Sophie

Sophie

distrib > Mageia > 5 > i586 > media > core-updates-src > by-pkgid > 5dc7169b4d6a6f6de76171e3d1c3a97e > files > 33

php-5.6.11-1.mga5.src.rpm

diff -Naur php-5.5.4RC1/build/build2.mk php-5.5.4RC1.oden/build/build2.mk
--- php-5.5.4RC1/build/build2.mk	2013-09-05 10:12:45.000000000 +0200
+++ php-5.5.4RC1.oden/build/build2.mk	2013-09-06 12:39:18.456939684 +0200
@@ -29,6 +29,7 @@
 
 PHP_AUTOCONF ?= 'autoconf'
 PHP_AUTOHEADER ?= 'autoheader'
+PHP_ACLOCAL ?= 'aclocal'
 
 SUPPRESS_WARNINGS ?= 2>&1 | (egrep -v '(AC_TRY_RUN called without default to allow cross compiling|AC_PROG_CXXCPP was called before AC_PROG_CXX|defined in acinclude.m4 but never used|AC_PROG_LEX invoked multiple times|AC_DECL_YYTEXT is expanded from...|the top level)'||true)
 
diff -Naur php-5.5.4RC1/scripts/phpize.in php-5.5.4RC1.oden/scripts/phpize.in
--- php-5.5.4RC1/scripts/phpize.in	2013-09-05 10:12:45.000000000 +0200
+++ php-5.5.4RC1.oden/scripts/phpize.in	2013-09-06 12:40:01.203942074 +0200
@@ -9,9 +9,11 @@
 builddir="`pwd`"
 SED="@SED@"
 
+export WANT_AUTOCONF_2_5="1"
+
 FILES_BUILD="mkdep.awk scan_makefile_in.awk shtool libtool.m4"
 FILES="acinclude.m4 Makefile.global config.sub config.guess ltmain.sh run-tests*.php"
-CLEAN_FILES="$FILES *.o *.lo *.la .deps .libs/ build/ modules/ install-sh \
+CLEAN_FILES="$FILES *.so *.o *.lo* *.la .deps .libs/ build/ 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 autom4te.cache/ \
 	config.log config.status Makefile Makefile.fragments Makefile.objects confdefs.h \
@@ -121,6 +123,7 @@
 {
   test -z "$PHP_AUTOCONF" && PHP_AUTOCONF=autoconf
   test -z "$PHP_AUTOHEADER" && PHP_AUTOHEADER=autoheader
+  test -z "$PHP_ACLOCAL" && PHP_ACLOCAL=aclocal
   
   if test ! -x "$PHP_AUTOCONF" && test ! -x "`$php_shtool path $PHP_AUTOCONF`"; then
     cat <<EOF
@@ -138,6 +141,14 @@
 EOF
     exit 1
   fi
+  if ! test -x "`$php_shtool path $PHP_ACLOCAL`"; then
+    cat <<EOF
+Cannot find aclocal. Please check your autoconf installation and the \$PHP_ACLOCAL 
+environment variable is set correctly and then rerun this script. 
+
+EOF
+    exit 1
+  fi
 }
 
 phpize_copy_files()
@@ -151,13 +162,13 @@
 
 phpize_replace_prefix()
 {
-  $SED \
-  -e "s#@prefix@#$prefix#" \
-  < "$phpdir/phpize.m4" > configure.in
+  cp $phpdir/phpize.m4 configure.in
 }
 
 phpize_autotools()
 {
+  libtoolize --copy --force || exit 1
+  $PHP_ACLOCAL    || exit 1
   $PHP_AUTOCONF   || exit 1
   $PHP_AUTOHEADER || exit 1
 }