SF.net SVN: openvrml:[4024] trunk

[<br...@us...>]

Revision: 4024
          http://openvrml.svn.sourceforge.net/openvrml/?rev=4024&view=rev
Author:   braden
Date:     2009-10-30 17:18:06 +0000 (Fri, 30 Oct 2009)

Log Message:
-----------
Use pkg-config to check for libpng.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/configure.ac

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-10-30 09:53:06 UTC (rev 4023)
+++ trunk/ChangeLog	2009-10-30 17:18:06 UTC (rev 4024)
@@ -1,5 +1,11 @@
 2009-10-30 Braden McDaniel  <br...@en...>
 
+	* configure.ac: Use pkg-config to check for libpng.  This allows
+	us to be a little smarter about linking and avoid linking directly
+	with zlib on platforms that don't need it.
+
+2009-10-30 Braden McDaniel  <br...@en...>
+
 	* configure.ac: Use AS_IF consistently.
 
 2009-10-27 Braden McDaniel  <br...@en...>

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2009-10-30 09:53:06 UTC (rev 4023)
+++ trunk/configure.ac	2009-10-30 17:18:06 UTC (rev 4024)
@@ -137,6 +137,7 @@
 AS_IF([test X$have_libxml = Xno -a -n "${XML_LIBS-x}"],
       [AC_MSG_FAILURE([libxml not found])])
 
+PKG_CHECK_MODULES([PNG], [libpng], , [have_libpng=no])
 PKG_CHECK_MODULES([FONTCONFIG], [$REQUIRE_FONTCONFIG], , [have_fontconfig=no])
 PKG_CHECK_MODULES([FREETYPE], [$REQUIRE_FREETYPE], , [have_freetype=no])
 #
@@ -284,12 +285,11 @@
 AC_ARG_ENABLE([png-textures],
               [AC_HELP_STRING([--disable-png-textures],
                               [disable support for rendering PNG textures])])
-AS_IF([test X$enable_png_textures = Xno],
-      [PNG_LIBS=""],
-      [PNG_LIBS="-lpng -lz"
+AS_IF([test X$enable_png_textures != Xno],
+      [AS_IF([test X$have_libpng = Xno],
+             [AC_MSG_FAILURE([libpng is required for PNG texture support])])
        AC_DEFINE([OPENVRML_ENABLE_PNG_TEXTURES], [1],
                  [Defined if support for rendering PNG textures is enabled.])])
-AC_SUBST([PNG_LIBS])
 
 #
 # JPEG texture support


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.