diff options
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/Makefile.frag | 2 | ||||
| -rw-r--r-- | scripts/phpize.in | 6 | ||||
| -rw-r--r-- | scripts/phpize.m4 | 12 |
3 files changed, 4 insertions, 16 deletions
diff --git a/scripts/Makefile.frag b/scripts/Makefile.frag index 5490752d91..b4c61f6dcb 100644 --- a/scripts/Makefile.frag +++ b/scripts/Makefile.frag @@ -10,8 +10,8 @@ BUILD_FILES = \ scripts/phpize.m4 \ build/mkdep.awk \ build/shtool \ + build/scan_makefile_in.awk \ Makefile.global \ - scan_makefile_in.awk \ acinclude.m4 bin_SCRIPTS = phpize php-config diff --git a/scripts/phpize.in b/scripts/phpize.in index ce20a6d228..a2e3631303 100644 --- a/scripts/phpize.in +++ b/scripts/phpize.in @@ -5,8 +5,8 @@ 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" +FILES_BUILD="mkdep.awk scan_makefile_in.awk shtool" +FILES="acinclude.m4 Makefile.global" 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 \ @@ -57,7 +57,7 @@ touch install-sh mkinstalldirs missing aclocal || exit 1 autoconf || exit 1 autoheader || exit 1 -libtoolize=`$phpdir/shtool path glibtoolize libtoolize` +libtoolize=`$builddir/build/shtool path glibtoolize libtoolize` $libtoolize -f -c || exit 1 # dumping API NOs: diff --git a/scripts/phpize.m4 b/scripts/phpize.m4 index 147d80fda3..d60d3df0c0 100644 --- a/scripts/phpize.m4 +++ b/scripts/phpize.m4 @@ -54,18 +54,6 @@ 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 -]) - AC_PROG_AWK sinclude(config.m4) |