- Fixed bug: #13561 (--without-pear prevents install of phpize, php-config)

diff --git a/Makefile.frag b/Makefile.frag
index ff6bf06234d1b09d488bec887a5d4730868d5629..2a4aa1c7f8cb58d927d83cc78879701062a70543 100644 (file)
--- a/Makefile.frag
+++ b/Makefile.frag
@@ -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
 

diff --git a/scripts/config-stubs b/build/config-stubs
similarity index 100%
rename from scripts/config-stubs
rename to build/config-stubs

diff --git a/configure.in b/configure.in
index 2532ededfe6058514f736f510852a7f286e8c2be..6a9aa686b0630bdc9989ea1bf42a1ac4f759a70a 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -231,7 +231,7 @@ SAPI_LIBTOOL=libphp4.la
 
 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 @@ PHP_ARG_WITH(pear, [whether to install PEAR, and where],
   --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 @@ AC_ARG_ENABLE(all,
 ])
 
 # reading config stubs
-esyscmd(./scripts/config-stubs ext)
+esyscmd(./build/config-stubs ext)
 
 
 dnl Other settings.
@@ -1084,7 +1084,7 @@ INLINE_CFLAGS="$INLINE_CFLAGS $standard_libtool_flag"
 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, main.c snprintf.c spprintf.c php_sprintf.c \
 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(sapi/$PHP_SAPI sapi/cli)
 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 @@ PHP_GEN_GLOBAL_MAKEFILE
 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, [], [

diff --git a/pear/Makefile.frag b/pear/Makefile.frag
index 2b02b50109e948b5fd109463d1abb2a2ebe173f3..4168c75a7b04e0925b821df92c52de2869f4e63f 100644 (file)
--- a/pear/Makefile.frag
+++ b/pear/Makefile.frag
@@ -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 @@ install-pear:
                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)

diff --git a/scripts/Makefile.frag b/scripts/Makefile.frag
new file mode 100644 (file)
index 0000000..7dc699d
--- /dev/null
+++ b/scripts/Makefile.frag
@@ -0,0 +1,65 @@
+
+#
+# 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)

diff --git a/scripts/conv_proto b/scripts/dev/conv_proto
similarity index 100%
rename from scripts/conv_proto
rename to scripts/dev/conv_proto

diff --git a/scripts/conv_z_macros b/scripts/dev/conv_z_macros
similarity index 100%
rename from scripts/conv_z_macros
rename to scripts/dev/conv_z_macros

diff --git a/scripts/credits b/scripts/dev/credits
similarity index 100%
rename from scripts/credits
rename to scripts/dev/credits

diff --git a/pear/scripts/php-config.in b/scripts/php-config.in
similarity index 77%
rename from pear/scripts/php-config.in
rename to scripts/php-config.in
index 5978ff2885289172f3250001375e8fbdf8abaf7e..abdab2ce0e581653955e3bc7612fd2d727af095f 100644 (file)
--- a/pear/scripts/php-config.in
+++ b/scripts/php-config.in
@@ -4,6 +4,7 @@ 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"
@@ -15,6 +16,8 @@ case "$1" in
        echo $prefix;;
 --includes)
        echo $includes;;
+--ldflags)
+       echo $ldflags;;
 --libs)
        echo $libs;;
 --extension-dir)
@@ -22,7 +25,7 @@ case "$1" in
 --version)
        echo $version;;
 *)
-       echo "Usage: $0 [--prefix|--includes|--libs|--extension-dir|--version]"
+       echo "Usage: $0 [--prefix|--includes|--ldflags|--libs|--extension-dir|--version]"
        exit 1;;
 esac
 

diff --git a/pear/scripts/phpextdist b/scripts/phpextdist
similarity index 100%
rename from pear/scripts/phpextdist
rename to scripts/phpextdist

diff --git a/pear/scripts/phpize.in b/scripts/phpize.in
similarity index 70%
rename from pear/scripts/phpize.in
rename to scripts/phpize.in
index c77694f8c3308e2d623884971236bb05d1a4df65..66ba42068a4420525a19b3274f831298e6a5e299 100644 (file)
--- a/pear/scripts/phpize.in
+++ b/scripts/phpize.in
@@ -4,8 +4,13 @@ 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. "
@@ -13,6 +18,15 @@ if test ! -r config.m4; then
   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)
@@ -20,7 +34,7 @@ test -d build || mkdir build
 
 sed \
 -e "s#@prefix@#$prefix#" \
-< $phpdir/pear.m4 > configure.in
+< $phpdir/phpize.m4 > configure.in
 
 touch install-sh mkinstalldirs missing
 

diff --git a/pear/pear.m4 b/scripts/phpize.m4
similarity index 100%
rename from pear/pear.m4
rename to scripts/phpize.m4