From: Automatic source maintenance Date: Thu, 25 Jun 2009 02:02:34 +0000 (-0600) Subject: Bootstrapped X-Git-Tag: SQUID_3_0_STABLE17~21 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=55a81480976104e6906e6fefd137e3a21380ea15;p=thirdparty%2Fsquid.git Bootstrapped --- diff --git a/configure b/configure index a74147a9e5..7d476e0971 100755 --- a/configure +++ b/configure @@ -1011,10 +1011,6 @@ USE_KQUEUE_TRUE USE_KQUEUE_FALSE USE_DEVPOLL_TRUE USE_DEVPOLL_FALSE -NEED_OWN_STRSEP_TRUE -NEED_OWN_STRSEP_FALSE -NEED_OWN_STRTOLL_TRUE -NEED_OWN_STRTOLL_FALSE REGEXLIB LIBREGEX XTRA_OBJS @@ -5543,7 +5539,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 5546 "configure"' > conftest.$ac_ext + echo '#line 5542 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -8166,11 +8162,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8169: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8165: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8173: \$? = $ac_status" >&5 + echo "$as_me:8169: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -8456,11 +8452,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8459: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8455: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8463: \$? = $ac_status" >&5 + echo "$as_me:8459: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -8560,11 +8556,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8563: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8559: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8567: \$? = $ac_status" >&5 + echo "$as_me:8563: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -10960,7 +10956,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:13468: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13476: \$? = $ac_status" >&5 + echo "$as_me:13472: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -13573,11 +13569,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13576: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13572: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13580: \$? = $ac_status" >&5 + echo "$as_me:13576: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -15156,11 +15152,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15159: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15155: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15163: \$? = $ac_status" >&5 + echo "$as_me:15159: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -15260,11 +15256,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15263: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15259: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:15267: \$? = $ac_status" >&5 + echo "$as_me:15263: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -17475,11 +17471,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17478: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17474: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:17482: \$? = $ac_status" >&5 + echo "$as_me:17478: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -17765,11 +17761,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17768: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17764: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:17772: \$? = $ac_status" >&5 + echo "$as_me:17768: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -17869,11 +17865,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17872: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17868: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:17876: \$? = $ac_status" >&5 + echo "$as_me:17872: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -45003,8 +44999,6 @@ esac - - @@ -45064,8 +45058,6 @@ for ac_func in \ srand48 \ srandom \ statfs \ - strsep \ - strtoll \ sysconf \ syslog \ timegm \ @@ -45173,10 +45165,14 @@ done + + for ac_func in \ drand48 \ initgroups \ strerror \ + strsep \ + strtoll \ tempnam \ do @@ -45935,45 +45931,6 @@ cat >>confdefs.h <<\_ACEOF #define HAVE_STRNSTR 0 _ACEOF -fi - - - if false; then - NEED_OWN_STRSEP_TRUE= - NEED_OWN_STRSEP_FALSE='#' -else - NEED_OWN_STRSEP_TRUE='#' - NEED_OWN_STRSEP_FALSE= -fi - -if test "$ac_cv_func_strsep" = "no" ; then - if true; then - NEED_OWN_STRSEP_TRUE= - NEED_OWN_STRSEP_FALSE='#' -else - NEED_OWN_STRSEP_TRUE='#' - NEED_OWN_STRSEP_FALSE= -fi - -fi - - if false; then - NEED_OWN_STRTOLL_TRUE= - NEED_OWN_STRTOLL_FALSE='#' -else - NEED_OWN_STRTOLL_TRUE='#' - NEED_OWN_STRTOLL_FALSE= -fi - -if test "$ac_cv_func_strtoll" = "no" ; then - if true; then - NEED_OWN_STRTOLL_TRUE= - NEED_OWN_STRTOLL_FALSE='#' -else - NEED_OWN_STRTOLL_TRUE='#' - NEED_OWN_STRTOLL_FALSE= -fi - fi { $as_echo "$as_me:$LINENO: checking if va_copy is implemented" >&5 @@ -47803,34 +47760,6 @@ $as_echo "$as_me: error: conditional \"USE_DEVPOLL\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi -if test -z "${NEED_OWN_STRSEP_TRUE}" && test -z "${NEED_OWN_STRSEP_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"NEED_OWN_STRSEP\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"NEED_OWN_STRSEP\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi -if test -z "${NEED_OWN_STRSEP_TRUE}" && test -z "${NEED_OWN_STRSEP_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"NEED_OWN_STRSEP\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"NEED_OWN_STRSEP\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi -if test -z "${NEED_OWN_STRTOLL_TRUE}" && test -z "${NEED_OWN_STRTOLL_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"NEED_OWN_STRTOLL\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"NEED_OWN_STRTOLL\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi -if test -z "${NEED_OWN_STRTOLL_TRUE}" && test -z "${NEED_OWN_STRTOLL_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"NEED_OWN_STRTOLL\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"NEED_OWN_STRTOLL\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi : ${CONFIG_STATUS=./config.status} ac_write_fail=0 diff --git a/lib/Makefile.in b/lib/Makefile.in index c6a442feec..34321573d0 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -39,7 +39,8 @@ host_triplet = @host@ check_PROGRAMS = tests/testAll$(EXEEXT) subdir = lib DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in drand48.c \ - inet_ntoa.c initgroups.c strerror.c tempnam.c + inet_ntoa.c initgroups.c strerror.c strsep.c strtoll.c \ + tempnam.c ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ $(top_srcdir)/configure.in @@ -56,21 +57,18 @@ libmiscutil_a_DEPENDENCIES = libTrie/src/Trie.o libTrie/src/TrieNode.o \ am__libmiscutil_a_SOURCES_DIST = MemPool.cc base64.c getfullhostname.c \ hash.c heap.c html_quote.c iso3307.c md5.c radix.c rfc1035.c \ rfc1123.c rfc1738.c rfc2617.c safe_inet_addr.c Splay.cc \ - strnstr.cc strsep.c strtoll.c stub_memaccount.c util.c \ - uudecode.c assert.c xusleep.c Profiler.c win32lib.c -@NEED_OWN_STRSEP_TRUE@am__objects_1 = strsep.$(OBJEXT) -@NEED_OWN_STRTOLL_TRUE@am__objects_2 = strtoll.$(OBJEXT) -@ENABLE_XPROF_STATS_TRUE@am__objects_3 = Profiler.$(OBJEXT) -@ENABLE_WIN32SPECIFIC_TRUE@am__objects_4 = win32lib.$(OBJEXT) + strnstr.cc stub_memaccount.c util.c uudecode.c assert.c \ + xusleep.c Profiler.c win32lib.c +@ENABLE_XPROF_STATS_TRUE@am__objects_1 = Profiler.$(OBJEXT) +@ENABLE_WIN32SPECIFIC_TRUE@am__objects_2 = win32lib.$(OBJEXT) am_libmiscutil_a_OBJECTS = MemPool.$(OBJEXT) base64.$(OBJEXT) \ getfullhostname.$(OBJEXT) hash.$(OBJEXT) heap.$(OBJEXT) \ html_quote.$(OBJEXT) iso3307.$(OBJEXT) md5.$(OBJEXT) \ radix.$(OBJEXT) rfc1035.$(OBJEXT) rfc1123.$(OBJEXT) \ rfc1738.$(OBJEXT) rfc2617.$(OBJEXT) safe_inet_addr.$(OBJEXT) \ - Splay.$(OBJEXT) strnstr.$(OBJEXT) $(am__objects_1) \ - $(am__objects_2) stub_memaccount.$(OBJEXT) util.$(OBJEXT) \ - uudecode.$(OBJEXT) assert.$(OBJEXT) xusleep.$(OBJEXT) \ - $(am__objects_3) $(am__objects_4) + Splay.$(OBJEXT) strnstr.$(OBJEXT) stub_memaccount.$(OBJEXT) \ + util.$(OBJEXT) uudecode.$(OBJEXT) assert.$(OBJEXT) \ + xusleep.$(OBJEXT) $(am__objects_1) $(am__objects_2) libmiscutil_a_OBJECTS = $(am_libmiscutil_a_OBJECTS) libntlmauth_a_AR = $(AR) $(ARFLAGS) libntlmauth_a_DEPENDENCIES = @LIBOBJS@ @@ -87,7 +85,7 @@ libsspwin32_a_OBJECTS = $(am_libsspwin32_a_OBJECTS) am__tests_testAll_SOURCES_DIST = tests/testArray.cc tests/testMain.cc \ tests/testArray.h Profiler.c win32lib.c util.c assert.c am_tests_testAll_OBJECTS = testArray.$(OBJEXT) testMain.$(OBJEXT) \ - $(am__objects_3) $(am__objects_4) util.$(OBJEXT) \ + $(am__objects_1) $(am__objects_2) util.$(OBJEXT) \ assert.$(OBJEXT) tests_testAll_OBJECTS = $(am_tests_testAll_OBJECTS) tests_testAll_DEPENDENCIES = @@ -314,10 +312,6 @@ AM_CFLAGS = @SQUID_CFLAGS@ AM_CXXFLAGS = @SQUID_CXXFLAGS@ @ENABLE_XPROF_STATS_FALSE@XPROF_STATS_SOURCE = @ENABLE_XPROF_STATS_TRUE@XPROF_STATS_SOURCE = Profiler.c -@NEED_OWN_STRSEP_FALSE@STRSEPSOURCE = -@NEED_OWN_STRSEP_TRUE@STRSEPSOURCE = strsep.c -@NEED_OWN_STRTOLL_FALSE@STRTOLLSOURCE = -@NEED_OWN_STRTOLL_TRUE@STRTOLLSOURCE = strtoll.c @ENABLE_WIN32SPECIFIC_FALSE@LIBSSPWIN32 = @ENABLE_WIN32SPECIFIC_TRUE@LIBSSPWIN32 = libsspwin32.a @ENABLE_WIN32SPECIFIC_FALSE@WIN32SRC = @@ -341,8 +335,6 @@ EXTRA_libmiscutil_a_SOURCES = \ getopt.c \ md5.c \ Profiler.c \ - strsep.c \ - strtoll.c \ win32lib.c libmiscutil_a_SOURCES = \ @@ -363,8 +355,6 @@ libmiscutil_a_SOURCES = \ $(SNPRINTFSOURCE) \ Splay.cc \ strnstr.cc \ - $(STRSEPSOURCE) \ - $(STRTOLLSOURCE) \ stub_memaccount.c \ util.c \ uudecode.c \ @@ -476,6 +466,8 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/inet_ntoa.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/initgroups.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strerror.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strsep.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strtoll.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/tempnam.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GNUregex.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MemPool.Po@am__quote@ @@ -501,8 +493,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/safe_inet_addr.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sspwin32.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strnstr.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strsep.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strtoll.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stub_memaccount.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testArray.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testMain.Po@am__quote@