fi
])
+
+AC_DEFUN([QT4_FIND_TOOL],
+[
+ $1=
+ if test -n "$qt4_cv_bin" ; then
+ AC_PATH_PROGS($1, [$2], [], $qt4_cv_bin)
+ fi
+ if test -z "$$1"; then
+ AC_PATH_PROGS($1, [$2-qt4 $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],
[
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,
+ 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)
- AC_PATH_PROGS(UIC4, [uic-qt4 uic],[],$qt4_cv_bin:$PATH)
- AC_PATH_PROGS(RCC4, [rcc-qt4 rcc],[],$qt4_cv_bin:$PATH)
- AC_CHECK_PROG(bc_found,[bc],[yes],[no],$PATH)
+ QT4_FIND_TOOL([MOC4], [moc])
+ QT4_FIND_TOOL([UIC4], [uic])
+ QT4_FIND_TOOL([RCC4], [rcc])
])
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`"
+ dnl LIBS="$LIBS `$PKG_CONFIG --libs-only-other QtCore QtGui`"
fi
PKG_CONFIG_PATH=$save_PKG_CONFIG_PATH
+ dnl Actually, the values of QT4_LIB and QT4_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.
+ QT4_CORE_LIB=$QT4_CORE_LIBS
+ QT4_CORE_LDFLAGS=
+ QT4_LIB=$QT4_FRONTEND_LIBS
+ QT4_LDFLAGS=
])
AC_DEFUN([QT4_DO_MANUAL_CONFIG],