[uim-commit] r554 - trunk

[tkng at freedesktop.org]

Author: tkng
Date: 2005-02-05 08:29:00 -0800 (Sat, 05 Feb 2005)
New Revision: 554

Modified:
   trunk/configure.ac
Log:
* configure.ac: Disable Qt related features if Qt not found.


Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2005-02-05 16:25:10 UTC (rev 553)
+++ trunk/configure.ac	2005-02-05 16:29:00 UTC (rev 554)
@@ -384,8 +384,6 @@
 AM_CONDITIONAL(DEFAULT_TOOLKIT_GTK, test x$default_toolkit = xgtk)
 AM_CONDITIONAL(DEFAULT_TOOLKIT_QT,  test x$default_toolkit = xqt)
 AM_CONDITIONAL(GNOME2, test x$use_gnome2 = xyes)
-AM_CONDITIONAL(QT, test x$use_qt = xyes)
-AM_CONDITIONAL(QT_IMMODULE, test x$use_qtimmodule = xyes)
 AM_CONDITIONAL(APPLET, test x$use_applet = xyes)
 AM_CONDITIONAL(UIM_FEP, test x$use_uim_fep = xyes)
 AM_CONDITIONAL(DICT, test x$use_dict = xyes)
@@ -531,7 +529,8 @@
 
     AC_MSG_RESULT("$result")
     if test "$result" = "no"; then
-       AC_MSG_ERROR([Qt Helper requires at least version $QT_VERSION of Qt])
+       use_qt="no"
+       AC_MSG_WARN([Qt Helper requires at least version $QT_VERSION of Qt])
     fi
     CXXFLAGS=$_SAVE_CXXFLAGS
     LIBS=$_SAVE_LIBS
@@ -547,19 +546,22 @@
     AC_SUBST(UIM_QT_LDFLAGS)
 fi
 
-if test x$use_qt = xyes ; then
-    if test x$use_qtimmodule = xyes ; then
-        AC_MSG_CHECKING(for qt-immodule patch)
-        # Check for immodule for Qt patch
-        if test ! -e $QTINCDIR/qinputcontext.h -o ! -e $QTINCDIR/qinputcontextplugin.h; then
-          AC_MSG_RESULT(no)
-          $use_qtimmodule="cannot"
-        else
-	  AC_MSG_RESULT(yes)
-        fi
+if test x$use_qtimmodule = xyes ; then
+    AC_MSG_CHECKING(for qt-immodule patch)
+    # Check for immodule for Qt patch
+    if test ! -f $QTINCDIR/qinputcontext.h  || test ! -f $QTINCDIR/qinputcontextplugin.h; then
+      AC_MSG_RESULT(no)
+      use_qtimmodule="cannot"
+    else
+      AC_MSG_RESULT(yes)
     fi
 fi
 
+
+AM_CONDITIONAL(QT, test x$use_qt = xyes)
+AM_CONDITIONAL(QT_IMMODULE, test x$use_qtimmodule = xyes)
+
+
 # add debugging flags to CFLAGS regardless of GCC=yes or not
 if test x$enable_debug = xyes; then
 	CFLAGS="$CFLAGS -g"