diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2006-06-11 23:12:51 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:09:01 -0500 |
| commit | 46a6477268ecdaeb15dbc00cd3ae016e2f24228d (patch) | |
| tree | 35aa913fe5089a1e89abe889274bab1e69f509e2 | |
| parent | a0d491f219f02fb1712e45a3e2fafc0ea56d9630 (diff) | |
| download | samba-46a6477268ecdaeb15dbc00cd3ae016e2f24228d.tar.gz samba-46a6477268ecdaeb15dbc00cd3ae016e2f24228d.tar.bz2 samba-46a6477268ecdaeb15dbc00cd3ae016e2f24228d.zip | |
r16143: Fix disappearance of user-specified CPPFLAGS,LDFLAGS and LIBS variables.
(This used to be commit b7c3f80efd08c2206048d00815b7396488c91d3b)
| -rw-r--r-- | source4/lib/charset/config.m4 | 9 |
1 files changed, 6 insertions, 3 deletions
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 |