From f4f389dabb73de659f0f77fc04683740bf8dd3e5 Mon Sep 17 00:00:00 2001
From: Holger Vogt <holger.vogt@uni-due.de>
Date: Mon, 21 May 2018 00:54:31 +0200
Subject: [PATCH] internal help: it is only available when --enable-oldapps is
 given ngnutmeg is only made when --enable-oldapps is given during ./configure

---
 compile_min.sh           | 1 +
 configure.ac             | 6 ++++--
 src/Makefile.am          | 9 ++++-----
 src/frontend/com_ghelp.c | 2 +-
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/compile_min.sh b/compile_min.sh
index 66ca87edb..f215de448 100755
--- a/compile_min.sh
+++ b/compile_min.sh
@@ -18,6 +18,7 @@
 # Please see http://ngspice.sourceforge.net/admshowto.html for more info on adms.
 # CIDER, XSPICE, and OpenMP may be selected at will.
 # --disable-debug will give O2 optimization (versus O0 for debug) and removes all debugging info.
+# --enable-oldapps will make ngnutmeg ngsconvert ngproc2mod ngmultidec ngmakeidx in addition to ngspice
 
 # ngspice as shared library:
 # Replace --with-wingui by --with-ngshared in line ../configure ... .
diff --git a/configure.ac b/configure.ac
index df8692da6..2352e5d68 100644
--- a/configure.ac
+++ b/configure.ac
@@ -687,9 +687,11 @@ AM_CONDITIONAL([NO_HELP], [test "x$has_no_help" = xtrue])
 # enabling making of the old and outdated applications
 # ngsconvert ngproc2mod ngmultidec ngmakeidx nghelp
 if test "x$enable_oldapps" = xyes ; then
-    AC_MSG_RESULT([ngsconvert ngproc2mod ngmultidec ngmakeidx nghelp are made.])
+    AC_MSG_RESULT([ngnutmeg ngsconvert ngproc2mod ngmultidec ngmakeidx nghelp are made.])
 else
-    AC_MSG_RESULT([ngsconvert ngproc2mod ngmultidec ngmakeidx nghelp are not made.])
+    AC_MSG_RESULT([ngnutmeg ngsconvert ngproc2mod ngmultidec ngmakeidx nghelp are not made.])
+    AC_MSG_RESULT([No internal help available.])    
+    AC_DEFINE([NOINTHELP], [1], [Internal (old) help not available])
 fi
 AM_CONDITIONAL([OLDAPPS], [test "x$enable_oldapps" = xyes])
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 644f4e0c4..8db960473 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -17,11 +17,11 @@ endif
 
 if !TCL_MODULE
 if !SHARED_MODULE
-bin_PROGRAMS =  ngspice ngnutmeg
+bin_PROGRAMS =  ngspice
 
 if OLDAPPS
 if !WINGUI
-bin_PROGRAMS += ngsconvert ngproc2mod ngmultidec ngmakeidx
+bin_PROGRAMS += ngnutmeg ngsconvert ngproc2mod ngmultidec ngmakeidx
 helpdatadir = $(pkgdatadir)/helpdir
 helpdata_DATA = ngspice.txt ngspice.idx
 if !NO_HELP
@@ -190,7 +190,7 @@ ngspice_LDADD += frontend/help/libhlp.la
 endif
 endif
 
-
+if OLDAPPS
 ## nutmeg:
 
 ngnutmeg_SOURCES = \
@@ -229,7 +229,6 @@ ngnutmeg_LDADD += \
 ## These programs are not required on Windows
 if !WINGUI
 if !SHWIN
-if OLDAPPS
 
 if !NO_X
 ngnutmeg_LDADD += \
@@ -294,9 +293,9 @@ ngmakeidx_SOURCES = makeidx.c
 ngspice.idx: ngmakeidx$(EXEEXT) $(srcdir)/ngspice.txt
 	./ngmakeidx$(EXEEXT) -o ngspice.idx $(srcdir)/ngspice.txt
 
-endif OLDAPPS
 endif !SHWIN
 endif !WINGUI
+endif OLDAPPS
 
 if RELPATH
 spinitpath=../lib/ngspice
diff --git a/src/frontend/com_ghelp.c b/src/frontend/com_ghelp.c
index 1b8aa53cb..2eef8f4bc 100644
--- a/src/frontend/com_ghelp.c
+++ b/src/frontend/com_ghelp.c
@@ -13,7 +13,7 @@
 void
 com_ghelp(wordlist *wl)
 {
-#if defined(HAS_WINGUI) || defined(_MSC_VER) || defined(__MINGW32__) || defined(X_DISPLAY_MISSING)
+#if defined(HAS_WINGUI) || defined(_MSC_VER) || defined(__MINGW32__) || defined(X_DISPLAY_MISSING) || defined(NOINTHELP)
 
     NG_IGNORE(wl);