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

diff --git a/config/qt4.m4 b/config/qt4.m4
index 79fbbc17ca..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
@@ -38,7 +38,8 @@ AC_DEFUN([QT4_CHECK_COMPILE],
 		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
@@ -94,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