[uim-commit] r1363 - trunk

[tkng at freedesktop.org]

Author: tkng
Date: 2005-08-31 05:07:14 -0700 (Wed, 31 Aug 2005)
New Revision: 1363

Modified:
   trunk/configure.ac
Log:
* configure.ac: Added checks for moc-qt3 and uic-qt3.


Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2005-08-31 11:01:08 UTC (rev 1362)
+++ trunk/configure.ac	2005-08-31 12:07:14 UTC (rev 1363)
@@ -621,6 +621,17 @@
     fi
     MOC=$HOST_MOC
 
+    # Check For moc-qt3
+    if test -x "$QTDIR/bin/moc-qt3"; then
+      HOST_MOC="$QTDIR/bin/moc-qt3"
+    else
+      AC_CHECK_PROGS(HOST_MOC_QT3, moc-qt3, "")
+    fi
+    if test -z "$HOST_MOC_QT3"; then
+      AC_MSG_ERROR([No acceptable moc (meta object compiler) found])
+    fi
+    MOC=$HOST_MOC_QT3
+
     # Check For UIC
     if test -x "$QTDIR/bin/uic"; then
       HOST_UIC="$QTDIR/bin/uic"
@@ -632,6 +643,17 @@
     fi
     UIC=$HOST_UIC
 
+    # Check for uic-qt3
+    if test -x "$QTDIR/bin/uic-qt3"; then
+      HOST_UIC_QT3="$QTDIR/bin/uic-qt3"
+    else
+      AC_CHECK_PROGS(HOST_UIC_QT3, uic-qt3, "")
+    fi
+    if test -z "$HOST_UIC_QT3"; then
+      AC_MSG_ERROR([No acceptable uic-qt3 (user interface compiler) found])
+    fi
+    UIC_QT3=$HOST_UIC_QT3
+
     # GUESS plugins dir for immodule installation
     AC_MSG_CHECKING(for qt-immodule plugins dir)
     if test ! -d "$QTDIR/plugins"; then
@@ -642,7 +664,6 @@
       AC_SUBST(QT_PLUGINSDIR)
     fi
 
-
     # Process for compiler & linker flags
     QT_CXXFLAGS="-I${QTINCDIR} -DQT_GENUINE_STR -DQT_NO_STL"
     if test -z "$enable_debug"; then
@@ -692,7 +713,9 @@
     UIM_QT_CXXFLAGS=$QT_CXXFLAGS
 
     AC_SUBST(MOC)
+    AC_SUBST(MOC_QT3)
     AC_SUBST(UIC)
+    AC_SUBST(UIC_QT3)
     AC_SUBST(UIM_QT_CXXFLAGS)
     AC_SUBST(UIM_QT_LDFLAGS)
 fi