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

Timestamp:

Nov 26, 2004, 2:49:55 PM (21 years ago)

Author:

bensch

Message:

orxonox/trunk: merged branches/osX back into the Trunk.
Conflicts resolved in Favor of trunk in all the Makefiles, and fixed many strange entries in configure.ac
merged with command: svn merge branches/osX/ trunk/ -r 2887:HEAD
AND most Important of all: change back to AUTOMAKE-1.7

File:

• orxonox/trunk/configure.ac (modified) (2 diffs)

orxonox/trunk/configure.ac

@@ -138 +138 @@
          exit -1
     fi   
+
 # checking for SDL-headers
     AC_CHECK_HEADERS(SDL/SDL.h ,,
       [AC_MSG_ERROR([cannot find SDL headers]) ])
 
+# checking for SDL-libs
     AC_CHECK_LIB([SDL], [main], FOUND_SDL=yes)
      if test "$FOUND_SDL" = "yes" ; then
@@ -162 +164 @@
 #    LIBS="$LIBS $SDL_LIBS"
     ;;
+
+### OS X ###
+ *darwin*)
+echo "OS X detected"
+
+ osX="yes"
+
+# checking gl header
+   AC_CHECK_HEADERS(OpenGL/gl.h ,,
+      [AC_MSG_ERROR([cannot find opengl headers]) ])
+# cheking for GLU-header
+    AC_CHECK_HEADERS(OpenGL/glu.h ,,
+      [AC_MSG_ERROR([cannot find opengl headers]) ])
+
+   LIBS="$LIBS -framework OpenGL"
+
+# checking for SDL-headers
+    AC_CHECK_HEADERS(SDL/SDL.h ,,
+      [AC_MSG_ERROR([cannot find SDL headers]) ])
+
+## checking for SDL
+#    SDL_VERSION=1.2.7
+#    AM_PATH_SDL($SDL_VERSION,
+#      :,
+#      AC_MSG_ERROR([*** SDL version $SDL_VERSION not found!])
+#      )
+
+       SDL_CFLAGS=`sdl-config --cflags`
+       SDL_LIBS=`sdl-config --libs`
+       CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
+       LIBS="$LIBS $SDL_LIBS"
+    ;;
+
   *)
     ;;