callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

back out accidental commit

Browse Source 
svn path=/trunk/; revision=19305
This commit is contained in:
Joe Shaw
2003-01-09 06:36:57 +00:00
parent 1e68876622
commit f255677bd1
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
macros/autogen.sh
View File

@ -38,7 +38,7 @@ fi
} }
(grep "^AM_PROG_LIBTOOL" $srcdir/configure.in >/dev/null) && { (grep "^AM_PROG_LIBTOOL" $srcdir/configure.in >/dev/null) && {
(libtool --version) < /dev/null > /dev/null 2>&1 || { (glibtool --version) < /dev/null > /dev/null 2>&1 || {
echo echo
echo "**Error**: You must have \`libtool' installed to compile $PKG_NAME." echo "**Error**: You must have \`libtool' installed to compile $PKG_NAME."
echo "Get ftp://ftp.gnu.org/pub/gnu/libtool-1.2d.tar.gz" echo "Get ftp://ftp.gnu.org/pub/gnu/libtool-1.2d.tar.gz"
@ -69,7 +69,7 @@ fi
# } # }
#} #}
(automake-1.4 --version) < /dev/null > /dev/null 2>&1 || { (automake --version) < /dev/null > /dev/null 2>&1 || {
echo echo
echo "**Error**: You must have \`automake' installed to compile $PKG_NAME." echo "**Error**: You must have \`automake' installed to compile $PKG_NAME."
echo "Get ftp://ftp.gnu.org/pub/gnu/automake-1.3.tar.gz" echo "Get ftp://ftp.gnu.org/pub/gnu/automake-1.3.tar.gz"
@ -80,7 +80,7 @@ fi
# if no automake, don't bother testing for aclocal # if no automake, don't bother testing for aclocal
test -n "$NO_AUTOMAKE" || (aclocal-1.4 --version) < /dev/null > /dev/null 2>&1 || { test -n "$NO_AUTOMAKE" || (aclocal --version) < /dev/null > /dev/null 2>&1 || {
echo echo
echo "**Error**: Missing \`aclocal'. The version of \`automake'" echo "**Error**: Missing \`aclocal'. The version of \`automake'"
echo "installed doesn't appear recent enough." echo "installed doesn't appear recent enough."
@ -172,10 +172,10 @@ do
libtoolize --force --copy libtoolize --force --copy
fi fi
fi fi
echo "Running aclocal-1.4 $aclocalinclude ..." echo "Running aclocal $aclocalinclude ..."
aclocal-1.4 $aclocalinclude || { aclocal $aclocalinclude || {
echo echo
echo "**Error**: aclocal-1.4 failed. This may mean that you have not" echo "**Error**: aclocal failed. This may mean that you have not"
echo "installed all of the packages you need, or you may need to" echo "installed all of the packages you need, or you may need to"
echo "set ACLOCAL_FLAGS to include \"-I \$prefix/share/aclocal\"" echo "set ACLOCAL_FLAGS to include \"-I \$prefix/share/aclocal\""
echo "for the prefix where you installed the packages whose" echo "for the prefix where you installed the packages whose"
@ -187,9 +187,9 @@ do
echo "Running autoheader..." echo "Running autoheader..."
autoheader || { echo "**Error**: autoheader failed."; exit 1; } autoheader || { echo "**Error**: autoheader failed."; exit 1; }
fi fi
echo "Running automake-1.4 --gnu $am_opt ..." echo "Running automake --gnu $am_opt ..."
automake-1.4 --add-missing --gnu $am_opt || automake --add-missing --gnu $am_opt ||
{ echo "**Error**: automake-1.4 failed."; exit 1; } { echo "**Error**: automake failed."; exit 1; }
echo "Running autoconf ..." echo "Running autoconf ..."
autoconf || { echo "**Error**: autoconf failed."; exit 1; } autoconf || { echo "**Error**: autoconf failed."; exit 1; }
) || exit 1 ) || exit 1