[committed] Don't build readline/libreadline.a, when --with-system-readline is supplied

Message ID 20221021065447.GA10032@delia
State Repeat Merge
Headers
Series [committed] Don't build readline/libreadline.a, when --with-system-readline is supplied |

Checks

Context Check Description
snail/gcc-patch-check warning Git am fail log

Commit Message

Tom de Vries Oct. 21, 2022, 6:54 a.m. UTC
  Hi,

[ Committed as obvious as per
https://gcc.gnu.org/legacy-ml/gcc-patches/2018-12/msg00299.html . ]

https://sourceware.org/bugzilla/show_bug.cgi?id=18632

The bundled libreadline is always built, even if the system is
./configure'd --with-system-readline and the build libreadline.a is not
used.

Proposed patch:

Fix ./configure.ac not to proceed readline/, when --with-system-
readline is provided

	* configure.ac: Don't configure readline if --with-system-readline is
	used.
	* configure: Re-generate.


Committed to trunk.

Thanks,
- Tom

Don't build readline/libreadline.a, when --with-system-readline is supplied

---
 configure    | 6 ++++++
 configure.ac | 6 ++++++
 2 files changed, 12 insertions(+)
  

Patch

diff --git a/configure b/configure
index d9aa84c6138..007a77a5f6c 100755
--- a/configure
+++ b/configure
@@ -2946,6 +2946,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
+
 # some tools are so dependent upon X11 that if we're not building with X,
 # it's not even worth trying to configure, much less build, that tool.
 
diff --git a/configure.ac b/configure.ac
index 2cff32e300e..1df410bba1f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -247,6 +247,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
+
 # some tools are so dependent upon X11 that if we're not building with X, 
 # it's not even worth trying to configure, much less build, that tool.