Changeset b5236ad

Timestamp:

06/17/05 15:38:06 (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:

7e9d51c

Parents:

db06c9d

Message:

fixes to makefile for documentation

Files:

• Makefile.am (modified) (1 diff)
• configure.in (modified) (1 diff)
• libtrace.doxygen (modified) (1 diff)

Makefile.am

@@ -1 +1 @@
 SUBDIRS=lib
-EXTRA_DIST=examples docs
+man_MANS = libtrace.h.3
+EXTRA_DIST=examples docs $(man_MANS)
+
+.PHONY: docs
 
 bootstrap-clean:

configure.in

@@ -175 +175 @@
 AM_CONDITIONAL(HAVE_DAG, test x$ac_cv_lbl_dag_api = xyes)
 
-
-# configure time options for selecting which libpcap and libz to use
-# this is provided to allow for systems whose default libraries don't support
-# large files - you can build your own and link using these options
-AC_ARG_WITH([pcap],
-    AC_HELP_STRING([--with-pcap],
-                                   [name of pcap library (default is pcap)]),
-        [ac_cv_use_pcap=$withval], 
-    [ac_cv_use_pcap=pcap])
-
-
-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])
-
-if test x"$ac_cv_use_pcap" != xno; then
-    ADD_LIBS="$ADD_LIBS  -l$ac_cv_use_pcap"
-    
-    pcap_lib_file="${ac_cv_use_pcap_path}/lib${ac_cv_use_pcap}.so"
-    
-    # if the library is in /usr/lib, then just use 
-    # AC_CHECK_LIB. 
-    if test x"${ac_cv_use_pcap_path}" == x"/usr/lib"; then
-            AC_CHECK_LIB(${ac_cv_use_pcap},pcap_open_live,
-                         have_libpcap=yes,
-                         have_libpcap=no)
-
-            if test x"${have_libpcap}" == xno; then
-                AC_MSG_NOTICE([Cannot find pcap library $pcap_lib_file.])
-                AC_MSG_ERROR([Exiting]);
-            fi
-    else
-        ADD_LDFLAGS="$ADD_LDFLAGS -L$ac_cv_use_pcap_path"
-        # if it's not in /usr/lib/, check manually. This isn't nice,
-        # and will probably break.
-        if test ! -r "$ac_cv_use_pcap_path" -o ! -r "$pcap_lib_file"; then
-                AC_MSG_NOTICE([Cannot find pcap library $pcap_lib_file.])
-                AC_MSG_ERROR([Exiting]);
-        fi  
-    fi
-    AC_DEFINE(HAVE_PCAP,1,[Conditional for building PCAP support])
-else
-    AC_DEFINE(HAVE_PCAP,0,[Conditional for building PCAP support])
-fi
+# The following is commented out because it seems you don't actually
+# need it. libpcap 'just works' with large files, even under woody,
+# although you probably need _FILE_OFFSET_BITS and LARGEFILE etc set 
+# properly - libtrace handles this however.
+## configure time options for selecting which libpcap and libz to use
+## this is provided to allow for systems whose default libraries don't support
+## large files - you can build your own and link using these options
+#AC_ARG_WITH([pcap],
+#    AC_HELP_STRING([--with-pcap],
+#                                  [name of pcap library (default is pcap)]),
+#       [ac_cv_use_pcap=$withval], 
+#    [ac_cv_use_pcap=pcap])
+#
+#
+#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])
+#
+#if test x"$ac_cv_use_pcap" != xno; then
+#    ADD_LIBS="$ADD_LIBS  -l$ac_cv_use_pcap"
+#    
+#    pcap_lib_file="${ac_cv_use_pcap_path}/lib${ac_cv_use_pcap}.so"
+#    
+#    # if the library is in /usr/lib, then just use 
+#    # AC_CHECK_LIB. 
+#    if test x"${ac_cv_use_pcap_path}" == x"/usr/lib"; then
+#           AC_CHECK_LIB(${ac_cv_use_pcap},pcap_open_live,
+#                        have_libpcap=yes,
+#                        have_libpcap=no)
+#
+#           if test x"${have_libpcap}" == xno; then
+#               AC_MSG_NOTICE([Cannot find pcap library $pcap_lib_file.])
+#               AC_MSG_ERROR([Exiting]);
+#           fi
+#    else
+#       ADD_LDFLAGS="$ADD_LDFLAGS -L$ac_cv_use_pcap_path"
+#       # if it's not in /usr/lib/, check manually. This isn't nice,
+#       # and will probably break.
+#       if test ! -r "$ac_cv_use_pcap_path" -o ! -r "$pcap_lib_file"; then
+#               AC_MSG_NOTICE([Cannot find pcap library $pcap_lib_file.])
+#               AC_MSG_ERROR([Exiting]);
+#       fi  
+#    fi
+#    AC_DEFINE(HAVE_PCAP,1,[Conditional for building PCAP support])
+#else
+#    AC_DEFINE(HAVE_PCAP,0,[Conditional for building PCAP support])
+#fi
 
 

libtrace.doxygen

@@ -903 +903 @@
 SEARCHENGINE           = NO
 
-# The CGI_NAME tag should be the name of the CGI script that 
-# starts the search engine (doxysearch) with the correct parameters. 
-# A script with this name will be generated by doxygen.
-
-CGI_NAME               = search.cgi
-
-# The CGI_URL tag should be the absolute URL to the directory where the 
-# cgi binaries are located. See the documentation of your http daemon for 
-# details.
-
-CGI_URL                = 
-
-# The DOC_URL tag should be the absolute URL to the directory where the 
-# documentation is located. If left blank the absolute path to the 
-# documentation, with file:// prepended to it, will be used.
-
-DOC_URL                = 
-
-# The DOC_ABSPATH tag should be the absolute path to the directory where the 
-# documentation is located. If left blank the directory on the local machine 
-# will be used.
-
-DOC_ABSPATH            = 
-
-# The BIN_ABSPATH tag must point to the directory where the doxysearch binary 
-# is installed.
-
-BIN_ABSPATH            = /usr/local/bin/
-
-# The EXT_DOC_PATHS tag can be used to specify one or more paths to 
-# documentation generated for other projects. This allows doxysearch to search 
-# the documentation for these projects as well.
-
-EXT_DOC_PATHS          =