configure: Find libpng in /usr/X11 on MacOS.
diff --git a/configure b/configure
index d9da9f3..df17af8 100755
--- a/configure
+++ b/configure
Binary files differ
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.])
diff --git a/dlls/oleaut32/Makefile.in b/dlls/oleaut32/Makefile.in
index cbc1ca1..5d41598 100644
--- a/dlls/oleaut32/Makefile.in
+++ b/dlls/oleaut32/Makefile.in
@@ -8,6 +8,7 @@
DELAYIMPORTS = comctl32 urlmon
EXTRADEFS = -D_OLEAUT32_ -DCOM_NO_WINDOWS_H \
-DENTRY_PREFIX=OLEAUTPS_ -DPROXY_CLSID=CLSID_PSDispatch -DPROXY_DELEGATION -DREGISTER_PROXY_DLL
+EXTRAINCL = @PNGINCL@
C_SRCS = \
connpt.c \
diff --git a/programs/winemenubuilder/Makefile.in b/programs/winemenubuilder/Makefile.in
index 0931bdf..092405e 100644
--- a/programs/winemenubuilder/Makefile.in
+++ b/programs/winemenubuilder/Makefile.in
@@ -6,6 +6,7 @@
MODULE = winemenubuilder.exe
APPMODE = -mwindows
IMPORTS = uuid shell32 shlwapi ole32 user32 advapi32 kernel32
+EXTRAINCL = @PNGINCL@
C_SRCS = \
winemenubuilder.c
