Author: jelmer Date: 2006-06-11 23:12:51 +0000 (Sun, 11 Jun 2006) New Revision: 16143
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=16143 Log: Fix disappearance of user-specified CPPFLAGS,LDFLAGS and LIBS variables. Modified: branches/SAMBA_4_0/source/lib/charset/config.m4 Changeset: Modified: branches/SAMBA_4_0/source/lib/charset/config.m4 =================================================================== --- branches/SAMBA_4_0/source/lib/charset/config.m4 2006-06-11 20:53:00 UTC (rev 16142) +++ branches/SAMBA_4_0/source/lib/charset/config.m4 2006-06-11 23:12:51 UTC (rev 16143) @@ -15,6 +15,9 @@ 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 @@ 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
