mirror/autoconf
2
0
Fork 0
mirror of git://git.sv.gnu.org/autoconf synced 2025-01-24 10:54:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* 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 93d9386de9.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
This commit is contained in:
Ralf Wildenhues 2009-12-12 08:40:14 +01:00
parent 918c278978
commit d30a7f6691
4 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -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.

3
NEWS
View File

@ -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.*.

1
THANKS
View File

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

20
lib/autoconf/general.m4
View File

@ -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])