[uim] r6206 committed - * configure.ac...

[codesite-noreply]

Revision: 6206
Author: nogu.dev
Date: Sun Feb 28 15:01:12 2010
Log: * configure.ac
  - Add `--enable-qt4-qt3support' option. With this option, you can
    enable or disable the support for the Qt3Support module in Qt4.
    What this option actually does is switching the support for Q3TextEdit
    in Qt4 immodule (see also the ENABLE_QT4_QT3SUPPORT macro
    in qt4/immodule/qtextutil.cpp).
    Q3TextEdit is in the Qt3Support module and, as the other classes
    in the Qt3Support, is obsolete and exists for compatibility.
    This option is for users who have Qt4 with Qt3Support disabled
    on their *nix boxes.
http://code.google.com/p/uim/source/detail?r=6206
Modified:
 /trunk/configure.ac

=======================================
--- /trunk/configure.ac Wed Feb 17 18:12:21 2010
+++ /trunk/configure.ac Sun Feb 28 15:01:12 2010
@@ -889,6 +889,33 @@
     fi
 fi

+dnl *****************************************
+dnl *** test for Qt3Support module in Qt4 ***
+dnl *****************************************
+AC_ARG_ENABLE(qt4-qt3support,
+  AC_HELP_STRING([--enable-qt4-qt3support],
+        [enable support for Qt3Support module in Qt4
+            @<:@default=yes@:>@]),
+        enable_qt4_qt3support=$enableval,
+        enable_qt4_qt3support=yes)
+case "$enable_qt4_qt3support" in
+  no)
+    use_qt4_qt3support="no"
+    ;;
+  yes|*)
+    if test "x$use_qt4_immodule" = "xyes"; then
+        if test -f `${QMAKE4} -query QT_INSTALL_LIBS`/libQt3Support.so;  
then
+            use_qt4_qt3support="yes"
+        else
+            use_qt4_qt3support="no"
+               AC_MSG_WARN([No Qt3Support found])
+        fi
+    else
+        use_qt4_qt3support="no"
+    fi
+    ;;
+esac
+
 default_toolkit="gtk"
 AC_ARG_ENABLE(default-toolkit,
   AC_HELP_STRING([--enable-default-toolkit],
@@ -1735,8 +1762,11 @@
     fi
 fi
 if test x$use_qt4_immodule = xyes; then
-    ${QMAKE4} -o ${ac_abs_top_builddir}/qt4/immodule/Makefile.qmake \
-                ${ac_abs_top_builddir}/qt4/immodule/quiminputcontextplugin.pro
+    if test x$use_qt4_qt3support = xyes; then
+        option="QT+=qt3support DEFINES+=ENABLE_QT4_QT3SUPPORT"
+    fi
+    ${QMAKE4} -o ${ac_abs_top_builddir}/qt4/immodule/Makefile.qmake  
${option} \
+                 
${ac_abs_top_builddir}/qt4/immodule/quiminputcontextplugin.pro
     ${QMAKE4} -o ${ac_abs_top_builddir}/qt4/edittest/Makefile.qmake \
                  ${ac_abs_top_srcdir}/qt4/edittest/edittest.pro
 fi
@@ -1763,6 +1793,7 @@
    Qt3 immodule    : ${use_qtimmodule}
    Qt4             : ${use_qt4}
    Qt4 immodule    : ${use_qt4_immodule}
+   Qt4 Qt3Support  : ${use_qt4_qt3support}
    KDE3 Applet     : ${use_applet_kde}
    KDE4 Applet     : ${use_applet_kde4}
    FEP             : ${use_uim_fep}