Changeset 6a9feb2

Timestamp:

08/12/04 17:35:44 (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:

299e9a0

Parents:

f5899e4

Message:

fixes for FILE_OFFSET_BITS

Files:

• bootstrap-other.sh (moved) (moved from bootstrap.sh)
• configure (modified) (5 diffs)
• configure.in (modified) (1 diff)
• lib/Makefile.am (modified) (1 diff)
• lib/Makefile.in (modified) (6 diffs)

configure

@@ -1724 +1724 @@
 
 
-
-
                                                     ac_config_headers="$ac_config_headers config.h"
 
@@ -4176 +4174 @@
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 4178 "configure"' > conftest.$ac_ext
+  echo '#line 4176 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
@@ -4712 +4710 @@
 CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
 compiler_c_o=no
-if { (eval echo configure:4714: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
+if { (eval echo configure:4712: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
   # The compiler can only warn and ignore the option if not recognized
   # So say no if there are warnings
@@ -6510 +6508 @@
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 6512 "configure"
+#line 6510 "configure"
 #include "confdefs.h"
 
@@ -6608 +6606 @@
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 6610 "configure"
+#line 6608 "configure"
 #include "confdefs.h"
 

configure.in

@@ -3 +3 @@
 AC_CONFIG_SRCDIR(lib/trace.c)
 AM_INIT_AUTOMAKE(libtrace,2.0.2)
-
-AC_PREREQ(2.5)
 
 dnl GNU C library

lib/Makefile.am

@@ -4 +4 @@
 libtrace_la_LIBADD = @LIBPCAP@ @LIBZ@
 libtrace_la_LDFLAGS=-version-info 2:2:0 @LIBPCAP_PATH@ @LIBZ_PATH@
+libtrace_la_CFLAGS+=-D_FILE_OFFSET_BITS=64

lib/Makefile.in

@@ -88 +88 @@
 libtrace_la_LIBADD = @LIBPCAP@ @LIBZ@
 libtrace_la_LDFLAGS = -version-info 2:2:0 @LIBPCAP_PATH@ @LIBZ_PATH@
+libtrace_la_CFLAGS = -D_FILE_OFFSET_BITS=64
 subdir = lib
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -95 +96 @@
 
 libtrace_la_DEPENDENCIES =
-am_libtrace_la_OBJECTS = trace.lo fifo.lo
+am_libtrace_la_OBJECTS = libtrace_la-trace.lo libtrace_la-fifo.lo
 libtrace_la_OBJECTS = $(am_libtrace_la_OBJECTS)
 
@@ -104 +105 @@
 LIBS = @LIBS@
 depcomp = $(SHELL) $(top_srcdir)/depcomp
-@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/fifo.Plo $(DEPDIR)/trace.Plo
+@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/libtrace_la-fifo.Plo \
+@AMDEP_TRUE@    $(DEPDIR)/libtrace_la-trace.Plo
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
         $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -158 +160 @@
 clean-libLTLIBRARIES:
         -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+libtrace_la-trace.lo: trace.c
+libtrace_la-fifo.lo: fifo.c
 libtrace.la: $(libtrace_la_OBJECTS) $(libtrace_la_DEPENDENCIES) 
         $(LINK) -rpath $(libdir) $(libtrace_la_LDFLAGS) $(libtrace_la_OBJECTS) $(libtrace_la_LIBADD) $(LIBS)
@@ -167 +171 @@
         -rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/fifo.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/trace.Plo@am__quote@
+@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@
 
 distclean-depend:
@@ -190 +194 @@
 @AMDEP_TRUE@    $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
         $(LTCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$<
+
+libtrace_la-trace.o: trace.c
+@AMDEP_TRUE@    source='trace.c' object='libtrace_la-trace.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@    depfile='$(DEPDIR)/libtrace_la-trace.Po' tmpdepfile='$(DEPDIR)/libtrace_la-trace.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@    $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+        $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtrace_la_CFLAGS) $(CFLAGS) -c -o libtrace_la-trace.o `test -f trace.c || echo '$(srcdir)/'`trace.c
+
+libtrace_la-trace.obj: trace.c
+@AMDEP_TRUE@    source='trace.c' object='libtrace_la-trace.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@    depfile='$(DEPDIR)/libtrace_la-trace.Po' tmpdepfile='$(DEPDIR)/libtrace_la-trace.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@    $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+        $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtrace_la_CFLAGS) $(CFLAGS) -c -o libtrace_la-trace.obj `cygpath -w trace.c`
+
+libtrace_la-trace.lo: trace.c
+@AMDEP_TRUE@    source='trace.c' object='libtrace_la-trace.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@    depfile='$(DEPDIR)/libtrace_la-trace.Plo' tmpdepfile='$(DEPDIR)/libtrace_la-trace.TPlo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@    $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+        $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtrace_la_CFLAGS) $(CFLAGS) -c -o libtrace_la-trace.lo `test -f trace.c || echo '$(srcdir)/'`trace.c
+
+libtrace_la-fifo.o: fifo.c
+@AMDEP_TRUE@    source='fifo.c' object='libtrace_la-fifo.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@    depfile='$(DEPDIR)/libtrace_la-fifo.Po' tmpdepfile='$(DEPDIR)/libtrace_la-fifo.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@    $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+        $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtrace_la_CFLAGS) $(CFLAGS) -c -o libtrace_la-fifo.o `test -f fifo.c || echo '$(srcdir)/'`fifo.c
+
+libtrace_la-fifo.obj: fifo.c
+@AMDEP_TRUE@    source='fifo.c' object='libtrace_la-fifo.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@    depfile='$(DEPDIR)/libtrace_la-fifo.Po' tmpdepfile='$(DEPDIR)/libtrace_la-fifo.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@    $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+        $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtrace_la_CFLAGS) $(CFLAGS) -c -o libtrace_la-fifo.obj `cygpath -w fifo.c`
+
+libtrace_la-fifo.lo: fifo.c
+@AMDEP_TRUE@    source='fifo.c' object='libtrace_la-fifo.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@    depfile='$(DEPDIR)/libtrace_la-fifo.Plo' tmpdepfile='$(DEPDIR)/libtrace_la-fifo.TPlo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@    $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+        $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtrace_la_CFLAGS) $(CFLAGS) -c -o libtrace_la-fifo.lo `test -f fifo.c || echo '$(srcdir)/'`fifo.c
 CCDEPMODE = @CCDEPMODE@
 uninstall-info-am: