cvs: php4 / Makefile.global acinclude.m4 configure.in
| From: | Marko Karppinen | Date: | Tue, 06 Aug 2002 22:05:39 +0000 |
| Subject: | cvs: php4 / Makefile.global acinclude.m4 configure.in | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-13182@lists.php.net to get a copy of this message | ||
markonen Tue Aug 6 18:05:39 2002 EDT
Modified files:
/php4 Makefile.global acinclude.m4 configure.in
Log:
Fix the framework support
Index: php4/Makefile.global
diff -u php4/Makefile.global:1.21 php4/Makefile.global:1.22
--- php4/Makefile.global:1.21 Tue Aug 6 13:51:24 2002
+++ php4/Makefile.global Tue Aug 6 18:05:38 2002
@@ -3,7 +3,7 @@
INSTALL_DATA = $(INSTALL) -m 644
DEFS = -DPHP_ATOM_INC -I$(top_builddir)/include -I$(top_builddir)/main -I$(top_srcdir)
-COMMON_FLAGS = $(DEFS) $(INCLUDES) $(EXTRA_INCLUDES) $(CPPFLAGS) $(PHP_FRAMEWORKS)
+COMMON_FLAGS = $(DEFS) $(INCLUDES) $(EXTRA_INCLUDES) $(CPPFLAGS) $(PHP_FRAMEWORKPATH)
all: $(all_targets)
Index: php4/acinclude.m4
diff -u php4/acinclude.m4:1.201 php4/acinclude.m4:1.202
--- php4/acinclude.m4:1.201 Tue Aug 6 12:01:33 2002
+++ php4/acinclude.m4 Tue Aug 6 18:05:38 2002
@@ -1,4 +1,4 @@
-dnl $Id: acinclude.m4,v 1.201 2002/08/06 16:01:33 markonen Exp $
+dnl $Id: acinclude.m4,v 1.202 2002/08/06 22:05:38 markonen Exp $
dnl
dnl This file contains local autoconf functions.
@@ -1025,7 +1025,7 @@
dnl to the beginning of the line.
AC_DEFUN(PHP_ADD_FRAMEWORK, [
- AC_PHP_ONCE(FRAMEWORK, $1, [
+ AC_PHP_ONCE(FRAMEWORKS, $1, [
if test "$2"; then
PHP_FRAMEWORKS="-framework $1 $PHP_FRAMEWORKS"
else
@@ -1049,9 +1049,9 @@
PHP_EXPAND_PATH($1, ai_p)
AC_PHP_ONCE(FRAMEWORKPATH, $ai_p, [
if test "$2"; then
- PHP_FRAMEWORKS="-F$ai_p $PHP_FRAMEWORKS"
+ PHP_FRAMEWORKPATH="-F$ai_p $PHP_FRAMEWORKPATH"
else
- PHP_FRAMEWORKS="$PHP_FRAMEWORKS -F$ai_p"
+ PHP_FRAMEWORKPATH="$PHP_FRAMEWORKPATH -F$ai_p"
fi
])
])
Index: php4/configure.in
diff -u php4/configure.in:1.365 php4/configure.in:1.366
--- php4/configure.in:1.365 Tue Aug 6 12:01:33 2002
+++ php4/configure.in Tue Aug 6 18:05:38 2002
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.365 2002/08/06 16:01:33 markonen Exp $ -*- sh -*-
+dnl ## $Id: configure.in,v 1.366 2002/08/06 22:05:38 markonen Exp $ -*- sh -*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -977,6 +977,7 @@
PHP_SUBST(TSRM_LIB)
PHP_SUBST(WARNING_LEVEL)
PHP_SUBST(PHP_FRAMEWORKS)
+PHP_SUBST(PHP_FRAMEWORKPATH)
PHP_SUBST_OLD(YACC)
PHP_SUBST_OLD(SHLIB_SUFFIX_NAME)