From 1c232ab030476db2037894600ef5eba9a6de5645 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: Thu, 20 Oct 2022 17:05:04 +0200 Subject: [PATCH] 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 --- configure | 6 ++++++ configure.ac | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/configure b/configure index 9ea8034f5d7..7bcb894d1fe 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 8af83cc98d3..aab451467bd 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)])]) -- 2.30.2