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

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.ac (modified) (3 diffs)

orxonox/branches/images/configure.ac

@@ -255 +255 @@
 if test "$def_sdl_image" = "no"; then
  ## checking for libjpeg
- AC_CHECK_HEADERS(jpeglib.h ,,
-        [AC_MSG_ERROR([cannot find jpeg headers]) ])
-
- AC_CHECK_LIB([jpeg], [main], FOUND_jpeg=yes)
+ 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"
@@ -268 +270 @@
          exit -1
     fi   
-
+ fi
 
  ## checking for libpng
- AC_CHECK_HEADERS(png.h ,,
-        [AC_MSG_ERROR([cannot find jpeg headers]) ])
-
- AC_CHECK_LIB([png], [main], FOUND_png=yes)
+ 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"
@@ -283 +287 @@
          echo "------------------"
          exit -1
-    fi   
+    fi
+ fi   
 fi