The branch, master, has been updated.
- Log -----------------------------------------------------------------
commit 1d08d5232d0ab6093267678a1f3cfae23913c9b5
Author: Jean-Marc Lasgouttes <lasgout...@lyx.org>
Date: Tue Mar 19 12:59:38 2013 +0100
Add a test to configure for minimal Qt version
* use AS_COMPARE_VERSION to check whether the Qt version is correct.
* upgrade minimal requirement for autoconf to version 2.60 (released in
2006!).
diff --git a/autogen.sh b/autogen.sh
index 8afd4bf..a12f744 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -32,17 +32,17 @@ autoversion=`$AUTOCONF --version 2>/dev/null | head -n 1`
test "$autoversion" != "" && {
echo "Using $autoversion"
} || {
- echo "LyX requires autoconf >= 2.59c"
+ echo "LyX requires autoconf >= 2.60"
exit 1
}
case $autoversion in
- *' '2.59d|*' '2.60[ab]|*' '2.6[0-9])
+ *' '2.60[ab]|*' '2.6[0-9])
;;
*)
echo "This autoconf version is not supported by LyX."
- echo "LyX only supports autoconf 2.59d-2.69."
+ echo "LyX only supports autoconf 2.60-2.69."
exit 1
;;
esac
diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4
index 2e529ea..a21ce0a 100644
--- a/config/lyxinclude.m4
+++ b/config/lyxinclude.m4
@@ -547,9 +547,6 @@ AM_CONDITIONAL(INSTALL_MACOSX, $lyx_install_macosx)
AM_CONDITIONAL(INSTALL_WINDOWS, $lyx_install_windows)
AM_CONDITIONAL(INSTALL_CYGWIN, $lyx_install_cygwin)
AM_CONDITIONAL(INSTALL_POSIX, $lyx_install_posix)
-dnl Next two lines are only for autoconf <= 2.59
-datadir='${datarootdir}'
-AC_SUBST(datarootdir)
AC_SUBST(pkgdatadir)
AC_SUBST(program_suffix)
])
diff --git a/config/qt4.m4 b/config/qt4.m4
index 3114341..2fd66b4 100644
--- a/config/qt4.m4
+++ b/config/qt4.m4
@@ -140,6 +140,12 @@ AC_DEFUN([QT4_DO_IT_ALL],
if test "$pkg_failed" != "no" ; then
QT4_DO_MANUAL_CONFIG
fi
+
+ dnl Check qt version
+ AS_VERSION_COMPARE($QT4_VERSION, $1,
+ [LYX_ERROR([LyX requires version $1 of Qt. Only version $QT4_VERSION
has been found.])
+ ])
+
AC_PATH_PROGS(MOC4, [moc-qt4 moc],[],$qt4_cv_bin:$PATH)
AC_PATH_PROGS(UIC4, [uic-qt4 uic],[],$qt4_cv_bin:$PATH)
AC_PATH_PROGS(RCC4, [rcc-qt4 rcc],[],$qt4_cv_bin:$PATH)
diff --git a/configure.ac b/configure.ac
index ae3ba02..0c4d833 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ dnl Process with autoconf to generate configure script -*- sh
-*-
AC_INIT(LyX,2.1.0dev,[lyx-de...@lists.lyx.org],[lyx])
# Use ISO format only. The frontend needs to parse this
AC_SUBST(LYX_DATE, ["2011-04-29"])
-AC_PREREQ(2.52)
+AC_PREREQ(2.60)
AC_CONFIG_SRCDIR(src/main.cpp)
AC_CONFIG_HEADERS([config.h])
@@ -133,7 +133,7 @@ dnl problems with the AC_REQUIRE contained in QT4_DO_IT_ALL.
for frontend in $FRONTENDS ; do
case "$frontend" in
qt4)
- QT4_DO_IT_ALL
+ QT4_DO_IT_ALL([4.5.0])
FRONTENDS_PROGS="$FRONTENDS_PROGS lyx-qt4\$(EXEEXT)"
FRONTENDS_SUBDIRS="$FRONTENDS_SUBDIRS qt4"
RPM_FRONTEND="qt4"
-----------------------------------------------------------------------
Summary of changes:
autogen.sh | 6 +++---
config/lyxinclude.m4 | 3 ---
config/qt4.m4 | 6 ++++++
configure.ac | 4 ++--
4 files changed, 11 insertions(+), 8 deletions(-)
hooks/post-receive
--
The LyX Source Repository
