Revision: 55088
http://brlcad.svn.sourceforge.net/brlcad/?rev=55088&view=rev
Author: starseeker
Date: 2013-04-09 14:51:01 +0000 (Tue, 09 Apr 2013)
Log Message:
-----------
Try something a little more drastic for libpng. This seems to get further -
distcheck in autotools is now failing due to issues with thread libs (probably
related to the new affinity work - had to add in a new AC_CHECK_TYPES for
cpu_set_t
Modified Paths:
--------------
brlcad/trunk/configure.ac
brlcad/trunk/src/other/libpng/Makefile.am
Modified: brlcad/trunk/configure.ac
===================================================================
--- brlcad/trunk/configure.ac 2013-04-09 03:08:57 UTC (rev 55087)
+++ brlcad/trunk/configure.ac 2013-04-09 14:51:01 UTC (rev 55088)
@@ -1844,6 +1844,8 @@
test -z "$ac_type" && break
done])
+AC_CHECK_TYPES([cpu_set_t], [], [], [#include <sched.h>])
+
dnl ******************************************
dnl *** Check for compiler characteristics ***
dnl ******************************************
@@ -4018,16 +4020,16 @@
fi
AC_SUBST(TK_PATH)
-dnl configure libpng
-if test "x$build_brlcad_png" = "xyes" ; then
- if test "x$LIBZ_CPPFLAGS" != "x" ; then
- LIBZ_PATH="$PWD/${ac_top_builddir}/src/other/libz"
- ac_configure_args="$ac_configure_args
--with-sub-libs=\"${LIBZ_PATH}/libz.la\" --with-sub-cppflags=\"-I${LIBZ_PATH}\"
--with-sub-cflags=\"$CFLAGS\" --with-sub-ldflags=\"$LDFLAGS\""
- else
- ac_configure_args="$ac_configure_args --with-sub-libs='$LIBZLIB'
--with-sub-cflags=\"$CFLAGS\" --with-sub-ldflags=\"$LDFLAGS\""
- fi
- AC_CONFIG_SUBDIRS([src/other/libpng])
-fi
+#dnl configure libpng
+#if test "x$build_brlcad_png" = "xyes" ; then
+# if test "x$LIBZ_CPPFLAGS" != "x" ; then
+# LIBZ_PATH="$PWD/${ac_top_builddir}/src/other/libz"
+# ac_configure_args="$ac_configure_args
--with-sub-libs=\"${LIBZ_PATH}/libz.la\" --with-sub-cppflags=\"-I${LIBZ_PATH}\"
--with-sub-cflags=\"$CFLAGS\" --with-sub-ldflags=\"$LDFLAGS\""
+# else
+# ac_configure_args="$ac_configure_args --with-sub-libs='$LIBZLIB'
--with-sub-cflags=\"$CFLAGS\" --with-sub-ldflags=\"$LDFLAGS\""
+# fi
+# AC_CONFIG_SUBDIRS([src/other/libpng])
+#fi
dnl configure tkhtml
if test "x$build_brlcad_tkhtml" = "xyes" ; then
@@ -4192,6 +4194,7 @@
src/other/iwidgets/generic/Makefile
src/other/iwidgets/iwidgets.tcl
src/other/iwidgets/pkgIndex.tcl
+ src/other/libpng/Makefile
src/other/libregex/Makefile
src/other/libtermlib/Makefile
src/other/libutahrle/Makefile
Modified: brlcad/trunk/src/other/libpng/Makefile.am
===================================================================
--- brlcad/trunk/src/other/libpng/Makefile.am 2013-04-09 03:08:57 UTC (rev
55087)
+++ brlcad/trunk/src/other/libpng/Makefile.am 2013-04-09 14:51:01 UTC (rev
55088)
@@ -3,7 +3,7 @@
#
ACLOCAL_AMFLAGS = -I ../../../m4
-PNGLIB_BASENAME= libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@
+PNGLIB_BASENAME= libpng15
# libpng does not follow GNU file name conventions
@@ -16,70 +16,36 @@
TESTS_ENVIRONMENT= srcdir=$(srcdir)
check_PROGRAMS= pngtest
pngtest_SOURCES = pngtest.c
-pngtest_LDADD = libpng@PNGLIB_MAJOR@@[email protected]
+pngtest_LDADD = libpng15.la
TESTS = test-pngtest.sh
# Only do the following if the contrib directory is present.
check_PROGRAMS+= pngvalid
pngvalid_SOURCES = contrib/libtests/pngvalid.c
-pngvalid_LDADD = libpng@PNGLIB_MAJOR@@[email protected]
+pngvalid_LDADD = libpng15.la
TESTS += test-pngvalid-simple.sh test-pngvalid-full.sh
# man pages
dist_man_MANS= libpng.3 libpngpf.3 png.5
-# generate the -config scripts if required
-binconfigs= libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@-config
-EXTRA_SCRIPTS= libpng-config libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@-config
-bin_SCRIPTS= @binconfigs@
-
# rules to build libpng, only build the old library on request
-lib_LTLIBRARIES=libpng@PNGLIB_MAJOR@@[email protected]
+lib_LTLIBRARIES=libpng15.la
# EXTRA_LTLIBRARIES= libpng.la
-libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_SOURCES = png.c pngerror.c\
+libpng15_la_SOURCES = png.c pngerror.c\
pngget.c pngmem.c pngpread.c pngread.c pngrio.c pngrtran.c pngrutil.c\
pngset.c pngtrans.c pngwio.c pngwrite.c pngwtran.c pngwutil.c\
png.h pngconf.h pngdebug.h pnginfo.h pngpriv.h pngstruct.h pngusr.dfa
-if PNG_ARM_NEON
-libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_SOURCES += arm/filter_neon.S
-endif
+nodist_libpng15_la_SOURCES = pnglibconf.h
-nodist_libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_SOURCES = pnglibconf.h
+libpng15_la_LDFLAGS = -no-undefined -export-dynamic \
+ -version-number 15:12:0
-#libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_CPPFLAGS = @LIBPNG_DEFINES@
-# libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_CPPFLAGS = @LIBPNG_DEFINES@
-# support automake 1.7+, no target-specific CPPFLAGS
-AM_CPPFLAGS = @LIBPNG_DEFINES@
-
-libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_LDFLAGS = -no-undefined -export-dynamic \
- -version-number @PNGLIB_MAJOR@@PNGLIB_MINOR@:@PNGLIB_RELEASE@:0
-
-if HAVE_LD_VERSION_SCRIPT
-# Versioned symbols and restricted exports
-if HAVE_SOLARIS_LD
- libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_LDFLAGS += -Wl,-M -Wl,libpng.vers
-else
- libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_LDFLAGS +=
-Wl,--version-script=libpng.vers
-endif
-
- libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_DEPENDENCIES = libpng.vers
-else
-# Only restricted exports when possible
- libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_LDFLAGS += -export-symbols libpng.sym
- libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_DEPENDENCIES = libpng.sym
-endif
-
#distribute headers in /usr/include/libpng/*
pkgincludedir= $(includedir)/$(PNGLIB_BASENAME)
pkginclude_HEADERS= png.h pngconf.h
nodist_pkginclude_HEADERS= pnglibconf.h
-# pkg-config stuff, note that libpng.pc is always required in order
-# to get the correct library
-pkgconfigdir = @pkgconfigdir@
-pkgconfig_DATA = libpng@PNGLIB_MAJOR@@[email protected]
-
#extra source distribution files.
EXTRA_DIST= \
ANNOUNCE CHANGES INSTALL LICENSE README TODO \
@@ -90,8 +56,8 @@
SCRIPT_CLEANFILES=scripts/*.out scripts/*.chk scripts/pnglibconf.dfn
-CLEANFILES= dfn.c dfn?.out pngout.png libpng@PNGLIB_MAJOR@@[email protected] \
- libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@-config libpng.vers libpng.sym \
+CLEANFILES= dfn.c dfn?.out pngout.png libpng15.pc \
+ libpng15-config libpng.vers libpng.sym \
check.new pnglibconf.* symbols.new pngtest-log.txt \
$(SCRIPT_CLEANFILES)
@@ -103,7 +69,7 @@
# checks input tokens for validity - effectively it performs part of the ANSI-C
# parsing - and therefore fails with the .df files. configure.ac has special
# checks for this and sets DFNCPP appropriately.
-DFNCPP = @DFNCPP@
+DFNCPP = cpp
SUFFIXES = .chk .dfn .out
@@ -139,7 +105,7 @@
# We must use -DPNG_NO_USE_READ_MACROS here even when the library may actually
# be built with PNG_USE_READ_MACROS; this prevents the read macros from
# interfering with the symbol file format.
-SYMBOL_CFLAGS = -DPNGLIB_LIBNAME='PNG@PNGLIB_MAJOR@@PNGLIB_MINOR@_0'\
+SYMBOL_CFLAGS = -DPNGLIB_LIBNAME='PNG15_0'\
-DPNGLIB_VERSION='@PNGLIB_VERSION@'\
-DSYMBOL_PREFIX='$(SYMBOL_PREFIX)'\
-DPNG_NO_USE_READ_MACROS -DPNG_BUILDING_SYMBOL_TABLE
@@ -148,7 +114,7 @@
rm -f $@ dfn.c dfn?.out
test -d scripts || mkdir scripts
echo '#include "$<"' >dfn.c
- $(DFNCPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) @LIBPNG_DEFINES@\
+ $(DFNCPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)\
$(CPPFLAGS) $(SYMBOL_CFLAGS) dfn.c > dfn1.out
$(SED) -n -e 's|^.*PNG_DEFN_MAGIC *-\(.*\)- *PNG_DEFN_END.*$$|\1|p'\
dfn1.out >dfn2.out
@@ -187,7 +153,7 @@
rm dfn1.out
mv dfn2.out $@
-$(libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_OBJECTS): png.h pngconf.h \
+$(libpng15_la_OBJECTS): png.h pngconf.h \
pnglibconf.h pngpriv.h pngdebug.h pnginfo.h pngstruct.h
test: check-am
@@ -210,13 +176,13 @@
cd $(DESTDIR)$(pkgconfigdir); rm -f libpng.pc
cd $(DESTDIR)$(pkgconfigdir); $(LN_S) $(PNGLIB_BASENAME).pc libpng.pc
-# do evil things to libpng to cause libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@ to be
used
+# do evil things to libpng to cause libpng15 to be used
install-exec-hook:
cd $(DESTDIR)$(bindir); rm -f libpng-config
cd $(DESTDIR)$(bindir); $(LN_S) $(PNGLIB_BASENAME)-config libpng-config
@set -x;\
cd $(DESTDIR)$(libdir);\
- for ext in a la so so.@PNGLIB_MAJOR@@PNGLIB_MINOR@.@PNGLIB_RELEASE@ sl
dylib dll.a; do\
+ for ext in a la so so.15.12 sl dylib dll.a; do\
rm -f libpng.$$ext;\
if test -f $(PNGLIB_BASENAME).$$ext; then\
$(LN_S) $(PNGLIB_BASENAME).$$ext libpng.$$ext;\
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Precog is a next-generation analytics platform capable of advanced
analytics on semi-structured data. The platform includes APIs for building
apps and a phenomenal toolset for data science. Developers can use
our toolset for easy data analysis & visualization. Get a free account!
http://www2.precog.com/precogplatform/slashdotnewsletter
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
