commit 85b6189c3fbfcd2d66e57fa2f5dda236a30fc26a
author Joerg-Cyril.Hoehle@t-systems.com <Joerg-Cyril.Hoehle@t-systems.com> Sat May 23 12:39:50 2009 +0200
committer Alexandre Julliard <julliard@winehq.org> Mon May 25 16:39:27 2009 +0200
tree bdc1d62aa0a5e0246c52891830edf1c6f3237a60
parent 5d631361c910e5d4bda51b8abe7aa5ee623f0442

configure: Find libpng in /usr/X11 on MacOS.

configure.ac

diff --git a/configure.ac b/configure.ac
index fc88e58..a7b6850 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1299,6 +1299,19 @@
 if test "$ac_cv_header_png_h" = "yes"
 then
     WINE_CHECK_SONAME(png,png_create_read_struct,,,-lm -lz,[[libpng[[0-9]]*]])
+elif test -n "$X_CFLAGS" -a "x$with_png" != "xno"
+then
+    dnl libpng is in the X directory on Mac OS X
+    ac_save_CPPFLAGS="$CPPFLAGS"
+    CPPFLAGS="$CPPFLAGS $X_CFLAGS"
+    $as_unset ac_cv_header_png_h
+    AC_CHECK_HEADERS([png.h])
+    CPPFLAGS="$ac_save_CPPFLAGS"
+    if test "$ac_cv_header_png_h" = "yes"
+    then
+        AC_SUBST(PNGINCL,"$X_CFLAGS")
+        WINE_CHECK_SONAME(png,png_create_read_struct,,,[$X_LIBS -lm -lz],[[libpng[[0-9]]*]])
+    fi
 fi
 WINE_WARNING_WITH(png,[test "x$ac_cv_lib_soname_png" = "x"],
                  [libpng ${notice_platform}development files not found, PNG won't be supported.])