update

[l4.git] / l4 / pkg / libsdl-image / contrib / configure.in

diff --git a/l4/pkg/libsdl-image/contrib/configure.in b/l4/pkg/libsdl-image/contrib/configure.in
index afe7ba00376c052039c887144c2f0728d3c6f0e5..034cd0b029b0d7b2a81b425b70a1994e06bd79f2 100644 (file)
--- a/l4/pkg/libsdl-image/contrib/configure.in
+++ b/l4/pkg/libsdl-image/contrib/configure.in
@@ -13,9 +13,9 @@ dnl Set various version strings - taken gratefully from the GTk sources
 
 MAJOR_VERSION=1
 MINOR_VERSION=2
-MICRO_VERSION=8
-INTERFACE_AGE=0
-BINARY_AGE=8
+MICRO_VERSION=11
+INTERFACE_AGE=3
+BINARY_AGE=11
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION
 
 AC_SUBST(MAJOR_VERSION)
@@ -75,6 +75,15 @@ case "$host" in
             use_version_rc=true
         fi
         ;;
+    *-*-darwin*)
+        AC_ARG_ENABLE([imageio], [AC_HELP_STRING([--enable-imageio], [use native Mac OS X frameworks for loading images [default=yes]])],
+                      [], [enable_imageio=yes])
+        if test x$enable_imageio = xyes; then
+            IMG_LIBS="-Wl,-framework,ApplicationServices $IMG_LIBS"
+        else
+            CFLAGS="$CFLAGS -DSDL_IMAGE_USE_COMMON_BACKEND"
+        fi
+        ;;
 esac
 AM_CONDITIONAL(USE_VERSION_RC, test x$use_version_rc = xtrue)
 
@@ -108,7 +117,7 @@ AM_PATH_SDL($SDL_VERSION,
             :,
            AC_MSG_ERROR([*** SDL version $SDL_VERSION not found!])
 )
-CFLAGS="$CFLAGS -DSDL_IMAGE_USE_COMMON_BACKEND $SDL_CFLAGS"
+CFLAGS="$CFLAGS $SDL_CFLAGS"
 LIBS="$LIBS $SDL_LIBS"
 saved_LIBS="$LIBS"