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 7e519ad0e7f9892ec5c5d210c83e5f25ba97a163..17e1d3db04f5e9858ac42d9bf8b3381c60086656 100644 (file)
--- 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 98612bb8361b26b98cac6b6e73d700e2da5f7769..02bee1739acaf08de0ada3ec6aeccf52d381b4d0 100644 (file)
--- 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 \