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

Timestamp:

Jun 23, 2005, 2:09:07 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: safer compile support

File:

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

orxonox/trunk/configure.ac

@@ -215 +215 @@
 echo "mingw-WINDOWS detected"
 
-CPPFLAGS="-I/usr/include/SDL -I/mingw/include/SDL"
+CPPFLAGS="-I/usr/include -I/mingw/include"
 
     mingw="yes"
@@ -261 +261 @@
     fi
 # checking for SDL-headers
-    AC_CHECK_HEADERS([SDL.h] ,,
+    AC_CHECK_HEADERS([SDL/SDL.h] ,,
       [AC_MSG_ERROR([cannot find SDL headers]) ])
 
@@ -295 +295 @@
  Linux="yes"
 
-CPPFLAGS="-I/usr/X11R6/include -I/usr/include/SDL"
+CPPFLAGS="-I/usr/X11R6/include -I/usr/include"
 LDFLAGS="-L/usr/lib/opengl/xorg-x11/lib -L/usr/Mesa-6.0.1/lib -L/usr/X11R6/lib $LDFLAGS"
 # checking gl header
@@ -329 +329 @@
 
 # checking for SDL-headers
-    AC_CHECK_HEADERS([SDL.h] ,,
+    AC_CHECK_HEADERS([SDL/SDL.h] ,,
       [AC_MSG_ERROR([cannot find SDL headers]) ])
 
@@ -362 +362 @@
  osX="yes"
 
- CPPFLAGS="-I/sw/include -I/sw/include/SDL $CPPFLAGS"
+ CPPFLAGS="-I/sw/include -I/sw/include $CPPFLAGS"
 # checking gl header
    AC_CHECK_HEADERS([OpenGL/gl.h] ,,
@@ -372 +372 @@
    LIBS="$LIBS -framework OpenGL"
 
+
+## SDL-check
        SDL_CFLAGS=`sdl-config --cflags`
        SDL_LIBS=`sdl-config --libs`
@@ -475 +477 @@
 #---------#
 # checking for SDL_ttf-headers
-  AC_CHECK_HEADERS([SDL_ttf.h] ,,
-      [AC_MSG_ERROR([cannot find SDL_ttf header.])])
+  AC_CHECK_HEADERS([SDL/SDL_ttf.h] ,,
+      [AC_CHECK_HEADERS([SDL_ttf.h] ,,AC_MSG_ERROR([cannot find SDL_ttf header.])]))
 #fi
 # checking for SDL_ttf-lib
@@ -496 +498 @@
 # checking for SDL_image-headers
 AC_CHECK_HEADERS([SDL_image.h] ,,
-    [echo "sdl_image header not found."; def_sdl_image=no; exit -1])
+    [AC_CHECK_HEADERS([SDL/SDL_image.h],, AC_MSG_ERROR([sdl_image header not found.]))])
 # checking for SDL_image-lib
 AC_CHECK_LIB([SDL_image], [main], [FOUND_SDL_image=yes])
@@ -596 +598 @@
                  src/lib/gui/Makefile
                  src/lib/tinyxml/Makefile
-                 src/subprojects/Makefile
+                 src/subprojects/Makefile
                  src/subprojects/testmain/Makefile
                  src/subprojects/importer/Makefile