X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=config%2Fqt4.m4;h=be2a21ebf92fec80c5472454d90e624e6b3fcef6;hb=a3c84666b2dbfc75c9a80cf4f94612149cb2b570;hp=6414bbaabb4e697ba58159887899f1427f8011d8;hpb=fe5c73915e90105a18497ab273ba7d39ac131ff6;p=lyx.git

diff --git a/config/qt4.m4 b/config/qt4.m4
index 6414bbaabb..be2a21ebf9 100644
--- a/config/qt4.m4
+++ b/config/qt4.m4
@@ -28,7 +28,7 @@ AC_DEFUN([QT4_CHECK_COMPILE],
 		AC_LANG_CPLUSPLUS
 		SAVE_CXXFLAGS=$CXXFLAGS
 		CXXFLAGS="$CXXFLAGS $QT4_INCLUDES $QT4_LDFLAGS"
-		for libname in '-lQtCore -lQtCore4'
+		for libname in -lQtCore -lQtCore4 '-framework QtCore'
 		do
 			QT4_TRY_LINK($libname)
 			if test -n "$qt4_cv_libname"; then
@@ -36,8 +36,10 @@ AC_DEFUN([QT4_CHECK_COMPILE],
 				break;
 			fi
 		done
+		qt4_cv_libname=
 		for libname in '-lQtCore -lQtGui' \
-		               '-lQtCore4 -lQtGui4'
+		               '-lQtCore4 -lQtGui4' \
+		               '-framework QtCore -framework QtGui'
 		do
 			QT4_TRY_LINK($libname)
 			if test -n "$qt4_cv_libname"; then
@@ -93,13 +95,13 @@ AC_DEFUN([QT4_DO_IT_ALL],
 	dnl oprofile.
 	FATAL=0
 
-	AC_ARG_WITH(qt4-dir, [  --with-qt4-dir           where the root of Qt 4 is installed ],
+	AC_ARG_WITH(qt4-dir, [AC_HELP_STRING([--with-qt4-dir], [where the root of Qt 4 is installed])],
 		[ qt4_cv_dir=`eval echo "$withval"/` ])
 
-	AC_ARG_WITH(qt4-includes, [  --with-qt4-includes      where the Qt 4 includes are. ],
+	AC_ARG_WITH(qt4-includes, [AC_HELP_STRING([--with-qt4-includes], [where the Qt 4 includes are])],
 		[ qt4_cv_includes=`eval echo "$withval"` ])
 
-	AC_ARG_WITH(qt4-libraries, [  --with-qt4-libraries     where the Qt 4 library is installed.],
+	AC_ARG_WITH(qt4-libraries, [AC_HELP_STRING([--with-qt4-libraries], [where the Qt 4 library is installed])],
 		[  qt4_cv_libraries=`eval echo "$withval"` ])
 
 	dnl pay attention to $QT4DIR unless overridden
@@ -123,35 +125,35 @@ AC_DEFUN([QT4_DO_IT_ALL],
 	fi
 
 	dnl Preprocessor flags
-	QT4_CPPFLAGS="-DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR -DQT_NO_STL -DQT_NO_KEYWORDS"
+	QT4_CPPFLAGS="-DQT_NO_STL -DQT_NO_KEYWORDS"
 	case ${host} in
 	*mingw*) QT4_CPPFLAGS="-DQT_DLL $QT4_CPPFLAGS";;
-	*cygwin*)
-	if test "x$with_x" = xno ; then
-		QT4_CPPFLAGS="$QT4_CPPFLAGS -DQ_CYGWIN_WIN"
-	fi;;
 	esac
 	AC_SUBST(QT4_CPPFLAGS)
 
 	dnl Check if it possible to do a pkg-config
-	QT4_DO_PKG_CONFIG
+	PKG_PROG_PKG_CONFIG
+	if test -n "$PKG_CONFIG" ; then
+		QT4_DO_PKG_CONFIG
+	fi
 	if test "$pkg_failed" != "no" ; then
 		QT4_DO_MANUAL_CONFIG
 	fi
 	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)
 ])
 
 AC_DEFUN([QT4_DO_PKG_CONFIG],
 [
-	PKG_PROG_PKG_CONFIG
+	dnl tell pkg-config to look also in $qt4_cv_dir/lib.
 	save_PKG_CONFIG_PATH=$PKG_CONFIG_PATH
 	if test -n "$qt4_cv_dir" ; then
-	  PKG_CONFIG_PATH=$qt4_cv_dir/lib:$PKG_CONFIG_PATH
+	  PKG_CONFIG_PATH=$qt4_cv_dir/lib:$qt4_cv_dir/lib/pkgconfig:$PKG_CONFIG_PATH
 	  export PKG_CONFIG_PATH
 	fi
-	PKG_CHECK_MODULES(QT4_CORE, QtCore)
-	if test "$pkg_failed" == "no" ; then
+	PKG_CHECK_MODULES(QT4_CORE, QtCore,,[:])
+	if test "$pkg_failed" = "no" ; then
 		QT4_CORE_INCLUDES=$QT4_CORE_CFLAGS
 		AC_SUBST(QT4_CORE_INCLUDES)
 		QT4_CORE_LDFLAGS=`$PKG_CONFIG --libs-only-L QtCore`
@@ -159,8 +161,8 @@ AC_DEFUN([QT4_DO_PKG_CONFIG],
 		QT4_CORE_LIB=`$PKG_CONFIG --libs-only-l QtCore`
 		AC_SUBST(QT4_CORE_LIB)
 	fi
-	PKG_CHECK_MODULES(QT4_FRONTEND, QtCore QtGui)
-	if test "$pkg_failed" == "no" ; then
+	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`
@@ -170,12 +172,23 @@ AC_DEFUN([QT4_DO_PKG_CONFIG],
 		AC_SUBST(QT4_VERSION)
 		QT4_LIB=`$PKG_CONFIG --libs-only-l QtCore QtGui`
 		AC_SUBST(QT4_LIB)
+		LIBS="$LIBS `$PKG_CONFIG --libs-only-other QtCore QtGui`"
 	fi
 	PKG_CONFIG_PATH=$save_PKG_CONFIG_PATH
 ])
 
 AC_DEFUN([QT4_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) LYX_ERROR([Cannot find X window libraries and/or headers.]);;
+	disable) ;;
+	esac
+
 	dnl flags for compilation
 	QT4_INCLUDES=
 	QT4_LDFLAGS=