Revision: 45722
http://brlcad.svn.sourceforge.net/brlcad/?rev=45722&view=rev
Author: starseeker
Date: 2011-07-28 21:04:40 +0000 (Thu, 28 Jul 2011)
Log Message:
-----------
autogen failed - add back in what seem to be the related differences from the
previous libpng configure.ac
Modified Paths:
--------------
brlcad/trunk/src/other/libpng/configure.ac
Modified: brlcad/trunk/src/other/libpng/configure.ac
===================================================================
--- brlcad/trunk/src/other/libpng/configure.ac 2011-07-28 20:22:55 UTC (rev
45721)
+++ brlcad/trunk/src/other/libpng/configure.ac 2011-07-28 21:04:40 UTC (rev
45722)
@@ -32,6 +32,7 @@
AC_CONFIG_SRCDIR([pngget.c])
AM_CONFIG_HEADER(config.h)
+AC_CONFIG_MACRO_DIR([../../../m4]
# Checks for programs.
AC_LANG([C])
@@ -43,7 +44,7 @@
AC_PROG_INSTALL
AC_PROG_LN_S
AC_PROG_MAKE_SET
-LT_INIT([win32-dll])
+AC_PROG_LIBTOOL
# On Solaris 10 and 12 CPP gets set to cc -E, however this still
# does some input parsing. We need strict ANSI-C style tokenization,
@@ -80,14 +81,14 @@
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_ARG_WITH(zlib-prefix,
- AC_HELP_STRING([--with-zlib-prefix],
- [prefix that may have been used in installed zlib]),
- [ZPREFIX=${withval}],
- [ZPREFIX='z_'])
-AC_CHECK_LIB(z, zlibVersion, ,
- AC_CHECK_LIB(z, ${ZPREFIX}zlibVersion, ,
- AC_ERROR([zlib not installed])))
+#AC_ARG_WITH(zlib-prefix,
+# AC_HELP_STRING([--with-zlib-prefix],
+# [prefix that may have been used in installed zlib]),
+# [ZPREFIX=${withval}],
+# [ZPREFIX='z_'])
+#AC_CHECK_LIB(z, zlibVersion, ,
+# AC_CHECK_LIB(z, ${ZPREFIX}zlibVersion, ,
+# AC_ERROR([zlib not installed])))
LIBPNG_DEFINES=-DPNG_CONFIGURE_LIBPNG
@@ -164,4 +165,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.
------------------------------------------------------------------------------
Got Input? Slashdot Needs You.
Take our quick survey online. Come on, we don't ask for help often.
Plus, you'll get a chance to win $100 to spend on ThinkGeek.
http://p.sf.net/sfu/slashdot-survey
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
