- Changed the PATH_SEPARATOR check to a macro

- Made sure we're generating aclocal.m4 in same way with both buildconf
  and phpize.
# Bug #33177

diff --git a/acinclude.m4 b/acinclude.m4
index db2cd40ab227c54b24382a01a19fea2b94aa2072..96239a596686b8ace5ea8c6b94c36a84028ea121 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2413,6 +2413,7 @@ dnl
 dnl Generates the config.nice file
 dnl
 AC_DEFUN([PHP_CONFIG_NICE],[
+  AC_REQUIRE([LT_AC_PATH_SEPARATOR])
   AC_REQUIRE([AC_PROG_EGREP])
   AC_REQUIRE([LT_AC_PROG_SED])
   PHP_SUBST(EGREP)

diff --git a/build/libtool.m4 b/build/libtool.m4
index b2738277db17e39e389ffa846cb67c2a9bb5265b..fb8473456fd5bff011f673216b56c9bf6918ecfa 100644 (file)
--- a/build/libtool.m4
+++ b/build/libtool.m4
@@ -14,6 +14,7 @@
 # ---------------------------------
 # Find the correct PATH separator.  Usually this is :', but
 # DJGPP uses ;' like DOS.
+AC_DEFUN([LT_AC_PATH_SEPARATOR], [
 if test "X${PATH_SEPARATOR+set}" != Xset; then
   UNAME=${UNAME-`uname 2>/dev/null`}
   case X$UNAME in
@@ -22,6 +23,7 @@ if test "X${PATH_SEPARATOR+set}" != Xset; then
   esac
   PATH_SEPARATOR=$lt_cv_sys_path_separator
 fi
+]) # LT_AC_PATH_SEPARATOR
 
 
 # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
@@ -33,7 +35,6 @@ ifdef([AC_PROVIDE_IFELSE],
                 [ifdef([AC_PROVIDE_$1],
                           [$2], [$3])])])
 
-
 # AC_PROG_LIBTOOL
 # ---------------
 AC_DEFUN([AC_PROG_LIBTOOL],
@@ -95,6 +96,7 @@ define([AC_PROG_LIBTOOL], [])
 # ----------------
 AC_DEFUN([AC_LIBTOOL_SETUP],
 [AC_PREREQ(2.13)dnl
+AC_REQUIRE([LT_AC_PATH_SEPARATOR])dnl
 AC_REQUIRE([AC_ENABLE_SHARED])dnl
 AC_REQUIRE([AC_ENABLE_STATIC])dnl
 AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl

diff --git a/scripts/phpize.in b/scripts/phpize.in
index 3a901743681db61eb7224c34d1697d20f88ee3e6..f4530667cb811e95fc25c718452cc82b428b0306 100644 (file)
--- a/scripts/phpize.in
+++ b/scripts/phpize.in
@@ -114,7 +114,7 @@ phpize_copy_files()
  
   (cd "$phpdir" && cp $FILES_BUILD "$builddir"/build)
   (cd "$phpdir" && cp $FILES "$builddir")
-  (cd "$builddir" && cat acinclude.m4 ./build/libtool.m4 > aclocal.m4)
+  (cd "$builddir" && cat ./build/libtool.m4 acinclude.m4 > aclocal.m4)
 }
 
 phpize_replace_prefix()