[Gpg4win-commits] r1593 - in trunk: . src

[scm-commit@wald.intevation.org]

Author: colinleroy
Date: 2010-12-15 11:16:53 +0100 (Wed, 15 Dec 2010)
New Revision: 1593

Modified:
   trunk/ChangeLog
   trunk/src/Makefile.am
Log:
2010-12-15  Colin Leroy  <colin at colino.net>

        * src/Makefile.am: Fix libpng building



Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2010-12-15 08:39:10 UTC (rev 1592)
+++ trunk/ChangeLog	2010-12-15 10:16:53 UTC (rev 1593)
@@ -1,3 +1,7 @@
+2010-12-15  Colin Leroy  <colin at colino.net>
+
+	* src/Makefile.am: Fix libpng building
+
 2010-12-14  Werner Koch  <wk at g10code.com>
 
 	* patches/dirmngr-1.1.0/01-mmap.patch: New.

Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am	2010-12-15 08:39:10 UTC (rev 1592)
+++ trunk/src/Makefile.am	2010-12-15 10:16:53 UTC (rev 1593)
@@ -174,7 +174,7 @@
 
 gpg4win_pkg_adns_configure = --silent
 
-gpg4win_pkg_libpng_configure = CPPFLAGS=\"-I$(idir)/include\" LDFLAGS=\"-L$(idir)/lib\"
+gpg4win_pkg_libpng_configure = CPPFLAGS=\"-I$(idir)/include -DPNG_BUILD_DLL\" LDFLAGS=\"-L$(idir)/lib\" LIBPNG_DEFINES=\"-DPNG_BUILD_DLL\"
 
 gpg4win_pkg_dirmngr_configure = \
   --with-gpg-error-prefix=$(idir) \