Changeset 7534 in orxonox.OLD for branches/qt_gui/acinclude.m4

Timestamp:

May 4, 2006, 3:14:25 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: QT-4 works on Tardis

File:

• branches/qt_gui/acinclude.m4 (modified) (3 diffs)

branches/qt_gui/acinclude.m4

@@ -82 +82 @@
     _lib_check=""
     _found_lib=""
+    QT_PREFIX="$1"
 
 
-    QT_PREFIX="$1"
     QT_LIBS=""
     QT_CXXFLAGS="-I${QT_PREFIX}/include"
-    QT_LDFLAGS="-L${QT_PREFIX}/lib -Wl,-rpath -Wl,${QT_PREFIX}/lib"
+    LDFLAGS="${LDFLAGS} -L${QT_PREFIX}/lib -Wl,-rpath -Wl,${QT_PREFIX}/lib"
     QT_BIN_DIR="${QT_PREFIX}/bin"
-    QT_COMMON_INCLUDE_DIRECTORIES=/usr/include `ls -dr /usr/include/qt*` `ls -dr /usr/lib/qt*/include` `ls -dr /usr/local/qt*/include` `ls -dr /opt/qt*/include` `ls -dr /Developer/qt*/include`
-    QT_COMMON_LIB_DIRECTORIES=/usr/lib `ls -dr /usr/lib/qt*` `ls -dr /usr/local/qt*/lib` `ls -dr /opt/qt*/lib` `ls -dr/Developer/qt*/lib`
+
+    QT_COMMON_INCLUDE_DIRECTORIES="/usr/include
+      `ls -dr ${QTDIR}/include         2>/dev/null`
+      `ls -dr /usr/include/qt*         2>/dev/null`
+      `ls -dr /usr/lib/qt*/include     2>/dev/null`
+      `ls -dr /usr/local/qt*/include   2>/dev/null`
+      `ls -dr /opt/qt*/include         2>/dev/null`
+      `ls -dr /Developer/qt*/include   2>/dev/null`
+    "
+
+    QT_COMMON_LIB_DIRECTORIES=""
 
     CACHED_CPPFLAG=${CPPFLAGS}
@@ -107 +116 @@
     if [test "x$_lib_check" = "xyes"] ; then
          QT_LIBS="${QT_LIBS} -l$_found_lib"
+         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],,,[http://www.trolltech.com] )
+
          $3
     else
@@ -116 +129 @@
          exit -1
     fi
+
+    echo "QT_LIBS = ${QT_LIBS}"
+    echo "QT_CXXFLAGS = ${QT_CXXFLAGS}"
+    echo "QT_LD_FLAGS = ${QT_LDFLAGS}"
+
     AC_SUBST([QT_LIBS])
     AC_SUBST([QT_CXXFLAGS])