* configure.in: Use CYGWIN and EXEEXT autoconf macro to look for

        win32 dependencies.
        * configure: Regenerated with autoconf 2.12.
        * Makefile.in: Add $(EXEEXT) to executable.

1 files changed, 46 insertions, 13 deletions

diff --git a/ld/configure.in b/ld/configure.in
index 726521c..2443dbc 100644
--- a/ld/configure.in
+++ b/ld/configure.in
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script
 dnl
-AC_PREREG(2.0)
+AC_PREREG(2.5)
 AC_INIT(ldmain.c)
 
 AC_ARG_ENABLE(targets,
@@ -16,8 +16,16 @@ AC_ARG_ENABLE(shared,
 [case "${enableval}" in
   yes) shared=true ;;
   no)  shared=false ;;
-  *)   AC_MSG_ERROR([bad value ${enableval} for BFD shared option]) ;;
+  *bfd*) shared=true ;;
+  *) shared=false ;;
 esac])dnl
+AC_ARG_ENABLE(64-bit-bfd,
+[  --enable-64-bit-bfd     64-bit support (on hosts with narrower word sizes)],
+[case "${enableval}" in
+  yes)  want64=true  ;;
+  no)   want64=false ;;
+  *)    AC_MSG_ERROR(bad value ${enableval} for 64-bit-bfd option) ;;
+esac],[want64=false])dnl
 
 AC_CONFIG_HEADER(config.h:config.in)
 
@@ -34,11 +42,14 @@ AC_ARG_PROGRAM
 # host-specific stuff:
 
 AC_PROG_CC
+AC_PROG_INSTALL
+CY_CYGWIN32
+CY_EXEEXT
 
 . ${srcdir}/configure.host
 
-AC_SUBST(CFLAGS)
 AC_SUBST(HLDFLAGS)
+AC_SUBST(HLDENV)
 AC_SUBST(RPATH_ENVVAR)
 AC_SUBST(HDEFINES)
 AC_SUBST(HOSTING_CRT0)
@@ -49,15 +60,27 @@ AC_SUBST(NATIVE_LIB_DIRS)
 # opcodes libraries.  However, if we are building shared libraries, we
 # need to handle some hosts specially.
 BFDLIB='-L../bfd -lbfd'
-if test "${shared}" = "true"; then
-  case "${host}" in
-  *-*-sunos*)
-    # On SunOS, we must link against the name we are going to install,
-    # not -lbfd, since SunOS does not support SONAME.
+case "${host}" in
+*-*-sunos*)
+  # On SunOS, we must link against the name we are going to install,
+  # not -lbfd, since SunOS does not support SONAME.
+  if test "${shared}" = "true"; then
     BFDLIB='-L../bfd -l`echo bfd | sed '"'"'$(program_transform_name)'"'"'`'
-    ;;
-  esac
-fi
+  fi
+  ;;
+alpha*-*-osf*)
+  # On Alpha OSF/1, the native linker searches all the -L
+  # directories for any LIB.so files, and only then searches for any
+  # LIB.a files.  That means that if there is an installed
+  # libbfd.so, but this build is not done with --enable-shared, the
+  # link will wind up being against the install libbfd.so rather
+  # than the newly built libbfd.  To avoid this, we must explicitly
+  # link against libbfd.a when --enable-shared is not used.
+  if test "${shared}" != "true"; then
+    BFDLIB='../bfd/libbfd.a'
+  fi
+  ;;
+esac
 AC_SUBST(BFDLIB)
 
 AC_CHECK_HEADERS(string.h strings.h stdlib.h unistd.h)
@@ -66,7 +89,10 @@ AC_HEADER_DIRENT
 
 BFD_BINARY_FOPEN
 
+BFD_NEED_DECLARATION(strstr)
 BFD_NEED_DECLARATION(free)
+BFD_NEED_DECLARATION(sbrk)
+BFD_NEED_DECLARATION(getenv)
 
 # target-specific stuff:
 
@@ -81,7 +107,7 @@ do
     all_targets=true
   else
     # Canonicalize the secondary target names.
-    result=`$ac_config_sub $targ_alias 2>/dev/null`
+    result=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $targ_alias 2>/dev/null`
     if test -n "$result"; then
 	targ=$result
     else
@@ -112,8 +138,15 @@ done
 AC_SUBST(EMUL)
 AC_SUBST(TDIRS)
 
+dnl FIXME: We will build a 64 bit BFD for a 64 bit host or a 64 bit
+dnl target, and in those cases we should also build the 64 bit
+dnl emulations.
 if test x${all_targets} = xtrue; then
-  EMULATION_OFILES='$(ALL_EMULATIONS)'
+  if test x${want64} = xtrue; then
+    EMULATION_OFILES='$(ALL_EMULATIONS) $(ALL_64_EMULATIONS)'
+  else
+    EMULATION_OFILES='$(ALL_EMULATIONS)'
+  fi
 else
   EMULATION_OFILES=$all_emuls
 fi