aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorДилян Палаузов <dilyan.palauzov@aegee.org>2022-10-20 17:05:04 +0200
committerTom de Vries <tdevries@suse.de>2022-10-20 17:05:04 +0200
commit1c232ab030476db2037894600ef5eba9a6de5645 (patch)
tree797581113733ace80681a15151aa7e30fd65506e
parent837e225ba1992f9745e5bbbd5e8443243a7f475f (diff)
downloadgdb-1c232ab030476db2037894600ef5eba9a6de5645.zip
gdb-1c232ab030476db2037894600ef5eba9a6de5645.tar.gz
gdb-1c232ab030476db2037894600ef5eba9a6de5645.tar.bz2
Reapply "Don't build readline/libreadline.a, when --with-system-readline is supplied"
Commit 228cf97dd3c8 ("Merge configure.ac from gcc project") undid the change originally done in commit 69961a84c9b ("Don't build readline/libreadline.a, when --with-system-readline is supplied"). Re-apply it. Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=18632
-rwxr-xr-xconfigure6
-rw-r--r--configure.ac6
2 files changed, 12 insertions, 0 deletions
diff --git a/configure b/configure
index 9ea8034..7bcb894 100755
--- a/configure
+++ b/configure
@@ -2960,6 +2960,12 @@ if test x$with_system_zlib = xyes ; then
noconfigdirs="$noconfigdirs zlib"
fi
+# Don't compile the bundled readline/libreadline.a if --with-system-readline
+# is provided.
+if test x$with_system_readline = xyes ; then
+ noconfigdirs="$noconfigdirs readline"
+fi
+
# Check whether --with-zstd was given.
if test "${with_zstd+set}" = set; then :
diff --git a/configure.ac b/configure.ac
index 8af83cc..aab4514 100644
--- a/configure.ac
+++ b/configure.ac
@@ -248,6 +248,12 @@ if test x$with_system_zlib = xyes ; then
noconfigdirs="$noconfigdirs zlib"
fi
+# Don't compile the bundled readline/libreadline.a if --with-system-readline
+# is provided.
+if test x$with_system_readline = xyes ; then
+ noconfigdirs="$noconfigdirs readline"
+fi
+
AC_ARG_WITH(zstd,
[AS_HELP_STRING([--with-zstd], [Support zstd compressed debug sections (default=auto)])])