[SCM] GNU Autoconf source repository branch, master, updated. v2.65-13-gd30a7f6

[Ralf Wildenhues]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Autoconf source repository".

http://git.sv.gnu.org/gitweb/?p=autoconf.git;a=commitdiff;h=d30a7f6691353a1ad1e59b99e00b1bcd5ded3b82

The branch, master has been updated
       via  d30a7f6691353a1ad1e59b99e00b1bcd5ded3b82 (commit)
      from  918c278978f4ac243740c6997be14e6ba443ba4e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit d30a7f6691353a1ad1e59b99e00b1bcd5ded3b82
Author: Ralf Wildenhues <address@hidden>
Date:   Sat Dec 12 08:40:14 2009 +0100

    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 <address@hidden>

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog               |    9 +++++++++
 NEWS                    |    3 +++
 THANKS                  |    1 +
 lib/autoconf/general.m4 |   20 +++++++++++++-------
 4 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 568a748..528ff2b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-12-12  Ralf Wildenhues  <address@hidden>
+
+       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  <address@hidden>
 
        Fix NEWS description for AC_FUNC_MMAP entry.
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/THANKS b/THANKS
index 5ec7633..623a297 100644
--- a/THANKS
+++ b/THANKS
@@ -105,6 +105,7 @@ Derek R. Price              address@hidden
 Didier Desseaux             address@hidden
 Didier Verna                address@hidden
 Dietmar P. Schindler        address@hidden
+Dmitry Grebeniuk            address@hidden
 Doug Evans                  address@hidden
 Dries Kimpe                 ?
 Edouard Bechetoille         address@hidden
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])


hooks/post-receive
-- 
GNU Autoconf source repository