Changeset 3177 in orxonox.OLD for orxonox

Timestamp:

Dec 15, 2004, 2:57:03 AM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: finding sdl-image more flexible.

Location:

orxonox/trunk

Files:

• config.h.in (modified) (1 diff)
• configure (modified) (3 diffs)
• configure.ac (modified) (2 diffs)
• importer/material.cc (modified) (3 diffs)
• importer/material.h (modified) (3 diffs)

orxonox/trunk/config.h.in

@@ -40 +40 @@
 /* Define to 1 if you have the <png.h> header file. */
 #undef HAVE_PNG_H
+
+/* if we have SDL-image */
+#undef HAVE_SDL_IMAGE
+
+/* Define to 1 if you have the <SDL_image.h> header file. */
+#undef HAVE_SDL_IMAGE_H
 
 /* Define to 1 if you have the <SDL/SDL.h> header file. */

orxonox/trunk/configure

@@ -6010 +6010 @@
 
 else
+  echo "sdl_image not found. falling back to other options"; sdl_image_second_check=yes
+fi
+
+done
+
+  if test "$sdl_image_second_check" = yes ; then
+
+for ac_header in SDL_image.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+else
+  # Is the header compilable?
+echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
+
+# Is the header present?
+echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  ac_header_preproc=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------------- ##
+## Report this to orxonox-dev@mail.datacore.ch ##
+## ------------------------------------------- ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  eval "$as_ac_Header=\$ac_header_preproc"
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+
+fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+else
   echo "sdl_image not found. falling back to other options"; def_sdl_image=no
 fi
@@ -6015 +6168 @@
 done
 
-fi
+  fi
+fi
+
+
 if test "$def_sdl_image" = "yes"; then
 # checking for SDL_image-lib
@@ -6082 +6238 @@
      if test "$FOUND_SDL_image" = "yes" ; then
        LIBS="$LIBS -lSDL_image"
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_SDL_IMAGE 1
+_ACEOF
+
      else
         echo "------------------"

orxonox/trunk/configure.ac

@@ -248 +248 @@
 # checking for SDL_image-headers
   AC_CHECK_HEADERS(SDL/SDL_image.h ,,
-      [echo "sdl_image not found. falling back to other options"; def_sdl_image=no ])
-fi
+      [echo "sdl_image not found. falling back to other options"; sdl_image_second_check=yes ])
+  if test "$sdl_image_second_check" = yes ; then
+   AC_CHECK_HEADERS(SDL_image.h ,,
+       [echo "sdl_image not found. falling back to other options"; def_sdl_image=no ])
+  fi
+fi
+
+
 if test "$def_sdl_image" = "yes"; then
 # checking for SDL_image-lib
@@ -255 +261 @@
      if test "$FOUND_SDL_image" = "yes" ; then
        LIBS="$LIBS -lSDL_image"
+       AC_DEFINE_UNQUOTED(HAVE_SDL_IMAGE, 1, [if we have SDL-image])
      else
         echo "------------------"

orxonox/trunk/importer/material.cc

@@ -494 +494 @@
 
 
-#ifdef HAVE_SDL_SDL_IMAGE_H
+#ifdef HAVE_SDL_IMAGE
 bool Material::loadImage(char* imageName, GLuint* texture)
 {
@@ -529 +529 @@
 
 
-#else /* HAVE_SDL_SDL_IMAGE_H */
+#else /* HAVE_SDL_IMAGE */
 /**
    \brief Makes the Programm ready to Read-in a texture-File
@@ -1252 +1252 @@
 }
 
-#endif /* HAVE_SDL_SDL_IMAGE_H */
+#endif /* HAVE_SDL_IMAGE */

orxonox/trunk/importer/material.h

@@ -19 +19 @@
 #ifdef HAVE_SDL_SDL_IMAGE_H
 #include <SDL/SDL_image.h>
-#else
+#endif
+#ifdef HAVE_SDL_IMAGE_H
+#include <SDL_image.h>
+#endif
+
+#ifndef HAVE_SDL_IMAGE
 // IMAGE LIBS //
 #ifdef HAVE_JPEGLIB_H
@@ -29 +34 @@
 #include <png.h>
 #endif /* HAVE_PNG_H */
-#endif /* HAVE_SDL_SDL_IMAGE_H */
+#endif /* HAVE_SDL_IMAGE */
 
 class PathList
@@ -118 +123 @@
 
   bool loadImage(char* imageName, GLuint* texture);
-#ifndef HAVE_SDL_SDL_IMAGE_H
+#ifndef HAVE_SDL_IMAGE
 
   bool loadBMP (char* bmpName, GLuint* texture);