diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rwxr-xr-x | configure | 18 | ||||
| -rw-r--r-- | configure.ac | 18 |
3 files changed, 28 insertions, 14 deletions
@@ -1,3 +1,9 @@ +2020-02-17 Tom Tromey <tom@tromey.com> + + * configure: Rebuild. + * configure.ac (configdirs): Add gnulib and gdbsupport when building + gdbserver. + 2020-02-14 Tom Tromey <tom@tromey.com> * Makefile.in: Rebuild. @@ -7360,13 +7360,17 @@ 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 and gdbsupport, but as nothing else does, only -# include them 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 to - # the list. - configdirs="${configdirs} gnulib gdbsupport" -fi +# gdb and gdbserver depend on gnulib and gdbsupport, but as nothing +# else does, only include them if one of these is built. The Makefile +# provides the ordering, so it's enough here to add to the list. +case " ${configdirs} " in + *\ gdb\ *) + configdirs="${configdirs} gnulib gdbsupport" + ;; + *\ gdbserver\ *) + configdirs="${configdirs} gnulib gdbsupport" + ;; +esac # Strip out unwanted targets. diff --git a/configure.ac b/configure.ac index 35a9c18..f306509 100644 --- a/configure.ac +++ b/configure.ac @@ -2746,13 +2746,17 @@ 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 and gdbsupport, but as nothing else does, only -# include them 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 to - # the list. - configdirs="${configdirs} gnulib gdbsupport" -fi +# gdb and gdbserver depend on gnulib and gdbsupport, but as nothing +# else does, only include them if one of these is built. The Makefile +# provides the ordering, so it's enough here to add to the list. +case " ${configdirs} " in + *\ gdb\ *) + configdirs="${configdirs} gnulib gdbsupport" + ;; + *\ gdbserver\ *) + configdirs="${configdirs} gnulib gdbsupport" + ;; +esac # Strip out unwanted targets. |