diff options
Diffstat (limited to 'sapi')
| -rw-r--r-- | sapi/apache/apMakefile.tmpl | 6 | ||||
| -rw-r--r-- | sapi/apache/libphp4.module.in | 2 | ||||
| -rw-r--r-- | sapi/thttpd/config.m4 | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/sapi/apache/apMakefile.tmpl b/sapi/apache/apMakefile.tmpl index 864e4d3044..f77b9975ba 100644 --- a/sapi/apache/apMakefile.tmpl +++ b/sapi/apache/apMakefile.tmpl @@ -45,9 +45,9 @@ libphp4.so: $(SHLIB_OBJS) $(SHLIB_OBJS_LIB) # extension .so-o .SUFFIXES: .o .so-o .c.o: - $(CC) -c $(INCLUDES) $(CFLAGS) $(SPACER) $< + $(CC) -c $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(SPACER) $< .c.so-o: - $(CC) -c $(INCLUDES) $(CFLAGS) $(CFLAGS_SHLIB) $(SPACER) $< && mv $*.o $*.so-o + $(CC) -c $(INCLUDES) $(CFLAGS) $(CFLAGS_SHLIB) $(CPPFLAGS) $(SPACER) $< && mv $*.o $*.so-o # cleanup clean: @@ -59,7 +59,7 @@ clean: 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) $(CFLAGS) $(CPPFLAGS) *.c >> Makefile.new \ && sed -e '1,$$s: $(INCDIR)/: $$(INCDIR)/:g' Makefile.new \ > Makefile.tmpl \ && rm Makefile.new diff --git a/sapi/apache/libphp4.module.in b/sapi/apache/libphp4.module.in index 277394b722..9647b80030 100644 --- a/sapi/apache/libphp4.module.in +++ b/sapi/apache/libphp4.module.in @@ -3,5 +3,5 @@ ConfigStart RULE_WANTHSREGEX=no LIBS="@NATIVE_RPATHS@ @PHP_LDFLAGS@ @PHP_LIBS@ @EXTRA_LIBS@ $LIBS" RULE_HIDE=yes - CFLAGS="$CFLAGS -I@abs_srcdir@ -I@abs_srcdir@/main -I@abs_builddir@/main -I@abs_srcdir@/Zend -I@abs_builddir@/Zend -I@abs_builddir@/TSRM -I@abs_srcdir@/TSRM -I@abs_builddir@" + CPPFLAGS="$CPPFLAGS -I@abs_srcdir@ -I@abs_srcdir@/main -I@abs_builddir@/main -I@abs_srcdir@/Zend -I@abs_builddir@/Zend -I@abs_builddir@/TSRM -I@abs_srcdir@/TSRM -I@abs_builddir@" ConfigEnd diff --git a/sapi/thttpd/config.m4 b/sapi/thttpd/config.m4 index f8242f72d5..e3a1470de2 100644 --- a/sapi/thttpd/config.m4 +++ b/sapi/thttpd/config.m4 @@ -5,7 +5,7 @@ AC_ARG_WITH(thttpd, INSTALL_IT="\ echo 'PHP_LIBS = -L. -lphp4 \$(PHP_LIBS) \$(EXTRA_LIBS)' > $THTTPD/php_makefile; \ echo 'PHP_LDFLAGS = \$(NATIVE_RPATHS) \$(PHP_LDFLAGS)' >> $THTTPD/php_makefile; \ - echo 'PHP_CFLAGS = \$(COMMON_FLAGS) \$(CFLAGS) \$(EXTRA_CFLAGS)' >> $THTTPD/php_makefile; \ + echo 'PHP_CFLAGS = \$(COMMON_FLAGS) \$(CFLAGS) \$(CPPFLAGS) \$(EXTRA_CFLAGS)' >> $THTTPD/php_makefile; \ \$(LN_S) $abs_srcdir/sapi/thttpd/thttpd.c $THTTPD/php_thttpd.c; \ cp $abs_srcdir/sapi/thttpd/php_thttpd.h $SAPI_STATIC $THTTPD;\ test -f $THTTPD/php_patched || \ |