Fix the framework support

diff --git a/Makefile.global b/Makefile.global
index ecdbb474c4d264d0c0d174fd254164a7b84de938..957cb43059a82bd12c8f56b17a0bada2b4fd0ef2 100644 (file)
--- a/Makefile.global
+++ b/Makefile.global
@@ -3,7 +3,7 @@ INSTALL = $(top_srcdir)/build/shtool install -c
 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) 

diff --git a/acinclude.m4 b/acinclude.m4
index 0995d3681ea47ba57bee8127053d4a8268795fc9..1e9e9088a15b0ef0032a6917f870ba4b941ccd66 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1025,7 +1025,7 @@ dnl line. if before is 1, the framework is added
 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 @@ AC_DEFUN(PHP_ADD_FRAMEWORKPATH, [
   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
   ])
 ])

diff --git a/configure.in b/configure.in
index 7f6b0fa7e9ba75028deb2752f4494c248ad1eeb4..ddccc16475080c34f1bb41bbef67e8b1f801733c 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -977,6 +977,7 @@ PHP_SUBST(TSRM_DIR)
 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)