Le 07/05/13 22:04, Jean-Marc Lasgouttes a écrit :
Richard, what about this for 2.0.x?
JMarc
Now with the patches
>From c76a91a23261b0f919838461ce23cadfc5ebb519 Mon Sep 17 00:00:00 2001
From: Stephan Witt <sw...@lyx.org>
Date: Fri, 18 Jan 2013 21:17:18 +0100
Subject: [PATCH 1/2] add support for automake 1.13
---
autogen.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/autogen.sh b/autogen.sh
index 8b48960..8239558 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -16,12 +16,12 @@ test "$automake_version" != "" && {
}
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 "LyX only supports automake 1.8 to 1.12."
+ echo "LyX only supports automake 1.8 to 1.13."
exit 1
;;
esac
--
1.8.1.2
>From 390fa0dd990c419f003850bfe494b99f4a44931e Mon Sep 17 00:00:00 2001
From: Jean-Marc Lasgouttes <lasgout...@lyx.org>
Date: Mon, 21 Jan 2013 10:15:27 +0100
Subject: [PATCH 2/2] Fix compatibility with 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.
---
INSTALL | 4 ++--
autogen.sh | 4 ++--
intl/Makefile.in | 2 +-
m4/intl.m4 | 3 ++-
m4/po.m4 | 3 ++-
po/Makefile.in.in | 2 +-
6 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/INSTALL b/INSTALL
index dd490db..42e0b98 100644
--- a/INSTALL
+++ b/INSTALL
@@ -35,8 +35,8 @@ Note for Git checkouts
If you have checked this out from Git, you need to have:
* automake >= 1.8
-* autoconf >= 2.59c
-* gettext >= 0.12
+* autoconf >= 2.59d
+* gettext >= 0.16.1
Then type "./autogen.sh" to build the needed configuration
files and proceed as stated above/below.
diff --git a/autogen.sh b/autogen.sh
index 8239558..2884481 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -38,11 +38,11 @@ test "$autoversion" != "" && {
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 "LyX only supports autoconf 2.59c-2.69."
+ echo "LyX only supports autoconf 2.59d-2.69."
exit 1
;;
esac
diff --git a/intl/Makefile.in b/intl/Makefile.in
index 525922e..49e8e70 100644
--- a/intl/Makefile.in
+++ b/intl/Makefile.in
@@ -62,7 +62,7 @@ INSTALL_DATA = @INSTALL_DATA@
mkinstalldirs = $(SHELL) @install_sh@ -d
install_sh = $(SHELL) @install_sh@
MKDIR_P = @MKDIR_P@
-mkdir_p = @mkdir_p@
+mkdir_p = @MKDIR_P@
l = @INTL_LIBTOOL_SUFFIX_PREFIX@
diff --git a/m4/intl.m4 b/m4/intl.m4
index dcefb11..286efc9 100644
--- a/m4/intl.m4
+++ b/m4/intl.m4
@@ -25,7 +25,8 @@ dnl USE_INCLUDED_LIBINTL, BUILD_INCLUDED_LIBINTL.
AC_DEFUN([AM_INTL_SUBDIR],
[
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_CANONICAL_HOST])dnl
AC_REQUIRE([gt_GLIBC2])dnl
diff --git a/m4/po.m4 b/m4/po.m4
index 00133ef..815c873 100644
--- a/m4/po.m4
+++ b/m4/po.m4
@@ -24,7 +24,8 @@ AC_DEFUN([AM_PO_SUBDIRS],
[
AC_REQUIRE([AC_PROG_MAKE_SET])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
dnl Perform the following tests also if --disable-nls has been given,
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index 33534f9..01bef6d 100644
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -43,7 +43,7 @@ INSTALL_DATA = @INSTALL_DATA@
mkinstalldirs = $(SHELL) @install_sh@ -d
install_sh = $(SHELL) @install_sh@
MKDIR_P = @MKDIR_P@
-mkdir_p = @mkdir_p@
+mkdir_p = @MKDIR_P@
GMSGFMT_ = @GMSGFMT@
GMSGFMT_no = @GMSGFMT@
--
1.8.1.2
