summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2005-02-17 23:39:56 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:10:45 -0500
commit7c65b81ed434b1fc27265710f07826d44fe542b9 (patch)
treee29c4423e6275342e588137e85013236c01c6806
parentc52fb55903fc68dd6e9d13f618277b2c12e17aa6 (diff)
downloadsamba-7c65b81ed434b1fc27265710f07826d44fe542b9.tar.gz
samba-7c65b81ed434b1fc27265710f07826d44fe542b9.tar.bz2
samba-7c65b81ed434b1fc27265710f07826d44fe542b9.zip
r5438: Keep new CFLAGS if the compiler accepted them.
(This used to be commit d0a6b973307ba3b740f18214f14682495a607c63)
-rw-r--r--source4/build/smb_build/public.m42
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/build/smb_build/public.m4 b/source4/build/smb_build/public.m4
index 6ce57b0083..12238bbcc8 100644
--- a/source4/build/smb_build/public.m4
+++ b/source4/build/smb_build/public.m4
@@ -181,9 +181,9 @@ AC_DEFUN([SMB_EXT_LIB_FROM_PKGCONFIG],
SMB_EXT_LIB_ENABLE($1, YES)
AC_MSG_RESULT(yes),
AC_MSG_RESULT(no),
+ CFLAGS="$OLD_CFLAGS"
AC_MSG_WARN([cannot run when cross-compiling]))
- CFLAGS="$OLD_CFLAGS"
SMB_EXT_LIB($1,
[`$PKG_CONFIG --libs-only-l '$2'`],