svn commit: samba r15577 - in branches/SAMBA_4_0/source: build/m4
lib/popt
jelmer at samba.org
jelmer at samba.org
Sat May 13 19:57:10 GMT 2006
Author: jelmer
Date: 2006-05-13 19:57:09 +0000 (Sat, 13 May 2006)
New Revision: 15577
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15577
Log:
Make popt CFLAGS popt-specific rather then global
Modified:
branches/SAMBA_4_0/source/build/m4/public.m4
branches/SAMBA_4_0/source/lib/popt/config.m4
Changeset:
Modified: branches/SAMBA_4_0/source/build/m4/public.m4
===================================================================
--- branches/SAMBA_4_0/source/build/m4/public.m4 2006-05-13 19:56:06 UTC (rev 15576)
+++ branches/SAMBA_4_0/source/build/m4/public.m4 2006-05-13 19:57:09 UTC (rev 15577)
@@ -16,7 +16,7 @@
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 @@
@<:@SUBSYSTEM::$1@:>@
OBJ_FILES = $2
PRIVATE_DEPENDENCIES = $3
+CFLAGS = $4
ENABLE = YES
# End Subsystem $1
###################################
Modified: branches/SAMBA_4_0/source/lib/popt/config.m4
===================================================================
--- branches/SAMBA_4_0/source/lib/popt/config.m4 2006-05-13 19:56:06 UTC (rev 15576)
+++ branches/SAMBA_4_0/source/lib/popt/config.m4 2006-05-13 19:57:09 UTC (rev 15577)
@@ -25,9 +25,8 @@
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
More information about the samba-cvs
mailing list