Fix configure bug of check qt.

diff --git a/configure.ac b/configure.ac
index ee6df2b06033372035c88571deb78ce4f842cfca..de96fa30f0c6580ac04d2848f6285b8eee8aa2d9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -99,10 +99,17 @@ PKG_CHECK_MODULES(QT,
 [IBUS_HAS_QT4=no]
 )
 
-if test x"$HAS_QT4" == x"yes"; then
+if test x"$IBUS_HAS_QT4" == x"yes"; then
        QMAKE=`$PKG_CONFIG --variable=qmake Qt`
        if test x"$QMAKE" == x""; then
-               QMAKE=qmake-qt4
+               AC_PATH_PROG(QMAKE, qmake-qt4)
+       fi
+       if test x"$QMAKE" == x""; then
+               AC_PATH_PROG(QMAKE, qmake)
+       fi
+       if test x"$QMAKE" == x""; then
+               IBUS_HAS_QT4=no
+               AC_MSG_WARN([Can not find qmake.])
        fi
        AC_SUBST(QMAKE)
 fi

diff --git a/gconf/ibus-gconf b/gconf/ibus-gconf
index 0d996bbbe9511950edca60cf651783015fe456fa..f7ee86d61778a33264da6027f44280dabf255b31 100644 (file)
--- a/gconf/ibus-gconf
+++ b/gconf/ibus-gconf
@@ -19,5 +19,5 @@
 # Free Software Foundation, Inc., 59 Temple Place, Suite 330,
 # Boston, MA  02111-1307  USA
 
-exec python /usr/local/share/ibus/gconf/main.py $@
+exec python /usr/share/ibus/gconf/main.py $@