cvs: /php4 acinclude.m4 /php4/pear Makefile.in pear.m4 php-config.in

sas Tue May 2 13:56:03 2000 EDT Modified files: /php4 acinclude.m4 /php4/pear Makefile.in pear.m4 php-config.in Log: Pear Changes: Store EXTENSION_DIR in php-config Ignore errors during header installation Automatically enable modules in self-contained mode Create empty .deps in builddir Index: php4/acinclude.m4 diff -u php4/acinclude.m4:1.75 php4/acinclude.m4:1.76 --- php4/acinclude.m4:1.75 Mon May 1 21:00:14 2000 +++ php4/acinclude.m4 Tue May 2 13:56:02 2000 @@ -1,4 +1,4 @@ -dnl $Id: acinclude.m4,v 1.75 2000/05/02 04:00:14 sas Exp $ +dnl $Id: acinclude.m4,v 1.76 2000/05/02 20:56:02 sas Exp $ dnl dnl This file contains local autoconf functions. @@ -35,6 +35,12 @@ ext_shared=no ;; esac + +if test "$php_always_shared"; then + ext_output="yes, shared" + ext_shared=yes + test "[$]$1" = "no" && $1=yes +fi AC_MSG_RESULT($ext_output) ]) Index: php4/pear/Makefile.in diff -u php4/pear/Makefile.in:1.18 php4/pear/Makefile.in:1.19 --- php4/pear/Makefile.in:1.18 Tue May 2 13:10:46 2000 +++ php4/pear/Makefile.in Tue May 2 13:56:03 2000 @@ -48,6 +48,7 @@ sed \ -e 's#@PREFIX@#$(prefix)#' \ -e 's#@PHPINCLUDEDIR@#$(phpincludedir)#g' \ + -e 's#@EXTENSION_DIR@#$(EXTENSION_DIR)#g' \ < $(srcdir)/php-config.in > $(bindir)/php-config.tmp && \ chmod +x $(bindir)/php-config.tmp && \ mv $(bindir)/php-config.tmp $(bindir)/php-config && \ @@ -67,6 +68,6 @@ $(mkinstalldirs) $$paths && \ echo "creating header file hierarchy" && \ for i in $(HEADER_DIRS); do \ - cd $(top_srcdir)/$$i && cp -p *.h $(phpincludedir)/$$i; \ - cd $(top_builddir)/$$i && cp -p *.h $(phpincludedir)/$$i; \ + (cd $(top_srcdir)/$$i && cp -p *.h $(phpincludedir)/$$i; \ + cd $(top_builddir)/$$i && cp -p *.h $(phpincludedir)/$$i) 2>/dev/null || true; \ done Index: php4/pear/pear.m4 diff -u php4/pear/pear.m4:1.2 php4/pear/pear.m4:1.3 --- php4/pear/pear.m4:1.2 Tue May 2 13:10:46 2000 +++ php4/pear/pear.m4 Tue May 2 13:56:03 2000 @@ -11,14 +11,17 @@ prefix=$PHP_CONFIG --prefix 2>/dev/null INCLUDES=$PHP_CONFIG --includes 2>/dev/null + EXTENSION_DIR=$PHP_CONFIG --extension-dir if test -z "$prefix"; then AC_MSG_ERROR(Cannot find php-config. Please use --with-php-config=[PATH]) fi - AC_MSG_CHECKING(PHP prefix) + AC_MSG_CHECKING(for PHP prefix) AC_MSG_RESULT($prefix) - AC_MSG_CHECKING(PHP includes) + AC_MSG_CHECKING(for PHP includes) AC_MSG_RESULT($INCLUDES) + AC_MSG_CHECKING(for PHP extension directory) + AC_MSG_RESULT($EXTENSION_DIR) ]) php_always_shared=yes @@ -44,8 +47,6 @@ test "$prefix" = "NONE" && prefix="/usr/local" test "$exec_prefix" = "NONE" && exec_prefix='$(prefix)' -EXTENSION_DIR="$prefix/lib/php/modules" - PHP_SUBST(prefix) PHP_SUBST(exec_prefix) PHP_SUBST(libdir) @@ -75,6 +76,7 @@ PHP_FAST_GENERATE test -d modules || mkdir modules +touch .deps AC_CONFIG_HEADER(php_config.h) Index: php4/pear/php-config.in diff -u php4/pear/php-config.in:1.1 php4/pear/php-config.in:1.2 --- php4/pear/php-config.in:1.1 Wed Dec 29 18:59:34 1999 +++ php4/pear/php-config.in Tue May 2 13:56:03 2000 @@ -2,14 +2,17 @@ prefix='@PREFIX@' includes='-I@PHPINCLUDEDIR@ -I@PHPINCLUDEDIR@/Zend -I@PHPINCLUDEDIR@/TSRM' +extension_dir='@EXTENSION_DIR@' case "$1" in --prefix) echo $prefix;; --includes) echo $includes;; +--extension-dir) + echo $extension_dir;; *) - echo "Usage: $0 [--prefix|--includes]" + echo "Usage: $0 [--prefix|--includes|--extension-dir]" exit 1;; esac