Changeset dcc1343


Ignore:
Timestamp:
03/07/05 16:52:18 (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:
5ed52b8
Parents:
bfba808
Message:

removed any programs supplid by autotools whihc should probably be rebuilt

Files:
16 deleted
1 edited

Legend:

Unmodified
Added
Removed
  • configure.in

    r70df58d rdcc1343  
    1 dnl Process this file with autoconf to produce a configure script.
     1# Process this file with autoconf to produce a configure script.
    22AC_INIT(libtrace,2.0.13,[libtrace@wand.net.nz],libtrace)
    33AC_CONFIG_SRCDIR(lib/trace.c)
     
    77dnl AC_GNU_SOURCE
    88
    9 AM_CONFIG_HEADER(config.h)
     9AM_CONFIG_HEADER([config.h])
    1010dnl Checks for programs.
    1111AC_PROG_CC
     
    1515
    1616
    17 dnl Checks for header files.
     17# Checks for header files.
    1818AC_HEADER_STDC
    1919dnl AC_CHECK_HEADERS(errno.h stdlib.h stdio.h assert.h string.h netinet/in.h assert.h errno.h fcntl.h net/ethernet.h netdb.h pcap.h stdio.h stdlib.h string.h sys/stat.h sys/types.h sys/socket.h sys/un.h unistd.h time.h sys/ioctl.h net/bpf.h pcap.h zlib.h pcap-bpf.h)
    2020AC_CHECK_HEADERS(pcap.h pcap-bpf.h net/bpf.h zlib.h sys/limits.h stddef.h stdint.h limits.h dagapi.h parser.h libxml/parser.h libxml2/libxml/parser.h)
    2121       
    22 dnl Checking for the right bpf header to include
     22# Checking for the right bpf header to include
    2323AC_MSG_CHECKING([where the bpf headers are kept])
    2424echo ""
     
    3333if test $bpfh = no; then
    3434  AC_MSG_RESULT([No BPF headers, compiling without support for BPF filters])
     35  AC_DEFINE(HAVE_BPF,0,[Conditional for building bpf support])
    3536else
    3637  AC_MSG_RESULT([Using $bpfh])
     38  AC_DEFINE(HAVE_BPF,1,[Conditional for building bpf support])
    3739fi
    3840
    3941
    40 AC_MSG_CHECKING([where the libxml parser header is kept])
    41 echo ""
    42 xmlparser=no
    43 AC_CHECK_FILE(/usr/include/parser.h,
    44         [AC_DEFINE([HAVE_PARSER_H]) xmlparser=parser.h])
    45 if test $xmlparser = no; then
    46 AC_CHECK_FILE(/usr/include/libxml/parser.h,
    47         [AC_DEFINE([HAVE_LIBXML_PARSER_H]) xmlparser=libxml/parser.h])
    48 if test $xmlparser = no; then
    49 AC_CHECK_FILE(/usr/include/libxml2/libxml/parser.h,
    50         [AC_DEFINE([HAVE_LIBXML2_LIBXML_PARSER_H]) xmlparser=libxml2/libxml/parser.h])
    51 fi
    52 fi
    53 
    54 if test $xmlparser = no; then
    55         AC_MSG_RESULT([No libxml parser headers, compiling without XML support])
    56 else
    57         AC_MSG_RESULT([Using $xmlparser])
    58 fi
    59 
    6042AC_REPLACE_FUNCS(strndup)
    6143
    62 dnl Checks for typedefs, structures, and compiler characteristics.
     44# Checks for typedefs, structures, and compiler characteristics.
    6345AC_C_CONST
    6446AC_C_INLINE
     
    6850AC_SYS_LARGEFILE
    6951
    70 dnl Checks for library functions.
     52# Checks for library functions.
    7153AC_PROG_GCC_TRADITIONAL
    7254AC_CHECK_FUNCS(socket strdup)
    7355
    7456
    75 dnl configure time options for use of DAG cards
    76 dnl borrowed from libpcap!
     57# configure time options for use of DAG cards
     58# borrowed from libpcap!
    7759AC_ARG_WITH(dag,
    7860            AC_HELP_STRING([--with-dag[=DIR]],
     
    121103
    122104        if test -r "$dag_include_dir/dagapi.h" -a -r "$dag_lib_dir/libdag.a";
    123 then
     105        then
    124106                ADD_INCLS="$ADD_INCLS -I $dag_include_dir"
    125107                ADD_LIBS="$ADD_LIBS -ldag"
     
    127109                DAG_TOOLS_DIR=$dag_tools_dir
    128110                AC_SUBST([DAG_TOOLS_DIR])
    129                 #ADD_LIBS="$ADD_LIBS $dag_tools_dir/dagapi.o $dag_tools_dir/dagopts.o"
    130                 #ADD_SOURCES="$ADD_SOURCES $dag_tools_dir/dagapi.c $dag_tools_dir/dagopts.c"
    131111                ac_cv_lbl_dag_api=yes
    132112        else
     
    141121        else
    142122                AC_DEFINE(HAVE_DAG_API, 1, [define if you have a DAG API])
     123                AC_DEFINE(HAVE_DAG,1,[conditional for building with DAG support])
    143124        fi
     125else
     126        AC_DEFINE(HAVE_DAG,0,[conditional for building with DAG support])
    144127fi
    145128
     
    147130
    148131
    149 dnl configure time options for selecting which libpcap and libz to use
    150 dnl this is provided to allow for systems whose default libraries don't support
    151 dnl large files - you can build your own and link using these options
    152 AC_DEFUN([CHECK_LIBPCAP],
    153          [AC_ARG_WITH([pcap],
    154                       AC_HELP_STRING([--with-pcap],
    155                                      [name of pcap library (default is pcap)]),
    156                       [ac_cv_use_pcap=$withval], [ac_cv_use_pcap=pcap])
    157 AC_CACHE_CHECK([which pcap library to use],
    158                [ac_cv_use_pcap], [ac_cv_use_pcap=pcap])])
    159 
    160 AC_DEFUN([CHECK_LIBPCAP_PATH],
    161          [AC_ARG_WITH([pcap-path],
    162                       AC_HELP_STRING([--with-pcap-path],
    163                                      [location of pcap library (default is /usr/lib)]),
    164                       [ac_cv_use_pcap_path=$withval], [ac_cv_use_pcap_path=/usr/lib])
    165 AC_CACHE_CHECK([location of pcap library],
    166                [ac_cv_use_pcap_path], [ac_cv_use_pcap_path=/usr/lib])])
     132# configure time options for selecting which libpcap and libz to use
     133# this is provided to allow for systems whose default libraries don't support
     134# large files - you can build your own and link using these options
     135AC_ARG_WITH([pcap],
     136    AC_HELP_STRING([--with-pcap],
     137                                   [name of pcap library (default is pcap)]),
     138        [ac_cv_use_pcap=$withval],
     139    [ac_cv_use_pcap=pcap])
    167140
    168141
    169 AC_DEFUN([CHECK_LIBZ],
    170          [AC_ARG_WITH([zlib],
    171                       AC_HELP_STRING([--with-zlib],
    172                                      [name of zlib library (default is z)]),
    173                       [ac_cv_use_zlib=$withval], [ac_cv_use_zlib=z])
    174 AC_CACHE_CHECK([which zlib library to use],
    175                [ac_cv_use_zlib], [ac_cv_use_zlib=z])])
     142AC_ARG_WITH([pcap-path],
     143    AC_HELP_STRING([--with-pcap-path],
     144                                   [location of pcap library (default is /usr/lib)]),
     145        [ac_cv_use_pcap_path=$withval],
     146    [ac_cv_use_pcap_path=/usr/lib])
    176147
    177 AC_DEFUN([CHECK_LIBZ_PATH],
    178         [AC_ARG_WITH([zlib-path],
    179                 AC_HELP_STRING([--with-zlib-path],
    180                         [location of zlib library (default is /usr/lib)]),
    181                 [ac_cv_use_zlib_path=$withval], [ac_cv_use_zlib_path=/usr/lib])
    182 AC_CACHE_CHECK([location of zlib library],
    183                [ac_cv_use_zlib_path], [ac_cv_use_zlib_path=/usr/lib])])
     148if test x"$ac_cv_use_pcap" != xno; then
     149        ADD_LIBS="$ADD_LIBS  -l$ac_cv_use_pcap"
     150        ADD_LDFLAGS="$ADD_LDFLAGS -L$ac_cv_use_pcap_path"
     151
     152    pcap_lib_file="${ac_cv_use_pcap_path}/lib${ac_cv_use_pcap}.so"
     153    if test ! -r "$ac_cv_use_pcap_path" -o ! -r "$pcap_lib_file"; then
     154        AC_MSG_NOTICE([Cannot find pcap library $pcap_lib_file.])
     155        AC_MSG_ERROR([Exiting]);
     156    fi 
     157    AC_DEFINE(HAVE_PCAP,1,[Conditional for building PCAP support])
     158else
     159    AC_DEFINE(HAVE_PCAP,0,[Conditional for building PCAP support])
     160fi
    184161
    185162
     163AC_ARG_WITH([zlib],
     164    AC_HELP_STRING([--with-zlib],
     165                               [name of zlib library (default is z)]),
     166        [ac_cv_use_zlib=$withval],
     167    [ac_cv_use_zlib=z])
    186168
    187 CHECK_LIBPCAP
    188 CHECK_LIBPCAP_PATH
    189 
    190 if test "$ac_cv_use_pcap" != no; then
    191         ADD_LIBS="$ADD_LIBS  -l$ac_cv_use_pcap"
    192         ADD_LDFLAGS="$ADD_LDFLAGS -L$ac_cv_use_pcap_path"
    193 fi
    194 CHECK_LIBZ
    195 CHECK_LIBZ_PATH
     169AC_ARG_WITH([zlib-path],
     170    AC_HELP_STRING([--with-zlib-path],
     171                   [location of zlib library (default is /usr/lib)]),
     172    [ac_cv_use_zlib_path=$withval],
     173    [ac_cv_use_zlib_path=/usr/lib])
    196174
    197175if test "$ac_cv_use_zlib" != no; then
    198176        ADD_LIBS="$ADD_LIBS -l$ac_cv_use_zlib"
    199177        ADD_LDFLAGS="$ADD_LDFLAGS -L$ac_cv_use_zlib_path"
     178   
     179    zlib_lib_file="${ac_cv_use_zlib_path}/lib${ac_cv_use_zlib}.so"
     180   
     181    if test ! -r "$ac_cv_use_zlib_path" -o ! -r "$zlib_lib_file"; then
     182        AC_MSG_NOTICE([Cannot find zlib library $zlib_lib_file.])
     183        AC_MSG_ERROR([Exiting]);
     184    fi
     185   
     186    AC_DEFINE(HAVE_ZLIB,1,[Conditional for building zlib support])
     187else
     188    AC_DEFINE(HAVE_ZLIB,0,[Conditional for building zlib support])   
    200189fi
     190
     191
    201192
    202193AC_SUBST([ADD_LIBS])
Note: See TracChangeset for help on using the changeset viewer.