qt4_cv_libname=
for libname in '-lQtCore -lQtGui' \
'-lQtCore4 -lQtGui4' \
+ '-framework QtCore -framework QtConcurrent -framework QtWidgets -framework QtGui'\
'-framework QtCore -framework QtGui'
do
QT4_TRY_LINK($libname)
if test -z "$qt4_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 4 executable. Check you have the right \$QT4DIR.])
else
AC_MSG_RESULT([$qt4_cv_libname])
fi
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_WITH(qt4-dir, [AC_HELP_STRING([--with-qt4-dir], [where the root of Qt 4 is installed])],
[ qt4_cv_dir=`eval echo "$withval"/` ])
if test "$pkg_failed" != "no" ; then
QT4_DO_MANUAL_CONFIG
fi
+
+ if test -z "$QT4_LIB"; then
+ AC_MSG_ERROR([cannot find qt4 library.])
+ fi
+
+ dnl Check qt version
+ AS_VERSION_COMPARE($QT4_VERSION, $1,
+ [AC_MSG_ERROR([LyX requires at least version $1 of Qt. Only version $QT4_VERSION has been found.])
+ ])
+
AC_PATH_PROGS(MOC4, [moc-qt4 moc],[],$qt4_cv_bin:$PATH)
+ if test -z "$MOC4"; then
+ AC_MSG_ERROR([cannot find moc binary.])
+ fi
AC_PATH_PROGS(UIC4, [uic-qt4 uic],[],$qt4_cv_bin:$PATH)
+ if test -z "$UIC4"; then
+ AC_MSG_ERROR([cannot find uic binary.])
+ fi
AC_PATH_PROGS(RCC4, [rcc-qt4 rcc],[],$qt4_cv_bin:$PATH)
+ if test -z "$RCC4"; then
+ AC_MSG_ERROR([cannot find rcc binary.])
+ fi
])
AC_DEFUN([QT4_DO_PKG_CONFIG],
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.]);;
+ no) AC_MSG_ERROR([cannot find X window libraries and/or headers.]);;
disable) ;;
esac
QT4_CORE_LDFLAGS=
if test -n "$qt4_cv_includes"; then
QT4_INCLUDES="-I$qt4_cv_includes"
- for i in Qt QtCore QtGui; do
+ for i in Qt QtCore QtGui QtWidgets QtConcurrent; do
QT4_INCLUDES="$QT4_INCLUDES -I$qt4_cv_includes/$i"
done
QT4_CORE_INCLUDES="-I$qt4_cv_includes -I$qt4_cv_includes/QtCore"
fi
- if test -n "$qt4_cv_libraries"; then
+ case "$qt4_cv_libraries" in
+ *framework*)
+ QT4_LDFLAGS="-F$qt4_cv_libraries"
+ QT4_CORE_LDFLAGS="-F$qt4_cv_libraries"
+ ;;
+ "")
+ ;;
+ *)
QT4_LDFLAGS="-L$qt4_cv_libraries"
QT4_CORE_LDFLAGS="-L$qt4_cv_libraries"
- fi
+ ;;
+ esac
AC_SUBST(QT4_INCLUDES)
AC_SUBST(QT4_CORE_INCLUDES)
AC_SUBST(QT4_LDFLAGS)