bfd/

	* configure.in: Call ACX_LARGEFILE.  Stop calling AC_PLUGINS,
	AC_SYS_LARGEFILE and checking the Solaris largefile exception.
	* aclocal.m4: Regenerate.
	* configure: Regenerate.

binutils/
	* configure.in: Call ACX_LARGEFILE.  Stop calling AC_PLUGINS,
	AC_SYS_LARGEFILE and checking the Solaris largefile exception.
	* aclocal.m4: Regenerate.
	* configure: Regenerate.

gas/
	* configure.in: Call ACX_LARGEFILE.  Stop calling AC_SYS_LARGEFILE.
	* aclocal.m4: Regenerate.
	* configure: Regenerate.

gdb/
	* configure.ac: Call ACX_LARGEFILE.
	* aclocal.m4: Call m4_include for ../config/largefile.m4 and
	../config/plugins.m4.
	* configure: Regenerate.
	* config.in: Regenerate.

gprof/
	* configure.in: Call ACX_LARGEFILE.  Stop calling AC_SYS_LARGEFILE.
	* aclocal.m4: Regenerate.
	* configure: Regenerate.

ld/
	* configure.in: Call ACX_LARGEFILE.  Stop calling AC_SYS_LARGEFILE.
	* aclocal.m4: Regenerate.
	* configure: Regenerate.

4 files changed, 37 insertions, 45 deletions

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 03f6773..f89e780 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,10 @@
+2009-11-11  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* configure.in: Call ACX_LARGEFILE.  Stop calling AC_PLUGINS,
+	AC_SYS_LARGEFILE and checking the Solaris largefile exception.
+	* aclocal.m4: Regenerate.
+	* configure: Regenerate.
+
 2009-11-09  H.J. Lu  <hongjiu.lu@intel.com>
 
 	PR ld/10911
diff --git a/bfd/aclocal.m4 b/bfd/aclocal.m4
index 77edbce..aedde7a 100644
--- a/bfd/aclocal.m4
+++ b/bfd/aclocal.m4
@@ -971,6 +971,7 @@ AC_SUBST([am__untar])
 m4_include([../config/acx.m4])
 m4_include([../config/depstand.m4])
 m4_include([../config/gettext-sister.m4])
+m4_include([../config/largefile.m4])
 m4_include([../config/lead-dot.m4])
 m4_include([../config/nls.m4])
 m4_include([../config/override.m4])
diff --git a/bfd/configure b/bfd/configure
index d5aec74..bef4a39 100755
--- a/bfd/configure
+++ b/bfd/configure
@@ -11629,6 +11629,11 @@ CC="$lt_save_CC"
 
 
 
+# AC_PLUGINS setting $plugins is called by ACX_LARGEFILE.
+
+# As the $enable_largefile decision depends on --enable-plugins we must set it
+# even in directories otherwise not depending on the $plugins option.
+
 
 # Check whether --enable-plugins was given.
 if test "${enable_plugins+set}" = set; then :
@@ -11643,36 +11648,16 @@ fi
 
 
 
- if test "$plugins" = "yes"; then
-  PLUGINS_TRUE=
-  PLUGINS_FALSE='#'
-else
-  PLUGINS_TRUE='#'
-  PLUGINS_FALSE=
-fi
-
-
-if test "$plugins" = "yes"; then
-  if test "$enable_dlopen" != "yes" ; then
-    as_fn_error "
-      Building BFD with plugin support requires a host that supports -ldl." "$LINENO" 5
-  fi
-  enable_targets="$enable_targets plugin"
-fi
-
-case "${target}" in
+case "${host}" in
   sparc-*-solaris*|i[3-7]86-*-solaris*)
     # On native 32bit sparc and ia32 solaris, large-file and procfs support
-    # are mutually exclusive; and without procfs support, the elf module
+    # are mutually exclusive; and without procfs support, the bfd/ elf module
     # cannot provide certain routines such as elfcore_write_prpsinfo
     # or elfcore_write_prstatus.  So unless the user explicitly requested
     # large-file support through the --enable-largefile switch, disable
     # large-file support in favor of procfs support.
-    if test "${target}" = "${host}" -a "$enable_largefile" != 'yes'; then
-      if test "$plugins" = "no"; then
-        enable_largefile="no"
-      fi
-    fi
+    test "${target}" = "${host}" -a "x$plugins" = xno \
+      && : ${enable_largefile="no"}
     ;;
 esac
 
@@ -11875,6 +11860,24 @@ rm -rf conftest*
 fi
 
 
+
+ if test "$plugins" = "yes"; then
+  PLUGINS_TRUE=
+  PLUGINS_FALSE='#'
+else
+  PLUGINS_TRUE='#'
+  PLUGINS_FALSE=
+fi
+
+
+if test "$plugins" = "yes"; then
+  if test "$enable_dlopen" != "yes" ; then
+    as_fn_error "
+      Building BFD with plugin support requires a host that supports -ldl." "$LINENO" 5
+  fi
+  enable_targets="$enable_targets plugin"
+fi
+
 # Check whether --enable-64-bit-bfd was given.
 if test "${enable_64_bit_bfd+set}" = set; then :
   enableval=$enable_64_bit_bfd; case "${enableval}" in
diff --git a/bfd/configure.in b/bfd/configure.in
index 7ca59b0..f96128e 100644
--- a/bfd/configure.in
+++ b/bfd/configure.in
@@ -25,7 +25,8 @@ AC_USE_SYSTEM_EXTENSIONS
 
 LT_INIT([dlopen])
 
-AC_PLUGINS
+# AC_PLUGINS setting $plugins is called by ACX_LARGEFILE.
+ACX_LARGEFILE
 
 AM_CONDITIONAL(PLUGINS, test "$plugins" = "yes")
 
@@ -37,26 +38,6 @@ if test "$plugins" = "yes"; then
   enable_targets="$enable_targets plugin"
 fi
 
-case "${target}" in
-changequote(,)dnl
-  sparc-*-solaris*|i[3-7]86-*-solaris*)
-changequote([,])dnl
-    # On native 32bit sparc and ia32 solaris, large-file and procfs support
-    # are mutually exclusive; and without procfs support, the elf module
-    # cannot provide certain routines such as elfcore_write_prpsinfo
-    # or elfcore_write_prstatus.  So unless the user explicitly requested
-    # large-file support through the --enable-largefile switch, disable
-    # large-file support in favor of procfs support.
-    if test "${target}" = "${host}" -a "$enable_largefile" != 'yes'; then
-      if test "$plugins" = "no"; then
-        enable_largefile="no"
-      fi
-    fi
-    ;;
-esac
-
-AC_SYS_LARGEFILE
-
 AC_ARG_ENABLE(64-bit-bfd,
 [  --enable-64-bit-bfd     64-bit support (on hosts with narrower word sizes)],
 [case "${enableval}" in