sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-24 21:34:56 +03:00
Code

dont add -I./popt to CFLAGS it really belongs in FLAGS1 with other include

Browse Source 
paths. This make it hard to use a script that overrides CFLAGS options.
(This used to be commit 646b5ae752)
This commit is contained in:
Herb Lewis 2001-12-05 19:45:30 +00:00
parent 7077558fb3
commit f3e6f2d953
3 changed files with 652 additions and 651 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source3/Makefile.in
View File

@ -69,9 +69,10 @@ LOCKDIR = @lockdir@
# man pages language(s)
man_langs = "@manlangs@"
FLAGS1 = $(CFLAGS) -Iinclude -I$(srcdir)/include -I$(srcdir)/ubiqx -I$(srcdir)/smbwrapper $(CPPFLAGS) -I. -I$(srcdir)
FLAGS1 = $(CFLAGS) @FLAGS1@ -Iinclude -I$(srcdir)/include -I$(srcdir)/ubiqx -I$(srcdir)/smbwrapper $(CPPFLAGS) -I. -I$(srcdir)
FLAGS2 =
FLAGS3 =
FLAGS4 =
FLAGS5 = $(FLAGS1) $(FLAGS2) $(FLAGS3) $(FLAGS4)
FLAGS = $(ISA) $(FLAGS5)
FLAGS32 = $(ISA32) $(FLAGS5)
@ -790,8 +791,8 @@ winbindd_proto:
$(WINBINDD_OBJ1)
delheaders:
@/bin/rm -f $(srcdir)/include/proto.h $(srcdir)/include/build_env.h
@/bin/rm -f include/proto.h include/build_env.h
@/bin/rm -f $(srcdir)/include/proto.h $(srcdir)/include/build_env.h $(srcdir)/.headers.stamp
@/bin/rm -f include/proto.h include/build_env.h .headers.stamp
# we want our generated headers to be rebuilt if they don't exist, but not rebuilt every time
.headers.stamp: include/proto.h include/build_env.h

1293
source3/configure vendored
View File

File diff suppressed because it is too large Load Diff

3
source3/configure.in
View File

@ -2536,12 +2536,13 @@ AC_MSG_CHECKING(whether to use included popt)
if test x"$INCLUDED_POPT" = x"yes"; then
AC_MSG_RESULT($srcdir/popt)
BUILD_POPT='$(POPT_OBJS)'
CFLAGS="$CFLAGS -I$srcdir/popt"
FLAGS1="-I$srcdir/popt"
else
AC_MSG_RESULT(no)
LIBS="$LIBS -lpopt"
fi
AC_SUBST(BUILD_POPT)
AC_SUBST(FLAGS1)
#################################################
# final configure stuff