new --enable-oldapps: ngsconvert ngproc2mod ngmultidec ngmakeidx are made only per user request
This commit is contained in:
Holger Vogt
parent
831f75d8cc
commit
3145716163
42
configure.ac
42
configure.ac
|
|
@ -90,6 +90,10 @@ AC_ARG_ENABLE([newpred],
|
|||
AC_ARG_ENABLE([newtrunc],
|
||||
[AS_HELP_STRING([--enable-newtrunc], [Enable, how we want extrapolate capacitances.])])
|
||||
|
||||
# --enable-oldapps: define OLDAPPS
|
||||
AC_ARG_ENABLE([oldapps],
|
||||
[AS_HELP_STRING([--enable-oldapps], [Enable making old, outdated apps.])])
|
||||
|
||||
# --enable-sense2: define WANT_SENSE2 for the code
|
||||
AC_ARG_ENABLE([sense2],
|
||||
[AS_HELP_STRING([--enable-sense2], [Use spice2 sensitivity analysis.])])
|
||||
|
|
@ -175,6 +179,7 @@ AC_ARG_ENABLE([xgraph],
|
|||
# ngspice shared may want relative paths for spinit etc.
|
||||
AC_ARG_ENABLE([relpath],
|
||||
[AS_HELP_STRING([--enable-relpath], [Enable relative paths for spinit etc.])])
|
||||
|
||||
# --with-readline: Includes GNU readline support into CLI. Default is "no".
|
||||
AC_ARG_WITH([readline],
|
||||
[AS_HELP_STRING([--with-readline[=yes/no]], [Enable GNU readline support for CLI. Default=no.])])
|
||||
|
|
@ -253,6 +258,7 @@ if test "x$enable_gprof" = xyes; then
|
|||
fi
|
||||
fi
|
||||
|
||||
|
||||
# Not sure that this will work....
|
||||
if test "x$with_checkergcc" = xyes; then
|
||||
CC="checkergcc"
|
||||
|
|
@ -361,9 +367,9 @@ elif test "x$with_tcl" != x && test "x$with_tcl" != xno ; then
|
|||
*)
|
||||
;;
|
||||
esac
|
||||
|
||||
|
||||
with_x=no
|
||||
|
||||
|
||||
AC_MSG_CHECKING([for tclConfig.sh])
|
||||
tcl_config_sh=""
|
||||
if test "x$with_tcl" != xyes ; then
|
||||
|
|
@ -397,8 +403,8 @@ elif test "x$with_tcl" != x && test "x$with_tcl" != xno ; then
|
|||
break
|
||||
fi
|
||||
done
|
||||
|
||||
|
||||
|
||||
|
||||
if test "x$tcl_config_sh" = x ; then
|
||||
for dir in \
|
||||
`ls -dr /usr/local/tcltk/tcl[[7-9]].[[0-9]]* 2>/dev/null` \
|
||||
|
|
@ -426,22 +432,22 @@ elif test "x$with_tcl" != x && test "x$with_tcl" != xno ; then
|
|||
done
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
AC_MSG_RESULT([${tcl_config_sh}])
|
||||
|
||||
|
||||
if test "x$tcl_config_sh" = x ; then
|
||||
echo "can't find Tcl configuration script \"tclConfig.sh\""
|
||||
find /usr/ -name 'tclConfig.sh' -exec echo "Should you add --with-tcl={} to ./configure arguments?" \; | sed -re "s/\/tclConfig.sh/ /"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
|
||||
. $tcl_config_sh
|
||||
|
||||
|
||||
CFLAGS="$CFLAGS $TCL_INCLUDE_SPEC"
|
||||
CPPFLAGS="$CPPFLAGS $TCL_INCLUDE_SPEC"
|
||||
|
||||
|
||||
AC_CHECK_HEADERS([tcl.h blt.h], [], [AC_MSG_ERROR([Couldn't find Tcl/BLT headers])])
|
||||
|
||||
|
||||
if test ! -x "$TCL_EXEC_PREFIX/bin/tclsh$TCL_VERSION" ; then
|
||||
AC_MSG_ERROR([Couldn't find $TCL_EXEC_PREFIX/bin/tclsh$TCL_VERSION])
|
||||
fi
|
||||
|
|
@ -466,12 +472,12 @@ EOF
|
|||
[AC_MSG_ERROR([Couldnt find BLT library.])])
|
||||
|
||||
AC_CHECK_LIB([pthread], [pthread_create])
|
||||
|
||||
|
||||
if test -n "$libdir" ; then
|
||||
AC_SUBST([libdir])
|
||||
echo "libraries in $libdir"
|
||||
fi
|
||||
|
||||
|
||||
if test -z "$libdir" ; then
|
||||
for TCL_PACKAGE_PATH_ELEMENT in $TCL_PACKAGE_PATH ; do
|
||||
if test -a "$TCL_PACKAGE_PATH_ELEMENT" ; then
|
||||
|
|
@ -677,6 +683,18 @@ esac
|
|||
AM_CONDITIONAL([NO_X], [test "x$has_no_x" = xtrue])
|
||||
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
|
||||
has_oldapps=true
|
||||
AC_MSG_RESULT([ngsconvert ngproc2mod ngmultidec ngmakeidx nghelp are made.])
|
||||
else
|
||||
has_oldapps=false
|
||||
fi
|
||||
AM_CONDITIONAL([OLDAPPS], [test "x$has_oldapps" = xtrue])
|
||||
|
||||
|
||||
# Check for a few typdefs:
|
||||
AC_TYPE_PID_T
|
||||
AC_TYPE_SIGNAL
|
||||
|
|
|
|||
|
|
@ -19,6 +19,7 @@ if !TCL_MODULE
|
|||
if !SHARED_MODULE
|
||||
bin_PROGRAMS = ngspice ngnutmeg
|
||||
|
||||
if OLDAPPS
|
||||
if !WINGUI
|
||||
bin_PROGRAMS += ngsconvert ngproc2mod ngmultidec ngmakeidx
|
||||
helpdatadir = $(pkgdatadir)/helpdir
|
||||
|
|
@ -27,6 +28,7 @@ if !NO_HELP
|
|||
bin_PROGRAMS += nghelp
|
||||
endif !NO_HELP
|
||||
endif !WINGUI
|
||||
endif OLDAPPS
|
||||
endif !SHARED_MODULE
|
||||
endif !TCL_MODULE
|
||||
|
||||
|
|
@ -227,6 +229,7 @@ ngnutmeg_LDADD += \
|
|||
## These programs are not required on Windows
|
||||
if !WINGUI
|
||||
if !SHWIN
|
||||
if OLDAPPS
|
||||
|
||||
if !NO_X
|
||||
ngnutmeg_LDADD += \
|
||||
|
|
@ -291,6 +294,7 @@ 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
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue