Changeset 9347 in orxonox.OLD for branches/proxy/configure.ac

Timestamp:

Jul 20, 2006, 11:43:27 AM (18 years ago)

Author:

bensch

Message:

orxonox/proxy: merged the proxy.old back again, and it seems to work.

Merged with command
svn merge -r9247:HEAD ​https://svn.orxonox.net/orxonox/branches/proxy.old .

no conflicts

File:

• branches/proxy/configure.ac (modified) (3 diffs)

branches/proxy/configure.ac

@@ -449 +449 @@
     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 +560 @@
 #----#
 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
 
@@ -672 +672 @@
                  src/subprojects/collision_detection/Makefile
                  src/subprojects/network/Makefile
+                 src/subprojects/recapture_mouse/Makefile
                  ])