Index: libiberty/configure |
diff --git a/libiberty/configure b/libiberty/configure |
index 6e98352f356ffdc22ecdba010b6378a1d307b659..8ea54da661313901b8fe872d1352316823015b79 100755 |
--- a/libiberty/configure |
+++ b/libiberty/configure |
@@ -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' |
@@ -4865,7 +4894,9 @@ case "${host}" in |
hppa*64*-*-hpux*) |
# PIC is the default for 64-bit PA HP-UX. |
;; |
- i[34567]86-*-cygwin* | i[34567]86-*-mingw* | x86_64-*-mingw*) |
+ i[34567]86-*-cygwin* | x86_64-*-cygwin*) |
+ ;; |
+ i[34567]86-*-mingw* | x86_64-*-mingw*) |
;; |
i[34567]86-*-interix[3-9]*) |
# Interix 3.x gcc -fpic/-fPIC options generate broken code. |
@@ -4896,9 +4927,6 @@ case "${host}" in |
i[34567]86-*-* | x86_64-*-*) |
PICFLAG=-fpic |
;; |
- m68k-*-*) |
- PICFLAG=-fpic |
- ;; |
# FIXME: Override -fPIC default in libgcc only? |
sh-*-linux* | sh[2346lbe]*-*-linux*) |
PICFLAG=-fpic |
@@ -4932,6 +4960,12 @@ case "${enable_shared}" in |
"") shared=no ;; |
*) shared=yes ;; |
esac |
+ |
+# ...unless --enable-host-shared was passed from top-level config: |
+if [ "${enable_host_shared}" = "yes" ]; then |
+ shared=yes |
+fi |
+ |
if [ "${shared}" != "yes" ]; then |
PICFLAG= |
fi |
@@ -5340,6 +5374,7 @@ funcs="$funcs strchr" |
funcs="$funcs strdup" |
funcs="$funcs strncasecmp" |
funcs="$funcs strndup" |
+funcs="$funcs strnlen" |
funcs="$funcs strrchr" |
funcs="$funcs strstr" |
funcs="$funcs strtod" |
@@ -5380,8 +5415,8 @@ if test "x" = "y"; then |
random realpath rename rindex \ |
sbrk setenv setproctitle setrlimit sigsetmask snprintf spawnve spawnvpe \ |
stpcpy stpncpy strcasecmp strchr strdup \ |
- strerror strncasecmp strndup strrchr strsignal strstr strtod strtol \ |
- strtoul strverscmp sysconf sysctl sysmp \ |
+ strerror strncasecmp strndup strnlen strrchr strsignal strstr strtod \ |
+ strtol strtoul strverscmp sysconf sysctl sysmp \ |
table times tmpnam \ |
vasprintf vfprintf vprintf vsprintf \ |
wait3 wait4 waitpid |
@@ -5663,6 +5698,12 @@ esac |
esac |
case " $LIBOBJS " in |
+ *" strnlen.$ac_objext "* ) ;; |
+ *) LIBOBJS="$LIBOBJS strnlen.$ac_objext" |
+ ;; |
+esac |
+ |
+ case " $LIBOBJS " in |
*" strverscmp.$ac_objext "* ) ;; |
*) LIBOBJS="$LIBOBJS strverscmp.$ac_objext" |
;; |
@@ -5683,7 +5724,7 @@ esac |
for f in $funcs; do |
case "$f" in |
- asprintf | basename | bcmp | bcopy | bzero | clock | ffs | getpagesize | index | insque | mempcpy | mkstemps | random | rindex | sigsetmask | stpcpy | stpncpy | strdup | strndup | strverscmp | vasprintf | waitpid) |
+ asprintf | basename | bcmp | bcopy | bzero | clock | ffs | getpagesize | index | insque | mempcpy | mkstemps | random | rindex | sigsetmask | stpcpy | stpncpy | strdup | strndup | strnlen | strverscmp | vasprintf | waitpid) |
;; |
*) |
n=HAVE_`echo $f | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` |
@@ -5752,29 +5793,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. |