allow overriding XTRA_LIBS

diff --git a/configure b/configure
index 9a5e1edeaa570fb3138a7c1090e4aecfb4e033d4..335d9f89468d096a7024718629a97409bcb506db 100755 (executable)
--- a/configure
+++ b/configure
@@ -517,7 +517,7 @@ fi
 
 
 
-# From configure.in Revision: 1.44 
+# From configure.in Revision: 1.45 
 ac_aux_dir=
 for ac_dir in aux $srcdir/aux; do
   if test -f $ac_dir/install-sh; then
@@ -592,7 +592,7 @@ if test -z "$LDFLAGS"; then
        LDFLAGS="-g"
 fi
 
-PREST_CFLAGS="$CFLAGS"
+PRESET_CFLAGS="$CFLAGS"
 
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
@@ -2785,9 +2785,10 @@ if test "$HAVE_LIBMALLOC" = "yes" ; then
 fi
 
 
-XTRA_LIBS="$LIBS"
-LIBS=''
-
+if test -z "$XTRA_LIBS"; then
+       XTRA_LIBS="$LIBS"
+       LIBS=''
+fi
 
 
 rm -f core 

diff --git a/configure.in b/configure.in
index ad5fe8af74a46d027a3856be24898f5ebe4fbe7e..caa6ccb14759243f18de1f9de4add31891900844 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.9)
 dnl
-dnl  $Id: configure.in,v 1.45 1996/11/11 22:32:05 wessels Exp $
+dnl  $Id: configure.in,v 1.46 1996/11/13 18:11:25 wessels Exp $
 dnl
 dnl
 dnl
 AC_INIT(src/main.c)
 AC_CONFIG_HEADER(include/autoconf.h)
-AC_REVISION($Revision: 1.45 $)dnl
+AC_REVISION($Revision: 1.46 $)dnl
 AC_PREFIX_DEFAULT(/usr/local/squid)
 AC_CONFIG_AUX_DIR(aux)
 
@@ -42,7 +42,7 @@ if test -z "$LDFLAGS"; then
        LDFLAGS="-g"
 fi
 
-PREST_CFLAGS="$CFLAGS"
+PRESET_CFLAGS="$CFLAGS"
 
 dnl Check for GNU cc
 AC_PROG_CC
@@ -492,11 +492,12 @@ if test "$HAVE_LIBMALLOC" = "yes" ; then
 fi
 AC_SUBST(XTRA_OBJS)
 
-XTRA_LIBS="$LIBS"
-LIBS=''
+if test -z "$XTRA_LIBS"; then
+       XTRA_LIBS="$LIBS"
+       LIBS=''
+fi
 AC_SUBST(XTRA_LIBS)
 
-
 dnl Clean up after OSF/1 core dump bug
 rm -f core