From 405e2f8dd01cfde121f4af2d95b0e7bc94d3e052 Mon Sep 17 00:00:00 2001 From: Guido Falsi Date: Sat, 25 Aug 2018 23:35:42 +0200 Subject: Add back pkgconfig file. It is required by ntopng to find the installed shared library. --- Makefile.am | 4 ++++ configure.seed | 2 +- libndpi.pc.in | 10 ++++++++++ 3 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 libndpi.pc.in diff --git a/Makefile.am b/Makefile.am index 0642aec9d..37f084916 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,3 +1,7 @@ ACLOCAL_AMFLAGS = -I m4 SUBDIRS = src/lib example tests + +pkgconfigdir = $(prefix)/libdata/pkgconfig +pkgconfig_DATA = libndpi.pc + EXTRA_DIST = autogen.sh diff --git a/configure.seed b/configure.seed index 946557a33..24ca87413 100644 --- a/configure.seed +++ b/configure.seed @@ -128,7 +128,7 @@ AC_ARG_ENABLE([debug-messages], AC_CHECK_LIB(pthread, pthread_setaffinity_np, AC_DEFINE_UNQUOTED(HAVE_PTHREAD_SETAFFINITY_NP, 1, [libc has pthread_setaffinity_np])) -AC_CONFIG_FILES([Makefile example/Makefile tests/Makefile src/include/ndpi_define.h src/lib/Makefile]) +AC_CONFIG_FILES([Makefile example/Makefile tests/Makefile libndpi.pc src/include/ndpi_define.h src/lib/Makefile]) AC_CONFIG_HEADERS(src/include/ndpi_config.h) AC_SUBST(GIT_RELEASE) AC_SUBST(NDPI_MAJOR) diff --git a/libndpi.pc.in b/libndpi.pc.in new file mode 100644 index 000000000..291429cc7 --- /dev/null +++ b/libndpi.pc.in @@ -0,0 +1,10 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: libndpi +Description: deep packet inspection library +Version: @VERSION@ +Libs: -L${libdir} -lndpi +Cflags: -I${includedir}/libndpi-@VERSION@ -- cgit v1.2.3 From d31a29bf6a0c8efa11203badff3afe9f3b19ce08 Mon Sep 17 00:00:00 2001 From: Guido Falsi Date: Sun, 26 Aug 2018 00:35:01 +0200 Subject: Adapt pkgconfig file include path to new Makefile install location. --- libndpi.pc.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libndpi.pc.in b/libndpi.pc.in index 291429cc7..5e1cde70b 100644 --- a/libndpi.pc.in +++ b/libndpi.pc.in @@ -7,4 +7,4 @@ Name: libndpi Description: deep packet inspection library Version: @VERSION@ Libs: -L${libdir} -lndpi -Cflags: -I${includedir}/libndpi-@VERSION@ +Cflags: -I${includedir}/ndpi -- cgit v1.2.3