From b416fb84413399d5b2ababc9b754e4d1b63f71e1 Mon Sep 17 00:00:00 2001
From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
Date: Sun, 27 Jan 2019 18:43:07 +0000
Subject: [PATCH 2/2] Unbundle readline

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

diff --git a/configure.ac b/configure.ac
index 7d391d13..648d484f 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)
@@ -747,7 +746,7 @@ AC_CONFIG_HEADERS([src/ivos/ivstream.h])
 AC_CONFIG_FILES([
 	nrnrpm.spec
 	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 25ad84c7..d14d7cd7 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
@@ -87,7 +80,7 @@ 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
-- 
2.20.1