diff options
| -rw-r--r-- | configure.ac | 13 | ||||
| -rw-r--r-- | src/Makefile.am | 6 | ||||
| -rw-r--r-- | src/conntrack/Makefile.am | 3 | ||||
| -rw-r--r-- | src/expect/Makefile.am | 3 |
4 files changed, 5 insertions, 20 deletions
diff --git a/configure.ac b/configure.ac index d5b65af..429f0a7 100644 --- a/configure.ac +++ b/configure.ac @@ -19,14 +19,6 @@ case "$host" in esac dnl Dependencies -AC_CHECK_PROG(HAVE_PKG_CONFIG, pkg-config, yes) -if test "x$HAVE_PKG_CONFIG" = "x" -then - echo "*** Error: No suitable pkg-config found. ***" - echo " Please install the 'pkg-config' package." - exit 1 -fi - PKG_CHECK_MODULES([LIBNFNETLINK], [libnfnetlink >= 1.0.0]) AC_CHECK_HEADERS(arpa/inet.h) @@ -69,11 +61,6 @@ if test ! -z "$libdir"; then CFLAGS="$CFLAGS -DLIBNETFILTER_CONNTRACK_DIR=$MODULE_DIR" fi -CFLAGS="$CFLAGS $LIBNFNETLINK_CFLAGS" -LIBNFCONNTRACK_LIBS="$LIBNFNETLINK_LIBS" - -AC_SUBST(LIBNFCONNTRACK_LIBS) - dnl Output the makefile AC_OUTPUT(Makefile src/Makefile include/Makefile utils/Makefile qa/Makefile include/libnetfilter_conntrack/Makefile include/internal/Makefile src/conntrack/Makefile src/expect/Makefile libnetfilter_conntrack.pc doxygen.cfg) diff --git a/src/Makefile.am b/src/Makefile.am index 7816f07..2e9ccd0 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -6,13 +6,13 @@ include $(top_srcdir)/Make_global.am SUBDIRS=conntrack expect -AM_CFLAGS = -Wall -LIBS = @LIBNFCONNTRACK_LIBS@ +AM_CFLAGS = -Wall ${LIBNFNETLINK_CFLAGS} lib_LTLIBRARIES = libnetfilter_conntrack.la libnetfilter_conntrack_la_LIBADD = conntrack/libnfconntrack.la \ - expect/libnfexpect.la + expect/libnfexpect.la \ + ${LIBNFNETLINK_LIBS} libnetfilter_conntrack_la_LDFLAGS = -Wc,-nostartfiles -lnfnetlink -ldl \ -version-info $(LIBVERSION) libnetfilter_conntrack_la_SOURCES = main.c diff --git a/src/conntrack/Makefile.am b/src/conntrack/Makefile.am index 51d03c0..68c2d72 100644 --- a/src/conntrack/Makefile.am +++ b/src/conntrack/Makefile.am @@ -1,7 +1,6 @@ include $(top_srcdir)/Make_global.am -AM_CFLAGS = -Wall -LIBS = @LIBNFCONNTRACK_LIBS@ +AM_CFLAGS = -Wall ${LIBNFNETLINK_CFLAGS} noinst_LTLIBRARIES = libnfconntrack.la diff --git a/src/expect/Makefile.am b/src/expect/Makefile.am index 719ed23..b0404ba 100644 --- a/src/expect/Makefile.am +++ b/src/expect/Makefile.am @@ -1,7 +1,6 @@ include $(top_srcdir)/Make_global.am -AM_CFLAGS = -Wall -LIBS = @LIBNFCONNTRACK_LIBS@ +AM_CFLAGS = -Wall ${LIBNFNETLINK_CFLAGS} noinst_LTLIBRARIES = libnfexpect.la |