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
This commit is contained in:
Дилян Палаузов 2022-10-20 17:05:04 +02:00 committed by Tom de Vries
parent 837e225ba1
commit 1c232ab030
2 changed files with 12 additions and 0 deletions

6
configure vendored
View File

@ -2960,6 +2960,12 @@ if test x$with_system_zlib = xyes ; then
noconfigdirs="$noconfigdirs zlib" noconfigdirs="$noconfigdirs zlib"
fi 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. # Check whether --with-zstd was given.
if test "${with_zstd+set}" = set; then : if test "${with_zstd+set}" = set; then :

View File

@ -248,6 +248,12 @@ if test x$with_system_zlib = xyes ; then
noconfigdirs="$noconfigdirs zlib" noconfigdirs="$noconfigdirs zlib"
fi 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, AC_ARG_WITH(zstd,
[AS_HELP_STRING([--with-zstd], [Support zstd compressed debug sections (default=auto)])]) [AS_HELP_STRING([--with-zstd], [Support zstd compressed debug sections (default=auto)])])