summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2006-05-13 19:57:09 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:05:59 -0500
commitb7d574cf86d61e72c7804443ed6f57e8e090349b (patch)
tree464343a34f76a8bab02f544735094882bd468906
parentc65d2f9b1bb9a772656ccb2840bd2a5c5dc533e4 (diff)
downloadsamba-b7d574cf86d61e72c7804443ed6f57e8e090349b.tar.gz
samba-b7d574cf86d61e72c7804443ed6f57e8e090349b.tar.bz2
samba-b7d574cf86d61e72c7804443ed6f57e8e090349b.zip
r15577: Make popt CFLAGS popt-specific rather then global
(This used to be commit 87233041ff6df94069f0d76f90aba22e275f83be)
-rw-r--r--source4/build/m4/public.m43
-rw-r--r--source4/lib/popt/config.m43
2 files changed, 3 insertions, 3 deletions
diff --git a/source4/build/m4/public.m4 b/source4/build/m4/public.m4
index 1539d4ff92..afb707e81d 100644
--- a/source4/build/m4/public.m4
+++ b/source4/build/m4/public.m4
@@ -16,7 +16,7 @@ dnl #######################################################
dnl ### And now the implementation ###
dnl #######################################################
-dnl SMB_SUBSYSTEM(name,obj_files,required_subsystems)
+dnl SMB_SUBSYSTEM(name,obj_files,required_subsystems,cflags)
AC_DEFUN([SMB_SUBSYSTEM],
[
SMB_INFO_SUBSYSTEMS="$SMB_INFO_SUBSYSTEMS
@@ -25,6 +25,7 @@ SMB_INFO_SUBSYSTEMS="$SMB_INFO_SUBSYSTEMS
@<:@SUBSYSTEM::$1@:>@
OBJ_FILES = $2
PRIVATE_DEPENDENCIES = $3
+CFLAGS = $4
ENABLE = YES
# End Subsystem $1
###################################
diff --git a/source4/lib/popt/config.m4 b/source4/lib/popt/config.m4
index d48cbe1dff..af9cb27851 100644
--- a/source4/lib/popt/config.m4
+++ b/source4/lib/popt/config.m4
@@ -25,9 +25,8 @@ fi
AC_MSG_CHECKING(whether to use included popt)
if test x"$INCLUDED_POPT" != x"no"; then
- CPPFLAGS="$CPPFLAGS -I$srcdir/lib/popt"
SMB_SUBSYSTEM(LIBPOPT,
- [lib/popt/findme.o lib/popt/popt.o lib/popt/poptconfig.o lib/popt/popthelp.o lib/popt/poptparse.o], [])
+ [lib/popt/findme.o lib/popt/popt.o lib/popt/poptconfig.o lib/popt/popthelp.o lib/popt/poptparse.o], [], [-I$srcdir/lib/popt])
AC_MSG_RESULT(yes)
else