X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=config%2Fqt.m4;h=1bc7e8db01a4051471615e59261d7ad304557fab;hb=b7665042ff81d577f2ad4fbfb3a2bfbc5645bc7f;hp=b70ef6215e7196cac68fa1db762b295cc737768f;hpb=0a64828a2775f003f67c8a6a18e520aaee6117dd;p=lyx.git

diff --git a/config/qt.m4 b/config/qt.m4
index b70ef6215e..1bc7e8db01 100644
--- a/config/qt.m4
+++ b/config/qt.m4
@@ -1,10 +1,5 @@
-
-dnl Please leave this alone. I use this file in
-dnl oprofile.
-FATAL=1
-
 dnl find a binary in the path
-AC_DEFUN(QT_FIND_PATH,
+AC_DEFUN([QT_FIND_PATH],
 [
 	AC_MSG_CHECKING([for $1])
 	AC_CACHE_VAL(qt_cv_path_$1,
@@ -20,7 +15,7 @@ AC_DEFUN(QT_FIND_PATH,
 				dirs="$dirs $dir"
 			done
 			IFS=$qt_save_IFS
- 
+
 			for dir in $dirs; do
 				if test -x "$dir/$1"; then
 					if test -n "$5"; then
@@ -37,7 +32,7 @@ AC_DEFUN(QT_FIND_PATH,
 			done
 		fi
 	])
- 
+
 	if test -z "$qt_cv_path_$1" || test "$qt_cv_path_$1" = "NONE"; then
 		AC_MSG_RESULT(not found)
 		$4
@@ -48,16 +43,16 @@ AC_DEFUN(QT_FIND_PATH,
 ])
 
 dnl Find the uic compiler on the path or in qt_cv_dir
-AC_DEFUN(QT_FIND_UIC,
+AC_DEFUN([QT_FIND_UIC],
 [
 	QT_FIND_PATH(uic, ac_uic, $qt_cv_dir/bin)
 	if test -z "$ac_uic" -a "$FATAL" = 1; then
 		AC_MSG_ERROR([uic binary not found in \$PATH or $qt_cv_dir/bin !])
 	fi
 ])
- 
+
 dnl Find the right moc in path/qt_cv_dir
-AC_DEFUN(QT_FIND_MOC,
+AC_DEFUN([QT_FIND_MOC],
 [
 	QT_FIND_PATH(moc2, ac_moc2, $qt_cv_dir/bin)
 	QT_FIND_PATH(moc, ac_moc1, $qt_cv_dir/bin)
@@ -84,9 +79,10 @@ AC_DEFUN(QT_FIND_MOC,
 ])
 
 dnl check a particular libname
-AC_DEFUN(QT_TRY_LINK,
+AC_DEFUN([QT_TRY_LINK],
 [
-	CXXFLAGS="$BASE_CXXFLAGS $1"
+	SAVE_LIBS="$LIBS"
+	LIBS="$LIBS $1"
 	AC_TRY_LINK([
 	#include <qglobal.h>
 	#include <qstring.h>
@@ -99,21 +95,21 @@ AC_DEFUN(QT_TRY_LINK,
 	],
 	qt_cv_libname=$1,
 	)
-	CXXFLAGS="$BASE_CXXFLAGS"
+	LIBS="$SAVE_LIBS"
 ])
- 
+
 dnl check we can do a compile
-AC_DEFUN(QT_CHECK_COMPILE,
+AC_DEFUN([QT_CHECK_COMPILE],
 [
 	AC_MSG_CHECKING([for Qt library name])
- 
+
 	AC_CACHE_VAL(qt_cv_libname,
 	[
 		AC_LANG_CPLUSPLUS
 		SAVE_CXXFLAGS=$CXXFLAGS
-		BASE_CXXFLAGS="$CXXFLAGS $QT_INCLUDES $QT_LDFLAGS" 
+		CXXFLAGS="$CXXFLAGS $QT_INCLUDES $QT_LDFLAGS"
 
-		for libname in -lqt3 -lqt2 -lqt -lqt-mt;
+		for libname in -lqt-mt -lqt3 -lqt2 -lqt;
 		do
 			QT_TRY_LINK($libname)
 			if test -n "$qt_cv_libname"; then
@@ -125,7 +121,7 @@ AC_DEFUN(QT_CHECK_COMPILE,
 	])
 
 	if test -z "$qt_cv_libname"; then
-		AC_MSG_RESULT([failed]) 
+		AC_MSG_RESULT([failed])
 		if test "$FATAL" = 1 ; then
 			AC_MSG_ERROR([Cannot compile a simple Qt executable. Check you have the right \$QTDIR !])
 		fi
@@ -134,15 +130,45 @@ AC_DEFUN(QT_CHECK_COMPILE,
 	fi
 ])
 
-dnl start here 
-AC_DEFUN(QT_DO_IT_ALL,
+dnl get Qt version we're using
+AC_DEFUN([QT_GET_VERSION],
 [
+	AC_CACHE_CHECK([Qt version],lyx_cv_qtversion,
+	[
+		AC_LANG_CPLUSPLUS
+		SAVE_CPPFLAGS=$CPPFLAGS
+		CPPFLAGS="$CPPFLAGS $QT_INCLUDES"
+
+		cat > conftest.$ac_ext <<EOF
+#line __oline__ "configure"
+#include "confdefs.h"
+#include <qglobal.h>
+"%%%"QT_VERSION_STR"%%%"
+EOF
+		lyx_cv_qtversion=`(eval "$ac_cpp conftest.$ac_ext") 2>&5 | \
+			grep '^"%%%"'  2>/dev/null | \
+			sed -e 's/"%%%"//g' -e 's/"//g'`
+		rm -f conftest.$ac_ext
+		CPPFLAGS=$SAVE_CPPFLAGS
+	])
+
+	QT_VERSION=$lyx_cv_qtversion
+	AC_SUBST(QT_VERSION)
+])
+
+dnl start here
+AC_DEFUN([QT_DO_IT_ALL],
+[
+	dnl Please leave this alone. I use this file in
+	dnl oprofile.
+	FATAL=0
+
 	AC_ARG_WITH(qt-dir, [  --with-qt-dir           where the root of Qt is installed ],
 		[ qt_cv_dir=`eval echo "$withval"/` ])
-	 
+
 	AC_ARG_WITH(qt-includes, [  --with-qt-includes      where the Qt includes are. ],
 		[ qt_cv_includes=`eval echo "$withval"` ])
- 
+
 	AC_ARG_WITH(qt-libraries, [  --with-qt-libraries     where the Qt library is installed.],
 		[  qt_cv_libraries=`eval echo "$withval"` ])
 
@@ -150,7 +176,7 @@ AC_DEFUN(QT_DO_IT_ALL,
 	if test -z "$qt_cv_dir"; then
 		qt_cv_dir=$QTDIR
 	fi
- 
+
 	dnl derive inc/lib if needed
 	if test -n "$qt_cv_dir"; then
 		if test -z "$qt_cv_includes"; then
@@ -172,16 +198,24 @@ AC_DEFUN(QT_DO_IT_ALL,
 	fi
 	AC_SUBST(QT_INCLUDES)
 	AC_SUBST(QT_LDFLAGS)
- 
-	QT_FIND_MOC
-	MOC=$ac_moc
+
+	if test -z "$MOC"; then
+		QT_FIND_MOC
+		MOC=$ac_moc
+	fi
 	AC_SUBST(MOC)
-	QT_FIND_UIC
-	UIC=$ac_uic
+	if test -z "$UIC"; then
+		QT_FIND_UIC
+		UIC=$ac_uic
+	fi
 	AC_SUBST(UIC)
 
 	QT_CHECK_COMPILE
- 
+
 	QT_LIB=$qt_cv_libname;
 	AC_SUBST(QT_LIB)
+
+	if test -n "$qt_cv_libname"; then
+		QT_GET_VERSION
+	fi
 ])