Changeset ad75d61

Timestamp:

11/30/04 13:44:34 (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:

5c27814

Parents:

47801f2

Message:

poink

Files:

• config.h (modified) (3 diffs)
• config.h.in (modified) (1 diff)
• configure (modified) (2 diffs)
• lib/Makefile.in (modified) (9 diffs)

config.h

@@ -15 +15 @@
 
 /* Define to 1 if you have the <libxml2/libxml/parser.h> header file. */
-/* #undef HAVE_LIBXML2_LIBXML_PARSER_H */
+#define HAVE_LIBXML2_LIBXML_PARSER_H 1
 
 /* Define to 1 if you have the <libxml/parser.h> header file. */
@@ -59 +59 @@
 #define HAVE_STRING_H 1
 
+/* Define to 1 if you have the `strndup' function. */
+#define HAVE_STRNDUP 1
+
 /* Define to 1 if you have the <sys/limits.h> header file. */
-#define HAVE_SYS_LIMITS_H 1
+/* #undef HAVE_SYS_LIMITS_H */
 
 /* Define to 1 if you have the <sys/stat.h> header file. */
@@ -106 +109 @@
 
 /* Number of bits in a file offset, on hosts where this is settable. */
-/* #undef _FILE_OFFSET_BITS */
+#define _FILE_OFFSET_BITS 64
 
 /* Define for large files, on AIX-style hosts. */

config.h.in

@@ -57 +57 @@
 /* Define to 1 if you have the <string.h> header file. */
 #undef HAVE_STRING_H
+
+/* Define to 1 if you have the `strndup' function. */
+#undef HAVE_STRNDUP
 
 /* Define to 1 if you have the <sys/limits.h> header file. */

configure

@@ -7924 +7924 @@
 
 
+for ac_func in strndup
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func (); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char $ac_func ();
+char (*f) ();
+
+#ifdef F77_DUMMY_MAIN
+#  ifdef __cplusplus
+     extern "C"
+#  endif
+   int F77_DUMMY_MAIN() { return 1; }
+#endif
+int
+main ()
+{
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+f = $ac_func;
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+eval "$as_ac_var=no"
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+else
+  LIBOBJS="$LIBOBJS $ac_func.$ac_objext"
+fi
+done
+
+
+
 echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
 echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
@@ -9727 +9806 @@
 s,@CPP@,$CPP,;t t
 s,@LIBTOOL@,$LIBTOOL,;t t
+s,@LIBOBJS@,$LIBOBJS,;t t
 s,@DAG_TOOLS_DIR@,$DAG_TOOLS_DIR,;t t
 s,@HAVE_DAG_TRUE@,$HAVE_DAG_TRUE,;t t

lib/Makefile.in

@@ -87 +87 @@
 INCLUDES = -I$(top_builddir) -I$(top_srcdir)
 
-
-#noinst_LIBRARIES = libreplace.a
-#libreplace_a_SOURCES = 
-#libreplace_a_LIBADD = @LIBOBJS@
+noinst_LIBRARIES = libreplace.a
+libreplace_a_SOURCES = 
+libreplace_a_LIBADD = @LIBOBJS@
+
 lib_LTLIBRARIES = libtrace.la
 include_HEADERS = libtrace.h dagformat.h wag.h
@@ -102 +102 @@
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+LIBRARIES = $(noinst_LIBRARIES)
+
+libreplace_a_AR = $(AR) cru
+libreplace_a_DEPENDENCIES = @LIBOBJS@
+am_libreplace_a_OBJECTS =
+libreplace_a_OBJECTS = $(am_libreplace_a_OBJECTS)
 LTLIBRARIES = $(lib_LTLIBRARIES)
 
@@ -121 +127 @@
 @AMDEP_TRUE@    $(DEPDIR)/libtrace_la-dagopts.Plo \
 @AMDEP_TRUE@    $(DEPDIR)/libtrace_la-fifo.Plo \
-@AMDEP_TRUE@    $(DEPDIR)/libtrace_la-trace.Plo
+@AMDEP_TRUE@    $(DEPDIR)/libtrace_la-trace.Plo \
+@AMDEP_TRUE@    $(DEPDIR)/strndup.Po
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
         $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -130 +137 @@
         $(AM_LDFLAGS) $(LDFLAGS) -o $@
 CFLAGS = @CFLAGS@
-DIST_SOURCES = $(libtrace_la_SOURCES)
+DIST_SOURCES = $(libreplace_a_SOURCES) $(libtrace_la_SOURCES)
 HEADERS = $(include_HEADERS)
 
-DIST_COMMON = $(include_HEADERS) Makefile.am Makefile.in
-SOURCES = $(libtrace_la_SOURCES)
+DIST_COMMON = $(include_HEADERS) Makefile.am Makefile.in strndup.c
+SOURCES = $(libreplace_a_SOURCES) $(libtrace_la_SOURCES)
 
 all: all-am
@@ -156 +163 @@
           CONFIG_HEADERS= CONFIG_LINKS= \
           CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
+
+AR = ar
+
+clean-noinstLIBRARIES:
+        -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
+libreplace.a: $(libreplace_a_OBJECTS) $(libreplace_a_DEPENDENCIES) 
+        -rm -f libreplace.a
+        $(libreplace_a_AR) libreplace.a $(libreplace_a_OBJECTS) $(libreplace_a_LIBADD)
+        $(RANLIB) libreplace.a
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
         @$(NORMAL_INSTALL)
@@ -192 +208 @@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/libtrace_la-fifo.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/libtrace_la-trace.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strndup.Po@am__quote@
 
 distclean-depend:
@@ -360 +377 @@
 check-am: all-am
 check: check-am
-all-am: Makefile $(LTLIBRARIES) $(HEADERS)
+all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(HEADERS)
 
 installdirs:
@@ -391 +408 @@
 
 clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
-        mostlyclean-am
+        clean-noinstLIBRARIES mostlyclean-am
 
 distclean: distclean-am
@@ -429 +446 @@
 
 .PHONY: GTAGS all all-am check check-am clean clean-generic \
-        clean-libLTLIBRARIES clean-libtool distclean distclean-compile \
-        distclean-depend distclean-generic distclean-libtool \
-        distclean-tags distdir dvi dvi-am info info-am install \
-        install-am install-data install-data-am install-exec \
-        install-exec-am install-includeHEADERS install-info \
-        install-info-am install-libLTLIBRARIES install-man \
+        clean-libLTLIBRARIES clean-libtool clean-noinstLIBRARIES \
+        distclean distclean-compile distclean-depend distclean-generic \
+        distclean-libtool distclean-tags distdir dvi dvi-am info \
+        info-am install install-am install-data install-data-am \
+        install-exec install-exec-am install-includeHEADERS \
+        install-info install-info-am install-libLTLIBRARIES install-man \
         install-strip installcheck installcheck-am installdirs \
         maintainer-clean maintainer-clean-generic mostlyclean \