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

diff --git a/configure b/configure
index 9ea8034f5d7f7a7b5a2d0506bc6f8b2d041d5fa7..7bcb894d1fedd177c40541071e12c9c89b981a6a 100755 (executable)
--- 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 8af83cc98d3cd357d3d71ea599d8d05adec0e8db..aab451467bdaa690a684de3e99a82e1aa2ffeb41 100644 (file)
--- 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)])])