Automatic date update in version.in

[platform/upstream/binutils.git] / gdb / acinclude.m4

diff --git a/gdb/acinclude.m4 b/gdb/acinclude.m4
index a3fb9e2..3ff5155 100644 (file)
--- a/gdb/acinclude.m4
+++ b/gdb/acinclude.m4
@@ -458,10 +458,6 @@ AC_DEFUN([GDB_AC_CHECK_BFD], [
   CFLAGS="-I${srcdir}/../include -I../bfd -I${srcdir}/../bfd $CFLAGS"
   LDFLAGS="-L../bfd -L../libiberty $LDFLAGS"
   intl=`echo $LIBINTL | sed 's,${top_builddir}/,,g'`
-  # -ldl is provided by bfd/Makfile.am (LIBDL) <PLUGINS>.
-  if test "$plugins" = "yes"; then
-    AC_SEARCH_LIBS(dlopen, dl)
-  fi
   LIBS="-lbfd -liberty $intl $LIBS"
   AC_CACHE_CHECK([$1], [$2],
   [AC_TRY_LINK(
@@ -482,14 +478,14 @@ dnl similar to Guile's 'GUILE_PROGS' macro.)
 AC_DEFUN([GDB_GUILE_PROGRAM_NAMES], [
   AC_CACHE_CHECK([for the absolute file name of the 'guild' command],
     [ac_cv_guild_program_name],
-    [ac_cv_guild_program_name="`$1 $2 --variable guild`"
+    [ac_cv_guild_program_name="`$1 --variable guild $2`"
 
      # In Guile up to 2.0.11 included, guile-2.0.pc would not define
      # the 'guild' and 'bindir' variables.  In that case, try to guess
      # what the program name is, at the risk of getting it wrong if
      # Guile was configured with '--program-suffix' or similar.
      if test "x$ac_cv_guild_program_name" = "x"; then
-       guile_exec_prefix="`$1 $2 --variable exec_prefix`"
+       guile_exec_prefix="`$1 --variable exec_prefix $2`"
        ac_cv_guild_program_name="$guile_exec_prefix/bin/guild"
      fi
   ])