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

Timestamp:

Jun 8, 2006, 11:11:37 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the osX-branche back here
merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/osx . -r7763:HEAD

conflicts resolved, and everything is working as expected (or at least i hope so )

File:

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

trunk/configure.ac

@@ -436 +436 @@
  *darwin*)
  echo "OS X detected"
-
  osX="yes"
 
- CPPFLAGS="-I/sw/include -I/sw/include ${CPPFLAGS}"
- LDFLAGS="$LDFLAGS -L/sw/lib"
+ QT_PREFIX="$prefix"
+ CPPFLAGS="-I/$prefix/include $CPPFLAGS -F$prefix/lib -I/opt/local"
+ LDFLAGS="$LDFLAGS -L$prefix/lib -F$prefix/lib -L/opt/local"
+ PCK_CONFIG_PATH='/opt/local'
+
 # checking gl header
    AC_CHECK_HEADERS([OpenGL/gl.h] ,,
       [AC_MSG_ERROR([cannot find opengl headers]) ])
-# cheking for GLU-header
+# checking for GLU-header
     AC_CHECK_HEADERS([OpenGL/glu.h] ,,
       [AC_MSG_ERROR([cannot find opengl headers]) ])
-
+        AC_CHECK_LIB( OpenGL, main, , )
    LIBS="$LIBS -framework OpenGL"
 
@@ -465 +467 @@
    fi
 
-
+ LIBS="$LIBS"
    AC_CHECK_HEADERS([OpenAL/al.h] ,,
       [AC_MSG_ERROR([cannot find opengl headers]) ])
@@ -475 +477 @@
        SDL_CFLAGS=`sdl-config --cflags`
        SDL_LIBS=`sdl-config --libs`
-       CXXFL\AGS="$CXXFLAGS $SDL_CFLAGS"
+       CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
        LIBS="$LIBS $SDL_LIBS"
    AC_CHECK_HEADERS([SDL/SDL.h] ,,
@@ -557 +559 @@
 # QT #
 #----#
-AX_CHECK_QT([${QT_PREFIX}], [QtCore QtCore4],, [http://www.trolltech.com])
-if test x$have_qt = xno ; then
-    WITH_QT=no
+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`
+#----------#
+            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
 fi