mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-09 18:31:04 +00:00
Remove the test for gettext; belongs in configure.
Exit 1 if autogen.sh exits abnormally. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9694 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
194f2be6de
commit
d98559ed0e
@ -1,3 +1,8 @@
|
||||
2005-03-05 Angus Leeming <leeming@lyx.org>
|
||||
|
||||
* autogen.sh: remove test for gettext. Belongs in configure.
|
||||
Return 1 if autogen.sh exits abnormally.
|
||||
|
||||
2005-03-02 Lars Gullik Bjonnes <larsbj@gullik.net>
|
||||
|
||||
* configure.ac: dont setup gnome/Makefile
|
||||
|
38
autogen.sh
38
autogen.sh
@ -6,26 +6,6 @@ AUTOMAKE="automake -a -c --foreign"
|
||||
AUTOCONF="autoconf"
|
||||
ACINCLUDE_FILES="lyxinclude.m4 libtool.m4 xforms.m4 qt.m4 gtk--.m4 gnome--.m4 gnome.m4 aspell.m4 pspell.m4 cygwin.m4 pkg.m4"
|
||||
|
||||
# Discover what version of gettext we are using.
|
||||
gettext_version=`gettext --version 2>/dev/null | head -n 1`
|
||||
|
||||
test "$gettext_version" != "" && {
|
||||
echo "Using $gettext_version"
|
||||
} || {
|
||||
echo "LyX requires getttext >= 0.12"
|
||||
exit
|
||||
}
|
||||
|
||||
case $gettext_version in
|
||||
*' '0.1[2-4]*)
|
||||
;;
|
||||
*)
|
||||
echo "This gettext version is not supported by LyX."
|
||||
echo "LyX supports only gettext 0.1[2-4]."
|
||||
exit
|
||||
;;
|
||||
esac
|
||||
|
||||
# Discover what version of automake we are using.
|
||||
automake_version=`$AUTOMAKE --version 2>/dev/null | head -n 1`
|
||||
|
||||
@ -33,7 +13,7 @@ test "$automake_version" != "" && {
|
||||
echo "Using $automake_version"
|
||||
} || {
|
||||
echo "LyX requires automake >= 1.5"
|
||||
exit
|
||||
exit 1
|
||||
}
|
||||
|
||||
case $automake_version in
|
||||
@ -43,7 +23,7 @@ case $automake_version in
|
||||
|
||||
echo "This automake version is not supported by LyX."
|
||||
echo "LyX only supports automake 1.[5-9]."
|
||||
exit
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
|
||||
@ -54,7 +34,7 @@ test "$autoversion" != "" && {
|
||||
echo "Using $autoversion"
|
||||
} || {
|
||||
echo "LyX requires autoconf >= 2.52"
|
||||
exit
|
||||
exit 1
|
||||
}
|
||||
|
||||
case $autoversion in
|
||||
@ -64,7 +44,7 @@ case $autoversion in
|
||||
*)
|
||||
echo "This autoconf version is not supported by LyX."
|
||||
echo "LyX only supports autoconf 2.5[2-9]."
|
||||
exit
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
|
||||
@ -83,7 +63,7 @@ for prog in $M4 gm4 gnum4 m4; do
|
||||
done
|
||||
if test x$GNUM4 = x ; then
|
||||
echo "not found."
|
||||
exit
|
||||
exit 1
|
||||
else
|
||||
echo `which $GNUM4`
|
||||
fi
|
||||
@ -104,7 +84,7 @@ if ( $ACLOCAL --version ) < /dev/null > /dev/null 2>&1; then
|
||||
echo "done."
|
||||
else
|
||||
echo "aclocal not found -- aborting"
|
||||
exit
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if ( $AUTOHEADER --version ) < /dev/null > /dev/null 2>&1; then
|
||||
@ -116,7 +96,7 @@ if ( $AUTOHEADER --version ) < /dev/null > /dev/null 2>&1; then
|
||||
echo "done."
|
||||
else
|
||||
echo "autoheader not found -- aborting"
|
||||
exit
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if ( $AUTOMAKE --version ) < /dev/null > /dev/null 2>&1; then
|
||||
@ -128,7 +108,7 @@ if ( $AUTOMAKE --version ) < /dev/null > /dev/null 2>&1; then
|
||||
echo "done."
|
||||
else
|
||||
echo "automake not found -- aborting"
|
||||
exit
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if ( $AUTOCONF --version ) < /dev/null > /dev/null 2>&1; then
|
||||
@ -140,7 +120,7 @@ if ( $AUTOCONF --version ) < /dev/null > /dev/null 2>&1; then
|
||||
echo "done."
|
||||
else
|
||||
echo "autoconf not found -- aborting"
|
||||
exit
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Autogenerate lib/configure.m4.
|
||||
|
Loading…
Reference in New Issue
Block a user