X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=config%2Fqt4.m4;h=33029b933d0010ffa6d4e1c3f924a4fa3ca8e2b3;hb=a1c248a47c523a9b2546cd735a78baf881620869;hp=aa44d0cd9bce02c5b2bb66647971dc81fde0bb60;hpb=3942d5eac121540f1176e6e4b5c6944ea8667ccc;p=lyx.git

diff --git a/config/qt4.m4 b/config/qt4.m4
index aa44d0cd9b..33029b933d 100644
--- a/config/qt4.m4
+++ b/config/qt4.m4
@@ -1,69 +1,5 @@
-dnl find a binary in the path
-AC_DEFUN([QT4_FIND_PATH],
-[
-	AC_MSG_CHECKING([for $1])
-	AC_CACHE_VAL(qt4_cv_path_$1,
-	[
-		qt4_cv_path_$1="NONE"
-		if test -n "$$2"; then
-			qt4_cv_path_$1="$$2";
-		else
-			dirs="$3"
-			qt_save_IFS=$IFS
-			IFS=':'
-			for dir in $PATH; do
-				dirs="$dirs $dir"
-			done
-			IFS=$qt_save_IFS
-
-			for dir in $dirs; do
-				if test -x "$dir/$1"; then
-					if test -n "$5"; then
-						evalstr="$dir/$1 $5 2>&1 "
-						if eval $evalstr; then
-							qt4_cv_path_$1="$dir/$1"
-							break
-						fi
-					else
-						qt4_cv_path_$1="$dir/$1"
-						break
-					fi
-				fi
-			done
-		fi
-	])
-
-	if test -z "$qt4_cv_path_$1" || test "$qt4_cv_path_$1" = "NONE"; then
-		AC_MSG_RESULT(not found)
-		$4
-	else
-		AC_MSG_RESULT($qt4_cv_path_$1)
-		$2=$qt4_cv_path_$1
-	fi
-])
-
-dnl Find the uic compiler on the path or in qt_cv_dir
-AC_DEFUN([QT_FIND_UIC4],
-[
-	QT4_FIND_PATH(uic, ac_uic4, $qt4_cv_dir/bin)
-
-	if test -z "$ac_uic4" -a "$FATAL" = 1; then
-		AC_MSG_ERROR([uic 4 binary not found in \$PATH or $qt4_cv_dir/bin !])
-	fi
-])
-
-dnl Find the right moc in path/qt_cv_dir
-AC_DEFUN([QT_FIND_MOC4],
-[
-	QT4_FIND_PATH(moc, ac_moc4, $qt4_cv_dir/bin)
-
-	if test -z "$ac_moc4"  -a "$FATAL" = 1; then
-		AC_MSG_ERROR([moc 4 binary not found in \$PATH or $qt4_cv_dir/bin !])
-	fi
-])
-
 dnl check a particular libname
-AC_DEFUN([QT4_TRY_LINK],
+AC_DEFUN([QT_TRY_LINK],
 [
 	SAVE_LIBS="$LIBS"
 	LIBS="$LIBS $1"
@@ -77,50 +13,84 @@ AC_DEFUN([QT4_TRY_LINK],
 	break_me_(\\\);
 	#endif
 	],
-	qt4_cv_libname=$1,
+	qt_cv_libname=$1,
 	)
 	LIBS="$SAVE_LIBS"
 ])
 
 dnl check we can do a compile
