Additional system scan prefered by autoscan and small changes for Windows prefix

This commit is contained in:
dwarning 2008-01-07 20:21:31 +00:00
parent ae1d4f899f
commit 5c9f55c9e4
1 changed files with 306 additions and 300 deletions

View File

@ -12,7 +12,7 @@ dnl Initialisation
dnl --------------- dnl ---------------
dnl Initialisation of configure 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 dnl Unique file in the source directory
AC_CONFIG_SRCDIR([src/ngspice.c]) AC_CONFIG_SRCDIR([src/ngspice.c])
@ -20,13 +20,13 @@ AC_CONFIG_SRCDIR([src/ngspice.c])
dnl Ensure a recent version of Autoconf is in use 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 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) 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 dnl Revison stamp the generated ./configure script
AC_REVISION($Revision$) AC_REVISION($Revision$)
dnl Create a configuration header dnl Create a configuration header
AC_CONFIG_HEADERS([config.h]) AC_CONFIG_HEADER([config.h])
dnl Initialise automake stuff dnl Initialise automake stuff
AM_INIT_AUTOMAKE AM_INIT_AUTOMAKE
@ -154,9 +154,9 @@ dnl --enable-cluster: define CLUSTER in the code. This is for cluster support
AC_ARG_ENABLE(cluster, AC_ARG_ENABLE(cluster,
AS_HELP_STRING([--enable-cluster],[Enable cluster support, (experimental) ])) 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, 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 --enable-xgraph: Compile the xgraph plotting program. Default is "no".
dnl Xgraph is a plotting package for X11 once very popular. dnl Xgraph is a plotting package for X11 once very popular.
@ -244,7 +244,6 @@ AC_CANONICAL_HOST
dnl Checks for programs dnl Checks for programs
AC_LIBTOOL_DLOPEN AC_LIBTOOL_DLOPEN
AM_PROG_LIBTOOL AM_PROG_LIBTOOL
AC_PROG_LIBTOOL AC_PROG_LIBTOOL
@ -262,7 +261,6 @@ AC_MSG_RESULT($with_windows)
AM_CONDITIONAL(WINDOWS, test x$with_windows = xyes) AM_CONDITIONAL(WINDOWS, test x$with_windows = xyes)
case $with_windows in case $with_windows in
yes ) yes )
AC_DEFINE(X_DISPLAY_MISSING) AC_DEFINE(X_DISPLAY_MISSING)
AC_MSG_RESULT(No X display!) AC_MSG_RESULT(No X display!)
@ -277,6 +275,18 @@ dnl Try to locate the X-Windows include files and libraries
AC_PATH_X AC_PATH_X
AC_PATH_XTRA 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 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 dnl the shared library path for the X libraries. This is off by default since
@ -368,12 +378,14 @@ AC_TYPE_PID_T
AC_TYPE_SIGNAL AC_TYPE_SIGNAL
dnl Check for a few libraries and headers: dnl Check for a few libraries and headers:
AC_HEADER_DIRENT AC_HEADER_DIRENT
AC_CHECK_HEADERS(ctype.h unistd.h pwd.h fcntl.h string.h sys/ioctl.h stropts.h) AC_CHECK_HEADERS(ctype.h unistd.h pwd.h fcntl.h string.h sys/ioctl.h stropts.h)
AC_HEADER_SYS_WAIT AC_HEADER_SYS_WAIT
AC_HEADER_STAT 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: dnl Check time and resources headers and functions:
AC_HEADER_TIME AC_HEADER_TIME
AC_STRUCT_TM AC_STRUCT_TM
@ -385,6 +397,8 @@ AC_CHECK_FUNCS(gettimeofday time)
AC_CHECK_FUNCS(getrusage utimes) 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 case $host_os in
*mingw* ) *mingw* )
AC_DEFINE(HAVE__MEMAVL,1,[Get system memory from windows API]) AC_DEFINE(HAVE__MEMAVL,1,[Get system memory from windows API])
@ -396,7 +410,7 @@ AC_CHECK_FUNCS(isatty tcgetattr tcsetattr)
dnl Check for a few functions: dnl Check for a few functions:
AC_FUNC_FORK([]) AC_FUNC_FORK([])
AC_CHECK_FUNCS(access bcopy qsort dup2 popen) AC_CHECK_FUNCS(access bcopy bzero qsort dup2 popen)
AC_CHECK_FUNCS(strchr index, break) AC_CHECK_FUNCS(strchr index, break)
AC_CHECK_FUNCS(strrchr rindex, break) AC_CHECK_FUNCS(strrchr rindex, break)
AC_CHECK_FUNCS(getcwd getwd, break) AC_CHECK_FUNCS(getcwd getwd, break)
@ -408,7 +422,7 @@ AC_CHECK_LIB(m, sqrt)
AC_CHECK_HEADERS(float.h limits.h values.h) AC_CHECK_HEADERS(float.h limits.h values.h)
dnl Check for a few mathematical functions: 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 dnl If user enables garbage collection, look for garbage collector
if test "$enable_gc" = "yes"; then if test "$enable_gc" = "yes"; then
@ -446,41 +460,35 @@ AC_CHECK_FUNCS(dirname,,AC_CHECK_LIB(gen,dirname,AC_DEFINE(HAVE_DIRNAME) LIBS="$
# Expand the prefix variable (this is really annoying!) # Expand the prefix variable (this is really annoying!)
if eval "test x$prefix = xNONE"; then if eval "test x$prefix = xNONE"; then
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 dprefix=$ac_default_prefix
fi
else else
dprefix=$prefix dprefix=$prefix
fi 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 if test "$with_windows" = "yes"; then
dnl redefine the path for WINDOWS:
AC_MSG_RESULT(WINDOWS code enabled) 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" WINMAIN="winmain.o"
WINDISPLIB="frontend/wdisp/libwindisp.a" WINDISPLIB="frontend/wdisp/libwindisp.a"
AC_CHECK_FUNCS([memmove])
else else
WINMAIN="" WINMAIN=""
WINDISPLIB="" WINDISPLIB=""
fi fi
AC_SUBST(WINMAIN) AC_SUBST(WINMAIN)
AC_SUBST(WINDISPLIB) AC_SUBST(WINDISPLIB)
# Recapitulate settings:
AC_MSG_RESULT(Settings which were chosen:)
if test "$enable_sense2" = "yes"; then if test "$enable_sense2" = "yes"; then
AC_DEFINE(WANT_SENSE2,[],[Define if we want spice2 sensitivity analysis]) AC_DEFINE(WANT_SENSE2,[],[Define if we want spice2 sensitivity analysis])
AC_MSG_RESULT(Spice2 sensitivity analysis enabled) AC_MSG_RESULT(Spice2 sensitivity analysis enabled)
@ -590,8 +598,8 @@ if test "$enable_xspice" = "yes"; then
$DLLIBS" $DLLIBS"
XSPICEINIT="" XSPICEINIT=""
XSPICETESTS="" XSPICETESTS=""
AC_CHECK_FUNCS([modf])
AC_CHECK_HEADERS([libintl.h malloc.h])
else else
XSPCIEDIR="" XSPCIEDIR=""
XSPICELIB1="" XSPICELIB1=""
@ -778,137 +786,135 @@ AC_CHECK_HEADERS(ncurses/termcap.h termcap.h)
dnl Output Files dnl Output Files
dnl ------------ dnl ------------
AC_CONFIG_FILES([\ AC_CONFIG_FILES([Makefile
Makefile \ doc/Makefile
doc/Makefile \ man/Makefile
man/Makefile \ man/man1/Makefile
man/man1/Makefile \ src/Makefile
src/Makefile \ src/spinit
src/spinit \ src/spicelib/Makefile
src/spicelib/Makefile \ src/spicelib/analysis/Makefile
src/spicelib/analysis/Makefile \ src/spicelib/devices/Makefile
src/spicelib/devices/Makefile \ src/spicelib/devices/asrc/Makefile
src/spicelib/devices/asrc/Makefile \ src/spicelib/devices/bjt/Makefile
src/spicelib/devices/bjt/Makefile \ src/spicelib/devices/bjt2/Makefile
src/spicelib/devices/bjt2/Makefile \ src/spicelib/devices/bsim1/Makefile
src/spicelib/devices/bsim1/Makefile \ src/spicelib/devices/bsim2/Makefile
src/spicelib/devices/bsim2/Makefile \ src/spicelib/devices/bsim3/Makefile
src/spicelib/devices/bsim3/Makefile \ src/spicelib/devices/bsim3v0/Makefile
src/spicelib/devices/bsim3v0/Makefile \ src/spicelib/devices/bsim3v1/Makefile
src/spicelib/devices/bsim3v1/Makefile \ src/spicelib/devices/bsim3v1a/Makefile
src/spicelib/devices/bsim3v1a/Makefile \ src/spicelib/devices/bsim3v1s/Makefile
src/spicelib/devices/bsim3v1s/Makefile \ src/spicelib/devices/bsim3v32/Makefile
src/spicelib/devices/bsim3v32/Makefile \ src/spicelib/devices/bsim4/Makefile
src/spicelib/devices/bsim4/Makefile \ src/spicelib/devices/bsim4v2/Makefile
src/spicelib/devices/bsim4v2/Makefile \ src/spicelib/devices/bsim4v3/Makefile
src/spicelib/devices/bsim4v3/Makefile \ src/spicelib/devices/bsim4v4/Makefile
src/spicelib/devices/bsim4v4/Makefile \ src/spicelib/devices/bsim4v5/Makefile
src/spicelib/devices/bsim4v5/Makefile \ src/spicelib/devices/bsim3soi/Makefile
src/spicelib/devices/bsim3soi/Makefile \ src/spicelib/devices/bsim3soi_pd/Makefile
src/spicelib/devices/bsim3soi_pd/Makefile \ src/spicelib/devices/bsim3soi_fd/Makefile
src/spicelib/devices/bsim3soi_fd/Makefile \ src/spicelib/devices/bsim3soi_dd/Makefile
src/spicelib/devices/bsim3soi_dd/Makefile \ src/spicelib/devices/cap/Makefile
src/spicelib/devices/cap/Makefile \ src/spicelib/devices/cccs/Makefile
src/spicelib/devices/cccs/Makefile \ src/spicelib/devices/ccvs/Makefile
src/spicelib/devices/ccvs/Makefile \ src/spicelib/devices/csw/Makefile
src/spicelib/devices/csw/Makefile \ src/spicelib/devices/cpl/Makefile
src/spicelib/devices/cpl/Makefile \ src/spicelib/devices/dio/Makefile
src/spicelib/devices/dio/Makefile \ src/spicelib/devices/ind/Makefile
src/spicelib/devices/ind/Makefile \ src/spicelib/devices/isrc/Makefile
src/spicelib/devices/isrc/Makefile \ src/spicelib/devices/hfet1/Makefile
src/spicelib/devices/hfet1/Makefile \ src/spicelib/devices/hfet2/Makefile
src/spicelib/devices/hfet2/Makefile \ src/spicelib/devices/hisim/Makefile
src/spicelib/devices/hisim/Makefile \ src/spicelib/devices/jfet/Makefile
src/spicelib/devices/jfet/Makefile \ src/spicelib/devices/jfet2/Makefile
src/spicelib/devices/jfet2/Makefile \ src/spicelib/devices/ltra/Makefile
src/spicelib/devices/ltra/Makefile \ src/spicelib/devices/mes/Makefile
src/spicelib/devices/mes/Makefile \ src/spicelib/devices/mesa/Makefile
src/spicelib/devices/mesa/Makefile \ src/spicelib/devices/mos1/Makefile
src/spicelib/devices/mos1/Makefile \ src/spicelib/devices/mos2/Makefile
src/spicelib/devices/mos2/Makefile \ src/spicelib/devices/mos3/Makefile
src/spicelib/devices/mos3/Makefile \ src/spicelib/devices/mos6/Makefile
src/spicelib/devices/mos6/Makefile \ src/spicelib/devices/mos9/Makefile
src/spicelib/devices/mos9/Makefile \ src/spicelib/devices/ndev/Makefile
src/spicelib/devices/ndev/Makefile \ src/spicelib/devices/res/Makefile
src/spicelib/devices/res/Makefile \ src/spicelib/devices/soi3/Makefile
src/spicelib/devices/soi3/Makefile \ src/spicelib/devices/sw/Makefile
src/spicelib/devices/sw/Makefile \ src/spicelib/devices/tra/Makefile
src/spicelib/devices/tra/Makefile \ src/spicelib/devices/txl/Makefile
src/spicelib/devices/txl/Makefile \ src/spicelib/devices/urc/Makefile
src/spicelib/devices/urc/Makefile \ src/spicelib/devices/vbic/Makefile
src/spicelib/devices/vbic/Makefile \ src/spicelib/devices/vccs/Makefile
src/spicelib/devices/vccs/Makefile \ src/spicelib/devices/vcvs/Makefile
src/spicelib/devices/vcvs/Makefile \ src/spicelib/devices/vsrc/Makefile
src/spicelib/devices/vsrc/Makefile \ src/spicelib/devices/nbjt/Makefile
src/spicelib/devices/nbjt/Makefile \ src/spicelib/devices/nbjt2/Makefile
src/spicelib/devices/nbjt2/Makefile \ src/spicelib/devices/numd/Makefile
src/spicelib/devices/numd/Makefile \ src/spicelib/devices/numd2/Makefile
src/spicelib/devices/numd2/Makefile \ src/spicelib/devices/numos/Makefile
src/spicelib/devices/numos/Makefile \ src/spicelib/parser/Makefile
src/spicelib/parser/Makefile \ src/ciderlib/Makefile
src/ciderlib/Makefile \ src/ciderlib/input/Makefile
src/ciderlib/input/Makefile \ src/ciderlib/support/Makefile
src/ciderlib/support/Makefile \ src/ciderlib/oned/Makefile
src/ciderlib/oned/Makefile \ src/ciderlib/twod/Makefile
src/ciderlib/twod/Makefile \ src/frontend/Makefile
src/frontend/Makefile \ src/frontend/numparam/Makefile
src/frontend/numparam/Makefile \ src/frontend/help/Makefile
src/frontend/help/Makefile \ src/frontend/parser/Makefile
src/frontend/parser/Makefile \ src/frontend/plotting/Makefile
src/frontend/plotting/Makefile \ src/frontend/wdisp/Makefile
src/frontend/wdisp/Makefile \ src/include/Makefile
src/include/Makefile \ src/maths/Makefile
src/maths/Makefile \ src/maths/cmaths/Makefile
src/maths/cmaths/Makefile \ src/maths/misc/Makefile
src/maths/misc/Makefile \ src/maths/ni/Makefile
src/maths/ni/Makefile \ src/maths/deriv/Makefile
src/maths/deriv/Makefile \ src/maths/poly/Makefile
src/maths/poly/Makefile \ src/maths/sparse/Makefile
src/maths/sparse/Makefile \ src/misc/Makefile
src/misc/Makefile \ src/xspice/Makefile
src/xspice/Makefile \ src/xspice/cm/Makefile
src/xspice/cm/Makefile \ src/xspice/cmpp/Makefile
src/xspice/cmpp/Makefile \ src/xspice/icm/makedefs
src/xspice/icm/makedefs \ src/xspice/mif/Makefile
src/xspice/mif/Makefile \ src/xspice/evt/Makefile
src/xspice/evt/Makefile \ src/xspice/enh/Makefile
src/xspice/enh/Makefile \ src/xspice/ipc/Makefile
src/xspice/ipc/Makefile \ src/xspice/idn/Makefile
src/xspice/idn/Makefile \ tests/Makefile
tests/Makefile \ tests/bsim1/Makefile
tests/bsim1/Makefile \ tests/bsim2/Makefile
tests/bsim2/Makefile \ tests/bsim3/Makefile
tests/bsim3/Makefile \ tests/bsim3/Berkeley/Makefile
tests/bsim3/Berkeley/Makefile \ tests/bsim3/Berkeley/3v0/Makefile
tests/bsim3/Berkeley/3v0/Makefile \ tests/bsim3/Berkeley/3v0/ac_sim/Makefile
tests/bsim3/Berkeley/3v0/ac_sim/Makefile \ tests/bsim3/Berkeley/3v0/dc_sim/Makefile
tests/bsim3/Berkeley/3v0/dc_sim/Makefile \ tests/bsim3/Berkeley/3v0/tran_sim/Makefile
tests/bsim3/Berkeley/3v0/tran_sim/Makefile \ tests/bsim3/Berkeley/3v1/Makefile
tests/bsim3/Berkeley/3v1/Makefile \ tests/bsim3/Berkeley/3v1/ac_sim/Makefile
tests/bsim3/Berkeley/3v1/ac_sim/Makefile \ tests/bsim3/Berkeley/3v1/dc_sim/Makefile
tests/bsim3/Berkeley/3v1/dc_sim/Makefile \ tests/bsim3/Berkeley/3v1/tran_sim/Makefile
tests/bsim3/Berkeley/3v1/tran_sim/Makefile \ tests/bsim3/Berkeley/3v2/Makefile
tests/bsim3/Berkeley/3v2/Makefile \ tests/bsim3/Berkeley/3v2/ac_sim/Makefile
tests/bsim3/Berkeley/3v2/ac_sim/Makefile \ tests/bsim3/Berkeley/3v2/dc_sim/Makefile
tests/bsim3/Berkeley/3v2/dc_sim/Makefile \ tests/bsim3/Berkeley/3v2/tran_sim/Makefile
tests/bsim3/Berkeley/3v2/tran_sim/Makefile \ tests/bsim3soidd/Makefile
tests/bsim3soidd/Makefile \ tests/bsim3soifd/Makefile
tests/bsim3soifd/Makefile \ tests/bsim3soipd/Makefile
tests/bsim3soipd/Makefile \ tests/bsim4/Makefile
tests/bsim4/Makefile \ tests/filters/Makefile
tests/filters/Makefile \ tests/general/Makefile
tests/general/Makefile \ tests/hfet/Makefile
tests/hfet/Makefile \ tests/hisim/Makefile
tests/hisim/Makefile \ tests/jfet/Makefile
tests/jfet/Makefile \ tests/mes/Makefile
tests/mes/Makefile \ tests/mesa/Makefile
tests/mesa/Makefile \ tests/mos6/Makefile
tests/mos6/Makefile \ tests/polezero/Makefile
tests/polezero/Makefile \ tests/sensitivity/Makefile
tests/sensitivity/Makefile \ tests/transient/Makefile
tests/transient/Makefile \ tests/transmission/Makefile
tests/transmission/Makefile \ tests/resistance/Makefile
tests/resistance/Makefile \ tests/vbic/Makefile])
tests/vbic/Makefile
])
AC_OUTPUT AC_OUTPUT