diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | ext/bcmath/libbcmath/src/Makefile.am | 3 | ||||
| -rw-r--r-- | ext/informix/config.m4 | 2 | ||||
| -rw-r--r-- | ext/msql/config.m4 | 6 | ||||
| -rw-r--r-- | ext/odbc/config.m4 | 2 | ||||
| -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 |
8 files changed, 21 insertions, 11 deletions
@@ -14,6 +14,15 @@ Add INSTALL_ROOT variable to allow installation into a packageable directory. + * ext/bcmath/libbcmath/src/Makefile.am + ext/informix/config.m4 + ext/msql/config.m4 + ext/odbc/config.m4 + sapi/apache/apMakefile.tmpl + sapi/apache/libphp4.module.in + sapi/thttpd/config.m4 + Separate CPPFLAGS from CFLAGS. + 2001-04-02 Wez Furlong <wez.php@thebrainroom.com> * ext/openssl/openssl.c: diff --git a/ext/bcmath/libbcmath/src/Makefile.am b/ext/bcmath/libbcmath/src/Makefile.am index a0928a2264..fab37d785e 100644 --- a/ext/bcmath/libbcmath/src/Makefile.am +++ b/ext/bcmath/libbcmath/src/Makefile.am @@ -11,7 +11,8 @@ libbcmath_a_SOURCES= add.c compare.c debug.c div.c divmod.c doaddsub.c \ INCLUDES = -I$(srcdir) -I.. -CFLAGS = @CFLAGS@ $(INCLUDES) -Wall +CFLAGS = @CFLAGS@ +CPPFLAGS = $(INCLUDES) -Wall MAINTAINERCLEANFILES= Makefile.in $(libbcmath_a_SOURCES) private.h bcmath.h diff --git a/ext/informix/config.m4 b/ext/informix/config.m4 index 537dd451be..dfc958d1dd 100644 --- a/ext/informix/config.m4 +++ b/ext/informix/config.m4 @@ -49,7 +49,7 @@ WARNING: You specified Informix base install directory that is different dnl Allow override to use static and/or threaded libs : fi - CFLAGS="$CFLAGS $IFX_INCLUDE" + CPPFLAGS="$CPPFLAGS $IFX_INCLUDE" LDFLAGS="$LDFLAGS $IFX_LFLAGS" case "$host_alias" in diff --git a/ext/msql/config.m4 b/ext/msql/config.m4 index a2b046d404..3241b89399 100644 --- a/ext/msql/config.m4 +++ b/ext/msql/config.m4 @@ -5,8 +5,8 @@ dnl Test mSQL version by checking if msql.h has "IDX_TYPE" defined. dnl AC_DEFUN(PHP_MSQL_VERSION,[ AC_MSG_CHECKING([mSQL version]) - ac_php_oldcflags=$CFLAGS - CFLAGS="$INCLUDES $CFLAGS" + ac_php_oldcppflags=$CPPFLAGS + CPPFLAGS="$INCLUDES $CPPFLAGS" AC_TRY_COMPILE([#include <sys/types.h> #include "msql.h"],[int i = IDX_TYPE],[ AC_DEFINE(MSQL1,0,[ ]) @@ -15,7 +15,7 @@ AC_DEFUN(PHP_MSQL_VERSION,[ AC_DEFINE(MSQL1,1,[ ]) MSQL_VERSION="1.0" ]) - CFLAGS=$ac_php_oldcflags + CPPFLAGS=$ac_php_oldcppflags AC_MSG_RESULT($MSQL_VERSION) ]) diff --git a/ext/odbc/config.m4 b/ext/odbc/config.m4 index 348527f8ef..43ca281055 100644 --- a/ext/odbc/config.m4 +++ b/ext/odbc/config.m4 @@ -271,7 +271,7 @@ AC_ARG_WITH(custom-odbc, E.g., you should define following for Sybase SQL Anywhere 5.5.00 on QNX, prior to run configure script: - CFLAGS=\"-DODBC_QNX -DSQLANY_BUG\" + CPPFLAGS=\"-DODBC_QNX -DSQLANY_BUG\" LDFLAGS=-lunix CUSTOM_ODBC_LIBS=\"-ldblib -lodbc\".], [ 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 || \ |