Changeset 7521 in orxonox.OLD for branches

Timestamp:

May 3, 2006, 4:17:32 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/qt_gui: works now on Tardis

Location:

branches/qt_gui

Files:

• acinclude.m4 (modified) (4 diffs)
• configure.ac (modified) (3 diffs)

branches/qt_gui/acinclude.m4

@@ -76 +76 @@
 
 
-dnl AX_CHECK_QT([LIBDIR], [LIBRARIES], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND], [LIB-WEB-PAGE])
+
+
+dnl AX_CHECK_QT([QTDIR], [LIBRARIES], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND], [LIB-WEB-PAGE])
 AC_DEFUN([AX_CHECK_QT], [
     _lib_check=""
@@ -95 +97 @@
       AC_CHECK_LIB([$_lib], [main], [_lib_check="yes"], [_lib_check="no"])
       if test "x$_lib_check" = "xyes" ; then
-        _found_libs=$_lib
+        _found_lib=$_lib
         break
       fi
@@ -101 +103 @@
 
     if [test "x$_lib_check" = "xyes"] ; then
-         QT_LIBS="${QT_LIBS} -l$_found_lib}"
+         QT_LIBS="${QT_LIBS} -l$_found_lib"
          $3
     else
@@ -125 +127 @@
 
     AC_PATH_PROG([QT_UIC], [uic], [no], ["${QT_BIN_DIR}:${PATH}"])
-      if test x${QT_UIC} = xno ; then
-        AC_MSG_ERROR([QT UIC not found])
-      fi
+ #     if test x${QT_UIC} = xno ; then
+ #       AC_MSG_WARN([QT UIC not found])
+ #     fi
     AC_SUBST([QT_UIC])
 
     AC_PATH_PROG([QT_RCC], [rcc], [no], ["${QT_BIN_DIR}:${PATH}"])
-      if test x${QT_RCC} = xno ; then
-        AC_MSG_ERROR([QT RCC not found])
-      fi
+#      if test x${QT_RCC} = xno ; then
+#        AC_MSG_WARN([QT RCC not found])
+#      fi
     AC_SUBST([QT_RCC])
 

branches/qt_gui/configure.ac

@@ -236 +236 @@
 
   ## QT
-  QT_PREFIX=/usr/pack/qt-4.0.1-mo
+  QT_PREFIX=/usr/pack/qt-3.3.3-mo
   CPPFLAGS="${CPPFLAGS} -I${PREFIX_QT}/${ARCH}/include"
   LDFLAGS="${LDFLAGS} -L${QT_PREFIX}/${ARCH}/lib -Wl,-rpath -Wl,${QT_PREFIX}/${ARCH}/lib"
@@ -243 +243 @@
 
 
-  QT_PREFIX=/usr/pack/qt-4.1.1-mo
+  QT_PREFIX=/usr/pack/qt-3.3.3-mo
   QTDIR="${QT_PREFIX}/${ARCH}"
   LDFLAGS="${LDFLAGS} -Wl,-rpath -Wl,${QT_PREFIX}/${ARCH}/lib"
@@ -579 +579 @@
 # QT #
 #----#
-AX_CHECK_QT([${QTDIR}], [QtCore QtCore4],, [http://www.trolltech.com])
+AX_CHECK_QT([${QTDIR}], [qt-mt],, [http://www.trolltech.com])
 if test x$have_qt = xno ; then
     WITH_QT=no
-else
-  AX_CHECK_REQUIRED_LIB([QtCore QtCore4], [main],,,[http://www.trolltech.com] )
-  AX_CHECK_REQUIRED_LIB([QtGui QtGui4], [main],,,[http://www.trolltech.com] )
-  AX_CHECK_REQUIRED_LIB([QtOpenGL QtOpenGL4], [main],,,[http://www.trolltech.com] )
+##else
+#  AX_CHECK_REQUIRED_LIB([QtCore QtCore4], [main],,,[http://www.trolltech.com] )
+#  AX_CHECK_REQUIRED_LIB([QtGui QtGui4], [main],,,[http://www.trolltech.com] )
+#  AX_CHECK_REQUIRED_LIB([QtOpenGL QtOpenGL4], [main],,,[http://www.trolltech.com] )
 
 fi