luke
/
ngspice
mirror of https://git.code.sf.net/p/ngspice/ngspice
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

adms, polish autogen.sh and configure.ac 

Allow to override the admsXml executable when invoking
  autogen.sh and configure.ac

ADMSXML=/foo/bar/baz/admsXml ./autogen.sh --adms
ADMSXML=/foo/bar/baz/admsXml ./configure --enable-adms
alternatively (and more advertised)
./configure ADMSXML=/foo/bar/baz/admsXml --enable-adms

The generated Makefiles remember the given path.
A relative path doesn't make sense of course.
This commit is contained in:
rlar 2017-03-12 19:12:53 +01:00
parent 3ea412e7cd
commit 8c09761e6b
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
autogen.sh
View File

@ -15,7 +15,7 @@ PROJECT=ngspice
ADMSDIR=src/spicelib/devices/adms ADMSDIR=src/spicelib/devices/adms
XMLPATH=src/spicelib/devices/adms/admst XMLPATH=src/spicelib/devices/adms/admst
ADMSXML=admsXml ADMSXML=${ADMSXML:-admsXml}
ADMS=0 ADMS=0
# Exit variable # Exit variable
@ -96,7 +96,7 @@ check_autoconf()
check_adms() check_adms()
{ {
(admsXml --version) < /dev/null > /dev/null 2>&1 || { ($ADMSXML --version) < /dev/null > /dev/null 2>&1 || {
echo echo
echo "You must have admsXml installed to compile adms models." echo "You must have admsXml installed to compile adms models."
echo "See http://mot-adms.sourceforge.net" echo "See http://mot-adms.sourceforge.net"

5
configure.ac
View File

@ -934,9 +934,9 @@ if test "x$enable_adms" = xyes ; then
AC_MSG_RESULT([********************************** AC_MSG_RESULT([**********************************
* ADMS support is experimental * * ADMS support is experimental *
**********************************]) **********************************])
AC_CHECK_PROGS([ADMSXML], [admsXml admsXml.exe], [no]) AC_CHECK_PROGS([ADMSXML], [admsXml admsXml.exe])
if test "x$ADMSXML" = xno; then if test "x$ADMSXML" = x; then
AC_MSG_ERROR([If you want Verilog-A models you should install admsXml]) AC_MSG_ERROR([If you want Verilog-A models you should install admsXml])
fi fi
AC_DEFINE([ADMS], [1], [Support for Verilog-A models]) AC_DEFINE([ADMS], [1], [Support for Verilog-A models])
@ -969,7 +969,6 @@ else
fi fi
AC_SUBST([ADMSXML])
AC_SUBST([VLADEVDIR]) AC_SUBST([VLADEVDIR])
AC_SUBST([VLADEV]) AC_SUBST([VLADEV])
AC_SUBST([NOTVLADEVDIR]) AC_SUBST([NOTVLADEVDIR])

2
src/spicelib/devices/adms/admst/ngspiceMakefile.am.xml
View File

@ -109,7 +109,7 @@ DISTCLEANFILES = Makefile.am \\
\$(ADMSXMLINTERFACE)/ngspiceMODULEguesstopology.c.xml \\ \$(ADMSXMLINTERFACE)/ngspiceMODULEguesstopology.c.xml \\
\$(ADMSXMLINTERFACE)/ngspiceMODULE.hxx.xml \\ \$(ADMSXMLINTERFACE)/ngspiceMODULE.hxx.xml \\
\$(ADMSXMLINTERFACE)/ngspiceMODULE.c.xml \$(ADMSXMLINTERFACE)/ngspiceMODULE.c.xml
admsXml -I\$(srcdir) -I\$(srcdir)/admsva \$&lt; \\ \$(ADMSXML) -I\$(srcdir) -I\$(srcdir)/admsva \$&lt; \\
-e \$(ADMSXMLINTERFACE)/ngspiceVersion.xml \\ -e \$(ADMSXMLINTERFACE)/ngspiceVersion.xml \\
-e \$(ADMSXMLINTERFACE)/ngspiceMODULEitf.h.xml \\ -e \$(ADMSXMLINTERFACE)/ngspiceMODULEitf.h.xml \\
-e \$(ADMSXMLINTERFACE)/ngspiceMODULEinit.c.xml \\ -e \$(ADMSXMLINTERFACE)/ngspiceMODULEinit.c.xml \\