From 79fb9463b497b6b7a0ea47410a44bf63933776d1 Mon Sep 17 00:00:00 2001 From: pnenzi Date: Thu, 25 Sep 2003 17:23:26 +0000 Subject: [PATCH] Added entries for numparam library. --- acconfig.h | 8 +++++++- configure.in | 34 ++++++++++++++++++++++++++++++---- src/Makefile.am | 2 ++ src/frontend/Makefile.am | 2 +- 4 files changed, 40 insertions(+), 6 deletions(-) diff --git a/acconfig.h b/acconfig.h index 84bc5306d..e514e4b31 100644 --- a/acconfig.h +++ b/acconfig.h @@ -47,9 +47,12 @@ /* Define if we have GNU readline */ #undef HAVE_GNUREADLINE -/* We do not want spurios debug info into non-developer code */ +/* Define if you want to debug frontend */ #undef FTEDEBUG +/* Define if you want to debug ngspice shell */ +#undef CPDEBUG + /* Define if you want to debug pole-zero analysis */ #undef PZDEBUG @@ -74,6 +77,9 @@ /* Spice cluster support */ #undef CLUSTER +/* Spice .param support */ +#undef NUMPARAMS + /* Generate MS WINDOWS executable */ #undef HAS_WINDOWS diff --git a/configure.in b/configure.in index 48e16a771..3b28e0aa1 100644 --- a/configure.in +++ b/configure.in @@ -11,9 +11,6 @@ AM_CONFIG_HEADER(config.h) dnl Initialize automake stuff AM_INIT_AUTOMAKE(ng-spice-rework,15pre1) -dnl --enable-ftedebug : enable frontend debug macros -AC_ARG_ENABLE(ftedebug, - [ --enable-ftedebug Enable ngspice frontend debug]) dnl --enable-ansi : try to force --ansi option to the compiler AC_ARG_ENABLE(ansi, @@ -63,6 +60,14 @@ dnl --enable-sense2 : define WANT_SENSE2 for the code AC_ARG_ENABLE(sense2, [ --enable-sense2 Use spice2 sensitivity analysis]) +dnl --enable-ftedebug : enable frontend debug macros +AC_ARG_ENABLE(ftedebug, + [ --enable-ftedebug Enable ngspice frontend debug]) + +dnl --enable-cpdebug : enable frontend debug macros +AC_ARG_ENABLE(cpdebug, + [ --enable-cpdebug Enable ngspice shell debug]) + dnl --enable-sensdebug : define SENSDEBUG for the code AC_ARG_ENABLE(sensedebug, [ --enable-sensdebug Debug sensitivity code]) @@ -103,10 +108,14 @@ dnl --enable-cider: define CIDER in the code. This is for CIDER support AC_ARG_ENABLE(cider, [ --enable-cider Enable CIDER enchancements, experimental *not in standard distribution*]) -dnl --enable-cluster: define CLUSTER in the code. This is for tcl support +dnl --enable-cluster: define CLUSTER in the code. This is for cluster support AC_ARG_ENABLE(cluster, [ --enable-cluster Enable cluster support, experimental *not in standard distribution*]) +dnl --enable-numparams: define NUMPARAMS in the code. This is for .param support +AC_ARG_ENABLE(numparam, + [ --enable-numparam Enable numparams library support, experimental *not in standard distribution*]) + dnl Enable maintainer commands only if requested AM_MAINTAINER_MODE @@ -358,6 +367,10 @@ if test "$enable_experimental" = "yes"; then AC_MSG_RESULT(EXPERIMENTAL_CODE enabled) fi +if test "$enable_cpdebug" = "yes"; then + AC_DEFINE(CPDEBUG) + AC_MSG_RESULT(WARNING: Shell debug is enabled) +fi if test "$enable_ftedebug" = "yes"; then AC_DEFINE(FTEDEBUG) AC_MSG_RESULT(WARNING: Frontend debug is enabled) @@ -469,6 +482,18 @@ if test "$enable_expdevices" = "yes"; then AC_MSG_RESULT(WARNING: Experimental devices enabled) fi +if test "$enable_numparam" = "yes"; then + AC_MSG_RESULT(Numparam library is enabled) + AC_DEFINE(NUMPARAMS) + NUMPARAMDIR="numparam" + NUMPARAMLIB="frontend/numparam/libnumparam.a" +else + NUMPARAMDIR="" + NUMPARAMLIB="" +fi +AC_SUBST(NUMPARAMDIR) +AC_SUBST(NUMPARAMLIB) + dnl --with-readline : the user wants to use readline library AC_ARG_WITH(readline, [ --with-readline Use the readline library. WARNING: breaks GPL license], @@ -544,6 +569,7 @@ src/ciderlib/support/Makefile \ src/ciderlib/oned/Makefile \ src/ciderlib/twod/Makefile \ src/frontend/Makefile \ +src/frontend/numparam/Makefile \ src/frontend/help/Makefile \ src/frontend/parser/Makefile \ src/frontend/plotting/Makefile \ diff --git a/src/Makefile.am b/src/Makefile.am index cf7fadff3..96c0fcf1d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -87,6 +87,7 @@ ngspice_LDADD = \ spicelib/devices/libdev.a \ @XSPICELIB2@ \ frontend/parser/libparser.a \ + @NUMPARAMLIB@ \ frontend/help/libhlp.a \ spicelib/parser/libinp.a \ @CIDERSIM@ \ @@ -119,6 +120,7 @@ ngnutmeg_LDADD = \ frontend/wdisp/libwindisp.a \ frontend/plotting/libplotting.a \ frontend/parser/libparser.a \ + @NUMPARAMLIB@ \ frontend/help/libhlp.a \ maths/cmaths/libcmaths.a \ maths/poly/libpoly.a \ diff --git a/src/frontend/Makefile.am b/src/frontend/Makefile.am index ce17b81a0..e98ac1722 100644 --- a/src/frontend/Makefile.am +++ b/src/frontend/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in -SUBDIRS = plotting help parser wdisp +SUBDIRS = plotting help parser wdisp @NUMPARAMDIR@ noinst_LIBRARIES = libfte.a