Changeset 9406 in orxonox.OLD for trunk/configure.ac

Timestamp:

Jul 24, 2006, 11:09:47 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the proxy back

merged with commandsvn merge -r9346:HEAD ​https://svn.orxonox.net/orxonox/branches/proxy .

no conflicts

File:

• trunk/configure.ac (modified) (7 diffs)

trunk/configure.ac

@@ -144 +144 @@
 fi
 
-#--------------#
-# GTK-disabled #
-#--------------#
-
-AC_MSG_CHECKING([if gtk should be enabled])
-AC_ARG_WITH([gtk],
-        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 - will be overwritten if Qt is enabled"
-fi
-if test x$def_gtk = xno; then
-  echo "no"
-fi
-
-
 
 #-------------------#
@@ -223 +208 @@
 #---------------------------#
 def_tardis=no
-GTKPATH=""
 AC_MSG_CHECKING([convenience flag for working at the taris in the ETH zurich])
 AC_ARG_WITH([tardis],
@@ -261 +245 @@
 #--------------------#
 AC_PATH_PROG(GPROF, gprof)
-
-#-------------------------#
-# checking for pkg-config #
-#-------------------------#
-if test x$def_gtk = xyes; then
- if test x${GTKPATH} != x; then
-   AC_PATH_PROG([PKG_CONFIG], [pkg-config],[], $GTKPATH )
- else
-   AC_PATH_PROG(PKG_CONFIG, pkg-config )
- fi
-fi
 
 
@@ -449 +422 @@
     AC_CHECK_HEADERS([OpenGL/glu.h] ,,
       [AC_MSG_ERROR([cannot find opengl headers]) ])
-        AC_CHECK_LIB( OpenGL, main, , )
+        AC_CHECK_LIB( OpenGL, main, , )
    LIBS="$LIBS -framework OpenGL"
 
@@ -560 +533 @@
 #----#
 if test x$osX = xyes ; then
-#       PKG_CONFIG_PATH="$prefix"
-#       PKG_CHECK_MODULES( QT, QtOpenGL >= 4.01 QtCore >= 4.01 QtGui >= 4.0.1 )
-#       QT_INCLUDE_DIR=`$PKG_CONFIG --variable=includedir QtOpenGL QtCore QtGui`
+#       PKG_CONFIG_PATH="$prefix"
+#       PKG_CHECK_MODULES( QT, QtOpenGL >= 4.01 QtCore >= 4.01 QtGui >= 4.0.1 )
+#       QT_INCLUDE_DIR=`$PKG_CONFIG --variable=includedir QtOpenGL QtCore QtGui`
 #----------#
-            AC_PATH_PROG([QT_MOC], [moc], [no], ["${QT_BIN_DIRECTORY}:${PATH}"])
-              if test x${QT_MOC} = xno ; then
-                AC_MSG_ERROR([QT MOC not found])
-              fi
-        AC_SUBST([QT_MOC])
-
-        AC_PATH_PROG([QT_UIC], [uic], [no], ["${QT_BIN_DIRECTORY}:${PATH}"])
-        AC_SUBST([QT_UIC])
-
-        AC_PATH_PROG([QT_RCC], [rcc], [no], ["${QT_BIN_DIRECTORY}:${PATH}"])
-
-        AC_SUBST([QT_RCC])
-        AC_SUBST( QT_INCLUDE_DIR )
-        AC_SUBST( QT_CFLAGS )
-        AC_SUBST( QT_LDFLAGS )
-        AC_SUBST( QT_LIBS )
-        echo "QT_LIBS                   = $QT_LIBS"
-        echo "QT_CFLAGS                 = $QT_CFLAGS"
-        echo "QT_INCLUDE_DIR    = $QT_INCLUDE_DIR"
+            AC_PATH_PROG([QT_MOC], [moc], [no], ["${QT_BIN_DIRECTORY}:${PATH}"])
+              if test x${QT_MOC} = xno ; then
+                AC_MSG_ERROR([QT MOC not found])
+              fi
+        AC_SUBST([QT_MOC])
+
+        AC_PATH_PROG([QT_UIC], [uic], [no], ["${QT_BIN_DIRECTORY}:${PATH}"])
+        AC_SUBST([QT_UIC])
+
+        AC_PATH_PROG([QT_RCC], [rcc], [no], ["${QT_BIN_DIRECTORY}:${PATH}"])
+
+        AC_SUBST([QT_RCC])
+        AC_SUBST( QT_INCLUDE_DIR )
+        AC_SUBST( QT_CFLAGS )
+        AC_SUBST( QT_LDFLAGS )
+        AC_SUBST( QT_LIBS )
+        echo "QT_LIBS                   = $QT_LIBS"
+        echo "QT_CFLAGS                 = $QT_CFLAGS"
+        echo "QT_INCLUDE_DIR    = $QT_INCLUDE_DIR"
 else
-        AX_CHECK_QT([${QT_PREFIX}], [QtCore QtCore4],, [http://www.trolltech.com])
-        if test x$have_qt = xno ; then
-                WITH_QT=no
-        fi
+        AX_CHECK_QT([${QT_PREFIX}], [QtCore QtCore4],, [http://www.trolltech.com])
+        if test x$have_qt = xno ; then
+                WITH_QT=no
+        fi
 fi
 
@@ -656 +629 @@
                  src/lib/shell/Makefile
                  src/lib/gui/Makefile
-                 src/lib/gui/gtk/Makefile
                  src/lib/gui/gl/Makefile
                  src/lib/gui/qt/Makefile
@@ -673 +645 @@
                  src/subprojects/collision_detection/Makefile
                  src/subprojects/network/Makefile
+                 src/subprojects/recapture_mouse/Makefile
                  ])