Changeset 8715 in orxonox.OLD for branches/terrain/configure.ac

Timestamp:

Jun 22, 2006, 1:51:50 PM (18 years ago)

Author:

ponder

Message:

• Added special checks for macosx to acinclude.m4 and configure.ac. This sucks
• Reapplied the endianness checks to the md2_model file. They got lost during the merge operation.
• Tried to do the collision detection for the ground. But somehow it doesn't work. Perhaps an offset will do.

File:

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

branches/terrain/configure.ac

@@ -564 +564 @@
 #       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
+#           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
@@ -622 +622 @@
 # FIXME: Replace `main' with a function in `-lm':
  AC_CHECK_LIB([m], [main])
- AX_CHECK_REQUIRED_HEADER_LIB([zlib.h], [z], [zlibVersion],,, [http://www.zlib.net])
-
+if test x$osX = xyes ; then
+        AC_CHECK_LIB( [z], [main], [LIBS="$LIBS -lz"] )
+else
+        AX_CHECK_REQUIRED_HEADER_LIB([zlib.h], [z], [zlibVersion],,, [http://www.zlib.net])
+fi
 # Checks for header files.
 AC_HEADER_STDC
@@ -632 +635 @@
 
 # Checks for library functions.
-AC_FUNC_MALLOC
-AC_CHECK_FUNCS([bzero sqrt])
-
+if test x$osX != xyes ; then 
+        AC_FUNC_MALLOC
+        AC_CHECK_FUNCS([bzero sqrt])
+fi
 ######################
 ## OUTPUT CONFIGURE ##