Revision: 41944
          http://brlcad.svn.sourceforge.net/brlcad/?rev=41944&view=rev
Author:   starseeker
Date:     2011-01-04 20:05:27 +0000 (Tue, 04 Jan 2011)

Log Message:
-----------
Use trunk configure.ac for cmake libpng

Modified Paths:
--------------
    brlcad/branches/cmake/src/other/libpng/configure.ac

Modified: brlcad/branches/cmake/src/other/libpng/configure.ac
===================================================================
--- brlcad/branches/cmake/src/other/libpng/configure.ac 2011-01-04 20:03:49 UTC 
(rev 41943)
+++ brlcad/branches/cmake/src/other/libpng/configure.ac 2011-01-04 20:05:27 UTC 
(rev 41944)
@@ -32,6 +32,7 @@
 
 AC_CONFIG_SRCDIR([pngget.c])
 AM_CONFIG_HEADER(config.h)
+AC_CONFIG_MACRO_DIR([../../../m4])
 
 # Checks for programs.
 AC_PROG_CC
@@ -41,7 +42,7 @@
 AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
-LT_INIT([win32-dll])
+AC_PROG_LIBTOOL
 
 # Checks for header files.
 AC_HEADER_STDC
@@ -56,7 +57,7 @@
 AC_FUNC_STRTOD
 AC_CHECK_FUNCS([memset], , AC_ERROR([memset not found in libc]))
 AC_CHECK_FUNCS([pow], , AC_CHECK_LIB(m, pow, , AC_ERROR([cannot find pow])) )
-AC_CHECK_LIB(z, zlibVersion, , AC_ERROR([zlib not installed]))
+#AC_CHECK_LIB(z, zlibVersion, , AC_ERROR([zlib not installed]))
 
 case $host_os in
   aix*)
@@ -137,4 +138,8 @@
 AC_CONFIG_FILES([libpng-config:libpng-config.in],
                [chmod +x libpng-config])
 
+# provides convenience argument handlers for specifying CFLAGS,
+# LDFLAGS, CPPFLAGS, and LIBS using --with argument handlers.
+BC_WITH_SUB_FLAG_ARGS
+
 AC_OUTPUT


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

------------------------------------------------------------------------------
Learn how Oracle Real Application Clusters (RAC) One Node allows customers
to consolidate database storage, standardize their database environment, and, 
should the need arise, upgrade to a full multi-node Oracle RAC database 
without downtime or disruption
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits

Reply via email to