From: Tim Van Holder <tim.van.holder@pandora.be>
Date: Sun, 23 Sep 2001 10:16:50 +0000 (+0000)
Subject: * m4/auxdir.m4, m4/init.m4: Require autoconf 2.50 and rely on it to
X-Git-Tag: Release-1-5b~141
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=123047c10bb9d297719a74b182b430bd3424185a;p=automake.git

* m4/auxdir.m4, m4/init.m4: Require autoconf 2.50 and rely on it to
  neutralize CDPATH for us.
* m4/init.m4: Don't substitute EXEEXT or OBJEXT anymore.
* lib/am/texibuild.am: Use @PATH_SEPARATOR@, not ':' to build
  TEXINPUTS.
---

diff --git a/ChangeLog b/ChangeLog
index d6d2b37f..3d47f63a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2001-09-23  Tim Van Holder  <tim.van.holder@pandora.be>
+
+	* m4/auxdir.m4, m4/init.m4: Require autoconf 2.50 and rely on it to
+	neutralize CDPATH for us.
+	* m4/init.m4: Don't substitute EXEEXT or OBJEXT anymore.
+	* lib/am/texibuild.am: Use @PATH_SEPARATOR@, not ':' to build
+	TEXINPUTS.
+
 2001-09-22  Akim Demaille  <akim@epita.fr>
 
 	* configure.in, NEWS: Bump to 1.5a.
diff --git a/lib/am/texibuild.am b/lib/am/texibuild.am
index f36ba764..f76010fc 100644
--- a/lib/am/texibuild.am
+++ b/lib/am/texibuild.am
@@ -35,7 +35,7 @@
 ?CYGNUS?	  -I $(srcdir) $<
 
 .%SUFFIX%.dvi:
-	TEXINPUTS=%TEXINFODIR%:$$TEXINPUTS \
+	TEXINPUTS="%TEXINFODIR%$(PATH_SEPARATOR)$$TEXINPUTS" \
 ## Must set MAKEINFO like this so that version.texi will be found even
 ## if it is in srcdir.
 	MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
diff --git a/m4/auxdir.m4 b/m4/auxdir.m4
index 2a47d085..0e84e110 100644
--- a/m4/auxdir.m4
+++ b/m4/auxdir.m4
@@ -55,7 +55,10 @@
 # absolute PATH.  The drawback is that using absolute paths prevent a
 # configured tree to be moved without reconfiguration.
 
+# Rely on autoconf to set up CDPATH properly.
+AC_PREREQ([2.50])
+
 AC_DEFUN([AM_AUX_DIR_EXPAND], [
 # expand $ac_aux_dir to an absolute path
-am_aux_dir=`CDPATH=:; cd $ac_aux_dir && pwd`
+am_aux_dir=`cd $ac_aux_dir && pwd`
 ])
diff --git a/m4/init.m4 b/m4/init.m4
index 7f2a1341..26b676d1 100644
--- a/m4/init.m4
+++ b/m4/init.m4
@@ -28,8 +28,9 @@
 # CC etc. in the Makefile, will ask for an AC_PROG_CC use...
 
 
-# We require 2.13 because we rely on SHELL being computed by configure.
-AC_PREREQ([2.13])
+# We require 2.50 because we need the PATH_SEPARATOR output variable, and
+# we rely on autoconf to neutralize CDPATH.
+AC_PREREQ([2.50])
 
 # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
 # -----------------------------------------------------------
@@ -50,7 +51,7 @@ ifdef([AC_PROVIDE_IFELSE],
 AC_DEFUN([AM_INIT_AUTOMAKE],
 [AC_REQUIRE([AC_PROG_INSTALL])dnl
 # test to see if srcdir already configured
-if test "`CDPATH=:; cd $srcdir && pwd`" != "`pwd`" &&
+if test "`cd $srcdir && pwd`" != "`pwd`" &&
    test -f $srcdir/config.status; then
   AC_MSG_ERROR([source directory already configured; run \"make distclean\" there first])
 fi
@@ -69,15 +70,6 @@ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])
 ifdef([m4_pattern_allow],
       [m4_pattern_allow([^AM_[A-Z]+FLAGS])])dnl
 
-# Autoconf 2.50 always computes EXEEXT.  However we need to be
-# compatible with 2.13, for now.  So we always define EXEEXT, but we
-# don't compute it.
-AC_SUBST(EXEEXT)
-# Similar for OBJEXT -- only we only use OBJEXT if the user actually
-# requests that it be used.  This is a bit dumb.
-: ${OBJEXT=o}
-AC_SUBST(OBJEXT)
-
 # Some tools Automake needs.
 AC_REQUIRE([AM_SANITY_CHECK])dnl
 AC_REQUIRE([AC_ARG_PROGRAM])dnl