Changeset 7501 in orxonox.OLD

Timestamp:

May 3, 2006, 11:09:18 AM (18 years ago)

Author:

bensch

Message:

config-work

File:

• branches/qt_gui/configure.ac (modified) (4 diffs)

branches/qt_gui/configure.ac

@@ -145 +145 @@
 fi
 
-
-#-------------#
-# with-qt-dir #
-#-------------#
-WITH_QT=yes
-AC_MSG_CHECKING([if we want to use QT for the gui.])
-AC_ARG_WITH([modular-debug],
-        AS_HELP_STRING([--without-qt], [does not use QT for the display of the GUI]),
-         WITH_QT=$enableval)
-if test x$WITH_QT = xno; then
-        echo "no"
-elif test x$WITH_QT = xyes; then
-        echo "yes"
-        BNV_HAVE_QT
-        if test x$have_qt = xno ; then
-          WITH_QT=no
-        fi
-fi
-AM_CONDITIONAL([WITH_QT], [test x$WITH_QT = xyes])
-
 #--------------#
 # GTK-disabled #
@@ -173 +153 @@
         AS_HELP_STRING(--with-gtk, uses GTK for the GUI), [def_gtk=yes], [def_gtk=no])
 if test x$def_gtk = xyes; then
-  echo "yes"
+  echo "yes - will be overwritten if Qt is enabled"
 fi
 if test x$def_gtk = xno; then
@@ -254 +234 @@
   CPPFLAGS="${CPPFLAGS} -I${PREFIX}/include"
   LDFLAGS="${LDFLAGS} -L$PREFIX/${ARCH}/lib -Wl,-rpath -Wl,${PREFIX}/${ARCH}/lib"
+
+  ## QT
+  QT_PREFIX=/usr/pack/qt-4.1.1-mo
+  QTDIR="${QT_PREFIX}/${ARCH}"
+  LDFLAGS="${LDFLAGS} -Wl,-rpath -Wl,${QT_PREFIX}/${ARCH}/lib"
+
+
   ## GTK
   GTKPREFIX=/usr/pack/gtk-2.8.3-mo
@@ -264 +251 @@
   echo "no"
 fi
+
+
+BNV_HAVE_QT(QTDIR)
+if test x$have_qt = xno ; then
+    WITH_QT=no
+fi
+
+
 
 #######################