Re: autoconf 2.64 + shtool => incorrect ac_install_sh

[Ralf Wildenhues]

Hello Dmitry,

thanks for the bug report!

* dmitry grebeniuk wrote on Fri, Dec 11, 2009 at 08:48:15AM CET:
>   It seems that autoconf 2.64 has broken "ac_install_sh" generation
> when configure script needs to use shtool as install script.

Darn, that's what I get for not reading closely.  I'm pushing this patch
and adding you to THANKS.  I still need to write a test case.

Sorry about that,
Ralf

    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.

diff --git a/NEWS b/NEWS
index 69cca79..6c398f3 100644
--- 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/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index e34bea4..e41c2c9 100644
--- 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])