Changeset 0654f5a

Timestamp:

08/10/04 15:17:47 (17 years ago)

Author:

Daniel Lawson <dlawson@…>

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:

4b42c39

Parents:

20b0755

Message:

added support for pathing for extra pcap and zlib

Files:

• configure.in (modified) (3 diffs)
• lib/Makefile.am (modified) (1 diff)

configure.in

@@ -31 +31 @@
 AC_CHECK_FUNCS(socket strdup)
 
-AC_DEFUN([CHECK_LIBPCAP],
+AC_DEFUN([WITH_LIBPCAP],
          [AC_ARG_WITH([pcap],
                       AC_HELP_STRING([--with-pcap],
@@ -39 +39 @@
                [ac_cv_use_pcap], [ac_cv_use_pcap=pcap])])
 
-AC_DEFUN([CHECK_LIBZ],
+AC_DEFUN([WITH_LIBPCAP_PATH],
+         [AC_ARG_WITH([pcap-path],
+                      AC_HELP_STRING([--with-pcap-path],
+                                     [location of pcap library (default is /usr/lib)]),
+                      [ac_cv_use_pcap_path=$withval], [ac_cv_use_pcap_path=/usr/lib])
+AC_CACHE_CHECK([location of pcap library],
+               [ac_cv_use_pcap_path], [ac_cv_use_pcap_path=/usr/lib])])
+
+AC_DEFUN([WITH_LIBZ],
          [AC_ARG_WITH([zlib],
                       AC_HELP_STRING([--with-zlib],
@@ -47 +55 @@
                [ac_cv_use_zlib], [ac_cv_use_zlib=z])])
 
-CHECK_LIBPCAP
-CHECK_LIBZ
+AC_DEFUN([WITH_LIBZ_PATH],
+         [AC_ARG_WITH([zlib-path],
+                      AC_HELP_STRING([--with-zlib-path],
+                                     [location of zlib library (default is /usr/lib)]),
+                      [ac_cv_use_zlib_path=$withval], [ac_cv_use_zlib_path=/usr/lib])
+AC_CACHE_CHECK([location of zlib library],
+               [ac_cv_use_zlib_path], [ac_cv_use_zlib_path=/usr/lib])])
+
+WITH_LIBPCAP
+WITH_LIBPCAP_PATH
+WITH_LIBZ
+WITH_LIBZ_PATH
 
 LIBPCAP=-l$ac_cv_use_pcap
+LIBPCAP_PATH=-L$ac_cv_use_pcap_path
+
 AC_SUBST([LIBPCAP])
+AC_SUBST([LIBPCAP_PATH)]
 
 LIBZ=-l$ac_cv_use_zlib
+LIBZ_PATH=-L$ac_cv_use_zlib_path
 AC_SUBST([LIBZ])
+AC_SUBST([LIBZ_PATH])
 
 AC_OUTPUT(Makefile lib/Makefile)

lib/Makefile.am

@@ -3 +3 @@
 lib_HEADERS = libtrace.h dagformat.h wag.h
 libtrace_la_LIBADD = @LIBPCAP@ @LIBZ@
-libtrace_la_LDFLAGS=-version-info 2:0:0
+libtrace_la_LDFLAGS=-version-info 2:0:0 @LIBPCAP_PATH@ @LIBZ_PATH@