Some major readjustment of configure.in. Use LIBS instead of XTRA_LIBS

so that we link with the libs we found when looking for functions
later on...

diff --git a/ChangeLog b/ChangeLog
index 3d4120907ee3919fdaf57fc9bec50344f55ed287..3363b399c594be8553971deba044b84b67c5c921 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,3 +6,7 @@
        - Changed #includes and such.
        - the -d (debug) option is now gone.  Use new "debug" in the
          config file instead.  Debugging is section,level.
+       - Added pid_filename to cached.conf
+       - Changed default behaviour to unbuffered, use -b to make buffered.
+       - fix byte order conversion bug on echo port
+       - Removed all code and references to binary port

diff --git a/configure b/configure
index 7a95aaac8ecbbb5e443ac2a6ab61df51e5642e33..b8d45c758f729c6249c07d3f052564ff3eab7096 100755 (executable)
--- a/configure
+++ b/configure
@@ -517,7 +517,7 @@ fi
 
 
 
-# From configure.in Revision: 1.11 
+# From configure.in Revision: 1.12 
 ac_aux_dir=
 for ac_dir in aux $srcdir/aux; do
   if test -f $ac_dir/install-sh; then
@@ -579,11 +579,8 @@ INSTALL_MANDIR="$myprefix/man";
 
 THIS_HOST="`hostname`"
 XTRA_CFLAGS=''
-XTRA_LIBS=''
 CRYPT_LIB=''
 
-SOCKET_PH_TYPE='default'
-
 
 
 
@@ -697,7 +694,7 @@ else
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 701 "configure"
+#line 698 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
@@ -711,7 +708,7 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 715 "configure"
+#line 712 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
@@ -1011,7 +1008,7 @@ if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1015 "configure"
+#line 1012 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
@@ -1051,7 +1048,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ldir  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1055 "configure"
+#line 1052 "configure"
 #include "confdefs.h"
 
 int main() { return 0; }
@@ -1086,7 +1083,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lx  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1090 "configure"
+#line 1087 "configure"
 #include "confdefs.h"
 
 int main() { return 0; }
@@ -1123,7 +1120,7 @@ else
   ac_cv_c_cross=yes
 else
 cat > conftest.$ac_ext <<EOF
-#line 1127 "configure"
+#line 1124 "configure"
 #include "confdefs.h"
 main(){return(0);}
 EOF
@@ -1145,7 +1142,7 @@ if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1149 "configure"
+#line 1146 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -1167,7 +1164,7 @@ rm -f conftest*
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 1171 "configure"
+#line 1168 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -1185,7 +1182,7 @@ fi
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 1189 "configure"
+#line 1186 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -1206,7 +1203,7 @@ if test "$cross_compiling" = yes; then
   :
 else
 cat > conftest.$ac_ext <<EOF
-#line 1210 "configure"
+#line 1207 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -1264,7 +1261,7 @@ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1268 "configure"
+#line 1265 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
@@ -1294,7 +1291,7 @@ done
 
 
 cat > conftest.$ac_ext <<EOF
-#line 1298 "configure"
+#line 1295 "configure"
 #include "confdefs.h"
 #include <malloc.h>
 EOF
@@ -1317,7 +1314,7 @@ else
     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
 else
 cat > conftest.$ac_ext <<EOF
-#line 1321 "configure"
+#line 1318 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -1351,7 +1348,7 @@ else
     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
 else
 cat > conftest.$ac_ext <<EOF
-#line 1355 "configure"
+#line 1352 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -1385,7 +1382,7 @@ if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1389 "configure"
+#line 1386 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int main() { return 0; }
@@ -1417,7 +1414,7 @@ if eval "test \"`echo '$''{'ac_cv_func_alloca'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1421 "configure"
+#line 1418 "configure"
 #include "confdefs.h"
 
 #ifdef __GNUC__
@@ -1476,7 +1473,7 @@ if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1480 "configure"
+#line 1477 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -1505,7 +1502,7 @@ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1509 "configure"
+#line 1506 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -1559,7 +1556,7 @@ else
   ac_cv_c_stack_direction=0
 else
 cat > conftest.$ac_ext <<EOF
