merge from gcc

This commit is contained in:
DJ Delorie
2013-06-01 01:01:44 +00:00
parent c5c412da3c
commit a4818a052e
4 changed files with 80 additions and 58 deletions

56
libiberty/configure vendored
View File

@@ -675,8 +675,8 @@ with_cross_host
with_newlib
enable_maintainer_mode
enable_multilib
enable_largefile
enable_install_libiberty
enable_largefile
'
ac_precious_vars='build_alias
host_alias
@@ -1303,8 +1303,8 @@ Optional Features:
enable make rules and dependencies not useful
(and sometimes confusing) to the casual installer
--enable-multilib build many library versions (default)
--enable-install-libiberty Install headers and library for end users
--disable-largefile omit support for large files
--enable-install-libiberty Install headers for end users
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
@@ -2784,6 +2784,35 @@ if test $cross_compiling = no && test $multilib = yes \
cross_compiling=maybe
fi
# We may wish to install the target headers somewhere.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to install libiberty headers and static library" >&5
$as_echo_n "checking whether to install libiberty headers and static library... " >&6; }
# Check whether --enable-install-libiberty was given.
if test "${enable_install_libiberty+set}" = set; then :
enableval=$enable_install_libiberty; enable_install_libiberty=$enableval
else
enable_install_libiberty=no
fi
# Option parsed, now set things appropriately.
case x"$enable_install_libiberty" in
xyes|x)
target_header_dir=libiberty
;;
xno)
target_header_dir=
;;
*)
# This could be sanity-checked in various ways...
target_header_dir="${enable_install_libiberty}"
;;
esac
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_install_libiberty" >&5
$as_echo "$enable_install_libiberty" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: target_header_dir = $target_header_dir" >&5
$as_echo "$as_me: target_header_dir = $target_header_dir" >&6;}
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
@@ -5761,29 +5790,6 @@ _ACEOF
esac
# We may wish to install the target headers somewhere.
# Check whether --enable-install-libiberty was given.
if test "${enable_install_libiberty+set}" = set; then :
enableval=$enable_install_libiberty; enable_install_libiberty=$enableval
else
enable_install_libiberty=no
fi
# Option parsed, now set things appropriately.
case x"$enable_install_libiberty" in
xyes|x)
target_header_dir=libiberty
;;
xno)
target_header_dir=
;;
*)
# This could be sanity-checked in various ways...
target_header_dir="${enable_install_libiberty}"
;;
esac
else
# Not a target library, so we set things up to run the test suite.