Changeset 0654f5a


Ignore:
Timestamp:
08/10/04 15:17:47 (16 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:
2 edited

Legend:

Unmodified
Added
Removed
  • configure.in

    r7d31d26 r0654f5a  
    3131AC_CHECK_FUNCS(socket strdup)
    3232
    33 AC_DEFUN([CHECK_LIBPCAP],
     33AC_DEFUN([WITH_LIBPCAP],
    3434         [AC_ARG_WITH([pcap],
    3535                      AC_HELP_STRING([--with-pcap],
     
    3939               [ac_cv_use_pcap], [ac_cv_use_pcap=pcap])])
    4040
    41 AC_DEFUN([CHECK_LIBZ],
     41AC_DEFUN([WITH_LIBPCAP_PATH],
     42         [AC_ARG_WITH([pcap-path],
     43                      AC_HELP_STRING([--with-pcap-path],
     44                                     [location of pcap library (default is /usr/lib)]),
     45                      [ac_cv_use_pcap_path=$withval], [ac_cv_use_pcap_path=/usr/lib])
     46AC_CACHE_CHECK([location of pcap library],
     47               [ac_cv_use_pcap_path], [ac_cv_use_pcap_path=/usr/lib])])
     48
     49AC_DEFUN([WITH_LIBZ],
    4250         [AC_ARG_WITH([zlib],
    4351                      AC_HELP_STRING([--with-zlib],
     
    4755               [ac_cv_use_zlib], [ac_cv_use_zlib=z])])
    4856
    49 CHECK_LIBPCAP
    50 CHECK_LIBZ
     57AC_DEFUN([WITH_LIBZ_PATH],
     58         [AC_ARG_WITH([zlib-path],
     59                      AC_HELP_STRING([--with-zlib-path],
     60                                     [location of zlib library (default is /usr/lib)]),
     61                      [ac_cv_use_zlib_path=$withval], [ac_cv_use_zlib_path=/usr/lib])
     62AC_CACHE_CHECK([location of zlib library],
     63               [ac_cv_use_zlib_path], [ac_cv_use_zlib_path=/usr/lib])])
     64
     65WITH_LIBPCAP
     66WITH_LIBPCAP_PATH
     67WITH_LIBZ
     68WITH_LIBZ_PATH
    5169
    5270LIBPCAP=-l$ac_cv_use_pcap
     71LIBPCAP_PATH=-L$ac_cv_use_pcap_path
     72
    5373AC_SUBST([LIBPCAP])
     74AC_SUBST([LIBPCAP_PATH)]
    5475
    5576LIBZ=-l$ac_cv_use_zlib
     77LIBZ_PATH=-L$ac_cv_use_zlib_path
    5678AC_SUBST([LIBZ])
     79AC_SUBST([LIBZ_PATH])
    5780
    5881AC_OUTPUT(Makefile lib/Makefile)
  • lib/Makefile.am

    r20b0755 r0654f5a  
    33lib_HEADERS = libtrace.h dagformat.h wag.h
    44libtrace_la_LIBADD = @LIBPCAP@ @LIBZ@
    5 libtrace_la_LDFLAGS=-version-info 2:0:0
     5libtrace_la_LDFLAGS=-version-info 2:0:0 @LIBPCAP_PATH@ @LIBZ_PATH@
Note: See TracChangeset for help on using the changeset viewer.