From 5c9f55c9e48c66cc5295b6de8f22119dadd6bce4 Mon Sep 17 00:00:00 2001 From: dwarning Date: Mon, 7 Jan 2008 20:21:31 +0000 Subject: [PATCH] Additional system scan prefered by autoscan and small changes for Windows prefix --- configure.in | 606 ++++++++++++++++++++++++++------------------------- 1 file changed, 306 insertions(+), 300 deletions(-) diff --git a/configure.in b/configure.in index f16328182..413c1ce44 100644 --- a/configure.in +++ b/configure.in @@ -12,7 +12,7 @@ dnl Initialisation dnl --------------- dnl Initialisation of configure -AC_INIT(ng-spice-rework,17,ngspice-bugs@lists.sourceforge.net) +AC_INIT(ng-spice-rework,17+,ngspice-bugs@lists.sourceforge.net) dnl Unique file in the source directory AC_CONFIG_SRCDIR([src/ngspice.c]) @@ -20,117 +20,117 @@ AC_CONFIG_SRCDIR([src/ngspice.c]) dnl Ensure a recent version of Autoconf is in use dnl Older versions may not work with this script and this will report the dnl problem to the user. (2.52 is a guess and might need some adjustment) -AC_PREREQ(2.52) +AC_PREREQ(2.59) dnl Revison stamp the generated ./configure script AC_REVISION($Revision$) dnl Create a configuration header -AC_CONFIG_HEADERS([config.h]) +AC_CONFIG_HEADER([config.h]) dnl Initialise automake stuff AM_INIT_AUTOMAKE dnl Package Options dnl --------------- - -dnl --enable-ansi : try to force --ansi option to the compiler + +dnl --enable-ansi: try to force --ansi option to the compiler AC_ARG_ENABLE(ansi, AS_HELP_STRING([--enable-ansi],[Force --ansi option for compilation])) -dnl --disable-debug : remove -g and -Wall option to the compiler +dnl --disable-debug: remove -g and -Wall option to the compiler AC_ARG_ENABLE(debug, AS_HELP_STRING([--enable-debug],[Add -g option for compilation (default)])) -dnl --enable-checker : add --with-checker-debug option to the compiler +dnl --enable-checker: add --with-checker-debug option to the compiler AC_ARG_ENABLE(checker, AS_HELP_STRING([--enable-checkergcc],[Option for compilation with checkergcc])) -dnl --enable-gc : Enable Boehm-Weiser Conservative Garbage Collector +dnl --enable-gc: Enable Boehm-Weiser Conservative Garbage Collector AC_ARG_ENABLE(checker, AS_HELP_STRING([--enable-gc],[Use Boehm-Weiser Conservative Garbage Collector. Disabled by default.])) - -dnl --enable-nosqrt : define NOSQRT for the code + +dnl --enable-nosqrt: define NOSQRT for the code AC_ARG_ENABLE(nosqrt, AS_HELP_STRING([--enable-nosqrt],[Use always log/exp for nonlinear capacitances])) - -dnl --enable-bypass : define BYPASS for the code + +dnl --enable-bypass: define BYPASS for the code AC_ARG_ENABLE(nobypass, AS_HELP_STRING([--enable-nobypass],[Don't bypass recalculations of slowly changing variables])) -dnl --enable-capbypass : define CAPBYPASS for the code +dnl --enable-capbypass: define CAPBYPASS for the code AC_ARG_ENABLE(capbypass, AS_HELP_STRING([--enable-capbypass],[Bypass calculation of cbd/cbs in the mosfets if the vbs/vbd voltages are unchanged])) -dnl --enable-capzerobypass : define CAPZEROBYPASS for the code +dnl --enable-capzerobypass: define CAPZEROBYPASS for the code AC_ARG_ENABLE(capzerobypass, AS_HELP_STRING([--enable-capzerobypass],[Bypass all the cbd/cbs calculations if Czero is zero])) - -dnl --enable-nodelimiting : define NODELIMITING for the code + +dnl --enable-nodelimiting: define NODELIMITING for the code AC_ARG_ENABLE(nodelimiting, AS_HELP_STRING([--enable-nodelimiting],[Experimental damping scheme])) - -dnl --enable-predictor : define PREDICTOR for the code + +dnl --enable-predictor: define PREDICTOR for the code AC_ARG_ENABLE(predictor, AS_HELP_STRING([--enable-predictor],[Enable a predictor method for convergence])) -dnl --enable-newpred : define PREDICTOR for the code +dnl --enable-newpred: define PREDICTOR for the code AC_ARG_ENABLE(newpred, AS_HELP_STRING([--enable-newpred],[Enable NEWPRED whatever it is(?)])) -dnl --enable-newtrunc : define NEWTRUNC for the code +dnl --enable-newtrunc: define NEWTRUNC for the code AC_ARG_ENABLE(newtrunc, AS_HELP_STRING([--enable-newtrunc],[Enable the newtrunc option])) -dnl --enable-sense2 : define WANT_SENSE2 for the code +dnl --enable-sense2: define WANT_SENSE2 for the code AC_ARG_ENABLE(sense2, AS_HELP_STRING([--enable-sense2],[Use spice2 sensitivity analysis])) -dnl --enable-ftedebug : enable frontend debug macros +dnl --enable-ftedebug: enable frontend debug macros AC_ARG_ENABLE(ftedebug, AS_HELP_STRING([--enable-ftedebug],[Enable ngspice frontend debug])) -dnl --enable-cpdebug : enable frontend debug macros +dnl --enable-cpdebug: enable frontend debug macros AC_ARG_ENABLE(cpdebug, AS_HELP_STRING([--enable-cpdebug],[Enable ngspice shell debug])) -dnl --enable-sensdebug : define SENSDEBUG for the code +dnl --enable-sensdebug: define SENSDEBUG for the code AC_ARG_ENABLE(sensdebug, AS_HELP_STRING([--enable-sensdebug],[Debug sensitivity code *SENSDEBUG*])) -dnl --enable-asdebug : define ASDEBUG for the code +dnl --enable-asdebug: define ASDEBUG for the code AC_ARG_ENABLE(asdebug, AS_HELP_STRING([--enable-asdebug],[Debug sensitivity code *ASDEBUG*])) - -dnl --enable-stepdebug : define STEPDEBUG for the code + +dnl --enable-stepdebug: define STEPDEBUG for the code AC_ARG_ENABLE(stepdebug, AS_HELP_STRING([--enable-stepdebug],[Unknown debug option])) -dnl --enable-pzdebug : define PZDEBUG for the code +dnl --enable-pzdebug: define PZDEBUG for the code AC_ARG_ENABLE(pzdebug, AS_HELP_STRING([--enable-pzdebug],[Debug pole/zero code])) -dnl --enable-blktmsdebug : define D_DBG_BLOCKTIMES for the code +dnl --enable-blktmsdebug: define D_DBG_BLOCKTIMES for the code AC_ARG_ENABLE(blktmsdebug, AS_HELP_STRING([--enable-blktmsdebug],[Debug distortion code *BLOCKTIMES*])) -dnl --enable-smltmsdebug : define D_DBG_SMALLTIMES for the code +dnl --enable-smltmsdebug: define D_DBG_SMALLTIMES for the code AC_ARG_ENABLE(smltmsdebug, AS_HELP_STRING([--enable-smltmsdebug],[Debug distortion code *SMALLTIMES*])) -dnl --enable-intnoise : define INT_NOISE for the code +dnl --enable-intnoise: define INT_NOISE for the code AC_ARG_ENABLE(intnoise, AS_HELP_STRING([--enable-intnoise],[Enable noise integration in noise analysis])) -dnl --enable-smoketest : a smoketest +dnl --enable-smoketest: a smoketest AC_ARG_ENABLE(smoketest, AS_HELP_STRING([--enable-smoketest],[Enable smoketest compile])) -dnl --enable-experimental : define EXPERIMENTAL_CODE for the code +dnl --enable-experimental: define EXPERIMENTAL_CODE for the code AC_ARG_ENABLE(experimental, AS_HELP_STRING([--enable-experimental],[Enable some experimental code])) -dnl --enable-expdevices : Enable the compilation of experimental devices +dnl --enable-expdevices: Enable the compilation of experimental devices AC_ARG_ENABLE(expdevices, AS_HELP_STRING([--enable-expdevices],[Enable experimental devices (they do not compile)])) @@ -154,33 +154,33 @@ dnl --enable-cluster: define CLUSTER in the code. This is for cluster support AC_ARG_ENABLE(cluster, AS_HELP_STRING([--enable-cluster],[Enable cluster support, (experimental) ])) -dnl --enable-numparams: define NUMPARAMS in the code. This is for .param support +dnl --enable-numparam: define NUMPARAMS in the code. This is for .param support AC_ARG_ENABLE(numparam, - AS_HELP_STRING([--enable-numparam],[Enable numparams library support, (experimental) ])) + AS_HELP_STRING([--enable-numparam],[Enable numparam library support, (experimental) ])) dnl --enable-xgraph: Compile the xgraph plotting program. Default is "no". dnl Xgraph is a plotting package for X11 once very popular. AC_ARG_ENABLE(xgraph, AS_HELP_STRING([--enable-xgraph],[Enable xgraph compilation.])) - + dnl --with-readline: Includes GNU readline support into CLI. Default is "no". dnl Including readline into ngspice is a violation of GPL license. It's use dnl is discouraged. AC_ARG_WITH(readline, - AS_HELP_STRING([--with-readline[=yes/no]],[Enable GNU readline support for CLI. Default=no.])) - + AS_HELP_STRING([--with-readline[=yes/no]],[Enable GNU readline support for CLI. Default=no.])) + dnl --with-editline: Includes BSD Editline support into CLI. Default is "no". AC_ARG_WITH(editline, - AS_HELP_STRING([--with-editline[=yes/no]],[Enable BSD editline support for CLI. Default=no.])) - - + AS_HELP_STRING([--with-editline[=yes/no]],[Enable BSD editline support for CLI. Default=no.])) + + dnl readline and editline cannot both be enabled if test "$with_editline" = "yes"; then if test "$with_readline" = "yes"; then AC_MSG_ERROR(Readline and editline cannot both be enabled) fi fi - + dnl Enable maintainer commands only if requested AM_MAINTAINER_MODE @@ -201,14 +201,14 @@ if test "$enable_debug" = "no"; then fi if test "x$GCC" = "xyes"; then - CFLAGS="$CFLAGS -Wall " + CFLAGS="$CFLAGS -Wall" fi dnl Not sure that this will work.... if test "$with_checkergcc" = "yes"; then CC="checkergcc" -fi +fi dnl Checks for ANSI-C header files. @@ -224,8 +224,8 @@ if test "$enable_ansi" = "yes"; then am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc if test ! "$am_cv_prog_cc_stdc"="yes"; then - AC_MSG_WARN(Failed to find Ansi flag!) - fi + AC_MSG_WARN(Failed to find Ansi flag!) + fi fi if test "$enable_smoketest" = "yes"; then @@ -239,12 +239,11 @@ dnl CFLAGS="$CFLAGS -Werror" fi -dnl Check system we're on , and tune accordingly +dnl Check system we're on , and tune accordingly AC_CANONICAL_HOST dnl Checks for programs - AC_LIBTOOL_DLOPEN AM_PROG_LIBTOOL AC_PROG_LIBTOOL @@ -253,7 +252,7 @@ dnl --with-windows : the user wants to use generate the MS WINDOWS executable AC_MSG_CHECKING([whether windows code is enabled]) AC_ARG_WITH(windows, AS_HELP_STRING([--with-windows],[MS WINDOWS executable]), - [if test "$with_windows" = "yes"; then + [if test "$with_windows" = "yes"; then AC_DEFINE([HAS_WINDOWS],[1],[define to specify MS Windows executable]) fi], [with_windows="no"] @@ -262,13 +261,12 @@ AC_MSG_RESULT($with_windows) AM_CONDITIONAL(WINDOWS, test x$with_windows = xyes) case $with_windows in - yes ) AC_DEFINE(X_DISPLAY_MISSING) AC_MSG_RESULT(No X display!) CFLAGS="$CFLAGS -mwindows";; * ) - + dnl Checks for X11 header files and libraries - X11 support can be disabled dnl by passing the '--without-x' option to configure: @@ -277,6 +275,18 @@ dnl Try to locate the X-Windows include files and libraries AC_PATH_X AC_PATH_XTRA +# Checks for typedefs, structures, and compiler characteristics. +AC_HEADER_STDBOOL +AC_TYPE_SIZE_T + +# Checks for library functions. +AC_FUNC_ALLOCA +AC_FUNC_MALLOC +AC_FUNC_REALLOC +AC_FUNC_CLOSEDIR_VOID +AC_FUNC_SELECT_ARGTYPES +AC_FUNC_SETVBUF_REVERSED +AC_FUNC_VPRINTF dnl Check if the user wants to use the appropriate rpath commands to compile in dnl the shared library path for the X libraries. This is off by default since @@ -323,7 +333,7 @@ if test "X$_use_rpath" = "Xyes" ; then AC_MSG_CHECKING([if the compiler accepts ${fl}path for runtime libraries]) AC_LINK_IFELSE([AC_LANG_PROGRAM()], AC_MSG_RESULT([yes]) - rpath=$fl, + rpath=$fl, AC_MSG_RESULT([no])) test -n "$rpath" && break done @@ -342,7 +352,7 @@ dnl SJB: 13th march 2005 dnl Library order is giving linker warnings on MacOSX dnl It's not clear to me which order is required for Cygwin (see comment above) dnl and neither can I find any authoritative answer for the correct link order -dnl for MacOSX or Linux, but +dnl for MacOSX or Linux, but dnl -lXaw -lXmu -lXt -lXext -lX11 dnl seems to be the popular choice. dnl (The previous order was -lX11 -lXt -lXext -lXmu -lXaw) @@ -368,12 +378,14 @@ AC_TYPE_PID_T AC_TYPE_SIGNAL dnl Check for a few libraries and headers: - AC_HEADER_DIRENT AC_CHECK_HEADERS(ctype.h unistd.h pwd.h fcntl.h string.h sys/ioctl.h stropts.h) AC_HEADER_SYS_WAIT AC_HEADER_STAT +AC_CHECK_HEADERS([arpa/inet.h netdb.h netinet/in.h stddef.h sys/file.h sys/param.h sys/socket.h sys/time.h sys/timeb.h]) + + dnl Check time and resources headers and functions: AC_HEADER_TIME AC_STRUCT_TM @@ -383,23 +395,25 @@ AC_CHECK_FUNCS(localtime) AC_CHECK_FUNCS(ftime) AC_CHECK_FUNCS(gettimeofday time) AC_CHECK_FUNCS(getrusage utimes) -AC_CHECK_FUNCS(getrlimit ulimit , break) +AC_CHECK_FUNCS(getrlimit ulimit, break) + +AC_CHECK_FUNCS([endpwent gethostbyname memset select socket strdup strerror strncasecmp strstr strtol]) case $host_os in *mingw* ) AC_DEFINE(HAVE__MEMAVL,1,[Get system memory from windows API]) -esac +esac dnl Look for termios first (posix) -AC_CHECK_HEADERS(termios.h termio.h sgtty.h , break) +AC_CHECK_HEADERS(termios.h termio.h sgtty.h, break) AC_CHECK_FUNCS(isatty tcgetattr tcsetattr) dnl Check for a few functions: AC_FUNC_FORK([]) -AC_CHECK_FUNCS(access bcopy qsort dup2 popen) -AC_CHECK_FUNCS(strchr index , break) -AC_CHECK_FUNCS(strrchr rindex , break) -AC_CHECK_FUNCS(getcwd getwd , break) +AC_CHECK_FUNCS(access bcopy bzero qsort dup2 popen) +AC_CHECK_FUNCS(strchr index, break) +AC_CHECK_FUNCS(strrchr rindex, break) +AC_CHECK_FUNCS(getcwd getwd, break) AC_MSG_RESULT(Checking mathematical features of the system:) @@ -408,12 +422,12 @@ AC_CHECK_LIB(m, sqrt) AC_CHECK_HEADERS(float.h limits.h values.h) dnl Check for a few mathematical functions: -AC_CHECK_FUNCS(erfc logb scalb scalbn asinh acosh atanh isnan) +AC_CHECK_FUNCS(erfc logb scalb scalbn asinh acosh atanh isnan pow sqrt floor) dnl If user enables garbage collection, look for garbage collector if test "$enable_gc" = "yes"; then -AC_MSG_RESULT(Checking for the presence of the Garbage Collector:) -AC_CHECK_LIB(gc,GC_malloc, + AC_MSG_RESULT(Checking for the presence of the Garbage Collector:) + AC_CHECK_LIB(gc,GC_malloc, AC_DEFINE(HAVE_LIBGC,[],[Define if we want garbage collection enabled ]) LIBS="$LIBS -lgc") fi @@ -446,116 +460,110 @@ AC_CHECK_FUNCS(dirname,,AC_CHECK_LIB(gen,dirname,AC_DEFINE(HAVE_DIRNAME) LIBS="$ # Expand the prefix variable (this is really annoying!) if eval "test x$prefix = xNONE"; then - dprefix=$ac_default_prefix +dnl with the MS WINDOWS executable we suggest C:/Spice/bin as *.exe-path + if test "$with_windows" = "yes"; then + dprefix="C:/Spice" + prefix=$dprefix + else + dprefix=$ac_default_prefix + fi else - dprefix=$prefix + dprefix=$prefix fi +AC_DEFINE_UNQUOTED(NGSPICEBINDIR,"`echo $dprefix/bin`",[Define the directory for executables]) +AC_DEFINE_UNQUOTED(NGSPICEDATADIR,"`echo $dprefix/share/ng-spice-rework`",[Define the directory for architecture independent data files]) +AC_DEFINE_UNQUOTED(NGSPICEBUILDDATE,"`date`",[Define the build date]) - -AC_DEFINE_UNQUOTED(NGSPICEBINDIR, - "`echo $dprefix/bin`", - [Define the directory for executables]) -AC_DEFINE_UNQUOTED(NGSPICEDATADIR, - "`echo $dprefix/share/ng-spice-rework`", - [Define the directory for architecture independent data files] ) -AC_DEFINE_UNQUOTED(NGSPICEBUILDDATE, - "`date`", - [Define the build date]) - -# Recapitulate settings: -AC_MSG_RESULT(Settings which were chosen:) - -dnl with the MS WINDOWS executable we suggest /spice_win/bin as *.exe-path if test "$with_windows" = "yes"; then -dnl redefine the path for WINDOWS: AC_MSG_RESULT(WINDOWS code enabled) - AC_DEFINE_UNQUOTED(NGSPICEBINDIR, "`echo /spice_win/bin`" ) - AC_DEFINE_UNQUOTED(NGSPICEDATADIR, "`echo /spice_win/lib`" ) WINMAIN="winmain.o" WINDISPLIB="frontend/wdisp/libwindisp.a" + AC_CHECK_FUNCS([memmove]) else WINMAIN="" WINDISPLIB="" fi - AC_SUBST(WINMAIN) AC_SUBST(WINDISPLIB) +# Recapitulate settings: +AC_MSG_RESULT(Settings which were chosen:) + if test "$enable_sense2" = "yes"; then - AC_DEFINE(WANT_SENSE2,[],[Define if we want spice2 sensitivity analysis]) - AC_MSG_RESULT(Spice2 sensitivity analysis enabled) + AC_DEFINE(WANT_SENSE2,[],[Define if we want spice2 sensitivity analysis]) + AC_MSG_RESULT(Spice2 sensitivity analysis enabled) fi if test "$enable_nobypass" = "yes"; then - AC_DEFINE(NOBYPASS,[],[Define if we want NOBYPASS]) - AC_MSG_RESULT(NOBYPASS option enabled) + AC_DEFINE(NOBYPASS,[],[Define if we want NOBYPASS]) + AC_MSG_RESULT(NOBYPASS option enabled) fi if test "$enable_nosqrt" = "yes"; then AC_DEFINE(NOSQRT,[],[Define to use always exp/log for bulk diode calculations in mosfetf]) - AC_MSG_RESULT(NOSQRT option enabled) -fi + AC_MSG_RESULT(NOSQRT option enabled) +fi if test "$enable_capbypass" = "yes"; then AC_DEFINE(CAPBYPASS,[],[Define if we want to bypass cbd/cbs calculation for non varying vbs/vbd]) - AC_MSG_RESULT(CAPBYPASS option enabled) -fi + AC_MSG_RESULT(CAPBYPASS option enabled) +fi if test "$enable_capzerobypass" = "yes"; then AC_DEFINE(CAPZEROBYPASS,[],[Define if we want to bypass cbd/cbs calculation if Czero is zero]) - AC_MSG_RESULT(CAPZEROBYPASS option enabled) + AC_MSG_RESULT(CAPZEROBYPASS option enabled) fi if test "$enable_nodelimiting" = "yes"; then AC_DEFINE(NODELIMITING,[],[Experimental code never implemented to damp Newton iterations]) - AC_MSG_RESULT(NODELIMITING option enabled) -fi + AC_MSG_RESULT(NODELIMITING option enabled) +fi if test "$enable_predictor" = "yes"; then - AC_DEFINE(PREDICTOR,[],[Define if we want predictor algorithm]) - AC_MSG_RESULT(PREDICTOR algorithm enabled) + AC_DEFINE(PREDICTOR,[],[Define if we want predictor algorithm]) + AC_MSG_RESULT(PREDICTOR algorithm enabled) fi if test "$enable_newpred" = "yes"; then - AC_DEFINE(NEWPRED,[],[Define if you want to discover :)]) - AC_MSG_RESULT(NEWPRED enabled) + AC_DEFINE(NEWPRED,[],[Define if you want to discover :)]) + AC_MSG_RESULT(NEWPRED enabled) fi if test "$enable_newtrunc" = "yes"; then AC_DEFINE(NEWTRUNC,[],[Do not trigger unwanted traps by default]) AC_MSG_RESULT(New truncation error calculation enabled) -fi +fi if test "$enable_intnoise" = "yes"; then - AC_DEFINE(INT_NOISE,[],[Define if we want noise integration code]) - AC_MSG_RESULT(Noise integration enabled) + AC_DEFINE(INT_NOISE,[],[Define if we want noise integration code]) + AC_MSG_RESULT(Noise integration enabled) fi if test "$enable_experimental" = "yes"; then - AC_DEFINE(EXPERIMENTAL_CODE,[],[Define if we want some experimental code]) - AC_MSG_RESULT(EXPERIMENTAL_CODE enabled) + AC_DEFINE(EXPERIMENTAL_CODE,[],[Define if we want some experimental code]) + AC_MSG_RESULT(EXPERIMENTAL_CODE enabled) fi if test "$enable_cpdebug" = "yes"; then - AC_DEFINE(CPDEBUG,[],[Define if you want to debug ngspice shell]) - AC_MSG_RESULT(WARNING: Shell debug is enabled) + AC_DEFINE(CPDEBUG,[],[Define if you want to debug ngspice shell]) + AC_MSG_RESULT(WARNING: Shell debug is enabled) fi if test "$enable_ftedebug" = "yes"; then - AC_DEFINE(FTEDEBUG,[],[Define if you want to debug frontend]) - AC_MSG_RESULT(WARNING: Frontend debug is enabled) + AC_DEFINE(FTEDEBUG,[],[Define if you want to debug frontend]) + AC_MSG_RESULT(WARNING: Frontend debug is enabled) fi if test "$enable_sensdebug" = "yes"; then AC_DEFINE(SENSDEBUG,[],[Define if we want debug sensititvity analysis]) - AC_MSG_RESULT(WARNING: Sensitivity code debug *SENSDEBUG* is enabled) + AC_MSG_RESULT(WARNING: Sensitivity code debug *SENSDEBUG* is enabled) fi if test "$enable_asdebug" = "yes"; then AC_DEFINE(ASDEBUG,[],[Define if we want debug sensitivity analysis]) - AC_MSG_RESULT(WARNING: Sensitivity code debug *ASDEBUG* is enabled) + AC_MSG_RESULT(WARNING: Sensitivity code debug *ASDEBUG* is enabled) fi if test "$enable_stepdebug" = "yes"; then AC_DEFINE(STEPDEBUG,[],[Define if we want stepdebug]) - AC_MSG_RESULT(WARNING: STEPDEBUG debug is enabled) + AC_MSG_RESULT(WARNING: STEPDEBUG debug is enabled) fi if test "$enable_pzdebug" = "yes"; then AC_DEFINE(PZDEBUG,[],[Define if you want to debug pole-zero analysis]) - AC_MSG_RESULT(WARNING: Pole/Zero analysis debug is enabled) + AC_MSG_RESULT(WARNING: Pole/Zero analysis debug is enabled) fi if test "$enable_blktmsdebug" = "yes"; then AC_DEFINE(D_DBG_BLOCKTIMES,[],[Define if we want debug distortion analysis (BLOCKTIMES)]) - AC_MSG_RESULT(WARNING: Distortion analysis debug *D_DBG_BLOCKTIMES* is enabled) + AC_MSG_RESULT(WARNING: Distortion analysis debug *D_DBG_BLOCKTIMES* is enabled) fi if test "$enable_smltmsdebug" = "yes"; then AC_DEFINE(D_DBG_SMALLTIMES,[],[Define if we want debug distortion analysis (SMALLTIMES)]) - AC_MSG_RESULT(WARNING: Distortion analysis debug *D_DBG_SMALLTIMES* is enabled) + AC_MSG_RESULT(WARNING: Distortion analysis debug *D_DBG_SMALLTIMES* is enabled) fi if test "$enable_xgraph" = "yes"; then AC_MSG_RESULT(Xgraph compilation enabled.) @@ -565,7 +573,7 @@ if test "$enable_xgraph" = "yes"; then else XGRAPHDIR="" NOTXGRAPH="xgraph" -fi +fi AC_SUBST(XGRAPHDIR) AC_SUBST(NOTXGRAPH) @@ -580,7 +588,7 @@ if test "$enable_xspice" = "yes"; then DLLIBS="";; * ) DLLIBS="-ldl";; - esac + esac XSPICELIB1="$XSPICEDIR/cm/libcmxsp.a \ $XSPICEDIR/mif/libmifxsp.a" XSPICELIB2="$XSPICEDIR/evt/libevtxsp.a \ @@ -588,10 +596,10 @@ if test "$enable_xspice" = "yes"; then $XSPICEDIR/ipc/libipcxsp.a \ $XSPICEDIR/idn/libidnxsp.a \ $DLLIBS" - XSPICEINIT="" - XSPICETESTS="" - - + XSPICEINIT="" + XSPICETESTS="" + AC_CHECK_FUNCS([modf]) + AC_CHECK_HEADERS([libintl.h malloc.h]) else XSPCIEDIR="" XSPICELIB1="" @@ -609,18 +617,18 @@ dnl Add CIDER enhancements to ngspice. if test "$enable_cider" = "yes"; then AC_MSG_RESULT(CIDER features enabled) AC_DEFINE(CIDER,[1],[The CIDER enhancements]) - + CIDERDIR="ciderlib" - + CIDERSIM=" $CIDERDIR/twod/libcidertwod.a \ $CIDERDIR/oned/libcideroned.a \ $CIDERDIR/input/libciderinput.a \ $CIDERDIR/support/libcidersuprt.a" - + CIDERMATH="misc" - + CIDERMATHDIR="maths/misc/libmathmisc.a" - + NUMDEV=" spicelib/devices/nbjt/libnbjt.a \ spicelib/devices/nbjt2/libnbjt2.a \ spicelib/devices/numd/libnumd.a \ @@ -631,23 +639,23 @@ if test "$enable_cider" = "yes"; then numd \ numd2 \ numos" - + CIDERSCRIPTS="devload devaxis ciderinit" - + else - CIDERLIB="" - CIDERSIM="" - CIDERMATH="" - CIDERMATHDIR="" - NUMDEV="" - NUMDEVDIR="" - CIDERSCRIPTS="" + CIDERLIB="" + CIDERSIM="" + CIDERMATH="" + CIDERMATHDIR="" + NUMDEV="" + NUMDEVDIR="" + CIDERSCRIPTS="" fi AC_SUBST(CIDERDIR) AC_SUBST(CIDERSIM) AC_SUBST(CIDERMATH) AC_SUBST(CIDERMATHDIR) -AC_SUBST(NUMDEV) +AC_SUBST(NUMDEV) AC_SUBST(NUMDEVDIR) AC_SUBST(CIDERSCRIPTS) @@ -658,12 +666,12 @@ if test "$enable_adms" = "yes"; then * ADMS support is experimental * **********************************) AC_CHECK_PROGS(ADMSXML, admsXml admsXml.exe,no) - + if test "$ADMSXML" = "no"; then - AC_MSG_ERROR(If you want adms models you should install admsXml) - fi + AC_MSG_ERROR(If you want adms models you should install admsXml) + fi AC_DEFINE(ADMS,[1],[Support for Verilog-A(MS) models]) - + VLADEVDIR=" adms/hicum0 \ adms/hicum2 \ adms/mextram \ @@ -671,42 +679,42 @@ if test "$enable_adms" = "yes"; then adms/psp102 " VLADEV=" spicelib/devices/adms/hicum0/libhicum0.a \ - spicelib/devices/adms/hicum2/libhicum2.a \ + spicelib/devices/adms/hicum2/libhicum2.a \ spicelib/devices/adms/mextram/libmextram.a \ spicelib/devices/adms/ekv/libekv.a \ - spicelib/devices/adms/psp102/libpsp102.a " - -fi + spicelib/devices/adms/psp102/libpsp102.a " + +fi AC_SUBST(ADMSXML) AC_SUBST(VLADEVDIR) AC_SUBST(VLADEV) dnl NDEV option if test "$enable_ndev" = "yes"; then - AC_MSG_RESULT(NDEV features enabled) - AC_DEFINE(NDEV,[],[The NDEV interface]) - NDEV="" - NDEV_DIR=" ndev " - NDEV_LIB=" spicelib/devices/ndev/libndev.a " + AC_MSG_RESULT(NDEV features enabled) + AC_DEFINE(NDEV,[],[The NDEV interface]) + NDEV="" + NDEV_DIR=" ndev " + NDEV_LIB=" spicelib/devices/ndev/libndev.a " else - NDEV="" - NDEV_DIR="" - NDEV_LIB="" + NDEV="" + NDEV_DIR="" + NDEV_LIB="" fi AC_SUBST(NDEV_DIR) AC_SUBST(NDEV_LIB) - + dnl Cluster option if test "$enable_cluster" = "yes"; then - AC_MSG_RESULT(Cluster version is being compiled) - AC_DEFINE(CLUSTER,[],[Spice cluster support ]) - LIBS="$LIBS -lpthread" + AC_MSG_RESULT(Cluster version is being compiled) + AC_DEFINE(CLUSTER,[],[Spice cluster support ]) + LIBS="$LIBS -lpthread" fi if test "$enable_expdevices" = "yes"; then - AC_DEFINE(EXP_DEV,[],[Define if we want to enable experimental devices]) - AC_MSG_RESULT(WARNING: Experimental devices enabled) + AC_DEFINE(EXP_DEV,[],[Define if we want to enable experimental devices]) + AC_MSG_RESULT(WARNING: Experimental devices enabled) fi dnl --enable-dot-global: Enable use of the .global keyword (experimental) @@ -726,7 +734,7 @@ if test "$enable_numparam" = "yes"; then NUMPARAMLIB="frontend/numparam/libnumparam.a" else NUMPARAMDIR="" - NUMPARAMLIB="" + NUMPARAMLIB="" fi AC_SUBST(NUMPARAMDIR) AC_SUBST(NUMPARAMLIB) @@ -738,17 +746,17 @@ dnl ---- Hope to see in the future readline replacement. ---- if test "$with_readline" != "yes"; then AC_MSG_RESULT(GNU readline disabled.) -else +else AC_MSG_RESULT(Checking for readline:) - AC_CHECK_HEADERS([readline/readline.h readline/history.h], + AC_CHECK_HEADERS([readline/readline.h readline/history.h], [AC_DEFINE(HAVE_GNUREADLINE,[],[Define if we have GNU readline])], [AC_MSG_ERROR(Couldn't find GNU readline headers.)]) AC_SEARCH_LIBS(tputs,ncurses termcap, AC_DEFINE(HAVE_TERMCAP,[],[Define if we have ncurses or termcap]), AC_MSG_ERROR(Found neither ncurses or termcap)) - AC_CHECK_LIB(readline, readline, + AC_CHECK_LIB(readline, readline, [LIBS="$LIBS -lreadline"], - [AC_MSG_ERROR(Couldn't find readline libraries.)]) + [AC_MSG_ERROR(Couldn't find readline libraries.)]) fi @@ -757,7 +765,7 @@ dnl ---- Default: disabled. ---- if test "$with_editline" != "yes"; then AC_MSG_RESULT(BSD editline disabled.) -else +else AC_MSG_RESULT(Checking for editline:) AC_CHECK_HEADERS([editline/readline.h], [AC_DEFINE([HAVE_BSDEDITLINE],[1],[Define to enable BSD editline])], @@ -765,10 +773,10 @@ else AC_SEARCH_LIBS(tputs,ncurses termcap, AC_DEFINE(HAVE_TERMCAP,[],[Define if we have ncurses or termcap]), AC_MSG_ERROR(Found neither ncurses or termcap)) - AC_CHECK_LIB(edit, readline, + AC_CHECK_LIB(edit, readline, [LIBS="$LIBS -ledit"], [AC_MSG_ERROR(Couldn't find editline libraries.)], - -lncurses ) + -lncurses ) fi dnl Use AC_CHECK_HEADERS so the HAVE_*_H symbol gets defined @@ -778,137 +786,135 @@ AC_CHECK_HEADERS(ncurses/termcap.h termcap.h) dnl Output Files dnl ------------ -AC_CONFIG_FILES([\ -Makefile \ -doc/Makefile \ -man/Makefile \ -man/man1/Makefile \ -src/Makefile \ -src/spinit \ -src/spicelib/Makefile \ -src/spicelib/analysis/Makefile \ -src/spicelib/devices/Makefile \ -src/spicelib/devices/asrc/Makefile \ -src/spicelib/devices/bjt/Makefile \ -src/spicelib/devices/bjt2/Makefile \ -src/spicelib/devices/bsim1/Makefile \ -src/spicelib/devices/bsim2/Makefile \ -src/spicelib/devices/bsim3/Makefile \ -src/spicelib/devices/bsim3v0/Makefile \ -src/spicelib/devices/bsim3v1/Makefile \ -src/spicelib/devices/bsim3v1a/Makefile \ -src/spicelib/devices/bsim3v1s/Makefile \ -src/spicelib/devices/bsim3v32/Makefile \ -src/spicelib/devices/bsim4/Makefile \ -src/spicelib/devices/bsim4v2/Makefile \ -src/spicelib/devices/bsim4v3/Makefile \ -src/spicelib/devices/bsim4v4/Makefile \ -src/spicelib/devices/bsim4v5/Makefile \ -src/spicelib/devices/bsim3soi/Makefile \ -src/spicelib/devices/bsim3soi_pd/Makefile \ -src/spicelib/devices/bsim3soi_fd/Makefile \ -src/spicelib/devices/bsim3soi_dd/Makefile \ -src/spicelib/devices/cap/Makefile \ -src/spicelib/devices/cccs/Makefile \ -src/spicelib/devices/ccvs/Makefile \ -src/spicelib/devices/csw/Makefile \ -src/spicelib/devices/cpl/Makefile \ -src/spicelib/devices/dio/Makefile \ -src/spicelib/devices/ind/Makefile \ -src/spicelib/devices/isrc/Makefile \ -src/spicelib/devices/hfet1/Makefile \ -src/spicelib/devices/hfet2/Makefile \ -src/spicelib/devices/hisim/Makefile \ -src/spicelib/devices/jfet/Makefile \ -src/spicelib/devices/jfet2/Makefile \ -src/spicelib/devices/ltra/Makefile \ -src/spicelib/devices/mes/Makefile \ -src/spicelib/devices/mesa/Makefile \ -src/spicelib/devices/mos1/Makefile \ -src/spicelib/devices/mos2/Makefile \ -src/spicelib/devices/mos3/Makefile \ -src/spicelib/devices/mos6/Makefile \ -src/spicelib/devices/mos9/Makefile \ -src/spicelib/devices/ndev/Makefile \ -src/spicelib/devices/res/Makefile \ -src/spicelib/devices/soi3/Makefile \ -src/spicelib/devices/sw/Makefile \ -src/spicelib/devices/tra/Makefile \ -src/spicelib/devices/txl/Makefile \ -src/spicelib/devices/urc/Makefile \ -src/spicelib/devices/vbic/Makefile \ -src/spicelib/devices/vccs/Makefile \ -src/spicelib/devices/vcvs/Makefile \ -src/spicelib/devices/vsrc/Makefile \ -src/spicelib/devices/nbjt/Makefile \ -src/spicelib/devices/nbjt2/Makefile \ -src/spicelib/devices/numd/Makefile \ -src/spicelib/devices/numd2/Makefile \ -src/spicelib/devices/numos/Makefile \ -src/spicelib/parser/Makefile \ -src/ciderlib/Makefile \ -src/ciderlib/input/Makefile \ -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 \ -src/frontend/wdisp/Makefile \ -src/include/Makefile \ -src/maths/Makefile \ -src/maths/cmaths/Makefile \ -src/maths/misc/Makefile \ -src/maths/ni/Makefile \ -src/maths/deriv/Makefile \ -src/maths/poly/Makefile \ -src/maths/sparse/Makefile \ -src/misc/Makefile \ -src/xspice/Makefile \ -src/xspice/cm/Makefile \ -src/xspice/cmpp/Makefile \ -src/xspice/icm/makedefs \ -src/xspice/mif/Makefile \ -src/xspice/evt/Makefile \ -src/xspice/enh/Makefile \ -src/xspice/ipc/Makefile \ -src/xspice/idn/Makefile \ -tests/Makefile \ -tests/bsim1/Makefile \ -tests/bsim2/Makefile \ -tests/bsim3/Makefile \ -tests/bsim3/Berkeley/Makefile \ -tests/bsim3/Berkeley/3v0/Makefile \ -tests/bsim3/Berkeley/3v0/ac_sim/Makefile \ -tests/bsim3/Berkeley/3v0/dc_sim/Makefile \ -tests/bsim3/Berkeley/3v0/tran_sim/Makefile \ -tests/bsim3/Berkeley/3v1/Makefile \ -tests/bsim3/Berkeley/3v1/ac_sim/Makefile \ -tests/bsim3/Berkeley/3v1/dc_sim/Makefile \ -tests/bsim3/Berkeley/3v1/tran_sim/Makefile \ -tests/bsim3/Berkeley/3v2/Makefile \ -tests/bsim3/Berkeley/3v2/ac_sim/Makefile \ -tests/bsim3/Berkeley/3v2/dc_sim/Makefile \ -tests/bsim3/Berkeley/3v2/tran_sim/Makefile \ -tests/bsim3soidd/Makefile \ -tests/bsim3soifd/Makefile \ -tests/bsim3soipd/Makefile \ -tests/bsim4/Makefile \ -tests/filters/Makefile \ -tests/general/Makefile \ -tests/hfet/Makefile \ -tests/hisim/Makefile \ -tests/jfet/Makefile \ -tests/mes/Makefile \ -tests/mesa/Makefile \ -tests/mos6/Makefile \ -tests/polezero/Makefile \ -tests/sensitivity/Makefile \ -tests/transient/Makefile \ -tests/transmission/Makefile \ -tests/resistance/Makefile \ -tests/vbic/Makefile -]) +AC_CONFIG_FILES([Makefile + doc/Makefile + man/Makefile + man/man1/Makefile + src/Makefile + src/spinit + src/spicelib/Makefile + src/spicelib/analysis/Makefile + src/spicelib/devices/Makefile + src/spicelib/devices/asrc/Makefile + src/spicelib/devices/bjt/Makefile + src/spicelib/devices/bjt2/Makefile + src/spicelib/devices/bsim1/Makefile + src/spicelib/devices/bsim2/Makefile + src/spicelib/devices/bsim3/Makefile + src/spicelib/devices/bsim3v0/Makefile + src/spicelib/devices/bsim3v1/Makefile + src/spicelib/devices/bsim3v1a/Makefile + src/spicelib/devices/bsim3v1s/Makefile + src/spicelib/devices/bsim3v32/Makefile + src/spicelib/devices/bsim4/Makefile + src/spicelib/devices/bsim4v2/Makefile + src/spicelib/devices/bsim4v3/Makefile + src/spicelib/devices/bsim4v4/Makefile + src/spicelib/devices/bsim4v5/Makefile + src/spicelib/devices/bsim3soi/Makefile + src/spicelib/devices/bsim3soi_pd/Makefile + src/spicelib/devices/bsim3soi_fd/Makefile + src/spicelib/devices/bsim3soi_dd/Makefile + src/spicelib/devices/cap/Makefile + src/spicelib/devices/cccs/Makefile + src/spicelib/devices/ccvs/Makefile + src/spicelib/devices/csw/Makefile + src/spicelib/devices/cpl/Makefile + src/spicelib/devices/dio/Makefile + src/spicelib/devices/ind/Makefile + src/spicelib/devices/isrc/Makefile + src/spicelib/devices/hfet1/Makefile + src/spicelib/devices/hfet2/Makefile + src/spicelib/devices/hisim/Makefile + src/spicelib/devices/jfet/Makefile + src/spicelib/devices/jfet2/Makefile + src/spicelib/devices/ltra/Makefile + src/spicelib/devices/mes/Makefile + src/spicelib/devices/mesa/Makefile + src/spicelib/devices/mos1/Makefile + src/spicelib/devices/mos2/Makefile + src/spicelib/devices/mos3/Makefile + src/spicelib/devices/mos6/Makefile + src/spicelib/devices/mos9/Makefile + src/spicelib/devices/ndev/Makefile + src/spicelib/devices/res/Makefile + src/spicelib/devices/soi3/Makefile + src/spicelib/devices/sw/Makefile + src/spicelib/devices/tra/Makefile + src/spicelib/devices/txl/Makefile + src/spicelib/devices/urc/Makefile + src/spicelib/devices/vbic/Makefile + src/spicelib/devices/vccs/Makefile + src/spicelib/devices/vcvs/Makefile + src/spicelib/devices/vsrc/Makefile + src/spicelib/devices/nbjt/Makefile + src/spicelib/devices/nbjt2/Makefile + src/spicelib/devices/numd/Makefile + src/spicelib/devices/numd2/Makefile + src/spicelib/devices/numos/Makefile + src/spicelib/parser/Makefile + src/ciderlib/Makefile + src/ciderlib/input/Makefile + 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 + src/frontend/wdisp/Makefile + src/include/Makefile + src/maths/Makefile + src/maths/cmaths/Makefile + src/maths/misc/Makefile + src/maths/ni/Makefile + src/maths/deriv/Makefile + src/maths/poly/Makefile + src/maths/sparse/Makefile + src/misc/Makefile + src/xspice/Makefile + src/xspice/cm/Makefile + src/xspice/cmpp/Makefile + src/xspice/icm/makedefs + src/xspice/mif/Makefile + src/xspice/evt/Makefile + src/xspice/enh/Makefile + src/xspice/ipc/Makefile + src/xspice/idn/Makefile + tests/Makefile + tests/bsim1/Makefile + tests/bsim2/Makefile + tests/bsim3/Makefile + tests/bsim3/Berkeley/Makefile + tests/bsim3/Berkeley/3v0/Makefile + tests/bsim3/Berkeley/3v0/ac_sim/Makefile + tests/bsim3/Berkeley/3v0/dc_sim/Makefile + tests/bsim3/Berkeley/3v0/tran_sim/Makefile + tests/bsim3/Berkeley/3v1/Makefile + tests/bsim3/Berkeley/3v1/ac_sim/Makefile + tests/bsim3/Berkeley/3v1/dc_sim/Makefile + tests/bsim3/Berkeley/3v1/tran_sim/Makefile + tests/bsim3/Berkeley/3v2/Makefile + tests/bsim3/Berkeley/3v2/ac_sim/Makefile + tests/bsim3/Berkeley/3v2/dc_sim/Makefile + tests/bsim3/Berkeley/3v2/tran_sim/Makefile + tests/bsim3soidd/Makefile + tests/bsim3soifd/Makefile + tests/bsim3soipd/Makefile + tests/bsim4/Makefile + tests/filters/Makefile + tests/general/Makefile + tests/hfet/Makefile + tests/hisim/Makefile + tests/jfet/Makefile + tests/mes/Makefile + tests/mesa/Makefile + tests/mos6/Makefile + tests/polezero/Makefile + tests/sensitivity/Makefile + tests/transient/Makefile + tests/transmission/Makefile + tests/resistance/Makefile + tests/vbic/Makefile]) AC_OUTPUT