From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sun, 14 Jun 2009 10:44:38 +0000 (+1200)
Subject: Bug 2679: strsep and strtoll should be bundled
X-Git-Tag: SQUID_3_2_0_1~946
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=585cdddaf15b1df75c1668f9621d2a332acc6bb0;p=thirdparty%2Fsquid.git

Bug 2679: strsep and strtoll should be bundled

Incorrect autoconf macro to test for these was leading to a large hack.
Using the right macro fixes this issue and links as needed.
---

diff --git a/configure.in b/configure.in
index 7e519ad0e7..17e1d3db04 100644
--- a/configure.in
+++ b/configure.in
@@ -2973,8 +2973,6 @@ AC_CHECK_FUNCS(\
 	srand48 \
 	srandom \
 	statfs \
-	strsep \
-	strtoll \
 	sysconf \
 	syslog \
 	timegm \
@@ -2989,6 +2987,8 @@ AC_REPLACE_FUNCS(\
 	getaddrinfo \
 	getnameinfo \
 	strerror \
+	strsep \
+	strtoll \
 	tempnam \
 )
 
@@ -3105,17 +3105,6 @@ else
   AC_DEFINE(HAVE_STRNSTR,0,[Yay! A MacOS X brokenness. Its not good enough to know that strnstr() exists, because MacOSX 10.4 and earlier may have a buffer overrun.])
 fi
 
-
-AM_CONDITIONAL(NEED_OWN_STRSEP, false)
-if test "$ac_cv_func_strsep" = "no" ; then
-  AM_CONDITIONAL(NEED_OWN_STRSEP, true)
-fi
-
-AM_CONDITIONAL(NEED_OWN_STRTOLL, false)
-if test "$ac_cv_func_strtoll" = "no" ; then
-  AM_CONDITIONAL(NEED_OWN_STRTOLL, true)
-fi
-
 dnl
 dnl Test for va_copy
 dnl
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 98612bb836..02bee1739a 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -26,17 +26,6 @@ else
 XPROF_STATS_SOURCE = 
 endif
 
-if NEED_OWN_STRSEP
-STRSEPSOURCE=strsep.c
-else
-STRSEPSOURCE=
-endif
-if NEED_OWN_STRTOLL
-STRTOLLSOURCE=strtoll.c
-else
-STRTOLLSOURCE=
-endif
-
 if ENABLE_WIN32SPECIFIC
 LIBSSPWIN32=libsspwin32.a
 WIN32SRC = win32lib.c
@@ -61,8 +50,6 @@ EXTRA_libmiscutil_a_SOURCES = \
 	getopt.c \
 	md5.c \
 	Profiler.c \
-	strsep.c \
-	strtoll.c \
 	win32lib.c
 libmiscutil_a_SOURCES = \
 	MemPool.cc \
@@ -83,8 +70,6 @@ libmiscutil_a_SOURCES = \
 	$(SNPRINTFSOURCE) \
 	Splay.cc \
 	strnstr.cc \
-	$(STRSEPSOURCE) \
-	$(STRTOLLSOURCE) \
 	stub_memaccount.c \
 	util.c \
 	uudecode.c \