From 5691d22d50690ece26f3b579f29be875336b8b03 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Wed, 27 May 2009 16:29:55 +0000 Subject: [PATCH] * plugins.m4: New. * aclocal.m4: Include ../config/plugins.m4. * configure.in: Use AC_PLUGINS. * configure: Regenerate. * Makefile.in: Regenerate. * doc/Makefile.in: Regenerate. --- bfd/ChangeLog | 8 ++++++++ bfd/Makefile.in | 5 +++-- bfd/aclocal.m4 | 5 +++-- bfd/configure | 4 +++- bfd/configure.in | 9 +-------- bfd/doc/Makefile.in | 5 +++-- binutils/Makefile.in | 13 +++++++------ binutils/aclocal.m4 | 5 +++-- binutils/configure | 32 +++++++++++++++++--------------- binutils/configure.in | 9 +-------- binutils/doc/Makefile.in | 13 +++++++------ config/ChangeLog | 4 ++++ config/plugins.m4 | 11 +++++++++++ 13 files changed, 71 insertions(+), 52 deletions(-) create mode 100644 config/plugins.m4 diff --git a/bfd/ChangeLog b/bfd/ChangeLog index e7f6f3bf17..a838d97b45 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,11 @@ +2009-05-26 Rafael Avila de Espindola + + * aclocal.m4: Include ../config/plugins.m4. + * configure.in: Use AC_PLUGINS. + * configure: Regenerate. + * Makefile.in: Regenerate. + * doc/Makefile.in: Regenerate. + 2009-05-27 Nathan Sidwell * elf32-ppc.c (ppc_elf_relax_section): Work with a partial diff --git a/bfd/Makefile.in b/bfd/Makefile.in index 3f6a7ed888..f9f0afd77b 100644 --- a/bfd/Makefile.in +++ b/bfd/Makefile.in @@ -54,13 +54,14 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \ $(top_srcdir)/../config/lead-dot.m4 \ $(top_srcdir)/../config/nls.m4 \ $(top_srcdir)/../config/override.m4 \ + $(top_srcdir)/../config/plugins.m4 \ $(top_srcdir)/../config/po.m4 \ $(top_srcdir)/../config/proginstall.m4 \ $(top_srcdir)/../config/progtest.m4 \ - $(top_srcdir)/../config/stdint.m4 $(top_srcdir)/../libtool.m4 \ + $(top_srcdir)/../config/stdint.m4 $(top_srcdir)/../bfd/bfd.m4 \ + $(top_srcdir)/../bfd/warning.m4 $(top_srcdir)/../libtool.m4 \ $(top_srcdir)/../ltoptions.m4 $(top_srcdir)/../ltsugar.m4 \ $(top_srcdir)/../ltversion.m4 $(top_srcdir)/../lt~obsolete.m4 \ - $(top_srcdir)/bfd.m4 $(top_srcdir)/warning.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) diff --git a/bfd/aclocal.m4 b/bfd/aclocal.m4 index 208fad97a1..3d0a0e70e9 100644 --- a/bfd/aclocal.m4 +++ b/bfd/aclocal.m4 @@ -863,15 +863,16 @@ m4_include([../config/gettext-sister.m4]) m4_include([../config/lead-dot.m4]) m4_include([../config/nls.m4]) m4_include([../config/override.m4]) +m4_include([../config/plugins.m4]) m4_include([../config/po.m4]) m4_include([../config/proginstall.m4]) m4_include([../config/progtest.m4]) m4_include([../config/stdint.m4]) +m4_include([../bfd/bfd.m4]) +m4_include([../bfd/warning.m4]) m4_include([../libtool.m4]) m4_include([../ltoptions.m4]) m4_include([../ltsugar.m4]) m4_include([../ltversion.m4]) m4_include([../lt~obsolete.m4]) -m4_include([bfd.m4]) -m4_include([warning.m4]) m4_include([acinclude.m4]) diff --git a/bfd/configure b/bfd/configure index fe32d99969..32f7713141 100755 --- a/bfd/configure +++ b/bfd/configure @@ -1009,7 +1009,7 @@ Optional Features: --enable-fast-install[=PKGS] optimize for fast installation [default=yes] --disable-libtool-lock avoid locking (might break parallel builds) - --enable-plugins linker plugins (defaults no) + --enable-plugins Enable support for plugins (defaults no) --disable-largefile omit support for large files --enable-64-bit-bfd 64-bit support (on hosts with narrower word sizes) --enable-targets alternative target configurations @@ -11414,6 +11414,7 @@ CC="$lt_save_CC" + # Check whether --enable-plugins or --disable-plugins was given. if test "${enable_plugins+set}" = set; then enableval="$enable_plugins" @@ -11428,6 +11429,7 @@ fi; + if test "$plugins" = "yes"; then PLUGINS_TRUE= PLUGINS_FALSE='#' diff --git a/bfd/configure.in b/bfd/configure.in index c7dd581b56..00c339a4a1 100644 --- a/bfd/configure.in +++ b/bfd/configure.in @@ -25,14 +25,7 @@ AC_USE_SYSTEM_EXTENSIONS LT_INIT([dlopen]) -AC_ARG_ENABLE([plugins], -AS_HELP_STRING([--enable-plugins], [linker plugins (defaults no)]), -[case "${enableval}" in - yes | "") plugins=yes ;; - no) plugins=no ;; - *) plugins=yes ;; - esac], -[plugins=no]) +AC_PLUGINS AM_CONDITIONAL(PLUGINS, test "$plugins" = "yes") diff --git a/bfd/doc/Makefile.in b/bfd/doc/Makefile.in index e2ce0b19e1..cbd66277ff 100644 --- a/bfd/doc/Makefile.in +++ b/bfd/doc/Makefile.in @@ -52,13 +52,14 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \ $(top_srcdir)/../config/lead-dot.m4 \ $(top_srcdir)/../config/nls.m4 \ $(top_srcdir)/../config/override.m4 \ + $(top_srcdir)/../config/plugins.m4 \ $(top_srcdir)/../config/po.m4 \ $(top_srcdir)/../config/proginstall.m4 \ $(top_srcdir)/../config/progtest.m4 \ - $(top_srcdir)/../config/stdint.m4 $(top_srcdir)/../libtool.m4 \ + $(top_srcdir)/../config/stdint.m4 $(top_srcdir)/../bfd/bfd.m4 \ + $(top_srcdir)/../bfd/warning.m4 $(top_srcdir)/../libtool.m4 \ $(top_srcdir)/../ltoptions.m4 $(top_srcdir)/../ltsugar.m4 \ $(top_srcdir)/../ltversion.m4 $(top_srcdir)/../lt~obsolete.m4 \ - $(top_srcdir)/bfd.m4 $(top_srcdir)/warning.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) diff --git a/binutils/Makefile.in b/binutils/Makefile.in index b123881873..ba7790c190 100644 --- a/binutils/Makefile.in +++ b/binutils/Makefile.in @@ -57,9 +57,7 @@ DIST_COMMON = $(srcdir)/../config.guess $(srcdir)/../config.sub NEWS \ $(srcdir)/../config.guess $(srcdir)/../config.sub subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../bfd/acinclude.m4 \ - $(top_srcdir)/../bfd/warning.m4 \ - $(top_srcdir)/../config/depstand.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/../config/depstand.m4 \ $(top_srcdir)/../config/extensions.m4 \ $(top_srcdir)/../config/gettext-sister.m4 \ $(top_srcdir)/../config/iconv.m4 \ @@ -69,12 +67,15 @@ am__aclocal_m4_deps = $(top_srcdir)/../bfd/acinclude.m4 \ $(top_srcdir)/../config/lib-prefix.m4 \ $(top_srcdir)/../config/nls.m4 \ $(top_srcdir)/../config/override.m4 \ + $(top_srcdir)/../config/plugins.m4 \ $(top_srcdir)/../config/po.m4 \ $(top_srcdir)/../config/proginstall.m4 \ $(top_srcdir)/../config/progtest.m4 \ - $(top_srcdir)/../libtool.m4 $(top_srcdir)/../ltoptions.m4 \ - $(top_srcdir)/../ltsugar.m4 $(top_srcdir)/../ltversion.m4 \ - $(top_srcdir)/../lt~obsolete.m4 $(top_srcdir)/configure.in + $(top_srcdir)/../bfd/acinclude.m4 \ + $(top_srcdir)/../bfd/warning.m4 $(top_srcdir)/../libtool.m4 \ + $(top_srcdir)/../ltoptions.m4 $(top_srcdir)/../ltsugar.m4 \ + $(top_srcdir)/../ltversion.m4 $(top_srcdir)/../lt~obsolete.m4 \ + $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ diff --git a/binutils/aclocal.m4 b/binutils/aclocal.m4 index 39857e5b94..acce2638d5 100644 --- a/binutils/aclocal.m4 +++ b/binutils/aclocal.m4 @@ -877,8 +877,6 @@ AC_SUBST([am__tar]) AC_SUBST([am__untar]) ]) # _AM_PROG_TAR -m4_include([../bfd/acinclude.m4]) -m4_include([../bfd/warning.m4]) m4_include([../config/depstand.m4]) m4_include([../config/extensions.m4]) m4_include([../config/gettext-sister.m4]) @@ -889,9 +887,12 @@ m4_include([../config/lib-link.m4]) m4_include([../config/lib-prefix.m4]) m4_include([../config/nls.m4]) m4_include([../config/override.m4]) +m4_include([../config/plugins.m4]) m4_include([../config/po.m4]) m4_include([../config/proginstall.m4]) m4_include([../config/progtest.m4]) +m4_include([../bfd/acinclude.m4]) +m4_include([../bfd/warning.m4]) m4_include([../libtool.m4]) m4_include([../ltoptions.m4]) m4_include([../ltsugar.m4]) diff --git a/binutils/configure b/binutils/configure index 83ba316007..09ca5996cd 100755 --- a/binutils/configure +++ b/binutils/configure @@ -1002,7 +1002,7 @@ Optional Features: --enable-FEATURE[=ARG] include FEATURE [ARG=yes] --disable-dependency-tracking speeds up one-time build --enable-dependency-tracking do not reject slow dependency extractors - --enable-plugins linker plugins (defaults no) + --enable-plugins Enable support for plugins (defaults no) --disable-largefile omit support for large files --enable-shared[=PKGS] build shared libraries [default=yes] @@ -4737,6 +4737,7 @@ _ACEOF + # Check whether --enable-plugins or --disable-plugins was given. if test "${enable_plugins+set}" = set; then enableval="$enable_plugins" @@ -4749,6 +4750,7 @@ else plugins=no fi; + case "${target}" in sparc-*-solaris*|i[3-7]86-*-solaris*) # See comment in bfd/configure.in for the reason for this test. @@ -5533,13 +5535,13 @@ if test "${lt_cv_nm_interface+set}" = set; then else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:5536: $ac_compile\"" >&5) + (eval echo "\"\$as_me:5538: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:5539: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:5541: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:5542: output\"" >&5) + (eval echo "\"\$as_me:5544: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -6696,7 +6698,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 6699 "configure"' > conftest.$ac_ext + echo '#line 6701 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -8002,11 +8004,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8005: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8007: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8009: \$? = $ac_status" >&5 + echo "$as_me:8011: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -8341,11 +8343,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8344: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8346: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8348: \$? = $ac_status" >&5 + echo "$as_me:8350: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -8446,11 +8448,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8449: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8451: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8453: \$? = $ac_status" >&5 + echo "$as_me:8455: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -8501,11 +8503,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8504: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8506: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8508: \$? = $ac_status" >&5 + echo "$as_me:8510: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -11313,7 +11315,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11316 "configure" +#line 11318 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11409,7 +11411,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11412 "configure" +#line 11414 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/binutils/configure.in b/binutils/configure.in index 3fdb349fec..6f9b3d022f 100644 --- a/binutils/configure.in +++ b/binutils/configure.in @@ -16,14 +16,7 @@ AC_PROG_CC AC_GNU_SOURCE AC_USE_SYSTEM_EXTENSIONS -AC_ARG_ENABLE([plugins], -AS_HELP_STRING([--enable-plugins], [linker plugins (defaults no)]), -[case "${enableval}" in - yes | "") plugins=yes ;; - no) plugins=no ;; - *) plugins=yes ;; - esac], -[plugins=no]) +AC_PLUGINS case "${target}" in changequote(,)dnl diff --git a/binutils/doc/Makefile.in b/binutils/doc/Makefile.in index 9379255278..b01c64078b 100644 --- a/binutils/doc/Makefile.in +++ b/binutils/doc/Makefile.in @@ -39,9 +39,7 @@ target_triplet = @target@ subdir = doc DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../bfd/acinclude.m4 \ - $(top_srcdir)/../bfd/warning.m4 \ - $(top_srcdir)/../config/depstand.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/../config/depstand.m4 \ $(top_srcdir)/../config/extensions.m4 \ $(top_srcdir)/../config/gettext-sister.m4 \ $(top_srcdir)/../config/iconv.m4 \ @@ -51,12 +49,15 @@ am__aclocal_m4_deps = $(top_srcdir)/../bfd/acinclude.m4 \ $(top_srcdir)/../config/lib-prefix.m4 \ $(top_srcdir)/../config/nls.m4 \ $(top_srcdir)/../config/override.m4 \ + $(top_srcdir)/../config/plugins.m4 \ $(top_srcdir)/../config/po.m4 \ $(top_srcdir)/../config/proginstall.m4 \ $(top_srcdir)/../config/progtest.m4 \ - $(top_srcdir)/../libtool.m4 $(top_srcdir)/../ltoptions.m4 \ - $(top_srcdir)/../ltsugar.m4 $(top_srcdir)/../ltversion.m4 \ - $(top_srcdir)/../lt~obsolete.m4 $(top_srcdir)/configure.in + $(top_srcdir)/../bfd/acinclude.m4 \ + $(top_srcdir)/../bfd/warning.m4 $(top_srcdir)/../libtool.m4 \ + $(top_srcdir)/../ltoptions.m4 $(top_srcdir)/../ltsugar.m4 \ + $(top_srcdir)/../ltversion.m4 $(top_srcdir)/../lt~obsolete.m4 \ + $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs diff --git a/config/ChangeLog b/config/ChangeLog index 743da73bbe..d6ff5652da 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,3 +1,7 @@ +2009-05-26 Rafael Avila de Espindola + + * plugins.m4: New. + 2009-05-12 Alexandre Oliva * multi.m4: Save CXX, GFORTRAN and GCJ in config.status. diff --git a/config/plugins.m4 b/config/plugins.m4 new file mode 100644 index 0000000000..7ee8412aa3 --- /dev/null +++ b/config/plugins.m4 @@ -0,0 +1,11 @@ +AC_DEFUN([AC_PLUGINS], +[ +AC_ARG_ENABLE([plugins], +AS_HELP_STRING([--enable-plugins], [Enable support for plugins (defaults no)]), +[case "${enableval}" in + yes | "") plugins=yes ;; + no) plugins=no ;; + *) plugins=yes ;; + esac], +[plugins=no]) +])