From 69961a84c9b3744a10248fb6cbccc3c688a1e0a5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=D0=94=D0=B8=D0=BB=D1=8F=D0=BD=20=D0=9F=D0=B0=D0=BB=D0=B0?= =?utf8?q?=D1=83=D0=B7=D0=BE=D0=B2?= Date: Wed, 12 Dec 2018 07:46:03 +0000 Subject: [PATCH] Don't build readline/libreadline.a, when --with-system-readline is supplied 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 --- ChangeLog | 6 ++++++ configure | 6 ++++++ configure.ac | 6 ++++++ 3 files changed, 18 insertions(+) diff --git a/ChangeLog b/ChangeLog index 60b19fdb150..81654d0c70d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2019-01-03 Дилян Палаузов + + * configure.ac: Don't configure readline if --with-system-readline is + used. + * configure: Re-generate. + 2018-10-31 Joseph Myers Merge from GCC: diff --git a/configure b/configure index 08dd35c3eaf..37476459612 100755 --- a/configure +++ b/configure @@ -2907,6 +2907,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 99229d97037..46501c28826 100644 --- a/configure.ac +++ b/configure.ac @@ -245,6 +245,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. -- 2.30.2