-#line 1563 "configure"
+#line 1560 "configure"
 #include "confdefs.h"
 find_stack_direction ()
 {
@@ -1596,69 +1593,6 @@ EOF
 fi
 
 
-for ac_func in \
-       getdtablesize \
-       regcomp \
-       regexec \
-       regfree \
-       setrlimit \
-       strdup \
-       strerror \
-       sysconf \
-       syslog \
-       timegm\
-
-do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 1618 "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.  */
-char $ac_func();
-
-int main() { return 0; }
-int t() {
-
-/* 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
-$ac_func();
-#endif
-
-; return 0; }
-EOF
-if eval $ac_link; then
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
-else
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=no"
-fi
-rm -f conftest*
-
-fi
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
-
-
 echo $ac_n "checking for -lsocket""... $ac_c" 1>&6
 ac_lib_var=`echo socket | tr '.-/+' '___p'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -1667,7 +1601,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1671 "configure"
+#line 1605 "configure"
 #include "confdefs.h"
 
 int main() { return 0; }
@@ -1688,7 +1622,13 @@ LIBS="$ac_save_LIBS"
 fi
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-  XTRA_LIBS="$XTRA_LIBS -lsocket"
+    ac_tr_lib=HAVE_LIB`echo socket | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_lib 1
+EOF
+
+  LIBS="-lsocket $LIBS"
+
 else
   echo "$ac_t""no" 1>&6
 fi
@@ -1701,7 +1641,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lmalloc  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1705 "configure"
+#line 1645 "configure"
 #include "confdefs.h"
 
 int main() { return 0; }
@@ -1722,7 +1662,7 @@ LIBS="$ac_save_LIBS"
 fi
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-  XTRA_LIBS="$XTRA_LIBS -lmalloc"; HAVE_LIBMALLOC="yes"
+  HAVE_LIBMALLOC="yes"; LIBS="$LIBS -lmalloc"
 else
   echo "$ac_t""no" 1>&6
 fi
@@ -1735,7 +1675,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1739 "configure"
+#line 1679 "configure"
 #include "confdefs.h"
 
 int main() { return 0; }
@@ -1756,7 +1696,13 @@ LIBS="$ac_save_LIBS"
 fi
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-  XTRA_LIBS="$XTRA_LIBS -lnsl"
+    ac_tr_lib=HAVE_LIB`echo nsl | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_lib 1
+EOF
+
+  LIBS="-lnsl $LIBS"
+
 else
   echo "$ac_t""no" 1>&6
 fi
@@ -1769,7 +1715,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lresolv  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1773 "configure"
+#line 1719 "configure"
 #include "confdefs.h"
 
 int main() { return 0; }
@@ -1790,7 +1736,13 @@ LIBS="$ac_save_LIBS"
 fi
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-  XTRA_LIBS="$XTRA_LIBS -lresolv"
+    ac_tr_lib=HAVE_LIB`echo resolv | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_lib 1
+EOF
+
+  LIBS="-lresolv $LIBS"
+
 else
   echo "$ac_t""no" 1>&6
 fi
@@ -1803,7 +1755,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lbsd  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1807 "configure"
+#line 1759 "configure"
 #include "confdefs.h"
 
 int main() { return 0; }
@@ -1824,7 +1776,13 @@ LIBS="$ac_save_LIBS"
 fi
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-  XTRA_LIBS="$XTRA_LIBS -lbsd"
+    ac_tr_lib=HAVE_LIB`echo bsd | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_lib 1
+EOF
+
+  LIBS="-lbsd $LIBS"
+
 else
   echo "$ac_t""no" 1>&6
 fi
@@ -1838,7 +1796,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-l44bsd  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1842 "configure"
+#line 1800 "configure"
 #include "confdefs.h"
 
 int main() { return 0; }
@@ -1872,7 +1830,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lresolv  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1876 "configure"
+#line 1834 "configure"
 #include "confdefs.h"
 
 int main() { return 0; }
@@ -1893,7 +1851,7 @@ LIBS="$ac_save_LIBS"
 fi
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-  if test "$HAVE_LIB44BSD" = "yes"; then XTRA_LIBS="$XTRA_LIBS -l44bsd"; fi
+  if test "$HAVE_LIB44BSD" = "yes"; then LIBS="$LIBS -l44bsd"; fi
 else
   echo "$ac_t""no" 1>&6
 fi
@@ -1907,7 +1865,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lcrypt  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1911 "configure"
+#line 1869 "configure"
 #include "confdefs.h"
 
 int main() { return 0; }
@@ -1938,17 +1896,82 @@ fi
 case "$host" in
        *-sun-solaris*)
                echo "Removing -lmalloc for Solaris..."
-               XTRA_LIBS=`echo $XTRA_LIBS | sed -e s/-lmalloc//`
+               LIBS=`echo $LIBS | sed -e s/-lmalloc//`
                HAVE_LIBMALLOC="no"
                ;;
        *-sgi-irix*)
                echo "Removing -lsocket for IRIX..."
-               XTRA_LIBS=`echo $XTRA_LIBS | sed -e s/-lsocket//`
+               LIBS=`echo $LIBS | sed -e s/-lsocket//`
                echo "Removing -lnsl for IRIX..."
-               XTRA_LIBS=`echo $XTRA_LIBS | sed -e s/-lnsl//`
+               LIBS=`echo $LIBS | sed -e s/-lnsl//`
                ;;
 esac
 
+for ac_func in \
+       getdtablesize \
+       mallinfo \
+       mallopt \
+       regcomp \
+       regexec \
+       regfree \
+       setrlimit \
+       strdup \
+       strerror \
+       sysconf \
+       syslog \
+       timegm\
+
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 1931 "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.  */
+char $ac_func();
+
+int main() { return 0; }
+int t() {
+
+/* 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
+$ac_func();
+#endif
+
+; return 0; }
+EOF
+if eval $ac_link; then
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=yes"
+else
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=no"
+fi
+rm -f conftest*
+
+fi
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+ 
+else
+  echo "$ac_t""no" 1>&6
+fi
+done
+
+
 XTRA_OBJS=''
 if test "$HAVE_LIBMALLOC" = "yes" ; then
        if test -r /usr/lib/debug/malloc.o ; then
@@ -1960,10 +1983,8 @@ if test "$HAVE_LIBMALLOC" = "yes" ; then
 fi
 
 
-
-if test -n "$XTRA_LIBS_OVERRIDE"; then
-  XTRA_LIBS="$XTRA_LIBS_OVERRIDE";
-fi
+XTRA_LIBS="$LIBS"
+LIBS=''
 
 
 if test -z "$STD_CFLAGS"; then

diff --git a/configure.in b/configure.in
index d39dbc777036d01edf6b71738678533154509e23..37737f14846fb164017d025eb9a377c41313c6e1 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -3,13 +3,13 @@ dnl  Configuration input file for Squid
 dnl
 dnl  Duane Wessels, wessels@nlanr.net, February 1996 (autoconf v2.7)
 dnl
-dnl  $Id: configure.in,v 1.12 1996/03/27 18:17:14 wessels Exp $
+dnl  $Id: configure.in,v 1.13 1996/03/28 02:32:49 wessels Exp $
 dnl
 dnl
 dnl
 AC_INIT(include/config.h)
 AC_CONFIG_HEADER(include/autoconf.h)
-AC_REVISION($Revision: 1.12 $)dnl
+AC_REVISION($Revision: 1.13 $)dnl
 AC_PREFIX_DEFAULT(/usr/local/squid)
 AC_CONFIG_AUX_DIR(aux)
 
@@ -30,11 +30,8 @@ INSTALL_MANDIR="$myprefix/man";
 
 THIS_HOST="`hostname`"
 XTRA_CFLAGS=''
-XTRA_LIBS=''
 CRYPT_LIB=''
 
-SOCKET_PH_TYPE='default'
-
 dnl Subsitutions
 AC_SUBST(INSTALL_TOPDIR)
 AC_SUBST(INSTALL_LIBDIR)
@@ -111,32 +108,18 @@ AC_CHECK_SIZEOF(long)
 dnl Check for special functions
 AC_FUNC_ALLOCA
 
-dnl Check for library functions
-AC_CHECK_FUNCS(\
-       getdtablesize \
-       regcomp \
-       regexec \
-       regfree \
-       setrlimit \
-       strdup \
-       strerror \
-       sysconf \
-       syslog \
-       timegm\
-)
-
 dnl Check for needed libraries
-AC_CHECK_LIB(socket, main, [XTRA_LIBS="$XTRA_LIBS -lsocket"])
-AC_CHECK_LIB(malloc, main, [XTRA_LIBS="$XTRA_LIBS -lmalloc"; HAVE_LIBMALLOC="yes"])
-AC_CHECK_LIB(nsl, main, [XTRA_LIBS="$XTRA_LIBS -lnsl"])
-AC_CHECK_LIB(resolv, main, [XTRA_LIBS="$XTRA_LIBS -lresolv"])
-AC_CHECK_LIB(bsd, main, [XTRA_LIBS="$XTRA_LIBS -lbsd"])
+AC_CHECK_LIB(socket, main)
+AC_CHECK_LIB(malloc, main, [HAVE_LIBMALLOC="yes"; LIBS="$LIBS -lmalloc"])
+AC_CHECK_LIB(nsl, main)
+AC_CHECK_LIB(resolv, main)
+AC_CHECK_LIB(bsd, main)
 
 dnl We found a version of libresolv on SunOS 4.x which requires -l44bsd
 dnl We have to first check to see if -l44bsd is present and has the
 dnl function inet_aton 
 AC_CHECK_LIB(44bsd, inet_aton, [HAVE_LIB44BSD="yes"])
-AC_CHECK_LIB(resolv, inet_aton, [if test "$HAVE_LIB44BSD" = "yes"; then XTRA_LIBS="$XTRA_LIBS -l44bsd"; fi])
+AC_CHECK_LIB(resolv, inet_aton, [if test "$HAVE_LIB44BSD" = "yes"; then LIBS="$LIBS -l44bsd"; fi])
 
 dnl Check for libcrypt
 dnl cached uses crypt(3) which may be in libc, or in libcrypt (eg FreeBSD)
@@ -148,17 +131,33 @@ dnl
 case "$host" in
        *-sun-solaris*)
                echo "Removing -lmalloc for Solaris..."
-               XTRA_LIBS=`echo $XTRA_LIBS | sed -e s/-lmalloc//`
+               LIBS=`echo $LIBS | sed -e s/-lmalloc//`
                HAVE_LIBMALLOC="no"
                ;;
        *-sgi-irix*)
                echo "Removing -lsocket for IRIX..."
-               XTRA_LIBS=`echo $XTRA_LIBS | sed -e s/-lsocket//`
+               LIBS=`echo $LIBS | sed -e s/-lsocket//`
                echo "Removing -lnsl for IRIX..."
-               XTRA_LIBS=`echo $XTRA_LIBS | sed -e s/-lnsl//`
+               LIBS=`echo $LIBS | sed -e s/-lnsl//`
                ;;
 esac
 
+dnl Check for library functions
+AC_CHECK_FUNCS(\
+       getdtablesize \
+       mallinfo \
+       mallopt \
+       regcomp \
+       regexec \
+       regfree \
+       setrlimit \
+       strdup \
+       strerror \
+       sysconf \
+       syslog \
+       timegm\
+)
+
 dnl Need the debugging version of malloc if available
 XTRA_OBJS=''
 if test "$HAVE_LIBMALLOC" = "yes" ; then
@@ -171,11 +170,8 @@ if test "$HAVE_LIBMALLOC" = "yes" ; then
 fi
 AC_SUBST(XTRA_OBJS)
 
-
-dnl Override XTRA_LIBS
-if test -n "$XTRA_LIBS_OVERRIDE"; then
-  XTRA_LIBS="$XTRA_LIBS_OVERRIDE";
-fi
+XTRA_LIBS="$LIBS"
+LIBS=''
 AC_SUBST(XTRA_LIBS)
 
 dnl Set STD_CFLAGS