diff options
| author | Marko Karppinen <markonen@php.net> | 2002-08-06 22:05:38 +0000 |
|---|---|---|
| committer | Marko Karppinen <markonen@php.net> | 2002-08-06 22:05:38 +0000 |
| commit | 107a9efbd9b4e2fea8714878ed28c5fc73f763af (patch) | |
| tree | daae426746c22a24d8330e2bbc7aa37659570a46 | |
| parent | 7498f568523dc8a626e7f7459d6e781b050730d2 (diff) | |
| download | php-git-107a9efbd9b4e2fea8714878ed28c5fc73f763af.tar.gz | |
Fix the framework support
| -rw-r--r-- | Makefile.global | 2 | ||||
| -rw-r--r-- | acinclude.m4 | 6 | ||||
| -rw-r--r-- | configure.in | 1 |
3 files changed, 5 insertions, 4 deletions
diff --git a/Makefile.global b/Makefile.global index ecdbb474c4..957cb43059 100644 --- 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 0995d3681e..1e9e9088a1 100644 --- 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 7f6b0fa7e9..ddccc16475 100644 --- 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) |