Changeset 9589941

Timestamp:

05/04/11 14:25:06 (10 years ago)

Author:

Shane Alcock <salcock@…>

Branches:

4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, getfragoff, help, libtrace4, master, ndag_format, pfring, rc-4.0.1, rc-4.0.2, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance, ringtimestampfixes

Children:

b6664e8

Parents:

3787331

Message:

• Separated the libraries to link against into 3 separate categories: one for libtrace itself, one for libpacketdump and one for the tools. This means that each component only links against libraries that are actually used by something within it, reducing dependencies and keeping our Debian maintainer happy.
• Also fixed a similar issue where libpacketdump did not explicitly link against libtrace

Files:

• configure.in (modified) (8 diffs)
• lib/Makefile.am (modified) (1 diff)
• libpacketdump/Makefile.am (modified) (1 diff)
• tools/Makefile.tools (modified) (1 diff)

configure.in

@@ -98 +98 @@
 AC_SYS_LARGEFILE
 
+LIBPKTDUMP_LIBS="-ltrace "
+LIBTRACE_LIBS=""
+TOOLS_LIBS=""
+
 # Set our C compiler flags based on the gcc version
 if test "$GCC" = "yes"; then
@@ -213 +217 @@
 AC_CHECK_HEADER(gdc.h,AC_DEFINE(HAVE_LIBGDC,1,[has gdc.h]))
 
-# Check to see if we have libdl - *BSD has built-in libdl
-AC_SEARCH_LIBS(dlopen,dl, dlfound=1,dlfound=0 )
-
-if test "$dlfound" = 0; then
-        AC_MSG_ERROR("Unable to find dlopen. Please use LDFLAGS to specify the location of libdl and re-run configure")
-fi
-
 # Check for libpcap
 AC_CHECK_LIB(pcap,pcap_next_ex,pcapfound=1,pcapfound=0)
@@ -245 +242 @@
         AC_MSG_ERROR(libpcap0.8 or greater is required to compile libtrace. If you have installed it in a non-standard location please use LDFLAGS to specify the location of the library)
 else
-        ADD_LIBS="$ADD_LIBS -lpcap"
+        TOOL_LIBS="$TOOL_LIBS -lpcap"
+        LIBTRACE_LIBS="$LIBTRACE_LIBS -lpcap"
         AC_DEFINE([HAVE_LIBPCAP],1,[compile with libpcap support])
         AC_DEFINE([HAVE_BPF_FILTER],1,[compile with bpf filter support])
@@ -291 +289 @@
         if test "$dag_found" = 1; then
                 ADD_LIBS="$ADD_LIBS -ldag"
+                LIBTRACE_LIBS="$LIBTRACE_LIBS -ldag"
                 AC_DEFINE(HAVE_DAG_API, 1, [define if you have the DAG API])
                 AC_DEFINE(HAVE_DAG,1,[conditional for building with DAG live capture support])
@@ -366 +365 @@
 
 # Checks for various "optional" libraries
-AC_CHECK_LIB(z, deflate)
-AC_CHECK_LIB(bz2, BZ2_bzDecompressInit)
-AC_CHECK_LIB(lzo2, lzo1x_1_compress)
-AC_CHECK_LIB(pthread, pthread_create)
+AC_CHECK_LIB(z, deflate, have_zlib=1, have_zlib=0)
+AC_CHECK_LIB(bz2, BZ2_bzDecompressInit, have_bzip=1, have_bzip=0)
+AC_CHECK_LIB(lzo2, lzo1x_1_compress, have_lzo=1, have_lzo=0)
+AC_CHECK_LIB(pthread, pthread_create, have_pthread=1, have_pthread=0)
 
 # Check for ncurses
-AC_SEARCH_LIBS(mvprintw, ncurses, , have_ncurses=no)
+AC_SEARCH_LIBS(mvprintw, ncurses, have_ncurses=yes, have_ncurses=no)
+LIBS=
 
 # These libraries have to be explicitly linked in OpenSolaris
-AC_SEARCH_LIBS(getservent, socket, [], [], -lnsl)               
-AC_SEARCH_LIBS(inet_ntop, nsl, [], [], -lsocket)
+AC_SEARCH_LIBS(getservent, socket, have_socket=1, have_socket=0, -lnsl)         
+LIBS=
+
+AC_SEARCH_LIBS(inet_ntop, nsl, have_nsl=1, have_nsl=0, -lsocket)
+LIBS=
+
+# Check to see if we have libdl - *BSD has built-in libdl
+AC_SEARCH_LIBS(dlopen,dl, dlfound=1,dlfound=0 )
+LIBS=
+
+if test "$dlfound" = 0; then
+        AC_MSG_ERROR("Unable to find dlopen. Please use LDFLAGS to specify the location of libdl and re-run configure")
+fi
+
+if test "$ac_cv_search_dlopen" != "none required"; then 
+        LIBPKTDUMP_LIBS="$LIBPKTDUMP_LIBS $ac_cv_search_dlopen"
+fi
+
+
+if test "$have_zlib" = 1; then
+        LIBTRACE_LIBS="$LIBTRACE_LIBS -lz"
+        AC_DEFINE(HAVE_LIBZ, 1, [Set to 1 if zlib is supported])
+fi
+
+if test "$have_bzip" = 1; then
+        LIBTRACE_LIBS="$LIBTRACE_LIBS -lbz2"
+        AC_DEFINE(HAVE_LIBBZ2, 1, [Set to 1 if bzip2 is supported])
+fi
+
+if test "$have_lzo" = 1; then
+        LIBTRACE_LIBS="$LIBTRACE_LIBS -llzo2"
+        AC_DEFINE(HAVE_LIBLZO2, 1, [Set to 1 if lzo2 is supported])
+fi
+
+if test "$have_pthread" = 1; then
+        LIBTRACE_LIBS="$LIBTRACE_LIBS -lpthread"
+        AC_DEFINE(HAVE_LIBPTHREAD, 1, [Set to 1 if pthreads are supported])
+fi
+
+if test "$have_ncurses" = "yes"; then
+        if test "$ac_cv_search_mvprintw" != "none required"; then
+                TOOLS_LIBS="$TOOLS_LIBS $ac_cv_search_mvprintw"
+        fi
+fi
+
+if test "$have_nsl" = 1; then
+        if test "$ac_cv_search_inet_ntop" != "none required"; then
+                LIBTRACE_LIBS="$LIBTRACE_LIBS $ac_cv_search_inet_ntop"
+                LIBPKTDUMP_LIBS="$LIBPKTDUMP_LIBS $ac_cv_search_inet_ntop"
+        fi
+fi
+
+if test "$have_socket" = 1; then
+        if test "$ac_cv_search_getservent" != "none required"; then
+                LIBTRACE_LIBS="$LIBTRACE_LIBS $ac_cv_search_getservent"
+                LIBPKTDUMP_LIBS="$LIBPKTDUMP_LIBS $ac_cv_search_getservent"
+        fi 
+fi
+
+
+# Stupid AC_SEARCH_LIB appends stuff to LIBS even when I don't want it to, so
+# just set libs to null here to avoid linking against them by default
+LIBS=
+
 
 # For now, the user has to explicitly ask for the LLVM stuff, as it's a bit
