update: remove goto
This commit is contained in:
parent
2fcbcc5f48
commit
1657b33535
|
|
@ -1,3 +1,6 @@
|
||||||
|
2010-08-01 Holger Vogt
|
||||||
|
* autogen.sh: update for adms
|
||||||
|
|
||||||
2010-08-01 Robert Larice
|
2010-08-01 Robert Larice
|
||||||
* src/pkgIndex.tcl.in ,
|
* src/pkgIndex.tcl.in ,
|
||||||
* src/tclspice.c ,
|
* src/tclspice.c ,
|
||||||
|
|
|
||||||
25
autogen.sh
25
autogen.sh
|
|
@ -41,6 +41,14 @@ echo "$PROJECT autogen.sh 1.0"
|
||||||
echo
|
echo
|
||||||
}
|
}
|
||||||
|
|
||||||
|
end_on_error()
|
||||||
|
{
|
||||||
|
if test "$ADMS" -eq 1; then
|
||||||
|
mv configure.temp configure.in
|
||||||
|
fi
|
||||||
|
|
||||||
|
exit 1
|
||||||
|
}
|
||||||
|
|
||||||
check_autoconf()
|
check_autoconf()
|
||||||
{
|
{
|
||||||
|
|
@ -170,27 +178,27 @@ fi
|
||||||
|
|
||||||
echo "Running libtoolize"
|
echo "Running libtoolize"
|
||||||
libtoolize --copy --force
|
libtoolize --copy --force
|
||||||
if [ $? -ne 0 ];then echo "libtoolize failed"; goto errorhandler ; fi
|
if [ $? -ne 0 ];then echo "libtoolize failed"; end_on_error ; fi
|
||||||
|
|
||||||
echo "Running aclocal $ACLOCAL_FLAGS"
|
echo "Running aclocal $ACLOCAL_FLAGS"
|
||||||
aclocal $ACLOCAL_FLAGS
|
aclocal $ACLOCAL_FLAGS
|
||||||
if [ $? -ne 0 ]; then echo "aclocal failed"; goto errorhandler ; fi
|
if [ $? -ne 0 ]; then echo "aclocal failed"; end_on_error ; fi
|
||||||
|
|
||||||
# optional feature: autoheader
|
# optional feature: autoheader
|
||||||
(autoheader --version) < /dev/null > /dev/null 2>&1
|
(autoheader --version) < /dev/null > /dev/null 2>&1
|
||||||
if [ $? -eq 0 ]; then
|
if [ $? -eq 0 ]; then
|
||||||
echo "Running autoheader"
|
echo "Running autoheader"
|
||||||
autoheader
|
autoheader
|
||||||
if [ $? -ne 0 ]; then echo "autoheader failed"; goto errorhandler ; fi
|
if [ $? -ne 0 ]; then echo "autoheader failed"; end_on_error ; fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "Running automake -Wall --copy --add-missing"
|
echo "Running automake -Wall --copy --add-missing"
|
||||||
automake -Wall --copy --add-missing $am_opt
|
automake -Wall --copy --add-missing $am_opt
|
||||||
if [ $? -ne 0 ]; then echo "automake failed"; goto errorhandler ; fi
|
if [ $? -ne 0 ]; then echo "automake failed"; end_on_error ; fi
|
||||||
|
|
||||||
echo "Running autoconf"
|
echo "Running autoconf"
|
||||||
autoconf
|
autoconf
|
||||||
if [ $? -ne 0 ]; then echo "autoconf failed"; goto errorhandler ; fi
|
if [ $? -ne 0 ]; then echo "autoconf failed"; end_on_error ; fi
|
||||||
|
|
||||||
if test "$ADMS" -eq 1; then
|
if test "$ADMS" -eq 1; then
|
||||||
mv configure.temp configure.in
|
mv configure.temp configure.in
|
||||||
|
|
@ -199,10 +207,3 @@ fi
|
||||||
echo "Success."
|
echo "Success."
|
||||||
|
|
||||||
exit 0
|
exit 0
|
||||||
|
|
||||||
errorhandler:
|
|
||||||
if test "$ADMS" -eq 1; then
|
|
||||||
mv configure.temp configure.in
|
|
||||||
fi
|
|
||||||
|
|
||||||
exit 1
|
|
||||||
Loading…
Reference in New Issue