From: foobar <sniper@php.net>
Date: Thu, 2 Jun 2005 21:36:38 +0000 (+0000)
Subject: - Revert previous change in build/libtool.m4 and make sure
X-Git-Tag: php-5.0.1b1~105
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2fa74dab0ecd451a5c96c1527bf04a08ab1c852f;p=php

- Revert previous change in build/libtool.m4 and make sure
  the PATH_SEPARATOR check is only done under autoconf 2.13.
# fixes also the php-gtk buildconf probs
---

diff --git a/acinclude.m4 b/acinclude.m4
index 242e866fb9..a4bf00ebd6 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2413,7 +2413,6 @@ 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 fb8473456f..413ac9bdd0 100644
--- a/build/libtool.m4
+++ b/build/libtool.m4
@@ -9,12 +9,12 @@
 
 # serial 47 AC_PROG_LIBTOOL
 
-
+ifdef([AC_ACVERSION],[
+# autoconf 2.13 compatibility
 # Set PATH_SEPARATOR variable
 # ---------------------------------
 # 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
@@ -23,8 +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)
 # -----------------------------------------------------------
@@ -96,7 +95,6 @@ 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