Fix handling of aligment; rearrange tabular-features menu stuff

[lyx.git] / config / qt.m4

diff --git a/config/qt.m4 b/config/qt.m4
index 9327c4c43265c7fd2c323a2582bfdf45e06bbd71..22167f6aa0442019ce0810a3d0ea4f698bb2930f 100644 (file)
--- a/config/qt.m4
+++ b/config/qt.m4
@@ -1,5 +1,5 @@
 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,
@@ -43,7 +43,7 @@ AC_DEFUN(QT_FIND_PATH,
 ])
 
 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
@@ -52,7 +52,7 @@ AC_DEFUN(QT_FIND_UIC,
 ])
 
 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)
@@ -79,7 +79,7 @@ AC_DEFUN(QT_FIND_MOC,
 ])
 
 dnl check a particular libname
-AC_DEFUN(QT_TRY_LINK,
+AC_DEFUN([QT_TRY_LINK],
 [
        SAVE_LIBS="$LIBS"
        LIBS="$LIBS $1"
@@ -99,7 +99,7 @@ AC_DEFUN(QT_TRY_LINK,
 ])
 
 dnl check we can do a compile
-AC_DEFUN(QT_CHECK_COMPILE,
+AC_DEFUN([QT_CHECK_COMPILE],
 [
        AC_MSG_CHECKING([for Qt library name])
 
@@ -109,7 +109,7 @@ AC_DEFUN(QT_CHECK_COMPILE,
                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
@@ -131,7 +131,7 @@ AC_DEFUN(QT_CHECK_COMPILE,
 ])
 
 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,
        [
@@ -157,7 +157,7 @@ EOF
 ])
 
 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.
@@ -199,11 +199,22 @@ AC_DEFUN(QT_DO_IT_ALL,
        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