@@ -414 +476 @@
         else
                 LIBCXXFLAGS="`$LLVM_CONFIG --cxxflags` $CXXFLAGS"
-                ADD_LIBS="$ADD_LIBS `$LLVM_CONFIG --libs all`";
+                LIBTRACE_LIBS="$LIBRACE_LIBS `$LLVM_CONFIG --libs all`";
                 LDFLAGS="`$LLVM_CONFIG --ldflags` $LDFLAGS";
                 JIT=yes
@@ -427 +489 @@
 AM_CONDITIONAL([DAG2_4], [test "$libtrace_dag_version" = 24])
 AM_CONDITIONAL([DAG2_5], [test "$libtrace_dag_version" = 25])
-AM_CONDITIONAL([HAVE_ZLIB], [test "$ac_cv_lib_z_deflate" = yes])
-AM_CONDITIONAL([HAVE_BZLIB], [test "$ac_cv_lib_bz2_BZ2_bzDecompressInit" = yes])
-AM_CONDITIONAL([HAVE_LZO], [test "$ac_cv_lib_lzo2_lzo1x_1_compress" = yes])
+AM_CONDITIONAL([HAVE_ZLIB], [test "$have_zlib" = 1])
+AM_CONDITIONAL([HAVE_BZLIB], [test "$have_bzip" = 1])
+AM_CONDITIONAL([HAVE_LZO], [test "$have_lzo" = 1])
 AM_CONDITIONAL([HAVE_NETPACKET_PACKET_H], [test "$libtrace_netpacket_packet_h" = true])
 AM_CONDITIONAL([HAVE_LIBGDC], [test "$ac_cv_header_gdc_h" = yes])
 AM_CONDITIONAL([HAVE_LLVM], [test "x$JIT" != "xno" ])
-AM_CONDITIONAL([HAVE_NCURSES], [test "x$have_ncurses" = "xyes"])
+AM_CONDITIONAL([HAVE_NCURSES], [test "$xhave_ncurses" = "xyes"])
 
 # Check for miscellaneous programs
@@ -441 +503 @@
 
 # Set all our output variables
-AC_SUBST([ADD_LIBS])
+AC_SUBST([LIBTRACE_LIBS])
+AC_SUBST([LIBPKTDUMP_LIBS])
+AC_SUBST([TOOLS_LIBS])
+#AC_SUBST([ADD_LIBS])
 AC_SUBST([ADD_LDFLAGS])
 AC_SUBST([ADD_INCLS])

lib/Makefile.am

@@ -75 +75 @@
 
 INCLUDES = @ADD_INCLS@
-libtrace_la_LIBADD = @ADD_LIBS@ @LTLIBOBJS@
+libtrace_la_LIBADD = @LIBTRACE_LIBS@ @LTLIBOBJS@
 libtrace_la_LDFLAGS=-version-info @LIBTRACE_MAJOR@:@LIBTRACE_MINOR@:@LIBTRACE_MID@ @ADD_LDFLAGS@
 

libpacketdump/Makefile.am

@@ -142 +142 @@
 # which on non x86_32 platforms means that they cannot be linked into
 # a shared library.
-libpacketdump_la_LIBADD = @ADD_LIBS@ 
+libpacketdump_la_LIBADD = @LIBPKTDUMP_LIBS@ 
 libpacketdump_la_LDFLAGS=\
         -version-info @LIBTRACE_MAJOR@:@LIBTRACE_MINOR@:@LIBTRACE_MID@ \

tools/Makefile.tools

@@ +1 @@
+
+
 AM_CFLAGS=-I"$(top_srcdir)/lib" -I"$(top_srcdir)/libpacketdump"
 AM_CXXFLAGS=-I"$(top_srcdir)/lib" -I"$(top_srcdir)/libpacketdump" 
-AM_LDFLAGS=-L"$(top_srcdir)/lib" -L"$(top_srcdir)/libpacketdump" -ltrace
+AM_LDFLAGS=-L"$(top_srcdir)/lib" -L"$(top_srcdir)/libpacketdump" -ltrace @TOOLS_LIBS@