sniper Tue Jan 28 05:59:12 2003 EDT
Added files:
/php4/build config-stubs
/php4/scripts Makefile.frag php-config.in phpextdist phpize.in
phpize.m4
/php4/scripts/dev conv_proto conv_z_macros credits
Removed files:
/php4/pear pear.m4
/php4/pear/scripts php-config.in phpextdist phpize.in
/php4/scripts config-stubs conv_proto conv_z_macros credits
Modified files:
/php4 Makefile.frag configure.in
/php4/pear Makefile.frag
/php4/pear/scripts .cvsignore
/php4/scripts .cvsignore
Log:
- Fixed bug: #13561 (--without-pear prevents install of phpize, php-config)
Index: php4/Makefile.frag
diff -u php4/Makefile.frag:1.2 php4/Makefile.frag:1.3
--- php4/Makefile.frag:1.2 Sat Mar 16 06:02:35 2002
+++ php4/Makefile.frag Tue Jan 28 05:59:09 2003
@@ -1,3 +1,8 @@
+
+#
+# Zend
+#
+
$(builddir)/zend_language_scanner.lo: $(builddir)/zend_language_parser.h
$(builddir)/zend_ini_scanner.lo: $(builddir)/zend_ini_parser.h
Index: php4/configure.in
diff -u php4/configure.in:1.416 php4/configure.in:1.417
--- php4/configure.in:1.416 Mon Jan 27 15:39:30 2003
+++ php4/configure.in Tue Jan 28 05:59:09 2003
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.416 2003/01/27 20:39:30 iliaa Exp $ -*- sh -*-
+dnl ## $Id: configure.in,v 1.417 2003/01/28 10:59:09 sniper Exp $ -*- sh -*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -231,7 +231,7 @@
PHP_CONFIGURE_PART(Configuring SAPI modules)
-esyscmd(./scripts/config-stubs sapi)
+esyscmd(./build/config-stubs sapi)
dnl Show which main SAPI was selected
AC_MSG_CHECKING([for chosen SAPI module])
@@ -617,7 +617,7 @@
--without-pear Do not install PEAR], DEFAULT, no)
if test "$PHP_PEAR" != "no" && test "$PHP_SAPI_CLI" != "no"; then
- install_pear="install-pear install-build install-headers install-programs"
+ install_pear="install-pear"
PEAR_INSTALLDIR=$PHP_PEAR
fi
@@ -778,7 +778,7 @@
])
# reading config stubs
-esyscmd(./scripts/config-stubs ext)
+esyscmd(./build/config-stubs ext)
dnl Other settings.
@@ -1084,7 +1084,7 @@
CXXFLAGS="$CXXFLAGS $standard_libtool_flag"
all_targets='$(OVERALL_TARGET) $(PHP_MODULES) $(PHP_CLI_TARGET)'
-install_targets="install-sapi install-modules $install_pear"
+install_targets="install-sapi install-modules $install_pear install-build
+install-headers install-programs"
if test "$PHP_SAPI" != "cgi"; then
install_targets="$PHP_INSTALL_CLI_TARGET $install_targets"
fi
@@ -1103,7 +1103,7 @@
PHP_ADD_SOURCES(/main, internal_functions.c,, sapi)
PHP_ADD_SOURCES(/main, internal_functions_cli.c,, cli)
-PHP_ADD_SOURCES(/Zend, zend_language_parser.c zend_language_scanner.c \
+PHP_ADD_SOURCES(/Zend, zend_language_parser.c zend_language_scanner.c \
zend_ini_parser.c zend_ini_scanner.c)
PHP_ADD_SOURCES(Zend, \
@@ -1134,7 +1134,7 @@
PHP_ADD_BUILD_DIR(TSRM)
PHP_ADD_BUILD_DIR(Zend)
-
+PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/scripts/Makefile.frag,$abs_srcdir/scripts,scripts)
PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/pear/Makefile.frag,$abs_srcdir/pear,pear)
PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/Makefile.frag,$abs_srcdir/Zend,Zend)
@@ -1144,8 +1144,10 @@
AC_DEFINE([HAVE_BUILD_DEFS_H], 1, [ ])
$php_shtool mkdir -p pear/scripts
+$php_shtool mkdir -p scripts
+
ALL_OUTPUT_FILES="php4.spec main/build-defs.h \
-pear/scripts/phpize pear/scripts/php-config \
+scripts/phpize scripts/php-config \
$PHP_OUTPUT_FILES"
AC_OUTPUT($ALL_OUTPUT_FILES, [], [
Index: php4/pear/Makefile.frag
diff -u php4/pear/Makefile.frag:1.30 php4/pear/Makefile.frag:1.31
--- php4/pear/Makefile.frag:1.30 Tue Nov 19 09:45:13 2002
+++ php4/pear/Makefile.frag Tue Jan 28 05:59:10 2003
@@ -1,11 +1,5 @@
# -*- makefile -*-
-pear_install_targets = \
- install-pear \
- install-headers \
- install-build \
- install-programs
-
peardir=$(PEAR_INSTALLDIR)
# Skip all php.ini files altogether
@@ -26,69 +20,9 @@
exit 5; \
fi
-phpincludedir = $(includedir)/php
-phpbuilddir = $(prefix)/lib/php/build
-
-BUILD_FILES = \
- pear/pear.m4 \
- build/mkdep.awk \
- build/shtool \
- Makefile.global \
- scan_makefile_in.awk \
- acinclude.m4
-
-bin_SCRIPTS = phpize php-config
-bin_src_SCRIPTS = phpextdist
-
-install-build:
- @echo "Installing build environment: $(INSTALL_ROOT)$(phpbuilddir)/"
- @$(mkinstalldirs) $(INSTALL_ROOT)$(phpbuilddir) $(INSTALL_ROOT)$(bindir) && \
- (cd $(top_srcdir) && cp $(BUILD_FILES) $(INSTALL_ROOT)$(phpbuilddir))
-
-install-programs:
- @echo "Installing helper programs: $(INSTALL_ROOT)$(bindir)/"
- @for prog in $(bin_SCRIPTS); do \
- echo " program: $$prog"; \
- $(INSTALL) -m 755 $(builddir)/scripts/$$prog
$(INSTALL_ROOT)$(bindir)/$$prog; \
- done
- @for prog in $(bin_src_SCRIPTS); do \
- echo " program: $$prog"; \
- $(INSTALL) -m 755 $(srcdir)/scripts/$$prog
$(INSTALL_ROOT)$(bindir)/$$prog; \
- done
-
-HEADER_DIRS = \
- / \
- Zend \
- TSRM \
- ext/standard \
- ext/session \
- ext/xml \
- ext/xml/expat \
- main \
- ext/mbstring \
- ext/pgsql \
- regex
-
-install-headers:
- -@for i in $(HEADER_DIRS); do \
- paths="$$paths $(INSTALL_ROOT)$(phpincludedir)/$$i"; \
- done; \
- $(mkinstalldirs) $$paths && \
- echo "Installing header files: $(INSTALL_ROOT)$(phpincludedir)/" && \
- for i in $(HEADER_DIRS); do \
- (cd $(top_srcdir)/$$i && cp -p *.h
$(INSTALL_ROOT)$(phpincludedir)/$$i; \
- cd $(top_builddir)/$$i && cp -p *.h
$(INSTALL_ROOT)$(phpincludedir)/$$i) 2>/dev/null || true; \
- done; \
- cd $(top_srcdir)/sapi/embed && cp -p *.h $(INSTALL_ROOT)$(phpincludedir)/main
-
#$(builddir)/scripts/pear: $(srcdir)/scripts/pear.in $(top_builddir)/config.status
# (CONFIG_FILES=$@ CONFIG_HEADERS= $(top_builddir)/config.status)
-$(builddir)/scripts/phpize: $(srcdir)/scripts/phpize.in $(top_builddir)/config.status
- (CONFIG_FILES=$@ CONFIG_HEADERS= $(top_builddir)/config.status)
-
#$(builddir)/scripts/phptar: $(srcdir)/scripts/phptar.in $(top_builddir)/config.status
# (CONFIG_FILES=$@ CONFIG_HEADERS= $(top_builddir)/config.status)
-$(builddir)/scripts/php-config: $(srcdir)/scripts/php-config.in
$(top_builddir)/config.status
- (CONFIG_FILES=$@ CONFIG_HEADERS= $(top_builddir)/config.status)
Index: php4/pear/scripts/.cvsignore
diff -u php4/pear/scripts/.cvsignore:1.6 php4/pear/scripts/.cvsignore:1.7
--- php4/pear/scripts/.cvsignore:1.6 Sat Apr 20 05:30:36 2002
+++ php4/pear/scripts/.cvsignore Tue Jan 28 05:59:10 2003
@@ -1,7 +1,5 @@
.deps
-phpize
run-tests
-php-config
pear
pearize
phptar
Index: php4/scripts/.cvsignore
diff -u /dev/null php4/scripts/.cvsignore:1.4
--- /dev/null Tue Jan 28 05:59:12 2003
+++ php4/scripts/.cvsignore Tue Jan 28 05:59:11 2003
@@ -0,0 +1,2 @@
+phpize
+php-config
Index: php4/scripts/Makefile.frag
+++ php4/scripts/Makefile.frag
#
# Build environment install
#
phpincludedir = $(includedir)/php
phpbuilddir = $(prefix)/lib/php/build
BUILD_FILES = \
scripts/phpize.m4 \
build/mkdep.awk \
build/shtool \
Makefile.global \
scan_makefile_in.awk \
acinclude.m4
bin_SCRIPTS = phpize php-config
bin_src_SCRIPTS = phpextdist
install-build:
@echo "Installing build environment: $(INSTALL_ROOT)$(phpbuilddir)/"
@$(mkinstalldirs) $(INSTALL_ROOT)$(phpbuilddir) $(INSTALL_ROOT)$(bindir) && \
(cd $(top_srcdir) && cp $(BUILD_FILES) $(INSTALL_ROOT)$(phpbuilddir))
HEADER_DIRS = \
/ \
Zend \
TSRM \
ext/standard \
ext/session \
ext/xml \
ext/xml/expat \
main \
ext/mbstring \
ext/pgsql \
regex
install-headers:
-@for i in $(HEADER_DIRS); do \
paths="$$paths $(INSTALL_ROOT)$(phpincludedir)/$$i"; \
done; \
$(mkinstalldirs) $$paths && \
echo "Installing header files: $(INSTALL_ROOT)$(phpincludedir)/" && \
for i in $(HEADER_DIRS); do \
(cd $(top_srcdir)/$$i && cp -p *.h
$(INSTALL_ROOT)$(phpincludedir)/$$i; \
cd $(top_builddir)/$$i && cp -p *.h
$(INSTALL_ROOT)$(phpincludedir)/$$i) 2>/dev/null || true; \
done; \
cd $(top_srcdir)/sapi/embed && cp -p *.h $(INSTALL_ROOT)$(phpincludedir)/main
install-programs:
@echo "Installing helper programs: $(INSTALL_ROOT)$(bindir)/"
@for prog in $(bin_SCRIPTS); do \
echo " program: $$prog"; \
$(INSTALL) -m 755 $(builddir)/$$prog $(INSTALL_ROOT)$(bindir)/$$prog; \
done
@for prog in $(bin_src_SCRIPTS); do \
echo " program: $$prog"; \
$(INSTALL) -m 755 $(top_srcdir)/scripts/$$prog
$(INSTALL_ROOT)$(bindir)/$$prog; \
done
$(builddir)/phpize: $(srcdir)/phpize.in $(top_builddir)/config.status
(CONFIG_FILES=$@ CONFIG_HEADERS= $(top_builddir)/config.status)
$(builddir)/php-config: $(srcdir)/php-config.in $(top_builddir)/config.status
(CONFIG_FILES=$@ CONFIG_HEADERS= $(top_builddir)/config.status)
Index: php4/scripts/php-config.in
+++ php4/scripts/php-config.in
#! /bin/sh
prefix="@prefix@"
version="@PHP_VERSION@"
includedir="@includedir@/php"
includes="-I$includedir -I$includedir/main -I$includedir/Zend"
ldflags="@PHP_LDFLAGS@"
libs="@EXTRA_LIBS@"
if test '@TSRM_DIR@' != ''; then
includes="$includes -I$includedir/TSRM"
fi
extension_dir='@EXTENSION_DIR@'
case "$1" in
--prefix)
echo $prefix;;
--includes)
echo $includes;;
--ldflags)
echo $ldflags;;
--libs)
echo $libs;;
--extension-dir)
echo $extension_dir;;
--version)
echo $version;;
*)
echo "Usage: $0
[--prefix|--includes|--ldflags|--libs|--extension-dir|--version]"
exit 1;;
esac
exit 0
Index: php4/scripts/phpize.in
+++ php4/scripts/phpize.in
#! /bin/sh
prefix='@prefix@'
phpdir="$prefix/lib/php/build"
includedir="$prefix/include/php"
builddir="`pwd`"
FILES_BUILD="mkdep.awk shtool"
FILES="acinclude.m4 Makefile.global scan_makefile_in.awk"
CLEAN_FILES="$FILES *.lo *.la *.o .deps .libs/ build/ include/ modules/ install-sh \
mkinstalldirs missing config.nice config.sub config.guess configure configure.in \
aclocal.m4 config.h config.h.in conftest* ltmain.sh libtool config.cache \
config.log config.status Makefile Makefile.fragments Makefile.objects"
if test ! -r config.m4; then
echo "Cannot find config.m4. "
echo "Make sure that you run $0 in the top level source directory of the module"
exit 1
fi
# Cleanup
if test "$1" = "--clean"; then
echo "Cleaning.."
for i in $CLEAN_FILES; do
test -e && rm -rf $i
done
exit 0
fi
test -d build || mkdir build
(cd $phpdir && cp $FILES_BUILD "$builddir"/build)
(cd $phpdir && cp $FILES "$builddir")
sed \
-e "s#@prefix@#$prefix#" \
< $phpdir/phpize.m4 > configure.in
touch install-sh mkinstalldirs missing
aclocal
autoconf
autoheader
libtoolize -f -c
# dumping API NOs:
PHP_API_VERSION=`grep -E '#define PHP_API_VERSION' $includedir/main/php.h|sed
's/#define PHP_API_VERSION//'`
ZEND_MODULE_API_NO=`grep -E '#define ZEND_MODULE_API_NO'
$includedir/Zend/zend_modules.h|sed 's/#define ZEND_MODULE_API_NO//'`
ZEND_EXTENSION_API_NO=`grep -E '#define ZEND_EXTENSION_API_NO'
$includedir/Zend/zend_extensions.h|sed 's/#define ZEND_EXTENSION_API_NO//'`
echo "Configuring for:"
echo " PHP Api Version: "$PHP_API_VERSION
echo " Zend Module Api No: "$ZEND_MODULE_API_NO
echo " Zend Extension Api No: "$ZEND_EXTENSION_API_NO
exit 0
Index: php4/scripts/phpize.m4
+++ php4/scripts/phpize.m4
dnl This file becomes configure.in for self-contained extensions.
AC_INIT(config.m4)
PHP_INIT_BUILD_SYSTEM
AC_DEFUN(PHP_WITH_PHP_CONFIG,[
AC_ARG_WITH(php-config,
[ --with-php-config=PATH],[
PHP_CONFIG=$withval
],[
PHP_CONFIG=php-config
])
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(for PHP prefix)
AC_MSG_RESULT($prefix)
AC_MSG_CHECKING(for PHP includes)
AC_MSG_RESULT($INCLUDES)
AC_MSG_CHECKING(for PHP extension directory)
AC_MSG_RESULT($EXTENSION_DIR)
])
dnl
AC_DEFUN(PHP_EXT_BUILDDIR,[.])dnl
AC_DEFUN(PHP_EXT_DIR,[""])dnl
AC_DEFUN(PHP_EXT_SRCDIR,[$abs_srcdir])dnl
AC_DEFUN(PHP_ALWAYS_SHARED,[
ext_output="yes, shared"
ext_shared=yes
test "[$]$1" = "no" && $1=yes
])dnl
dnl
abs_srcdir=`(cd $srcdir && pwd)`
abs_builddir=`pwd`
PHP_CONFIG_NICE(config.nice)
AC_PROG_CC
AC_PROG_CC_C_O
PHP_RUNPATH_SWITCH
PHP_SHLIB_SUFFIX_NAME
PHP_WITH_PHP_CONFIG
PHP_BUILD_SHARED
AC_PREFIX_DEFAULT()
AC_ARG_WITH(openssl,
[ --with-openssl[=DIR] Include OpenSSL support (requires OpenSSL >= 0.9.5) ],
[
if test "$withval" != "no"; then
PHP_WITH_SHARED
PHP_OPENSSL=$withval
ext_openssl_shared=yes
ext_shared=yes
PHP_SETUP_OPENSSL
fi
])
sinclude(config.m4)
enable_static=no
enable_shared=yes
AC_PROG_LIBTOOL
AC_PROG_AWK
all_targets='$(PHP_MODULES)'
install_targets=install-modules
phplibdir="`pwd`/modules"
CPPFLAGS="$CPPFLAGS -DHAVE_CONFIG_H"
CFLAGS_CLEAN=$CFLAGS
test "$prefix" = "NONE" && prefix="/usr/local"
test "$exec_prefix" = "NONE" && exec_prefix='$(prefix)'
PHP_SUBST(PHP_MODULES)
PHP_SUBST(all_targets)
PHP_SUBST(install_targets)
PHP_SUBST(prefix)
PHP_SUBST(exec_prefix)
PHP_SUBST(libdir)
PHP_SUBST(prefix)
PHP_SUBST(phplibdir)
PHP_SUBST(PHP_COMPILE)
PHP_SUBST(CC)
PHP_SUBST(CFLAGS)
PHP_SUBST(CFLAGS_CLEAN)
PHP_SUBST(CPP)
PHP_SUBST(CPPFLAGS)
PHP_SUBST(CXX)
PHP_SUBST(DEFS)
PHP_SUBST(EXTENSION_DIR)
PHP_SUBST(EXTRA_LDFLAGS)
PHP_SUBST(EXTRA_LIBS)
PHP_SUBST(INCLUDES)
PHP_SUBST(LEX)
PHP_SUBST(LEX_OUTPUT_ROOT)
PHP_SUBST(LFLAGS)
PHP_SUBST(LDFLAGS)
PHP_SUBST(SHARED_LIBTOOL)
PHP_SUBST(LIBTOOL)
PHP_SUBST(SHELL)
PHP_SUBST(AWK)
PHP_GEN_BUILD_DIRS
PHP_GEN_GLOBAL_MAKEFILE
test -d modules || mkdir modules
touch .deps
AC_CONFIG_HEADER(config.h)
AC_OUTPUT()
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
