From 6acd994ba41f05cef28c789c9125f264f0d4e9cc Mon Sep 17 00:00:00 2001
From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
Date: Wed, 19 Jun 2019 18:37:49 +0100
Subject: [PATCH 2/6] Unbundle readline

---
 configure.ac    |  3 +--
 src/Makefile.am | 11 ++---------
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/configure.ac b/configure.ac
index dc12d134..61a06940 100644
--- a/configure.ac
+++ b/configure.ac
@@ -530,7 +530,6 @@ AC_SUBST(nrndef_unix)
 AC_SUBST(nrndef_mac)
 AC_SUBST(nrndef_mswin)
 
-AM_CONDITIONAL(BUILD_READLINE, test x$build_readline = xyes)
 AM_CONDITIONAL(BUILD_NRNJAVA, test x$build_nrnjava = xyes)
 AM_CONDITIONAL(BUILD_NRNIV, test x$build_nrniv = xyes)
 AM_CONDITIONAL(BUILD_IVOS, test x$use_ivos = xyes)
@@ -640,7 +639,7 @@ AC_CONFIG_FILES([
 	src/sundials/Makefile src/sundials/shared/Makefile
 	src/sundials/cvodes/Makefile src/sundials/ida/Makefile
 	src/sparse/Makefile src/memacs/Makefile
-	src/readline/Makefile src/sparse13/Makefile
+	src/sparse13/Makefile
 	src/oc/Makefile	src/scopmath/Makefile src/nrnoc/Makefile
 	src/gnu/Makefile src/uxnrnbbs/Makefile src/mesch/Makefile
 	src/uxnrnbbs/mos2nrn.h src/nrnmpi/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index e790a4e8..c27f4b30 100755
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -6,7 +6,6 @@
 ## The order of compilation is important in some cases.  Directories are
 ## searched in the order they are specified.
 
-READLINE_SUBDIRS = readline
 MEMACS_SUBDIRS = memacs
 if BUILD_MINGW
 NMODL_SUBDIRS = modlunit nmodl
@@ -31,12 +30,6 @@ else
 memacsbuild = 
 endif
 
-if BUILD_READLINE
-readlinebuild = $(READLINE_SUBDIRS)
-else
-readlinebuild =
-endif
-
 if BUILD_NRNIV
 nrnivbuild = $(NRNIV_SUBDIRS)
 else
@@ -88,14 +81,14 @@ else
 if NRNPYTHON_ONLY
 SUBDIRS = $(nrnpythonbuild) mswin
 else
-SUBDIRS = $(readlinebuild) $(memacsbuild) $(nmodlbuild) $(NRNOC_SUBDIRS) \
+SUBDIRS = $(memacsbuild) $(nmodlbuild) $(NRNOC_SUBDIRS) \
 	$(nrnjavabuild) $(ivosbuild) $(nrnpythonbuild) \
 	$(build_6229) $(nrnivbuild) $(mos2nrnbuild) $(neuronmusicbuild) \
 	mac mswin
 endif
 endif
 
-DIST_SUBDIRS = $(MEMACS_SUBDIRS) $(READLINE_SUBDIRS) $(NMODL_SUBDIRS) $(NRNOC_SUBDIRS) \
+DIST_SUBDIRS = $(MEMACS_SUBDIRS) $(NMODL_SUBDIRS) $(NRNOC_SUBDIRS) \
 	$(NRNJAVA_SUBDIRS) $(NRNIV_SUBDIRS) $(IVOS_SUBDIRS) \
 	$(NRNPYTHON_SUBDIRS) mswin uxnrnbbs mac ni_pci_6229 neuronmusic
 
-- 
2.21.0