diff --git a/ChangeLog b/ChangeLog index 33213cafb..3b1a0ba93 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +2012-01-28 Holger Vogt + * configure.ac, compile_min.sh: prepare for release 24 + 2012-01-27 Holger Vogt * NEWS, INSTALL, tests\bin\ngspice.pm, /visualc/include/ngspice/config.h: prepare for release 24 diff --git a/compile_min.sh b/compile_min.sh index ba5eb985d..fd04eb901 100644 --- a/compile_min.sh +++ b/compile_min.sh @@ -32,6 +32,12 @@ else fi # If compiling sources from CVS, you may need to uncomment the following two lines: +#./autogen.sh +#if [ $? -ne 0 ]; then echo "./autogen.sh failed"; exit 1 ; fi + +# Alternatively, if compiling sources from CVS, and want to add adms created devices, +# you may need to uncomment the following two lines (and don't forget to add adms option +# to the ../configure statement): #./autogen.sh --adms #if [ $? -ne 0 ]; then echo "./autogen.sh failed"; exit 1 ; fi @@ -42,16 +48,16 @@ if test "$1" = "64"; then echo "configuring for 64 bit" echo # You may add --enable-adms to the following command for adding adms generated devices - ../configure --with-windows --enable-xspice --enable-cider --enable-openmp --disable-debug prefix="C:/Spice64" CFLAGS="-m64" LDFLAGS="-m64" + ../configure --with-windows --enable-xspice --enable-cider --enable-openmp --disable-debug prefix="C:/Spice64" CFLAGS="-m64" LDFLAGS="-m64" else cd release if [ $? -ne 0 ]; then echo "cd release failed"; exit 1 ; fi echo "configuring for 32 bit" echo # You may add --enable-adms to the following command for adding adms generated devices - ../configure --with-windows --enable-xspice --enable-cider --enable-openmp --disable-debug CFLAGS="-m32" LDFLAGS="-m32" + ../configure --with-windows --enable-xspice --enable-cider --enable-openmp --disable-debug prefix="C:/Spice" CFLAGS="-m32" LDFLAGS="-m32" fi -if [ $? -ne 0 ]; then echo "./configure failed"; exit 1 ; fi +if [ $? -ne 0 ]; then echo "../configure failed"; exit 1 ; fi echo # make clean is required for properly making the code models diff --git a/configure.ac b/configure.ac index 37bf9af27..51e172218 100644 --- a/configure.ac +++ b/configure.ac @@ -12,7 +12,7 @@ dnl Initialisation dnl --------------- dnl Initialisation of configure -AC_INIT(ngspice,23,http://ngspice.sourceforge.net/bugrep.html) +AC_INIT(ngspice,24,http://ngspice.sourceforge.net/bugrep.html) dnl Unique file in the source directory AC_CONFIG_SRCDIR([src/ngspice.c])