[fusion-commits] compiz mirror: Changes to 'master' (019d9477ba91d01bb9724d92d3c9f1f6edc918b5)

[compiz at server.beryl-project.org]

New commits:
commit 019d9477ba91d01bb9724d92d3c9f1f6edc918b5
Author: David Reveman <davidr at novell.com>
Date:   Tue Jul 24 19:17:56 2007 -0400

    Build png plugin properly.


 configure.ac        |    5 +++--
 plugins/Makefile.am |    2 ++
 2 files changed, 5 insertions(+), 2 deletions(-)


Modified: compiz/configure.ac
===================================================================
--- compiz/configure.ac
+++ compiz/configure.ac
@@ -80,8 +80,7 @@ AC_SUBST(imagedir)
 metadatadir=$datadir/compiz
 AC_SUBST(metadatadir)
 
-COMPIZ_REQUIRES="libpng	    \
-		 xcomposite \
+COMPIZ_REQUIRES="xcomposite \
 		 xfixes	    \
 		 xdamage    \
 		 xrandr	    \
@@ -128,6 +127,8 @@ if test -z "$XSLTPROC"; then
   AC_MSG_ERROR([Couldn't find xsltproc])
 fi
 
+PKG_CHECK_MODULES(LIBPNG, libpng)
+
 AC_ARG_ENABLE(glib,
   [  --disable-glib          Disable glib plugin],
   [use_glib=$enableval], [use_glib=yes])

Modified: compiz/plugins/Makefile.am
===================================================================
--- compiz/plugins/Makefile.am
+++ compiz/plugins/Makefile.am
@@ -46,6 +46,7 @@ libclone_la_LDFLAGS = -module -avoid-version -no-undefined
 libclone_la_SOURCES = clone.c
 
 libpng_la_LDFLAGS = -module -avoid-version -no-undefined
+libpng_la_LIBADD = @LIBPNG_LIBS@
 libpng_la_SOURCES = png.c
 
 libblur_la_DEPENDENCIES = $(top_builddir)/libdecoration/libdecoration.la
@@ -124,6 +125,7 @@ endif
 
 INCLUDES =					\
 	@COMPIZ_CFLAGS@				\
+	@LIBPNG_CFLAGS@				\
 	@LIBRSVG_CFLAGS@			\
 	@ANNOTATE_CFLAGS@			\
 	@GCONF_CFLAGS@				\