aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rwxr-xr-xconfigure6
-rw-r--r--configure.ac6
3 files changed, 18 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 60b19fd..81654d0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2019-01-03 Дилян Палаузов <dilyan.palauzov@aegee.org>
+
+ * configure.ac: Don't configure readline if --with-system-readline is
+ used.
+ * configure: Re-generate.
+
2018-10-31 Joseph Myers <joseph@codesourcery.com>
Merge from GCC:
diff --git a/configure b/configure
index 08dd35c..3747645 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 99229d9..46501c2 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.