ACLOCAL="aclocal -I m4 -I config"
AUTOHEADER="autoheader"
-AUTOMAKE="automake --add-missing --copy --foreign"
+AUTOMAKE="automake --add-missing --force-missing --copy --foreign"
AUTOCONF="autoconf"
# Discover what version of automake we are using.
test "$automake_version" != "" && {
echo "Using $automake_version"
} || {
- echo "LyX requires automake >= 1.5"
+ echo "LyX requires automake >= 1.8"
exit 1
}
case $automake_version in
- *' '1.[5-9]*|*' '1.10*)
+ *' '1.[8-9]*|*' '1.1[012]*)
;;
*)
echo "This automake version is not supported by LyX."
- echo "LyX only supports automake 1.5 to 1.10."
+ echo "LyX only supports automake 1.8 to 1.12."
exit 1
;;
esac
test "$autoversion" != "" && {
echo "Using $autoversion"
} || {
- echo "LyX requires autoconf >= 2.52"
+ echo "LyX requires autoconf >= 2.59c"
exit 1
}
+
case $autoversion in
- *' '2.5[2-9]|*' '2.60[ab]|*' '2.6[0-2])
+ *' '2.59[cd]|*' '2.60[ab]|*' '2.6[0-9])
;;
*)
echo "This autoconf version is not supported by LyX."
- echo "LyX only supports autoconf 2.52-2.61."
+ echo "LyX only supports autoconf 2.59c-2.69."
exit 1
;;
esac
# automake will stop if their contents was created by an earlier version.
rm -rf autom4te.cache
-# Update the gettext files
-echo "Copying gettext code... "
-if ( autopoint --version ) < /dev/null > /dev/null 2>&1; then
- autopoint --force >/dev/null
-else
- echo "autopoint not found -- aborting"
- exit 1
-fi
-
# Generate the Makefiles and configure files
echo "Building macros..."
if ( $ACLOCAL --version ) < /dev/null > /dev/null 2>&1; then
exit 1
fi
+echo "Building po/POTFILES.in..."
+if (! make -s -f po/Rules-lyx srcdir=po top_srcdir=. po/POTFILES.in ); then
+ echo "Building po/POTFILES.in failed -- aborting"
+ exit 1
+fi
+
echo
-echo 'run "./configure ; make"'
+echo 'run "./configure && make"'
echo