--- configure.orig	Thu Feb 13 11:01:47 2003
+++ configure	Tue Apr 13 20:58:41 2004
@@ -6204,9 +6204,9 @@
     SUBDIR_POPT=""
 else
     SUBDIR_POPT="lib_popt"
-                 CPPFLAGS="$CPPFLAGS -Ilib_popt"
-                 CFLAGS="$CFLAGS -Ilib_popt"
-                 LDFLAGS="$LDFLAGS -Llib_popt/.libs"
+                 CPPFLAGS="-Ilib_popt $CPPFLAGS"
+                 CFLAGS="-Ilib_popt $CFLAGS"
+                 LDFLAGS="-Llib_popt/.libs $LDFLAGS"
                  LIBS_EXTRA="$LIBS_EXTRA -lpopt"
 fi
 echo "$as_me:$LINENO: result: $with_popt" >&5
@@ -6904,8 +6904,9 @@
 echo "$as_me:$LINENO: result: $with_dmalloc" >&5
 echo "${ECHO_T}$with_dmalloc" >&6
 
-
-LIBS="$LIBS_EXTRA $LIBS"
+LIBS_EXTRA="$LIBS_EXTRA $LIBS"
+unset LIBS
+LIBS="$LIBS_EXTRA"
 
 enable_shared=no
 export enable_shared