Changeset 3110 in orxonox.OLD for orxonox/branches/images/configure

Timestamp:

Dec 6, 2004, 1:11:56 AM (19 years ago)

Author:

bensch

Message:

orxonox/branches/images: test for jpeg and png libs in configure.ac and material.cc/h

File:

• orxonox/branches/images/configure (modified) (6 diffs)

orxonox/branches/images/configure

@@ -5496 +5496 @@
  osX="yes"
 
+ CPPFLAGS="-I/sw/include $CPPFLAGS"
 # checking gl header
 
@@ -5825 +5826 @@
        LIBS="$LIBS $SDL_LIBS"
 
-       def_sdl_image=no;
     ;;
 
@@ -6213 +6213 @@
 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
-
-else
-  { { echo "$as_me:$LINENO: error: cannot find jpeg headers" >&5
-echo "$as_me: error: cannot find jpeg headers" >&2;}
-   { (exit 1); exit 1; }; }
+ jpegHeader="yes"
+else
+  jpegHeader="no"
 fi
 
 done
 
-
- echo "$as_me:$LINENO: checking for main in -ljpeg" >&5
+ if test $jpegHeader = "no"; then
+        echo " not including jpeg."
+ else
+  echo "$as_me:$LINENO: checking for main in -ljpeg" >&5
 echo $ECHO_N "checking for main in -ljpeg... $ECHO_C" >&6
 if test "${ac_cv_lib_jpeg_main+set}" = set; then
@@ -6294 +6294 @@
          exit -1
     fi
-
+ fi
 
  ## checking for libpng
@@ -6442 +6442 @@
 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
-
-else
-  { { echo "$as_me:$LINENO: error: cannot find jpeg headers" >&5
-echo "$as_me: error: cannot find jpeg headers" >&2;}
-   { (exit 1); exit 1; }; }
+ pngHeader="yes"
+else
+  pngHeader="no"
 fi
 
 done
 
-
- echo "$as_me:$LINENO: checking for main in -lpng" >&5
+ if test $pngHeader = "no"; then
+        echo " not including png."
+ else
+  echo "$as_me:$LINENO: checking for main in -lpng" >&5
 echo $ECHO_N "checking for main in -lpng... $ECHO_C" >&6
 if test "${ac_cv_lib_png_main+set}" = set; then
@@ -6523 +6523 @@
          exit -1
     fi
+ fi
 fi