anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-09-19 14:30:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix compatibility with automake 1.13

Browse Source 
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:
Jean-Marc Lasgouttes 2013-01-21 10:15:27 +01:00
parent c48bdf845c
commit d5e0e21ba0
6 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
INSTALL
View File

@ -37,7 +37,7 @@ 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.16.1 * 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.

4
autogen.sh
View File

@ -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
intl/Makefile.in
View File

@ -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@

3
m4/intl.m4
View File

@ -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
View File

@ -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,

2
po/Makefile.in.in
View File

@ -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@