* m4/mkdirp.m4: Do not require AM_AUX_DIR_EXPAND.

diff --git a/ChangeLog b/ChangeLog
index 362a867c5f947a78738062f94715b78c8fa6a336..f506dc4ecd6a935d76ad97cf1d6e1f2929b94e87 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2003-11-13  Alexandre Duret-Lutz  <adl@gnu.org>
+
+       * m4/mkdirp.m4: Do not require AM_AUX_DIR_EXPAND.
+
 2003-11-12  Alexandre Duret-Lutz  <adl@gnu.org>
 
        * automake.in (scan_autoconf_traces): Honor sinclude.

diff --git a/configure b/configure
index ff7d51dee4dd7c54768046fc645b229978bf3f62..bc3c8897851338866ac61db28a8069a5b5e25faf 100755 (executable)
--- a/configure
+++ b/configure
@@ -1467,7 +1467,7 @@ else
     test -d $d && rmdir $d
   done
   # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
-  if test -f "$am_aux_dir/mkinstalldirs"; then
+  if test -f "$ac_aux_dir/mkinstalldirs"; then
     mkdir_p='$(mkinstalldirs) -m 0755'
   else
     mkdir_p='$(install_sh) -m 0755 -d'

diff --git a/m4/mkdirp.m4 b/m4/mkdirp.m4
index 6958adf33f4ca8c19b867d35d87e07ad3750c3b6..034fc9146ee9a7d967e7672d2b2819d65479be95 100644 (file)
--- a/m4/mkdirp.m4
+++ b/m4/mkdirp.m4
@@ -20,8 +20,7 @@
 # 02111-1307, USA.
 
 AC_DEFUN([AM_PROG_MKDIR_P],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-if mkdir -m 0755 -p -- . 2>/dev/null; then
+[if mkdir -m 0755 -p -- . 2>/dev/null; then
   mkdir_p='mkdir -m 0755 -p --'
 else
   # On NextStep and OpenStep, the `mkdir' command does not
@@ -33,7 +32,7 @@ else
     test -d $d && rmdir $d
   done
   # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
-  if test -f "$am_aux_dir/mkinstalldirs"; then
+  if test -f "$ac_aux_dir/mkinstalldirs"; then
     mkdir_p='$(mkinstalldirs) -m 0755'
   else
     mkdir_p='$(install_sh) -m 0755 -d'