* configure.ac: m4_include config/proginstall.m4.
* configure: Regenerate. config/ * proginstall.m4: New file, with fixed AC_PROG_INSTALL. bfd/ * aclocal.m4: Regenerate. * configure: Likewise. * Makefile.in: Likewise. bfd/doc/ * Makefile.in: Regenerate. intl/ * aclocal.m4: Regenerate. * configure: Likewise. gas/ * aclocal.m4: Regenerate. * configure: Likewise. * Makefile.in: Likewise. * doc/Makefile.in: Likewise. ld/ * aclocal.m4: Regenerate. * configure: Likewise. * Makefile.in: Likewise. opcodes/ * aclocal.m4: Regenerate. * configure: Likewise. * Makefile.in: Likewise. binutils/ * aclocal.m4: Regenerate. * configure: Likewise. * Makefile.in: Likewise. * doc/Makefile.in: Likewise. gprof/ * aclocal.m4: Regenerate. * configure: Likewise. * Makefile.in: Likewise.
This commit is contained in:
parent
bff091bcfe
commit
e30fd60fb5
|
@ -1,3 +1,8 @@
|
|||
2008-03-17 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
|
||||
|
||||
* configure.ac: m4_include config/proginstall.m4.
|
||||
* configure: Regenerate.
|
||||
|
||||
2008-03-16 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
|
||||
|
||||
Backport from upstream Libtool:
|
||||
|
|
|
@ -1,3 +1,7 @@
|
|||
2008-03-17 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
|
||||
|
||||
* proginstall.m4: New file, with fixed AC_PROG_INSTALL.
|
||||
|
||||
2008-02-20 Uros Bizjak <ubizjak@gmail.com>
|
||||
|
||||
* mh-ppc-darwin (BOOT_CFLAGS): Use +=, not =.
|
||||
|
|
|
@ -0,0 +1,98 @@
|
|||
# AC_PROG_INSTALL
|
||||
# ---------------
|
||||
#
|
||||
# This macro is stolen from Autoconf 2.61a-341.
|
||||
# It requires `install' to be able to install multiple files at once.
|
||||
# This file will be obsolete when GCC moves to Autoconf 2.62.
|
||||
|
||||
m4_version_prereq([2.62], [],
|
||||
[
|
||||
AC_DEFUN([AC_PROG_INSTALL],
|
||||
[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
|
||||
dnl AC_REQUIRE_AUX_FILE([install-sh])dnl This line does not work with 2.59.
|
||||
# Find a good install program. We prefer a C program (faster),
|
||||
# so one script is as good as another. But avoid the broken or
|
||||
# incompatible versions:
|
||||
# SysV /etc/install, /usr/sbin/install
|
||||
# SunOS /usr/etc/install
|
||||
# IRIX /sbin/install
|
||||
# AIX /bin/install
|
||||
# AmigaOS /C/install, which installs bootblocks on floppy discs
|
||||
# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
|
||||
# AFS /usr/afsws/bin/install, which mishandles nonexistent args
|
||||
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
|
||||
# OS/2's system install, which has a completely different semantic
|
||||
# ./install, which can be erroneously created by make from ./install.sh.
|
||||
# Reject install programs that cannot install multiple files.
|
||||
AC_MSG_CHECKING([for a BSD-compatible install])
|
||||
if test -z "$INSTALL"; then
|
||||
AC_CACHE_VAL(ac_cv_path_install,
|
||||
[_AS_PATH_WALK([$PATH],
|
||||
[# Account for people who put trailing slashes in PATH elements.
|
||||
case $as_dir/ in
|
||||
./ | .// | /[cC]/* | \
|
||||
/etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
|
||||
?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
|
||||
/usr/ucb/* ) ;;
|
||||
*)
|
||||
# OSF1 and SCO ODT 3.0 have their own names for install.
|
||||
# Don't use installbsd from OSF since it installs stuff as root
|
||||
# by default.
|
||||
for ac_prog in ginstall scoinst install; do
|
||||
for ac_exec_ext in '' $ac_executable_extensions; do
|
||||
if AS_EXECUTABLE_P(["$as_dir/$ac_prog$ac_exec_ext"]); then
|
||||
if test $ac_prog = install &&
|
||||
grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
|
||||
# AIX install. It has an incompatible calling convention.
|
||||
:
|
||||
elif test $ac_prog = install &&
|
||||
grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
|
||||
# program-specific install script used by HP pwplus--don't use.
|
||||
:
|
||||
else
|
||||
rm -rf conftest.one conftest.two conftest.dir
|
||||
echo one > conftest.one
|
||||
echo two > conftest.two
|
||||
mkdir conftest.dir
|
||||
if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
|
||||
test -s conftest.one && test -s conftest.two &&
|
||||
test -s conftest.dir/conftest.one &&
|
||||
test -s conftest.dir/conftest.two
|
||||
then
|
||||
ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
|
||||
break 3
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
done
|
||||
done
|
||||
;;
|
||||
esac])
|
||||
rm -rf conftest.one conftest.two conftest.dir
|
||||
])dnl
|
||||
if test "${ac_cv_path_install+set}" = set; then
|
||||
INSTALL=$ac_cv_path_install
|
||||
else
|
||||
# As a last resort, use the slow shell script. Don't cache a
|
||||
# value for INSTALL within a source directory, because that will
|
||||
# break other packages using the cache if that directory is
|
||||
# removed, or if the value is a relative name.
|
||||
INSTALL=$ac_install_sh
|
||||
fi
|
||||
fi
|
||||
dnl Do special magic for INSTALL instead of AC_SUBST, to get
|
||||
dnl relative names right.
|
||||
AC_MSG_RESULT([$INSTALL])
|
||||
|
||||
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
|
||||
# It thinks the first close brace ends the variable substitution.
|
||||
test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
|
||||
AC_SUBST(INSTALL_PROGRAM)dnl
|
||||
|
||||
test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
|
||||
AC_SUBST(INSTALL_SCRIPT)dnl
|
||||
|
||||
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
|
||||
AC_SUBST(INSTALL_DATA)dnl
|
||||
])# AC_PROG_INSTALL
|
||||
])
|
|
@ -1634,6 +1634,7 @@ rm conftest.sed
|
|||
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
|
||||
# OS/2's system install, which has a completely different semantic
|
||||
# ./install, which can be erroneously created by make from ./install.sh.
|
||||
# Reject install programs that cannot install multiple files.
|
||||
echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
|
||||
echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
|
||||
if test -z "$INSTALL"; then
|
||||
|
@ -1667,8 +1668,18 @@ case $as_dir/ in
|
|||
# program-specific install script used by HP pwplus--don't use.
|
||||
:
|
||||
else
|
||||
ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
|
||||
break 3
|
||||
rm -rf conftest.one conftest.two conftest.dir
|
||||
echo one > conftest.one
|
||||
echo two > conftest.two
|
||||
mkdir conftest.dir
|
||||
if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
|
||||
test -s conftest.one && test -s conftest.two &&
|
||||
test -s conftest.dir/conftest.one &&
|
||||
test -s conftest.dir/conftest.two
|
||||
then
|
||||
ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
|
||||
break 3
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
done
|
||||
|
@ -1677,15 +1688,16 @@ case $as_dir/ in
|
|||
esac
|
||||
done
|
||||
|
||||
rm -rf conftest.one conftest.two conftest.dir
|
||||
|
||||
fi
|
||||
if test "${ac_cv_path_install+set}" = set; then
|
||||
INSTALL=$ac_cv_path_install
|
||||
else
|
||||
# As a last resort, use the slow shell script. We don't cache a
|
||||
# path for INSTALL within a source directory, because that will
|
||||
# As a last resort, use the slow shell script. Don't cache a
|
||||
# value for INSTALL within a source directory, because that will
|
||||
# break other packages using the cache if that directory is
|
||||
# removed, or if the path is relative.
|
||||
# removed, or if the value is a relative name.
|
||||
INSTALL=$ac_install_sh
|
||||
fi
|
||||
fi
|
||||
|
|
|
@ -19,6 +19,7 @@
|
|||
### WARNING: this file contains embedded tabs. Do not run untabify on this file.
|
||||
|
||||
sinclude(config/acx.m4)
|
||||
m4_include(config/proginstall.m4)
|
||||
|
||||
AC_INIT(move-if-change)
|
||||
AC_PREREQ(2.59)
|
||||
|
|
Loading…
Reference in New Issue