dougm 00/08/31 22:10:15 Modified: . Changes apaci Makefile.tmpl src/modules/perl Makefile Log: change apaci/Makefile.tmpl and src/modules/perl/Makefile so Perl's include path comes before /usr/local/include, e.g. to make sure Perl's patchlevel.h is used Revision Changes Path 1.512 +4 -0 modperl/Changes Index: Changes =================================================================== RCS file: /home/cvs/modperl/Changes,v retrieving revision 1.511 retrieving revision 1.512 diff -u -r1.511 -r1.512 --- Changes 2000/08/31 20:54:22 1.511 +++ Changes 2000/09/01 05:10:09 1.512 @@ -10,6 +10,10 @@ =item 1.24_01-dev +change apaci/Makefile.tmpl and src/modules/perl/Makefile so Perl's +include path comes before /usr/local/include, e.g. to make sure Perl's +patchlevel.h is used, thanks to Ryan Morgan for the spot + avoid duplicate buffer copy in {read,get}_client_block by reading directly into Perl's SV buffer 1.9 +1 -1 modperl/apaci/Makefile.tmpl Index: Makefile.tmpl =================================================================== RCS file: /home/cvs/modperl/apaci/Makefile.tmpl,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- Makefile.tmpl 1999/08/04 00:31:26 1.8 +++ Makefile.tmpl 2000/09/01 05:10:12 1.9 @@ -13,7 +13,7 @@ # Reassemble mod_perl parameters # from Perl and Apache parameters MP_CC=$(PERL_CC) -MP_CFLAGS=$(PERL_OPTIMIZE) $(PERL_CCFLAGS) -I$(PERL_INC) \ +MP_CFLAGS=$(PERL_OPTIMIZE) -I$(PERL_INC) $(PERL_CCFLAGS) \ $(PERL_DEFS) $(INCLUDES) $(CFLAGS) MP_CFLAGS_SHLIB=$(PERL_CCCDLFLAGS) $(MP_CFLAGS) MP_LD=$(PERL_LD) 1.11 +5 -2 modperl/src/modules/perl/Makefile Index: Makefile =================================================================== RCS file: /home/cvs/modperl/src/modules/perl/Makefile,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- Makefile 1998/07/30 15:37:21 1.10 +++ Makefile 2000/09/01 05:10:14 1.11 @@ -50,7 +50,7 @@ # # Makefile for the Apache mod_perl library # -# $Id: Makefile,v 1.10 1998/07/30 15:37:21 dougm Exp $ +# $Id: Makefile,v 1.11 2000/09/01 05:10:14 dougm Exp $ # #__ORIGINAL__ @@ -104,7 +104,10 @@ PERL_STATIC_EXTS = PERL5LIB=`$(PERL) -MConfig -e 'print $$Config{privlibexp}'` EXTUTILS_EMBED = $(PERL) -MExtUtils::Embed -PERL_CCFLAGS = `$(EXTUTILS_EMBED) -e ccopts` $(PERL_HOOKS) $(TRACE) +PERL_CFG_CCFLAGS = `$(PERL) -MConfig -e 'print $$Config{ccflags}'` +PERL_CFG_ARCHLIB = `$(PERL) -MConfig -e 'print $$Config{archlibexp}'` + +PERL_CCFLAGS = -I$(PERL_CFG_ARCHLIB)/CORE $(PERL_CFG_CCFLAGS) $(PERL_HOOKS) $(TRACE) .SUFFIXES: .xs .c .o