Initialize status_ in the 3rd constructor.

[lyx.git] / config / qt2.m4

diff --git a/config/qt2.m4 b/config/qt2.m4
index 3de5fd30d7c4ab8b0a43eb07d9123916d00dd235..6bdd23f9f266d7d2edee06801b8841338ae88869 100644 (file)
--- a/config/qt2.m4
+++ b/config/qt2.m4
@@ -83,6 +83,17 @@ AC_DEFUN(QT2_FIND_PATH,
    fi
 ])
  
+dnl ------------------------------------------------------------------------
+dnl Find the UIC compiler if available
+dnl ------------------------------------------------------------------------
+AC_DEFUN(QT2_AC_PATH_UIC,
+[
+   QT2_FIND_PATH(uic, UIC, [$ac_qt2_bindir $QTDIR/bin \
+            /usr/bin /usr/X11R6/bin /usr/lib/qt2/bin \
+            /usr/local/qt2/bin /usr/local/qt/bin /usr/lib/qt/bin], )
+   AC_SUBST(UIC)
+])
+ 
 dnl ------------------------------------------------------------------------
 dnl Find the meta object compiler in the PATH, in $QTDIR/bin, and some
 dnl more usual places
@@ -184,6 +195,7 @@ AC_MSG_CHECKING([for Qt 2])
 ac_qt2_includes=NO ac_qt2_libraries=NO ac_qt2_bindir=NO
 qt2_libraries=""
 qt2_includes=""
+ 
 AC_ARG_WITH(qt2-dir,
     [  --with-qt2-dir           where the root of Qt2 is installed ],
     [  ac_qt2_includes="$withval"/include
@@ -210,7 +222,7 @@ if test "$ac_qt2_includes" = NO || test "$ac_qt2_libraries" = NO; then
 AC_CACHE_VAL(ac_cv_have_qt2,
 [#try to guess Qt2 locations
 
-qt_incdirs="$ac_qt2_includes usr/lib/qt2/include /usr/local/qt2/include /usr/include/qt2 /usr/X11R6/include/X11/qt2 /usr/lib/qt/include /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt $x_includes $QTINC"
+qt2_incdirs="$ac_qt2_includes usr/lib/qt2/include /usr/local/qt2/include /usr/include/qt2 /usr/X11R6/include/X11/qt2 /usr/lib/qt/include /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt $x_includes $QTINC"
 test -n "$QTDIR" && qt2_incdirs="$QTDIR/include/qt2 $QTDIR/include/qt $QTDIR/include $QTDIR $qt2_incdirs"
 AC_FIND_FILE(qmovie.h, $qt2_incdirs, qt2_incdir)
 ac_qt2_includes="$qt2_incdir"
@@ -294,7 +306,6 @@ QT2_CHECK_DIRECT(qt2_libraries= ,[])
 fi
 
 dnl check it is Qt2
-dnl FIXME: what minor version do we require ???
 
 SAVE_CXXFLAGS="$CXXFLAGS"
 CXXFLAGS="$CXXFLAGS -I$qt2_includes -L$qt2_libraries"
@@ -304,7 +315,7 @@ AC_TRY_COMPILE([
 #include <qglobal.h>
 ],
 [
-#if (QT_VERSION < 200)
+#if (QT_VERSION < 221)
 break_me_(\\\);
 #endif
 ],
@@ -337,6 +348,7 @@ AC_SUBST(QT2_INCLUDES)
 AC_SUBST(QT2_LDFLAGS)
 AC_SUBST(QT2_LIBS)
 QT2_AC_PATH_MOC
+QT2_AC_PATH_UIC
 ])
 
 AC_DEFUN(QT2_DO_IT_ALL,