[svn:mod_parrot] r257 - mod_parrot/trunk

Author: jhorwitz
Date: Fri Sep 21 08:46:20 2007
New Revision: 257

Modified:
   mod_parrot/trunk/Configure.pl
   mod_parrot/trunk/Makefile.in

Log:
add proper cppflags from apache config


Modified: mod_parrot/trunk/Configure.pl
==============================================================================
--- mod_parrot/trunk/Configure.pl	(original)
+++ mod_parrot/trunk/Configure.pl	Fri Sep 21 08:46:20 2007
@@ -57,6 +57,7 @@
 my $apache_include_dir = `$apxs -q INCLUDEDIR`;
 my $apr_include_dir = `$apxs -q APR_INCLUDEDIR`;
 my $apu_include_dir = `$apxs -q APU_INCLUDEDIR`;
+my $extra_cppflags = `$apxs -q EXTRA_CPPFLAGS`;
 my $libexec_dir = `$apxs -q LIBEXECDIR`;
 my $cc = `$apxs -q CC`;
 my $libtool = `$apxs -q LIBTOOL`;
@@ -87,6 +88,7 @@
 $template =~ s/\@LIBTOOL\@/$libtool/g;
 $template =~ s/\@DEFINES\@/$defines/g;
 $template =~ s/\@CFLAGS\@/$cflags/g;
+$template =~ s/\@EXTRA_CPPFLAGS\@/$extra_cppflags/g;
 $template =~ s/\@LDFLAGS\@/$ldflags/g;
 $template =~ s/\@LIBS\@/$libs/g;
 $template =~ s/\@LIBEXECDIR\@/$libexec_dir/g;

Modified: mod_parrot/trunk/Makefile.in
==============================================================================
--- mod_parrot/trunk/Makefile.in	(original)
+++ mod_parrot/trunk/Makefile.in	Fri Sep 21 08:46:20 2007
@@ -8,6 +8,7 @@
 APU_INCLUDE_DIR=@APU_INCLUDE_DIR@
 DEFINES=@DEFINES@
 CFLAGS=@CFLAGS@
+EXTRA_CPPFLAGS=@EXTRA_CPPFLAGS@
 LDFLAGS=@LDFLAGS@
 LIBS=@LIBS@
 LIBEXECDIR=@LIBEXECDIR@
@@ -46,7 +47,7 @@
 all: gen-src $(SRC_DIR)/mod_parrot.la
 
 %.lo: %.c
-	$(LIBTOOL) --mode=compile $(CC) -o $@ $(CFLAGS) -I$(CFG_INCLUDEDIR) -I$(APR_INCLUDE_DIR) -I$(APU_INCLUDE_DIR) $(DEFINES) -c $<
+	$(LIBTOOL) --mode=compile $(CC) -o $@ $(EXTRA_CPPFLAGS) $(CFLAGS) -I$(CFG_INCLUDEDIR) -I$(APR_INCLUDE_DIR) -I$(APU_INCLUDE_DIR) $(DEFINES) -c $<
 
 $(SRC_DIR)/mod_parrot.la: $(OBJ_FILES)
 	$(LIBTOOL) --mode=link $(CC) -o $@ $(LDFLAGS) $(OBJ_FILES) $(LIBS) -rpath $(LIBEXECDIR) -module -avoid-version