Fix the popt check so you can pass CPPFLAGS and LDFLAGS in in the

	* configure.in: Fix the popt check so you can pass CPPFLAGS and
	LDFLAGS in in the environment.

diff --git a/ChangeLog b/ChangeLog
index 54013ef..27348e3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-10-31  Dan Winship  <danw@ximian.com>
+
+       * configure.in: Fix the popt check so you can pass CPPFLAGS and
+       LDFLAGS in in the environment.
+
 2001-10-30  Alex Graveley  <alex@ximian.com>
 
        * src/libsoup/soup-auth.c (soup_auth_set_context): Remove the

diff --git a/configure.in b/configure.in
index ed92c77..9d59f37 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -140,23 +140,15 @@ dnl ***********************
 dnl *** Checks for popt ***
 dnl ***********************
 
-save_CPPFLAGS=$CPPFLAGS
-save_LIBS=$LIBS
-CPPFLAGS=
-LIBS=
-
 AC_CHECK_LIB(popt, poptGetContext,, AC_MSG_ERROR([popt is required]))
 AC_CHECK_HEADERS(popt.h,, AC_MSG_ERROR([popt.h is required]))
 
-POPT_CFLAGS=$CPPFLAGS
-POPT_LIBS=$LIBS
+POPT_CFLAGS="$CPPFLAGS"
+POPT_LIBS="$LIBS"
 
 AC_SUBST(POPT_CFLAGS)
 AC_SUBST(POPT_LIBS)
 
-CPPFLAGS=$save_CPPFLAGS
-LIBS=$save_LIBS
-
 
 dnl **********************************************
 dnl *** Variable substitution for soup*Conf.sh ***