Changeset 10475 in orxonox.OLD for trunk

Timestamp:

Jan 29, 2007, 9:32:37 AM (18 years ago)

Author:

bensch

Message:

fixed a compilation bug on tardis machines, now SDL is only searched for with sdl-config if SDL is not found natively by automake algorithms.
the only problem is, that if SDL is really not found, nothing is reported
but at least it works for the moment

please inform me if any problems on other platforms do arise

Location:

trunk

Files:

• acinclude.m4 (modified) (2 diffs)
• config.h.in (modified) (1 diff)
• configure.ac (modified) (1 diff)
• src/lib/graphics/importer/texture.cc (modified) (1 diff)

trunk/acinclude.m4

@@ -6 +6 @@
     _lib_check=""
 
-    AC_CHECK_HEADER([$1], [_header_check="yes"], [_header_check="no"])
+    AC_CHECK_HEADERS([$1], [_header_check="yes"], [_header_check="no"])
     AC_CHECK_LIB([$2], [$3], [_lib_check="yes"], [_lib_check="no"])
     if [test "x$_header_check" = "xyes" && test "x$_lib_check" = "xyes"] ; then
@@ -28 +28 @@
     _header_USED=""
 
+##    AC_CHECK_HEADERS([$1], [_header_check="yes"],, [$7])
     for _header in $1
     do
-      AC_CHECK_HEADER([${_header}], [_header_check="yes" ; _header_USED=${_header}], [_header_check="no"], $7)
+      AC_CHECK_HEADERS([${_header}], [_header_check="yes" ; _header_USED=${_header}], [_header_check="no"], $7)
       if  test "x${_header_check}" = "xyes" ; then
         break

trunk/config.h.in

@@ -9 +9 @@
 /* if we have CURL */
 #undef HAVE_CURL
+
+/* Define to 1 if you have the <curl/curl.h> header file. */
+#undef HAVE_CURL_CURL_H
 
 /* Define to 1 if you have the <GL/glew.h> header file. */

trunk/configure.ac

@@ -294 +294 @@
   SDL_VERSION=`sdl-config --version`
   echo $SDL_VERSION
-   CPPFLAGS="${CPPFLAGS} `sdl-config --cflags`"
-
-  AX_CHECK_REQUIRED_HEADER_LIB([SDL.h SDL/SDL.h], [SDL], [main],,, [http://www.libsdl.org])
+   
+
+  AX_CHECK_REQUIRED_HEADER_LIB([SDL.h SDL/SDL.h], [SDL], [main],, [
+     CPPFLAGS="${CPPFLAGS} `sdl-config --cflags`"
+     LDFLAGS="${LDFLAGS} `sdl-config --libs`"], [http://www.libsdl.org])
+     
 
     ;;

trunk/src/lib/graphics/importer/texture.cc

@@ -22 +22 @@
 
 #ifdef HAVE_SDL_SDL_H
-#include <SDL/SDL_image.h>
-#include <SDL/SDL_endian.h>
-#include <SDL/SDL_byteorder.h>
+ #include <SDL/SDL_image.h>
+ #include <SDL/SDL_endian.h>
+ #include <SDL/SDL_byteorder.h>
 #else
-#include <SDL_endian.h>
-#include <SDL_image.h>
-#include <SDL_byteorder.h>
+ #include <SDL_image.h>
+ #include <SDL_endian.h>
+ #include <SDL_byteorder.h>
 #endif
 #if SDL_BYTEORDER == SDL_BIG_ENDIAN