From 46a6477268ecdaeb15dbc00cd3ae016e2f24228d Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sun, 11 Jun 2006 23:12:51 +0000
Subject: r16143: Fix disappearance of user-specified CPPFLAGS,LDFLAGS and LIBS
 variables. (This used to be commit b7c3f80efd08c2206048d00815b7396488c91d3b)

---
 source4/lib/charset/config.m4 | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'source4/lib/charset')

diff --git a/source4/lib/charset/config.m4 b/source4/lib/charset/config.m4
index 5d37a781fd..ce278a6e4c 100644
--- a/source4/lib/charset/config.m4
+++ b/source4/lib/charset/config.m4
@@ -15,6 +15,9 @@ int main()
 dnl SMB_CHECK_ICONV_DIR(dir,action-if-found,action-if-not-found)
 AC_DEFUN(SMB_CHECK_ICONV_DIR,
 [
+	save_CPPFLAGS="$CPPFLAGS"
+	save_LDFLAGS="$LDFLAGS"
+	save_LIBS="$LIBS"
 	CPPFLAGS="-I$1/include"
 	LDFLAGS="-L$1/lib"
 	LIBS=-liconv
@@ -24,9 +27,9 @@ AC_DEFUN(SMB_CHECK_ICONV_DIR,
         SMB_CHECK_ICONV(giconv.h,[AC_DEFINE(HAVE_GICONV_H,1,[Whether giconv.h is present]) $2],[$3])
 	])
 
-	CPPFLAGS=$save_CPPFLAGS
-	LDFLAGS=$save_LDFLAGS
-	LIBS=$save_LIBS
+	CPPFLAGS="$save_CPPFLAGS"
+	LDFLAGS="$save_LDFLAGS"
+	LIBS="$save_LIBS"
 ])
 
 ICONV_FOUND=no
-- 
cgit