dnl find a binary in the path
-AC_DEFUN(QT_FIND_PATH,
+AC_DEFUN([QT_FIND_PATH],
[
AC_MSG_CHECKING([for $1])
AC_CACHE_VAL(qt_cv_path_$1,
])
dnl Find the uic compiler on the path or in qt_cv_dir
-AC_DEFUN(QT_FIND_UIC,
+AC_DEFUN([QT_FIND_UIC],
[
QT_FIND_PATH(uic, ac_uic, $qt_cv_dir/bin)
if test -z "$ac_uic" -a "$FATAL" = 1; then
])
dnl Find the right moc in path/qt_cv_dir
-AC_DEFUN(QT_FIND_MOC,
+AC_DEFUN([QT_FIND_MOC],
[
QT_FIND_PATH(moc2, ac_moc2, $qt_cv_dir/bin)
QT_FIND_PATH(moc, ac_moc1, $qt_cv_dir/bin)
])
dnl check a particular libname
-AC_DEFUN(QT_TRY_LINK,
+AC_DEFUN([QT_TRY_LINK],
[
SAVE_LIBS="$LIBS"
LIBS="$LIBS $1"
])
dnl check we can do a compile
-AC_DEFUN(QT_CHECK_COMPILE,
+AC_DEFUN([QT_CHECK_COMPILE],
[
AC_MSG_CHECKING([for Qt library name])
SAVE_CXXFLAGS=$CXXFLAGS
CXXFLAGS="$CXXFLAGS $QT_INCLUDES $QT_LDFLAGS"
- for libname in -lqt-mt -lqt3 -lqt2 -lqt;
+ for libname in -lqt-mt -lqt-mt3 -lqt3 -lqt2 -lqt;
do
QT_TRY_LINK($libname)
if test -n "$qt_cv_libname"; then
])
dnl get Qt version we're using
-AC_DEFUN(QT_GET_VERSION,
+AC_DEFUN([QT_GET_VERSION],
[
AC_CACHE_CHECK([Qt version],lyx_cv_qtversion,
[
])
dnl start here
-AC_DEFUN(QT_DO_IT_ALL,
+AC_DEFUN([QT_DO_IT_ALL],
[
dnl Please leave this alone. I use this file in
dnl oprofile.
AC_SUBST(QT_INCLUDES)
AC_SUBST(QT_LDFLAGS)
- QT_FIND_MOC
- MOC=$ac_moc
+ dnl Preprocessor flags
+ case ${host} in
+ *mingw*) QT_CPPFLAGS="-DQT_DLL -DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR";;
+ *) QT_CPPFLAGS="-DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR";;
+ esac
+ AC_SUBST(QT_CPPFLAGS)
+
+ if test -z "$MOC"; then
+ QT_FIND_MOC
+ MOC=$ac_moc
+ fi
AC_SUBST(MOC)
- QT_FIND_UIC
- UIC=$ac_uic
+ if test -z "$UIC"; then
+ QT_FIND_UIC
+ UIC=$ac_uic
+ fi
AC_SUBST(UIC)
QT_CHECK_COMPILE