mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-12 22:14:35 +00:00
add support for automake 1.13
Do not use AM_PROG_MKDIR_P, which is obsolete. We use the AC_* version now, which requires autoconf>=2.59d. This also mean that we need to use the variable MKDIR_P instead of mkdir_p.
This commit is contained in:
parent
4d267e4f79
commit
e1610a86c4
4
INSTALL
4
INSTALL
@ -35,8 +35,8 @@ Note for Git checkouts
|
|||||||
|
|
||||||
If you have checked this out from Git, you need to have:
|
If you have checked this out from Git, you need to have:
|
||||||
* automake >= 1.8
|
* automake >= 1.8
|
||||||
* autoconf >= 2.59c
|
* autoconf >= 2.59d
|
||||||
* gettext >= 0.12
|
* gettext >= 0.16.1
|
||||||
Then type "./autogen.sh" to build the needed configuration
|
Then type "./autogen.sh" to build the needed configuration
|
||||||
files and proceed as stated above/below.
|
files and proceed as stated above/below.
|
||||||
|
|
||||||
|
@ -16,12 +16,12 @@ test "$automake_version" != "" && {
|
|||||||
}
|
}
|
||||||
|
|
||||||
case $automake_version in
|
case $automake_version in
|
||||||
*' '1.[8-9]*|*' '1.1[012]*)
|
*' '1.[8-9]*|*' '1.1[0123]*)
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
|
|
||||||
echo "This automake version is not supported by LyX."
|
echo "This automake version is not supported by LyX."
|
||||||
echo "LyX only supports automake 1.8 to 1.12."
|
echo "LyX only supports automake 1.8 to 1.13."
|
||||||
exit 1
|
exit 1
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
@ -38,11 +38,11 @@ test "$autoversion" != "" && {
|
|||||||
|
|
||||||
|
|
||||||
case $autoversion in
|
case $autoversion in
|
||||||
*' '2.59[cd]|*' '2.60[ab]|*' '2.6[0-9])
|
*' '2.59d|*' '2.60[ab]|*' '2.6[0-9])
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
echo "This autoconf version is not supported by LyX."
|
echo "This autoconf version is not supported by LyX."
|
||||||
echo "LyX only supports autoconf 2.59c-2.69."
|
echo "LyX only supports autoconf 2.59d-2.69."
|
||||||
exit 1
|
exit 1
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
2
config/.gitignore
vendored
2
config/.gitignore
vendored
@ -4,3 +4,5 @@ depcomp
|
|||||||
install-sh
|
install-sh
|
||||||
missing
|
missing
|
||||||
py-compile
|
py-compile
|
||||||
|
test-driver
|
||||||
|
|
||||||
|
@ -62,7 +62,7 @@ INSTALL_DATA = @INSTALL_DATA@
|
|||||||
mkinstalldirs = $(SHELL) @install_sh@ -d
|
mkinstalldirs = $(SHELL) @install_sh@ -d
|
||||||
install_sh = $(SHELL) @install_sh@
|
install_sh = $(SHELL) @install_sh@
|
||||||
MKDIR_P = @MKDIR_P@
|
MKDIR_P = @MKDIR_P@
|
||||||
mkdir_p = @mkdir_p@
|
mkdir_p = @MKDIR_P@
|
||||||
|
|
||||||
l = @INTL_LIBTOOL_SUFFIX_PREFIX@
|
l = @INTL_LIBTOOL_SUFFIX_PREFIX@
|
||||||
|
|
||||||
|
@ -25,7 +25,8 @@ dnl USE_INCLUDED_LIBINTL, BUILD_INCLUDED_LIBINTL.
|
|||||||
AC_DEFUN([AM_INTL_SUBDIR],
|
AC_DEFUN([AM_INTL_SUBDIR],
|
||||||
[
|
[
|
||||||
AC_REQUIRE([AC_PROG_INSTALL])dnl
|
AC_REQUIRE([AC_PROG_INSTALL])dnl
|
||||||
AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake
|
AC_REQUIRE([AC_PROG_MKDIR_P])dnl defined by autoconf
|
||||||
|
dnl AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake (obsolete)
|
||||||
AC_REQUIRE([AC_PROG_CC])dnl
|
AC_REQUIRE([AC_PROG_CC])dnl
|
||||||
AC_REQUIRE([AC_CANONICAL_HOST])dnl
|
AC_REQUIRE([AC_CANONICAL_HOST])dnl
|
||||||
AC_REQUIRE([gt_GLIBC2])dnl
|
AC_REQUIRE([gt_GLIBC2])dnl
|
||||||
|
3
m4/po.m4
3
m4/po.m4
@ -24,7 +24,8 @@ AC_DEFUN([AM_PO_SUBDIRS],
|
|||||||
[
|
[
|
||||||
AC_REQUIRE([AC_PROG_MAKE_SET])dnl
|
AC_REQUIRE([AC_PROG_MAKE_SET])dnl
|
||||||
AC_REQUIRE([AC_PROG_INSTALL])dnl
|
AC_REQUIRE([AC_PROG_INSTALL])dnl
|
||||||
AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake
|
AC_REQUIRE([AC_PROG_MKDIR_P])dnl defined by autoconf
|
||||||
|
dnl AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake (obsolete)
|
||||||
AC_REQUIRE([AM_NLS])dnl
|
AC_REQUIRE([AM_NLS])dnl
|
||||||
|
|
||||||
dnl Perform the following tests also if --disable-nls has been given,
|
dnl Perform the following tests also if --disable-nls has been given,
|
||||||
|
@ -43,7 +43,7 @@ INSTALL_DATA = @INSTALL_DATA@
|
|||||||
mkinstalldirs = $(SHELL) @install_sh@ -d
|
mkinstalldirs = $(SHELL) @install_sh@ -d
|
||||||
install_sh = $(SHELL) @install_sh@
|
install_sh = $(SHELL) @install_sh@
|
||||||
MKDIR_P = @MKDIR_P@
|
MKDIR_P = @MKDIR_P@
|
||||||
mkdir_p = @mkdir_p@
|
mkdir_p = @MKDIR_P@
|
||||||
|
|
||||||
GMSGFMT_ = @GMSGFMT@
|
GMSGFMT_ = @GMSGFMT@
|
||||||
GMSGFMT_no = @GMSGFMT@
|
GMSGFMT_no = @GMSGFMT@
|
||||||
|
Loading…
Reference in New Issue
Block a user