-AC_DEFUN([QT4_CHECK_COMPILE],
+AC_DEFUN([QT_CHECK_COMPILE],
 [
-	AC_MSG_CHECKING([for Qt 4 library name])
+	AC_MSG_CHECKING([for Qt library name])
 
-	AC_CACHE_VAL(qt4_cv_libname,
+	AC_CACHE_VAL(qt_cv_libname,
 	[
 		AC_LANG_CPLUSPLUS
 		SAVE_CXXFLAGS=$CXXFLAGS
-		CXXFLAGS="$CXXFLAGS $QT4_INCLUDES $QT4_LDFLAGS"
-		for libname in '-lQtCore -lQtGui' \
-		               '-lQtCore4 -lQtGui4'
+		CXXFLAGS="$CXXFLAGS $QT_INCLUDES $QT_LDFLAGS"
+		qt_corelibs="-lQtCore -lQtCore4"
+		qt_guilibs="'-lQtCore -lQtGui' '-lQtCore4 -lQtGui4'"
+		if test $USE_QT5 = "yes" ; then
+		    qt_corelibs="-lQt5Core"
+		    qt_guilibs="-lQt5Core -lQt5Concurrent -lQt5Gui -lQt5Svg -lQt5Widgets"
+		fi
+		for libname in $qt_corelibs '-framework QtCore'
 		do
-			QT4_TRY_LINK($libname)
-			if test -n "$qt4_cv_libname"; then
+			QT_TRY_LINK($libname)
+			if test -n "$qt_cv_libname"; then
+				QT_CORE_LIB="$qt_cv_libname"
+				break;
+			fi
+		done
+		qt_cv_libname=
+		for libname in $qt_guilibs \
+		               '-framework QtCore -framework QtConcurrent -framework QtSvg -framework QtWidgets -framework QtMacExtras -framework QtGui'\
+		               '-framework QtCore -framework QtGui'
+		do
+			QT_TRY_LINK($libname)
+			if test -n "$qt_cv_libname"; then
 				break;
 			fi
 		done
 		CXXFLAGS=$SAVE_CXXFLAGS
 	])
 
-	if test -z "$qt4_cv_libname"; then
+	if test -z "$qt_cv_libname"; then
 		AC_MSG_RESULT([failed])
-		if test "$FATAL" = 1 ; then
-			AC_MSG_ERROR([Cannot compile a simple Qt 4 executable. Check you have the right \$QT4DIR !])
-		fi
+		AC_MSG_ERROR([cannot compile a simple Qt executable. Check you have the right \$QTDIR.])
 	else
-		AC_MSG_RESULT([$qt4_cv_libname])
+		AC_MSG_RESULT([$qt_cv_libname])
+	fi
+])
+
+
+AC_DEFUN([QT_FIND_TOOL],
+[
+	$1=
+	qt_ext=qt4
+	if test "x$USE_QT5" != "xno" ; then
+		qt_ext=qt5
+	fi
+	if test -n "$qt_cv_bin" ; then
+		AC_PATH_PROGS($1, [$2], [], $qt_cv_bin)
+	fi
+	if test -z "$$1"; then
+		AC_PATH_PROGS($1, [$2-$qt_ext $2],[],$PATH)
+	fi
+	if test -z "$$1"; then
+		AC_MSG_ERROR([cannot find $2 binary.])
 	fi
 ])
 
+
 dnl get Qt version we're using
-AC_DEFUN([QT4_GET_VERSION],
+AC_DEFUN([QT_GET_VERSION],
 [
-	AC_CACHE_CHECK([Qt 4 version],lyx_cv_qt4version,
+	AC_CACHE_CHECK([Qt version],lyx_cv_qtversion,
 	[
 		AC_LANG_CPLUSPLUS
 		SAVE_CPPFLAGS=$CPPFLAGS
-		CPPFLAGS="$CPPFLAGS $QT4_INCLUDES"
+		CPPFLAGS="$CPPFLAGS $QT_INCLUDES"
 
 		cat > conftest.$ac_ext <<EOF
 #line __oline__ "configure"
@@ -128,126 +98,206 @@ AC_DEFUN([QT4_GET_VERSION],
 #include <qglobal.h>
 "%%%"QT_VERSION_STR"%%%"
 EOF
-		lyx_cv_qt4version=`(eval "$ac_cpp conftest.$ac_ext") 2>&5 | \
+		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
 	])
 
-	QT4_VERSION=$lyx_cv_qt4version
-	AC_SUBST(QT4_VERSION)
+	QTLIB_VERSION=$lyx_cv_qtversion
+	AC_SUBST(QTLIB_VERSION)
 ])
 
 dnl start here
-AC_DEFUN([QT4_DO_IT_ALL],
-[
-        dnl Check if it possible to do a pgk-config
-        PKG_PROG_PKG_CONFIG
-        if test -n "$PKG_CONFIG" ; then
-                QT4_DO_PKG_CONFIG
-        else
-                QT4_DO_MANUAL_CONFIG
-        fi
-])
-
-AC_DEFUN([QT4_DO_PKG_CONFIG],
-[
-        PKG_CHECK_MODULES(QT4_FRONTEND, QtCore QtGui)
-        if test "$pkg_failed" == "no" ; then
-                QT4_INCLUDES=$QT4_FRONTEND_CFLAGS
-                dnl QT4_LDFLAGS=$QT4_FRONTEND_LIBS
-                QT4_LDFLAGS=`$PKG_CONFIG --libs-only-L QtCore QtGui`
-        	AC_SUBST(QT4_INCLUDES)
-	        AC_SUBST(QT4_LDFLAGS)
-                QT4_VERSION=`$PKG_CONFIG --modversion QtCore`
-        	AC_SUBST(QT4_VERSION)
-                QT4_LIB=`$PKG_CONFIG --libs-only-l QtCore QtGui`
-                AC_SUBST(QT4_LIB)
-        	QT4_CPPFLAGS="-DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR -DQT_NO_STL -DQT_NO_KEYWORDS"
-	        case ${host} in
-	                *mingw*) QT4_CPPFLAGS="-DQT_DLL $QT4_CPPFLAGS";;
-	        esac
-	        AC_SUBST(QT4_CPPFLAGS)
-                AC_CHECK_PROGS(MOC4, moc-qt4 moc)
-                AC_CHECK_PROGS(UIC4, uic-qt4 uic)
-        else
-                QT4_DO_MANUAL_CONFIG
-        fi
-])
-
-AC_DEFUN([QT4_DO_MANUAL_CONFIG],
+AC_DEFUN([QT_DO_IT_ALL],
 [
 	dnl this variable is precious
-	AC_ARG_VAR(QT4DIR, [the place where the Qt 4 files are, e.g. /usr/lib/qt4])
-
-	dnl Please leave this alone. I use this file in
-	dnl oprofile.
-	FATAL=0
+	AC_ARG_VAR(QTDIR, [the place where the Qt files are, e.g. /usr/lib/qt4])
 
-	AC_ARG_WITH(qt4-dir, [  --with-qt4-dir           where the root of Qt 4 is installed ],
-		[ qt4_cv_dir=`eval echo "$withval"/` ])
+	AC_ARG_WITH(qt-dir, [AC_HELP_STRING([--with-qt-dir], [where the root of Qt is installed])],
+		[ qt_cv_dir=`eval echo "$withval"/` ])
 
-	AC_ARG_WITH(qt4-includes, [  --with-qt4-includes      where the Qt 4 includes are. ],
-		[ qt4_cv_includes=`eval echo "$withval"` ])
+	AC_ARG_WITH(qt-includes, [AC_HELP_STRING([--with-qt-includes], [where the Qt includes are])],
+		[ qt_cv_includes=`eval echo "$withval"` ])
 
-	AC_ARG_WITH(qt4-libraries, [  --with-qt4-libraries     where the Qt 4 library is installed.],
-		[  qt4_cv_libraries=`eval echo "$withval"` ])
+	AC_ARG_WITH(qt-libraries, [AC_HELP_STRING([--with-qt-libraries], [where the Qt library is installed])],
+		[  qt_cv_libraries=`eval echo "$withval"` ])
 
-	dnl pay attention to $QT4DIR unless overridden
-	if test -z "$qt4_cv_dir"; then
-		qt4_cv_dir=$QT4DIR
+	dnl pay attention to $QTDIR unless overridden
+	if test -z "$qt_cv_dir"; then
+		qt_cv_dir=$QTDIR
 	fi
 
 	dnl derive inc/lib if needed
-	if test -n "$qt4_cv_dir"; then
-		if test -z "$qt4_cv_includes"; then
-			qt4_cv_includes=$qt4_cv_dir/include
+	if test -n "$qt_cv_dir"; then
+		if test -z "$qt_cv_includes"; then
+			qt_cv_includes=$qt_cv_dir/include
 		fi
-		if test -z "$qt4_cv_libraries"; then
-			qt4_cv_libraries=$qt4_cv_dir/lib
+		if test -z "$qt_cv_libraries"; then
+			qt_cv_libraries=$qt_cv_dir/lib
 		fi
 	fi
 
-	dnl flags for compilation
-	QT4_INCLUDES=
-	QT4_LDFLAGS=
-	if test -n "$qt4_cv_includes"; then
-		QT4_INCLUDES="-I$qt4_cv_includes"
-		for i in Qt QtCore QtGui; do
-			QT4_INCLUDES="$QT4_INCLUDES -I$qt4_cv_includes/$i"
-		done
+	dnl compute the binary dir too
+	if test -n "$qt_cv_dir"; then
+		qt_cv_bin=$qt_cv_dir/bin
 	fi
-	if test -n "$qt4_cv_libraries"; then
-		QT4_LDFLAGS="-L$qt4_cv_libraries"
-	fi
-	AC_SUBST(QT4_INCLUDES)
-	AC_SUBST(QT4_LDFLAGS)
 
 	dnl Preprocessor flags
-	QT4_CPPFLAGS="-DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR -DQT_NO_STL -DQT_NO_KEYWORDS"
+	QT_CPPFLAGS="-DQT_NO_STL -DQT_NO_KEYWORDS"
 	case ${host} in
-	*mingw*) QT4_CPPFLAGS="-DQT_DLL $QT4_CPPFLAGS";;
+	*mingw*) QT_CPPFLAGS="-DQT_DLL $QT_CPPFLAGS";;
 	esac
-	AC_SUBST(QT4_CPPFLAGS)
+	AC_SUBST(QT_CPPFLAGS)
+
+	dnl Check if it possible to do a pkg-config
+	PKG_PROG_PKG_CONFIG
+	if test -n "$PKG_CONFIG" ; then
+		QT_DO_PKG_CONFIG
+	fi
+	if test "$pkg_failed" != "no" ; then
+		QT_DO_MANUAL_CONFIG
+	fi
 
-	if test -z "$MOC4"; then
-		QT_FIND_MOC4
-		MOC4=$ac_moc4
+	if test -z "$QT_LIB"; then
+	  AC_MSG_ERROR([cannot find qt libraries.])
 	fi
-	AC_SUBST(MOC4)
-	if test -z "$UIC4"; then
-		QT_FIND_UIC4
-		UIC4=$ac_uic4
+
+	dnl Check qt version
+	AS_VERSION_COMPARE($QTLIB_VERSION, $1,
+	[AC_MSG_ERROR([LyX requires at least version $1 of Qt. Only version $QTLIB_VERSION has been found.])
+	])
+
+	if test x$USE_QT5 = xyes ; then
+	  save_CPPFLAGS=$CPPFLAGS
+	  AC_MSG_CHECKING([whether Qt uses the X Window system])
+	  CPPFLAGS="$save_CPPFLAGS $QT_CORE_INCLUDES"
+	  AC_EGREP_CPP(xcb,
+	    [#include <qconfig.h>
+	    QT_QPA_DEFAULT_PLATFORM_NAME],
+	    [AC_MSG_RESULT(yes)
+	     AC_DEFINE(QPA_XCB, 1, [Define if Qt uses the X Window System])],
+	    [AC_MSG_RESULT(no)])
+	  CPPFLAGS=$save_CPPFLAGS
 	fi
-	AC_SUBST(UIC4)
 
-	QT4_CHECK_COMPILE
+	QT_FIND_TOOL([QT_MOC], [moc])
+	QT_FIND_TOOL([QT_UIC], [uic])
+	QT_FIND_TOOL([QT_RCC], [rcc])
+
+	dnl Safety check
+	mocqtver=`$QT_MOC -v 2>&1 | sed -e 's/.*\([[0-9]]\.[[0-9]]\.[[0-9]]\).*/\1/'`
+	if test "x$mocqtver" != "x$QTLIB_VERSION"; then
+		LYX_WARNING([The found moc compiler is for Qt $mocqtver but the Qt library version is $QTLIB_VERSION.])
+	fi
+])
+
+AC_DEFUN([QT_DO_PKG_CONFIG],
+[
+	dnl tell pkg-config to look also in $qt_cv_dir/lib.
+	save_PKG_CONFIG_PATH=$PKG_CONFIG_PATH
+	if test -n "$qt_cv_dir" ; then
+	  PKG_CONFIG_PATH=$qt_cv_dir/lib:$qt_cv_dir/lib/pkgconfig:$PKG_CONFIG_PATH
+	  export PKG_CONFIG_PATH
+	fi
+	qt_corelibs="QtCore"
+	qt_guilibs="QtCore QtGui QtSvg"
+	if test "x$USE_QT5" != "xno" ; then
+		qt_corelibs="Qt5Core"
+		qt_guilibs="Qt5Core Qt5Concurrent Qt5Gui Qt5Svg Qt5Widgets"
+		lyx_use_winextras=false
+		PKG_CHECK_EXISTS(Qt5WinExtras, [lyx_use_winextras=true], [])
+		if $lyx_use_winextras; then
+			qt_guilibs="$qt_guilibs Qt5WinExtras"
+		fi
+		lyx_use_macextras=false
+		PKG_CHECK_EXISTS(Qt5MacExtras, [lyx_use_macextras=true], [])
+		if $lyx_use_macextras; then
+			qt_guilibs="$qt_guilibs Qt5MacExtras"
+		fi
+	fi
+	PKG_CHECK_MODULES(QT_CORE, $qt_corelibs,,[:])
+	if test "$pkg_failed" = "no" ; then
+		QT_CORE_INCLUDES=$QT_CORE_CFLAGS
+		AC_SUBST(QT_CORE_INCLUDES)
+		QT_CORE_LDFLAGS=`$PKG_CONFIG --libs-only-L $qt_corelibs`
+		AC_SUBST(QT_CORE_LDFLAGS)
+		QT_CORE_LIB=`$PKG_CONFIG --libs-only-l $qt_corelibs`
+		AC_SUBST(QT_CORE_LIB)
+	fi
+	PKG_CHECK_MODULES(QT_FRONTEND, $qt_guilibs,,[:])
+	if test "$pkg_failed" = "no" ; then
+		QT_INCLUDES=$QT_FRONTEND_CFLAGS
+		dnl QT_LDFLAGS=$QT_FRONTEND_LIBS
+		QT_LDFLAGS=`$PKG_CONFIG --libs-only-L $qt_guilibs`
+		AC_SUBST(QT_INCLUDES)
+		AC_SUBST(QT_LDFLAGS)
+		QTLIB_VERSION=`$PKG_CONFIG --modversion $qt_corelibs`
+		AC_SUBST(QTLIB_VERSION)
+		QT_LIB=`$PKG_CONFIG --libs-only-l $qt_guilibs`
+		AC_SUBST(QT_LIB)
+		dnl LIBS="$LIBS `$PKG_CONFIG --libs-only-other $qt_guilibs`"
+	fi
+	PKG_CONFIG_PATH=$save_PKG_CONFIG_PATH
+	dnl Actually, the values of QT_LIB and QT_CORE_LIB can be completely
+	dnl wrong on OS X, where everything goes to --libs-only-other.
+	dnl As a quick workaround, let us assign better values. A better patch
+	dnl exists for next cycle.
+	QT_CORE_LIB=$QT_CORE_LIBS
+	QT_CORE_LDFLAGS=
+	QT_LIB=$QT_FRONTEND_LIBS
+	QT_LDFLAGS=
+])
+
+AC_DEFUN([QT_DO_MANUAL_CONFIG],
+[
+	dnl Check for X libraries
+	AC_PATH_X
+	AC_PATH_XTRA
+	case $have_x in
+	    yes) LIBS="$X_PRE_LIBS $LIBS $X_LIBS -lX11 $X_EXTRA_LIBS"
+	         CPPFLAGS="$CPPFLAGS $X_CFLAGS";;
+	     no) AC_MSG_ERROR([cannot find X window libraries and/or headers.]);;
+	disable) ;;
+	esac
+
+	dnl flags for compilation
+	QT_INCLUDES=
+	QT_LDFLAGS=
+	QT_CORE_INCLUDES=
+	QT_CORE_LDFLAGS=
+	if test -n "$qt_cv_includes"; then
+		QT_INCLUDES="-I$qt_cv_includes"
+		for i in Qt QtCore QtGui QtWidgets QtSvg QtConcurrent QtMacExtras; do
+			QT_INCLUDES="$QT_INCLUDES -I$qt_cv_includes/$i"
+		done
+		QT_CORE_INCLUDES="-I$qt_cv_includes -I$qt_cv_includes/QtCore"
+	fi
+	case "$qt_cv_libraries" in
+	*framework*)
+		QT_LDFLAGS="-F$qt_cv_libraries"
+		QT_CORE_LDFLAGS="-F$qt_cv_libraries"
+		;;
+	"")
+		;;
+	*)
+		QT_LDFLAGS="-L$qt_cv_libraries"
+		QT_CORE_LDFLAGS="-L$qt_cv_libraries"
+		;;
+	esac
+	AC_SUBST(QT_INCLUDES)
+	AC_SUBST(QT_CORE_INCLUDES)
+	AC_SUBST(QT_LDFLAGS)
+	AC_SUBST(QT_CORE_LDFLAGS)
+
+	QT_CHECK_COMPILE
 
-	QT4_LIB=$qt4_cv_libname;
-	AC_SUBST(QT4_LIB)
+	QT_LIB=$qt_cv_libname;
+	AC_SUBST(QT_LIB)
+	AC_SUBST(QT_CORE_LIB)
 
-	if test -n "$qt4_cv_libname"; then
-		QT4_GET_VERSION
+	if test -n "$qt_cv_libname"; then
+		QT_GET_VERSION
 	fi
 ])