X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=configure.ac;h=854f71a34e5e01c5e0e9894aa3b2e108ea61f2f8;hb=25c816e70e578b8a9abab0dada0490dd5ae41780;hp=c205698cd6be55f2a08a8cf7f3298e177930b660;hpb=90bd54236cb8b1c31c3662977159be971044c20d;p=deliverable%2Fbinutils-gdb.git

diff --git a/configure.ac b/configure.ac
index c205698cd6..854f71a34e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
 #   2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012,
-#   2014, 2015, 2016 Free Software Foundation, Inc.
+#   2014, 2015, 2016, 2019 Free Software Foundation, Inc.
 #
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -901,22 +901,6 @@ case "${target}" in
     ;;
 esac
 
-# Targets that do not use the ELF file format cannot support libctf.
-case "${target}" in
-  *-*-pe | *-*-*vms* | *-*-darwin | *-*-*coff* | *-*-wince | *-*-mingw*)
-    noconfigdirs="$noconfigdirs libctf"
-    ;;
-  *-*-aout | *-*-osf* | *-*-go32 | *-*-macos* | *-*-rhapsody*)
-    noconfigdirs="$noconfigdirs libctf"
-    ;;
-  *-*-netbsdpe | *-*-cygwin* | *-*-pep | *-*-msdos | *-*-winnt)
-    noconfigdirs="$noconfigdirs libctf"
-    ;;
-  ns32k-*-* | pdp11-*-* | *-*-aix* | *-*-netbsdaout)
-    noconfigdirs="$noconfigdirs libctf"
-    ;;
-esac
-
 case "${target}" in
   *-*-chorusos)
     ;;
@@ -2728,6 +2712,14 @@ esac
 CONFIGURE_GDB_TK=`echo ${GDB_TK} | sed s/-all-/-configure-/g`
 INSTALL_GDB_TK=`echo ${GDB_TK} | sed s/-all-/-install-/g`
 
+# gdb depends on gnulib, but as nothing else does, only include it if
+# gdb is built.
+if echo " ${configdirs} " | grep " gdb " > /dev/null 2>&1 ; then
+  # The Makefile provides the ordering, so it's enough here to add
+  # gnulib to the list.
+  configdirs="${configdirs} gnulib"
+fi
+
 # Strip out unwanted targets.
 
 # While at that, we remove Makefiles if we were started for recursive