Revert "Improve AC_CONFIG_AUX_DIRS a bit." to fix shtool usage.

* lib/autoconf/general.m4 (AC_CONFIG_AUX_DIRS): Revert test for
shtool as install script.  Regression introduced in 2.64.
* NEWS, THANKS: Update.
Report by Dmitry Grebeniuk.

This reverts commit 93d9386de9c1320afed43f1337ac5ddb2d2dcbb4.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

diff --git a/ChangeLog b/ChangeLog
index 568a748986356356a2f0f685dedfe825c1a233cc..528ff2b0e15088e4dbbbfe903d69f89228ab72f2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-12-12  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       Revert "Improve AC_CONFIG_AUX_DIRS a bit." to fix shtool usage.
+       * lib/autoconf/general.m4 (AC_CONFIG_AUX_DIRS): Revert test for
+       shtool as install script.  Regression introduced in 2.64.
+       * NEWS, THANKS: Update.
+       Report by Dmitry Grebeniuk.
+       This reverts commit 93d9386de9c1320afed43f1337ac5ddb2d2dcbb4.
+
 2009-12-09  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        Fix NEWS description for AC_FUNC_MMAP entry.

diff --git a/NEWS b/NEWS
index 69cca79fe16092f34a4ac1e54d70a60227674813..6c398f3fd8e88530026a116bdbac706da164bfda 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -11,6 +11,9 @@ GNU Autoconf NEWS - User visible changes.
 ** The macros AC_TYPE_INT8_T, AC_TYPE_INT16_T, AC_TYPE_INT32_T, and
    AC_TYPE_INT64_T work again.  Regression introduced in 2.65.
 
+** AC_PROG_INSTALL correctly uses `shtool' again.  Regression introduced
+   in 2.64.
+
 * Major changes in Autoconf 2.65 (2009-11-21) [stable]
   Released by Eric Blake, based on git versions 2.64.*.
 

diff --git a/THANKS b/THANKS
index 5ec7633fc05e74dfc95c03d2ddc12972f0dfe1be..623a2978b737e3a388c9f3c1c3de9ab2b242e453 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -105,6 +105,7 @@ Derek R. Price              derek.price@openavenue.com
 Didier Desseaux             didess@infonie.fr
 Didier Verna                didier@xemacs.org
 Dietmar P. Schindler        schd@mra.man.de
+Dmitry Grebeniuk            gdsfh1@gmail.com
 Doug Evans                  dje@canuck.cygnus.com
 Dries Kimpe                 ?
 Edouard Bechetoille         ebecheto@ens-lyon.fr

diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index e34bea4d04b0857e611b0205b4e46c1b7f34e75a..e41c2c99441d062d2364c190e4101be910c7b40f 100644 (file)
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -1680,13 +1680,19 @@ AC_DEFUN([AC_CONFIG_AUX_DIR_DEFAULT],
 AC_DEFUN([AC_CONFIG_AUX_DIRS],
 [ac_aux_dir=
 for ac_dir in $1; do
-  for ac_t in install-sh install.sh shtool; do
-    if test -f "$ac_dir/$ac_t"; then
-      ac_aux_dir=$ac_dir
-      ac_install_sh="$ac_aux_dir/$ac_t -c"
-      break 2
-    fi
-  done
+  if test -f "$ac_dir/install-sh"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install-sh -c"
+    break
+  elif test -f "$ac_dir/install.sh"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install.sh -c"
+    break
+  elif test -f "$ac_dir/shtool"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/shtool install -c"
+    break
+  fi
 done
 if test -z "$ac_aux_dir"; then
   AC_MSG_ERROR([cannot find install-sh, install.sh, or shtool in $1])