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

Timestamp:

Dec 10, 2004, 7:44:36 PM (21 years ago)

Author:

bensch

Message:

orxonox/trunk: merged branches/images back into the trunk.
merged with command: svn merge bensches/images/ trunk/ -r 3084:HEAD

Conflicts in configure/.ac

resolved in favor of branches/images (newer)

Mayor differences:

1. Image-Importing capability.
2. configure remade for usage with sdl-image/jpeglib and so on.
3. Absolutely no change in the trunk/src

File:

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

orxonox/trunk/configure.ac

@@ -20 +20 @@
 AC_PROG_CXX
 AC_HEADER_STDC
-
 
 ### CHECKING  OPTIONAT ARGUMENTS
@@ -35 +34 @@
   echo "no"
 fi
-
-
+### SDL_image-disable
+def_sdl_image=yes
+AC_MSG_CHECKING([if SDL_image should be enabled])
+AC_ARG_ENABLE([sdl_image], 
+        AC_HELP_STRING( [--disabel-sdl-image], 
+        [Prevents SDL_image from being loaded]), [def_sdl_image=no]) 
+if test "$def_sdl_image" = yes; then 
+  echo "yes"
+fi 
+if test "$def_sdl_image" = no; then 
+  echo "no"
+fi
 
 ### CHECKING FOR SYSTEM ###
@@ -116 +125 @@
     fi
 
-
     ;;
 
@@ -160 +168 @@
       [AC_MSG_ERROR([cannot find SDL headers]) ])
 
-# checking for SDL-libs
+# checking for SDL-lib
     AC_CHECK_LIB([SDL], [main], FOUND_SDL=yes)
      if test "$FOUND_SDL" = "yes" ; then
@@ -171 +179 @@
         exit -1
      fi   
+
 
 ## checking for SDL
@@ -188 +197 @@
  osX="yes"
 
+ CPPFLAGS="-I/sw/include $CPPFLAGS"
 # checking gl header
    AC_CHECK_HEADERS(OpenGL/gl.h ,,
@@ -212 +222 @@
        CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
        LIBS="$LIBS $SDL_LIBS"
+
     ;;
 
@@ -220 +231 @@
 AC_SUBST(MSBITFIELDS)
 
-
-
+## check for SDL_Image
+if test "$def_sdl_image" = "yes"; then
+# 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
+if test "$def_sdl_image" = "yes"; then
+# checking for SDL_image-lib
+  AC_CHECK_LIB([SDL_image], [main], FOUND_SDL_image=yes)
+     if test "$FOUND_SDL_image" = "yes" ; then
+       LIBS="$LIBS -lSDL_image"
+     else
+        echo "------------------"
+        echo "SDL_image library not found."
+        echo "please install the SDL_image library, which can be found at http://www.libsdl.org/projects/SDL_image/"
+        echo "------------------"
+        exit -1
+     fi   
+fi
+
+
+if test "$def_sdl_image" = "no"; then
+ ## checking for libjpeg
+ AC_CHECK_HEADERS(jpeglib.h ,jpegHeader="yes",
+        jpegHeader="no")
+ if test $jpegHeader = "no"; then
+        echo " not including jpeg."
+ else
+  AC_CHECK_LIB([jpeg], [main], FOUND_jpeg=yes)
+    if test "$FOUND_jpeg" = "yes" ; then
+      LIBS="$LIBS -ljpeg"
+    else
+         echo "------------------"
+         echo "jpeg library not found."
+         echo "please install the jpeg library from the Independent JPEG Group, which can be found at http://www.ijg.org"
+         echo "------------------"
+         exit -1
+    fi   
+ fi
+
+ ## checking for libpng
+ AC_CHECK_HEADERS(png.h ,pngHeader="yes",
+        pngHeader="no")
+ if test $pngHeader = "no"; then
+        echo " not including png."
+ else
+  AC_CHECK_LIB([png], [main], FOUND_png=yes)
+    if test "$FOUND_png" = "yes" ; then
+      LIBS="$LIBS -lpng"
+    else
+         echo "------------------"
+         echo "png library not found."
+         echo "please install the png library, which can be found at http://libpng.org/pub/png/libpng.html"
+         echo "------------------"
+         exit -1
+    fi
+ fi   
+fi
 
 ## checking for GTK