[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] /srv/bzr/gnash/trunk r9600: Change png to libpng, so it w
From: |
rob |
Subject: |
[Gnash-commit] /srv/bzr/gnash/trunk r9600: Change png to libpng, so it works with pkg-config. |
Date: |
Fri, 15 Aug 2008 13:12:52 -0600 |
User-agent: |
Bazaar (1.5) |
------------------------------------------------------------
revno: 9600
committer: address@hidden
branch nick: trunk
timestamp: Fri 2008-08-15 13:12:52 -0600
message:
Change png to libpng, so it works with pkg-config.
modified:
Makefile.am
backend/Makefile.am
configure.ac
libbase/Makefile.am
libmedia/Makefile.am
=== modified file 'Makefile.am'
--- a/Makefile.am 2008-08-12 05:11:32 +0000
+++ b/Makefile.am 2008-08-15 19:12:52 +0000
@@ -143,8 +143,8 @@
@echo "Image decoding support..."
@echo " JPEG_CFLAGS is $(JPEG_CFLAGS)"
@echo " JPEG_LIBS is $(JPEG_LIBS)"
- @echo " PNG_CFLAGS is $(PNG_CFLAGS)"
- @echo " PNG_LIBS is $(PNG_LIBS)"
+ @echo " PNG_CFLAGS is $(LIBPNG_CFLAGS)"
+ @echo " PNG_LIBS is $(LIBPNG_LIBS)"
@echo "Audio decoding support..."
if USE_SOUND_GST
@echo " GSTREAMER_CFLAGS is $(GSTREAMER_CFLAGS)"
=== modified file 'backend/Makefile.am'
--- a/backend/Makefile.am 2008-07-22 21:24:49 +0000
+++ b/backend/Makefile.am 2008-08-15 19:12:52 +0000
@@ -42,7 +42,7 @@
$(GLIB_CFLAGS) \
$(ATK_CFLAGS) \
$(DMALLOC_CFLAGS) \
- $(PNG_CFLAGS) \
+ $(LIBPNG_CFLAGS) \
$(JPEG_CFLAGS) \
$(OGG_CFLAGS) \
$(BOOST_CFLAGS) \
=== modified file 'configure.ac'
--- a/configure.ac 2008-08-12 16:02:52 +0000
+++ b/configure.ac 2008-08-15 19:12:52 +0000
@@ -707,7 +707,8 @@
no) xmitshm=no ;;
*) AC_MSG_ERROR([bad value ${enableval} for --enable-mit-shm option]) ;;
esac],xmitshm=yes)
-if test "x${xmitshm}" = "xyes"; then
+dnl as windows doesn't run X11, don't enable this extension there.
+if test "x${xmitshm}" = "xyes" -a "x${windows}" = "xno"; then
AC_DEFINE(ENABLE_MIT_SHM, [1], [Use MIT-SHM X extension if available])
fi
@@ -1510,7 +1511,7 @@
GNASH_PKG_FIND(z, [zlib.h], [zlib compression library], compress)
GNASH_PKG_FIND(jpeg, [jpeglib.h], [jpeg images], jpeg_mem_init)
-GNASH_PKG_FIND(png, [png.h], [png images], png_info_init)
+GNASH_PKG_FIND(libpng, [png.h], [png images], png_info_init)
GNASH_PKG_FIND(gif, [gif_lib.h], [gif images], DGifOpen)
GNASH_PKG_INCLUDES([dejagnu], [dejagnu.h])
@@ -2388,13 +2389,13 @@
echo " or .rpm users: yum install libungif-devel" >&3
fi
-if test x"${PNG_LIBS}" != x ; then
- if test x"${PNG_CFLAGS}" != x ; then
- echo " PNG flags are: $PNG_CFLAGS"
+if test x"${LIBPNG_LIBS}" != x ; then
+ if test x"${LIBPNG_CFLAGS}" != x ; then
+ echo " PNG flags are: $LIBPNG_CFLAGS"
else
echo " PNG flags are: default include path"
fi
- echo " PNG libs are: $PNG_LIBS"
+ echo " PNG libs are: $LIBPNG_LIBS"
else
echo " WARNING: No PNG library development package installed!" >&4
echo " Gnash will be built without support for dynamic
loading of PNG files." >&4
=== modified file 'libbase/Makefile.am'
--- a/libbase/Makefile.am 2008-08-06 17:11:45 +0000
+++ b/libbase/Makefile.am 2008-08-15 19:12:52 +0000
@@ -53,7 +53,7 @@
-I$(top_srcdir)/libcore/swf \
$(PTHREAD_CFLAGS) \
$(LIBXML_CFLAGS) \
- $(PNG_CFLAGS) \
+ $(LIBPNG_CFLAGS) \
$(GIF_CFLAG) \
$(GLIB_CFLAGS) \
$(GSTREAMER_CFLAGS) \
@@ -69,7 +69,7 @@
libgnashbase_la_LIBADD = \
$(JPEG_LIBS) \
- $(PNG_LIBS) \
+ $(LIBPNG_LIBS) \
$(GIF_LIBS) \
$(Z_LIBS) \
$(CURL_LIBS) \
=== modified file 'libmedia/Makefile.am'
--- a/libmedia/Makefile.am 2008-07-22 21:24:49 +0000
+++ b/libmedia/Makefile.am 2008-08-15 19:12:52 +0000
@@ -41,7 +41,7 @@
$(DMALLOC_CFLAGS) \
$(OPENGL_CFLAGS) \
$(LIBXML_CFLAGS) \
- $(PNG_CFLAGS) \
+ $(LIBPNG_CFLAGS) \
$(GLIB_CFLAGS) \
$(CURL_CFLAGS) \
$(Z_CFLAGS) \
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] /srv/bzr/gnash/trunk r9600: Change png to libpng, so it works with pkg-config.,
rob <=