Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 1 | From 2796129af52901dd68595e5e88a639308541def9 Mon Sep 17 00:00:00 2001 |
| 2 | From: Fabio Berton <fabio.berton@ossystems.com.br> |
| 3 | Date: Thu, 3 Nov 2016 17:56:29 -0200 |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 4 | Subject: [PATCH] libpcap: pkgconfig support |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 5 | Organization: O.S. Systems Software LTDA. |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 6 | |
| 7 | Adding basic structure to support pkg-config. |
| 8 | |
| 9 | Upstream-Status: Inappropriate [embedded specific] |
| 10 | |
| 11 | Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com> |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 12 | Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br> |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 13 | --- |
| 14 | Makefile.in | 5 +++++ |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 15 | configure.ac | 1 + |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 16 | libpcap.pc.in | 10 ++++++++++ |
| 17 | 3 files changed, 16 insertions(+) |
| 18 | create mode 100644 libpcap.pc.in |
| 19 | |
| 20 | diff --git a/Makefile.in b/Makefile.in |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 21 | index e71d973..d7004ed 100644 |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 22 | --- a/Makefile.in |
| 23 | +++ b/Makefile.in |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 24 | @@ -61,6 +61,10 @@ V_RPATH_OPT = @V_RPATH_OPT@ |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 25 | DEPENDENCY_CFLAG = @DEPENDENCY_CFLAG@ |
| 26 | PROG=libpcap |
| 27 | |
| 28 | +# pkgconfig support |
| 29 | +pkgconfigdir = $(libdir)/pkgconfig |
| 30 | +pkgconfig_DATA = libpcap.pc |
| 31 | + |
| 32 | # Standard CFLAGS |
| 33 | FULL_CFLAGS = $(CCOPT) $(INCLS) $(DEFS) $(CFLAGS) |
| 34 | |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 35 | @@ -286,6 +290,7 @@ EXTRA_DIST = \ |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 36 | lbl/os-solaris2.h \ |
| 37 | lbl/os-sunos4.h \ |
| 38 | lbl/os-ultrix4.h \ |
| 39 | + libpcap.pc \ |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 40 | missing/getopt.c \ |
| 41 | missing/getopt.h \ |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 42 | missing/snprintf.c \ |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 43 | diff --git a/configure.ac b/configure.ac |
| 44 | index da2f940..4fc67bf 100644 |
| 45 | --- a/configure.ac |
| 46 | +++ b/configure.ac |
| 47 | @@ -1805,6 +1805,7 @@ fi |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 48 | AC_PROG_INSTALL |
| 49 | |
| 50 | AC_CONFIG_HEADER(config.h) |
| 51 | +AC_CONFIG_FILES([libpcap.pc]) |
| 52 | |
| 53 | AC_OUTPUT_COMMANDS([if test -f .devel; then |
| 54 | echo timestamp > stamp-h |
| 55 | diff --git a/libpcap.pc.in b/libpcap.pc.in |
| 56 | new file mode 100644 |
| 57 | index 0000000..4f78ad8 |
| 58 | --- /dev/null |
| 59 | +++ b/libpcap.pc.in |
| 60 | @@ -0,0 +1,10 @@ |
| 61 | +prefix=@prefix@ |
| 62 | +exec_prefix=@exec_prefix@ |
| 63 | +libdir=@libdir@ |
| 64 | +includedir=@includedir@ |
| 65 | + |
| 66 | +Name: libpcap |
| 67 | +Description: System-independent interface for user-level packet capture. |
| 68 | +Version: @VERSION@ |
| 69 | +Libs: -L${libdir} -lpcap |
| 70 | +Cflags: -I${includedir} |
| 71 | -- |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 72 | 2.1.4 |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 73 | |