wsanchez Tue Apr 3 16:30:46 2001 EDT
Modified files:
/php4 ChangeLog
/php4/ext/bcmath/libbcmath/src Makefile.am
/php4/ext/informix config.m4
/php4/ext/msql config.m4
/php4/ext/odbc config.m4
/php4/sapi/apache apMakefile.tmpl libphp4.module.in
/php4/sapi/thttpd config.m4
Log:
Separate CPPFLAGS from CFLAGS.
Index: php4/ChangeLog
diff -u php4/ChangeLog:1.667 php4/ChangeLog:1.668
--- php4/ChangeLog:1.667 Tue Apr 3 16:05:08 2001
+++ php4/ChangeLog Tue Apr 3 16:30:43 2001
@@ -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 <[EMAIL PROTECTED]>
* ext/openssl/openssl.c:
Index: php4/ext/bcmath/libbcmath/src/Makefile.am
diff -u php4/ext/bcmath/libbcmath/src/Makefile.am:1.1
php4/ext/bcmath/libbcmath/src/Makefile.am:1.2
--- php4/ext/bcmath/libbcmath/src/Makefile.am:1.1 Wed Nov 22 12:20:02 2000
+++ php4/ext/bcmath/libbcmath/src/Makefile.am Tue Apr 3 16:30:43 2001
@@ -11,7 +11,8 @@
INCLUDES = -I$(srcdir) -I..
-CFLAGS = @CFLAGS@ $(INCLUDES) -Wall
+CFLAGS = @CFLAGS@
+CPPFLAGS = $(INCLUDES) -Wall
MAINTAINERCLEANFILES= Makefile.in $(libbcmath_a_SOURCES) private.h bcmath.h
Index: php4/ext/informix/config.m4
diff -u php4/ext/informix/config.m4:1.17 php4/ext/informix/config.m4:1.18
--- php4/ext/informix/config.m4:1.17 Tue Mar 27 12:34:29 2001
+++ php4/ext/informix/config.m4 Tue Apr 3 16:30:43 2001
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.17 2001/03/27 20:34:29 sniper Exp $
+dnl $Id: config.m4,v 1.18 2001/04/03 23:30:43 wsanchez Exp $
PHPIFXLIB=ext/informix/libphp_ifx.a
@@ -49,7 +49,7 @@
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
Index: php4/ext/msql/config.m4
diff -u php4/ext/msql/config.m4:1.8 php4/ext/msql/config.m4:1.9
--- php4/ext/msql/config.m4:1.8 Tue Mar 27 12:34:33 2001
+++ php4/ext/msql/config.m4 Tue Apr 3 16:30:44 2001
@@ -1,12 +1,12 @@
-dnl $Id: config.m4,v 1.8 2001/03/27 20:34:33 sniper Exp $
+dnl $Id: config.m4,v 1.9 2001/04/03 23:30:44 wsanchez Exp $
dnl
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_DEFINE(MSQL1,1,[ ])
MSQL_VERSION="1.0"
])
- CFLAGS=$ac_php_oldcflags
+ CPPFLAGS=$ac_php_oldcppflags
AC_MSG_RESULT($MSQL_VERSION)
])
Index: php4/ext/odbc/config.m4
diff -u php4/ext/odbc/config.m4:1.37 php4/ext/odbc/config.m4:1.38
--- php4/ext/odbc/config.m4:1.37 Tue Mar 27 12:34:37 2001
+++ php4/ext/odbc/config.m4 Tue Apr 3 16:30:44 2001
@@ -271,7 +271,7 @@
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\".],
[
Index: php4/sapi/apache/apMakefile.tmpl
diff -u php4/sapi/apache/apMakefile.tmpl:1.2 php4/sapi/apache/apMakefile.tmpl:1.3
--- php4/sapi/apache/apMakefile.tmpl:1.2 Sat Jun 24 04:39:37 2000
+++ php4/sapi/apache/apMakefile.tmpl Tue Apr 3 16:30:45 2001
@@ -45,9 +45,9 @@
# 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 @@
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
Index: php4/sapi/apache/libphp4.module.in
diff -u php4/sapi/apache/libphp4.module.in:1.8 php4/sapi/apache/libphp4.module.in:1.9
--- php4/sapi/apache/libphp4.module.in:1.8 Wed Sep 6 08:41:40 2000
+++ php4/sapi/apache/libphp4.module.in Tue Apr 3 16:30:45 2001
@@ -3,5 +3,5 @@
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
Index: php4/sapi/thttpd/config.m4
diff -u php4/sapi/thttpd/config.m4:1.5 php4/sapi/thttpd/config.m4:1.6
--- php4/sapi/thttpd/config.m4:1.5 Tue Mar 27 12:34:50 2001
+++ php4/sapi/thttpd/config.m4 Tue Apr 3 16:30:45 2001
@@ -5,7 +5,7 @@
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 || \
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]
