You are viewing a plain text version of this content. The canonical link for it is here.
Posted to modperl-cvs@perl.apache.org by as...@apache.org on 2001/02/11 16:33:13 UTC
cvs commit: modperl/apaci Makefile.tmpl configure
ask 01/02/11 07:33:12
Modified: . Changes
apaci Makefile.tmpl configure
Log:
Put Apache's CFLAGS into AP_CFLAGS instead of CFLAGS, so that
people who like to override CFLAGS from the make line (make
CFLAGS='-arch ppc -arch i386') can do so without stomping the
Apache flags.
Submitted by: Wilfredo Sanchez <ws...@KnowNow.com>
Revision Changes Path
1.580 +5 -0 modperl/Changes
Index: Changes
===================================================================
RCS file: /home/cvs/modperl/Changes,v
retrieving revision 1.579
retrieving revision 1.580
diff -u -r1.579 -r1.580
--- Changes 2001/01/30 04:35:50 1.579
+++ Changes 2001/02/11 15:33:12 1.580
@@ -10,6 +10,11 @@
=item 1.25_01-dev
+Put Apache's CFLAGS into AP_CFLAGS instead of CFLAGS, so that
+people who like to override CFLAGS from the make line (make
+CFLAGS='-arch ppc -arch i386') can do so without stomping the
+Apache flags. [ Wilfredo Sanchez <ws...@KnowNow.com> ]
+
=item 1.25 - January 29, 2001
avoid 'prototype mismatch' warnings in Apache::PerlRun::flush_namespace
1.10 +2 -2 modperl/apaci/Makefile.tmpl
Index: Makefile.tmpl
===================================================================
RCS file: /home/cvs/modperl/apaci/Makefile.tmpl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Makefile.tmpl 2000/09/01 05:10:12 1.9
+++ Makefile.tmpl 2001/02/11 15:33:12 1.10
@@ -14,7 +14,7 @@
# from Perl and Apache parameters
MP_CC=$(PERL_CC)
MP_CFLAGS=$(PERL_OPTIMIZE) -I$(PERL_INC) $(PERL_CCFLAGS) \
- $(PERL_DEFS) $(INCLUDES) $(CFLAGS)
+ $(PERL_DEFS) $(INCLUDES) $(AP_CFLAGS) $(CFLAGS)
MP_CFLAGS_SHLIB=$(PERL_CCCDLFLAGS) $(MP_CFLAGS)
MP_LD=$(PERL_LD)
MP_LDFLAGS_SHLIB=$(PERL_LDDLFLAGS)
@@ -99,7 +99,7 @@
depend:
cp Makefile.tmpl Makefile.tmpl.bak \
&& sed -ne '1,/^# DO NOT REMOVE/p' Makefile.tmpl > Makefile.new \
- && gcc -MM $(INCLUDES) $(CFLAGS) *.c >> Makefile.new \
+ && gcc -MM $(INCLUDES) $(AP_CFLAGS) $(CFLAGS) *.c >> Makefile.new \
&& sed -e '1,$$s: $(INCDIR)/: $$(INCDIR)/:g' \
-e '1,$$s: $(OSDIR)/: $$(OSDIR)/:g' Makefile.new \
> Makefile.tmpl \
1.12 +1 -1 modperl/apaci/configure
Index: configure
===================================================================
RCS file: /home/cvs/modperl/apaci/configure,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- configure 2000/03/16 19:47:11 1.11
+++ configure 2001/02/11 15:33:12 1.12
@@ -91,7 +91,7 @@
echo "##" >>$my_makefileconf
echo "" >>$my_makefileconf
echo "# provide some stuff Apache usually provides" >>$my_makefileconf
-echo "CFLAGS=-DMOD_PERL $my_apxs_cflags" >>$my_makefileconf
+echo "AP_CFLAGS=-DMOD_PERL $my_apxs_cflags" >>$my_makefileconf
echo "INCLUDES=$my_apxs_includes" >>$my_makefileconf
echo "RANLIB=ranlib" >>$my_makefileconf
echo "LIBEXT=so" >>$my_makefileconf