diff options
| author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2016-02-19 05:05:00 +0000 |
|---|---|---|
| committer | João Valverde <j@v6e.pt> | 2016-02-21 18:21:42 +0000 |
| commit | de1dc7e7b82a93ed8e686506c1120669622699cf (patch) | |
| tree | 9c02de1cd6f4c4cbf8ae3bc0c03b55e0ff677883 | |
| parent | 6e1d7b935b80ae651b246ce2e530ade81ce36593 (diff) | |
| download | wireshark-de1dc7e7b82a93ed8e686506c1120669622699cf.tar.gz | |
autotools: Improve libnl configuration and dependency
Change-Id: I3de7c2a6292a2f3fc57fdb849c23c3b31f6e4a13
Reviewed-on: https://code.wireshark.org/review/14052
Petri-Dish: João Valverde <j@v6e.pt>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
| -rw-r--r-- | Makefile.am | 6 | ||||
| -rw-r--r-- | caputils/Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 15 |
3 files changed, 11 insertions, 12 deletions
diff --git a/Makefile.am b/Makefile.am index c7440e7626..55ac4d5fad 100644 --- a/Makefile.am +++ b/Makefile.am @@ -399,7 +399,8 @@ wireshark_common_ldadd = \ @COREFOUNDATION_FRAMEWORKS@ \ @LIBGCRYPT_LIBS@ \ @LIBGNUTLS_LIBS@ \ - @LIBSMI_LDFLAGS@ + @LIBSMI_LDFLAGS@ \ + @LIBNL_LIBS@ if HAVE_Qt wireshark_SOURCES = $(WIRESHARK_COMMON_SRC) wireshark-qt.cpp @@ -628,7 +629,8 @@ dumpcap_LDADD = \ @NSL_LIBS@ \ @SYSTEMCONFIGURATION_FRAMEWORKS@ \ @COREFOUNDATION_FRAMEWORKS@ \ - @LIBCAP_LIBS@ + @LIBCAP_LIBS@ \ + @LIBNL_LIBS@ # # Build the version string diff --git a/caputils/Makefile.am b/caputils/Makefile.am index f53c070a49..bcfad3eb91 100644 --- a/caputils/Makefile.am +++ b/caputils/Makefile.am @@ -22,7 +22,7 @@ include Makefile.common include $(top_srcdir)/Makefile.am.inc -AM_CPPFLAGS = $(INCLUDEDIRS) $(WS_CPPFLAGS) $(GLIB_CFLAGS) +AM_CPPFLAGS = $(INCLUDEDIRS) $(WS_CPPFLAGS) $(GLIB_CFLAGS) $(LIBNL_CFLAGS) noinst_LIBRARIES = libcaputils.a diff --git a/configure.ac b/configure.ac index f6e9dbf00d..5e7498d5f6 100644 --- a/configure.ac +++ b/configure.ac @@ -682,29 +682,26 @@ linux*) # was requested by the user. # if test x$libnl_version = "xany" -o x$libnl_version = "x3"; then - PKG_WIRESHARK_CHECK_SYSTEM_MODULES(LIBNL3, [libnl-route-3.0 >= 3.0 libnl-genl-3.0] >= 3.0, [have_libnl3=yes], [have_libnl3=no]) + PKG_CHECK_EXISTS([libnl-3.0 libnl-route-3.0 libnl-genl-3.0], [have_libnl3=yes], [have_libnl3=no]) fi if test x$libnl_version = "xany" -o x$libnl_version = "x2"; then - PKG_WIRESHARK_CHECK_SYSTEM_MODULES(LIBNL2, libnl-2.0 >= 2.0, [have_libnl2=yes], [have_libnl2=no]) + PKG_CHECK_EXISTS([libnl-2.0], [have_libnl2=yes], [have_libnl2=no]) fi if test x$libnl_version = "xany" -o x$libnl_version = "x1"; then - PKG_WIRESHARK_CHECK_SYSTEM_MODULES(LIBNL1, libnl-1 >= 1.0, [have_libnl1=yes], [have_libnl1=no]) + PKG_CHECK_EXISTS([libnl-1], [have_libnl1=yes], [have_libnl1=no]) fi if (test "${have_libnl3}" = "yes"); then - WS_CFLAGS="$WS_CFLAGS $LIBNL3_CFLAGS" - LIBS="$LIBS $LIBNL3_LIBS" + PKG_WIRESHARK_CHECK_SYSTEM_MODULES([LIBNL], [libnl-3.0 libnl-route-3.0 libnl-genl-3.0]) AC_DEFINE(HAVE_LIBNL, 1, [Enable libnl support]) AC_DEFINE(HAVE_LIBNL3, 1, [libnl version 3]) libnl_message="yes (v3)" elif (test "${have_libnl2}" = "yes"); then - WS_CFLAGS="$WS_CFLAGS $LIBNL2_CFLAGS" - LIBS="$LIBS $LIBNL2_LIBS" + PKG_WIRESHARK_CHECK_SYSTEM_MODULES([LIBNL], [libnl-2.0]) AC_DEFINE(HAVE_LIBNL, 1, [Enable libnl support]) AC_DEFINE(HAVE_LIBNL2, 1, [libnl version 2]) libnl_message="yes (v2)" elif (test "${have_libnl1}" = "yes"); then - WS_CFLAGS="$WS_CFLAGS $LIBNL1_CFLAGS" - LIBS="$LIBS $LIBNL1_LIBS" + PKG_WIRESHARK_CHECK_SYSTEM_MODULES([LIBNL], [libnl-1]) AC_DEFINE(HAVE_LIBNL, 1, [Enable libnl support]) AC_DEFINE(HAVE_LIBNL1, 1, [libnl version 1]) libnl_message="yes (v1)" |