Maintenance: update --with-netfilter-conntrack detection (#1717)

Fixes pollution of global LIBS, LDFLAGS and CPPFLAGS
when the library and required headers are not
detected as usable.

diff --git a/configure.ac b/configure.ac
index 208edada6d71a0be7d0023689246b37e96d98c3f..6d75c0e8520f15927bc52e3159c1bf5d82387113 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1455,13 +1455,15 @@ AC_MSG_NOTICE([Linux Netfilter support requested: ${enable_linux_netfilter:=auto
 dnl Look for libnetfilter_conntrack options (needed for QOS netfilter marking)
 SQUID_AUTO_LIB(netfilter-conntrack,[Netfilter conntrack],[LIBNETFILTER_CONNTRACK])
 SQUID_CHECK_LIB_WORKS(netfilter-conntrack,[
-  LDFLAGS="$LIBNETFILTER_CONNTRACK_PATH $LDFLAGS"
+  SQUID_STATE_SAVE(squid_netfilter_conntrack_state)
+  PKG_CHECK_MODULES([LIBNETFILTER_CONNTRACK],[libnetfilter_conntrack],[:],[:])
   CPPFLAGS="$LIBNETFILTER_CONNTRACK_CFLAGS $CPPFLAGS"
-  AC_SEARCH_LIBS([nfct_query],[netfilter_conntrack],[LIBNETFILTER_CONNTRACK_LIBS="-lnetfilter_conntrack"])
+  LIBS="$LIBNETFILTER_CONNTRACK_PATH $LIBNETFILTER_CONNTRACK_LIBS $LIBS"
   AC_CHECK_HEADERS([ \
     libnetfilter_conntrack/libnetfilter_conntrack.h \
-    libnetfilter_conntrack/libnetfilter_conntrack_tcp.h
-  ],,[LIBNETFILTER_CONNTRACK_LIBS=""])
+    libnetfilter_conntrack/libnetfilter_conntrack_tcp.h \
+  ])
+  SQUID_STATE_ROLLBACK(squid_netfilter_conntrack_state)
 ])
 
 dnl Enable Large file support

diff --git a/src/Makefile.am b/src/Makefile.am
index 8c8fd202bb7f5bca2e7e076348cf9098c86dc11e..2db91a28d70be8803a6edc83f01a1c8a79c9cb41 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -534,6 +534,7 @@ squid_LDADD = \
        $(COMPAT_LIB) \
        $(LIBGSS_LIBS) \
        $(LIBMIT_KRB5_LIBS) \
+       $(LIBNETFILTER_CONNTRACK_LIBS) \
        $(LIBNETTLE_LIBS) \
        $(LIBPSAPI_LIBS) \
        $(XTRA_LIBS)
@@ -1986,6 +1987,7 @@ tests_test_http_range_LDADD = \
        $(COMPAT_LIB) \
        $(LIBGSS_LIBS) \
        $(LIBMIT_KRB5_LIBS) \
+       $(LIBNETFILTER_CONNTRACK_LIBS) \
        $(LIBNETTLE_LIBS) \
        $(LIBPSAPI_LIBS) \
        $(XTRA_LIBS)
@@ -2374,6 +2376,7 @@ tests_testHttpRequest_LDADD = \
        $(COMPAT_LIB) \
        $(LIBGSS_LIBS) \
        $(LIBMIT_KRB5_LIBS) \
+       $(LIBNETFILTER_CONNTRACK_LIBS) \
        $(LIBNETTLE_LIBS) \
        $(LIBPSAPI_LIBS) \
        $(XTRA_LIBS)
@@ -2673,6 +2676,7 @@ tests_testCacheManager_LDADD = \
        $(COMPAT_LIB) \
        $(LIBGSS_LIBS) \
        $(LIBMIT_KRB5_LIBS) \
+       $(LIBNETFILTER_CONNTRACK_LIBS) \
        $(LIBNETTLE_LIBS) \
        $(LIBPSAPI_LIBS) \
        $(XTRA_LIBS)