diff options
| -rw-r--r-- | acinclude.m4 | 1 | ||||
| -rw-r--r-- | build/libtool.m4 | 4 | ||||
| -rw-r--r-- | scripts/phpize.in | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index db2cd40ab2..96239a5966 100644 --- 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 b2738277db..fb8473456f 100644 --- 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 3a90174368..f4530667cb 100644 --- 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() |