Add vmfunc

[deliverable/binutils-gdb.git] / binutils / configure

diff --git a/binutils/configure b/binutils/configure
index 003b6f1e25988ddebe7270b3ee5f83e457d9131c..8d324e489aef79aa7eb517bfeab23184b17ef088 100755 (executable)
--- a/binutils/configure
+++ b/binutils/configure
@@ -771,10 +771,12 @@ enable_fast_install
 with_gnu_ld
 enable_libtool_lock
 enable_targets
+enable_deterministic_archives
 enable_werror
 enable_build_warnings
 enable_nls
 enable_maintainer_mode
+with_zlib
 enable_rpath
 with_libiconv_prefix
 '
@@ -1417,6 +1419,8 @@ Optional Features:
                           optimize for fast installation [default=yes]
   --disable-libtool-lock  avoid locking (might break parallel builds)
   --enable-targets        alternative target configurations
+  --enable-deterministic-archives
+                          ar and ranlib default to -D behavior
   --enable-werror         treat compile warnings as errors
   --enable-build-warnings enable build-time compiler warnings
   --disable-nls           do not use Native Language Support
@@ -1430,6 +1434,7 @@ Optional Packages:
   --with-pic              try to use only PIC/non-PIC objects [default=use
                           both]
   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
+  --with-zlib             include zlib support (auto/yes/no) default=auto
   --with-gnu-ld           assume the C compiler uses GNU ld default=no
   --with-libiconv-prefix[=DIR]  search for libiconv in DIR/include and DIR/lib
   --without-libiconv-prefix     don't search for libiconv in includedir and libdir
@@ -11199,7 +11204,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11202 "configure"
+#line 11207 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11305,7 +11310,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11308 "configure"
+#line 11313 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11553,6 +11558,25 @@ if test "${enable_targets+set}" = set; then :
 esac
 fi
 
+# Check whether --enable-deterministic-archives was given.
+if test "${enable_deterministic_archives+set}" = set; then :
+  enableval=$enable_deterministic_archives;
+if test "${enableval}" = no; then
+  default_ar_deterministic=0
+else
+  default_ar_deterministic=1
+fi
+else
+  default_ar_deterministic=0
+fi
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define DEFAULT_AR_DETERMINISTIC $default_ar_deterministic
+_ACEOF
+
+
 
 GCC_WARN_CFLAGS="-W -Wall -Wstrict-prototypes -Wmissing-prototypes"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -12972,7 +12996,19 @@ _ACEOF
 # Link in zlib if we can.  This allows us to read compressed debug
 # sections.  This is used only by readelf.c (objdump uses bfd for
 # reading compressed sections).
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing zlibVersion" >&5
+
+  # See if the user specified whether he wants zlib support or not.
+
+# Check whether --with-zlib was given.
+if test "${with_zlib+set}" = set; then :
+  withval=$with_zlib;
+else
+  with_zlib=auto
+fi
+
+
+  if test "$with_zlib" != "no"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing zlibVersion" >&5
 $as_echo_n "checking for library containing zlibVersion... " >&6; }
 if test "${ac_cv_search_zlibVersion+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -13039,6 +13075,11 @@ done
 
 fi
 
+    if test "$with_zlib" = "yes" -a "$ac_cv_header_zlib_h" != "yes"; then
+      as_fn_error "zlib (libz) library was explicitly requested but not found" "$LINENO" 5
+    fi
+  fi
+
 
 
 case "${host}" in
@@ -13800,7 +13841,7 @@ do
        fi
        DLLTOOL_DEFS="$DLLTOOL_DEFS -DDLLTOOL_I386"
        BUILD_DLLWRAP='$(DLLWRAP_PROG)$(EXEEXT)'
-        od_vectors="$od_vectors objdump_private_desc_xcoff"
+       od_vectors="$od_vectors objdump_private_desc_xcoff"
     else
        case $targ in
        i[3-7]86*-*-netware*)
@@ -13895,7 +13936,10 @@ do
          BUILD_WINDMC='$(WINDMC_PROG)$(EXEEXT)'
          ;;
        powerpc*-*-linux* | powerpc*-*-elf* | powerpc*-*-eabi*)
-         BUILD_INSTALL_MISC="${BUILD_INSTALL_MISC} embedspu"
+         case "$BUILD_INSTALL_MISC" in
+           *embedspu*) ;;
+           *) BUILD_INSTALL_MISC="${BUILD_INSTALL_MISC} embedspu"
+         esac
          ;;
        sh*-*-pe)
          BUILD_DLLTOOL='$(DLLTOOL_PROG)$(EXEEXT)'
@@ -13942,7 +13986,10 @@ do
        # Add objdump private vectors.
        case $targ in
        powerpc-*-aix*)
-       od_vectors="$od_vectors objdump_private_desc_xcoff"
+         od_vectors="$od_vectors objdump_private_desc_xcoff"
+         ;;
+        *-*-darwin*)
+         od_vectors="$od_vectors objdump_private_desc_mach_o"
          ;;
        esac
     fi
@@ -13960,6 +14007,8 @@ for i in $od_vectors ; do
        case $i in
        objdump_private_desc_xcoff)
            od_files="$od_files od-xcoff" ;;
+       objdump_private_desc_mach_o)
+           od_files="$od_files od-macho" ;;
        *) as_fn_error "*** unknown private vector $i" "$LINENO" 5 ;;
        esac
        ;;