mirror of
https://github.com/Gnucash/gnucash.git
synced 2026-08-13 06:25:03 -05:00
Build changes to clean up library cross-dependencies and move to libtool-1.4
syntax. Also a patched ltmain.sh included with CVS now, so builds are faster and folks with libtool-1.3.4 installed aren't left in the cold. git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@5788 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
+15
-15
@@ -17,15 +17,15 @@ fi
|
||||
DIE=1
|
||||
}
|
||||
|
||||
(grep "^AM_PROG_LIBTOOL" $srcdir/configure.in >/dev/null) && {
|
||||
(libtool --version) < /dev/null > /dev/null 2>&1 || {
|
||||
echo
|
||||
echo "**Error**: You must have \`libtool' installed to compile Gnome."
|
||||
echo "Get ftp://ftp.gnu.org/pub/gnu/libtool-1.2d.tar.gz"
|
||||
echo "(or a newer version if it is available)"
|
||||
DIE=1
|
||||
}
|
||||
}
|
||||
#(grep "^AM_PROG_LIBTOOL" $srcdir/configure.in >/dev/null) && {
|
||||
# (libtool --version) < /dev/null > /dev/null 2>&1 || {
|
||||
# echo
|
||||
# echo "**Error**: You must have \`libtool' installed to compile Gnome."
|
||||
# echo "Get ftp://ftp.gnu.org/pub/gnu/libtool-1.2d.tar.gz"
|
||||
# echo "(or a newer version if it is available)"
|
||||
# DIE=1
|
||||
# }
|
||||
#}
|
||||
|
||||
#grep "^AM_GNU_GETTEXT" $srcdir/configure.in >/dev/null && {
|
||||
# grep "sed.*POTFILES" $srcdir/configure.in >/dev/null || \
|
||||
@@ -142,12 +142,12 @@ do
|
||||
echo "Running intltoolize ..."
|
||||
intltoolize --copy --force --automake
|
||||
fi
|
||||
if grep "^AM_PROG_LIBTOOL" configure.in >/dev/null; then
|
||||
if test -z "$NO_LIBTOOLIZE" ; then
|
||||
echo "Running libtoolize..."
|
||||
libtoolize --force --copy
|
||||
fi
|
||||
fi
|
||||
# if grep "^AM_PROG_LIBTOOL" configure.in >/dev/null; then
|
||||
# if test -z "$NO_LIBTOOLIZE" ; then
|
||||
# echo "Running libtoolize..."
|
||||
# libtoolize --force --copy
|
||||
# fi
|
||||
# fi
|
||||
echo "Running aclocal $aclocalinclude ..."
|
||||
aclocal $aclocalinclude || {
|
||||
echo
|
||||
|
||||
Reference in New Issue
Block a user