[931] in Kerberos-V5-bugs
Correction to patch for cpp options
daemon@ATHENA.MIT.EDU (Richard Basch)
Wed Nov 2 19:57:40 1994
Date: Wed, 2 Nov 1994 19:57:36 -0500
To: krb5-bugs@MIT.EDU
From: "Richard Basch" <basch@MIT.EDU>
This one is the corrected patch...
I added a --with-cpp-opts=
where you can specify options to be passed to the C pre-processor.
These flags will also be used as part of CFLAGS.
-Richard
===================================================================
RCS file: /mit/krb5/.cvsroot/src/aclocal.m4,v
retrieving revision 1.33
diff -c -r1.33 aclocal.m4
*** aclocal.m4 1994/10/26 05:42:23 1.33
--- aclocal.m4 1994/11/03 00:07:16
***************
*** 101,107 ****
for i in $(SUBDIRS) ;\
do \
(cd $$i ; echo>>> $1 <<<"in $(CURRENT_DIR)$$i..."; \
! $(MAKE) $(MFLAGS) CCOPTS="$(CCOPTS)" CC="$(CC)" \
CURRENT_DIR=$(CURRENT_DIR)$$i/ >>>$2<<<); \
done>>>
changequote([,])dnl
--- 101,108 ----
for i in $(SUBDIRS) ;\
do \
(cd $$i ; echo>>> $1 <<<"in $(CURRENT_DIR)$$i..."; \
! $(MAKE) $(MFLAGS) CC="$(CC)" \
! CPPOPTS="$(CPPOPTS)" CCOPTS="$(CCOPTS)" \
CURRENT_DIR=$(CURRENT_DIR)$$i/ >>>$2<<<); \
done>>>
changequote([,])dnl
***************
*** 139,144 ****
--- 140,146 ----
dnl
define(CONFIG_RULES,[
WITH_CC dnl
+ WITH_CPPOPTS dnl
AC_DIVERT_PUSH(AC_DIVERSION_MAKEFILE)dnl
[
SHELL=/bin/sh
***************
*** 289,294 ****
--- 291,306 ----
CCOPTS=)dnl
AC_SUBST(CCOPTS)])dnl
dnl
+ dnl set $(CPPOPTS) from --with-cppopts=value
+ dnl
+ define(WITH_CPPOPTS,[
+ AC_ARG_WITH([cppopts],[select compiler preprocessor command line options],
+ echo CPPOPTS=$withval
+ CPPOPTS=$withval
+ CFLAGS="$CFLAGS $withval",
+ echo CPPOPTS defaults to $CPPOPTS)dnl
+ AC_SUBST(CPPOPTS)])dnl
+ dnl
dnl Imake LinkFile rule, so they occur in the right place -- LinkFile(dst,src)
dnl
define(LinkFile,[
===================================================================
RCS file: /mit/krb5/.cvsroot/src/config/pre.in,v
retrieving revision 1.8
diff -c -r1.8 pre.in
*** pre.in 1994/10/26 05:43:44 1.8
--- pre.in 1994/11/02 23:12:12
***************
*** 5,14 ****
srcdir = @srcdir@
VPATH = @srcdir@
! CPPFLAGS = @CPPFLAGS@
DEFS = @DEFS@ $(CPPFLAGS)
CC = @CC@
CCOPTS = @CCOPTS@
LIBS = @LIBS@
KRB5ROOT= @KRB5ROOT@
KRB4=@KRB4@
--- 5,15 ----
srcdir = @srcdir@
VPATH = @srcdir@
! CPPFLAGS = @CPPFLAGS@ $(CPPOPTS)
DEFS = @DEFS@ $(CPPFLAGS)
CC = @CC@
CCOPTS = @CCOPTS@
+ CPPOPTS = @CPPOPTS@
LIBS = @LIBS@
KRB5ROOT= @KRB5ROOT@
KRB4=@KRB4@
