SF.net SVN: openvrml:[4039] trunk

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

Revision: 4039
          http://openvrml.svn.sourceforge.net/openvrml/?rev=4039&view=rev
Author:   braden
Date:     2009-11-01 22:29:16 +0000 (Sun, 01 Nov 2009)

Log Message:
-----------
Don't fail on missing libpng if PNG_LIBS has been set.

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-11-01 22:25:24 UTC (rev 4038)
+++ trunk/ChangeLog	2009-11-01 22:29:16 UTC (rev 4039)
@@ -1,5 +1,10 @@
 2009-11-01 Braden McDaniel  <br...@en...>
 
+	* configure.ac: Don't fail on missing libpng if PNG_LIBS has been
+	set.
+
+2009-11-01 Braden McDaniel  <br...@en...>
+
 	* configure.ac: Improve error message when no SpiderMonkey is
 	found: account for the possibility that the installed libjs was
 	not built with -DJS_THREADSAFE.

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2009-11-01 22:25:24 UTC (rev 4038)
+++ trunk/configure.ac	2009-11-01 22:29:16 UTC (rev 4039)
@@ -248,7 +248,7 @@
               [AC_HELP_STRING([--disable-png-textures],
                               [disable support for rendering PNG textures])])
 AS_IF([test X$enable_png_textures != Xno],
-      [AS_IF([test X$have_libpng = Xno],
+      [AS_IF([test X$have_libpng = Xno -a -z "${PNG_LIBS+x}"],
              [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.])])


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