[silo-llnl] 58/96: New upstream 4.9.1
Alastair McKinstry
mckinstry at moszumanska.debian.org
Tue Jul 21 13:09:33 UTC 2015
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch debian/master
in repository silo-llnl.
commit 5d16a0040be41d722b3672592d7739bdef12845c
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Tue Mar 4 14:08:46 2014 +0000
New upstream 4.9.1
---
FAQ | 2 +-
Makefile.am | 12 +-
Makefile.in | 280 +-
SiloWindows/MSVC2010/BaseIncludes.props | 12 +
SiloWindows/MSVC2010/DepLibs.props | 75 +
SiloWindows/MSVC2010/HDF5_Defines.props | 19 +
SiloWindows/MSVC2010/ModernDTPR.props | 12 +
SiloWindows/MSVC2010/NO_SEC_DEP.props | 11 +
SiloWindows/MSVC2010/QT_Defines.props | 17 +
SiloWindows/MSVC2010/Silo.sln | 65 +
SiloWindows/MSVC2010/Silo.vcxproj | 211 +
SiloWindows/MSVC2010/Silo.vcxproj.filters | 208 +
SiloWindows/MSVC2010/browser.vcxproj | 200 +
SiloWindows/MSVC2010/browser.vcxproj.filters | 77 +
SiloWindows/MSVC2010/pdb_detect/pdb_detect.vcxproj | 131 +
.../MSVC2010/pdb_detect/pdb_detect.vcxproj.filters | 14 +
SiloWindows/MSVC2010/silex.vcxproj | 212 +
SiloWindows/MSVC2010/silex.vcxproj.filters | 92 +
SiloWindows/MSVC8/Silo.vcproj | 876 -
SiloWindows/MSVC8/SiloWindows.sln | 104 -
SiloWindows/MSVC8/Tests/TestReadMask.vcproj | 212 -
SiloWindows/MSVC8/Tests/Tests.sln | 498 -
SiloWindows/MSVC8/Tests/alltypes.vcproj | 213 -
SiloWindows/MSVC8/Tests/array.vcproj | 212 -
SiloWindows/MSVC8/Tests/array_f.vfproj | 31 -
SiloWindows/MSVC8/Tests/compression.vcproj | 212 -
SiloWindows/MSVC8/Tests/csg.vcproj | 212 -
SiloWindows/MSVC8/Tests/curve_f.vfproj | 31 -
SiloWindows/MSVC8/Tests/dirtest.vcproj | 216 -
SiloWindows/MSVC8/Tests/extface.vcproj | 212 -
SiloWindows/MSVC8/Tests/grab.vcproj | 212 -
SiloWindows/MSVC8/Tests/group_test.vcproj | 212 -
SiloWindows/MSVC8/Tests/largefile.vcproj | 212 -
SiloWindows/MSVC8/Tests/listtypes.vcproj | 212 -
SiloWindows/MSVC8/Tests/mat3d_3across.vcproj | 212 -
SiloWindows/MSVC8/Tests/mat_f.vfproj | 31 -
SiloWindows/MSVC8/Tests/merge_block.vcproj | 212 -
SiloWindows/MSVC8/Tests/mmadjacency.vcproj | 212 -
SiloWindows/MSVC8/Tests/multi_file.vcproj | 212 -
SiloWindows/MSVC8/Tests/multi_test.vcproj | 212 -
SiloWindows/MSVC8/Tests/multispec.vcproj | 212 -
SiloWindows/MSVC8/Tests/namescheme.vcproj | 212 -
SiloWindows/MSVC8/Tests/obj.vcproj | 212 -
SiloWindows/MSVC8/Tests/onehex.vcproj | 212 -
SiloWindows/MSVC8/Tests/oneprism.vcproj | 212 -
SiloWindows/MSVC8/Tests/onepyramid.vcproj | 212 -
SiloWindows/MSVC8/Tests/onetet.vcproj | 212 -
SiloWindows/MSVC8/Tests/partial_io.vcproj | 212 -
SiloWindows/MSVC8/Tests/point.vcproj | 212 -
SiloWindows/MSVC8/Tests/point_f.vfproj | 31 -
SiloWindows/MSVC8/Tests/polyzl.vcproj | 212 -
SiloWindows/MSVC8/Tests/quad.vcproj | 216 -
SiloWindows/MSVC8/Tests/rocket.vcproj | 230 -
SiloWindows/MSVC8/Tests/sami.vcproj | 212 -
SiloWindows/MSVC8/Tests/simple.vcproj | 212 -
SiloWindows/MSVC8/Tests/spec.vcproj | 212 -
SiloWindows/MSVC8/Tests/specmix.vcproj | 212 -
SiloWindows/MSVC8/Tests/subhex.vcproj | 212 -
SiloWindows/MSVC8/Tests/testall.vcproj | 212 -
SiloWindows/MSVC8/Tests/testall_f.vfproj | 31 -
SiloWindows/MSVC8/Tests/testpdb.vcproj | 212 -
SiloWindows/MSVC8/Tests/twohex.vcproj | 212 -
SiloWindows/MSVC8/Tests/ucd.vcproj | 212 -
SiloWindows/MSVC8/Tests/ucd1d.vcproj | 212 -
SiloWindows/MSVC8/Tests/ucd_f.vfproj | 31 -
SiloWindows/MSVC8/Tests/ucdsamp3.vcproj | 212 -
SiloWindows/MSVC8/Tests/version.vcproj | 212 -
SiloWindows/MSVC8/Tests/wave.vcproj | 212 -
SiloWindows/MSVC8/pdb_detect/pdb_detect.vcproj | 114 -
SiloWindows/MSVC8/silex.vcproj | 839 -
SiloWindows/{MSVC8 => MSVC9}/BaseIncludes.vsprops | 0
SiloWindows/MSVC9/DepLibs.vsprops | 59 +
SiloWindows/{MSVC8 => MSVC9}/HDF5_Defines.vsprops | 2 +-
SiloWindows/{MSVC8 => MSVC9}/ModernDTPR.vsprops | 0
SiloWindows/{MSVC8 => MSVC9}/NO_SEC_DEP.vsprops | 0
SiloWindows/MSVC9/QT_Defines.vsprops | 16 +
SiloWindows/MSVC9/Silo.vcproj | 570 +
SiloWindows/MSVC9/SiloWindows.sln | 64 +
SiloWindows/MSVC9/Tests/CopyTestDependencies.bat | 34 +
SiloWindows/MSVC9/Tests/Preparation.vcproj | 121 +
.../{MSVC8 => MSVC9}/Tests/TestIncludes.vsprops | 0
SiloWindows/MSVC9/Tests/TestReadMask.vcproj | 399 +
SiloWindows/MSVC9/Tests/Tests.sln | 539 +
SiloWindows/MSVC9/Tests/alltypes.vcproj | 400 +
SiloWindows/MSVC9/Tests/arbpoly.vcproj | 399 +
SiloWindows/MSVC9/Tests/arbpoly3d.vcproj | 399 +
SiloWindows/MSVC9/Tests/array.vcproj | 399 +
SiloWindows/MSVC9/Tests/array_f.vfproj | 52 +
SiloWindows/MSVC9/Tests/compression.vcproj | 399 +
SiloWindows/MSVC9/Tests/csg.vcproj | 399 +
SiloWindows/MSVC9/Tests/curve_f.vfproj | 52 +
SiloWindows/MSVC9/Tests/dirtest.vcproj | 403 +
SiloWindows/MSVC9/Tests/empty.vcproj | 399 +
SiloWindows/MSVC9/Tests/extface.vcproj | 399 +
SiloWindows/MSVC9/Tests/grab.vcproj | 399 +
SiloWindows/MSVC9/Tests/group_test.vcproj | 399 +
SiloWindows/MSVC9/Tests/largefile.vcproj | 399 +
SiloWindows/MSVC9/Tests/listtypes.vcproj | 399 +
SiloWindows/MSVC9/Tests/mat3d_3across.vcproj | 399 +
SiloWindows/MSVC9/Tests/mat_f.vfproj | 52 +
SiloWindows/MSVC9/Tests/merge_block.vcproj | 399 +
SiloWindows/MSVC9/Tests/mmadjacency.vcproj | 399 +
SiloWindows/MSVC9/Tests/multi_file.vcproj | 399 +
SiloWindows/MSVC9/Tests/multi_test.vcproj | 399 +
SiloWindows/MSVC9/Tests/multispec.vcproj | 399 +
SiloWindows/MSVC9/Tests/namescheme.vcproj | 399 +
SiloWindows/MSVC9/Tests/obj.vcproj | 399 +
SiloWindows/MSVC9/Tests/onehex.vcproj | 399 +
SiloWindows/MSVC9/Tests/oneprism.vcproj | 399 +
SiloWindows/MSVC9/Tests/onepyramid.vcproj | 399 +
SiloWindows/MSVC9/Tests/onetet.vcproj | 399 +
SiloWindows/MSVC9/Tests/partial_io.vcproj | 399 +
SiloWindows/MSVC9/Tests/point.vcproj | 399 +
SiloWindows/MSVC9/Tests/point_f.vfproj | 52 +
SiloWindows/MSVC9/Tests/polyzl.vcproj | 399 +
SiloWindows/MSVC9/Tests/quad.vcproj | 403 +
SiloWindows/MSVC9/Tests/quad_f.vfproj | 52 +
SiloWindows/MSVC9/Tests/sami.vcproj | 399 +
SiloWindows/MSVC9/Tests/simple.vcproj | 399 +
SiloWindows/MSVC9/Tests/spec.vcproj | 399 +
SiloWindows/MSVC9/Tests/specmix.vcproj | 399 +
SiloWindows/MSVC9/Tests/subhex.vcproj | 399 +
SiloWindows/MSVC9/Tests/testall.vcproj | 399 +
SiloWindows/MSVC9/Tests/testall_f.vfproj | 52 +
SiloWindows/MSVC9/Tests/testpdb.vcproj | 399 +
SiloWindows/MSVC9/Tests/twohex.vcproj | 399 +
SiloWindows/MSVC9/Tests/ucd.vcproj | 399 +
SiloWindows/MSVC9/Tests/ucd1d.vcproj | 399 +
SiloWindows/MSVC9/Tests/ucd_f.vfproj | 52 +
SiloWindows/MSVC9/Tests/ucdsamp3.vcproj | 399 +
SiloWindows/MSVC9/Tests/version.vcproj | 399 +
SiloWindows/MSVC9/Tests/wave.vcproj | 399 +
SiloWindows/{MSVC8 => MSVC9}/bin/RunTests.bat | 2 +-
SiloWindows/MSVC9/browser.vcproj | 481 +
SiloWindows/MSVC9/pdb_detect/pdb_detect.vcproj | 200 +
SiloWindows/MSVC9/silex.vcproj | 480 +
SiloWindows/Makefile | 485 +-
SiloWindows/Makefile.am | 289 +-
SiloWindows/Makefile.in | 377 +-
SiloWindows/README | 105 +-
SiloWindows/copysilo.bat | 84 +-
SiloWindows/include/config.h | 46 +-
SiloWindows/runsilexmoc.bat | 2 +-
SiloWindows/silodiff.bat | 25 +
VERSION | 2 +-
aclocal.m4 | 7733 +---
config-site/Makefile.in | 89 +-
config-site/atlas0.conf | 1 -
config-site/atlas1088.conf | 1 -
config-site/atlas1120.conf | 1 -
config-site/atlas32.conf | 1 -
config-site/atlas512.conf | 1 -
config-site/atlas544.conf | 1 -
config-site/atlas576.conf | 1 -
config-site/atlas608.conf | 1 -
config-site/hoth.conf | 4 +-
config-site/kickit.conf | 14 -
config-site/minos.conf | 1 -
config-site/minos0.conf | 1 -
config-site/minos32.conf | 1 -
config-site/minos512.conf | 1 -
config-site/minos544.conf | 1 -
config-site/minos576.conf | 1 -
config-site/minos608.conf | 1 -
config-site/prism1.conf | 1 -
config-site/prism2.conf | 1 -
config-site/purple.conf | 1 -
config-site/purple1441.conf | 1 -
config-site/purple1442.conf | 1 -
config-site/purple1443.conf | 1 -
config-site/purple1444.conf | 1 -
config-site/rhea.conf | 1 -
config-site/rhea0.conf | 1 -
config-site/rhea32.conf | 1 -
config-site/rhea512.conf | 1 -
config-site/rhea544.conf | 1 -
config-site/sasn100.conf | 9 -
config-site/sidious.conf | 6 +-
config-site/sunburn.conf | 1 -
config-site/sunset.conf | 26 -
config-site/sunspot.conf | 34 -
config-site/tread.conf | 37 -
config-site/yana.conf | 1 -
config-site/yana1.conf | 1 -
config-site/yana2.conf | 1 -
config-site/yana3.conf | 1 -
config-site/yana4.conf | 1 -
config/Makefile.am | 3 +-
config/Makefile.in | 92 +-
config/ax_check_compiler_flags.m4 | 79 +
config/ax_have_qt.m4 | 515 +
config/bootstrap | 4 +-
config/config.guess | 291 +-
config/config.h.in | 10 +
config/config.sub | 149 +-
config/depcomp | 116 +-
config/install-sh | 231 +-
config/libtool.m4 | 7360 ++++
config/ltmain.sh | 13216 ++++---
config/ltoptions.m4 | 368 +
config/ltsugar.m4 | 123 +
config/ltversion.m4 | 23 +
config/lt~obsolete.m4 | 92 +
config/missing | 49 +-
config/mkinc | 37 +-
config/mklite | 85 +
config/vl_lib_readline.m4 | 106 +
configure | 37766 +++++++++++--------
configure.ac | 142 +-
docs/Makefile.in | 89 +-
src/Makefile.in | 244 +-
src/debug/Makefile.in | 134 +-
src/filters/Makefile.am | 2 +
src/filters/Makefile.in | 136 +-
src/filters/f_ale3d.c | 43 +-
src/filters/f_ale3d.h | 59 +
src/filters/f_sample.c | 43 +-
src/filters/f_sample.h | 59 +
src/hdf5_drv/H5FDsilo.c | 25 +-
src/hdf5_drv/Makefile.am | 6 +-
src/hdf5_drv/Makefile.in | 144 +-
src/hdf5_drv/silo_hdf5.c | 727 +-
src/hdf5_drv/silo_hdf5_private.h | 84 +-
src/netcdf/Makefile.in | 134 +-
src/netcdf/silo_netcdf.c | 6 +-
src/pdb/Makefile.am | 21 +-
src/pdb/Makefile.in | 219 +-
src/pdb/detect.c | 1 +
src/pdb/pdb.c | 89 +-
src/pdb/pdb.h | 187 +-
src/pdb/pdbdir.c | 19 +-
src/pdb/pdbmm.c | 17 +-
src/pdb/pdbx.c | 6 +-
src/pdb/pdconv.c | 2 +-
src/pdb/pdlow.c | 43 +-
src/pdb/pdmemb.c | 8 +-
src/pdb/pdpath.c | 14 +-
src/pdb/pdrdwr.c | 28 +-
src/pdb_drv/Makefile.in | 134 +-
src/pdb_drv/silo_pdb.c | 878 +-
src/pdb_drv/silo_pdb_private.h | 82 +-
src/pdbp_drv/Makefile.in | 134 +-
src/score/Makefile.am | 14 +-
src/score/Makefile.in | 206 +-
src/score/scctla.c | 61 +-
src/score/schash.c | 88 +-
src/score/score.h | 163 +-
src/silo/Makefile.am | 2 +
src/silo/Makefile.in | 198 +-
src/silo/alloc.c | 287 +-
src/silo/pmpio.h | 4 +-
src/silo/silo.c | 1076 +-
src/silo/silo.h.in | 453 +-
src/silo/silo.inc | 679 +-
src/silo/silo_f.c | 76 +-
src/silo/silo_f.h | 1 +
src/silo/silo_ns.c | 122 +-
src/silo/silo_private.h | 20 +-
src/silo/silo_win32_compatibility.h | 33 +-
src/taurus/Makefile.in | 134 +-
src/unknown/Makefile.in | 134 +-
svn_bin/Makefile.in | 89 +-
tests/Makefile.am | 85 +-
tests/Makefile.in | 658 +-
tests/TestReadMask.c | 1 +
tests/add_amr_mrgtree.c | 39 +-
tests/alltypes.c | 2 +
tests/arbpoly.c | 703 +
tests/arrayf77.f | 16 +-
tests/checksums | 18 +-
tests/compression.c | 6 +-
tests/csg.c | 4 +-
tests/{arrayf77.f => csgmesh.f} | 177 +-
tests/curvef77.f | 15 +-
tests/dir.c | 2 +-
tests/empty.c | 295 +
tests/extface.c | 18 +-
tests/ioperf.c | 25 +-
tests/ioperf_hdf5.c | 3 +-
tests/ioperf_pdb.c | 2 +-
tests/listtypes.c | 52 +-
tests/{ioperf_pdb.c => majorder.c} | 117 +-
tests/mat3d_3across.c | 4 +
tests/matf77.f | 17 +-
tests/{ioperf_pdb.c => mk_nasf_h5.c} | 73 +-
tests/mmadjacency.c | 2 +
tests/multi_file.c | 131 +-
tests/multi_test.c | 981 +-
tests/namescheme.c | 204 +-
tests/onehex.c | 30 +-
tests/oneprism.c | 2 +
tests/onepyramid.c | 2 +
tests/onetet.c | 2 +
tests/package.m4 | 4 +-
tests/pdbtst.c | 4203 +++
tests/point.c | 2 +
tests/pointf77.f | 16 +-
tests/polyzl.c | 2 +
tests/quadf77.f | 22 +-
tests/rocket.cpp | 1750 -
tests/rocket.cxx | 848 +
tests/rocket.h | 232 +
tests/rocket_silo.cxx | 494 +
tests/simple.c | 5 +-
tests/specmix.c | 19 +-
tests/testall.c | 10 +-
tests/testallf77.f | 26 +-
tests/{polyzl.c => testfs.c} | 105 +-
tests/testlib.c | 2 +
tests/{testxvers => testonehex} | 53 +-
tests/testpdb.c | 38 +-
tests/testsuite | 7880 ++--
tests/testsuite.at | 45 +-
tests/testxvers | 22 +-
tests/twohex.c | 2 +
tests/ucd.c | 8 +-
tests/ucdf77.f | 17 +-
tests/zeros.dat | Bin 0 -> 16 bytes
tools/Makefile.in | 194 +-
tools/browser/Makefile.am | 4 +-
tools/browser/Makefile.in | 392 +-
tools/browser/browser.c | 216 +-
tools/browser/browser.h | 10 +
tools/browser/browser.html | 332 +-
tools/browser/browser.info | 175 +-
tools/browser/file.c | 10 +-
tools/browser/func.c | 75 +-
tools/browser/lex.c | 3 +
tools/browser/output.c | 83 +-
tools/browser/parse.c | 13 +-
tools/browser/prim.c | 9 +-
tools/browser/stc.c | 26 +-
tools/browser/switch.c | 4 +-
tools/browser/sym.c | 5 +
tools/python/Makefile.am | 2 +-
tools/python/Makefile.in | 176 +-
tools/python/pydbfile.cpp | 276 +-
tools/python/pydbfile.h | 2 +-
tools/python/pydbtoc.cpp | 246 +-
tools/python/pysilo.cpp | 99 +-
tools/python/pysilo.h | 4 +
tools/silex/Makefile.in | 195 +-
tools/silex/SiloArrayView.cpp | 10 +-
tools/silex/SiloFile.cpp | 8 +-
tools/silock/Makefile.in | 196 +-
345 files changed, 79786 insertions(+), 53468 deletions(-)
diff --git a/FAQ b/FAQ
index d8342d5..9c96154 100644
--- a/FAQ
+++ b/FAQ
@@ -47,7 +47,7 @@ Silo Development FAQ
as it should recognise that Makefile.am, etc. has been modified and run
the appropriate commands to regenerate the Makefile.
1) you must put the current autotools binaries in your PATH:
- PATH=/usr/gapps/silo/autotools/i686-pc-linux-gnu:$PATH
+ PATH=/groups/visit/miller/silo/autotools/linux-x86_64/bin:$PATH
2) check-out all of the autotools generated files:
config/bootstrap -o
3) Enable maintainer tools:
diff --git a/Makefile.am b/Makefile.am
index a7c5630..4a40d8e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -64,6 +64,9 @@
#
# Mark C. Miller, Mon Aug 9 16:58:46 PDT 2010
# Added creation of smalltest dist for bsd distributions.
+#
+# Kathleen Bonnell, Thu Mar 3 10:34:15 PST 2011
+# Handle MSVC9 windows project files.
ACLOCAL_AMFLAGS = -I config
@@ -99,13 +102,16 @@ dist-gzip-bsd: dist-gzip
cp -R $(PACKAGE)-$(VERSION) $(PACKAGE)-$(VERSION)-bsd
rm -rf $(PACKAGE)-$(VERSION)-bsd/src/hzip
rm -rf $(PACKAGE)-$(VERSION)-bsd/src/fpzip
- rm -rf $(PACKAGE)-$(VERSION)-bsd/SiloWindows/MSVC8
- mv $(PACKAGE)-$(VERSION)-bsd/SiloWindows/MSVC8-BSD $(PACKAGE)-$(VERSION)-bsd/SiloWindows/MSVC8
+ rm -rf $(PACKAGE)-$(VERSION)-bsd/SiloWindows/MSVC9
+ rm -rf $(PACKAGE)-$(VERSION)-bsd/SiloWindows/MSVC2010
+ mv $(PACKAGE)-$(VERSION)-bsd/SiloWindows/MSVC9-BSD $(PACKAGE)-$(VERSION)-bsd/SiloWindows/MSVC9
+ mv $(PACKAGE)-$(VERSION)-bsd/SiloWindows/MSVC2010-BSD $(PACKAGE)-$(VERSION)-bsd/SiloWindows/MSVC2010
tar cf - $(PACKAGE)-$(VERSION)-bsd | gzip --best > $(PACKAGE)-$(VERSION)-bsd.tar.gz
rm -rf $(PACKAGE)-$(VERSION)-bsd/tests/{amr3d.silo,pion0244.silo,amr2d.silo,xvers_data.tar.bz2}
tar cf - $(PACKAGE)-$(VERSION)-bsd | gzip --best > $(PACKAGE)-$(VERSION)-bsd-smalltest.tar.gz
rm -rf $(PACKAGE)-$(VERSION)-bsd
- rm -rf $(PACKAGE)-$(VERSION)/SiloWindows/MSVC8-BSD
+ rm -rf $(PACKAGE)-$(VERSION)/SiloWindows/MSVC9-BSD
+ rm -rf $(PACKAGE)-$(VERSION)/SiloWindows/MSVC2010-BSD
tar cf - $(PACKAGE)-$(VERSION) | gzip --best > $(PACKAGE)-$(VERSION).tar.gz
rm -rf $(PACKAGE)-$(VERSION)
diff --git a/Makefile.in b/Makefile.in
index 826de1e..33a690b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -80,11 +81,15 @@
#
# Mark C. Miller, Mon Aug 9 16:58:46 PDT 2010
# Added creation of smalltest dist for bsd distributions.
+#
+# Kathleen Bonnell, Thu Mar 3 10:34:15 PST 2011
+# Handle MSVC9 windows project files.
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -104,7 +109,15 @@ DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(top_srcdir)/config/config.h.in \
$(top_srcdir)/configure INSTALL
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/config/ax_check_compiler_flags.m4 \
+ $(top_srcdir)/config/ax_have_qt.m4 \
+ $(top_srcdir)/config/libtool.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
+ $(top_srcdir)/config/vl_lib_readline.m4 \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
@@ -112,6 +125,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
@@ -124,15 +138,43 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
HEADERS = $(nodist_noinst_HEADERS)
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+ distdir dist dist-all distcheck
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
am__remove_distdir = \
- { test ! -d $(distdir) \
- || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
- && rm -fr $(distdir); }; }
+ { test ! -d "$(distdir)" \
+ || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
+ && rm -fr "$(distdir)"; }; }
+am__relativize = \
+ dir0=`pwd`; \
+ sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+ sed_rest='s,^[^/]*/*,,'; \
+ sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+ sed_butlast='s,/*[^/]*$$,,'; \
+ while test -n "$$dir1"; do \
+ first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+ if test "$$first" != "."; then \
+ if test "$$first" = ".."; then \
+ dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+ dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+ else \
+ first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+ if test "$$first2" = "$$first"; then \
+ dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+ else \
+ dir2="../$$dir2"; \
+ fi; \
+ dir0="$$dir0"/"$$first"; \
+ fi; \
+ fi; \
+ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+ done; \
+ reldir="$$dir2"
DIST_ARCHIVES = $(distdir).tar.gz
GZIP_ENV = --best
distuninstallcheck_listfiles = find . -type f -print
@@ -163,7 +205,8 @@ CXX_FULLPATH = @CXX_FULLPATH@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -175,6 +218,7 @@ FCFLAGS = @FCFLAGS@
FCLIBS = @FCLIBS@
FC_FULLPATH = @FC_FULLPATH@
FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FORTRAN = @FORTRAN@
FPZIP = @FPZIP@
GREP = @GREP@
@@ -185,17 +229,25 @@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
LDFLAGS = @LDFLAGS@
+LIBM = @LIBM@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
NETCDF = @NETCDF@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -205,7 +257,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PDBP_DRV = @PDBP_DRV@
PDB_DRV = @PDB_DRV@
-PRTDIAG = @PRTDIAG@
PYTHON = @PYTHON@
PYTHONMODULE = @PYTHONMODULE@
PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@
@@ -213,17 +264,13 @@ PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
PYTHON_PLATFORM = @PYTHON_PLATFORM@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
-QT_BIN = @QT_BIN@
-QT_CORE = @QT_CORE@
-QT_CORE_LIB = @QT_CORE_LIB@
QT_CXXFLAGS = @QT_CXXFLAGS@
-QT_GUI = @QT_GUI@
-QT_GUI_LIB = @QT_GUI_LIB@
-QT_INCLUDE = @QT_INCLUDE@
-QT_LDFLAGS = @QT_LDFLAGS@
-QT_LIB = @QT_LIB@
+QT_DIR = @QT_DIR@
QT_LIBS = @QT_LIBS@
+QT_LRELEASE = @QT_LRELEASE@
+QT_LUPDATE = @QT_LUPDATE@
QT_MOC = @QT_MOC@
+QT_UIC = @QT_UIC@
RANLIB = @RANLIB@
READLINE_LIBS = @READLINE_LIBS@
SED = @SED@
@@ -241,6 +288,11 @@ SILO_VERS_TAG = @SILO_VERS_TAG@
STRIP = @STRIP@
TAURUS = @TAURUS@
VERSION = @VERSION@
+XMKMF = @XMKMF@
+X_CFLAGS = @X_CFLAGS@
+X_EXTRA_LIBS = @X_EXTRA_LIBS@
+X_LIBS = @X_LIBS@
+X_PRE_LIBS = @X_PRE_LIBS@
ZLIB = @ZLIB@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
@@ -248,6 +300,7 @@ abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_F77 = @ac_ct_F77@
ac_ct_FC = @ac_ct_FC@
am__include = @am__include@
@@ -280,6 +333,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -296,6 +350,7 @@ sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
ACLOCAL_AMFLAGS = -I config
@@ -319,15 +374,15 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
- echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \
- cd $(srcdir) && $(AUTOMAKE) --foreign \
+ echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \
+ $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \
&& exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
- cd $(top_srcdir) && \
- $(AUTOMAKE) --foreign Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --foreign Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -343,9 +398,10 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENC
$(SHELL) ./config.status --recheck
$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(srcdir) && $(AUTOCONF)
+ $(am__cd) $(srcdir) && $(AUTOCONF)
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+ $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+$(am__aclocal_m4_deps):
config.h: stamp-h1
@if test ! -f $@; then \
@@ -357,7 +413,7 @@ stamp-h1: $(top_srcdir)/config/config.h.in $(top_builddir)/config.status
@rm -f stamp-h1
cd $(top_builddir) && $(SHELL) ./config.status config.h
$(top_srcdir)/config/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_srcdir) && $(AUTOHEADER)
+ ($(am__cd) $(top_srcdir) && $(AUTOHEADER))
rm -f stamp-h1
touch $@
@@ -371,7 +427,7 @@ clean-libtool:
-rm -rf .libs _libs
distclean-libtool:
- -rm -f libtool
+ -rm -f libtool config.lt
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
@@ -380,7 +436,7 @@ distclean-libtool:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -397,7 +453,7 @@ $(RECURSIVE_TARGETS):
else \
local_target="$$target"; \
fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
|| eval $$failcom; \
done; \
if test "$$dot_seen" = "no"; then \
@@ -405,7 +461,7 @@ $(RECURSIVE_TARGETS):
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -431,16 +487,16 @@ $(RECURSIVE_CLEAN_TARGETS):
else \
local_target="$$target"; \
fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
|| eval $$failcom; \
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
done
ctags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -448,14 +504,14 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
+ set x; \
here=`pwd`; \
if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
include_option=--etags-include; \
@@ -467,46 +523,50 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
list='$(SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test ! -f $$subdir/TAGS || \
- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
fi
ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
+ $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && cd $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) $$here
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
$(am__remove_distdir)
- test -d $(distdir) || mkdir $(distdir)
+ test -d "$(distdir)" || mkdir "$(distdir)"
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
@@ -522,38 +582,55 @@ distdir: $(DISTFILES)
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
if test -d $$d/$$file; then \
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test -d "$(distdir)/$$subdir" \
|| $(MKDIR_P) "$(distdir)/$$subdir" \
|| exit 1; \
- distdir=`$(am__cd) $(distdir) && pwd`; \
- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- (cd $$subdir && \
+ fi; \
+ done
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+ $(am__relativize); \
+ new_distdir=$$reldir; \
+ dir1=$$subdir; dir2="$(top_distdir)"; \
+ $(am__relativize); \
+ new_top_distdir=$$reldir; \
+ echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+ echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+ ($(am__cd) $$subdir && \
$(MAKE) $(AM_MAKEFLAGS) \
- top_distdir="$$top_distdir" \
- distdir="$$distdir/$$subdir" \
+ top_distdir="$$new_top_distdir" \
+ distdir="$$new_distdir" \
am__remove_distdir=: \
am__skip_length_check=: \
+ am__skip_mode_fix=: \
distdir) \
|| exit 1; \
fi; \
done
- -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
+ -test -n "$(am__skip_mode_fix)" \
+ || find "$(distdir)" -type d ! -perm -755 \
+ -exec chmod u+rwx,go+rx {} \; -o \
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
- || chmod -R a+r $(distdir)
+ || chmod -R a+r "$(distdir)"
dist-gzip: distdir
tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
$(am__remove_distdir)
@@ -562,6 +639,14 @@ dist-bzip2: distdir
tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
$(am__remove_distdir)
+dist-lzma: distdir
+ tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
+ $(am__remove_distdir)
+
+dist-xz: distdir
+ tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
+ $(am__remove_distdir)
+
dist-tarZ: distdir
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__remove_distdir)
@@ -585,13 +670,17 @@ dist dist-all: distdir
distcheck: dist
case '$(DIST_ARCHIVES)' in \
*.tar.gz*) \
- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
+ GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
- bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
+ *.tar.lzma*) \
+ lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
+ *.tar.xz*) \
+ xz -dc $(distdir).tar.xz | $(am__untar) ;;\
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
- GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
+ GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
*.zip*) \
unzip $(distdir).zip ;;\
esac
@@ -599,9 +688,11 @@ distcheck: dist
mkdir $(distdir)/_build
mkdir $(distdir)/_inst
chmod a-w $(distdir)
+ test -d $(distdir)/_build || exit 0; \
dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
&& dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
- && cd $(distdir)/_build \
+ && am__cwd=`pwd` \
+ && $(am__cd) $(distdir)/_build \
&& ../configure --srcdir=.. --prefix="$$dc_install_base" \
$(DISTCHECK_CONFIGURE_FLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) \
@@ -623,13 +714,15 @@ distcheck: dist
&& rm -rf "$$dc_destdir" \
&& $(MAKE) $(AM_MAKEFLAGS) dist \
&& rm -rf $(DIST_ARCHIVES) \
- && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
+ && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
+ && cd "$$am__cwd" \
+ || exit 1
$(am__remove_distdir)
@(echo "$(distdir) archives ready for distribution: "; \
list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
distuninstallcheck:
- @cd $(distuninstallcheck_dir) \
+ @$(am__cd) '$(distuninstallcheck_dir)' \
&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
|| { echo "ERROR: files left after uninstall:" ; \
if test -n "$(DESTDIR)"; then \
@@ -671,6 +764,7 @@ clean-generic:
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -692,6 +786,8 @@ dvi-am:
html: html-recursive
+html-am:
+
info: info-recursive
info-am:
@@ -700,18 +796,28 @@ install-data-am:
install-dvi: install-dvi-recursive
+install-dvi-am:
+
install-exec-am:
install-html: install-html-recursive
+install-html-am:
+
install-info: install-info-recursive
+install-info-am:
+
install-man:
install-pdf: install-pdf-recursive
+install-pdf-am:
+
install-ps: install-ps-recursive
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-recursive
@@ -734,24 +840,24 @@ ps-am:
uninstall-am:
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
- install-strip
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \
+ ctags-recursive install-am install-strip tags-recursive
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
all all-am am--refresh check check-am clean clean-generic \
clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
- dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \
- distclean-generic distclean-hdr distclean-libtool \
- distclean-tags distcleancheck distdir distuninstallcheck dvi \
- dvi-am html html-am info info-am install install-am \
- install-data install-data-am install-dvi install-dvi-am \
- install-exec install-exec-am install-html install-html-am \
- install-info install-info-am install-man install-pdf \
- install-pdf-am install-ps install-ps-am install-strip \
- installcheck installcheck-am installdirs installdirs-am \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags tags-recursive uninstall uninstall-am
+ dist-gzip dist-lzma dist-shar dist-tarZ dist-xz dist-zip \
+ distcheck distclean distclean-generic distclean-hdr \
+ distclean-libtool distclean-tags distcleancheck distdir \
+ distuninstallcheck dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ installdirs-am maintainer-clean maintainer-clean-generic \
+ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+ ps ps-am tags tags-recursive uninstall uninstall-am
help: config/make.help
@@ -773,17 +879,21 @@ dist-gzip-bsd: dist-gzip
cp -R $(PACKAGE)-$(VERSION) $(PACKAGE)-$(VERSION)-bsd
rm -rf $(PACKAGE)-$(VERSION)-bsd/src/hzip
rm -rf $(PACKAGE)-$(VERSION)-bsd/src/fpzip
- rm -rf $(PACKAGE)-$(VERSION)-bsd/SiloWindows/MSVC8
- mv $(PACKAGE)-$(VERSION)-bsd/SiloWindows/MSVC8-BSD $(PACKAGE)-$(VERSION)-bsd/SiloWindows/MSVC8
+ rm -rf $(PACKAGE)-$(VERSION)-bsd/SiloWindows/MSVC9
+ rm -rf $(PACKAGE)-$(VERSION)-bsd/SiloWindows/MSVC2010
+ mv $(PACKAGE)-$(VERSION)-bsd/SiloWindows/MSVC9-BSD $(PACKAGE)-$(VERSION)-bsd/SiloWindows/MSVC9
+ mv $(PACKAGE)-$(VERSION)-bsd/SiloWindows/MSVC2010-BSD $(PACKAGE)-$(VERSION)-bsd/SiloWindows/MSVC2010
tar cf - $(PACKAGE)-$(VERSION)-bsd | gzip --best > $(PACKAGE)-$(VERSION)-bsd.tar.gz
rm -rf $(PACKAGE)-$(VERSION)-bsd/tests/{amr3d.silo,pion0244.silo,amr2d.silo,xvers_data.tar.bz2}
tar cf - $(PACKAGE)-$(VERSION)-bsd | gzip --best > $(PACKAGE)-$(VERSION)-bsd-smalltest.tar.gz
rm -rf $(PACKAGE)-$(VERSION)-bsd
- rm -rf $(PACKAGE)-$(VERSION)/SiloWindows/MSVC8-BSD
+ rm -rf $(PACKAGE)-$(VERSION)/SiloWindows/MSVC9-BSD
+ rm -rf $(PACKAGE)-$(VERSION)/SiloWindows/MSVC2010-BSD
tar cf - $(PACKAGE)-$(VERSION) | gzip --best > $(PACKAGE)-$(VERSION).tar.gz
rm -rf $(PACKAGE)-$(VERSION)
.PHONY: help
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/SiloWindows/MSVC2010/BaseIncludes.props b/SiloWindows/MSVC2010/BaseIncludes.props
new file mode 100644
index 0000000..3e7d155
--- /dev/null
+++ b/SiloWindows/MSVC2010/BaseIncludes.props
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
+ <_PropertySheetDisplayName>BaseIncludes</_PropertySheetDisplayName>
+ </PropertyGroup>
+ <ItemDefinitionGroup>
+ <ClCompile>
+ <AdditionalIncludeDirectories>$(SolutionDir)..\include;$(SolutionDir)..\..\src\debug;$(SolutionDir)..\..\src\hdf5_drv;$(SolutionDir)..\..\src\pdb;$(SolutionDir)..\..\src\pdb_drv;$(SolutionDir)..\..\src\score;$(SolutionDir)..\..\src\silo;$(SolutionDir)..\..\src\taurus;$(SolutionDir)..\..\src\unknown;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ </ClCompile>
+ </ItemDefinitionGroup>
+</Project>
diff --git a/SiloWindows/MSVC2010/DepLibs.props b/SiloWindows/MSVC2010/DepLibs.props
new file mode 100644
index 0000000..7958393
--- /dev/null
+++ b/SiloWindows/MSVC2010/DepLibs.props
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ImportGroup Label="PropertySheets" />
+ <PropertyGroup Label="UserMacros">
+ <HDF5_INC_DIR>C:\a_VisIt\VisItDev\windowsbuild\ThirdParty\hdf5-1.8.7\MSVC2010\include</HDF5_INC_DIR>
+ <HDF5_INC_DIR_X64>C:\a_VisIt\VisItDev\windowsbuild\ThirdParty\hdf5-1.8.7\MSVC2010-x64\include</HDF5_INC_DIR_X64>
+ <HDF5_LIB_DIR>C:\a_VisIt\VisItDev\windowsbuild\ThirdParty\hdf5-1.8.7\MSVC2010\lib</HDF5_LIB_DIR>
+ <HDF5_LIB_DIR_X64>C:\a_VisIt\VisItDev\windowsbuild\ThirdParty\hdf5-1.8.7\MSVC2010-x64\lib</HDF5_LIB_DIR_X64>
+ <SZIP_INC_DIR>C:\a_VisIt\VisItDev\windowsbuild\ThirdParty\szip\include</SZIP_INC_DIR>
+ <SZIP_LIB_DIR>C:\a_VisIt\VisItDev\windowsbuild\ThirdParty\szip\lib\MSVC2010</SZIP_LIB_DIR>
+ <SZIP_LIB_DIR_X64>C:\a_VisIt\VisItDev\windowsbuild\ThirdParty\szip\lib\MSVC2010-x64</SZIP_LIB_DIR_X64>
+ <ZLIB_INC_DIR>C:\a_VisIt\VisItDev\windowsbuild\ThirdParty\zlib\include</ZLIB_INC_DIR>
+ <ZLIB_LIB_DIR>C:\a_VisIt\VisItDev\windowsbuild\ThirdParty\zlib\lib\MSVC2010</ZLIB_LIB_DIR>
+ <ZLIB_LIB_DIR_X64>C:\a_VisIt\VisItDev\windowsbuild\ThirdParty\zlib\lib\MSVC2010-x64</ZLIB_LIB_DIR_X64>
+ <QT_INC_DIR>C:\a_VisIt\VisItDev\windowsbuild\ThirdParty\Qt-4.8.3\include</QT_INC_DIR>
+ <QT_LIB_DIR>C:\a_VisIt\VisItDev\windowsbuild\ThirdParty\Qt-4.8.3\lib\MSVC2010</QT_LIB_DIR>
+ <QT_LIB_DIR_X64>C:\a_VisIt\VisItDev\windowsbuild\ThirdParty\Qt-4.8.3\lib\MSVC2010-x64</QT_LIB_DIR_X64>
+ </PropertyGroup>
+ <PropertyGroup />
+ <ItemDefinitionGroup />
+ <ItemGroup>
+ <BuildMacro Include="HDF5_INC_DIR">
+ <Value>$(HDF5_INC_DIR)</Value>
+ <EnvironmentVariable>true</EnvironmentVariable>
+ </BuildMacro>
+ <BuildMacro Include="HDF5_INC_DIR_X64">
+ <Value>$(HDF5_INC_DIR_X64)</Value>
+ <EnvironmentVariable>true</EnvironmentVariable>
+ </BuildMacro>
+ <BuildMacro Include="HDF5_LIB_DIR">
+ <Value>$(HDF5_LIB_DIR)</Value>
+ <EnvironmentVariable>true</EnvironmentVariable>
+ </BuildMacro>
+ <BuildMacro Include="HDF5_LIB_DIR_X64">
+ <Value>$(HDF5_LIB_DIR_X64)</Value>
+ <EnvironmentVariable>true</EnvironmentVariable>
+ </BuildMacro>
+ <BuildMacro Include="SZIP_INC_DIR">
+ <Value>$(SZIP_INC_DIR)</Value>
+ <EnvironmentVariable>true</EnvironmentVariable>
+ </BuildMacro>
+ <BuildMacro Include="SZIP_LIB_DIR">
+ <Value>$(SZIP_LIB_DIR)</Value>
+ <EnvironmentVariable>true</EnvironmentVariable>
+ </BuildMacro>
+ <BuildMacro Include="SZIP_LIB_DIR_X64">
+ <Value>$(SZIP_LIB_DIR_X64)</Value>
+ <EnvironmentVariable>true</EnvironmentVariable>
+ </BuildMacro>
+ <BuildMacro Include="ZLIB_INC_DIR">
+ <Value>$(ZLIB_INC_DIR)</Value>
+ <EnvironmentVariable>true</EnvironmentVariable>
+ </BuildMacro>
+ <BuildMacro Include="ZLIB_LIB_DIR">
+ <Value>$(ZLIB_LIB_DIR)</Value>
+ <EnvironmentVariable>true</EnvironmentVariable>
+ </BuildMacro>
+ <BuildMacro Include="ZLIB_LIB_DIR_X64">
+ <Value>$(ZLIB_LIB_DIR_X64)</Value>
+ <EnvironmentVariable>true</EnvironmentVariable>
+ </BuildMacro>
+ <BuildMacro Include="QT_INC_DIR">
+ <Value>$(QT_INC_DIR)</Value>
+ <EnvironmentVariable>true</EnvironmentVariable>
+ </BuildMacro>
+ <BuildMacro Include="QT_LIB_DIR">
+ <Value>$(QT_LIB_DIR)</Value>
+ <EnvironmentVariable>true</EnvironmentVariable>
+ </BuildMacro>
+ <BuildMacro Include="QT_LIB_DIR_X64">
+ <Value>$(QT_LIB_DIR_X64)</Value>
+ <EnvironmentVariable>true</EnvironmentVariable>
+ </BuildMacro>
+ </ItemGroup>
+</Project>
diff --git a/SiloWindows/MSVC2010/HDF5_Defines.props b/SiloWindows/MSVC2010/HDF5_Defines.props
new file mode 100644
index 0000000..a7692c7
--- /dev/null
+++ b/SiloWindows/MSVC2010/HDF5_Defines.props
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
+ <_PropertySheetDisplayName>HDF5_DEFINES</_PropertySheetDisplayName>
+ </PropertyGroup>
+ <ItemDefinitionGroup>
+ <ClCompile>
+ <PreprocessorDefinitions>HAVE_HDF5_DRIVER=1;HAVE_HDF5_H=1;HAVE_LIBHDF5=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Platform)'=='Win32'">$(HDF5_INC_DIR);$(ZLIB_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Platform)'=='x64'">$(HDF5_INC_DIR_X64);$(ZLIB_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+ <AdditionalLibraryDirectories Condition="'$(Platform)'=='Win32'">$(HDF5_LIB_DIR);$(ZLIB_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories Condition="'$(Platform)'=='x64'">$(HDF5_LIB_DIR_X64);$(ZLIB_LIB_DIR_X64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalDependencies>hdf5dll.lib;zlib1.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ </ItemDefinitionGroup>
+</Project>
diff --git a/SiloWindows/MSVC2010/ModernDTPR.props b/SiloWindows/MSVC2010/ModernDTPR.props
new file mode 100644
index 0000000..246ed86
--- /dev/null
+++ b/SiloWindows/MSVC2010/ModernDTPR.props
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
+ <_PropertySheetDisplayName>MODERN_DTPTR</_PropertySheetDisplayName>
+ </PropertyGroup>
+ <ItemDefinitionGroup>
+ <ClCompile>
+ <PreprocessorDefinitions>DB_USE_MODERN_DTPTR;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ </ItemDefinitionGroup>
+</Project>
\ No newline at end of file
diff --git a/SiloWindows/MSVC2010/NO_SEC_DEP.props b/SiloWindows/MSVC2010/NO_SEC_DEP.props
new file mode 100644
index 0000000..e3b9d2b
--- /dev/null
+++ b/SiloWindows/MSVC2010/NO_SEC_DEP.props
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
+ </PropertyGroup>
+ <ItemDefinitionGroup>
+ <ClCompile>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ </ItemDefinitionGroup>
+</Project>
\ No newline at end of file
diff --git a/SiloWindows/MSVC2010/QT_Defines.props b/SiloWindows/MSVC2010/QT_Defines.props
new file mode 100644
index 0000000..77d7090
--- /dev/null
+++ b/SiloWindows/MSVC2010/QT_Defines.props
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
+ <_PropertySheetDisplayName>QT_DEFINES</_PropertySheetDisplayName>
+ </PropertyGroup>
+ <ItemDefinitionGroup>
+ <ClCompile>
+ <AdditionalIncludeDirectories>$(QT_INC_DIR);$(QT_INC_DIR)\QtCore;$(QT_INC_DIR)\QtGui;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+ <AdditionalLibraryDirectories Condition="'$(Platform)'=='Win32'">$(QT_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories Condition="'$(Platform)'=='x64'">$(QT_LIB_DIR_X64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalDependencies>QtCore4.lib;QtGui4.lib;silohdf5.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ </ItemDefinitionGroup>
+</Project>
diff --git a/SiloWindows/MSVC2010/Silo.sln b/SiloWindows/MSVC2010/Silo.sln
new file mode 100644
index 0000000..49347c9
--- /dev/null
+++ b/SiloWindows/MSVC2010/Silo.sln
@@ -0,0 +1,65 @@
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Silo", "Silo.vcxproj", "{3F76AF02-F554-BD84-E19C-AACBB8DAF098}"
+ ProjectSection(ProjectDependencies) = postProject
+ {17857422-AD82-4D37-A5AF-94C4556935D0} = {17857422-AD82-4D37-A5AF-94C4556935D0}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "silex", "silex.vcxproj", "{5B19C3D2-D3F9-4A39-A1CD-5A557D83E990}"
+ ProjectSection(ProjectDependencies) = postProject
+ {3F76AF02-F554-BD84-E19C-AACBB8DAF098} = {3F76AF02-F554-BD84-E19C-AACBB8DAF098}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pdb_detect", "pdb_detect\pdb_detect.vcxproj", "{17857422-AD82-4D37-A5AF-94C4556935D0}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "browser", "browser.vcxproj", "{239DB654-39CC-46B4-85EC-894F6592BF17}"
+ ProjectSection(ProjectDependencies) = postProject
+ {3F76AF02-F554-BD84-E19C-AACBB8DAF098} = {3F76AF02-F554-BD84-E19C-AACBB8DAF098}
+ EndProjectSection
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Win32 = Debug|Win32
+ Debug|x64 = Debug|x64
+ Release|Win32 = Release|Win32
+ Release|x64 = Release|x64
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {3F76AF02-F554-BD84-E19C-AACBB8DAF098}.Debug|Win32.ActiveCfg = Debug|Win32
+ {3F76AF02-F554-BD84-E19C-AACBB8DAF098}.Debug|Win32.Build.0 = Debug|Win32
+ {3F76AF02-F554-BD84-E19C-AACBB8DAF098}.Debug|x64.ActiveCfg = Debug|x64
+ {3F76AF02-F554-BD84-E19C-AACBB8DAF098}.Debug|x64.Build.0 = Debug|x64
+ {3F76AF02-F554-BD84-E19C-AACBB8DAF098}.Release|Win32.ActiveCfg = Release|Win32
+ {3F76AF02-F554-BD84-E19C-AACBB8DAF098}.Release|Win32.Build.0 = Release|Win32
+ {3F76AF02-F554-BD84-E19C-AACBB8DAF098}.Release|x64.ActiveCfg = Release|x64
+ {3F76AF02-F554-BD84-E19C-AACBB8DAF098}.Release|x64.Build.0 = Release|x64
+ {5B19C3D2-D3F9-4A39-A1CD-5A557D83E990}.Debug|Win32.ActiveCfg = Debug|Win32
+ {5B19C3D2-D3F9-4A39-A1CD-5A557D83E990}.Debug|Win32.Build.0 = Debug|Win32
+ {5B19C3D2-D3F9-4A39-A1CD-5A557D83E990}.Debug|x64.ActiveCfg = Debug|x64
+ {5B19C3D2-D3F9-4A39-A1CD-5A557D83E990}.Debug|x64.Build.0 = Debug|x64
+ {5B19C3D2-D3F9-4A39-A1CD-5A557D83E990}.Release|Win32.ActiveCfg = Release|Win32
+ {5B19C3D2-D3F9-4A39-A1CD-5A557D83E990}.Release|Win32.Build.0 = Release|Win32
+ {5B19C3D2-D3F9-4A39-A1CD-5A557D83E990}.Release|x64.ActiveCfg = Release|x64
+ {5B19C3D2-D3F9-4A39-A1CD-5A557D83E990}.Release|x64.Build.0 = Release|x64
+ {17857422-AD82-4D37-A5AF-94C4556935D0}.Debug|Win32.ActiveCfg = Release|Win32
+ {17857422-AD82-4D37-A5AF-94C4556935D0}.Debug|Win32.Build.0 = Release|Win32
+ {17857422-AD82-4D37-A5AF-94C4556935D0}.Debug|x64.ActiveCfg = Release|x64
+ {17857422-AD82-4D37-A5AF-94C4556935D0}.Debug|x64.Build.0 = Release|x64
+ {17857422-AD82-4D37-A5AF-94C4556935D0}.Release|Win32.ActiveCfg = Release|Win32
+ {17857422-AD82-4D37-A5AF-94C4556935D0}.Release|Win32.Build.0 = Release|Win32
+ {17857422-AD82-4D37-A5AF-94C4556935D0}.Release|x64.ActiveCfg = Release|x64
+ {17857422-AD82-4D37-A5AF-94C4556935D0}.Release|x64.Build.0 = Release|x64
+ {239DB654-39CC-46B4-85EC-894F6592BF17}.Debug|Win32.ActiveCfg = Debug|Win32
+ {239DB654-39CC-46B4-85EC-894F6592BF17}.Debug|Win32.Build.0 = Debug|Win32
+ {239DB654-39CC-46B4-85EC-894F6592BF17}.Debug|x64.ActiveCfg = Debug|x64
+ {239DB654-39CC-46B4-85EC-894F6592BF17}.Debug|x64.Build.0 = Debug|x64
+ {239DB654-39CC-46B4-85EC-894F6592BF17}.Release|Win32.ActiveCfg = Release|Win32
+ {239DB654-39CC-46B4-85EC-894F6592BF17}.Release|Win32.Build.0 = Release|Win32
+ {239DB654-39CC-46B4-85EC-894F6592BF17}.Release|x64.ActiveCfg = Release|x64
+ {239DB654-39CC-46B4-85EC-894F6592BF17}.Release|x64.Build.0 = Release|x64
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
diff --git a/SiloWindows/MSVC2010/Silo.vcxproj b/SiloWindows/MSVC2010/Silo.vcxproj
new file mode 100644
index 0000000..8ed332f
--- /dev/null
+++ b/SiloWindows/MSVC2010/Silo.vcxproj
@@ -0,0 +1,211 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <Keyword>Win32Proj</Keyword>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseDebugLibraries>true</UseDebugLibraries>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseDebugLibraries>true</UseDebugLibraries>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseDebugLibraries>false</UseDebugLibraries>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseDebugLibraries>false</UseDebugLibraries>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="DepLibs.props" />
+ <Import Project="ModernDTPR.props" />
+ <Import Project="HDF5_Defines.props" />
+ <Import Project="BaseIncludes.props" />
+ <Import Project="NO_SEC_DEP.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="DepLibs.props" />
+ <Import Project="ModernDTPR.props" />
+ <Import Project="HDF5_Defines.props" />
+ <Import Project="BaseIncludes.props" />
+ <Import Project="NO_SEC_DEP.props" />
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="DepLibs.props" />
+ <Import Project="ModernDTPR.props" />
+ <Import Project="HDF5_Defines.props" />
+ <Import Project="BaseIncludes.props" />
+ <Import Project="NO_SEC_DEP.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="DepLibs.props" />
+ <Import Project="ModernDTPR.props" />
+ <Import Project="HDF5_Defines.props" />
+ <Import Project="BaseIncludes.props" />
+ <Import Project="NO_SEC_DEP.props" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <LinkIncremental>true</LinkIncremental>
+ <TargetName>silohdf5</TargetName>
+ <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
+ <IntDir>$(PlatformName)\$(Configuration)\</IntDir>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <LinkIncremental>true</LinkIncremental>
+ <TargetName>silohdf5</TargetName>
+ <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
+ <IntDir>$(PlatformName)\$(Configuration)\</IntDir>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <LinkIncremental>true</LinkIncremental>
+ <TargetName>silohdf5</TargetName>
+ <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
+ <IntDir>$(PlatformName)\$(Configuration)\</IntDir>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <LinkIncremental>true</LinkIncremental>
+ <TargetName>silohdf5</TargetName>
+ <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
+ <IntDir>$(PlatformName)\$(Configuration)\</IntDir>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <ClCompile>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;SILO_EXPORTS;LITE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <Optimization>Disabled</Optimization>
+ </ClCompile>
+ <Link>
+ <TargetMachine>MachineX86</TargetMachine>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Windows</SubSystem>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <ClCompile>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;SILO_EXPORTS;LITE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <Optimization>Disabled</Optimization>
+ </ClCompile>
+ <Link>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Windows</SubSystem>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <ClCompile>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;SILO_EXPORTS;LITE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <Link>
+ <TargetMachine>MachineX86</TargetMachine>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Windows</SubSystem>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <OptimizeReferences>true</OptimizeReferences>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <ClCompile>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;SILO_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <Link>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Windows</SubSystem>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <OptimizeReferences>true</OptimizeReferences>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\src\debug\silo_debug.c" />
+ <ClCompile Include="..\..\src\filters\f_ale3d.c" />
+ <ClCompile Include="..\..\src\filters\f_sample.c" />
+ <ClCompile Include="..\..\src\hdf5_drv\H5FDsilo.c" />
+ <ClCompile Include="..\..\src\hdf5_drv\silo_hdf5.c" />
+ <ClCompile Include="..\..\src\pdb\pdb.c" />
+ <ClCompile Include="..\..\src\pdb\pdbdir.c" />
+ <ClCompile Include="..\..\src\pdb\pdbio.c" />
+ <ClCompile Include="..\..\src\pdb\pdbmm.c" />
+ <ClCompile Include="..\..\src\pdb\pdbx.c" />
+ <ClCompile Include="..\..\src\pdb\pdconv.c" />
+ <ClCompile Include="..\..\src\pdb\pdlow.c" />
+ <ClCompile Include="..\..\src\pdb\pdmemb.c" />
+ <ClCompile Include="..\..\src\pdb\pdpath.c" />
+ <ClCompile Include="..\..\src\pdb\pdrdwr.c" />
+ <ClCompile Include="..\..\src\pdb_drv\silo_pdb.c" />
+ <ClCompile Include="..\..\src\score\memmove.c" />
+ <ClCompile Include="..\..\src\score\scctl.c" />
+ <ClCompile Include="..\..\src\score\scctla.c" />
+ <ClCompile Include="..\..\src\score\schash.c" />
+ <ClCompile Include="..\..\src\score\scstr.c" />
+ <ClCompile Include="..\..\src\silo\alloc.c" />
+ <ClCompile Include="..\..\src\silo\extface.c" />
+ <ClCompile Include="..\..\src\silo\silo.c" />
+ <ClCompile Include="..\..\src\silo\silo_f.c" />
+ <ClCompile Include="..\..\src\silo\silo_ns.c" />
+ <ClCompile Include="..\..\src\taurus\silo_taurus.c" />
+ <ClCompile Include="..\..\src\taurus\taurus.c" />
+ <ClCompile Include="..\..\src\unknown\silo_unknown.c" />
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\src\debug\silo_debug_private.h" />
+ <ClInclude Include="..\..\src\filters\filter.h" />
+ <ClInclude Include="..\..\src\hdf5_drv\H5FDsilo.h" />
+ <ClInclude Include="..\..\src\hdf5_drv\silo_hdf5_private.h" />
+ <ClInclude Include="..\..\src\pdb\pdb.h" />
+ <ClInclude Include="..\..\src\pdb_drv\silo_pdb_private.h" />
+ <ClInclude Include="..\..\src\score\score.h" />
+ <ClInclude Include="..\..\src\silo\pmpio.h" />
+ <ClInclude Include="..\..\src\silo\silo_drivers.h" />
+ <ClInclude Include="..\..\src\silo\silo_f.h" />
+ <ClInclude Include="..\..\src\silo\silo_private.h" />
+ <ClInclude Include="..\..\src\silo\silo_win32_compatibility.h" />
+ <ClInclude Include="..\..\src\taurus\silo_taurus_private.h" />
+ <ClInclude Include="..\..\src\taurus\taurus.h" />
+ <ClInclude Include="..\..\src\unknown\silo_unknown_private.h" />
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="..\..\src\silo\silo.inc" />
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
diff --git a/SiloWindows/MSVC2010/Silo.vcxproj.filters b/SiloWindows/MSVC2010/Silo.vcxproj.filters
new file mode 100644
index 0000000..5af1371
--- /dev/null
+++ b/SiloWindows/MSVC2010/Silo.vcxproj.filters
@@ -0,0 +1,208 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup>
+ <Filter Include="Source Files">
+ <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+ <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+ </Filter>
+ <Filter Include="Header Files">
+ <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+ <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+ </Filter>
+ <Filter Include="Source Files\silo">
+ <UniqueIdentifier>{b44642f2-0e22-4359-b89d-c614990994e6}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Source Files\score">
+ <UniqueIdentifier>{0ce27567-4be8-499f-b4ed-a9691b6ee052}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Source Files\pdb_drv">
+ <UniqueIdentifier>{a5a05c0d-c9ff-479d-b704-e8e36367455a}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Header Files\taurus_drv">
+ <UniqueIdentifier>{5cfee3fc-3f25-4ace-9c79-58ec311615c4}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Header Files\score">
+ <UniqueIdentifier>{80f224fd-98b4-4c51-b15d-e90068310f94}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Header Files\pdb_drv">
+ <UniqueIdentifier>{8d5272ec-4b82-49bf-9f22-3133a17cc2ad}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Header Files\pdb">
+ <UniqueIdentifier>{6f7b3441-fd7c-4882-b55e-2a5298100280}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Header Files\filters">
+ <UniqueIdentifier>{33c5d424-dd8d-4a6d-9e66-fd4b812b7486}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Header Files\hdf5_drv">
+ <UniqueIdentifier>{f1de1134-82ac-4e1a-ac70-9072c99a7dae}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Header Files\silo">
+ <UniqueIdentifier>{0c828d0b-349d-4989-91c7-0d9a310af1b4}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Header Files\unknown">
+ <UniqueIdentifier>{9aa3c521-e2aa-4070-96f7-83975de1dfad}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Source Files\hdf5_drv">
+ <UniqueIdentifier>{57a6a43e-8406-4fdf-9c59-35197de4a97f}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Source Files\filters">
+ <UniqueIdentifier>{9476e32e-ba96-4459-a75a-254258fcc5ef}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Source Files\unknown">
+ <UniqueIdentifier>{b6fe0391-5082-4b6b-aa8f-30a7a7f170b9}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Source Files\pdb">
+ <UniqueIdentifier>{dde8ddc9-470a-4ae4-9697-c2033fcc730c}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Source Files\taurus_drv">
+ <UniqueIdentifier>{5c033d34-5b73-4ebf-9dfe-f80d0599db6d}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Source Files\debug">
+ <UniqueIdentifier>{99f571f9-ae34-4b74-bfc8-7e6e1d1a72aa}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Header Files\debug">
+ <UniqueIdentifier>{bed62ec2-c976-4850-8d57-bd00ec661159}</UniqueIdentifier>
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\src\silo\silo_ns.c">
+ <Filter>Source Files\silo</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\silo\alloc.c">
+ <Filter>Source Files\silo</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\silo\extface.c">
+ <Filter>Source Files\silo</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\silo\silo.c">
+ <Filter>Source Files\silo</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\silo\silo_f.c">
+ <Filter>Source Files\silo</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\taurus\silo_taurus.c">
+ <Filter>Source Files\taurus_drv</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\taurus\taurus.c">
+ <Filter>Source Files\taurus_drv</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\score\memmove.c">
+ <Filter>Source Files\score</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\score\scctl.c">
+ <Filter>Source Files\score</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\score\scctla.c">
+ <Filter>Source Files\score</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\score\schash.c">
+ <Filter>Source Files\score</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\score\scstr.c">
+ <Filter>Source Files\score</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\pdb_drv\silo_pdb.c">
+ <Filter>Source Files\pdb_drv</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\pdb\pdb.c">
+ <Filter>Source Files\pdb</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\pdb\pdbdir.c">
+ <Filter>Source Files\pdb</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\pdb\pdbio.c">
+ <Filter>Source Files\pdb</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\pdb\pdbmm.c">
+ <Filter>Source Files\pdb</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\pdb\pdbx.c">
+ <Filter>Source Files\pdb</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\pdb\pdlow.c">
+ <Filter>Source Files\pdb</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\pdb\pdmemb.c">
+ <Filter>Source Files\pdb</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\pdb\pdpath.c">
+ <Filter>Source Files\pdb</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\pdb\pdrdwr.c">
+ <Filter>Source Files\pdb</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\pdb\pdconv.c">
+ <Filter>Source Files\pdb</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\hdf5_drv\H5FDsilo.c">
+ <Filter>Source Files\hdf5_drv</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\hdf5_drv\silo_hdf5.c">
+ <Filter>Source Files\hdf5_drv</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\filters\f_ale3d.c">
+ <Filter>Source Files\filters</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\filters\f_sample.c">
+ <Filter>Source Files\filters</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\unknown\silo_unknown.c">
+ <Filter>Source Files\unknown</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\debug\silo_debug.c">
+ <Filter>Source Files\debug</Filter>
+ </ClCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\src\silo\pmpio.h">
+ <Filter>Header Files\silo</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\silo\silo_win32_compatibility.h">
+ <Filter>Header Files\silo</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\silo\silo_drivers.h">
+ <Filter>Header Files\silo</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\silo\silo_f.h">
+ <Filter>Header Files\silo</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\silo\silo_private.h">
+ <Filter>Header Files\silo</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\taurus\silo_taurus_private.h">
+ <Filter>Header Files\taurus_drv</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\taurus\taurus.h">
+ <Filter>Header Files\taurus_drv</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\score\score.h">
+ <Filter>Header Files\score</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\pdb_drv\silo_pdb_private.h">
+ <Filter>Header Files\pdb_drv</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\pdb\pdb.h">
+ <Filter>Header Files\pdb</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\filters\filter.h">
+ <Filter>Header Files\filters</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\hdf5_drv\H5FDsilo.h">
+ <Filter>Header Files\hdf5_drv</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\hdf5_drv\silo_hdf5_private.h">
+ <Filter>Header Files\hdf5_drv</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\unknown\silo_unknown_private.h">
+ <Filter>Header Files\unknown</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\debug\silo_debug_private.h">
+ <Filter>Header Files\debug</Filter>
+ </ClInclude>
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="..\..\src\silo\silo.inc">
+ <Filter>Header Files\silo</Filter>
+ </None>
+ </ItemGroup>
+</Project>
diff --git a/SiloWindows/MSVC2010/browser.vcxproj b/SiloWindows/MSVC2010/browser.vcxproj
new file mode 100644
index 0000000..c950b4a
--- /dev/null
+++ b/SiloWindows/MSVC2010/browser.vcxproj
@@ -0,0 +1,200 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{239DB654-39CC-46B4-85EC-894F6592BF17}</ProjectGuid>
+ <Keyword>Win32Proj</Keyword>
+ <RootNamespace>browser</RootNamespace>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>true</UseDebugLibraries>
+ <CharacterSet>Unicode</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>true</UseDebugLibraries>
+ <CharacterSet>Unicode</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>false</UseDebugLibraries>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <CharacterSet>Unicode</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>false</UseDebugLibraries>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <CharacterSet>Unicode</CharacterSet>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="NO_SEC_DEP.props" />
+ <Import Project="ModernDTPR.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="NO_SEC_DEP.props" />
+ <Import Project="ModernDTPR.props" />
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="NO_SEC_DEP.props" />
+ <Import Project="ModernDTPR.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="NO_SEC_DEP.props" />
+ <Import Project="ModernDTPR.props" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <LinkIncremental>true</LinkIncremental>
+ <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+ <IntDir>$(Platform)\$(Configuration)\</IntDir>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <LinkIncremental>true</LinkIncremental>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <LinkIncremental>false</LinkIncremental>
+ <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+ <IntDir>$(Platform)\$(Configuration)\</IntDir>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <LinkIncremental>false</LinkIncremental>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <ClCompile>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>Disabled</Optimization>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\include;..\..\tools\browser;..\..\src\silo;..\..\src\filters;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
+ <AdditionalDependencies>silohdf5.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ <PostBuildEvent>
+ <Command>copy $(SolutionDir)..\silodiff.bat $(OutDir)</Command>
+ </PostBuildEvent>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <ClCompile>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>Disabled</Optimization>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\include;..\..\tools\browser;..\..\src\silo;..\..\src\filters;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
+ <AdditionalDependencies>silohdf5.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ <PostBuildEvent>
+ <Command>copy $(SolutionDir)..\silodiff.bat $(OutDir)</Command>
+ </PostBuildEvent>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <Optimization>MaxSpeed</Optimization>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\include;..\..\tools\browser;..\..\src\silo;..\..\src\filters;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <OptimizeReferences>true</OptimizeReferences>
+ <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
+ <AdditionalDependencies>silohdf5.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ <PostBuildEvent>
+ <Command>copy $(SolutionDir)..\silodiff.bat $(OutDir)</Command>
+ </PostBuildEvent>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <Optimization>MaxSpeed</Optimization>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\include;..\..\tools\browser;..\..\src\silo;..\..\src\filters;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <OptimizeReferences>true</OptimizeReferences>
+ <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
+ <AdditionalDependencies>silohdf5.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ <PostBuildEvent>
+ <Command>copy $(SolutionDir)..\silodiff.bat $(OutDir)</Command>
+ </PostBuildEvent>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\tools\browser\array.c" />
+ <ClCompile Include="..\..\tools\browser\bif.c" />
+ <ClCompile Include="..\..\tools\browser\browser.c" />
+ <ClCompile Include="..\..\tools\browser\cons.c" />
+ <ClCompile Include="..\..\tools\browser\file.c" />
+ <ClCompile Include="..\..\tools\browser\func.c" />
+ <ClCompile Include="..\..\tools\browser\lex.c" />
+ <ClCompile Include="..\..\tools\browser\num.c" />
+ <ClCompile Include="..\..\tools\browser\obj.c" />
+ <ClCompile Include="..\..\tools\browser\output.c" />
+ <ClCompile Include="..\..\tools\browser\parse.c" />
+ <ClCompile Include="..\..\tools\browser\prim.c" />
+ <ClCompile Include="..\..\tools\browser\ptr.c" />
+ <ClCompile Include="..\..\tools\browser\range.c" />
+ <ClCompile Include="..\..\tools\browser\sdo.c" />
+ <ClCompile Include="..\..\tools\browser\stc.c" />
+ <ClCompile Include="..\..\tools\browser\str.c" />
+ <ClCompile Include="..\..\tools\browser\switch.c" />
+ <ClCompile Include="..\..\tools\browser\sym.c" />
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\tools\browser\browser.h" />
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/SiloWindows/MSVC2010/browser.vcxproj.filters b/SiloWindows/MSVC2010/browser.vcxproj.filters
new file mode 100644
index 0000000..3683299
--- /dev/null
+++ b/SiloWindows/MSVC2010/browser.vcxproj.filters
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup>
+ <Filter Include="Source Files">
+ <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+ <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+ </Filter>
+ <Filter Include="Header Files">
+ <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+ <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\tools\browser\array.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\tools\browser\bif.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\tools\browser\browser.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\tools\browser\cons.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\tools\browser\file.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\tools\browser\func.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\tools\browser\lex.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\tools\browser\num.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\tools\browser\obj.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\tools\browser\output.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\tools\browser\parse.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\tools\browser\prim.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\tools\browser\ptr.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\tools\browser\range.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\tools\browser\sdo.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\tools\browser\stc.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\tools\browser\str.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\tools\browser\switch.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\tools\browser\sym.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\tools\browser\browser.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/SiloWindows/MSVC2010/pdb_detect/pdb_detect.vcxproj b/SiloWindows/MSVC2010/pdb_detect/pdb_detect.vcxproj
new file mode 100644
index 0000000..f9b6409
--- /dev/null
+++ b/SiloWindows/MSVC2010/pdb_detect/pdb_detect.vcxproj
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{17857422-AD82-4D37-A5AF-94C4556935D0}</ProjectGuid>
+ <RootNamespace>pdb_detect</RootNamespace>
+ <Keyword>Win32Proj</Keyword>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <CharacterSet>Unicode</CharacterSet>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <CharacterSet>Unicode</CharacterSet>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="..\NO_SEC_DEP.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="..\NO_SEC_DEP.props" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)$(Platform)\$(Configuration)\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)$(Platform)\$(Configuration)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <ClCompile>
+ <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <Link>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Console</SubSystem>
+ <OptimizeReferences>true</OptimizeReferences>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <DataExecutionPrevention>
+ </DataExecutionPrevention>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <PostBuildEvent>
+ <Message>Create pdbform.h, lite_pdb.h, lite_score.h</Message>
+ <Command>$(OutDir)pdb_detect.exe > ..\..\..\src\pdb\pdform.h
+ perl.exe $(SolutionDir)..\..\config\mklite $(SolutionDir)..\..\src\pdb\pdb.h $(SolutionDir)\..\include\lite_pdb.h
+ perl.exe $(SolutionDir)..\..\config\mklite $(SolutionDir)..\..\src\score\score.h $(SolutionDir)\..\include\lite_score.h
+ </Command>
+ </PostBuildEvent>
+ <PreBuildEvent>
+ <Command>cd ..\..\
+ copysilo.bat
+ </Command>
+ </PreBuildEvent>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <Midl>
+ <TargetEnvironment>X64</TargetEnvironment>
+ </Midl>
+ <ClCompile>
+ <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <Link>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Console</SubSystem>
+ <OptimizeReferences>true</OptimizeReferences>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <DataExecutionPrevention>
+ </DataExecutionPrevention>
+ <TargetMachine>MachineX64</TargetMachine>
+ </Link>
+ <PostBuildEvent>
+ <Message>Create pdbform.h, lite_pdb.h, lite_score.h</Message>
+ <Command>$(OutDir)pdb_detect.exe > ..\..\..\src\pdb\pdform.h
+ perl.exe $(SolutionDir)..\..\config\mklite $(SolutionDir)..\..\src\pdb\pdb.h $(SolutionDir)\..\include\lite_pdb.h
+ perl.exe $(SolutionDir)..\..\config\mklite $(SolutionDir)..\..\src\score\score.h $(SolutionDir)\..\include\lite_score.h
+ </Command>
+ </PostBuildEvent>
+ <PreBuildEvent>
+ <Command>cd ..\..\
+ copysilo.bat
+ </Command>
+ </PreBuildEvent>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\..\src\pdb\detect.c" />
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
diff --git a/SiloWindows/MSVC2010/pdb_detect/pdb_detect.vcxproj.filters b/SiloWindows/MSVC2010/pdb_detect/pdb_detect.vcxproj.filters
new file mode 100644
index 0000000..749b8fd
--- /dev/null
+++ b/SiloWindows/MSVC2010/pdb_detect/pdb_detect.vcxproj.filters
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup>
+ <Filter Include="Source Files">
+ <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+ <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\..\src\pdb\detect.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/SiloWindows/MSVC2010/silex.vcxproj b/SiloWindows/MSVC2010/silex.vcxproj
new file mode 100644
index 0000000..33c90ba
--- /dev/null
+++ b/SiloWindows/MSVC2010/silex.vcxproj
@@ -0,0 +1,212 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{5B19C3D2-D3F9-4A39-A1CD-5A557D83E990}</ProjectGuid>
+ <Keyword>Win32Proj</Keyword>
+ <RootNamespace>silex</RootNamespace>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>true</UseDebugLibraries>
+ <CharacterSet>Unicode</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>true</UseDebugLibraries>
+ <CharacterSet>Unicode</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>false</UseDebugLibraries>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <CharacterSet>Unicode</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>false</UseDebugLibraries>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <CharacterSet>Unicode</CharacterSet>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="NO_SEC_DEP.props" />
+ <Import Project="ModernDTPR.props" />
+ <Import Project="DepLibs.props" />
+ <Import Project="QT_Defines.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="NO_SEC_DEP.props" />
+ <Import Project="ModernDTPR.props" />
+ <Import Project="DepLibs.props" />
+ <Import Project="QT_Defines.props" />
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="NO_SEC_DEP.props" />
+ <Import Project="ModernDTPR.props" />
+ <Import Project="DepLibs.props" />
+ <Import Project="QT_Defines.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="NO_SEC_DEP.props" />
+ <Import Project="ModernDTPR.props" />
+ <Import Project="DepLibs.props" />
+ <Import Project="QT_Defines.props" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <LinkIncremental>true</LinkIncremental>
+ <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
+ <IntDir>$(PlatformName)\$(Configuration)\</IntDir>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <LinkIncremental>true</LinkIncremental>
+ <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
+ <IntDir>$(PlatformName)\$(Configuration)\</IntDir>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <LinkIncremental>false</LinkIncremental>
+ <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
+ <IntDir>$(PlatformName)\$(Configuration)\</IntDir>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <LinkIncremental>false</LinkIncremental>
+ <OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir>
+ <IntDir>$(PlatformName)\$(Configuration)\</IntDir>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <ClCompile>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>Disabled</Optimization>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>$(SolutionDir)..\include;$(SolutionDir)..\..\tools\silex;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ </Link>
+ <PreBuildEvent>
+ <Command>..\runsilexmoc.bat $(QT_LIB_DIR)</Command>
+ </PreBuildEvent>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <ClCompile>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>Disabled</Optimization>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>$(SolutionDir)..\include;$(SolutionDir)..\..\tools\silex;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ </Link>
+ <PreBuildEvent>
+ <Command>..\runsilexmoc.bat $(QT_LIB_DIR_X64)</Command>
+ </PreBuildEvent>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <Optimization>MaxSpeed</Optimization>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>$(SolutionDir)..\include;$(SolutionDir)..\..\tools\silex;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <OptimizeReferences>true</OptimizeReferences>
+ <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ </Link>
+ <PreBuildEvent>
+ <Command>..\runsilexmoc.bat $(QT_LIB_DIR)</Command>
+ </PreBuildEvent>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <Optimization>MaxSpeed</Optimization>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>$(SolutionDir)..\include;$(SolutionDir)..\..\tools\silex;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <OptimizeReferences>true</OptimizeReferences>
+ <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ </Link>
+ <PreBuildEvent>
+ <Command>..\runsilexmoc.bat $(QT_LIB_DIR_X64)</Command>
+ </PreBuildEvent>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\tools\silex\Explorer.cpp" />
+ <ClCompile Include="..\..\tools\silex\Explorer_moc.cpp" />
+ <ClCompile Include="..\..\tools\silex\main.cpp" />
+ <ClCompile Include="..\..\tools\silex\SiloArrayView.cpp" />
+ <ClCompile Include="..\..\tools\silex\SiloArrayView_moc.cpp" />
+ <ClCompile Include="..\..\tools\silex\SiloDirTreeView.cpp" />
+ <ClCompile Include="..\..\tools\silex\SiloDirTreeView_moc.cpp" />
+ <ClCompile Include="..\..\tools\silex\SiloDirView.cpp" />
+ <ClCompile Include="..\..\tools\silex\SiloDirView_moc.cpp" />
+ <ClCompile Include="..\..\tools\silex\SiloFile.cpp" />
+ <ClCompile Include="..\..\tools\silex\SiloObjectView.cpp" />
+ <ClCompile Include="..\..\tools\silex\SiloObjectView_moc.cpp" />
+ <ClCompile Include="..\..\tools\silex\SiloValueView.cpp" />
+ <ClCompile Include="..\..\tools\silex\SiloValueView_moc.cpp" />
+ <ClCompile Include="..\..\tools\silex\SiloView.cpp" />
+ <ClCompile Include="..\..\tools\silex\SiloView_moc.cpp" />
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\tools\silex\Explorer.h" />
+ <ClInclude Include="..\..\tools\silex\SiloArrayView.h" />
+ <ClInclude Include="..\..\tools\silex\SiloDirTreeView.h" />
+ <ClInclude Include="..\..\tools\silex\SiloDirView.h" />
+ <ClInclude Include="..\..\tools\silex\SiloFile.h" />
+ <ClInclude Include="..\..\tools\silex\SiloObjectView.h" />
+ <ClInclude Include="..\..\tools\silex\SiloValueView.h" />
+ <ClInclude Include="..\..\tools\silex\SiloView.h" />
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/SiloWindows/MSVC2010/silex.vcxproj.filters b/SiloWindows/MSVC2010/silex.vcxproj.filters
new file mode 100644
index 0000000..fe48078
--- /dev/null
+++ b/SiloWindows/MSVC2010/silex.vcxproj.filters
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup>
+ <Filter Include="Source Files">
+ <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+ <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+ </Filter>
+ <Filter Include="Header Files">
+ <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+ <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+ </Filter>
+ <Filter Include="Source Files\moc">
+ <UniqueIdentifier>{94ceaedb-6e8a-4de6-91e5-1db608812798}</UniqueIdentifier>
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\tools\silex\Explorer.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\tools\silex\main.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\tools\silex\SiloArrayView.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\tools\silex\SiloDirTreeView.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\tools\silex\SiloDirView.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\tools\silex\SiloFile.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\tools\silex\SiloObjectView.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\tools\silex\SiloValueView.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\tools\silex\SiloView.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\tools\silex\Explorer_moc.cpp">
+ <Filter>Source Files\moc</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\tools\silex\SiloArrayView_moc.cpp">
+ <Filter>Source Files\moc</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\tools\silex\SiloDirTreeView_moc.cpp">
+ <Filter>Source Files\moc</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\tools\silex\SiloDirView_moc.cpp">
+ <Filter>Source Files\moc</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\tools\silex\SiloObjectView_moc.cpp">
+ <Filter>Source Files\moc</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\tools\silex\SiloValueView_moc.cpp">
+ <Filter>Source Files\moc</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\tools\silex\SiloView_moc.cpp">
+ <Filter>Source Files\moc</Filter>
+ </ClCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\tools\silex\Explorer.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\tools\silex\SiloArrayView.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\tools\silex\SiloDirTreeView.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\tools\silex\SiloDirView.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\tools\silex\SiloFile.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\tools\silex\SiloObjectView.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\tools\silex\SiloValueView.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\tools\silex\SiloView.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/SiloWindows/MSVC8/Silo.vcproj b/SiloWindows/MSVC8/Silo.vcproj
deleted file mode 100644
index 997d977..0000000
--- a/SiloWindows/MSVC8/Silo.vcproj
+++ /dev/null
@@ -1,876 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="Silo"
- ProjectGUID="{20BFB7B0-9F43-43BB-B188-555DEA431CDF}"
- RootNamespace="Silo"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="DLLwithHDF5_Release|Win32"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
- IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
- ConfigurationType="2"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;.\NO_SEC_DEP.vsprops;.\ModernDTPR.vsprops;.\HDF5_Defines.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- PreprocessorDefinitions="NDEBUG"
- MkTypLibCompatible="true"
- SuppressStartupBanner="true"
- TargetEnvironment="1"
- TypeLibraryName="$(OutDir)\DLLwithHDF5.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- InlineFunctionExpansion="2"
- AdditionalIncludeDirectories="..\include;..\..\src\debug;..\..\src\hdf5_drv;..\..\src\pdb;..\..\src\pdb_drv;..\..\src\score;..\..\src\silo;..\..\src\taurus;..\..\src\unknown;$(HDF5_INC_DIR);$(ZLIB_INC_DIR)"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SILO_EXPORTS"
- StringPooling="true"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="$(OutDir)\DLLwithHDF5.pch"
- AssemblerListingLocation="$(OutDir)\"
- ObjectFile="$(OutDir)\"
- ProgramDataBaseFileName="$(OutDir)\"
- WarningLevel="3"
- SuppressStartupBanner="true"
- CompileAs="0"
- DisableSpecificWarnings="4244;4305"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="zlib1.lib hdf5dll.lib"
- OutputFile="$(OutDir)\silohdf5.dll"
- LinkIncremental="1"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="$(ZLIB_LIB_DIR);$(HDF5_LIB_DIR)"
- ProgramDatabaseFile="$(OutDir)\silohdf5.pdb"
- ImportLibrary="$(OutDir)\silohdf5.lib"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="DLLwithHDF5_Debug|Win32"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
- IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
- ConfigurationType="2"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;.\NO_SEC_DEP.vsprops;.\ModernDTPR.vsprops;.\HDF5_Defines.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- PreprocessorDefinitions=""
- MkTypLibCompatible="true"
- SuppressStartupBanner="true"
- TargetEnvironment="1"
- TypeLibraryName="$(OutDir)\DLLwithHDF5.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..\include;..\..\src\debug;..\..\src\hdf5_drv;..\..\src\pdb;..\..\src\pdb_drv;..\..\src\score;..\..\src\silo;..\..\src\taurus;..\..\src\unknown;$(HDF5_INC_DIR);$(ZLIB_INC_DIR)"
- PreprocessorDefinitions="WIN32;_WINDOWS;_USRDLL;SILO_EXPORTS"
- BasicRuntimeChecks="3"
- RuntimeLibrary="2"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="$(OutDir)\DLLwithHDF5.pch"
- AssemblerListingLocation="$(OutDir)\"
- ObjectFile="$(OutDir)\"
- ProgramDataBaseFileName="$(OutDir)\"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DebugInformationFormat="4"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="zlib1.lib hdf5dll.lib"
- OutputFile="$(OutDir)\silohdf5.dll"
- LinkIncremental="1"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="$(ZLIB_LIB_DIR);$(HDF5_LIB_DIR)"
- GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)\silohdf5.pdb"
- ImportLibrary="$(OutDir)\silohdf5.lib"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="DLL_Debug|Win32"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
- IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
- ConfigurationType="2"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;.\NO_SEC_DEP.vsprops;.\ModernDTPR.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- PreprocessorDefinitions=""
- MkTypLibCompatible="true"
- SuppressStartupBanner="true"
- TargetEnvironment="1"
- TypeLibraryName="$(OutDir)\DLL.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..\include;..\..\src\debug;..\..\src\hdf5_drv;..\..\src\pdb;..\..\src\pdb_drv;..\..\src\score;..\..\src\silo;..\..\src\taurus;..\..\src\unknown"
- PreprocessorDefinitions="WIN32;_WINDOWS;_USRDLL;SILO_EXPORTS"
- BasicRuntimeChecks="3"
- RuntimeLibrary="2"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="$(OutDir)\DLL.pch"
- AssemblerListingLocation="$(OutDir)\"
- ObjectFile="$(OutDir)\"
- ProgramDataBaseFileName="$(OutDir)\"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DebugInformationFormat="4"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies=""
- OutputFile="$(OutDir)\silo.dll"
- LinkIncremental="1"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories=""
- GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)\silo.pdb"
- ImportLibrary="$(OutDir)\silo.lib"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="DLL_Release|Win32"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
- IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
- ConfigurationType="2"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;.\NO_SEC_DEP.vsprops;.\ModernDTPR.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- PreprocessorDefinitions="NDEBUG"
- MkTypLibCompatible="true"
- SuppressStartupBanner="true"
- TargetEnvironment="1"
- TypeLibraryName="$(OutDir)\DLL.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- InlineFunctionExpansion="2"
- AdditionalIncludeDirectories="..\include;..\..\src\debug;..\..\src\hdf5_drv;..\..\src\pdb;..\..\src\pdb_drv;..\..\src\score;..\..\src\silo;..\..\src\taurus;..\..\src\unknown"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SILO_EXPORTS"
- StringPooling="true"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="$(OutDir)\DLL.pch"
- AssemblerListingLocation="$(OutDir)\"
- ObjectFile="$(OutDir)\"
- ProgramDataBaseFileName="$(OutDir)\"
- WarningLevel="3"
- SuppressStartupBanner="true"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies=""
- ShowProgress="0"
- OutputFile="$(OutDir)\silo.dll"
- LinkIncremental="1"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories=""
- ProgramDatabaseFile="$(OutDir)\silo.pdb"
- ImportLibrary="$(OutDir)\silo.lib"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="StaticLibwithHDF5_Release|Win32"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
- IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
- ConfigurationType="4"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;.\NO_SEC_DEP.vsprops;.\ModernDTPR.vsprops;.\HDF5_Defines.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- PreprocessorDefinitions="NDEBUG"
- MkTypLibCompatible="true"
- SuppressStartupBanner="true"
- TargetEnvironment="1"
- TypeLibraryName="$(OutDir)\DLLwithHDF5.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- InlineFunctionExpansion="2"
- AdditionalIncludeDirectories="..\include;..\..\src\debug;..\..\src\hdf5_drv;..\..\src\pdb;..\..\src\pdb_drv;..\..\src\score;..\..\src\silo;..\..\src\taurus;..\..\src\unknown;$(HDF5_INC_DIR);$(ZLIB_INC_DIR)"
- PreprocessorDefinitions="WIN32;NDEBUG;_LIB;SILO_STATIC_LIBRARY"
- StringPooling="true"
- RuntimeLibrary="0"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="$(OutDir)\DLLwithHDF5.pch"
- AssemblerListingLocation="$(OutDir)\"
- ObjectFile="$(OutDir)\"
- ProgramDataBaseFileName="$(OutDir)\"
- WarningLevel="3"
- SuppressStartupBanner="true"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- AdditionalDependencies="zlib.lib hdf5.lib szlib.lib"
- OutputFile="$(OutDir)\silohdf5.lib"
- AdditionalLibraryDirectories="$(ZLIB_LIB_DIR_STATIC);$(HDF5_LIB_DIR_STATIC);$(SZIP_LIB_DIR_STATIC)"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="StaticLibwithHDF5_Debug|Win32"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
- IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
- ConfigurationType="4"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;.\NO_SEC_DEP.vsprops;.\ModernDTPR.vsprops;.\HDF5_Defines.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- PreprocessorDefinitions="_DEBUG"
- MkTypLibCompatible="true"
- SuppressStartupBanner="true"
- TargetEnvironment="1"
- TypeLibraryName="$(OutDir)\DLLwithHDF5.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..\include;..\..\src\debug;..\..\src\hdf5_drv;..\..\src\pdb;..\..\src\pdb_drv;..\..\src\score;..\..\src\silo;..\..\src\taurus;..\..\src\unknown;$(HDF5_INC_DIR);$(ZLIB_INC_DIR)"
- PreprocessorDefinitions="WIN32;_DEBUG;_LIB;SILO_STATIC_LIBRARY"
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="$(OutDir)\DLLwithHDF5.pch"
- AssemblerListingLocation="$(OutDir)\"
- ObjectFile="$(OutDir)\"
- ProgramDataBaseFileName="$(OutDir)\"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DebugInformationFormat="4"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- AdditionalDependencies="zlib.lib hdf5.lib szlib.lib"
- OutputFile="$(OutDir)/silohdf5.lib"
- AdditionalLibraryDirectories="$(ZLIB_LIB_DIR_STATIC);$(HDF5_LIB_DIR_STATIC); $(SZIP_LIB_DIR_STATIC)"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="StaticLib_Release|Win32"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
- IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
- ConfigurationType="4"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;.\NO_SEC_DEP.vsprops;.\ModernDTPR.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- PreprocessorDefinitions="NDEBUG"
- MkTypLibCompatible="true"
- SuppressStartupBanner="true"
- TargetEnvironment="1"
- TypeLibraryName="$(OutDir)\DLLwithHDF5.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- InlineFunctionExpansion="2"
- AdditionalIncludeDirectories="..\include;..\..\src\debug;..\..\src\hdf5_drv;..\..\src\pdb;..\..\src\pdb_drv;..\..\src\score;..\..\src\silo;..\..\src\taurus;..\..\src\unknown"
- PreprocessorDefinitions="WIN32;NDEBUG;_LIB;SILO_STATIC_LIBRARY"
- StringPooling="true"
- RuntimeLibrary="0"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="$(OutDir)\silo.pch"
- AssemblerListingLocation="$(OutDir)\"
- ObjectFile="$(OutDir)\"
- ProgramDataBaseFileName="$(OutDir)\"
- WarningLevel="3"
- SuppressStartupBanner="true"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- AdditionalDependencies=""
- OutputFile="$(OutDir)\silo.lib"
- AdditionalLibraryDirectories=""
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="StaticLib_Debug|Win32"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
- IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
- ConfigurationType="4"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;.\NO_SEC_DEP.vsprops;.\ModernDTPR.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- PreprocessorDefinitions="_DEBUG"
- MkTypLibCompatible="true"
- SuppressStartupBanner="true"
- TargetEnvironment="1"
- TypeLibraryName="$(OutDir)\DLLwithHDF5.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..\include;..\..\src\debug;..\..\src\hdf5_drv;..\..\src\pdb;..\..\src\pdb_drv;..\..\src\score;..\..\src\silo;..\..\src\taurus;..\..\src\unknown"
- PreprocessorDefinitions="WIN32;_DEBUG;_LIB;SILO_STATIC_LIBRARY"
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="$(OutDir)\silo.pch"
- AssemblerListingLocation="$(OutDir)\"
- ObjectFile="$(OutDir)\"
- ProgramDataBaseFileName="$(OutDir)\"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DebugInformationFormat="4"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- AdditionalDependencies=""
- OutputFile="$(OutDir)\silo.lib"
- AdditionalLibraryDirectories=""
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="score"
- >
- <File
- RelativePath="..\..\src\score\memmove.c"
- >
- </File>
- <File
- RelativePath="..\..\src\score\scctl.c"
- >
- </File>
- <File
- RelativePath="..\..\src\score\scctla.c"
- >
- </File>
- <File
- RelativePath="..\..\src\score\schash.c"
- >
- </File>
- <File
- RelativePath="..\..\src\score\scstr.c"
- >
- </File>
- </Filter>
- <Filter
- Name="pdb"
- >
- <File
- RelativePath="..\..\src\pdb\pdb.c"
- >
- </File>
- <File
- RelativePath="..\..\src\pdb\pdbdir.c"
- >
- </File>
- <File
- RelativePath="..\..\src\pdb\pdbio.c"
- >
- </File>
- <File
- RelativePath="..\..\src\pdb\pdbmm.c"
- >
- </File>
- <File
- RelativePath="..\..\src\pdb\pdbx.c"
- >
- </File>
- <File
- RelativePath="..\..\src\pdb\pdconv.c"
- >
- </File>
- <File
- RelativePath="..\..\src\pdb\pdlow.c"
- >
- </File>
- <File
- RelativePath="..\..\src\pdb\pdmemb.c"
- >
- </File>
- <File
- RelativePath="..\..\src\pdb\pdpath.c"
- >
- </File>
- <File
- RelativePath="..\..\src\pdb\pdrdwr.c"
- >
- </File>
- </Filter>
- <Filter
- Name="pdb_drv"
- >
- <File
- RelativePath="..\..\src\pdb_drv\silo_pdb.c"
- >
- </File>
- </Filter>
- <Filter
- Name="silo"
- >
- <File
- RelativePath="..\..\src\silo\alloc.c"
- >
- </File>
- <File
- RelativePath="..\..\src\silo\extface.c"
- >
- </File>
- <File
- RelativePath="..\..\src\silo\silo.c"
- >
- </File>
- <File
- RelativePath="..\..\src\silo\silo_f.c"
- >
- </File>
- <File
- RelativePath="..\..\src\silo\silo_ns.c"
- >
- </File>
- </Filter>
- <Filter
- Name="unknown"
- >
- <File
- RelativePath="..\..\src\unknown\silo_unknown.c"
- >
- </File>
- </Filter>
- <Filter
- Name="debug"
- >
- <File
- RelativePath="..\..\src\debug\silo_debug.c"
- >
- </File>
- </Filter>
- <Filter
- Name="hdf5_drv"
- >
- <File
- RelativePath="..\..\src\hdf5_drv\H5FDsilo.c"
- >
- </File>
- <File
- RelativePath="..\..\src\hdf5_drv\silo_hdf5.c"
- >
- </File>
- </Filter>
- <Filter
- Name="taurus_drv"
- >
- <File
- RelativePath="..\..\src\taurus\silo_taurus.c"
- >
- </File>
- <File
- RelativePath="..\..\src\taurus\taurus.c"
- >
- </File>
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/SiloWindows/MSVC8/SiloWindows.sln b/SiloWindows/MSVC8/SiloWindows.sln
deleted file mode 100644
index 7c4d827..0000000
--- a/SiloWindows/MSVC8/SiloWindows.sln
+++ /dev/null
@@ -1,104 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "silex", "silex.vcproj", "{3D443B05-403C-4907-8F50-DC396DB6BB23}"
- ProjectSection(ProjectDependencies) = postProject
- {20BFB7B0-9F43-43BB-B188-555DEA431CDF} = {20BFB7B0-9F43-43BB-B188-555DEA431CDF}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Silo", "Silo.vcproj", "{20BFB7B0-9F43-43BB-B188-555DEA431CDF}"
- ProjectSection(ProjectDependencies) = postProject
- {17857422-AD82-4D37-A5AF-94C4556935D0} = {17857422-AD82-4D37-A5AF-94C4556935D0}
- {00AB914E-42B9-4775-B1E6-154F8923655B} = {00AB914E-42B9-4775-B1E6-154F8923655B}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pdb_detect", "pdb_detect\pdb_detect.vcproj", "{17857422-AD82-4D37-A5AF-94C4556935D0}"
-EndProject
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- DLL_Debug|Win32 = DLL_Debug|Win32
- DLL_Release|Win32 = DLL_Release|Win32
- DLLwithHDF5_Debug|Win32 = DLLwithHDF5_Debug|Win32
- DLLwithHDF5_Release|Win32 = DLLwithHDF5_Release|Win32
- Release|Win32 = Release|Win32
- StaticLib_Debug|Win32 = StaticLib_Debug|Win32
- StaticLib_Release|Win32 = StaticLib_Release|Win32
- StaticLibwithHDF5_Debug|Win32 = StaticLibwithHDF5_Debug|Win32
- StaticLibwithHDF5_Release|Win32 = StaticLibwithHDF5_Release|Win32
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {3D443B05-403C-4907-8F50-DC396DB6BB23}.DLL_Debug|Win32.ActiveCfg = DLL_Debug|Win32
- {3D443B05-403C-4907-8F50-DC396DB6BB23}.DLL_Debug|Win32.Build.0 = DLL_Debug|Win32
- {3D443B05-403C-4907-8F50-DC396DB6BB23}.DLL_Release|Win32.ActiveCfg = DLL_Release|Win32
- {3D443B05-403C-4907-8F50-DC396DB6BB23}.DLL_Release|Win32.Build.0 = DLL_Release|Win32
- {3D443B05-403C-4907-8F50-DC396DB6BB23}.DLLwithHDF5_Debug|Win32.ActiveCfg = DLLwithHDF5_Debug|Win32
- {3D443B05-403C-4907-8F50-DC396DB6BB23}.DLLwithHDF5_Debug|Win32.Build.0 = DLLwithHDF5_Debug|Win32
- {3D443B05-403C-4907-8F50-DC396DB6BB23}.DLLwithHDF5_Release|Win32.ActiveCfg = DLLwithHDF5_Release|Win32
- {3D443B05-403C-4907-8F50-DC396DB6BB23}.DLLwithHDF5_Release|Win32.Build.0 = DLLwithHDF5_Release|Win32
- {3D443B05-403C-4907-8F50-DC396DB6BB23}.Release|Win32.ActiveCfg = StaticLib_Release|Win32
- {3D443B05-403C-4907-8F50-DC396DB6BB23}.StaticLib_Debug|Win32.ActiveCfg = StaticLib_Debug|Win32
- {3D443B05-403C-4907-8F50-DC396DB6BB23}.StaticLib_Debug|Win32.Build.0 = StaticLib_Debug|Win32
- {3D443B05-403C-4907-8F50-DC396DB6BB23}.StaticLib_Release|Win32.ActiveCfg = StaticLib_Release|Win32
- {3D443B05-403C-4907-8F50-DC396DB6BB23}.StaticLib_Release|Win32.Build.0 = StaticLib_Release|Win32
- {3D443B05-403C-4907-8F50-DC396DB6BB23}.StaticLibwithHDF5_Debug|Win32.ActiveCfg = StaticLibwithHDF5_Debug|Win32
- {3D443B05-403C-4907-8F50-DC396DB6BB23}.StaticLibwithHDF5_Debug|Win32.Build.0 = StaticLibwithHDF5_Debug|Win32
- {3D443B05-403C-4907-8F50-DC396DB6BB23}.StaticLibwithHDF5_Release|Win32.ActiveCfg = StaticLibwithHDF5_Release|Win32
- {3D443B05-403C-4907-8F50-DC396DB6BB23}.StaticLibwithHDF5_Release|Win32.Build.0 = StaticLibwithHDF5_Release|Win32
- {20BFB7B0-9F43-43BB-B188-555DEA431CDF}.DLL_Debug|Win32.ActiveCfg = DLL_Debug|Win32
- {20BFB7B0-9F43-43BB-B188-555DEA431CDF}.DLL_Debug|Win32.Build.0 = DLL_Debug|Win32
- {20BFB7B0-9F43-43BB-B188-555DEA431CDF}.DLL_Release|Win32.ActiveCfg = DLL_Release|Win32
- {20BFB7B0-9F43-43BB-B188-555DEA431CDF}.DLL_Release|Win32.Build.0 = DLL_Release|Win32
- {20BFB7B0-9F43-43BB-B188-555DEA431CDF}.DLLwithHDF5_Debug|Win32.ActiveCfg = DLLwithHDF5_Debug|Win32
- {20BFB7B0-9F43-43BB-B188-555DEA431CDF}.DLLwithHDF5_Debug|Win32.Build.0 = DLLwithHDF5_Debug|Win32
- {20BFB7B0-9F43-43BB-B188-555DEA431CDF}.DLLwithHDF5_Release|Win32.ActiveCfg = DLLwithHDF5_Release|Win32
- {20BFB7B0-9F43-43BB-B188-555DEA431CDF}.DLLwithHDF5_Release|Win32.Build.0 = DLLwithHDF5_Release|Win32
- {20BFB7B0-9F43-43BB-B188-555DEA431CDF}.Release|Win32.ActiveCfg = StaticLibwithHDF5_Release|Win32
- {20BFB7B0-9F43-43BB-B188-555DEA431CDF}.StaticLib_Debug|Win32.ActiveCfg = StaticLib_Debug|Win32
- {20BFB7B0-9F43-43BB-B188-555DEA431CDF}.StaticLib_Debug|Win32.Build.0 = StaticLib_Debug|Win32
- {20BFB7B0-9F43-43BB-B188-555DEA431CDF}.StaticLib_Release|Win32.ActiveCfg = StaticLib_Release|Win32
- {20BFB7B0-9F43-43BB-B188-555DEA431CDF}.StaticLib_Release|Win32.Build.0 = StaticLib_Release|Win32
- {20BFB7B0-9F43-43BB-B188-555DEA431CDF}.StaticLibwithHDF5_Debug|Win32.ActiveCfg = StaticLibwithHDF5_Debug|Win32
- {20BFB7B0-9F43-43BB-B188-555DEA431CDF}.StaticLibwithHDF5_Debug|Win32.Build.0 = StaticLibwithHDF5_Debug|Win32
- {20BFB7B0-9F43-43BB-B188-555DEA431CDF}.StaticLibwithHDF5_Release|Win32.ActiveCfg = StaticLibwithHDF5_Release|Win32
- {20BFB7B0-9F43-43BB-B188-555DEA431CDF}.StaticLibwithHDF5_Release|Win32.Build.0 = StaticLibwithHDF5_Release|Win32
- {17857422-AD82-4D37-A5AF-94C4556935D0}.DLL_Debug|Win32.ActiveCfg = Release|Win32
- {17857422-AD82-4D37-A5AF-94C4556935D0}.DLL_Debug|Win32.Build.0 = Release|Win32
- {17857422-AD82-4D37-A5AF-94C4556935D0}.DLL_Release|Win32.ActiveCfg = Release|Win32
- {17857422-AD82-4D37-A5AF-94C4556935D0}.DLL_Release|Win32.Build.0 = Release|Win32
- {17857422-AD82-4D37-A5AF-94C4556935D0}.DLLwithHDF5_Debug|Win32.ActiveCfg = Release|Win32
- {17857422-AD82-4D37-A5AF-94C4556935D0}.DLLwithHDF5_Debug|Win32.Build.0 = Release|Win32
- {17857422-AD82-4D37-A5AF-94C4556935D0}.DLLwithHDF5_Release|Win32.ActiveCfg = Release|Win32
- {17857422-AD82-4D37-A5AF-94C4556935D0}.DLLwithHDF5_Release|Win32.Build.0 = Release|Win32
- {17857422-AD82-4D37-A5AF-94C4556935D0}.Release|Win32.ActiveCfg = Release|Win32
- {17857422-AD82-4D37-A5AF-94C4556935D0}.Release|Win32.Build.0 = Release|Win32
- {17857422-AD82-4D37-A5AF-94C4556935D0}.StaticLib_Debug|Win32.ActiveCfg = Release|Win32
- {17857422-AD82-4D37-A5AF-94C4556935D0}.StaticLib_Debug|Win32.Build.0 = Release|Win32
- {17857422-AD82-4D37-A5AF-94C4556935D0}.StaticLib_Release|Win32.ActiveCfg = Release|Win32
- {17857422-AD82-4D37-A5AF-94C4556935D0}.StaticLib_Release|Win32.Build.0 = Release|Win32
- {17857422-AD82-4D37-A5AF-94C4556935D0}.StaticLibwithHDF5_Debug|Win32.ActiveCfg = Release|Win32
- {17857422-AD82-4D37-A5AF-94C4556935D0}.StaticLibwithHDF5_Debug|Win32.Build.0 = Release|Win32
- {17857422-AD82-4D37-A5AF-94C4556935D0}.StaticLibwithHDF5_Release|Win32.ActiveCfg = Release|Win32
- {17857422-AD82-4D37-A5AF-94C4556935D0}.StaticLibwithHDF5_Release|Win32.Build.0 = Release|Win32
- {00AB914E-42B9-4775-B1E6-154F8923655B}.DLL_Debug|Win32.ActiveCfg = Release|Win32
- {00AB914E-42B9-4775-B1E6-154F8923655B}.DLL_Debug|Win32.Build.0 = Release|Win32
- {00AB914E-42B9-4775-B1E6-154F8923655B}.DLL_Release|Win32.ActiveCfg = Release|Win32
- {00AB914E-42B9-4775-B1E6-154F8923655B}.DLL_Release|Win32.Build.0 = Release|Win32
- {00AB914E-42B9-4775-B1E6-154F8923655B}.DLLwithHDF5_Debug|Win32.ActiveCfg = Release|Win32
- {00AB914E-42B9-4775-B1E6-154F8923655B}.DLLwithHDF5_Debug|Win32.Build.0 = Release|Win32
- {00AB914E-42B9-4775-B1E6-154F8923655B}.DLLwithHDF5_Release|Win32.ActiveCfg = Release|Win32
- {00AB914E-42B9-4775-B1E6-154F8923655B}.DLLwithHDF5_Release|Win32.Build.0 = Release|Win32
- {00AB914E-42B9-4775-B1E6-154F8923655B}.Release|Win32.ActiveCfg = Release|Win32
- {00AB914E-42B9-4775-B1E6-154F8923655B}.Release|Win32.Build.0 = Release|Win32
- {00AB914E-42B9-4775-B1E6-154F8923655B}.StaticLib_Debug|Win32.ActiveCfg = Release|Win32
- {00AB914E-42B9-4775-B1E6-154F8923655B}.StaticLib_Debug|Win32.Build.0 = Release|Win32
- {00AB914E-42B9-4775-B1E6-154F8923655B}.StaticLib_Release|Win32.ActiveCfg = Release|Win32
- {00AB914E-42B9-4775-B1E6-154F8923655B}.StaticLib_Release|Win32.Build.0 = Release|Win32
- {00AB914E-42B9-4775-B1E6-154F8923655B}.StaticLibwithHDF5_Debug|Win32.ActiveCfg = Release|Win32
- {00AB914E-42B9-4775-B1E6-154F8923655B}.StaticLibwithHDF5_Debug|Win32.Build.0 = Release|Win32
- {00AB914E-42B9-4775-B1E6-154F8923655B}.StaticLibwithHDF5_Release|Win32.ActiveCfg = Release|Win32
- {00AB914E-42B9-4775-B1E6-154F8923655B}.StaticLibwithHDF5_Release|Win32.Build.0 = Release|Win32
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
-EndGlobal
diff --git a/SiloWindows/MSVC8/Tests/TestReadMask.vcproj b/SiloWindows/MSVC8/Tests/TestReadMask.vcproj
deleted file mode 100644
index 96dc231..0000000
--- a/SiloWindows/MSVC8/Tests/TestReadMask.vcproj
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="TestReadMask"
- ProjectGUID="{D47B6498-6A8D-4E87-A3B6-C6D08DF29FE2}"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="DLLwithHDF5_Debug|Win32"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\TestReadMask"
- IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\TestReadMask"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName="$(OutDir)\TestReadMask.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..\..\..\src\silo"
- PreprocessorDefinitions="WIN32;_CONSOLE"
- BasicRuntimeChecks="3"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="$(OutDir)\TestReadMask.pch"
- AssemblerListingLocation="$(OutDir)\"
- ObjectFile="$(OutDir)\"
- ProgramDataBaseFileName="$(OutDir)\TestReadMask"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DebugInformationFormat="4"
- DisableSpecificWarnings="4244;4305"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="silohdf5.lib"
- OutputFile="$(SolutionDir)..\bin\TestReadMask.exe"
- LinkIncremental="2"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
- GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)\TestReadMask.pdb"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="DLLwithHDF5_Release|Win32"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\TestReadMask"
- IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\TestReadMask"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName="$(OutDir)\TestReadMask.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="..\..\..\src\silo"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- StringPooling="true"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="$(OutDir)\TestReadMask.pch"
- AssemblerListingLocation="$(OutDir)\"
- ObjectFile="$(OutDir)\"
- ProgramDataBaseFileName="$(OutDir)\"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DisableSpecificWarnings="4244;4305"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="silohdf5.lib"
- OutputFile="$(SolutionDir)..\bin\TestReadMask.exe"
- LinkIncremental="1"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
- ProgramDatabaseFile="$(OutDir)\TestReadMask.pdb"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath="..\..\..\tests\TestReadMask.c"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/SiloWindows/MSVC8/Tests/Tests.sln b/SiloWindows/MSVC8/Tests/Tests.sln
deleted file mode 100644
index 5c5d5eb..0000000
--- a/SiloWindows/MSVC8/Tests/Tests.sln
+++ /dev/null
@@ -1,498 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wave", "wave.vcproj", "{3D443B05-403C-4907-8F50-DC396DB6BB23}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "alltypes", "alltypes.vcproj", "{627C8E54-0ABD-4B8A-B76B-0BD13F5E684B}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "array", "array.vcproj", "{CB409787-8ACF-4854-A2AB-6CD727E7120D}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "compression", "compression.vcproj", "{AA9DE89B-47C8-4164-944A-6D42B4AF0FEB}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "csg", "csg.vcproj", "{6DE8948E-8CF8-4650-9749-1C21066AA957}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "extface", "extface.vcproj", "{3482A43B-3A21-4583-88C4-45A4422E2307}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testall", "testall.vcproj", "{E4105EA9-2AB2-4656-B966-01F16961A14B}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grab", "grab.vcproj", "{DCFFC0C8-1C81-4016-8364-1678FAB1D2D2}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "largefile", "largefile.vcproj", "{EA0DA3EC-DD78-4C57-A0A9-F0EEAE35A85A}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "listtypes", "listtypes.vcproj", "{A79DA077-0644-4DA7-8D8A-BB115597F474}"
- ProjectSection(ProjectDependencies) = postProject
- {9B955616-D58C-4ED8-AB6F-FBA74E768B54} = {9B955616-D58C-4ED8-AB6F-FBA74E768B54}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mat3d_3across", "mat3d_3across.vcproj", "{CEA025B3-7259-4852-980F-CB39E8206304}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "merge_block", "merge_block.vcproj", "{2B22FE6C-0C77-445A-8320-50EEF60EEF7D}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mmadjacency", "mmadjacency.vcproj", "{809F6E22-2B80-4264-A220-7974EC9EDBBF}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "multi_file", "multi_file.vcproj", "{8CC26B54-D539-4A0A-B461-26F074B790FD}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "multi_test", "multi_test.vcproj", "{7535A535-FDEC-4448-AF9C-C031C9EA8459}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "multispec", "multispec.vcproj", "{2D46EF91-58B2-43B5-ADD7-6908D6794578}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "obj", "obj.vcproj", "{AC0F21DF-ECA4-4B17-9829-59634B68B0D2}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "onehex", "onehex.vcproj", "{3863899B-7F9F-4823-9383-AE2205DCB054}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "oneprism", "oneprism.vcproj", "{4BCA7F35-0742-424F-8E50-39B934312F8F}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "onepyramid", "onepyramid.vcproj", "{2AFC873D-E906-4145-A0CB-6264E8CAE97D}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "onetet", "onetet.vcproj", "{A76CCA62-BC5F-44F8-B090-9C45DA138680}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "partial_io", "partial_io.vcproj", "{4F6A7EC6-F141-4512-B2A8-D108CBD6FAC1}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "point", "point.vcproj", "{025CFEA1-6C43-404D-9DA4-5392A17FA162}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "polyzl", "polyzl.vcproj", "{8C6BC636-FF71-4D58-9D63-E12265523982}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "quad", "quad.vcproj", "{4D5EA26A-8356-4665-A13D-51CCEE2BA7F4}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rocket", "rocket.vcproj", "{A9F76A7B-20A1-4D93-9444-175824B7B3DF}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sami", "sami.vcproj", "{B3C7F964-68B8-4F8C-B5E7-7607836FB101}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "simple", "simple.vcproj", "{7AB46C61-04D5-4E77-AD3F-E7726F3E173A}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "spec", "spec.vcproj", "{7A5F618C-F98A-4F8E-BBC7-C4F5C6BCD5A4}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "specmix", "specmix.vcproj", "{27C64509-94EB-406D-9978-93AE531CEB1E}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "subhex", "subhex.vcproj", "{8C02951E-155B-4D09-A1DD-F98695F02A0E}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testpdb", "testpdb.vcproj", "{29110B58-9FD5-4A8E-B9F7-064650EE16C6}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestReadMask", "TestReadMask.vcproj", "{D47B6498-6A8D-4E87-A3B6-C6D08DF29FE2}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "twohex", "twohex.vcproj", "{64A6CE79-710F-405C-AAE8-F604E74A4374}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ucd1d", "ucd1d.vcproj", "{C065DCD0-DE87-4B6E-A1E6-8F7EDB272D53}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ucd", "ucd.vcproj", "{9B955616-D58C-4ED8-AB6F-FBA74E768B54}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ucdsamp3", "ucdsamp3.vcproj", "{94D10A14-5A9B-4E1E-B204-DE3196750126}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "version", "version.vcproj", "{CBBCFD38-0F91-4CA2-8CBF-2833AC284438}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dirtest", "dirtest.vcproj", "{B8FE1ABF-E1AD-41C7-AFAE-333BAB3636E1}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "group_test", "group_test.vcproj", "{69340E63-F15C-4A33-85B7-344666F8F25C}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "namescheme", "namescheme.vcproj", "{D839F6C1-3736-4269-A5E7-30B2BC1CBCCD}"
-EndProject
-Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "array_f", "array_f.vfproj", "{A1F2E6F2-6E49-4746-9133-9DF0A404C7DB}"
-EndProject
-Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "curve_f", "curve_f.vfproj", "{D08D4EA4-8AF5-4FD2-BFBE-4FFB247B2A35}"
-EndProject
-Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "mat_f", "mat_f.vfproj", "{595357B8-132D-4F3E-9679-6E52B474E8A5}"
-EndProject
-Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "point_f", "point_f.vfproj", "{EC9BB75A-9691-4DAF-A876-5116DDCBAFBC}"
-EndProject
-Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "quad_f", "quad_f.vfproj", "{12C054D3-D396-45F9-912E-8A7FF6548738}"
-EndProject
-Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "testall_f", "testall_f.vfproj", "{BCC584B3-571E-4441-8ABF-D2CDD0646116}"
-EndProject
-Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "ucd_f", "ucd_f.vfproj", "{A8A0C0C5-A117-4430-B47A-E98603255D01}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Win32 = Debug|Win32
- DLLwithHDF5_Debug|Win32 = DLLwithHDF5_Debug|Win32
- DLLwithHDF5_Release|Win32 = DLLwithHDF5_Release|Win32
- Release|Win32 = Release|Win32
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {3D443B05-403C-4907-8F50-DC396DB6BB23}.Debug|Win32.ActiveCfg = DLLwithHDF5_Debug|Win32
- {3D443B05-403C-4907-8F50-DC396DB6BB23}.Debug|Win32.Build.0 = DLLwithHDF5_Debug|Win32
- {3D443B05-403C-4907-8F50-DC396DB6BB23}.DLLwithHDF5_Debug|Win32.ActiveCfg = DLLwithHDF5_Debug|Win32
- {3D443B05-403C-4907-8F50-DC396DB6BB23}.DLLwithHDF5_Debug|Win32.Build.0 = DLLwithHDF5_Debug|Win32
- {3D443B05-403C-4907-8F50-DC396DB6BB23}.DLLwithHDF5_Release|Win32.ActiveCfg = DLLwithHDF5_Release|Win32
- {3D443B05-403C-4907-8F50-DC396DB6BB23}.DLLwithHDF5_Release|Win32.Build.0 = DLLwithHDF5_Release|Win32
- {3D443B05-403C-4907-8F50-DC396DB6BB23}.Release|Win32.ActiveCfg = DLLwithHDF5_Release|Win32
- {3D443B05-403C-4907-8F50-DC396DB6BB23}.Release|Win32.Build.0 = DLLwithHDF5_Release|Win32
- {627C8E54-0ABD-4B8A-B76B-0BD13F5E684B}.Debug|Win32.ActiveCfg = DLLwithHDF5_Debug|Win32
- {627C8E54-0ABD-4B8A-B76B-0BD13F5E684B}.Debug|Win32.Build.0 = DLLwithHDF5_Debug|Win32
- {627C8E54-0ABD-4B8A-B76B-0BD13F5E684B}.DLLwithHDF5_Debug|Win32.ActiveCfg = DLLwithHDF5_Debug|Win32
- {627C8E54-0ABD-4B8A-B76B-0BD13F5E684B}.DLLwithHDF5_Debug|Win32.Build.0 = DLLwithHDF5_Debug|Win32
- {627C8E54-0ABD-4B8A-B76B-0BD13F5E684B}.DLLwithHDF5_Release|Win32.ActiveCfg = DLLwithHDF5_Release|Win32
- {627C8E54-0ABD-4B8A-B76B-0BD13F5E684B}.DLLwithHDF5_Release|Win32.Build.0 = DLLwithHDF5_Release|Win32
- {627C8E54-0ABD-4B8A-B76B-0BD13F5E684B}.Release|Win32.ActiveCfg = DLLwithHDF5_Release|Win32
- {627C8E54-0ABD-4B8A-B76B-0BD13F5E684B}.Release|Win32.Build.0 = DLLwithHDF5_Release|Win32
- {CB409787-8ACF-4854-A2AB-6CD727E7120D}.Debug|Win32.ActiveCfg = DLLwithHDF5_Debug|Win32
- {CB409787-8ACF-4854-A2AB-6CD727E7120D}.Debug|Win32.Build.0 = DLLwithHDF5_Debug|Win32
- {CB409787-8ACF-4854-A2AB-6CD727E7120D}.DLLwithHDF5_Debug|Win32.ActiveCfg = DLLwithHDF5_Debug|Win32
- {CB409787-8ACF-4854-A2AB-6CD727E7120D}.DLLwithHDF5_Debug|Win32.Build.0 = DLLwithHDF5_Debug|Win32
- {CB409787-8ACF-4854-A2AB-6CD727E7120D}.DLLwithHDF5_Release|Win32.ActiveCfg = DLLwithHDF5_Release|Win32
- {CB409787-8ACF-4854-A2AB-6CD727E7120D}.DLLwithHDF5_Release|Win32.Build.0 = DLLwithHDF5_Release|Win32
- {CB409787-8ACF-4854-A2AB-6CD727E7120D}.Release|Win32.ActiveCfg = DLLwithHDF5_Release|Win32
- {CB409787-8ACF-4854-A2AB-6CD727E7120D}.Release|Win32.Build.0 = DLLwithHDF5_Release|Win32
- {AA9DE89B-47C8-4164-944A-6D42B4AF0FEB}.Debug|Win32.ActiveCfg = DLLwithHDF5_Debug|Win32
- {AA9DE89B-47C8-4164-944A-6D42B4AF0FEB}.Debug|Win32.Build.0 = DLLwithHDF5_Debug|Win32
- {AA9DE89B-47C8-4164-944A-6D42B4AF0FEB}.DLLwithHDF5_Debug|Win32.ActiveCfg = DLLwithHDF5_Debug|Win32
- {AA9DE89B-47C8-4164-944A-6D42B4AF0FEB}.DLLwithHDF5_Debug|Win32.Build.0 = DLLwithHDF5_Debug|Win32
- {AA9DE89B-47C8-4164-944A-6D42B4AF0FEB}.DLLwithHDF5_Release|Win32.ActiveCfg = DLLwithHDF5_Release|Win32
- {AA9DE89B-47C8-4164-944A-6D42B4AF0FEB}.DLLwithHDF5_Release|Win32.Build.0 = DLLwithHDF5_Release|Win32
- {AA9DE89B-47C8-4164-944A-6D42B4AF0FEB}.Release|Win32.ActiveCfg = DLLwithHDF5_Release|Win32
- {AA9DE89B-47C8-4164-944A-6D42B4AF0FEB}.Release|Win32.Build.0 = DLLwithHDF5_Release|Win32
- {6DE8948E-8CF8-4650-9749-1C21066AA957}.Debug|Win32.ActiveCfg = DLLwithHDF5_Debug|Win32
- {6DE8948E-8CF8-4650-9749-1C21066AA957}.Debug|Win32.Build.0 = DLLwithHDF5_Debug|Win32
- {6DE8948E-8CF8-4650-9749-1C21066AA957}.DLLwithHDF5_Debug|Win32.ActiveCfg = DLLwithHDF5_Debug|Win32
- {6DE8948E-8CF8-4650-9749-1C21066AA957}.DLLwithHDF5_Debug|Win32.Build.0 = DLLwithHDF5_Debug|Win32
- {6DE8948E-8CF8-4650-9749-1C21066AA957}.DLLwithHDF5_Release|Win32.ActiveCfg = DLLwithHDF5_Release|Win32
- {6DE8948E-8CF8-4650-9749-1C21066AA957}.DLLwithHDF5_Release|Win32.Build.0 = DLLwithHDF5_Release|Win32
- {6DE8948E-8CF8-4650-9749-1C21066AA957}.Release|Win32.ActiveCfg = DLLwithHDF5_Release|Win32
- {6DE8948E-8CF8-4650-9749-1C21066AA957}.Release|Win32.Build.0 = DLLwithHDF5_Release|Win32
- {3482A43B-3A21-4583-88C4-45A4422E2307}.Debug|Win32.ActiveCfg = DLLwithHDF5_Debug|Win32
- {3482A43B-3A21-4583-88C4-45A4422E2307}.Debug|Win32.Build.0 = DLLwithHDF5_Debug|Win32
- {3482A43B-3A21-4583-88C4-45A4422E2307}.DLLwithHDF5_Debug|Win32.ActiveCfg = DLLwithHDF5_Debug|Win32
- {3482A43B-3A21-4583-88C4-45A4422E2307}.DLLwithHDF5_Debug|Win32.Build.0 = DLLwithHDF5_Debug|Win32
- {3482A43B-3A21-4583-88C4-45A4422E2307}.DLLwithHDF5_Release|Win32.ActiveCfg = DLLwithHDF5_Release|Win32
- {3482A43B-3A21-4583-88C4-45A4422E2307}.DLLwithHDF5_Release|Win32.Build.0 = DLLwithHDF5_Release|Win32
- {3482A43B-3A21-4583-88C4-45A4422E2307}.Release|Win32.ActiveCfg = DLLwithHDF5_Release|Win32
- {3482A43B-3A21-4583-88C4-45A4422E2307}.Release|Win32.Build.0 = DLLwithHDF5_Release|Win32
- {E4105EA9-2AB2-4656-B966-01F16961A14B}.Debug|Win32.ActiveCfg = DLLwithHDF5_Debug|Win32
- {E4105EA9-2AB2-4656-B966-01F16961A14B}.Debug|Win32.Build.0 = DLLwithHDF5_Debug|Win32
- {E4105EA9-2AB2-4656-B966-01F16961A14B}.DLLwithHDF5_Debug|Win32.ActiveCfg = DLLwithHDF5_Debug|Win32
- {E4105EA9-2AB2-4656-B966-01F16961A14B}.DLLwithHDF5_Debug|Win32.Build.0 = DLLwithHDF5_Debug|Win32
- {E4105EA9-2AB2-4656-B966-01F16961A14B}.DLLwithHDF5_Release|Win32.ActiveCfg = DLLwithHDF5_Release|Win32
- {E4105EA9-2AB2-4656-B966-01F16961A14B}.DLLwithHDF5_Release|Win32.Build.0 = DLLwithHDF5_Release|Win32
- {E4105EA9-2AB2-4656-B966-01F16961A14B}.Release|Win32.ActiveCfg = DLLwithHDF5_Release|Win32
- {E4105EA9-2AB2-4656-B966-01F16961A14B}.Release|Win32.Build.0 = DLLwithHDF5_Release|Win32
- {DCFFC0C8-1C81-4016-8364-1678FAB1D2D2}.Debug|Win32.ActiveCfg = DLLwithHDF5_Debug|Win32
- {DCFFC0C8-1C81-4016-8364-1678FAB1D2D2}.Debug|Win32.Build.0 = DLLwithHDF5_Debug|Win32
- {DCFFC0C8-1C81-4016-8364-1678FAB1D2D2}.DLLwithHDF5_Debug|Win32.ActiveCfg = DLLwithHDF5_Debug|Win32
- {DCFFC0C8-1C81-4016-8364-1678FAB1D2D2}.DLLwithHDF5_Debug|Win32.Build.0 = DLLwithHDF5_Debug|Win32
- {DCFFC0C8-1C81-4016-8364-1678FAB1D2D2}.DLLwithHDF5_Release|Win32.ActiveCfg = DLLwithHDF5_Release|Win32
- {DCFFC0C8-1C81-4016-8364-1678FAB1D2D2}.DLLwithHDF5_Release|Win32.Build.0 = DLLwithHDF5_Release|Win32
- {DCFFC0C8-1C81-4016-8364-1678FAB1D2D2}.Release|Win32.ActiveCfg = DLLwithHDF5_Release|Win32
- {DCFFC0C8-1C81-4016-8364-1678FAB1D2D2}.Release|Win32.Build.0 = DLLwithHDF5_Release|Win32
- {EA0DA3EC-DD78-4C57-A0A9-F0EEAE35A85A}.Debug|Win32.ActiveCfg = DLLwithHDF5_Debug|Win32
- {EA0DA3EC-DD78-4C57-A0A9-F0EEAE35A85A}.Debug|Win32.Build.0 = DLLwithHDF5_Debug|Win32
- {EA0DA3EC-DD78-4C57-A0A9-F0EEAE35A85A}.DLLwithHDF5_Debug|Win32.ActiveCfg = DLLwithHDF5_Debug|Win32
- {EA0DA3EC-DD78-4C57-A0A9-F0EEAE35A85A}.DLLwithHDF5_Debug|Win32.Build.0 = DLLwithHDF5_Debug|Win32
- {EA0DA3EC-DD78-4C57-A0A9-F0EEAE35A85A}.DLLwithHDF5_Release|Win32.ActiveCfg = DLLwithHDF5_Release|Win32
- {EA0DA3EC-DD78-4C57-A0A9-F0EEAE35A85A}.DLLwithHDF5_Release|Win32.Build.0 = DLLwithHDF5_Release|Win32
- {EA0DA3EC-DD78-4C57-A0A9-F0EEAE35A85A}.Release|Win32.ActiveCfg = DLLwithHDF5_Release|Win32
- {EA0DA3EC-DD78-4C57-A0A9-F0EEAE35A85A}.Release|Win32.Build.0 = DLLwithHDF5_Release|Win32
- {A79DA077-0644-4DA7-8D8A-BB115597F474}.Debug|Win32.ActiveCfg = DLLwithHDF5_Debug|Win32
- {A79DA077-0644-4DA7-8D8A-BB115597F474}.Debug|Win32.Build.0 = DLLwithHDF5_Debug|Win32
- {A79DA077-0644-4DA7-8D8A-BB115597F474}.DLLwithHDF5_Debug|Win32.ActiveCfg = DLLwithHDF5_Debug|Win32
- {A79DA077-0644-4DA7-8D8A-BB115597F474}.DLLwithHDF5_Debug|Win32.Build.0 = DLLwithHDF5_Debug|Win32
- {A79DA077-0644-4DA7-8D8A-BB115597F474}.DLLwithHDF5_Release|Win32.ActiveCfg = DLLwithHDF5_Release|Win32
- {A79DA077-0644-4DA7-8D8A-BB115597F474}.DLLwithHDF5_Release|Win32.Build.0 = DLLwithHDF5_Release|Win32
- {A79DA077-0644-4DA7-8D8A-BB115597F474}.Release|Win32.ActiveCfg = DLLwithHDF5_Release|Win32
- {A79DA077-0644-4DA7-8D8A-BB115597F474}.Release|Win32.Build.0 = DLLwithHDF5_Release|Win32
- {CEA025B3-7259-4852-980F-CB39E8206304}.Debug|Win32.ActiveCfg = DLLwithHDF5_Debug|Win32
- {CEA025B3-7259-4852-980F-CB39E8206304}.Debug|Win32.Build.0 = DLLwithHDF5_Debug|Win32
- {CEA025B3-7259-4852-980F-CB39E8206304}.DLLwithHDF5_Debug|Win32.ActiveCfg = DLLwithHDF5_Debug|Win32
- {CEA025B3-7259-4852-980F-CB39E8206304}.DLLwithHDF5_Debug|Win32.Build.0 = DLLwithHDF5_Debug|Win32
- {CEA025B3-7259-4852-980F-CB39E8206304}.DLLwithHDF5_Release|Win32.ActiveCfg = DLLwithHDF5_Release|Win32
- {CEA025B3-7259-4852-980F-CB39E8206304}.DLLwithHDF5_Release|Win32.Build.0 = DLLwithHDF5_Release|Win32
- {CEA025B3-7259-4852-980F-CB39E8206304}.Release|Win32.ActiveCfg = DLLwithHDF5_Release|Win32
- {CEA025B3-7259-4852-980F-CB39E8206304}.Release|Win32.Build.0 = DLLwithHDF5_Release|Win32
- {2B22FE6C-0C77-445A-8320-50EEF60EEF7D}.Debug|Win32.ActiveCfg = DLLwithHDF5_Debug|Win32
- {2B22FE6C-0C77-445A-8320-50EEF60EEF7D}.Debug|Win32.Build.0 = DLLwithHDF5_Debug|Win32
- {2B22FE6C-0C77-445A-8320-50EEF60EEF7D}.DLLwithHDF5_Debug|Win32.ActiveCfg = DLLwithHDF5_Debug|Win32
- {2B22FE6C-0C77-445A-8320-50EEF60EEF7D}.DLLwithHDF5_Debug|Win32.Build.0 = DLLwithHDF5_Debug|Win32
- {2B22FE6C-0C77-445A-8320-50EEF60EEF7D}.DLLwithHDF5_Release|Win32.ActiveCfg = DLLwithHDF5_Release|Win32
- {2B22FE6C-0C77-445A-8320-50EEF60EEF7D}.DLLwithHDF5_Release|Win32.Build.0 = DLLwithHDF5_Release|Win32
- {2B22FE6C-0C77-445A-8320-50EEF60EEF7D}.Release|Win32.ActiveCfg = DLLwithHDF5_Release|Win32
- {2B22FE6C-0C77-445A-8320-50EEF60EEF7D}.Release|Win32.Build.0 = DLLwithHDF5_Release|Win32
- {809F6E22-2B80-4264-A220-7974EC9EDBBF}.Debug|Win32.ActiveCfg = DLLwithHDF5_Debug|Win32
- {809F6E22-2B80-4264-A220-7974EC9EDBBF}.Debug|Win32.Build.0 = DLLwithHDF5_Debug|Win32
- {809F6E22-2B80-4264-A220-7974EC9EDBBF}.DLLwithHDF5_Debug|Win32.ActiveCfg = DLLwithHDF5_Debug|Win32
- {809F6E22-2B80-4264-A220-7974EC9EDBBF}.DLLwithHDF5_Debug|Win32.Build.0 = DLLwithHDF5_Debug|Win32
- {809F6E22-2B80-4264-A220-7974EC9EDBBF}.DLLwithHDF5_Release|Win32.ActiveCfg = DLLwithHDF5_Release|Win32
- {809F6E22-2B80-4264-A220-7974EC9EDBBF}.DLLwithHDF5_Release|Win32.Build.0 = DLLwithHDF5_Release|Win32
- {809F6E22-2B80-4264-A220-7974EC9EDBBF}.Release|Win32.ActiveCfg = DLLwithHDF5_Release|Win32
- {809F6E22-2B80-4264-A220-7974EC9EDBBF}.Release|Win32.Build.0 = DLLwithHDF5_Release|Win32
- {8CC26B54-D539-4A0A-B461-26F074B790FD}.Debug|Win32.ActiveCfg = DLLwithHDF5_Debug|Win32
- {8CC26B54-D539-4A0A-B461-26F074B790FD}.Debug|Win32.Build.0 = DLLwithHDF5_Debug|Win32
- {8CC26B54-D539-4A0A-B461-26F074B790FD}.DLLwithHDF5_Debug|Win32.ActiveCfg = DLLwithHDF5_Debug|Win32
- {8CC26B54-D539-4A0A-B461-26F074B790FD}.DLLwithHDF5_Debug|Win32.Build.0 = DLLwithHDF5_Debug|Win32
- {8CC26B54-D539-4A0A-B461-26F074B790FD}.DLLwithHDF5_Release|Win32.ActiveCfg = DLLwithHDF5_Release|Win32
- {8CC26B54-D539-4A0A-B461-26F074B790FD}.DLLwithHDF5_Release|Win32.Build.0 = DLLwithHDF5_Release|Win32
- {8CC26B54-D539-4A0A-B461-26F074B790FD}.Release|Win32.ActiveCfg = DLLwithHDF5_Release|Win32
- {8CC26B54-D539-4A0A-B461-26F074B790FD}.Release|Win32.Build.0 = DLLwithHDF5_Release|Win32
- {7535A535-FDEC-4448-AF9C-C031C9EA8459}.Debug|Win32.ActiveCfg = DLLwithHDF5_Debug|Win32
- {7535A535-FDEC-4448-AF9C-C031C9EA8459}.Debug|Win32.Build.0 = DLLwithHDF5_Debug|Win32
- {7535A535-FDEC-4448-AF9C-C031C9EA8459}.DLLwithHDF5_Debug|Win32.ActiveCfg = DLLwithHDF5_Debug|Win32
- {7535A535-FDEC-4448-AF9C-C031C9EA8459}.DLLwithHDF5_Debug|Win32.Build.0 = DLLwithHDF5_Debug|Win32
- {7535A535-FDEC-4448-AF9C-C031C9EA8459}.DLLwithHDF5_Release|Win32.ActiveCfg = DLLwithHDF5_Release|Win32
- {7535A535-FDEC-4448-AF9C-C031C9EA8459}.DLLwithHDF5_Release|Win32.Build.0 = DLLwithHDF5_Release|Win32
- {7535A535-FDEC-4448-AF9C-C031C9EA8459}.Release|Win32.ActiveCfg = DLLwithHDF5_Release|Win32
- {7535A535-FDEC-4448-AF9C-C031C9EA8459}.Release|Win32.Build.0 = DLLwithHDF5_Release|Win32
- {2D46EF91-58B2-43B5-ADD7-6908D6794578}.Debug|Win32.ActiveCfg = DLLwithHDF5_Debug|Win32
- {2D46EF91-58B2-43B5-ADD7-6908D6794578}.Debug|Win32.Build.0 = DLLwithHDF5_Debug|Win32
- {2D46EF91-58B2-43B5-ADD7-6908D6794578}.DLLwithHDF5_Debug|Win32.ActiveCfg = DLLwithHDF5_Debug|Win32
- {2D46EF91-58B2-43B5-ADD7-6908D6794578}.DLLwithHDF5_Debug|Win32.Build.0 = DLLwithHDF5_Debug|Win32
- {2D46EF91-58B2-43B5-ADD7-6908D6794578}.DLLwithHDF5_Release|Win32.ActiveCfg = DLLwithHDF5_Release|Win32
- {2D46EF91-58B2-43B5-ADD7-6908D6794578}.DLLwithHDF5_Release|Win32.Build.0 = DLLwithHDF5_Release|Win32
- {2D46EF91-58B2-43B5-ADD7-6908D6794578}.Release|Win32.ActiveCfg = DLLwithHDF5_Release|Win32
- {2D46EF91-58B2-43B5-ADD7-6908D6794578}.Release|Win32.Build.0 = DLLwithHDF5_Release|Win32
- {AC0F21DF-ECA4-4B17-9829-59634B68B0D2}.Debug|Win32.ActiveCfg = DLLwithHDF5_Debug|Win32
- {AC0F21DF-ECA4-4B17-9829-59634B68B0D2}.Debug|Win32.Build.0 = DLLwithHDF5_Debug|Win32
- {AC0F21DF-ECA4-4B17-9829-59634B68B0D2}.DLLwithHDF5_Debug|Win32.ActiveCfg = DLLwithHDF5_Debug|Win32
- {AC0F21DF-ECA4-4B17-9829-59634B68B0D2}.DLLwithHDF5_Debug|Win32.Build.0 = DLLwithHDF5_Debug|Win32
- {AC0F21DF-ECA4-4B17-9829-59634B68B0D2}.DLLwithHDF5_Release|Win32.ActiveCfg = DLLwithHDF5_Release|Win32
- {AC0F21DF-ECA4-4B17-9829-59634B68B0D2}.DLLwithHDF5_Release|Win32.Build.0 = DLLwithHDF5_Release|Win32
- {AC0F21DF-ECA4-4B17-9829-59634B68B0D2}.Release|Win32.ActiveCfg = DLLwithHDF5_Release|Win32
- {AC0F21DF-ECA4-4B17-9829-59634B68B0D2}.Release|Win32.Build.0 = DLLwithHDF5_Release|Win32
- {3863899B-7F9F-4823-9383-AE2205DCB054}.Debug|Win32.ActiveCfg = DLLwithHDF5_Debug|Win32
- {3863899B-7F9F-4823-9383-AE2205DCB054}.Debug|Win32.Build.0 = DLLwithHDF5_Debug|Win32
- {3863899B-7F9F-4823-9383-AE2205DCB054}.DLLwithHDF5_Debug|Win32.ActiveCfg = DLLwithHDF5_Debug|Win32
- {3863899B-7F9F-4823-9383-AE2205DCB054}.DLLwithHDF5_Debug|Win32.Build.0 = DLLwithHDF5_Debug|Win32
- {3863899B-7F9F-4823-9383-AE2205DCB054}.DLLwithHDF5_Release|Win32.ActiveCfg = DLLwithHDF5_Release|Win32
- {3863899B-7F9F-4823-9383-AE2205DCB054}.DLLwithHDF5_Release|Win32.Build.0 = DLLwithHDF5_Release|Win32
- {3863899B-7F9F-4823-9383-AE2205DCB054}.Release|Win32.ActiveCfg = DLLwithHDF5_Release|Win32
- {3863899B-7F9F-4823-9383-AE2205DCB054}.Release|Win32.Build.0 = DLLwithHDF5_Release|Win32
- {4BCA7F35-0742-424F-8E50-39B934312F8F}.Debug|Win32.ActiveCfg = DLLwithHDF5_Debug|Win32
- {4BCA7F35-0742-424F-8E50-39B934312F8F}.Debug|Win32.Build.0 = DLLwithHDF5_Debug|Win32
- {4BCA7F35-0742-424F-8E50-39B934312F8F}.DLLwithHDF5_Debug|Win32.ActiveCfg = DLLwithHDF5_Debug|Win32
- {4BCA7F35-0742-424F-8E50-39B934312F8F}.DLLwithHDF5_Debug|Win32.Build.0 = DLLwithHDF5_Debug|Win32
- {4BCA7F35-0742-424F-8E50-39B934312F8F}.DLLwithHDF5_Release|Win32.ActiveCfg = DLLwithHDF5_Release|Win32
- {4BCA7F35-0742-424F-8E50-39B934312F8F}.DLLwithHDF5_Release|Win32.Build.0 = DLLwithHDF5_Release|Win32
- {4BCA7F35-0742-424F-8E50-39B934312F8F}.Release|Win32.ActiveCfg = DLLwithHDF5_Release|Win32
- {4BCA7F35-0742-424F-8E50-39B934312F8F}.Release|Win32.Build.0 = DLLwithHDF5_Release|Win32
- {2AFC873D-E906-4145-A0CB-6264E8CAE97D}.Debug|Win32.ActiveCfg = DLLwithHDF5_Debug|Win32
- {2AFC873D-E906-4145-A0CB-6264E8CAE97D}.Debug|Win32.Build.0 = DLLwithHDF5_Debug|Win32
- {2AFC873D-E906-4145-A0CB-6264E8CAE97D}.DLLwithHDF5_Debug|Win32.ActiveCfg = DLLwithHDF5_Debug|Win32
- {2AFC873D-E906-4145-A0CB-6264E8CAE97D}.DLLwithHDF5_Debug|Win32.Build.0 = DLLwithHDF5_Debug|Win32
- {2AFC873D-E906-4145-A0CB-6264E8CAE97D}.DLLwithHDF5_Release|Win32.ActiveCfg = DLLwithHDF5_Release|Win32
- {2AFC873D-E906-4145-A0CB-6264E8CAE97D}.DLLwithHDF5_Release|Win32.Build.0 = DLLwithHDF5_Release|Win32
- {2AFC873D-E906-4145-A0CB-6264E8CAE97D}.Release|Win32.ActiveCfg = DLLwithHDF5_Release|Win32
- {2AFC873D-E906-4145-A0CB-6264E8CAE97D}.Release|Win32.Build.0 = DLLwithHDF5_Release|Win32
- {A76CCA62-BC5F-44F8-B090-9C45DA138680}.Debug|Win32.ActiveCfg = DLLwithHDF5_Debug|Win32
- {A76CCA62-BC5F-44F8-B090-9C45DA138680}.Debug|Win32.Build.0 = DLLwithHDF5_Debug|Win32
- {A76CCA62-BC5F-44F8-B090-9C45DA138680}.DLLwithHDF5_Debug|Win32.ActiveCfg = DLLwithHDF5_Debug|Win32
- {A76CCA62-BC5F-44F8-B090-9C45DA138680}.DLLwithHDF5_Debug|Win32.Build.0 = DLLwithHDF5_Debug|Win32
- {A76CCA62-BC5F-44F8-B090-9C45DA138680}.DLLwithHDF5_Release|Win32.ActiveCfg = DLLwithHDF5_Release|Win32
- {A76CCA62-BC5F-44F8-B090-9C45DA138680}.DLLwithHDF5_Release|Win32.Build.0 = DLLwithHDF5_Release|Win32
- {A76CCA62-BC5F-44F8-B090-9C45DA138680}.Release|Win32.ActiveCfg = DLLwithHDF5_Release|Win32
- {A76CCA62-BC5F-44F8-B090-9C45DA138680}.Release|Win32.Build.0 = DLLwithHDF5_Release|Win32
- {4F6A7EC6-F141-4512-B2A8-D108CBD6FAC1}.Debug|Win32.ActiveCfg = DLLwithHDF5_Debug|Win32
- {4F6A7EC6-F141-4512-B2A8-D108CBD6FAC1}.Debug|Win32.Build.0 = DLLwithHDF5_Debug|Win32
- {4F6A7EC6-F141-4512-B2A8-D108CBD6FAC1}.DLLwithHDF5_Debug|Win32.ActiveCfg = DLLwithHDF5_Debug|Win32
- {4F6A7EC6-F141-4512-B2A8-D108CBD6FAC1}.DLLwithHDF5_Debug|Win32.Build.0 = DLLwithHDF5_Debug|Win32
- {4F6A7EC6-F141-4512-B2A8-D108CBD6FAC1}.DLLwithHDF5_Release|Win32.ActiveCfg = DLLwithHDF5_Release|Win32
- {4F6A7EC6-F141-4512-B2A8-D108CBD6FAC1}.DLLwithHDF5_Release|Win32.Build.0 = DLLwithHDF5_Release|Win32
- {4F6A7EC6-F141-4512-B2A8-D108CBD6FAC1}.Release|Win32.ActiveCfg = DLLwithHDF5_Release|Win32
- {4F6A7EC6-F141-4512-B2A8-D108CBD6FAC1}.Release|Win32.Build.0 = DLLwithHDF5_Release|Win32
- {025CFEA1-6C43-404D-9DA4-5392A17FA162}.Debug|Win32.ActiveCfg = DLLwithHDF5_Debug|Win32
- {025CFEA1-6C43-404D-9DA4-5392A17FA162}.Debug|Win32.Build.0 = DLLwithHDF5_Debug|Win32
- {025CFEA1-6C43-404D-9DA4-5392A17FA162}.DLLwithHDF5_Debug|Win32.ActiveCfg = DLLwithHDF5_Debug|Win32
- {025CFEA1-6C43-404D-9DA4-5392A17FA162}.DLLwithHDF5_Debug|Win32.Build.0 = DLLwithHDF5_Debug|Win32
- {025CFEA1-6C43-404D-9DA4-5392A17FA162}.DLLwithHDF5_Release|Win32.ActiveCfg = DLLwithHDF5_Release|Win32
- {025CFEA1-6C43-404D-9DA4-5392A17FA162}.DLLwithHDF5_Release|Win32.Build.0 = DLLwithHDF5_Release|Win32
- {025CFEA1-6C43-404D-9DA4-5392A17FA162}.Release|Win32.ActiveCfg = DLLwithHDF5_Release|Win32
- {025CFEA1-6C43-404D-9DA4-5392A17FA162}.Release|Win32.Build.0 = DLLwithHDF5_Release|Win32
- {8C6BC636-FF71-4D58-9D63-E12265523982}.Debug|Win32.ActiveCfg = DLLwithHDF5_Debug|Win32
- {8C6BC636-FF71-4D58-9D63-E12265523982}.Debug|Win32.Build.0 = DLLwithHDF5_Debug|Win32
- {8C6BC636-FF71-4D58-9D63-E12265523982}.DLLwithHDF5_Debug|Win32.ActiveCfg = DLLwithHDF5_Debug|Win32
- {8C6BC636-FF71-4D58-9D63-E12265523982}.DLLwithHDF5_Debug|Win32.Build.0 = DLLwithHDF5_Debug|Win32
- {8C6BC636-FF71-4D58-9D63-E12265523982}.DLLwithHDF5_Release|Win32.ActiveCfg = DLLwithHDF5_Release|Win32
- {8C6BC636-FF71-4D58-9D63-E12265523982}.DLLwithHDF5_Release|Win32.Build.0 = DLLwithHDF5_Release|Win32
- {8C6BC636-FF71-4D58-9D63-E12265523982}.Release|Win32.ActiveCfg = DLLwithHDF5_Release|Win32
- {8C6BC636-FF71-4D58-9D63-E12265523982}.Release|Win32.Build.0 = DLLwithHDF5_Release|Win32
- {4D5EA26A-8356-4665-A13D-51CCEE2BA7F4}.Debug|Win32.ActiveCfg = DLLwithHDF5_Debug|Win32
- {4D5EA26A-8356-4665-A13D-51CCEE2BA7F4}.Debug|Win32.Build.0 = DLLwithHDF5_Debug|Win32
- {4D5EA26A-8356-4665-A13D-51CCEE2BA7F4}.DLLwithHDF5_Debug|Win32.ActiveCfg = DLLwithHDF5_Debug|Win32
- {4D5EA26A-8356-4665-A13D-51CCEE2BA7F4}.DLLwithHDF5_Debug|Win32.Build.0 = DLLwithHDF5_Debug|Win32
- {4D5EA26A-8356-4665-A13D-51CCEE2BA7F4}.DLLwithHDF5_Release|Win32.ActiveCfg = DLLwithHDF5_Release|Win32
- {4D5EA26A-8356-4665-A13D-51CCEE2BA7F4}.DLLwithHDF5_Release|Win32.Build.0 = DLLwithHDF5_Release|Win32
- {4D5EA26A-8356-4665-A13D-51CCEE2BA7F4}.Release|Win32.ActiveCfg = DLLwithHDF5_Release|Win32
- {4D5EA26A-8356-4665-A13D-51CCEE2BA7F4}.Release|Win32.Build.0 = DLLwithHDF5_Release|Win32
- {A9F76A7B-20A1-4D93-9444-175824B7B3DF}.Debug|Win32.ActiveCfg = DLLwithHDF5_Debug|Win32
- {A9F76A7B-20A1-4D93-9444-175824B7B3DF}.Debug|Win32.Build.0 = DLLwithHDF5_Debug|Win32
- {A9F76A7B-20A1-4D93-9444-175824B7B3DF}.DLLwithHDF5_Debug|Win32.ActiveCfg = DLLwithHDF5_Debug|Win32
- {A9F76A7B-20A1-4D93-9444-175824B7B3DF}.DLLwithHDF5_Debug|Win32.Build.0 = DLLwithHDF5_Debug|Win32
- {A9F76A7B-20A1-4D93-9444-175824B7B3DF}.DLLwithHDF5_Release|Win32.ActiveCfg = DLLwithHDF5_Release|Win32
- {A9F76A7B-20A1-4D93-9444-175824B7B3DF}.DLLwithHDF5_Release|Win32.Build.0 = DLLwithHDF5_Release|Win32
- {A9F76A7B-20A1-4D93-9444-175824B7B3DF}.Release|Win32.ActiveCfg = DLLwithHDF5_Release|Win32
- {A9F76A7B-20A1-4D93-9444-175824B7B3DF}.Release|Win32.Build.0 = DLLwithHDF5_Release|Win32
- {B3C7F964-68B8-4F8C-B5E7-7607836FB101}.Debug|Win32.ActiveCfg = DLLwithHDF5_Debug|Win32
- {B3C7F964-68B8-4F8C-B5E7-7607836FB101}.Debug|Win32.Build.0 = DLLwithHDF5_Debug|Win32
- {B3C7F964-68B8-4F8C-B5E7-7607836FB101}.DLLwithHDF5_Debug|Win32.ActiveCfg = DLLwithHDF5_Debug|Win32
- {B3C7F964-68B8-4F8C-B5E7-7607836FB101}.DLLwithHDF5_Debug|Win32.Build.0 = DLLwithHDF5_Debug|Win32
- {B3C7F964-68B8-4F8C-B5E7-7607836FB101}.DLLwithHDF5_Release|Win32.ActiveCfg = DLLwithHDF5_Release|Win32
- {B3C7F964-68B8-4F8C-B5E7-7607836FB101}.DLLwithHDF5_Release|Win32.Build.0 = DLLwithHDF5_Release|Win32
- {B3C7F964-68B8-4F8C-B5E7-7607836FB101}.Release|Win32.ActiveCfg = DLLwithHDF5_Release|Win32
- {B3C7F964-68B8-4F8C-B5E7-7607836FB101}.Release|Win32.Build.0 = DLLwithHDF5_Release|Win32
- {7AB46C61-04D5-4E77-AD3F-E7726F3E173A}.Debug|Win32.ActiveCfg = DLLwithHDF5_Debug|Win32
- {7AB46C61-04D5-4E77-AD3F-E7726F3E173A}.Debug|Win32.Build.0 = DLLwithHDF5_Debug|Win32
- {7AB46C61-04D5-4E77-AD3F-E7726F3E173A}.DLLwithHDF5_Debug|Win32.ActiveCfg = DLLwithHDF5_Debug|Win32
- {7AB46C61-04D5-4E77-AD3F-E7726F3E173A}.DLLwithHDF5_Debug|Win32.Build.0 = DLLwithHDF5_Debug|Win32
- {7AB46C61-04D5-4E77-AD3F-E7726F3E173A}.DLLwithHDF5_Release|Win32.ActiveCfg = DLLwithHDF5_Release|Win32
- {7AB46C61-04D5-4E77-AD3F-E7726F3E173A}.DLLwithHDF5_Release|Win32.Build.0 = DLLwithHDF5_Release|Win32
- {7AB46C61-04D5-4E77-AD3F-E7726F3E173A}.Release|Win32.ActiveCfg = DLLwithHDF5_Release|Win32
- {7AB46C61-04D5-4E77-AD3F-E7726F3E173A}.Release|Win32.Build.0 = DLLwithHDF5_Release|Win32
- {7A5F618C-F98A-4F8E-BBC7-C4F5C6BCD5A4}.Debug|Win32.ActiveCfg = DLLwithHDF5_Debug|Win32
- {7A5F618C-F98A-4F8E-BBC7-C4F5C6BCD5A4}.Debug|Win32.Build.0 = DLLwithHDF5_Debug|Win32
- {7A5F618C-F98A-4F8E-BBC7-C4F5C6BCD5A4}.DLLwithHDF5_Debug|Win32.ActiveCfg = DLLwithHDF5_Debug|Win32
- {7A5F618C-F98A-4F8E-BBC7-C4F5C6BCD5A4}.DLLwithHDF5_Debug|Win32.Build.0 = DLLwithHDF5_Debug|Win32
- {7A5F618C-F98A-4F8E-BBC7-C4F5C6BCD5A4}.DLLwithHDF5_Release|Win32.ActiveCfg = DLLwithHDF5_Release|Win32
- {7A5F618C-F98A-4F8E-BBC7-C4F5C6BCD5A4}.DLLwithHDF5_Release|Win32.Build.0 = DLLwithHDF5_Release|Win32
- {7A5F618C-F98A-4F8E-BBC7-C4F5C6BCD5A4}.Release|Win32.ActiveCfg = DLLwithHDF5_Release|Win32
- {7A5F618C-F98A-4F8E-BBC7-C4F5C6BCD5A4}.Release|Win32.Build.0 = DLLwithHDF5_Release|Win32
- {27C64509-94EB-406D-9978-93AE531CEB1E}.Debug|Win32.ActiveCfg = DLLwithHDF5_Debug|Win32
- {27C64509-94EB-406D-9978-93AE531CEB1E}.Debug|Win32.Build.0 = DLLwithHDF5_Debug|Win32
- {27C64509-94EB-406D-9978-93AE531CEB1E}.DLLwithHDF5_Debug|Win32.ActiveCfg = DLLwithHDF5_Debug|Win32
- {27C64509-94EB-406D-9978-93AE531CEB1E}.DLLwithHDF5_Debug|Win32.Build.0 = DLLwithHDF5_Debug|Win32
- {27C64509-94EB-406D-9978-93AE531CEB1E}.DLLwithHDF5_Release|Win32.ActiveCfg = DLLwithHDF5_Release|Win32
- {27C64509-94EB-406D-9978-93AE531CEB1E}.DLLwithHDF5_Release|Win32.Build.0 = DLLwithHDF5_Release|Win32
- {27C64509-94EB-406D-9978-93AE531CEB1E}.Release|Win32.ActiveCfg = DLLwithHDF5_Release|Win32
- {27C64509-94EB-406D-9978-93AE531CEB1E}.Release|Win32.Build.0 = DLLwithHDF5_Release|Win32
- {8C02951E-155B-4D09-A1DD-F98695F02A0E}.Debug|Win32.ActiveCfg = DLLwithHDF5_Debug|Win32
- {8C02951E-155B-4D09-A1DD-F98695F02A0E}.Debug|Win32.Build.0 = DLLwithHDF5_Debug|Win32
- {8C02951E-155B-4D09-A1DD-F98695F02A0E}.DLLwithHDF5_Debug|Win32.ActiveCfg = DLLwithHDF5_Debug|Win32
- {8C02951E-155B-4D09-A1DD-F98695F02A0E}.DLLwithHDF5_Debug|Win32.Build.0 = DLLwithHDF5_Debug|Win32
- {8C02951E-155B-4D09-A1DD-F98695F02A0E}.DLLwithHDF5_Release|Win32.ActiveCfg = DLLwithHDF5_Release|Win32
- {8C02951E-155B-4D09-A1DD-F98695F02A0E}.DLLwithHDF5_Release|Win32.Build.0 = DLLwithHDF5_Release|Win32
- {8C02951E-155B-4D09-A1DD-F98695F02A0E}.Release|Win32.ActiveCfg = DLLwithHDF5_Release|Win32
- {8C02951E-155B-4D09-A1DD-F98695F02A0E}.Release|Win32.Build.0 = DLLwithHDF5_Release|Win32
- {29110B58-9FD5-4A8E-B9F7-064650EE16C6}.Debug|Win32.ActiveCfg = DLLwithHDF5_Debug|Win32
- {29110B58-9FD5-4A8E-B9F7-064650EE16C6}.Debug|Win32.Build.0 = DLLwithHDF5_Debug|Win32
- {29110B58-9FD5-4A8E-B9F7-064650EE16C6}.DLLwithHDF5_Debug|Win32.ActiveCfg = DLLwithHDF5_Debug|Win32
- {29110B58-9FD5-4A8E-B9F7-064650EE16C6}.DLLwithHDF5_Debug|Win32.Build.0 = DLLwithHDF5_Debug|Win32
- {29110B58-9FD5-4A8E-B9F7-064650EE16C6}.DLLwithHDF5_Release|Win32.ActiveCfg = DLLwithHDF5_Release|Win32
- {29110B58-9FD5-4A8E-B9F7-064650EE16C6}.DLLwithHDF5_Release|Win32.Build.0 = DLLwithHDF5_Release|Win32
- {29110B58-9FD5-4A8E-B9F7-064650EE16C6}.Release|Win32.ActiveCfg = DLLwithHDF5_Release|Win32
- {29110B58-9FD5-4A8E-B9F7-064650EE16C6}.Release|Win32.Build.0 = DLLwithHDF5_Release|Win32
- {D47B6498-6A8D-4E87-A3B6-C6D08DF29FE2}.Debug|Win32.ActiveCfg = DLLwithHDF5_Debug|Win32
- {D47B6498-6A8D-4E87-A3B6-C6D08DF29FE2}.Debug|Win32.Build.0 = DLLwithHDF5_Debug|Win32
- {D47B6498-6A8D-4E87-A3B6-C6D08DF29FE2}.DLLwithHDF5_Debug|Win32.ActiveCfg = DLLwithHDF5_Debug|Win32
- {D47B6498-6A8D-4E87-A3B6-C6D08DF29FE2}.DLLwithHDF5_Debug|Win32.Build.0 = DLLwithHDF5_Debug|Win32
- {D47B6498-6A8D-4E87-A3B6-C6D08DF29FE2}.DLLwithHDF5_Release|Win32.ActiveCfg = DLLwithHDF5_Release|Win32
- {D47B6498-6A8D-4E87-A3B6-C6D08DF29FE2}.DLLwithHDF5_Release|Win32.Build.0 = DLLwithHDF5_Release|Win32
- {D47B6498-6A8D-4E87-A3B6-C6D08DF29FE2}.Release|Win32.ActiveCfg = DLLwithHDF5_Release|Win32
- {D47B6498-6A8D-4E87-A3B6-C6D08DF29FE2}.Release|Win32.Build.0 = DLLwithHDF5_Release|Win32
- {64A6CE79-710F-405C-AAE8-F604E74A4374}.Debug|Win32.ActiveCfg = DLLwithHDF5_Debug|Win32
- {64A6CE79-710F-405C-AAE8-F604E74A4374}.Debug|Win32.Build.0 = DLLwithHDF5_Debug|Win32
- {64A6CE79-710F-405C-AAE8-F604E74A4374}.DLLwithHDF5_Debug|Win32.ActiveCfg = DLLwithHDF5_Debug|Win32
- {64A6CE79-710F-405C-AAE8-F604E74A4374}.DLLwithHDF5_Debug|Win32.Build.0 = DLLwithHDF5_Debug|Win32
- {64A6CE79-710F-405C-AAE8-F604E74A4374}.DLLwithHDF5_Release|Win32.ActiveCfg = DLLwithHDF5_Release|Win32
- {64A6CE79-710F-405C-AAE8-F604E74A4374}.DLLwithHDF5_Release|Win32.Build.0 = DLLwithHDF5_Release|Win32
- {64A6CE79-710F-405C-AAE8-F604E74A4374}.Release|Win32.ActiveCfg = DLLwithHDF5_Release|Win32
- {64A6CE79-710F-405C-AAE8-F604E74A4374}.Release|Win32.Build.0 = DLLwithHDF5_Release|Win32
- {C065DCD0-DE87-4B6E-A1E6-8F7EDB272D53}.Debug|Win32.ActiveCfg = DLLwithHDF5_Debug|Win32
- {C065DCD0-DE87-4B6E-A1E6-8F7EDB272D53}.Debug|Win32.Build.0 = DLLwithHDF5_Debug|Win32
- {C065DCD0-DE87-4B6E-A1E6-8F7EDB272D53}.DLLwithHDF5_Debug|Win32.ActiveCfg = DLLwithHDF5_Debug|Win32
- {C065DCD0-DE87-4B6E-A1E6-8F7EDB272D53}.DLLwithHDF5_Debug|Win32.Build.0 = DLLwithHDF5_Debug|Win32
- {C065DCD0-DE87-4B6E-A1E6-8F7EDB272D53}.DLLwithHDF5_Release|Win32.ActiveCfg = DLLwithHDF5_Release|Win32
- {C065DCD0-DE87-4B6E-A1E6-8F7EDB272D53}.DLLwithHDF5_Release|Win32.Build.0 = DLLwithHDF5_Release|Win32
- {C065DCD0-DE87-4B6E-A1E6-8F7EDB272D53}.Release|Win32.ActiveCfg = DLLwithHDF5_Release|Win32
- {C065DCD0-DE87-4B6E-A1E6-8F7EDB272D53}.Release|Win32.Build.0 = DLLwithHDF5_Release|Win32
- {9B955616-D58C-4ED8-AB6F-FBA74E768B54}.Debug|Win32.ActiveCfg = DLLwithHDF5_Debug|Win32
- {9B955616-D58C-4ED8-AB6F-FBA74E768B54}.Debug|Win32.Build.0 = DLLwithHDF5_Debug|Win32
- {9B955616-D58C-4ED8-AB6F-FBA74E768B54}.DLLwithHDF5_Debug|Win32.ActiveCfg = DLLwithHDF5_Debug|Win32
- {9B955616-D58C-4ED8-AB6F-FBA74E768B54}.DLLwithHDF5_Debug|Win32.Build.0 = DLLwithHDF5_Debug|Win32
- {9B955616-D58C-4ED8-AB6F-FBA74E768B54}.DLLwithHDF5_Release|Win32.ActiveCfg = DLLwithHDF5_Release|Win32
- {9B955616-D58C-4ED8-AB6F-FBA74E768B54}.DLLwithHDF5_Release|Win32.Build.0 = DLLwithHDF5_Release|Win32
- {9B955616-D58C-4ED8-AB6F-FBA74E768B54}.Release|Win32.ActiveCfg = DLLwithHDF5_Release|Win32
- {9B955616-D58C-4ED8-AB6F-FBA74E768B54}.Release|Win32.Build.0 = DLLwithHDF5_Release|Win32
- {94D10A14-5A9B-4E1E-B204-DE3196750126}.Debug|Win32.ActiveCfg = DLLwithHDF5_Debug|Win32
- {94D10A14-5A9B-4E1E-B204-DE3196750126}.Debug|Win32.Build.0 = DLLwithHDF5_Debug|Win32
- {94D10A14-5A9B-4E1E-B204-DE3196750126}.DLLwithHDF5_Debug|Win32.ActiveCfg = DLLwithHDF5_Debug|Win32
- {94D10A14-5A9B-4E1E-B204-DE3196750126}.DLLwithHDF5_Debug|Win32.Build.0 = DLLwithHDF5_Debug|Win32
- {94D10A14-5A9B-4E1E-B204-DE3196750126}.DLLwithHDF5_Release|Win32.ActiveCfg = DLLwithHDF5_Release|Win32
- {94D10A14-5A9B-4E1E-B204-DE3196750126}.DLLwithHDF5_Release|Win32.Build.0 = DLLwithHDF5_Release|Win32
- {94D10A14-5A9B-4E1E-B204-DE3196750126}.Release|Win32.ActiveCfg = DLLwithHDF5_Release|Win32
- {94D10A14-5A9B-4E1E-B204-DE3196750126}.Release|Win32.Build.0 = DLLwithHDF5_Release|Win32
- {CBBCFD38-0F91-4CA2-8CBF-2833AC284438}.Debug|Win32.ActiveCfg = DLLwithHDF5_Debug|Win32
- {CBBCFD38-0F91-4CA2-8CBF-2833AC284438}.Debug|Win32.Build.0 = DLLwithHDF5_Debug|Win32
- {CBBCFD38-0F91-4CA2-8CBF-2833AC284438}.DLLwithHDF5_Debug|Win32.ActiveCfg = DLLwithHDF5_Debug|Win32
- {CBBCFD38-0F91-4CA2-8CBF-2833AC284438}.DLLwithHDF5_Debug|Win32.Build.0 = DLLwithHDF5_Debug|Win32
- {CBBCFD38-0F91-4CA2-8CBF-2833AC284438}.DLLwithHDF5_Release|Win32.ActiveCfg = DLLwithHDF5_Release|Win32
- {CBBCFD38-0F91-4CA2-8CBF-2833AC284438}.DLLwithHDF5_Release|Win32.Build.0 = DLLwithHDF5_Release|Win32
- {CBBCFD38-0F91-4CA2-8CBF-2833AC284438}.Release|Win32.ActiveCfg = DLLwithHDF5_Release|Win32
- {CBBCFD38-0F91-4CA2-8CBF-2833AC284438}.Release|Win32.Build.0 = DLLwithHDF5_Release|Win32
- {B8FE1ABF-E1AD-41C7-AFAE-333BAB3636E1}.Debug|Win32.ActiveCfg = DLLwithHDF5_Debug|Win32
- {B8FE1ABF-E1AD-41C7-AFAE-333BAB3636E1}.Debug|Win32.Build.0 = DLLwithHDF5_Debug|Win32
- {B8FE1ABF-E1AD-41C7-AFAE-333BAB3636E1}.DLLwithHDF5_Debug|Win32.ActiveCfg = DLLwithHDF5_Debug|Win32
- {B8FE1ABF-E1AD-41C7-AFAE-333BAB3636E1}.DLLwithHDF5_Debug|Win32.Build.0 = DLLwithHDF5_Debug|Win32
- {B8FE1ABF-E1AD-41C7-AFAE-333BAB3636E1}.DLLwithHDF5_Release|Win32.ActiveCfg = DLLwithHDF5_Release|Win32
- {B8FE1ABF-E1AD-41C7-AFAE-333BAB3636E1}.DLLwithHDF5_Release|Win32.Build.0 = DLLwithHDF5_Release|Win32
- {B8FE1ABF-E1AD-41C7-AFAE-333BAB3636E1}.Release|Win32.ActiveCfg = DLLwithHDF5_Release|Win32
- {B8FE1ABF-E1AD-41C7-AFAE-333BAB3636E1}.Release|Win32.Build.0 = DLLwithHDF5_Release|Win32
- {69340E63-F15C-4A33-85B7-344666F8F25C}.Debug|Win32.ActiveCfg = DLLwithHDF5_Debug|Win32
- {69340E63-F15C-4A33-85B7-344666F8F25C}.Debug|Win32.Build.0 = DLLwithHDF5_Debug|Win32
- {69340E63-F15C-4A33-85B7-344666F8F25C}.DLLwithHDF5_Debug|Win32.ActiveCfg = DLLwithHDF5_Debug|Win32
- {69340E63-F15C-4A33-85B7-344666F8F25C}.DLLwithHDF5_Debug|Win32.Build.0 = DLLwithHDF5_Debug|Win32
- {69340E63-F15C-4A33-85B7-344666F8F25C}.DLLwithHDF5_Release|Win32.ActiveCfg = DLLwithHDF5_Release|Win32
- {69340E63-F15C-4A33-85B7-344666F8F25C}.DLLwithHDF5_Release|Win32.Build.0 = DLLwithHDF5_Release|Win32
- {69340E63-F15C-4A33-85B7-344666F8F25C}.Release|Win32.ActiveCfg = DLLwithHDF5_Release|Win32
- {69340E63-F15C-4A33-85B7-344666F8F25C}.Release|Win32.Build.0 = DLLwithHDF5_Release|Win32
- {D839F6C1-3736-4269-A5E7-30B2BC1CBCCD}.Debug|Win32.ActiveCfg = DLLwithHDF5_Debug|Win32
- {D839F6C1-3736-4269-A5E7-30B2BC1CBCCD}.Debug|Win32.Build.0 = DLLwithHDF5_Debug|Win32
- {D839F6C1-3736-4269-A5E7-30B2BC1CBCCD}.DLLwithHDF5_Debug|Win32.ActiveCfg = DLLwithHDF5_Debug|Win32
- {D839F6C1-3736-4269-A5E7-30B2BC1CBCCD}.DLLwithHDF5_Debug|Win32.Build.0 = DLLwithHDF5_Debug|Win32
- {D839F6C1-3736-4269-A5E7-30B2BC1CBCCD}.DLLwithHDF5_Release|Win32.ActiveCfg = DLLwithHDF5_Release|Win32
- {D839F6C1-3736-4269-A5E7-30B2BC1CBCCD}.DLLwithHDF5_Release|Win32.Build.0 = DLLwithHDF5_Release|Win32
- {D839F6C1-3736-4269-A5E7-30B2BC1CBCCD}.Release|Win32.ActiveCfg = DLLwithHDF5_Release|Win32
- {D839F6C1-3736-4269-A5E7-30B2BC1CBCCD}.Release|Win32.Build.0 = DLLwithHDF5_Release|Win32
- {A1F2E6F2-6E49-4746-9133-9DF0A404C7DB}.Debug|Win32.ActiveCfg = DLLwithHDF5_Debug|Win32
- {A1F2E6F2-6E49-4746-9133-9DF0A404C7DB}.Debug|Win32.Build.0 = DLLwithHDF5_Debug|Win32
- {A1F2E6F2-6E49-4746-9133-9DF0A404C7DB}.DLLwithHDF5_Debug|Win32.ActiveCfg = DLLwithHDF5_Debug|Win32
- {A1F2E6F2-6E49-4746-9133-9DF0A404C7DB}.DLLwithHDF5_Debug|Win32.Build.0 = DLLwithHDF5_Debug|Win32
- {A1F2E6F2-6E49-4746-9133-9DF0A404C7DB}.DLLwithHDF5_Release|Win32.ActiveCfg = DLLwithHDF5_Release|Win32
- {A1F2E6F2-6E49-4746-9133-9DF0A404C7DB}.DLLwithHDF5_Release|Win32.Build.0 = DLLwithHDF5_Release|Win32
- {A1F2E6F2-6E49-4746-9133-9DF0A404C7DB}.Release|Win32.ActiveCfg = DLLwithHDF5_Release|Win32
- {A1F2E6F2-6E49-4746-9133-9DF0A404C7DB}.Release|Win32.Build.0 = DLLwithHDF5_Release|Win32
- {D08D4EA4-8AF5-4FD2-BFBE-4FFB247B2A35}.Debug|Win32.ActiveCfg = DLLwithHDF5_Debug|Win32
- {D08D4EA4-8AF5-4FD2-BFBE-4FFB247B2A35}.Debug|Win32.Build.0 = DLLwithHDF5_Debug|Win32
- {D08D4EA4-8AF5-4FD2-BFBE-4FFB247B2A35}.DLLwithHDF5_Debug|Win32.ActiveCfg = DLLwithHDF5_Debug|Win32
- {D08D4EA4-8AF5-4FD2-BFBE-4FFB247B2A35}.DLLwithHDF5_Debug|Win32.Build.0 = DLLwithHDF5_Debug|Win32
- {D08D4EA4-8AF5-4FD2-BFBE-4FFB247B2A35}.DLLwithHDF5_Release|Win32.ActiveCfg = DLLwithHDF5_Release|Win32
- {D08D4EA4-8AF5-4FD2-BFBE-4FFB247B2A35}.DLLwithHDF5_Release|Win32.Build.0 = DLLwithHDF5_Release|Win32
- {D08D4EA4-8AF5-4FD2-BFBE-4FFB247B2A35}.Release|Win32.ActiveCfg = DLLwithHDF5_Release|Win32
- {D08D4EA4-8AF5-4FD2-BFBE-4FFB247B2A35}.Release|Win32.Build.0 = DLLwithHDF5_Release|Win32
- {595357B8-132D-4F3E-9679-6E52B474E8A5}.Debug|Win32.ActiveCfg = DLLwithHDF5_Debug|Win32
- {595357B8-132D-4F3E-9679-6E52B474E8A5}.Debug|Win32.Build.0 = DLLwithHDF5_Debug|Win32
- {595357B8-132D-4F3E-9679-6E52B474E8A5}.DLLwithHDF5_Debug|Win32.ActiveCfg = DLLwithHDF5_Debug|Win32
- {595357B8-132D-4F3E-9679-6E52B474E8A5}.DLLwithHDF5_Debug|Win32.Build.0 = DLLwithHDF5_Debug|Win32
- {595357B8-132D-4F3E-9679-6E52B474E8A5}.DLLwithHDF5_Release|Win32.ActiveCfg = DLLwithHDF5_Release|Win32
- {595357B8-132D-4F3E-9679-6E52B474E8A5}.DLLwithHDF5_Release|Win32.Build.0 = DLLwithHDF5_Release|Win32
- {595357B8-132D-4F3E-9679-6E52B474E8A5}.Release|Win32.ActiveCfg = DLLwithHDF5_Release|Win32
- {595357B8-132D-4F3E-9679-6E52B474E8A5}.Release|Win32.Build.0 = DLLwithHDF5_Release|Win32
- {EC9BB75A-9691-4DAF-A876-5116DDCBAFBC}.Debug|Win32.ActiveCfg = DLLwithHDF5_Debug|Win32
- {EC9BB75A-9691-4DAF-A876-5116DDCBAFBC}.Debug|Win32.Build.0 = DLLwithHDF5_Debug|Win32
- {EC9BB75A-9691-4DAF-A876-5116DDCBAFBC}.DLLwithHDF5_Debug|Win32.ActiveCfg = DLLwithHDF5_Debug|Win32
- {EC9BB75A-9691-4DAF-A876-5116DDCBAFBC}.DLLwithHDF5_Debug|Win32.Build.0 = DLLwithHDF5_Debug|Win32
- {EC9BB75A-9691-4DAF-A876-5116DDCBAFBC}.DLLwithHDF5_Release|Win32.ActiveCfg = DLLwithHDF5_Release|Win32
- {EC9BB75A-9691-4DAF-A876-5116DDCBAFBC}.DLLwithHDF5_Release|Win32.Build.0 = DLLwithHDF5_Release|Win32
- {EC9BB75A-9691-4DAF-A876-5116DDCBAFBC}.Release|Win32.ActiveCfg = DLLwithHDF5_Release|Win32
- {EC9BB75A-9691-4DAF-A876-5116DDCBAFBC}.Release|Win32.Build.0 = DLLwithHDF5_Release|Win32
- {12C054D3-D396-45F9-912E-8A7FF6548738}.Debug|Win32.ActiveCfg = DLLwithHDF5_Debug|Win32
- {12C054D3-D396-45F9-912E-8A7FF6548738}.Debug|Win32.Build.0 = DLLwithHDF5_Debug|Win32
- {12C054D3-D396-45F9-912E-8A7FF6548738}.DLLwithHDF5_Debug|Win32.ActiveCfg = DLLwithHDF5_Debug|Win32
- {12C054D3-D396-45F9-912E-8A7FF6548738}.DLLwithHDF5_Debug|Win32.Build.0 = DLLwithHDF5_Debug|Win32
- {12C054D3-D396-45F9-912E-8A7FF6548738}.DLLwithHDF5_Release|Win32.ActiveCfg = DLLwithHDF5_Release|Win32
- {12C054D3-D396-45F9-912E-8A7FF6548738}.DLLwithHDF5_Release|Win32.Build.0 = DLLwithHDF5_Release|Win32
- {12C054D3-D396-45F9-912E-8A7FF6548738}.Release|Win32.ActiveCfg = DLLwithHDF5_Release|Win32
- {12C054D3-D396-45F9-912E-8A7FF6548738}.Release|Win32.Build.0 = DLLwithHDF5_Release|Win32
- {BCC584B3-571E-4441-8ABF-D2CDD0646116}.Debug|Win32.ActiveCfg = DLLwithHDF5_Debug|Win32
- {BCC584B3-571E-4441-8ABF-D2CDD0646116}.Debug|Win32.Build.0 = DLLwithHDF5_Debug|Win32
- {BCC584B3-571E-4441-8ABF-D2CDD0646116}.DLLwithHDF5_Debug|Win32.ActiveCfg = DLLwithHDF5_Debug|Win32
- {BCC584B3-571E-4441-8ABF-D2CDD0646116}.DLLwithHDF5_Debug|Win32.Build.0 = DLLwithHDF5_Debug|Win32
- {BCC584B3-571E-4441-8ABF-D2CDD0646116}.DLLwithHDF5_Release|Win32.ActiveCfg = DLLwithHDF5_Release|Win32
- {BCC584B3-571E-4441-8ABF-D2CDD0646116}.DLLwithHDF5_Release|Win32.Build.0 = DLLwithHDF5_Release|Win32
- {BCC584B3-571E-4441-8ABF-D2CDD0646116}.Release|Win32.ActiveCfg = DLLwithHDF5_Release|Win32
- {BCC584B3-571E-4441-8ABF-D2CDD0646116}.Release|Win32.Build.0 = DLLwithHDF5_Release|Win32
- {A8A0C0C5-A117-4430-B47A-E98603255D01}.Debug|Win32.ActiveCfg = DLLwithHDF5_Debug|Win32
- {A8A0C0C5-A117-4430-B47A-E98603255D01}.Debug|Win32.Build.0 = DLLwithHDF5_Debug|Win32
- {A8A0C0C5-A117-4430-B47A-E98603255D01}.DLLwithHDF5_Debug|Win32.ActiveCfg = DLLwithHDF5_Debug|Win32
- {A8A0C0C5-A117-4430-B47A-E98603255D01}.DLLwithHDF5_Debug|Win32.Build.0 = DLLwithHDF5_Debug|Win32
- {A8A0C0C5-A117-4430-B47A-E98603255D01}.DLLwithHDF5_Release|Win32.ActiveCfg = DLLwithHDF5_Release|Win32
- {A8A0C0C5-A117-4430-B47A-E98603255D01}.DLLwithHDF5_Release|Win32.Build.0 = DLLwithHDF5_Release|Win32
- {A8A0C0C5-A117-4430-B47A-E98603255D01}.Release|Win32.ActiveCfg = DLLwithHDF5_Release|Win32
- {A8A0C0C5-A117-4430-B47A-E98603255D01}.Release|Win32.Build.0 = DLLwithHDF5_Release|Win32
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
-EndGlobal
diff --git a/SiloWindows/MSVC8/Tests/alltypes.vcproj b/SiloWindows/MSVC8/Tests/alltypes.vcproj
deleted file mode 100644
index 1176adb..0000000
--- a/SiloWindows/MSVC8/Tests/alltypes.vcproj
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="alltypes"
- ProjectGUID="{627C8E54-0ABD-4B8A-B76B-0BD13F5E684B}"
- RootNamespace="alltypes"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="DLLwithHDF5_Debug|Win32"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\alltypes"
- IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\alltypes"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName="$(OutDir)\alltypes.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..\..\..\src\silo"
- PreprocessorDefinitions="WIN32;_CONSOLE"
- BasicRuntimeChecks="3"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="$(OutDir)\alltypes.pch"
- AssemblerListingLocation="$(OutDir)\"
- ObjectFile="$(OutDir)\"
- ProgramDataBaseFileName="$(OutDir)\alltypes"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DebugInformationFormat="4"
- DisableSpecificWarnings="4244;4305"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="silohdf5.lib"
- OutputFile="$(SolutionDir)..\bin\alltypes.exe"
- LinkIncremental="2"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
- GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)\alltypes.pdb"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="DLLwithHDF5_Release|Win32"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\alltypes"
- IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\alltypes"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName="$(OutDir)\alltypes.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="..\..\..\src\silo"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- StringPooling="true"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="$(OutDir)\alltypes.pch"
- AssemblerListingLocation="$(OutDir)\"
- ObjectFile="$(OutDir)\"
- ProgramDataBaseFileName="$(OutDir)\"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DisableSpecificWarnings="4244;4305"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="silohdf5.lib"
- OutputFile="$(SolutionDir)..\bin\alltypes.exe"
- LinkIncremental="1"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
- ProgramDatabaseFile="$(OutDir)\alltypes.pdb"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath="..\..\..\tests\alltypes.c"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/SiloWindows/MSVC8/Tests/array.vcproj b/SiloWindows/MSVC8/Tests/array.vcproj
deleted file mode 100644
index 68813dc..0000000
--- a/SiloWindows/MSVC8/Tests/array.vcproj
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="array"
- ProjectGUID="{CB409787-8ACF-4854-A2AB-6CD727E7120D}"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="DLLwithHDF5_Debug|Win32"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\array"
- IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\array"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName="$(OutDir)\array.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..\..\..\src\silo"
- PreprocessorDefinitions="WIN32;_CONSOLE"
- BasicRuntimeChecks="3"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="$(OutDir)\array.pch"
- AssemblerListingLocation="$(OutDir)\"
- ObjectFile="$(OutDir)\"
- ProgramDataBaseFileName="$(OutDir)\array"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DebugInformationFormat="4"
- DisableSpecificWarnings="4244;4305"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="silohdf5.lib"
- OutputFile="$(SolutionDir)..\bin\array.exe"
- LinkIncremental="2"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
- GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)\array.pdb"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="DLLwithHDF5_Release|Win32"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\array"
- IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\array"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName="$(OutDir)\array.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="..\..\..\src\silo"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- StringPooling="true"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="$(OutDir)\array.pch"
- AssemblerListingLocation="$(OutDir)\"
- ObjectFile="$(OutDir)\"
- ProgramDataBaseFileName="$(OutDir)\"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DisableSpecificWarnings="4244;4305"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="silohdf5.lib"
- OutputFile="$(SolutionDir)..\bin\array.exe"
- LinkIncremental="1"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
- ProgramDatabaseFile="$(OutDir)\array.pdb"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath="..\..\..\tests\array.c"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/SiloWindows/MSVC8/Tests/array_f.vfproj b/SiloWindows/MSVC8/Tests/array_f.vfproj
deleted file mode 100644
index 7533a47..0000000
--- a/SiloWindows/MSVC8/Tests/array_f.vfproj
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VisualStudioProject ProjectCreator="Intel Fortran" Keyword="Console Application" Version="11.0" ProjectIdGuid="{A1F2E6F2-6E49-4746-9133-9DF0A404C7DB}">
- <Platforms>
- <Platform Name="Win32"/></Platforms>
- <Configurations>
- <Configuration Name="DLLwithHDF5_Debug|Win32" OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\array_f" IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\array_f">
- <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="..\..\..\src\silo" Interfaces="true" WarnInterfaces="true" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug"/>
- <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)..\bin\$(ProjectName).exe" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)" ManifestFile="$(IntDir)\$(TargetFileName).intermediate.manifest" GenerateDebugInformation="true" ProgramDatabaseFile="$(IntDir)$(TargetName).pdb" SubSystem="subSystemConsole" ImportLibrary="$(IntDir)\$(TargetName).lib" TargetMachine="machineX86" AdditionalDep [...]
- <Tool Name="VFResourceCompilerTool" ResourceOutputFileName="$(IntDir)\$(InputName).res"/>
- <Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(IntDir)\$(ProjectName).tlb"/>
- <Tool Name="VFCustomBuildTool"/>
- <Tool Name="VFPreLinkEventTool"/>
- <Tool Name="VFPreBuildEventTool"/>
- <Tool Name="VFPostBuildEventTool"/>
- <Tool Name="VFManifestTool" SuppressStartupBanner="true" OutputManifestFile="$(Intdir)\$(TargetFileName).embed.manifest" ResourceFile="$(IntDir)\$(TargetFileName).embed.manifest.res"/></Configuration>
- <Configuration Name="DLLwithHDF5_Release|Win32" OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\array_f" IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\array_f">
- <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" AdditionalIncludeDirectories="..\..\..\src\silo" DiagnosticsFile="$(IntDir)$(TargetName).diag" ModulePath="$(IntDir)" ObjectFile="$(IntDir)"/>
- <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)..\bin\$(ProjectName).exe" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)" ManifestFile="$(IntDir)\$(TargetFileName).intermediate.manifest" ProgramDatabaseFile="$(IntDir)$(TargetName).pdb" SubSystem="subSystemConsole" ImportLibrary="$(IntDir)\$(TargetName).lib" AdditionalDependencies="silohdf5.lib"/>
- <Tool Name="VFResourceCompilerTool" ResourceOutputFileName="$(IntDir)\$(InputName).res"/>
- <Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(IntDir)\$(ProjectName).tlb"/>
- <Tool Name="VFCustomBuildTool"/>
- <Tool Name="VFPreLinkEventTool"/>
- <Tool Name="VFPreBuildEventTool"/>
- <Tool Name="VFPostBuildEventTool"/>
- <Tool Name="VFManifestTool" SuppressStartupBanner="true" OutputManifestFile="$(Intdir)\$(TargetFileName).embed.manifest" ResourceFile="$(IntDir)\$(TargetFileName).embed.manifest.res"/></Configuration></Configurations>
- <Files>
- <Filter Name="Header Files" Filter="fi;fd"/>
- <Filter Name="Resource Files" Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"/>
- <Filter Name="Source Files" Filter="f90;for;f;fpp;ftn;def;odl;idl">
- <File RelativePath="..\..\..\tests\arrayf77.f"/></Filter></Files>
- <Globals/></VisualStudioProject>
diff --git a/SiloWindows/MSVC8/Tests/compression.vcproj b/SiloWindows/MSVC8/Tests/compression.vcproj
deleted file mode 100644
index 94b8497..0000000
--- a/SiloWindows/MSVC8/Tests/compression.vcproj
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="compression"
- ProjectGUID="{AA9DE89B-47C8-4164-944A-6D42B4AF0FEB}"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="DLLwithHDF5_Debug|Win32"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\compression"
- IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\compression"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName="$(OutDir)\compression.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..\..\..\src\silo"
- PreprocessorDefinitions="WIN32;_CONSOLE"
- BasicRuntimeChecks="3"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="$(OutDir)\compression.pch"
- AssemblerListingLocation="$(OutDir)\"
- ObjectFile="$(OutDir)\"
- ProgramDataBaseFileName="$(OutDir)\compression"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DebugInformationFormat="4"
- DisableSpecificWarnings="4244;4305"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="silohdf5.lib"
- OutputFile="$(SolutionDir)..\bin\compression.exe"
- LinkIncremental="2"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
- GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)\compression.pdb"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="DLLwithHDF5_Release|Win32"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\compression"
- IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\compression"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName="$(OutDir)\compression.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="..\..\..\src\silo"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- StringPooling="true"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="$(OutDir)\compression.pch"
- AssemblerListingLocation="$(OutDir)\"
- ObjectFile="$(OutDir)\"
- ProgramDataBaseFileName="$(OutDir)\"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DisableSpecificWarnings="4244;4305"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="silohdf5.lib"
- OutputFile="$(SolutionDir)..\bin\compression.exe"
- LinkIncremental="1"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
- ProgramDatabaseFile="$(OutDir)\compression.pdb"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath="..\..\..\tests\compression.c"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/SiloWindows/MSVC8/Tests/csg.vcproj b/SiloWindows/MSVC8/Tests/csg.vcproj
deleted file mode 100644
index a4dfca9..0000000
--- a/SiloWindows/MSVC8/Tests/csg.vcproj
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="csg"
- ProjectGUID="{6DE8948E-8CF8-4650-9749-1C21066AA957}"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="DLLwithHDF5_Debug|Win32"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\csg"
- IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\csg"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName="$(OutDir)\csg.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..\..\..\src\silo"
- PreprocessorDefinitions="WIN32;_CONSOLE"
- BasicRuntimeChecks="3"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="$(OutDir)\csg.pch"
- AssemblerListingLocation="$(OutDir)\"
- ObjectFile="$(OutDir)\"
- ProgramDataBaseFileName="$(OutDir)\csg"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DebugInformationFormat="4"
- DisableSpecificWarnings="4244;4305"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="silohdf5.lib"
- OutputFile="$(SolutionDir)..\bin\csg.exe"
- LinkIncremental="2"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
- GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)\csg.pdb"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="DLLwithHDF5_Release|Win32"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\csg"
- IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\csg"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName="$(OutDir)\csg.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="..\..\..\src\silo"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- StringPooling="true"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="$(OutDir)\csg.pch"
- AssemblerListingLocation="$(OutDir)\"
- ObjectFile="$(OutDir)\"
- ProgramDataBaseFileName="$(OutDir)\"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DisableSpecificWarnings="4244;4305"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="silohdf5.lib"
- OutputFile="$(SolutionDir)..\bin\csg.exe"
- LinkIncremental="1"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
- ProgramDatabaseFile="$(OutDir)\csg.pdb"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath="..\..\..\tests\csg.c"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/SiloWindows/MSVC8/Tests/curve_f.vfproj b/SiloWindows/MSVC8/Tests/curve_f.vfproj
deleted file mode 100644
index f6bab90..0000000
--- a/SiloWindows/MSVC8/Tests/curve_f.vfproj
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VisualStudioProject ProjectCreator="Intel Fortran" Keyword="Console Application" Version="11.0" ProjectIdGuid="{A1F2E6F2-6E49-4746-9133-9DF0A404C7DB}">
- <Platforms>
- <Platform Name="Win32"/></Platforms>
- <Configurations>
- <Configuration Name="DLLwithHDF5_Debug|Win32" OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\curve_f" IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\curve_f">
- <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="..\..\..\src\silo" Interfaces="true" WarnInterfaces="true" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug"/>
- <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)..\bin\$(ProjectName).exe" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)" ManifestFile="$(IntDir)\$(TargetFileName).intermediate.manifest" GenerateDebugInformation="true" ProgramDatabaseFile="$(IntDir)$(TargetName).pdb" SubSystem="subSystemConsole" ImportLibrary="$(IntDir)\$(TargetName).lib" TargetMachine="machineX86" AdditionalDep [...]
- <Tool Name="VFResourceCompilerTool" ResourceOutputFileName="$(IntDir)\$(InputName).res"/>
- <Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(IntDir)\$(ProjectName).tlb"/>
- <Tool Name="VFCustomBuildTool"/>
- <Tool Name="VFPreLinkEventTool"/>
- <Tool Name="VFPreBuildEventTool"/>
- <Tool Name="VFPostBuildEventTool"/>
- <Tool Name="VFManifestTool" SuppressStartupBanner="true" OutputManifestFile="$(Intdir)\$(TargetFileName).embed.manifest" ResourceFile="$(IntDir)\$(TargetFileName).embed.manifest.res"/></Configuration>
- <Configuration Name="DLLwithHDF5_Release|Win32" OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\curve_f" IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\curve_f">
- <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" AdditionalIncludeDirectories="..\..\..\src\silo" DiagnosticsFile="$(IntDir)$(TargetName).diag" ModulePath="$(IntDir)" ObjectFile="$(IntDir)"/>
- <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)..\bin\$(ProjectName).exe" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)" ManifestFile="$(IntDir)\$(TargetFileName).intermediate.manifest" ProgramDatabaseFile="$(IntDir)$(TargetName).pdb" SubSystem="subSystemConsole" ImportLibrary="$(IntDir)\$(TargetName).lib" AdditionalDependencies="silohdf5.lib"/>
- <Tool Name="VFResourceCompilerTool" ResourceOutputFileName="$(IntDir)\$(InputName).res"/>
- <Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(IntDir)\$(ProjectName).tlb"/>
- <Tool Name="VFCustomBuildTool"/>
- <Tool Name="VFPreLinkEventTool"/>
- <Tool Name="VFPreBuildEventTool"/>
- <Tool Name="VFPostBuildEventTool"/>
- <Tool Name="VFManifestTool" SuppressStartupBanner="true" OutputManifestFile="$(Intdir)\$(TargetFileName).embed.manifest" ResourceFile="$(IntDir)\$(TargetFileName).embed.manifest.res"/></Configuration></Configurations>
- <Files>
- <Filter Name="Header Files" Filter="fi;fd"/>
- <Filter Name="Resource Files" Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"/>
- <Filter Name="Source Files" Filter="f90;for;f;fpp;ftn;def;odl;idl">
- <File RelativePath="..\..\..\tests\curvef77.f"/></Filter></Files>
- <Globals/></VisualStudioProject>
diff --git a/SiloWindows/MSVC8/Tests/dirtest.vcproj b/SiloWindows/MSVC8/Tests/dirtest.vcproj
deleted file mode 100644
index 70dd5e7..0000000
--- a/SiloWindows/MSVC8/Tests/dirtest.vcproj
+++ /dev/null
@@ -1,216 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="dirtest"
- ProjectGUID="{B8FE1ABF-E1AD-41C7-AFAE-333BAB3636E1}"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="DLLwithHDF5_Debug|Win32"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\dirtest"
- IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\dirtest"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName="$(OutDir)\dirtest.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..\..\..\src\silo"
- PreprocessorDefinitions="WIN32;_CONSOLE"
- BasicRuntimeChecks="3"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="$(OutDir)\dirtest.pch"
- AssemblerListingLocation="$(OutDir)\"
- ObjectFile="$(OutDir)\"
- ProgramDataBaseFileName="$(OutDir)\dirtest"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DebugInformationFormat="4"
- DisableSpecificWarnings="4244;4305"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="silohdf5.lib"
- OutputFile="$(SolutionDir)..\bin\dirtest.exe"
- LinkIncremental="2"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
- GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)\dirtest.pdb"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="DLLwithHDF5_Release|Win32"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\dirtest"
- IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\dirtest"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName="$(OutDir)\dirtest.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="..\..\..\src\silo"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- StringPooling="true"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="$(OutDir)\dirtest.pch"
- AssemblerListingLocation="$(OutDir)\"
- ObjectFile="$(OutDir)\"
- ProgramDataBaseFileName="$(OutDir)\"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DisableSpecificWarnings="4244;4305"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="silohdf5.lib"
- OutputFile="$(SolutionDir)..\bin\dirtest.exe"
- LinkIncremental="1"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
- ProgramDatabaseFile="$(OutDir)\dirtest.pdb"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath="..\..\..\tests\dir.c"
- >
- </File>
- <File
- RelativePath="..\..\..\tests\testlib.c"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/SiloWindows/MSVC8/Tests/extface.vcproj b/SiloWindows/MSVC8/Tests/extface.vcproj
deleted file mode 100644
index 6b6810f..0000000
--- a/SiloWindows/MSVC8/Tests/extface.vcproj
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="extface"
- ProjectGUID="{3482A43B-3A21-4583-88C4-45A4422E2307}"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="DLLwithHDF5_Debug|Win32"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\extface"
- IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\extface"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName="$(OutDir)\extface.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..\..\..\src\silo"
- PreprocessorDefinitions="WIN32;_CONSOLE"
- BasicRuntimeChecks="3"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="$(OutDir)\extface.pch"
- AssemblerListingLocation="$(OutDir)\"
- ObjectFile="$(OutDir)\"
- ProgramDataBaseFileName="$(OutDir)\extface"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DebugInformationFormat="4"
- DisableSpecificWarnings="4244;4305"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="silohdf5.lib"
- OutputFile="$(SolutionDir)..\bin\extface.exe"
- LinkIncremental="2"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
- GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)\extface.pdb"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="DLLwithHDF5_Release|Win32"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\extface"
- IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\extface"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName="$(OutDir)\extface.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="..\..\..\src\silo"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- StringPooling="true"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="$(OutDir)\extface.pch"
- AssemblerListingLocation="$(OutDir)\"
- ObjectFile="$(OutDir)\"
- ProgramDataBaseFileName="$(OutDir)\"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DisableSpecificWarnings="4244;4305"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="silohdf5.lib"
- OutputFile="$(SolutionDir)..\bin\extface.exe"
- LinkIncremental="1"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
- ProgramDatabaseFile="$(OutDir)\extface.pdb"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath="..\..\..\tests\extface.c"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/SiloWindows/MSVC8/Tests/grab.vcproj b/SiloWindows/MSVC8/Tests/grab.vcproj
deleted file mode 100644
index de62a7f..0000000
--- a/SiloWindows/MSVC8/Tests/grab.vcproj
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="grab"
- ProjectGUID="{DCFFC0C8-1C81-4016-8364-1678FAB1D2D2}"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="DLLwithHDF5_Debug|Win32"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\grab"
- IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\grab"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName="$(OutDir)\grab.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..\..\include\WithHDF5;..\..\..\src\silo;$(HDF5_INC_DIR)"
- PreprocessorDefinitions="WIN32;_CONSOLE;_HDF5USEDLL_"
- BasicRuntimeChecks="3"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="$(OutDir)\grab.pch"
- AssemblerListingLocation="$(OutDir)\"
- ObjectFile="$(OutDir)\"
- ProgramDataBaseFileName="$(OutDir)\grab"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DebugInformationFormat="4"
- DisableSpecificWarnings="4244;4305"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="silohdf5.lib hdf5dll.lib"
- OutputFile="$(SolutionDir)..\bin\grab.exe"
- LinkIncremental="2"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName);$(HDF5_LIB_DIR)"
- GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)\grab.pdb"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="DLLwithHDF5_Release|Win32"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\grab"
- IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\grab"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName="$(OutDir)\grab.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="..\..\include\WithHDF5;..\..\..\src\silo;$(HDF5_INC_DIR)"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_HDF5USEDLL_"
- StringPooling="true"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="$(OutDir)\grab.pch"
- AssemblerListingLocation="$(OutDir)\"
- ObjectFile="$(OutDir)\"
- ProgramDataBaseFileName="$(OutDir)\"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DisableSpecificWarnings="4244;4305"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="silohdf5.lib hdf5dll.lib"
- OutputFile="$(SolutionDir)..\bin\grab.exe"
- LinkIncremental="1"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName);$(HDF5_LIB_DIR)"
- ProgramDatabaseFile="$(OutDir)\grab.pdb"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath="..\..\..\tests\grab.c"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/SiloWindows/MSVC8/Tests/group_test.vcproj b/SiloWindows/MSVC8/Tests/group_test.vcproj
deleted file mode 100644
index 4e941cf..0000000
--- a/SiloWindows/MSVC8/Tests/group_test.vcproj
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="group_test"
- ProjectGUID="{69340E63-F15C-4A33-85B7-344666F8F25C}"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="DLLwithHDF5_Debug|Win32"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\group_test"
- IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\group_test"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName="$(OutDir)\group_test.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..\..\..\src\silo"
- PreprocessorDefinitions="WIN32;_CONSOLE"
- BasicRuntimeChecks="3"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="$(OutDir)\group_test.pch"
- AssemblerListingLocation="$(OutDir)\"
- ObjectFile="$(OutDir)\"
- ProgramDataBaseFileName="$(OutDir)\group_test"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DebugInformationFormat="4"
- DisableSpecificWarnings="4244;4305"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="silohdf5.lib"
- OutputFile="$(SolutionDir)..\bin\group_test.exe"
- LinkIncremental="2"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
- GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)\group_test.pdb"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="DLLwithHDF5_Release|Win32"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\group_test"
- IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\group_test"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName="$(OutDir)\group_test.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="..\..\..\src\silo"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- StringPooling="true"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="$(OutDir)\group_test.pch"
- AssemblerListingLocation="$(OutDir)\"
- ObjectFile="$(OutDir)\"
- ProgramDataBaseFileName="$(OutDir)\"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DisableSpecificWarnings="4244;4305"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="silohdf5.lib"
- OutputFile="$(SolutionDir)..\bin\group_test.exe"
- LinkIncremental="1"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
- ProgramDatabaseFile="$(OutDir)\group_test.pdb"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath="..\..\..\tests\group_test.c"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/SiloWindows/MSVC8/Tests/largefile.vcproj b/SiloWindows/MSVC8/Tests/largefile.vcproj
deleted file mode 100644
index 7da0442..0000000
--- a/SiloWindows/MSVC8/Tests/largefile.vcproj
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="largefile"
- ProjectGUID="{EA0DA3EC-DD78-4C57-A0A9-F0EEAE35A85A}"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="DLLwithHDF5_Debug|Win32"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\largefile"
- IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\largefile"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName="$(OutDir)\largefile.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..\..\..\src\silo"
- PreprocessorDefinitions="WIN32;_CONSOLE"
- BasicRuntimeChecks="3"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="$(OutDir)\largefile.pch"
- AssemblerListingLocation="$(OutDir)\"
- ObjectFile="$(OutDir)\"
- ProgramDataBaseFileName="$(OutDir)\largefile"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DebugInformationFormat="4"
- DisableSpecificWarnings="4244;4305"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="silohdf5.lib"
- OutputFile="$(SolutionDir)..\bin\largefile.exe"
- LinkIncremental="2"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
- GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)\largefile.pdb"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="DLLwithHDF5_Release|Win32"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\largefile"
- IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\largefile"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName="$(OutDir)\largefile.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="..\..\..\src\silo"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- StringPooling="true"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="$(OutDir)\largefile.pch"
- AssemblerListingLocation="$(OutDir)\"
- ObjectFile="$(OutDir)\"
- ProgramDataBaseFileName="$(OutDir)\"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DisableSpecificWarnings="4244;4305"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="silohdf5.lib"
- OutputFile="$(SolutionDir)..\bin\largefile.exe"
- LinkIncremental="1"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
- ProgramDatabaseFile="$(OutDir)\largefile.pdb"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath="..\..\..\tests\largefile.c"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/SiloWindows/MSVC8/Tests/listtypes.vcproj b/SiloWindows/MSVC8/Tests/listtypes.vcproj
deleted file mode 100644
index 7a8a86b..0000000
--- a/SiloWindows/MSVC8/Tests/listtypes.vcproj
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="listtypes"
- ProjectGUID="{A79DA077-0644-4DA7-8D8A-BB115597F474}"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="DLLwithHDF5_Debug|Win32"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\listtypes"
- IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\listtypes"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName="$(OutDir)\listtypes.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..\..\..\src\silo"
- PreprocessorDefinitions="WIN32;_CONSOLE"
- BasicRuntimeChecks="3"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="$(OutDir)\listtypes.pch"
- AssemblerListingLocation="$(OutDir)\"
- ObjectFile="$(OutDir)\"
- ProgramDataBaseFileName="$(OutDir)\listtypes"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DebugInformationFormat="4"
- DisableSpecificWarnings="4244;4305"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="silohdf5.lib"
- OutputFile="$(SolutionDir)..\bin\listtypes.exe"
- LinkIncremental="2"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
- GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)\listtypes.pdb"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="DLLwithHDF5_Release|Win32"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\listtypes"
- IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\listtypes"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName="$(OutDir)\listtypes.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="..\..\..\src\silo"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- StringPooling="true"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="$(OutDir)\listtypes.pch"
- AssemblerListingLocation="$(OutDir)\"
- ObjectFile="$(OutDir)\"
- ProgramDataBaseFileName="$(OutDir)\"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DisableSpecificWarnings="4244;4305"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="silohdf5.lib"
- OutputFile="$(SolutionDir)..\bin\listtypes.exe"
- LinkIncremental="1"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
- ProgramDatabaseFile="$(OutDir)\listtypes.pdb"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath="..\..\..\tests\listtypes.c"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/SiloWindows/MSVC8/Tests/mat3d_3across.vcproj b/SiloWindows/MSVC8/Tests/mat3d_3across.vcproj
deleted file mode 100644
index bfae0a7..0000000
--- a/SiloWindows/MSVC8/Tests/mat3d_3across.vcproj
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="mat3d_3across"
- ProjectGUID="{CEA025B3-7259-4852-980F-CB39E8206304}"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="DLLwithHDF5_Debug|Win32"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\mat3d_3across"
- IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\mat3d_3across"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName="$(OutDir)\mat3d_3across.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..\..\..\src\silo"
- PreprocessorDefinitions="WIN32;_CONSOLE"
- BasicRuntimeChecks="3"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="$(OutDir)\mat3d_3across.pch"
- AssemblerListingLocation="$(OutDir)\"
- ObjectFile="$(OutDir)\"
- ProgramDataBaseFileName="$(OutDir)\mat3d_3across"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DebugInformationFormat="4"
- DisableSpecificWarnings="4244;4305"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="silohdf5.lib"
- OutputFile="$(SolutionDir)..\bin\mat3d_3across.exe"
- LinkIncremental="2"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
- GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)\mat3d_3across.pdb"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="DLLwithHDF5_Release|Win32"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\mat3d_3across"
- IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\mat3d_3across"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName="$(OutDir)\mat3d_3across.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="..\..\..\src\silo"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- StringPooling="true"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="$(OutDir)\mat3d_3across.pch"
- AssemblerListingLocation="$(OutDir)\"
- ObjectFile="$(OutDir)\"
- ProgramDataBaseFileName="$(OutDir)\"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DisableSpecificWarnings="4244;4305"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="silohdf5.lib"
- OutputFile="$(SolutionDir)..\bin\mat3d_3across.exe"
- LinkIncremental="1"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
- ProgramDatabaseFile="$(OutDir)\mat3d_3across.pdb"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath="..\..\..\tests\mat3d_3across.c"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/SiloWindows/MSVC8/Tests/mat_f.vfproj b/SiloWindows/MSVC8/Tests/mat_f.vfproj
deleted file mode 100644
index d81ba47..0000000
--- a/SiloWindows/MSVC8/Tests/mat_f.vfproj
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VisualStudioProject ProjectCreator="Intel Fortran" Keyword="Console Application" Version="11.0" ProjectIdGuid="{A1F2E6F2-6E49-4746-9133-9DF0A404C7DB}">
- <Platforms>
- <Platform Name="Win32"/></Platforms>
- <Configurations>
- <Configuration Name="DLLwithHDF5_Debug|Win32" OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\mat_f" IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\mat_f">
- <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="..\..\..\src\silo" Interfaces="true" WarnInterfaces="true" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug"/>
- <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)..\bin\$(ProjectName).exe" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)" ManifestFile="$(IntDir)\$(TargetFileName).intermediate.manifest" GenerateDebugInformation="true" ProgramDatabaseFile="$(IntDir)$(TargetName).pdb" SubSystem="subSystemConsole" ImportLibrary="$(IntDir)\$(TargetName).lib" TargetMachine="machineX86" AdditionalDep [...]
- <Tool Name="VFResourceCompilerTool" ResourceOutputFileName="$(IntDir)\$(InputName).res"/>
- <Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(IntDir)\$(ProjectName).tlb"/>
- <Tool Name="VFCustomBuildTool"/>
- <Tool Name="VFPreLinkEventTool"/>
- <Tool Name="VFPreBuildEventTool"/>
- <Tool Name="VFPostBuildEventTool"/>
- <Tool Name="VFManifestTool" SuppressStartupBanner="true" OutputManifestFile="$(Intdir)\$(TargetFileName).embed.manifest" ResourceFile="$(IntDir)\$(TargetFileName).embed.manifest.res"/></Configuration>
- <Configuration Name="DLLwithHDF5_Release|Win32" OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\mat_f" IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\mat_f">
- <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" AdditionalIncludeDirectories="..\..\..\src\silo" DiagnosticsFile="$(IntDir)$(TargetName).diag" ModulePath="$(IntDir)" ObjectFile="$(IntDir)"/>
- <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)..\bin\$(ProjectName).exe" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)" ManifestFile="$(IntDir)\$(TargetFileName).intermediate.manifest" ProgramDatabaseFile="$(IntDir)$(TargetName).pdb" SubSystem="subSystemConsole" ImportLibrary="$(IntDir)\$(TargetName).lib" AdditionalDependencies="silohdf5.lib"/>
- <Tool Name="VFResourceCompilerTool" ResourceOutputFileName="$(IntDir)\$(InputName).res"/>
- <Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(IntDir)\$(ProjectName).tlb"/>
- <Tool Name="VFCustomBuildTool"/>
- <Tool Name="VFPreLinkEventTool"/>
- <Tool Name="VFPreBuildEventTool"/>
- <Tool Name="VFPostBuildEventTool"/>
- <Tool Name="VFManifestTool" SuppressStartupBanner="true" OutputManifestFile="$(Intdir)\$(TargetFileName).embed.manifest" ResourceFile="$(IntDir)\$(TargetFileName).embed.manifest.res"/></Configuration></Configurations>
- <Files>
- <Filter Name="Header Files" Filter="fi;fd"/>
- <Filter Name="Resource Files" Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"/>
- <Filter Name="Source Files" Filter="f90;for;f;fpp;ftn;def;odl;idl">
- <File RelativePath="..\..\..\tests\pointf77.f"/></Filter></Files>
- <Globals/></VisualStudioProject>
diff --git a/SiloWindows/MSVC8/Tests/merge_block.vcproj b/SiloWindows/MSVC8/Tests/merge_block.vcproj
deleted file mode 100644
index b66b07f..0000000
--- a/SiloWindows/MSVC8/Tests/merge_block.vcproj
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="merge_block"
- ProjectGUID="{2B22FE6C-0C77-445A-8320-50EEF60EEF7D}"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="DLLwithHDF5_Debug|Win32"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\merge_block"
- IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\merge_block"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName="$(OutDir)\merge_block.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..\..\..\src\silo"
- PreprocessorDefinitions="WIN32;_CONSOLE"
- BasicRuntimeChecks="3"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="$(OutDir)\merge_block.pch"
- AssemblerListingLocation="$(OutDir)\"
- ObjectFile="$(OutDir)\"
- ProgramDataBaseFileName="$(OutDir)\merge_block"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DebugInformationFormat="4"
- DisableSpecificWarnings="4244;4305"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="silohdf5.lib"
- OutputFile="$(SolutionDir)..\bin\merge_block.exe"
- LinkIncremental="2"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
- GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)\merge_block.pdb"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="DLLwithHDF5_Release|Win32"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\merge_block"
- IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\merge_block"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName="$(OutDir)\merge_block.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="..\..\..\src\silo"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- StringPooling="true"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="$(OutDir)\merge_block.pch"
- AssemblerListingLocation="$(OutDir)\"
- ObjectFile="$(OutDir)\"
- ProgramDataBaseFileName="$(OutDir)\"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DisableSpecificWarnings="4244;4305"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="silohdf5.lib"
- OutputFile="$(SolutionDir)..\bin\merge_block.exe"
- LinkIncremental="1"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
- ProgramDatabaseFile="$(OutDir)\merge_block.pdb"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath="..\..\..\tests\merge_block.c"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/SiloWindows/MSVC8/Tests/mmadjacency.vcproj b/SiloWindows/MSVC8/Tests/mmadjacency.vcproj
deleted file mode 100644
index 99cc0f6..0000000
--- a/SiloWindows/MSVC8/Tests/mmadjacency.vcproj
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="mmadjacency"
- ProjectGUID="{809F6E22-2B80-4264-A220-7974EC9EDBBF}"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="DLLwithHDF5_Debug|Win32"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\mmadjacency"
- IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\mmadjacency"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName="$(OutDir)\mmadjacency.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..\..\..\src\silo"
- PreprocessorDefinitions="WIN32;_CONSOLE"
- BasicRuntimeChecks="3"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="$(OutDir)\mmadjacency.pch"
- AssemblerListingLocation="$(OutDir)\"
- ObjectFile="$(OutDir)\"
- ProgramDataBaseFileName="$(OutDir)\mmadjacency"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DebugInformationFormat="4"
- DisableSpecificWarnings="4244;4305"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="silohdf5.lib"
- OutputFile="$(SolutionDir)..\bin\mmadjacency.exe"
- LinkIncremental="2"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
- GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)\mmadjacency.pdb"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="DLLwithHDF5_Release|Win32"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\mmadjacency"
- IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\mmadjacency"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName="$(OutDir)\mmadjacency.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="..\..\..\src\silo"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- StringPooling="true"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="$(OutDir)\mmadjacency.pch"
- AssemblerListingLocation="$(OutDir)\"
- ObjectFile="$(OutDir)\"
- ProgramDataBaseFileName="$(OutDir)\"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DisableSpecificWarnings="4244;4305"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="silohdf5.lib"
- OutputFile="$(SolutionDir)..\bin\mmadjacency.exe"
- LinkIncremental="1"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
- ProgramDatabaseFile="$(OutDir)\mmadjacency.pdb"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath="..\..\..\tests\mmadjacency.c"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/SiloWindows/MSVC8/Tests/multi_file.vcproj b/SiloWindows/MSVC8/Tests/multi_file.vcproj
deleted file mode 100644
index 16d9e76..0000000
--- a/SiloWindows/MSVC8/Tests/multi_file.vcproj
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="multi_file"
- ProjectGUID="{8CC26B54-D539-4A0A-B461-26F074B790FD}"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="DLLwithHDF5_Debug|Win32"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\multi_file"
- IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\multi_file"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName="$(OutDir)\multi_file.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..\..\..\src\silo"
- PreprocessorDefinitions="WIN32;_CONSOLE"
- BasicRuntimeChecks="3"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="$(OutDir)\multi_file.pch"
- AssemblerListingLocation="$(OutDir)\"
- ObjectFile="$(OutDir)\"
- ProgramDataBaseFileName="$(OutDir)\multi_file"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DebugInformationFormat="4"
- DisableSpecificWarnings="4244;4305"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="silohdf5.lib"
- OutputFile="$(SolutionDir)..\bin\multi_file.exe"
- LinkIncremental="2"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
- GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)\multi_file.pdb"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="DLLwithHDF5_Release|Win32"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\multi_file"
- IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\multi_file"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName="$(OutDir)\multi_file.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="..\..\..\src\silo"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- StringPooling="true"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="$(OutDir)\multi_file.pch"
- AssemblerListingLocation="$(OutDir)\"
- ObjectFile="$(OutDir)\"
- ProgramDataBaseFileName="$(OutDir)\"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DisableSpecificWarnings="4244;4305"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="silohdf5.lib"
- OutputFile="$(SolutionDir)..\bin\multi_file.exe"
- LinkIncremental="1"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
- ProgramDatabaseFile="$(OutDir)\multi_file.pdb"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath="..\..\..\tests\multi_file.c"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/SiloWindows/MSVC8/Tests/multi_test.vcproj b/SiloWindows/MSVC8/Tests/multi_test.vcproj
deleted file mode 100644
index 1939156..0000000
--- a/SiloWindows/MSVC8/Tests/multi_test.vcproj
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="multi_test"
- ProjectGUID="{7535A535-FDEC-4448-AF9C-C031C9EA8459}"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="DLLwithHDF5_Debug|Win32"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\multi_test"
- IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\multi_test"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName="$(OutDir)\multi_test.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..\..\..\src\silo"
- PreprocessorDefinitions="WIN32;_CONSOLE"
- BasicRuntimeChecks="3"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="$(OutDir)\multi_test.pch"
- AssemblerListingLocation="$(OutDir)\"
- ObjectFile="$(OutDir)\"
- ProgramDataBaseFileName="$(OutDir)\multi_test"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DebugInformationFormat="4"
- DisableSpecificWarnings="4244;4305"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="silohdf5.lib"
- OutputFile="$(SolutionDir)..\bin\multi_test.exe"
- LinkIncremental="2"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
- GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)\multi_test.pdb"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="DLLwithHDF5_Release|Win32"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\multi_test"
- IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\multi_test"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName="$(OutDir)\multi_test.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="..\..\..\src\silo"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- StringPooling="true"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="$(OutDir)\multi_test.pch"
- AssemblerListingLocation="$(OutDir)\"
- ObjectFile="$(OutDir)\"
- ProgramDataBaseFileName="$(OutDir)\"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DisableSpecificWarnings="4244;4305"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="silohdf5.lib"
- OutputFile="$(SolutionDir)..\bin\multi_test.exe"
- LinkIncremental="1"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
- ProgramDatabaseFile="$(OutDir)\multi_test.pdb"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath="..\..\..\tests\multi_test.c"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/SiloWindows/MSVC8/Tests/multispec.vcproj b/SiloWindows/MSVC8/Tests/multispec.vcproj
deleted file mode 100644
index e1ab845..0000000
--- a/SiloWindows/MSVC8/Tests/multispec.vcproj
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="multispec"
- ProjectGUID="{2D46EF91-58B2-43B5-ADD7-6908D6794578}"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="DLLwithHDF5_Debug|Win32"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\multispec"
- IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\multispec"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName="$(OutDir)\multispec.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..\..\..\src\silo"
- PreprocessorDefinitions="WIN32;_CONSOLE"
- BasicRuntimeChecks="3"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="$(OutDir)\multispec.pch"
- AssemblerListingLocation="$(OutDir)\"
- ObjectFile="$(OutDir)\"
- ProgramDataBaseFileName="$(OutDir)\multispec"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DebugInformationFormat="4"
- DisableSpecificWarnings="4244;4305"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="silohdf5.lib"
- OutputFile="$(SolutionDir)..\bin\multispec.exe"
- LinkIncremental="2"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
- GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)\multispec.pdb"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="DLLwithHDF5_Release|Win32"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\multispec"
- IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\multispec"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName="$(OutDir)\multispec.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="..\..\..\src\silo"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- StringPooling="true"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="$(OutDir)\multispec.pch"
- AssemblerListingLocation="$(OutDir)\"
- ObjectFile="$(OutDir)\"
- ProgramDataBaseFileName="$(OutDir)\"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DisableSpecificWarnings="4244;4305"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="silohdf5.lib"
- OutputFile="$(SolutionDir)..\bin\multispec.exe"
- LinkIncremental="1"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
- ProgramDatabaseFile="$(OutDir)\multispec.pdb"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath="..\..\..\tests\multispec.c"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/SiloWindows/MSVC8/Tests/namescheme.vcproj b/SiloWindows/MSVC8/Tests/namescheme.vcproj
deleted file mode 100644
index 0778438..0000000
--- a/SiloWindows/MSVC8/Tests/namescheme.vcproj
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="namescheme"
- ProjectGUID="{D839F6C1-3736-4269-A5E7-30B2BC1CBCCD}"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="DLLwithHDF5_Debug|Win32"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\namescheme"
- IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\namescheme"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName="$(OutDir)\namescheme.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..\..\..\src\silo"
- PreprocessorDefinitions="WIN32;_CONSOLE"
- BasicRuntimeChecks="3"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="$(OutDir)\namescheme.pch"
- AssemblerListingLocation="$(OutDir)\"
- ObjectFile="$(OutDir)\"
- ProgramDataBaseFileName="$(OutDir)\namescheme"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DebugInformationFormat="4"
- DisableSpecificWarnings="4244;4305"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="silohdf5.lib"
- OutputFile="$(SolutionDir)..\bin\namescheme.exe"
- LinkIncremental="2"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
- GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)\namescheme.pdb"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="DLLwithHDF5_Release|Win32"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\namescheme"
- IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\namescheme"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName="$(OutDir)\namescheme.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="..\..\..\src\silo"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- StringPooling="true"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="$(OutDir)\namescheme.pch"
- AssemblerListingLocation="$(OutDir)\"
- ObjectFile="$(OutDir)\"
- ProgramDataBaseFileName="$(OutDir)\"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DisableSpecificWarnings="4244;4305"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="silohdf5.lib"
- OutputFile="$(SolutionDir)..\bin\namescheme.exe"
- LinkIncremental="1"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
- ProgramDatabaseFile="$(OutDir)\namescheme.pdb"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath="..\..\..\tests\namescheme.c"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/SiloWindows/MSVC8/Tests/obj.vcproj b/SiloWindows/MSVC8/Tests/obj.vcproj
deleted file mode 100644
index 659c45d..0000000
--- a/SiloWindows/MSVC8/Tests/obj.vcproj
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="obj"
- ProjectGUID="{AC0F21DF-ECA4-4B17-9829-59634B68B0D2}"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="DLLwithHDF5_Debug|Win32"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\obj"
- IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\obj"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName="$(OutDir)\obj.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..\..\..\src\silo"
- PreprocessorDefinitions="WIN32;_CONSOLE"
- BasicRuntimeChecks="3"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="$(OutDir)\obj.pch"
- AssemblerListingLocation="$(OutDir)\"
- ObjectFile="$(OutDir)\"
- ProgramDataBaseFileName="$(OutDir)\obj"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DebugInformationFormat="4"
- DisableSpecificWarnings="4244;4305"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="silohdf5.lib"
- OutputFile="$(SolutionDir)..\bin\obj.exe"
- LinkIncremental="2"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
- GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)\obj.pdb"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="DLLwithHDF5_Release|Win32"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\obj"
- IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\obj"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName="$(OutDir)\obj.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="..\..\..\src\silo"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- StringPooling="true"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="$(OutDir)\obj.pch"
- AssemblerListingLocation="$(OutDir)\"
- ObjectFile="$(OutDir)\"
- ProgramDataBaseFileName="$(OutDir)\"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DisableSpecificWarnings="4244;4305"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="silohdf5.lib"
- OutputFile="$(SolutionDir)..\bin\obj.exe"
- LinkIncremental="1"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
- ProgramDatabaseFile="$(OutDir)\obj.pdb"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath="..\..\..\tests\obj.c"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/SiloWindows/MSVC8/Tests/onehex.vcproj b/SiloWindows/MSVC8/Tests/onehex.vcproj
deleted file mode 100644
index ffdaf00..0000000
--- a/SiloWindows/MSVC8/Tests/onehex.vcproj
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="onehex"
- ProjectGUID="{3863899B-7F9F-4823-9383-AE2205DCB054}"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="DLLwithHDF5_Debug|Win32"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\onehex"
- IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\onehex"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName="$(OutDir)\onehex.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..\..\..\src\silo"
- PreprocessorDefinitions="WIN32;_CONSOLE"
- BasicRuntimeChecks="3"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="$(OutDir)\onehex.pch"
- AssemblerListingLocation="$(OutDir)\"
- ObjectFile="$(OutDir)\"
- ProgramDataBaseFileName="$(OutDir)\onehex"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DebugInformationFormat="4"
- DisableSpecificWarnings="4244;4305"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="silohdf5.lib"
- OutputFile="$(SolutionDir)..\bin\onehex.exe"
- LinkIncremental="2"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
- GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)\onehex.pdb"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="DLLwithHDF5_Release|Win32"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\onehex"
- IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\onehex"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName="$(OutDir)\onehex.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="..\..\..\src\silo"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- StringPooling="true"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="$(OutDir)\onehex.pch"
- AssemblerListingLocation="$(OutDir)\"
- ObjectFile="$(OutDir)\"
- ProgramDataBaseFileName="$(OutDir)\"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DisableSpecificWarnings="4244;4305"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="silohdf5.lib"
- OutputFile="$(SolutionDir)..\bin\onehex.exe"
- LinkIncremental="1"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
- ProgramDatabaseFile="$(OutDir)\onehex.pdb"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath="..\..\..\tests\onehex.c"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/SiloWindows/MSVC8/Tests/oneprism.vcproj b/SiloWindows/MSVC8/Tests/oneprism.vcproj
deleted file mode 100644
index b556dcc..0000000
--- a/SiloWindows/MSVC8/Tests/oneprism.vcproj
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="oneprism"
- ProjectGUID="{4BCA7F35-0742-424F-8E50-39B934312F8F}"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="DLLwithHDF5_Debug|Win32"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\oneprism"
- IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\oneprism"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName="$(OutDir)\oneprism.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..\..\..\src\silo"
- PreprocessorDefinitions="WIN32;_CONSOLE"
- BasicRuntimeChecks="3"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="$(OutDir)\oneprism.pch"
- AssemblerListingLocation="$(OutDir)\"
- ObjectFile="$(OutDir)\"
- ProgramDataBaseFileName="$(OutDir)\oneprism"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DebugInformationFormat="4"
- DisableSpecificWarnings="4244;4305"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="silohdf5.lib"
- OutputFile="$(SolutionDir)..\bin\oneprism.exe"
- LinkIncremental="2"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
- GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)\oneprism.pdb"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="DLLwithHDF5_Release|Win32"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\oneprism"
- IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\oneprism"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName="$(OutDir)\oneprism.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="..\..\..\src\silo"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- StringPooling="true"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="$(OutDir)\oneprism.pch"
- AssemblerListingLocation="$(OutDir)\"
- ObjectFile="$(OutDir)\"
- ProgramDataBaseFileName="$(OutDir)\"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DisableSpecificWarnings="4244;4305"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="silohdf5.lib"
- OutputFile="$(SolutionDir)..\bin\oneprism.exe"
- LinkIncremental="1"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
- ProgramDatabaseFile="$(OutDir)\oneprism.pdb"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath="..\..\..\tests\oneprism.c"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/SiloWindows/MSVC8/Tests/onepyramid.vcproj b/SiloWindows/MSVC8/Tests/onepyramid.vcproj
deleted file mode 100644
index 14dac7f..0000000
--- a/SiloWindows/MSVC8/Tests/onepyramid.vcproj
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="onepyramid"
- ProjectGUID="{2AFC873D-E906-4145-A0CB-6264E8CAE97D}"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="DLLwithHDF5_Debug|Win32"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\onepyramid"
- IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\onepyramid"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName="$(OutDir)\onepyramid.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..\..\..\src\silo"
- PreprocessorDefinitions="WIN32;_CONSOLE"
- BasicRuntimeChecks="3"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="$(OutDir)\onepyramid.pch"
- AssemblerListingLocation="$(OutDir)\"
- ObjectFile="$(OutDir)\"
- ProgramDataBaseFileName="$(OutDir)\onepyramid"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DebugInformationFormat="4"
- DisableSpecificWarnings="4244;4305"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="silohdf5.lib"
- OutputFile="$(SolutionDir)..\bin\onepyramid.exe"
- LinkIncremental="2"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
- GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)\onepyramid.pdb"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="DLLwithHDF5_Release|Win32"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\onepyramid"
- IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\onepyramid"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName="$(OutDir)\onepyramid.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="..\..\..\src\silo"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- StringPooling="true"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="$(OutDir)\onepyramid.pch"
- AssemblerListingLocation="$(OutDir)\"
- ObjectFile="$(OutDir)\"
- ProgramDataBaseFileName="$(OutDir)\"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DisableSpecificWarnings="4244;4305"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="silohdf5.lib"
- OutputFile="$(SolutionDir)..\bin\onepyramid.exe"
- LinkIncremental="1"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
- ProgramDatabaseFile="$(OutDir)\onepyramid.pdb"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath="..\..\..\tests\onepyramid.c"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/SiloWindows/MSVC8/Tests/onetet.vcproj b/SiloWindows/MSVC8/Tests/onetet.vcproj
deleted file mode 100644
index 28052fc..0000000
--- a/SiloWindows/MSVC8/Tests/onetet.vcproj
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="onetet"
- ProjectGUID="{A76CCA62-BC5F-44F8-B090-9C45DA138680}"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="DLLwithHDF5_Debug|Win32"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\onetet"
- IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\onetet"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName="$(OutDir)\onetet.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..\..\..\src\silo"
- PreprocessorDefinitions="WIN32;_CONSOLE"
- BasicRuntimeChecks="3"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="$(OutDir)\onetet.pch"
- AssemblerListingLocation="$(OutDir)\"
- ObjectFile="$(OutDir)\"
- ProgramDataBaseFileName="$(OutDir)\onetet"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DebugInformationFormat="4"
- DisableSpecificWarnings="4244;4305"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="silohdf5.lib"
- OutputFile="$(SolutionDir)..\bin\onetet.exe"
- LinkIncremental="2"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
- GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)\onetet.pdb"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="DLLwithHDF5_Release|Win32"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\onetet"
- IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\onetet"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName="$(OutDir)\onetet.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="..\..\..\src\silo"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- StringPooling="true"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="$(OutDir)\onetet.pch"
- AssemblerListingLocation="$(OutDir)\"
- ObjectFile="$(OutDir)\"
- ProgramDataBaseFileName="$(OutDir)\"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DisableSpecificWarnings="4244;4305"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="silohdf5.lib"
- OutputFile="$(SolutionDir)..\bin\onetet.exe"
- LinkIncremental="1"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
- ProgramDatabaseFile="$(OutDir)\onetet.pdb"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath="..\..\..\tests\onetet.c"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/SiloWindows/MSVC8/Tests/partial_io.vcproj b/SiloWindows/MSVC8/Tests/partial_io.vcproj
deleted file mode 100644
index e69e9c5..0000000
--- a/SiloWindows/MSVC8/Tests/partial_io.vcproj
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="partial_io"
- ProjectGUID="{4F6A7EC6-F141-4512-B2A8-D108CBD6FAC1}"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="DLLwithHDF5_Debug|Win32"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\partial_io"
- IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\partial_io"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName="$(OutDir)\partial_io.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..\..\..\src\silo"
- PreprocessorDefinitions="WIN32;_CONSOLE"
- BasicRuntimeChecks="3"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="$(OutDir)\partial_io.pch"
- AssemblerListingLocation="$(OutDir)\"
- ObjectFile="$(OutDir)\"
- ProgramDataBaseFileName="$(OutDir)\partial_io"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DebugInformationFormat="4"
- DisableSpecificWarnings="4244;4305"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="silohdf5.lib"
- OutputFile="$(SolutionDir)..\bin\partial_io.exe"
- LinkIncremental="2"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
- GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)\partial_io.pdb"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="DLLwithHDF5_Release|Win32"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\partial_io"
- IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\partial_io"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName="$(OutDir)\partial_io.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="..\..\..\src\silo"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- StringPooling="true"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="$(OutDir)\partial_io.pch"
- AssemblerListingLocation="$(OutDir)\"
- ObjectFile="$(OutDir)\"
- ProgramDataBaseFileName="$(OutDir)\"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DisableSpecificWarnings="4244;4305"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="silohdf5.lib"
- OutputFile="$(SolutionDir)..\bin\partial_io.exe"
- LinkIncremental="1"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
- ProgramDatabaseFile="$(OutDir)\partial_io.pdb"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath="..\..\..\tests\partial_io.c"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/SiloWindows/MSVC8/Tests/point.vcproj b/SiloWindows/MSVC8/Tests/point.vcproj
deleted file mode 100644
index 8dc3c58..0000000
--- a/SiloWindows/MSVC8/Tests/point.vcproj
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="point"
- ProjectGUID="{025CFEA1-6C43-404D-9DA4-5392A17FA162}"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="DLLwithHDF5_Debug|Win32"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\point"
- IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\point"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName="$(OutDir)\point.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..\..\..\src\silo"
- PreprocessorDefinitions="WIN32;_CONSOLE"
- BasicRuntimeChecks="3"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="$(OutDir)\point.pch"
- AssemblerListingLocation="$(OutDir)\"
- ObjectFile="$(OutDir)\"
- ProgramDataBaseFileName="$(OutDir)\point"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DebugInformationFormat="4"
- DisableSpecificWarnings="4244;4305"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="silohdf5.lib"
- OutputFile="$(SolutionDir)..\bin\point.exe"
- LinkIncremental="2"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
- GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)\point.pdb"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="DLLwithHDF5_Release|Win32"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\point"
- IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\point"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName="$(OutDir)\point.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="..\..\..\src\silo"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- StringPooling="true"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="$(OutDir)\point.pch"
- AssemblerListingLocation="$(OutDir)\"
- ObjectFile="$(OutDir)\"
- ProgramDataBaseFileName="$(OutDir)\"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DisableSpecificWarnings="4244;4305"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="silohdf5.lib"
- OutputFile="$(SolutionDir)..\bin\point.exe"
- LinkIncremental="1"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
- ProgramDatabaseFile="$(OutDir)\point.pdb"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath="..\..\..\tests\point.c"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/SiloWindows/MSVC8/Tests/point_f.vfproj b/SiloWindows/MSVC8/Tests/point_f.vfproj
deleted file mode 100644
index aac47f0..0000000
--- a/SiloWindows/MSVC8/Tests/point_f.vfproj
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VisualStudioProject ProjectCreator="Intel Fortran" Keyword="Console Application" Version="11.0" ProjectIdGuid="{A1F2E6F2-6E49-4746-9133-9DF0A404C7DB}">
- <Platforms>
- <Platform Name="Win32"/></Platforms>
- <Configurations>
- <Configuration Name="DLLwithHDF5_Debug|Win32" OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\point_f" IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\point_f">
- <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="..\..\..\src\silo" Interfaces="true" WarnInterfaces="true" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug"/>
- <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)..\bin\$(ProjectName).exe" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)" ManifestFile="$(IntDir)\$(TargetFileName).intermediate.manifest" GenerateDebugInformation="true" ProgramDatabaseFile="$(IntDir)$(TargetName).pdb" SubSystem="subSystemConsole" ImportLibrary="$(IntDir)\$(TargetName).lib" TargetMachine="machineX86" AdditionalDep [...]
- <Tool Name="VFResourceCompilerTool" ResourceOutputFileName="$(IntDir)\$(InputName).res"/>
- <Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(IntDir)\$(ProjectName).tlb"/>
- <Tool Name="VFCustomBuildTool"/>
- <Tool Name="VFPreLinkEventTool"/>
- <Tool Name="VFPreBuildEventTool"/>
- <Tool Name="VFPostBuildEventTool"/>
- <Tool Name="VFManifestTool" SuppressStartupBanner="true" OutputManifestFile="$(Intdir)\$(TargetFileName).embed.manifest" ResourceFile="$(IntDir)\$(TargetFileName).embed.manifest.res"/></Configuration>
- <Configuration Name="DLLwithHDF5_Release|Win32" OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\point_f" IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\point_f">
- <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" AdditionalIncludeDirectories="..\..\..\src\silo" DiagnosticsFile="$(IntDir)$(TargetName).diag" ModulePath="$(IntDir)" ObjectFile="$(IntDir)"/>
- <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)..\bin\$(ProjectName).exe" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)" ManifestFile="$(IntDir)\$(TargetFileName).intermediate.manifest" ProgramDatabaseFile="$(IntDir)$(TargetName).pdb" SubSystem="subSystemConsole" ImportLibrary="$(IntDir)\$(TargetName).lib" AdditionalDependencies="silohdf5.lib"/>
- <Tool Name="VFResourceCompilerTool" ResourceOutputFileName="$(IntDir)\$(InputName).res"/>
- <Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(IntDir)\$(ProjectName).tlb"/>
- <Tool Name="VFCustomBuildTool"/>
- <Tool Name="VFPreLinkEventTool"/>
- <Tool Name="VFPreBuildEventTool"/>
- <Tool Name="VFPostBuildEventTool"/>
- <Tool Name="VFManifestTool" SuppressStartupBanner="true" OutputManifestFile="$(Intdir)\$(TargetFileName).embed.manifest" ResourceFile="$(IntDir)\$(TargetFileName).embed.manifest.res"/></Configuration></Configurations>
- <Files>
- <Filter Name="Header Files" Filter="fi;fd"/>
- <Filter Name="Resource Files" Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"/>
- <Filter Name="Source Files" Filter="f90;for;f;fpp;ftn;def;odl;idl">
- <File RelativePath="..\..\..\tests\pointf77.f"/></Filter></Files>
- <Globals/></VisualStudioProject>
diff --git a/SiloWindows/MSVC8/Tests/polyzl.vcproj b/SiloWindows/MSVC8/Tests/polyzl.vcproj
deleted file mode 100644
index 72990a3..0000000
--- a/SiloWindows/MSVC8/Tests/polyzl.vcproj
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="polyzl"
- ProjectGUID="{8C6BC636-FF71-4D58-9D63-E12265523982}"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="DLLwithHDF5_Debug|Win32"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\polyzl"
- IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\polyzl"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName="$(OutDir)\polyzl.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..\..\..\src\silo"
- PreprocessorDefinitions="WIN32;_CONSOLE"
- BasicRuntimeChecks="3"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="$(OutDir)\polyzl.pch"
- AssemblerListingLocation="$(OutDir)\"
- ObjectFile="$(OutDir)\"
- ProgramDataBaseFileName="$(OutDir)\polyzl"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DebugInformationFormat="4"
- DisableSpecificWarnings="4244;4305"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="silohdf5.lib"
- OutputFile="$(SolutionDir)..\bin\polyzl.exe"
- LinkIncremental="2"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
- GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)\polyzl.pdb"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="DLLwithHDF5_Release|Win32"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\polyzl"
- IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\polyzl"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName="$(OutDir)\polyzl.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="..\..\..\src\silo"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- StringPooling="true"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="$(OutDir)\polyzl.pch"
- AssemblerListingLocation="$(OutDir)\"
- ObjectFile="$(OutDir)\"
- ProgramDataBaseFileName="$(OutDir)\"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DisableSpecificWarnings="4244;4305"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="silohdf5.lib"
- OutputFile="$(SolutionDir)..\bin\polyzl.exe"
- LinkIncremental="1"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
- ProgramDatabaseFile="$(OutDir)\polyzl.pdb"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath="..\..\..\tests\polyzl.c"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/SiloWindows/MSVC8/Tests/quad.vcproj b/SiloWindows/MSVC8/Tests/quad.vcproj
deleted file mode 100644
index 9d0a9a9..0000000
--- a/SiloWindows/MSVC8/Tests/quad.vcproj
+++ /dev/null
@@ -1,216 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="quad"
- ProjectGUID="{4D5EA26A-8356-4665-A13D-51CCEE2BA7F4}"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="DLLwithHDF5_Debug|Win32"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\quad"
- IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\quad"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName="$(OutDir)\quad.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..\..\..\src\silo"
- PreprocessorDefinitions="WIN32;_CONSOLE"
- BasicRuntimeChecks="3"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="$(OutDir)\quad.pch"
- AssemblerListingLocation="$(OutDir)\"
- ObjectFile="$(OutDir)\"
- ProgramDataBaseFileName="$(OutDir)\quad"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DebugInformationFormat="4"
- DisableSpecificWarnings="4244;4305"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="silohdf5.lib"
- OutputFile="$(SolutionDir)..\bin\quad.exe"
- LinkIncremental="2"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
- GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)\quad.pdb"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="DLLwithHDF5_Release|Win32"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\quad"
- IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\quad"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName="$(OutDir)\quad.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="..\..\..\src\silo"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- StringPooling="true"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="$(OutDir)\quad.pch"
- AssemblerListingLocation="$(OutDir)\"
- ObjectFile="$(OutDir)\"
- ProgramDataBaseFileName="$(OutDir)\"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DisableSpecificWarnings="4244;4305"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="silohdf5.lib"
- OutputFile="$(SolutionDir)..\bin\quad.exe"
- LinkIncremental="1"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
- ProgramDatabaseFile="$(OutDir)\quad.pdb"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath="..\..\..\tests\quad.c"
- >
- </File>
- <File
- RelativePath="..\..\..\tests\testlib.c"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/SiloWindows/MSVC8/Tests/rocket.vcproj b/SiloWindows/MSVC8/Tests/rocket.vcproj
deleted file mode 100644
index 588c7fb..0000000
--- a/SiloWindows/MSVC8/Tests/rocket.vcproj
+++ /dev/null
@@ -1,230 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="rocket"
- ProjectGUID="{A9F76A7B-20A1-4D93-9444-175824B7B3DF}"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="DLLwithHDF5_Debug|Win32"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\rocket"
- IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\rocket"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName="$(OutDir)\rocket.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..\..\..\src\silo"
- PreprocessorDefinitions="WIN32;_CONSOLE"
- BasicRuntimeChecks="3"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="$(OutDir)\rocket.pch"
- AssemblerListingLocation="$(OutDir)\"
- ObjectFile="$(OutDir)\"
- ProgramDataBaseFileName="$(OutDir)\rocket"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DebugInformationFormat="4"
- DisableSpecificWarnings="4244;4305"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="silohdf5.lib"
- OutputFile="$(SolutionDir)..\bin\rocket.exe"
- LinkIncremental="2"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
- GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)\rocket.pdb"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="DLLwithHDF5_Release|Win32"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\rocket"
- IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\rocket"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName="$(OutDir)\rocket.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="..\..\..\src\silo"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- StringPooling="true"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="$(OutDir)\rocket.pch"
- AssemblerListingLocation="$(OutDir)\"
- ObjectFile="$(OutDir)\"
- ProgramDataBaseFileName="$(OutDir)\"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DisableSpecificWarnings="4244;4305"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="silohdf5.lib"
- OutputFile="$(SolutionDir)..\bin\rocket.exe"
- LinkIncremental="1"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
- ProgramDatabaseFile="$(OutDir)\rocket.pdb"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath="..\..\..\tests\rocket.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)/$(InputName)1.obj"
- CompileAs="2"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)/$(InputName)1.obj"
- CompileAs="2"
- />
- </FileConfiguration>
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/SiloWindows/MSVC8/Tests/sami.vcproj b/SiloWindows/MSVC8/Tests/sami.vcproj
deleted file mode 100644
index 7d36a0b..0000000
--- a/SiloWindows/MSVC8/Tests/sami.vcproj
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="sami"
- ProjectGUID="{B3C7F964-68B8-4F8C-B5E7-7607836FB101}"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="DLLwithHDF5_Debug|Win32"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\sami"
- IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\sami"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName="$(OutDir)\sami.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..\..\include\WithHDF5;..\..\..\src\silo;$(HDF5_INC_DIR)"
- PreprocessorDefinitions="WIN32;_CONSOLE"
- BasicRuntimeChecks="3"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="$(OutDir)\sami.pch"
- AssemblerListingLocation="$(OutDir)\"
- ObjectFile="$(OutDir)\"
- ProgramDataBaseFileName="$(OutDir)\sami"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DebugInformationFormat="4"
- DisableSpecificWarnings="4244;4305"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="silohdf5.lib hdf5dll.lib"
- OutputFile="$(SolutionDir)..\bin\sami.exe"
- LinkIncremental="2"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName);$(HDF5_LIB_DIR)"
- GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)\sami.pdb"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="DLLwithHDF5_Release|Win32"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\sami"
- IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\sami"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName="$(OutDir)\sami.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="..\..\include\WithHDF5;..\..\..\src\silo;$(HDF5_INC_DIR)"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- StringPooling="true"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="$(OutDir)\sami.pch"
- AssemblerListingLocation="$(OutDir)\"
- ObjectFile="$(OutDir)\"
- ProgramDataBaseFileName="$(OutDir)\"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DisableSpecificWarnings="4244;4305"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="silohdf5.lib hdf5dll.lib"
- OutputFile="$(SolutionDir)..\bin\sami.exe"
- LinkIncremental="1"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName);$(HDF5_LIB_DIR)"
- ProgramDatabaseFile="$(OutDir)\sami.pdb"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath="..\..\..\tests\sami.c"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/SiloWindows/MSVC8/Tests/simple.vcproj b/SiloWindows/MSVC8/Tests/simple.vcproj
deleted file mode 100644
index b024cee..0000000
--- a/SiloWindows/MSVC8/Tests/simple.vcproj
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="simple"
- ProjectGUID="{7AB46C61-04D5-4E77-AD3F-E7726F3E173A}"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="DLLwithHDF5_Debug|Win32"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\simple"
- IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\simple"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName="$(OutDir)\simple.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..\..\..\src\silo"
- PreprocessorDefinitions="WIN32;_CONSOLE"
- BasicRuntimeChecks="3"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="$(OutDir)\simple.pch"
- AssemblerListingLocation="$(OutDir)\"
- ObjectFile="$(OutDir)\"
- ProgramDataBaseFileName="$(OutDir)\simple"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DebugInformationFormat="4"
- DisableSpecificWarnings="4244;4305"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="silohdf5.lib"
- OutputFile="$(SolutionDir)..\bin\simple.exe"
- LinkIncremental="2"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
- GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)\simple.pdb"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="DLLwithHDF5_Release|Win32"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\simple"
- IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\simple"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName="$(OutDir)\simple.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="..\..\..\src\silo"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- StringPooling="true"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="$(OutDir)\simple.pch"
- AssemblerListingLocation="$(OutDir)\"
- ObjectFile="$(OutDir)\"
- ProgramDataBaseFileName="$(OutDir)\"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DisableSpecificWarnings="4244;4305"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="silohdf5.lib"
- OutputFile="$(SolutionDir)..\bin\simple.exe"
- LinkIncremental="1"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
- ProgramDatabaseFile="$(OutDir)\simple.pdb"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath="..\..\..\tests\simple.c"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/SiloWindows/MSVC8/Tests/spec.vcproj b/SiloWindows/MSVC8/Tests/spec.vcproj
deleted file mode 100644
index 9bc2595..0000000
--- a/SiloWindows/MSVC8/Tests/spec.vcproj
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="spec"
- ProjectGUID="{7A5F618C-F98A-4F8E-BBC7-C4F5C6BCD5A4}"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="DLLwithHDF5_Debug|Win32"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\spec"
- IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\spec"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName="$(OutDir)\spec.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..\..\..\src\silo"
- PreprocessorDefinitions="WIN32;_CONSOLE"
- BasicRuntimeChecks="3"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="$(OutDir)\spec.pch"
- AssemblerListingLocation="$(OutDir)\"
- ObjectFile="$(OutDir)\"
- ProgramDataBaseFileName="$(OutDir)\spec"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DebugInformationFormat="4"
- DisableSpecificWarnings="4244;4305"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="silohdf5.lib"
- OutputFile="$(SolutionDir)..\bin\spec.exe"
- LinkIncremental="2"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
- GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)\spec.pdb"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="DLLwithHDF5_Release|Win32"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\spec"
- IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\spec"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName="$(OutDir)\spec.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="..\..\..\src\silo"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- StringPooling="true"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="$(OutDir)\spec.pch"
- AssemblerListingLocation="$(OutDir)\"
- ObjectFile="$(OutDir)\"
- ProgramDataBaseFileName="$(OutDir)\"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DisableSpecificWarnings="4244;4305"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="silohdf5.lib"
- OutputFile="$(SolutionDir)..\bin\spec.exe"
- LinkIncremental="1"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
- ProgramDatabaseFile="$(OutDir)\spec.pdb"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath="..\..\..\tests\spec.c"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/SiloWindows/MSVC8/Tests/specmix.vcproj b/SiloWindows/MSVC8/Tests/specmix.vcproj
deleted file mode 100644
index 6dd34b1..0000000
--- a/SiloWindows/MSVC8/Tests/specmix.vcproj
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="specmix"
- ProjectGUID="{27C64509-94EB-406D-9978-93AE531CEB1E}"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="DLLwithHDF5_Debug|Win32"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\specmix"
- IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\specmix"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName="$(OutDir)\specmix.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..\..\..\src\silo"
- PreprocessorDefinitions="WIN32;_CONSOLE"
- BasicRuntimeChecks="3"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="$(OutDir)\specmix.pch"
- AssemblerListingLocation="$(OutDir)\"
- ObjectFile="$(OutDir)\"
- ProgramDataBaseFileName="$(OutDir)\specmix"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DebugInformationFormat="4"
- DisableSpecificWarnings="4244;4305"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="silohdf5.lib"
- OutputFile="$(SolutionDir)..\bin\specmix.exe"
- LinkIncremental="2"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
- GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)\specmix.pdb"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="DLLwithHDF5_Release|Win32"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\specmix"
- IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\specmix"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName="$(OutDir)\specmix.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="..\..\..\src\silo"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- StringPooling="true"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="$(OutDir)\specmix.pch"
- AssemblerListingLocation="$(OutDir)\"
- ObjectFile="$(OutDir)\"
- ProgramDataBaseFileName="$(OutDir)\"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DisableSpecificWarnings="4244;4305"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="silohdf5.lib"
- OutputFile="$(SolutionDir)..\bin\specmix.exe"
- LinkIncremental="1"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
- ProgramDatabaseFile="$(OutDir)\specmix.pdb"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath="..\..\..\tests\specmix.c"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/SiloWindows/MSVC8/Tests/subhex.vcproj b/SiloWindows/MSVC8/Tests/subhex.vcproj
deleted file mode 100644
index c77529e..0000000
--- a/SiloWindows/MSVC8/Tests/subhex.vcproj
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="subhex"
- ProjectGUID="{8C02951E-155B-4D09-A1DD-F98695F02A0E}"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="DLLwithHDF5_Debug|Win32"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\subhex"
- IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\subhex"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName="$(OutDir)\subhex.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..\..\..\src\silo"
- PreprocessorDefinitions="WIN32;_CONSOLE"
- BasicRuntimeChecks="3"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="$(OutDir)\subhex.pch"
- AssemblerListingLocation="$(OutDir)\"
- ObjectFile="$(OutDir)\"
- ProgramDataBaseFileName="$(OutDir)\subhex"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DebugInformationFormat="4"
- DisableSpecificWarnings="4244;4305"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="silohdf5.lib"
- OutputFile="$(SolutionDir)..\bin\subhex.exe"
- LinkIncremental="2"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
- GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)\subhex.pdb"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="DLLwithHDF5_Release|Win32"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\subhex"
- IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\subhex"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName="$(OutDir)\subhex.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="..\..\..\src\silo"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- StringPooling="true"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="$(OutDir)\subhex.pch"
- AssemblerListingLocation="$(OutDir)\"
- ObjectFile="$(OutDir)\"
- ProgramDataBaseFileName="$(OutDir)\"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DisableSpecificWarnings="4244;4305"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="silohdf5.lib"
- OutputFile="$(SolutionDir)..\bin\subhex.exe"
- LinkIncremental="1"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
- ProgramDatabaseFile="$(OutDir)\subhex.pdb"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath="..\..\..\tests\subhex.c"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/SiloWindows/MSVC8/Tests/testall.vcproj b/SiloWindows/MSVC8/Tests/testall.vcproj
deleted file mode 100644
index 1a5cd3c..0000000
--- a/SiloWindows/MSVC8/Tests/testall.vcproj
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="testall"
- ProjectGUID="{E4105EA9-2AB2-4656-B966-01F16961A14B}"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="DLLwithHDF5_Debug|Win32"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\testall"
- IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\testall"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName="$(OutDir)\testall.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..\..\..\src\silo"
- PreprocessorDefinitions="WIN32;_CONSOLE"
- BasicRuntimeChecks="3"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="$(OutDir)\testall.pch"
- AssemblerListingLocation="$(OutDir)\"
- ObjectFile="$(OutDir)\"
- ProgramDataBaseFileName="$(OutDir)\testall"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DebugInformationFormat="4"
- DisableSpecificWarnings="4244;4305"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="silohdf5.lib"
- OutputFile="$(SolutionDir)..\bin\testall.exe"
- LinkIncremental="2"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
- GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)\testall.pdb"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="DLLwithHDF5_Release|Win32"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\testall"
- IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\testall"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName="$(OutDir)\testall.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="..\..\..\src\silo"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- StringPooling="true"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="$(OutDir)\testall.pch"
- AssemblerListingLocation="$(OutDir)\"
- ObjectFile="$(OutDir)\"
- ProgramDataBaseFileName="$(OutDir)\"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DisableSpecificWarnings="4244;4305"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="silohdf5.lib"
- OutputFile="$(SolutionDir)..\bin\testall.exe"
- LinkIncremental="1"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
- ProgramDatabaseFile="$(OutDir)\testall.pdb"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath="..\..\..\tests\testall.c"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/SiloWindows/MSVC8/Tests/testall_f.vfproj b/SiloWindows/MSVC8/Tests/testall_f.vfproj
deleted file mode 100644
index f371f47..0000000
--- a/SiloWindows/MSVC8/Tests/testall_f.vfproj
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VisualStudioProject ProjectCreator="Intel Fortran" Keyword="Console Application" Version="11.0" ProjectIdGuid="{A1F2E6F2-6E49-4746-9133-9DF0A404C7DB}">
- <Platforms>
- <Platform Name="Win32"/></Platforms>
- <Configurations>
- <Configuration Name="DLLwithHDF5_Debug|Win32" OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\testall_f" IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\testall_f">
- <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="..\..\..\src\silo" Interfaces="true" WarnInterfaces="true" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug"/>
- <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)..\bin\$(ProjectName).exe" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)" ManifestFile="$(IntDir)\$(TargetFileName).intermediate.manifest" GenerateDebugInformation="true" ProgramDatabaseFile="$(IntDir)$(TargetName).pdb" SubSystem="subSystemConsole" ImportLibrary="$(IntDir)\$(TargetName).lib" TargetMachine="machineX86" AdditionalDep [...]
- <Tool Name="VFResourceCompilerTool" ResourceOutputFileName="$(IntDir)\$(InputName).res"/>
- <Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(IntDir)\$(ProjectName).tlb"/>
- <Tool Name="VFCustomBuildTool"/>
- <Tool Name="VFPreLinkEventTool"/>
- <Tool Name="VFPreBuildEventTool"/>
- <Tool Name="VFPostBuildEventTool"/>
- <Tool Name="VFManifestTool" SuppressStartupBanner="true" OutputManifestFile="$(Intdir)\$(TargetFileName).embed.manifest" ResourceFile="$(IntDir)\$(TargetFileName).embed.manifest.res"/></Configuration>
- <Configuration Name="DLLwithHDF5_Release|Win32" OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\testall_f" IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\testall_f">
- <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" AdditionalIncludeDirectories="..\..\..\src\silo" DiagnosticsFile="$(IntDir)$(TargetName).diag" ModulePath="$(IntDir)" ObjectFile="$(IntDir)"/>
- <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)..\bin\$(ProjectName).exe" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)" ManifestFile="$(IntDir)\$(TargetFileName).intermediate.manifest" ProgramDatabaseFile="$(IntDir)$(TargetName).pdb" SubSystem="subSystemConsole" ImportLibrary="$(IntDir)\$(TargetName).lib" AdditionalDependencies="silohdf5.lib"/>
- <Tool Name="VFResourceCompilerTool" ResourceOutputFileName="$(IntDir)\$(InputName).res"/>
- <Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(IntDir)\$(ProjectName).tlb"/>
- <Tool Name="VFCustomBuildTool"/>
- <Tool Name="VFPreLinkEventTool"/>
- <Tool Name="VFPreBuildEventTool"/>
- <Tool Name="VFPostBuildEventTool"/>
- <Tool Name="VFManifestTool" SuppressStartupBanner="true" OutputManifestFile="$(Intdir)\$(TargetFileName).embed.manifest" ResourceFile="$(IntDir)\$(TargetFileName).embed.manifest.res"/></Configuration></Configurations>
- <Files>
- <Filter Name="Header Files" Filter="fi;fd"/>
- <Filter Name="Resource Files" Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"/>
- <Filter Name="Source Files" Filter="f90;for;f;fpp;ftn;def;odl;idl">
- <File RelativePath="..\..\..\tests\testallf77.f"/></Filter></Files>
- <Globals/></VisualStudioProject>
diff --git a/SiloWindows/MSVC8/Tests/testpdb.vcproj b/SiloWindows/MSVC8/Tests/testpdb.vcproj
deleted file mode 100644
index 05a723e..0000000
--- a/SiloWindows/MSVC8/Tests/testpdb.vcproj
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="testpdb"
- ProjectGUID="{29110B58-9FD5-4A8E-B9F7-064650EE16C6}"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="DLLwithHDF5_Debug|Win32"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\testpdb"
- IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\testpdb"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName="$(OutDir)\testpdb.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..\..\include\WithHDF5;..\..\..\src\silo;..\..\..\src\score;..\..\..\src\pdb"
- PreprocessorDefinitions="WIN32;_CONSOLE"
- BasicRuntimeChecks="3"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="$(OutDir)\testpdb.pch"
- AssemblerListingLocation="$(OutDir)\"
- ObjectFile="$(OutDir)\"
- ProgramDataBaseFileName="$(OutDir)\testpdb"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DebugInformationFormat="4"
- DisableSpecificWarnings="4244;4305"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="silohdf5.lib"
- OutputFile="$(SolutionDir)..\bin\testpdb.exe"
- LinkIncremental="2"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
- GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)\testpdb.pdb"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="DLLwithHDF5_Release|Win32"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\testpdb"
- IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\testpdb"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName="$(OutDir)\testpdb.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="..\..\include\WithHDF5;..\..\..\src\silo;..\..\..\src\score;..\..\..\src\pdb"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- StringPooling="true"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="$(OutDir)\testpdb.pch"
- AssemblerListingLocation="$(OutDir)\"
- ObjectFile="$(OutDir)\"
- ProgramDataBaseFileName="$(OutDir)\"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DisableSpecificWarnings="4244;4305"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="silohdf5.lib"
- OutputFile="$(SolutionDir)..\bin\testpdb.exe"
- LinkIncremental="1"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
- ProgramDatabaseFile="$(OutDir)\testpdb.pdb"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath="..\..\..\tests\testpdb.c"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/SiloWindows/MSVC8/Tests/twohex.vcproj b/SiloWindows/MSVC8/Tests/twohex.vcproj
deleted file mode 100644
index 3360fe9..0000000
--- a/SiloWindows/MSVC8/Tests/twohex.vcproj
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="twohex"
- ProjectGUID="{64A6CE79-710F-405C-AAE8-F604E74A4374}"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="DLLwithHDF5_Debug|Win32"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\twohex"
- IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\twohex"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName="$(OutDir)\twohex.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..\..\..\src\silo"
- PreprocessorDefinitions="WIN32;_CONSOLE"
- BasicRuntimeChecks="3"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="$(OutDir)\twohex.pch"
- AssemblerListingLocation="$(OutDir)\"
- ObjectFile="$(OutDir)\"
- ProgramDataBaseFileName="$(OutDir)\twohex"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DebugInformationFormat="4"
- DisableSpecificWarnings="4244;4305"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="silohdf5.lib"
- OutputFile="$(SolutionDir)..\bin\twohex.exe"
- LinkIncremental="2"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
- GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)\twohex.pdb"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="DLLwithHDF5_Release|Win32"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\twohex"
- IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\twohex"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName="$(OutDir)\twohex.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="..\..\..\src\silo"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- StringPooling="true"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="$(OutDir)\twohex.pch"
- AssemblerListingLocation="$(OutDir)\"
- ObjectFile="$(OutDir)\"
- ProgramDataBaseFileName="$(OutDir)\"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DisableSpecificWarnings="4244;4305"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="silohdf5.lib"
- OutputFile="$(SolutionDir)..\bin\twohex.exe"
- LinkIncremental="1"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
- ProgramDatabaseFile="$(OutDir)\twohex.pdb"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath="..\..\..\tests\twohex.c"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/SiloWindows/MSVC8/Tests/ucd.vcproj b/SiloWindows/MSVC8/Tests/ucd.vcproj
deleted file mode 100644
index 9ac6be9..0000000
--- a/SiloWindows/MSVC8/Tests/ucd.vcproj
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="ucd"
- ProjectGUID="{9B955616-D58C-4ED8-AB6F-FBA74E768B54}"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="DLLwithHDF5_Debug|Win32"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\ucd"
- IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\ucd"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName="$(OutDir)\ucd.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..\..\..\src\silo"
- PreprocessorDefinitions="WIN32;_CONSOLE"
- BasicRuntimeChecks="3"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="$(OutDir)\ucd.pch"
- AssemblerListingLocation="$(OutDir)\"
- ObjectFile="$(OutDir)\"
- ProgramDataBaseFileName="$(OutDir)\ucd"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DebugInformationFormat="4"
- DisableSpecificWarnings="4244;4305"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="silohdf5.lib"
- OutputFile="$(SolutionDir)..\bin\ucd.exe"
- LinkIncremental="2"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
- GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)\ucd.pdb"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="DLLwithHDF5_Release|Win32"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\ucd"
- IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\ucd"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName="$(OutDir)\ucd.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="..\..\..\src\silo"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- StringPooling="true"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="$(OutDir)\ucd.pch"
- AssemblerListingLocation="$(OutDir)\"
- ObjectFile="$(OutDir)\"
- ProgramDataBaseFileName="$(OutDir)\"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DisableSpecificWarnings="4244;4305"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="silohdf5.lib"
- OutputFile="$(SolutionDir)..\bin\ucd.exe"
- LinkIncremental="1"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
- ProgramDatabaseFile="$(OutDir)\ucd.pdb"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath="..\..\..\tests\ucd.c"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/SiloWindows/MSVC8/Tests/ucd1d.vcproj b/SiloWindows/MSVC8/Tests/ucd1d.vcproj
deleted file mode 100644
index d4fb36f..0000000
--- a/SiloWindows/MSVC8/Tests/ucd1d.vcproj
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="ucd1d"
- ProjectGUID="{C065DCD0-DE87-4B6E-A1E6-8F7EDB272D53}"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="DLLwithHDF5_Debug|Win32"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\ucd1d"
- IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\ucd1d"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName="$(OutDir)\ucd1d.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..\..\..\src\silo"
- PreprocessorDefinitions="WIN32;_CONSOLE;_USE_MATH_DEFINES"
- BasicRuntimeChecks="3"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="$(OutDir)\ucd1d.pch"
- AssemblerListingLocation="$(OutDir)\"
- ObjectFile="$(OutDir)\"
- ProgramDataBaseFileName="$(OutDir)\ucd1d"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DebugInformationFormat="4"
- DisableSpecificWarnings="4244;4305"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="silohdf5.lib"
- OutputFile="$(SolutionDir)..\bin\ucd1d.exe"
- LinkIncremental="2"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
- GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)\ucd1d.pdb"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="DLLwithHDF5_Release|Win32"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\ucd1d"
- IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\ucd1d"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName="$(OutDir)\ucd1d.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="..\..\..\src\silo"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_USE_MATH_DEFINES"
- StringPooling="true"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="$(OutDir)\ucd1d.pch"
- AssemblerListingLocation="$(OutDir)\"
- ObjectFile="$(OutDir)\"
- ProgramDataBaseFileName="$(OutDir)\"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DisableSpecificWarnings="4244;4305"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="silohdf5.lib"
- OutputFile="$(SolutionDir)..\bin\ucd1d.exe"
- LinkIncremental="1"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
- ProgramDatabaseFile="$(OutDir)\ucd1d.pdb"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath="..\..\..\tests\ucd1d.c"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/SiloWindows/MSVC8/Tests/ucd_f.vfproj b/SiloWindows/MSVC8/Tests/ucd_f.vfproj
deleted file mode 100644
index 8830be6..0000000
--- a/SiloWindows/MSVC8/Tests/ucd_f.vfproj
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VisualStudioProject ProjectCreator="Intel Fortran" Keyword="Console Application" Version="11.0" ProjectIdGuid="{A1F2E6F2-6E49-4746-9133-9DF0A404C7DB}">
- <Platforms>
- <Platform Name="Win32"/></Platforms>
- <Configurations>
- <Configuration Name="DLLwithHDF5_Debug|Win32" OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\ucd_f" IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\ucd_f">
- <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="..\..\..\src\silo" Interfaces="true" WarnInterfaces="true" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug"/>
- <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)..\bin\$(ProjectName).exe" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)" ManifestFile="$(IntDir)\$(TargetFileName).intermediate.manifest" GenerateDebugInformation="true" ProgramDatabaseFile="$(IntDir)$(TargetName).pdb" SubSystem="subSystemConsole" ImportLibrary="$(IntDir)\$(TargetName).lib" TargetMachine="machineX86" AdditionalDep [...]
- <Tool Name="VFResourceCompilerTool" ResourceOutputFileName="$(IntDir)\$(InputName).res"/>
- <Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(IntDir)\$(ProjectName).tlb"/>
- <Tool Name="VFCustomBuildTool"/>
- <Tool Name="VFPreLinkEventTool"/>
- <Tool Name="VFPreBuildEventTool"/>
- <Tool Name="VFPostBuildEventTool"/>
- <Tool Name="VFManifestTool" SuppressStartupBanner="true" OutputManifestFile="$(Intdir)\$(TargetFileName).embed.manifest" ResourceFile="$(IntDir)\$(TargetFileName).embed.manifest.res"/></Configuration>
- <Configuration Name="DLLwithHDF5_Release|Win32" OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\ucd_f" IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\ucd_f">
- <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" AdditionalIncludeDirectories="..\..\..\src\silo" DiagnosticsFile="$(IntDir)$(TargetName).diag" ModulePath="$(IntDir)" ObjectFile="$(IntDir)"/>
- <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)..\bin\$(ProjectName).exe" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)" ManifestFile="$(IntDir)\$(TargetFileName).intermediate.manifest" ProgramDatabaseFile="$(IntDir)$(TargetName).pdb" SubSystem="subSystemConsole" ImportLibrary="$(IntDir)\$(TargetName).lib" AdditionalDependencies="silohdf5.lib"/>
- <Tool Name="VFResourceCompilerTool" ResourceOutputFileName="$(IntDir)\$(InputName).res"/>
- <Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(IntDir)\$(ProjectName).tlb"/>
- <Tool Name="VFCustomBuildTool"/>
- <Tool Name="VFPreLinkEventTool"/>
- <Tool Name="VFPreBuildEventTool"/>
- <Tool Name="VFPostBuildEventTool"/>
- <Tool Name="VFManifestTool" SuppressStartupBanner="true" OutputManifestFile="$(Intdir)\$(TargetFileName).embed.manifest" ResourceFile="$(IntDir)\$(TargetFileName).embed.manifest.res"/></Configuration></Configurations>
- <Files>
- <Filter Name="Header Files" Filter="fi;fd"/>
- <Filter Name="Resource Files" Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"/>
- <Filter Name="Source Files" Filter="f90;for;f;fpp;ftn;def;odl;idl">
- <File RelativePath="..\..\..\tests\ucdf77.f"/></Filter></Files>
- <Globals/></VisualStudioProject>
diff --git a/SiloWindows/MSVC8/Tests/ucdsamp3.vcproj b/SiloWindows/MSVC8/Tests/ucdsamp3.vcproj
deleted file mode 100644
index 734a847..0000000
--- a/SiloWindows/MSVC8/Tests/ucdsamp3.vcproj
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="ucdsamp3"
- ProjectGUID="{94D10A14-5A9B-4E1E-B204-DE3196750126}"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="DLLwithHDF5_Debug|Win32"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\ucdsamp3"
- IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\ucdsamp3"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName="$(OutDir)\ucdsamp3.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..\..\..\src\silo"
- PreprocessorDefinitions="WIN32;_CONSOLE"
- BasicRuntimeChecks="3"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="$(OutDir)\ucdsamp3.pch"
- AssemblerListingLocation="$(OutDir)\"
- ObjectFile="$(OutDir)\"
- ProgramDataBaseFileName="$(OutDir)\ucdsamp3"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DebugInformationFormat="4"
- DisableSpecificWarnings="4244;4305"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="silohdf5.lib"
- OutputFile="$(SolutionDir)..\bin\ucdsamp3.exe"
- LinkIncremental="2"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
- GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)\ucdsamp3.pdb"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="DLLwithHDF5_Release|Win32"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\ucdsamp3"
- IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\ucdsamp3"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName="$(OutDir)\ucdsamp3.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="..\..\..\src\silo"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- StringPooling="true"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="$(OutDir)\ucdsamp3.pch"
- AssemblerListingLocation="$(OutDir)\"
- ObjectFile="$(OutDir)\"
- ProgramDataBaseFileName="$(OutDir)\"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DisableSpecificWarnings="4244;4305"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="silohdf5.lib"
- OutputFile="$(SolutionDir)..\bin\ucdsamp3.exe"
- LinkIncremental="1"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
- ProgramDatabaseFile="$(OutDir)\ucdsamp3.pdb"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath="..\..\..\tests\ucdsamp3.c"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/SiloWindows/MSVC8/Tests/version.vcproj b/SiloWindows/MSVC8/Tests/version.vcproj
deleted file mode 100644
index 483aad3..0000000
--- a/SiloWindows/MSVC8/Tests/version.vcproj
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="version"
- ProjectGUID="{CBBCFD38-0F91-4CA2-8CBF-2833AC284438}"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="DLLwithHDF5_Debug|Win32"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\version"
- IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\version"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName="$(OutDir)\version.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..\..\..\src\silo"
- PreprocessorDefinitions="WIN32;_CONSOLE"
- BasicRuntimeChecks="3"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="$(OutDir)\version.pch"
- AssemblerListingLocation="$(OutDir)\"
- ObjectFile="$(OutDir)\"
- ProgramDataBaseFileName="$(OutDir)\version"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DebugInformationFormat="4"
- DisableSpecificWarnings="4244;4305"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="silohdf5.lib"
- OutputFile="$(SolutionDir)..\bin\version.exe"
- LinkIncremental="2"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
- GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)\version.pdb"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="DLLwithHDF5_Release|Win32"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\version"
- IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\version"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName="$(OutDir)\version.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="..\..\..\src\silo"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- StringPooling="true"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="$(OutDir)\version.pch"
- AssemblerListingLocation="$(OutDir)\"
- ObjectFile="$(OutDir)\"
- ProgramDataBaseFileName="$(OutDir)\"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DisableSpecificWarnings="4244;4305"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="silohdf5.lib"
- OutputFile="$(SolutionDir)..\bin\version.exe"
- LinkIncremental="1"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
- ProgramDatabaseFile="$(OutDir)\version.pdb"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath="..\..\..\tests\version.c"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/SiloWindows/MSVC8/Tests/wave.vcproj b/SiloWindows/MSVC8/Tests/wave.vcproj
deleted file mode 100644
index 59a17de..0000000
--- a/SiloWindows/MSVC8/Tests/wave.vcproj
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="wave"
- ProjectGUID="{3D443B05-403C-4907-8F50-DC396DB6BB23}"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="DLLwithHDF5_Debug|Win32"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\wave"
- IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\wave"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName="$(OutDir)\wave.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..\..\..\src\silo"
- PreprocessorDefinitions="WIN32;_CONSOLE"
- BasicRuntimeChecks="3"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="$(OutDir)\wave.pch"
- AssemblerListingLocation="$(OutDir)\"
- ObjectFile="$(OutDir)\"
- ProgramDataBaseFileName="$(OutDir)\wave"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DebugInformationFormat="4"
- DisableSpecificWarnings="4244;4305"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="silohdf5.lib"
- OutputFile="$(SolutionDir)..\bin\wave.exe"
- LinkIncremental="2"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
- GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)\wave.pdb"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="DLLwithHDF5_Release|Win32"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\wave"
- IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\wave"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName="$(OutDir)\wave.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="..\..\..\src\silo"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- StringPooling="true"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="$(OutDir)\wave.pch"
- AssemblerListingLocation="$(OutDir)\"
- ObjectFile="$(OutDir)\"
- ProgramDataBaseFileName="$(OutDir)\"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DisableSpecificWarnings="4244;4305"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="silohdf5.lib"
- OutputFile="$(SolutionDir)..\bin\wave.exe"
- LinkIncremental="1"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
- ProgramDatabaseFile="$(OutDir)\wave.pdb"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath="..\..\..\tests\wave.c"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/SiloWindows/MSVC8/pdb_detect/pdb_detect.vcproj b/SiloWindows/MSVC8/pdb_detect/pdb_detect.vcproj
deleted file mode 100644
index 9048db7..0000000
--- a/SiloWindows/MSVC8/pdb_detect/pdb_detect.vcproj
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="pdb_detect"
- ProjectGUID="{17857422-AD82-4D37-A5AF-94C4556935D0}"
- RootNamespace="pdb_detect"
- Keyword="Win32Proj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(ProjectDir)$(PlatformName)\$(ConfigurationName)"
- IntermediateDirectory="$(ProjectDir)$(PlatformName)\$(ConfigurationName)"
- ConfigurationType="1"
- InheritedPropertySheets="..\NO_SEC_DEP.vsprops"
- CharacterSet="1"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\..\include"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- RuntimeLibrary="2"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- LinkIncremental="1"
- GenerateDebugInformation="true"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- Description="Create pdbform.h"
- CommandLine="$(OutDir)\pdb_detect.exe > ..\..\..\src\pdb\pdform.h
"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- >
- <File
- RelativePath="..\..\..\src\pdb\detect.c"
- >
- </File>
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/SiloWindows/MSVC8/silex.vcproj b/SiloWindows/MSVC8/silex.vcproj
deleted file mode 100644
index c89fec7..0000000
--- a/SiloWindows/MSVC8/silex.vcproj
+++ /dev/null
@@ -1,839 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="silex"
- ProjectGUID="{3D443B05-403C-4907-8F50-DC396DB6BB23}"
- RootNamespace="silex"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="DLLwithHDF5_Debug|Win32"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
- IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;.\NO_SEC_DEP.vsprops;.\ModernDTPR.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- CommandLine="..\runsilexmoc.bat"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName="$(OutDir)\silex.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..\include;..\..\tools\silex;..\..\src\silo;$(QT_INC_DIR);$(QT_INC_DIR)\QtCore;$(QT_INC_DIR)\QtGui"
- PreprocessorDefinitions="WIN32;_CONSOLE"
- BasicRuntimeChecks="3"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="$(OutDir)\silex.pch"
- AssemblerListingLocation="$(OutDir)\"
- ObjectFile="$(OutDir)\"
- ProgramDataBaseFileName="$(OutDir)\"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DebugInformationFormat="4"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="QtCore4.lib QtGui4.lib silohdf5.lib"
- OutputFile="$(OutDir)\silex.exe"
- LinkIncremental="2"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="$(QT_LIB_DIR);$(OutDir)"
- GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)\silex.pdb"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="DLLwithHDF5_Release|Win32"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
- IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;.\NO_SEC_DEP.vsprops;.\ModernDTPR.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- CommandLine="..\runsilexmoc.bat"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName="$(OutDir)\silex.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="..\include;..\..\tools\silex;..\..\src\silo;$(QT_INC_DIR);$(QT_INC_DIR)\QtCore;$(QT_INC_DIR)\QtGui"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- StringPooling="true"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="$(OutDir)\silex.pch"
- AssemblerListingLocation="$(OutDir)\"
- ObjectFile="$(OutDir)\"
- ProgramDataBaseFileName="$(OutDir)\"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DisableSpecificWarnings="4244;4305"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="QtCore4.lib QtGui4.lib silohdf5.lib"
- OutputFile="$(OutDir)\silex.exe"
- LinkIncremental="1"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="$(QT_LIB_DIR);$(OutDir)"
- IgnoreDefaultLibraryNames=""
- ProgramDatabaseFile="$(OutDir)\silex.pdb"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="DLL_Debug|Win32"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
- IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;.\NO_SEC_DEP.vsprops;.\ModernDTPR.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- CommandLine="..\runsilexmoc.bat"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName="$(OutDir)\silex.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..\include;..\..\tools\silex;..\..\src\silo;$(QT_INC_DIR);$(QT_INC_DIR)\QtCore;$(QT_INC_DIR)\QtGui"
- PreprocessorDefinitions="WIN32;_CONSOLE"
- BasicRuntimeChecks="3"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="$(OutDir)\silex.pch"
- AssemblerListingLocation="$(OutDir)\"
- ObjectFile="$(OutDir)\"
- ProgramDataBaseFileName="$(OutDir)\"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DebugInformationFormat="4"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="QtCore4.lib QtGui4.lib silo.lib"
- OutputFile="$(OutDir)\silex.exe"
- LinkIncremental="2"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="$(QT_LIB_DIR);$(OutDir)"
- GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)\silex.pdb"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="DLL_Release|Win32"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
- IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;.\NO_SEC_DEP.vsprops;.\ModernDTPR.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- CommandLine="..\runsilexmoc.bat"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName="$(OutDir)\silex.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="..\include;..\..\tools\silex;..\..\src\silo;$(QT_INC_DIR);$(QT_INC_DIR)\QtCore;$(QT_INC_DIR)\QtGui"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- StringPooling="true"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="$(OutDir)\silex.pch"
- AssemblerListingLocation="$(OutDir)\"
- ObjectFile="$(OutDir)\"
- ProgramDataBaseFileName="$(OutDir)\"
- WarningLevel="3"
- SuppressStartupBanner="true"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="QtCore4.lib QtGui4.lib silo.lib"
- OutputFile="$(OutDir)\silex.exe"
- LinkIncremental="1"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="$(QT_LIB_DIR);$(OutDir)"
- ProgramDatabaseFile="$(OutDir)\silex.pdb"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="StaticLibwithHDF5_Release|Win32"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
- IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;.\NO_SEC_DEP.vsprops;.\ModernDTPR.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- CommandLine="..\runsilexmoc.bat"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName="$(OutDir)\silex.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="..\include;..\..\tools\silex;..\..\src\silo;$(QT_INC_DIR);$(QT_INC_DIR)\QtCore;$(QT_INC_DIR)\QtGui"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;SILO_STATIC_LIBRARY"
- StringPooling="true"
- RuntimeLibrary="0"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="$(OutDir)\silex.pch"
- AssemblerListingLocation="$(OutDir)\"
- ObjectFile="$(OutDir)\"
- ProgramDataBaseFileName="$(OutDir)\"
- WarningLevel="3"
- SuppressStartupBanner="true"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="QtCore4.lib QtGui4.lib silohdf5.lib"
- OutputFile="$(OutDir)\silex.exe"
- LinkIncremental="1"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="$(QT_LIB_DIR);$(OutDir)"
- ProgramDatabaseFile="$(OutDir)\silex.pdb"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="StaticLibwithHDF5_Debug|Win32"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
- IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;.\NO_SEC_DEP.vsprops;.\ModernDTPR.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- CommandLine="..\runsilexmoc.bat"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName="$(OutDir)\silex.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..\include;..\..\tools\silex;..\..\src\silo;$(QT_INC_DIR);$(QT_INC_DIR)\QtCore;$(QT_INC_DIR)\QtGui"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;SILO_STATIC_LIBRARY"
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="$(OutDir)\silex.pch"
- AssemblerListingLocation="$(OutDir)\"
- ObjectFile="$(OutDir)\"
- ProgramDataBaseFileName="$(OutDir)\"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DebugInformationFormat="4"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="QtCore4.lib QtGui4.lib silohdf5.lib"
- OutputFile="$(OutDir)\silex.exe"
- LinkIncremental="2"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="$(QT_LIB_DIR);$(OutDir)"
- IgnoreDefaultLibraryNames="libcmt.lib"
- GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)\silex.pdb"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="StaticLib_Release|Win32"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
- IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;.\NO_SEC_DEP.vsprops;.\ModernDTPR.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- CommandLine="..\runsilexmoc.bat"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName="$(OutDir)\silex.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="..\include;..\..\tools\silex;..\..\src\silo;$(QT_INC_DIR);$(QT_INC_DIR)\QtCore;$(QT_INC_DIR)\QtGui"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;SILO_STATIC_LIBRARY"
- StringPooling="true"
- RuntimeLibrary="0"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="$(OutDir)\silex.pch"
- AssemblerListingLocation="$(OutDir)\"
- ObjectFile="$(OutDir)\"
- ProgramDataBaseFileName="$(OutDir)\"
- WarningLevel="3"
- SuppressStartupBanner="true"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="QtCore4.lib QtGui4.lib silo.lib"
- OutputFile="$(OutDir)\silex.exe"
- LinkIncremental="1"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="$(QT_LIB_DIR);$(OutDir)"
- ProgramDatabaseFile="$(OutDir)\silex.pdb"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="StaticLib_Debug|Win32"
- OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
- IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;.\NO_SEC_DEP.vsprops;.\ModernDTPR.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- CommandLine="..\runsilexmoc.bat"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName="$(OutDir)\silex.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..\include;..\..\tools\silex;..\..\src\silo;$(QT_INC_DIR);$(QT_INC_DIR)\QtCore;$(QT_INC_DIR)\QtGui"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;SILO_STATIC_LIBRARY"
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="$(OutDir)\silex.pch"
- AssemblerListingLocation="$(OutDir)\"
- ObjectFile="$(OutDir)\"
- ProgramDataBaseFileName="$(OutDir)\"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DebugInformationFormat="4"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="QtCore4.lib QtGui4.lib silo.lib"
- OutputFile="$(OutDir)\silex.exe"
- LinkIncremental="2"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="$(QT_LIB_DIR);$(OutDir)"
- GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)\silex.pdb"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="moc"
- >
- <File
- RelativePath="..\..\tools\silex\Explorer_moc.cpp"
- >
- </File>
- <File
- RelativePath="..\..\tools\silex\SiloArrayView_moc.cpp"
- >
- </File>
- <File
- RelativePath="..\..\tools\silex\SiloDirTreeView_moc.cpp"
- >
- </File>
- <File
- RelativePath="..\..\tools\silex\SiloDirView_moc.cpp"
- >
- </File>
- <File
- RelativePath="..\..\tools\silex\SiloObjectView_moc.cpp"
- >
- </File>
- <File
- RelativePath="..\..\tools\silex\SiloValueView_moc.cpp"
- >
- </File>
- <File
- RelativePath="..\..\tools\silex\SiloView_moc.cpp"
- >
- </File>
- </Filter>
- <File
- RelativePath="..\..\tools\silex\Explorer.cpp"
- >
- </File>
- <File
- RelativePath="..\..\tools\silex\main.cpp"
- >
- </File>
- <File
- RelativePath="..\resources\silex.rc"
- >
- </File>
- <File
- RelativePath="..\..\tools\silex\SiloArrayView.cpp"
- >
- </File>
- <File
- RelativePath="..\..\tools\silex\SiloDirTreeView.cpp"
- >
- </File>
- <File
- RelativePath="..\..\tools\silex\SiloDirView.cpp"
- >
- </File>
- <File
- RelativePath="..\..\tools\silex\SiloFile.cpp"
- >
- </File>
- <File
- RelativePath="..\..\tools\silex\SiloObjectView.cpp"
- >
- </File>
- <File
- RelativePath="..\..\tools\silex\SiloValueView.cpp"
- >
- </File>
- <File
- RelativePath="..\..\tools\silex\SiloView.cpp"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/SiloWindows/MSVC8/BaseIncludes.vsprops b/SiloWindows/MSVC9/BaseIncludes.vsprops
similarity index 100%
rename from SiloWindows/MSVC8/BaseIncludes.vsprops
rename to SiloWindows/MSVC9/BaseIncludes.vsprops
diff --git a/SiloWindows/MSVC9/DepLibs.vsprops b/SiloWindows/MSVC9/DepLibs.vsprops
new file mode 100644
index 0000000..a81ffa5
--- /dev/null
+++ b/SiloWindows/MSVC9/DepLibs.vsprops
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+ ProjectType="Visual C++"
+ Version="8.00"
+ Name="DepLibs"
+ >
+ <UserMacro
+ Name="HDF5_INC_DIR"
+ Value="C:\VisIt\TRUNK\windowsbuild\ThirdParty\hdf5-1.8.7\MSVC90\include"
+ />
+ <UserMacro
+ Name="HDF5_INC_DIR_X64"
+ Value="C:\VisIt\TRUNK\windowsbuild\ThirdParty\hdf5-1.8.7\MSVC90-x64\include"
+ />
+ <UserMacro
+ Name="HDF5_LIB_DIR"
+ Value="C:\VisIt\TRUNK\windowsbuild\ThirdParty\hdf5-1.8.7\MSVC90\lib"
+ />
+ <UserMacro
+ Name="HDF5_LIB_DIR_X64"
+ Value="C:\VisIt\TRUNK\windowsbuild\ThirdParty\hdf5-1.8.7\MSVC90-x64\lib"
+ />
+ <UserMacro
+ Name="SZIP_INC_DIR"
+ Value="C:\VisIt\TRUNK\windowsbuild\ThirdParty\szip\include"
+ />
+ <UserMacro
+ Name="SZIP_LIB_DIR"
+ Value="C:\VisIt\TRUNK\windowsbuild\ThirdParty\szip\lib\MSVC90"
+ />
+ <UserMacro
+ Name="SZIP_LIB_DIR_X64"
+ Value="C:\VisIt\TRUNK\windowsbuild\ThirdParty\szip\lib\MSVC90-x64"
+ />
+ <UserMacro
+ Name="ZLIB_INC_DIR"
+ Value="C:\VisIt\TRUNK\windowsbuild\ThirdParty\zlib\include"
+ />
+ <UserMacro
+ Name="ZLIB_LIB_DIR"
+ Value="C:\VisIt\TRUNK\windowsbuild\ThirdParty\zlib\lib\MSVC90"
+ />
+ <UserMacro
+ Name="ZLIB_LIB_DIR_X64"
+ Value="C:\VisIt\TRUNK\windowsbuild\ThirdParty\zlib\lib\MSVC90-x64"
+ />
+ <UserMacro
+ Name="QT_INC_DIR"
+ Value="C:\VisIt\TRUNK\windowsbuild\ThirdParty\Qt-4.8.3\include"
+ />
+ <UserMacro
+ Name="QT_LIB_DIR"
+ Value="C:\VisIt\TRUNK\windowsbuild\ThirdParty\Qt-4.8.3\lib\MSVC90"
+ />
+ <UserMacro
+ Name="QT_LIB_DIR_X64"
+ Value="C:\VisIt\TRUNK\windowsbuild\ThirdParty\Qt-4.8.3\lib\MSVC90-x64"
+ />
+</VisualStudioPropertySheet>
diff --git a/SiloWindows/MSVC8/HDF5_Defines.vsprops b/SiloWindows/MSVC9/HDF5_Defines.vsprops
similarity index 70%
rename from SiloWindows/MSVC8/HDF5_Defines.vsprops
rename to SiloWindows/MSVC9/HDF5_Defines.vsprops
index a54c3c2..d4b0bc5 100644
--- a/SiloWindows/MSVC8/HDF5_Defines.vsprops
+++ b/SiloWindows/MSVC9/HDF5_Defines.vsprops
@@ -6,6 +6,6 @@
>
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="_HDF5USEDLL_;HAVE_HDF5_DRIVER=1;HAVE_HDF5_H=1"
+ PreprocessorDefinitions="HAVE_HDF5_DRIVER=1;HAVE_HDF5_H=1;HAVE_LIBHDF5=1"
/>
</VisualStudioPropertySheet>
diff --git a/SiloWindows/MSVC8/ModernDTPR.vsprops b/SiloWindows/MSVC9/ModernDTPR.vsprops
similarity index 100%
rename from SiloWindows/MSVC8/ModernDTPR.vsprops
rename to SiloWindows/MSVC9/ModernDTPR.vsprops
diff --git a/SiloWindows/MSVC8/NO_SEC_DEP.vsprops b/SiloWindows/MSVC9/NO_SEC_DEP.vsprops
similarity index 100%
rename from SiloWindows/MSVC8/NO_SEC_DEP.vsprops
rename to SiloWindows/MSVC9/NO_SEC_DEP.vsprops
diff --git a/SiloWindows/MSVC9/QT_Defines.vsprops b/SiloWindows/MSVC9/QT_Defines.vsprops
new file mode 100644
index 0000000..e3c8f30
--- /dev/null
+++ b/SiloWindows/MSVC9/QT_Defines.vsprops
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+ ProjectType="Visual C++"
+ Version="8.00"
+ Name="QT_DEFINES"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories="$(QT_INC_DIR);$(QT_INC_DIR)\QtCore;"
+ />
+ <Tool
+ Name="VCLinkterTool"
+ AdditionalLibraryDirectories="$(QT_LIB_DIR);"
+ AdditionalDependencies="QtCore4.lib;QtGui4.lib;silohdf5.lib;"
+ />
+</VisualStudioPropertySheet>
diff --git a/SiloWindows/MSVC9/Silo.vcproj b/SiloWindows/MSVC9/Silo.vcproj
new file mode 100644
index 0000000..79ba6cf
--- /dev/null
+++ b/SiloWindows/MSVC9/Silo.vcproj
@@ -0,0 +1,570 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="Silo"
+ ProjectGUID="{20BFB7B0-9F43-43BB-B188-555DEA431CDF}"
+ RootNamespace="Silo"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="2"
+ InheritedPropertySheets=".\NO_SEC_DEP.vsprops;.\ModernDTPR.vsprops;.\HDF5_Defines.vsprops;.\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ BuildLogFile="$(IntDir)\$(ProjectName)_BuildLog.htm"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions="NDEBUG"
+ MkTypLibCompatible="true"
+ SuppressStartupBanner="true"
+ TargetEnvironment="1"
+ TypeLibraryName="$(OutDir)\silohdf5.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="2"
+ AdditionalIncludeDirectories="..\include;..\..\src\debug;..\..\src\hdf5_drv;..\..\src\pdb;..\..\src\pdb_drv;..\..\src\score;..\..\src\silo;..\..\src\taurus;..\..\src\unknown;$(HDF5_INC_DIR);$(ZLIB_INC_DIR)"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SILO_EXPORTS;LITE_EXPORTS"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\silohdf5.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ CompileAs="0"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="zlib1.lib hdf5dll.lib"
+ OutputFile="$(OutDir)\silohdf5.dll"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ZLIB_LIB_DIR);$(HDF5_LIB_DIR)"
+ ProgramDatabaseFile="$(OutDir)\silohdf5.pdb"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ ImportLibrary="$(OutDir)\silohdf5.lib"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ CommandLine="copy $(HDF5_LIB_DIR)\hdf5dll.dll $(OutDir)
copy $(ZLIB_LIB_DIR)\zlib1.dll $(OutDir)
copy $(SZIP_LIB_DIR)\szlibdll.dll $(OutDir)
"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="2"
+ InheritedPropertySheets=".\NO_SEC_DEP.vsprops;.\ModernDTPR.vsprops;.\HDF5_Defines.vsprops;.\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ BuildLogFile="$(IntDir)\$(ProjectName)_BuildLog.htm"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions="NDEBUG"
+ MkTypLibCompatible="true"
+ SuppressStartupBanner="true"
+ TargetEnvironment="3"
+ TypeLibraryName="$(OutDir)\silohdf5.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="2"
+ AdditionalIncludeDirectories="..\include;..\..\src\debug;..\..\src\hdf5_drv;..\..\src\pdb;..\..\src\pdb_drv;..\..\src\score;..\..\src\silo;..\..\src\taurus;..\..\src\unknown;$(HDF5_INC_DIR_X64);$(ZLIB_INC_DIR)"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SILO_EXPORTS;LITE_EXPORTS"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\silohdf5.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ CompileAs="0"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="zlib1.lib hdf5dll.lib"
+ OutputFile="$(OutDir)\silohdf5.dll"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ZLIB_LIB_DIR_X64);$(HDF5_LIB_DIR_X64)"
+ ProgramDatabaseFile="$(OutDir)\silohdf5.pdb"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ ImportLibrary="$(OutDir)\silohdf5.lib"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ CommandLine="copy $(HDF5_LIB_DIR_X64)\hdf5dll.dll $(OutDir)
copy $(ZLIB_LIB_DIR_X64)\zlib1.dll $(OutDir)
copy $(SZIP_LIB_DIR_X64)\szlibdll.dll $(OutDir)
"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="2"
+ InheritedPropertySheets=".\NO_SEC_DEP.vsprops;.\ModernDTPR.vsprops;.\HDF5_Defines.vsprops;.\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ BuildLogFile="$(IntDir)\$(ProjectName)_BuildLog.htm"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions=""
+ MkTypLibCompatible="true"
+ SuppressStartupBanner="true"
+ TargetEnvironment="1"
+ TypeLibraryName="$(OutDir)\silohdf5.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\include;..\..\src\debug;..\..\src\hdf5_drv;..\..\src\pdb;..\..\src\pdb_drv;..\..\src\score;..\..\src\silo;..\..\src\taurus;..\..\src\unknown;$(HDF5_INC_DIR);$(ZLIB_INC_DIR)"
+ PreprocessorDefinitions="WIN32;_WINDOWS;_USRDLL;SILO_EXPORTS;LITE_EXPORTS"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="2"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\silohdf5.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="4"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="zlib1.lib hdf5dll.lib"
+ OutputFile="$(OutDir)\silohdf5.dll"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ZLIB_LIB_DIR);$(HDF5_LIB_DIR)"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)\silohdf5.pdb"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ ImportLibrary="$(OutDir)\silohdf5.lib"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ CommandLine="copy $(HDF5_LIB_DIR)\hdf5dll.dll $(OutDir)
copy $(ZLIB_LIB_DIR)\zlib1.dll $(OutDir)
copy $(SZIP_LIB_DIR)\szlibdll.dll $(OutDir)
"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="2"
+ InheritedPropertySheets=".\NO_SEC_DEP.vsprops;.\ModernDTPR.vsprops;.\HDF5_Defines.vsprops;.\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ BuildLogFile="$(IntDir)\$(ProjectName)_BuildLog.htm"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions=""
+ MkTypLibCompatible="true"
+ SuppressStartupBanner="true"
+ TargetEnvironment="3"
+ TypeLibraryName="$(OutDir)\silohdf5.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\include;..\..\src\debug;..\..\src\hdf5_drv;..\..\src\pdb;..\..\src\pdb_drv;..\..\src\score;..\..\src\silo;..\..\src\taurus;..\..\src\unknown;$(HDF5_INC_DIR_X64);$(ZLIB_INC_DIR)"
+ PreprocessorDefinitions="WIN32;_WINDOWS;_USRDLL;SILO_EXPORTS;LITE_EXPORTS"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="2"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\silohdf5.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="zlib1.lib hdf5dll.lib"
+ OutputFile="$(OutDir)\silohdf5.dll"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(ZLIB_LIB_DIR_X64);$(HDF5_LIB_DIR_X64)"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)\silohdf5.pdb"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ ImportLibrary="$(OutDir)\silohdf5.lib"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ CommandLine="copy $(HDF5_LIB_DIR_X64)\hdf5dll.dll $(OutDir)
copy $(ZLIB_LIB_DIR_X64)\zlib1.dll $(OutDir)
copy $(SZIP_LIB_DIR_X64)\szlibdll.dll $(OutDir)
"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="score"
+ >
+ <File
+ RelativePath="..\..\src\score\memmove.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\src\score\scctl.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\src\score\scctla.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\src\score\schash.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\src\score\scstr.c"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="pdb"
+ >
+ <File
+ RelativePath="..\..\src\pdb\pdb.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\src\pdb\pdbdir.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\src\pdb\pdbio.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\src\pdb\pdbmm.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\src\pdb\pdbx.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\src\pdb\pdconv.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\src\pdb\pdlow.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\src\pdb\pdmemb.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\src\pdb\pdpath.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\src\pdb\pdrdwr.c"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="pdb_drv"
+ >
+ <File
+ RelativePath="..\..\src\pdb_drv\silo_pdb.c"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="silo"
+ >
+ <File
+ RelativePath="..\..\src\silo\alloc.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\src\silo\extface.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\src\silo\silo.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\src\silo\silo_f.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\src\silo\silo_ns.c"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="unknown"
+ >
+ <File
+ RelativePath="..\..\src\unknown\silo_unknown.c"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="debug"
+ >
+ <File
+ RelativePath="..\..\src\debug\silo_debug.c"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="hdf5_drv"
+ >
+ <File
+ RelativePath="..\..\src\hdf5_drv\H5FDsilo.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\src\hdf5_drv\silo_hdf5.c"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="taurus_drv"
+ >
+ <File
+ RelativePath="..\..\src\taurus\silo_taurus.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\src\taurus\taurus.c"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="filters"
+ >
+ <File
+ RelativePath="..\..\src\filters\f_ale3d.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\src\filters\f_sample.c"
+ >
+ </File>
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/SiloWindows/MSVC9/SiloWindows.sln b/SiloWindows/MSVC9/SiloWindows.sln
new file mode 100644
index 0000000..7036eaf
--- /dev/null
+++ b/SiloWindows/MSVC9/SiloWindows.sln
@@ -0,0 +1,64 @@
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "silex", "silex.vcproj", "{3D443B05-403C-4907-8F50-DC396DB6BB23}"
+ ProjectSection(ProjectDependencies) = postProject
+ {20BFB7B0-9F43-43BB-B188-555DEA431CDF} = {20BFB7B0-9F43-43BB-B188-555DEA431CDF}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Silo", "Silo.vcproj", "{20BFB7B0-9F43-43BB-B188-555DEA431CDF}"
+ ProjectSection(ProjectDependencies) = postProject
+ {17857422-AD82-4D37-A5AF-94C4556935D0} = {17857422-AD82-4D37-A5AF-94C4556935D0}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pdb_detect", "pdb_detect\pdb_detect.vcproj", "{17857422-AD82-4D37-A5AF-94C4556935D0}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "browser", "browser.vcproj", "{7C65A1CE-9430-4012-8CED-783C233AEA1D}"
+ ProjectSection(ProjectDependencies) = postProject
+ {20BFB7B0-9F43-43BB-B188-555DEA431CDF} = {20BFB7B0-9F43-43BB-B188-555DEA431CDF}
+ EndProjectSection
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Win32 = Debug|Win32
+ Debug|x64 = Debug|x64
+ Release|Win32 = Release|Win32
+ Release|x64 = Release|x64
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {3D443B05-403C-4907-8F50-DC396DB6BB23}.Debug|Win32.ActiveCfg = Debug|Win32
+ {3D443B05-403C-4907-8F50-DC396DB6BB23}.Debug|Win32.Build.0 = Debug|Win32
+ {3D443B05-403C-4907-8F50-DC396DB6BB23}.Debug|x64.ActiveCfg = Debug|x64
+ {3D443B05-403C-4907-8F50-DC396DB6BB23}.Debug|x64.Build.0 = Debug|x64
+ {3D443B05-403C-4907-8F50-DC396DB6BB23}.Release|Win32.ActiveCfg = Release|Win32
+ {3D443B05-403C-4907-8F50-DC396DB6BB23}.Release|Win32.Build.0 = Release|Win32
+ {3D443B05-403C-4907-8F50-DC396DB6BB23}.Release|x64.ActiveCfg = Release|x64
+ {3D443B05-403C-4907-8F50-DC396DB6BB23}.Release|x64.Build.0 = Release|x64
+ {20BFB7B0-9F43-43BB-B188-555DEA431CDF}.Debug|Win32.ActiveCfg = Debug|Win32
+ {20BFB7B0-9F43-43BB-B188-555DEA431CDF}.Debug|Win32.Build.0 = Debug|Win32
+ {20BFB7B0-9F43-43BB-B188-555DEA431CDF}.Debug|x64.ActiveCfg = Debug|x64
+ {20BFB7B0-9F43-43BB-B188-555DEA431CDF}.Debug|x64.Build.0 = Debug|x64
+ {20BFB7B0-9F43-43BB-B188-555DEA431CDF}.Release|Win32.ActiveCfg = Release|Win32
+ {20BFB7B0-9F43-43BB-B188-555DEA431CDF}.Release|Win32.Build.0 = Release|Win32
+ {20BFB7B0-9F43-43BB-B188-555DEA431CDF}.Release|x64.ActiveCfg = Release|x64
+ {20BFB7B0-9F43-43BB-B188-555DEA431CDF}.Release|x64.Build.0 = Release|x64
+ {17857422-AD82-4D37-A5AF-94C4556935D0}.Debug|Win32.ActiveCfg = Release|Win32
+ {17857422-AD82-4D37-A5AF-94C4556935D0}.Debug|Win32.Build.0 = Release|Win32
+ {17857422-AD82-4D37-A5AF-94C4556935D0}.Debug|x64.ActiveCfg = Release|x64
+ {17857422-AD82-4D37-A5AF-94C4556935D0}.Debug|x64.Build.0 = Release|x64
+ {17857422-AD82-4D37-A5AF-94C4556935D0}.Release|Win32.ActiveCfg = Release|Win32
+ {17857422-AD82-4D37-A5AF-94C4556935D0}.Release|Win32.Build.0 = Release|Win32
+ {17857422-AD82-4D37-A5AF-94C4556935D0}.Release|x64.ActiveCfg = Release|x64
+ {17857422-AD82-4D37-A5AF-94C4556935D0}.Release|x64.Build.0 = Release|x64
+ {7C65A1CE-9430-4012-8CED-783C233AEA1D}.Debug|Win32.ActiveCfg = Debug|Win32
+ {7C65A1CE-9430-4012-8CED-783C233AEA1D}.Debug|Win32.Build.0 = Debug|Win32
+ {7C65A1CE-9430-4012-8CED-783C233AEA1D}.Debug|x64.ActiveCfg = Debug|x64
+ {7C65A1CE-9430-4012-8CED-783C233AEA1D}.Debug|x64.Build.0 = Debug|x64
+ {7C65A1CE-9430-4012-8CED-783C233AEA1D}.Release|Win32.ActiveCfg = Release|Win32
+ {7C65A1CE-9430-4012-8CED-783C233AEA1D}.Release|Win32.Build.0 = Release|Win32
+ {7C65A1CE-9430-4012-8CED-783C233AEA1D}.Release|x64.ActiveCfg = Release|x64
+ {7C65A1CE-9430-4012-8CED-783C233AEA1D}.Release|x64.Build.0 = Release|x64
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
diff --git a/SiloWindows/MSVC9/Tests/CopyTestDependencies.bat b/SiloWindows/MSVC9/Tests/CopyTestDependencies.bat
new file mode 100644
index 0000000..8689a9c
--- /dev/null
+++ b/SiloWindows/MSVC9/Tests/CopyTestDependencies.bat
@@ -0,0 +1,34 @@
+ at echo off
+set HDF5_IN=%1\hdf5dll.dll
+set ZLIB_IN=%2\zlib1.dll
+set SZIP_IN=%3\szlibdll.dll
+set SILO_IN=%4\silohdf5.dll
+
+set HDF5_OUT=%5\hdf5dll.dll
+set ZLIB_OUT=%5\zlib1.dll
+set SZIP_OUT=%5\szlibdll.dll
+set SILO_OUT=%5\silohdf5.dll
+
+echo ************************************************************************
+echo copying dependent libs to test directory
+echo ...
+
+if not exist %HDF5_OUT% (
+ copy %HDF5_IN% %HDF5_OUT%
+)
+
+if not exist %ZLIB_OUT% (
+ copy %ZLIB_IN% %ZLIB_OUT%
+)
+
+if not exist %SZIP_OUT% (
+ copy %SZIP_IN% %SZIP_OUT%
+)
+
+if not exist %SILO_OUT% (
+ copy %SILO_IN% %SILO_OUT%
+)
+
+echo ...
+echo Done.
+echo ************************************************************************
diff --git a/SiloWindows/MSVC9/Tests/Preparation.vcproj b/SiloWindows/MSVC9/Tests/Preparation.vcproj
new file mode 100644
index 0000000..944a7c6
--- /dev/null
+++ b/SiloWindows/MSVC9/Tests/Preparation.vcproj
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="Preparation"
+ ProjectGUID="{EF8EC721-3949-484B-862F-2BB07460526D}"
+ RootNamespace="Preparation"
+ Keyword="Win32Proj"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
+ ConfigurationType="10"
+ InheritedPropertySheets="..\DepLibs.vsprops"
+ CharacterSet="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ CommandLine="CopyTestDependencies.bat $(HDF5_LIB_DIR) $(ZLIB_LIB_DIR) $(SZIP_LIB_DIR) $(SolutionDir)..\$(PlatformName)\$(ConfigurationName) $(SolutionDir)..\bin"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="10"
+ InheritedPropertySheets="..\DepLibs.vsprops"
+ CharacterSet="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ CommandLine="CopyTestDependencies.bat $(HDF5_LIB_DIR_X64) $(ZLIB_LIB_DIR_X64) $(SZIP_LIB_DIR_X64) $(SolutionDir)..\$(PlatformName)\$(ConfigurationName) $(SolutionDir)..\bin"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
+ ConfigurationType="10"
+ InheritedPropertySheets="..\DepLibs.vsprops"
+ CharacterSet="1"
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ CommandLine="CopyTestDependencies.bat $(HDF5_LIB_DIR) $(ZLIB_LIB_DIR) $(SZIP_LIB_DIR) $(SolutionDir)..\$(PlatformName)\$(ConfigurationName) $(SolutionDir)..\bin"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="10"
+ InheritedPropertySheets="..\DepLibs.vsprops"
+ CharacterSet="1"
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ CommandLine="CopyTestDependencies.bat $(HDF5_LIB_DIR_X64) $(ZLIB_LIB_DIR_X64) $(SZIP_LIB_DIR_X64) $(SolutionDir)..\$(PlatformName)\$(ConfigurationName) $(SolutionDir)..\bin"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/SiloWindows/MSVC8/Tests/TestIncludes.vsprops b/SiloWindows/MSVC9/Tests/TestIncludes.vsprops
similarity index 100%
rename from SiloWindows/MSVC8/Tests/TestIncludes.vsprops
rename to SiloWindows/MSVC9/Tests/TestIncludes.vsprops
diff --git a/SiloWindows/MSVC9/Tests/TestReadMask.vcproj b/SiloWindows/MSVC9/Tests/TestReadMask.vcproj
new file mode 100644
index 0000000..3666034
--- /dev/null
+++ b/SiloWindows/MSVC9/Tests/TestReadMask.vcproj
@@ -0,0 +1,399 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="TestReadMask"
+ ProjectGUID="{D47B6498-6A8D-4E87-A3B6-C6D08DF29FE2}"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\TestReadMask"
+ IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\TestReadMask"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(OutDir)\TestReadMask.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;_CONSOLE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\TestReadMask.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\TestReadMask"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="4"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\TestReadMask.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)\TestReadMask.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(OutDir)\TestReadMask.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;_CONSOLE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\TestReadMask.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\TestReadMask"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\TestReadMask.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)\TestReadMask.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\TestReadMask"
+ IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\TestReadMask"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(OutDir)\TestReadMask.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\TestReadMask.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\TestReadMask.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ ProgramDatabaseFile="$(OutDir)\TestReadMask.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(OutDir)\TestReadMask.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\TestReadMask.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\TestReadMask.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ ProgramDatabaseFile="$(OutDir)\TestReadMask.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <File
+ RelativePath="..\..\..\tests\TestReadMask.c"
+ >
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/SiloWindows/MSVC9/Tests/Tests.sln b/SiloWindows/MSVC9/Tests/Tests.sln
new file mode 100644
index 0000000..821f5ce
--- /dev/null
+++ b/SiloWindows/MSVC9/Tests/Tests.sln
@@ -0,0 +1,539 @@
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wave", "wave.vcproj", "{3D443B05-403C-4907-8F50-DC396DB6BB23}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "alltypes", "alltypes.vcproj", "{627C8E54-0ABD-4B8A-B76B-0BD13F5E684B}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "array", "array.vcproj", "{CB409787-8ACF-4854-A2AB-6CD727E7120D}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "compression", "compression.vcproj", "{AA9DE89B-47C8-4164-944A-6D42B4AF0FEB}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "csg", "csg.vcproj", "{6DE8948E-8CF8-4650-9749-1C21066AA957}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "extface", "extface.vcproj", "{3482A43B-3A21-4583-88C4-45A4422E2307}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testall", "testall.vcproj", "{E4105EA9-2AB2-4656-B966-01F16961A14B}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grab", "grab.vcproj", "{DCFFC0C8-1C81-4016-8364-1678FAB1D2D2}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "largefile", "largefile.vcproj", "{EA0DA3EC-DD78-4C57-A0A9-F0EEAE35A85A}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "listtypes", "listtypes.vcproj", "{A79DA077-0644-4DA7-8D8A-BB115597F474}"
+ ProjectSection(ProjectDependencies) = postProject
+ {9B955616-D58C-4ED8-AB6F-FBA74E768B54} = {9B955616-D58C-4ED8-AB6F-FBA74E768B54}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mat3d_3across", "mat3d_3across.vcproj", "{CEA025B3-7259-4852-980F-CB39E8206304}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "merge_block", "merge_block.vcproj", "{2B22FE6C-0C77-445A-8320-50EEF60EEF7D}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mmadjacency", "mmadjacency.vcproj", "{809F6E22-2B80-4264-A220-7974EC9EDBBF}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "multi_file", "multi_file.vcproj", "{8CC26B54-D539-4A0A-B461-26F074B790FD}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "multi_test", "multi_test.vcproj", "{7535A535-FDEC-4448-AF9C-C031C9EA8459}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "multispec", "multispec.vcproj", "{2D46EF91-58B2-43B5-ADD7-6908D6794578}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "obj", "obj.vcproj", "{AC0F21DF-ECA4-4B17-9829-59634B68B0D2}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "onehex", "onehex.vcproj", "{3863899B-7F9F-4823-9383-AE2205DCB054}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "oneprism", "oneprism.vcproj", "{4BCA7F35-0742-424F-8E50-39B934312F8F}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "onepyramid", "onepyramid.vcproj", "{2AFC873D-E906-4145-A0CB-6264E8CAE97D}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "onetet", "onetet.vcproj", "{A76CCA62-BC5F-44F8-B090-9C45DA138680}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "partial_io", "partial_io.vcproj", "{4F6A7EC6-F141-4512-B2A8-D108CBD6FAC1}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "point", "point.vcproj", "{025CFEA1-6C43-404D-9DA4-5392A17FA162}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "polyzl", "polyzl.vcproj", "{8C6BC636-FF71-4D58-9D63-E12265523982}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "quad", "quad.vcproj", "{4D5EA26A-8356-4665-A13D-51CCEE2BA7F4}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sami", "sami.vcproj", "{B3C7F964-68B8-4F8C-B5E7-7607836FB101}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "simple", "simple.vcproj", "{7AB46C61-04D5-4E77-AD3F-E7726F3E173A}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "spec", "spec.vcproj", "{7A5F618C-F98A-4F8E-BBC7-C4F5C6BCD5A4}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "specmix", "specmix.vcproj", "{27C64509-94EB-406D-9978-93AE531CEB1E}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "subhex", "subhex.vcproj", "{8C02951E-155B-4D09-A1DD-F98695F02A0E}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testpdb", "testpdb.vcproj", "{29110B58-9FD5-4A8E-B9F7-064650EE16C6}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestReadMask", "TestReadMask.vcproj", "{D47B6498-6A8D-4E87-A3B6-C6D08DF29FE2}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "twohex", "twohex.vcproj", "{64A6CE79-710F-405C-AAE8-F604E74A4374}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ucd1d", "ucd1d.vcproj", "{C065DCD0-DE87-4B6E-A1E6-8F7EDB272D53}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ucd", "ucd.vcproj", "{9B955616-D58C-4ED8-AB6F-FBA74E768B54}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ucdsamp3", "ucdsamp3.vcproj", "{94D10A14-5A9B-4E1E-B204-DE3196750126}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "version", "version.vcproj", "{CBBCFD38-0F91-4CA2-8CBF-2833AC284438}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dirtest", "dirtest.vcproj", "{B8FE1ABF-E1AD-41C7-AFAE-333BAB3636E1}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "group_test", "group_test.vcproj", "{69340E63-F15C-4A33-85B7-344666F8F25C}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "namescheme", "namescheme.vcproj", "{D839F6C1-3736-4269-A5E7-30B2BC1CBCCD}"
+EndProject
+Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "array_f", "array_f.vfproj", "{A1F2E6F2-6E49-4746-9133-9DF0A404C7DB}"
+EndProject
+Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "curve_f", "curve_f.vfproj", "{D08D4EA4-8AF5-4FD2-BFBE-4FFB247B2A35}"
+EndProject
+Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "mat_f", "mat_f.vfproj", "{595357B8-132D-4F3E-9679-6E52B474E8A5}"
+EndProject
+Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "point_f", "point_f.vfproj", "{EC9BB75A-9691-4DAF-A876-5116DDCBAFBC}"
+EndProject
+Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "quad_f", "quad_f.vfproj", "{12C054D3-D396-45F9-912E-8A7FF6548738}"
+EndProject
+Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "testall_f", "testall_f.vfproj", "{BCC584B3-571E-4441-8ABF-D2CDD0646116}"
+EndProject
+Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "ucd_f", "ucd_f.vfproj", "{A8A0C0C5-A117-4430-B47A-E98603255D01}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Preparation", "Preparation.vcproj", "{EF8EC721-3949-484B-862F-2BB07460526D}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "FortranTests", "FortranTests", "{E7608C74-F664-43A4-823C-D4370571FD4C}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "arbpoly3d", "arbpoly3d.vcproj", "{BF87D83F-575E-49B5-87BD-02C6E581FD6A}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "arbpoly", "arbpoly.vcproj", "{970CE296-FB4C-4990-8FC7-F26078998302}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "empty", "empty.vcproj", "{2C3B0E05-5959-4630-A94F-625C9BCE9B10}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Win32 = Debug|Win32
+ Debug|x64 = Debug|x64
+ Release|Win32 = Release|Win32
+ Release|x64 = Release|x64
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {3D443B05-403C-4907-8F50-DC396DB6BB23}.Debug|Win32.ActiveCfg = Debug|Win32
+ {3D443B05-403C-4907-8F50-DC396DB6BB23}.Debug|Win32.Build.0 = Debug|Win32
+ {3D443B05-403C-4907-8F50-DC396DB6BB23}.Debug|x64.ActiveCfg = Debug|x64
+ {3D443B05-403C-4907-8F50-DC396DB6BB23}.Debug|x64.Build.0 = Debug|x64
+ {3D443B05-403C-4907-8F50-DC396DB6BB23}.Release|Win32.ActiveCfg = Release|Win32
+ {3D443B05-403C-4907-8F50-DC396DB6BB23}.Release|Win32.Build.0 = Release|Win32
+ {3D443B05-403C-4907-8F50-DC396DB6BB23}.Release|x64.ActiveCfg = Release|x64
+ {3D443B05-403C-4907-8F50-DC396DB6BB23}.Release|x64.Build.0 = Release|x64
+ {627C8E54-0ABD-4B8A-B76B-0BD13F5E684B}.Debug|Win32.ActiveCfg = Debug|Win32
+ {627C8E54-0ABD-4B8A-B76B-0BD13F5E684B}.Debug|Win32.Build.0 = Debug|Win32
+ {627C8E54-0ABD-4B8A-B76B-0BD13F5E684B}.Debug|x64.ActiveCfg = Debug|x64
+ {627C8E54-0ABD-4B8A-B76B-0BD13F5E684B}.Debug|x64.Build.0 = Debug|x64
+ {627C8E54-0ABD-4B8A-B76B-0BD13F5E684B}.Release|Win32.ActiveCfg = Release|Win32
+ {627C8E54-0ABD-4B8A-B76B-0BD13F5E684B}.Release|Win32.Build.0 = Release|Win32
+ {627C8E54-0ABD-4B8A-B76B-0BD13F5E684B}.Release|x64.ActiveCfg = Release|x64
+ {627C8E54-0ABD-4B8A-B76B-0BD13F5E684B}.Release|x64.Build.0 = Release|x64
+ {CB409787-8ACF-4854-A2AB-6CD727E7120D}.Debug|Win32.ActiveCfg = Debug|Win32
+ {CB409787-8ACF-4854-A2AB-6CD727E7120D}.Debug|Win32.Build.0 = Debug|Win32
+ {CB409787-8ACF-4854-A2AB-6CD727E7120D}.Debug|x64.ActiveCfg = Debug|x64
+ {CB409787-8ACF-4854-A2AB-6CD727E7120D}.Debug|x64.Build.0 = Debug|x64
+ {CB409787-8ACF-4854-A2AB-6CD727E7120D}.Release|Win32.ActiveCfg = Release|Win32
+ {CB409787-8ACF-4854-A2AB-6CD727E7120D}.Release|Win32.Build.0 = Release|Win32
+ {CB409787-8ACF-4854-A2AB-6CD727E7120D}.Release|x64.ActiveCfg = Release|x64
+ {CB409787-8ACF-4854-A2AB-6CD727E7120D}.Release|x64.Build.0 = Release|x64
+ {AA9DE89B-47C8-4164-944A-6D42B4AF0FEB}.Debug|Win32.ActiveCfg = Debug|Win32
+ {AA9DE89B-47C8-4164-944A-6D42B4AF0FEB}.Debug|Win32.Build.0 = Debug|Win32
+ {AA9DE89B-47C8-4164-944A-6D42B4AF0FEB}.Debug|x64.ActiveCfg = Debug|x64
+ {AA9DE89B-47C8-4164-944A-6D42B4AF0FEB}.Debug|x64.Build.0 = Debug|x64
+ {AA9DE89B-47C8-4164-944A-6D42B4AF0FEB}.Release|Win32.ActiveCfg = Release|Win32
+ {AA9DE89B-47C8-4164-944A-6D42B4AF0FEB}.Release|Win32.Build.0 = Release|Win32
+ {AA9DE89B-47C8-4164-944A-6D42B4AF0FEB}.Release|x64.ActiveCfg = Release|x64
+ {AA9DE89B-47C8-4164-944A-6D42B4AF0FEB}.Release|x64.Build.0 = Release|x64
+ {6DE8948E-8CF8-4650-9749-1C21066AA957}.Debug|Win32.ActiveCfg = Debug|Win32
+ {6DE8948E-8CF8-4650-9749-1C21066AA957}.Debug|Win32.Build.0 = Debug|Win32
+ {6DE8948E-8CF8-4650-9749-1C21066AA957}.Debug|x64.ActiveCfg = Debug|x64
+ {6DE8948E-8CF8-4650-9749-1C21066AA957}.Debug|x64.Build.0 = Debug|x64
+ {6DE8948E-8CF8-4650-9749-1C21066AA957}.Release|Win32.ActiveCfg = Release|Win32
+ {6DE8948E-8CF8-4650-9749-1C21066AA957}.Release|Win32.Build.0 = Release|Win32
+ {6DE8948E-8CF8-4650-9749-1C21066AA957}.Release|x64.ActiveCfg = Release|x64
+ {6DE8948E-8CF8-4650-9749-1C21066AA957}.Release|x64.Build.0 = Release|x64
+ {3482A43B-3A21-4583-88C4-45A4422E2307}.Debug|Win32.ActiveCfg = Debug|Win32
+ {3482A43B-3A21-4583-88C4-45A4422E2307}.Debug|Win32.Build.0 = Debug|Win32
+ {3482A43B-3A21-4583-88C4-45A4422E2307}.Debug|x64.ActiveCfg = Debug|x64
+ {3482A43B-3A21-4583-88C4-45A4422E2307}.Debug|x64.Build.0 = Debug|x64
+ {3482A43B-3A21-4583-88C4-45A4422E2307}.Release|Win32.ActiveCfg = Release|Win32
+ {3482A43B-3A21-4583-88C4-45A4422E2307}.Release|Win32.Build.0 = Release|Win32
+ {3482A43B-3A21-4583-88C4-45A4422E2307}.Release|x64.ActiveCfg = Release|x64
+ {3482A43B-3A21-4583-88C4-45A4422E2307}.Release|x64.Build.0 = Release|x64
+ {E4105EA9-2AB2-4656-B966-01F16961A14B}.Debug|Win32.ActiveCfg = Debug|Win32
+ {E4105EA9-2AB2-4656-B966-01F16961A14B}.Debug|Win32.Build.0 = Debug|Win32
+ {E4105EA9-2AB2-4656-B966-01F16961A14B}.Debug|x64.ActiveCfg = Debug|x64
+ {E4105EA9-2AB2-4656-B966-01F16961A14B}.Debug|x64.Build.0 = Debug|x64
+ {E4105EA9-2AB2-4656-B966-01F16961A14B}.Release|Win32.ActiveCfg = Release|Win32
+ {E4105EA9-2AB2-4656-B966-01F16961A14B}.Release|Win32.Build.0 = Release|Win32
+ {E4105EA9-2AB2-4656-B966-01F16961A14B}.Release|x64.ActiveCfg = Release|x64
+ {E4105EA9-2AB2-4656-B966-01F16961A14B}.Release|x64.Build.0 = Release|x64
+ {DCFFC0C8-1C81-4016-8364-1678FAB1D2D2}.Debug|Win32.ActiveCfg = Debug|Win32
+ {DCFFC0C8-1C81-4016-8364-1678FAB1D2D2}.Debug|Win32.Build.0 = Debug|Win32
+ {DCFFC0C8-1C81-4016-8364-1678FAB1D2D2}.Debug|x64.ActiveCfg = Debug|x64
+ {DCFFC0C8-1C81-4016-8364-1678FAB1D2D2}.Debug|x64.Build.0 = Debug|x64
+ {DCFFC0C8-1C81-4016-8364-1678FAB1D2D2}.Release|Win32.ActiveCfg = Release|Win32
+ {DCFFC0C8-1C81-4016-8364-1678FAB1D2D2}.Release|Win32.Build.0 = Release|Win32
+ {DCFFC0C8-1C81-4016-8364-1678FAB1D2D2}.Release|x64.ActiveCfg = Release|x64
+ {DCFFC0C8-1C81-4016-8364-1678FAB1D2D2}.Release|x64.Build.0 = Release|x64
+ {EA0DA3EC-DD78-4C57-A0A9-F0EEAE35A85A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {EA0DA3EC-DD78-4C57-A0A9-F0EEAE35A85A}.Debug|Win32.Build.0 = Debug|Win32
+ {EA0DA3EC-DD78-4C57-A0A9-F0EEAE35A85A}.Debug|x64.ActiveCfg = Debug|x64
+ {EA0DA3EC-DD78-4C57-A0A9-F0EEAE35A85A}.Debug|x64.Build.0 = Debug|x64
+ {EA0DA3EC-DD78-4C57-A0A9-F0EEAE35A85A}.Release|Win32.ActiveCfg = Release|Win32
+ {EA0DA3EC-DD78-4C57-A0A9-F0EEAE35A85A}.Release|Win32.Build.0 = Release|Win32
+ {EA0DA3EC-DD78-4C57-A0A9-F0EEAE35A85A}.Release|x64.ActiveCfg = Release|x64
+ {EA0DA3EC-DD78-4C57-A0A9-F0EEAE35A85A}.Release|x64.Build.0 = Release|x64
+ {A79DA077-0644-4DA7-8D8A-BB115597F474}.Debug|Win32.ActiveCfg = Debug|Win32
+ {A79DA077-0644-4DA7-8D8A-BB115597F474}.Debug|Win32.Build.0 = Debug|Win32
+ {A79DA077-0644-4DA7-8D8A-BB115597F474}.Debug|x64.ActiveCfg = Debug|x64
+ {A79DA077-0644-4DA7-8D8A-BB115597F474}.Debug|x64.Build.0 = Debug|x64
+ {A79DA077-0644-4DA7-8D8A-BB115597F474}.Release|Win32.ActiveCfg = Release|Win32
+ {A79DA077-0644-4DA7-8D8A-BB115597F474}.Release|Win32.Build.0 = Release|Win32
+ {A79DA077-0644-4DA7-8D8A-BB115597F474}.Release|x64.ActiveCfg = Release|x64
+ {A79DA077-0644-4DA7-8D8A-BB115597F474}.Release|x64.Build.0 = Release|x64
+ {CEA025B3-7259-4852-980F-CB39E8206304}.Debug|Win32.ActiveCfg = Debug|Win32
+ {CEA025B3-7259-4852-980F-CB39E8206304}.Debug|Win32.Build.0 = Debug|Win32
+ {CEA025B3-7259-4852-980F-CB39E8206304}.Debug|x64.ActiveCfg = Debug|x64
+ {CEA025B3-7259-4852-980F-CB39E8206304}.Debug|x64.Build.0 = Debug|x64
+ {CEA025B3-7259-4852-980F-CB39E8206304}.Release|Win32.ActiveCfg = Release|Win32
+ {CEA025B3-7259-4852-980F-CB39E8206304}.Release|Win32.Build.0 = Release|Win32
+ {CEA025B3-7259-4852-980F-CB39E8206304}.Release|x64.ActiveCfg = Release|x64
+ {CEA025B3-7259-4852-980F-CB39E8206304}.Release|x64.Build.0 = Release|x64
+ {2B22FE6C-0C77-445A-8320-50EEF60EEF7D}.Debug|Win32.ActiveCfg = Debug|Win32
+ {2B22FE6C-0C77-445A-8320-50EEF60EEF7D}.Debug|Win32.Build.0 = Debug|Win32
+ {2B22FE6C-0C77-445A-8320-50EEF60EEF7D}.Debug|x64.ActiveCfg = Debug|x64
+ {2B22FE6C-0C77-445A-8320-50EEF60EEF7D}.Debug|x64.Build.0 = Debug|x64
+ {2B22FE6C-0C77-445A-8320-50EEF60EEF7D}.Release|Win32.ActiveCfg = Release|Win32
+ {2B22FE6C-0C77-445A-8320-50EEF60EEF7D}.Release|Win32.Build.0 = Release|Win32
+ {2B22FE6C-0C77-445A-8320-50EEF60EEF7D}.Release|x64.ActiveCfg = Release|x64
+ {2B22FE6C-0C77-445A-8320-50EEF60EEF7D}.Release|x64.Build.0 = Release|x64
+ {809F6E22-2B80-4264-A220-7974EC9EDBBF}.Debug|Win32.ActiveCfg = Debug|Win32
+ {809F6E22-2B80-4264-A220-7974EC9EDBBF}.Debug|Win32.Build.0 = Debug|Win32
+ {809F6E22-2B80-4264-A220-7974EC9EDBBF}.Debug|x64.ActiveCfg = Debug|x64
+ {809F6E22-2B80-4264-A220-7974EC9EDBBF}.Debug|x64.Build.0 = Debug|x64
+ {809F6E22-2B80-4264-A220-7974EC9EDBBF}.Release|Win32.ActiveCfg = Release|Win32
+ {809F6E22-2B80-4264-A220-7974EC9EDBBF}.Release|Win32.Build.0 = Release|Win32
+ {809F6E22-2B80-4264-A220-7974EC9EDBBF}.Release|x64.ActiveCfg = Release|x64
+ {809F6E22-2B80-4264-A220-7974EC9EDBBF}.Release|x64.Build.0 = Release|x64
+ {8CC26B54-D539-4A0A-B461-26F074B790FD}.Debug|Win32.ActiveCfg = Debug|Win32
+ {8CC26B54-D539-4A0A-B461-26F074B790FD}.Debug|Win32.Build.0 = Debug|Win32
+ {8CC26B54-D539-4A0A-B461-26F074B790FD}.Debug|x64.ActiveCfg = Debug|x64
+ {8CC26B54-D539-4A0A-B461-26F074B790FD}.Debug|x64.Build.0 = Debug|x64
+ {8CC26B54-D539-4A0A-B461-26F074B790FD}.Release|Win32.ActiveCfg = Release|Win32
+ {8CC26B54-D539-4A0A-B461-26F074B790FD}.Release|Win32.Build.0 = Release|Win32
+ {8CC26B54-D539-4A0A-B461-26F074B790FD}.Release|x64.ActiveCfg = Release|x64
+ {8CC26B54-D539-4A0A-B461-26F074B790FD}.Release|x64.Build.0 = Release|x64
+ {7535A535-FDEC-4448-AF9C-C031C9EA8459}.Debug|Win32.ActiveCfg = Debug|Win32
+ {7535A535-FDEC-4448-AF9C-C031C9EA8459}.Debug|Win32.Build.0 = Debug|Win32
+ {7535A535-FDEC-4448-AF9C-C031C9EA8459}.Debug|x64.ActiveCfg = Debug|x64
+ {7535A535-FDEC-4448-AF9C-C031C9EA8459}.Debug|x64.Build.0 = Debug|x64
+ {7535A535-FDEC-4448-AF9C-C031C9EA8459}.Release|Win32.ActiveCfg = Release|Win32
+ {7535A535-FDEC-4448-AF9C-C031C9EA8459}.Release|Win32.Build.0 = Release|Win32
+ {7535A535-FDEC-4448-AF9C-C031C9EA8459}.Release|x64.ActiveCfg = Release|x64
+ {7535A535-FDEC-4448-AF9C-C031C9EA8459}.Release|x64.Build.0 = Release|x64
+ {2D46EF91-58B2-43B5-ADD7-6908D6794578}.Debug|Win32.ActiveCfg = Debug|Win32
+ {2D46EF91-58B2-43B5-ADD7-6908D6794578}.Debug|Win32.Build.0 = Debug|Win32
+ {2D46EF91-58B2-43B5-ADD7-6908D6794578}.Debug|x64.ActiveCfg = Debug|x64
+ {2D46EF91-58B2-43B5-ADD7-6908D6794578}.Debug|x64.Build.0 = Debug|x64
+ {2D46EF91-58B2-43B5-ADD7-6908D6794578}.Release|Win32.ActiveCfg = Release|Win32
+ {2D46EF91-58B2-43B5-ADD7-6908D6794578}.Release|Win32.Build.0 = Release|Win32
+ {2D46EF91-58B2-43B5-ADD7-6908D6794578}.Release|x64.ActiveCfg = Release|x64
+ {2D46EF91-58B2-43B5-ADD7-6908D6794578}.Release|x64.Build.0 = Release|x64
+ {AC0F21DF-ECA4-4B17-9829-59634B68B0D2}.Debug|Win32.ActiveCfg = Debug|Win32
+ {AC0F21DF-ECA4-4B17-9829-59634B68B0D2}.Debug|Win32.Build.0 = Debug|Win32
+ {AC0F21DF-ECA4-4B17-9829-59634B68B0D2}.Debug|x64.ActiveCfg = Debug|x64
+ {AC0F21DF-ECA4-4B17-9829-59634B68B0D2}.Debug|x64.Build.0 = Debug|x64
+ {AC0F21DF-ECA4-4B17-9829-59634B68B0D2}.Release|Win32.ActiveCfg = Release|Win32
+ {AC0F21DF-ECA4-4B17-9829-59634B68B0D2}.Release|Win32.Build.0 = Release|Win32
+ {AC0F21DF-ECA4-4B17-9829-59634B68B0D2}.Release|x64.ActiveCfg = Release|x64
+ {AC0F21DF-ECA4-4B17-9829-59634B68B0D2}.Release|x64.Build.0 = Release|x64
+ {3863899B-7F9F-4823-9383-AE2205DCB054}.Debug|Win32.ActiveCfg = Debug|Win32
+ {3863899B-7F9F-4823-9383-AE2205DCB054}.Debug|Win32.Build.0 = Debug|Win32
+ {3863899B-7F9F-4823-9383-AE2205DCB054}.Debug|x64.ActiveCfg = Debug|x64
+ {3863899B-7F9F-4823-9383-AE2205DCB054}.Debug|x64.Build.0 = Debug|x64
+ {3863899B-7F9F-4823-9383-AE2205DCB054}.Release|Win32.ActiveCfg = Release|Win32
+ {3863899B-7F9F-4823-9383-AE2205DCB054}.Release|Win32.Build.0 = Release|Win32
+ {3863899B-7F9F-4823-9383-AE2205DCB054}.Release|x64.ActiveCfg = Release|x64
+ {3863899B-7F9F-4823-9383-AE2205DCB054}.Release|x64.Build.0 = Release|x64
+ {4BCA7F35-0742-424F-8E50-39B934312F8F}.Debug|Win32.ActiveCfg = Debug|Win32
+ {4BCA7F35-0742-424F-8E50-39B934312F8F}.Debug|Win32.Build.0 = Debug|Win32
+ {4BCA7F35-0742-424F-8E50-39B934312F8F}.Debug|x64.ActiveCfg = Debug|x64
+ {4BCA7F35-0742-424F-8E50-39B934312F8F}.Debug|x64.Build.0 = Debug|x64
+ {4BCA7F35-0742-424F-8E50-39B934312F8F}.Release|Win32.ActiveCfg = Release|Win32
+ {4BCA7F35-0742-424F-8E50-39B934312F8F}.Release|Win32.Build.0 = Release|Win32
+ {4BCA7F35-0742-424F-8E50-39B934312F8F}.Release|x64.ActiveCfg = Release|x64
+ {4BCA7F35-0742-424F-8E50-39B934312F8F}.Release|x64.Build.0 = Release|x64
+ {2AFC873D-E906-4145-A0CB-6264E8CAE97D}.Debug|Win32.ActiveCfg = Debug|Win32
+ {2AFC873D-E906-4145-A0CB-6264E8CAE97D}.Debug|Win32.Build.0 = Debug|Win32
+ {2AFC873D-E906-4145-A0CB-6264E8CAE97D}.Debug|x64.ActiveCfg = Debug|x64
+ {2AFC873D-E906-4145-A0CB-6264E8CAE97D}.Debug|x64.Build.0 = Debug|x64
+ {2AFC873D-E906-4145-A0CB-6264E8CAE97D}.Release|Win32.ActiveCfg = Release|Win32
+ {2AFC873D-E906-4145-A0CB-6264E8CAE97D}.Release|Win32.Build.0 = Release|Win32
+ {2AFC873D-E906-4145-A0CB-6264E8CAE97D}.Release|x64.ActiveCfg = Release|x64
+ {2AFC873D-E906-4145-A0CB-6264E8CAE97D}.Release|x64.Build.0 = Release|x64
+ {A76CCA62-BC5F-44F8-B090-9C45DA138680}.Debug|Win32.ActiveCfg = Debug|Win32
+ {A76CCA62-BC5F-44F8-B090-9C45DA138680}.Debug|Win32.Build.0 = Debug|Win32
+ {A76CCA62-BC5F-44F8-B090-9C45DA138680}.Debug|x64.ActiveCfg = Debug|x64
+ {A76CCA62-BC5F-44F8-B090-9C45DA138680}.Debug|x64.Build.0 = Debug|x64
+ {A76CCA62-BC5F-44F8-B090-9C45DA138680}.Release|Win32.ActiveCfg = Release|Win32
+ {A76CCA62-BC5F-44F8-B090-9C45DA138680}.Release|Win32.Build.0 = Release|Win32
+ {A76CCA62-BC5F-44F8-B090-9C45DA138680}.Release|x64.ActiveCfg = Release|x64
+ {A76CCA62-BC5F-44F8-B090-9C45DA138680}.Release|x64.Build.0 = Release|x64
+ {4F6A7EC6-F141-4512-B2A8-D108CBD6FAC1}.Debug|Win32.ActiveCfg = Debug|Win32
+ {4F6A7EC6-F141-4512-B2A8-D108CBD6FAC1}.Debug|Win32.Build.0 = Debug|Win32
+ {4F6A7EC6-F141-4512-B2A8-D108CBD6FAC1}.Debug|x64.ActiveCfg = Debug|x64
+ {4F6A7EC6-F141-4512-B2A8-D108CBD6FAC1}.Debug|x64.Build.0 = Debug|x64
+ {4F6A7EC6-F141-4512-B2A8-D108CBD6FAC1}.Release|Win32.ActiveCfg = Release|Win32
+ {4F6A7EC6-F141-4512-B2A8-D108CBD6FAC1}.Release|Win32.Build.0 = Release|Win32
+ {4F6A7EC6-F141-4512-B2A8-D108CBD6FAC1}.Release|x64.ActiveCfg = Release|x64
+ {4F6A7EC6-F141-4512-B2A8-D108CBD6FAC1}.Release|x64.Build.0 = Release|x64
+ {025CFEA1-6C43-404D-9DA4-5392A17FA162}.Debug|Win32.ActiveCfg = Debug|Win32
+ {025CFEA1-6C43-404D-9DA4-5392A17FA162}.Debug|Win32.Build.0 = Debug|Win32
+ {025CFEA1-6C43-404D-9DA4-5392A17FA162}.Debug|x64.ActiveCfg = Debug|x64
+ {025CFEA1-6C43-404D-9DA4-5392A17FA162}.Debug|x64.Build.0 = Debug|x64
+ {025CFEA1-6C43-404D-9DA4-5392A17FA162}.Release|Win32.ActiveCfg = Release|Win32
+ {025CFEA1-6C43-404D-9DA4-5392A17FA162}.Release|Win32.Build.0 = Release|Win32
+ {025CFEA1-6C43-404D-9DA4-5392A17FA162}.Release|x64.ActiveCfg = Release|x64
+ {025CFEA1-6C43-404D-9DA4-5392A17FA162}.Release|x64.Build.0 = Release|x64
+ {8C6BC636-FF71-4D58-9D63-E12265523982}.Debug|Win32.ActiveCfg = Debug|Win32
+ {8C6BC636-FF71-4D58-9D63-E12265523982}.Debug|Win32.Build.0 = Debug|Win32
+ {8C6BC636-FF71-4D58-9D63-E12265523982}.Debug|x64.ActiveCfg = Debug|x64
+ {8C6BC636-FF71-4D58-9D63-E12265523982}.Debug|x64.Build.0 = Debug|x64
+ {8C6BC636-FF71-4D58-9D63-E12265523982}.Release|Win32.ActiveCfg = Release|Win32
+ {8C6BC636-FF71-4D58-9D63-E12265523982}.Release|Win32.Build.0 = Release|Win32
+ {8C6BC636-FF71-4D58-9D63-E12265523982}.Release|x64.ActiveCfg = Release|x64
+ {8C6BC636-FF71-4D58-9D63-E12265523982}.Release|x64.Build.0 = Release|x64
+ {4D5EA26A-8356-4665-A13D-51CCEE2BA7F4}.Debug|Win32.ActiveCfg = Debug|Win32
+ {4D5EA26A-8356-4665-A13D-51CCEE2BA7F4}.Debug|Win32.Build.0 = Debug|Win32
+ {4D5EA26A-8356-4665-A13D-51CCEE2BA7F4}.Debug|x64.ActiveCfg = Debug|x64
+ {4D5EA26A-8356-4665-A13D-51CCEE2BA7F4}.Debug|x64.Build.0 = Debug|x64
+ {4D5EA26A-8356-4665-A13D-51CCEE2BA7F4}.Release|Win32.ActiveCfg = Release|Win32
+ {4D5EA26A-8356-4665-A13D-51CCEE2BA7F4}.Release|Win32.Build.0 = Release|Win32
+ {4D5EA26A-8356-4665-A13D-51CCEE2BA7F4}.Release|x64.ActiveCfg = Release|x64
+ {4D5EA26A-8356-4665-A13D-51CCEE2BA7F4}.Release|x64.Build.0 = Release|x64
+ {B3C7F964-68B8-4F8C-B5E7-7607836FB101}.Debug|Win32.ActiveCfg = Debug|Win32
+ {B3C7F964-68B8-4F8C-B5E7-7607836FB101}.Debug|Win32.Build.0 = Debug|Win32
+ {B3C7F964-68B8-4F8C-B5E7-7607836FB101}.Debug|x64.ActiveCfg = Debug|x64
+ {B3C7F964-68B8-4F8C-B5E7-7607836FB101}.Debug|x64.Build.0 = Debug|x64
+ {B3C7F964-68B8-4F8C-B5E7-7607836FB101}.Release|Win32.ActiveCfg = Release|Win32
+ {B3C7F964-68B8-4F8C-B5E7-7607836FB101}.Release|Win32.Build.0 = Release|Win32
+ {B3C7F964-68B8-4F8C-B5E7-7607836FB101}.Release|x64.ActiveCfg = Release|x64
+ {B3C7F964-68B8-4F8C-B5E7-7607836FB101}.Release|x64.Build.0 = Release|x64
+ {7AB46C61-04D5-4E77-AD3F-E7726F3E173A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {7AB46C61-04D5-4E77-AD3F-E7726F3E173A}.Debug|Win32.Build.0 = Debug|Win32
+ {7AB46C61-04D5-4E77-AD3F-E7726F3E173A}.Debug|x64.ActiveCfg = Debug|x64
+ {7AB46C61-04D5-4E77-AD3F-E7726F3E173A}.Debug|x64.Build.0 = Debug|x64
+ {7AB46C61-04D5-4E77-AD3F-E7726F3E173A}.Release|Win32.ActiveCfg = Release|Win32
+ {7AB46C61-04D5-4E77-AD3F-E7726F3E173A}.Release|Win32.Build.0 = Release|Win32
+ {7AB46C61-04D5-4E77-AD3F-E7726F3E173A}.Release|x64.ActiveCfg = Release|x64
+ {7AB46C61-04D5-4E77-AD3F-E7726F3E173A}.Release|x64.Build.0 = Release|x64
+ {7A5F618C-F98A-4F8E-BBC7-C4F5C6BCD5A4}.Debug|Win32.ActiveCfg = Debug|Win32
+ {7A5F618C-F98A-4F8E-BBC7-C4F5C6BCD5A4}.Debug|Win32.Build.0 = Debug|Win32
+ {7A5F618C-F98A-4F8E-BBC7-C4F5C6BCD5A4}.Debug|x64.ActiveCfg = Debug|x64
+ {7A5F618C-F98A-4F8E-BBC7-C4F5C6BCD5A4}.Debug|x64.Build.0 = Debug|x64
+ {7A5F618C-F98A-4F8E-BBC7-C4F5C6BCD5A4}.Release|Win32.ActiveCfg = Release|Win32
+ {7A5F618C-F98A-4F8E-BBC7-C4F5C6BCD5A4}.Release|Win32.Build.0 = Release|Win32
+ {7A5F618C-F98A-4F8E-BBC7-C4F5C6BCD5A4}.Release|x64.ActiveCfg = Release|x64
+ {7A5F618C-F98A-4F8E-BBC7-C4F5C6BCD5A4}.Release|x64.Build.0 = Release|x64
+ {27C64509-94EB-406D-9978-93AE531CEB1E}.Debug|Win32.ActiveCfg = Debug|Win32
+ {27C64509-94EB-406D-9978-93AE531CEB1E}.Debug|Win32.Build.0 = Debug|Win32
+ {27C64509-94EB-406D-9978-93AE531CEB1E}.Debug|x64.ActiveCfg = Debug|x64
+ {27C64509-94EB-406D-9978-93AE531CEB1E}.Debug|x64.Build.0 = Debug|x64
+ {27C64509-94EB-406D-9978-93AE531CEB1E}.Release|Win32.ActiveCfg = Release|Win32
+ {27C64509-94EB-406D-9978-93AE531CEB1E}.Release|Win32.Build.0 = Release|Win32
+ {27C64509-94EB-406D-9978-93AE531CEB1E}.Release|x64.ActiveCfg = Release|x64
+ {27C64509-94EB-406D-9978-93AE531CEB1E}.Release|x64.Build.0 = Release|x64
+ {8C02951E-155B-4D09-A1DD-F98695F02A0E}.Debug|Win32.ActiveCfg = Debug|Win32
+ {8C02951E-155B-4D09-A1DD-F98695F02A0E}.Debug|Win32.Build.0 = Debug|Win32
+ {8C02951E-155B-4D09-A1DD-F98695F02A0E}.Debug|x64.ActiveCfg = Debug|x64
+ {8C02951E-155B-4D09-A1DD-F98695F02A0E}.Debug|x64.Build.0 = Debug|x64
+ {8C02951E-155B-4D09-A1DD-F98695F02A0E}.Release|Win32.ActiveCfg = Release|Win32
+ {8C02951E-155B-4D09-A1DD-F98695F02A0E}.Release|Win32.Build.0 = Release|Win32
+ {8C02951E-155B-4D09-A1DD-F98695F02A0E}.Release|x64.ActiveCfg = Release|x64
+ {8C02951E-155B-4D09-A1DD-F98695F02A0E}.Release|x64.Build.0 = Release|x64
+ {29110B58-9FD5-4A8E-B9F7-064650EE16C6}.Debug|Win32.ActiveCfg = Debug|Win32
+ {29110B58-9FD5-4A8E-B9F7-064650EE16C6}.Debug|Win32.Build.0 = Debug|Win32
+ {29110B58-9FD5-4A8E-B9F7-064650EE16C6}.Debug|x64.ActiveCfg = Debug|x64
+ {29110B58-9FD5-4A8E-B9F7-064650EE16C6}.Debug|x64.Build.0 = Debug|x64
+ {29110B58-9FD5-4A8E-B9F7-064650EE16C6}.Release|Win32.ActiveCfg = Release|Win32
+ {29110B58-9FD5-4A8E-B9F7-064650EE16C6}.Release|Win32.Build.0 = Release|Win32
+ {29110B58-9FD5-4A8E-B9F7-064650EE16C6}.Release|x64.ActiveCfg = Release|x64
+ {29110B58-9FD5-4A8E-B9F7-064650EE16C6}.Release|x64.Build.0 = Release|x64
+ {D47B6498-6A8D-4E87-A3B6-C6D08DF29FE2}.Debug|Win32.ActiveCfg = Debug|Win32
+ {D47B6498-6A8D-4E87-A3B6-C6D08DF29FE2}.Debug|Win32.Build.0 = Debug|Win32
+ {D47B6498-6A8D-4E87-A3B6-C6D08DF29FE2}.Debug|x64.ActiveCfg = Debug|x64
+ {D47B6498-6A8D-4E87-A3B6-C6D08DF29FE2}.Debug|x64.Build.0 = Debug|x64
+ {D47B6498-6A8D-4E87-A3B6-C6D08DF29FE2}.Release|Win32.ActiveCfg = Release|Win32
+ {D47B6498-6A8D-4E87-A3B6-C6D08DF29FE2}.Release|Win32.Build.0 = Release|Win32
+ {D47B6498-6A8D-4E87-A3B6-C6D08DF29FE2}.Release|x64.ActiveCfg = Release|x64
+ {D47B6498-6A8D-4E87-A3B6-C6D08DF29FE2}.Release|x64.Build.0 = Release|x64
+ {64A6CE79-710F-405C-AAE8-F604E74A4374}.Debug|Win32.ActiveCfg = Debug|Win32
+ {64A6CE79-710F-405C-AAE8-F604E74A4374}.Debug|Win32.Build.0 = Debug|Win32
+ {64A6CE79-710F-405C-AAE8-F604E74A4374}.Debug|x64.ActiveCfg = Debug|x64
+ {64A6CE79-710F-405C-AAE8-F604E74A4374}.Debug|x64.Build.0 = Debug|x64
+ {64A6CE79-710F-405C-AAE8-F604E74A4374}.Release|Win32.ActiveCfg = Release|Win32
+ {64A6CE79-710F-405C-AAE8-F604E74A4374}.Release|Win32.Build.0 = Release|Win32
+ {64A6CE79-710F-405C-AAE8-F604E74A4374}.Release|x64.ActiveCfg = Release|x64
+ {64A6CE79-710F-405C-AAE8-F604E74A4374}.Release|x64.Build.0 = Release|x64
+ {C065DCD0-DE87-4B6E-A1E6-8F7EDB272D53}.Debug|Win32.ActiveCfg = Debug|Win32
+ {C065DCD0-DE87-4B6E-A1E6-8F7EDB272D53}.Debug|Win32.Build.0 = Debug|Win32
+ {C065DCD0-DE87-4B6E-A1E6-8F7EDB272D53}.Debug|x64.ActiveCfg = Debug|x64
+ {C065DCD0-DE87-4B6E-A1E6-8F7EDB272D53}.Debug|x64.Build.0 = Debug|x64
+ {C065DCD0-DE87-4B6E-A1E6-8F7EDB272D53}.Release|Win32.ActiveCfg = Release|Win32
+ {C065DCD0-DE87-4B6E-A1E6-8F7EDB272D53}.Release|Win32.Build.0 = Release|Win32
+ {C065DCD0-DE87-4B6E-A1E6-8F7EDB272D53}.Release|x64.ActiveCfg = Release|x64
+ {C065DCD0-DE87-4B6E-A1E6-8F7EDB272D53}.Release|x64.Build.0 = Release|x64
+ {9B955616-D58C-4ED8-AB6F-FBA74E768B54}.Debug|Win32.ActiveCfg = Debug|Win32
+ {9B955616-D58C-4ED8-AB6F-FBA74E768B54}.Debug|Win32.Build.0 = Debug|Win32
+ {9B955616-D58C-4ED8-AB6F-FBA74E768B54}.Debug|x64.ActiveCfg = Debug|x64
+ {9B955616-D58C-4ED8-AB6F-FBA74E768B54}.Debug|x64.Build.0 = Debug|x64
+ {9B955616-D58C-4ED8-AB6F-FBA74E768B54}.Release|Win32.ActiveCfg = Release|Win32
+ {9B955616-D58C-4ED8-AB6F-FBA74E768B54}.Release|Win32.Build.0 = Release|Win32
+ {9B955616-D58C-4ED8-AB6F-FBA74E768B54}.Release|x64.ActiveCfg = Release|x64
+ {9B955616-D58C-4ED8-AB6F-FBA74E768B54}.Release|x64.Build.0 = Release|x64
+ {94D10A14-5A9B-4E1E-B204-DE3196750126}.Debug|Win32.ActiveCfg = Debug|Win32
+ {94D10A14-5A9B-4E1E-B204-DE3196750126}.Debug|Win32.Build.0 = Debug|Win32
+ {94D10A14-5A9B-4E1E-B204-DE3196750126}.Debug|x64.ActiveCfg = Debug|x64
+ {94D10A14-5A9B-4E1E-B204-DE3196750126}.Debug|x64.Build.0 = Debug|x64
+ {94D10A14-5A9B-4E1E-B204-DE3196750126}.Release|Win32.ActiveCfg = Release|Win32
+ {94D10A14-5A9B-4E1E-B204-DE3196750126}.Release|Win32.Build.0 = Release|Win32
+ {94D10A14-5A9B-4E1E-B204-DE3196750126}.Release|x64.ActiveCfg = Release|x64
+ {94D10A14-5A9B-4E1E-B204-DE3196750126}.Release|x64.Build.0 = Release|x64
+ {CBBCFD38-0F91-4CA2-8CBF-2833AC284438}.Debug|Win32.ActiveCfg = Debug|Win32
+ {CBBCFD38-0F91-4CA2-8CBF-2833AC284438}.Debug|Win32.Build.0 = Debug|Win32
+ {CBBCFD38-0F91-4CA2-8CBF-2833AC284438}.Debug|x64.ActiveCfg = Debug|x64
+ {CBBCFD38-0F91-4CA2-8CBF-2833AC284438}.Debug|x64.Build.0 = Debug|x64
+ {CBBCFD38-0F91-4CA2-8CBF-2833AC284438}.Release|Win32.ActiveCfg = Release|Win32
+ {CBBCFD38-0F91-4CA2-8CBF-2833AC284438}.Release|Win32.Build.0 = Release|Win32
+ {CBBCFD38-0F91-4CA2-8CBF-2833AC284438}.Release|x64.ActiveCfg = Release|x64
+ {CBBCFD38-0F91-4CA2-8CBF-2833AC284438}.Release|x64.Build.0 = Release|x64
+ {B8FE1ABF-E1AD-41C7-AFAE-333BAB3636E1}.Debug|Win32.ActiveCfg = Debug|Win32
+ {B8FE1ABF-E1AD-41C7-AFAE-333BAB3636E1}.Debug|Win32.Build.0 = Debug|Win32
+ {B8FE1ABF-E1AD-41C7-AFAE-333BAB3636E1}.Debug|x64.ActiveCfg = Debug|x64
+ {B8FE1ABF-E1AD-41C7-AFAE-333BAB3636E1}.Debug|x64.Build.0 = Debug|x64
+ {B8FE1ABF-E1AD-41C7-AFAE-333BAB3636E1}.Release|Win32.ActiveCfg = Release|Win32
+ {B8FE1ABF-E1AD-41C7-AFAE-333BAB3636E1}.Release|Win32.Build.0 = Release|Win32
+ {B8FE1ABF-E1AD-41C7-AFAE-333BAB3636E1}.Release|x64.ActiveCfg = Release|x64
+ {B8FE1ABF-E1AD-41C7-AFAE-333BAB3636E1}.Release|x64.Build.0 = Release|x64
+ {69340E63-F15C-4A33-85B7-344666F8F25C}.Debug|Win32.ActiveCfg = Debug|Win32
+ {69340E63-F15C-4A33-85B7-344666F8F25C}.Debug|Win32.Build.0 = Debug|Win32
+ {69340E63-F15C-4A33-85B7-344666F8F25C}.Debug|x64.ActiveCfg = Debug|x64
+ {69340E63-F15C-4A33-85B7-344666F8F25C}.Debug|x64.Build.0 = Debug|x64
+ {69340E63-F15C-4A33-85B7-344666F8F25C}.Release|Win32.ActiveCfg = Release|Win32
+ {69340E63-F15C-4A33-85B7-344666F8F25C}.Release|Win32.Build.0 = Release|Win32
+ {69340E63-F15C-4A33-85B7-344666F8F25C}.Release|x64.ActiveCfg = Release|x64
+ {69340E63-F15C-4A33-85B7-344666F8F25C}.Release|x64.Build.0 = Release|x64
+ {D839F6C1-3736-4269-A5E7-30B2BC1CBCCD}.Debug|Win32.ActiveCfg = Debug|Win32
+ {D839F6C1-3736-4269-A5E7-30B2BC1CBCCD}.Debug|Win32.Build.0 = Debug|Win32
+ {D839F6C1-3736-4269-A5E7-30B2BC1CBCCD}.Debug|x64.ActiveCfg = Debug|x64
+ {D839F6C1-3736-4269-A5E7-30B2BC1CBCCD}.Debug|x64.Build.0 = Debug|x64
+ {D839F6C1-3736-4269-A5E7-30B2BC1CBCCD}.Release|Win32.ActiveCfg = Release|Win32
+ {D839F6C1-3736-4269-A5E7-30B2BC1CBCCD}.Release|Win32.Build.0 = Release|Win32
+ {D839F6C1-3736-4269-A5E7-30B2BC1CBCCD}.Release|x64.ActiveCfg = Release|x64
+ {D839F6C1-3736-4269-A5E7-30B2BC1CBCCD}.Release|x64.Build.0 = Release|x64
+ {A1F2E6F2-6E49-4746-9133-9DF0A404C7DB}.Debug|Win32.ActiveCfg = Debug|Win32
+ {A1F2E6F2-6E49-4746-9133-9DF0A404C7DB}.Debug|Win32.Build.0 = Debug|Win32
+ {A1F2E6F2-6E49-4746-9133-9DF0A404C7DB}.Debug|x64.ActiveCfg = Debug|x64
+ {A1F2E6F2-6E49-4746-9133-9DF0A404C7DB}.Debug|x64.Build.0 = Debug|x64
+ {A1F2E6F2-6E49-4746-9133-9DF0A404C7DB}.Release|Win32.ActiveCfg = Release|Win32
+ {A1F2E6F2-6E49-4746-9133-9DF0A404C7DB}.Release|Win32.Build.0 = Release|Win32
+ {A1F2E6F2-6E49-4746-9133-9DF0A404C7DB}.Release|x64.ActiveCfg = Release|x64
+ {A1F2E6F2-6E49-4746-9133-9DF0A404C7DB}.Release|x64.Build.0 = Release|x64
+ {D08D4EA4-8AF5-4FD2-BFBE-4FFB247B2A35}.Debug|Win32.ActiveCfg = Debug|Win32
+ {D08D4EA4-8AF5-4FD2-BFBE-4FFB247B2A35}.Debug|Win32.Build.0 = Debug|Win32
+ {D08D4EA4-8AF5-4FD2-BFBE-4FFB247B2A35}.Debug|x64.ActiveCfg = Debug|x64
+ {D08D4EA4-8AF5-4FD2-BFBE-4FFB247B2A35}.Debug|x64.Build.0 = Debug|x64
+ {D08D4EA4-8AF5-4FD2-BFBE-4FFB247B2A35}.Release|Win32.ActiveCfg = Release|Win32
+ {D08D4EA4-8AF5-4FD2-BFBE-4FFB247B2A35}.Release|Win32.Build.0 = Release|Win32
+ {D08D4EA4-8AF5-4FD2-BFBE-4FFB247B2A35}.Release|x64.ActiveCfg = Release|x64
+ {D08D4EA4-8AF5-4FD2-BFBE-4FFB247B2A35}.Release|x64.Build.0 = Release|x64
+ {595357B8-132D-4F3E-9679-6E52B474E8A5}.Debug|Win32.ActiveCfg = Debug|Win32
+ {595357B8-132D-4F3E-9679-6E52B474E8A5}.Debug|Win32.Build.0 = Debug|Win32
+ {595357B8-132D-4F3E-9679-6E52B474E8A5}.Debug|x64.ActiveCfg = Debug|x64
+ {595357B8-132D-4F3E-9679-6E52B474E8A5}.Debug|x64.Build.0 = Debug|x64
+ {595357B8-132D-4F3E-9679-6E52B474E8A5}.Release|Win32.ActiveCfg = Release|Win32
+ {595357B8-132D-4F3E-9679-6E52B474E8A5}.Release|Win32.Build.0 = Release|Win32
+ {595357B8-132D-4F3E-9679-6E52B474E8A5}.Release|x64.ActiveCfg = Release|x64
+ {595357B8-132D-4F3E-9679-6E52B474E8A5}.Release|x64.Build.0 = Release|x64
+ {EC9BB75A-9691-4DAF-A876-5116DDCBAFBC}.Debug|Win32.ActiveCfg = Debug|Win32
+ {EC9BB75A-9691-4DAF-A876-5116DDCBAFBC}.Debug|Win32.Build.0 = Debug|Win32
+ {EC9BB75A-9691-4DAF-A876-5116DDCBAFBC}.Debug|x64.ActiveCfg = Debug|x64
+ {EC9BB75A-9691-4DAF-A876-5116DDCBAFBC}.Debug|x64.Build.0 = Debug|x64
+ {EC9BB75A-9691-4DAF-A876-5116DDCBAFBC}.Release|Win32.ActiveCfg = Release|Win32
+ {EC9BB75A-9691-4DAF-A876-5116DDCBAFBC}.Release|Win32.Build.0 = Release|Win32
+ {EC9BB75A-9691-4DAF-A876-5116DDCBAFBC}.Release|x64.ActiveCfg = Release|x64
+ {EC9BB75A-9691-4DAF-A876-5116DDCBAFBC}.Release|x64.Build.0 = Release|x64
+ {12C054D3-D396-45F9-912E-8A7FF6548738}.Debug|Win32.ActiveCfg = Debug|Win32
+ {12C054D3-D396-45F9-912E-8A7FF6548738}.Debug|Win32.Build.0 = Debug|Win32
+ {12C054D3-D396-45F9-912E-8A7FF6548738}.Debug|x64.ActiveCfg = Debug|x64
+ {12C054D3-D396-45F9-912E-8A7FF6548738}.Debug|x64.Build.0 = Debug|x64
+ {12C054D3-D396-45F9-912E-8A7FF6548738}.Release|Win32.ActiveCfg = Release|Win32
+ {12C054D3-D396-45F9-912E-8A7FF6548738}.Release|Win32.Build.0 = Release|Win32
+ {12C054D3-D396-45F9-912E-8A7FF6548738}.Release|x64.ActiveCfg = Release|x64
+ {12C054D3-D396-45F9-912E-8A7FF6548738}.Release|x64.Build.0 = Release|x64
+ {BCC584B3-571E-4441-8ABF-D2CDD0646116}.Debug|Win32.ActiveCfg = Debug|Win32
+ {BCC584B3-571E-4441-8ABF-D2CDD0646116}.Debug|Win32.Build.0 = Debug|Win32
+ {BCC584B3-571E-4441-8ABF-D2CDD0646116}.Debug|x64.ActiveCfg = Debug|x64
+ {BCC584B3-571E-4441-8ABF-D2CDD0646116}.Debug|x64.Build.0 = Debug|x64
+ {BCC584B3-571E-4441-8ABF-D2CDD0646116}.Release|Win32.ActiveCfg = Release|Win32
+ {BCC584B3-571E-4441-8ABF-D2CDD0646116}.Release|Win32.Build.0 = Release|Win32
+ {BCC584B3-571E-4441-8ABF-D2CDD0646116}.Release|x64.ActiveCfg = Release|x64
+ {BCC584B3-571E-4441-8ABF-D2CDD0646116}.Release|x64.Build.0 = Release|x64
+ {A8A0C0C5-A117-4430-B47A-E98603255D01}.Debug|Win32.ActiveCfg = Debug|Win32
+ {A8A0C0C5-A117-4430-B47A-E98603255D01}.Debug|Win32.Build.0 = Debug|Win32
+ {A8A0C0C5-A117-4430-B47A-E98603255D01}.Debug|x64.ActiveCfg = Debug|x64
+ {A8A0C0C5-A117-4430-B47A-E98603255D01}.Debug|x64.Build.0 = Debug|x64
+ {A8A0C0C5-A117-4430-B47A-E98603255D01}.Release|Win32.ActiveCfg = Release|Win32
+ {A8A0C0C5-A117-4430-B47A-E98603255D01}.Release|Win32.Build.0 = Release|Win32
+ {A8A0C0C5-A117-4430-B47A-E98603255D01}.Release|x64.ActiveCfg = Release|x64
+ {A8A0C0C5-A117-4430-B47A-E98603255D01}.Release|x64.Build.0 = Release|x64
+ {EF8EC721-3949-484B-862F-2BB07460526D}.Debug|Win32.ActiveCfg = Debug|Win32
+ {EF8EC721-3949-484B-862F-2BB07460526D}.Debug|Win32.Build.0 = Debug|Win32
+ {EF8EC721-3949-484B-862F-2BB07460526D}.Debug|x64.ActiveCfg = Debug|x64
+ {EF8EC721-3949-484B-862F-2BB07460526D}.Debug|x64.Build.0 = Debug|x64
+ {EF8EC721-3949-484B-862F-2BB07460526D}.Release|Win32.ActiveCfg = Release|Win32
+ {EF8EC721-3949-484B-862F-2BB07460526D}.Release|Win32.Build.0 = Release|Win32
+ {EF8EC721-3949-484B-862F-2BB07460526D}.Release|x64.ActiveCfg = Release|x64
+ {EF8EC721-3949-484B-862F-2BB07460526D}.Release|x64.Build.0 = Release|x64
+ {BF87D83F-575E-49B5-87BD-02C6E581FD6A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {BF87D83F-575E-49B5-87BD-02C6E581FD6A}.Debug|Win32.Build.0 = Debug|Win32
+ {BF87D83F-575E-49B5-87BD-02C6E581FD6A}.Debug|x64.ActiveCfg = Debug|x64
+ {BF87D83F-575E-49B5-87BD-02C6E581FD6A}.Debug|x64.Build.0 = Debug|x64
+ {BF87D83F-575E-49B5-87BD-02C6E581FD6A}.Release|Win32.ActiveCfg = Release|Win32
+ {BF87D83F-575E-49B5-87BD-02C6E581FD6A}.Release|Win32.Build.0 = Release|Win32
+ {BF87D83F-575E-49B5-87BD-02C6E581FD6A}.Release|x64.ActiveCfg = Release|x64
+ {BF87D83F-575E-49B5-87BD-02C6E581FD6A}.Release|x64.Build.0 = Release|x64
+ {970CE296-FB4C-4990-8FC7-F26078998302}.Debug|Win32.ActiveCfg = Debug|Win32
+ {970CE296-FB4C-4990-8FC7-F26078998302}.Debug|Win32.Build.0 = Debug|Win32
+ {970CE296-FB4C-4990-8FC7-F26078998302}.Debug|x64.ActiveCfg = Debug|x64
+ {970CE296-FB4C-4990-8FC7-F26078998302}.Debug|x64.Build.0 = Debug|x64
+ {970CE296-FB4C-4990-8FC7-F26078998302}.Release|Win32.ActiveCfg = Release|Win32
+ {970CE296-FB4C-4990-8FC7-F26078998302}.Release|Win32.Build.0 = Release|Win32
+ {970CE296-FB4C-4990-8FC7-F26078998302}.Release|x64.ActiveCfg = Release|x64
+ {970CE296-FB4C-4990-8FC7-F26078998302}.Release|x64.Build.0 = Release|x64
+ {2C3B0E05-5959-4630-A94F-625C9BCE9B10}.Debug|Win32.ActiveCfg = Debug|Win32
+ {2C3B0E05-5959-4630-A94F-625C9BCE9B10}.Debug|Win32.Build.0 = Debug|Win32
+ {2C3B0E05-5959-4630-A94F-625C9BCE9B10}.Debug|x64.ActiveCfg = Debug|x64
+ {2C3B0E05-5959-4630-A94F-625C9BCE9B10}.Debug|x64.Build.0 = Debug|x64
+ {2C3B0E05-5959-4630-A94F-625C9BCE9B10}.Release|Win32.ActiveCfg = Release|Win32
+ {2C3B0E05-5959-4630-A94F-625C9BCE9B10}.Release|Win32.Build.0 = Release|Win32
+ {2C3B0E05-5959-4630-A94F-625C9BCE9B10}.Release|x64.ActiveCfg = Release|x64
+ {2C3B0E05-5959-4630-A94F-625C9BCE9B10}.Release|x64.Build.0 = Release|x64
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+ GlobalSection(NestedProjects) = preSolution
+ {D08D4EA4-8AF5-4FD2-BFBE-4FFB247B2A35} = {E7608C74-F664-43A4-823C-D4370571FD4C}
+ {595357B8-132D-4F3E-9679-6E52B474E8A5} = {E7608C74-F664-43A4-823C-D4370571FD4C}
+ {EC9BB75A-9691-4DAF-A876-5116DDCBAFBC} = {E7608C74-F664-43A4-823C-D4370571FD4C}
+ {12C054D3-D396-45F9-912E-8A7FF6548738} = {E7608C74-F664-43A4-823C-D4370571FD4C}
+ {BCC584B3-571E-4441-8ABF-D2CDD0646116} = {E7608C74-F664-43A4-823C-D4370571FD4C}
+ {A8A0C0C5-A117-4430-B47A-E98603255D01} = {E7608C74-F664-43A4-823C-D4370571FD4C}
+ {A1F2E6F2-6E49-4746-9133-9DF0A404C7DB} = {E7608C74-F664-43A4-823C-D4370571FD4C}
+ EndGlobalSection
+EndGlobal
diff --git a/SiloWindows/MSVC9/Tests/alltypes.vcproj b/SiloWindows/MSVC9/Tests/alltypes.vcproj
new file mode 100644
index 0000000..de38bb1
--- /dev/null
+++ b/SiloWindows/MSVC9/Tests/alltypes.vcproj
@@ -0,0 +1,400 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="alltypes"
+ ProjectGUID="{627C8E54-0ABD-4B8A-B76B-0BD13F5E684B}"
+ RootNamespace="alltypes"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\alltypes"
+ IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\alltypes"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(OutDir)\alltypes.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;_CONSOLE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\alltypes.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\alltypes"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="4"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\alltypes.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)\alltypes.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(OutDir)\alltypes.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;_CONSOLE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\alltypes.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\alltypes"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\alltypes.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)\alltypes.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\alltypes"
+ IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\alltypes"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(OutDir)\alltypes.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\alltypes.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\alltypes.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ ProgramDatabaseFile="$(OutDir)\alltypes.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(OutDir)\alltypes.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\alltypes.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\alltypes.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ ProgramDatabaseFile="$(OutDir)\alltypes.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <File
+ RelativePath="..\..\..\tests\alltypes.c"
+ >
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/SiloWindows/MSVC9/Tests/arbpoly.vcproj b/SiloWindows/MSVC9/Tests/arbpoly.vcproj
new file mode 100644
index 0000000..76ca270
--- /dev/null
+++ b/SiloWindows/MSVC9/Tests/arbpoly.vcproj
@@ -0,0 +1,399 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="arbpoly"
+ ProjectGUID="{970CE296-FB4C-4990-8FC7-F26078998302}"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\arbpoly"
+ IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\arbpoly"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(OutDir)\arbpoly.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;_CONSOLE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\arbpoly.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\arbpoly"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="4"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\arbpoly.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)\arbpoly.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(OutDir)\arbpoly.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;_CONSOLE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\arbpoly.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\arbpoly"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\arbpoly.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)\arbpoly.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\arbpoly"
+ IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\arbpoly"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(OutDir)\arbpoly.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\arbpoly.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\arbpoly.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ ProgramDatabaseFile="$(OutDir)\arbpoly.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(OutDir)\arbpoly.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\arbpoly.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\arbpoly.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ ProgramDatabaseFile="$(OutDir)\arbpoly.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <File
+ RelativePath="..\..\..\tests\arbpoly.c"
+ >
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/SiloWindows/MSVC9/Tests/arbpoly3d.vcproj b/SiloWindows/MSVC9/Tests/arbpoly3d.vcproj
new file mode 100644
index 0000000..320f0eb
--- /dev/null
+++ b/SiloWindows/MSVC9/Tests/arbpoly3d.vcproj
@@ -0,0 +1,399 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="arbpoly3d"
+ ProjectGUID="{BF87D83F-575E-49B5-87BD-02C6E581FD6A}"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\arbpoly3d"
+ IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\arbpoly3d"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(OutDir)\arbpoly3d.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;_CONSOLE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\arbpoly3d.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\arbpoly3d"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="4"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\arbpoly3d.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)\arbpoly3d.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(OutDir)\arbpoly3d.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;_CONSOLE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\arbpoly3d.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\arbpoly3d"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\arbpoly3d.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)\arbpoly3d.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\arbpoly3d"
+ IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\arbpoly3d"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(OutDir)\arbpoly3d.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\arbpoly3d.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\arbpoly3d.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ ProgramDatabaseFile="$(OutDir)\arbpoly3d.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(OutDir)\arbpoly3d.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\arbpoly3d.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\arbpoly3d.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ ProgramDatabaseFile="$(OutDir)\arbpoly3d.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <File
+ RelativePath="..\..\..\tests\arbpoly3d.c"
+ >
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/SiloWindows/MSVC9/Tests/array.vcproj b/SiloWindows/MSVC9/Tests/array.vcproj
new file mode 100644
index 0000000..af64d35
--- /dev/null
+++ b/SiloWindows/MSVC9/Tests/array.vcproj
@@ -0,0 +1,399 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="array"
+ ProjectGUID="{CB409787-8ACF-4854-A2AB-6CD727E7120D}"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\array"
+ IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\array"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(OutDir)\array.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;_CONSOLE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\array.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\array"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="4"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\array.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)\array.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(OutDir)\array.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;_CONSOLE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\array.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\array"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\array.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)\array.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\array"
+ IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\array"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(OutDir)\array.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\array.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\array.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ ProgramDatabaseFile="$(OutDir)\array.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(OutDir)\array.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\array.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\array.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ ProgramDatabaseFile="$(OutDir)\array.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <File
+ RelativePath="..\..\..\tests\array.c"
+ >
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/SiloWindows/MSVC9/Tests/array_f.vfproj b/SiloWindows/MSVC9/Tests/array_f.vfproj
new file mode 100644
index 0000000..8a9c649
--- /dev/null
+++ b/SiloWindows/MSVC9/Tests/array_f.vfproj
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<VisualStudioProject ProjectCreator="Intel Fortran" Keyword="Console Application" Version="11.0" ProjectIdGuid="{A1F2E6F2-6E49-4746-9133-9DF0A404C7DB}">
+ <Platforms>
+ <Platform Name="Win32"/>
+ <Platform Name="x64"/></Platforms>
+ <Configurations>
+ <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\array_f" IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\array_f">
+ <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="..\..\..\src\silo" Interfaces="true" WarnInterfaces="true" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug"/>
+ <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)..\bin\$(ProjectName).exe" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)" ManifestFile="$(IntDir)\$(TargetFileName).intermediate.manifest" GenerateDebugInformation="true" ProgramDatabaseFile="$(IntDir)$(TargetName).pdb" SubSystem="subSystemConsole" ImportLibrary="$(IntDir)\$(TargetName).lib" TargetMachine="machineX86" AdditionalDep [...]
+ <Tool Name="VFResourceCompilerTool" ResourceOutputFileName="$(IntDir)\$(InputName).res"/>
+ <Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(IntDir)\$(ProjectName).tlb"/>
+ <Tool Name="VFCustomBuildTool"/>
+ <Tool Name="VFPreLinkEventTool"/>
+ <Tool Name="VFPreBuildEventTool"/>
+ <Tool Name="VFPostBuildEventTool"/>
+ <Tool Name="VFManifestTool" SuppressStartupBanner="true" OutputManifestFile="$(Intdir)\$(TargetFileName).embed.manifest" ResourceFile="$(IntDir)\$(TargetFileName).embed.manifest.res"/></Configuration>
+ <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\array_f" IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\array_f">
+ <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" AdditionalIncludeDirectories="..\..\..\src\silo" DiagnosticsFile="$(IntDir)$(TargetName).diag" ModulePath="$(IntDir)" ObjectFile="$(IntDir)"/>
+ <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)..\bin\$(ProjectName).exe" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)" ManifestFile="$(IntDir)\$(TargetFileName).intermediate.manifest" ProgramDatabaseFile="$(IntDir)$(TargetName).pdb" SubSystem="subSystemConsole" ImportLibrary="$(IntDir)\$(TargetName).lib" AdditionalDependencies="silohdf5.lib"/>
+ <Tool Name="VFResourceCompilerTool" ResourceOutputFileName="$(IntDir)\$(InputName).res"/>
+ <Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(IntDir)\$(ProjectName).tlb"/>
+ <Tool Name="VFCustomBuildTool"/>
+ <Tool Name="VFPreLinkEventTool"/>
+ <Tool Name="VFPreBuildEventTool"/>
+ <Tool Name="VFPostBuildEventTool"/>
+ <Tool Name="VFManifestTool" SuppressStartupBanner="true" OutputManifestFile="$(Intdir)\$(TargetFileName).embed.manifest" ResourceFile="$(IntDir)\$(TargetFileName).embed.manifest.res"/></Configuration>
+ <Configuration Name="Debug|x64">
+ <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="..\..\..\src\silo" Interfaces="true" WarnInterfaces="true" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug"/>
+ <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)..\bin\$(ProjectName).exe" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)" ManifestFile="$(IntDir)\$(TargetFileName).intermediate.manifest" GenerateDebugInformation="true" ProgramDatabaseFile="$(IntDir)$(TargetName).pdb" SubSystem="subSystemConsole" ImportLibrary="$(IntDir)\$(TargetName).lib" AdditionalDependencies="silohdf5.lib"/>
+ <Tool Name="VFResourceCompilerTool" ResourceOutputFileName="$(IntDir)\$(InputName).res"/>
+ <Tool Name="VFMidlTool" SuppressStartupBanner="true" TargetEnvironment="midlTargetAMD64" TypeLibraryName="$(IntDir)\$(ProjectName).tlb"/>
+ <Tool Name="VFCustomBuildTool"/>
+ <Tool Name="VFPreLinkEventTool"/>
+ <Tool Name="VFPreBuildEventTool"/>
+ <Tool Name="VFPostBuildEventTool"/>
+ <Tool Name="VFManifestTool" SuppressStartupBanner="true" OutputManifestFile="$(Intdir)\$(TargetFileName).embed.manifest" ResourceFile="$(IntDir)\$(TargetFileName).embed.manifest.res"/></Configuration>
+ <Configuration Name="Release|x64">
+ <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" AdditionalIncludeDirectories="..\..\..\src\silo" DiagnosticsFile="$(IntDir)$(TargetName).diag" ModulePath="$(IntDir)" ObjectFile="$(IntDir)"/>
+ <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)..\bin\$(ProjectName).exe" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)" ManifestFile="$(IntDir)\$(TargetFileName).intermediate.manifest" ProgramDatabaseFile="$(IntDir)$(TargetName).pdb" SubSystem="subSystemConsole" ImportLibrary="$(IntDir)\$(TargetName).lib" AdditionalDependencies="silohdf5.lib"/>
+ <Tool Name="VFResourceCompilerTool" ResourceOutputFileName="$(IntDir)\$(InputName).res"/>
+ <Tool Name="VFMidlTool" SuppressStartupBanner="true" TargetEnvironment="midlTargetAMD64" TypeLibraryName="$(IntDir)\$(ProjectName).tlb"/>
+ <Tool Name="VFCustomBuildTool"/>
+ <Tool Name="VFPreLinkEventTool"/>
+ <Tool Name="VFPreBuildEventTool"/>
+ <Tool Name="VFPostBuildEventTool"/>
+ <Tool Name="VFManifestTool" SuppressStartupBanner="true" OutputManifestFile="$(Intdir)\$(TargetFileName).embed.manifest" ResourceFile="$(IntDir)\$(TargetFileName).embed.manifest.res"/></Configuration></Configurations>
+ <Files>
+ <Filter Name="Header Files" Filter="fi;fd"/>
+ <Filter Name="Resource Files" Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"/>
+ <Filter Name="Source Files" Filter="f90;for;f;fpp;ftn;def;odl;idl">
+ <File RelativePath="..\..\..\tests\arrayf77.f"/></Filter></Files>
+ <Globals/></VisualStudioProject>
diff --git a/SiloWindows/MSVC9/Tests/compression.vcproj b/SiloWindows/MSVC9/Tests/compression.vcproj
new file mode 100644
index 0000000..40aae09
--- /dev/null
+++ b/SiloWindows/MSVC9/Tests/compression.vcproj
@@ -0,0 +1,399 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="compression"
+ ProjectGUID="{AA9DE89B-47C8-4164-944A-6D42B4AF0FEB}"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\compression"
+ IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\compression"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(OutDir)\compression.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;_CONSOLE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\compression.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\compression"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="4"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\compression.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)\compression.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(OutDir)\compression.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;_CONSOLE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\compression.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\compression"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\compression.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)\compression.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\compression"
+ IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\compression"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(OutDir)\compression.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\compression.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\compression.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ ProgramDatabaseFile="$(OutDir)\compression.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(OutDir)\compression.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\compression.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\compression.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ ProgramDatabaseFile="$(OutDir)\compression.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <File
+ RelativePath="..\..\..\tests\compression.c"
+ >
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/SiloWindows/MSVC9/Tests/csg.vcproj b/SiloWindows/MSVC9/Tests/csg.vcproj
new file mode 100644
index 0000000..0aaabca
--- /dev/null
+++ b/SiloWindows/MSVC9/Tests/csg.vcproj
@@ -0,0 +1,399 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="csg"
+ ProjectGUID="{6DE8948E-8CF8-4650-9749-1C21066AA957}"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\csg"
+ IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\csg"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(OutDir)\csg.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;_CONSOLE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\csg.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\csg"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="4"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\csg.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)\csg.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(OutDir)\csg.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;_CONSOLE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\csg.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\csg"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\csg.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)\csg.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\csg"
+ IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\csg"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(OutDir)\csg.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\csg.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\csg.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ ProgramDatabaseFile="$(OutDir)\csg.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(OutDir)\csg.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\csg.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\csg.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ ProgramDatabaseFile="$(OutDir)\csg.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <File
+ RelativePath="..\..\..\tests\csg.c"
+ >
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/SiloWindows/MSVC9/Tests/curve_f.vfproj b/SiloWindows/MSVC9/Tests/curve_f.vfproj
new file mode 100644
index 0000000..de0b526
--- /dev/null
+++ b/SiloWindows/MSVC9/Tests/curve_f.vfproj
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<VisualStudioProject ProjectCreator="Intel Fortran" Keyword="Console Application" Version="11.0" ProjectIdGuid="{A1F2E6F2-6E49-4746-9133-9DF0A404C7DB}">
+ <Platforms>
+ <Platform Name="Win32"/>
+ <Platform Name="x64"/></Platforms>
+ <Configurations>
+ <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\curve_f" IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\curve_f">
+ <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="..\..\..\src\silo" Interfaces="true" WarnInterfaces="true" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug"/>
+ <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)..\bin\$(ProjectName).exe" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)" ManifestFile="$(IntDir)\$(TargetFileName).intermediate.manifest" GenerateDebugInformation="true" ProgramDatabaseFile="$(IntDir)$(TargetName).pdb" SubSystem="subSystemConsole" ImportLibrary="$(IntDir)\$(TargetName).lib" TargetMachine="machineX86" AdditionalDep [...]
+ <Tool Name="VFResourceCompilerTool" ResourceOutputFileName="$(IntDir)\$(InputName).res"/>
+ <Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(IntDir)\$(ProjectName).tlb"/>
+ <Tool Name="VFCustomBuildTool"/>
+ <Tool Name="VFPreLinkEventTool"/>
+ <Tool Name="VFPreBuildEventTool"/>
+ <Tool Name="VFPostBuildEventTool"/>
+ <Tool Name="VFManifestTool" SuppressStartupBanner="true" OutputManifestFile="$(Intdir)\$(TargetFileName).embed.manifest" ResourceFile="$(IntDir)\$(TargetFileName).embed.manifest.res"/></Configuration>
+ <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\curve_f" IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\curve_f">
+ <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" AdditionalIncludeDirectories="..\..\..\src\silo" DiagnosticsFile="$(IntDir)$(TargetName).diag" ModulePath="$(IntDir)" ObjectFile="$(IntDir)"/>
+ <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)..\bin\$(ProjectName).exe" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)" ManifestFile="$(IntDir)\$(TargetFileName).intermediate.manifest" ProgramDatabaseFile="$(IntDir)$(TargetName).pdb" SubSystem="subSystemConsole" ImportLibrary="$(IntDir)\$(TargetName).lib" AdditionalDependencies="silohdf5.lib"/>
+ <Tool Name="VFResourceCompilerTool" ResourceOutputFileName="$(IntDir)\$(InputName).res"/>
+ <Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(IntDir)\$(ProjectName).tlb"/>
+ <Tool Name="VFCustomBuildTool"/>
+ <Tool Name="VFPreLinkEventTool"/>
+ <Tool Name="VFPreBuildEventTool"/>
+ <Tool Name="VFPostBuildEventTool"/>
+ <Tool Name="VFManifestTool" SuppressStartupBanner="true" OutputManifestFile="$(Intdir)\$(TargetFileName).embed.manifest" ResourceFile="$(IntDir)\$(TargetFileName).embed.manifest.res"/></Configuration>
+ <Configuration Name="Debug|x64">
+ <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="..\..\..\src\silo" Interfaces="true" WarnInterfaces="true" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug"/>
+ <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)..\bin\$(ProjectName).exe" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)" ManifestFile="$(IntDir)\$(TargetFileName).intermediate.manifest" GenerateDebugInformation="true" ProgramDatabaseFile="$(IntDir)$(TargetName).pdb" SubSystem="subSystemConsole" ImportLibrary="$(IntDir)\$(TargetName).lib" AdditionalDependencies="silohdf5.lib"/>
+ <Tool Name="VFResourceCompilerTool" ResourceOutputFileName="$(IntDir)\$(InputName).res"/>
+ <Tool Name="VFMidlTool" SuppressStartupBanner="true" TargetEnvironment="midlTargetAMD64" TypeLibraryName="$(IntDir)\$(ProjectName).tlb"/>
+ <Tool Name="VFCustomBuildTool"/>
+ <Tool Name="VFPreLinkEventTool"/>
+ <Tool Name="VFPreBuildEventTool"/>
+ <Tool Name="VFPostBuildEventTool"/>
+ <Tool Name="VFManifestTool" SuppressStartupBanner="true" OutputManifestFile="$(Intdir)\$(TargetFileName).embed.manifest" ResourceFile="$(IntDir)\$(TargetFileName).embed.manifest.res"/></Configuration>
+ <Configuration Name="Release|x64">
+ <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" AdditionalIncludeDirectories="..\..\..\src\silo" DiagnosticsFile="$(IntDir)$(TargetName).diag" ModulePath="$(IntDir)" ObjectFile="$(IntDir)"/>
+ <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)..\bin\$(ProjectName).exe" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)" ManifestFile="$(IntDir)\$(TargetFileName).intermediate.manifest" ProgramDatabaseFile="$(IntDir)$(TargetName).pdb" SubSystem="subSystemConsole" ImportLibrary="$(IntDir)\$(TargetName).lib" AdditionalDependencies="silohdf5.lib"/>
+ <Tool Name="VFResourceCompilerTool" ResourceOutputFileName="$(IntDir)\$(InputName).res"/>
+ <Tool Name="VFMidlTool" SuppressStartupBanner="true" TargetEnvironment="midlTargetAMD64" TypeLibraryName="$(IntDir)\$(ProjectName).tlb"/>
+ <Tool Name="VFCustomBuildTool"/>
+ <Tool Name="VFPreLinkEventTool"/>
+ <Tool Name="VFPreBuildEventTool"/>
+ <Tool Name="VFPostBuildEventTool"/>
+ <Tool Name="VFManifestTool" SuppressStartupBanner="true" OutputManifestFile="$(Intdir)\$(TargetFileName).embed.manifest" ResourceFile="$(IntDir)\$(TargetFileName).embed.manifest.res"/></Configuration></Configurations>
+ <Files>
+ <Filter Name="Header Files" Filter="fi;fd"/>
+ <Filter Name="Resource Files" Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"/>
+ <Filter Name="Source Files" Filter="f90;for;f;fpp;ftn;def;odl;idl">
+ <File RelativePath="..\..\..\tests\curvef77.f"/></Filter></Files>
+ <Globals/></VisualStudioProject>
diff --git a/SiloWindows/MSVC9/Tests/dirtest.vcproj b/SiloWindows/MSVC9/Tests/dirtest.vcproj
new file mode 100644
index 0000000..d3815d4
--- /dev/null
+++ b/SiloWindows/MSVC9/Tests/dirtest.vcproj
@@ -0,0 +1,403 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="dirtest"
+ ProjectGUID="{B8FE1ABF-E1AD-41C7-AFAE-333BAB3636E1}"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\dirtest"
+ IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\dirtest"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(OutDir)\dirtest.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;_CONSOLE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\dirtest.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\dirtest"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="4"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\dirtest.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)\dirtest.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(OutDir)\dirtest.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;_CONSOLE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\dirtest.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\dirtest"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\dirtest.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)\dirtest.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\dirtest"
+ IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\dirtest"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(OutDir)\dirtest.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\dirtest.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\dirtest.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ ProgramDatabaseFile="$(OutDir)\dirtest.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(OutDir)\dirtest.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\dirtest.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\dirtest.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ ProgramDatabaseFile="$(OutDir)\dirtest.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <File
+ RelativePath="..\..\..\tests\dir.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\tests\testlib.c"
+ >
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/SiloWindows/MSVC9/Tests/empty.vcproj b/SiloWindows/MSVC9/Tests/empty.vcproj
new file mode 100644
index 0000000..8ed7a5e
--- /dev/null
+++ b/SiloWindows/MSVC9/Tests/empty.vcproj
@@ -0,0 +1,399 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="empty"
+ ProjectGUID="{2C3B0E05-5959-4630-A94F-625C9BCE9B10}"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\empty"
+ IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\empty"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(OutDir)\empty.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;_CONSOLE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\empty.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\empty"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="4"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\empty.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)\empty.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(OutDir)\empty.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;_CONSOLE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\empty.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\empty"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\empty.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)\empty.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\empty"
+ IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\empty"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(OutDir)\empty.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\empty.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\empty.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ ProgramDatabaseFile="$(OutDir)\empty.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(OutDir)\empty.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\empty.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\empty.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ ProgramDatabaseFile="$(OutDir)\empty.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <File
+ RelativePath="..\..\..\tests\empty.c"
+ >
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/SiloWindows/MSVC9/Tests/extface.vcproj b/SiloWindows/MSVC9/Tests/extface.vcproj
new file mode 100644
index 0000000..ded50f8
--- /dev/null
+++ b/SiloWindows/MSVC9/Tests/extface.vcproj
@@ -0,0 +1,399 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="extface"
+ ProjectGUID="{3482A43B-3A21-4583-88C4-45A4422E2307}"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\extface"
+ IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\extface"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(OutDir)\extface.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;_CONSOLE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\extface.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\extface"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="4"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\extface.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)\extface.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(OutDir)\extface.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;_CONSOLE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\extface.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\extface"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\extface.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)\extface.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\extface"
+ IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\extface"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(OutDir)\extface.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\extface.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\extface.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ ProgramDatabaseFile="$(OutDir)\extface.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(OutDir)\extface.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\extface.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\extface.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ ProgramDatabaseFile="$(OutDir)\extface.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <File
+ RelativePath="..\..\..\tests\extface.c"
+ >
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/SiloWindows/MSVC9/Tests/grab.vcproj b/SiloWindows/MSVC9/Tests/grab.vcproj
new file mode 100644
index 0000000..d9d61ab
--- /dev/null
+++ b/SiloWindows/MSVC9/Tests/grab.vcproj
@@ -0,0 +1,399 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="grab"
+ ProjectGUID="{DCFFC0C8-1C81-4016-8364-1678FAB1D2D2}"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\grab"
+ IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\grab"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(OutDir)\grab.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\include;..\..\..\src\silo;$(HDF5_INC_DIR)"
+ PreprocessorDefinitions="WIN32;_CONSOLE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\grab.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\grab"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="4"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib hdf5dll.lib"
+ OutputFile="$(SolutionDir)..\bin\grab.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName);$(HDF5_LIB_DIR)"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)\grab.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(OutDir)\grab.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\include;..\..\..\src\silo;$(HDF5_INC_DIR_X64)"
+ PreprocessorDefinitions="WIN32;_CONSOLE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\grab.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\grab"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib hdf5dll.lib"
+ OutputFile="$(SolutionDir)..\bin\grab.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName);$(HDF5_LIB_DIR_X64)"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)\grab.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\grab"
+ IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\grab"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(OutDir)\grab.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="..\..\include\;..\..\..\src\silo;$(HDF5_INC_DIR)"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\grab.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib hdf5dll.lib"
+ OutputFile="$(SolutionDir)..\bin\grab.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName);$(HDF5_LIB_DIR)"
+ ProgramDatabaseFile="$(OutDir)\grab.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(OutDir)\grab.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="..\..\include;..\..\..\src\silo;$(HDF5_INC_DIR_X64)"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\grab.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib hdf5dll.lib"
+ OutputFile="$(SolutionDir)..\bin\grab.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName);$(HDF5_LIB_DIR_X64)"
+ ProgramDatabaseFile="$(OutDir)\grab.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <File
+ RelativePath="..\..\..\tests\grab.c"
+ >
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/SiloWindows/MSVC9/Tests/group_test.vcproj b/SiloWindows/MSVC9/Tests/group_test.vcproj
new file mode 100644
index 0000000..c968e72
--- /dev/null
+++ b/SiloWindows/MSVC9/Tests/group_test.vcproj
@@ -0,0 +1,399 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="group_test"
+ ProjectGUID="{69340E63-F15C-4A33-85B7-344666F8F25C}"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\group_test"
+ IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\group_test"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(OutDir)\group_test.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;_CONSOLE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\group_test.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\group_test"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="4"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\group_test.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)\group_test.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(OutDir)\group_test.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;_CONSOLE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\group_test.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\group_test"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\group_test.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)\group_test.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\group_test"
+ IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\group_test"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(OutDir)\group_test.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\group_test.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\group_test.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ ProgramDatabaseFile="$(OutDir)\group_test.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(OutDir)\group_test.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\group_test.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\group_test.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ ProgramDatabaseFile="$(OutDir)\group_test.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <File
+ RelativePath="..\..\..\tests\group_test.c"
+ >
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/SiloWindows/MSVC9/Tests/largefile.vcproj b/SiloWindows/MSVC9/Tests/largefile.vcproj
new file mode 100644
index 0000000..bdcf096
--- /dev/null
+++ b/SiloWindows/MSVC9/Tests/largefile.vcproj
@@ -0,0 +1,399 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="largefile"
+ ProjectGUID="{EA0DA3EC-DD78-4C57-A0A9-F0EEAE35A85A}"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\largefile"
+ IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\largefile"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(OutDir)\largefile.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;_CONSOLE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\largefile.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\largefile"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="4"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\largefile.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)\largefile.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(OutDir)\largefile.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;_CONSOLE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\largefile.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\largefile"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\largefile.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)\largefile.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\largefile"
+ IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\largefile"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(OutDir)\largefile.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\largefile.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\largefile.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ ProgramDatabaseFile="$(OutDir)\largefile.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(OutDir)\largefile.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\largefile.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\largefile.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ ProgramDatabaseFile="$(OutDir)\largefile.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <File
+ RelativePath="..\..\..\tests\largefile.c"
+ >
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/SiloWindows/MSVC9/Tests/listtypes.vcproj b/SiloWindows/MSVC9/Tests/listtypes.vcproj
new file mode 100644
index 0000000..aa25a08
--- /dev/null
+++ b/SiloWindows/MSVC9/Tests/listtypes.vcproj
@@ -0,0 +1,399 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="listtypes"
+ ProjectGUID="{A79DA077-0644-4DA7-8D8A-BB115597F474}"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\listtypes"
+ IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\listtypes"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(OutDir)\listtypes.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;_CONSOLE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\listtypes.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\listtypes"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="4"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\listtypes.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)\listtypes.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(OutDir)\listtypes.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;_CONSOLE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\listtypes.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\listtypes"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\listtypes.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)\listtypes.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\listtypes"
+ IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\listtypes"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(OutDir)\listtypes.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\listtypes.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\listtypes.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ ProgramDatabaseFile="$(OutDir)\listtypes.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(OutDir)\listtypes.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\listtypes.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\listtypes.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ ProgramDatabaseFile="$(OutDir)\listtypes.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <File
+ RelativePath="..\..\..\tests\listtypes.c"
+ >
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/SiloWindows/MSVC9/Tests/mat3d_3across.vcproj b/SiloWindows/MSVC9/Tests/mat3d_3across.vcproj
new file mode 100644
index 0000000..d3a0111
--- /dev/null
+++ b/SiloWindows/MSVC9/Tests/mat3d_3across.vcproj
@@ -0,0 +1,399 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="mat3d_3across"
+ ProjectGUID="{CEA025B3-7259-4852-980F-CB39E8206304}"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\mat3d_3across"
+ IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\mat3d_3across"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(OutDir)\mat3d_3across.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;_CONSOLE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\mat3d_3across.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\mat3d_3across"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="4"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\mat3d_3across.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)\mat3d_3across.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(OutDir)\mat3d_3across.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;_CONSOLE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\mat3d_3across.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\mat3d_3across"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\mat3d_3across.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)\mat3d_3across.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\mat3d_3across"
+ IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\mat3d_3across"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(OutDir)\mat3d_3across.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\mat3d_3across.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\mat3d_3across.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ ProgramDatabaseFile="$(OutDir)\mat3d_3across.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(OutDir)\mat3d_3across.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\mat3d_3across.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\mat3d_3across.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ ProgramDatabaseFile="$(OutDir)\mat3d_3across.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <File
+ RelativePath="..\..\..\tests\mat3d_3across.c"
+ >
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/SiloWindows/MSVC9/Tests/mat_f.vfproj b/SiloWindows/MSVC9/Tests/mat_f.vfproj
new file mode 100644
index 0000000..76ab0e5
--- /dev/null
+++ b/SiloWindows/MSVC9/Tests/mat_f.vfproj
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<VisualStudioProject ProjectCreator="Intel Fortran" Keyword="Console Application" Version="11.0" ProjectIdGuid="{A1F2E6F2-6E49-4746-9133-9DF0A404C7DB}">
+ <Platforms>
+ <Platform Name="Win32"/>
+ <Platform Name="x64"/></Platforms>
+ <Configurations>
+ <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\mat_f" IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\mat_f">
+ <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="..\..\..\src\silo" Interfaces="true" WarnInterfaces="true" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug"/>
+ <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)..\bin\$(ProjectName).exe" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)" ManifestFile="$(IntDir)\$(TargetFileName).intermediate.manifest" GenerateDebugInformation="true" ProgramDatabaseFile="$(IntDir)$(TargetName).pdb" SubSystem="subSystemConsole" ImportLibrary="$(IntDir)\$(TargetName).lib" TargetMachine="machineX86" AdditionalDep [...]
+ <Tool Name="VFResourceCompilerTool" ResourceOutputFileName="$(IntDir)\$(InputName).res"/>
+ <Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(IntDir)\$(ProjectName).tlb"/>
+ <Tool Name="VFCustomBuildTool"/>
+ <Tool Name="VFPreLinkEventTool"/>
+ <Tool Name="VFPreBuildEventTool"/>
+ <Tool Name="VFPostBuildEventTool"/>
+ <Tool Name="VFManifestTool" SuppressStartupBanner="true" OutputManifestFile="$(Intdir)\$(TargetFileName).embed.manifest" ResourceFile="$(IntDir)\$(TargetFileName).embed.manifest.res"/></Configuration>
+ <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\mat_f" IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\mat_f">
+ <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" AdditionalIncludeDirectories="..\..\..\src\silo" DiagnosticsFile="$(IntDir)$(TargetName).diag" ModulePath="$(IntDir)" ObjectFile="$(IntDir)"/>
+ <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)..\bin\$(ProjectName).exe" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)" ManifestFile="$(IntDir)\$(TargetFileName).intermediate.manifest" ProgramDatabaseFile="$(IntDir)$(TargetName).pdb" SubSystem="subSystemConsole" ImportLibrary="$(IntDir)\$(TargetName).lib" AdditionalDependencies="silohdf5.lib"/>
+ <Tool Name="VFResourceCompilerTool" ResourceOutputFileName="$(IntDir)\$(InputName).res"/>
+ <Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(IntDir)\$(ProjectName).tlb"/>
+ <Tool Name="VFCustomBuildTool"/>
+ <Tool Name="VFPreLinkEventTool"/>
+ <Tool Name="VFPreBuildEventTool"/>
+ <Tool Name="VFPostBuildEventTool"/>
+ <Tool Name="VFManifestTool" SuppressStartupBanner="true" OutputManifestFile="$(Intdir)\$(TargetFileName).embed.manifest" ResourceFile="$(IntDir)\$(TargetFileName).embed.manifest.res"/></Configuration>
+ <Configuration Name="Debug|x64">
+ <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="..\..\..\src\silo" Interfaces="true" WarnInterfaces="true" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug"/>
+ <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)..\bin\$(ProjectName).exe" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)" ManifestFile="$(IntDir)\$(TargetFileName).intermediate.manifest" GenerateDebugInformation="true" ProgramDatabaseFile="$(IntDir)$(TargetName).pdb" SubSystem="subSystemConsole" ImportLibrary="$(IntDir)\$(TargetName).lib" AdditionalDependencies="silohdf5.lib"/>
+ <Tool Name="VFResourceCompilerTool" ResourceOutputFileName="$(IntDir)\$(InputName).res"/>
+ <Tool Name="VFMidlTool" SuppressStartupBanner="true" TargetEnvironment="midlTargetAMD64" TypeLibraryName="$(IntDir)\$(ProjectName).tlb"/>
+ <Tool Name="VFCustomBuildTool"/>
+ <Tool Name="VFPreLinkEventTool"/>
+ <Tool Name="VFPreBuildEventTool"/>
+ <Tool Name="VFPostBuildEventTool"/>
+ <Tool Name="VFManifestTool" SuppressStartupBanner="true" OutputManifestFile="$(Intdir)\$(TargetFileName).embed.manifest" ResourceFile="$(IntDir)\$(TargetFileName).embed.manifest.res"/></Configuration>
+ <Configuration Name="Release|x64">
+ <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" AdditionalIncludeDirectories="..\..\..\src\silo" DiagnosticsFile="$(IntDir)$(TargetName).diag" ModulePath="$(IntDir)" ObjectFile="$(IntDir)"/>
+ <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)..\bin\$(ProjectName).exe" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)" ManifestFile="$(IntDir)\$(TargetFileName).intermediate.manifest" ProgramDatabaseFile="$(IntDir)$(TargetName).pdb" SubSystem="subSystemConsole" ImportLibrary="$(IntDir)\$(TargetName).lib" AdditionalDependencies="silohdf5.lib"/>
+ <Tool Name="VFResourceCompilerTool" ResourceOutputFileName="$(IntDir)\$(InputName).res"/>
+ <Tool Name="VFMidlTool" SuppressStartupBanner="true" TargetEnvironment="midlTargetAMD64" TypeLibraryName="$(IntDir)\$(ProjectName).tlb"/>
+ <Tool Name="VFCustomBuildTool"/>
+ <Tool Name="VFPreLinkEventTool"/>
+ <Tool Name="VFPreBuildEventTool"/>
+ <Tool Name="VFPostBuildEventTool"/>
+ <Tool Name="VFManifestTool" SuppressStartupBanner="true" OutputManifestFile="$(Intdir)\$(TargetFileName).embed.manifest" ResourceFile="$(IntDir)\$(TargetFileName).embed.manifest.res"/></Configuration></Configurations>
+ <Files>
+ <Filter Name="Header Files" Filter="fi;fd"/>
+ <Filter Name="Resource Files" Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"/>
+ <Filter Name="Source Files" Filter="f90;for;f;fpp;ftn;def;odl;idl">
+ <File RelativePath="..\..\..\tests\pointf77.f"/></Filter></Files>
+ <Globals/></VisualStudioProject>
diff --git a/SiloWindows/MSVC9/Tests/merge_block.vcproj b/SiloWindows/MSVC9/Tests/merge_block.vcproj
new file mode 100644
index 0000000..313e949
--- /dev/null
+++ b/SiloWindows/MSVC9/Tests/merge_block.vcproj
@@ -0,0 +1,399 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="merge_block"
+ ProjectGUID="{2B22FE6C-0C77-445A-8320-50EEF60EEF7D}"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\merge_block"
+ IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\merge_block"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(OutDir)\merge_block.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;_CONSOLE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\merge_block.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\merge_block"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="4"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\merge_block.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)\merge_block.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(OutDir)\merge_block.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;_CONSOLE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\merge_block.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\merge_block"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\merge_block.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)\merge_block.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\merge_block"
+ IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\merge_block"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(OutDir)\merge_block.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\merge_block.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\merge_block.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ ProgramDatabaseFile="$(OutDir)\merge_block.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(OutDir)\merge_block.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\merge_block.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\merge_block.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ ProgramDatabaseFile="$(OutDir)\merge_block.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <File
+ RelativePath="..\..\..\tests\merge_block.c"
+ >
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/SiloWindows/MSVC9/Tests/mmadjacency.vcproj b/SiloWindows/MSVC9/Tests/mmadjacency.vcproj
new file mode 100644
index 0000000..8f25d7f
--- /dev/null
+++ b/SiloWindows/MSVC9/Tests/mmadjacency.vcproj
@@ -0,0 +1,399 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="mmadjacency"
+ ProjectGUID="{809F6E22-2B80-4264-A220-7974EC9EDBBF}"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\mmadjacency"
+ IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\mmadjacency"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(OutDir)\mmadjacency.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;_CONSOLE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\mmadjacency.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\mmadjacency"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="4"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\mmadjacency.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)\mmadjacency.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(OutDir)\mmadjacency.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;_CONSOLE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\mmadjacency.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\mmadjacency"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\mmadjacency.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)\mmadjacency.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\mmadjacency"
+ IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\mmadjacency"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(OutDir)\mmadjacency.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\mmadjacency.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\mmadjacency.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ ProgramDatabaseFile="$(OutDir)\mmadjacency.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(OutDir)\mmadjacency.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\mmadjacency.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\mmadjacency.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ ProgramDatabaseFile="$(OutDir)\mmadjacency.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <File
+ RelativePath="..\..\..\tests\mmadjacency.c"
+ >
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/SiloWindows/MSVC9/Tests/multi_file.vcproj b/SiloWindows/MSVC9/Tests/multi_file.vcproj
new file mode 100644
index 0000000..e197e3c
--- /dev/null
+++ b/SiloWindows/MSVC9/Tests/multi_file.vcproj
@@ -0,0 +1,399 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="multi_file"
+ ProjectGUID="{8CC26B54-D539-4A0A-B461-26F074B790FD}"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\multi_file"
+ IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\multi_file"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(OutDir)\multi_file.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;_CONSOLE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\multi_file.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\multi_file"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="4"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\multi_file.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)\multi_file.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(OutDir)\multi_file.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;_CONSOLE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\multi_file.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\multi_file"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\multi_file.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)\multi_file.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\multi_file"
+ IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\multi_file"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(OutDir)\multi_file.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\multi_file.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\multi_file.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ ProgramDatabaseFile="$(OutDir)\multi_file.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(OutDir)\multi_file.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\multi_file.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\multi_file.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ ProgramDatabaseFile="$(OutDir)\multi_file.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <File
+ RelativePath="..\..\..\tests\multi_file.c"
+ >
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/SiloWindows/MSVC9/Tests/multi_test.vcproj b/SiloWindows/MSVC9/Tests/multi_test.vcproj
new file mode 100644
index 0000000..0de2c90
--- /dev/null
+++ b/SiloWindows/MSVC9/Tests/multi_test.vcproj
@@ -0,0 +1,399 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="multi_test"
+ ProjectGUID="{7535A535-FDEC-4448-AF9C-C031C9EA8459}"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\multi_test"
+ IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\multi_test"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(OutDir)\multi_test.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;_CONSOLE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\multi_test.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\multi_test"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="4"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\multi_test.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)\multi_test.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(OutDir)\multi_test.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;_CONSOLE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\multi_test.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\multi_test"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\multi_test.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)\multi_test.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\multi_test"
+ IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\multi_test"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(OutDir)\multi_test.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\multi_test.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\multi_test.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ ProgramDatabaseFile="$(OutDir)\multi_test.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(OutDir)\multi_test.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\multi_test.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\multi_test.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ ProgramDatabaseFile="$(OutDir)\multi_test.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <File
+ RelativePath="..\..\..\tests\multi_test.c"
+ >
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/SiloWindows/MSVC9/Tests/multispec.vcproj b/SiloWindows/MSVC9/Tests/multispec.vcproj
new file mode 100644
index 0000000..7d28b16
--- /dev/null
+++ b/SiloWindows/MSVC9/Tests/multispec.vcproj
@@ -0,0 +1,399 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="multispec"
+ ProjectGUID="{2D46EF91-58B2-43B5-ADD7-6908D6794578}"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\multispec"
+ IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\multispec"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(OutDir)\multispec.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;_CONSOLE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\multispec.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\multispec"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="4"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\multispec.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)\multispec.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(OutDir)\multispec.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;_CONSOLE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\multispec.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\multispec"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\multispec.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)\multispec.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\multispec"
+ IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\multispec"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(OutDir)\multispec.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\multispec.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\multispec.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ ProgramDatabaseFile="$(OutDir)\multispec.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(OutDir)\multispec.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\multispec.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\multispec.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ ProgramDatabaseFile="$(OutDir)\multispec.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <File
+ RelativePath="..\..\..\tests\multispec.c"
+ >
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/SiloWindows/MSVC9/Tests/namescheme.vcproj b/SiloWindows/MSVC9/Tests/namescheme.vcproj
new file mode 100644
index 0000000..4f34199
--- /dev/null
+++ b/SiloWindows/MSVC9/Tests/namescheme.vcproj
@@ -0,0 +1,399 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="namescheme"
+ ProjectGUID="{D839F6C1-3736-4269-A5E7-30B2BC1CBCCD}"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\namescheme"
+ IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\namescheme"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(OutDir)\namescheme.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;_CONSOLE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\namescheme.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\namescheme"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="4"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\namescheme.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)\namescheme.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(OutDir)\namescheme.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;_CONSOLE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\namescheme.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\namescheme"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\namescheme.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)\namescheme.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\namescheme"
+ IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\namescheme"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(OutDir)\namescheme.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\namescheme.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\namescheme.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ ProgramDatabaseFile="$(OutDir)\namescheme.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(OutDir)\namescheme.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\namescheme.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\namescheme.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ ProgramDatabaseFile="$(OutDir)\namescheme.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <File
+ RelativePath="..\..\..\tests\namescheme.c"
+ >
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/SiloWindows/MSVC9/Tests/obj.vcproj b/SiloWindows/MSVC9/Tests/obj.vcproj
new file mode 100644
index 0000000..2850562
--- /dev/null
+++ b/SiloWindows/MSVC9/Tests/obj.vcproj
@@ -0,0 +1,399 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="obj"
+ ProjectGUID="{AC0F21DF-ECA4-4B17-9829-59634B68B0D2}"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\obj"
+ IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\obj"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(OutDir)\obj.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;_CONSOLE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\obj.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\obj"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="4"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\obj.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)\obj.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(OutDir)\obj.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;_CONSOLE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\obj.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\obj"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\obj.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)\obj.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\obj"
+ IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\obj"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(OutDir)\obj.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\obj.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\obj.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ ProgramDatabaseFile="$(OutDir)\obj.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(OutDir)\obj.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\obj.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\obj.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ ProgramDatabaseFile="$(OutDir)\obj.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <File
+ RelativePath="..\..\..\tests\obj.c"
+ >
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/SiloWindows/MSVC9/Tests/onehex.vcproj b/SiloWindows/MSVC9/Tests/onehex.vcproj
new file mode 100644
index 0000000..efcedab
--- /dev/null
+++ b/SiloWindows/MSVC9/Tests/onehex.vcproj
@@ -0,0 +1,399 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="onehex"
+ ProjectGUID="{3863899B-7F9F-4823-9383-AE2205DCB054}"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\onehex"
+ IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\onehex"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(OutDir)\onehex.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;_CONSOLE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\onehex.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\onehex"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="4"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\onehex.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)\onehex.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(OutDir)\onehex.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;_CONSOLE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\onehex.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\onehex"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\onehex.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)\onehex.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\onehex"
+ IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\onehex"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(OutDir)\onehex.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\onehex.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\onehex.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ ProgramDatabaseFile="$(OutDir)\onehex.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(OutDir)\onehex.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\onehex.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\onehex.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ ProgramDatabaseFile="$(OutDir)\onehex.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <File
+ RelativePath="..\..\..\tests\onehex.c"
+ >
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/SiloWindows/MSVC9/Tests/oneprism.vcproj b/SiloWindows/MSVC9/Tests/oneprism.vcproj
new file mode 100644
index 0000000..0ce7201
--- /dev/null
+++ b/SiloWindows/MSVC9/Tests/oneprism.vcproj
@@ -0,0 +1,399 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="oneprism"
+ ProjectGUID="{4BCA7F35-0742-424F-8E50-39B934312F8F}"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\oneprism"
+ IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\oneprism"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(OutDir)\oneprism.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;_CONSOLE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\oneprism.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\oneprism"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="4"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\oneprism.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)\oneprism.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(OutDir)\oneprism.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;_CONSOLE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\oneprism.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\oneprism"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\oneprism.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)\oneprism.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\oneprism"
+ IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\oneprism"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(OutDir)\oneprism.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\oneprism.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\oneprism.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ ProgramDatabaseFile="$(OutDir)\oneprism.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(OutDir)\oneprism.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\oneprism.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\oneprism.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ ProgramDatabaseFile="$(OutDir)\oneprism.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <File
+ RelativePath="..\..\..\tests\oneprism.c"
+ >
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/SiloWindows/MSVC9/Tests/onepyramid.vcproj b/SiloWindows/MSVC9/Tests/onepyramid.vcproj
new file mode 100644
index 0000000..c18b31d
--- /dev/null
+++ b/SiloWindows/MSVC9/Tests/onepyramid.vcproj
@@ -0,0 +1,399 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="onepyramid"
+ ProjectGUID="{2AFC873D-E906-4145-A0CB-6264E8CAE97D}"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\onepyramid"
+ IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\onepyramid"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(OutDir)\onepyramid.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;_CONSOLE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\onepyramid.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\onepyramid"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="4"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\onepyramid.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)\onepyramid.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(OutDir)\onepyramid.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;_CONSOLE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\onepyramid.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\onepyramid"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\onepyramid.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)\onepyramid.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\onepyramid"
+ IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\onepyramid"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(OutDir)\onepyramid.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\onepyramid.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\onepyramid.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ ProgramDatabaseFile="$(OutDir)\onepyramid.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(OutDir)\onepyramid.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\onepyramid.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\onepyramid.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ ProgramDatabaseFile="$(OutDir)\onepyramid.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <File
+ RelativePath="..\..\..\tests\onepyramid.c"
+ >
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/SiloWindows/MSVC9/Tests/onetet.vcproj b/SiloWindows/MSVC9/Tests/onetet.vcproj
new file mode 100644
index 0000000..fa1b531
--- /dev/null
+++ b/SiloWindows/MSVC9/Tests/onetet.vcproj
@@ -0,0 +1,399 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="onetet"
+ ProjectGUID="{A76CCA62-BC5F-44F8-B090-9C45DA138680}"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\onetet"
+ IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\onetet"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(OutDir)\onetet.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;_CONSOLE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\onetet.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\onetet"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="4"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\onetet.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)\onetet.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(OutDir)\onetet.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;_CONSOLE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\onetet.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\onetet"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\onetet.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)\onetet.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\onetet"
+ IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\onetet"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(OutDir)\onetet.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\onetet.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\onetet.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ ProgramDatabaseFile="$(OutDir)\onetet.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(OutDir)\onetet.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\onetet.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\onetet.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ ProgramDatabaseFile="$(OutDir)\onetet.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <File
+ RelativePath="..\..\..\tests\onetet.c"
+ >
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/SiloWindows/MSVC9/Tests/partial_io.vcproj b/SiloWindows/MSVC9/Tests/partial_io.vcproj
new file mode 100644
index 0000000..b2eedc1
--- /dev/null
+++ b/SiloWindows/MSVC9/Tests/partial_io.vcproj
@@ -0,0 +1,399 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="partial_io"
+ ProjectGUID="{4F6A7EC6-F141-4512-B2A8-D108CBD6FAC1}"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\partial_io"
+ IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\partial_io"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(OutDir)\partial_io.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;_CONSOLE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\partial_io.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\partial_io"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="4"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\partial_io.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)\partial_io.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(OutDir)\partial_io.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;_CONSOLE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\partial_io.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\partial_io"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\partial_io.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)\partial_io.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\partial_io"
+ IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\partial_io"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(OutDir)\partial_io.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\partial_io.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\partial_io.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ ProgramDatabaseFile="$(OutDir)\partial_io.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(OutDir)\partial_io.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\partial_io.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\partial_io.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ ProgramDatabaseFile="$(OutDir)\partial_io.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <File
+ RelativePath="..\..\..\tests\partial_io.c"
+ >
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/SiloWindows/MSVC9/Tests/point.vcproj b/SiloWindows/MSVC9/Tests/point.vcproj
new file mode 100644
index 0000000..47fea10
--- /dev/null
+++ b/SiloWindows/MSVC9/Tests/point.vcproj
@@ -0,0 +1,399 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="point"
+ ProjectGUID="{025CFEA1-6C43-404D-9DA4-5392A17FA162}"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\point"
+ IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\point"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(OutDir)\point.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;_CONSOLE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\point.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\point"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="4"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\point.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)\point.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(OutDir)\point.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;_CONSOLE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\point.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\point"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\point.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)\point.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\point"
+ IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\point"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(OutDir)\point.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\point.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\point.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ ProgramDatabaseFile="$(OutDir)\point.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(OutDir)\point.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\point.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\point.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ ProgramDatabaseFile="$(OutDir)\point.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <File
+ RelativePath="..\..\..\tests\point.c"
+ >
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/SiloWindows/MSVC9/Tests/point_f.vfproj b/SiloWindows/MSVC9/Tests/point_f.vfproj
new file mode 100644
index 0000000..fe1e70b
--- /dev/null
+++ b/SiloWindows/MSVC9/Tests/point_f.vfproj
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<VisualStudioProject ProjectCreator="Intel Fortran" Keyword="Console Application" Version="11.0" ProjectIdGuid="{A1F2E6F2-6E49-4746-9133-9DF0A404C7DB}">
+ <Platforms>
+ <Platform Name="Win32"/>
+ <Platform Name="x64"/></Platforms>
+ <Configurations>
+ <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\point_f" IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\point_f">
+ <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="..\..\..\src\silo" Interfaces="true" WarnInterfaces="true" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug"/>
+ <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)..\bin\$(ProjectName).exe" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)" ManifestFile="$(IntDir)\$(TargetFileName).intermediate.manifest" GenerateDebugInformation="true" ProgramDatabaseFile="$(IntDir)$(TargetName).pdb" SubSystem="subSystemConsole" ImportLibrary="$(IntDir)\$(TargetName).lib" TargetMachine="machineX86" AdditionalDep [...]
+ <Tool Name="VFResourceCompilerTool" ResourceOutputFileName="$(IntDir)\$(InputName).res"/>
+ <Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(IntDir)\$(ProjectName).tlb"/>
+ <Tool Name="VFCustomBuildTool"/>
+ <Tool Name="VFPreLinkEventTool"/>
+ <Tool Name="VFPreBuildEventTool"/>
+ <Tool Name="VFPostBuildEventTool"/>
+ <Tool Name="VFManifestTool" SuppressStartupBanner="true" OutputManifestFile="$(Intdir)\$(TargetFileName).embed.manifest" ResourceFile="$(IntDir)\$(TargetFileName).embed.manifest.res"/></Configuration>
+ <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\point_f" IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\point_f">
+ <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" AdditionalIncludeDirectories="..\..\..\src\silo" DiagnosticsFile="$(IntDir)$(TargetName).diag" ModulePath="$(IntDir)" ObjectFile="$(IntDir)"/>
+ <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)..\bin\$(ProjectName).exe" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)" ManifestFile="$(IntDir)\$(TargetFileName).intermediate.manifest" ProgramDatabaseFile="$(IntDir)$(TargetName).pdb" SubSystem="subSystemConsole" ImportLibrary="$(IntDir)\$(TargetName).lib" AdditionalDependencies="silohdf5.lib"/>
+ <Tool Name="VFResourceCompilerTool" ResourceOutputFileName="$(IntDir)\$(InputName).res"/>
+ <Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(IntDir)\$(ProjectName).tlb"/>
+ <Tool Name="VFCustomBuildTool"/>
+ <Tool Name="VFPreLinkEventTool"/>
+ <Tool Name="VFPreBuildEventTool"/>
+ <Tool Name="VFPostBuildEventTool"/>
+ <Tool Name="VFManifestTool" SuppressStartupBanner="true" OutputManifestFile="$(Intdir)\$(TargetFileName).embed.manifest" ResourceFile="$(IntDir)\$(TargetFileName).embed.manifest.res"/></Configuration>
+ <Configuration Name="Debug|x64">
+ <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="..\..\..\src\silo" Interfaces="true" WarnInterfaces="true" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug"/>
+ <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)..\bin\$(ProjectName).exe" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)" ManifestFile="$(IntDir)\$(TargetFileName).intermediate.manifest" GenerateDebugInformation="true" ProgramDatabaseFile="$(IntDir)$(TargetName).pdb" SubSystem="subSystemConsole" ImportLibrary="$(IntDir)\$(TargetName).lib" AdditionalDependencies="silohdf5.lib"/>
+ <Tool Name="VFResourceCompilerTool" ResourceOutputFileName="$(IntDir)\$(InputName).res"/>
+ <Tool Name="VFMidlTool" SuppressStartupBanner="true" TargetEnvironment="midlTargetAMD64" TypeLibraryName="$(IntDir)\$(ProjectName).tlb"/>
+ <Tool Name="VFCustomBuildTool"/>
+ <Tool Name="VFPreLinkEventTool"/>
+ <Tool Name="VFPreBuildEventTool"/>
+ <Tool Name="VFPostBuildEventTool"/>
+ <Tool Name="VFManifestTool" SuppressStartupBanner="true" OutputManifestFile="$(Intdir)\$(TargetFileName).embed.manifest" ResourceFile="$(IntDir)\$(TargetFileName).embed.manifest.res"/></Configuration>
+ <Configuration Name="Release|x64">
+ <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" AdditionalIncludeDirectories="..\..\..\src\silo" DiagnosticsFile="$(IntDir)$(TargetName).diag" ModulePath="$(IntDir)" ObjectFile="$(IntDir)"/>
+ <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)..\bin\$(ProjectName).exe" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)" ManifestFile="$(IntDir)\$(TargetFileName).intermediate.manifest" ProgramDatabaseFile="$(IntDir)$(TargetName).pdb" SubSystem="subSystemConsole" ImportLibrary="$(IntDir)\$(TargetName).lib" AdditionalDependencies="silohdf5.lib"/>
+ <Tool Name="VFResourceCompilerTool" ResourceOutputFileName="$(IntDir)\$(InputName).res"/>
+ <Tool Name="VFMidlTool" SuppressStartupBanner="true" TargetEnvironment="midlTargetAMD64" TypeLibraryName="$(IntDir)\$(ProjectName).tlb"/>
+ <Tool Name="VFCustomBuildTool"/>
+ <Tool Name="VFPreLinkEventTool"/>
+ <Tool Name="VFPreBuildEventTool"/>
+ <Tool Name="VFPostBuildEventTool"/>
+ <Tool Name="VFManifestTool" SuppressStartupBanner="true" OutputManifestFile="$(Intdir)\$(TargetFileName).embed.manifest" ResourceFile="$(IntDir)\$(TargetFileName).embed.manifest.res"/></Configuration></Configurations>
+ <Files>
+ <Filter Name="Header Files" Filter="fi;fd"/>
+ <Filter Name="Resource Files" Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"/>
+ <Filter Name="Source Files" Filter="f90;for;f;fpp;ftn;def;odl;idl">
+ <File RelativePath="..\..\..\tests\pointf77.f"/></Filter></Files>
+ <Globals/></VisualStudioProject>
diff --git a/SiloWindows/MSVC9/Tests/polyzl.vcproj b/SiloWindows/MSVC9/Tests/polyzl.vcproj
new file mode 100644
index 0000000..314e59e
--- /dev/null
+++ b/SiloWindows/MSVC9/Tests/polyzl.vcproj
@@ -0,0 +1,399 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="polyzl"
+ ProjectGUID="{8C6BC636-FF71-4D58-9D63-E12265523982}"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\polyzl"
+ IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\polyzl"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(OutDir)\polyzl.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;_CONSOLE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\polyzl.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\polyzl"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="4"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\polyzl.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)\polyzl.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(OutDir)\polyzl.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;_CONSOLE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\polyzl.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\polyzl"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\polyzl.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)\polyzl.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\polyzl"
+ IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\polyzl"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(OutDir)\polyzl.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\polyzl.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\polyzl.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ ProgramDatabaseFile="$(OutDir)\polyzl.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(OutDir)\polyzl.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\polyzl.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\polyzl.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ ProgramDatabaseFile="$(OutDir)\polyzl.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <File
+ RelativePath="..\..\..\tests\polyzl.c"
+ >
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/SiloWindows/MSVC9/Tests/quad.vcproj b/SiloWindows/MSVC9/Tests/quad.vcproj
new file mode 100644
index 0000000..a213e00
--- /dev/null
+++ b/SiloWindows/MSVC9/Tests/quad.vcproj
@@ -0,0 +1,403 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="quad"
+ ProjectGUID="{4D5EA26A-8356-4665-A13D-51CCEE2BA7F4}"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\quad"
+ IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\quad"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(OutDir)\quad.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;_CONSOLE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\quad.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\quad"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="4"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\quad.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)\quad.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(OutDir)\quad.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;_CONSOLE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\quad.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\quad"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\quad.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)\quad.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\quad"
+ IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\quad"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(OutDir)\quad.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\quad.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\quad.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ ProgramDatabaseFile="$(OutDir)\quad.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(OutDir)\quad.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\quad.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\quad.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ ProgramDatabaseFile="$(OutDir)\quad.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <File
+ RelativePath="..\..\..\tests\quad.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\tests\testlib.c"
+ >
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/SiloWindows/MSVC9/Tests/quad_f.vfproj b/SiloWindows/MSVC9/Tests/quad_f.vfproj
new file mode 100644
index 0000000..72e2127
--- /dev/null
+++ b/SiloWindows/MSVC9/Tests/quad_f.vfproj
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<VisualStudioProject ProjectCreator="Intel Fortran" Keyword="Console Application" Version="11.0" ProjectIdGuid="{A1F2E6F2-6E49-4746-9133-9DF0A404C7DB}">
+ <Platforms>
+ <Platform Name="Win32"/>
+ <Platform Name="x64"/></Platforms>
+ <Configurations>
+ <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\quad_f" IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\quad_f">
+ <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="..\..\..\src\silo" Interfaces="true" WarnInterfaces="true" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug"/>
+ <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)..\bin\$(ProjectName).exe" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)" ManifestFile="$(IntDir)\$(TargetFileName).intermediate.manifest" GenerateDebugInformation="true" ProgramDatabaseFile="$(IntDir)$(TargetName).pdb" SubSystem="subSystemConsole" ImportLibrary="$(IntDir)\$(TargetName).lib" TargetMachine="machineX86" AdditionalDep [...]
+ <Tool Name="VFResourceCompilerTool" ResourceOutputFileName="$(IntDir)\$(InputName).res"/>
+ <Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(IntDir)\$(ProjectName).tlb"/>
+ <Tool Name="VFCustomBuildTool"/>
+ <Tool Name="VFPreLinkEventTool"/>
+ <Tool Name="VFPreBuildEventTool"/>
+ <Tool Name="VFPostBuildEventTool"/>
+ <Tool Name="VFManifestTool" SuppressStartupBanner="true" OutputManifestFile="$(Intdir)\$(TargetFileName).embed.manifest" ResourceFile="$(IntDir)\$(TargetFileName).embed.manifest.res"/></Configuration>
+ <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\quad_f" IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\quad_f">
+ <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" AdditionalIncludeDirectories="..\..\..\src\silo" DiagnosticsFile="$(IntDir)$(TargetName).diag" ModulePath="$(IntDir)" ObjectFile="$(IntDir)"/>
+ <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)..\bin\$(ProjectName).exe" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)" ManifestFile="$(IntDir)\$(TargetFileName).intermediate.manifest" ProgramDatabaseFile="$(IntDir)$(TargetName).pdb" SubSystem="subSystemConsole" ImportLibrary="$(IntDir)\$(TargetName).lib" AdditionalDependencies="silohdf5.lib"/>
+ <Tool Name="VFResourceCompilerTool" ResourceOutputFileName="$(IntDir)\$(InputName).res"/>
+ <Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(IntDir)\$(ProjectName).tlb"/>
+ <Tool Name="VFCustomBuildTool"/>
+ <Tool Name="VFPreLinkEventTool"/>
+ <Tool Name="VFPreBuildEventTool"/>
+ <Tool Name="VFPostBuildEventTool"/>
+ <Tool Name="VFManifestTool" SuppressStartupBanner="true" OutputManifestFile="$(Intdir)\$(TargetFileName).embed.manifest" ResourceFile="$(IntDir)\$(TargetFileName).embed.manifest.res"/></Configuration>
+ <Configuration Name="Debug|x64">
+ <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="..\..\..\src\silo" Interfaces="true" WarnInterfaces="true" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug"/>
+ <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)..\bin\$(ProjectName).exe" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)" ManifestFile="$(IntDir)\$(TargetFileName).intermediate.manifest" GenerateDebugInformation="true" ProgramDatabaseFile="$(IntDir)$(TargetName).pdb" SubSystem="subSystemConsole" ImportLibrary="$(IntDir)\$(TargetName).lib" AdditionalDependencies="silohdf5.lib"/>
+ <Tool Name="VFResourceCompilerTool" ResourceOutputFileName="$(IntDir)\$(InputName).res"/>
+ <Tool Name="VFMidlTool" SuppressStartupBanner="true" TargetEnvironment="midlTargetAMD64" TypeLibraryName="$(IntDir)\$(ProjectName).tlb"/>
+ <Tool Name="VFCustomBuildTool"/>
+ <Tool Name="VFPreLinkEventTool"/>
+ <Tool Name="VFPreBuildEventTool"/>
+ <Tool Name="VFPostBuildEventTool"/>
+ <Tool Name="VFManifestTool" SuppressStartupBanner="true" OutputManifestFile="$(Intdir)\$(TargetFileName).embed.manifest" ResourceFile="$(IntDir)\$(TargetFileName).embed.manifest.res"/></Configuration>
+ <Configuration Name="Release|x64">
+ <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" AdditionalIncludeDirectories="..\..\..\src\silo" DiagnosticsFile="$(IntDir)$(TargetName).diag" ModulePath="$(IntDir)" ObjectFile="$(IntDir)"/>
+ <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)..\bin\$(ProjectName).exe" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)" ManifestFile="$(IntDir)\$(TargetFileName).intermediate.manifest" ProgramDatabaseFile="$(IntDir)$(TargetName).pdb" SubSystem="subSystemConsole" ImportLibrary="$(IntDir)\$(TargetName).lib" AdditionalDependencies="silohdf5.lib"/>
+ <Tool Name="VFResourceCompilerTool" ResourceOutputFileName="$(IntDir)\$(InputName).res"/>
+ <Tool Name="VFMidlTool" SuppressStartupBanner="true" TargetEnvironment="midlTargetAMD64" TypeLibraryName="$(IntDir)\$(ProjectName).tlb"/>
+ <Tool Name="VFCustomBuildTool"/>
+ <Tool Name="VFPreLinkEventTool"/>
+ <Tool Name="VFPreBuildEventTool"/>
+ <Tool Name="VFPostBuildEventTool"/>
+ <Tool Name="VFManifestTool" SuppressStartupBanner="true" OutputManifestFile="$(Intdir)\$(TargetFileName).embed.manifest" ResourceFile="$(IntDir)\$(TargetFileName).embed.manifest.res"/></Configuration></Configurations>
+ <Files>
+ <Filter Name="Header Files" Filter="fi;fd"/>
+ <Filter Name="Resource Files" Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"/>
+ <Filter Name="Source Files" Filter="f90;for;f;fpp;ftn;def;odl;idl">
+ <File RelativePath="..\..\..\tests\quadf77.f"/></Filter></Files>
+ <Globals/></VisualStudioProject>
diff --git a/SiloWindows/MSVC9/Tests/sami.vcproj b/SiloWindows/MSVC9/Tests/sami.vcproj
new file mode 100644
index 0000000..5305da3
--- /dev/null
+++ b/SiloWindows/MSVC9/Tests/sami.vcproj
@@ -0,0 +1,399 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="sami"
+ ProjectGUID="{B3C7F964-68B8-4F8C-B5E7-7607836FB101}"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\sami"
+ IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\sami"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(OutDir)\sami.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\include\WithHDF5;..\..\..\src\silo;$(HDF5_INC_DIR)"
+ PreprocessorDefinitions="WIN32;_CONSOLE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\sami.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\sami"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="4"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib hdf5dll.lib"
+ OutputFile="$(SolutionDir)..\bin\sami.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName);$(HDF5_LIB_DIR)"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)\sami.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(OutDir)\sami.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\include\WithHDF5;..\..\..\src\silo;$(HDF5_INC_DIR_X64)"
+ PreprocessorDefinitions="WIN32;_CONSOLE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\sami.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\sami"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib hdf5dll.lib"
+ OutputFile="$(SolutionDir)..\bin\sami.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName);$(HDF5_LIB_DIR_X64)"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)\sami.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\sami"
+ IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\sami"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(OutDir)\sami.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="..\..\include\WithHDF5;..\..\..\src\silo;$(HDF5_INC_DIR)"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\sami.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib hdf5dll.lib"
+ OutputFile="$(SolutionDir)..\bin\sami.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName);$(HDF5_LIB_DIR)"
+ ProgramDatabaseFile="$(OutDir)\sami.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(OutDir)\sami.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="..\..\include\WithHDF5;..\..\..\src\silo;$(HDF5_INC_DIR_X64)"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\sami.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib hdf5dll.lib"
+ OutputFile="$(SolutionDir)..\bin\sami.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName);$(HDF5_LIB_DIR_X64)"
+ ProgramDatabaseFile="$(OutDir)\sami.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <File
+ RelativePath="..\..\..\tests\sami.c"
+ >
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/SiloWindows/MSVC9/Tests/simple.vcproj b/SiloWindows/MSVC9/Tests/simple.vcproj
new file mode 100644
index 0000000..8eae385
--- /dev/null
+++ b/SiloWindows/MSVC9/Tests/simple.vcproj
@@ -0,0 +1,399 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="simple"
+ ProjectGUID="{7AB46C61-04D5-4E77-AD3F-E7726F3E173A}"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\simple"
+ IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\simple"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(OutDir)\simple.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;_CONSOLE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\simple.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\simple"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="4"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\simple.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)\simple.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(OutDir)\simple.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;_CONSOLE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\simple.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\simple"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\simple.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)\simple.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\simple"
+ IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\simple"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(OutDir)\simple.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\simple.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\simple.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ ProgramDatabaseFile="$(OutDir)\simple.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(OutDir)\simple.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\simple.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\simple.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ ProgramDatabaseFile="$(OutDir)\simple.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <File
+ RelativePath="..\..\..\tests\simple.c"
+ >
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/SiloWindows/MSVC9/Tests/spec.vcproj b/SiloWindows/MSVC9/Tests/spec.vcproj
new file mode 100644
index 0000000..89920af
--- /dev/null
+++ b/SiloWindows/MSVC9/Tests/spec.vcproj
@@ -0,0 +1,399 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="spec"
+ ProjectGUID="{7A5F618C-F98A-4F8E-BBC7-C4F5C6BCD5A4}"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\spec"
+ IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\spec"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(OutDir)\spec.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;_CONSOLE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\spec.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\spec"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="4"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\spec.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)\spec.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(OutDir)\spec.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;_CONSOLE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\spec.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\spec"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\spec.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)\spec.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\spec"
+ IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\spec"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(OutDir)\spec.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\spec.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\spec.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ ProgramDatabaseFile="$(OutDir)\spec.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(OutDir)\spec.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\spec.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\spec.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ ProgramDatabaseFile="$(OutDir)\spec.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <File
+ RelativePath="..\..\..\tests\spec.c"
+ >
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/SiloWindows/MSVC9/Tests/specmix.vcproj b/SiloWindows/MSVC9/Tests/specmix.vcproj
new file mode 100644
index 0000000..beca14a
--- /dev/null
+++ b/SiloWindows/MSVC9/Tests/specmix.vcproj
@@ -0,0 +1,399 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="specmix"
+ ProjectGUID="{27C64509-94EB-406D-9978-93AE531CEB1E}"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\specmix"
+ IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\specmix"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(OutDir)\specmix.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;_CONSOLE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\specmix.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\specmix"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="4"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\specmix.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)\specmix.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(OutDir)\specmix.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;_CONSOLE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\specmix.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\specmix"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\specmix.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)\specmix.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\specmix"
+ IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\specmix"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(OutDir)\specmix.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\specmix.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\specmix.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ ProgramDatabaseFile="$(OutDir)\specmix.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(OutDir)\specmix.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\specmix.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\specmix.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ ProgramDatabaseFile="$(OutDir)\specmix.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <File
+ RelativePath="..\..\..\tests\specmix.c"
+ >
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/SiloWindows/MSVC9/Tests/subhex.vcproj b/SiloWindows/MSVC9/Tests/subhex.vcproj
new file mode 100644
index 0000000..ed64251
--- /dev/null
+++ b/SiloWindows/MSVC9/Tests/subhex.vcproj
@@ -0,0 +1,399 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="subhex"
+ ProjectGUID="{8C02951E-155B-4D09-A1DD-F98695F02A0E}"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\subhex"
+ IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\subhex"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(OutDir)\subhex.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;_CONSOLE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\subhex.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\subhex"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="4"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\subhex.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)\subhex.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(OutDir)\subhex.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;_CONSOLE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\subhex.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\subhex"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\subhex.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)\subhex.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\subhex"
+ IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\subhex"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(OutDir)\subhex.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\subhex.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\subhex.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ ProgramDatabaseFile="$(OutDir)\subhex.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(OutDir)\subhex.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\subhex.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\subhex.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ ProgramDatabaseFile="$(OutDir)\subhex.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <File
+ RelativePath="..\..\..\tests\subhex.c"
+ >
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/SiloWindows/MSVC9/Tests/testall.vcproj b/SiloWindows/MSVC9/Tests/testall.vcproj
new file mode 100644
index 0000000..852d99d
--- /dev/null
+++ b/SiloWindows/MSVC9/Tests/testall.vcproj
@@ -0,0 +1,399 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="testall"
+ ProjectGUID="{E4105EA9-2AB2-4656-B966-01F16961A14B}"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\testall"
+ IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\testall"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(OutDir)\testall.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;_CONSOLE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\testall.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\testall"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="4"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\testall.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)\testall.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(OutDir)\testall.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;_CONSOLE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\testall.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\testall"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\testall.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)\testall.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\testall"
+ IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\testall"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(OutDir)\testall.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\testall.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\testall.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ ProgramDatabaseFile="$(OutDir)\testall.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(OutDir)\testall.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\testall.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\testall.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ ProgramDatabaseFile="$(OutDir)\testall.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <File
+ RelativePath="..\..\..\tests\testall.c"
+ >
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/SiloWindows/MSVC9/Tests/testall_f.vfproj b/SiloWindows/MSVC9/Tests/testall_f.vfproj
new file mode 100644
index 0000000..77e3a69
--- /dev/null
+++ b/SiloWindows/MSVC9/Tests/testall_f.vfproj
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<VisualStudioProject ProjectCreator="Intel Fortran" Keyword="Console Application" Version="11.0" ProjectIdGuid="{A1F2E6F2-6E49-4746-9133-9DF0A404C7DB}">
+ <Platforms>
+ <Platform Name="Win32"/>
+ <Platform Name="x64"/></Platforms>
+ <Configurations>
+ <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\testall_f" IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\testall_f">
+ <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="..\..\..\src\silo" Interfaces="true" WarnInterfaces="true" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug"/>
+ <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)..\bin\$(ProjectName).exe" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)" ManifestFile="$(IntDir)\$(TargetFileName).intermediate.manifest" GenerateDebugInformation="true" ProgramDatabaseFile="$(IntDir)$(TargetName).pdb" SubSystem="subSystemConsole" ImportLibrary="$(IntDir)\$(TargetName).lib" TargetMachine="machineX86" AdditionalDep [...]
+ <Tool Name="VFResourceCompilerTool" ResourceOutputFileName="$(IntDir)\$(InputName).res"/>
+ <Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(IntDir)\$(ProjectName).tlb"/>
+ <Tool Name="VFCustomBuildTool"/>
+ <Tool Name="VFPreLinkEventTool"/>
+ <Tool Name="VFPreBuildEventTool"/>
+ <Tool Name="VFPostBuildEventTool"/>
+ <Tool Name="VFManifestTool" SuppressStartupBanner="true" OutputManifestFile="$(Intdir)\$(TargetFileName).embed.manifest" ResourceFile="$(IntDir)\$(TargetFileName).embed.manifest.res"/></Configuration>
+ <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\testall_f" IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\testall_f">
+ <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" AdditionalIncludeDirectories="..\..\..\src\silo" DiagnosticsFile="$(IntDir)$(TargetName).diag" ModulePath="$(IntDir)" ObjectFile="$(IntDir)"/>
+ <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)..\bin\$(ProjectName).exe" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)" ManifestFile="$(IntDir)\$(TargetFileName).intermediate.manifest" ProgramDatabaseFile="$(IntDir)$(TargetName).pdb" SubSystem="subSystemConsole" ImportLibrary="$(IntDir)\$(TargetName).lib" AdditionalDependencies="silohdf5.lib"/>
+ <Tool Name="VFResourceCompilerTool" ResourceOutputFileName="$(IntDir)\$(InputName).res"/>
+ <Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(IntDir)\$(ProjectName).tlb"/>
+ <Tool Name="VFCustomBuildTool"/>
+ <Tool Name="VFPreLinkEventTool"/>
+ <Tool Name="VFPreBuildEventTool"/>
+ <Tool Name="VFPostBuildEventTool"/>
+ <Tool Name="VFManifestTool" SuppressStartupBanner="true" OutputManifestFile="$(Intdir)\$(TargetFileName).embed.manifest" ResourceFile="$(IntDir)\$(TargetFileName).embed.manifest.res"/></Configuration>
+ <Configuration Name="Debug|x64">
+ <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="..\..\..\src\silo" Interfaces="true" WarnInterfaces="true" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug"/>
+ <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)..\bin\$(ProjectName).exe" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)" ManifestFile="$(IntDir)\$(TargetFileName).intermediate.manifest" GenerateDebugInformation="true" ProgramDatabaseFile="$(IntDir)$(TargetName).pdb" SubSystem="subSystemConsole" ImportLibrary="$(IntDir)\$(TargetName).lib" AdditionalDependencies="silohdf5.lib"/>
+ <Tool Name="VFResourceCompilerTool" ResourceOutputFileName="$(IntDir)\$(InputName).res"/>
+ <Tool Name="VFMidlTool" SuppressStartupBanner="true" TargetEnvironment="midlTargetAMD64" TypeLibraryName="$(IntDir)\$(ProjectName).tlb"/>
+ <Tool Name="VFCustomBuildTool"/>
+ <Tool Name="VFPreLinkEventTool"/>
+ <Tool Name="VFPreBuildEventTool"/>
+ <Tool Name="VFPostBuildEventTool"/>
+ <Tool Name="VFManifestTool" SuppressStartupBanner="true" OutputManifestFile="$(Intdir)\$(TargetFileName).embed.manifest" ResourceFile="$(IntDir)\$(TargetFileName).embed.manifest.res"/></Configuration>
+ <Configuration Name="Release|x64">
+ <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" AdditionalIncludeDirectories="..\..\..\src\silo" DiagnosticsFile="$(IntDir)$(TargetName).diag" ModulePath="$(IntDir)" ObjectFile="$(IntDir)"/>
+ <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)..\bin\$(ProjectName).exe" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)" ManifestFile="$(IntDir)\$(TargetFileName).intermediate.manifest" ProgramDatabaseFile="$(IntDir)$(TargetName).pdb" SubSystem="subSystemConsole" ImportLibrary="$(IntDir)\$(TargetName).lib" AdditionalDependencies="silohdf5.lib"/>
+ <Tool Name="VFResourceCompilerTool" ResourceOutputFileName="$(IntDir)\$(InputName).res"/>
+ <Tool Name="VFMidlTool" SuppressStartupBanner="true" TargetEnvironment="midlTargetAMD64" TypeLibraryName="$(IntDir)\$(ProjectName).tlb"/>
+ <Tool Name="VFCustomBuildTool"/>
+ <Tool Name="VFPreLinkEventTool"/>
+ <Tool Name="VFPreBuildEventTool"/>
+ <Tool Name="VFPostBuildEventTool"/>
+ <Tool Name="VFManifestTool" SuppressStartupBanner="true" OutputManifestFile="$(Intdir)\$(TargetFileName).embed.manifest" ResourceFile="$(IntDir)\$(TargetFileName).embed.manifest.res"/></Configuration></Configurations>
+ <Files>
+ <Filter Name="Header Files" Filter="fi;fd"/>
+ <Filter Name="Resource Files" Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"/>
+ <Filter Name="Source Files" Filter="f90;for;f;fpp;ftn;def;odl;idl">
+ <File RelativePath="..\..\..\tests\testallf77.f"/></Filter></Files>
+ <Globals/></VisualStudioProject>
diff --git a/SiloWindows/MSVC9/Tests/testpdb.vcproj b/SiloWindows/MSVC9/Tests/testpdb.vcproj
new file mode 100644
index 0000000..91eeb25
--- /dev/null
+++ b/SiloWindows/MSVC9/Tests/testpdb.vcproj
@@ -0,0 +1,399 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="testpdb"
+ ProjectGUID="{29110B58-9FD5-4A8E-B9F7-064650EE16C6}"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\testpdb"
+ IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\testpdb"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(OutDir)\testpdb.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\src\silo;..\..\..\src\score;..\..\..\src\pdb"
+ PreprocessorDefinitions="WIN32;_CONSOLE;PDB_LITE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\testpdb.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\testpdb"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="4"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\testpdb.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)\testpdb.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(OutDir)\testpdb.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\src\silo;..\..\..\src\score;..\..\..\src\pdb"
+ PreprocessorDefinitions="WIN32;_CONSOLE;PDB_LITE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\testpdb.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\testpdb"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\testpdb.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)\testpdb.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\testpdb"
+ IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\testpdb"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(OutDir)\testpdb.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="..\..\..\src\silo;..\..\..\src\score;..\..\..\src\pdb"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;PDB_LITE"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\testpdb.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\testpdb.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ ProgramDatabaseFile="$(OutDir)\testpdb.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(OutDir)\testpdb.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="..\..\..\src\silo;..\..\..\src\score;..\..\..\src\pdb"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;PDB_LITE"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\testpdb.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\testpdb.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ ProgramDatabaseFile="$(OutDir)\testpdb.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <File
+ RelativePath="..\..\..\tests\testpdb.c"
+ >
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/SiloWindows/MSVC9/Tests/twohex.vcproj b/SiloWindows/MSVC9/Tests/twohex.vcproj
new file mode 100644
index 0000000..e8a1ea5
--- /dev/null
+++ b/SiloWindows/MSVC9/Tests/twohex.vcproj
@@ -0,0 +1,399 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="twohex"
+ ProjectGUID="{64A6CE79-710F-405C-AAE8-F604E74A4374}"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\twohex"
+ IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\twohex"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(OutDir)\twohex.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;_CONSOLE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\twohex.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\twohex"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="4"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\twohex.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)\twohex.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(OutDir)\twohex.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;_CONSOLE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\twohex.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\twohex"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\twohex.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)\twohex.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\twohex"
+ IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\twohex"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(OutDir)\twohex.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\twohex.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\twohex.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ ProgramDatabaseFile="$(OutDir)\twohex.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(OutDir)\twohex.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\twohex.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\twohex.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ ProgramDatabaseFile="$(OutDir)\twohex.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <File
+ RelativePath="..\..\..\tests\twohex.c"
+ >
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/SiloWindows/MSVC9/Tests/ucd.vcproj b/SiloWindows/MSVC9/Tests/ucd.vcproj
new file mode 100644
index 0000000..969fe2f
--- /dev/null
+++ b/SiloWindows/MSVC9/Tests/ucd.vcproj
@@ -0,0 +1,399 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="ucd"
+ ProjectGUID="{9B955616-D58C-4ED8-AB6F-FBA74E768B54}"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\ucd"
+ IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\ucd"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(OutDir)\ucd.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;_CONSOLE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\ucd.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\ucd"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="4"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\ucd.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)\ucd.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(OutDir)\ucd.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;_CONSOLE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\ucd.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\ucd"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\ucd.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)\ucd.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\ucd"
+ IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\ucd"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(OutDir)\ucd.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\ucd.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\ucd.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ ProgramDatabaseFile="$(OutDir)\ucd.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(OutDir)\ucd.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\ucd.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\ucd.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ ProgramDatabaseFile="$(OutDir)\ucd.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <File
+ RelativePath="..\..\..\tests\ucd.c"
+ >
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/SiloWindows/MSVC9/Tests/ucd1d.vcproj b/SiloWindows/MSVC9/Tests/ucd1d.vcproj
new file mode 100644
index 0000000..4f82d5f
--- /dev/null
+++ b/SiloWindows/MSVC9/Tests/ucd1d.vcproj
@@ -0,0 +1,399 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="ucd1d"
+ ProjectGUID="{C065DCD0-DE87-4B6E-A1E6-8F7EDB272D53}"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\ucd1d"
+ IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\ucd1d"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(OutDir)\ucd1d.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;_CONSOLE;_USE_MATH_DEFINES"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\ucd1d.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\ucd1d"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="4"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\ucd1d.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)\ucd1d.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(OutDir)\ucd1d.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;_CONSOLE;_USE_MATH_DEFINES"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\ucd1d.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\ucd1d"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\ucd1d.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)\ucd1d.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\ucd1d"
+ IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\ucd1d"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(OutDir)\ucd1d.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_USE_MATH_DEFINES"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\ucd1d.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\ucd1d.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ ProgramDatabaseFile="$(OutDir)\ucd1d.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(OutDir)\ucd1d.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_USE_MATH_DEFINES"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\ucd1d.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\ucd1d.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ ProgramDatabaseFile="$(OutDir)\ucd1d.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <File
+ RelativePath="..\..\..\tests\ucd1d.c"
+ >
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/SiloWindows/MSVC9/Tests/ucd_f.vfproj b/SiloWindows/MSVC9/Tests/ucd_f.vfproj
new file mode 100644
index 0000000..35c10b3
--- /dev/null
+++ b/SiloWindows/MSVC9/Tests/ucd_f.vfproj
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<VisualStudioProject ProjectCreator="Intel Fortran" Keyword="Console Application" Version="11.0" ProjectIdGuid="{A1F2E6F2-6E49-4746-9133-9DF0A404C7DB}">
+ <Platforms>
+ <Platform Name="Win32"/>
+ <Platform Name="x64"/></Platforms>
+ <Configurations>
+ <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\ucd_f" IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\ucd_f">
+ <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="..\..\..\src\silo" Interfaces="true" WarnInterfaces="true" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug"/>
+ <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)..\bin\$(ProjectName).exe" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)" ManifestFile="$(IntDir)\$(TargetFileName).intermediate.manifest" GenerateDebugInformation="true" ProgramDatabaseFile="$(IntDir)$(TargetName).pdb" SubSystem="subSystemConsole" ImportLibrary="$(IntDir)\$(TargetName).lib" TargetMachine="machineX86" AdditionalDep [...]
+ <Tool Name="VFResourceCompilerTool" ResourceOutputFileName="$(IntDir)\$(InputName).res"/>
+ <Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(IntDir)\$(ProjectName).tlb"/>
+ <Tool Name="VFCustomBuildTool"/>
+ <Tool Name="VFPreLinkEventTool"/>
+ <Tool Name="VFPreBuildEventTool"/>
+ <Tool Name="VFPostBuildEventTool"/>
+ <Tool Name="VFManifestTool" SuppressStartupBanner="true" OutputManifestFile="$(Intdir)\$(TargetFileName).embed.manifest" ResourceFile="$(IntDir)\$(TargetFileName).embed.manifest.res"/></Configuration>
+ <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\ucd_f" IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\ucd_f">
+ <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" AdditionalIncludeDirectories="..\..\..\src\silo" DiagnosticsFile="$(IntDir)$(TargetName).diag" ModulePath="$(IntDir)" ObjectFile="$(IntDir)"/>
+ <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)..\bin\$(ProjectName).exe" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)" ManifestFile="$(IntDir)\$(TargetFileName).intermediate.manifest" ProgramDatabaseFile="$(IntDir)$(TargetName).pdb" SubSystem="subSystemConsole" ImportLibrary="$(IntDir)\$(TargetName).lib" AdditionalDependencies="silohdf5.lib"/>
+ <Tool Name="VFResourceCompilerTool" ResourceOutputFileName="$(IntDir)\$(InputName).res"/>
+ <Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(IntDir)\$(ProjectName).tlb"/>
+ <Tool Name="VFCustomBuildTool"/>
+ <Tool Name="VFPreLinkEventTool"/>
+ <Tool Name="VFPreBuildEventTool"/>
+ <Tool Name="VFPostBuildEventTool"/>
+ <Tool Name="VFManifestTool" SuppressStartupBanner="true" OutputManifestFile="$(Intdir)\$(TargetFileName).embed.manifest" ResourceFile="$(IntDir)\$(TargetFileName).embed.manifest.res"/></Configuration>
+ <Configuration Name="Debug|x64">
+ <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="..\..\..\src\silo" Interfaces="true" WarnInterfaces="true" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug"/>
+ <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)..\bin\$(ProjectName).exe" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)" ManifestFile="$(IntDir)\$(TargetFileName).intermediate.manifest" GenerateDebugInformation="true" ProgramDatabaseFile="$(IntDir)$(TargetName).pdb" SubSystem="subSystemConsole" ImportLibrary="$(IntDir)\$(TargetName).lib" AdditionalDependencies="silohdf5.lib"/>
+ <Tool Name="VFResourceCompilerTool" ResourceOutputFileName="$(IntDir)\$(InputName).res"/>
+ <Tool Name="VFMidlTool" SuppressStartupBanner="true" TargetEnvironment="midlTargetAMD64" TypeLibraryName="$(IntDir)\$(ProjectName).tlb"/>
+ <Tool Name="VFCustomBuildTool"/>
+ <Tool Name="VFPreLinkEventTool"/>
+ <Tool Name="VFPreBuildEventTool"/>
+ <Tool Name="VFPostBuildEventTool"/>
+ <Tool Name="VFManifestTool" SuppressStartupBanner="true" OutputManifestFile="$(Intdir)\$(TargetFileName).embed.manifest" ResourceFile="$(IntDir)\$(TargetFileName).embed.manifest.res"/></Configuration>
+ <Configuration Name="Release|x64">
+ <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" AdditionalIncludeDirectories="..\..\..\src\silo" DiagnosticsFile="$(IntDir)$(TargetName).diag" ModulePath="$(IntDir)" ObjectFile="$(IntDir)"/>
+ <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)..\bin\$(ProjectName).exe" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)" ManifestFile="$(IntDir)\$(TargetFileName).intermediate.manifest" ProgramDatabaseFile="$(IntDir)$(TargetName).pdb" SubSystem="subSystemConsole" ImportLibrary="$(IntDir)\$(TargetName).lib" AdditionalDependencies="silohdf5.lib"/>
+ <Tool Name="VFResourceCompilerTool" ResourceOutputFileName="$(IntDir)\$(InputName).res"/>
+ <Tool Name="VFMidlTool" SuppressStartupBanner="true" TargetEnvironment="midlTargetAMD64" TypeLibraryName="$(IntDir)\$(ProjectName).tlb"/>
+ <Tool Name="VFCustomBuildTool"/>
+ <Tool Name="VFPreLinkEventTool"/>
+ <Tool Name="VFPreBuildEventTool"/>
+ <Tool Name="VFPostBuildEventTool"/>
+ <Tool Name="VFManifestTool" SuppressStartupBanner="true" OutputManifestFile="$(Intdir)\$(TargetFileName).embed.manifest" ResourceFile="$(IntDir)\$(TargetFileName).embed.manifest.res"/></Configuration></Configurations>
+ <Files>
+ <Filter Name="Header Files" Filter="fi;fd"/>
+ <Filter Name="Resource Files" Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"/>
+ <Filter Name="Source Files" Filter="f90;for;f;fpp;ftn;def;odl;idl">
+ <File RelativePath="..\..\..\tests\ucdf77.f"/></Filter></Files>
+ <Globals/></VisualStudioProject>
diff --git a/SiloWindows/MSVC9/Tests/ucdsamp3.vcproj b/SiloWindows/MSVC9/Tests/ucdsamp3.vcproj
new file mode 100644
index 0000000..bfdcdc4
--- /dev/null
+++ b/SiloWindows/MSVC9/Tests/ucdsamp3.vcproj
@@ -0,0 +1,399 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="ucdsamp3"
+ ProjectGUID="{94D10A14-5A9B-4E1E-B204-DE3196750126}"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\ucdsamp3"
+ IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\ucdsamp3"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(OutDir)\ucdsamp3.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;_CONSOLE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\ucdsamp3.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\ucdsamp3"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="4"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\ucdsamp3.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)\ucdsamp3.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(OutDir)\ucdsamp3.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;_CONSOLE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\ucdsamp3.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\ucdsamp3"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\ucdsamp3.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)\ucdsamp3.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\ucdsamp3"
+ IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\ucdsamp3"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(OutDir)\ucdsamp3.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\ucdsamp3.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\ucdsamp3.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ ProgramDatabaseFile="$(OutDir)\ucdsamp3.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(OutDir)\ucdsamp3.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\ucdsamp3.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\ucdsamp3.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ ProgramDatabaseFile="$(OutDir)\ucdsamp3.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <File
+ RelativePath="..\..\..\tests\ucdsamp3.c"
+ >
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/SiloWindows/MSVC9/Tests/version.vcproj b/SiloWindows/MSVC9/Tests/version.vcproj
new file mode 100644
index 0000000..4615ec5
--- /dev/null
+++ b/SiloWindows/MSVC9/Tests/version.vcproj
@@ -0,0 +1,399 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="version"
+ ProjectGUID="{CBBCFD38-0F91-4CA2-8CBF-2833AC284438}"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\version"
+ IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\version"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(OutDir)\version.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;_CONSOLE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\version.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\version"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="4"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\version.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)\version.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(OutDir)\version.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;_CONSOLE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\version.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\version"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\version.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)\version.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\version"
+ IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\version"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(OutDir)\version.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\version.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\version.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ ProgramDatabaseFile="$(OutDir)\version.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(OutDir)\version.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\version.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\version.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ ProgramDatabaseFile="$(OutDir)\version.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <File
+ RelativePath="..\..\..\tests\version.c"
+ >
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/SiloWindows/MSVC9/Tests/wave.vcproj b/SiloWindows/MSVC9/Tests/wave.vcproj
new file mode 100644
index 0000000..7a87f70
--- /dev/null
+++ b/SiloWindows/MSVC9/Tests/wave.vcproj
@@ -0,0 +1,399 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="wave"
+ ProjectGUID="{3D443B05-403C-4907-8F50-DC396DB6BB23}"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\wave"
+ IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\wave"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(OutDir)\wave.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;_CONSOLE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\wave.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\wave"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="4"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\wave.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)\wave.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(OutDir)\wave.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;_CONSOLE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\wave.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\wave"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\wave.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)\wave.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\wave"
+ IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\wave"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(OutDir)\wave.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\wave.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\wave.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ ProgramDatabaseFile="$(OutDir)\wave.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops;..\ModernDTPR.vsprops;.\TestIncludes.vsprops;..\BaseIncludes.vsprops;..\HDF5_Defines.vsprops;..\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(OutDir)\wave.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="..\..\..\src\silo"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\wave.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(SolutionDir)..\bin\wave.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(SolutionDir)..\$(PlatformName)\$(ConfigurationName)"
+ ProgramDatabaseFile="$(OutDir)\wave.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <File
+ RelativePath="..\..\..\tests\wave.c"
+ >
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/SiloWindows/MSVC8/bin/RunTests.bat b/SiloWindows/MSVC9/bin/RunTests.bat
similarity index 89%
rename from SiloWindows/MSVC8/bin/RunTests.bat
rename to SiloWindows/MSVC9/bin/RunTests.bat
index ec53a24..42e6723 100644
--- a/SiloWindows/MSVC8/bin/RunTests.bat
+++ b/SiloWindows/MSVC9/bin/RunTests.bat
@@ -6,7 +6,7 @@ set drivers=(DB_PDB DB_HDF5)
set buildDir=..\Win32\DLLwithHDF5_Release\
-set gp=(version.exe namescheme.exe point.exe extface.exe testall.exe TesReadMask.exe array.exe multi_test.exe partial_io.exe simple.exe ucd.exe ucdsamp3.exe obj.exe onehex.exe oneprism.exe onepyramid.exe onetet.exe subhex.exe twohex.exe multispec.exe sami.exe specmix.exe spec.exe alltypes.exe wave.exe polyzl.exe csg.exe rocket.exe mmadjacency.exe mat3d_3across.exe ucd1d.exe dirtest.exe quad.exe namescheme.exe)
+set gp=(version.exe namescheme.exe point.exe empty.exe extface.exe testall.exe TesReadMask.exe array.exe multi_test.exe partial_io.exe simple.exe ucd.exe ucdsamp3.exe obj.exe onehex.exe oneprism.exe onepyramid.exe onetet.exe subhex.exe twohex.exe multispec.exe sami.exe specmix.exe spec.exe alltypes.exe wave.exe polyzl.exe csg.exe rocket.exe mmadjacency.exe mat3d_3across.exe ucd1d.exe dirtest.exe quad.exe namescheme.exe arbpoly.exe arbpoly3d.exe)
:: copy necessary dlls to this executable directory
diff --git a/SiloWindows/MSVC9/browser.vcproj b/SiloWindows/MSVC9/browser.vcproj
new file mode 100644
index 0000000..3b9837a
--- /dev/null
+++ b/SiloWindows/MSVC9/browser.vcproj
@@ -0,0 +1,481 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="browser"
+ ProjectGUID="{7C65A1CE-9430-4012-8CED-783C233AEA1D}"
+ RootNamespace="browser"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ InheritedPropertySheets=".\NO_SEC_DEP.vsprops;.\ModernDTPR.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ BuildLogFile="$(IntDir)\$(ProjectName)_BuildLog.htm"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(OutDir)\browser.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\include;..\..\tools\browser;..\..\src\silo;..\..\src\filters"
+ PreprocessorDefinitions="WIN32;_CONSOLE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\browser.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="4"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(OutDir)\browser.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(OutDir)"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)\browser.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ CommandLine="copy $(SolutionDir)..\silodiff.bat $(OutDir)"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ InheritedPropertySheets=".\NO_SEC_DEP.vsprops;.\ModernDTPR.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ BuildLogFile="$(IntDir)\$(ProjectName)_BuildLog.htm"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(OutDir)\browser.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\include;..\..\tools\browser;..\..\src\silo;..\..\src\filters"
+ PreprocessorDefinitions="WIN32;_CONSOLE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\browser.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(OutDir)\browser.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(OutDir)"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)\browser.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ CommandLine="copy $(SolutionDir)..\silodiff.bat $(OutDir)"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ InheritedPropertySheets=".\NO_SEC_DEP.vsprops;.\ModernDTPR.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ BuildLogFile="$(IntDir)\$(ProjectName)_BuildLog.htm"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(OutDir)\browser.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="..\include;..\..\tools\browser;..\..\src\silo;..\..\src\filters"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\browser.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ CompileAs="0"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(OutDir)\browser.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(OutDir)"
+ IgnoreDefaultLibraryNames=""
+ ProgramDatabaseFile="$(OutDir)\browser.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ CommandLine="copy $(SolutionDir)..\silodiff.bat $(OutDir)"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ InheritedPropertySheets=".\NO_SEC_DEP.vsprops;.\ModernDTPR.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ BuildLogFile="$(IntDir)\$(ProjectName)_BuildLog.htm"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(OutDir)\browser.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="..\include;..\..\tools\browser;..\..\src\silo;..\..\src\filters"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\browser.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="silohdf5.lib"
+ OutputFile="$(OutDir)\browser.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(OutDir)"
+ IgnoreDefaultLibraryNames=""
+ ProgramDatabaseFile="$(OutDir)\browser.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ CommandLine="copy $(SolutionDir)..\silodiff.bat $(OutDir)"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <File
+ RelativePath="..\..\tools\browser\array.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\tools\browser\bif.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\tools\browser\browser.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\tools\browser\cons.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\tools\browser\file.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\tools\browser\func.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\tools\browser\lex.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\tools\browser\num.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\tools\browser\obj.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\tools\browser\output.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\tools\browser\parse.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\tools\browser\prim.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\tools\browser\ptr.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\tools\browser\range.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\tools\browser\sdo.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\tools\browser\stc.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\tools\browser\str.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\tools\browser\switch.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\tools\browser\sym.c"
+ >
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/SiloWindows/MSVC9/pdb_detect/pdb_detect.vcproj b/SiloWindows/MSVC9/pdb_detect/pdb_detect.vcproj
new file mode 100644
index 0000000..05e5e96
--- /dev/null
+++ b/SiloWindows/MSVC9/pdb_detect/pdb_detect.vcproj
@@ -0,0 +1,200 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="pdb_detect"
+ ProjectGUID="{17857422-AD82-4D37-A5AF-94C4556935D0}"
+ RootNamespace="pdb_detect"
+ Keyword="Win32Proj"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ProjectDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(ProjectDir)$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops"
+ CharacterSet="1"
+ WholeProgramOptimization="1"
+ BuildLogFile="$(IntDir)\$(ProjectName)_BuildLog.htm"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ CommandLine="cd ..\..\
copysilo.bat"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories="..\..\include"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ RuntimeLibrary="2"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="false"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ LinkIncremental="1"
+ GenerateDebugInformation="true"
+ SubSystem="1"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ Description="Create pdbform.h, lite_pdb.h, lite_score.h"
+ CommandLine="$(OutDir)\pdb_detect.exe > ..\..\..\src\pdb\pdform.h
perl.exe $(SolutionDir)..\..\config\mklite $(SolutionDir)..\..\src\pdb\pdb.h $(SolutionDir)..\include\lite_pdb.h
perl.exe $(SolutionDir)..\..\config\mklite $(SolutionDir)..\..\src\score\score.h $(SolutionDir)..\include\lite_score.h"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="..\NO_SEC_DEP.vsprops"
+ CharacterSet="1"
+ WholeProgramOptimization="1"
+ BuildLogFile="$(IntDir)\$(ProjectName)_BuildLog.htm"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ CommandLine="cd ..\..\
copysilo.bat"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories="..\..\include"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ RuntimeLibrary="2"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="false"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ LinkIncremental="1"
+ GenerateDebugInformation="true"
+ SubSystem="1"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ Description="Create pdbform.h, lite_pdb.h, lite_score.h."
+ CommandLine="$(OutDir)\pdb_detect.exe > ..\..\..\src\pdb\pdform.h
perl.exe $(SolutionDir)..\..\config\mklite $(SolutionDir)..\..\src\pdb\pdb.h $(SolutionDir)..\include\lite_pdb.h
perl.exe $(SolutionDir)..\..\config\mklite $(SolutionDir)..\..\src\score\score.h $(SolutionDir)..\include\lite_score.h"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+ >
+ <File
+ RelativePath="..\..\..\src\pdb\detect.c"
+ >
+ </File>
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/SiloWindows/MSVC9/silex.vcproj b/SiloWindows/MSVC9/silex.vcproj
new file mode 100644
index 0000000..b3d780a
--- /dev/null
+++ b/SiloWindows/MSVC9/silex.vcproj
@@ -0,0 +1,480 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="silex"
+ ProjectGUID="{3D443B05-403C-4907-8F50-DC396DB6BB23}"
+ RootNamespace="silex"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ InheritedPropertySheets=".\NO_SEC_DEP.vsprops;.\ModernDTPR.vsprops;.\QT_Defines.vsprops;.\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ BuildLogFile="$(IntDir)\$(ProjectName)_BuildLog.htm"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ CommandLine="..\runsilexmoc.bat $(QT_LIB_DIR)"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(OutDir)\silex.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\include;..\..\tools\silex;..\..\src\silo;$(QT_INC_DIR);$(QT_INC_DIR)\QtCore;$(QT_INC_DIR)\QtGui"
+ PreprocessorDefinitions="WIN32;_CONSOLE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\silex.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="4"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="QtCore4.lib QtGui4.lib silohdf5.lib"
+ OutputFile="$(OutDir)\silex.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(QT_LIB_DIR);$(OutDir)"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)\silex.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ CommandLine="copy $(QT_LIB_DIR)\QtCore4.dll $(OutDir)
copy $(QT_LIB_DIR)\QtGui4.dll $(OutDir)
"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ InheritedPropertySheets=".\NO_SEC_DEP.vsprops;.\ModernDTPR.vsprops;.\QT_Defines.vsprops;.\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ BuildLogFile="$(IntDir)\$(ProjectName)_BuildLog.htm"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ CommandLine="..\runsilexmoc.bat $(QT_LIB_DIR_X64)"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(OutDir)\silex.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\include;..\..\tools\silex;..\..\src\silo;$(QT_INC_DIR);$(QT_INC_DIR)\QtCore;$(QT_INC_DIR)\QtGui"
+ PreprocessorDefinitions="WIN32;_CONSOLE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\silex.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="QtCore4.lib QtGui4.lib silohdf5.lib"
+ OutputFile="$(OutDir)\silex.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(QT_LIB_DIR_X64);$(OutDir)"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)\silex.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ CommandLine="copy $(QT_LIB_DIR)\QtCore4.dll $(OutDir)
copy $(QT_LIB_DIR)\QtGui4.dll $(OutDir)
"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ InheritedPropertySheets=".\NO_SEC_DEP.vsprops;.\ModernDTPR.vsprops;.\QT_Defines.vsprops;.\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ BuildLogFile="$(IntDir)\$(ProjectName)_BuildLog.htm"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ CommandLine="..\runsilexmoc.bat $(QT_LIB_DIR)"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName="$(OutDir)\silex.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="..\include;..\..\tools\silex;..\..\src\silo;$(QT_INC_DIR);$(QT_INC_DIR)\QtCore;$(QT_INC_DIR)\QtGui"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\silex.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="QtCore4.lib QtGui4.lib silohdf5.lib"
+ OutputFile="$(OutDir)\silex.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(QT_LIB_DIR);$(OutDir)"
+ IgnoreDefaultLibraryNames=""
+ ProgramDatabaseFile="$(OutDir)\silex.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ CommandLine="copy $(QT_LIB_DIR)\QtCore4.dll $(OutDir)
copy $(QT_LIB_DIR)\QtGui4.dll $(OutDir)
"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ InheritedPropertySheets=".\NO_SEC_DEP.vsprops;.\ModernDTPR.vsprops;.\QT_Defines.vsprops;.\DepLibs.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ BuildLogFile="$(IntDir)\$(ProjectName)_BuildLog.htm"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ CommandLine="..\runsilexmoc.bat $(QT_LIB_DIR_X64)"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(OutDir)\silex.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="..\include;..\..\tools\silex;..\..\src\silo;$(QT_INC_DIR);$(QT_INC_DIR)\QtCore;$(QT_INC_DIR)\QtGui"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(OutDir)\silex.pch"
+ AssemblerListingLocation="$(OutDir)\"
+ ObjectFile="$(OutDir)\"
+ ProgramDataBaseFileName="$(OutDir)\"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DisableSpecificWarnings="4244;4305"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="QtCore4.lib QtGui4.lib silohdf5.lib"
+ OutputFile="$(OutDir)\silex.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="$(QT_LIB_DIR_X64);$(OutDir)"
+ IgnoreDefaultLibraryNames=""
+ ProgramDatabaseFile="$(OutDir)\silex.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ CommandLine="copy $(QT_LIB_DIR)\QtCore4.dll $(OutDir)
copy $(QT_LIB_DIR)\QtGui4.dll $(OutDir)
"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="moc"
+ >
+ <File
+ RelativePath="..\..\tools\silex\Explorer_moc.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\tools\silex\SiloArrayView_moc.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\tools\silex\SiloDirTreeView_moc.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\tools\silex\SiloDirView_moc.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\tools\silex\SiloObjectView_moc.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\tools\silex\SiloValueView_moc.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\tools\silex\SiloView_moc.cpp"
+ >
+ </File>
+ </Filter>
+ <File
+ RelativePath="..\..\tools\silex\Explorer.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\tools\silex\main.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\resources\silex.rc"
+ >
+ </File>
+ <File
+ RelativePath="..\..\tools\silex\SiloArrayView.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\tools\silex\SiloDirTreeView.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\tools\silex\SiloDirView.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\tools\silex\SiloFile.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\tools\silex\SiloObjectView.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\tools\silex\SiloValueView.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\tools\silex\SiloView.cpp"
+ >
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/SiloWindows/Makefile b/SiloWindows/Makefile
index 79ef125..1beca9f 100644
--- a/SiloWindows/Makefile
+++ b/SiloWindows/Makefile
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# SiloWindows/Makefile. Generated from Makefile.in by configure.
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -71,10 +72,17 @@
# Modifications:
# Mark C. Miller, Tue Aug 3 17:24:43 PDT 2010
# Ensure a number of silo project files were included.
+#
+# Kathleen Bonnell, Fri Dec 10 10:02:09 PST 2010
+# Add silodiff.bat, browser.vcproj
+#
+# Kathleen Bonnell, Thu Mar 3 10:38:05 PST 2011
+# Add MSVC9 project files.
pkgdatadir = $(datadir)/silo
-pkglibdir = $(libdir)/silo
pkgincludedir = $(includedir)/silo
+pkglibdir = $(libdir)/silo
+pkglibexecdir = $(libexecdir)/silo
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -87,58 +95,69 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-build_triplet = i686-pc-linux-gnu
-host_triplet = i686-pc-linux-gnu
+build_triplet = x86_64-unknown-linux-gnu
+host_triplet = x86_64-unknown-linux-gnu
subdir = SiloWindows
DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/config/ax_check_compiler_flags.m4 \
+ $(top_srcdir)/config/ax_have_qt.m4 \
+ $(top_srcdir)/config/libtool.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
+ $(top_srcdir)/config/vl_lib_readline.m4 \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /groups/visit/miller/silo/trunk/config/missing --run aclocal-1.10
-AMTAR = ${SHELL} /groups/visit/miller/silo/trunk/config/missing --run tar
+ACLOCAL = ${SHELL} /g/g11/miller86/silo/silo_4.9RC/config/missing --run aclocal-1.11
+AMTAR = ${SHELL} /g/g11/miller86/silo/silo_4.9RC/config/missing --run tar
AR = ar
-AUTOCONF = ${SHELL} /groups/visit/miller/silo/trunk/config/missing --run autoconf
-AUTOHEADER = ${SHELL} /groups/visit/miller/silo/trunk/config/missing --run autoheader
-AUTOMAKE = ${SHELL} /groups/visit/miller/silo/trunk/config/missing --run automake-1.10
+AUTOCONF = ${SHELL} /g/g11/miller86/silo/silo_4.9RC/config/missing --run autoconf
+AUTOHEADER = ${SHELL} /g/g11/miller86/silo/silo_4.9RC/config/missing --run autoheader
+AUTOMAKE = ${SHELL} /g/g11/miller86/silo/silo_4.9RC/config/missing --run automake-1.11
AWK = gawk
BROWSER = browser
BUNDLE_TARGET =
CC = gcc
CCDEPMODE = depmode=gcc3
-CC_FULLPATH = /usr/bin/gcc
+CC_FULLPATH = /usr/local/bin/gcc
CFLAGS = -g -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Wdeclaration-after-statement
-CONFIG_CMD = ./configure 'LDFLAGS=-static' 'CFLAGS=-g' 'CXXFLAGS=-g' 'FC=g77' 'F77=g77' '--with-hdf5=/usr/gapps/silo/hdf5/1.8.4/i686_Linux_ELsmp/include,/usr/gapps/silo/hdf5/1.8.4/i686_Linux_ELsmp/lib' '--with-szlib=/usr/gapps/silo/szip/2.1/i686_Linux_ELsmp' '--disable-shared' '--prefix=/groups/visit/miller/silo/trunk/install'
-CONFIG_DATE = Wed Sep 15 07:49:24 PDT 2010
-CONFIG_USER = miller86 at alderaan.llnl.gov
+CONFIG_CMD = ./configure '--enable-fortran' 'FC=gfortran' 'F77=gfortran' 'FCFLAGS=-g' 'CFLAGS=-g' 'CXXFLAGS=-g' '--enable-pythonmodule' '--with-hdf5=/usr/gapps/visit/thirdparty_shared_2_7_0/hdf5/1.8.7/linux-x86_64_gcc-4.4/include,/usr/gapps/visit/thirdparty_shared_2_7_0/hdf5/1.8.7/linux-x86_64_gcc-4.4/lib' '--with-szlib=/usr/gapps/visit/thirdparty_shared_2_7_0/szip/2.1/linux-x86_64_gcc-4.4' '--with-Qt-dir=/usr/gapps/visit/thirdparty_shared_2_7_0/qt/4.8.3/linux-x86_64_gcc-4.4' '--with-Qt- [...]
+CONFIG_DATE = Tue Mar 19 10:33:26 PDT 2013
+CONFIG_USER = miller86 at edge83
CPP = gcc -E
-CPPFLAGS = -I/usr/gapps/silo/hdf5/1.8.4/i686_Linux_ELsmp/include
+CPPFLAGS = -I/usr/gapps/visit/thirdparty_shared_2_7_0/hdf5/1.8.7/linux-x86_64_gcc-4.4/include
CXX = g++
CXXCPP = g++ -E
CXXDEPMODE = depmode=gcc3
CXXFLAGS = -g
-CXX_FULLPATH = /usr/bin/g++
+CXX_FULLPATH = /usr/local/bin/g++
CYGPATH_W = echo
DEFS = -DHAVE_CONFIG_H
DEPDIR = .deps
-ECHO = echo
+DSYMUTIL =
+DUMPBIN =
ECHO_C =
ECHO_N = -n
ECHO_T =
EGREP = /bin/grep -E
EXEEXT =
-F77 = g77
-FC = g77
-FCFLAGS = -g -O2
-FCLIBS = -L/usr/lib/gcc-lib/i386-redhat-linux/3.2.3 -L/usr/lib/gcc-lib/i386-redhat-linux/3.2.3/../../.. -lfrtbegin -lg2c -lm
-FC_FULLPATH = /usr/bin/g77
+F77 = gfortran
+FC = gfortran
+FCFLAGS = -g
+FCLIBS = -L/usr/lib/gcc/x86_64-redhat-linux/4.4.6 -L/usr/lib/gcc/x86_64-redhat-linux/4.4.6/../../../../lib64 -L/lib/../lib64 -L/usr/lib/../lib64 -L/usr/lib/gcc/x86_64-redhat-linux/4.4.6/../../.. -lgfortranbegin -lgfortran -lm
+FC_FULLPATH = /usr/local/bin/gfortran
FFLAGS = -g -O2
+FGREP = /bin/grep -F
FORTRAN = fortran
FPZIP = fpzip
GREP = /bin/grep
@@ -149,69 +168,78 @@ INSTALL_DATA = ${INSTALL} -m 644
INSTALL_PROGRAM = ${INSTALL}
INSTALL_SCRIPT = ${INSTALL}
INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
-LDFLAGS = -L/usr/gapps/silo/hdf5/1.8.4/i686_Linux_ELsmp/lib -L/usr/gapps/silo/szip/2.1/i686_Linux_ELsmp/lib -static -L/usr/gapps/silo/szip/2.1/i686_Linux_ELsmp/lib
+LD = /usr/local/bin/ld -m elf_x86_64
+LDFLAGS = -L/usr/gapps/visit/thirdparty_shared_2_7_0/hdf5/1.8.7/linux-x86_64_gcc-4.4/lib -L/usr/gapps/visit/thirdparty_shared_2_7_0/szip/2.1/linux-x86_64_gcc-4.4/lib -L/usr/gapps/visit/thirdparty_shared_2_7_0/szip/2.1/linux-x86_64_gcc-4.4/lib
+LIBM = -lm
LIBOBJS =
LIBS = -lhdf5 -lsz -lsz -lz -lm -lsz
LIBTOOL = $(SHELL) $(top_builddir)/libtool
+LIPO =
LN_S = ln -s
LTLIBOBJS =
MAINT = #
-MAKEINFO = ${SHELL} /groups/visit/miller/silo/trunk/config/missing --run makeinfo
+MAKEINFO = ${SHELL} /g/g11/miller86/silo/silo_4.9RC/config/missing --run makeinfo
MKDIR_P = /bin/mkdir -p
NETCDF = netcdf
+NM = /usr/bin/nm -B
+NMEDIT =
+OBJDUMP = objdump
OBJEXT = o
+OTOOL =
+OTOOL64 =
PACKAGE = silo
PACKAGE_BUGREPORT = visit-users at email.ornl.gov
PACKAGE_NAME = silo
-PACKAGE_STRING = silo 4.8
+PACKAGE_STRING = silo 4.9.1
PACKAGE_TARNAME = silo
-PACKAGE_VERSION = 4.8
+PACKAGE_VERSION = 4.9.1
PATH_SEPARATOR = :
PDBP_DRV =
PDB_DRV = pdb_drv
-PRTDIAG =
-PYTHON =
-PYTHONMODULE =
-PYTHON_CPPFLAGS =
-PYTHON_EXEC_PREFIX =
-PYTHON_PLATFORM =
-PYTHON_PREFIX =
-PYTHON_VERSION =
-QT_BIN = /usr/lib/qt-3.1/bin
-QT_CORE = libQtCore.so
-QT_CORE_LIB = -lQtCore
-QT_CXXFLAGS = -I$(QT_INCLUDE) -I$(QT_INCLUDE)/Qt -I$(QT_INCLUDE)/QtCore -I$(QT_INCLUDE)/QtGui
-QT_GUI = libQtGui.so
-QT_GUI_LIB = -lQtGui
-QT_INCLUDE = /usr/lib/qt-3.1/include
-QT_LDFLAGS = -L$(QT_LIB)
-QT_LIB = /usr/lib/qt-3.1/lib
-QT_LIBS = $(QT_CORE_LIB) $(QT_GUI_LIB)
-QT_MOC = $(QT_BIN)/moc
+PYTHON = /usr/local/bin/python
+PYTHONMODULE = python
+PYTHON_CPPFLAGS = -I/usr/apps/python/include/python2.6
+PYTHON_EXEC_PREFIX = ${exec_prefix}
+PYTHON_PLATFORM = linux2
+PYTHON_PREFIX = ${prefix}
+PYTHON_VERSION = 2.6
+QT_CXXFLAGS = -I/usr/gapps/visit/thirdparty_shared_2_7_0/qt/4.8.3/linux-x86_64_gcc-4.4/include -I/usr/gapps/visit/thirdparty_shared_2_7_0/qt/4.8.3/linux-x86_64_gcc-4.4/include/Qt -I/usr/gapps/visit/thirdparty_shared_2_7_0/qt/4.8.3/linux-x86_64_gcc-4.4/include/QtCore -I/usr/gapps/visit/thirdparty_shared_2_7_0/qt/4.8.3/linux-x86_64_gcc-4.4/include/QtGui
+QT_DIR = /usr/gapps/visit/thirdparty_shared_2_7_0/qt/4.8.3/linux-x86_64_gcc-4.4
+QT_LIBS = -L/usr/gapps/visit/thirdparty_shared_2_7_0/qt/4.8.3/linux-x86_64_gcc-4.4/lib -lQtGui -lSM -lICE -lX11 -lXext -lXmu -lXt -lXi
+QT_LRELEASE = /usr/gapps/visit/thirdparty_shared_2_7_0/qt/4.8.3/linux-x86_64_gcc-4.4/bin/lrelease
+QT_LUPDATE = /usr/gapps/visit/thirdparty_shared_2_7_0/qt/4.8.3/linux-x86_64_gcc-4.4/bin/lupdate
+QT_MOC = /usr/gapps/visit/thirdparty_shared_2_7_0/qt/4.8.3/linux-x86_64_gcc-4.4/bin/moc
+QT_UIC = /usr/gapps/visit/thirdparty_shared_2_7_0/qt/4.8.3/linux-x86_64_gcc-4.4/bin/uic
RANLIB = ranlib
-READLINE_LIBS = -lreadline -ltermcap
+READLINE_LIBS = -lreadline
SED = /bin/sed
SET_MAKE =
SHELL = /bin/sh
-SILEX =
+SILEX = silex
SILO_DTYPPTR = void
SILO_DTYPPTR1 = void*
SILO_DTYPPTR2 = void*
SILO_VERS_MAJ = 4
-SILO_VERS_MIN = 8
-SILO_VERS_PAT =
+SILO_VERS_MIN = 9
+SILO_VERS_PAT = 1
SILO_VERS_PRE =
-SILO_VERS_TAG = Silo_version_4_8
+SILO_VERS_TAG = Silo_version_4_9_1
STRIP = strip
TAURUS = taurus
-VERSION = 4.8
+VERSION = 4.9.1
+XMKMF =
+X_CFLAGS =
+X_EXTRA_LIBS =
+X_LIBS =
+X_PRE_LIBS = -lSM -lICE
ZLIB = zlib
-abs_builddir = /groups/visit/miller/silo/trunk/SiloWindows
-abs_srcdir = /groups/visit/miller/silo/trunk/SiloWindows
-abs_top_builddir = /groups/visit/miller/silo/trunk
-abs_top_srcdir = /groups/visit/miller/silo/trunk
+abs_builddir = /g/g11/miller86/silo/silo_4.9RC/SiloWindows
+abs_srcdir = /g/g11/miller86/silo/silo_4.9RC/SiloWindows
+abs_top_builddir = /g/g11/miller86/silo/silo_4.9RC
+abs_top_srcdir = /g/g11/miller86/silo/silo_4.9RC
ac_ct_CC = gcc
ac_ct_CXX = g++
+ac_ct_DUMPBIN =
ac_ct_F77 =
ac_ct_FC =
am__include = include
@@ -220,108 +248,118 @@ am__quote =
am__tar = ${AMTAR} chof - "$$tardir"
am__untar = ${AMTAR} xf -
bindir = ${exec_prefix}/bin
-build = i686-pc-linux-gnu
+build = x86_64-unknown-linux-gnu
build_alias =
-build_cpu = i686
+build_cpu = x86_64
build_os = linux-gnu
-build_vendor = pc
+build_vendor = unknown
builddir = .
datadir = ${datarootdir}
datarootdir = ${prefix}/share
docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
dvidir = ${docdir}
exec_prefix = ${prefix}
-host = i686-pc-linux-gnu
+host = x86_64-unknown-linux-gnu
host_alias =
-host_cpu = i686
+host_cpu = x86_64
host_os = linux-gnu
-host_vendor = pc
+host_vendor = unknown
htmldir = ${docdir}
includedir = ${prefix}/include
infodir = ${datarootdir}/info
-install_sh = $(SHELL) /groups/visit/miller/silo/trunk/config/install-sh
+install_sh = ${SHELL} /g/g11/miller86/silo/silo_4.9RC/config/install-sh
libdir = ${exec_prefix}/lib
libexecdir = ${exec_prefix}/libexec
localedir = ${datarootdir}/locale
localstatedir = ${prefix}/var
+lt_ECHO = echo
mandir = ${datarootdir}/man
mkdir_p = /bin/mkdir -p
oldincludedir = /usr/include
pdfdir = ${docdir}
-pkgpyexecdir =
-pkgpythondir =
-prefix = /groups/visit/miller/silo/trunk/install
+pkgpyexecdir = ${pyexecdir}/silo
+pkgpythondir = ${pythondir}/silo
+prefix = /usr/gapps/visit/thirdparty_shared_2_7_0/silo/4.9.1-pre1/linux-x86_64_gcc-4.4
program_transform_name = s,x,x,
psdir = ${docdir}
-pyexecdir =
-pythondir =
+pyexecdir = ${exec_prefix}/lib/python2.6/site-packages
+pythondir = ${prefix}/lib/python2.6/site-packages
sbindir = ${exec_prefix}/sbin
sharedstatedir = ${prefix}/com
srcdir = .
sysconfdir = ${prefix}/etc
target_alias =
+top_build_prefix = ../
top_builddir = ..
top_srcdir = ..
EXTRA_DIST = \
-./MSVC8/Tests/alltypes.vcproj\
-./MSVC8/Tests/array.vcproj\
-./MSVC8/Tests/array_f.vfproj\
-./MSVC8/Tests/compression.vcproj\
-./MSVC8/Tests/csg.vcproj\
-./MSVC8/Tests/curve_f.vfproj\
-./MSVC8/Tests/dirtest.vcproj\
-./MSVC8/Tests/extface.vcproj\
-./MSVC8/Tests/grab.vcproj\
-./MSVC8/Tests/group_test.vcproj\
-./MSVC8/Tests/largefile.vcproj\
-./MSVC8/Tests/listtypes.vcproj\
-./MSVC8/Tests/mat3d_3across.vcproj\
-./MSVC8/Tests/mat_f.vfproj\
-./MSVC8/Tests/merge_block.vcproj\
-./MSVC8/Tests/mmadjacency.vcproj\
-./MSVC8/Tests/multi_file.vcproj\
-./MSVC8/Tests/multi_test.vcproj\
-./MSVC8/Tests/multispec.vcproj\
-./MSVC8/Tests/namescheme.vcproj\
-./MSVC8/Tests/obj.vcproj\
-./MSVC8/Tests/onehex.vcproj\
-./MSVC8/Tests/oneprism.vcproj\
-./MSVC8/Tests/onepyramid.vcproj\
-./MSVC8/Tests/onetet.vcproj\
-./MSVC8/Tests/partial_io.vcproj\
-./MSVC8/Tests/point.vcproj\
-./MSVC8/Tests/point_f.vfproj\
-./MSVC8/Tests/polyzl.vcproj\
-./MSVC8/Tests/quad.vcproj\
-./MSVC8/Tests/rocket.vcproj\
-./MSVC8/Tests/sami.vcproj\
-./MSVC8/Tests/simple.vcproj\
-./MSVC8/Tests/spec.vcproj\
-./MSVC8/Tests/specmix.vcproj\
-./MSVC8/Tests/subhex.vcproj\
-./MSVC8/Tests/testall.vcproj\
-./MSVC8/Tests/testall_f.vfproj\
-./MSVC8/Tests/TestIncludes.vsprops\
-./MSVC8/Tests/testpdb.vcproj\
-./MSVC8/Tests/TestReadMask.vcproj\
-./MSVC8/Tests/Tests.sln\
-./MSVC8/Tests/twohex.vcproj\
-./MSVC8/Tests/ucd1d.vcproj\
-./MSVC8/Tests/ucd.vcproj\
-./MSVC8/Tests/ucd_f.vfproj\
-./MSVC8/Tests/ucdsamp3.vcproj\
-./MSVC8/Tests/version.vcproj\
-./MSVC8/Tests/wave.vcproj\
-./MSVC8/bin/RunTests.bat\
-./MSVC8/pdb_detect/pdb_detect.vcproj\
-./MSVC8/BaseIncludes.vsprops\
-./MSVC8/HDF5_Defines.vsprops\
-./MSVC8/ModernDTPR.vsprops\
-./MSVC8/NO_SEC_DEP.vsprops\
-./MSVC8/NON_BSD_DEFINES.vsprops\
-./MSVC8/silex.vcproj\
-./MSVC8/Silo.vcproj\
-./MSVC8/SiloWindows.sln\
+./MSVC9/Tests/alltypes.vcproj\
+./MSVC9/Tests/arbpoly.vcproj\
+./MSVC9/Tests/arbpoly3d.vcproj\
+./MSVC9/Tests/array.vcproj\
+./MSVC9/Tests/array_f.vfproj\
+./MSVC9/Tests/compression.vcproj\
+./MSVC9/Tests/csg.vcproj\
+./MSVC9/Tests/curve_f.vfproj\
+./MSVC9/Tests/dirtest.vcproj\
+./MSVC9/Tests/empty.vcproj\
+./MSVC9/Tests/extface.vcproj\
+./MSVC9/Tests/grab.vcproj\
+./MSVC9/Tests/group_test.vcproj\
+./MSVC9/Tests/largefile.vcproj\
+./MSVC9/Tests/listtypes.vcproj\
+./MSVC9/Tests/mat3d_3across.vcproj\
+./MSVC9/Tests/mat_f.vfproj\
+./MSVC9/Tests/merge_block.vcproj\
+./MSVC9/Tests/mmadjacency.vcproj\
+./MSVC9/Tests/multi_file.vcproj\
+./MSVC9/Tests/multi_test.vcproj\
+./MSVC9/Tests/multispec.vcproj\
+./MSVC9/Tests/namescheme.vcproj\
+./MSVC9/Tests/obj.vcproj\
+./MSVC9/Tests/onehex.vcproj\
+./MSVC9/Tests/oneprism.vcproj\
+./MSVC9/Tests/onepyramid.vcproj\
+./MSVC9/Tests/onetet.vcproj\
+./MSVC9/Tests/partial_io.vcproj\
+./MSVC9/Tests/point.vcproj\
+./MSVC9/Tests/point_f.vfproj\
+./MSVC9/Tests/polyzl.vcproj\
+./MSVC9/Tests/Preparation.vcproj\
+./MSVC9/Tests/quad.vcproj\
+./MSVC9/Tests/quad_f.vfproj\
+./MSVC9/Tests/sami.vcproj\
+./MSVC9/Tests/simple.vcproj\
+./MSVC9/Tests/spec.vcproj\
+./MSVC9/Tests/specmix.vcproj\
+./MSVC9/Tests/subhex.vcproj\
+./MSVC9/Tests/testall.vcproj\
+./MSVC9/Tests/testall_f.vfproj\
+./MSVC9/Tests/testpdb.vcproj\
+./MSVC9/Tests/TestReadMask.vcproj\
+./MSVC9/Tests/twohex.vcproj\
+./MSVC9/Tests/ucd1d.vcproj\
+./MSVC9/Tests/ucd.vcproj\
+./MSVC9/Tests/ucd_f.vfproj\
+./MSVC9/Tests/ucdsamp3.vcproj\
+./MSVC9/Tests/version.vcproj\
+./MSVC9/Tests/wave.vcproj\
+./MSVC9/Tests/Tests.sln\
+./MSVC9/Tests/CopyTestDependencies.bat\
+./MSVC9/Tests/TestIncludes.vsprops\
+./MSVC9/bin/RunTests.bat\
+./MSVC9/pdb_detect/pdb_detect.vcproj\
+./MSVC9/BaseIncludes.vsprops\
+./MSVC9/DepLibs.vsprops\
+./MSVC9/HDF5_Defines.vsprops\
+./MSVC9/ModernDTPR.vsprops\
+./MSVC9/NO_SEC_DEP.vsprops\
+./MSVC9/NON_BSD_DEFINES.vsprops\
+./MSVC9/QT_Defines.vsprops\
+./MSVC9/browser.vcproj\
+./MSVC9/silex.vcproj\
+./MSVC9/Silo.vcproj\
+./MSVC9/SiloWindows.sln\
./include/config.h\
./resources/silex.aps\
./resources/silex.ico\
@@ -331,65 +369,105 @@ EXTRA_DIST = \
./runsilexmoc.bat\
./Makefile.in\
./copysilo.bat\
+./silodiff.bat\
./README\
-./MSVC8-BSD/Tests/alltypes.vcproj\
-./MSVC8-BSD/Tests/array.vcproj\
-./MSVC8-BSD/Tests/array_f.vfproj\
-./MSVC8-BSD/Tests/compression.vcproj\
-./MSVC8-BSD/Tests/csg.vcproj\
-./MSVC8-BSD/Tests/curve_f.vfproj\
-./MSVC8-BSD/Tests/dirtest.vcproj\
-./MSVC8-BSD/Tests/extface.vcproj\
-./MSVC8-BSD/Tests/grab.vcproj\
-./MSVC8-BSD/Tests/group_test.vcproj\
-./MSVC8-BSD/Tests/largefile.vcproj\
-./MSVC8-BSD/Tests/listtypes.vcproj\
-./MSVC8-BSD/Tests/mat3d_3across.vcproj\
-./MSVC8-BSD/Tests/mat_f.vfproj\
-./MSVC8-BSD/Tests/merge_block.vcproj\
-./MSVC8-BSD/Tests/mmadjacency.vcproj\
-./MSVC8-BSD/Tests/multi_file.vcproj\
-./MSVC8-BSD/Tests/multi_test.vcproj\
-./MSVC8-BSD/Tests/multispec.vcproj\
-./MSVC8-BSD/Tests/namescheme.vcproj\
-./MSVC8-BSD/Tests/obj.vcproj\
-./MSVC8-BSD/Tests/onehex.vcproj\
-./MSVC8-BSD/Tests/oneprism.vcproj\
-./MSVC8-BSD/Tests/onepyramid.vcproj\
-./MSVC8-BSD/Tests/onetet.vcproj\
-./MSVC8-BSD/Tests/partial_io.vcproj\
-./MSVC8-BSD/Tests/point.vcproj\
-./MSVC8-BSD/Tests/point_f.vfproj\
-./MSVC8-BSD/Tests/polyzl.vcproj\
-./MSVC8-BSD/Tests/quad.vcproj\
-./MSVC8-BSD/Tests/rocket.vcproj\
-./MSVC8-BSD/Tests/sami.vcproj\
-./MSVC8-BSD/Tests/simple.vcproj\
-./MSVC8-BSD/Tests/spec.vcproj\
-./MSVC8-BSD/Tests/specmix.vcproj\
-./MSVC8-BSD/Tests/subhex.vcproj\
-./MSVC8-BSD/Tests/testall.vcproj\
-./MSVC8-BSD/Tests/testall_f.vfproj\
-./MSVC8-BSD/Tests/TestIncludes.vsprops\
-./MSVC8-BSD/Tests/testpdb.vcproj\
-./MSVC8-BSD/Tests/TestReadMask.vcproj\
-./MSVC8-BSD/Tests/Tests.sln\
-./MSVC8-BSD/Tests/twohex.vcproj\
-./MSVC8-BSD/Tests/ucd1d.vcproj\
-./MSVC8-BSD/Tests/ucd.vcproj\
-./MSVC8-BSD/Tests/ucd_f.vfproj\
-./MSVC8-BSD/Tests/ucdsamp3.vcproj\
-./MSVC8-BSD/Tests/version.vcproj\
-./MSVC8-BSD/Tests/wave.vcproj\
-./MSVC8-BSD/bin/RunTests.bat\
-./MSVC8-BSD/pdb_detect/pdb_detect.vcproj\
-./MSVC8-BSD/BaseIncludes.vsprops\
-./MSVC8-BSD/HDF5_Defines.vsprops\
-./MSVC8-BSD/ModernDTPR.vsprops\
-./MSVC8-BSD/NO_SEC_DEP.vsprops\
-./MSVC8-BSD/silex.vcproj\
-./MSVC8-BSD/Silo.vcproj\
-./MSVC8-BSD/SiloWindows.sln
+./MSVC9-BSD/Tests/alltypes.vcproj\
+./MSVC9-BSD/Tests/arbpoly.vcproj\
+./MSVC9-BSD/Tests/arbpoly3d.vcproj\
+./MSVC9-BSD/Tests/array.vcproj\
+./MSVC9-BSD/Tests/array_f.vfproj\
+./MSVC9-BSD/Tests/compression.vcproj\
+./MSVC9-BSD/Tests/csg.vcproj\
+./MSVC9-BSD/Tests/curve_f.vfproj\
+./MSVC9-BSD/Tests/dirtest.vcproj\
+./MSVC9-BSD/Tests/empty.vcproj\
+./MSVC9-BSD/Tests/extface.vcproj\
+./MSVC9-BSD/Tests/grab.vcproj\
+./MSVC9-BSD/Tests/group_test.vcproj\
+./MSVC9-BSD/Tests/largefile.vcproj\
+./MSVC9-BSD/Tests/listtypes.vcproj\
+./MSVC9-BSD/Tests/mat3d_3across.vcproj\
+./MSVC9-BSD/Tests/mat_f.vfproj\
+./MSVC9-BSD/Tests/merge_block.vcproj\
+./MSVC9-BSD/Tests/mmadjacency.vcproj\
+./MSVC9-BSD/Tests/multi_file.vcproj\
+./MSVC9-BSD/Tests/multi_test.vcproj\
+./MSVC9-BSD/Tests/multispec.vcproj\
+./MSVC9-BSD/Tests/namescheme.vcproj\
+./MSVC9-BSD/Tests/obj.vcproj\
+./MSVC9-BSD/Tests/onehex.vcproj\
+./MSVC9-BSD/Tests/oneprism.vcproj\
+./MSVC9-BSD/Tests/onepyramid.vcproj\
+./MSVC9-BSD/Tests/onetet.vcproj\
+./MSVC9-BSD/Tests/partial_io.vcproj\
+./MSVC9-BSD/Tests/point.vcproj\
+./MSVC9-BSD/Tests/point_f.vfproj\
+./MSVC9-BSD/Tests/polyzl.vcproj\
+./MSVC9-BSD/Tests/Preparation.vcproj\
+./MSVC9-BSD/Tests/quad.vcproj\
+./MSVC9-BSD/Tests/quad_f.vfproj\
+./MSVC9-BSD/Tests/sami.vcproj\
+./MSVC9-BSD/Tests/simple.vcproj\
+./MSVC9-BSD/Tests/spec.vcproj\
+./MSVC9-BSD/Tests/specmix.vcproj\
+./MSVC9-BSD/Tests/subhex.vcproj\
+./MSVC9-BSD/Tests/testall.vcproj\
+./MSVC9-BSD/Tests/testall_f.vfproj\
+./MSVC9-BSD/Tests/testpdb.vcproj\
+./MSVC9-BSD/Tests/TestReadMask.vcproj\
+./MSVC9-BSD/Tests/twohex.vcproj\
+./MSVC9-BSD/Tests/ucd1d.vcproj\
+./MSVC9-BSD/Tests/ucd.vcproj\
+./MSVC9-BSD/Tests/ucd_f.vfproj\
+./MSVC9-BSD/Tests/ucdsamp3.vcproj\
+./MSVC9-BSD/Tests/version.vcproj\
+./MSVC9-BSD/Tests/wave.vcproj\
+./MSVC9-BSD/Tests/Tests.sln\
+./MSVC9-BSD/Tests/CopyTestDependencies.bat\
+./MSVC9-BSD/Tests/TestIncludes.vsprops\
+./MSVC9-BSD/bin/RunTests.bat\
+./MSVC9-BSD/pdb_detect/pdb_detect.vcproj\
+./MSVC9-BSD/BaseIncludes.vsprops\
+./MSVC9-BSD/DepLibs.vsprops\
+./MSVC9-BSD/HDF5_Defines.vsprops\
+./MSVC9-BSD/ModernDTPR.vsprops\
+./MSVC9-BSD/NO_SEC_DEP.vsprops\
+./MSVC9-BSD/QT_Defines.vsprops\
+./MSVC9-BSD/browser.vcproj\
+./MSVC9-BSD/silex.vcproj\
+./MSVC9-BSD/Silo.vcproj\
+./MSVC9-BSD/SiloWindows.sln\
+./MSVC2010/BaseIncludes.props\
+./MSVC2010/DepLibs.props\
+./MSVC2010/HDF5_Defines.props\
+./MSVC2010/ModernDTPR.props\
+./MSVC2010/NON_BSD_DEFINES.props\
+./MSVC2010/NO_SEC_DEP.props\
+./MSVC2010/QT_Defines.props\
+./MSVC2010/Silo.sln\
+./MSVC2010/Silo.vcxproj\
+./MSVC2010/Silo.vcxproj.filters\
+./MSVC2010/browser.vcxproj\
+./MSVC2010/browser.vcxproj.filters\
+./MSVC2010/silex.vcxproj\
+./MSVC2010/silex.vcxproj.filters\
+./MSVC2010/pdb_detect/pdb_detect.vcxproj\
+./MSVC2010/pdb_detect/pdb_detect.vcxproj.filters\
+./MSVC2010-BSD/BaseIncludes.props\
+./MSVC2010-BSD/DepLibs.props\
+./MSVC2010-BSD/HDF5_Defines.props\
+./MSVC2010-BSD/ModernDTPR.props\
+./MSVC2010-BSD/NO_SEC_DEP.props\
+./MSVC2010-BSD/QT_Defines.props\
+./MSVC2010-BSD/Silo.sln\
+./MSVC2010-BSD/Silo.vcxproj\
+./MSVC2010-BSD/Silo.vcxproj.filters\
+./MSVC2010-BSD/browser.vcxproj\
+./MSVC2010-BSD/browser.vcxproj.filters\
+./MSVC2010-BSD/silex.vcxproj\
+./MSVC2010-BSD/silex.vcxproj.filters\
+./MSVC2010-BSD/pdb_detect/pdb_detect.vcxproj\
+./MSVC2010-BSD/pdb_detect/pdb_detect.vcxproj.filters
all: all-am
@@ -398,14 +476,14 @@ $(srcdir)/Makefile.in: # $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
- && exit 0; \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign SiloWindows/Makefile'; \
- cd $(top_srcdir) && \
- $(AUTOMAKE) --foreign SiloWindows/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign SiloWindows/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --foreign SiloWindows/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -423,6 +501,7 @@ $(top_srcdir)/configure: # $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): # $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
mostlyclean-libtool:
-rm -f *.lo
@@ -452,13 +531,17 @@ distdir: $(DISTFILES)
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
if test -d $$d/$$file; then \
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
@@ -486,6 +569,7 @@ clean-generic:
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -504,6 +588,8 @@ dvi-am:
html: html-am
+html-am:
+
info: info-am
info-am:
@@ -512,18 +598,28 @@ install-data-am:
install-dvi: install-dvi-am
+install-dvi-am:
+
install-exec-am:
install-html: install-html-am
+install-html-am:
+
install-info: install-info-am
+install-info-am:
+
install-man:
install-pdf: install-pdf-am
+install-pdf-am:
+
install-ps: install-ps-am
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-am
@@ -557,6 +653,7 @@ uninstall-am:
maintainer-clean-generic mostlyclean mostlyclean-generic \
mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/SiloWindows/Makefile.am b/SiloWindows/Makefile.am
index adf02de..b6b1f93 100644
--- a/SiloWindows/Makefile.am
+++ b/SiloWindows/Makefile.am
@@ -56,67 +56,82 @@
# Modifications:
# Mark C. Miller, Tue Aug 3 17:24:43 PDT 2010
# Ensure a number of silo project files were included.
+#
+# Kathleen Bonnell, Fri Dec 10 10:02:09 PST 2010
+# Add silodiff.bat, browser.vcproj
+#
+# Kathleen Bonnell, Thu Mar 3 10:38:05 PST 2011
+# Add MSVC9 project files.
+
EXTRA_DIST = \
-./MSVC8/Tests/alltypes.vcproj\
-./MSVC8/Tests/array.vcproj\
-./MSVC8/Tests/array_f.vfproj\
-./MSVC8/Tests/compression.vcproj\
-./MSVC8/Tests/csg.vcproj\
-./MSVC8/Tests/curve_f.vfproj\
-./MSVC8/Tests/dirtest.vcproj\
-./MSVC8/Tests/extface.vcproj\
-./MSVC8/Tests/grab.vcproj\
-./MSVC8/Tests/group_test.vcproj\
-./MSVC8/Tests/largefile.vcproj\
-./MSVC8/Tests/listtypes.vcproj\
-./MSVC8/Tests/mat3d_3across.vcproj\
-./MSVC8/Tests/mat_f.vfproj\
-./MSVC8/Tests/merge_block.vcproj\
-./MSVC8/Tests/mmadjacency.vcproj\
-./MSVC8/Tests/multi_file.vcproj\
-./MSVC8/Tests/multi_test.vcproj\
-./MSVC8/Tests/multispec.vcproj\
-./MSVC8/Tests/namescheme.vcproj\
-./MSVC8/Tests/obj.vcproj\
-./MSVC8/Tests/onehex.vcproj\
-./MSVC8/Tests/oneprism.vcproj\
-./MSVC8/Tests/onepyramid.vcproj\
-./MSVC8/Tests/onetet.vcproj\
-./MSVC8/Tests/partial_io.vcproj\
-./MSVC8/Tests/point.vcproj\
-./MSVC8/Tests/point_f.vfproj\
-./MSVC8/Tests/polyzl.vcproj\
-./MSVC8/Tests/quad.vcproj\
-./MSVC8/Tests/rocket.vcproj\
-./MSVC8/Tests/sami.vcproj\
-./MSVC8/Tests/simple.vcproj\
-./MSVC8/Tests/spec.vcproj\
-./MSVC8/Tests/specmix.vcproj\
-./MSVC8/Tests/subhex.vcproj\
-./MSVC8/Tests/testall.vcproj\
-./MSVC8/Tests/testall_f.vfproj\
-./MSVC8/Tests/TestIncludes.vsprops\
-./MSVC8/Tests/testpdb.vcproj\
-./MSVC8/Tests/TestReadMask.vcproj\
-./MSVC8/Tests/Tests.sln\
-./MSVC8/Tests/twohex.vcproj\
-./MSVC8/Tests/ucd1d.vcproj\
-./MSVC8/Tests/ucd.vcproj\
-./MSVC8/Tests/ucd_f.vfproj\
-./MSVC8/Tests/ucdsamp3.vcproj\
-./MSVC8/Tests/version.vcproj\
-./MSVC8/Tests/wave.vcproj\
-./MSVC8/bin/RunTests.bat\
-./MSVC8/pdb_detect/pdb_detect.vcproj\
-./MSVC8/BaseIncludes.vsprops\
-./MSVC8/HDF5_Defines.vsprops\
-./MSVC8/ModernDTPR.vsprops\
-./MSVC8/NO_SEC_DEP.vsprops\
-./MSVC8/NON_BSD_DEFINES.vsprops\
-./MSVC8/silex.vcproj\
-./MSVC8/Silo.vcproj\
-./MSVC8/SiloWindows.sln\
+./MSVC9/Tests/alltypes.vcproj\
+./MSVC9/Tests/arbpoly.vcproj\
+./MSVC9/Tests/arbpoly3d.vcproj\
+./MSVC9/Tests/array.vcproj\
+./MSVC9/Tests/array_f.vfproj\
+./MSVC9/Tests/compression.vcproj\
+./MSVC9/Tests/csg.vcproj\
+./MSVC9/Tests/curve_f.vfproj\
+./MSVC9/Tests/dirtest.vcproj\
+./MSVC9/Tests/empty.vcproj\
+./MSVC9/Tests/extface.vcproj\
+./MSVC9/Tests/grab.vcproj\
+./MSVC9/Tests/group_test.vcproj\
+./MSVC9/Tests/largefile.vcproj\
+./MSVC9/Tests/listtypes.vcproj\
+./MSVC9/Tests/mat3d_3across.vcproj\
+./MSVC9/Tests/mat_f.vfproj\
+./MSVC9/Tests/merge_block.vcproj\
+./MSVC9/Tests/mmadjacency.vcproj\
+./MSVC9/Tests/multi_file.vcproj\
+./MSVC9/Tests/multi_test.vcproj\
+./MSVC9/Tests/multispec.vcproj\
+./MSVC9/Tests/namescheme.vcproj\
+./MSVC9/Tests/obj.vcproj\
+./MSVC9/Tests/onehex.vcproj\
+./MSVC9/Tests/oneprism.vcproj\
+./MSVC9/Tests/onepyramid.vcproj\
+./MSVC9/Tests/onetet.vcproj\
+./MSVC9/Tests/partial_io.vcproj\
+./MSVC9/Tests/point.vcproj\
+./MSVC9/Tests/point_f.vfproj\
+./MSVC9/Tests/polyzl.vcproj\
+./MSVC9/Tests/Preparation.vcproj\
+./MSVC9/Tests/quad.vcproj\
+./MSVC9/Tests/quad_f.vfproj\
+./MSVC9/Tests/sami.vcproj\
+./MSVC9/Tests/simple.vcproj\
+./MSVC9/Tests/spec.vcproj\
+./MSVC9/Tests/specmix.vcproj\
+./MSVC9/Tests/subhex.vcproj\
+./MSVC9/Tests/testall.vcproj\
+./MSVC9/Tests/testall_f.vfproj\
+./MSVC9/Tests/testpdb.vcproj\
+./MSVC9/Tests/TestReadMask.vcproj\
+./MSVC9/Tests/twohex.vcproj\
+./MSVC9/Tests/ucd1d.vcproj\
+./MSVC9/Tests/ucd.vcproj\
+./MSVC9/Tests/ucd_f.vfproj\
+./MSVC9/Tests/ucdsamp3.vcproj\
+./MSVC9/Tests/version.vcproj\
+./MSVC9/Tests/wave.vcproj\
+./MSVC9/Tests/Tests.sln\
+./MSVC9/Tests/CopyTestDependencies.bat\
+./MSVC9/Tests/TestIncludes.vsprops\
+./MSVC9/bin/RunTests.bat\
+./MSVC9/pdb_detect/pdb_detect.vcproj\
+./MSVC9/BaseIncludes.vsprops\
+./MSVC9/DepLibs.vsprops\
+./MSVC9/HDF5_Defines.vsprops\
+./MSVC9/ModernDTPR.vsprops\
+./MSVC9/NO_SEC_DEP.vsprops\
+./MSVC9/NON_BSD_DEFINES.vsprops\
+./MSVC9/QT_Defines.vsprops\
+./MSVC9/browser.vcproj\
+./MSVC9/silex.vcproj\
+./MSVC9/Silo.vcproj\
+./MSVC9/SiloWindows.sln\
./include/config.h\
./resources/silex.aps\
./resources/silex.ico\
@@ -126,62 +141,102 @@ EXTRA_DIST = \
./runsilexmoc.bat\
./Makefile.in\
./copysilo.bat\
+./silodiff.bat\
./README\
-./MSVC8-BSD/Tests/alltypes.vcproj\
-./MSVC8-BSD/Tests/array.vcproj\
-./MSVC8-BSD/Tests/array_f.vfproj\
-./MSVC8-BSD/Tests/compression.vcproj\
-./MSVC8-BSD/Tests/csg.vcproj\
-./MSVC8-BSD/Tests/curve_f.vfproj\
-./MSVC8-BSD/Tests/dirtest.vcproj\
-./MSVC8-BSD/Tests/extface.vcproj\
-./MSVC8-BSD/Tests/grab.vcproj\
-./MSVC8-BSD/Tests/group_test.vcproj\
-./MSVC8-BSD/Tests/largefile.vcproj\
-./MSVC8-BSD/Tests/listtypes.vcproj\
-./MSVC8-BSD/Tests/mat3d_3across.vcproj\
-./MSVC8-BSD/Tests/mat_f.vfproj\
-./MSVC8-BSD/Tests/merge_block.vcproj\
-./MSVC8-BSD/Tests/mmadjacency.vcproj\
-./MSVC8-BSD/Tests/multi_file.vcproj\
-./MSVC8-BSD/Tests/multi_test.vcproj\
-./MSVC8-BSD/Tests/multispec.vcproj\
-./MSVC8-BSD/Tests/namescheme.vcproj\
-./MSVC8-BSD/Tests/obj.vcproj\
-./MSVC8-BSD/Tests/onehex.vcproj\
-./MSVC8-BSD/Tests/oneprism.vcproj\
-./MSVC8-BSD/Tests/onepyramid.vcproj\
-./MSVC8-BSD/Tests/onetet.vcproj\
-./MSVC8-BSD/Tests/partial_io.vcproj\
-./MSVC8-BSD/Tests/point.vcproj\
-./MSVC8-BSD/Tests/point_f.vfproj\
-./MSVC8-BSD/Tests/polyzl.vcproj\
-./MSVC8-BSD/Tests/quad.vcproj\
-./MSVC8-BSD/Tests/rocket.vcproj\
-./MSVC8-BSD/Tests/sami.vcproj\
-./MSVC8-BSD/Tests/simple.vcproj\
-./MSVC8-BSD/Tests/spec.vcproj\
-./MSVC8-BSD/Tests/specmix.vcproj\
-./MSVC8-BSD/Tests/subhex.vcproj\
-./MSVC8-BSD/Tests/testall.vcproj\
-./MSVC8-BSD/Tests/testall_f.vfproj\
-./MSVC8-BSD/Tests/TestIncludes.vsprops\
-./MSVC8-BSD/Tests/testpdb.vcproj\
-./MSVC8-BSD/Tests/TestReadMask.vcproj\
-./MSVC8-BSD/Tests/Tests.sln\
-./MSVC8-BSD/Tests/twohex.vcproj\
-./MSVC8-BSD/Tests/ucd1d.vcproj\
-./MSVC8-BSD/Tests/ucd.vcproj\
-./MSVC8-BSD/Tests/ucd_f.vfproj\
-./MSVC8-BSD/Tests/ucdsamp3.vcproj\
-./MSVC8-BSD/Tests/version.vcproj\
-./MSVC8-BSD/Tests/wave.vcproj\
-./MSVC8-BSD/bin/RunTests.bat\
-./MSVC8-BSD/pdb_detect/pdb_detect.vcproj\
-./MSVC8-BSD/BaseIncludes.vsprops\
-./MSVC8-BSD/HDF5_Defines.vsprops\
-./MSVC8-BSD/ModernDTPR.vsprops\
-./MSVC8-BSD/NO_SEC_DEP.vsprops\
-./MSVC8-BSD/silex.vcproj\
-./MSVC8-BSD/Silo.vcproj\
-./MSVC8-BSD/SiloWindows.sln
+./MSVC9-BSD/Tests/alltypes.vcproj\
+./MSVC9-BSD/Tests/arbpoly.vcproj\
+./MSVC9-BSD/Tests/arbpoly3d.vcproj\
+./MSVC9-BSD/Tests/array.vcproj\
+./MSVC9-BSD/Tests/array_f.vfproj\
+./MSVC9-BSD/Tests/compression.vcproj\
+./MSVC9-BSD/Tests/csg.vcproj\
+./MSVC9-BSD/Tests/curve_f.vfproj\
+./MSVC9-BSD/Tests/dirtest.vcproj\
+./MSVC9-BSD/Tests/empty.vcproj\
+./MSVC9-BSD/Tests/extface.vcproj\
+./MSVC9-BSD/Tests/grab.vcproj\
+./MSVC9-BSD/Tests/group_test.vcproj\
+./MSVC9-BSD/Tests/largefile.vcproj\
+./MSVC9-BSD/Tests/listtypes.vcproj\
+./MSVC9-BSD/Tests/mat3d_3across.vcproj\
+./MSVC9-BSD/Tests/mat_f.vfproj\
+./MSVC9-BSD/Tests/merge_block.vcproj\
+./MSVC9-BSD/Tests/mmadjacency.vcproj\
+./MSVC9-BSD/Tests/multi_file.vcproj\
+./MSVC9-BSD/Tests/multi_test.vcproj\
+./MSVC9-BSD/Tests/multispec.vcproj\
+./MSVC9-BSD/Tests/namescheme.vcproj\
+./MSVC9-BSD/Tests/obj.vcproj\
+./MSVC9-BSD/Tests/onehex.vcproj\
+./MSVC9-BSD/Tests/oneprism.vcproj\
+./MSVC9-BSD/Tests/onepyramid.vcproj\
+./MSVC9-BSD/Tests/onetet.vcproj\
+./MSVC9-BSD/Tests/partial_io.vcproj\
+./MSVC9-BSD/Tests/point.vcproj\
+./MSVC9-BSD/Tests/point_f.vfproj\
+./MSVC9-BSD/Tests/polyzl.vcproj\
+./MSVC9-BSD/Tests/Preparation.vcproj\
+./MSVC9-BSD/Tests/quad.vcproj\
+./MSVC9-BSD/Tests/quad_f.vfproj\
+./MSVC9-BSD/Tests/sami.vcproj\
+./MSVC9-BSD/Tests/simple.vcproj\
+./MSVC9-BSD/Tests/spec.vcproj\
+./MSVC9-BSD/Tests/specmix.vcproj\
+./MSVC9-BSD/Tests/subhex.vcproj\
+./MSVC9-BSD/Tests/testall.vcproj\
+./MSVC9-BSD/Tests/testall_f.vfproj\
+./MSVC9-BSD/Tests/testpdb.vcproj\
+./MSVC9-BSD/Tests/TestReadMask.vcproj\
+./MSVC9-BSD/Tests/twohex.vcproj\
+./MSVC9-BSD/Tests/ucd1d.vcproj\
+./MSVC9-BSD/Tests/ucd.vcproj\
+./MSVC9-BSD/Tests/ucd_f.vfproj\
+./MSVC9-BSD/Tests/ucdsamp3.vcproj\
+./MSVC9-BSD/Tests/version.vcproj\
+./MSVC9-BSD/Tests/wave.vcproj\
+./MSVC9-BSD/Tests/Tests.sln\
+./MSVC9-BSD/Tests/CopyTestDependencies.bat\
+./MSVC9-BSD/Tests/TestIncludes.vsprops\
+./MSVC9-BSD/bin/RunTests.bat\
+./MSVC9-BSD/pdb_detect/pdb_detect.vcproj\
+./MSVC9-BSD/BaseIncludes.vsprops\
+./MSVC9-BSD/DepLibs.vsprops\
+./MSVC9-BSD/HDF5_Defines.vsprops\
+./MSVC9-BSD/ModernDTPR.vsprops\
+./MSVC9-BSD/NO_SEC_DEP.vsprops\
+./MSVC9-BSD/QT_Defines.vsprops\
+./MSVC9-BSD/browser.vcproj\
+./MSVC9-BSD/silex.vcproj\
+./MSVC9-BSD/Silo.vcproj\
+./MSVC9-BSD/SiloWindows.sln\
+./MSVC2010/BaseIncludes.props\
+./MSVC2010/DepLibs.props\
+./MSVC2010/HDF5_Defines.props\
+./MSVC2010/ModernDTPR.props\
+./MSVC2010/NON_BSD_DEFINES.props\
+./MSVC2010/NO_SEC_DEP.props\
+./MSVC2010/QT_Defines.props\
+./MSVC2010/Silo.sln\
+./MSVC2010/Silo.vcxproj\
+./MSVC2010/Silo.vcxproj.filters\
+./MSVC2010/browser.vcxproj\
+./MSVC2010/browser.vcxproj.filters\
+./MSVC2010/silex.vcxproj\
+./MSVC2010/silex.vcxproj.filters\
+./MSVC2010/pdb_detect/pdb_detect.vcxproj\
+./MSVC2010/pdb_detect/pdb_detect.vcxproj.filters\
+./MSVC2010-BSD/BaseIncludes.props\
+./MSVC2010-BSD/DepLibs.props\
+./MSVC2010-BSD/HDF5_Defines.props\
+./MSVC2010-BSD/ModernDTPR.props\
+./MSVC2010-BSD/NO_SEC_DEP.props\
+./MSVC2010-BSD/QT_Defines.props\
+./MSVC2010-BSD/Silo.sln\
+./MSVC2010-BSD/Silo.vcxproj\
+./MSVC2010-BSD/Silo.vcxproj.filters\
+./MSVC2010-BSD/browser.vcxproj\
+./MSVC2010-BSD/browser.vcxproj.filters\
+./MSVC2010-BSD/silex.vcxproj\
+./MSVC2010-BSD/silex.vcxproj.filters\
+./MSVC2010-BSD/pdb_detect/pdb_detect.vcxproj\
+./MSVC2010-BSD/pdb_detect/pdb_detect.vcxproj.filters
diff --git a/SiloWindows/Makefile.in b/SiloWindows/Makefile.in
index eed1613..bce4c5d 100644
--- a/SiloWindows/Makefile.in
+++ b/SiloWindows/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -71,10 +72,17 @@
# Modifications:
# Mark C. Miller, Tue Aug 3 17:24:43 PDT 2010
# Ensure a number of silo project files were included.
+#
+# Kathleen Bonnell, Fri Dec 10 10:02:09 PST 2010
+# Add silodiff.bat, browser.vcproj
+#
+# Kathleen Bonnell, Thu Mar 3 10:38:05 PST 2011
+# Add MSVC9 project files.
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -92,12 +100,21 @@ host_triplet = @host@
subdir = SiloWindows
DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/config/ax_check_compiler_flags.m4 \
+ $(top_srcdir)/config/ax_have_qt.m4 \
+ $(top_srcdir)/config/libtool.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
+ $(top_srcdir)/config/vl_lib_readline.m4 \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -127,7 +144,8 @@ CXX_FULLPATH = @CXX_FULLPATH@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -139,6 +157,7 @@ FCFLAGS = @FCFLAGS@
FCLIBS = @FCLIBS@
FC_FULLPATH = @FC_FULLPATH@
FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FORTRAN = @FORTRAN@
FPZIP = @FPZIP@
GREP = @GREP@
@@ -149,17 +168,25 @@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
LDFLAGS = @LDFLAGS@
+LIBM = @LIBM@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
NETCDF = @NETCDF@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -169,7 +196,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PDBP_DRV = @PDBP_DRV@
PDB_DRV = @PDB_DRV@
-PRTDIAG = @PRTDIAG@
PYTHON = @PYTHON@
PYTHONMODULE = @PYTHONMODULE@
PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@
@@ -177,17 +203,13 @@ PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
PYTHON_PLATFORM = @PYTHON_PLATFORM@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
-QT_BIN = @QT_BIN@
-QT_CORE = @QT_CORE@
-QT_CORE_LIB = @QT_CORE_LIB@
QT_CXXFLAGS = @QT_CXXFLAGS@
-QT_GUI = @QT_GUI@
-QT_GUI_LIB = @QT_GUI_LIB@
-QT_INCLUDE = @QT_INCLUDE@
-QT_LDFLAGS = @QT_LDFLAGS@
-QT_LIB = @QT_LIB@
+QT_DIR = @QT_DIR@
QT_LIBS = @QT_LIBS@
+QT_LRELEASE = @QT_LRELEASE@
+QT_LUPDATE = @QT_LUPDATE@
QT_MOC = @QT_MOC@
+QT_UIC = @QT_UIC@
RANLIB = @RANLIB@
READLINE_LIBS = @READLINE_LIBS@
SED = @SED@
@@ -205,6 +227,11 @@ SILO_VERS_TAG = @SILO_VERS_TAG@
STRIP = @STRIP@
TAURUS = @TAURUS@
VERSION = @VERSION@
+XMKMF = @XMKMF@
+X_CFLAGS = @X_CFLAGS@
+X_EXTRA_LIBS = @X_EXTRA_LIBS@
+X_LIBS = @X_LIBS@
+X_PRE_LIBS = @X_PRE_LIBS@
ZLIB = @ZLIB@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
@@ -212,6 +239,7 @@ abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_F77 = @ac_ct_F77@
ac_ct_FC = @ac_ct_FC@
am__include = @am__include@
@@ -244,6 +272,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -260,68 +289,77 @@ sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
EXTRA_DIST = \
-./MSVC8/Tests/alltypes.vcproj\
-./MSVC8/Tests/array.vcproj\
-./MSVC8/Tests/array_f.vfproj\
-./MSVC8/Tests/compression.vcproj\
-./MSVC8/Tests/csg.vcproj\
-./MSVC8/Tests/curve_f.vfproj\
-./MSVC8/Tests/dirtest.vcproj\
-./MSVC8/Tests/extface.vcproj\
-./MSVC8/Tests/grab.vcproj\
-./MSVC8/Tests/group_test.vcproj\
-./MSVC8/Tests/largefile.vcproj\
-./MSVC8/Tests/listtypes.vcproj\
-./MSVC8/Tests/mat3d_3across.vcproj\
-./MSVC8/Tests/mat_f.vfproj\
-./MSVC8/Tests/merge_block.vcproj\
-./MSVC8/Tests/mmadjacency.vcproj\
-./MSVC8/Tests/multi_file.vcproj\
-./MSVC8/Tests/multi_test.vcproj\
-./MSVC8/Tests/multispec.vcproj\
-./MSVC8/Tests/namescheme.vcproj\
-./MSVC8/Tests/obj.vcproj\
-./MSVC8/Tests/onehex.vcproj\
-./MSVC8/Tests/oneprism.vcproj\
-./MSVC8/Tests/onepyramid.vcproj\
-./MSVC8/Tests/onetet.vcproj\
-./MSVC8/Tests/partial_io.vcproj\
-./MSVC8/Tests/point.vcproj\
-./MSVC8/Tests/point_f.vfproj\
-./MSVC8/Tests/polyzl.vcproj\
-./MSVC8/Tests/quad.vcproj\
-./MSVC8/Tests/rocket.vcproj\
-./MSVC8/Tests/sami.vcproj\
-./MSVC8/Tests/simple.vcproj\
-./MSVC8/Tests/spec.vcproj\
-./MSVC8/Tests/specmix.vcproj\
-./MSVC8/Tests/subhex.vcproj\
-./MSVC8/Tests/testall.vcproj\
-./MSVC8/Tests/testall_f.vfproj\
-./MSVC8/Tests/TestIncludes.vsprops\
-./MSVC8/Tests/testpdb.vcproj\
-./MSVC8/Tests/TestReadMask.vcproj\
-./MSVC8/Tests/Tests.sln\
-./MSVC8/Tests/twohex.vcproj\
-./MSVC8/Tests/ucd1d.vcproj\
-./MSVC8/Tests/ucd.vcproj\
-./MSVC8/Tests/ucd_f.vfproj\
-./MSVC8/Tests/ucdsamp3.vcproj\
-./MSVC8/Tests/version.vcproj\
-./MSVC8/Tests/wave.vcproj\
-./MSVC8/bin/RunTests.bat\
-./MSVC8/pdb_detect/pdb_detect.vcproj\
-./MSVC8/BaseIncludes.vsprops\
-./MSVC8/HDF5_Defines.vsprops\
-./MSVC8/ModernDTPR.vsprops\
-./MSVC8/NO_SEC_DEP.vsprops\
-./MSVC8/NON_BSD_DEFINES.vsprops\
-./MSVC8/silex.vcproj\
-./MSVC8/Silo.vcproj\
-./MSVC8/SiloWindows.sln\
+./MSVC9/Tests/alltypes.vcproj\
+./MSVC9/Tests/arbpoly.vcproj\
+./MSVC9/Tests/arbpoly3d.vcproj\
+./MSVC9/Tests/array.vcproj\
+./MSVC9/Tests/array_f.vfproj\
+./MSVC9/Tests/compression.vcproj\
+./MSVC9/Tests/csg.vcproj\
+./MSVC9/Tests/curve_f.vfproj\
+./MSVC9/Tests/dirtest.vcproj\
+./MSVC9/Tests/empty.vcproj\
+./MSVC9/Tests/extface.vcproj\
+./MSVC9/Tests/grab.vcproj\
+./MSVC9/Tests/group_test.vcproj\
+./MSVC9/Tests/largefile.vcproj\
+./MSVC9/Tests/listtypes.vcproj\
+./MSVC9/Tests/mat3d_3across.vcproj\
+./MSVC9/Tests/mat_f.vfproj\
+./MSVC9/Tests/merge_block.vcproj\
+./MSVC9/Tests/mmadjacency.vcproj\
+./MSVC9/Tests/multi_file.vcproj\
+./MSVC9/Tests/multi_test.vcproj\
+./MSVC9/Tests/multispec.vcproj\
+./MSVC9/Tests/namescheme.vcproj\
+./MSVC9/Tests/obj.vcproj\
+./MSVC9/Tests/onehex.vcproj\
+./MSVC9/Tests/oneprism.vcproj\
+./MSVC9/Tests/onepyramid.vcproj\
+./MSVC9/Tests/onetet.vcproj\
+./MSVC9/Tests/partial_io.vcproj\
+./MSVC9/Tests/point.vcproj\
+./MSVC9/Tests/point_f.vfproj\
+./MSVC9/Tests/polyzl.vcproj\
+./MSVC9/Tests/Preparation.vcproj\
+./MSVC9/Tests/quad.vcproj\
+./MSVC9/Tests/quad_f.vfproj\
+./MSVC9/Tests/sami.vcproj\
+./MSVC9/Tests/simple.vcproj\
+./MSVC9/Tests/spec.vcproj\
+./MSVC9/Tests/specmix.vcproj\
+./MSVC9/Tests/subhex.vcproj\
+./MSVC9/Tests/testall.vcproj\
+./MSVC9/Tests/testall_f.vfproj\
+./MSVC9/Tests/testpdb.vcproj\
+./MSVC9/Tests/TestReadMask.vcproj\
+./MSVC9/Tests/twohex.vcproj\
+./MSVC9/Tests/ucd1d.vcproj\
+./MSVC9/Tests/ucd.vcproj\
+./MSVC9/Tests/ucd_f.vfproj\
+./MSVC9/Tests/ucdsamp3.vcproj\
+./MSVC9/Tests/version.vcproj\
+./MSVC9/Tests/wave.vcproj\
+./MSVC9/Tests/Tests.sln\
+./MSVC9/Tests/CopyTestDependencies.bat\
+./MSVC9/Tests/TestIncludes.vsprops\
+./MSVC9/bin/RunTests.bat\
+./MSVC9/pdb_detect/pdb_detect.vcproj\
+./MSVC9/BaseIncludes.vsprops\
+./MSVC9/DepLibs.vsprops\
+./MSVC9/HDF5_Defines.vsprops\
+./MSVC9/ModernDTPR.vsprops\
+./MSVC9/NO_SEC_DEP.vsprops\
+./MSVC9/NON_BSD_DEFINES.vsprops\
+./MSVC9/QT_Defines.vsprops\
+./MSVC9/browser.vcproj\
+./MSVC9/silex.vcproj\
+./MSVC9/Silo.vcproj\
+./MSVC9/SiloWindows.sln\
./include/config.h\
./resources/silex.aps\
./resources/silex.ico\
@@ -331,65 +369,105 @@ EXTRA_DIST = \
./runsilexmoc.bat\
./Makefile.in\
./copysilo.bat\
+./silodiff.bat\
./README\
-./MSVC8-BSD/Tests/alltypes.vcproj\
-./MSVC8-BSD/Tests/array.vcproj\
-./MSVC8-BSD/Tests/array_f.vfproj\
-./MSVC8-BSD/Tests/compression.vcproj\
-./MSVC8-BSD/Tests/csg.vcproj\
-./MSVC8-BSD/Tests/curve_f.vfproj\
-./MSVC8-BSD/Tests/dirtest.vcproj\
-./MSVC8-BSD/Tests/extface.vcproj\
-./MSVC8-BSD/Tests/grab.vcproj\
-./MSVC8-BSD/Tests/group_test.vcproj\
-./MSVC8-BSD/Tests/largefile.vcproj\
-./MSVC8-BSD/Tests/listtypes.vcproj\
-./MSVC8-BSD/Tests/mat3d_3across.vcproj\
-./MSVC8-BSD/Tests/mat_f.vfproj\
-./MSVC8-BSD/Tests/merge_block.vcproj\
-./MSVC8-BSD/Tests/mmadjacency.vcproj\
-./MSVC8-BSD/Tests/multi_file.vcproj\
-./MSVC8-BSD/Tests/multi_test.vcproj\
-./MSVC8-BSD/Tests/multispec.vcproj\
-./MSVC8-BSD/Tests/namescheme.vcproj\
-./MSVC8-BSD/Tests/obj.vcproj\
-./MSVC8-BSD/Tests/onehex.vcproj\
-./MSVC8-BSD/Tests/oneprism.vcproj\
-./MSVC8-BSD/Tests/onepyramid.vcproj\
-./MSVC8-BSD/Tests/onetet.vcproj\
-./MSVC8-BSD/Tests/partial_io.vcproj\
-./MSVC8-BSD/Tests/point.vcproj\
-./MSVC8-BSD/Tests/point_f.vfproj\
-./MSVC8-BSD/Tests/polyzl.vcproj\
-./MSVC8-BSD/Tests/quad.vcproj\
-./MSVC8-BSD/Tests/rocket.vcproj\
-./MSVC8-BSD/Tests/sami.vcproj\
-./MSVC8-BSD/Tests/simple.vcproj\
-./MSVC8-BSD/Tests/spec.vcproj\
-./MSVC8-BSD/Tests/specmix.vcproj\
-./MSVC8-BSD/Tests/subhex.vcproj\
-./MSVC8-BSD/Tests/testall.vcproj\
-./MSVC8-BSD/Tests/testall_f.vfproj\
-./MSVC8-BSD/Tests/TestIncludes.vsprops\
-./MSVC8-BSD/Tests/testpdb.vcproj\
-./MSVC8-BSD/Tests/TestReadMask.vcproj\
-./MSVC8-BSD/Tests/Tests.sln\
-./MSVC8-BSD/Tests/twohex.vcproj\
-./MSVC8-BSD/Tests/ucd1d.vcproj\
-./MSVC8-BSD/Tests/ucd.vcproj\
-./MSVC8-BSD/Tests/ucd_f.vfproj\
-./MSVC8-BSD/Tests/ucdsamp3.vcproj\
-./MSVC8-BSD/Tests/version.vcproj\
-./MSVC8-BSD/Tests/wave.vcproj\
-./MSVC8-BSD/bin/RunTests.bat\
-./MSVC8-BSD/pdb_detect/pdb_detect.vcproj\
-./MSVC8-BSD/BaseIncludes.vsprops\
-./MSVC8-BSD/HDF5_Defines.vsprops\
-./MSVC8-BSD/ModernDTPR.vsprops\
-./MSVC8-BSD/NO_SEC_DEP.vsprops\
-./MSVC8-BSD/silex.vcproj\
-./MSVC8-BSD/Silo.vcproj\
-./MSVC8-BSD/SiloWindows.sln
+./MSVC9-BSD/Tests/alltypes.vcproj\
+./MSVC9-BSD/Tests/arbpoly.vcproj\
+./MSVC9-BSD/Tests/arbpoly3d.vcproj\
+./MSVC9-BSD/Tests/array.vcproj\
+./MSVC9-BSD/Tests/array_f.vfproj\
+./MSVC9-BSD/Tests/compression.vcproj\
+./MSVC9-BSD/Tests/csg.vcproj\
+./MSVC9-BSD/Tests/curve_f.vfproj\
+./MSVC9-BSD/Tests/dirtest.vcproj\
+./MSVC9-BSD/Tests/empty.vcproj\
+./MSVC9-BSD/Tests/extface.vcproj\
+./MSVC9-BSD/Tests/grab.vcproj\
+./MSVC9-BSD/Tests/group_test.vcproj\
+./MSVC9-BSD/Tests/largefile.vcproj\
+./MSVC9-BSD/Tests/listtypes.vcproj\
+./MSVC9-BSD/Tests/mat3d_3across.vcproj\
+./MSVC9-BSD/Tests/mat_f.vfproj\
+./MSVC9-BSD/Tests/merge_block.vcproj\
+./MSVC9-BSD/Tests/mmadjacency.vcproj\
+./MSVC9-BSD/Tests/multi_file.vcproj\
+./MSVC9-BSD/Tests/multi_test.vcproj\
+./MSVC9-BSD/Tests/multispec.vcproj\
+./MSVC9-BSD/Tests/namescheme.vcproj\
+./MSVC9-BSD/Tests/obj.vcproj\
+./MSVC9-BSD/Tests/onehex.vcproj\
+./MSVC9-BSD/Tests/oneprism.vcproj\
+./MSVC9-BSD/Tests/onepyramid.vcproj\
+./MSVC9-BSD/Tests/onetet.vcproj\
+./MSVC9-BSD/Tests/partial_io.vcproj\
+./MSVC9-BSD/Tests/point.vcproj\
+./MSVC9-BSD/Tests/point_f.vfproj\
+./MSVC9-BSD/Tests/polyzl.vcproj\
+./MSVC9-BSD/Tests/Preparation.vcproj\
+./MSVC9-BSD/Tests/quad.vcproj\
+./MSVC9-BSD/Tests/quad_f.vfproj\
+./MSVC9-BSD/Tests/sami.vcproj\
+./MSVC9-BSD/Tests/simple.vcproj\
+./MSVC9-BSD/Tests/spec.vcproj\
+./MSVC9-BSD/Tests/specmix.vcproj\
+./MSVC9-BSD/Tests/subhex.vcproj\
+./MSVC9-BSD/Tests/testall.vcproj\
+./MSVC9-BSD/Tests/testall_f.vfproj\
+./MSVC9-BSD/Tests/testpdb.vcproj\
+./MSVC9-BSD/Tests/TestReadMask.vcproj\
+./MSVC9-BSD/Tests/twohex.vcproj\
+./MSVC9-BSD/Tests/ucd1d.vcproj\
+./MSVC9-BSD/Tests/ucd.vcproj\
+./MSVC9-BSD/Tests/ucd_f.vfproj\
+./MSVC9-BSD/Tests/ucdsamp3.vcproj\
+./MSVC9-BSD/Tests/version.vcproj\
+./MSVC9-BSD/Tests/wave.vcproj\
+./MSVC9-BSD/Tests/Tests.sln\
+./MSVC9-BSD/Tests/CopyTestDependencies.bat\
+./MSVC9-BSD/Tests/TestIncludes.vsprops\
+./MSVC9-BSD/bin/RunTests.bat\
+./MSVC9-BSD/pdb_detect/pdb_detect.vcproj\
+./MSVC9-BSD/BaseIncludes.vsprops\
+./MSVC9-BSD/DepLibs.vsprops\
+./MSVC9-BSD/HDF5_Defines.vsprops\
+./MSVC9-BSD/ModernDTPR.vsprops\
+./MSVC9-BSD/NO_SEC_DEP.vsprops\
+./MSVC9-BSD/QT_Defines.vsprops\
+./MSVC9-BSD/browser.vcproj\
+./MSVC9-BSD/silex.vcproj\
+./MSVC9-BSD/Silo.vcproj\
+./MSVC9-BSD/SiloWindows.sln\
+./MSVC2010/BaseIncludes.props\
+./MSVC2010/DepLibs.props\
+./MSVC2010/HDF5_Defines.props\
+./MSVC2010/ModernDTPR.props\
+./MSVC2010/NON_BSD_DEFINES.props\
+./MSVC2010/NO_SEC_DEP.props\
+./MSVC2010/QT_Defines.props\
+./MSVC2010/Silo.sln\
+./MSVC2010/Silo.vcxproj\
+./MSVC2010/Silo.vcxproj.filters\
+./MSVC2010/browser.vcxproj\
+./MSVC2010/browser.vcxproj.filters\
+./MSVC2010/silex.vcxproj\
+./MSVC2010/silex.vcxproj.filters\
+./MSVC2010/pdb_detect/pdb_detect.vcxproj\
+./MSVC2010/pdb_detect/pdb_detect.vcxproj.filters\
+./MSVC2010-BSD/BaseIncludes.props\
+./MSVC2010-BSD/DepLibs.props\
+./MSVC2010-BSD/HDF5_Defines.props\
+./MSVC2010-BSD/ModernDTPR.props\
+./MSVC2010-BSD/NO_SEC_DEP.props\
+./MSVC2010-BSD/QT_Defines.props\
+./MSVC2010-BSD/Silo.sln\
+./MSVC2010-BSD/Silo.vcxproj\
+./MSVC2010-BSD/Silo.vcxproj.filters\
+./MSVC2010-BSD/browser.vcxproj\
+./MSVC2010-BSD/browser.vcxproj.filters\
+./MSVC2010-BSD/silex.vcxproj\
+./MSVC2010-BSD/silex.vcxproj.filters\
+./MSVC2010-BSD/pdb_detect/pdb_detect.vcxproj\
+./MSVC2010-BSD/pdb_detect/pdb_detect.vcxproj.filters
all: all-am
@@ -398,14 +476,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
- && exit 0; \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign SiloWindows/Makefile'; \
- cd $(top_srcdir) && \
- $(AUTOMAKE) --foreign SiloWindows/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign SiloWindows/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --foreign SiloWindows/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -423,6 +501,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
mostlyclean-libtool:
-rm -f *.lo
@@ -452,13 +531,17 @@ distdir: $(DISTFILES)
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
if test -d $$d/$$file; then \
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
@@ -486,6 +569,7 @@ clean-generic:
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -504,6 +588,8 @@ dvi-am:
html: html-am
+html-am:
+
info: info-am
info-am:
@@ -512,18 +598,28 @@ install-data-am:
install-dvi: install-dvi-am
+install-dvi-am:
+
install-exec-am:
install-html: install-html-am
+install-html-am:
+
install-info: install-info-am
+install-info-am:
+
install-man:
install-pdf: install-pdf-am
+install-pdf-am:
+
install-ps: install-ps-am
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-am
@@ -557,6 +653,7 @@ uninstall-am:
maintainer-clean-generic mostlyclean mostlyclean-generic \
mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/SiloWindows/README b/SiloWindows/README
index 95de1ea..4ab3ca6 100644
--- a/SiloWindows/README
+++ b/SiloWindows/README
@@ -1,89 +1,64 @@
- Building Silo using Microsoft Visual C++ version 8.0
+ Building Silo using Microsoft Visual C++ version 9.0 (2008)
+ or 10.0 (2010)
===========================================================
-This guide contains instructions for building Silo using MSVC 8.0
+This guide contains instructions for building Silo using MSVC 9.0 or 10
on a computer running MS Windows. While the Silo source code should build using
-other compilers, we only provide project files and support for MSVC and 8.0.
+other compilers, we only provide project files and support for MSVC and 9.0 or
+10.0.
What gets built
===============
+* Silo shared libraries (silohdf5.dll and silohdf5.lib) with HDF5 support.
+* Silex.exe
+* Browser.exe
-Two project files are provided: Silo and Silex. There are 8 configuration
-options within the solution: combinations of debug or release, static or dll,
-with hdf5 or without. (e.g. DLLwithHDF5 Debug, DLLWithHDF5 Release, StaticLib
-Debug, StaticLib Release, etc.)
+When developing applications that use Silo, be sure to link your application
+with the silohdf5.lib import library. This resolves the symbols that come from
+the Silo DLL at runtime. Then be sure that silohdf5.dll is in your path when
+you run your application. Be sure to also link with the hdf5dll.lib, szlibdll.lib and zlib1.lib).
-The DLL configurations build Silo as a dynamic link library, while the
-StaticLib configurations build Silo as a static library.
-
-The configuration ending in 'WithHDF5' build Silo with the HDF5 driver.
-When the Silo DLL is built, an import library called silo.lib is also created.
-When developing applications that use the Silo DLL, be sure to link your
-application with the silo.lib import library. This resolves the symbols that
-come from the Silo DLL at runtime.
-
-Then be sure that silo.dll is in your path when you run your application.
-The HDF5 versions append 'hdf5' to the name: silohdf5.lib, silohdf5.dll.
-
-When using the static library version of Silo, link your applications with the
-silo.lib produced by the build of the static library.
-
-When linking against the 'WithHDF5' versions, be sure to also link with the
-appropriate hdf5 lib (hdf5.lib for static or hdf5dll.lib). HDF5 also has a
-dependency on zlib, so you must also link your applications with that.
+*** As of Silo 4.9, PERL is required in order to generate the lite versions ***
+*** of pdb.h and score.h Make sure PERL is in your PATH, or edit your ***
+*** Visual Studio settings to include perl's path in your Executables ***
Build instructions
==================
-1. Run the copysilo.bat file in the SiloWindows subdirectory.
-
-2. The solution and project files are found in the SiloWindows subdirectory of
- the silo source tree. There is a subdirectory for MSVC8 project file. In
+1. The solution and project files are found in the SiloWindows subdirectory of
+ the silo source tree. There is a subdirectory for MSVC9 project files. In
addition there are subdirectories for special includes and resource files
necessary for the build process.
-3. Environment variables need to be defined:
- ZLIB_INC_DIR path to zlib include directory
- ZLIB_LIB_DIR path to zlib library files
- ZLIB_LIB_DIR_STATIC path to static zlib library files
+2. Edit the DepLibs.vsprops file to use proper values for:
+ ZLIB_INC_DIR path to zlib include directory
+ ZLIB_LIB_DIR path to zlib library files
+ ZLIB_LIB_DIR_x64 path to zlib 64bit library files
-4. If building silo with HDF5 support, you must define a few environment
- variables so that the compiler can find the necessary files
-
- HDF5_INC_DIR path to the HDF5 incude directory (where headers are
- located)
- HDF5_LIB_DIR path to location of HDF5 libs
- HDF5_LIB_DIR_STATIC path to location of static HDF5 libs
+ HDF5_INC_DIR path to the HDF5 incude directory
+ HDF5_LIB_DIR path to location of HDF5 libs
+ HDF5_LIB_DIR_x64 path to location of HDF5 64bit libs
- SZIP_INC_DIR path to the szip incude directory (where headers are
- located)
- SZIP_LIB_DIR path to location of szip libs
- SZIP_LIB_DIR_STATIC path to location of static szip libs
-
-5. Silex is built by default after Silo completes, and it also requires an
- evironment variable to be defined:
- QT_DIR path to the Qt directory.
- If you do not have Qt or simply choose not to build Silex, you can remove
+ SZIP_INC_DIR path to the szip incude directory
+ SZIP_LIB_DIR path to location of szip libs
+ SZIP_LIB_DIR_x64 path to location of szip 64bit libs
+
+ And, if building silex:
+
+ QT_INC_DIR path to the Qt incude directory
+ QT_LIB_DIR path to location of Qt libs
+ QT_LIB_DIR_x64 path to location of Qt 64bit libs
+
+3. If you do not have Qt or simply choose not to build Silex, you can remove
it from the build process by opening the Configuration Management window
(Once Visual Studio is open). To do so, right-click the solution name,
Unselect the silex project for the configuration you will be building.
-6. Open VisualStudio and the SiloWindows solution file located in
- the MSVC8 subdirectory of SiloWindows.
-
-7. Choose the build configuration that is appropriate for your needs. Most
- users should choose the DLL and only build the Release version.
- To change the active build configuration, select Build->Select active
- configuration from the main menu and choose the desired build configuration
- from the available list.
-
-8. Build the Silo library. If you are building the Silo DLL, both silo.dll and
- silo.lib are placed in the subdirectory for the selected build configuration.
- Those directories are:
+4. Open the solution file, choose a configuration and build.
- SiloWindows\MSVC8\<ConfigurationName)
- e.g.
+5. The generated files will be placed in the subdirectory for the selected
+ build configuration.
- SiloWindows\MSVC8\DLLwithHDF5_Debug
- SiloWindows\MSVC8\DLLwithHDF5_Release
+ SiloWindows\MSVC9\Win32\Release
+ SiloWindows\MSVC9\x64\Release
diff --git a/SiloWindows/copysilo.bat b/SiloWindows/copysilo.bat
index 9d2f445..7c6689a 100644
--- a/SiloWindows/copysilo.bat
+++ b/SiloWindows/copysilo.bat
@@ -5,17 +5,69 @@ set SiloOut=.\\include\\silo.h
set VersionOut=.\\include\\siloversion.h
set major=0
set minor=0
-set patch=0
+set patch=
set pre=
+set versionfile=.\\..\\VERSION
+set dotpatch=
+set dotpre=
+set underpatch=
+set underpre=
REM Retrieve and parse the version tokens
-for /F "tokens=1,2,3* delims=.,-pre" %%i in (.\\..\\VERSION) do (
- Set major=%%i
- Set minor=%%j
- Set patch=%%k
- Set pre=%%l
+findstr ".*\..*\..*-pre.*" %versionfile% > Nul
+if %errorlevel%==0 (
+ REM "found Major.Minor.Patch-Pre: major.minor.patch-pre"
+ for /F "tokens=1,2,3* delims=.,-pre" %%i in (%versionfile%) do (
+ Set major=%%i
+ Set minor=%%j
+ Set patch=%%k
+ Set pre=%%l
+ set dotpatch=.%%k
+ set dotpre=-pre%%l
+ set underpatch=_%%k
+ set underpre=_pre%%l
+ )
+ goto parsedversion
+)
+
+findstr ".*\..*\..*" %versionfile% > Nul
+if %errorlevel%==0 (
+ REM "found Major.Minor.Patch: major.minor.patch"
+ for /F "tokens=1,2,3* delims=.,-pre" %%i in (%versionfile%) do (
+ Set major=%%i
+ Set minor=%%j
+ Set patch=%%k
+ set dotpatch=.%%k
+ set underpatch=_%%k
+ )
+ goto parsedversion
+)
+
+findstr ".*\..*-pre.*" %versionfile% > Nul
+if %errorlevel%==0 (
+ REM "found Major.Minor-Pre: major.minor-pre"
+ for /F "tokens=1,2,3* delims=.,-pre" %%i in (%versionfile%) do (
+ Set major=%%i
+ Set minor=%%j
+ Set pre=%%k
+ set dotpre=-pre%%k
+ set underpre=_pre%%k
+ )
+ goto parsedversion
+)
+
+findstr ".*\..*" %versionfile% > Nul
+if %errorlevel%==0 (
+ REM "found Major.Minor: major.minor"
+ for /F "tokens=1,2,3* delims=.,-pre" %%i in (%versionfile%) do (
+ Set major=%%i
+ Set minor=%%j
+ )
+ goto parsedversion
)
+:parsedversion
+
if exist %SiloOut% (
del %SiloOut%
)
@@ -42,19 +94,13 @@ for /F "tokens=1* delims=]" %%i in ('find /v /n "" ^.\..\src\silo\silo.h.in') do
) else if "%%B"=="SILO_VERS_PRE" (
@echo %%A%pre%>> %SiloOut%
) else if "%%B"=="SILO_VERS_TAG" (
- if "%pre%"=="" (
- @echo %%A Silo_version_%major%_%minor%_%patch%>> %SiloOut%
- ) else (
- @echo %%A Silo_version_%major%_%minor%_%patch%_pre%pre%>> %SiloOut%
- )
+ @echo %%A Silo_version_%major%_%minor%%underpatch%%underpre%>> %SiloOut%
) else if "%%B"=="SILO_DTYPPTR" (
@echo %%Avoid%%C>> %SiloOut%
) else if "%%B"=="SILO_DTYPPTR1" (
@echo %%Avoid*%%C>> %SiloOut%
) else if "%%B"=="SILO_DTYPPTR2" (
@echo %%Avoid*%%C>> %SiloOut%
- ) else if "%%B"=="DB_LONG_LONG_DEF" (
- @echo %%A22%%C>> %SiloOut%
) else (
if not "%%C"=="" (
@echo %%A%%B%%C>> %SiloOut%
@@ -68,14 +114,8 @@ for /F "tokens=1* delims=]" %%i in ('find /v /n "" ^.\..\src\silo\silo.h.in') do
)
)
-if "%pre%"=="" (
- @echo #define PACKAGE_STRING "silo %major%.%minor%.%patch%>> %VersionOut%
- @echo #define PACKAGE_VERSION "%major%.%minor%.%patch%>> %VersionOut%
- @echo #define VERSION "%major%.%minor%.%patch%>> %VersionOut%
-) else (
- @echo #define PACKAGE_STRING "silo %major%.%minor%.%patch%-pre%pre%">> %VersionOut%
- @echo #define PACKAGE_VERSION "%major%.%minor%.%patch%-pre%pre%">> %VersionOut%
- @echo #define VERSION "%major%.%minor%.%patch%-pre%pre%">> %VersionOut%
-)
+ at echo #define PACKAGE_STRING "silo %major%.%minor%%dotpatch%%dotpre%" >> %VersionOut%
+ at echo #define PACKAGE_VERSION "%major%.%minor%%dotpatch%%dotpre%" >> %VersionOut%
+ at echo #define SILO_VERSION "%major%.%minor%%dotpatch%%dotpre%" >> %VersionOut%
diff --git a/SiloWindows/include/config.h b/SiloWindows/include/config.h
index fe1dbd1..53b8f02 100644
--- a/SiloWindows/include/config.h
+++ b/SiloWindows/include/config.h
@@ -13,7 +13,7 @@
#define FC_FUNC(name,NAME) NAME
/* As FC_FUNC, but for C identifiers containing underscores. */
-/*#define SILO_FC_FUNC_(name,NAME) name ## _*/
+/*#define FC_FUNC_(name,NAME) name ## _*/
/* Define to 1 if you have the <dlfcn.h> header file. */
/* #define HAVE_DLFCN_H 1 */
@@ -42,6 +42,9 @@
/* System provides fprintf prototypes */
#define HAVE_FPRINTF_POINTER 1
+/* Support for Lindstrom float array compression */
+#undef HAVE_FPZIP
+
/* System provides fread prototypes */
#define HAVE_FREAD_POINTER 1
@@ -54,10 +57,20 @@
/* System provides fwrite prototypes */
#define HAVE_FWRITE_POINTER 1
+/* Support for HDF5 */
+/* This gets defined in the Visual Studio Project Files for the HDF5 build option */
+/* #undef HAVE_HDF5_DRIVER */
+
+/* Define to 1 if you have the <hdf5.h> header file. */
+/* This gets defined in the Visual Studio Project files for the HDF5 build option */
+/* #undef HAVE_HDF5_H */
/* Define to 1 if you have the <history.h> header file. */
/* #undef HAVE_HISTORY_H */
+/* Support for Lindstrom hex/quad mesh compression */
+/* #undef HAVE_HZIP */
+
/* Define to 1 if you have the <ieeefp.h> header file. */
/* #undef HAVE_IEEEFP_H */
@@ -67,8 +80,9 @@
/* Define to 1 if you have the `isnan' function. */
#define HAVE_ISNAN 1
-/* Define to 1 if you have the `hdf5' library (-lhdf5). */
-#define HAVE_LIBHDF5 1
+/* Define to 1 if you have the `hdf5' library (-lhdf5). */
+/* This gets defined in the Visual Studio project file for the HDF5 configuration */
+/* #define HAVE_LIBHDF5 1 */
/* Define if you have a readline compatible library */
#define HAVE_LIBREADLINE 1
@@ -88,7 +102,10 @@
#define HAVE_MEMORY_H 1
/* Support for NetCDF */
-/* #define HAVE_NETCDF_DRIVER 1 */
+/* #undef HAVE_NETCDF_DRIVER */
+
+/* Support for PDB Proper */
+/* #undef HAVE_PDBP_DRIVER */
/* Support for PDB */
#define HAVE_PDB_DRIVER 1
@@ -97,13 +114,13 @@
/* #undef HAVE_READLINE_H */
/* Define if your readline library has \`add_history' */
-/* #define HAVE_READLINE_HISTORY 1 */
+/* #undef HAVE_READLINE_HISTORY */
/* Define to 1 if you have the <readline/history.h> header file. */
-/* #define HAVE_READLINE_HISTORY_H 1 */
+/* #undef HAVE_READLINE_HISTORY_H */
/* Define to 1 if you have the <readline/readline.h> header file. */
-/* #define HAVE_READLINE_READLINE_H 1 */
+/* #undef HAVE_READLINE_READLINE_H */
/* System provides setvbuf prototypes */
#define HAVE_SETVBUF_POINTER 1
@@ -112,7 +129,7 @@
#define HAVE_STDARG_H 1
/* Define to 1 if you have the <stdint.h> header file. */
-/* #define HAVE_STDINT_H 1 */
+/* #undef HAVE_STDINT_H */
/* Define to 1 if you have the <stdlib.h> header file. */
#define HAVE_STDLIB_H 1
@@ -121,19 +138,19 @@
#define HAVE_STRERROR 1
/* Define to 1 if you have the <strings.h> header file. */
-/* #define HAVE_STRINGS_H 1 */
+/* #undef HAVE_STRINGS_H */
/* Define to 1 if you have the <string.h> header file. */
#define HAVE_STRING_H 1
/* Define to 1 if you have the <sys/fcntl.h> header file. */
-/* #define HAVE_SYS_FCNTL_H 1 */
+/* #undef HAVE_SYS_FCNTL_H */
/* Define to 1 if you have the <sys/stat.h> header file. */
#define HAVE_SYS_STAT_H 1
/* Define to 1 if you have the <sys/time.h> header file. */
-/* #define HAVE_SYS_TIME_H 1 */
+/* #undef HAVE_SYS_TIME_H */
/* Define to 1 if you have the <sys/types.h> header file. */
#define HAVE_SYS_TYPES_H 1
@@ -142,13 +159,11 @@
#define HAVE_TAURUS_DRIVER 1
/* Define to 1 if you have the <unistd.h> header file. */
-/* #define HAVE_UNISTD_H 1 */
+/* #undef HAVE_UNISTD_H */
/* Define to 1 if you have the <zlib.h> header file. */
#define HAVE_ZLIB_H 1
-#define SILO_LONG_LONG __int64
-
/* Name of package */
#define PACKAGE "silo"
@@ -158,6 +173,9 @@
/* Define to the full name of this package. */
#define PACKAGE_NAME "silo"
+/* Define to the full name and version of this package. */
+/* #undef PACKAGE_STRING */
+
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "silo"
diff --git a/SiloWindows/runsilexmoc.bat b/SiloWindows/runsilexmoc.bat
index 4bbd26f..241390c 100644
--- a/SiloWindows/runsilexmoc.bat
+++ b/SiloWindows/runsilexmoc.bat
@@ -1,5 +1,5 @@
@echo off
-set MOC=%QTDIR%\bin\moc.exe
+set MOC=%1\moc.exe
set SILEX=..\..\tools\silex
diff --git a/SiloWindows/silodiff.bat b/SiloWindows/silodiff.bat
new file mode 100644
index 0000000..e426746
--- /dev/null
+++ b/SiloWindows/silodiff.bat
@@ -0,0 +1,25 @@
+ at echo off
+:: /**** usage: silodiff.bat file1 file2
+:: file1 becomes %1
+:: file2 becomes %2
+
+:: make sure we have two files on the command line
+:: well actually, this simply checks for the existence of two args on the
+:: command line, no error-checking, but browser will error out if
+:: the args aren't correct
+
+if "%1"=="" goto Usage
+if "%2"=="" goto Usage
+goto RunBrowser
+
+:Usage
+echo usage: silodiff.bat file1 file2
+goto end
+
+:RunBrowser
+:: %~dp0 contains the path to this batch file, and should also be
+:: the location where browser.exe exists.
+
+%~dp0\browser.exe -e diff %1 %2
+
+:end
diff --git a/VERSION b/VERSION
index ef216a5..5b341fd 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-4.8
+4.9.1
diff --git a/aclocal.m4 b/aclocal.m4
index 263311a..e3362e6 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.10 -*- Autoconf -*-
+# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006 Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -11,7316 +11,15 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
-m4_if(m4_PACKAGE_VERSION, [2.61],,
-[m4_fatal([this file was generated for autoconf 2.61.
-You have another version of autoconf. If you want to use that,
-you should regenerate the build system entirely.], [63])])
+m4_ifndef([AC_AUTOCONF_VERSION],
+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],,
+[m4_warning([this file was generated for autoconf 2.63.
+You have another version of autoconf. It may work, but is not guaranteed to.
+If you have problems, you may need to regenerate the build system entirely.
+To do so, use the procedure documented by the package, typically `autoreconf'.])])
-#
-# SYNOPSIS
-#
-# AX_CC_MAXOPT
-#
-# DESCRIPTION
-#
-# Try to turn on "good" C optimization flags for various compilers
-# and architectures, for some definition of "good". (In our case,
-# good for FFTW and hopefully for other scientific codes. Modify as
-# needed.)
-#
-# The user can override the flags by setting the CFLAGS environment
-# variable. The user can also specify --enable-portable-binary in
-# order to disable any optimization flags that might result in a
-# binary that only runs on the host architecture.
-#
-# Note also that the flags assume that ANSI C aliasing rules are
-# followed by the code (e.g. for gcc's -fstrict-aliasing), and that
-# floating-point computations can be re-ordered as needed.
-#
-# Requires macros: AX_CHECK_COMPILER_FLAGS, AX_COMPILER_VENDOR,
-# AX_GCC_ARCHFLAG, AX_GCC_X86_CPUID.
-#
-# LAST MODIFICATION
-#
-# 2007-07-29
-#
-# COPYLEFT
-#
-# Copyright (c) 2007 Steven G. Johnson <stevenj at alum.mit.edu>
-# Copyright (c) 2007 Matteo Frigo
-#
-# This program is free software: you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see
-# <http://www.gnu.org/licenses/>.
-#
-# As a special exception, the respective Autoconf Macro's copyright
-# owner gives unlimited permission to copy, distribute and modify the
-# configure scripts that are the output of Autoconf when processing
-# the Macro. You need not follow the terms of the GNU General Public
-# License when using or distributing such scripts, even though
-# portions of the text of the Macro appear in them. The GNU General
-# Public License (GPL) does govern all other use of the material that
-# constitutes the Autoconf Macro.
-#
-# This special exception to the GPL applies to versions of the
-# Autoconf Macro released by the Autoconf Macro Archive. When you
-# make and distribute a modified version of the Autoconf Macro, you
-# may extend this special exception to the GPL to apply to your
-# modified version as well.
-
-AC_DEFUN([AX_CC_MAXOPT],
-[
-AC_REQUIRE([AC_PROG_CC])
-AC_REQUIRE([AX_COMPILER_VENDOR])
-AC_REQUIRE([AC_CANONICAL_HOST])
-
-AC_ARG_ENABLE(portable-binary, [AC_HELP_STRING([--enable-portable-binary], [disable compiler optimizations that would produce unportable binaries])],
- acx_maxopt_portable=$withval, acx_maxopt_portable=no)
-
-# Try to determine "good" native compiler flags if none specified via CFLAGS
-if test "$ac_test_CFLAGS" != "set"; then
- CFLAGS=""
- case $ax_cv_c_compiler_vendor in
- dec) CFLAGS="-newc -w0 -O5 -ansi_alias -ansi_args -fp_reorder -tune host"
- if test "x$acx_maxopt_portable" = xno; then
- CFLAGS="$CFLAGS -arch host"
- fi;;
-
- sun) CFLAGS="-native -fast -xO5 -dalign"
- if test "x$acx_maxopt_portable" = xyes; then
- CFLAGS="$CFLAGS -xarch=generic"
- fi;;
-
- hp) CFLAGS="+Oall +Optrs_ansi +DSnative"
- if test "x$acx_maxopt_portable" = xyes; then
- CFLAGS="$CFLAGS +DAportable"
- fi;;
-
- ibm) if test "x$acx_maxopt_portable" = xno; then
- xlc_opt="-qarch=auto -qtune=auto"
- else
- xlc_opt="-qtune=auto"
- fi
- AX_CHECK_COMPILER_FLAGS($xlc_opt,
- CFLAGS="-O3 -qansialias -w $xlc_opt",
- [CFLAGS="-O3 -qansialias -w"
- echo "******************************************************"
- echo "* You seem to have the IBM C compiler. It is *"
- echo "* recommended for best performance that you use: *"
- echo "* *"
- echo "* CFLAGS=-O3 -qarch=xxx -qtune=xxx -qansialias -w *"
- echo "* ^^^ ^^^ *"
- echo "* where xxx is pwr2, pwr3, 604, or whatever kind of *"
- echo "* CPU you have. (Set the CFLAGS environment var. *"
- echo "* and re-run configure.) For more info, man cc. *"
- echo "******************************************************"])
- ;;
-
- intel) CFLAGS="-O3 -ansi_alias"
- if test "x$acx_maxopt_portable" = xno; then
- icc_archflag=unknown
- icc_flags=""
- case $host_cpu in
- i686*|x86_64*)
- # icc accepts gcc assembly syntax, so these should work:
- AX_GCC_X86_CPUID(0)
- AX_GCC_X86_CPUID(1)
- case $ax_cv_gcc_x86_cpuid_0 in # see AX_GCC_ARCHFLAG
- *:756e6547:*:*) # Intel
- case $ax_cv_gcc_x86_cpuid_1 in
- *6a?:*[[234]]:*:*|*6[[789b]]?:*:*:*) icc_flags="-xK";;
- *f3[[347]]:*:*:*|*f4[1347]:*:*:*) icc_flags="-xP -xN -xW -xK";;
- *f??:*:*:*) icc_flags="-xN -xW -xK";;
- esac ;;
- esac ;;
- esac
- if test "x$icc_flags" != x; then
- for flag in $icc_flags; do
- AX_CHECK_COMPILER_FLAGS($flag, [icc_archflag=$flag; break])
- done
- fi
- AC_MSG_CHECKING([for icc architecture flag])
- AC_MSG_RESULT($icc_archflag)
- if test "x$icc_archflag" != xunknown; then
- CFLAGS="$CFLAGS $icc_archflag"
- fi
- fi
- ;;
-
- gnu)
- # default optimization flags for gcc on all systems
- CFLAGS="-O3 -fomit-frame-pointer"
-
- # -malign-double for x86 systems
- AX_CHECK_COMPILER_FLAGS(-malign-double, CFLAGS="$CFLAGS -malign-double")
-
- # -fstrict-aliasing for gcc-2.95+
- AX_CHECK_COMPILER_FLAGS(-fstrict-aliasing,
- CFLAGS="$CFLAGS -fstrict-aliasing")
-
- # note that we enable "unsafe" fp optimization with other compilers, too
- AX_CHECK_COMPILER_FLAGS(-ffast-math, CFLAGS="$CFLAGS -ffast-math")
-
- AX_GCC_ARCHFLAG($acx_maxopt_portable)
- ;;
- esac
-
- if test -z "$CFLAGS"; then
- echo ""
- echo "********************************************************"
- echo "* WARNING: Don't know the best CFLAGS for this system *"
- echo "* Use ./configure CFLAGS=... to specify your own flags *"
- echo "* (otherwise, a default of CFLAGS=-O3 will be used) *"
- echo "********************************************************"
- echo ""
- CFLAGS="-O3"
- fi
-
- AX_CHECK_COMPILER_FLAGS($CFLAGS, [], [
- echo ""
- echo "********************************************************"
- echo "* WARNING: The guessed CFLAGS don't seem to work with *"
- echo "* your compiler. *"
- echo "* Use ./configure CFLAGS=... to specify your own flags *"
- echo "********************************************************"
- echo ""
- CFLAGS=""
- ])
-
-fi
-])
-
-#
-# SYNOPSIS
-#
-# AX_CHECK_COMPILER_FLAGS(FLAGS, [ACTION-SUCCESS], [ACTION-FAILURE])
-#
-# DESCRIPTION
-#
-# Check whether the given compiler FLAGS work with the current
-# language's compiler, or whether they give an error. (Warnings,
-# however, are ignored.)
-#
-# ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on
-# success/failure.
-#
-# LAST MODIFICATION
-#
-# 2007-07-29
-#
-# COPYLEFT
-#
-# Copyright (c) 2007 Steven G. Johnson <stevenj at alum.mit.edu>
-# Copyright (c) 2007 Matteo Frigo
-#
-# This program is free software: you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see
-# <http://www.gnu.org/licenses/>.
-#
-# As a special exception, the respective Autoconf Macro's copyright
-# owner gives unlimited permission to copy, distribute and modify the
-# configure scripts that are the output of Autoconf when processing
-# the Macro. You need not follow the terms of the GNU General Public
-# License when using or distributing such scripts, even though
-# portions of the text of the Macro appear in them. The GNU General
-# Public License (GPL) does govern all other use of the material that
-# constitutes the Autoconf Macro.
-#
-# This special exception to the GPL applies to versions of the
-# Autoconf Macro released by the Autoconf Macro Archive. When you
-# make and distribute a modified version of the Autoconf Macro, you
-# may extend this special exception to the GPL to apply to your
-# modified version as well.
-
-AC_DEFUN([AX_CHECK_COMPILER_FLAGS],
-[AC_PREREQ(2.59) dnl for _AC_LANG_PREFIX
-AC_MSG_CHECKING([whether _AC_LANG compiler accepts $1])
-dnl Some hackery here since AC_CACHE_VAL can't handle a non-literal varname:
-AS_LITERAL_IF([$1],
- [AC_CACHE_VAL(AS_TR_SH(ax_cv_[]_AC_LANG_ABBREV[]_flags_$1), [
- ax_save_FLAGS=$[]_AC_LANG_PREFIX[]FLAGS
- _AC_LANG_PREFIX[]FLAGS="$1"
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM()],
- AS_TR_SH(ax_cv_[]_AC_LANG_ABBREV[]_flags_$1)=yes,
- AS_TR_SH(ax_cv_[]_AC_LANG_ABBREV[]_flags_$1)=no)
- _AC_LANG_PREFIX[]FLAGS=$ax_save_FLAGS])],
- [ax_save_FLAGS=$[]_AC_LANG_PREFIX[]FLAGS
- _AC_LANG_PREFIX[]FLAGS="$1"
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM()],
- eval AS_TR_SH(ax_cv_[]_AC_LANG_ABBREV[]_flags_$1)=yes,
- eval AS_TR_SH(ax_cv_[]_AC_LANG_ABBREV[]_flags_$1)=no)
- _AC_LANG_PREFIX[]FLAGS=$ax_save_FLAGS])
-eval ax_check_compiler_flags=$AS_TR_SH(ax_cv_[]_AC_LANG_ABBREV[]_flags_$1)
-AC_MSG_RESULT($ax_check_compiler_flags)
-if test "x$ax_check_compiler_flags" = xyes; then
- m4_default([$2], :)
-else
- m4_default([$3], :)
-fi
-])dnl AX_CHECK_COMPILER_FLAGS
-
-#
-# SYNOPSIS
-#
-# AX_COMPILER_VENDOR
-#
-# DESCRIPTION
-#
-# Determine the vendor of the C/C++ compiler, e.g., gnu, intel, ibm,
-# sun, hp, borland, comeau, dec, cray, kai, lcc, metrowerks, sgi,
-# microsoft, watcom, etc. The vendor is returned in the cache
-# variable $ax_cv_c_compiler_vendor for C and
-# $ax_cv_cxx_compiler_vendor for C++.
-#
-# LAST MODIFICATION
-#
-# 2007-08-01
-#
-# COPYLEFT
-#
-# Copyright (c) 2007 Steven G. Johnson <stevenj at alum.mit.edu>
-# Copyright (c) 2007 Matteo Frigo
-#
-# This program is free software: you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see
-# <http://www.gnu.org/licenses/>.
-#
-# As a special exception, the respective Autoconf Macro's copyright
-# owner gives unlimited permission to copy, distribute and modify the
-# configure scripts that are the output of Autoconf when processing
-# the Macro. You need not follow the terms of the GNU General Public
-# License when using or distributing such scripts, even though
-# portions of the text of the Macro appear in them. The GNU General
-# Public License (GPL) does govern all other use of the material that
-# constitutes the Autoconf Macro.
-#
-# This special exception to the GPL applies to versions of the
-# Autoconf Macro released by the Autoconf Macro Archive. When you
-# make and distribute a modified version of the Autoconf Macro, you
-# may extend this special exception to the GPL to apply to your
-# modified version as well.
-
-AC_DEFUN([AX_COMPILER_VENDOR],
-[
-AC_CACHE_CHECK([for _AC_LANG compiler vendor], ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor,
- [ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor=unknown
- # note: don't check for gcc first since some other compilers define __GNUC__
- for ventest in intel:__ICC,__ECC,__INTEL_COMPILER ibm:__xlc__,__xlC__,__IBMC__,__IBMCPP__ pathscale:__PATHCC__,__PATHSCALE__ gnu:__GNUC__ sun:__SUNPRO_C,__SUNPRO_CC hp:__HP_cc,__HP_aCC dec:__DECC,__DECCXX,__DECC_VER,__DECCXX_VER borland:__BORLANDC__,__TURBOC__ comeau:__COMO__ cray:_CRAYC kai:__KCC lcc:__LCC__ metrowerks:__MWERKS__ sgi:__sgi,sgi microsoft:_MSC_VER watcom:__WATCOMC__ portland:__PGI; do
- vencpp="defined("`echo $ventest | cut -d: -f2 | sed 's/,/) || defined(/g'`")"
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM(,[
-#if !($vencpp)
- thisisanerror;
-#endif
-])], [ax_cv_]_AC_LANG_ABBREV[_compiler_vendor=`echo $ventest | cut -d: -f1`; break])
- done
- ])
-])
-
-#
-# SYNOPSIS
-#
-# AX_GCC_ARCHFLAG([PORTABLE?], [ACTION-SUCCESS], [ACTION-FAILURE])
-#
-# DESCRIPTION
-#
-# This macro tries to guess the "native" arch corresponding to the
-# target architecture for use with gcc's -march=arch or -mtune=arch
-# flags. If found, the cache variable $ax_cv_gcc_archflag is set to
-# this flag and ACTION-SUCCESS is executed; otherwise
-# $ax_cv_gcc_archflag is is set to "unknown" and ACTION-FAILURE is
-# executed. The default ACTION-SUCCESS is to add $ax_cv_gcc_archflag
-# to the end of $CFLAGS.
-#
-# PORTABLE? should be either [yes] (default) or [no]. In the former
-# case, the flag is set to -mtune (or equivalent) so that the
-# architecture is only used for tuning, but the instruction set used
-# is still portable. In the latter case, the flag is set to -march
-# (or equivalent) so that architecture-specific instructions are
-# enabled.
-#
-# The user can specify --with-gcc-arch=<arch> in order to override
-# the macro's choice of architecture, or --without-gcc-arch to
-# disable this.
-#
-# When cross-compiling, or if $CC is not gcc, then ACTION-FAILURE is
-# called unless the user specified --with-gcc-arch manually.
-#
-# Requires macros: AX_CHECK_COMPILER_FLAGS, AX_GCC_X86_CPUID
-#
-# (The main emphasis here is on recent CPUs, on the principle that
-# doing high-performance computing on old hardware is uncommon.)
-#
-# LAST MODIFICATION
-#
-# 2007-07-29
-#
-# COPYLEFT
-#
-# Copyright (c) 2007 Steven G. Johnson <stevenj at alum.mit.edu>
-# Copyright (c) 2007 Matteo Frigo
-#
-# This program is free software: you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see
-# <http://www.gnu.org/licenses/>.
-#
-# As a special exception, the respective Autoconf Macro's copyright
-# owner gives unlimited permission to copy, distribute and modify the
-# configure scripts that are the output of Autoconf when processing
-# the Macro. You need not follow the terms of the GNU General Public
-# License when using or distributing such scripts, even though
-# portions of the text of the Macro appear in them. The GNU General
-# Public License (GPL) does govern all other use of the material that
-# constitutes the Autoconf Macro.
-#
-# This special exception to the GPL applies to versions of the
-# Autoconf Macro released by the Autoconf Macro Archive. When you
-# make and distribute a modified version of the Autoconf Macro, you
-# may extend this special exception to the GPL to apply to your
-# modified version as well.
-
-AC_DEFUN([AX_GCC_ARCHFLAG],
-[AC_REQUIRE([AC_PROG_CC])
-AC_REQUIRE([AC_CANONICAL_HOST])
-
-AC_ARG_WITH(gcc-arch, [AC_HELP_STRING([--with-gcc-arch=<arch>], [use architecture <arch> for gcc -march/-mtune, instead of guessing])],
- ax_gcc_arch=$withval, ax_gcc_arch=yes)
-
-AC_MSG_CHECKING([for gcc architecture flag])
-AC_MSG_RESULT([])
-AC_CACHE_VAL(ax_cv_gcc_archflag,
-[
-ax_cv_gcc_archflag="unknown"
-
-if test "$GCC" = yes; then
-
-if test "x$ax_gcc_arch" = xyes; then
-ax_gcc_arch=""
-if test "$cross_compiling" = no; then
-case $host_cpu in
- i[[3456]]86*|x86_64*) # use cpuid codes, in part from x86info-1.7 by D. Jones
- AX_GCC_X86_CPUID(0)
- AX_GCC_X86_CPUID(1)
- case $ax_cv_gcc_x86_cpuid_0 in
- *:756e6547:*:*) # Intel
- case $ax_cv_gcc_x86_cpuid_1 in
- *5[[48]]?:*:*:*) ax_gcc_arch="pentium-mmx pentium" ;;
- *5??:*:*:*) ax_gcc_arch=pentium ;;
- *6[[3456]]?:*:*:*) ax_gcc_arch="pentium2 pentiumpro" ;;
- *6a?:*[[01]]:*:*) ax_gcc_arch="pentium2 pentiumpro" ;;
- *6a?:*[[234]]:*:*) ax_gcc_arch="pentium3 pentiumpro" ;;
- *6[[9d]]?:*:*:*) ax_gcc_arch="pentium-m pentium3 pentiumpro" ;;
- *6[[78b]]?:*:*:*) ax_gcc_arch="pentium3 pentiumpro" ;;
- *6??:*:*:*) ax_gcc_arch=pentiumpro ;;
- *f3[[347]]:*:*:*|*f4[1347]:*:*:*)
- case $host_cpu in
- x86_64*) ax_gcc_arch="nocona pentium4 pentiumpro" ;;
- *) ax_gcc_arch="prescott pentium4 pentiumpro" ;;
- esac ;;
- *f??:*:*:*) ax_gcc_arch="pentium4 pentiumpro";;
- esac ;;
- *:68747541:*:*) # AMD
- case $ax_cv_gcc_x86_cpuid_1 in
- *5[[67]]?:*:*:*) ax_gcc_arch=k6 ;;
- *5[[8d]]?:*:*:*) ax_gcc_arch="k6-2 k6" ;;
- *5[[9]]?:*:*:*) ax_gcc_arch="k6-3 k6" ;;
- *60?:*:*:*) ax_gcc_arch=k7 ;;
- *6[[12]]?:*:*:*) ax_gcc_arch="athlon k7" ;;
- *6[[34]]?:*:*:*) ax_gcc_arch="athlon-tbird k7" ;;
- *67?:*:*:*) ax_gcc_arch="athlon-4 athlon k7" ;;
- *6[[68a]]?:*:*:*)
- AX_GCC_X86_CPUID(0x80000006) # L2 cache size
- case $ax_cv_gcc_x86_cpuid_0x80000006 in
- *:*:*[[1-9a-f]]??????:*) # (L2 = ecx >> 16) >= 256
- ax_gcc_arch="athlon-xp athlon-4 athlon k7" ;;
- *) ax_gcc_arch="athlon-4 athlon k7" ;;
- esac ;;
- *f[[4cef8b]]?:*:*:*) ax_gcc_arch="athlon64 k8" ;;
- *f5?:*:*:*) ax_gcc_arch="opteron k8" ;;
- *f7?:*:*:*) ax_gcc_arch="athlon-fx opteron k8" ;;
- *f??:*:*:*) ax_gcc_arch="k8" ;;
- esac ;;
- *:746e6543:*:*) # IDT
- case $ax_cv_gcc_x86_cpuid_1 in
- *54?:*:*:*) ax_gcc_arch=winchip-c6 ;;
- *58?:*:*:*) ax_gcc_arch=winchip2 ;;
- *6[[78]]?:*:*:*) ax_gcc_arch=c3 ;;
- *69?:*:*:*) ax_gcc_arch="c3-2 c3" ;;
- esac ;;
- esac
- if test x"$ax_gcc_arch" = x; then # fallback
- case $host_cpu in
- i586*) ax_gcc_arch=pentium ;;
- i686*) ax_gcc_arch=pentiumpro ;;
- esac
- fi
- ;;
-
- sparc*)
- AC_PATH_PROG([PRTDIAG], [prtdiag], [prtdiag], [$PATH:/usr/platform/`uname -i`/sbin/:/usr/platform/`uname -m`/sbin/])
- cputype=`(((grep cpu /proc/cpuinfo | cut -d: -f2) ; ($PRTDIAG -v |grep -i sparc) ; grep -i cpu /var/run/dmesg.boot ) | head -n 1) 2> /dev/null`
- cputype=`echo "$cputype" | tr -d ' -' |tr $as_cr_LETTERS $as_cr_letters`
- case $cputype in
- *ultrasparciv*) ax_gcc_arch="ultrasparc4 ultrasparc3 ultrasparc v9" ;;
- *ultrasparciii*) ax_gcc_arch="ultrasparc3 ultrasparc v9" ;;
- *ultrasparc*) ax_gcc_arch="ultrasparc v9" ;;
- *supersparc*|*tms390z5[[05]]*) ax_gcc_arch="supersparc v8" ;;
- *hypersparc*|*rt62[[056]]*) ax_gcc_arch="hypersparc v8" ;;
- *cypress*) ax_gcc_arch=cypress ;;
- esac ;;
-
- alphaev5) ax_gcc_arch=ev5 ;;
- alphaev56) ax_gcc_arch=ev56 ;;
- alphapca56) ax_gcc_arch="pca56 ev56" ;;
- alphapca57) ax_gcc_arch="pca57 pca56 ev56" ;;
- alphaev6) ax_gcc_arch=ev6 ;;
- alphaev67) ax_gcc_arch=ev67 ;;
- alphaev68) ax_gcc_arch="ev68 ev67" ;;
- alphaev69) ax_gcc_arch="ev69 ev68 ev67" ;;
- alphaev7) ax_gcc_arch="ev7 ev69 ev68 ev67" ;;
- alphaev79) ax_gcc_arch="ev79 ev7 ev69 ev68 ev67" ;;
-
- powerpc*)
- cputype=`((grep cpu /proc/cpuinfo | head -n 1 | cut -d: -f2 | cut -d, -f1 | sed 's/ //g') ; /usr/bin/machine ; /bin/machine; grep CPU /var/run/dmesg.boot | head -n 1 | cut -d" " -f2) 2> /dev/null`
- cputype=`echo $cputype | sed -e 's/ppc//g;s/ *//g'`
- case $cputype in
- *750*) ax_gcc_arch="750 G3" ;;
- *740[[0-9]]*) ax_gcc_arch="$cputype 7400 G4" ;;
- *74[[4-5]][[0-9]]*) ax_gcc_arch="$cputype 7450 G4" ;;
- *74[[0-9]][[0-9]]*) ax_gcc_arch="$cputype G4" ;;
- *970*) ax_gcc_arch="970 G5 power4";;
- *POWER4*|*power4*|*gq*) ax_gcc_arch="power4 970";;
- *POWER5*|*power5*|*gr*|*gs*) ax_gcc_arch="power5 power4 970";;
- 603ev|8240) ax_gcc_arch="$cputype 603e 603";;
- *) ax_gcc_arch=$cputype ;;
- esac
- ax_gcc_arch="$ax_gcc_arch powerpc"
- ;;
-esac
-fi # not cross-compiling
-fi # guess arch
-
-if test "x$ax_gcc_arch" != x -a "x$ax_gcc_arch" != xno; then
-for arch in $ax_gcc_arch; do
- if test "x[]m4_default([$1],yes)" = xyes; then # if we require portable code
- flags="-mtune=$arch"
- # -mcpu=$arch and m$arch generate nonportable code on every arch except
- # x86. And some other arches (e.g. Alpha) don't accept -mtune. Grrr.
- case $host_cpu in i*86|x86_64*) flags="$flags -mcpu=$arch -m$arch";; esac
- else
- flags="-march=$arch -mcpu=$arch -m$arch"
- fi
- for flag in $flags; do
- AX_CHECK_COMPILER_FLAGS($flag, [ax_cv_gcc_archflag=$flag; break])
- done
- test "x$ax_cv_gcc_archflag" = xunknown || break
-done
-fi
-
-fi # $GCC=yes
-])
-AC_MSG_CHECKING([for gcc architecture flag])
-AC_MSG_RESULT($ax_cv_gcc_archflag)
-if test "x$ax_cv_gcc_archflag" = xunknown; then
- m4_default([$3],:)
-else
- m4_default([$2], [CFLAGS="$CFLAGS $ax_cv_gcc_archflag"])
-fi
-])
-
-#
-# SYNOPSIS
-#
-# AX_GCC_X86_CPUID(OP)
-#
-# DESCRIPTION
-#
-# On Pentium and later x86 processors, with gcc or a compiler that
-# has a compatible syntax for inline assembly instructions, run a
-# small program that executes the cpuid instruction with input OP.
-# This can be used to detect the CPU type.
-#
-# On output, the values of the eax, ebx, ecx, and edx registers are
-# stored as hexadecimal strings as "eax:ebx:ecx:edx" in the cache
-# variable ax_cv_gcc_x86_cpuid_OP.
-#
-# If the cpuid instruction fails (because you are running a
-# cross-compiler, or because you are not using gcc, or because you
-# are on a processor that doesn't have this instruction),
-# ax_cv_gcc_x86_cpuid_OP is set to the string "unknown".
-#
-# This macro mainly exists to be used in AX_GCC_ARCHFLAG.
-#
-# LAST MODIFICATION
-#
-# 2007-07-29
-#
-# COPYLEFT
-#
-# Copyright (c) 2007 Steven G. Johnson <stevenj at alum.mit.edu>
-# Copyright (c) 2007 Matteo Frigo
-#
-# This program is free software: you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see
-# <http://www.gnu.org/licenses/>.
-#
-# As a special exception, the respective Autoconf Macro's copyright
-# owner gives unlimited permission to copy, distribute and modify the
-# configure scripts that are the output of Autoconf when processing
-# the Macro. You need not follow the terms of the GNU General Public
-# License when using or distributing such scripts, even though
-# portions of the text of the Macro appear in them. The GNU General
-# Public License (GPL) does govern all other use of the material that
-# constitutes the Autoconf Macro.
-#
-# This special exception to the GPL applies to versions of the
-# Autoconf Macro released by the Autoconf Macro Archive. When you
-# make and distribute a modified version of the Autoconf Macro, you
-# may extend this special exception to the GPL to apply to your
-# modified version as well.
-
-AC_DEFUN([AX_GCC_X86_CPUID],
-[AC_REQUIRE([AC_PROG_CC])
-AC_LANG_PUSH([C])
-AC_CACHE_CHECK(for x86 cpuid $1 output, ax_cv_gcc_x86_cpuid_$1,
- [AC_RUN_IFELSE([AC_LANG_PROGRAM([#include <stdio.h>], [
- int op = $1, eax, ebx, ecx, edx;
- FILE *f;
- __asm__("cpuid"
- : "=a" (eax), "=b" (ebx), "=c" (ecx), "=d" (edx)
- : "a" (op));
- f = fopen("conftest_cpuid", "w"); if (!f) return 1;
- fprintf(f, "%x:%x:%x:%x\n", eax, ebx, ecx, edx);
- fclose(f);
- return 0;
-])],
- [ax_cv_gcc_x86_cpuid_$1=`cat conftest_cpuid`; rm -f conftest_cpuid],
- [ax_cv_gcc_x86_cpuid_$1=unknown; rm -f conftest_cpuid],
- [ax_cv_gcc_x86_cpuid_$1=unknown])])
-AC_LANG_POP([C])
-])
-
-# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-
-# serial 51 AC_PROG_LIBTOOL
-
-
-# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-# -----------------------------------------------------------
-# If this macro is not defined by Autoconf, define it here.
-m4_ifdef([AC_PROVIDE_IFELSE],
- [],
- [m4_define([AC_PROVIDE_IFELSE],
- [m4_ifdef([AC_PROVIDE_$1],
- [$2], [$3])])])
-
-
-# AC_PROG_LIBTOOL
-# ---------------
-AC_DEFUN([AC_PROG_LIBTOOL],
-[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
-dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
-dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
- AC_PROVIDE_IFELSE([AC_PROG_CXX],
- [AC_LIBTOOL_CXX],
- [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
- ])])
-dnl And a similar setup for Fortran 77 support
- AC_PROVIDE_IFELSE([AC_PROG_F77],
- [AC_LIBTOOL_F77],
- [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77
-])])
-
-dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
-dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
-dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
- AC_PROVIDE_IFELSE([AC_PROG_GCJ],
- [AC_LIBTOOL_GCJ],
- [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
- [AC_LIBTOOL_GCJ],
- [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],
- [AC_LIBTOOL_GCJ],
- [ifdef([AC_PROG_GCJ],
- [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])
- ifdef([A][M_PROG_GCJ],
- [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])])
- ifdef([LT_AC_PROG_GCJ],
- [define([LT_AC_PROG_GCJ],
- defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])])
-])])# AC_PROG_LIBTOOL
-
-
-# _AC_PROG_LIBTOOL
-# ----------------
-AC_DEFUN([_AC_PROG_LIBTOOL],
-[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
-AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
-AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl
-AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
-
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-AC_SUBST(LIBTOOL)dnl
-
-# Prevent multiple expansion
-define([AC_PROG_LIBTOOL], [])
-])# _AC_PROG_LIBTOOL
-
-
-# AC_LIBTOOL_SETUP
-# ----------------
-AC_DEFUN([AC_LIBTOOL_SETUP],
-[AC_PREREQ(2.50)dnl
-AC_REQUIRE([AC_ENABLE_SHARED])dnl
-AC_REQUIRE([AC_ENABLE_STATIC])dnl
-AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_PROG_LD])dnl
-AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
-AC_REQUIRE([AC_PROG_NM])dnl
-
-AC_REQUIRE([AC_PROG_LN_S])dnl
-AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
-# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
-AC_REQUIRE([AC_OBJEXT])dnl
-AC_REQUIRE([AC_EXEEXT])dnl
-dnl
-
-AC_LIBTOOL_SYS_MAX_CMD_LEN
-AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
-AC_LIBTOOL_OBJDIR
-
-AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
-_LT_AC_PROG_ECHO_BACKSLASH
-
-case $host_os in
-aix3*)
- # AIX sometimes has problems with the GCC collect2 program. For some
- # reason, if we set the COLLECT_NAMES environment variable, the problems
- # vanish in a puff of smoke.
- if test "X${COLLECT_NAMES+set}" != Xset; then
- COLLECT_NAMES=
- export COLLECT_NAMES
- fi
- ;;
-esac
-
-# Sed substitution that helps us do robust quoting. It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed='sed -e 1s/^X//'
-[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
-
-# Same as above, but do not quote variable references.
-[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g']
-
-# Sed substitution to delay expansion of an escaped shell variable in a
-# double_quote_subst'ed string.
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-
-# Sed substitution to avoid accidental globbing in evaled expressions
-no_glob_subst='s/\*/\\\*/g'
-
-# Constants:
-rm="rm -f"
-
-# Global variables:
-default_ofile=libtool
-can_build_shared=yes
-
-# All known linkers require a `.a' archive for static linking (except MSVC,
-# which needs '.lib').
-libext=a
-ltmain="$ac_aux_dir/ltmain.sh"
-ofile="$default_ofile"
-with_gnu_ld="$lt_cv_prog_gnu_ld"
-
-AC_CHECK_TOOL(AR, ar, false)
-AC_CHECK_TOOL(RANLIB, ranlib, :)
-AC_CHECK_TOOL(STRIP, strip, :)
-
-old_CC="$CC"
-old_CFLAGS="$CFLAGS"
-
-# Set sane defaults for various variables
-test -z "$AR" && AR=ar
-test -z "$AR_FLAGS" && AR_FLAGS=cru
-test -z "$AS" && AS=as
-test -z "$CC" && CC=cc
-test -z "$LTCC" && LTCC=$CC
-test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
-test -z "$DLLTOOL" && DLLTOOL=dlltool
-test -z "$LD" && LD=ld
-test -z "$LN_S" && LN_S="ln -s"
-test -z "$MAGIC_CMD" && MAGIC_CMD=file
-test -z "$NM" && NM=nm
-test -z "$SED" && SED=sed
-test -z "$OBJDUMP" && OBJDUMP=objdump
-test -z "$RANLIB" && RANLIB=:
-test -z "$STRIP" && STRIP=:
-test -z "$ac_objext" && ac_objext=o
-
-# Determine commands to create old-style static archives.
-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
-old_postinstall_cmds='chmod 644 $oldlib'
-old_postuninstall_cmds=
-
-if test -n "$RANLIB"; then
- case $host_os in
- openbsd*)
- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
- ;;
- *)
- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
- ;;
- esac
- old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
-fi
-
-_LT_CC_BASENAME([$compiler])
-
-# Only perform the check for file, if the check method requires it
-case $deplibs_check_method in
-file_magic*)
- if test "$file_magic_cmd" = '$MAGIC_CMD'; then
- AC_PATH_MAGIC
- fi
- ;;
-esac
-
-AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
-AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
-enable_win32_dll=yes, enable_win32_dll=no)
-
-AC_ARG_ENABLE([libtool-lock],
- [AC_HELP_STRING([--disable-libtool-lock],
- [avoid locking (might break parallel builds)])])
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-
-AC_ARG_WITH([pic],
- [AC_HELP_STRING([--with-pic],
- [try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
- [pic_mode="$withval"],
- [pic_mode=default])
-test -z "$pic_mode" && pic_mode=default
-
-# Use C for the default configuration in the libtool script
-tagname=
-AC_LIBTOOL_LANG_C_CONFIG
-_LT_AC_TAGCONFIG
-])# AC_LIBTOOL_SETUP
-
-
-# _LT_AC_SYS_COMPILER
-# -------------------
-AC_DEFUN([_LT_AC_SYS_COMPILER],
-[AC_REQUIRE([AC_PROG_CC])dnl
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# If no C compiler flags were specified, use CFLAGS.
-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-])# _LT_AC_SYS_COMPILER
-
-
-# _LT_CC_BASENAME(CC)
-# -------------------
-# Calculate cc_basename. Skip known compiler wrappers and cross-prefix.
-AC_DEFUN([_LT_CC_BASENAME],
-[for cc_temp in $1""; do
- case $cc_temp in
- compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
- distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
- \-*) ;;
- *) break;;
- esac
-done
-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-])
-
-
-# _LT_COMPILER_BOILERPLATE
-# ------------------------
-# Check for compiler boilerplate output or warnings with
-# the simple compiler test code.
-AC_DEFUN([_LT_COMPILER_BOILERPLATE],
-[AC_REQUIRE([LT_AC_PROG_SED])dnl
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_compile_test_code" >conftest.$ac_ext
-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_compiler_boilerplate=`cat conftest.err`
-$rm conftest*
-])# _LT_COMPILER_BOILERPLATE
-
-
-# _LT_LINKER_BOILERPLATE
-# ----------------------
-# Check for linker boilerplate output or warnings with
-# the simple link test code.
-AC_DEFUN([_LT_LINKER_BOILERPLATE],
-[AC_REQUIRE([LT_AC_PROG_SED])dnl
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_link_test_code" >conftest.$ac_ext
-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_linker_boilerplate=`cat conftest.err`
-$rm conftest*
-])# _LT_LINKER_BOILERPLATE
-
-
-# _LT_AC_SYS_LIBPATH_AIX
-# ----------------------
-# Links a minimal program and checks the executable
-# for the system default hardcoded library path. In most cases,
-# this is /usr/lib:/lib, but when the MPI compilers are used
-# the location of the communication and MPI libs are included too.
-# If we don't find anything, use the default library path according
-# to the aix ld manual.
-AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX],
-[AC_REQUIRE([LT_AC_PROG_SED])dnl
-AC_LINK_IFELSE(AC_LANG_PROGRAM,[
-lt_aix_libpath_sed='
- /Import File Strings/,/^$/ {
- /^0/ {
- s/^0 *\(.*\)$/\1/
- p
- }
- }'
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then
- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-fi],[])
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-])# _LT_AC_SYS_LIBPATH_AIX
-
-
-# _LT_AC_SHELL_INIT(ARG)
-# ----------------------
-AC_DEFUN([_LT_AC_SHELL_INIT],
-[ifdef([AC_DIVERSION_NOTICE],
- [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
- [AC_DIVERT_PUSH(NOTICE)])
-$1
-AC_DIVERT_POP
-])# _LT_AC_SHELL_INIT
-
-
-# _LT_AC_PROG_ECHO_BACKSLASH
-# --------------------------
-# Add some code to the start of the generated configure script which
-# will find an echo command which doesn't interpret backslashes.
-AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH],
-[_LT_AC_SHELL_INIT([
-# Check that we are running under the correct shell.
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-case X$ECHO in
-X*--fallback-echo)
- # Remove one level of quotation (which was required for Make).
- ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
- ;;
-esac
-
-echo=${ECHO-echo}
-if test "X[$]1" = X--no-reexec; then
- # Discard the --no-reexec flag, and continue.
- shift
-elif test "X[$]1" = X--fallback-echo; then
- # Avoid inline document here, it may be left over
- :
-elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then
- # Yippee, $echo works!
- :
-else
- # Restart under the correct shell.
- exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
-fi
-
-if test "X[$]1" = X--fallback-echo; then
- # used as fallback echo
- shift
- cat <<EOF
-[$]*
-EOF
- exit 0
-fi
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-if test -z "$ECHO"; then
-if test "X${echo_test_string+set}" != Xset; then
-# find a string as large as possible, as long as the shell can cope with it
- for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
- # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
- if (echo_test_string=`eval $cmd`) 2>/dev/null &&
- echo_test_string=`eval $cmd` &&
- (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
- then
- break
- fi
- done
-fi
-
-if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
- echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- :
-else
- # The Solaris, AIX, and Digital Unix default echo programs unquote
- # backslashes. This makes it impossible to quote backslashes using
- # echo "$something" | sed 's/\\/\\\\/g'
- #
- # So, first we look for a working echo in the user's PATH.
-
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
- for dir in $PATH /usr/ucb; do
- IFS="$lt_save_ifs"
- if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
- test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
- echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- echo="$dir/echo"
- break
- fi
- done
- IFS="$lt_save_ifs"
-
- if test "X$echo" = Xecho; then
- # We didn't find a better echo, so look for alternatives.
- if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
- echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- # This shell has a builtin print -r that does the trick.
- echo='print -r'
- elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
- test "X$CONFIG_SHELL" != X/bin/ksh; then
- # If we have ksh, try running configure again with it.
- ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
- export ORIGINAL_CONFIG_SHELL
- CONFIG_SHELL=/bin/ksh
- export CONFIG_SHELL
- exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
- else
- # Try using printf.
- echo='printf %s\n'
- if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
- echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- # Cool, printf works
- :
- elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
- test "X$echo_testing_string" = 'X\t' &&
- echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
- export CONFIG_SHELL
- SHELL="$CONFIG_SHELL"
- export SHELL
- echo="$CONFIG_SHELL [$]0 --fallback-echo"
- elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
- test "X$echo_testing_string" = 'X\t' &&
- echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- echo="$CONFIG_SHELL [$]0 --fallback-echo"
- else
- # maybe with a smaller string...
- prev=:
-
- for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
- if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null
- then
- break
- fi
- prev="$cmd"
- done
-
- if test "$prev" != 'sed 50q "[$]0"'; then
- echo_test_string=`eval $prev`
- export echo_test_string
- exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
- else
- # Oops. We lost completely, so just stick with echo.
- echo=echo
- fi
- fi
- fi
- fi
-fi
-fi
-
-# Copy echo and quote the copy suitably for passing to libtool from
-# the Makefile, instead of quoting the original, which is used later.
-ECHO=$echo
-if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
- ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
-fi
-
-AC_SUBST(ECHO)
-])])# _LT_AC_PROG_ECHO_BACKSLASH
-
-
-# _LT_AC_LOCK
-# -----------
-AC_DEFUN([_LT_AC_LOCK],
-[AC_ARG_ENABLE([libtool-lock],
- [AC_HELP_STRING([--disable-libtool-lock],
- [avoid locking (might break parallel builds)])])
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-
-# Some flags need to be propagated to the compiler or linker for good
-# libtool support.
-case $host in
-ia64-*-hpux*)
- # Find out which ABI we are using.
- echo 'int i;' > conftest.$ac_ext
- if AC_TRY_EVAL(ac_compile); then
- case `/usr/bin/file conftest.$ac_objext` in
- *ELF-32*)
- HPUX_IA64_MODE="32"
- ;;
- *ELF-64*)
- HPUX_IA64_MODE="64"
- ;;
- esac
- fi
- rm -rf conftest*
- ;;
-*-*-irix6*)
- # Find out which ABI we are using.
- echo '[#]line __oline__ "configure"' > conftest.$ac_ext
- if AC_TRY_EVAL(ac_compile); then
- if test "$lt_cv_prog_gnu_ld" = yes; then
- case `/usr/bin/file conftest.$ac_objext` in
- *32-bit*)
- LD="${LD-ld} -melf32bsmip"
- ;;
- *N32*)
- LD="${LD-ld} -melf32bmipn32"
- ;;
- *64-bit*)
- LD="${LD-ld} -melf64bmip"
- ;;
- esac
- else
- case `/usr/bin/file conftest.$ac_objext` in
- *32-bit*)
- LD="${LD-ld} -32"
- ;;
- *N32*)
- LD="${LD-ld} -n32"
- ;;
- *64-bit*)
- LD="${LD-ld} -64"
- ;;
- esac
- fi
- fi
- rm -rf conftest*
- ;;
-
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
-s390*-*linux*|sparc*-*linux*)
- # Find out which ABI we are using.
- echo 'int i;' > conftest.$ac_ext
- if AC_TRY_EVAL(ac_compile); then
- case `/usr/bin/file conftest.o` in
- *32-bit*)
- case $host in
- x86_64-*kfreebsd*-gnu)
- LD="${LD-ld} -m elf_i386_fbsd"
- ;;
- x86_64-*linux*)
- LD="${LD-ld} -m elf_i386"
- ;;
- ppc64-*linux*|powerpc64-*linux*)
- LD="${LD-ld} -m elf32ppclinux"
- ;;
- s390x-*linux*)
- LD="${LD-ld} -m elf_s390"
- ;;
- sparc64-*linux*)
- LD="${LD-ld} -m elf32_sparc"
- ;;
- esac
- ;;
- *64-bit*)
- case $host in
- x86_64-*kfreebsd*-gnu)
- LD="${LD-ld} -m elf_x86_64_fbsd"
- ;;
- x86_64-*linux*)
- LD="${LD-ld} -m elf_x86_64"
- ;;
- ppc*-*linux*|powerpc*-*linux*)
- LD="${LD-ld} -m elf64ppc"
- ;;
- s390*-*linux*)
- LD="${LD-ld} -m elf64_s390"
- ;;
- sparc*-*linux*)
- LD="${LD-ld} -m elf64_sparc"
- ;;
- esac
- ;;
- esac
- fi
- rm -rf conftest*
- ;;
-
-*-*-sco3.2v5*)
- # On SCO OpenServer 5, we need -belf to get full-featured binaries.
- SAVE_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS -belf"
- AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
- [AC_LANG_PUSH(C)
- AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
- AC_LANG_POP])
- if test x"$lt_cv_cc_needs_belf" != x"yes"; then
- # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
- CFLAGS="$SAVE_CFLAGS"
- fi
- ;;
-sparc*-*solaris*)
- # Find out which ABI we are using.
- echo 'int i;' > conftest.$ac_ext
- if AC_TRY_EVAL(ac_compile); then
- case `/usr/bin/file conftest.o` in
- *64-bit*)
- case $lt_cv_prog_gnu_ld in
- yes*) LD="${LD-ld} -m elf64_sparc" ;;
- *) LD="${LD-ld} -64" ;;
- esac
- ;;
- esac
- fi
- rm -rf conftest*
- ;;
-
-AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
-[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
- AC_CHECK_TOOL(DLLTOOL, dlltool, false)
- AC_CHECK_TOOL(AS, as, false)
- AC_CHECK_TOOL(OBJDUMP, objdump, false)
- ;;
- ])
-esac
-
-need_locks="$enable_libtool_lock"
-
-])# _LT_AC_LOCK
-
-
-# AC_LIBTOOL_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
-# [OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
-# ----------------------------------------------------------------
-# Check whether the given compiler option works
-AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION],
-[AC_REQUIRE([LT_AC_PROG_SED])
-AC_CACHE_CHECK([$1], [$2],
- [$2=no
- ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
- echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- lt_compiler_flag="$3"
- # Insert the option either (1) after the last *FLAGS variable, or
- # (2) before a word containing "conftest.", or (3) at the end.
- # Note that $ac_compile itself does not contain backslashes and begins
- # with a dollar sign (not a hyphen), so the echo should work correctly.
- # The option is referenced via a variable to avoid confusing sed.
- lt_compile=`echo "$ac_compile" | $SED \
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&AS_MESSAGE_LOG_FD
- echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
- if (exit $ac_status) && test -s "$ac_outfile"; then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings other than the usual output.
- $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
- $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
- if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
- $2=yes
- fi
- fi
- $rm conftest*
-])
-
-if test x"[$]$2" = xyes; then
- ifelse([$5], , :, [$5])
-else
- ifelse([$6], , :, [$6])
-fi
-])# AC_LIBTOOL_COMPILER_OPTION
-
-
-# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
-# [ACTION-SUCCESS], [ACTION-FAILURE])
-# ------------------------------------------------------------
-# Check whether the given compiler option works
-AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
-[AC_REQUIRE([LT_AC_PROG_SED])dnl
-AC_CACHE_CHECK([$1], [$2],
- [$2=no
- save_LDFLAGS="$LDFLAGS"
- LDFLAGS="$LDFLAGS $3"
- echo "$lt_simple_link_test_code" > conftest.$ac_ext
- if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
- # The linker can only warn and ignore the option if not recognized
- # So say no if there are warnings
- if test -s conftest.err; then
- # Append any errors to the config.log.
- cat conftest.err 1>&AS_MESSAGE_LOG_FD
- $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
- $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
- if diff conftest.exp conftest.er2 >/dev/null; then
- $2=yes
- fi
- else
- $2=yes
- fi
- fi
- $rm conftest*
- LDFLAGS="$save_LDFLAGS"
-])
-
-if test x"[$]$2" = xyes; then
- ifelse([$4], , :, [$4])
-else
- ifelse([$5], , :, [$5])
-fi
-])# AC_LIBTOOL_LINKER_OPTION
-
-
-# AC_LIBTOOL_SYS_MAX_CMD_LEN
-# --------------------------
-AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN],
-[# find the maximum length of command line arguments
-AC_MSG_CHECKING([the maximum length of command line arguments])
-AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
- i=0
- teststring="ABCD"
-
- case $build_os in
- msdosdjgpp*)
- # On DJGPP, this test can blow up pretty badly due to problems in libc
- # (any single argument exceeding 2000 bytes causes a buffer overrun
- # during glob expansion). Even if it were fixed, the result of this
- # check would be larger than it should be.
- lt_cv_sys_max_cmd_len=12288; # 12K is about right
- ;;
-
- gnu*)
- # Under GNU Hurd, this test is not required because there is
- # no limit to the length of command line arguments.
- # Libtool will interpret -1 as no limit whatsoever
- lt_cv_sys_max_cmd_len=-1;
- ;;
-
- cygwin* | mingw*)
- # On Win9x/ME, this test blows up -- it succeeds, but takes
- # about 5 minutes as the teststring grows exponentially.
- # Worse, since 9x/ME are not pre-emptively multitasking,
- # you end up with a "frozen" computer, even though with patience
- # the test eventually succeeds (with a max line length of 256k).
- # Instead, let's just punt: use the minimum linelength reported by
- # all of the supported platforms: 8192 (on NT/2K/XP).
- lt_cv_sys_max_cmd_len=8192;
- ;;
-
- amigaos*)
- # On AmigaOS with pdksh, this test takes hours, literally.
- # So we just punt and use a minimum line length of 8192.
- lt_cv_sys_max_cmd_len=8192;
- ;;
-
- netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
- # This has been around since 386BSD, at least. Likely further.
- if test -x /sbin/sysctl; then
- lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
- elif test -x /usr/sbin/sysctl; then
- lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
- else
- lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs
- fi
- # And add a safety zone
- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
- ;;
-
- interix*)
- # We know the value 262144 and hardcode it with a safety zone (like BSD)
- lt_cv_sys_max_cmd_len=196608
- ;;
-
- osf*)
- # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
- # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
- # nice to cause kernel panics so lets avoid the loop below.
- # First set a reasonable default.
- lt_cv_sys_max_cmd_len=16384
- #
- if test -x /sbin/sysconfig; then
- case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
- *1*) lt_cv_sys_max_cmd_len=-1 ;;
- esac
- fi
- ;;
- sco3.2v5*)
- lt_cv_sys_max_cmd_len=102400
- ;;
- sysv5* | sco5v6* | sysv4.2uw2*)
- kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
- if test -n "$kargmax"; then
- lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'`
- else
- lt_cv_sys_max_cmd_len=32768
- fi
- ;;
- *)
- lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
- if test -n "$lt_cv_sys_max_cmd_len"; then
- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
- else
- SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
- while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
- = "XX$teststring") >/dev/null 2>&1 &&
- new_result=`expr "X$teststring" : ".*" 2>&1` &&
- lt_cv_sys_max_cmd_len=$new_result &&
- test $i != 17 # 1/2 MB should be enough
- do
- i=`expr $i + 1`
- teststring=$teststring$teststring
- done
- teststring=
- # Add a significant safety factor because C++ compilers can tack on massive
- # amounts of additional arguments before passing them to the linker.
- # It appears as though 1/2 is a usable value.
- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
- fi
- ;;
- esac
-])
-if test -n $lt_cv_sys_max_cmd_len ; then
- AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
-else
- AC_MSG_RESULT(none)
-fi
-])# AC_LIBTOOL_SYS_MAX_CMD_LEN
-
-
-# _LT_AC_CHECK_DLFCN
-# ------------------
-AC_DEFUN([_LT_AC_CHECK_DLFCN],
-[AC_CHECK_HEADERS(dlfcn.h)dnl
-])# _LT_AC_CHECK_DLFCN
-
-
-# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
-# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
-# ---------------------------------------------------------------------
-AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
-[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
-if test "$cross_compiling" = yes; then :
- [$4]
-else
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
-[#line __oline__ "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef RTLD_GLOBAL
-# define LT_DLGLOBAL RTLD_GLOBAL
-#else
-# ifdef DL_GLOBAL
-# define LT_DLGLOBAL DL_GLOBAL
-# else
-# define LT_DLGLOBAL 0
-# endif
-#endif
-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
- find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-# ifdef RTLD_LAZY
-# define LT_DLLAZY_OR_NOW RTLD_LAZY
-# else
-# ifdef DL_LAZY
-# define LT_DLLAZY_OR_NOW DL_LAZY
-# else
-# ifdef RTLD_NOW
-# define LT_DLLAZY_OR_NOW RTLD_NOW
-# else
-# ifdef DL_NOW
-# define LT_DLLAZY_OR_NOW DL_NOW
-# else
-# define LT_DLLAZY_OR_NOW 0
-# endif
-# endif
-# endif
-# endif
-#endif
-
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
-
-void fnord() { int i=42;}
-int main ()
-{
- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
- int status = $lt_dlunknown;
-
- if (self)
- {
- if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
- /* dlclose (self); */
- }
- else
- puts (dlerror ());
-
- exit (status);
-}]
-EOF
- if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
- (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
- lt_status=$?
- case x$lt_status in
- x$lt_dlno_uscore) $1 ;;
- x$lt_dlneed_uscore) $2 ;;
- x$lt_dlunknown|x*) $3 ;;
- esac
- else :
- # compilation failed
- $3
- fi
-fi
-rm -fr conftest*
-])# _LT_AC_TRY_DLOPEN_SELF
-
-
-# AC_LIBTOOL_DLOPEN_SELF
-# ----------------------
-AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
-[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
-if test "x$enable_dlopen" != xyes; then
- enable_dlopen=unknown
- enable_dlopen_self=unknown
- enable_dlopen_self_static=unknown
-else
- lt_cv_dlopen=no
- lt_cv_dlopen_libs=
-
- case $host_os in
- beos*)
- lt_cv_dlopen="load_add_on"
- lt_cv_dlopen_libs=
- lt_cv_dlopen_self=yes
- ;;
-
- mingw* | pw32*)
- lt_cv_dlopen="LoadLibrary"
- lt_cv_dlopen_libs=
- ;;
-
- cygwin*)
- lt_cv_dlopen="dlopen"
- lt_cv_dlopen_libs=
- ;;
-
- darwin*)
- # if libdl is installed we need to link against it
- AC_CHECK_LIB([dl], [dlopen],
- [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
- lt_cv_dlopen="dyld"
- lt_cv_dlopen_libs=
- lt_cv_dlopen_self=yes
- ])
- ;;
-
- *)
- AC_CHECK_FUNC([shl_load],
- [lt_cv_dlopen="shl_load"],
- [AC_CHECK_LIB([dld], [shl_load],
- [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"],
- [AC_CHECK_FUNC([dlopen],
- [lt_cv_dlopen="dlopen"],
- [AC_CHECK_LIB([dl], [dlopen],
- [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
- [AC_CHECK_LIB([svld], [dlopen],
- [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
- [AC_CHECK_LIB([dld], [dld_link],
- [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
- ])
- ])
- ])
- ])
- ])
- ;;
- esac
-
- if test "x$lt_cv_dlopen" != xno; then
- enable_dlopen=yes
- else
- enable_dlopen=no
- fi
-
- case $lt_cv_dlopen in
- dlopen)
- save_CPPFLAGS="$CPPFLAGS"
- test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-
- save_LDFLAGS="$LDFLAGS"
- wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-
- save_LIBS="$LIBS"
- LIBS="$lt_cv_dlopen_libs $LIBS"
-
- AC_CACHE_CHECK([whether a program can dlopen itself],
- lt_cv_dlopen_self, [dnl
- _LT_AC_TRY_DLOPEN_SELF(
- lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
- lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
- ])
-
- if test "x$lt_cv_dlopen_self" = xyes; then
- wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
- AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
- lt_cv_dlopen_self_static, [dnl
- _LT_AC_TRY_DLOPEN_SELF(
- lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
- lt_cv_dlopen_self_static=no, lt_cv_dlopen_self_static=cross)
- ])
- fi
-
- CPPFLAGS="$save_CPPFLAGS"
- LDFLAGS="$save_LDFLAGS"
- LIBS="$save_LIBS"
- ;;
- esac
-
- case $lt_cv_dlopen_self in
- yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
- *) enable_dlopen_self=unknown ;;
- esac
-
- case $lt_cv_dlopen_self_static in
- yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
- *) enable_dlopen_self_static=unknown ;;
- esac
-fi
-])# AC_LIBTOOL_DLOPEN_SELF
-
-
-# AC_LIBTOOL_PROG_CC_C_O([TAGNAME])
-# ---------------------------------
-# Check to see if options -c and -o are simultaneously supported by compiler
-AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O],
-[AC_REQUIRE([LT_AC_PROG_SED])dnl
-AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
-AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
- [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
- [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
- $rm -r conftest 2>/dev/null
- mkdir conftest
- cd conftest
- mkdir out
- echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
- lt_compiler_flag="-o out/conftest2.$ac_objext"
- # Insert the option either (1) after the last *FLAGS variable, or
- # (2) before a word containing "conftest.", or (3) at the end.
- # Note that $ac_compile itself does not contain backslashes and begins
- # with a dollar sign (not a hyphen), so the echo should work correctly.
- lt_compile=`echo "$ac_compile" | $SED \
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
- (eval "$lt_compile" 2>out/conftest.err)
- ac_status=$?
- cat out/conftest.err >&AS_MESSAGE_LOG_FD
- echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
- if (exit $ac_status) && test -s out/conftest2.$ac_objext
- then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings
- $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
- $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
- if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
- _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
- fi
- fi
- chmod u+w . 2>&AS_MESSAGE_LOG_FD
- $rm conftest*
- # SGI C++ compiler will create directory out/ii_files/ for
- # template instantiation
- test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
- $rm out/* && rmdir out
- cd ..
- rmdir conftest
- $rm conftest*
-])
-])# AC_LIBTOOL_PROG_CC_C_O
-
-
-# AC_LIBTOOL_SYS_HARD_LINK_LOCKS([TAGNAME])
-# -----------------------------------------
-# Check to see if we can do hard links to lock some files if needed
-AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS],
-[AC_REQUIRE([_LT_AC_LOCK])dnl
-
-hard_links="nottested"
-if test "$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
- # do not overwrite the value of need_locks provided by the user
- AC_MSG_CHECKING([if we can lock with hard links])
- hard_links=yes
- $rm conftest*
- ln conftest.a conftest.b 2>/dev/null && hard_links=no
- touch conftest.a
- ln conftest.a conftest.b 2>&5 || hard_links=no
- ln conftest.a conftest.b 2>/dev/null && hard_links=no
- AC_MSG_RESULT([$hard_links])
- if test "$hard_links" = no; then
- AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
- need_locks=warn
- fi
-else
- need_locks=no
-fi
-])# AC_LIBTOOL_SYS_HARD_LINK_LOCKS
-
-
-# AC_LIBTOOL_OBJDIR
-# -----------------
-AC_DEFUN([AC_LIBTOOL_OBJDIR],
-[AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
-[rm -f .libs 2>/dev/null
-mkdir .libs 2>/dev/null
-if test -d .libs; then
- lt_cv_objdir=.libs
-else
- # MS-DOS does not allow filenames that begin with a dot.
- lt_cv_objdir=_libs
-fi
-rmdir .libs 2>/dev/null])
-objdir=$lt_cv_objdir
-])# AC_LIBTOOL_OBJDIR
-
-
-# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([TAGNAME])
-# ----------------------------------------------
-# Check hardcoding attributes.
-AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH],
-[AC_MSG_CHECKING([how to hardcode library paths into programs])
-_LT_AC_TAGVAR(hardcode_action, $1)=
-if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
- test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \
- test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
-
- # We can hardcode non-existant directories.
- if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
- # If the only mechanism to avoid hardcoding is shlibpath_var, we
- # have to relink, otherwise we might link with an installed library
- # when we should be linking with a yet-to-be-installed one
- ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
- test "$_LT_AC_TAGVAR(hardcode_minus_L, $1)" != no; then
- # Linking always hardcodes the temporary library directory.
- _LT_AC_TAGVAR(hardcode_action, $1)=relink
- else
- # We can link without hardcoding, and we can hardcode nonexisting dirs.
- _LT_AC_TAGVAR(hardcode_action, $1)=immediate
- fi
-else
- # We cannot hardcode anything, or else we can only hardcode existing
- # directories.
- _LT_AC_TAGVAR(hardcode_action, $1)=unsupported
-fi
-AC_MSG_RESULT([$_LT_AC_TAGVAR(hardcode_action, $1)])
-
-if test "$_LT_AC_TAGVAR(hardcode_action, $1)" = relink; then
- # Fast installation is not supported
- enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
- test "$enable_shared" = no; then
- # Fast installation is not necessary
- enable_fast_install=needless
-fi
-])# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH
-
-
-# AC_LIBTOOL_SYS_LIB_STRIP
-# ------------------------
-AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP],
-[striplib=
-old_striplib=
-AC_MSG_CHECKING([whether stripping libraries is possible])
-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
- test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
- test -z "$striplib" && striplib="$STRIP --strip-unneeded"
- AC_MSG_RESULT([yes])
-else
-# FIXME - insert some real tests, host_os isn't really good enough
- case $host_os in
- darwin*)
- if test -n "$STRIP" ; then
- striplib="$STRIP -x"
- old_striplib="$STRIP -S"
- AC_MSG_RESULT([yes])
- else
- AC_MSG_RESULT([no])
-fi
- ;;
- *)
- AC_MSG_RESULT([no])
- ;;
- esac
-fi
-])# AC_LIBTOOL_SYS_LIB_STRIP
-
-
-# AC_LIBTOOL_SYS_DYNAMIC_LINKER
-# -----------------------------
-# PORTME Fill in your ld.so characteristics
-AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER],
-[AC_REQUIRE([LT_AC_PROG_SED])dnl
-AC_MSG_CHECKING([dynamic linker characteristics])
-library_names_spec=
-libname_spec='lib$name'
-soname_spec=
-shrext_cmds=".so"
-postinstall_cmds=
-postuninstall_cmds=
-finish_cmds=
-finish_eval=
-shlibpath_var=
-shlibpath_overrides_runpath=unknown
-version_type=none
-dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
-m4_if($1,[],[
-if test "$GCC" = yes; then
- case $host_os in
- darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
- *) lt_awk_arg="/^libraries:/" ;;
- esac
- lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
- if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then
- # if the path contains ";" then we assume it to be the separator
- # otherwise default to the standard path separator (i.e. ":") - it is
- # assumed that no part of a normal pathname contains ";" but that should
- # okay in the real world where ";" in dirpaths is itself problematic.
- lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'`
- else
- lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
- fi
- # Ok, now we have the path, separated by spaces, we can step through it
- # and add multilib dir if necessary.
- lt_tmp_lt_search_path_spec=
- lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
- for lt_sys_path in $lt_search_path_spec; do
- if test -d "$lt_sys_path/$lt_multi_os_dir"; then
- lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
- else
- test -d "$lt_sys_path" && \
- lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
- fi
- done
- lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk '
-BEGIN {RS=" "; FS="/|\n";} {
- lt_foo="";
- lt_count=0;
- for (lt_i = NF; lt_i > 0; lt_i--) {
- if ($lt_i != "" && $lt_i != ".") {
- if ($lt_i == "..") {
- lt_count++;
- } else {
- if (lt_count == 0) {
- lt_foo="/" $lt_i lt_foo;
- } else {
- lt_count--;
- }
- }
- }
- }
- if (lt_foo != "") { lt_freq[[lt_foo]]++; }
- if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
-}'`
- sys_lib_search_path_spec=`echo $lt_search_path_spec`
-else
- sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi])
-need_lib_prefix=unknown
-hardcode_into_libs=no
-
-# when you set need_version to no, make sure it does not cause -set_version
-# flags to be left without arguments
-need_version=unknown
-
-case $host_os in
-aix3*)
- version_type=linux
- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
- shlibpath_var=LIBPATH
-
- # AIX 3 has no versioning support, so we append a major version to the name.
- soname_spec='${libname}${release}${shared_ext}$major'
- ;;
-
-aix4* | aix5*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- hardcode_into_libs=yes
- if test "$host_cpu" = ia64; then
- # AIX 5 supports IA64
- library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
- shlibpath_var=LD_LIBRARY_PATH
- else
- # With GCC up to 2.95.x, collect2 would create an import file
- # for dependence libraries. The import file would start with
- # the line `#! .'. This would cause the generated library to
- # depend on `.', always an invalid library. This was fixed in
- # development snapshots of GCC prior to 3.0.
- case $host_os in
- aix4 | aix4.[[01]] | aix4.[[01]].*)
- if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
- echo ' yes '
- echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
- :
- else
- can_build_shared=no
- fi
- ;;
- esac
- # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
- # soname into executable. Probably we can add versioning support to
- # collect2, so additional links can be useful in future.
- if test "$aix_use_runtimelinking" = yes; then
- # If using run time linking (on AIX 4.2 or later) use lib<name>.so
- # instead of lib<name>.a to let people know that these are not
- # typical AIX shared libraries.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- else
- # We preserve .a as extension for shared libraries through AIX4.2
- # and later when we are not doing run time linking.
- library_names_spec='${libname}${release}.a $libname.a'
- soname_spec='${libname}${release}${shared_ext}$major'
- fi
- shlibpath_var=LIBPATH
- fi
- ;;
-
-amigaos*)
- library_names_spec='$libname.ixlibrary $libname.a'
- # Create ${libname}_ixlibrary.a entries in /sys/libs.
- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
- ;;
-
-beos*)
- library_names_spec='${libname}${shared_ext}'
- dynamic_linker="$host_os ld.so"
- shlibpath_var=LIBRARY_PATH
- ;;
-
-bsdi[[45]]*)
- version_type=linux
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
- shlibpath_var=LD_LIBRARY_PATH
- sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
- sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
- # the default ld.so.conf also contains /usr/contrib/lib and
- # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
- # libtool to hard-code these into programs
- ;;
-
-cygwin* | mingw* | pw32*)
- version_type=windows
- shrext_cmds=".dll"
- need_version=no
- need_lib_prefix=no
-
- case $GCC,$host_os in
- yes,cygwin* | yes,mingw* | yes,pw32*)
- library_names_spec='$libname.dll.a'
- # DLL is installed to $(libdir)/../bin by postinstall_cmds
- postinstall_cmds='base_file=`basename \${file}`~
- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
- dldir=$destdir/`dirname \$dlpath`~
- test -d \$dldir || mkdir -p \$dldir~
- $install_prog $dir/$dlname \$dldir/$dlname~
- chmod a+x \$dldir/$dlname'
- postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
- dlpath=$dir/\$dldll~
- $rm \$dlpath'
- shlibpath_overrides_runpath=yes
-
- case $host_os in
- cygwin*)
- # Cygwin DLLs use 'cyg' prefix rather than 'lib'
- soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
- sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
- ;;
- mingw*)
- # MinGW DLLs use traditional 'lib' prefix
- soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
- if echo "$sys_lib_search_path_spec" | [grep ';[c-zC-Z]:/' >/dev/null]; then
- # It is most probably a Windows format PATH printed by
- # mingw gcc, but we are running on Cygwin. Gcc prints its search
- # path with ; separators, and with drive letters. We can handle the
- # drive letters (cygwin fileutils understands them), so leave them,
- # especially as we might pass files found there to a mingw objdump,
- # which wouldn't understand a cygwinified path. Ahh.
- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
- else
- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
- fi
- ;;
- pw32*)
- # pw32 DLLs use 'pw' prefix rather than 'lib'
- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
- ;;
- esac
- ;;
-
- *)
- library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
- ;;
- esac
- dynamic_linker='Win32 ld.exe'
- # FIXME: first we should search . and the directory the executable is in
- shlibpath_var=PATH
- ;;
-
-darwin* | rhapsody*)
- dynamic_linker="$host_os dyld"
- version_type=darwin
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
- soname_spec='${libname}${release}${major}$shared_ext'
- shlibpath_overrides_runpath=yes
- shlibpath_var=DYLD_LIBRARY_PATH
- shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
- m4_if([$1], [],[
- sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"])
- sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
- ;;
-
-dgux*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- ;;
-
-freebsd1*)
- dynamic_linker=no
- ;;
-
-freebsd* | dragonfly*)
- # DragonFly does not have aout. When/if they implement a new
- # versioning mechanism, adjust this.
- if test -x /usr/bin/objformat; then
- objformat=`/usr/bin/objformat`
- else
- case $host_os in
- freebsd[[123]]*) objformat=aout ;;
- *) objformat=elf ;;
- esac
- fi
- version_type=freebsd-$objformat
- case $version_type in
- freebsd-elf*)
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
- need_version=no
- need_lib_prefix=no
- ;;
- freebsd-*)
- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
- need_version=yes
- ;;
- esac
- shlibpath_var=LD_LIBRARY_PATH
- case $host_os in
- freebsd2*)
- shlibpath_overrides_runpath=yes
- ;;
- freebsd3.[[01]]* | freebsdelf3.[[01]]*)
- shlibpath_overrides_runpath=yes
- hardcode_into_libs=yes
- ;;
- freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \
- freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1)
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- ;;
- *) # from 4.6 on, and DragonFly
- shlibpath_overrides_runpath=yes
- hardcode_into_libs=yes
- ;;
- esac
- ;;
-
-gnu*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- hardcode_into_libs=yes
- ;;
-
-hpux9* | hpux10* | hpux11*)
- # Give a soname corresponding to the major version so that dld.sl refuses to
- # link against other versions.
- version_type=sunos
- need_lib_prefix=no
- need_version=no
- case $host_cpu in
- ia64*)
- shrext_cmds='.so'
- hardcode_into_libs=yes
- dynamic_linker="$host_os dld.so"
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- if test "X$HPUX_IA64_MODE" = X32; then
- sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
- else
- sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
- fi
- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
- ;;
- hppa*64*)
- shrext_cmds='.sl'
- hardcode_into_libs=yes
- dynamic_linker="$host_os dld.sl"
- shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
- shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
- ;;
- *)
- shrext_cmds='.sl'
- dynamic_linker="$host_os dld.sl"
- shlibpath_var=SHLIB_PATH
- shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- ;;
- esac
- # HP-UX runs *really* slowly unless shared libraries are mode 555.
- postinstall_cmds='chmod 555 $lib'
- ;;
-
-interix[[3-9]]*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- ;;
-
-irix5* | irix6* | nonstopux*)
- case $host_os in
- nonstopux*) version_type=nonstopux ;;
- *)
- if test "$lt_cv_prog_gnu_ld" = yes; then
- version_type=linux
- else
- version_type=irix
- fi ;;
- esac
- need_lib_prefix=no
- need_version=no
- soname_spec='${libname}${release}${shared_ext}$major'
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
- case $host_os in
- irix5* | nonstopux*)
- libsuff= shlibsuff=
- ;;
- *)
- case $LD in # libtool.m4 will add one of these switches to LD
- *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
- libsuff= shlibsuff= libmagic=32-bit;;
- *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
- libsuff=32 shlibsuff=N32 libmagic=N32;;
- *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
- libsuff=64 shlibsuff=64 libmagic=64-bit;;
- *) libsuff= shlibsuff= libmagic=never-match;;
- esac
- ;;
- esac
- shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
- shlibpath_overrides_runpath=no
- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
- hardcode_into_libs=yes
- ;;
-
-# No shared lib support for Linux oldld, aout, or coff.
-linux*oldld* | linux*aout* | linux*coff*)
- dynamic_linker=no
- ;;
-
-# This must be Linux ELF.
-linux* | k*bsd*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- # This implies no fast_install, which is unacceptable.
- # Some rework will be needed to allow for fast_install
- # before this can be enabled.
- hardcode_into_libs=yes
-
- # Append ld.so.conf contents to the search path
- if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
- fi
-
- # We used to test for /lib/ld.so.1 and disable shared libraries on
- # powerpc, because MkLinux only supported shared libraries with the
- # GNU dynamic linker. Since this was broken with cross compilers,
- # most powerpc-linux boxes support dynamic linking these days and
- # people can always --disable-shared, the test was removed, and we
- # assume the GNU/Linux dynamic linker is in use.
- dynamic_linker='GNU/Linux ld.so'
- ;;
-
-netbsd*)
- version_type=sunos
- need_lib_prefix=no
- need_version=no
- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
- dynamic_linker='NetBSD (a.out) ld.so'
- else
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- dynamic_linker='NetBSD ld.elf_so'
- fi
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes
- hardcode_into_libs=yes
- ;;
-
-newsos6)
- version_type=linux
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes
- ;;
-
-nto-qnx*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes
- ;;
-
-openbsd*)
- version_type=sunos
- sys_lib_dlsearch_path_spec="/usr/lib"
- need_lib_prefix=no
- # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
- case $host_os in
- openbsd3.3 | openbsd3.3.*) need_version=yes ;;
- *) need_version=no ;;
- esac
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
- shlibpath_var=LD_LIBRARY_PATH
- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- case $host_os in
- openbsd2.[[89]] | openbsd2.[[89]].*)
- shlibpath_overrides_runpath=no
- ;;
- *)
- shlibpath_overrides_runpath=yes
- ;;
- esac
- else
- shlibpath_overrides_runpath=yes
- fi
- ;;
-
-os2*)
- libname_spec='$name'
- shrext_cmds=".dll"
- need_lib_prefix=no
- library_names_spec='$libname${shared_ext} $libname.a'
- dynamic_linker='OS/2 ld.exe'
- shlibpath_var=LIBPATH
- ;;
-
-osf3* | osf4* | osf5*)
- version_type=osf
- need_lib_prefix=no
- need_version=no
- soname_spec='${libname}${release}${shared_ext}$major'
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- shlibpath_var=LD_LIBRARY_PATH
- sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
- sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
- ;;
-
-rdos*)
- dynamic_linker=no
- ;;
-
-solaris*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes
- hardcode_into_libs=yes
- # ldd complains unless libraries are executable
- postinstall_cmds='chmod +x $lib'
- ;;
-
-sunos4*)
- version_type=sunos
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
- finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes
- if test "$with_gnu_ld" = yes; then
- need_lib_prefix=no
- fi
- need_version=yes
- ;;
-
-sysv4 | sysv4.3*)
- version_type=linux
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- case $host_vendor in
- sni)
- shlibpath_overrides_runpath=no
- need_lib_prefix=no
- export_dynamic_flag_spec='${wl}-Blargedynsym'
- runpath_var=LD_RUN_PATH
- ;;
- siemens)
- need_lib_prefix=no
- ;;
- motorola)
- need_lib_prefix=no
- need_version=no
- shlibpath_overrides_runpath=no
- sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
- ;;
- esac
- ;;
-
-sysv4*MP*)
- if test -d /usr/nec ;then
- version_type=linux
- library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
- soname_spec='$libname${shared_ext}.$major'
- shlibpath_var=LD_LIBRARY_PATH
- fi
- ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
- version_type=freebsd-elf
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- hardcode_into_libs=yes
- if test "$with_gnu_ld" = yes; then
- sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
- shlibpath_overrides_runpath=no
- else
- sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
- shlibpath_overrides_runpath=yes
- case $host_os in
- sco3.2v5*)
- sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
- ;;
- esac
- fi
- sys_lib_dlsearch_path_spec='/usr/lib'
- ;;
-
-uts4*)
- version_type=linux
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- ;;
-
-*)
- dynamic_linker=no
- ;;
-esac
-AC_MSG_RESULT([$dynamic_linker])
-test "$dynamic_linker" = no && can_build_shared=no
-
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
-])# AC_LIBTOOL_SYS_DYNAMIC_LINKER
-
-
-# _LT_AC_TAGCONFIG
-# ----------------
-AC_DEFUN([_LT_AC_TAGCONFIG],
-[AC_REQUIRE([LT_AC_PROG_SED])dnl
-AC_ARG_WITH([tags],
- [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@],
- [include additional configurations @<:@automatic@:>@])],
- [tagnames="$withval"])
-
-if test -f "$ltmain" && test -n "$tagnames"; then
- if test ! -f "${ofile}"; then
- AC_MSG_WARN([output file `$ofile' does not exist])
- fi
-
- if test -z "$LTCC"; then
- eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
- if test -z "$LTCC"; then
- AC_MSG_WARN([output file `$ofile' does not look like a libtool script])
- else
- AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile'])
- fi
- fi
- if test -z "$LTCFLAGS"; then
- eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`"
- fi
-
- # Extract list of available tagged configurations in $ofile.
- # Note that this assumes the entire list is on one line.
- available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'`
-
- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
- for tagname in $tagnames; do
- IFS="$lt_save_ifs"
- # Check whether tagname contains only valid characters
- case `$echo "X$tagname" | $Xsed -e 's:[[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]]::g'` in
- "") ;;
- *) AC_MSG_ERROR([invalid tag name: $tagname])
- ;;
- esac
-
- if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
- then
- AC_MSG_ERROR([tag name \"$tagname\" already exists])
- fi
-
- # Update the list of available tags.
- if test -n "$tagname"; then
- echo appending configuration tag \"$tagname\" to $ofile
-
- case $tagname in
- CXX)
- if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
- ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
- (test "X$CXX" != "Xg++"))) ; then
- AC_LIBTOOL_LANG_CXX_CONFIG
- else
- tagname=""
- fi
- ;;
-
- F77)
- if test -n "$F77" && test "X$F77" != "Xno"; then
- AC_LIBTOOL_LANG_F77_CONFIG
- else
- tagname=""
- fi
- ;;
-
- GCJ)
- if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
- AC_LIBTOOL_LANG_GCJ_CONFIG
- else
- tagname=""
- fi
- ;;
-
- RC)
- AC_LIBTOOL_LANG_RC_CONFIG
- ;;
-
- *)
- AC_MSG_ERROR([Unsupported tag name: $tagname])
- ;;
- esac
-
- # Append the new tag name to the list of available tags.
- if test -n "$tagname" ; then
- available_tags="$available_tags $tagname"
- fi
- fi
- done
- IFS="$lt_save_ifs"
-
- # Now substitute the updated list of available tags.
- if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then
- mv "${ofile}T" "$ofile"
- chmod +x "$ofile"
- else
- rm -f "${ofile}T"
- AC_MSG_ERROR([unable to update list of available tagged configurations.])
- fi
-fi
-])# _LT_AC_TAGCONFIG
-
-
-# AC_LIBTOOL_DLOPEN
-# -----------------
-# enable checks for dlopen support
-AC_DEFUN([AC_LIBTOOL_DLOPEN],
- [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])
-])# AC_LIBTOOL_DLOPEN
-
-
-# AC_LIBTOOL_WIN32_DLL
-# --------------------
-# declare package support for building win32 DLLs
-AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
-[AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
-])# AC_LIBTOOL_WIN32_DLL
-
-
-# AC_ENABLE_SHARED([DEFAULT])
-# ---------------------------
-# implement the --enable-shared flag
-# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
-AC_DEFUN([AC_ENABLE_SHARED],
-[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE([shared],
- [AC_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
- [build shared libraries @<:@default=]AC_ENABLE_SHARED_DEFAULT[@:>@])],
- [p=${PACKAGE-default}
- case $enableval in
- yes) enable_shared=yes ;;
- no) enable_shared=no ;;
- *)
- enable_shared=no
- # Look at the argument we got. We use all the common list separators.
- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
- for pkg in $enableval; do
- IFS="$lt_save_ifs"
- if test "X$pkg" = "X$p"; then
- enable_shared=yes
- fi
- done
- IFS="$lt_save_ifs"
- ;;
- esac],
- [enable_shared=]AC_ENABLE_SHARED_DEFAULT)
-])# AC_ENABLE_SHARED
-
-
-# AC_DISABLE_SHARED
-# -----------------
-# set the default shared flag to --disable-shared
-AC_DEFUN([AC_DISABLE_SHARED],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-AC_ENABLE_SHARED(no)
-])# AC_DISABLE_SHARED
-
-
-# AC_ENABLE_STATIC([DEFAULT])
-# ---------------------------
-# implement the --enable-static flag
-# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
-AC_DEFUN([AC_ENABLE_STATIC],
-[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE([static],
- [AC_HELP_STRING([--enable-static@<:@=PKGS@:>@],
- [build static libraries @<:@default=]AC_ENABLE_STATIC_DEFAULT[@:>@])],
- [p=${PACKAGE-default}
- case $enableval in
- yes) enable_static=yes ;;
- no) enable_static=no ;;
- *)
- enable_static=no
- # Look at the argument we got. We use all the common list separators.
- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
- for pkg in $enableval; do
- IFS="$lt_save_ifs"
- if test "X$pkg" = "X$p"; then
- enable_static=yes
- fi
- done
- IFS="$lt_save_ifs"
- ;;
- esac],
- [enable_static=]AC_ENABLE_STATIC_DEFAULT)
-])# AC_ENABLE_STATIC
-
-
-# AC_DISABLE_STATIC
-# -----------------
-# set the default static flag to --disable-static
-AC_DEFUN([AC_DISABLE_STATIC],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-AC_ENABLE_STATIC(no)
-])# AC_DISABLE_STATIC
-
-
-# AC_ENABLE_FAST_INSTALL([DEFAULT])
-# ---------------------------------
-# implement the --enable-fast-install flag
-# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
-AC_DEFUN([AC_ENABLE_FAST_INSTALL],
-[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE([fast-install],
- [AC_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
- [optimize for fast installation @<:@default=]AC_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
- [p=${PACKAGE-default}
- case $enableval in
- yes) enable_fast_install=yes ;;
- no) enable_fast_install=no ;;
- *)
- enable_fast_install=no
- # Look at the argument we got. We use all the common list separators.
- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
- for pkg in $enableval; do
- IFS="$lt_save_ifs"
- if test "X$pkg" = "X$p"; then
- enable_fast_install=yes
- fi
- done
- IFS="$lt_save_ifs"
- ;;
- esac],
- [enable_fast_install=]AC_ENABLE_FAST_INSTALL_DEFAULT)
-])# AC_ENABLE_FAST_INSTALL
-
-
-# AC_DISABLE_FAST_INSTALL
-# -----------------------
-# set the default to --disable-fast-install
-AC_DEFUN([AC_DISABLE_FAST_INSTALL],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-AC_ENABLE_FAST_INSTALL(no)
-])# AC_DISABLE_FAST_INSTALL
-
-
-# AC_LIBTOOL_PICMODE([MODE])
-# --------------------------
-# implement the --with-pic flag
-# MODE is either `yes' or `no'. If omitted, it defaults to `both'.
-AC_DEFUN([AC_LIBTOOL_PICMODE],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-pic_mode=ifelse($#,1,$1,default)
-])# AC_LIBTOOL_PICMODE
-
-
-# AC_PROG_EGREP
-# -------------
-# This is predefined starting with Autoconf 2.54, so this conditional
-# definition can be removed once we require Autoconf 2.54 or later.
-m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP],
-[AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep],
- [if echo a | (grep -E '(a|b)') >/dev/null 2>&1
- then ac_cv_prog_egrep='grep -E'
- else ac_cv_prog_egrep='egrep'
- fi])
- EGREP=$ac_cv_prog_egrep
- AC_SUBST([EGREP])
-])])
-
-
-# AC_PATH_TOOL_PREFIX
-# -------------------
-# find a file program which can recognize shared library
-AC_DEFUN([AC_PATH_TOOL_PREFIX],
-[AC_REQUIRE([AC_PROG_EGREP])dnl
-AC_MSG_CHECKING([for $1])
-AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
-[case $MAGIC_CMD in
-[[\\/*] | ?:[\\/]*])
- lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
- ;;
-*)
- lt_save_MAGIC_CMD="$MAGIC_CMD"
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-dnl $ac_dummy forces splitting on constant user-supplied paths.
-dnl POSIX.2 word splitting is done only on the output of word expansions,
-dnl not every word. This closes a longstanding sh security hole.
- ac_dummy="ifelse([$2], , $PATH, [$2])"
- for ac_dir in $ac_dummy; do
- IFS="$lt_save_ifs"
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$1; then
- lt_cv_path_MAGIC_CMD="$ac_dir/$1"
- if test -n "$file_magic_test_file"; then
- case $deplibs_check_method in
- "file_magic "*)
- file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
- MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
- if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
- $EGREP "$file_magic_regex" > /dev/null; then
- :
- else
- cat <<EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such. This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem. Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool at gnu.org
-
-EOF
- fi ;;
- esac
- fi
- break
- fi
- done
- IFS="$lt_save_ifs"
- MAGIC_CMD="$lt_save_MAGIC_CMD"
- ;;
-esac])
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
- AC_MSG_RESULT($MAGIC_CMD)
-else
- AC_MSG_RESULT(no)
-fi
-])# AC_PATH_TOOL_PREFIX
-
-
-# AC_PATH_MAGIC
-# -------------
-# find a file program which can recognize a shared library
-AC_DEFUN([AC_PATH_MAGIC],
-[AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
-if test -z "$lt_cv_path_MAGIC_CMD"; then
- if test -n "$ac_tool_prefix"; then
- AC_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
- else
- MAGIC_CMD=:
- fi
-fi
-])# AC_PATH_MAGIC
-
-
-# AC_PROG_LD
-# ----------
-# find the pathname to the GNU or non-GNU linker
-AC_DEFUN([AC_PROG_LD],
-[AC_ARG_WITH([gnu-ld],
- [AC_HELP_STRING([--with-gnu-ld],
- [assume the C compiler uses GNU ld @<:@default=no@:>@])],
- [test "$withval" = no || with_gnu_ld=yes],
- [with_gnu_ld=no])
-AC_REQUIRE([LT_AC_PROG_SED])dnl
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-ac_prog=ld
-if test "$GCC" = yes; then
- # Check if gcc -print-prog-name=ld gives a path.
- AC_MSG_CHECKING([for ld used by $CC])
- case $host in
- *-*-mingw*)
- # gcc leaves a trailing carriage return which upsets mingw
- ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
- *)
- ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
- esac
- case $ac_prog in
- # Accept absolute paths.
- [[\\/]]* | ?:[[\\/]]*)
- re_direlt='/[[^/]][[^/]]*/\.\./'
- # Canonicalize the pathname of ld
- ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
- while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
- ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
- done
- test -z "$LD" && LD="$ac_prog"
- ;;
- "")
- # If it fails, then pretend we aren't using GCC.
- ac_prog=ld
- ;;
- *)
- # If it is relative, then search for the first ld in PATH.
- with_gnu_ld=unknown
- ;;
- esac
-elif test "$with_gnu_ld" = yes; then
- AC_MSG_CHECKING([for GNU ld])
-else
- AC_MSG_CHECKING([for non-GNU ld])
-fi
-AC_CACHE_VAL(lt_cv_path_LD,
-[if test -z "$LD"; then
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
- for ac_dir in $PATH; do
- IFS="$lt_save_ifs"
- test -z "$ac_dir" && ac_dir=.
- if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
- lt_cv_path_LD="$ac_dir/$ac_prog"
- # Check to see if the program is GNU ld. I'd rather use --version,
- # but apparently some variants of GNU ld only accept -v.
- # Break only if it was the GNU/non-GNU ld that we prefer.
- case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
- *GNU* | *'with BFD'*)
- test "$with_gnu_ld" != no && break
- ;;
- *)
- test "$with_gnu_ld" != yes && break
- ;;
- esac
- fi
- done
- IFS="$lt_save_ifs"
-else
- lt_cv_path_LD="$LD" # Let the user override the test with a path.
-fi])
-LD="$lt_cv_path_LD"
-if test -n "$LD"; then
- AC_MSG_RESULT($LD)
-else
- AC_MSG_RESULT(no)
-fi
-test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
-AC_PROG_LD_GNU
-])# AC_PROG_LD
-
-
-# AC_PROG_LD_GNU
-# --------------
-AC_DEFUN([AC_PROG_LD_GNU],
-[AC_REQUIRE([AC_PROG_EGREP])dnl
-AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
-[# I'd rather use --version here, but apparently some GNU lds only accept -v.
-case `$LD -v 2>&1 </dev/null` in
-*GNU* | *'with BFD'*)
- lt_cv_prog_gnu_ld=yes
- ;;
-*)
- lt_cv_prog_gnu_ld=no
- ;;
-esac])
-with_gnu_ld=$lt_cv_prog_gnu_ld
-])# AC_PROG_LD_GNU
-
-
-# AC_PROG_LD_RELOAD_FLAG
-# ----------------------
-# find reload flag for linker
-# -- PORTME Some linkers may need a different reload flag.
-AC_DEFUN([AC_PROG_LD_RELOAD_FLAG],
-[AC_CACHE_CHECK([for $LD option to reload object files],
- lt_cv_ld_reload_flag,
- [lt_cv_ld_reload_flag='-r'])
-reload_flag=$lt_cv_ld_reload_flag
-case $reload_flag in
-"" | " "*) ;;
-*) reload_flag=" $reload_flag" ;;
-esac
-reload_cmds='$LD$reload_flag -o $output$reload_objs'
-case $host_os in
- darwin*)
- if test "$GCC" = yes; then
- reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
- else
- reload_cmds='$LD$reload_flag -o $output$reload_objs'
- fi
- ;;
-esac
-])# AC_PROG_LD_RELOAD_FLAG
-
-
-# AC_DEPLIBS_CHECK_METHOD
-# -----------------------
-# how to check for library dependencies
-# -- PORTME fill in with the dynamic library characteristics
-AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
-[AC_CACHE_CHECK([how to recognize dependent libraries],
-lt_cv_deplibs_check_method,
-[lt_cv_file_magic_cmd='$MAGIC_CMD'
-lt_cv_file_magic_test_file=
-lt_cv_deplibs_check_method='unknown'
-# Need to set the preceding variable on all platforms that support
-# interlibrary dependencies.
-# 'none' -- dependencies not supported.
-# `unknown' -- same as none, but documents that we really don't know.
-# 'pass_all' -- all dependencies passed with no checks.
-# 'test_compile' -- check by making test program.
-# 'file_magic [[regex]]' -- check by looking for files in library path
-# which responds to the $file_magic_cmd with a given extended regex.
-# If you have `file' or equivalent on your system and you're not sure
-# whether `pass_all' will *always* work, you probably want this one.
-
-case $host_os in
-aix4* | aix5*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-beos*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-bsdi[[45]]*)
- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
- lt_cv_file_magic_cmd='/usr/bin/file -L'
- lt_cv_file_magic_test_file=/shlib/libc.so
- ;;
-
-cygwin*)
- # func_win32_libid is a shell function defined in ltmain.sh
- lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
- lt_cv_file_magic_cmd='func_win32_libid'
- ;;
-
-mingw* | pw32*)
- # Base MSYS/MinGW do not provide the 'file' command needed by
- # func_win32_libid shell function, so use a weaker test based on 'objdump',
- # unless we find 'file', for example because we are cross-compiling.
- if ( file / ) >/dev/null 2>&1; then
- lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
- lt_cv_file_magic_cmd='func_win32_libid'
- else
- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
- lt_cv_file_magic_cmd='$OBJDUMP -f'
- fi
- ;;
-
-darwin* | rhapsody*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-freebsd* | dragonfly*)
- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
- case $host_cpu in
- i*86 )
- # Not sure whether the presence of OpenBSD here was a mistake.
- # Let's accept both of them until this is cleared up.
- lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
- lt_cv_file_magic_cmd=/usr/bin/file
- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
- ;;
- esac
- else
- lt_cv_deplibs_check_method=pass_all
- fi
- ;;
-
-gnu*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-hpux10.20* | hpux11*)
- lt_cv_file_magic_cmd=/usr/bin/file
- case $host_cpu in
- ia64*)
- lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
- lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
- ;;
- hppa*64*)
- [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]']
- lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
- ;;
- *)
- lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
- lt_cv_file_magic_test_file=/usr/lib/libc.sl
- ;;
- esac
- ;;
-
-interix[[3-9]]*)
- # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
- ;;
-
-irix5* | irix6* | nonstopux*)
- case $LD in
- *-32|*"-32 ") libmagic=32-bit;;
- *-n32|*"-n32 ") libmagic=N32;;
- *-64|*"-64 ") libmagic=64-bit;;
- *) libmagic=never-match;;
- esac
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-# This must be Linux ELF.
-linux* | k*bsd*-gnu)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-netbsd*)
- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
- else
- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
- fi
- ;;
-
-newos6*)
- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
- lt_cv_file_magic_cmd=/usr/bin/file
- lt_cv_file_magic_test_file=/usr/lib/libnls.so
- ;;
-
-nto-qnx*)
- lt_cv_deplibs_check_method=unknown
- ;;
-
-openbsd*)
- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
- else
- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
- fi
- ;;
-
-osf3* | osf4* | osf5*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-rdos*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-solaris*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-sysv4 | sysv4.3*)
- case $host_vendor in
- motorola)
- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
- ;;
- ncr)
- lt_cv_deplibs_check_method=pass_all
- ;;
- sequent)
- lt_cv_file_magic_cmd='/bin/file'
- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
- ;;
- sni)
- lt_cv_file_magic_cmd='/bin/file'
- lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
- lt_cv_file_magic_test_file=/lib/libc.so
- ;;
- siemens)
- lt_cv_deplibs_check_method=pass_all
- ;;
- pc)
- lt_cv_deplibs_check_method=pass_all
- ;;
- esac
- ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-esac
-])
-file_magic_cmd=$lt_cv_file_magic_cmd
-deplibs_check_method=$lt_cv_deplibs_check_method
-test -z "$deplibs_check_method" && deplibs_check_method=unknown
-])# AC_DEPLIBS_CHECK_METHOD
-
-
-# AC_PROG_NM
-# ----------
-# find the pathname to a BSD-compatible name lister
-AC_DEFUN([AC_PROG_NM],
-[AC_CACHE_CHECK([for BSD-compatible nm], lt_cv_path_NM,
-[if test -n "$NM"; then
- # Let the user override the test.
- lt_cv_path_NM="$NM"
-else
- lt_nm_to_check="${ac_tool_prefix}nm"
- if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
- lt_nm_to_check="$lt_nm_to_check nm"
- fi
- for lt_tmp_nm in $lt_nm_to_check; do
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
- for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
- IFS="$lt_save_ifs"
- test -z "$ac_dir" && ac_dir=.
- tmp_nm="$ac_dir/$lt_tmp_nm"
- if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
- # Check to see if the nm accepts a BSD-compat flag.
- # Adding the `sed 1q' prevents false positives on HP-UX, which says:
- # nm: unknown option "B" ignored
- # Tru64's nm complains that /dev/null is an invalid object file
- case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
- */dev/null* | *'Invalid file or object type'*)
- lt_cv_path_NM="$tmp_nm -B"
- break
- ;;
- *)
- case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
- */dev/null*)
- lt_cv_path_NM="$tmp_nm -p"
- break
- ;;
- *)
- lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
- continue # so that we can try to find one that supports BSD flags
- ;;
- esac
- ;;
- esac
- fi
- done
- IFS="$lt_save_ifs"
- done
- test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
-fi])
-NM="$lt_cv_path_NM"
-])# AC_PROG_NM
-
-
-# AC_CHECK_LIBM
-# -------------
-# check for math library
-AC_DEFUN([AC_CHECK_LIBM],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-LIBM=
-case $host in
-*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
- # These system don't have libm, or don't need it
- ;;
-*-ncr-sysv4.3*)
- AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
- AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
- ;;
-*)
- AC_CHECK_LIB(m, cos, LIBM="-lm")
- ;;
-esac
-])# AC_CHECK_LIBM
-
-
-# AC_LIBLTDL_CONVENIENCE([DIRECTORY])
-# -----------------------------------
-# sets LIBLTDL to the link flags for the libltdl convenience library and
-# LTDLINCL to the include flags for the libltdl header and adds
-# --enable-ltdl-convenience to the configure arguments. Note that
-# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided,
-# it is assumed to be `libltdl'. LIBLTDL will be prefixed with
-# '${top_builddir}/' and LTDLINCL will be prefixed with '${top_srcdir}/'
-# (note the single quotes!). If your package is not flat and you're not
-# using automake, define top_builddir and top_srcdir appropriately in
-# the Makefiles.
-AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
- case $enable_ltdl_convenience in
- no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
- "") enable_ltdl_convenience=yes
- ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
- esac
- LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
- LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
- # For backwards non-gettext consistent compatibility...
- INCLTDL="$LTDLINCL"
-])# AC_LIBLTDL_CONVENIENCE
-
-
-# AC_LIBLTDL_INSTALLABLE([DIRECTORY])
-# -----------------------------------
-# sets LIBLTDL to the link flags for the libltdl installable library and
-# LTDLINCL to the include flags for the libltdl header and adds
-# --enable-ltdl-install to the configure arguments. Note that
-# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided,
-# and an installed libltdl is not found, it is assumed to be `libltdl'.
-# LIBLTDL will be prefixed with '${top_builddir}/'# and LTDLINCL with
-# '${top_srcdir}/' (note the single quotes!). If your package is not
-# flat and you're not using automake, define top_builddir and top_srcdir
-# appropriately in the Makefiles.
-# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
-AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
- AC_CHECK_LIB(ltdl, lt_dlinit,
- [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
- [if test x"$enable_ltdl_install" = xno; then
- AC_MSG_WARN([libltdl not installed, but installation disabled])
- else
- enable_ltdl_install=yes
- fi
- ])
- if test x"$enable_ltdl_install" = x"yes"; then
- ac_configure_args="$ac_configure_args --enable-ltdl-install"
- LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
- LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
- else
- ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
- LIBLTDL="-lltdl"
- LTDLINCL=
- fi
- # For backwards non-gettext consistent compatibility...
- INCLTDL="$LTDLINCL"
-])# AC_LIBLTDL_INSTALLABLE
-
-
-# AC_LIBTOOL_CXX
-# --------------
-# enable support for C++ libraries
-AC_DEFUN([AC_LIBTOOL_CXX],
-[AC_REQUIRE([_LT_AC_LANG_CXX])
-])# AC_LIBTOOL_CXX
-
-
-# _LT_AC_LANG_CXX
-# ---------------
-AC_DEFUN([_LT_AC_LANG_CXX],
-[AC_REQUIRE([AC_PROG_CXX])
-AC_REQUIRE([_LT_AC_PROG_CXXCPP])
-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX])
-])# _LT_AC_LANG_CXX
-
-# _LT_AC_PROG_CXXCPP
-# ------------------
-AC_DEFUN([_LT_AC_PROG_CXXCPP],
-[
-AC_REQUIRE([AC_PROG_CXX])
-if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
- ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
- (test "X$CXX" != "Xg++"))) ; then
- AC_PROG_CXXCPP
-fi
-])# _LT_AC_PROG_CXXCPP
-
-# AC_LIBTOOL_F77
-# --------------
-# enable support for Fortran 77 libraries
-AC_DEFUN([AC_LIBTOOL_F77],
-[AC_REQUIRE([_LT_AC_LANG_F77])
-])# AC_LIBTOOL_F77
-
-
-# _LT_AC_LANG_F77
-# ---------------
-AC_DEFUN([_LT_AC_LANG_F77],
-[AC_REQUIRE([AC_PROG_F77])
-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}F77])
-])# _LT_AC_LANG_F77
-
-
-# AC_LIBTOOL_GCJ
-# --------------
-# enable support for GCJ libraries
-AC_DEFUN([AC_LIBTOOL_GCJ],
-[AC_REQUIRE([_LT_AC_LANG_GCJ])
-])# AC_LIBTOOL_GCJ
-
-
-# _LT_AC_LANG_GCJ
-# ---------------
-AC_DEFUN([_LT_AC_LANG_GCJ],
-[AC_PROVIDE_IFELSE([AC_PROG_GCJ],[],
- [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[],
- [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[],
- [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])],
- [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])],
- [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])])
-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}GCJ])
-])# _LT_AC_LANG_GCJ
-
-
-# AC_LIBTOOL_RC
-# -------------
-# enable support for Windows resource files
-AC_DEFUN([AC_LIBTOOL_RC],
-[AC_REQUIRE([LT_AC_PROG_RC])
-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}RC])
-])# AC_LIBTOOL_RC
-
-
-# AC_LIBTOOL_LANG_C_CONFIG
-# ------------------------
-# Ensure that the configuration vars for the C compiler are
-# suitably defined. Those variables are subsequently used by
-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG], [_LT_AC_LANG_C_CONFIG])
-AC_DEFUN([_LT_AC_LANG_C_CONFIG],
-[lt_save_CC="$CC"
-AC_LANG_PUSH(C)
-
-# Source file extension for C test sources.
-ac_ext=c
-
-# Object file extension for compiled C test sources.
-objext=o
-_LT_AC_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='int main(){return(0);}'
-
-_LT_AC_SYS_COMPILER
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
-AC_LIBTOOL_PROG_COMPILER_PIC($1)
-AC_LIBTOOL_PROG_CC_C_O($1)
-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
-AC_LIBTOOL_PROG_LD_SHLIBS($1)
-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
-AC_LIBTOOL_SYS_LIB_STRIP
-AC_LIBTOOL_DLOPEN_SELF
-
-# Report which library types will actually be built
-AC_MSG_CHECKING([if libtool supports shared libraries])
-AC_MSG_RESULT([$can_build_shared])
-
-AC_MSG_CHECKING([whether to build shared libraries])
-test "$can_build_shared" = "no" && enable_shared=no
-
-# On AIX, shared libraries and static libraries use the same namespace, and
-# are all built from PIC.
-case $host_os in
-aix3*)
- test "$enable_shared" = yes && enable_static=no
- if test -n "$RANLIB"; then
- archive_cmds="$archive_cmds~\$RANLIB \$lib"
- postinstall_cmds='$RANLIB $lib'
- fi
- ;;
-
-aix4* | aix5*)
- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
- test "$enable_shared" = yes && enable_static=no
- fi
- ;;
-esac
-AC_MSG_RESULT([$enable_shared])
-
-AC_MSG_CHECKING([whether to build static libraries])
-# Make sure either enable_shared or enable_static is yes.
-test "$enable_shared" = yes || enable_static=yes
-AC_MSG_RESULT([$enable_static])
-
-AC_LIBTOOL_CONFIG($1)
-
-AC_LANG_POP
-CC="$lt_save_CC"
-])# AC_LIBTOOL_LANG_C_CONFIG
-
-
-# AC_LIBTOOL_LANG_CXX_CONFIG
-# --------------------------
-# Ensure that the configuration vars for the C compiler are
-# suitably defined. Those variables are subsequently used by
-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [_LT_AC_LANG_CXX_CONFIG(CXX)])
-AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
-[AC_LANG_PUSH(C++)
-AC_REQUIRE([AC_PROG_CXX])
-AC_REQUIRE([_LT_AC_PROG_CXXCPP])
-
-_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-_LT_AC_TAGVAR(allow_undefined_flag, $1)=
-_LT_AC_TAGVAR(always_export_symbols, $1)=no
-_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
-_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
-_LT_AC_TAGVAR(hardcode_direct, $1)=no
-_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
-_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
-_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-_LT_AC_TAGVAR(hardcode_automatic, $1)=no
-_LT_AC_TAGVAR(module_cmds, $1)=
-_LT_AC_TAGVAR(module_expsym_cmds, $1)=
-_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
-_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_AC_TAGVAR(no_undefined_flag, $1)=
-_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-
-# Dependencies to place before and after the object being linked:
-_LT_AC_TAGVAR(predep_objects, $1)=
-_LT_AC_TAGVAR(postdep_objects, $1)=
-_LT_AC_TAGVAR(predeps, $1)=
-_LT_AC_TAGVAR(postdeps, $1)=
-_LT_AC_TAGVAR(compiler_lib_search_path, $1)=
-
-# Source file extension for C++ test sources.
-ac_ext=cpp
-
-# Object file extension for compiled C++ test sources.
-objext=o
-_LT_AC_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_AC_SYS_COMPILER
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-# Allow CC to be a program name with arguments.
-lt_save_CC=$CC
-lt_save_LD=$LD
-lt_save_GCC=$GCC
-GCC=$GXX
-lt_save_with_gnu_ld=$with_gnu_ld
-lt_save_path_LD=$lt_cv_path_LD
-if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
- lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
-else
- $as_unset lt_cv_prog_gnu_ld
-fi
-if test -n "${lt_cv_path_LDCXX+set}"; then
- lt_cv_path_LD=$lt_cv_path_LDCXX
-else
- $as_unset lt_cv_path_LD
-fi
-test -z "${LDCXX+set}" || LD=$LDCXX
-CC=${CXX-"c++"}
-compiler=$CC
-_LT_AC_TAGVAR(compiler, $1)=$CC
-_LT_CC_BASENAME([$compiler])
-
-# We don't want -fno-exception wen compiling C++ code, so set the
-# no_builtin_flag separately
-if test "$GXX" = yes; then
- _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
-else
- _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
-fi
-
-if test "$GXX" = yes; then
- # Set up default GNU C++ configuration
-
- AC_PROG_LD
-
- # Check if GNU C++ uses GNU ld as the underlying linker, since the
- # archiving commands below assume that GNU ld is being used.
- if test "$with_gnu_ld" = yes; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-
- # If archive_cmds runs LD, not CC, wlarc should be empty
- # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
- # investigate it a little bit more. (MM)
- wlarc='${wl}'
-
- # ancient GNU ld didn't support --whole-archive et. al.
- if eval "`$CC -print-prog-name=ld` --help 2>&1" | \
- grep 'no-whole-archive' > /dev/null; then
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
- else
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
- fi
- else
- with_gnu_ld=no
- wlarc=
-
- # A generic and very simple default shared library creation
- # command for GNU C++ for the case where it uses the native
- # linker, instead of GNU ld. If possible, this setting should
- # overridden to take advantage of the native linker features on
- # the platform it is being used on.
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
- fi
-
- # Commands to make compiler produce verbose output that lists
- # what "hidden" libraries, object files and flags are used when
- # linking a shared library.
- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
-
-else
- GXX=no
- with_gnu_ld=no
- wlarc=
-fi
-
-# PORTME: fill in a description of your system's C++ link characteristics
-AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
-_LT_AC_TAGVAR(ld_shlibs, $1)=yes
-case $host_os in
- aix3*)
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
- aix4* | aix5*)
- if test "$host_cpu" = ia64; then
- # On IA64, the linker does run time linking by default, so we don't
- # have to do anything special.
- aix_use_runtimelinking=no
- exp_sym_flag='-Bexport'
- no_entry_flag=""
- else
- aix_use_runtimelinking=no
-
- # Test if we are trying to use run time linking or normal
- # AIX style linking. If -brtl is somewhere in LDFLAGS, we
- # need to do runtime linking.
- case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
- for ld_flag in $LDFLAGS; do
- case $ld_flag in
- *-brtl*)
- aix_use_runtimelinking=yes
- break
- ;;
- esac
- done
- ;;
- esac
-
- exp_sym_flag='-bexport'
- no_entry_flag='-bnoentry'
- fi
-
- # When large executables or shared objects are built, AIX ld can
- # have problems creating the table of contents. If linking a library
- # or program results in "error TOC overflow" add -mminimal-toc to
- # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not
- # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
- _LT_AC_TAGVAR(archive_cmds, $1)=''
- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-
- if test "$GXX" = yes; then
- case $host_os in aix4.[[012]]|aix4.[[012]].*)
- # We only want to do this on AIX 4.2 and lower, the check
- # below for broken collect2 doesn't work under 4.3+
- collect2name=`${CC} -print-prog-name=collect2`
- if test -f "$collect2name" && \
- strings "$collect2name" | grep resolve_lib_name >/dev/null
- then
- # We have reworked collect2
- :
- else
- # We have old collect2
- _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
- # It fails to find uninstalled libraries when the uninstalled
- # path is not listed in the libpath. Setting hardcode_minus_L
- # to unsupported forces relinking
- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
- fi
- ;;
- esac
- shared_flag='-shared'
- if test "$aix_use_runtimelinking" = yes; then
- shared_flag="$shared_flag "'${wl}-G'
- fi
- else
- # not using gcc
- if test "$host_cpu" = ia64; then
- # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
- # chokes on -Wl,-G. The following line is correct:
- shared_flag='-G'
- else
- if test "$aix_use_runtimelinking" = yes; then
- shared_flag='${wl}-G'
- else
- shared_flag='${wl}-bM:SRE'
- fi
- fi
- fi
-
- # It seems that -bexpall does not export symbols beginning with
- # underscore (_), so it is better to generate a list of symbols to export.
- _LT_AC_TAGVAR(always_export_symbols, $1)=yes
- if test "$aix_use_runtimelinking" = yes; then
- # Warning - without using the other runtime loading flags (-brtl),
- # -berok will link without error, but may produce a broken library.
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
- # Determine the default libpath from the value encoded in an empty executable.
- _LT_AC_SYS_LIBPATH_AIX
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
- else
- if test "$host_cpu" = ia64; then
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
- _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
- else
- # Determine the default libpath from the value encoded in an empty executable.
- _LT_AC_SYS_LIBPATH_AIX
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
- # Warning - without using the other run time loading flags,
- # -berok will link without error, but may produce a broken library.
- _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
- # Exported symbols can be pulled into shared objects from archives
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
- # This is similar to how AIX traditionally builds its shared libraries.
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
- fi
- fi
- ;;
-
- beos*)
- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
- _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
- # Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
- # support --undefined. This deserves some investigation. FIXME
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- else
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
-
- chorus*)
- case $cc_basename in
- *)
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
- esac
- ;;
-
- cygwin* | mingw* | pw32*)
- # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
- # as there is no search path for DLLs.
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
- _LT_AC_TAGVAR(always_export_symbols, $1)=no
- _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-
- if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
- # If the export-symbols file already is a .def file (1st line
- # is EXPORTS), use it as is; otherwise, prepend...
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
- cp $export_symbols $output_objdir/$soname.def;
- else
- echo EXPORTS > $output_objdir/$soname.def;
- cat $export_symbols >> $output_objdir/$soname.def;
- fi~
- $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
- else
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
- darwin* | rhapsody*)
- case $host_os in
- rhapsody* | darwin1.[[012]])
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
- ;;
- *) # Darwin 1.3 on
- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
- else
- case ${MACOSX_DEPLOYMENT_TARGET} in
- 10.[[012]])
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
- ;;
- 10.*)
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
- ;;
- esac
- fi
- ;;
- esac
- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
- _LT_AC_TAGVAR(hardcode_direct, $1)=no
- _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-
- if test "$GXX" = yes ; then
- lt_int_apple_cc_single_mod=no
- output_verbose_link_cmd='echo'
- if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
- lt_int_apple_cc_single_mod=yes
- fi
- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
- else
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
- fi
- _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- else
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- fi
- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- else
- case $cc_basename in
- xlc*)
- output_verbose_link_cmd='echo'
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
- _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- ;;
- *)
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
- esac
- fi
- ;;
-
- dgux*)
- case $cc_basename in
- ec++*)
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
- ghcx*)
- # Green Hills C++ Compiler
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
- *)
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
- esac
- ;;
- freebsd[[12]]*)
- # C++ shared libraries reported to be fairly broken before switch to ELF
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
- freebsd-elf*)
- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
- ;;
- freebsd* | dragonfly*)
- # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
- # conventions
- _LT_AC_TAGVAR(ld_shlibs, $1)=yes
- ;;
- gnu*)
- ;;
- hpux9*)
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
- # but as the default
- # location of the library.
-
- case $cc_basename in
- CC*)
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
- aCC*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
- # Commands to make compiler produce verbose output that lists
- # what "hidden" libraries, object files and flags are used when
- # linking a shared library.
- #
- # There doesn't appear to be a way to prevent this compiler from
- # explicitly linking system object files so we need to strip them
- # from the output so that they don't get included in the library
- # dependencies.
- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[[-]]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
- ;;
- *)
- if test "$GXX" = yes; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
- else
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
- esac
- ;;
- hpux10*|hpux11*)
- if test $with_gnu_ld = no; then
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
- case $host_cpu in
- hppa*64*|ia64*) ;;
- *)
- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
- ;;
- esac
- fi
- case $host_cpu in
- hppa*64*|ia64*)
- _LT_AC_TAGVAR(hardcode_direct, $1)=no
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
- *)
- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
- # but as the default
- # location of the library.
- ;;
- esac
-
- case $cc_basename in
- CC*)
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
- aCC*)
- case $host_cpu in
- hppa*64*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
- ;;
- ia64*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
- ;;
- *)
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
- ;;
- esac
- # Commands to make compiler produce verbose output that lists
- # what "hidden" libraries, object files and flags are used when
- # linking a shared library.
- #
- # There doesn't appear to be a way to prevent this compiler from
- # explicitly linking system object files so we need to strip them
- # from the output so that they don't get included in the library
- # dependencies.
- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
- ;;
- *)
- if test "$GXX" = yes; then
- if test $with_gnu_ld = no; then
- case $host_cpu in
- hppa*64*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
- ;;
- ia64*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
- ;;
- *)
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
- ;;
- esac
- fi
- else
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
- esac
- ;;
- interix[[3-9]]*)
- _LT_AC_TAGVAR(hardcode_direct, $1)=no
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
- # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
- # Instead, shared libraries are loaded at an image base (0x10000000 by
- # default) and relocated if they conflict, which is a slow very memory
- # consuming and fragmenting process. To avoid this, we pick a random,
- # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
- # time. Moving up from 0x10000000 also allows more sbrk(2) space.
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
- ;;
- irix5* | irix6*)
- case $cc_basename in
- CC*)
- # SGI C++
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-
- # Archives containing C++ object files must be created using
- # "CC -ar", where "CC" is the IRIX C++ compiler. This is
- # necessary to make sure instantiated templates are included
- # in the archive.
- _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
- ;;
- *)
- if test "$GXX" = yes; then
- if test "$with_gnu_ld" = no; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
- else
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
- fi
- fi
- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
- ;;
- esac
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
- ;;
- linux* | k*bsd*-gnu)
- case $cc_basename in
- KCC*)
- # Kuck and Associates, Inc. (KAI) C++ Compiler
-
- # KCC will only create a shared library if the output file
- # ends with ".so" (or ".sl" for HP-UX), so rename the library
- # to its proper name (with version) after linking.
- _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
- # Commands to make compiler produce verbose output that lists
- # what "hidden" libraries, object files and flags are used when
- # linking a shared library.
- #
- # There doesn't appear to be a way to prevent this compiler from
- # explicitly linking system object files so we need to strip them
- # from the output so that they don't get included in the library
- # dependencies.
- output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath,$libdir'
- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-
- # Archives containing C++ object files must be created using
- # "CC -Bstatic", where "CC" is the KAI C++ compiler.
- _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
- ;;
- icpc*)
- # Intel C++
- with_gnu_ld=yes
- # version 8.0 and above of icpc choke on multiply defined symbols
- # if we add $predep_objects and $postdep_objects, however 7.1 and
- # earlier do not add the objects themselves.
- case `$CC -V 2>&1` in
- *"Version 7."*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- ;;
- *) # Version 8.0 or newer
- tmp_idyn=
- case $host_cpu in
- ia64*) tmp_idyn=' -i_dynamic';;
- esac
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- ;;
- esac
- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
- ;;
- pgCC*)
- # Portland Group C++ compiler
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
-
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
- ;;
- cxx*)
- # Compaq C++
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
-
- runpath_var=LD_RUN_PATH
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
- # Commands to make compiler produce verbose output that lists
- # what "hidden" libraries, object files and flags are used when
- # linking a shared library.
- #
- # There doesn't appear to be a way to prevent this compiler from
- # explicitly linking system object files so we need to strip them
- # from the output so that they don't get included in the library
- # dependencies.
- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
- ;;
- *)
- case `$CC -V 2>&1 | sed 5q` in
- *Sun\ C*)
- # Sun C++ 5.9
- _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-
- # Not sure whether something based on
- # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
- # would be better.
- output_verbose_link_cmd='echo'
-
- # Archives containing C++ object files must be created using
- # "CC -xar", where "CC" is the Sun C++ compiler. This is
- # necessary to make sure instantiated templates are included
- # in the archive.
- _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
- ;;
- esac
- ;;
- esac
- ;;
- lynxos*)
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
- m88k*)
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
- mvs*)
- case $cc_basename in
- cxx*)
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
- *)
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
- esac
- ;;
- netbsd*)
- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
- wlarc=
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- fi
- # Workaround some broken pre-1.5 toolchains
- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
- ;;
- openbsd2*)
- # C++ shared libraries are fairly broken
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
- openbsd*)
- if test -f /usr/libexec/ld.so; then
- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
- fi
- output_verbose_link_cmd='echo'
- else
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
- osf3*)
- case $cc_basename in
- KCC*)
- # Kuck and Associates, Inc. (KAI) C++ Compiler
-
- # KCC will only create a shared library if the output file
- # ends with ".so" (or ".sl" for HP-UX), so rename the library
- # to its proper name (with version) after linking.
- _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
- # Archives containing C++ object files must be created using
- # "CC -Bstatic", where "CC" is the KAI C++ compiler.
- _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
-
- ;;
- RCC*)
- # Rational C++ 2.4.1
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
- cxx*)
- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
- # Commands to make compiler produce verbose output that lists
- # what "hidden" libraries, object files and flags are used when
- # linking a shared library.
- #
- # There doesn't appear to be a way to prevent this compiler from
- # explicitly linking system object files so we need to strip them
- # from the output so that they don't get included in the library
- # dependencies.
- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
- ;;
- *)
- if test "$GXX" = yes && test "$with_gnu_ld" = no; then
- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
- # Commands to make compiler produce verbose output that lists
- # what "hidden" libraries, object files and flags are used when
- # linking a shared library.
- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
-
- else
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
- esac
- ;;
- osf4* | osf5*)
- case $cc_basename in
- KCC*)
- # Kuck and Associates, Inc. (KAI) C++ Compiler
-
- # KCC will only create a shared library if the output file
- # ends with ".so" (or ".sl" for HP-UX), so rename the library
- # to its proper name (with version) after linking.
- _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
- # Archives containing C++ object files must be created using
- # the KAI C++ compiler.
- _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
- ;;
- RCC*)
- # Rational C++ 2.4.1
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
- cxx*)
- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
- echo "-hidden">> $lib.exp~
- $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~
- $rm $lib.exp'
-
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
- # Commands to make compiler produce verbose output that lists
- # what "hidden" libraries, object files and flags are used when
- # linking a shared library.
- #
- # There doesn't appear to be a way to prevent this compiler from
- # explicitly linking system object files so we need to strip them
- # from the output so that they don't get included in the library
- # dependencies.
- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
- ;;
- *)
- if test "$GXX" = yes && test "$with_gnu_ld" = no; then
- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
- # Commands to make compiler produce verbose output that lists
- # what "hidden" libraries, object files and flags are used when
- # linking a shared library.
- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
-
- else
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
- esac
- ;;
- psos*)
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
- sunos4*)
- case $cc_basename in
- CC*)
- # Sun C++ 4.x
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
- lcc*)
- # Lucid
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
- *)
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
- esac
- ;;
- solaris*)
- case $cc_basename in
- CC*)
- # Sun C++ 4.2, 5.x and Centerline C++
- _LT_AC_TAGVAR(archive_cmds_need_lc,$1)=yes
- _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
- $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
-
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- case $host_os in
- solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
- *)
- # The compiler driver will combine and reorder linker options,
- # but understands `-z linker_flag'.
- # Supported since Solaris 2.6 (maybe 2.5.1?)
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
- ;;
- esac
- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-
- output_verbose_link_cmd='echo'
-
- # Archives containing C++ object files must be created using
- # "CC -xar", where "CC" is the Sun C++ compiler. This is
- # necessary to make sure instantiated templates are included
- # in the archive.
- _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
- ;;
- gcx*)
- # Green Hills C++ Compiler
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-
- # The C++ compiler must be used to create the archive.
- _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
- ;;
- *)
- # GNU C++ compiler with Solaris linker
- if test "$GXX" = yes && test "$with_gnu_ld" = no; then
- _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
- if $CC --version | grep -v '^2\.7' > /dev/null; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
- $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
-
- # Commands to make compiler produce verbose output that lists
- # what "hidden" libraries, object files and flags are used when
- # linking a shared library.
- output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
- else
- # g++ 2.7 appears to require `-G' NOT `-shared' on this
- # platform.
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
- $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
-
- # Commands to make compiler produce verbose output that lists
- # what "hidden" libraries, object files and flags are used when
- # linking a shared library.
- output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
- fi
-
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
- case $host_os in
- solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
- *)
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
- ;;
- esac
- fi
- ;;
- esac
- ;;
- sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
- _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- runpath_var='LD_RUN_PATH'
-
- case $cc_basename in
- CC*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- ;;
- *)
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- ;;
- esac
- ;;
- sysv5* | sco3.2v5* | sco5v6*)
- # Note: We can NOT use -z defs as we might desire, because we do not
- # link with -lc, and that would cause any symbols used from libc to
- # always be unresolved, which means just about no library would
- # ever link correctly. If we're not using GNU ld we use -z text
- # though, which does catch some bad symbols but isn't as heavy-handed
- # as -z defs.
- # For security reasons, it is highly recommended that you always
- # use absolute paths for naming shared libraries, and exclude the
- # DT_RUNPATH tag from executables and libraries. But doing so
- # requires that you compile everything twice, which is a pain.
- # So that behaviour is only enabled if SCOABSPATH is set to a
- # non-empty value in the environment. Most likely only useful for
- # creating official distributions of packages.
- # This is a hack until libtool officially supports absolute path
- # names for shared libraries.
- _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
- runpath_var='LD_RUN_PATH'
-
- case $cc_basename in
- CC*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
- ;;
- *)
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
- ;;
- esac
- ;;
- tandem*)
- case $cc_basename in
- NCC*)
- # NonStop-UX NCC 3.20
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
- *)
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
- esac
- ;;
- vxworks*)
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
- *)
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
-esac
-AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
-test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-
-_LT_AC_TAGVAR(GCC, $1)="$GXX"
-_LT_AC_TAGVAR(LD, $1)="$LD"
-
-AC_LIBTOOL_POSTDEP_PREDEP($1)
-AC_LIBTOOL_PROG_COMPILER_PIC($1)
-AC_LIBTOOL_PROG_CC_C_O($1)
-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
-AC_LIBTOOL_PROG_LD_SHLIBS($1)
-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
-
-AC_LIBTOOL_CONFIG($1)
-
-AC_LANG_POP
-CC=$lt_save_CC
-LDCXX=$LD
-LD=$lt_save_LD
-GCC=$lt_save_GCC
-with_gnu_ldcxx=$with_gnu_ld
-with_gnu_ld=$lt_save_with_gnu_ld
-lt_cv_path_LDCXX=$lt_cv_path_LD
-lt_cv_path_LD=$lt_save_path_LD
-lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
-lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
-])# AC_LIBTOOL_LANG_CXX_CONFIG
-
-# AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME])
-# ------------------------------------
-# Figure out "hidden" library dependencies from verbose
-# compiler output when linking a shared library.
-# Parse the compiler output and extract the necessary
-# objects, libraries and library flags.
-AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[
-dnl we can't use the lt_simple_compile_test_code here,
-dnl because it contains code intended for an executable,
-dnl not a library. It's possible we should let each
-dnl tag define a new lt_????_link_test_code variable,
-dnl but it's only used here...
-ifelse([$1],[],[cat > conftest.$ac_ext <<EOF
-int a;
-void foo (void) { a = 0; }
-EOF
-],[$1],[CXX],[cat > conftest.$ac_ext <<EOF
-class Foo
-{
-public:
- Foo (void) { a = 0; }
-private:
- int a;
-};
-EOF
-],[$1],[F77],[cat > conftest.$ac_ext <<EOF
- subroutine foo
- implicit none
- integer*4 a
- a=0
- return
- end
-EOF
-],[$1],[GCJ],[cat > conftest.$ac_ext <<EOF
-public class foo {
- private int a;
- public void bar (void) {
- a = 0;
- }
-};
-EOF
-])
-dnl Parse the compiler output and extract the necessary
-dnl objects, libraries and library flags.
-if AC_TRY_EVAL(ac_compile); then
- # Parse the compiler output and extract the necessary
- # objects, libraries and library flags.
-
- # Sentinel used to keep track of whether or not we are before
- # the conftest object file.
- pre_test_object_deps_done=no
-
- # The `*' in the case matches for architectures that use `case' in
- # $output_verbose_cmd can trigger glob expansion during the loop
- # eval without this substitution.
- output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"`
-
- for p in `eval $output_verbose_link_cmd`; do
- case $p in
-
- -L* | -R* | -l*)
- # Some compilers place space between "-{L,R}" and the path.
- # Remove the space.
- if test $p = "-L" \
- || test $p = "-R"; then
- prev=$p
- continue
- else
- prev=
- fi
-
- if test "$pre_test_object_deps_done" = no; then
- case $p in
- -L* | -R*)
- # Internal compiler library paths should come after those
- # provided the user. The postdeps already come after the
- # user supplied libs so there is no need to process them.
- if test -z "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then
- _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
- else
- _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${_LT_AC_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
- fi
- ;;
- # The "-l" case would never come before the object being
- # linked, so don't bother handling this case.
- esac
- else
- if test -z "$_LT_AC_TAGVAR(postdeps, $1)"; then
- _LT_AC_TAGVAR(postdeps, $1)="${prev}${p}"
- else
- _LT_AC_TAGVAR(postdeps, $1)="${_LT_AC_TAGVAR(postdeps, $1)} ${prev}${p}"
- fi
- fi
- ;;
-
- *.$objext)
- # This assumes that the test object file only shows up
- # once in the compiler output.
- if test "$p" = "conftest.$objext"; then
- pre_test_object_deps_done=yes
- continue
- fi
-
- if test "$pre_test_object_deps_done" = no; then
- if test -z "$_LT_AC_TAGVAR(predep_objects, $1)"; then
- _LT_AC_TAGVAR(predep_objects, $1)="$p"
- else
- _LT_AC_TAGVAR(predep_objects, $1)="$_LT_AC_TAGVAR(predep_objects, $1) $p"
- fi
- else
- if test -z "$_LT_AC_TAGVAR(postdep_objects, $1)"; then
- _LT_AC_TAGVAR(postdep_objects, $1)="$p"
- else
- _LT_AC_TAGVAR(postdep_objects, $1)="$_LT_AC_TAGVAR(postdep_objects, $1) $p"
- fi
- fi
- ;;
-
- *) ;; # Ignore the rest.
-
- esac
- done
-
- # Clean up.
- rm -f a.out a.exe
-else
- echo "libtool.m4: error: problem compiling $1 test program"
-fi
-
-$rm -f confest.$objext
-
-# PORTME: override above test on systems where it is broken
-ifelse([$1],[CXX],
-[case $host_os in
-interix[[3-9]]*)
- # Interix 3.5 installs completely hosed .la files for C++, so rather than
- # hack all around it, let's just trust "g++" to DTRT.
- _LT_AC_TAGVAR(predep_objects,$1)=
- _LT_AC_TAGVAR(postdep_objects,$1)=
- _LT_AC_TAGVAR(postdeps,$1)=
- ;;
-
-linux*)
- case `$CC -V 2>&1 | sed 5q` in
- *Sun\ C*)
- # Sun C++ 5.9
- #
- # The more standards-conforming stlport4 library is
- # incompatible with the Cstd library. Avoid specifying
- # it if it's in CXXFLAGS. Ignore libCrun as
- # -library=stlport4 depends on it.
- case " $CXX $CXXFLAGS " in
- *" -library=stlport4 "*)
- solaris_use_stlport4=yes
- ;;
- esac
- if test "$solaris_use_stlport4" != yes; then
- _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
- fi
- ;;
- esac
- ;;
-
-solaris*)
- case $cc_basename in
- CC*)
- # The more standards-conforming stlport4 library is
- # incompatible with the Cstd library. Avoid specifying
- # it if it's in CXXFLAGS. Ignore libCrun as
- # -library=stlport4 depends on it.
- case " $CXX $CXXFLAGS " in
- *" -library=stlport4 "*)
- solaris_use_stlport4=yes
- ;;
- esac
-
- # Adding this requires a known-good setup of shared libraries for
- # Sun compiler versions before 5.6, else PIC objects from an old
- # archive will be linked into the output, leading to subtle bugs.
- if test "$solaris_use_stlport4" != yes; then
- _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
- fi
- ;;
- esac
- ;;
-esac
-])
-
-case " $_LT_AC_TAGVAR(postdeps, $1) " in
-*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
-esac
-])# AC_LIBTOOL_POSTDEP_PREDEP
-
-# AC_LIBTOOL_LANG_F77_CONFIG
-# --------------------------
-# Ensure that the configuration vars for the C compiler are
-# suitably defined. Those variables are subsequently used by
-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG], [_LT_AC_LANG_F77_CONFIG(F77)])
-AC_DEFUN([_LT_AC_LANG_F77_CONFIG],
-[AC_REQUIRE([AC_PROG_F77])
-AC_LANG_PUSH(Fortran 77)
-
-_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-_LT_AC_TAGVAR(allow_undefined_flag, $1)=
-_LT_AC_TAGVAR(always_export_symbols, $1)=no
-_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
-_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
-_LT_AC_TAGVAR(hardcode_direct, $1)=no
-_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
-_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
-_LT_AC_TAGVAR(hardcode_automatic, $1)=no
-_LT_AC_TAGVAR(module_cmds, $1)=
-_LT_AC_TAGVAR(module_expsym_cmds, $1)=
-_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
-_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_AC_TAGVAR(no_undefined_flag, $1)=
-_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-
-# Source file extension for f77 test sources.
-ac_ext=f
-
-# Object file extension for compiled f77 test sources.
-objext=o
-_LT_AC_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="\
- subroutine t
- return
- end
-"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code="\
- program t
- end
-"
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_AC_SYS_COMPILER
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
-CC=${F77-"f77"}
-compiler=$CC
-_LT_AC_TAGVAR(compiler, $1)=$CC
-_LT_CC_BASENAME([$compiler])
-
-AC_MSG_CHECKING([if libtool supports shared libraries])
-AC_MSG_RESULT([$can_build_shared])
-
-AC_MSG_CHECKING([whether to build shared libraries])
-test "$can_build_shared" = "no" && enable_shared=no
-
-# On AIX, shared libraries and static libraries use the same namespace, and
-# are all built from PIC.
-case $host_os in
-aix3*)
- test "$enable_shared" = yes && enable_static=no
- if test -n "$RANLIB"; then
- archive_cmds="$archive_cmds~\$RANLIB \$lib"
- postinstall_cmds='$RANLIB $lib'
- fi
- ;;
-aix4* | aix5*)
- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
- test "$enable_shared" = yes && enable_static=no
- fi
- ;;
-esac
-AC_MSG_RESULT([$enable_shared])
-
-AC_MSG_CHECKING([whether to build static libraries])
-# Make sure either enable_shared or enable_static is yes.
-test "$enable_shared" = yes || enable_static=yes
-AC_MSG_RESULT([$enable_static])
-
-_LT_AC_TAGVAR(GCC, $1)="$G77"
-_LT_AC_TAGVAR(LD, $1)="$LD"
-
-AC_LIBTOOL_PROG_COMPILER_PIC($1)
-AC_LIBTOOL_PROG_CC_C_O($1)
-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
-AC_LIBTOOL_PROG_LD_SHLIBS($1)
-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
-
-AC_LIBTOOL_CONFIG($1)
-
-AC_LANG_POP
-CC="$lt_save_CC"
-])# AC_LIBTOOL_LANG_F77_CONFIG
-
-
-# AC_LIBTOOL_LANG_GCJ_CONFIG
-# --------------------------
-# Ensure that the configuration vars for the C compiler are
-# suitably defined. Those variables are subsequently used by
-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG], [_LT_AC_LANG_GCJ_CONFIG(GCJ)])
-AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG],
-[AC_LANG_SAVE
-
-# Source file extension for Java test sources.
-ac_ext=java
-
-# Object file extension for compiled Java test sources.
-objext=o
-_LT_AC_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="class foo {}"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }'
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_AC_SYS_COMPILER
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
-CC=${GCJ-"gcj"}
-compiler=$CC
-_LT_AC_TAGVAR(compiler, $1)=$CC
-_LT_CC_BASENAME([$compiler])
-
-# GCJ did not exist at the time GCC didn't implicitly link libc in.
-_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-
-_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-
-AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
-AC_LIBTOOL_PROG_COMPILER_PIC($1)
-AC_LIBTOOL_PROG_CC_C_O($1)
-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
-AC_LIBTOOL_PROG_LD_SHLIBS($1)
-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
-
-AC_LIBTOOL_CONFIG($1)
-
-AC_LANG_RESTORE
-CC="$lt_save_CC"
-])# AC_LIBTOOL_LANG_GCJ_CONFIG
-
-
-# AC_LIBTOOL_LANG_RC_CONFIG
-# -------------------------
-# Ensure that the configuration vars for the Windows resource compiler are
-# suitably defined. Those variables are subsequently used by
-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG], [_LT_AC_LANG_RC_CONFIG(RC)])
-AC_DEFUN([_LT_AC_LANG_RC_CONFIG],
-[AC_LANG_SAVE
-
-# Source file extension for RC test sources.
-ac_ext=rc
-
-# Object file extension for compiled RC test sources.
-objext=o
-_LT_AC_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
-
-# Code to be used in simple link tests
-lt_simple_link_test_code="$lt_simple_compile_test_code"
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_AC_SYS_COMPILER
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
-CC=${RC-"windres"}
-compiler=$CC
-_LT_AC_TAGVAR(compiler, $1)=$CC
-_LT_CC_BASENAME([$compiler])
-_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
-
-AC_LIBTOOL_CONFIG($1)
-
-AC_LANG_RESTORE
-CC="$lt_save_CC"
-])# AC_LIBTOOL_LANG_RC_CONFIG
-
-
-# AC_LIBTOOL_CONFIG([TAGNAME])
-# ----------------------------
-# If TAGNAME is not passed, then create an initial libtool script
-# with a default configuration from the untagged config vars. Otherwise
-# add code to config.status for appending the configuration named by
-# TAGNAME from the matching tagged config vars.
-AC_DEFUN([AC_LIBTOOL_CONFIG],
-[# The else clause should only fire when bootstrapping the
-# libtool distribution, otherwise you forgot to ship ltmain.sh
-# with your package, and you will get complaints that there are
-# no rules to generate ltmain.sh.
-if test -f "$ltmain"; then
- # See if we are running on zsh, and set the options which allow our commands through
- # without removal of \ escapes.
- if test -n "${ZSH_VERSION+set}" ; then
- setopt NO_GLOB_SUBST
- fi
- # Now quote all the things that may contain metacharacters while being
- # careful not to overquote the AC_SUBSTed values. We take copies of the
- # variables and quote the copies for generation of the libtool script.
- for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
- SED SHELL STRIP \
- libname_spec library_names_spec soname_spec extract_expsyms_cmds \
- old_striplib striplib file_magic_cmd finish_cmds finish_eval \
- deplibs_check_method reload_flag reload_cmds need_locks \
- lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
- lt_cv_sys_global_symbol_to_c_name_address \
- sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
- old_postinstall_cmds old_postuninstall_cmds \
- _LT_AC_TAGVAR(compiler, $1) \
- _LT_AC_TAGVAR(CC, $1) \
- _LT_AC_TAGVAR(LD, $1) \
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1) \
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1) \
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1) \
- _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) \
- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1) \
- _LT_AC_TAGVAR(thread_safe_flag_spec, $1) \
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1) \
- _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) \
- _LT_AC_TAGVAR(old_archive_cmds, $1) \
- _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) \
- _LT_AC_TAGVAR(predep_objects, $1) \
- _LT_AC_TAGVAR(postdep_objects, $1) \
- _LT_AC_TAGVAR(predeps, $1) \
- _LT_AC_TAGVAR(postdeps, $1) \
- _LT_AC_TAGVAR(compiler_lib_search_path, $1) \
- _LT_AC_TAGVAR(archive_cmds, $1) \
- _LT_AC_TAGVAR(archive_expsym_cmds, $1) \
- _LT_AC_TAGVAR(postinstall_cmds, $1) \
- _LT_AC_TAGVAR(postuninstall_cmds, $1) \
- _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) \
- _LT_AC_TAGVAR(allow_undefined_flag, $1) \
- _LT_AC_TAGVAR(no_undefined_flag, $1) \
- _LT_AC_TAGVAR(export_symbols_cmds, $1) \
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) \
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1) \
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1) \
- _LT_AC_TAGVAR(hardcode_automatic, $1) \
- _LT_AC_TAGVAR(module_cmds, $1) \
- _LT_AC_TAGVAR(module_expsym_cmds, $1) \
- _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \
- _LT_AC_TAGVAR(fix_srcfile_path, $1) \
- _LT_AC_TAGVAR(exclude_expsyms, $1) \
- _LT_AC_TAGVAR(include_expsyms, $1); do
-
- case $var in
- _LT_AC_TAGVAR(old_archive_cmds, $1) | \
- _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) | \
- _LT_AC_TAGVAR(archive_cmds, $1) | \
- _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
- _LT_AC_TAGVAR(module_cmds, $1) | \
- _LT_AC_TAGVAR(module_expsym_cmds, $1) | \
- _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
- _LT_AC_TAGVAR(export_symbols_cmds, $1) | \
- extract_expsyms_cmds | reload_cmds | finish_cmds | \
- postinstall_cmds | postuninstall_cmds | \
- old_postinstall_cmds | old_postuninstall_cmds | \
- sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
- # Double-quote double-evaled strings.
- eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
- ;;
- *)
- eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
- ;;
- esac
- done
-
- case $lt_echo in
- *'\[$]0 --fallback-echo"')
- lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\[$]0 --fallback-echo"[$]/[$]0 --fallback-echo"/'`
- ;;
- esac
-
-ifelse([$1], [],
- [cfgfile="${ofile}T"
- trap "$rm \"$cfgfile\"; exit 1" 1 2 15
- $rm -f "$cfgfile"
- AC_MSG_NOTICE([creating $ofile])],
- [cfgfile="$ofile"])
-
- cat <<__EOF__ >> "$cfgfile"
-ifelse([$1], [],
-[#! $SHELL
-
-# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
-# NOTE: Changes made to this file will be lost: look at ltmain.sh.
-#
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
-# Free Software Foundation, Inc.
-#
-# This file is part of GNU Libtool:
-# Originally by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# A sed program that does not truncate output.
-SED=$lt_SED
-
-# Sed that helps us avoid accidentally triggering echo(1) options like -n.
-Xsed="$SED -e 1s/^X//"
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-# The names of the tagged configurations supported by this script.
-available_tags=
-
-# ### BEGIN LIBTOOL CONFIG],
-[# ### BEGIN LIBTOOL TAG CONFIG: $tagname])
-
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
-
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
-
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)
-
-# Whether or not to disallow shared libs when runtime libs are static
-allow_libtool_libs_with_static_runtimes=$_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)
-
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
-
-# The host system.
-host_alias=$host_alias
-host=$host
-host_os=$host_os
-
-# The build system.
-build_alias=$build_alias
-build=$build
-build_os=$build_os
-
-# An echo program that does not interpret backslashes.
-echo=$lt_echo
-
-# The archiver.
-AR=$lt_AR
-AR_FLAGS=$lt_AR_FLAGS
-
-# A C compiler.
-LTCC=$lt_LTCC
-
-# LTCC compiler flags.
-LTCFLAGS=$lt_LTCFLAGS
-
-# A language-specific compiler.
-CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
-
-# Is the compiler the GNU C compiler?
-with_gcc=$_LT_AC_TAGVAR(GCC, $1)
-
-# An ERE matcher.
-EGREP=$lt_EGREP
-
-# The linker used to build libraries.
-LD=$lt_[]_LT_AC_TAGVAR(LD, $1)
-
-# Whether we need hard or soft links.
-LN_S=$lt_LN_S
-
-# A BSD-compatible nm program.
-NM=$lt_NM
-
-# A symbol stripping program
-STRIP=$lt_STRIP
-
-# Used to examine libraries when file_magic_cmd begins "file"
-MAGIC_CMD=$MAGIC_CMD
-
-# Used on cygwin: DLL creation program.
-DLLTOOL="$DLLTOOL"
-
-# Used on cygwin: object dumper.
-OBJDUMP="$OBJDUMP"
-
-# Used on cygwin: assembler.
-AS="$AS"
-
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
-
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
-
-# How to pass a linker flag through the compiler.
-wl=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
-
-# Object file suffix (normally "o").
-objext="$ac_objext"
-
-# Old archive suffix (normally "a").
-libext="$libext"
-
-# Shared library suffix (normally ".so").
-shrext_cmds='$shrext_cmds'
-
-# Executable file suffix (normally "").
-exeext="$exeext"
-
-# Additional compiler flags for building library objects.
-pic_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
-pic_mode=$pic_mode
-
-# What is the maximum length of a command?
-max_cmd_len=$lt_cv_sys_max_cmd_len
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
-
-# Must we lock files when doing compilation?
-need_locks=$lt_need_locks
-
-# Do we need the lib prefix for modules?
-need_lib_prefix=$need_lib_prefix
-
-# Do we need a version for libraries?
-need_version=$need_version
-
-# Whether dlopen is supported.
-dlopen_support=$enable_dlopen
-
-# Whether dlopen of programs is supported.
-dlopen_self=$enable_dlopen_self
-
-# Whether dlopen of statically linked programs is supported.
-dlopen_self_static=$enable_dlopen_self_static
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_static, $1)
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$lt_[]_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$lt_[]_LT_AC_TAGVAR(whole_archive_flag_spec, $1)
-
-# Compiler flag to generate thread-safe objects.
-thread_safe_flag_spec=$lt_[]_LT_AC_TAGVAR(thread_safe_flag_spec, $1)
-
-# Library versioning type.
-version_type=$version_type
-
-# Format of library name prefix.
-libname_spec=$lt_libname_spec
-
-# List of archive names. First name is the real one, the rest are links.
-# The last name is the one that the linker finds with -lNAME.
-library_names_spec=$lt_library_names_spec
-
-# The coded name of the library, if different from the real name.
-soname_spec=$lt_soname_spec
-
-# Commands used to build and install an old-style archive.
-RANLIB=$lt_RANLIB
-old_archive_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_cmds, $1)
-old_postinstall_cmds=$lt_old_postinstall_cmds
-old_postuninstall_cmds=$lt_old_postuninstall_cmds
-
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_new_cmds, $1)
-
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)
-
-# Commands used to build and install a shared archive.
-archive_cmds=$lt_[]_LT_AC_TAGVAR(archive_cmds, $1)
-archive_expsym_cmds=$lt_[]_LT_AC_TAGVAR(archive_expsym_cmds, $1)
-postinstall_cmds=$lt_postinstall_cmds
-postuninstall_cmds=$lt_postuninstall_cmds
-
-# Commands used to build a loadable module (assumed same as above if empty)
-module_cmds=$lt_[]_LT_AC_TAGVAR(module_cmds, $1)
-module_expsym_cmds=$lt_[]_LT_AC_TAGVAR(module_expsym_cmds, $1)
-
-# Commands to strip libraries.
-old_striplib=$lt_old_striplib
-striplib=$lt_striplib
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1)
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1)
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1)
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
-
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
-
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method=$lt_deplibs_check_method
-
-# Command to use when deplibs_check_method == file_magic.
-file_magic_cmd=$lt_file_magic_cmd
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$lt_[]_LT_AC_TAGVAR(allow_undefined_flag, $1)
-
-# Flag that forces no undefined symbols.
-no_undefined_flag=$lt_[]_LT_AC_TAGVAR(no_undefined_flag, $1)
-
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds=$lt_finish_cmds
-
-# Same as above, but a single script fragment to be evaled but not shown.
-finish_eval=$lt_finish_eval
-
-# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
-
-# Transform the output of nm in a proper C declaration
-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-
-# Transform the output of nm in a C name address pair
-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
-
-# This is the shared library runtime path variable.
-runpath_var=$runpath_var
-
-# This is the shared library path variable.
-shlibpath_var=$shlibpath_var
-
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=$_LT_AC_TAGVAR(hardcode_action, $1)
-
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=$hardcode_into_libs
-
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)
-
-# If ld is used when linking, flag to hardcode \$libdir into
-# a binary during linking. This must work even if \$libdir does
-# not exist.
-hardcode_libdir_flag_spec_ld=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)
-
-# Whether we need a single -rpath flag with a separated argument.
-hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1)
-
-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
-# resulting binary.
-hardcode_direct=$_LT_AC_TAGVAR(hardcode_direct, $1)
-
-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-# resulting binary.
-hardcode_minus_L=$_LT_AC_TAGVAR(hardcode_minus_L, $1)
-
-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-# the resulting binary.
-hardcode_shlibpath_var=$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)
-
-# Set to yes if building a shared library automatically hardcodes DIR into the library
-# and all subsequent libraries and executables linked against it.
-hardcode_automatic=$_LT_AC_TAGVAR(hardcode_automatic, $1)
-
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at relink time.
-variables_saved_for_relink="$variables_saved_for_relink"
-
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1)
-
-# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-
-# Run-time system search path for libraries
-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-
-# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path=$lt_fix_srcfile_path
-
-# Set to yes if exported symbols are required.
-always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1)
-
-# The commands to list exported symbols.
-export_symbols_cmds=$lt_[]_LT_AC_TAGVAR(export_symbols_cmds, $1)
-
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=$lt_extract_expsyms_cmds
-
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$lt_[]_LT_AC_TAGVAR(exclude_expsyms, $1)
-
-# Symbols that must always be exported.
-include_expsyms=$lt_[]_LT_AC_TAGVAR(include_expsyms, $1)
-
-ifelse([$1],[],
-[# ### END LIBTOOL CONFIG],
-[# ### END LIBTOOL TAG CONFIG: $tagname])
-
-__EOF__
-
-ifelse([$1],[], [
- case $host_os in
- aix3*)
- cat <<\EOF >> "$cfgfile"
-
-# AIX sometimes has problems with the GCC collect2 program. For some
-# reason, if we set the COLLECT_NAMES environment variable, the problems
-# vanish in a puff of smoke.
-if test "X${COLLECT_NAMES+set}" != Xset; then
- COLLECT_NAMES=
- export COLLECT_NAMES
-fi
-EOF
- ;;
- esac
-
- # We use sed instead of cat because bash on DJGPP gets confused if
- # if finds mixed CR/LF and LF-only lines. Since sed operates in
- # text mode, it properly converts lines to CR/LF. This bash problem
- # is reportedly fixed, but why not run on old versions too?
- sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1)
-
- mv -f "$cfgfile" "$ofile" || \
- (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
- chmod +x "$ofile"
-])
-else
- # If there is no Makefile yet, we rely on a make rule to execute
- # `config.status --recheck' to rerun these tests and create the
- # libtool script then.
- ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
- if test -f "$ltmain_in"; then
- test -f Makefile && make "$ltmain"
- fi
-fi
-])# AC_LIBTOOL_CONFIG
-
-
-# AC_LIBTOOL_PROG_COMPILER_NO_RTTI([TAGNAME])
-# -------------------------------------------
-AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI],
-[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
-
-_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
-
-if test "$GCC" = yes; then
- _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
-
- AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
- lt_cv_prog_compiler_rtti_exceptions,
- [-fno-rtti -fno-exceptions], [],
- [_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
-fi
-])# AC_LIBTOOL_PROG_COMPILER_NO_RTTI
-
-
-# AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
-# ---------------------------------
-AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],
-[AC_REQUIRE([AC_CANONICAL_HOST])
-AC_REQUIRE([LT_AC_PROG_SED])
-AC_REQUIRE([AC_PROG_NM])
-AC_REQUIRE([AC_OBJEXT])
-# Check for command to grab the raw symbol name followed by C symbol from nm.
-AC_MSG_CHECKING([command to parse $NM output from $compiler object])
-AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe],
-[
-# These are sane defaults that work on at least a few old systems.
-# [They come from Ultrix. What could be older than Ultrix?!! ;)]
-
-# Character class describing NM global symbol codes.
-symcode='[[BCDEGRST]]'
-
-# Regexp to match symbols that can be accessed directly from C.
-sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
-
-# Transform an extracted symbol line into a proper C declaration
-lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
-
-# Transform an extracted symbol line into symbol name and symbol address
-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
-
-# Define system-specific variables.
-case $host_os in
-aix*)
- symcode='[[BCDT]]'
- ;;
-cygwin* | mingw* | pw32*)
- symcode='[[ABCDGISTW]]'
- ;;
-hpux*) # Its linker distinguishes data from code symbols
- if test "$host_cpu" = ia64; then
- symcode='[[ABCDEGRST]]'
- fi
- lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
- lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
- ;;
-linux* | k*bsd*-gnu)
- if test "$host_cpu" = ia64; then
- symcode='[[ABCDGIRSTW]]'
- lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
- lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
- fi
- ;;
-irix* | nonstopux*)
- symcode='[[BCDEGRST]]'
- ;;
-osf*)
- symcode='[[BCDEGQRST]]'
- ;;
-solaris*)
- symcode='[[BDRT]]'
- ;;
-sco3.2v5*)
- symcode='[[DT]]'
- ;;
-sysv4.2uw2*)
- symcode='[[DT]]'
- ;;
-sysv5* | sco5v6* | unixware* | OpenUNIX*)
- symcode='[[ABDT]]'
- ;;
-sysv4)
- symcode='[[DFNSTU]]'
- ;;
-esac
-
-# Handle CRLF in mingw tool chain
-opt_cr=
-case $build_os in
-mingw*)
- opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp
- ;;
-esac
-
-# If we're using GNU nm, then use its standard symbol codes.
-case `$NM -V 2>&1` in
-*GNU* | *'with BFD'*)
- symcode='[[ABCDGIRSTW]]' ;;
-esac
-
-# Try without a prefix undercore, then with it.
-for ac_symprfx in "" "_"; do
-
- # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
- symxfrm="\\1 $ac_symprfx\\2 \\2"
-
- # Write the raw and C identifiers.
- lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
-
- # Check to see that the pipe works correctly.
- pipe_works=no
-
- rm -f conftest*
- cat > conftest.$ac_ext <<EOF
-#ifdef __cplusplus
-extern "C" {
-#endif
-char nm_test_var;
-void nm_test_func(){}
-#ifdef __cplusplus
-}
-#endif
-int main(){nm_test_var='a';nm_test_func();return(0);}
-EOF
-
- if AC_TRY_EVAL(ac_compile); then
- # Now try to grab the symbols.
- nlist=conftest.nm
- if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
- # Try sorting and uniquifying the output.
- if sort "$nlist" | uniq > "$nlist"T; then
- mv -f "$nlist"T "$nlist"
- else
- rm -f "$nlist"T
- fi
-
- # Make sure that we snagged all the symbols we need.
- if grep ' nm_test_var$' "$nlist" >/dev/null; then
- if grep ' nm_test_func$' "$nlist" >/dev/null; then
- cat <<EOF > conftest.$ac_ext
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-EOF
- # Now generate the symbol file.
- eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext'
-
- cat <<EOF >> conftest.$ac_ext
-#if defined (__STDC__) && __STDC__
-# define lt_ptr_t void *
-#else
-# define lt_ptr_t char *
-# define const
-#endif
-
-/* The mapping between symbol names and symbols. */
-const struct {
- const char *name;
- lt_ptr_t address;
-}
-lt_preloaded_symbols[[]] =
-{
-EOF
- $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext
- cat <<\EOF >> conftest.$ac_ext
- {0, (lt_ptr_t) 0}
-};
-
-#ifdef __cplusplus
-}
-#endif
-EOF
- # Now try linking the two files.
- mv conftest.$ac_objext conftstm.$ac_objext
- lt_save_LIBS="$LIBS"
- lt_save_CFLAGS="$CFLAGS"
- LIBS="conftstm.$ac_objext"
- CFLAGS="$CFLAGS$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
- if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
- pipe_works=yes
- fi
- LIBS="$lt_save_LIBS"
- CFLAGS="$lt_save_CFLAGS"
- else
- echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
- fi
- else
- echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD
- fi
- else
- echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
- fi
- else
- echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
- cat conftest.$ac_ext >&5
- fi
- rm -f conftest* conftst*
-
- # Do not use the global_symbol_pipe unless it works.
- if test "$pipe_works" = yes; then
- break
- else
- lt_cv_sys_global_symbol_pipe=
- fi
-done
-])
-if test -z "$lt_cv_sys_global_symbol_pipe"; then
- lt_cv_sys_global_symbol_to_cdecl=
-fi
-if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
- AC_MSG_RESULT(failed)
-else
- AC_MSG_RESULT(ok)
-fi
-]) # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
-
-
-# AC_LIBTOOL_PROG_COMPILER_PIC([TAGNAME])
-# ---------------------------------------
-AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC],
-[_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)=
-_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=
-
-AC_MSG_CHECKING([for $compiler option to produce PIC])
- ifelse([$1],[CXX],[
- # C++ specific cases for pic, static, wl, etc.
- if test "$GXX" = yes; then
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
-
- case $host_os in
- aix*)
- # All AIX code is PIC.
- if test "$host_cpu" = ia64; then
- # AIX 5 now supports IA64 processor
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- fi
- ;;
- amigaos*)
- # FIXME: we need at least 68020 code to build shared libraries, but
- # adding the `-m68020' flag to GCC prevents building anything better,
- # like `-m68040'.
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
- ;;
- beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
- # PIC is the default for these OSes.
- ;;
- mingw* | cygwin* | os2* | pw32*)
- # This hack is so that the source file can tell whether it is being
- # built for inclusion in a dll (and should export symbols for example).
- # Although the cygwin gcc ignores -fPIC, still need this for old-style
- # (--disable-auto-import) libraries
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
- ;;
- darwin* | rhapsody*)
- # PIC is the default on this platform
- # Common symbols not allowed in MH_DYLIB files
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
- ;;
- *djgpp*)
- # DJGPP does not support shared libraries at all
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
- ;;
- interix[[3-9]]*)
- # Interix 3.x gcc -fpic/-fPIC options generate broken code.
- # Instead, we relocate shared libraries at runtime.
- ;;
- sysv4*MP*)
- if test -d /usr/nec; then
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
- fi
- ;;
- hpux*)
- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
- # not for PA HP-UX.
- case $host_cpu in
- hppa*64*|ia64*)
- ;;
- *)
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
- ;;
- esac
- ;;
- *)
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
- ;;
- esac
- else
- case $host_os in
- aix4* | aix5*)
- # All AIX code is PIC.
- if test "$host_cpu" = ia64; then
- # AIX 5 now supports IA64 processor
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- else
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
- fi
- ;;
- chorus*)
- case $cc_basename in
- cxch68*)
- # Green Hills C++ Compiler
- # _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
- ;;
- esac
- ;;
- darwin*)
- # PIC is the default on this platform
- # Common symbols not allowed in MH_DYLIB files
- case $cc_basename in
- xlc*)
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- ;;
- esac
- ;;
- dgux*)
- case $cc_basename in
- ec++*)
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- ;;
- ghcx*)
- # Green Hills C++ Compiler
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
- ;;
- *)
- ;;
- esac
- ;;
- freebsd* | dragonfly*)
- # FreeBSD uses GNU C++
- ;;
- hpux9* | hpux10* | hpux11*)
- case $cc_basename in
- CC*)
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
- if test "$host_cpu" != ia64; then
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
- fi
- ;;
- aCC*)
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
- case $host_cpu in
- hppa*64*|ia64*)
- # +Z the default
- ;;
- *)
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
- ;;
- esac
- ;;
- *)
- ;;
- esac
- ;;
- interix*)
- # This is c89, which is MS Visual C++ (no shared libs)
- # Anyone wants to do a port?
- ;;
- irix5* | irix6* | nonstopux*)
- case $cc_basename in
- CC*)
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
- # CC pic flag -KPIC is the default.
- ;;
- *)
- ;;
- esac
- ;;
- linux* | k*bsd*-gnu)
- case $cc_basename in
- KCC*)
- # KAI C++ Compiler
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
- ;;
- icpc* | ecpc*)
- # Intel C++
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
- ;;
- pgCC*)
- # Portland Group C++ compiler.
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- ;;
- cxx*)
- # Compaq C++
- # Make sure the PIC flag is empty. It appears that all Alpha
- # Linux and Compaq Tru64 Unix objects are PIC.
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
- ;;
- *)
- case `$CC -V 2>&1 | sed 5q` in
- *Sun\ C*)
- # Sun C++ 5.9
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
- ;;
- esac
- ;;
- esac
- ;;
- lynxos*)
- ;;
- m88k*)
- ;;
- mvs*)
- case $cc_basename in
- cxx*)
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
- ;;
- *)
- ;;
- esac
- ;;
- netbsd*)
- ;;
- osf3* | osf4* | osf5*)
- case $cc_basename in
- KCC*)
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
- ;;
- RCC*)
- # Rational C++ 2.4.1
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
- ;;
- cxx*)
- # Digital/Compaq C++
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- # Make sure the PIC flag is empty. It appears that all Alpha
- # Linux and Compaq Tru64 Unix objects are PIC.
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
- ;;
- *)
- ;;
- esac
- ;;
- psos*)
- ;;
- solaris*)
- case $cc_basename in
- CC*)
- # Sun C++ 4.2, 5.x and Centerline C++
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
- ;;
- gcx*)
- # Green Hills C++ Compiler
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
- ;;
- *)
- ;;
- esac
- ;;
- sunos4*)
- case $cc_basename in
- CC*)
- # Sun C++ 4.x
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- ;;
- lcc*)
- # Lucid
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
- ;;
- *)
- ;;
- esac
- ;;
- tandem*)
- case $cc_basename in
- NCC*)
- # NonStop-UX NCC 3.20
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- ;;
- *)
- ;;
- esac
- ;;
- sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
- case $cc_basename in
- CC*)
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- ;;
- esac
- ;;
- vxworks*)
- ;;
- *)
- _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
- ;;
- esac
- fi
-],
-[
- if test "$GCC" = yes; then
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
-
- case $host_os in
- aix*)
- # All AIX code is PIC.
- if test "$host_cpu" = ia64; then
- # AIX 5 now supports IA64 processor
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- fi
- ;;
-
- amigaos*)
- # FIXME: we need at least 68020 code to build shared libraries, but
- # adding the `-m68020' flag to GCC prevents building anything better,
- # like `-m68040'.
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
- ;;
-
- beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
- # PIC is the default for these OSes.
- ;;
-
- mingw* | cygwin* | pw32* | os2*)
- # This hack is so that the source file can tell whether it is being
- # built for inclusion in a dll (and should export symbols for example).
- # Although the cygwin gcc ignores -fPIC, still need this for old-style
- # (--disable-auto-import) libraries
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
- ;;
-
- darwin* | rhapsody*)
- # PIC is the default on this platform
- # Common symbols not allowed in MH_DYLIB files
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
- ;;
-
- interix[[3-9]]*)
- # Interix 3.x gcc -fpic/-fPIC options generate broken code.
- # Instead, we relocate shared libraries at runtime.
- ;;
-
- msdosdjgpp*)
- # Just because we use GCC doesn't mean we suddenly get shared libraries
- # on systems that don't support them.
- _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
- enable_shared=no
- ;;
-
- sysv4*MP*)
- if test -d /usr/nec; then
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
- fi
- ;;
-
- hpux*)
- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
- # not for PA HP-UX.
- case $host_cpu in
- hppa*64*|ia64*)
- # +Z the default
- ;;
- *)
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
- ;;
- esac
- ;;
-
- *)
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
- ;;
- esac
- else
- # PORTME Check for flag to pass linker flags through the system compiler.
- case $host_os in
- aix*)
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- if test "$host_cpu" = ia64; then
- # AIX 5 now supports IA64 processor
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- else
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
- fi
- ;;
- darwin*)
- # PIC is the default on this platform
- # Common symbols not allowed in MH_DYLIB files
- case $cc_basename in
- xlc*)
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- ;;
- esac
- ;;
-
- mingw* | cygwin* | pw32* | os2*)
- # This hack is so that the source file can tell whether it is being
- # built for inclusion in a dll (and should export symbols for example).
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
- ;;
-
- hpux9* | hpux10* | hpux11*)
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
- # not for PA HP-UX.
- case $host_cpu in
- hppa*64*|ia64*)
- # +Z the default
- ;;
- *)
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
- ;;
- esac
- # Is there a better lt_prog_compiler_static that works with the bundled CC?
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
- ;;
-
- irix5* | irix6* | nonstopux*)
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- # PIC (with -KPIC) is the default.
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
- ;;
-
- newsos6)
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- ;;
-
- linux* | k*bsd*-gnu)
- case $cc_basename in
- icc* | ecc*)
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
- ;;
- pgcc* | pgf77* | pgf90* | pgf95*)
- # Portland Group compilers (*not* the Pentium gcc compiler,
- # which looks to be a dead project)
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- ;;
- ccc*)
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- # All Alpha code is PIC.
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
- ;;
- *)
- case `$CC -V 2>&1 | sed 5q` in
- *Sun\ C*)
- # Sun C 5.9
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- ;;
- *Sun\ F*)
- # Sun Fortran 8.3 passes all unrecognized flags to the linker
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)=''
- ;;
- esac
- ;;
- esac
- ;;
-
- osf3* | osf4* | osf5*)
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- # All OSF/1 code is PIC.
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
- ;;
-
- rdos*)
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
- ;;
-
- solaris*)
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- case $cc_basename in
- f77* | f90* | f95*)
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
- *)
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
- esac
- ;;
-
- sunos4*)
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- ;;
-
- sysv4 | sysv4.2uw2* | sysv4.3*)
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- ;;
-
- sysv4*MP*)
- if test -d /usr/nec ;then
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- fi
- ;;
-
- sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- ;;
-
- unicos*)
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
- ;;
-
- uts4*)
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- ;;
-
- *)
- _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
- ;;
- esac
- fi
-])
-AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)])
-
-#
-# Check to make sure the PIC flag actually works.
-#
-if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then
- AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works],
- _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1),
- [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [],
- [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in
- "" | " "*) ;;
- *) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)" ;;
- esac],
- [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
- _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
-fi
-case $host_os in
- # For platforms which do not support PIC, -DPIC is meaningless:
- *djgpp*)
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
- ;;
- *)
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])"
- ;;
-esac
-
-#
-# Check to make sure the static flag actually works.
-#
-wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\"
-AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
- _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
- $lt_tmp_static_flag,
- [],
- [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
-])
-
-
-# AC_LIBTOOL_PROG_LD_SHLIBS([TAGNAME])
-# ------------------------------------
-# See if the linker supports building shared libraries.
-AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS],
-[AC_REQUIRE([LT_AC_PROG_SED])dnl
-AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
-ifelse([$1],[CXX],[
- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
- case $host_os in
- aix4* | aix5*)
- # If we're using GNU nm, then we don't want the "-C" option.
- # -C means demangle to AIX nm, but means don't demangle with GNU nm
- if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
- else
- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
- fi
- ;;
- pw32*)
- _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
- ;;
- cygwin* | mingw*)
- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
- ;;
- *)
- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
- ;;
- esac
-],[
- runpath_var=
- _LT_AC_TAGVAR(allow_undefined_flag, $1)=
- _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
- _LT_AC_TAGVAR(archive_cmds, $1)=
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)=
- _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)=
- _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)=
- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
- _LT_AC_TAGVAR(thread_safe_flag_spec, $1)=
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
- _LT_AC_TAGVAR(hardcode_direct, $1)=no
- _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
- _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
- _LT_AC_TAGVAR(hardcode_automatic, $1)=no
- _LT_AC_TAGVAR(module_cmds, $1)=
- _LT_AC_TAGVAR(module_expsym_cmds, $1)=
- _LT_AC_TAGVAR(always_export_symbols, $1)=no
- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
- # include_expsyms should be a list of space-separated symbols to be *always*
- # included in the symbol list
- _LT_AC_TAGVAR(include_expsyms, $1)=
- # exclude_expsyms can be an extended regexp of symbols to exclude
- # it will be wrapped by ` (' and `)$', so one must not match beginning or
- # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
- # as well as any symbol that contains `d'.
- _LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_"
- # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
- # platforms (ab)use it in PIC code, but their linkers get confused if
- # the symbol is explicitly referenced. Since portable code cannot
- # rely on this symbol name, it's probably fine to never include it in
- # preloaded symbol tables.
- extract_expsyms_cmds=
- # Just being paranoid about ensuring that cc_basename is set.
- _LT_CC_BASENAME([$compiler])
- case $host_os in
- cygwin* | mingw* | pw32*)
- # FIXME: the MSVC++ port hasn't been tested in a loooong time
- # When not using gcc, we currently assume that we are using
- # Microsoft Visual C++.
- if test "$GCC" != yes; then
- with_gnu_ld=no
- fi
- ;;
- interix*)
- # we just hope/assume this is gcc and not c89 (= MSVC++)
- with_gnu_ld=yes
- ;;
- openbsd*)
- with_gnu_ld=no
- ;;
- esac
-
- _LT_AC_TAGVAR(ld_shlibs, $1)=yes
- if test "$with_gnu_ld" = yes; then
- # If archive_cmds runs LD, not CC, wlarc should be empty
- wlarc='${wl}'
-
- # Set some defaults for GNU ld with shared library support. These
- # are reset later if shared libraries are not supported. Putting them
- # here allows them to be overridden if necessary.
- runpath_var=LD_RUN_PATH
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
- # ancient GNU ld didn't support --whole-archive et. al.
- if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
- else
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
- fi
- supports_anon_versioning=no
- case `$LD -v 2>/dev/null` in
- *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
- *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
- *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
- *\ 2.11.*) ;; # other 2.11 versions
- *) supports_anon_versioning=yes ;;
- esac
-
- # See if GNU ld supports shared libraries.
- case $host_os in
- aix3* | aix4* | aix5*)
- # On AIX/PPC, the GNU linker is very broken
- if test "$host_cpu" != ia64; then
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- cat <<EOF 1>&2
-
-*** Warning: the GNU linker, at least up to release 2.9.1, is reported
-*** to be unable to reliably create shared libraries on AIX.
-*** Therefore, libtool is disabling shared libraries support. If you
-*** really care for shared libraries, you may want to modify your PATH
-*** so that a non-GNU linker is found, and then restart.
-
-EOF
- fi
- ;;
-
- amigaos*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-
- # Samuel A. Falvo II <kc5tja at dolphin.openprojects.net> reports
- # that the semantics of dynamic libraries on AmigaOS, at least up
- # to version 4, is to share data among multiple programs linked
- # with the same dynamic library. Since this doesn't match the
- # behavior of shared libraries on other platforms, we can't use
- # them.
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
-
- beos*)
- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
- _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
- # Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
- # support --undefined. This deserves some investigation. FIXME
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- else
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
-
- cygwin* | mingw* | pw32*)
- # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
- # as there is no search path for DLLs.
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
- _LT_AC_TAGVAR(always_export_symbols, $1)=no
- _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
-
- if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
- # If the export-symbols file already is a .def file (1st line
- # is EXPORTS), use it as is; otherwise, prepend...
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
- cp $export_symbols $output_objdir/$soname.def;
- else
- echo EXPORTS > $output_objdir/$soname.def;
- cat $export_symbols >> $output_objdir/$soname.def;
- fi~
- $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
- else
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
-
- interix[[3-9]]*)
- _LT_AC_TAGVAR(hardcode_direct, $1)=no
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
- # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
- # Instead, shared libraries are loaded at an image base (0x10000000 by
- # default) and relocated if they conflict, which is a slow very memory
- # consuming and fragmenting process. To avoid this, we pick a random,
- # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
- # time. Moving up from 0x10000000 also allows more sbrk(2) space.
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
- ;;
-
- gnu* | linux* | k*bsd*-gnu)
- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
- tmp_addflag=
- case $cc_basename,$host_cpu in
- pgcc*) # Portland Group C compiler
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
- tmp_addflag=' $pic_flag'
- ;;
- pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
- tmp_addflag=' $pic_flag -Mnomain' ;;
- ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
- tmp_addflag=' -i_dynamic' ;;
- efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64
- tmp_addflag=' -i_dynamic -nofor_main' ;;
- ifc* | ifort*) # Intel Fortran compiler
- tmp_addflag=' -nofor_main' ;;
- esac
- case `$CC -V 2>&1 | sed 5q` in
- *Sun\ C*) # Sun C 5.9
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
- tmp_sharedflag='-G' ;;
- *Sun\ F*) # Sun Fortran 8.3
- tmp_sharedflag='-G' ;;
- *)
- tmp_sharedflag='-shared' ;;
- esac
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-
- if test $supports_anon_versioning = yes; then
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
- cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
- $echo "local: *; };" >> $output_objdir/$libname.ver~
- $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
- fi
- else
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
-
- netbsd*)
- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
- wlarc=
- else
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- fi
- ;;
-
- solaris*)
- if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- cat <<EOF 1>&2
-
-*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-*** create shared libraries on Solaris systems. Therefore, libtool
-*** is disabling shared libraries support. We urge you to upgrade GNU
-*** binutils to release 2.9.1 or newer. Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-EOF
- elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- else
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
-
- sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
- case `$LD -v 2>&1` in
- *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- cat <<_LT_EOF 1>&2
-
-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
-*** reliably create shared libraries on SCO systems. Therefore, libtool
-*** is disabling shared libraries support. We urge you to upgrade GNU
-*** binutils to release 2.16.91.0.3 or newer. Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-_LT_EOF
- ;;
- *)
- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
- else
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
- esac
- ;;
-
- sunos4*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
- wlarc=
- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
-
- *)
- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- else
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
- esac
-
- if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no; then
- runpath_var=
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
- fi
- else
- # PORTME fill in a description of your system's linker (not GNU ld)
- case $host_os in
- aix3*)
- _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
- _LT_AC_TAGVAR(always_export_symbols, $1)=yes
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
- # Note: this linker hardcodes the directories in LIBPATH if there
- # are no directories specified by -L.
- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
- if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
- # Neither direct hardcoding nor static linking is supported with a
- # broken collect2.
- _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
- fi
- ;;
-
- aix4* | aix5*)
- if test "$host_cpu" = ia64; then
- # On IA64, the linker does run time linking by default, so we don't
- # have to do anything special.
- aix_use_runtimelinking=no
- exp_sym_flag='-Bexport'
- no_entry_flag=""
- else
- # If we're using GNU nm, then we don't want the "-C" option.
- # -C means demangle to AIX nm, but means don't demangle with GNU nm
- if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
- else
- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
- fi
- aix_use_runtimelinking=no
-
- # Test if we are trying to use run time linking or normal
- # AIX style linking. If -brtl is somewhere in LDFLAGS, we
- # need to do runtime linking.
- case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
- for ld_flag in $LDFLAGS; do
- if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
- aix_use_runtimelinking=yes
- break
- fi
- done
- ;;
- esac
-
- exp_sym_flag='-bexport'
- no_entry_flag='-bnoentry'
- fi
-
- # When large executables or shared objects are built, AIX ld can
- # have problems creating the table of contents. If linking a library
- # or program results in "error TOC overflow" add -mminimal-toc to
- # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not
- # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
- _LT_AC_TAGVAR(archive_cmds, $1)=''
- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-
- if test "$GCC" = yes; then
- case $host_os in aix4.[[012]]|aix4.[[012]].*)
- # We only want to do this on AIX 4.2 and lower, the check
- # below for broken collect2 doesn't work under 4.3+
- collect2name=`${CC} -print-prog-name=collect2`
- if test -f "$collect2name" && \
- strings "$collect2name" | grep resolve_lib_name >/dev/null
- then
- # We have reworked collect2
- :
- else
- # We have old collect2
- _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
- # It fails to find uninstalled libraries when the uninstalled
- # path is not listed in the libpath. Setting hardcode_minus_L
- # to unsupported forces relinking
- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
- fi
- ;;
- esac
- shared_flag='-shared'
- if test "$aix_use_runtimelinking" = yes; then
- shared_flag="$shared_flag "'${wl}-G'
- fi
- else
- # not using gcc
- if test "$host_cpu" = ia64; then
- # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
- # chokes on -Wl,-G. The following line is correct:
- shared_flag='-G'
- else
- if test "$aix_use_runtimelinking" = yes; then
- shared_flag='${wl}-G'
- else
- shared_flag='${wl}-bM:SRE'
- fi
- fi
- fi
-
- # It seems that -bexpall does not export symbols beginning with
- # underscore (_), so it is better to generate a list of symbols to export.
- _LT_AC_TAGVAR(always_export_symbols, $1)=yes
- if test "$aix_use_runtimelinking" = yes; then
- # Warning - without using the other runtime loading flags (-brtl),
- # -berok will link without error, but may produce a broken library.
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
- # Determine the default libpath from the value encoded in an empty executable.
- _LT_AC_SYS_LIBPATH_AIX
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
- else
- if test "$host_cpu" = ia64; then
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
- _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
- else
- # Determine the default libpath from the value encoded in an empty executable.
- _LT_AC_SYS_LIBPATH_AIX
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
- # Warning - without using the other run time loading flags,
- # -berok will link without error, but may produce a broken library.
- _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
- # Exported symbols can be pulled into shared objects from archives
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
- # This is similar to how AIX traditionally builds its shared libraries.
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
- fi
- fi
- ;;
-
- amigaos*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
- # see comment about different semantics on the GNU ld section
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
-
- bsdi[[45]]*)
- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
- ;;
-
- cygwin* | mingw* | pw32*)
- # When not using gcc, we currently assume that we are using
- # Microsoft Visual C++.
- # hardcode_libdir_flag_spec is actually meaningless, as there is
- # no search path for DLLs.
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
- _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
- # Tell ltmain to make .lib files, not .a files.
- libext=lib
- # Tell ltmain to make .dll files, not .so files.
- shrext_cmds=".dll"
- # FIXME: Setting linknames here is a bad hack.
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
- # The linker will automatically build a .lib file if we build a DLL.
- _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
- # FIXME: Should let the user specify the lib program.
- _LT_AC_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
- _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
- _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
- ;;
-
- darwin* | rhapsody*)
- case $host_os in
- rhapsody* | darwin1.[[012]])
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
- ;;
- *) # Darwin 1.3 on
- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
- else
- case ${MACOSX_DEPLOYMENT_TARGET} in
- 10.[[012]])
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
- ;;
- 10.*)
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
- ;;
- esac
- fi
- ;;
- esac
- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
- _LT_AC_TAGVAR(hardcode_direct, $1)=no
- _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
- if test "$GCC" = yes ; then
- output_verbose_link_cmd='echo'
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
- _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- else
- case $cc_basename in
- xlc*)
- output_verbose_link_cmd='echo'
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
- _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- ;;
- *)
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
- esac
- fi
- ;;
-
- dgux*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
-
- freebsd1*)
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
-
- # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
- # support. Future versions do this automatically, but an explicit c++rt0.o
- # does not break anything, and helps significantly (at the cost of a little
- # extra space).
- freebsd2.2*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
-
- # Unfortunately, older versions of FreeBSD 2 do not have this feature.
- freebsd2*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
-
- # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
- freebsd* | dragonfly*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
-
- hpux9*)
- if test "$GCC" = yes; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
- else
- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
- fi
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-
- # hardcode_minus_L: Not really in the search PATH,
- # but as the default location of the library.
- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
- ;;
-
- hpux10*)
- if test "$GCC" = yes -a "$with_gnu_ld" = no; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
- else
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
- fi
- if test "$with_gnu_ld" = no; then
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-
- # hardcode_minus_L: Not really in the search PATH,
- # but as the default location of the library.
- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
- fi
- ;;
-
- hpux11*)
- if test "$GCC" = yes -a "$with_gnu_ld" = no; then
- case $host_cpu in
- hppa*64*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
- ;;
- ia64*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
- ;;
- *)
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
- ;;
- esac
- else
- case $host_cpu in
- hppa*64*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
- ;;
- ia64*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
- ;;
- *)
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
- ;;
- esac
- fi
- if test "$with_gnu_ld" = no; then
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
- case $host_cpu in
- hppa*64*|ia64*)
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
- _LT_AC_TAGVAR(hardcode_direct, $1)=no
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
- *)
- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-
- # hardcode_minus_L: Not really in the search PATH,
- # but as the default location of the library.
- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
- ;;
- esac
- fi
- ;;
-
- irix5* | irix6* | nonstopux*)
- if test "$GCC" = yes; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
- else
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
- fi
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
- ;;
-
- netbsd*)
- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
- else
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF
- fi
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
-
- newsos6)
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
-
- openbsd*)
- if test -f /usr/libexec/ld.so; then
- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
- else
- case $host_os in
- openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
- ;;
- *)
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- ;;
- esac
- fi
- else
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
-
- os2*)
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
- _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
- _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
- _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
- ;;
-
- osf3*)
- if test "$GCC" = yes; then
- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
- else
- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
- fi
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
- ;;
-
- osf4* | osf5*) # as osf3* with the addition of -msym flag
- if test "$GCC" = yes; then
- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- else
- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
- $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
-
- # Both c and cxx compiler support -rpath directly
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
- fi
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
- ;;
-
- solaris*)
- _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
- if test "$GCC" = yes; then
- wlarc='${wl}'
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
- $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
- else
- wlarc=''
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
- fi
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- case $host_os in
- solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
- *)
- # The compiler driver will combine and reorder linker options,
- # but understands `-z linker_flag'. GCC discards it without `$wl',
- # but is careful enough not to reorder.
- # Supported since Solaris 2.6 (maybe 2.5.1?)
- if test "$GCC" = yes; then
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
- else
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
- fi
- ;;
- esac
- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
- ;;
-
- sunos4*)
- if test "x$host_vendor" = xsequent; then
- # Use $CC to link under sequent, because it throws in some extra .o
- # files that make .init and .fini sections work.
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
- else
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
- fi
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
-
- sysv4)
- case $host_vendor in
- sni)
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
- _LT_AC_TAGVAR(hardcode_direct, $1)=yes # is this really true???
- ;;
- siemens)
- ## LD is ld it makes a PLAMLIB
- ## CC just makes a GrossModule.
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
- _LT_AC_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
- _LT_AC_TAGVAR(hardcode_direct, $1)=no
- ;;
- motorola)
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
- _LT_AC_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
- ;;
- esac
- runpath_var='LD_RUN_PATH'
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
-
- sysv4.3*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
- ;;
-
- sysv4*MP*)
- if test -d /usr/nec; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- runpath_var=LD_RUN_PATH
- hardcode_runpath_var=yes
- _LT_AC_TAGVAR(ld_shlibs, $1)=yes
- fi
- ;;
-
- sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
- _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- runpath_var='LD_RUN_PATH'
-
- if test "$GCC" = yes; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- else
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- fi
- ;;
-
- sysv5* | sco3.2v5* | sco5v6*)
- # Note: We can NOT use -z defs as we might desire, because we do not
- # link with -lc, and that would cause any symbols used from libc to
- # always be unresolved, which means just about no library would
- # ever link correctly. If we're not using GNU ld we use -z text
- # though, which does catch some bad symbols but isn't as heavy-handed
- # as -z defs.
- _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
- runpath_var='LD_RUN_PATH'
-
- if test "$GCC" = yes; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
- else
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
- fi
- ;;
-
- uts4*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
-
- *)
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
- esac
- fi
-])
-AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
-test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-
-#
-# Do we need to explicitly link libc?
-#
-case "x$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)" in
-x|xyes)
- # Assume -lc should be added
- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
-
- if test "$enable_shared" = yes && test "$GCC" = yes; then
- case $_LT_AC_TAGVAR(archive_cmds, $1) in
- *'~'*)
- # FIXME: we may have to deal with multi-command sequences.
- ;;
- '$CC '*)
- # Test whether the compiler implicitly links with -lc since on some
- # systems, -lgcc has to come before -lc. If gcc already passes -lc
- # to ld, don't add -lc before -lgcc.
- AC_MSG_CHECKING([whether -lc should be explicitly linked in])
- $rm conftest*
- echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
- if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
- soname=conftest
- lib=conftest
- libobjs=conftest.$ac_objext
- deplibs=
- wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
- pic_flag=$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
- compiler_flags=-v
- linker_flags=-v
- verstring=
- output_objdir=.
- libname=conftest
- lt_save_allow_undefined_flag=$_LT_AC_TAGVAR(allow_undefined_flag, $1)
- _LT_AC_TAGVAR(allow_undefined_flag, $1)=
- if AC_TRY_EVAL(_LT_AC_TAGVAR(archive_cmds, $1) 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1)
- then
- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
- else
- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
- fi
- _LT_AC_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
- else
- cat conftest.err 1>&5
- fi
- $rm conftest*
- AC_MSG_RESULT([$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)])
- ;;
- esac
- fi
- ;;
-esac
-])# AC_LIBTOOL_PROG_LD_SHLIBS
-
-
-# _LT_AC_FILE_LTDLL_C
-# -------------------
-# Be careful that the start marker always follows a newline.
-AC_DEFUN([_LT_AC_FILE_LTDLL_C], [
-# /* ltdll.c starts here */
-# #define WIN32_LEAN_AND_MEAN
-# #include <windows.h>
-# #undef WIN32_LEAN_AND_MEAN
-# #include <stdio.h>
-#
-# #ifndef __CYGWIN__
-# # ifdef __CYGWIN32__
-# # define __CYGWIN__ __CYGWIN32__
-# # endif
-# #endif
-#
-# #ifdef __cplusplus
-# extern "C" {
-# #endif
-# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved);
-# #ifdef __cplusplus
-# }
-# #endif
-#
-# #ifdef __CYGWIN__
-# #include <cygwin/cygwin_dll.h>
-# DECLARE_CYGWIN_DLL( DllMain );
-# #endif
-# HINSTANCE __hDllInstance_base;
-#
-# BOOL APIENTRY
-# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
-# {
-# __hDllInstance_base = hInst;
-# return TRUE;
-# }
-# /* ltdll.c ends here */
-])# _LT_AC_FILE_LTDLL_C
-
-
-# _LT_AC_TAGVAR(VARNAME, [TAGNAME])
-# ---------------------------------
-AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])])
-
-
-# old names
-AC_DEFUN([AM_PROG_LIBTOOL], [AC_PROG_LIBTOOL])
-AC_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)])
-AC_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)])
-AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
-AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
-AC_DEFUN([AM_PROG_LD], [AC_PROG_LD])
-AC_DEFUN([AM_PROG_NM], [AC_PROG_NM])
-
-# This is just to silence aclocal about the macro not being used
-ifelse([AC_DISABLE_FAST_INSTALL])
-
-AC_DEFUN([LT_AC_PROG_GCJ],
-[AC_CHECK_TOOL(GCJ, gcj, no)
- test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
- AC_SUBST(GCJFLAGS)
-])
-
-AC_DEFUN([LT_AC_PROG_RC],
-[AC_CHECK_TOOL(RC, windres, no)
-])
-
-
-# Cheap backport of AS_EXECUTABLE_P and required macros
-# from Autoconf 2.59; we should not use $as_executable_p directly.
-
-# _AS_TEST_PREPARE
-# ----------------
-m4_ifndef([_AS_TEST_PREPARE],
-[m4_defun([_AS_TEST_PREPARE],
-[if test -x / >/dev/null 2>&1; then
- as_executable_p='test -x'
-else
- as_executable_p='test -f'
-fi
-])])# _AS_TEST_PREPARE
-
-# AS_EXECUTABLE_P
-# ---------------
-# Check whether a file is executable.
-m4_ifndef([AS_EXECUTABLE_P],
-[m4_defun([AS_EXECUTABLE_P],
-[AS_REQUIRE([_AS_TEST_PREPARE])dnl
-$as_executable_p $1[]dnl
-])])# AS_EXECUTABLE_P
-
-# NOTE: This macro has been submitted for inclusion into #
-# GNU Autoconf as AC_PROG_SED. When it is available in #
-# a released version of Autoconf we should remove this #
-# macro and use it instead. #
-# LT_AC_PROG_SED
-# --------------
-# Check for a fully-functional sed program, that truncates
-# as few characters as possible. Prefer GNU sed if found.
-AC_DEFUN([LT_AC_PROG_SED],
-[AC_MSG_CHECKING([for a sed that does not truncate output])
-AC_CACHE_VAL(lt_cv_path_SED,
-[# Loop through the user's path and test for sed and gsed.
-# Then use that list of sed's as ones to test for truncation.
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for lt_ac_prog in sed gsed; do
- for ac_exec_ext in '' $ac_executable_extensions; do
- if AS_EXECUTABLE_P(["$as_dir/$lt_ac_prog$ac_exec_ext"]); then
- lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
- fi
- done
- done
-done
-IFS=$as_save_IFS
-lt_ac_max=0
-lt_ac_count=0
-# Add /usr/xpg4/bin/sed as it is typically found on Solaris
-# along with /bin/sed that truncates output.
-for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
- test ! -f $lt_ac_sed && continue
- cat /dev/null > conftest.in
- lt_ac_count=0
- echo $ECHO_N "0123456789$ECHO_C" >conftest.in
- # Check for GNU sed and select it if it is found.
- if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
- lt_cv_path_SED=$lt_ac_sed
- break
- fi
- while true; do
- cat conftest.in conftest.in >conftest.tmp
- mv conftest.tmp conftest.in
- cp conftest.in conftest.nl
- echo >>conftest.nl
- $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
- cmp -s conftest.out conftest.nl || break
- # 10000 chars as input seems more than enough
- test $lt_ac_count -gt 10 && break
- lt_ac_count=`expr $lt_ac_count + 1`
- if test $lt_ac_count -gt $lt_ac_max; then
- lt_ac_max=$lt_ac_count
- lt_cv_path_SED=$lt_ac_sed
- fi
- done
-done
-])
-SED=$lt_cv_path_SED
-AC_SUBST([SED])
-AC_MSG_RESULT([$SED])
-])
-
-#
-# SYNOPSIS
-#
-# VL_LIB_READLINE
-#
-# DESCRIPTION
-#
-# Searches for a readline compatible library. If found, defines
-# `HAVE_LIBREADLINE'. If the found library has the `add_history'
-# function, sets also `HAVE_READLINE_HISTORY'. Also checks for the
-# locations of the necessary include files and sets `HAVE_READLINE_H'
-# or `HAVE_READLINE_READLINE_H' and `HAVE_READLINE_HISTORY_H' or
-# 'HAVE_HISTORY_H' if the corresponding include files exists.
-#
-# The libraries that may be readline compatible are `libedit',
-# `libeditline' and `libreadline'. Sometimes we need to link a
-# termcap library for readline to work, this macro tests these cases
-# too by trying to link with `libtermcap', `libcurses' or
-# `libncurses' before giving up.
-#
-# Here is an example of how to use the information provided by this
-# macro to perform the necessary includes or declarations in a C
-# file:
-#
-# #ifdef HAVE_LIBREADLINE
-# # if defined(HAVE_READLINE_READLINE_H)
-# # include <readline/readline.h>
-# # elif defined(HAVE_READLINE_H)
-# # include <readline.h>
-# # else /* !defined(HAVE_READLINE_H) */
-# extern char *readline ();
-# # endif /* !defined(HAVE_READLINE_H) */
-# char *cmdline = NULL;
-# #else /* !defined(HAVE_READLINE_READLINE_H) */
-# /* no readline */
-# #endif /* HAVE_LIBREADLINE */
-#
-# #ifdef HAVE_READLINE_HISTORY
-# # if defined(HAVE_READLINE_HISTORY_H)
-# # include <readline/history.h>
-# # elif defined(HAVE_HISTORY_H)
-# # include <history.h>
-# # else /* !defined(HAVE_HISTORY_H) */
-# extern void add_history ();
-# extern int write_history ();
-# extern int read_history ();
-# # endif /* defined(HAVE_READLINE_HISTORY_H) */
-# /* no history */
-# #endif /* HAVE_READLINE_HISTORY */
-#
-# LAST MODIFICATION
-#
-# 2002-04-04
-#
-# COPYLEFT
-#
-# Copyright (c) 2002 Ville Laurikari <vl at iki.fi>
-#
-# Copying and distribution of this file, with or without
-# modification, are permitted in any medium without royalty provided
-# the copyright notice and this notice are preserved.
-
-AC_DEFUN([VL_LIB_READLINE], [
- AC_CACHE_CHECK([for a readline compatible library],
- vl_cv_lib_readline, [
- ORIG_LIBS="$LIBS"
- for readline_lib in readline edit editline; do
- for termcap_lib in "" termcap curses ncurses; do
- if test -z "$termcap_lib"; then
- TRY_LIB="-l$readline_lib"
- else
- TRY_LIB="-l$readline_lib -l$termcap_lib"
- fi
- LIBS="$ORIG_LIBS $TRY_LIB"
- AC_TRY_LINK_FUNC(readline, vl_cv_lib_readline="$TRY_LIB")
- if test -n "$vl_cv_lib_readline"; then
- break
- fi
- done
- if test -n "$vl_cv_lib_readline"; then
- break
- fi
- done
- if test -z "$vl_cv_lib_readline"; then
- vl_cv_lib_readline="no"
- LIBS="$ORIG_LIBS"
- fi
- ])
-
- if test "$vl_cv_lib_readline" != "no"; then
- AC_DEFINE(HAVE_LIBREADLINE, 1,
- [Define if you have a readline compatible library])
- AC_CHECK_HEADERS(readline.h readline/readline.h)
- AC_CACHE_CHECK([whether readline supports history],
- vl_cv_lib_readline_history, [
- vl_cv_lib_readline_history="no"
- AC_TRY_LINK_FUNC(add_history, vl_cv_lib_readline_history="yes")
- ])
- if test "$vl_cv_lib_readline_history" = "yes"; then
- AC_DEFINE(HAVE_READLINE_HISTORY, 1,
- [Define if your readline library has \`add_history'])
- AC_CHECK_HEADERS(history.h readline/history.h)
- fi
- fi
-])dnl
-
-# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -7332,10 +31,10 @@ AC_DEFUN([VL_LIB_READLINE], [
# generated from the m4 files accompanying Automake X.Y.
# (This private macro should not be called outside this file.)
AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.10'
+[am__api_version='1.11'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.10], [],
+m4_if([$1], [1.11.1], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -7349,10 +48,12 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# AM_SET_CURRENT_AUTOMAKE_VERSION
# -------------------------------
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
+# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.10])dnl
-_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])
+[AM_AUTOMAKE_VERSION([1.11.1])dnl
+m4_ifndef([AC_AUTOCONF_VERSION],
+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
@@ -7409,14 +110,14 @@ am_aux_dir=`cd $ac_aux_dir && pwd`
# AM_CONDITIONAL -*- Autoconf -*-
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006
+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
# Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 8
+# serial 9
# AM_CONDITIONAL(NAME, SHELL-CONDITION)
# -------------------------------------
@@ -7429,6 +130,7 @@ AC_SUBST([$1_TRUE])dnl
AC_SUBST([$1_FALSE])dnl
_AM_SUBST_NOTMAKE([$1_TRUE])dnl
_AM_SUBST_NOTMAKE([$1_FALSE])dnl
+m4_define([_AM_COND_VALUE_$1], [$2])dnl
if $2; then
$1_TRUE=
$1_FALSE='#'
@@ -7442,14 +144,14 @@ AC_CONFIG_COMMANDS_PRE(
Usually this means the macro was only invoked conditionally.]])
fi])])
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
# Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 9
+# serial 10
# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
# written in clear, in which case automake, when reading aclocal.m4,
@@ -7506,6 +208,16 @@ AC_CACHE_CHECK([dependency style of $depcc],
if test "$am_compiler_list" = ""; then
am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
fi
+ am__universal=false
+ m4_case([$1], [CC],
+ [case " $depcc " in #(
+ *\ -arch\ *\ -arch\ *) am__universal=true ;;
+ esac],
+ [CXX],
+ [case " $depcc " in #(
+ *\ -arch\ *\ -arch\ *) am__universal=true ;;
+ esac])
+
for depmode in $am_compiler_list; do
# Setup a source with many dependencies, because some compilers
# like to wrap large dependency lists on column 80 (with \), and
@@ -7523,7 +235,17 @@ AC_CACHE_CHECK([dependency style of $depcc],
done
echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+ # We check with `-c' and `-o' for the sake of the "dashmstdout"
+ # mode. It turns out that the SunPro C++ compiler does not properly
+ # handle `-M -o', and we need to detect this. Also, some Intel
+ # versions had trouble with output in subdirs
+ am__obj=sub/conftest.${OBJEXT-o}
+ am__minus_obj="-o $am__obj"
case $depmode in
+ gcc)
+ # This depmode causes a compiler race in universal mode.
+ test "$am__universal" = false || continue
+ ;;
nosideeffect)
# after this tag, mechanisms are not by side-effect, so they'll
# only be used when explicitly requested
@@ -7533,19 +255,23 @@ AC_CACHE_CHECK([dependency style of $depcc],
break
fi
;;
+ msvisualcpp | msvcmsys)
+ # This compiler won't grok `-c -o', but also, the minuso test has
+ # not run yet. These depmodes are late enough in the game, and
+ # so weak that their functioning should not be impacted.
+ am__obj=conftest.${OBJEXT-o}
+ am__minus_obj=
+ ;;
none) break ;;
esac
- # We check with `-c' and `-o' for the sake of the "dashmstdout"
- # mode. It turns out that the SunPro C++ compiler does not properly
- # handle `-M -o', and we need to detect this.
if depmode=$depmode \
- source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
+ source=sub/conftest.c object=$am__obj \
depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+ $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
>/dev/null 2>conftest.err &&
grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
+ grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
# icc doesn't choke on unknown options, it will just issue warnings
# or remarks (even with -Werror). So we grep stderr for any message
@@ -7602,57 +328,68 @@ _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
# Generate code to set up dependency tracking. -*- Autoconf -*-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
# Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-#serial 3
+#serial 5
# _AM_OUTPUT_DEPENDENCY_COMMANDS
# ------------------------------
AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
-[for mf in $CONFIG_FILES; do
- # Strip MF so we end up with the name of the file.
- mf=`echo "$mf" | sed -e 's/:.*$//'`
- # Check whether this is an Automake generated Makefile or not.
- # We used to match only the files named `Makefile.in', but
- # some people rename them; so instead we look at the file content.
- # Grep'ing the first line is not enough: some people post-process
- # each Makefile.in and add a new line on top of each file to say so.
- # Grep'ing the whole file is not good either: AIX grep has a line
- # limit of 2048, but all sed's we know have understand at least 4000.
- if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
- dirpart=`AS_DIRNAME("$mf")`
- else
- continue
- fi
- # Extract the definition of DEPDIR, am__include, and am__quote
- # from the Makefile without running `make'.
- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
- test -z "$DEPDIR" && continue
- am__include=`sed -n 's/^am__include = //p' < "$mf"`
- test -z "am__include" && continue
- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
- # When using ansi2knr, U may be empty or an underscore; expand it
- U=`sed -n 's/^U = //p' < "$mf"`
- # Find all dependency output files, they are included files with
- # $(DEPDIR) in their names. We invoke sed twice because it is the
- # simplest approach to changing $(DEPDIR) to its actual value in the
- # expansion.
- for file in `sed -n "
- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
- # Make sure the directory exists.
- test -f "$dirpart/$file" && continue
- fdir=`AS_DIRNAME(["$file"])`
- AS_MKDIR_P([$dirpart/$fdir])
- # echo "creating $dirpart/$file"
- echo '# dummy' > "$dirpart/$file"
+[{
+ # Autoconf 2.62 quotes --file arguments for eval, but not when files
+ # are listed without --file. Let's play safe and only enable the eval
+ # if we detect the quoting.
+ case $CONFIG_FILES in
+ *\'*) eval set x "$CONFIG_FILES" ;;
+ *) set x $CONFIG_FILES ;;
+ esac
+ shift
+ for mf
+ do
+ # Strip MF so we end up with the name of the file.
+ mf=`echo "$mf" | sed -e 's/:.*$//'`
+ # Check whether this is an Automake generated Makefile or not.
+ # We used to match only the files named `Makefile.in', but
+ # some people rename them; so instead we look at the file content.
+ # Grep'ing the first line is not enough: some people post-process
+ # each Makefile.in and add a new line on top of each file to say so.
+ # Grep'ing the whole file is not good either: AIX grep has a line
+ # limit of 2048, but all sed's we know have understand at least 4000.
+ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+ dirpart=`AS_DIRNAME("$mf")`
+ else
+ continue
+ fi
+ # Extract the definition of DEPDIR, am__include, and am__quote
+ # from the Makefile without running `make'.
+ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+ test -z "$DEPDIR" && continue
+ am__include=`sed -n 's/^am__include = //p' < "$mf"`
+ test -z "am__include" && continue
+ am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+ # When using ansi2knr, U may be empty or an underscore; expand it
+ U=`sed -n 's/^U = //p' < "$mf"`
+ # Find all dependency output files, they are included files with
+ # $(DEPDIR) in their names. We invoke sed twice because it is the
+ # simplest approach to changing $(DEPDIR) to its actual value in the
+ # expansion.
+ for file in `sed -n "
+ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+ # Make sure the directory exists.
+ test -f "$dirpart/$file" && continue
+ fdir=`AS_DIRNAME(["$file"])`
+ AS_MKDIR_P([$dirpart/$fdir])
+ # echo "creating $dirpart/$file"
+ echo '# dummy' > "$dirpart/$file"
+ done
done
-done
+}
])# _AM_OUTPUT_DEPENDENCY_COMMANDS
@@ -7672,13 +409,13 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
# Do all the work for Automake. -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006 Free Software Foundation, Inc.
+# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 12
+# serial 16
# This macro actually does too much. Some checks are only needed if
# your package does certain things. But this isn't really a big deal.
@@ -7695,7 +432,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
# arguments mandatory, and then we can depend on a new Autoconf
# release and drop the old call support.
AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.60])dnl
+[AC_PREREQ([2.62])dnl
dnl Autoconf wants to disallow AM_ names. We explicitly allow
dnl the ones we care about.
m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
@@ -7746,8 +483,8 @@ AM_MISSING_PROG(AUTOCONF, autoconf)
AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
AM_MISSING_PROG(AUTOHEADER, autoheader)
AM_MISSING_PROG(MAKEINFO, makeinfo)
-AM_PROG_INSTALL_SH
-AM_PROG_INSTALL_STRIP
+AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
AC_REQUIRE([AM_PROG_MKDIR_P])dnl
# We need awk for the "check" target. The system "awk" is bad on
# some platforms.
@@ -7755,24 +492,37 @@ AC_REQUIRE([AC_PROG_AWK])dnl
AC_REQUIRE([AC_PROG_MAKE_SET])dnl
AC_REQUIRE([AM_SET_LEADING_DOT])dnl
_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
- [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
- [_AM_PROG_TAR([v7])])])
+ [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
+ [_AM_PROG_TAR([v7])])])
_AM_IF_OPTION([no-dependencies],,
[AC_PROVIDE_IFELSE([AC_PROG_CC],
- [_AM_DEPENDENCIES(CC)],
- [define([AC_PROG_CC],
- defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
+ [_AM_DEPENDENCIES(CC)],
+ [define([AC_PROG_CC],
+ defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
AC_PROVIDE_IFELSE([AC_PROG_CXX],
- [_AM_DEPENDENCIES(CXX)],
- [define([AC_PROG_CXX],
- defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+ [_AM_DEPENDENCIES(CXX)],
+ [define([AC_PROG_CXX],
+ defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
AC_PROVIDE_IFELSE([AC_PROG_OBJC],
- [_AM_DEPENDENCIES(OBJC)],
- [define([AC_PROG_OBJC],
- defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
+ [_AM_DEPENDENCIES(OBJC)],
+ [define([AC_PROG_OBJC],
+ defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
])
+_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
+dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
+dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro
+dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
+AC_CONFIG_COMMANDS_PRE(dnl
+[m4_provide_if([_AM_COMPILER_EXEEXT],
+ [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
])
+dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
+dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
+dnl mangled by Autoconf and run in a shell conditional statement.
+m4_define([_AC_COMPILER_EXEEXT],
+m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
+
# When config.status generates a header, we must update the stamp-h file.
# This file resides in the same directory as the config header
@@ -7783,18 +533,19 @@ AC_PROVIDE_IFELSE([AC_PROG_OBJC],
# our stamp files there.
AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
[# Compute $1's index in $config_headers.
+_am_arg=$1
_am_stamp_count=1
for _am_header in $config_headers :; do
case $_am_header in
- $1 | $1:* )
+ $_am_arg | $_am_arg:* )
break ;;
* )
_am_stamp_count=`expr $_am_stamp_count + 1` ;;
esac
done
-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
+echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -7805,7 +556,14 @@ echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
# Define $install_sh.
AC_DEFUN([AM_PROG_INSTALL_SH],
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
+if test x"${install_sh}" != xset; then
+ case $am_aux_dir in
+ *\ * | *\ *)
+ install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
+ *)
+ install_sh="\${SHELL} $am_aux_dir/install-sh"
+ esac
+fi
AC_SUBST(install_sh)])
# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
@@ -7832,27 +590,38 @@ AC_SUBST([am__leading_dot])])
# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
# From Jim Meyering
-# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005
+# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008
# Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 4
+# serial 5
+# AM_MAINTAINER_MODE([DEFAULT-MODE])
+# ----------------------------------
+# Control maintainer-specific portions of Makefiles.
+# Default is to disable them, unless `enable' is passed literally.
+# For symmetry, `disable' may be passed as well. Anyway, the user
+# can override the default with the --enable/--disable switch.
AC_DEFUN([AM_MAINTAINER_MODE],
-[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
- dnl maintainer-mode is disabled by default
- AC_ARG_ENABLE(maintainer-mode,
-[ --enable-maintainer-mode enable make rules and dependencies not useful
+[m4_case(m4_default([$1], [disable]),
+ [enable], [m4_define([am_maintainer_other], [disable])],
+ [disable], [m4_define([am_maintainer_other], [enable])],
+ [m4_define([am_maintainer_other], [enable])
+ m4_warn([syntax], [unexpected argument to AM@&t at _MAINTAINER_MODE: $1])])
+AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles])
+ dnl maintainer-mode's default is 'disable' unless 'enable' is passed
+ AC_ARG_ENABLE([maintainer-mode],
+[ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful
(and sometimes confusing) to the casual installer],
- USE_MAINTAINER_MODE=$enableval,
- USE_MAINTAINER_MODE=no)
+ [USE_MAINTAINER_MODE=$enableval],
+ [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))
AC_MSG_RESULT([$USE_MAINTAINER_MODE])
- AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes])
+ AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes])
MAINT=$MAINTAINER_MODE_TRUE
- AC_SUBST(MAINT)dnl
+ AC_SUBST([MAINT])dnl
]
)
@@ -7860,13 +629,13 @@ AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
# Check to see how 'make' treats includes. -*- Autoconf -*-
-# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 3
+# serial 4
# AM_MAKE_INCLUDE()
# -----------------
@@ -7875,7 +644,7 @@ AC_DEFUN([AM_MAKE_INCLUDE],
[am_make=${MAKE-make}
cat > confinc << 'END'
am__doit:
- @echo done
+ @echo this is the am__doit target
.PHONY: am__doit
END
# If we don't find an include directive, just comment out the code.
@@ -7885,24 +654,24 @@ am__quote=
_am_result=none
# First try GNU make style include.
echo "include confinc" > confmf
-# We grep out `Entering directory' and `Leaving directory'
-# messages which can occur if `w' ends up in MAKEFLAGS.
-# In particular we don't look at `^make:' because GNU make might
-# be invoked under some other name (usually "gmake"), in which
-# case it prints its new name instead of `make'.
-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
- am__include=include
- am__quote=
- _am_result=GNU
-fi
+# Ignore all kinds of additional output from `make'.
+case `$am_make -s -f confmf 2> /dev/null` in #(
+*the\ am__doit\ target*)
+ am__include=include
+ am__quote=
+ _am_result=GNU
+ ;;
+esac
# Now try BSD make style include.
if test "$am__include" = "#"; then
echo '.include "confinc"' > confmf
- if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
- am__include=.include
- am__quote="\""
- _am_result=BSD
- fi
+ case `$am_make -s -f confmf 2> /dev/null` in #(
+ *the\ am__doit\ target*)
+ am__include=.include
+ am__quote="\""
+ _am_result=BSD
+ ;;
+ esac
fi
AC_SUBST([am__include])
AC_SUBST([am__quote])
@@ -7912,14 +681,14 @@ rm -f confinc confmf
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005
+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
# Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 5
+# serial 6
# AM_MISSING_PROG(NAME, PROGRAM)
# ------------------------------
@@ -7936,7 +705,14 @@ AC_SUBST($1)])
AC_DEFUN([AM_MISSING_HAS_RUN],
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
AC_REQUIRE_AUX_FILE([missing])dnl
-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
+if test x"${MISSING+set}" != xset; then
+ case $am_aux_dir in
+ *\ * | *\ *)
+ MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
+ *)
+ MISSING="\${SHELL} $am_aux_dir/missing" ;;
+ esac
+fi
# Use eval to expand $SHELL
if eval "$MISSING --run true"; then
am_missing_run="$MISSING --run "
@@ -7974,13 +750,13 @@ esac
# Helper functions for option handling. -*- Autoconf -*-
-# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 3
+# serial 4
# _AM_MANGLE_OPTION(NAME)
# -----------------------
@@ -7997,7 +773,7 @@ AC_DEFUN([_AM_SET_OPTION],
# ----------------------------------
# OPTIONS is a space-separated list of Automake options.
AC_DEFUN([_AM_SET_OPTIONS],
-[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
+[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
# -------------------------------------------
@@ -8005,7 +781,7 @@ AC_DEFUN([_AM_SET_OPTIONS],
AC_DEFUN([_AM_IF_OPTION],
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008, 2009
# Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
@@ -8036,13 +812,11 @@ AC_DEFUN([_AM_IF_OPTION],
# numbers and dots only.
AC_DEFUN([AM_PATH_PYTHON],
[
- dnl Find a Python interpreter. Python versions prior to 1.5 are not
- dnl supported because the default installation locations changed from
- dnl $prefix/lib/site-python in 1.4 to $prefix/lib/python1.5/site-packages
- dnl in 1.5.
+ dnl Find a Python interpreter. Python versions prior to 2.0 are not
+ dnl supported. (2.0 was released on October 16, 2000).
m4_define_default([_AM_PYTHON_INTERPRETER_LIST],
- [python python2 python2.5 python2.4 python2.3 python2.2 dnl
-python2.1 python2.0 python1.6 python1.5])
+ [python python2 python3 python3.0 python2.5 python2.4 python2.3 python2.2 dnl
+python2.1 python2.0])
m4_if([$1],[],[
dnl No version check is needed.
@@ -8089,7 +863,7 @@ python2.1 python2.0 python1.6 python1.5])
dnl library.
AC_CACHE_CHECK([for $am_display_PYTHON version], [am_cv_python_version],
- [am_cv_python_version=`$PYTHON -c "import sys; print sys.version[[:3]]"`])
+ [am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[[:3]])"`])
AC_SUBST([PYTHON_VERSION], [$am_cv_python_version])
dnl Use the values of $prefix and $exec_prefix for the corresponding
@@ -8104,7 +878,7 @@ python2.1 python2.0 python1.6 python1.5])
dnl to know which OS platform Python thinks this is.
AC_CACHE_CHECK([for $am_display_PYTHON platform], [am_cv_python_platform],
- [am_cv_python_platform=`$PYTHON -c "import sys; print sys.platform"`])
+ [am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"`])
AC_SUBST([PYTHON_PLATFORM], [$am_cv_python_platform])
@@ -8119,8 +893,29 @@ python2.1 python2.0 python1.6 python1.5])
dnl doesn't work.
AC_CACHE_CHECK([for $am_display_PYTHON script directory],
[am_cv_python_pythondir],
- [am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0,prefix='$PYTHON_PREFIX')" 2>/dev/null ||
- echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`])
+ [if test "x$prefix" = xNONE
+ then
+ am_py_prefix=$ac_default_prefix
+ else
+ am_py_prefix=$prefix
+ fi
+ am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 2>/dev/null ||
+ echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
+ case $am_cv_python_pythondir in
+ $am_py_prefix*)
+ am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`
+ am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"`
+ ;;
+ *)
+ case $am_py_prefix in
+ /usr|/System*) ;;
+ *)
+ am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages
+ ;;
+ esac
+ ;;
+ esac
+ ])
AC_SUBST([pythondir], [$am_cv_python_pythondir])
dnl pkgpythondir -- $PACKAGE directory under pythondir. Was
@@ -8136,8 +931,29 @@ python2.1 python2.0 python1.6 python1.5])
dnl doesn't work.
AC_CACHE_CHECK([for $am_display_PYTHON extension module directory],
[am_cv_python_pyexecdir],
- [am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0,prefix='$PYTHON_EXEC_PREFIX')" 2>/dev/null ||
- echo "${PYTHON_EXEC_PREFIX}/lib/python${PYTHON_VERSION}/site-packages"`])
+ [if test "x$exec_prefix" = xNONE
+ then
+ am_py_exec_prefix=$am_py_prefix
+ else
+ am_py_exec_prefix=$exec_prefix
+ fi
+ am_cv_python_pyexecdir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(1,0,prefix='$am_py_exec_prefix'))" 2>/dev/null ||
+ echo "$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
+ case $am_cv_python_pyexecdir in
+ $am_py_exec_prefix*)
+ am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`
+ am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"`
+ ;;
+ *)
+ case $am_py_exec_prefix in
+ /usr|/System*) ;;
+ *)
+ am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages
+ ;;
+ esac
+ ;;
+ esac
+ ])
AC_SUBST([pyexecdir], [$am_cv_python_pyexecdir])
dnl pkgpyexecdir -- $(pyexecdir)/$(PACKAGE)
@@ -8157,15 +973,16 @@ python2.1 python2.0 python1.6 python1.5])
# Run ACTION-IF-FALSE otherwise.
# This test uses sys.hexversion instead of the string equivalent (first
# word of sys.version), in order to cope with versions such as 2.2c1.
-# hexversion has been introduced in Python 1.5.2; it's probably not
-# worth to support older versions (1.5.1 was released on October 31, 1998).
+# This supports Python 2.0 or higher. (2.0 was released on October 16, 2000).
AC_DEFUN([AM_PYTHON_CHECK_VERSION],
- [prog="import sys, string
+ [prog="import sys
# split strings by '.' and convert to numeric. Append some zeros
# because we need at least 4 digits for the hex conversion.
-minver = map(int, string.split('$2', '.')) + [[0, 0, 0]]
+# map returns an iterator in Python 3.0 and a list in 2.x
+minver = list(map(int, '$2'.split('.'))) + [[0, 0, 0]]
minverhex = 0
-for i in xrange(0, 4): minverhex = (minverhex << 8) + minver[[i]]
+# xrange is not present in Python 3.0 and range returns an iterator
+for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[[i]]
sys.exit(sys.hexversion < minverhex)"
AS_IF([AM_RUN_LOG([$1 -c "$prog"])], [$3], [$4])])
@@ -8188,14 +1005,14 @@ AC_DEFUN([AM_RUN_LOG],
# Check to make sure that the build environment is sane. -*- Autoconf -*-
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
# Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 4
+# serial 5
# AM_SANITY_CHECK
# ---------------
@@ -8204,16 +1021,29 @@ AC_DEFUN([AM_SANITY_CHECK],
# Just in case
sleep 1
echo timestamp > conftest.file
+# Reject unsafe characters in $srcdir or the absolute working directory
+# name. Accept space and tab only in the latter.
+am_lf='
+'
+case `pwd` in
+ *[[\\\"\#\$\&\'\`$am_lf]]*)
+ AC_MSG_ERROR([unsafe absolute working directory name]);;
+esac
+case $srcdir in
+ *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*)
+ AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
+esac
+
# Do `set' in a subshell so we don't clobber the current shell's
# arguments. Must try -L first in case configure is actually a
# symlink; some systems play weird games with the mod time of symlinks
# (eg FreeBSD returns the mod time of the symlink's containing
# directory).
if (
- set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
+ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
if test "$[*]" = "X"; then
# -L didn't work.
- set X `ls -t $srcdir/configure conftest.file`
+ set X `ls -t "$srcdir/configure" conftest.file`
fi
rm -f conftest.file
if test "$[*]" != "X $srcdir/configure conftest.file" \
@@ -8266,18 +1096,25 @@ fi
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
-# Copyright (C) 2006 Free Software Foundation, Inc.
+# Copyright (C) 2006, 2008 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
+# serial 2
+
# _AM_SUBST_NOTMAKE(VARIABLE)
# ---------------------------
-# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in.
+# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
# This macro is traced by Automake.
AC_DEFUN([_AM_SUBST_NOTMAKE])
+# AM_SUBST_NOTMAKE(VARIABLE)
+# ---------------------------
+# Public sister of _AM_SUBST_NOTMAKE.
+AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
+
# Check how to create a tarball. -*- Autoconf -*-
# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
@@ -8374,3 +1211,11 @@ AC_SUBST([am__tar])
AC_SUBST([am__untar])
]) # _AM_PROG_TAR
+m4_include([config/ax_check_compiler_flags.m4])
+m4_include([config/ax_have_qt.m4])
+m4_include([config/libtool.m4])
+m4_include([config/ltoptions.m4])
+m4_include([config/ltsugar.m4])
+m4_include([config/ltversion.m4])
+m4_include([config/lt~obsolete.m4])
+m4_include([config/vl_lib_readline.m4])
diff --git a/config-site/Makefile.in b/config-site/Makefile.in
index fe54be7..814b8de 100644
--- a/config-site/Makefile.in
+++ b/config-site/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -68,8 +69,9 @@
#
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -87,12 +89,21 @@ host_triplet = @host@
subdir = config-site
DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/config/ax_check_compiler_flags.m4 \
+ $(top_srcdir)/config/ax_have_qt.m4 \
+ $(top_srcdir)/config/libtool.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
+ $(top_srcdir)/config/vl_lib_readline.m4 \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -122,7 +133,8 @@ CXX_FULLPATH = @CXX_FULLPATH@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -134,6 +146,7 @@ FCFLAGS = @FCFLAGS@
FCLIBS = @FCLIBS@
FC_FULLPATH = @FC_FULLPATH@
FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FORTRAN = @FORTRAN@
FPZIP = @FPZIP@
GREP = @GREP@
@@ -144,17 +157,25 @@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
LDFLAGS = @LDFLAGS@
+LIBM = @LIBM@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
NETCDF = @NETCDF@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -164,7 +185,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PDBP_DRV = @PDBP_DRV@
PDB_DRV = @PDB_DRV@
-PRTDIAG = @PRTDIAG@
PYTHON = @PYTHON@
PYTHONMODULE = @PYTHONMODULE@
PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@
@@ -172,17 +192,13 @@ PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
PYTHON_PLATFORM = @PYTHON_PLATFORM@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
-QT_BIN = @QT_BIN@
-QT_CORE = @QT_CORE@
-QT_CORE_LIB = @QT_CORE_LIB@
QT_CXXFLAGS = @QT_CXXFLAGS@
-QT_GUI = @QT_GUI@
-QT_GUI_LIB = @QT_GUI_LIB@
-QT_INCLUDE = @QT_INCLUDE@
-QT_LDFLAGS = @QT_LDFLAGS@
-QT_LIB = @QT_LIB@
+QT_DIR = @QT_DIR@
QT_LIBS = @QT_LIBS@
+QT_LRELEASE = @QT_LRELEASE@
+QT_LUPDATE = @QT_LUPDATE@
QT_MOC = @QT_MOC@
+QT_UIC = @QT_UIC@
RANLIB = @RANLIB@
READLINE_LIBS = @READLINE_LIBS@
SED = @SED@
@@ -200,6 +216,11 @@ SILO_VERS_TAG = @SILO_VERS_TAG@
STRIP = @STRIP@
TAURUS = @TAURUS@
VERSION = @VERSION@
+XMKMF = @XMKMF@
+X_CFLAGS = @X_CFLAGS@
+X_EXTRA_LIBS = @X_EXTRA_LIBS@
+X_LIBS = @X_LIBS@
+X_PRE_LIBS = @X_PRE_LIBS@
ZLIB = @ZLIB@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
@@ -207,6 +228,7 @@ abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_F77 = @ac_ct_F77@
ac_ct_FC = @ac_ct_FC@
am__include = @am__include@
@@ -239,6 +261,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -255,6 +278,7 @@ sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
EXTRA_DIST = *.conf
@@ -265,14 +289,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
- && exit 0; \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign config-site/Makefile'; \
- cd $(top_srcdir) && \
- $(AUTOMAKE) --foreign config-site/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign config-site/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --foreign config-site/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -290,6 +314,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
mostlyclean-libtool:
-rm -f *.lo
@@ -319,13 +344,17 @@ distdir: $(DISTFILES)
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
if test -d $$d/$$file; then \
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
@@ -356,6 +385,7 @@ clean-generic:
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -374,6 +404,8 @@ dvi-am:
html: html-am
+html-am:
+
info: info-am
info-am:
@@ -382,18 +414,28 @@ install-data-am:
install-dvi: install-dvi-am
+install-dvi-am:
+
install-exec-am:
install-html: install-html-am
+install-html-am:
+
install-info: install-info-am
+install-info-am:
+
install-man:
install-pdf: install-pdf-am
+install-pdf-am:
+
install-ps: install-ps-am
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-am
@@ -453,6 +495,7 @@ dist-hook:
rm -f $(distdir)/$$file; \
cp -pd $(srcdir)/$$file $(distdir)/$$file ;\
done
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/config-site/atlas0.conf b/config-site/atlas0.conf
deleted file mode 120000
index b04d896..0000000
--- a/config-site/atlas0.conf
+++ /dev/null
@@ -1 +0,0 @@
-yana.conf
\ No newline at end of file
diff --git a/config-site/atlas1088.conf b/config-site/atlas1088.conf
deleted file mode 120000
index b04d896..0000000
--- a/config-site/atlas1088.conf
+++ /dev/null
@@ -1 +0,0 @@
-yana.conf
\ No newline at end of file
diff --git a/config-site/atlas1120.conf b/config-site/atlas1120.conf
deleted file mode 120000
index b04d896..0000000
--- a/config-site/atlas1120.conf
+++ /dev/null
@@ -1 +0,0 @@
-yana.conf
\ No newline at end of file
diff --git a/config-site/atlas32.conf b/config-site/atlas32.conf
deleted file mode 120000
index b04d896..0000000
--- a/config-site/atlas32.conf
+++ /dev/null
@@ -1 +0,0 @@
-yana.conf
\ No newline at end of file
diff --git a/config-site/atlas512.conf b/config-site/atlas512.conf
deleted file mode 120000
index b04d896..0000000
--- a/config-site/atlas512.conf
+++ /dev/null
@@ -1 +0,0 @@
-yana.conf
\ No newline at end of file
diff --git a/config-site/atlas544.conf b/config-site/atlas544.conf
deleted file mode 120000
index b04d896..0000000
--- a/config-site/atlas544.conf
+++ /dev/null
@@ -1 +0,0 @@
-yana.conf
\ No newline at end of file
diff --git a/config-site/atlas576.conf b/config-site/atlas576.conf
deleted file mode 120000
index b04d896..0000000
--- a/config-site/atlas576.conf
+++ /dev/null
@@ -1 +0,0 @@
-yana.conf
\ No newline at end of file
diff --git a/config-site/atlas608.conf b/config-site/atlas608.conf
deleted file mode 120000
index b04d896..0000000
--- a/config-site/atlas608.conf
+++ /dev/null
@@ -1 +0,0 @@
-yana.conf
\ No newline at end of file
diff --git a/config-site/hoth.conf b/config-site/hoth.conf
index 470607a..638b46e 100644
--- a/config-site/hoth.conf
+++ b/config-site/hoth.conf
@@ -9,8 +9,8 @@ if test -z "$DEFAULT_SZIP_LIBDIR"; then
DEFAULT_SZIP_LIBDIR=/usr/gapps/silo/szip/2.1/i686_Linux_ELsmp/lib
fi
if test -z "$DEFAULT_HDF5_LIBDIR"; then
- DEFAULT_HDF5_LIBDIR=/usr/gapps/silo/hdf5/1.8.1/i686_Linux_ELsmp/lib
+ DEFAULT_HDF5_LIBDIR=/usr/gapps/silo/hdf5/1.8.4/i686_Linux_ELsmp/lib
fi
if test -z "$DEFAULT_HDF5_INCLUDE"; then
- DEFAULT_HDF5_INCLUDE=/usr/gapps/silo/hdf5/1.8.1/i686_Linux_ELsmp/include
+ DEFAULT_HDF5_INCLUDE=/usr/gapps/silo/hdf5/1.8.4/i686_Linux_ELsmp/include
fi
diff --git a/config-site/kickit.conf b/config-site/kickit.conf
deleted file mode 100644
index 02490a4..0000000
--- a/config-site/kickit.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-##
-## Site configuration for kickit, an R10000 running IRIX 6.2.
-##
-## People are having problems compiling gcc for this configuration, so use cc
-## instead.
-##
-CC=cc
-
-##
-## Turn on full warnings unless the user specifies something else.
-##
-if test -z "$CFLAGS"; then
- CFLAGS="-n32 -fullwarn -g"
-fi
diff --git a/config-site/minos.conf b/config-site/minos.conf
deleted file mode 120000
index 7cf226a..0000000
--- a/config-site/minos.conf
+++ /dev/null
@@ -1 +0,0 @@
-llnl_lc.conf
\ No newline at end of file
diff --git a/config-site/minos0.conf b/config-site/minos0.conf
deleted file mode 120000
index f7a13b0..0000000
--- a/config-site/minos0.conf
+++ /dev/null
@@ -1 +0,0 @@
-minos.conf
\ No newline at end of file
diff --git a/config-site/minos32.conf b/config-site/minos32.conf
deleted file mode 120000
index f7a13b0..0000000
--- a/config-site/minos32.conf
+++ /dev/null
@@ -1 +0,0 @@
-minos.conf
\ No newline at end of file
diff --git a/config-site/minos512.conf b/config-site/minos512.conf
deleted file mode 120000
index f7a13b0..0000000
--- a/config-site/minos512.conf
+++ /dev/null
@@ -1 +0,0 @@
-minos.conf
\ No newline at end of file
diff --git a/config-site/minos544.conf b/config-site/minos544.conf
deleted file mode 120000
index f7a13b0..0000000
--- a/config-site/minos544.conf
+++ /dev/null
@@ -1 +0,0 @@
-minos.conf
\ No newline at end of file
diff --git a/config-site/minos576.conf b/config-site/minos576.conf
deleted file mode 120000
index f7a13b0..0000000
--- a/config-site/minos576.conf
+++ /dev/null
@@ -1 +0,0 @@
-minos.conf
\ No newline at end of file
diff --git a/config-site/minos608.conf b/config-site/minos608.conf
deleted file mode 120000
index f7a13b0..0000000
--- a/config-site/minos608.conf
+++ /dev/null
@@ -1 +0,0 @@
-minos.conf
\ No newline at end of file
diff --git a/config-site/prism1.conf b/config-site/prism1.conf
deleted file mode 120000
index b04d896..0000000
--- a/config-site/prism1.conf
+++ /dev/null
@@ -1 +0,0 @@
-yana.conf
\ No newline at end of file
diff --git a/config-site/prism2.conf b/config-site/prism2.conf
deleted file mode 120000
index b04d896..0000000
--- a/config-site/prism2.conf
+++ /dev/null
@@ -1 +0,0 @@
-yana.conf
\ No newline at end of file
diff --git a/config-site/purple.conf b/config-site/purple.conf
deleted file mode 120000
index 7cf226a..0000000
--- a/config-site/purple.conf
+++ /dev/null
@@ -1 +0,0 @@
-llnl_lc.conf
\ No newline at end of file
diff --git a/config-site/purple1441.conf b/config-site/purple1441.conf
deleted file mode 120000
index a5b9805..0000000
--- a/config-site/purple1441.conf
+++ /dev/null
@@ -1 +0,0 @@
-purple.conf
\ No newline at end of file
diff --git a/config-site/purple1442.conf b/config-site/purple1442.conf
deleted file mode 120000
index a5b9805..0000000
--- a/config-site/purple1442.conf
+++ /dev/null
@@ -1 +0,0 @@
-purple.conf
\ No newline at end of file
diff --git a/config-site/purple1443.conf b/config-site/purple1443.conf
deleted file mode 120000
index a5b9805..0000000
--- a/config-site/purple1443.conf
+++ /dev/null
@@ -1 +0,0 @@
-purple.conf
\ No newline at end of file
diff --git a/config-site/purple1444.conf b/config-site/purple1444.conf
deleted file mode 120000
index a5b9805..0000000
--- a/config-site/purple1444.conf
+++ /dev/null
@@ -1 +0,0 @@
-purple.conf
\ No newline at end of file
diff --git a/config-site/rhea.conf b/config-site/rhea.conf
deleted file mode 120000
index 7cf226a..0000000
--- a/config-site/rhea.conf
+++ /dev/null
@@ -1 +0,0 @@
-llnl_lc.conf
\ No newline at end of file
diff --git a/config-site/rhea0.conf b/config-site/rhea0.conf
deleted file mode 120000
index 769495f..0000000
--- a/config-site/rhea0.conf
+++ /dev/null
@@ -1 +0,0 @@
-rhea.conf
\ No newline at end of file
diff --git a/config-site/rhea32.conf b/config-site/rhea32.conf
deleted file mode 120000
index 769495f..0000000
--- a/config-site/rhea32.conf
+++ /dev/null
@@ -1 +0,0 @@
-rhea.conf
\ No newline at end of file
diff --git a/config-site/rhea512.conf b/config-site/rhea512.conf
deleted file mode 120000
index 769495f..0000000
--- a/config-site/rhea512.conf
+++ /dev/null
@@ -1 +0,0 @@
-rhea.conf
\ No newline at end of file
diff --git a/config-site/rhea544.conf b/config-site/rhea544.conf
deleted file mode 120000
index 769495f..0000000
--- a/config-site/rhea544.conf
+++ /dev/null
@@ -1 +0,0 @@
-rhea.conf
\ No newline at end of file
diff --git a/config-site/sasn100.conf b/config-site/sasn100.conf
deleted file mode 100644
index 887dda6..0000000
--- a/config-site/sasn100.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-##
-## Site configuration for Sandia's ASCI Red machine. This file contains
-## the "common denominator" settings that can be used for both the
-## scalar version on the service nodes and the stripped-down parallel
-## version on the compute nodes.
-##
-
-CFLAGS="-fast $CFLAGS"
-SETJMP_OVERRIDE="true"
diff --git a/config-site/sidious.conf b/config-site/sidious.conf
index cefc56b..d855d39 100644
--- a/config-site/sidious.conf
+++ b/config-site/sidious.conf
@@ -15,11 +15,11 @@ if test -z "$FC"; then
FC=g77
fi
if test -z "$DEFAULT_SZIP_LIBDIR"; then
- DEFAULT_SZIP_LIBDIR=/usr/gapps/silo/szip/2.1/x86_64-linux-el5-gcc-4.2.1/lib
+ DEFAULT_SZIP_LIBDIR=/usr/gapps/silo/szip/2.1/x86_64_Linux_el5/lib
fi
if test -z "$DEFAULT_HDF5_LIBDIR"; then
- DEFAULT_HDF5_LIBDIR=/usr/gapps/silo/hdf5/1.6.6/x86_64-linux-el5-gcc-4.2.1/lib
+ DEFAULT_HDF5_LIBDIR=/usr/gapps/silo/hdf5/1.8.4/x86_64_Linux_el5/lib
fi
if test -z "$DEFAULT_HDF5_INCLUDE"; then
- DEFAULT_HDF5_INCLUDE=/usr/gapps/silo/hdf5/1.6.6/x86_64-linux-el5-gcc-4.2.1/include
+ DEFAULT_HDF5_INCLUDE=/usr/gapps/silo/hdf5/1.8.4/x86_64_Linux_el5/include
fi
diff --git a/config-site/sunburn.conf b/config-site/sunburn.conf
deleted file mode 120000
index b6b98e5..0000000
--- a/config-site/sunburn.conf
+++ /dev/null
@@ -1 +0,0 @@
-sunspot.conf
\ No newline at end of file
diff --git a/config-site/sunset.conf b/config-site/sunset.conf
deleted file mode 100644
index 55e6788..0000000
--- a/config-site/sunset.conf
+++ /dev/null
@@ -1,26 +0,0 @@
-##
-## Site configuration for B Division sunset Sun Solaris 5
-##
-
-#if test -z "$DEFAULT_HEXZIP"; then
-# HEXZIP=YES
-#fi
-#if test -z "$DEFAULT_LOCAL"; then
-# DEFAULT_LOCAL=YES
-#fi
-if test -z "$DEFAULT_FORTRAN"; then
- DEFAULT_FORTRAN=YES
-fi
-if test -z "$DEFAULT_SZIP_LIBDIR"; then
- DEFAULT_SZIP_LIBDIR=/usr/gapps/silo/szip/2.1/sparc-sun-solaris-gcc-2.95/lib
-fi
-if test -z "$DEFAULT_HDF5_LIBDIR"; then
- DEFAULT_HDF5_LIBDIR=/usr/gapps/silo/hdf5/1.6.6/sparc-sun-solaris-gcc-2.95/lib
-fi
-if test -z "$DEFAULT_HDF5_INCLUDE"; then
- DEFAULT_HDF5_INCLUDE=/usr/gapps/silo/hdf5/1.6.6/sparc-sun-solaris-gcc-2.95/include
-fi
-if test -z "$QTDIR"; then
- QTDIR=/usr/gapps/silo/qt/3.3.8/sparc-sun-solaris-gcc-2.95
-fi
-
diff --git a/config-site/sunspot.conf b/config-site/sunspot.conf
deleted file mode 100644
index 158808b..0000000
--- a/config-site/sunspot.conf
+++ /dev/null
@@ -1,34 +0,0 @@
-##
-## Site configuration for B Division sunspot Sun Solaris 5
-##
-
-#if test -z "$DEFAULT_HEXZIP"; then
-# HEXZIP=YES
-#fi
-#if test -z "$DEFAULT_LOCAL"; then
-# DEFAULT_LOCAL=YES
-#fi
-if test -z "$DEFAULT_FORTRAN"; then
- DEFAULT_FORTRAN=YES
-fi
-if test -z "$DEFAULT_SZIP_LIBDIR"; then
- DEFAULT_SZIP_LIBDIR=/usr/gapps/silo/szip/2.1/sparc-sun-solaris-gcc-2.95/lib
-fi
-if test -z "$DEFAULT_HDF5_LIBDIR"; then
- DEFAULT_HDF5_LIBDIR=/usr/gapps/silo/hdf5/1.6.6/sparc-sun-solaris-gcc-2.95/lib
-fi
-if test -z "$DEFAULT_HDF5_INCLUDE"; then
- DEFAULT_HDF5_INCLUDE=/usr/gapps/silo/hdf5/1.6.6/sparc-sun-solaris-gcc-2.95/include
-fi
-if test -z "$QTDIR"; then
-# QTDIR=/usr/gapps/silo/qt/3.3.8/sparc-sun-solaris-gcc-2.95
- QT_CXXFLAGS="-I/usr/gapps/silo/qt/3.3.8/sparc-sun-solaris-gcc-2.95/include \
--DQT_THREAD_SUPPORT"
- QT_DIR=/usr/gapps/silo/qt/3.3.8/sparc-sun-solaris-gcc-2.95
- QT_LIBS="-L/usr/gapps/silo/qt/3.3.8/sparc-sun-solaris-gcc-2.95/lib -lqt-mt \
--L/usr/openwin/lib -L/usr/openwin/lib -lGL -lXmu -lXext -lX11 -lresolv \
--lsocket -lnsl -lSM -lICE -ldl -lpthread -lrt"
- QT_UIC=/usr/gapps/silo/qt/3.3.8/sparc-sun-solaris-gcc-2.95/bin/uic
- QT_MOC=/usr/gapps/silo/qt/3.3.8/sparc-sun-solaris-gcc-2.95/bin/moc
-fi
-
diff --git a/config-site/tread.conf b/config-site/tread.conf
deleted file mode 100644
index 4e3bac8..0000000
--- a/config-site/tread.conf
+++ /dev/null
@@ -1,37 +0,0 @@
-##
-## Site configuration for Intel Macintosh running Mac OS X 10.4
-##
-
-#if test -z "$DEFAULT_HEXZIP"; then
-# HEXZIP=YES
-#fi
-#if test -z "$DEFAULT_LOCAL"; then
-# DEFAULT_LOCAL=YES
-#fi
-if test -z "$DEFAULT_FORTRAN"; then
- DEFAULT_FORTRAN=NO
-fi
-if test -z "$F77"; then
- F77=""
-fi
-if test -z "$FC"; then
- FC=""
-fi
-if test -z "$DEFAULT_SZIP_LIBDIR"; then
- DEFAULT_SZIP_LIBDIR=/usr/gapps/silo/szip/2.1/i386-apple-darwin8-gcc-4.0.1/lib
-fi
-if test -z "$DEFAULT_HDF5_LIBDIR"; then
- DEFAULT_HDF5_LIBDIR=/usr/gapps/silo/hdf5/1.6.6/i386-apple-darwin8-gcc-4.0.1/lib
-fi
-if test -z "$DEFAULT_HDF5_INCLUDE"; then
- DEFAULT_HDF5_INCLUDE=/usr/gapps/silo/hdf5/1.6.6/i386-apple-darwin8-gcc-4.0.1/include
-fi
-if test -z "$QTDIR"; then
-# QTDIR=/usr/gapps/silo/qt/3.3.8/i386-apple-darwin8-gcc-4.0.1
- QT_CXXFLAGS="-I/usr/gapps/silo/qt/3.3.8/i386-apple-darwin8-gcc-4.0.1/include -DQT_THREAD_SUPPORT"
- QT_DIR=/usr/gapps/silo/qt/3.3.8/i386-apple-darwin8-gcc-4.0.1
- QT_LIBS="-L/usr/gapps/silo/qt/3.3.8/i386-apple-darwin8-gcc-4.0.1/lib -lqt-mt -framework Carbon -framework QuickTime -lz -framework OpenGL -framework AGL"
- QT_UIC=/usr/gapps/silo/qt/3.3.8/i386-apple-darwin8-gcc-4.0.1/bin/uic
- QT_MOC=/usr/gapps/silo/qt/3.3.8/i386-apple-darwin8-gcc-4.0.1/bin/moc
-fi
-
diff --git a/config-site/yana.conf b/config-site/yana.conf
deleted file mode 120000
index 7cf226a..0000000
--- a/config-site/yana.conf
+++ /dev/null
@@ -1 +0,0 @@
-llnl_lc.conf
\ No newline at end of file
diff --git a/config-site/yana1.conf b/config-site/yana1.conf
deleted file mode 120000
index b04d896..0000000
--- a/config-site/yana1.conf
+++ /dev/null
@@ -1 +0,0 @@
-yana.conf
\ No newline at end of file
diff --git a/config-site/yana2.conf b/config-site/yana2.conf
deleted file mode 120000
index b04d896..0000000
--- a/config-site/yana2.conf
+++ /dev/null
@@ -1 +0,0 @@
-yana.conf
\ No newline at end of file
diff --git a/config-site/yana3.conf b/config-site/yana3.conf
deleted file mode 120000
index b04d896..0000000
--- a/config-site/yana3.conf
+++ /dev/null
@@ -1 +0,0 @@
-yana.conf
\ No newline at end of file
diff --git a/config-site/yana4.conf b/config-site/yana4.conf
deleted file mode 120000
index b04d896..0000000
--- a/config-site/yana4.conf
+++ /dev/null
@@ -1 +0,0 @@
-yana.conf
\ No newline at end of file
diff --git a/config/Makefile.am b/config/Makefile.am
index d9465ee..8190811 100644
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -63,7 +63,8 @@ AUX_DIST = \
EXTRA_DIST = \
bootstrap\
- mkinc
+ mkinc \
+ mklite
MAINTAINERCLEANFILES = \
config.h.in\
diff --git a/config/Makefile.in b/config/Makefile.in
index 0dd75d8..35e8468 100644
--- a/config/Makefile.in
+++ b/config/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -68,8 +69,9 @@
#
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -88,12 +90,21 @@ subdir = config
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in compile \
config.guess config.sub depcomp install-sh ltmain.sh missing
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/config/ax_check_compiler_flags.m4 \
+ $(top_srcdir)/config/ax_have_qt.m4 \
+ $(top_srcdir)/config/libtool.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
+ $(top_srcdir)/config/vl_lib_readline.m4 \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -123,7 +134,8 @@ CXX_FULLPATH = @CXX_FULLPATH@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -135,6 +147,7 @@ FCFLAGS = @FCFLAGS@
FCLIBS = @FCLIBS@
FC_FULLPATH = @FC_FULLPATH@
FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FORTRAN = @FORTRAN@
FPZIP = @FPZIP@
GREP = @GREP@
@@ -145,17 +158,25 @@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
LDFLAGS = @LDFLAGS@
+LIBM = @LIBM@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
NETCDF = @NETCDF@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -165,7 +186,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PDBP_DRV = @PDBP_DRV@
PDB_DRV = @PDB_DRV@
-PRTDIAG = @PRTDIAG@
PYTHON = @PYTHON@
PYTHONMODULE = @PYTHONMODULE@
PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@
@@ -173,17 +193,13 @@ PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
PYTHON_PLATFORM = @PYTHON_PLATFORM@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
-QT_BIN = @QT_BIN@
-QT_CORE = @QT_CORE@
-QT_CORE_LIB = @QT_CORE_LIB@
QT_CXXFLAGS = @QT_CXXFLAGS@
-QT_GUI = @QT_GUI@
-QT_GUI_LIB = @QT_GUI_LIB@
-QT_INCLUDE = @QT_INCLUDE@
-QT_LDFLAGS = @QT_LDFLAGS@
-QT_LIB = @QT_LIB@
+QT_DIR = @QT_DIR@
QT_LIBS = @QT_LIBS@
+QT_LRELEASE = @QT_LRELEASE@
+QT_LUPDATE = @QT_LUPDATE@
QT_MOC = @QT_MOC@
+QT_UIC = @QT_UIC@
RANLIB = @RANLIB@
READLINE_LIBS = @READLINE_LIBS@
SED = @SED@
@@ -201,6 +217,11 @@ SILO_VERS_TAG = @SILO_VERS_TAG@
STRIP = @STRIP@
TAURUS = @TAURUS@
VERSION = @VERSION@
+XMKMF = @XMKMF@
+X_CFLAGS = @X_CFLAGS@
+X_EXTRA_LIBS = @X_EXTRA_LIBS@
+X_LIBS = @X_LIBS@
+X_PRE_LIBS = @X_PRE_LIBS@
ZLIB = @ZLIB@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
@@ -208,6 +229,7 @@ abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_F77 = @ac_ct_F77@
ac_ct_FC = @ac_ct_FC@
am__include = @am__include@
@@ -240,6 +262,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -256,6 +279,7 @@ sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUX_DIST = \
@@ -268,7 +292,8 @@ AUX_DIST = \
EXTRA_DIST = \
bootstrap\
- mkinc
+ mkinc \
+ mklite
MAINTAINERCLEANFILES = \
config.h.in\
@@ -282,14 +307,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
- && exit 0; \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign config/Makefile'; \
- cd $(top_srcdir) && \
- $(AUTOMAKE) --foreign config/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign config/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --foreign config/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -307,6 +332,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
mostlyclean-libtool:
-rm -f *.lo
@@ -336,13 +362,17 @@ distdir: $(DISTFILES)
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
if test -d $$d/$$file; then \
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
@@ -370,6 +400,7 @@ clean-generic:
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -389,6 +420,8 @@ dvi-am:
html: html-am
+html-am:
+
info: info-am
info-am:
@@ -397,18 +430,28 @@ install-data-am:
install-dvi: install-dvi-am
+install-dvi-am:
+
install-exec-am:
install-html: install-html-am
+install-html-am:
+
install-info: install-info-am
+install-info-am:
+
install-man:
install-pdf: install-pdf-am
+install-pdf-am:
+
install-ps: install-ps-am
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-am
@@ -442,6 +485,7 @@ uninstall-am:
maintainer-clean-generic mostlyclean mostlyclean-generic \
mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/config/ax_check_compiler_flags.m4 b/config/ax_check_compiler_flags.m4
new file mode 100644
index 0000000..809cfde
--- /dev/null
+++ b/config/ax_check_compiler_flags.m4
@@ -0,0 +1,79 @@
+##### http://autoconf-archive.cryp.to/ax_check_compiler_flags.html
+#
+# SYNOPSIS
+#
+# AX_CHECK_COMPILER_FLAGS(FLAGS, [ACTION-SUCCESS], [ACTION-FAILURE])
+#
+# DESCRIPTION
+#
+# Check whether the given compiler FLAGS work with the current
+# language's compiler, or whether they give an error. (Warnings,
+# however, are ignored.)
+#
+# ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on
+# success/failure.
+#
+# LAST MODIFICATION
+#
+# 2007-07-29
+#
+# COPYLEFT
+#
+# Copyright (c) 2007 Steven G. Johnson <stevenj at alum.mit.edu>
+# Copyright (c) 2007 Matteo Frigo
+#
+# This program is free software: you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see
+# <http://www.gnu.org/licenses/>.
+#
+# As a special exception, the respective Autoconf Macro's copyright
+# owner gives unlimited permission to copy, distribute and modify the
+# configure scripts that are the output of Autoconf when processing
+# the Macro. You need not follow the terms of the GNU General Public
+# License when using or distributing such scripts, even though
+# portions of the text of the Macro appear in them. The GNU General
+# Public License (GPL) does govern all other use of the material that
+# constitutes the Autoconf Macro.
+#
+# This special exception to the GPL applies to versions of the
+# Autoconf Macro released by the Autoconf Macro Archive. When you
+# make and distribute a modified version of the Autoconf Macro, you
+# may extend this special exception to the GPL to apply to your
+# modified version as well.
+
+AC_DEFUN([AX_CHECK_COMPILER_FLAGS],
+[AC_PREREQ(2.59) dnl for _AC_LANG_PREFIX
+AC_MSG_CHECKING([whether _AC_LANG compiler accepts $1])
+dnl Some hackery here since AC_CACHE_VAL can't handle a non-literal varname:
+AS_LITERAL_IF([$1],
+ [AC_CACHE_VAL(AS_TR_SH(ax_cv_[]_AC_LANG_ABBREV[]_flags_$1), [
+ ax_save_FLAGS=$[]_AC_LANG_PREFIX[]FLAGS
+ _AC_LANG_PREFIX[]FLAGS="$1"
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM()],
+ AS_TR_SH(ax_cv_[]_AC_LANG_ABBREV[]_flags_$1)=yes,
+ AS_TR_SH(ax_cv_[]_AC_LANG_ABBREV[]_flags_$1)=no)
+ _AC_LANG_PREFIX[]FLAGS=$ax_save_FLAGS])],
+ [ax_save_FLAGS=$[]_AC_LANG_PREFIX[]FLAGS
+ _AC_LANG_PREFIX[]FLAGS="$1"
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM()],
+ eval AS_TR_SH(ax_cv_[]_AC_LANG_ABBREV[]_flags_$1)=yes,
+ eval AS_TR_SH(ax_cv_[]_AC_LANG_ABBREV[]_flags_$1)=no)
+ _AC_LANG_PREFIX[]FLAGS=$ax_save_FLAGS])
+eval ax_check_compiler_flags=$AS_TR_SH(ax_cv_[]_AC_LANG_ABBREV[]_flags_$1)
+AC_MSG_RESULT($ax_check_compiler_flags)
+if test "x$ax_check_compiler_flags" = xyes; then
+ m4_default([$2], :)
+else
+ m4_default([$3], :)
+fi
+])dnl AX_CHECK_COMPILER_FLAGS
diff --git a/config/ax_have_qt.m4 b/config/ax_have_qt.m4
new file mode 100644
index 0000000..b4623f1
--- /dev/null
+++ b/config/ax_have_qt.m4
@@ -0,0 +1,515 @@
+# ===========================================================================
+# http://www.gnu.org/software/autoconf-archive/ax_have_qt.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+# AX_HAVE_QT [--with-Qt-dir=DIR] [--with-Qt-lib-dir=DIR] [--with-Qt-lib=LIB]
+# AX_HAVE_QT [--with-Qt-include-dir=DIR] [--with-Qt-bin-dir=DIR] [--with-Qt-lib-dir=DIR] [--with-Qt-lib=LIB]
+#
+# DESCRIPTION
+#
+# Searches common directories for Qt include files, libraries and Qt
+# binary utilities. The macro supports several different versions of the
+# Qt framework being installed on the same machine. Without options, the
+# macro is designed to look for the latest library, i.e., the highest
+# definition of QT_VERSION in qglobal.h. By use of one or more options a
+# different library may be selected. There are two different sets of
+# options. Both sets contain the option --with-Qt-lib=LIB which can be
+# used to force the use of a particular version of the library file when
+# more than one are available. LIB must be in the form as it would appear
+# behind the "-l" option to the compiler. Examples for LIB would be
+# "qt-mt" for the multi-threaded version and "qt" for the regular version.
+# In addition to this, the first set consists of an option
+# --with-Qt-dir=DIR which can be used when the installation conforms to
+# Trolltech's standard installation, which means that header files are in
+# DIR/include, binary utilities are in DIR/bin and the library is in
+# DIR/lib. The second set of options can be used to indicate individual
+# locations for the header files, the binary utilities and the library
+# file, in addition to the specific version of the library file.
+#
+# The following shell variable is set to either "yes" or "no":
+#
+# have_qt
+#
+# Additionally, the following variables are exported:
+#
+# QT_CXXFLAGS
+# QT_LIBS
+# QT_MOC
+# QT_UIC
+# QT_LRELEASE
+# QT_LUPDATE
+# QT_DIR
+#
+# which respectively contain an "-I" flag pointing to the Qt include
+# directory (and "-DQT_THREAD_SUPPORT" when LIB is "qt-mt"), link flags
+# necessary to link with Qt and X, the name of the meta object compiler
+# and the user interface compiler both with full path, and finaly the
+# variable QTDIR as Trolltech likes to see it defined (if possible).
+#
+# Example lines for Makefile.in:
+#
+# CXXFLAGS = @QT_CXXFLAGS@
+# MOC = @QT_MOC@
+#
+# After the variables have been set, a trial compile and link is performed
+# to check the correct functioning of the meta object compiler. This test
+# may fail when the different detected elements stem from different
+# releases of the Qt framework. In that case, an error message is emitted
+# and configure stops.
+#
+# No common variables such as $LIBS or $CFLAGS are polluted.
+#
+# Options:
+#
+# --with-Qt-dir=DIR: DIR is equal to $QTDIR if you have followed the
+# installation instructions of Trolltech. Header files are in DIR/include,
+# binary utilities are in DIR/bin and the library is in DIR/lib.
+#
+# --with-Qt-include-dir=DIR: Qt header files are in DIR.
+#
+# --with-Qt-bin-dir=DIR: Qt utilities such as moc and uic are in DIR.
+#
+# --with-Qt-lib-dir=DIR: The Qt library is in DIR.
+#
+# --with-Qt-lib=LIB: Use -lLIB to link with the Qt library.
+#
+# If some option "=no" or, equivalently, a --without-Qt-* version is given
+# in stead of a --with-Qt-*, "have_qt" is set to "no" and the other
+# variables are set to the empty string.
+#
+# LICENSE
+#
+# Copyright (c) 2008 Bastiaan Veelo <Bastiaan at Veelo.net>
+#
+# Copying and distribution of this file, with or without modification, are
+# permitted in any medium without royalty provided the copyright notice
+# and this notice are preserved. This file is offered as-is, without any
+# warranty.
+
+#serial 10
+
+dnl Calls AX_PATH_QT_DIRECT (contained in this file) as a subroutine.
+AU_ALIAS([BNV_HAVE_QT], [AX_HAVE_QT])
+AC_DEFUN([AX_HAVE_QT],
+[
+ AC_REQUIRE([AC_PROG_CXX])
+ AC_REQUIRE([AC_PATH_X])
+ AC_REQUIRE([AC_PATH_XTRA])
+
+ AC_MSG_CHECKING(for Qt)
+
+ AC_ARG_WITH([Qt-dir],
+ AS_HELP_STRING([--with-Qt-dir=DIR],
+ [DIR is equal to $QTDIR if you have followed the
+ installation instructions of Trolltech. Header
+ files are in DIR/include, binary utilities are
+ in DIR/bin. The library is in DIR/lib, unless
+ --with-Qt-lib-dir is also set.]))
+ AC_ARG_WITH([Qt-include-dir],
+ AS_HELP_STRING([--with-Qt-include-dir=DIR],
+ [Qt header files are in DIR]))
+ AC_ARG_WITH([Qt-bin-dir],
+ AS_HELP_STRING([--with-Qt-bin-dir=DIR],
+ [Qt utilities such as moc and uic are in DIR]))
+ AC_ARG_WITH([Qt-lib-dir],
+ AS_HELP_STRING([--with-Qt-lib-dir=DIR],
+ [The Qt library is in DIR]))
+ AC_ARG_WITH([Qt-lib],
+ AS_HELP_STRING([--with-Qt-lib=LIB],
+ [Use -lLIB to link with the Qt library]))
+ if test x"$with_Qt_dir" = x"no" ||
+ test x"$with_Qt_include-dir" = x"no" ||
+ test x"$with_Qt_bin_dir" = x"no" ||
+ test x"$with_Qt_lib_dir" = x"no" ||
+ test x"$with_Qt_lib" = x"no"; then
+ # user disabled Qt. Leave cache alone.
+ have_qt="User disabled Qt."
+ else
+ # "yes" is a bogus option
+ if test x"$with_Qt_dir" = xyes; then
+ with_Qt_dir=
+ fi
+ if test x"$with_Qt_include_dir" = xyes; then
+ with_Qt_include_dir=
+ fi
+ if test x"$with_Qt_bin_dir" = xyes; then
+ with_Qt_bin_dir=
+ fi
+ if test x"$with_Qt_lib_dir" = xyes; then
+ with_Qt_lib_dir=
+ fi
+ if test x"$with_Qt_lib" = xyes; then
+ with_Qt_lib=
+ fi
+ # No Qt unless we discover otherwise
+ have_qt=no
+ # Check whether we are requested to link with a specific version
+ if test x"$with_Qt_lib" != x; then
+ ax_qt_lib="$with_Qt_lib"
+ fi
+ # Check whether we were supplied with an answer already
+ if test x"$with_Qt_dir" != x; then
+ have_qt=yes
+ ax_qt_dir="$with_Qt_dir"
+ ax_qt_include_dir="$with_Qt_dir/include"
+ ax_qt_bin_dir="$with_Qt_dir/bin"
+ ax_qt_lib_dir="$with_Qt_dir/lib"
+ # Only search for the lib if the user did not define one already
+ if test x"$ax_qt_lib" = x; then
+ ax_qt_lib="`ls $ax_qt_lib_dir/libQt* | sed -n 1p |
+ sed s@$ax_qt_lib_dir/lib@@ | [sed s@[.].*@@]`"
+ fi
+ ax_qt_LIBS="-L$ax_qt_lib_dir -l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
+ else
+ # Use cached value or do search, starting with suggestions from
+ # the command line
+ AC_CACHE_VAL(ax_cv_have_qt,
+ [
+ # We are not given a solution and there is no cached value.
+ ax_qt_dir=NO
+ ax_qt_include_dir=NO
+ ax_qt_lib_dir=NO
+ if test x"$ax_qt_lib" = x; then
+ ax_qt_lib=NO
+ fi
+ AX_PATH_QT_DIRECT
+ if test "$ax_qt_dir" = NO ||
+ test "$ax_qt_include_dir" = NO ||
+ test "$ax_qt_lib_dir" = NO ||
+ test "$ax_qt_lib" = NO; then
+ # Problem with finding complete Qt. Cache the known absence of Qt.
+ ax_cv_have_qt="have_qt=no"
+ else
+ # Record where we found Qt for the cache.
+ ax_cv_have_qt="have_qt=yes \
+ ax_qt_dir=$ax_qt_dir \
+ ax_qt_include_dir=$ax_qt_include_dir \
+ ax_qt_bin_dir=$ax_qt_bin_dir \
+ ax_qt_LIBS=\"$ax_qt_LIBS\""
+ fi
+ ])dnl
+ eval "$ax_cv_have_qt"
+ fi # all $ax_qt_* are set
+ fi # $have_qt reflects the system status
+ if test x"$have_qt" = xyes; then
+ QT_CXXFLAGS="-I$ax_qt_include_dir -I$ax_qt_include_dir/Qt -I$ax_qt_include_dir/QtCore -I$ax_qt_include_dir/QtGui"
+ if test x"$ax_qt_lib" = xqt-mt; then
+ QT_CXXFLAGS="$QT_CXXFLAGS -DQT_THREAD_SUPPORT"
+ fi
+ QT_DIR="$ax_qt_dir"
+ QT_LIBS="$ax_qt_LIBS"
+ # If ax_qt_dir is defined, utilities are expected to be in the
+ # bin subdirectory
+ if test x"$ax_qt_dir" != x; then
+ if test -x "$ax_qt_dir/bin/uic"; then
+ QT_UIC="$ax_qt_dir/bin/uic"
+ else
+ # Old versions of Qt don't have uic
+ QT_UIC=
+ fi
+ QT_MOC="$ax_qt_dir/bin/moc"
+ QT_LRELEASE="$ax_qt_dir/bin/lrelease"
+ QT_LUPDATE="$ax_qt_dir/bin/lupdate"
+ else
+ # Or maybe we are told where to look for the utilities
+ if test x"$ax_qt_bin_dir" != x; then
+ if test -x "$ax_qt_bin_dir/uic"; then
+ QT_UIC="$ax_qt_bin_dir/uic"
+ else
+ # Old versions of Qt don't have uic
+ QT_UIC=
+ fi
+ QT_MOC="$ax_qt_bin_dir/moc"
+ QT_LRELEASE="$ax_qt_bin_dir/lrelease"
+ QT_LUPDATE="$ax_qt_bin_dir/lupdate"
+ else
+ # Last possibility is that they are in $PATH
+ QT_UIC="`which uic`"
+ QT_MOC="`which moc`"
+ QT_LRELEASE="`which lrelease`"
+ QT_LUPDATE="`which lupdate`"
+ fi
+ fi
+ # All variables are defined, report the result
+ AC_MSG_RESULT([$have_qt:
+ QT_CXXFLAGS=$QT_CXXFLAGS
+ QT_DIR=$QT_DIR
+ QT_LIBS=$QT_LIBS
+ QT_UIC=$QT_UIC
+ QT_MOC=$QT_MOC
+ QT_LRELEASE=$QT_LRELEASE
+ QT_LUPDATE=$QT_LUPDATE])
+ else
+ # Qt was not found
+ QT_CXXFLAGS=
+ QT_DIR=
+ QT_LIBS=
+ QT_UIC=
+ QT_MOC=
+ QT_LRELEASE=
+ QT_LUPDATE=
+ AC_MSG_RESULT($have_qt)
+ fi
+ AC_SUBST(QT_CXXFLAGS)
+ AC_SUBST(QT_DIR)
+ AC_SUBST(QT_LIBS)
+ AC_SUBST(QT_UIC)
+ AC_SUBST(QT_MOC)
+ AC_SUBST(QT_LRELEASE)
+ AC_SUBST(QT_LUPDATE)
+
+ #### Being paranoid:
+ if test x"$have_qt" = xyes; then
+ AC_MSG_CHECKING(correct functioning of Qt installation)
+ AC_CACHE_VAL(ax_cv_qt_test_result,
+ [
+ cat > ax_qt_test.h << EOF
+#include <QObject>
+class Test : public QObject
+{
+Q_OBJECT
+public:
+ Test() {}
+ ~Test() {}
+public slots:
+ void receive() {}
+signals:
+ void send();
+};
+EOF
+
+ cat > ax_qt_main.$ac_ext << EOF
+#include "ax_qt_test.h"
+#include <QApplication>
+int main( int argc, char **argv )
+{
+ QApplication app( argc, argv );
+ Test t;
+ QObject::connect( &t, SIGNAL(send()), &t, SLOT(receive()) );
+}
+EOF
+
+ ax_cv_qt_test_result="failure"
+ ax_try_1="$QT_MOC ax_qt_test.h -o moc_ax_qt_test.$ac_ext >/dev/null 2>/dev/null"
+ AC_TRY_EVAL(ax_try_1)
+ if test x"$ac_status" != x0; then
+ echo "$ax_err_1" >&AS_MESSAGE_LOG_FD
+ echo "configure: could not run $QT_MOC on:" >&AS_MESSAGE_LOG_FD
+ cat ax_qt_test.h >&AS_MESSAGE_LOG_FD
+ else
+ ax_try_2="$CXX $QT_CXXFLAGS -c $CXXFLAGS -o moc_ax_qt_test.o moc_ax_qt_test.$ac_ext >/dev/null 2>/dev/null"
+ AC_TRY_EVAL(ax_try_2)
+ if test x"$ac_status" != x0; then
+ echo "$ax_err_2" >&AS_MESSAGE_LOG_FD
+ echo "configure: could not compile:" >&AS_MESSAGE_LOG_FD
+ cat moc_ax_qt_test.$ac_ext >&AS_MESSAGE_LOG_FD
+ else
+ ax_try_3="$CXX $QT_CXXFLAGS -c $CXXFLAGS -o ax_qt_main.o ax_qt_main.$ac_ext >/dev/null 2>/dev/null"
+ AC_TRY_EVAL(ax_try_3)
+ if test x"$ac_status" != x0; then
+ echo "$ax_err_3" >&AS_MESSAGE_LOG_FD
+ echo "configure: could not compile:" >&AS_MESSAGE_LOG_FD
+ cat ax_qt_main.$ac_ext >&AS_MESSAGE_LOG_FD
+ else
+ ax_try_4="$CXX -o ax_qt_main ax_qt_main.o moc_ax_qt_test.o $QT_LIBS $LIBS >/dev/null 2>/dev/null"
+ AC_TRY_EVAL(ax_try_4)
+ if test x"$ac_status" != x0; then
+ echo "$ax_err_4" >&AS_MESSAGE_LOG_FD
+ else
+ ax_cv_qt_test_result="success"
+ fi
+ fi
+ fi
+ fi
+ ])dnl AC_CACHE_VAL ax_cv_qt_test_result
+ AC_MSG_RESULT([$ax_cv_qt_test_result])
+ if test x"$ax_cv_qt_test_result" = "xfailure"; then
+ AC_MSG_ERROR([Failed to find matching components of a complete
+ Qt installation. Try using more options,
+ see ./configure --help.])
+ fi
+
+ rm -f ax_qt_test.h moc_ax_qt_test.$ac_ext moc_ax_qt_test.o \
+ ax_qt_main.$ac_ext ax_qt_main.o ax_qt_main
+ fi
+])
+
+dnl Internal subroutine of AX_HAVE_QT
+dnl Set ax_qt_dir ax_qt_include_dir ax_qt_bin_dir ax_qt_lib_dir ax_qt_lib
+AC_DEFUN([AX_PATH_QT_DIRECT],
+[
+ ## Binary utilities ##
+ if test x"$with_Qt_bin_dir" != x; then
+ ax_qt_bin_dir=$with_Qt_bin_dir
+ fi
+ ## Look for header files ##
+ if test x"$with_Qt_include_dir" != x; then
+ ax_qt_include_dir="$with_Qt_include_dir"
+ else
+ # The following header file is expected to define QT_VERSION.
+ qt_direct_test_header=qglobal.h
+ # Look for the header file in a standard set of common directories.
+ ax_include_path_list="
+ /usr/include
+ `ls -dr ${QTDIR}/include 2>/dev/null`
+ `ls -dr /usr/include/qt* 2>/dev/null`
+ `ls -dr /usr/lib/qt*/include 2>/dev/null`
+ `ls -dr /usr/local/qt*/include 2>/dev/null`
+ `ls -dr /opt/qt*/include 2>/dev/null`
+ `ls -dr /Developer/qt*/include 2>/dev/null`
+ "
+ for ax_dir in $ax_include_path_list; do
+ if test -r "$ax_dir/$qt_direct_test_header"; then
+ ax_dirs="$ax_dirs $ax_dir"
+ fi
+ done
+ # Now look for the newest in this list
+ ax_prev_ver=0
+ for ax_dir in $ax_dirs; do
+ ax_this_ver=`egrep -w '#define QT_VERSION' $ax_dir/$qt_direct_test_header | sed s/'#define QT_VERSION'//`
+ if expr $ax_this_ver '>' $ax_prev_ver > /dev/null; then
+ ax_qt_include_dir=$ax_dir
+ ax_prev_ver=$ax_this_ver
+ fi
+ done
+ fi dnl Found header files.
+
+ # Are these headers located in a traditional Trolltech installation?
+ # That would be $ax_qt_include_dir stripped from its last element:
+ ax_possible_qt_dir=`dirname $ax_qt_include_dir`
+ if (test -x $ax_possible_qt_dir/bin/moc) &&
+ ((ls $ax_possible_qt_dir/lib/libQt* > /dev/null 2>/dev/null) ||
+ (ls $ax_possible_qt_dir/lib64/libQt* > /dev/null 2>/dev/null)); then
+ # Then the rest is a piece of cake
+ ax_qt_dir=$ax_possible_qt_dir
+ ax_qt_bin_dir="$ax_qt_dir/bin"
+ if test x"$with_Qt_lib_dir" != x; then
+ ax_qt_lib_dir="$with_Qt_lib_dir"
+ else
+ if (test -d $ax_qt_dir/lib64); then
+ ax_qt_lib_dir="$ax_qt_dir/lib64"
+ else
+ ax_qt_lib_dir="$ax_qt_dir/lib"
+ fi
+ fi
+ # Only look for lib if the user did not supply it already
+ if test x"$ax_qt_lib" = xNO; then
+ ax_qt_lib="`ls $ax_qt_lib_dir/libQt* | sed -n 1p |
+ sed s@$ax_qt_lib_dir/lib@@ | [sed s@[.].*@@]`"
+ fi
+ ax_qt_LIBS="-L$ax_qt_lib_dir -l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
+ else
+ # There is no valid definition for $QTDIR as Trolltech likes to see it
+ ax_qt_dir=
+ ## Look for Qt library ##
+ if test x"$with_Qt_lib_dir" != x; then
+ ax_qt_lib_dir="$with_Qt_lib_dir"
+ # Only look for lib if the user did not supply it already
+ if test x"$ax_qt_lib" = xNO; then
+ ax_qt_lib="`ls $ax_qt_lib_dir/libQt* | sed -n 1p |
+ sed s@$ax_qt_lib_dir/lib@@ | [sed s@[.].*@@]`"
+ fi
+ ax_qt_LIBS="-L$ax_qt_lib_dir -l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
+ else
+ # Normally, when there is no traditional Trolltech installation,
+ # the library is installed in a place where the linker finds it
+ # automatically.
+ # If the user did not define the library name, try with qt
+ if test x"$ax_qt_lib" = xNO; then
+ ax_qt_lib=qt
+ fi
+ qt_direct_test_header=qapplication.h
+ qt_direct_test_main="
+ int argc;
+ char ** argv;
+ QApplication app(argc,argv);
+ "
+ # See if we find the library without any special options.
+ # Don't add top $LIBS permanently yet
+ ax_save_LIBS="$LIBS"
+ LIBS="-l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
+ ax_qt_LIBS="$LIBS"
+ ax_save_CXXFLAGS="$CXXFLAGS"
+ CXXFLAGS="-I$ax_qt_include_dir -I$ax_qt_include_dir/Qt -I$ax_qt_include_dir/QtCore -I$ax_qt_include_dir/QtGui"
+ AC_TRY_LINK([#include <$qt_direct_test_header>],
+ $qt_direct_test_main,
+ [
+ # Success.
+ # We can link with no special library directory.
+ ax_qt_lib_dir=
+ ], [
+ # That did not work. Try the multi-threaded version
+ echo "Non-critical error, please neglect the above." >&AS_MESSAGE_LOG_FD
+ ax_qt_lib=qt-mt
+ LIBS="-l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
+ AC_TRY_LINK([#include <$qt_direct_test_header>],
+ $qt_direct_test_main,
+ [
+ # Success.
+ # We can link with no special library directory.
+ ax_qt_lib_dir=
+ ], [
+ # That did not work. Try the OpenGL version
+ echo "Non-critical error, please neglect the above." >&AS_MESSAGE_LOG_FD
+ ax_qt_lib=qt-gl
+ LIBS="-l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
+ AC_TRY_LINK([#include <$qt_direct_test_header>],
+ $qt_direct_test_main,
+ [
+ # Success.
+ # We can link with no special library directory.
+ ax_qt_lib_dir=
+ ], [
+ # That did not work. Maybe a library version I don't know about?
+ echo "Non-critical error, please neglect the above." >&AS_MESSAGE_LOG_FD
+ # Look for some Qt lib in a standard set of common directories.
+ ax_dir_list="
+ `echo $ax_qt_includes | sed ss/includess`
+ /lib
+ /usr/lib64
+ /usr/lib
+ /usr/local/lib64
+ /usr/local/lib
+ /opt/lib64
+ /opt/lib
+ `ls -dr /usr/lib64/qt* 2>/dev/null`
+ `ls -dr /usr/lib64/qt*/lib64 2>/dev/null`
+ `ls -dr /usr/lib/qt* 2>/dev/null`
+ `ls -dr /usr/local/qt* 2>/dev/null`
+ `ls -dr /opt/qt* 2>/dev/null`
+ "
+ for ax_dir in $ax_dir_list; do
+ if ls $ax_dir/libQt* >/dev/null 2>/dev/null; then
+ # Gamble that it's the first one...
+ ax_qt_lib="`ls $ax_dir/libQt* | sed -n 1p |
+ sed s@$ax_dir/lib@@ | sed s/[[.]].*//`"
+ ax_qt_lib_dir="$ax_dir"
+ break
+ fi
+ done
+ # Try with that one
+ LIBS="-l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
+ AC_TRY_LINK([#include <$qt_direct_test_header>],
+ $qt_direct_test_main,
+ [
+ # Success.
+ # We can link with no special library directory.
+ ax_qt_lib_dir=
+ ], [
+ : # Leave ax_qt_lib_dir defined
+ ])
+ ])
+ ])
+ ])
+ if test x"$ax_qt_lib_dir" != x; then
+ ax_qt_LIBS="-L$ax_qt_lib_dir $LIBS"
+ else
+ ax_qt_LIBS="$LIBS"
+ fi
+ LIBS="$ax_save_LIBS"
+ CXXFLAGS="$ax_save_CXXFLAGS"
+ fi dnl $with_Qt_lib_dir was not given
+ fi dnl Done setting up for non-traditional Trolltech installation
+])
diff --git a/config/bootstrap b/config/bootstrap
index ac91e7a..58b3508 100755
--- a/config/bootstrap
+++ b/config/bootstrap
@@ -1,7 +1,5 @@
#!/bin/sh
-#set -x
-HOST=`/usr/gapps/silo/autotools/bin/config.guess`
-AUTOTOOLS=/usr/gapps/silo/autotools/$HOST/bin
+AUTOTOOLS=/groups/visit/miller/silo/autotools/linux-x86_64/bin
# somewhat of a hack
if test -x configure.ac ; then
echo "must be in the same directory as ./configure to run this script"
diff --git a/config/config.guess b/config/config.guess
index 396482d..dc84c68 100755
--- a/config/config.guess
+++ b/config/config.guess
@@ -1,10 +1,10 @@
#! /bin/sh
# Attempt to guess a canonical system name.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
-# Inc.
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+# Free Software Foundation, Inc.
-timestamp='2006-07-02'
+timestamp='2009-11-20'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -27,16 +27,16 @@ timestamp='2006-07-02'
# the same distribution terms that you use for the rest of that program.
-# Originally written by Per Bothner <per at bothner.com>.
-# Please send patches to <config-patches at gnu.org>. Submit a context
-# diff and a properly formatted ChangeLog entry.
+# Originally written by Per Bothner. Please send patches (context
+# diff format) to <config-patches at gnu.org> and include a ChangeLog
+# entry.
#
# This script attempts to guess a canonical system name similar to
# config.sub. If it succeeds, it prints the system name on stdout, and
# exits with 0. Otherwise, it exits with 1.
#
-# The plan is that this can be called by configure scripts if you
-# don't specify an explicit build system type.
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
me=`echo "$0" | sed -e 's,.*/,,'`
@@ -56,8 +56,8 @@ version="\
GNU config.guess ($timestamp)
Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -161,6 +161,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
arm*) machine=arm-unknown ;;
sh3el) machine=shl-unknown ;;
sh3eb) machine=sh-unknown ;;
+ sh5el) machine=sh5le-unknown ;;
*) machine=${UNAME_MACHINE_ARCH}-unknown ;;
esac
# The Operating System including object format, if it has switched
@@ -169,7 +170,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
arm*|i386|m68k|ns32k|sh3*|sparc|vax)
eval $set_cc_for_build
if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
- | grep __ELF__ >/dev/null
+ | grep -q __ELF__
then
# Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
# Return netbsd for either. FIX?
@@ -323,14 +324,33 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
case `/usr/bin/uname -p` in
sparc) echo sparc-icl-nx7; exit ;;
esac ;;
+ s390x:SunOS:*:*)
+ echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ exit ;;
sun4H:SunOS:5.*:*)
echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
- i86pc:SunOS:5.*:*)
- echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
+ echo i386-pc-auroraux${UNAME_RELEASE}
+ exit ;;
+ i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
+ eval $set_cc_for_build
+ SUN_ARCH="i386"
+ # If there is a compiler, see if it is configured for 64-bit objects.
+ # Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
+ # This test works for both compilers.
+ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+ if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
+ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+ grep IS_64BIT_ARCH >/dev/null
+ then
+ SUN_ARCH="x86_64"
+ fi
+ fi
+ echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
sun4*:SunOS:6*:*)
# According to config.sub, this is the proper way to canonicalize
@@ -531,7 +551,7 @@ EOF
echo rs6000-ibm-aix3.2
fi
exit ;;
- *:AIX:*:[45])
+ *:AIX:*:[456])
IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
IBM_ARCH=rs6000
@@ -639,7 +659,7 @@ EOF
# => hppa64-hp-hpux11.23
if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
- grep __LP64__ >/dev/null
+ grep -q __LP64__
then
HP_ARCH="hppa2.0w"
else
@@ -780,7 +800,7 @@ EOF
i*:CYGWIN*:*)
echo ${UNAME_MACHINE}-pc-cygwin
exit ;;
- i*:MINGW*:*)
+ *:MINGW*:*)
echo ${UNAME_MACHINE}-pc-mingw32
exit ;;
i*:windows32*:*)
@@ -790,15 +810,24 @@ EOF
i*:PW*:*)
echo ${UNAME_MACHINE}-pc-pw32
exit ;;
- x86:Interix*:[3456]*)
- echo i586-pc-interix${UNAME_RELEASE}
- exit ;;
- EM64T:Interix*:[3456]*)
- echo x86_64-unknown-interix${UNAME_RELEASE}
- exit ;;
+ *:Interix*:*)
+ case ${UNAME_MACHINE} in
+ x86)
+ echo i586-pc-interix${UNAME_RELEASE}
+ exit ;;
+ authenticamd | genuineintel | EM64T)
+ echo x86_64-unknown-interix${UNAME_RELEASE}
+ exit ;;
+ IA64)
+ echo ia64-unknown-interix${UNAME_RELEASE}
+ exit ;;
+ esac ;;
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
echo i${UNAME_MACHINE}-pc-mks
exit ;;
+ 8664:Windows_NT:*)
+ echo x86_64-pc-mks
+ exit ;;
i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
# How do we know it's Interix rather than the generic POSIX subsystem?
# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
@@ -828,8 +857,29 @@ EOF
i*86:Minix:*:*)
echo ${UNAME_MACHINE}-pc-minix
exit ;;
+ alpha:Linux:*:*)
+ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+ EV5) UNAME_MACHINE=alphaev5 ;;
+ EV56) UNAME_MACHINE=alphaev56 ;;
+ PCA56) UNAME_MACHINE=alphapca56 ;;
+ PCA57) UNAME_MACHINE=alphapca56 ;;
+ EV6) UNAME_MACHINE=alphaev6 ;;
+ EV67) UNAME_MACHINE=alphaev67 ;;
+ EV68*) UNAME_MACHINE=alphaev68 ;;
+ esac
+ objdump --private-headers /bin/sh | grep -q ld.so.1
+ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+ echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+ exit ;;
arm*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ eval $set_cc_for_build
+ if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
+ | grep -q __ARM_EABI__
+ then
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ else
+ echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+ fi
exit ;;
avr32*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -843,6 +893,17 @@ EOF
frv:Linux:*:*)
echo frv-unknown-linux-gnu
exit ;;
+ i*86:Linux:*:*)
+ LIBC=gnu
+ eval $set_cc_for_build
+ sed 's/^ //' << EOF >$dummy.c
+ #ifdef __dietlibc__
+ LIBC=dietlibc
+ #endif
+EOF
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+ echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+ exit ;;
ia64:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
@@ -852,74 +913,33 @@ EOF
m68*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
- mips:Linux:*:*)
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
- #undef CPU
- #undef mips
- #undef mipsel
- #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
- CPU=mipsel
- #else
- #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
- CPU=mips
- #else
- CPU=
- #endif
- #endif
-EOF
- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
- /^CPU/{
- s: ::g
- p
- }'`"
- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
- ;;
- mips64:Linux:*:*)
+ mips:Linux:*:* | mips64:Linux:*:*)
eval $set_cc_for_build
sed 's/^ //' << EOF >$dummy.c
#undef CPU
- #undef mips64
- #undef mips64el
+ #undef ${UNAME_MACHINE}
+ #undef ${UNAME_MACHINE}el
#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
- CPU=mips64el
+ CPU=${UNAME_MACHINE}el
#else
#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
- CPU=mips64
+ CPU=${UNAME_MACHINE}
#else
CPU=
#endif
#endif
EOF
- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
- /^CPU/{
- s: ::g
- p
- }'`"
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
;;
or32:Linux:*:*)
echo or32-unknown-linux-gnu
exit ;;
- ppc:Linux:*:*)
- echo powerpc-unknown-linux-gnu
+ padre:Linux:*:*)
+ echo sparc-unknown-linux-gnu
exit ;;
- ppc64:Linux:*:*)
- echo powerpc64-unknown-linux-gnu
- exit ;;
- alpha:Linux:*:*)
- case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
- EV5) UNAME_MACHINE=alphaev5 ;;
- EV56) UNAME_MACHINE=alphaev56 ;;
- PCA56) UNAME_MACHINE=alphapca56 ;;
- PCA57) UNAME_MACHINE=alphapca56 ;;
- EV6) UNAME_MACHINE=alphaev6 ;;
- EV67) UNAME_MACHINE=alphaev67 ;;
- EV68*) UNAME_MACHINE=alphaev68 ;;
- esac
- objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+ parisc64:Linux:*:* | hppa64:Linux:*:*)
+ echo hppa64-unknown-linux-gnu
exit ;;
parisc:Linux:*:* | hppa:Linux:*:*)
# Look for CPU level
@@ -929,8 +949,11 @@ EOF
*) echo hppa-unknown-linux-gnu ;;
esac
exit ;;
- parisc64:Linux:*:* | hppa64:Linux:*:*)
- echo hppa64-unknown-linux-gnu
+ ppc64:Linux:*:*)
+ echo powerpc64-unknown-linux-gnu
+ exit ;;
+ ppc:Linux:*:*)
+ echo powerpc-unknown-linux-gnu
exit ;;
s390:Linux:*:* | s390x:Linux:*:*)
echo ${UNAME_MACHINE}-ibm-linux
@@ -950,69 +973,9 @@ EOF
x86_64:Linux:*:*)
echo x86_64-unknown-linux-gnu
exit ;;
- i*86:Linux:*:*)
- # The BFD linker knows what the default object file format is, so
- # first see if it will tell us. cd to the root directory to prevent
- # problems with other programs or directories called `ld' in the path.
- # Set LC_ALL=C to ensure ld outputs messages in English.
- ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
- | sed -ne '/supported targets:/!d
- s/[ ][ ]*/ /g
- s/.*supported targets: *//
- s/ .*//
- p'`
- case "$ld_supported_targets" in
- elf32-i386)
- TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
- ;;
- a.out-i386-linux)
- echo "${UNAME_MACHINE}-pc-linux-gnuaout"
- exit ;;
- coff-i386)
- echo "${UNAME_MACHINE}-pc-linux-gnucoff"
- exit ;;
- "")
- # Either a pre-BFD a.out linker (linux-gnuoldld) or
- # one that does not give us useful --help.
- echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
- exit ;;
- esac
- # Determine whether the default compiler is a.out or elf
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
- #include <features.h>
- #ifdef __ELF__
- # ifdef __GLIBC__
- # if __GLIBC__ >= 2
- LIBC=gnu
- # else
- LIBC=gnulibc1
- # endif
- # else
- LIBC=gnulibc1
- # endif
- #else
- #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
- LIBC=gnu
- #else
- LIBC=gnuaout
- #endif
- #endif
- #ifdef __dietlibc__
- LIBC=dietlibc
- #endif
-EOF
- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
- /^LIBC/{
- s: ::g
- p
- }'`"
- test x"${LIBC}" != x && {
- echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
- exit
- }
- test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
- ;;
+ xtensa*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
i*86:DYNIX/ptx:4*:*)
# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
# earlier versions are messed up and put the nodename in both
@@ -1041,7 +1004,7 @@ EOF
i*86:syllable:*:*)
echo ${UNAME_MACHINE}-pc-syllable
exit ;;
- i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
+ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
echo i386-unknown-lynxos${UNAME_RELEASE}
exit ;;
i*86:*DOS:*:*)
@@ -1085,8 +1048,11 @@ EOF
pc:*:*:*)
# Left here for compatibility:
# uname -m prints for DJGPP always 'pc', but it prints nothing about
- # the processor, so we play safe by assuming i386.
- echo i386-pc-msdosdjgpp
+ # the processor, so we play safe by assuming i586.
+ # Note: whatever this is, it MUST be the same as what config.sub
+ # prints for the "djgpp" host, or else GDB configury will decide that
+ # this is a cross-build.
+ echo i586-pc-msdosdjgpp
exit ;;
Intel:Mach:3*:*)
echo i386-pc-mach3
@@ -1124,6 +1090,16 @@ EOF
3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
&& { echo i486-ncr-sysv4; exit; } ;;
+ NCR*:*:4.2:* | MPRAS*:*:4.2:*)
+ OS_REL='.3'
+ test -r /etc/.relid \
+ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+ && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
+ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
+ /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
echo m68k-unknown-lynxos${UNAME_RELEASE}
exit ;;
@@ -1136,7 +1112,7 @@ EOF
rs6000:LynxOS:2.*:*)
echo rs6000-unknown-lynxos${UNAME_RELEASE}
exit ;;
- PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
+ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
echo powerpc-unknown-lynxos${UNAME_RELEASE}
exit ;;
SM[BE]S:UNIX_SV:*:*)
@@ -1199,6 +1175,9 @@ EOF
BePC:BeOS:*:*) # BeOS running on Intel PC compatible.
echo i586-pc-beos
exit ;;
+ BePC:Haiku:*:*) # Haiku running on Intel PC compatible.
+ echo i586-pc-haiku
+ exit ;;
SX-4:SUPER-UX:*:*)
echo sx4-nec-superux${UNAME_RELEASE}
exit ;;
@@ -1208,6 +1187,15 @@ EOF
SX-6:SUPER-UX:*:*)
echo sx6-nec-superux${UNAME_RELEASE}
exit ;;
+ SX-7:SUPER-UX:*:*)
+ echo sx7-nec-superux${UNAME_RELEASE}
+ exit ;;
+ SX-8:SUPER-UX:*:*)
+ echo sx8-nec-superux${UNAME_RELEASE}
+ exit ;;
+ SX-8R:SUPER-UX:*:*)
+ echo sx8r-nec-superux${UNAME_RELEASE}
+ exit ;;
Power*:Rhapsody:*:*)
echo powerpc-apple-rhapsody${UNAME_RELEASE}
exit ;;
@@ -1217,6 +1205,16 @@ EOF
*:Darwin:*:*)
UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
case $UNAME_PROCESSOR in
+ i386)
+ eval $set_cc_for_build
+ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+ grep IS_64BIT_ARCH >/dev/null
+ then
+ UNAME_PROCESSOR="x86_64"
+ fi
+ fi ;;
unknown) UNAME_PROCESSOR=powerpc ;;
esac
echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
@@ -1298,6 +1296,9 @@ EOF
i*86:rdos:*:*)
echo ${UNAME_MACHINE}-pc-rdos
exit ;;
+ i*86:AROS:*:*)
+ echo ${UNAME_MACHINE}-pc-aros
+ exit ;;
esac
#echo '(No uname command or uname output not recognized.)' 1>&2
@@ -1458,9 +1459,9 @@ This script, last modified $timestamp, has failed to recognize
the operating system you are using. It is advised that you
download the most up to date version of the config scripts from
- http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
+ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
and
- http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
+ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
If the version you run ($0) is already up to date, please
send the following data and any information you think might be
diff --git a/config/config.h.in b/config/config.h.in
index 06f3485..db0a461 100644
--- a/config/config.h.in
+++ b/config/config.h.in
@@ -158,6 +158,13 @@
/* Define to 1 if you have the <zlib.h> header file. */
#undef HAVE_ZLIB_H
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+ */
+#undef LT_OBJDIR
+
+/* SCORE lite memory header optimizations */
+#undef NORMAL_SCLITE_HEADERS
+
/* Name of package */
#undef PACKAGE
@@ -185,6 +192,9 @@
/* Version number of package */
#undef VERSION
+/* Define to 1 if the X Window System is missing or not being used. */
+#undef X_DISPLAY_MISSING
+
/* Override longjmp */
#undef longjmp
diff --git a/config/config.sub b/config/config.sub
index fab0aa3..2a55a50 100755
--- a/config/config.sub
+++ b/config/config.sub
@@ -1,10 +1,10 @@
#! /bin/sh
# Configuration validation subroutine script.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
-# Inc.
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+# Free Software Foundation, Inc.
-timestamp='2006-09-20'
+timestamp='2009-11-20'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -32,13 +32,16 @@ timestamp='2006-09-20'
# Please send patches to <config-patches at gnu.org>. Submit a context
-# diff and a properly formatted ChangeLog entry.
+# diff and a properly formatted GNU ChangeLog entry.
#
# Configuration subroutine to validate and canonicalize a configuration type.
# Supply the specified configuration type as an argument.
# If it is invalid, we print an error message on stderr and exit with code 1.
# Otherwise, we print the canonical config type on stdout and succeed.
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+
# This file is supposed to be the same for all GNU packages
# and recognize all the CPU types, system types and aliases
# that are meaningful with *any* GNU software.
@@ -72,8 +75,8 @@ Report bugs and patches to <config-patches at gnu.org>."
version="\
GNU config.sub ($timestamp)
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -122,6 +125,7 @@ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
case $maybe_os in
nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
+ kopensolaris*-gnu* | \
storm-chaos* | os2-emx* | rtmk-nova*)
os=-$maybe_os
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
@@ -148,10 +152,13 @@ case $os in
-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
- -apple | -axis | -knuth | -cray)
+ -apple | -axis | -knuth | -cray | -microblaze)
os=
basic_machine=$1
;;
+ -bluegene*)
+ os=-cnk
+ ;;
-sim | -cisco | -oki | -wec | -winbond)
os=
basic_machine=$1
@@ -245,17 +252,20 @@ case $basic_machine in
| bfin \
| c4x | clipper \
| d10v | d30v | dlx | dsp16xx \
- | fr30 | frv \
+ | fido | fr30 | frv \
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
| i370 | i860 | i960 | ia64 \
| ip2k | iq2000 \
+ | lm32 \
| m32c | m32r | m32rle | m68000 | m68k | m88k \
- | maxq | mb | microblaze | mcore \
+ | maxq | mb | microblaze | mcore | mep | metag \
| mips | mipsbe | mipseb | mipsel | mipsle \
| mips16 \
| mips64 | mips64el \
- | mips64vr | mips64vrel \
+ | mips64octeon | mips64octeonel \
| mips64orion | mips64orionel \
+ | mips64r5900 | mips64r5900el \
+ | mips64vr | mips64vrel \
| mips64vr4100 | mips64vr4100el \
| mips64vr4300 | mips64vr4300el \
| mips64vr5000 | mips64vr5000el \
@@ -268,6 +278,7 @@ case $basic_machine in
| mipsisa64sr71k | mipsisa64sr71kel \
| mipstx39 | mipstx39el \
| mn10200 | mn10300 \
+ | moxie \
| mt \
| msp430 \
| nios | nios2 \
@@ -276,20 +287,22 @@ case $basic_machine in
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
| pyramid \
+ | rx \
| score \
- | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
| sh64 | sh64le \
| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
| spu | strongarm \
| tahoe | thumb | tic4x | tic80 | tron \
+ | ubicom32 \
| v850 | v850e \
| we32k \
| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
- | z8k)
+ | z8k | z80)
basic_machine=$basic_machine-unknown
;;
- m6811 | m68hc11 | m6812 | m68hc12)
+ m6811 | m68hc11 | m6812 | m68hc12 | picochip)
# Motorola 68HC11/12.
basic_machine=$basic_machine-unknown
os=-none
@@ -324,19 +337,22 @@ case $basic_machine in
| clipper-* | craynv-* | cydra-* \
| d10v-* | d30v-* | dlx-* \
| elxsi-* \
- | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
+ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
| h8300-* | h8500-* \
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
| i*86-* | i860-* | i960-* | ia64-* \
| ip2k-* | iq2000-* \
+ | lm32-* \
| m32c-* | m32r-* | m32rle-* \
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
- | m88110-* | m88k-* | maxq-* | mcore-* \
+ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
| mips16-* \
| mips64-* | mips64el-* \
- | mips64vr-* | mips64vrel-* \
+ | mips64octeon-* | mips64octeonel-* \
| mips64orion-* | mips64orionel-* \
+ | mips64r5900-* | mips64r5900el-* \
+ | mips64vr-* | mips64vrel-* \
| mips64vr4100-* | mips64vr4100el-* \
| mips64vr4300-* | mips64vr4300el-* \
| mips64vr5000-* | mips64vr5000el-* \
@@ -357,21 +373,26 @@ case $basic_machine in
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
| pyramid-* \
- | romp-* | rs6000-* \
- | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
+ | romp-* | rs6000-* | rx-* \
+ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
| sparclite-* \
| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
| tahoe-* | thumb-* \
- | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
| tron-* \
+ | ubicom32-* \
| v850-* | v850e-* | vax-* \
| we32k-* \
| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
- | xstormy16-* | xtensa-* \
+ | xstormy16-* | xtensa*-* \
| ymp-* \
- | z8k-*)
+ | z8k-* | z80-*)
+ ;;
+ # Recognize the basic CPU types without company name, with glob match.
+ xtensa*)
+ basic_machine=$basic_machine-unknown
;;
# Recognize the various machine names and aliases which stand
# for a CPU type and a company and sometimes even an OS.
@@ -435,6 +456,10 @@ case $basic_machine in
basic_machine=m68k-apollo
os=-bsd
;;
+ aros)
+ basic_machine=i386-pc
+ os=-aros
+ ;;
aux)
basic_machine=m68k-apple
os=-aux
@@ -443,10 +468,26 @@ case $basic_machine in
basic_machine=ns32k-sequent
os=-dynix
;;
+ blackfin)
+ basic_machine=bfin-unknown
+ os=-linux
+ ;;
+ blackfin-*)
+ basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
+ os=-linux
+ ;;
+ bluegene*)
+ basic_machine=powerpc-ibm
+ os=-cnk
+ ;;
c90)
basic_machine=c90-cray
os=-unicos
;;
+ cegcc)
+ basic_machine=arm-unknown
+ os=-cegcc
+ ;;
convex-c1)
basic_machine=c1-convex
os=-bsd
@@ -475,8 +516,8 @@ case $basic_machine in
basic_machine=craynv-cray
os=-unicosmp
;;
- cr16c)
- basic_machine=cr16c-unknown
+ cr16)
+ basic_machine=cr16-unknown
os=-elf
;;
crds | unos)
@@ -514,6 +555,10 @@ case $basic_machine in
basic_machine=m88k-motorola
os=-sysv3
;;
+ dicos)
+ basic_machine=i686-pc
+ os=-dicos
+ ;;
djgpp)
basic_machine=i586-pc
os=-msdosdjgpp
@@ -668,6 +713,14 @@ case $basic_machine in
basic_machine=m68k-isi
os=-sysv
;;
+ m68knommu)
+ basic_machine=m68k-unknown
+ os=-linux
+ ;;
+ m68knommu-*)
+ basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
+ os=-linux
+ ;;
m88k-omron*)
basic_machine=m88k-omron
;;
@@ -679,10 +732,17 @@ case $basic_machine in
basic_machine=ns32k-utek
os=-sysv
;;
+ microblaze)
+ basic_machine=microblaze-xilinx
+ ;;
mingw32)
basic_machine=i386-pc
os=-mingw32
;;
+ mingw32ce)
+ basic_machine=arm-unknown
+ os=-mingw32ce
+ ;;
miniframe)
basic_machine=m68000-convergent
;;
@@ -809,6 +869,14 @@ case $basic_machine in
basic_machine=i860-intel
os=-osf
;;
+ parisc)
+ basic_machine=hppa-unknown
+ os=-linux
+ ;;
+ parisc-*)
+ basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
+ os=-linux
+ ;;
pbd)
basic_machine=sparc-tti
;;
@@ -925,6 +993,9 @@ case $basic_machine in
basic_machine=sh-hitachi
os=-hms
;;
+ sh5el)
+ basic_machine=sh5le-unknown
+ ;;
sh64)
basic_machine=sh64-unknown
;;
@@ -1014,6 +1085,10 @@ case $basic_machine in
basic_machine=tic6x-unknown
os=-coff
;;
+ tile*)
+ basic_machine=tile-unknown
+ os=-linux-gnu
+ ;;
tx39)
basic_machine=mipstx39-unknown
;;
@@ -1089,6 +1164,10 @@ case $basic_machine in
basic_machine=z8k-unknown
os=-sim
;;
+ z80-*-coff)
+ basic_machine=z80-unknown
+ os=-sim
+ ;;
none)
basic_machine=none-none
os=-none
@@ -1127,7 +1206,7 @@ case $basic_machine in
we32k)
basic_machine=we32k-att
;;
- sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
+ sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
basic_machine=sh-unknown
;;
sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
@@ -1177,6 +1256,9 @@ case $os in
# First match some system type aliases
# that might get confused with valid system types.
# -solaris* is a basic system type, with this one exception.
+ -auroraux)
+ os=-auroraux
+ ;;
-solaris1 | -solaris1.*)
os=`echo $os | sed -e 's|solaris1|sunos4|'`
;;
@@ -1197,10 +1279,11 @@ case $os in
# Each alternative MUST END IN A *, to match a version number.
# -sysv* is not here because it comes later, after sysvr4.
-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
- | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
- | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
+ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
+ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
+ | -sym* | -kopensolaris* \
| -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
- | -aos* \
+ | -aos* | -aros* \
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
| -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
@@ -1209,7 +1292,7 @@ case $os in
| -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
- | -chorusos* | -chorusrdb* \
+ | -chorusos* | -chorusrdb* | -cegcc* \
| -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
| -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
| -uxpv* | -beos* | -mpeix* | -udk* \
@@ -1219,7 +1302,7 @@ case $os in
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
- | -skyos* | -haiku* | -rdos* | -toppers*)
+ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
@@ -1349,6 +1432,9 @@ case $os in
-zvmoe)
os=-zvmoe
;;
+ -dicos*)
+ os=-dicos
+ ;;
-none)
;;
*)
@@ -1414,6 +1500,9 @@ case $basic_machine in
m68*-cisco)
os=-aout
;;
+ mep-*)
+ os=-elf
+ ;;
mips*-cisco)
os=-elf
;;
@@ -1543,7 +1632,7 @@ case $basic_machine in
-sunos*)
vendor=sun
;;
- -aix*)
+ -cnk*|-aix*)
vendor=ibm
;;
-beos*)
diff --git a/config/depcomp b/config/depcomp
index ca5ea4e..df8eea7 100755
--- a/config/depcomp
+++ b/config/depcomp
@@ -1,10 +1,10 @@
#! /bin/sh
# depcomp - compile a program generating dependencies as side-effects
-scriptversion=2006-10-15.18
+scriptversion=2009-04-28.21; # UTC
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006 Free Software
-# Foundation, Inc.
+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free
+# Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -17,9 +17,7 @@ scriptversion=2006-10-15.18
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -87,6 +85,15 @@ if test "$depmode" = dashXmstdout; then
depmode=dashmstdout
fi
+cygpath_u="cygpath -u -f -"
+if test "$depmode" = msvcmsys; then
+ # This is just like msvisualcpp but w/o cygpath translation.
+ # Just convert the backslash-escaped backslashes to single forward
+ # slashes to satisfy depend.m4
+ cygpath_u="sed s,\\\\\\\\,/,g"
+ depmode=msvisualcpp
+fi
+
case "$depmode" in
gcc3)
## gcc 3 implements dependency tracking that does exactly what
@@ -192,14 +199,14 @@ sgi)
' < "$tmpdepfile" \
| sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
tr '
-' ' ' >> $depfile
- echo >> $depfile
+' ' ' >> "$depfile"
+ echo >> "$depfile"
# The second pass generates a dummy entry for each header file.
tr ' ' '
' < "$tmpdepfile" \
| sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
- >> $depfile
+ >> "$depfile"
else
# The sourcefile does not contain any dependencies, so just
# store a dummy comment line, to avoid errors with the Makefile
@@ -215,34 +222,39 @@ aix)
# current directory. Also, the AIX compiler puts `$object:' at the
# start of each line; $object doesn't have directory information.
# Version 6 uses the directory in both cases.
- stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'`
- tmpdepfile="$stripped.u"
+ dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
+ test "x$dir" = "x$object" && dir=
+ base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
if test "$libtool" = yes; then
+ tmpdepfile1=$dir$base.u
+ tmpdepfile2=$base.u
+ tmpdepfile3=$dir.libs/$base.u
"$@" -Wc,-M
else
+ tmpdepfile1=$dir$base.u
+ tmpdepfile2=$dir$base.u
+ tmpdepfile3=$dir$base.u
"$@" -M
fi
stat=$?
- if test -f "$tmpdepfile"; then :
- else
- stripped=`echo "$stripped" | sed 's,^.*/,,'`
- tmpdepfile="$stripped.u"
- fi
-
if test $stat -eq 0; then :
else
- rm -f "$tmpdepfile"
+ rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
exit $stat
fi
+ for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+ do
+ test -f "$tmpdepfile" && break
+ done
if test -f "$tmpdepfile"; then
- outname="$stripped.o"
# Each line is of the form `foo.o: dependent.h'.
# Do two passes, one to just change these to
# `$object: dependent.h' and one to simply `dependent.h:'.
- sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
- sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
+ sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
+ # That's a tab and a space in the [].
+ sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
else
# The sourcefile does not contain any dependencies, so just
# store a dummy comment line, to avoid errors with the Makefile
@@ -323,7 +335,12 @@ hp2)
if test -f "$tmpdepfile"; then
sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
# Add `dependent.h:' lines.
- sed -ne '2,${; s/^ *//; s/ \\*$//; s/$/:/; p;}' "$tmpdepfile" >> "$depfile"
+ sed -ne '2,${
+ s/^ *//
+ s/ \\*$//
+ s/$/:/
+ p
+ }' "$tmpdepfile" >> "$depfile"
else
echo "#dummy" > "$depfile"
fi
@@ -399,7 +416,7 @@ dashmstdout)
# Remove the call to Libtool.
if test "$libtool" = yes; then
- while test $1 != '--mode=compile'; do
+ while test "X$1" != 'X--mode=compile'; do
shift
done
shift
@@ -450,32 +467,39 @@ makedepend)
"$@" || exit $?
# Remove any Libtool call
if test "$libtool" = yes; then
- while test $1 != '--mode=compile'; do
+ while test "X$1" != 'X--mode=compile'; do
shift
done
shift
fi
# X makedepend
shift
- cleared=no
- for arg in "$@"; do
+ cleared=no eat=no
+ for arg
+ do
case $cleared in
no)
set ""; shift
cleared=yes ;;
esac
+ if test $eat = yes; then
+ eat=no
+ continue
+ fi
case "$arg" in
-D*|-I*)
set fnord "$@" "$arg"; shift ;;
# Strip any option that makedepend may not understand. Remove
# the object too, otherwise makedepend will parse it as a source file.
+ -arch)
+ eat=yes ;;
-*|$object)
;;
*)
set fnord "$@" "$arg"; shift ;;
esac
done
- obj_suffix="`echo $object | sed 's/^.*\././'`"
+ obj_suffix=`echo "$object" | sed 's/^.*\././'`
touch "$tmpdepfile"
${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
rm -f "$depfile"
@@ -495,7 +519,7 @@ cpp)
# Remove the call to Libtool.
if test "$libtool" = yes; then
- while test $1 != '--mode=compile'; do
+ while test "X$1" != 'X--mode=compile'; do
shift
done
shift
@@ -533,13 +557,27 @@ cpp)
msvisualcpp)
# Important note: in order to support this mode, a compiler *must*
- # always write the preprocessed file to stdout, regardless of -o,
- # because we must use -o when running libtool.
+ # always write the preprocessed file to stdout.
"$@" || exit $?
+
+ # Remove the call to Libtool.
+ if test "$libtool" = yes; then
+ while test "X$1" != 'X--mode=compile'; do
+ shift
+ done
+ shift
+ fi
+
IFS=" "
for arg
do
case "$arg" in
+ -o)
+ shift
+ ;;
+ $object)
+ shift
+ ;;
"-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
set fnord "$@"
shift
@@ -552,16 +590,23 @@ msvisualcpp)
;;
esac
done
- "$@" -E |
- sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
+ "$@" -E 2>/dev/null |
+ sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile"
rm -f "$depfile"
echo "$object : \\" > "$depfile"
- . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile"
+ sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile"
echo " " >> "$depfile"
- . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile"
+ sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile"
rm -f "$tmpdepfile"
;;
+msvcmsys)
+ # This case exists only to let depend.m4 do its work. It works by
+ # looking at the text of this script. This case will never be run,
+ # since it is checked for above.
+ exit 1
+ ;;
+
none)
exec "$@"
;;
@@ -580,5 +625,6 @@ exit 0
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
# End:
diff --git a/config/install-sh b/config/install-sh
index 4fbbae7..6781b98 100755
--- a/config/install-sh
+++ b/config/install-sh
@@ -1,7 +1,7 @@
#!/bin/sh
# install - install a program, script, or datafile
-scriptversion=2006-10-14.15
+scriptversion=2009-04-28.21; # UTC
# This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the
@@ -48,7 +48,7 @@ IFS=" "" $nl"
# set DOITPROG to echo to test this script
# Don't use :- since 4.3BSD and earlier shells don't like it.
-doit="${DOITPROG-}"
+doit=${DOITPROG-}
if test -z "$doit"; then
doit_exec=exec
else
@@ -58,34 +58,49 @@ fi
# Put in absolute file names if you don't have them in your path;
# or use environment vars.
-mvprog="${MVPROG-mv}"
-cpprog="${CPPROG-cp}"
-chmodprog="${CHMODPROG-chmod}"
-chownprog="${CHOWNPROG-chown}"
-chgrpprog="${CHGRPPROG-chgrp}"
-stripprog="${STRIPPROG-strip}"
-rmprog="${RMPROG-rm}"
-mkdirprog="${MKDIRPROG-mkdir}"
+chgrpprog=${CHGRPPROG-chgrp}
+chmodprog=${CHMODPROG-chmod}
+chownprog=${CHOWNPROG-chown}
+cmpprog=${CMPPROG-cmp}
+cpprog=${CPPROG-cp}
+mkdirprog=${MKDIRPROG-mkdir}
+mvprog=${MVPROG-mv}
+rmprog=${RMPROG-rm}
+stripprog=${STRIPPROG-strip}
+
+posix_glob='?'
+initialize_posix_glob='
+ test "$posix_glob" != "?" || {
+ if (set -f) 2>/dev/null; then
+ posix_glob=
+ else
+ posix_glob=:
+ fi
+ }
+'
-posix_glob=
posix_mkdir=
# Desired mode of installed file.
mode=0755
+chgrpcmd=
chmodcmd=$chmodprog
chowncmd=
-chgrpcmd=
-stripcmd=
+mvcmd=$mvprog
rmcmd="$rmprog -f"
-mvcmd="$mvprog"
+stripcmd=
+
src=
dst=
dir_arg=
-dstarg=
+dst_arg=
+
+copy_on_change=false
no_target_directory=
-usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
+usage="\
+Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
or: $0 [OPTION]... SRCFILES... DIRECTORY
or: $0 [OPTION]... -t DIRECTORY SRCFILES...
or: $0 [OPTION]... -d DIRECTORIES...
@@ -95,65 +110,55 @@ In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
In the 4th, create DIRECTORIES.
Options:
--c (ignored)
--d create directories instead of installing files.
--g GROUP $chgrpprog installed files to GROUP.
--m MODE $chmodprog installed files to MODE.
--o USER $chownprog installed files to USER.
--s $stripprog installed files.
--t DIRECTORY install into DIRECTORY.
--T report an error if DSTFILE is a directory.
---help display this help and exit.
---version display version info and exit.
+ --help display this help and exit.
+ --version display version info and exit.
+
+ -c (ignored)
+ -C install only if different (preserve the last data modification time)
+ -d create directories instead of installing files.
+ -g GROUP $chgrpprog installed files to GROUP.
+ -m MODE $chmodprog installed files to MODE.
+ -o USER $chownprog installed files to USER.
+ -s $stripprog installed files.
+ -t DIRECTORY install into DIRECTORY.
+ -T report an error if DSTFILE is a directory.
Environment variables override the default commands:
- CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
+ CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
+ RMPROG STRIPPROG
"
while test $# -ne 0; do
case $1 in
- -c) shift
- continue;;
+ -c) ;;
+
+ -C) copy_on_change=true;;
- -d) dir_arg=true
- shift
- continue;;
+ -d) dir_arg=true;;
-g) chgrpcmd="$chgrpprog $2"
- shift
- shift
- continue;;
+ shift;;
--help) echo "$usage"; exit $?;;
-m) mode=$2
- shift
- shift
case $mode in
*' '* | *' '* | *'
'* | *'*'* | *'?'* | *'['*)
echo "$0: invalid mode: $mode" >&2
exit 1;;
esac
- continue;;
+ shift;;
-o) chowncmd="$chownprog $2"
- shift
- shift
- continue;;
+ shift;;
- -s) stripcmd=$stripprog
- shift
- continue;;
+ -s) stripcmd=$stripprog;;
- -t) dstarg=$2
- shift
- shift
- continue;;
+ -t) dst_arg=$2
+ shift;;
- -T) no_target_directory=true
- shift
- continue;;
+ -T) no_target_directory=true;;
--version) echo "$0 $scriptversion"; exit $?;;
@@ -165,21 +170,22 @@ while test $# -ne 0; do
*) break;;
esac
+ shift
done
-if test $# -ne 0 && test -z "$dir_arg$dstarg"; then
+if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
# When -d is used, all remaining arguments are directories to create.
# When -t is used, the destination is already specified.
# Otherwise, the last argument is the destination. Remove it from $@.
for arg
do
- if test -n "$dstarg"; then
+ if test -n "$dst_arg"; then
# $@ is not empty: it contains at least $arg.
- set fnord "$@" "$dstarg"
+ set fnord "$@" "$dst_arg"
shift # fnord
fi
shift # arg
- dstarg=$arg
+ dst_arg=$arg
done
fi
@@ -224,7 +230,7 @@ for src
do
# Protect names starting with `-'.
case $src in
- -*) src=./$src ;;
+ -*) src=./$src;;
esac
if test -n "$dir_arg"; then
@@ -242,22 +248,22 @@ do
exit 1
fi
- if test -z "$dstarg"; then
+ if test -z "$dst_arg"; then
echo "$0: no destination specified." >&2
exit 1
fi
- dst=$dstarg
+ dst=$dst_arg
# Protect names starting with `-'.
case $dst in
- -*) dst=./$dst ;;
+ -*) dst=./$dst;;
esac
# If destination is a directory, append the input filename; won't work
# if double slashes aren't ignored.
if test -d "$dst"; then
if test -n "$no_target_directory"; then
- echo "$0: $dstarg: Is a directory" >&2
+ echo "$0: $dst_arg: Is a directory" >&2
exit 1
fi
dstdir=$dst
@@ -378,26 +384,19 @@ do
# directory the slow way, step by step, checking for races as we go.
case $dstdir in
- /*) prefix=/ ;;
- -*) prefix=./ ;;
- *) prefix= ;;
+ /*) prefix='/';;
+ -*) prefix='./';;
+ *) prefix='';;
esac
- case $posix_glob in
- '')
- if (set -f) 2>/dev/null; then
- posix_glob=true
- else
- posix_glob=false
- fi ;;
- esac
+ eval "$initialize_posix_glob"
oIFS=$IFS
IFS=/
- $posix_glob && set -f
+ $posix_glob set -f
set fnord $dstdir
shift
- $posix_glob && set +f
+ $posix_glob set +f
IFS=$oIFS
prefixes=
@@ -459,41 +458,54 @@ do
# ignore errors from any of these, just make sure not to ignore
# errors from the above "$doit $cpprog $src $dsttmp" command.
#
- { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
- && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
- && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
- && { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
-
- # Now rename the file to the real destination.
- { $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null \
- || {
- # The rename failed, perhaps because mv can't rename something else
- # to itself, or perhaps because mv is so ancient that it does not
- # support -f.
-
- # Now remove or move aside any old file at destination location.
- # We try this two ways since rm can't unlink itself on some
- # systems and the destination file might be busy for other
- # reasons. In this case, the final cleanup might fail but the new
- # file should still install successfully.
- {
- if test -f "$dst"; then
- $doit $rmcmd -f "$dst" 2>/dev/null \
- || { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null \
- && { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }; }\
- || {
- echo "$0: cannot unlink or rename $dst" >&2
- (exit 1); exit 1
- }
- else
- :
- fi
- } &&
-
- # Now rename the file to the real destination.
- $doit $mvcmd "$dsttmp" "$dst"
- }
- } || exit 1
+ { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
+ { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
+ { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
+ { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
+
+ # If -C, don't bother to copy if it wouldn't change the file.
+ if $copy_on_change &&
+ old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` &&
+ new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` &&
+
+ eval "$initialize_posix_glob" &&
+ $posix_glob set -f &&
+ set X $old && old=:$2:$4:$5:$6 &&
+ set X $new && new=:$2:$4:$5:$6 &&
+ $posix_glob set +f &&
+
+ test "$old" = "$new" &&
+ $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
+ then
+ rm -f "$dsttmp"
+ else
+ # Rename the file to the real destination.
+ $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
+
+ # The rename failed, perhaps because mv can't rename something else
+ # to itself, or perhaps because mv is so ancient that it does not
+ # support -f.
+ {
+ # Now remove or move aside any old file at destination location.
+ # We try this two ways since rm can't unlink itself on some
+ # systems and the destination file might be busy for other
+ # reasons. In this case, the final cleanup might fail but the new
+ # file should still install successfully.
+ {
+ test ! -f "$dst" ||
+ $doit $rmcmd -f "$dst" 2>/dev/null ||
+ { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
+ { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
+ } ||
+ { echo "$0: cannot unlink or rename $dst" >&2
+ (exit 1); exit 1
+ }
+ } &&
+
+ # Now rename the file to the real destination.
+ $doit $mvcmd "$dsttmp" "$dst"
+ }
+ fi || exit 1
trap '' 0
fi
@@ -503,5 +515,6 @@ done
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
# End:
diff --git a/config/libtool.m4 b/config/libtool.m4
new file mode 100644
index 0000000..671cde1
--- /dev/null
+++ b/config/libtool.m4
@@ -0,0 +1,7360 @@
+# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+#
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
+# 2006, 2007, 2008 Free Software Foundation, Inc.
+# Written by Gordon Matzigkeit, 1996
+#
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+
+m4_define([_LT_COPYING], [dnl
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
+# 2006, 2007, 2008 Free Software Foundation, Inc.
+# Written by Gordon Matzigkeit, 1996
+#
+# This file is part of GNU Libtool.
+#
+# GNU Libtool is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
+#
+# As a special exception to the GNU General Public License,
+# if you distribute this file as part of a program or library that
+# is built using GNU Libtool, you may include this file under the
+# same distribution terms that you use for the rest of that program.
+#
+# GNU Libtool is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Libtool; see the file COPYING. If not, a copy
+# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
+# obtained by writing to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+])
+
+# serial 56 LT_INIT
+
+
+# LT_PREREQ(VERSION)
+# ------------------
+# Complain and exit if this libtool version is less that VERSION.
+m4_defun([LT_PREREQ],
+[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1,
+ [m4_default([$3],
+ [m4_fatal([Libtool version $1 or higher is required],
+ 63)])],
+ [$2])])
+
+
+# _LT_CHECK_BUILDDIR
+# ------------------
+# Complain if the absolute build directory name contains unusual characters
+m4_defun([_LT_CHECK_BUILDDIR],
+[case `pwd` in
+ *\ * | *\ *)
+ AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;;
+esac
+])
+
+
+# LT_INIT([OPTIONS])
+# ------------------
+AC_DEFUN([LT_INIT],
+[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
+AC_BEFORE([$0], [LT_LANG])dnl
+AC_BEFORE([$0], [LT_OUTPUT])dnl
+AC_BEFORE([$0], [LTDL_INIT])dnl
+m4_require([_LT_CHECK_BUILDDIR])dnl
+
+dnl Autoconf doesn't catch unexpanded LT_ macros by default:
+m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl
+m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl
+dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4
+dnl unless we require an AC_DEFUNed macro:
+AC_REQUIRE([LTOPTIONS_VERSION])dnl
+AC_REQUIRE([LTSUGAR_VERSION])dnl
+AC_REQUIRE([LTVERSION_VERSION])dnl
+AC_REQUIRE([LTOBSOLETE_VERSION])dnl
+m4_require([_LT_PROG_LTMAIN])dnl
+
+dnl Parse OPTIONS
+_LT_SET_OPTIONS([$0], [$1])
+
+# This can be used to rebuild libtool when needed
+LIBTOOL_DEPS="$ltmain"
+
+# Always use our own libtool.
+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+AC_SUBST(LIBTOOL)dnl
+
+_LT_SETUP
+
+# Only expand once:
+m4_define([LT_INIT])
+])# LT_INIT
+
+# Old names:
+AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT])
+AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_PROG_LIBTOOL], [])
+dnl AC_DEFUN([AM_PROG_LIBTOOL], [])
+
+
+# _LT_CC_BASENAME(CC)
+# -------------------
+# Calculate cc_basename. Skip known compiler wrappers and cross-prefix.
+m4_defun([_LT_CC_BASENAME],
+[for cc_temp in $1""; do
+ case $cc_temp in
+ compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
+ distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
+ \-*) ;;
+ *) break;;
+ esac
+done
+cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+])
+
+
+# _LT_FILEUTILS_DEFAULTS
+# ----------------------
+# It is okay to use these file commands and assume they have been set
+# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'.
+m4_defun([_LT_FILEUTILS_DEFAULTS],
+[: ${CP="cp -f"}
+: ${MV="mv -f"}
+: ${RM="rm -f"}
+])# _LT_FILEUTILS_DEFAULTS
+
+
+# _LT_SETUP
+# ---------
+m4_defun([_LT_SETUP],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+_LT_DECL([], [host_alias], [0], [The host system])dnl
+_LT_DECL([], [host], [0])dnl
+_LT_DECL([], [host_os], [0])dnl
+dnl
+_LT_DECL([], [build_alias], [0], [The build system])dnl
+_LT_DECL([], [build], [0])dnl
+_LT_DECL([], [build_os], [0])dnl
+dnl
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([LT_PATH_LD])dnl
+AC_REQUIRE([LT_PATH_NM])dnl
+dnl
+AC_REQUIRE([AC_PROG_LN_S])dnl
+test -z "$LN_S" && LN_S="ln -s"
+_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl
+dnl
+AC_REQUIRE([LT_CMD_MAX_LEN])dnl
+_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl
+_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl
+dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_CHECK_SHELL_FEATURES])dnl
+m4_require([_LT_CMD_RELOAD])dnl
+m4_require([_LT_CHECK_MAGIC_METHOD])dnl
+m4_require([_LT_CMD_OLD_ARCHIVE])dnl
+m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
+
+_LT_CONFIG_LIBTOOL_INIT([
+# See if we are running on zsh, and set the options which allow our
+# commands through without removal of \ escapes INIT.
+if test -n "\${ZSH_VERSION+set}" ; then
+ setopt NO_GLOB_SUBST
+fi
+])
+if test -n "${ZSH_VERSION+set}" ; then
+ setopt NO_GLOB_SUBST
+fi
+
+_LT_CHECK_OBJDIR
+
+m4_require([_LT_TAG_COMPILER])dnl
+_LT_PROG_ECHO_BACKSLASH
+
+case $host_os in
+aix3*)
+ # AIX sometimes has problems with the GCC collect2 program. For some
+ # reason, if we set the COLLECT_NAMES environment variable, the problems
+ # vanish in a puff of smoke.
+ if test "X${COLLECT_NAMES+set}" != Xset; then
+ COLLECT_NAMES=
+ export COLLECT_NAMES
+ fi
+ ;;
+esac
+
+# Sed substitution that helps us do robust quoting. It backslashifies
+# metacharacters that are still active within double-quoted strings.
+sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
+
+# Same as above, but do not quote variable references.
+double_quote_subst='s/\([["`\\]]\)/\\\1/g'
+
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+
+# Sed substitution to delay expansion of an escaped single quote.
+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
+
+# Sed substitution to avoid accidental globbing in evaled expressions
+no_glob_subst='s/\*/\\\*/g'
+
+# Global variables:
+ofile=libtool
+can_build_shared=yes
+
+# All known linkers require a `.a' archive for static linking (except MSVC,
+# which needs '.lib').
+libext=a
+
+with_gnu_ld="$lt_cv_prog_gnu_ld"
+
+old_CC="$CC"
+old_CFLAGS="$CFLAGS"
+
+# Set sane defaults for various variables
+test -z "$CC" && CC=cc
+test -z "$LTCC" && LTCC=$CC
+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
+test -z "$LD" && LD=ld
+test -z "$ac_objext" && ac_objext=o
+
+_LT_CC_BASENAME([$compiler])
+
+# Only perform the check for file, if the check method requires it
+test -z "$MAGIC_CMD" && MAGIC_CMD=file
+case $deplibs_check_method in
+file_magic*)
+ if test "$file_magic_cmd" = '$MAGIC_CMD'; then
+ _LT_PATH_MAGIC
+ fi
+ ;;
+esac
+
+# Use C for the default configuration in the libtool script
+LT_SUPPORTED_TAG([CC])
+_LT_LANG_C_CONFIG
+_LT_LANG_DEFAULT_CONFIG
+_LT_CONFIG_COMMANDS
+])# _LT_SETUP
+
+
+# _LT_PROG_LTMAIN
+# ---------------
+# Note that this code is called both from `configure', and `config.status'
+# now that we use AC_CONFIG_COMMANDS to generate libtool. Notably,
+# `config.status' has no value for ac_aux_dir unless we are using Automake,
+# so we pass a copy along to make sure it has a sensible value anyway.
+m4_defun([_LT_PROG_LTMAIN],
+[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl
+_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir'])
+ltmain="$ac_aux_dir/ltmain.sh"
+])# _LT_PROG_LTMAIN
+
+
+## ------------------------------------- ##
+## Accumulate code for creating libtool. ##
+## ------------------------------------- ##
+
+# So that we can recreate a full libtool script including additional
+# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS
+# in macros and then make a single call at the end using the `libtool'
+# label.
+
+
+# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS])
+# ----------------------------------------
+# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later.
+m4_define([_LT_CONFIG_LIBTOOL_INIT],
+[m4_ifval([$1],
+ [m4_append([_LT_OUTPUT_LIBTOOL_INIT],
+ [$1
+])])])
+
+# Initialize.
+m4_define([_LT_OUTPUT_LIBTOOL_INIT])
+
+
+# _LT_CONFIG_LIBTOOL([COMMANDS])
+# ------------------------------
+# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later.
+m4_define([_LT_CONFIG_LIBTOOL],
+[m4_ifval([$1],
+ [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS],
+ [$1
+])])])
+
+# Initialize.
+m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS])
+
+
+# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS])
+# -----------------------------------------------------
+m4_defun([_LT_CONFIG_SAVE_COMMANDS],
+[_LT_CONFIG_LIBTOOL([$1])
+_LT_CONFIG_LIBTOOL_INIT([$2])
+])
+
+
+# _LT_FORMAT_COMMENT([COMMENT])
+# -----------------------------
+# Add leading comment marks to the start of each line, and a trailing
+# full-stop to the whole comment if one is not present already.
+m4_define([_LT_FORMAT_COMMENT],
+[m4_ifval([$1], [
+m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])],
+ [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.])
+)])
+
+
+
+## ------------------------ ##
+## FIXME: Eliminate VARNAME ##
+## ------------------------ ##
+
+
+# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?])
+# -------------------------------------------------------------------
+# CONFIGNAME is the name given to the value in the libtool script.
+# VARNAME is the (base) name used in the configure script.
+# VALUE may be 0, 1 or 2 for a computed quote escaped value based on
+# VARNAME. Any other value will be used directly.
+m4_define([_LT_DECL],
+[lt_if_append_uniq([lt_decl_varnames], [$2], [, ],
+ [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name],
+ [m4_ifval([$1], [$1], [$2])])
+ lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3])
+ m4_ifval([$4],
+ [lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])])
+ lt_dict_add_subkey([lt_decl_dict], [$2],
+ [tagged?], [m4_ifval([$5], [yes], [no])])])
+])
+
+
+# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION])
+# --------------------------------------------------------
+m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])])
+
+
+# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...])
+# ------------------------------------------------
+m4_define([lt_decl_tag_varnames],
+[_lt_decl_filter([tagged?], [yes], $@)])
+
+
+# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..])
+# ---------------------------------------------------------
+m4_define([_lt_decl_filter],
+[m4_case([$#],
+ [0], [m4_fatal([$0: too few arguments: $#])],
+ [1], [m4_fatal([$0: too few arguments: $#: $1])],
+ [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)],
+ [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)],
+ [lt_dict_filter([lt_decl_dict], $@)])[]dnl
+])
+
+
+# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...])
+# --------------------------------------------------
+m4_define([lt_decl_quote_varnames],
+[_lt_decl_filter([value], [1], $@)])
+
+
+# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...])
+# ---------------------------------------------------
+m4_define([lt_decl_dquote_varnames],
+[_lt_decl_filter([value], [2], $@)])
+
+
+# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...])
+# ---------------------------------------------------
+m4_define([lt_decl_varnames_tagged],
+[m4_assert([$# <= 2])dnl
+_$0(m4_quote(m4_default([$1], [[, ]])),
+ m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]),
+ m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))])
+m4_define([_lt_decl_varnames_tagged],
+[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])])
+
+
+# lt_decl_all_varnames([SEPARATOR], [VARNAME1...])
+# ------------------------------------------------
+m4_define([lt_decl_all_varnames],
+[_$0(m4_quote(m4_default([$1], [[, ]])),
+ m4_if([$2], [],
+ m4_quote(lt_decl_varnames),
+ m4_quote(m4_shift($@))))[]dnl
+])
+m4_define([_lt_decl_all_varnames],
+[lt_join($@, lt_decl_varnames_tagged([$1],
+ lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl
+])
+
+
+# _LT_CONFIG_STATUS_DECLARE([VARNAME])
+# ------------------------------------
+# Quote a variable value, and forward it to `config.status' so that its
+# declaration there will have the same value as in `configure'. VARNAME
+# must have a single quote delimited value for this to work.
+m4_define([_LT_CONFIG_STATUS_DECLARE],
+[$1='`$ECHO "X$][$1" | $Xsed -e "$delay_single_quote_subst"`'])
+
+
+# _LT_CONFIG_STATUS_DECLARATIONS
+# ------------------------------
+# We delimit libtool config variables with single quotes, so when
+# we write them to config.status, we have to be sure to quote all
+# embedded single quotes properly. In configure, this macro expands
+# each variable declared with _LT_DECL (and _LT_TAGDECL) into:
+#
+# <var>='`$ECHO "X$<var>" | $Xsed -e "$delay_single_quote_subst"`'
+m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
+[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames),
+ [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])])
+
+
+# _LT_LIBTOOL_TAGS
+# ----------------
+# Output comment and list of tags supported by the script
+m4_defun([_LT_LIBTOOL_TAGS],
+[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl
+available_tags="_LT_TAGS"dnl
+])
+
+
+# _LT_LIBTOOL_DECLARE(VARNAME, [TAG])
+# -----------------------------------
+# Extract the dictionary values for VARNAME (optionally with TAG) and
+# expand to a commented shell variable setting:
+#
+# # Some comment about what VAR is for.
+# visible_name=$lt_internal_name
+m4_define([_LT_LIBTOOL_DECLARE],
+[_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch([lt_decl_dict], [$1],
+ [description])))[]dnl
+m4_pushdef([_libtool_name],
+ m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [libtool_name])))[]dnl
+m4_case(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [value])),
+ [0], [_libtool_name=[$]$1],
+ [1], [_libtool_name=$lt_[]$1],
+ [2], [_libtool_name=$lt_[]$1],
+ [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl
+m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl
+])
+
+
+# _LT_LIBTOOL_CONFIG_VARS
+# -----------------------
+# Produce commented declarations of non-tagged libtool config variables
+# suitable for insertion in the LIBTOOL CONFIG section of the `libtool'
+# script. Tagged libtool config variables (even for the LIBTOOL CONFIG
+# section) are produced by _LT_LIBTOOL_TAG_VARS.
+m4_defun([_LT_LIBTOOL_CONFIG_VARS],
+[m4_foreach([_lt_var],
+ m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)),
+ [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])])
+
+
+# _LT_LIBTOOL_TAG_VARS(TAG)
+# -------------------------
+m4_define([_LT_LIBTOOL_TAG_VARS],
+[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames),
+ [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])])
+
+
+# _LT_TAGVAR(VARNAME, [TAGNAME])
+# ------------------------------
+m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])])
+
+
+# _LT_CONFIG_COMMANDS
+# -------------------
+# Send accumulated output to $CONFIG_STATUS. Thanks to the lists of
+# variables for single and double quote escaping we saved from calls
+# to _LT_DECL, we can put quote escaped variables declarations
+# into `config.status', and then the shell code to quote escape them in
+# for loops in `config.status'. Finally, any additional code accumulated
+# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded.
+m4_defun([_LT_CONFIG_COMMANDS],
+[AC_PROVIDE_IFELSE([LT_OUTPUT],
+ dnl If the libtool generation code has been placed in $CONFIG_LT,
+ dnl instead of duplicating it all over again into config.status,
+ dnl then we will have config.status run $CONFIG_LT later, so it
+ dnl needs to know what name is stored there:
+ [AC_CONFIG_COMMANDS([libtool],
+ [$SHELL $CONFIG_LT || AS_EXIT(1)], [CONFIG_LT='$CONFIG_LT'])],
+ dnl If the libtool generation code is destined for config.status,
+ dnl expand the accumulated commands and init code now:
+ [AC_CONFIG_COMMANDS([libtool],
+ [_LT_OUTPUT_LIBTOOL_COMMANDS], [_LT_OUTPUT_LIBTOOL_COMMANDS_INIT])])
+])#_LT_CONFIG_COMMANDS
+
+
+# Initialize.
+m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT],
+[
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+sed_quote_subst='$sed_quote_subst'
+double_quote_subst='$double_quote_subst'
+delay_variable_subst='$delay_variable_subst'
+_LT_CONFIG_STATUS_DECLARATIONS
+LTCC='$LTCC'
+LTCFLAGS='$LTCFLAGS'
+compiler='$compiler_DEFAULT'
+
+# Quote evaled strings.
+for var in lt_decl_all_varnames([[ \
+]], lt_decl_quote_varnames); do
+ case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
+ *[[\\\\\\\`\\"\\\$]]*)
+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
+ ;;
+ *)
+ eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+ ;;
+ esac
+done
+
+# Double-quote double-evaled strings.
+for var in lt_decl_all_varnames([[ \
+]], lt_decl_dquote_varnames); do
+ case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
+ *[[\\\\\\\`\\"\\\$]]*)
+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
+ ;;
+ *)
+ eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+ ;;
+ esac
+done
+
+# Fix-up fallback echo if it was mangled by the above quoting rules.
+case \$lt_ECHO in
+*'\\\[$]0 --fallback-echo"')dnl "
+ lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\[$]0 --fallback-echo"\[$]/\[$]0 --fallback-echo"/'\`
+ ;;
+esac
+
+_LT_OUTPUT_LIBTOOL_INIT
+])
+
+
+# LT_OUTPUT
+# ---------
+# This macro allows early generation of the libtool script (before
+# AC_OUTPUT is called), incase it is used in configure for compilation
+# tests.
+AC_DEFUN([LT_OUTPUT],
+[: ${CONFIG_LT=./config.lt}
+AC_MSG_NOTICE([creating $CONFIG_LT])
+cat >"$CONFIG_LT" <<_LTEOF
+#! $SHELL
+# Generated by $as_me.
+# Run this file to recreate a libtool stub with the current configuration.
+
+lt_cl_silent=false
+SHELL=\${CONFIG_SHELL-$SHELL}
+_LTEOF
+
+cat >>"$CONFIG_LT" <<\_LTEOF
+AS_SHELL_SANITIZE
+_AS_PREPARE
+
+exec AS_MESSAGE_FD>&1
+exec AS_MESSAGE_LOG_FD>>config.log
+{
+ echo
+ AS_BOX([Running $as_me.])
+} >&AS_MESSAGE_LOG_FD
+
+lt_cl_help="\
+\`$as_me' creates a local libtool stub from the current configuration,
+for use in further configure time tests before the real libtool is
+generated.
+
+Usage: $[0] [[OPTIONS]]
+
+ -h, --help print this help, then exit
+ -V, --version print version number, then exit
+ -q, --quiet do not print progress messages
+ -d, --debug don't remove temporary files
+
+Report bugs to <bug-libtool at gnu.org>."
+
+lt_cl_version="\
+m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl
+m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
+configured by $[0], generated by m4_PACKAGE_STRING.
+
+Copyright (C) 2008 Free Software Foundation, Inc.
+This config.lt script is free software; the Free Software Foundation
+gives unlimited permision to copy, distribute and modify it."
+
+while test $[#] != 0
+do
+ case $[1] in
+ --version | --v* | -V )
+ echo "$lt_cl_version"; exit 0 ;;
+ --help | --h* | -h )
+ echo "$lt_cl_help"; exit 0 ;;
+ --debug | --d* | -d )
+ debug=: ;;
+ --quiet | --q* | --silent | --s* | -q )
+ lt_cl_silent=: ;;
+
+ -*) AC_MSG_ERROR([unrecognized option: $[1]
+Try \`$[0] --help' for more information.]) ;;
+
+ *) AC_MSG_ERROR([unrecognized argument: $[1]
+Try \`$[0] --help' for more information.]) ;;
+ esac
+ shift
+done
+
+if $lt_cl_silent; then
+ exec AS_MESSAGE_FD>/dev/null
+fi
+_LTEOF
+
+cat >>"$CONFIG_LT" <<_LTEOF
+_LT_OUTPUT_LIBTOOL_COMMANDS_INIT
+_LTEOF
+
+cat >>"$CONFIG_LT" <<\_LTEOF
+AC_MSG_NOTICE([creating $ofile])
+_LT_OUTPUT_LIBTOOL_COMMANDS
+AS_EXIT(0)
+_LTEOF
+chmod +x "$CONFIG_LT"
+
+# configure is writing to config.log, but config.lt does its own redirection,
+# appending to config.log, which fails on DOS, as config.log is still kept
+# open by configure. Here we exec the FD to /dev/null, effectively closing
+# config.log, so it can be properly (re)opened and appended to by config.lt.
+if test "$no_create" != yes; then
+ lt_cl_success=:
+ test "$silent" = yes &&
+ lt_config_lt_args="$lt_config_lt_args --quiet"
+ exec AS_MESSAGE_LOG_FD>/dev/null
+ $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
+ exec AS_MESSAGE_LOG_FD>>config.log
+ $lt_cl_success || AS_EXIT(1)
+fi
+])# LT_OUTPUT
+
+
+# _LT_CONFIG(TAG)
+# ---------------
+# If TAG is the built-in tag, create an initial libtool script with a
+# default configuration from the untagged config vars. Otherwise add code
+# to config.status for appending the configuration named by TAG from the
+# matching tagged config vars.
+m4_defun([_LT_CONFIG],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+_LT_CONFIG_SAVE_COMMANDS([
+ m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl
+ m4_if(_LT_TAG, [C], [
+ # See if we are running on zsh, and set the options which allow our
+ # commands through without removal of \ escapes.
+ if test -n "${ZSH_VERSION+set}" ; then
+ setopt NO_GLOB_SUBST
+ fi
+
+ cfgfile="${ofile}T"
+ trap "$RM \"$cfgfile\"; exit 1" 1 2 15
+ $RM "$cfgfile"
+
+ cat <<_LT_EOF >> "$cfgfile"
+#! $SHELL
+
+# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
+# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+# NOTE: Changes made to this file will be lost: look at ltmain.sh.
+#
+_LT_COPYING
+_LT_LIBTOOL_TAGS
+
+# ### BEGIN LIBTOOL CONFIG
+_LT_LIBTOOL_CONFIG_VARS
+_LT_LIBTOOL_TAG_VARS
+# ### END LIBTOOL CONFIG
+
+_LT_EOF
+
+ case $host_os in
+ aix3*)
+ cat <<\_LT_EOF >> "$cfgfile"
+# AIX sometimes has problems with the GCC collect2 program. For some
+# reason, if we set the COLLECT_NAMES environment variable, the problems
+# vanish in a puff of smoke.
+if test "X${COLLECT_NAMES+set}" != Xset; then
+ COLLECT_NAMES=
+ export COLLECT_NAMES
+fi
+_LT_EOF
+ ;;
+ esac
+
+ _LT_PROG_LTMAIN
+
+ # We use sed instead of cat because bash on DJGPP gets confused if
+ # if finds mixed CR/LF and LF-only lines. Since sed operates in
+ # text mode, it properly converts lines to CR/LF. This bash problem
+ # is reportedly fixed, but why not run on old versions too?
+ sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
+ || (rm -f "$cfgfile"; exit 1)
+
+ _LT_PROG_XSI_SHELLFNS
+
+ sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
+ || (rm -f "$cfgfile"; exit 1)
+
+ mv -f "$cfgfile" "$ofile" ||
+ (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
+ chmod +x "$ofile"
+],
+[cat <<_LT_EOF >> "$ofile"
+
+dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded
+dnl in a comment (ie after a #).
+# ### BEGIN LIBTOOL TAG CONFIG: $1
+_LT_LIBTOOL_TAG_VARS(_LT_TAG)
+# ### END LIBTOOL TAG CONFIG: $1
+_LT_EOF
+])dnl /m4_if
+],
+[m4_if([$1], [], [
+ PACKAGE='$PACKAGE'
+ VERSION='$VERSION'
+ TIMESTAMP='$TIMESTAMP'
+ RM='$RM'
+ ofile='$ofile'], [])
+])dnl /_LT_CONFIG_SAVE_COMMANDS
+])# _LT_CONFIG
+
+
+# LT_SUPPORTED_TAG(TAG)
+# ---------------------
+# Trace this macro to discover what tags are supported by the libtool
+# --tag option, using:
+# autoconf --trace 'LT_SUPPORTED_TAG:$1'
+AC_DEFUN([LT_SUPPORTED_TAG], [])
+
+
+# C support is built-in for now
+m4_define([_LT_LANG_C_enabled], [])
+m4_define([_LT_TAGS], [])
+
+
+# LT_LANG(LANG)
+# -------------
+# Enable libtool support for the given language if not already enabled.
+AC_DEFUN([LT_LANG],
+[AC_BEFORE([$0], [LT_OUTPUT])dnl
+m4_case([$1],
+ [C], [_LT_LANG(C)],
+ [C++], [_LT_LANG(CXX)],
+ [Java], [_LT_LANG(GCJ)],
+ [Fortran 77], [_LT_LANG(F77)],
+ [Fortran], [_LT_LANG(FC)],
+ [Windows Resource], [_LT_LANG(RC)],
+ [m4_ifdef([_LT_LANG_]$1[_CONFIG],
+ [_LT_LANG($1)],
+ [m4_fatal([$0: unsupported language: "$1"])])])dnl
+])# LT_LANG
+
+
+# _LT_LANG(LANGNAME)
+# ------------------
+m4_defun([_LT_LANG],
+[m4_ifdef([_LT_LANG_]$1[_enabled], [],
+ [LT_SUPPORTED_TAG([$1])dnl
+ m4_append([_LT_TAGS], [$1 ])dnl
+ m4_define([_LT_LANG_]$1[_enabled], [])dnl
+ _LT_LANG_$1_CONFIG($1)])dnl
+])# _LT_LANG
+
+
+# _LT_LANG_DEFAULT_CONFIG
+# -----------------------
+m4_defun([_LT_LANG_DEFAULT_CONFIG],
+[AC_PROVIDE_IFELSE([AC_PROG_CXX],
+ [LT_LANG(CXX)],
+ [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[LT_LANG(CXX)])])
+
+AC_PROVIDE_IFELSE([AC_PROG_F77],
+ [LT_LANG(F77)],
+ [m4_define([AC_PROG_F77], defn([AC_PROG_F77])[LT_LANG(F77)])])
+
+AC_PROVIDE_IFELSE([AC_PROG_FC],
+ [LT_LANG(FC)],
+ [m4_define([AC_PROG_FC], defn([AC_PROG_FC])[LT_LANG(FC)])])
+
+dnl The call to [A][M_PROG_GCJ] is quoted like that to stop aclocal
+dnl pulling things in needlessly.
+AC_PROVIDE_IFELSE([AC_PROG_GCJ],
+ [LT_LANG(GCJ)],
+ [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
+ [LT_LANG(GCJ)],
+ [AC_PROVIDE_IFELSE([LT_PROG_GCJ],
+ [LT_LANG(GCJ)],
+ [m4_ifdef([AC_PROG_GCJ],
+ [m4_define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[LT_LANG(GCJ)])])
+ m4_ifdef([A][M_PROG_GCJ],
+ [m4_define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[LT_LANG(GCJ)])])
+ m4_ifdef([LT_PROG_GCJ],
+ [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])])
+
+AC_PROVIDE_IFELSE([LT_PROG_RC],
+ [LT_LANG(RC)],
+ [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])])
+])# _LT_LANG_DEFAULT_CONFIG
+
+# Obsolete macros:
+AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)])
+AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)])
+AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)])
+AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_CXX], [])
+dnl AC_DEFUN([AC_LIBTOOL_F77], [])
+dnl AC_DEFUN([AC_LIBTOOL_FC], [])
+dnl AC_DEFUN([AC_LIBTOOL_GCJ], [])
+
+
+# _LT_TAG_COMPILER
+# ----------------
+m4_defun([_LT_TAG_COMPILER],
+[AC_REQUIRE([AC_PROG_CC])dnl
+
+_LT_DECL([LTCC], [CC], [1], [A C compiler])dnl
+_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl
+_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl
+_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl
+
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
+
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
+# Allow CC to be a program name with arguments.
+compiler=$CC
+])# _LT_TAG_COMPILER
+
+
+# _LT_COMPILER_BOILERPLATE
+# ------------------------
+# Check for compiler boilerplate output or warnings with
+# the simple compiler test code.
+m4_defun([_LT_COMPILER_BOILERPLATE],
+[m4_require([_LT_DECL_SED])dnl
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$RM conftest*
+])# _LT_COMPILER_BOILERPLATE
+
+
+# _LT_LINKER_BOILERPLATE
+# ----------------------
+# Check for linker boilerplate output or warnings with
+# the simple link test code.
+m4_defun([_LT_LINKER_BOILERPLATE],
+[m4_require([_LT_DECL_SED])dnl
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$RM -r conftest*
+])# _LT_LINKER_BOILERPLATE
+
+# _LT_REQUIRED_DARWIN_CHECKS
+# -------------------------
+m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
+ case $host_os in
+ rhapsody* | darwin*)
+ AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
+ AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
+ AC_CHECK_TOOL([LIPO], [lipo], [:])
+ AC_CHECK_TOOL([OTOOL], [otool], [:])
+ AC_CHECK_TOOL([OTOOL64], [otool64], [:])
+ _LT_DECL([], [DSYMUTIL], [1],
+ [Tool to manipulate archived DWARF debug symbol files on Mac OS X])
+ _LT_DECL([], [NMEDIT], [1],
+ [Tool to change global to local symbols on Mac OS X])
+ _LT_DECL([], [LIPO], [1],
+ [Tool to manipulate fat objects and archives on Mac OS X])
+ _LT_DECL([], [OTOOL], [1],
+ [ldd/readelf like tool for Mach-O binaries on Mac OS X])
+ _LT_DECL([], [OTOOL64], [1],
+ [ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4])
+
+ AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
+ [lt_cv_apple_cc_single_mod=no
+ if test -z "${LT_MULTI_MODULE}"; then
+ # By default we will add the -single_module flag. You can override
+ # by either setting the environment variable LT_MULTI_MODULE
+ # non-empty at configure time, or by adding -multi_module to the
+ # link flags.
+ rm -rf libconftest.dylib*
+ echo "int foo(void){return 1;}" > conftest.c
+ echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+-dynamiclib -Wl,-single_module conftest.c" >&AS_MESSAGE_LOG_FD
+ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+ -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
+ _lt_result=$?
+ if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
+ lt_cv_apple_cc_single_mod=yes
+ else
+ cat conftest.err >&AS_MESSAGE_LOG_FD
+ fi
+ rm -rf libconftest.dylib*
+ rm -f conftest.*
+ fi])
+ AC_CACHE_CHECK([for -exported_symbols_list linker flag],
+ [lt_cv_ld_exported_symbols_list],
+ [lt_cv_ld_exported_symbols_list=no
+ save_LDFLAGS=$LDFLAGS
+ echo "_main" > conftest.sym
+ LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
+ [lt_cv_ld_exported_symbols_list=yes],
+ [lt_cv_ld_exported_symbols_list=no])
+ LDFLAGS="$save_LDFLAGS"
+ ])
+ case $host_os in
+ rhapsody* | darwin1.[[012]])
+ _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
+ darwin1.*)
+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+ darwin*) # darwin 5.x on
+ # if running on 10.5 or later, the deployment target defaults
+ # to the OS version, if on x86, and 10.4, the deployment
+ # target defaults to 10.4. Don't you love it?
+ case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
+ 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+ 10.[[012]]*)
+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+ 10.*)
+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+ esac
+ ;;
+ esac
+ if test "$lt_cv_apple_cc_single_mod" = "yes"; then
+ _lt_dar_single_mod='$single_module'
+ fi
+ if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
+ _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
+ else
+ _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ fi
+ if test "$DSYMUTIL" != ":"; then
+ _lt_dsymutil='~$DSYMUTIL $lib || :'
+ else
+ _lt_dsymutil=
+ fi
+ ;;
+ esac
+])
+
+
+# _LT_DARWIN_LINKER_FEATURES
+# --------------------------
+# Checks for linker and compiler features on darwin
+m4_defun([_LT_DARWIN_LINKER_FEATURES],
+[
+ m4_require([_LT_REQUIRED_DARWIN_CHECKS])
+ _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+ _LT_TAGVAR(hardcode_direct, $1)=no
+ _LT_TAGVAR(hardcode_automatic, $1)=yes
+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+ _LT_TAGVAR(whole_archive_flag_spec, $1)=''
+ _LT_TAGVAR(link_all_deplibs, $1)=yes
+ _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
+ case $cc_basename in
+ ifort*) _lt_dar_can_shared=yes ;;
+ *) _lt_dar_can_shared=$GCC ;;
+ esac
+ if test "$_lt_dar_can_shared" = "yes"; then
+ output_verbose_link_cmd=echo
+ _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+ _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+ _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+ _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+ m4_if([$1], [CXX],
+[ if test "$lt_cv_apple_cc_single_mod" != "yes"; then
+ _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
+ _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
+ fi
+],[])
+ else
+ _LT_TAGVAR(ld_shlibs, $1)=no
+ fi
+])
+
+# _LT_SYS_MODULE_PATH_AIX
+# -----------------------
+# Links a minimal program and checks the executable
+# for the system default hardcoded library path. In most cases,
+# this is /usr/lib:/lib, but when the MPI compilers are used
+# the location of the communication and MPI libs are included too.
+# If we don't find anything, use the default library path according
+# to the aix ld manual.
+m4_defun([_LT_SYS_MODULE_PATH_AIX],
+[m4_require([_LT_DECL_SED])dnl
+AC_LINK_IFELSE(AC_LANG_PROGRAM,[
+lt_aix_libpath_sed='
+ /Import File Strings/,/^$/ {
+ /^0/ {
+ s/^0 *\(.*\)$/\1/
+ p
+ }
+ }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+# Check for a 64-bit object if we didn't find anything.
+if test -z "$aix_libpath"; then
+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi],[])
+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+])# _LT_SYS_MODULE_PATH_AIX
+
+
+# _LT_SHELL_INIT(ARG)
+# -------------------
+m4_define([_LT_SHELL_INIT],
+[ifdef([AC_DIVERSION_NOTICE],
+ [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
+ [AC_DIVERT_PUSH(NOTICE)])
+$1
+AC_DIVERT_POP
+])# _LT_SHELL_INIT
+
+
+# _LT_PROG_ECHO_BACKSLASH
+# -----------------------
+# Add some code to the start of the generated configure script which
+# will find an echo command which doesn't interpret backslashes.
+m4_defun([_LT_PROG_ECHO_BACKSLASH],
+[_LT_SHELL_INIT([
+# Check that we are running under the correct shell.
+SHELL=${CONFIG_SHELL-/bin/sh}
+
+case X$lt_ECHO in
+X*--fallback-echo)
+ # Remove one level of quotation (which was required for Make).
+ ECHO=`echo "$lt_ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
+ ;;
+esac
+
+ECHO=${lt_ECHO-echo}
+if test "X[$]1" = X--no-reexec; then
+ # Discard the --no-reexec flag, and continue.
+ shift
+elif test "X[$]1" = X--fallback-echo; then
+ # Avoid inline document here, it may be left over
+ :
+elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then
+ # Yippee, $ECHO works!
+ :
+else
+ # Restart under the correct shell.
+ exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
+fi
+
+if test "X[$]1" = X--fallback-echo; then
+ # used as fallback echo
+ shift
+ cat <<_LT_EOF
+[$]*
+_LT_EOF
+ exit 0
+fi
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+if test -z "$lt_ECHO"; then
+ if test "X${echo_test_string+set}" != Xset; then
+ # find a string as large as possible, as long as the shell can cope with it
+ for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
+ # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
+ if { echo_test_string=`eval $cmd`; } 2>/dev/null &&
+ { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null
+ then
+ break
+ fi
+ done
+ fi
+
+ if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
+ echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
+ test "X$echo_testing_string" = "X$echo_test_string"; then
+ :
+ else
+ # The Solaris, AIX, and Digital Unix default echo programs unquote
+ # backslashes. This makes it impossible to quote backslashes using
+ # echo "$something" | sed 's/\\/\\\\/g'
+ #
+ # So, first we look for a working echo in the user's PATH.
+
+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+ for dir in $PATH /usr/ucb; do
+ IFS="$lt_save_ifs"
+ if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
+ test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
+ echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
+ test "X$echo_testing_string" = "X$echo_test_string"; then
+ ECHO="$dir/echo"
+ break
+ fi
+ done
+ IFS="$lt_save_ifs"
+
+ if test "X$ECHO" = Xecho; then
+ # We didn't find a better echo, so look for alternatives.
+ if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' &&
+ echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` &&
+ test "X$echo_testing_string" = "X$echo_test_string"; then
+ # This shell has a builtin print -r that does the trick.
+ ECHO='print -r'
+ elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } &&
+ test "X$CONFIG_SHELL" != X/bin/ksh; then
+ # If we have ksh, try running configure again with it.
+ ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
+ export ORIGINAL_CONFIG_SHELL
+ CONFIG_SHELL=/bin/ksh
+ export CONFIG_SHELL
+ exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
+ else
+ # Try using printf.
+ ECHO='printf %s\n'
+ if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
+ echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
+ test "X$echo_testing_string" = "X$echo_test_string"; then
+ # Cool, printf works
+ :
+ elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
+ test "X$echo_testing_string" = 'X\t' &&
+ echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
+ test "X$echo_testing_string" = "X$echo_test_string"; then
+ CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
+ export CONFIG_SHELL
+ SHELL="$CONFIG_SHELL"
+ export SHELL
+ ECHO="$CONFIG_SHELL [$]0 --fallback-echo"
+ elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
+ test "X$echo_testing_string" = 'X\t' &&
+ echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
+ test "X$echo_testing_string" = "X$echo_test_string"; then
+ ECHO="$CONFIG_SHELL [$]0 --fallback-echo"
+ else
+ # maybe with a smaller string...
+ prev=:
+
+ for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
+ if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null
+ then
+ break
+ fi
+ prev="$cmd"
+ done
+
+ if test "$prev" != 'sed 50q "[$]0"'; then
+ echo_test_string=`eval $prev`
+ export echo_test_string
+ exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
+ else
+ # Oops. We lost completely, so just stick with echo.
+ ECHO=echo
+ fi
+ fi
+ fi
+ fi
+ fi
+fi
+
+# Copy echo and quote the copy suitably for passing to libtool from
+# the Makefile, instead of quoting the original, which is used later.
+lt_ECHO=$ECHO
+if test "X$lt_ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
+ lt_ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
+fi
+
+AC_SUBST(lt_ECHO)
+])
+_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts])
+_LT_DECL([], [ECHO], [1],
+ [An echo program that does not interpret backslashes])
+])# _LT_PROG_ECHO_BACKSLASH
+
+
+# _LT_ENABLE_LOCK
+# ---------------
+m4_defun([_LT_ENABLE_LOCK],
+[AC_ARG_ENABLE([libtool-lock],
+ [AS_HELP_STRING([--disable-libtool-lock],
+ [avoid locking (might break parallel builds)])])
+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+
+# Some flags need to be propagated to the compiler or linker for good
+# libtool support.
+case $host in
+ia64-*-hpux*)
+ # Find out which ABI we are using.
+ echo 'int i;' > conftest.$ac_ext
+ if AC_TRY_EVAL(ac_compile); then
+ case `/usr/bin/file conftest.$ac_objext` in
+ *ELF-32*)
+ HPUX_IA64_MODE="32"
+ ;;
+ *ELF-64*)
+ HPUX_IA64_MODE="64"
+ ;;
+ esac
+ fi
+ rm -rf conftest*
+ ;;
+*-*-irix6*)
+ # Find out which ABI we are using.
+ echo '[#]line __oline__ "configure"' > conftest.$ac_ext
+ if AC_TRY_EVAL(ac_compile); then
+ if test "$lt_cv_prog_gnu_ld" = yes; then
+ case `/usr/bin/file conftest.$ac_objext` in
+ *32-bit*)
+ LD="${LD-ld} -melf32bsmip"
+ ;;
+ *N32*)
+ LD="${LD-ld} -melf32bmipn32"
+ ;;
+ *64-bit*)
+ LD="${LD-ld} -melf64bmip"
+ ;;
+ esac
+ else
+ case `/usr/bin/file conftest.$ac_objext` in
+ *32-bit*)
+ LD="${LD-ld} -32"
+ ;;
+ *N32*)
+ LD="${LD-ld} -n32"
+ ;;
+ *64-bit*)
+ LD="${LD-ld} -64"
+ ;;
+ esac
+ fi
+ fi
+ rm -rf conftest*
+ ;;
+
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
+ # Find out which ABI we are using.
+ echo 'int i;' > conftest.$ac_ext
+ if AC_TRY_EVAL(ac_compile); then
+ case `/usr/bin/file conftest.o` in
+ *32-bit*)
+ case $host in
+ x86_64-*kfreebsd*-gnu)
+ LD="${LD-ld} -m elf_i386_fbsd"
+ ;;
+ x86_64-*linux*)
+ LD="${LD-ld} -m elf_i386"
+ ;;
+ ppc64-*linux*|powerpc64-*linux*)
+ LD="${LD-ld} -m elf32ppclinux"
+ ;;
+ s390x-*linux*)
+ LD="${LD-ld} -m elf_s390"
+ ;;
+ sparc64-*linux*)
+ LD="${LD-ld} -m elf32_sparc"
+ ;;
+ esac
+ ;;
+ *64-bit*)
+ case $host in
+ x86_64-*kfreebsd*-gnu)
+ LD="${LD-ld} -m elf_x86_64_fbsd"
+ ;;
+ x86_64-*linux*)
+ LD="${LD-ld} -m elf_x86_64"
+ ;;
+ ppc*-*linux*|powerpc*-*linux*)
+ LD="${LD-ld} -m elf64ppc"
+ ;;
+ s390*-*linux*|s390*-*tpf*)
+ LD="${LD-ld} -m elf64_s390"
+ ;;
+ sparc*-*linux*)
+ LD="${LD-ld} -m elf64_sparc"
+ ;;
+ esac
+ ;;
+ esac
+ fi
+ rm -rf conftest*
+ ;;
+
+*-*-sco3.2v5*)
+ # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+ SAVE_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS -belf"
+ AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
+ [AC_LANG_PUSH(C)
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
+ AC_LANG_POP])
+ if test x"$lt_cv_cc_needs_belf" != x"yes"; then
+ # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
+ CFLAGS="$SAVE_CFLAGS"
+ fi
+ ;;
+sparc*-*solaris*)
+ # Find out which ABI we are using.
+ echo 'int i;' > conftest.$ac_ext
+ if AC_TRY_EVAL(ac_compile); then
+ case `/usr/bin/file conftest.o` in
+ *64-bit*)
+ case $lt_cv_prog_gnu_ld in
+ yes*) LD="${LD-ld} -m elf64_sparc" ;;
+ *)
+ if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
+ LD="${LD-ld} -64"
+ fi
+ ;;
+ esac
+ ;;
+ esac
+ fi
+ rm -rf conftest*
+ ;;
+esac
+
+need_locks="$enable_libtool_lock"
+])# _LT_ENABLE_LOCK
+
+
+# _LT_CMD_OLD_ARCHIVE
+# -------------------
+m4_defun([_LT_CMD_OLD_ARCHIVE],
+[AC_CHECK_TOOL(AR, ar, false)
+test -z "$AR" && AR=ar
+test -z "$AR_FLAGS" && AR_FLAGS=cru
+_LT_DECL([], [AR], [1], [The archiver])
+_LT_DECL([], [AR_FLAGS], [1])
+
+AC_CHECK_TOOL(STRIP, strip, :)
+test -z "$STRIP" && STRIP=:
+_LT_DECL([], [STRIP], [1], [A symbol stripping program])
+
+AC_CHECK_TOOL(RANLIB, ranlib, :)
+test -z "$RANLIB" && RANLIB=:
+_LT_DECL([], [RANLIB], [1],
+ [Commands used to install an old-style archive])
+
+# Determine commands to create old-style static archives.
+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
+old_postinstall_cmds='chmod 644 $oldlib'
+old_postuninstall_cmds=
+
+if test -n "$RANLIB"; then
+ case $host_os in
+ openbsd*)
+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+ ;;
+ *)
+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+ ;;
+ esac
+ old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+fi
+_LT_DECL([], [old_postinstall_cmds], [2])
+_LT_DECL([], [old_postuninstall_cmds], [2])
+_LT_TAGDECL([], [old_archive_cmds], [2],
+ [Commands used to build an old-style archive])
+])# _LT_CMD_OLD_ARCHIVE
+
+
+# _LT_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
+# [OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
+# ----------------------------------------------------------------
+# Check whether the given compiler option works
+AC_DEFUN([_LT_COMPILER_OPTION],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_SED])dnl
+AC_CACHE_CHECK([$1], [$2],
+ [$2=no
+ m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+ lt_compiler_flag="$3"
+ # Insert the option either (1) after the last *FLAGS variable, or
+ # (2) before a word containing "conftest.", or (3) at the end.
+ # Note that $ac_compile itself does not contain backslashes and begins
+ # with a dollar sign (not a hyphen), so the echo should work correctly.
+ # The option is referenced via a variable to avoid confusing sed.
+ lt_compile=`echo "$ac_compile" | $SED \
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+ (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&AS_MESSAGE_LOG_FD
+ echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+ $2=yes
+ fi
+ fi
+ $RM conftest*
+])
+
+if test x"[$]$2" = xyes; then
+ m4_if([$5], , :, [$5])
+else
+ m4_if([$6], , :, [$6])
+fi
+])# _LT_COMPILER_OPTION
+
+# Old name:
+AU_ALIAS([AC_LIBTOOL_COMPILER_OPTION], [_LT_COMPILER_OPTION])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], [])
+
+
+# _LT_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
+# [ACTION-SUCCESS], [ACTION-FAILURE])
+# ----------------------------------------------------
+# Check whether the given linker option works
+AC_DEFUN([_LT_LINKER_OPTION],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_SED])dnl
+AC_CACHE_CHECK([$1], [$2],
+ [$2=no
+ save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $3"
+ echo "$lt_simple_link_test_code" > conftest.$ac_ext
+ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+ # The linker can only warn and ignore the option if not recognized
+ # So say no if there are warnings
+ if test -s conftest.err; then
+ # Append any errors to the config.log.
+ cat conftest.err 1>&AS_MESSAGE_LOG_FD
+ $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+ if diff conftest.exp conftest.er2 >/dev/null; then
+ $2=yes
+ fi
+ else
+ $2=yes
+ fi
+ fi
+ $RM -r conftest*
+ LDFLAGS="$save_LDFLAGS"
+])
+
+if test x"[$]$2" = xyes; then
+ m4_if([$4], , :, [$4])
+else
+ m4_if([$5], , :, [$5])
+fi
+])# _LT_LINKER_OPTION
+
+# Old name:
+AU_ALIAS([AC_LIBTOOL_LINKER_OPTION], [_LT_LINKER_OPTION])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], [])
+
+
+# LT_CMD_MAX_LEN
+#---------------
+AC_DEFUN([LT_CMD_MAX_LEN],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+# find the maximum length of command line arguments
+AC_MSG_CHECKING([the maximum length of command line arguments])
+AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
+ i=0
+ teststring="ABCD"
+
+ case $build_os in
+ msdosdjgpp*)
+ # On DJGPP, this test can blow up pretty badly due to problems in libc
+ # (any single argument exceeding 2000 bytes causes a buffer overrun
+ # during glob expansion). Even if it were fixed, the result of this
+ # check would be larger than it should be.
+ lt_cv_sys_max_cmd_len=12288; # 12K is about right
+ ;;
+
+ gnu*)
+ # Under GNU Hurd, this test is not required because there is
+ # no limit to the length of command line arguments.
+ # Libtool will interpret -1 as no limit whatsoever
+ lt_cv_sys_max_cmd_len=-1;
+ ;;
+
+ cygwin* | mingw* | cegcc*)
+ # On Win9x/ME, this test blows up -- it succeeds, but takes
+ # about 5 minutes as the teststring grows exponentially.
+ # Worse, since 9x/ME are not pre-emptively multitasking,
+ # you end up with a "frozen" computer, even though with patience
+ # the test eventually succeeds (with a max line length of 256k).
+ # Instead, let's just punt: use the minimum linelength reported by
+ # all of the supported platforms: 8192 (on NT/2K/XP).
+ lt_cv_sys_max_cmd_len=8192;
+ ;;
+
+ amigaos*)
+ # On AmigaOS with pdksh, this test takes hours, literally.
+ # So we just punt and use a minimum line length of 8192.
+ lt_cv_sys_max_cmd_len=8192;
+ ;;
+
+ netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+ # This has been around since 386BSD, at least. Likely further.
+ if test -x /sbin/sysctl; then
+ lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
+ elif test -x /usr/sbin/sysctl; then
+ lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
+ else
+ lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs
+ fi
+ # And add a safety zone
+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+ ;;
+
+ interix*)
+ # We know the value 262144 and hardcode it with a safety zone (like BSD)
+ lt_cv_sys_max_cmd_len=196608
+ ;;
+
+ osf*)
+ # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
+ # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
+ # nice to cause kernel panics so lets avoid the loop below.
+ # First set a reasonable default.
+ lt_cv_sys_max_cmd_len=16384
+ #
+ if test -x /sbin/sysconfig; then
+ case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
+ *1*) lt_cv_sys_max_cmd_len=-1 ;;
+ esac
+ fi
+ ;;
+ sco3.2v5*)
+ lt_cv_sys_max_cmd_len=102400
+ ;;
+ sysv5* | sco5v6* | sysv4.2uw2*)
+ kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
+ if test -n "$kargmax"; then
+ lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'`
+ else
+ lt_cv_sys_max_cmd_len=32768
+ fi
+ ;;
+ *)
+ lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
+ if test -n "$lt_cv_sys_max_cmd_len"; then
+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+ else
+ # Make teststring a little bigger before we do anything with it.
+ # a 1K string should be a reasonable start.
+ for i in 1 2 3 4 5 6 7 8 ; do
+ teststring=$teststring$teststring
+ done
+ SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+ # If test is not a shell built-in, we'll probably end up computing a
+ # maximum length that is only half of the actual maximum length, but
+ # we can't tell.
+ while { test "X"`$SHELL [$]0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \
+ = "XX$teststring$teststring"; } >/dev/null 2>&1 &&
+ test $i != 17 # 1/2 MB should be enough
+ do
+ i=`expr $i + 1`
+ teststring=$teststring$teststring
+ done
+ # Only check the string length outside the loop.
+ lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
+ teststring=
+ # Add a significant safety factor because C++ compilers can tack on
+ # massive amounts of additional arguments before passing them to the
+ # linker. It appears as though 1/2 is a usable value.
+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+ fi
+ ;;
+ esac
+])
+if test -n $lt_cv_sys_max_cmd_len ; then
+ AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
+else
+ AC_MSG_RESULT(none)
+fi
+max_cmd_len=$lt_cv_sys_max_cmd_len
+_LT_DECL([], [max_cmd_len], [0],
+ [What is the maximum length of a command?])
+])# LT_CMD_MAX_LEN
+
+# Old name:
+AU_ALIAS([AC_LIBTOOL_SYS_MAX_CMD_LEN], [LT_CMD_MAX_LEN])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], [])
+
+
+# _LT_HEADER_DLFCN
+# ----------------
+m4_defun([_LT_HEADER_DLFCN],
+[AC_CHECK_HEADERS([dlfcn.h], [], [], [AC_INCLUDES_DEFAULT])dnl
+])# _LT_HEADER_DLFCN
+
+
+# _LT_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
+# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
+# ----------------------------------------------------------------
+m4_defun([_LT_TRY_DLOPEN_SELF],
+[m4_require([_LT_HEADER_DLFCN])dnl
+if test "$cross_compiling" = yes; then :
+ [$4]
+else
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<_LT_EOF
+[#line __oline__ "configure"
+#include "confdefs.h"
+
+#if HAVE_DLFCN_H
+#include <dlfcn.h>
+#endif
+
+#include <stdio.h>
+
+#ifdef RTLD_GLOBAL
+# define LT_DLGLOBAL RTLD_GLOBAL
+#else
+# ifdef DL_GLOBAL
+# define LT_DLGLOBAL DL_GLOBAL
+# else
+# define LT_DLGLOBAL 0
+# endif
+#endif
+
+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+ find out it does not work in some platform. */
+#ifndef LT_DLLAZY_OR_NOW
+# ifdef RTLD_LAZY
+# define LT_DLLAZY_OR_NOW RTLD_LAZY
+# else
+# ifdef DL_LAZY
+# define LT_DLLAZY_OR_NOW DL_LAZY
+# else
+# ifdef RTLD_NOW
+# define LT_DLLAZY_OR_NOW RTLD_NOW
+# else
+# ifdef DL_NOW
+# define LT_DLLAZY_OR_NOW DL_NOW
+# else
+# define LT_DLLAZY_OR_NOW 0
+# endif
+# endif
+# endif
+# endif
+#endif
+
+void fnord() { int i=42;}
+int main ()
+{
+ void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+ int status = $lt_dlunknown;
+
+ if (self)
+ {
+ if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
+ else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+ /* dlclose (self); */
+ }
+ else
+ puts (dlerror ());
+
+ return status;
+}]
+_LT_EOF
+ if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
+ (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
+ lt_status=$?
+ case x$lt_status in
+ x$lt_dlno_uscore) $1 ;;
+ x$lt_dlneed_uscore) $2 ;;
+ x$lt_dlunknown|x*) $3 ;;
+ esac
+ else :
+ # compilation failed
+ $3
+ fi
+fi
+rm -fr conftest*
+])# _LT_TRY_DLOPEN_SELF
+
+
+# LT_SYS_DLOPEN_SELF
+# ------------------
+AC_DEFUN([LT_SYS_DLOPEN_SELF],
+[m4_require([_LT_HEADER_DLFCN])dnl
+if test "x$enable_dlopen" != xyes; then
+ enable_dlopen=unknown
+ enable_dlopen_self=unknown
+ enable_dlopen_self_static=unknown
+else
+ lt_cv_dlopen=no
+ lt_cv_dlopen_libs=
+
+ case $host_os in
+ beos*)
+ lt_cv_dlopen="load_add_on"
+ lt_cv_dlopen_libs=
+ lt_cv_dlopen_self=yes
+ ;;
+
+ mingw* | pw32* | cegcc*)
+ lt_cv_dlopen="LoadLibrary"
+ lt_cv_dlopen_libs=
+ ;;
+
+ cygwin*)
+ lt_cv_dlopen="dlopen"
+ lt_cv_dlopen_libs=
+ ;;
+
+ darwin*)
+ # if libdl is installed we need to link against it
+ AC_CHECK_LIB([dl], [dlopen],
+ [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
+ lt_cv_dlopen="dyld"
+ lt_cv_dlopen_libs=
+ lt_cv_dlopen_self=yes
+ ])
+ ;;
+
+ *)
+ AC_CHECK_FUNC([shl_load],
+ [lt_cv_dlopen="shl_load"],
+ [AC_CHECK_LIB([dld], [shl_load],
+ [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
+ [AC_CHECK_FUNC([dlopen],
+ [lt_cv_dlopen="dlopen"],
+ [AC_CHECK_LIB([dl], [dlopen],
+ [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
+ [AC_CHECK_LIB([svld], [dlopen],
+ [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
+ [AC_CHECK_LIB([dld], [dld_link],
+ [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
+ ])
+ ])
+ ])
+ ])
+ ])
+ ;;
+ esac
+
+ if test "x$lt_cv_dlopen" != xno; then
+ enable_dlopen=yes
+ else
+ enable_dlopen=no
+ fi
+
+ case $lt_cv_dlopen in
+ dlopen)
+ save_CPPFLAGS="$CPPFLAGS"
+ test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+
+ save_LDFLAGS="$LDFLAGS"
+ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+
+ save_LIBS="$LIBS"
+ LIBS="$lt_cv_dlopen_libs $LIBS"
+
+ AC_CACHE_CHECK([whether a program can dlopen itself],
+ lt_cv_dlopen_self, [dnl
+ _LT_TRY_DLOPEN_SELF(
+ lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
+ lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
+ ])
+
+ if test "x$lt_cv_dlopen_self" = xyes; then
+ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
+ AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
+ lt_cv_dlopen_self_static, [dnl
+ _LT_TRY_DLOPEN_SELF(
+ lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
+ lt_cv_dlopen_self_static=no, lt_cv_dlopen_self_static=cross)
+ ])
+ fi
+
+ CPPFLAGS="$save_CPPFLAGS"
+ LDFLAGS="$save_LDFLAGS"
+ LIBS="$save_LIBS"
+ ;;
+ esac
+
+ case $lt_cv_dlopen_self in
+ yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
+ *) enable_dlopen_self=unknown ;;
+ esac
+
+ case $lt_cv_dlopen_self_static in
+ yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
+ *) enable_dlopen_self_static=unknown ;;
+ esac
+fi
+_LT_DECL([dlopen_support], [enable_dlopen], [0],
+ [Whether dlopen is supported])
+_LT_DECL([dlopen_self], [enable_dlopen_self], [0],
+ [Whether dlopen of programs is supported])
+_LT_DECL([dlopen_self_static], [enable_dlopen_self_static], [0],
+ [Whether dlopen of statically linked programs is supported])
+])# LT_SYS_DLOPEN_SELF
+
+# Old name:
+AU_ALIAS([AC_LIBTOOL_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], [])
+
+
+# _LT_COMPILER_C_O([TAGNAME])
+# ---------------------------
+# Check to see if options -c and -o are simultaneously supported by compiler.
+# This macro does not hard code the compiler like AC_PROG_CC_C_O.
+m4_defun([_LT_COMPILER_C_O],
+[m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_TAG_COMPILER])dnl
+AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
+ [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
+ [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
+ $RM -r conftest 2>/dev/null
+ mkdir conftest
+ cd conftest
+ mkdir out
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+ lt_compiler_flag="-o out/conftest2.$ac_objext"
+ # Insert the option either (1) after the last *FLAGS variable, or
+ # (2) before a word containing "conftest.", or (3) at the end.
+ # Note that $ac_compile itself does not contain backslashes and begins
+ # with a dollar sign (not a hyphen), so the echo should work correctly.
+ lt_compile=`echo "$ac_compile" | $SED \
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+ (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&AS_MESSAGE_LOG_FD
+ echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings
+ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+ _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+ fi
+ fi
+ chmod u+w . 2>&AS_MESSAGE_LOG_FD
+ $RM conftest*
+ # SGI C++ compiler will create directory out/ii_files/ for
+ # template instantiation
+ test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
+ $RM out/* && rmdir out
+ cd ..
+ $RM -r conftest
+ $RM conftest*
+])
+_LT_TAGDECL([compiler_c_o], [lt_cv_prog_compiler_c_o], [1],
+ [Does compiler simultaneously support -c and -o options?])
+])# _LT_COMPILER_C_O
+
+
+# _LT_COMPILER_FILE_LOCKS([TAGNAME])
+# ----------------------------------
+# Check to see if we can do hard links to lock some files if needed
+m4_defun([_LT_COMPILER_FILE_LOCKS],
+[m4_require([_LT_ENABLE_LOCK])dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+_LT_COMPILER_C_O([$1])
+
+hard_links="nottested"
+if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
+ # do not overwrite the value of need_locks provided by the user
+ AC_MSG_CHECKING([if we can lock with hard links])
+ hard_links=yes
+ $RM conftest*
+ ln conftest.a conftest.b 2>/dev/null && hard_links=no
+ touch conftest.a
+ ln conftest.a conftest.b 2>&5 || hard_links=no
+ ln conftest.a conftest.b 2>/dev/null && hard_links=no
+ AC_MSG_RESULT([$hard_links])
+ if test "$hard_links" = no; then
+ AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
+ need_locks=warn
+ fi
+else
+ need_locks=no
+fi
+_LT_DECL([], [need_locks], [1], [Must we lock files when doing compilation?])
+])# _LT_COMPILER_FILE_LOCKS
+
+
+# _LT_CHECK_OBJDIR
+# ----------------
+m4_defun([_LT_CHECK_OBJDIR],
+[AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
+[rm -f .libs 2>/dev/null
+mkdir .libs 2>/dev/null
+if test -d .libs; then
+ lt_cv_objdir=.libs
+else
+ # MS-DOS does not allow filenames that begin with a dot.
+ lt_cv_objdir=_libs
+fi
+rmdir .libs 2>/dev/null])
+objdir=$lt_cv_objdir
+_LT_DECL([], [objdir], [0],
+ [The name of the directory that contains temporary libtool files])dnl
+m4_pattern_allow([LT_OBJDIR])dnl
+AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/",
+ [Define to the sub-directory in which libtool stores uninstalled libraries.])
+])# _LT_CHECK_OBJDIR
+
+
+# _LT_LINKER_HARDCODE_LIBPATH([TAGNAME])
+# --------------------------------------
+# Check hardcoding attributes.
+m4_defun([_LT_LINKER_HARDCODE_LIBPATH],
+[AC_MSG_CHECKING([how to hardcode library paths into programs])
+_LT_TAGVAR(hardcode_action, $1)=
+if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" ||
+ test -n "$_LT_TAGVAR(runpath_var, $1)" ||
+ test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
+
+ # We can hardcode non-existent directories.
+ if test "$_LT_TAGVAR(hardcode_direct, $1)" != no &&
+ # If the only mechanism to avoid hardcoding is shlibpath_var, we
+ # have to relink, otherwise we might link with an installed library
+ # when we should be linking with a yet-to-be-installed one
+ ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
+ test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then
+ # Linking always hardcodes the temporary library directory.
+ _LT_TAGVAR(hardcode_action, $1)=relink
+ else
+ # We can link without hardcoding, and we can hardcode nonexisting dirs.
+ _LT_TAGVAR(hardcode_action, $1)=immediate
+ fi
+else
+ # We cannot hardcode anything, or else we can only hardcode existing
+ # directories.
+ _LT_TAGVAR(hardcode_action, $1)=unsupported
+fi
+AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)])
+
+if test "$_LT_TAGVAR(hardcode_action, $1)" = relink ||
+ test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then
+ # Fast installation is not supported
+ enable_fast_install=no
+elif test "$shlibpath_overrides_runpath" = yes ||
+ test "$enable_shared" = no; then
+ # Fast installation is not necessary
+ enable_fast_install=needless
+fi
+_LT_TAGDECL([], [hardcode_action], [0],
+ [How to hardcode a shared library path into an executable])
+])# _LT_LINKER_HARDCODE_LIBPATH
+
+
+# _LT_CMD_STRIPLIB
+# ----------------
+m4_defun([_LT_CMD_STRIPLIB],
+[m4_require([_LT_DECL_EGREP])
+striplib=
+old_striplib=
+AC_MSG_CHECKING([whether stripping libraries is possible])
+if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
+ test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+ test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+ AC_MSG_RESULT([yes])
+else
+# FIXME - insert some real tests, host_os isn't really good enough
+ case $host_os in
+ darwin*)
+ if test -n "$STRIP" ; then
+ striplib="$STRIP -x"
+ old_striplib="$STRIP -S"
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_RESULT([no])
+ fi
+ ;;
+ *)
+ AC_MSG_RESULT([no])
+ ;;
+ esac
+fi
+_LT_DECL([], [old_striplib], [1], [Commands to strip libraries])
+_LT_DECL([], [striplib], [1])
+])# _LT_CMD_STRIPLIB
+
+
+# _LT_SYS_DYNAMIC_LINKER([TAG])
+# -----------------------------
+# PORTME Fill in your ld.so characteristics
+m4_defun([_LT_SYS_DYNAMIC_LINKER],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_OBJDUMP])dnl
+m4_require([_LT_DECL_SED])dnl
+AC_MSG_CHECKING([dynamic linker characteristics])
+m4_if([$1],
+ [], [
+if test "$GCC" = yes; then
+ case $host_os in
+ darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
+ *) lt_awk_arg="/^libraries:/" ;;
+ esac
+ lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+ if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then
+ # if the path contains ";" then we assume it to be the separator
+ # otherwise default to the standard path separator (i.e. ":") - it is
+ # assumed that no part of a normal pathname contains ";" but that should
+ # okay in the real world where ";" in dirpaths is itself problematic.
+ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'`
+ else
+ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+ fi
+ # Ok, now we have the path, separated by spaces, we can step through it
+ # and add multilib dir if necessary.
+ lt_tmp_lt_search_path_spec=
+ lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+ for lt_sys_path in $lt_search_path_spec; do
+ if test -d "$lt_sys_path/$lt_multi_os_dir"; then
+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
+ else
+ test -d "$lt_sys_path" && \
+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
+ fi
+ done
+ lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk '
+BEGIN {RS=" "; FS="/|\n";} {
+ lt_foo="";
+ lt_count=0;
+ for (lt_i = NF; lt_i > 0; lt_i--) {
+ if ($lt_i != "" && $lt_i != ".") {
+ if ($lt_i == "..") {
+ lt_count++;
+ } else {
+ if (lt_count == 0) {
+ lt_foo="/" $lt_i lt_foo;
+ } else {
+ lt_count--;
+ }
+ }
+ }
+ }
+ if (lt_foo != "") { lt_freq[[lt_foo]]++; }
+ if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
+}'`
+ sys_lib_search_path_spec=`$ECHO $lt_search_path_spec`
+else
+ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+fi])
+library_names_spec=
+libname_spec='lib$name'
+soname_spec=
+shrext_cmds=".so"
+postinstall_cmds=
+postuninstall_cmds=
+finish_cmds=
+finish_eval=
+shlibpath_var=
+shlibpath_overrides_runpath=unknown
+version_type=none
+dynamic_linker="$host_os ld.so"
+sys_lib_dlsearch_path_spec="/lib /usr/lib"
+need_lib_prefix=unknown
+hardcode_into_libs=no
+
+# when you set need_version to no, make sure it does not cause -set_version
+# flags to be left without arguments
+need_version=unknown
+
+case $host_os in
+aix3*)
+ version_type=linux
+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+ shlibpath_var=LIBPATH
+
+ # AIX 3 has no versioning support, so we append a major version to the name.
+ soname_spec='${libname}${release}${shared_ext}$major'
+ ;;
+
+aix[[4-9]]*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ hardcode_into_libs=yes
+ if test "$host_cpu" = ia64; then
+ # AIX 5 supports IA64
+ library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
+ shlibpath_var=LD_LIBRARY_PATH
+ else
+ # With GCC up to 2.95.x, collect2 would create an import file
+ # for dependence libraries. The import file would start with
+ # the line `#! .'. This would cause the generated library to
+ # depend on `.', always an invalid library. This was fixed in
+ # development snapshots of GCC prior to 3.0.
+ case $host_os in
+ aix4 | aix4.[[01]] | aix4.[[01]].*)
+ if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
+ echo ' yes '
+ echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
+ :
+ else
+ can_build_shared=no
+ fi
+ ;;
+ esac
+ # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
+ # soname into executable. Probably we can add versioning support to
+ # collect2, so additional links can be useful in future.
+ if test "$aix_use_runtimelinking" = yes; then
+ # If using run time linking (on AIX 4.2 or later) use lib<name>.so
+ # instead of lib<name>.a to let people know that these are not
+ # typical AIX shared libraries.
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ else
+ # We preserve .a as extension for shared libraries through AIX4.2
+ # and later when we are not doing run time linking.
+ library_names_spec='${libname}${release}.a $libname.a'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ fi
+ shlibpath_var=LIBPATH
+ fi
+ ;;
+
+amigaos*)
+ case $host_cpu in
+ powerpc)
+ # Since July 2007 AmigaOS4 officially supports .so libraries.
+ # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ ;;
+ m68k)
+ library_names_spec='$libname.ixlibrary $libname.a'
+ # Create ${libname}_ixlibrary.a entries in /sys/libs.
+ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+ ;;
+ esac
+ ;;
+
+beos*)
+ library_names_spec='${libname}${shared_ext}'
+ dynamic_linker="$host_os ld.so"
+ shlibpath_var=LIBRARY_PATH
+ ;;
+
+bsdi[[45]]*)
+ version_type=linux
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+ shlibpath_var=LD_LIBRARY_PATH
+ sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
+ sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
+ # the default ld.so.conf also contains /usr/contrib/lib and
+ # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
+ # libtool to hard-code these into programs
+ ;;
+
+cygwin* | mingw* | pw32* | cegcc*)
+ version_type=windows
+ shrext_cmds=".dll"
+ need_version=no
+ need_lib_prefix=no
+
+ case $GCC,$host_os in
+ yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
+ library_names_spec='$libname.dll.a'
+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
+ postinstall_cmds='base_file=`basename \${file}`~
+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+ dldir=$destdir/`dirname \$dlpath`~
+ test -d \$dldir || mkdir -p \$dldir~
+ $install_prog $dir/$dlname \$dldir/$dlname~
+ chmod a+x \$dldir/$dlname~
+ if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+ eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+ fi'
+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+ dlpath=$dir/\$dldll~
+ $RM \$dlpath'
+ shlibpath_overrides_runpath=yes
+
+ case $host_os in
+ cygwin*)
+ # Cygwin DLLs use 'cyg' prefix rather than 'lib'
+ soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+ sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
+ ;;
+ mingw* | cegcc*)
+ # MinGW DLLs use traditional 'lib' prefix
+ soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+ sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+ if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
+ # It is most probably a Windows format PATH printed by
+ # mingw gcc, but we are running on Cygwin. Gcc prints its search
+ # path with ; separators, and with drive letters. We can handle the
+ # drive letters (cygwin fileutils understands them), so leave them,
+ # especially as we might pass files found there to a mingw objdump,
+ # which wouldn't understand a cygwinified path. Ahh.
+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+ else
+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+ fi
+ ;;
+ pw32*)
+ # pw32 DLLs use 'pw' prefix rather than 'lib'
+ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+ ;;
+ esac
+ ;;
+
+ *)
+ library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
+ ;;
+ esac
+ dynamic_linker='Win32 ld.exe'
+ # FIXME: first we should search . and the directory the executable is in
+ shlibpath_var=PATH
+ ;;
+
+darwin* | rhapsody*)
+ dynamic_linker="$host_os dyld"
+ version_type=darwin
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
+ soname_spec='${libname}${release}${major}$shared_ext'
+ shlibpath_overrides_runpath=yes
+ shlibpath_var=DYLD_LIBRARY_PATH
+ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+m4_if([$1], [],[
+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"])
+ sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+ ;;
+
+dgux*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ ;;
+
+freebsd1*)
+ dynamic_linker=no
+ ;;
+
+freebsd* | dragonfly*)
+ # DragonFly does not have aout. When/if they implement a new
+ # versioning mechanism, adjust this.
+ if test -x /usr/bin/objformat; then
+ objformat=`/usr/bin/objformat`
+ else
+ case $host_os in
+ freebsd[[123]]*) objformat=aout ;;
+ *) objformat=elf ;;
+ esac
+ fi
+ version_type=freebsd-$objformat
+ case $version_type in
+ freebsd-elf*)
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+ need_version=no
+ need_lib_prefix=no
+ ;;
+ freebsd-*)
+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+ need_version=yes
+ ;;
+ esac
+ shlibpath_var=LD_LIBRARY_PATH
+ case $host_os in
+ freebsd2*)
+ shlibpath_overrides_runpath=yes
+ ;;
+ freebsd3.[[01]]* | freebsdelf3.[[01]]*)
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+ ;;
+ freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \
+ freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1)
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ ;;
+ *) # from 4.6 on, and DragonFly
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+ ;;
+ esac
+ ;;
+
+gnu*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ hardcode_into_libs=yes
+ ;;
+
+hpux9* | hpux10* | hpux11*)
+ # Give a soname corresponding to the major version so that dld.sl refuses to
+ # link against other versions.
+ version_type=sunos
+ need_lib_prefix=no
+ need_version=no
+ case $host_cpu in
+ ia64*)
+ shrext_cmds='.so'
+ hardcode_into_libs=yes
+ dynamic_linker="$host_os dld.so"
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ if test "X$HPUX_IA64_MODE" = X32; then
+ sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+ else
+ sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+ fi
+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+ ;;
+ hppa*64*)
+ shrext_cmds='.sl'
+ hardcode_into_libs=yes
+ dynamic_linker="$host_os dld.sl"
+ shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+ ;;
+ *)
+ shrext_cmds='.sl'
+ dynamic_linker="$host_os dld.sl"
+ shlibpath_var=SHLIB_PATH
+ shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ ;;
+ esac
+ # HP-UX runs *really* slowly unless shared libraries are mode 555.
+ postinstall_cmds='chmod 555 $lib'
+ ;;
+
+interix[[3-9]]*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ ;;
+
+irix5* | irix6* | nonstopux*)
+ case $host_os in
+ nonstopux*) version_type=nonstopux ;;
+ *)
+ if test "$lt_cv_prog_gnu_ld" = yes; then
+ version_type=linux
+ else
+ version_type=irix
+ fi ;;
+ esac
+ need_lib_prefix=no
+ need_version=no
+ soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
+ case $host_os in
+ irix5* | nonstopux*)
+ libsuff= shlibsuff=
+ ;;
+ *)
+ case $LD in # libtool.m4 will add one of these switches to LD
+ *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
+ libsuff= shlibsuff= libmagic=32-bit;;
+ *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
+ libsuff=32 shlibsuff=N32 libmagic=N32;;
+ *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
+ libsuff=64 shlibsuff=64 libmagic=64-bit;;
+ *) libsuff= shlibsuff= libmagic=never-match;;
+ esac
+ ;;
+ esac
+ shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
+ shlibpath_overrides_runpath=no
+ sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+ sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+ hardcode_into_libs=yes
+ ;;
+
+# No shared lib support for Linux oldld, aout, or coff.
+linux*oldld* | linux*aout* | linux*coff*)
+ dynamic_linker=no
+ ;;
+
+# This must be Linux ELF.
+linux* | k*bsd*-gnu)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ # Some binutils ld are patched to set DT_RUNPATH
+ save_LDFLAGS=$LDFLAGS
+ save_libdir=$libdir
+ eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
+ LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
+ [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],
+ [shlibpath_overrides_runpath=yes])])
+ LDFLAGS=$save_LDFLAGS
+ libdir=$save_libdir
+
+ # This implies no fast_install, which is unacceptable.
+ # Some rework will be needed to allow for fast_install
+ # before this can be enabled.
+ hardcode_into_libs=yes
+
+ # Add ABI-specific directories to the system library path.
+ sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
+
+ # Append ld.so.conf contents to the search path
+ if test -f /etc/ld.so.conf; then
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
+ fi
+
+ # We used to test for /lib/ld.so.1 and disable shared libraries on
+ # powerpc, because MkLinux only supported shared libraries with the
+ # GNU dynamic linker. Since this was broken with cross compilers,
+ # most powerpc-linux boxes support dynamic linking these days and
+ # people can always --disable-shared, the test was removed, and we
+ # assume the GNU/Linux dynamic linker is in use.
+ dynamic_linker='GNU/Linux ld.so'
+ ;;
+
+netbsd*)
+ version_type=sunos
+ need_lib_prefix=no
+ need_version=no
+ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+ dynamic_linker='NetBSD (a.out) ld.so'
+ else
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ dynamic_linker='NetBSD ld.elf_so'
+ fi
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+ ;;
+
+newsos6)
+ version_type=linux
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+ ;;
+
+*nto* | *qnx*)
+ version_type=qnx
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ dynamic_linker='ldqnx.so'
+ ;;
+
+openbsd*)
+ version_type=sunos
+ sys_lib_dlsearch_path_spec="/usr/lib"
+ need_lib_prefix=no
+ # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
+ case $host_os in
+ openbsd3.3 | openbsd3.3.*) need_version=yes ;;
+ *) need_version=no ;;
+ esac
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+ shlibpath_var=LD_LIBRARY_PATH
+ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ case $host_os in
+ openbsd2.[[89]] | openbsd2.[[89]].*)
+ shlibpath_overrides_runpath=no
+ ;;
+ *)
+ shlibpath_overrides_runpath=yes
+ ;;
+ esac
+ else
+ shlibpath_overrides_runpath=yes
+ fi
+ ;;
+
+os2*)
+ libname_spec='$name'
+ shrext_cmds=".dll"
+ need_lib_prefix=no
+ library_names_spec='$libname${shared_ext} $libname.a'
+ dynamic_linker='OS/2 ld.exe'
+ shlibpath_var=LIBPATH
+ ;;
+
+osf3* | osf4* | osf5*)
+ version_type=osf
+ need_lib_prefix=no
+ need_version=no
+ soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ shlibpath_var=LD_LIBRARY_PATH
+ sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+ ;;
+
+rdos*)
+ dynamic_linker=no
+ ;;
+
+solaris*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+ # ldd complains unless libraries are executable
+ postinstall_cmds='chmod +x $lib'
+ ;;
+
+sunos4*)
+ version_type=sunos
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+ finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+ if test "$with_gnu_ld" = yes; then
+ need_lib_prefix=no
+ fi
+ need_version=yes
+ ;;
+
+sysv4 | sysv4.3*)
+ version_type=linux
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ case $host_vendor in
+ sni)
+ shlibpath_overrides_runpath=no
+ need_lib_prefix=no
+ runpath_var=LD_RUN_PATH
+ ;;
+ siemens)
+ need_lib_prefix=no
+ ;;
+ motorola)
+ need_lib_prefix=no
+ need_version=no
+ shlibpath_overrides_runpath=no
+ sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
+ ;;
+ esac
+ ;;
+
+sysv4*MP*)
+ if test -d /usr/nec ;then
+ version_type=linux
+ library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
+ soname_spec='$libname${shared_ext}.$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ fi
+ ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+ version_type=freebsd-elf
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+ if test "$with_gnu_ld" = yes; then
+ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+ else
+ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+ case $host_os in
+ sco3.2v5*)
+ sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
+ ;;
+ esac
+ fi
+ sys_lib_dlsearch_path_spec='/usr/lib'
+ ;;
+
+tpf*)
+ # TPF is a cross-target only. Preferred cross-host = GNU/Linux.
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ ;;
+
+uts4*)
+ version_type=linux
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ ;;
+
+*)
+ dynamic_linker=no
+ ;;
+esac
+AC_MSG_RESULT([$dynamic_linker])
+test "$dynamic_linker" = no && can_build_shared=no
+
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test "$GCC" = yes; then
+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+fi
+
+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
+ sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+fi
+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
+ sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+fi
+
+_LT_DECL([], [variables_saved_for_relink], [1],
+ [Variables whose values should be saved in libtool wrapper scripts and
+ restored at link time])
+_LT_DECL([], [need_lib_prefix], [0],
+ [Do we need the "lib" prefix for modules?])
+_LT_DECL([], [need_version], [0], [Do we need a version for libraries?])
+_LT_DECL([], [version_type], [0], [Library versioning type])
+_LT_DECL([], [runpath_var], [0], [Shared library runtime path variable])
+_LT_DECL([], [shlibpath_var], [0],[Shared library path variable])
+_LT_DECL([], [shlibpath_overrides_runpath], [0],
+ [Is shlibpath searched before the hard-coded library search path?])
+_LT_DECL([], [libname_spec], [1], [Format of library name prefix])
+_LT_DECL([], [library_names_spec], [1],
+ [[List of archive names. First name is the real one, the rest are links.
+ The last name is the one that the linker finds with -lNAME]])
+_LT_DECL([], [soname_spec], [1],
+ [[The coded name of the library, if different from the real name]])
+_LT_DECL([], [postinstall_cmds], [2],
+ [Command to use after installation of a shared archive])
+_LT_DECL([], [postuninstall_cmds], [2],
+ [Command to use after uninstallation of a shared archive])
+_LT_DECL([], [finish_cmds], [2],
+ [Commands used to finish a libtool library installation in a directory])
+_LT_DECL([], [finish_eval], [1],
+ [[As "finish_cmds", except a single script fragment to be evaled but
+ not shown]])
+_LT_DECL([], [hardcode_into_libs], [0],
+ [Whether we should hardcode library paths into libraries])
+_LT_DECL([], [sys_lib_search_path_spec], [2],
+ [Compile-time system search path for libraries])
+_LT_DECL([], [sys_lib_dlsearch_path_spec], [2],
+ [Run-time system search path for libraries])
+])# _LT_SYS_DYNAMIC_LINKER
+
+
+# _LT_PATH_TOOL_PREFIX(TOOL)
+# --------------------------
+# find a file program which can recognize shared library
+AC_DEFUN([_LT_PATH_TOOL_PREFIX],
+[m4_require([_LT_DECL_EGREP])dnl
+AC_MSG_CHECKING([for $1])
+AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
+[case $MAGIC_CMD in
+[[\\/*] | ?:[\\/]*])
+ lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
+ ;;
+*)
+ lt_save_MAGIC_CMD="$MAGIC_CMD"
+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+dnl $ac_dummy forces splitting on constant user-supplied paths.
+dnl POSIX.2 word splitting is done only on the output of word expansions,
+dnl not every word. This closes a longstanding sh security hole.
+ ac_dummy="m4_if([$2], , $PATH, [$2])"
+ for ac_dir in $ac_dummy; do
+ IFS="$lt_save_ifs"
+ test -z "$ac_dir" && ac_dir=.
+ if test -f $ac_dir/$1; then
+ lt_cv_path_MAGIC_CMD="$ac_dir/$1"
+ if test -n "$file_magic_test_file"; then
+ case $deplibs_check_method in
+ "file_magic "*)
+ file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
+ MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+ if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+ $EGREP "$file_magic_regex" > /dev/null; then
+ :
+ else
+ cat <<_LT_EOF 1>&2
+
+*** Warning: the command libtool uses to detect shared libraries,
+*** $file_magic_cmd, produces output that libtool cannot recognize.
+*** The result is that libtool may fail to recognize shared libraries
+*** as such. This will affect the creation of libtool libraries that
+*** depend on shared libraries, but programs linked with such libtool
+*** libraries will work regardless of this problem. Nevertheless, you
+*** may want to report the problem to your system manager and/or to
+*** bug-libtool at gnu.org
+
+_LT_EOF
+ fi ;;
+ esac
+ fi
+ break
+ fi
+ done
+ IFS="$lt_save_ifs"
+ MAGIC_CMD="$lt_save_MAGIC_CMD"
+ ;;
+esac])
+MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+if test -n "$MAGIC_CMD"; then
+ AC_MSG_RESULT($MAGIC_CMD)
+else
+ AC_MSG_RESULT(no)
+fi
+_LT_DECL([], [MAGIC_CMD], [0],
+ [Used to examine libraries when file_magic_cmd begins with "file"])dnl
+])# _LT_PATH_TOOL_PREFIX
+
+# Old name:
+AU_ALIAS([AC_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], [])
+
+
+# _LT_PATH_MAGIC
+# --------------
+# find a file program which can recognize a shared library
+m4_defun([_LT_PATH_MAGIC],
+[_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
+if test -z "$lt_cv_path_MAGIC_CMD"; then
+ if test -n "$ac_tool_prefix"; then
+ _LT_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
+ else
+ MAGIC_CMD=:
+ fi
+fi
+])# _LT_PATH_MAGIC
+
+
+# LT_PATH_LD
+# ----------
+# find the pathname to the GNU or non-GNU linker
+AC_DEFUN([LT_PATH_LD],
+[AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_DECL_EGREP])dnl
+
+AC_ARG_WITH([gnu-ld],
+ [AS_HELP_STRING([--with-gnu-ld],
+ [assume the C compiler uses GNU ld @<:@default=no@:>@])],
+ [test "$withval" = no || with_gnu_ld=yes],
+ [with_gnu_ld=no])dnl
+
+ac_prog=ld
+if test "$GCC" = yes; then
+ # Check if gcc -print-prog-name=ld gives a path.
+ AC_MSG_CHECKING([for ld used by $CC])
+ case $host in
+ *-*-mingw*)
+ # gcc leaves a trailing carriage return which upsets mingw
+ ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+ *)
+ ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+ esac
+ case $ac_prog in
+ # Accept absolute paths.
+ [[\\/]]* | ?:[[\\/]]*)
+ re_direlt='/[[^/]][[^/]]*/\.\./'
+ # Canonicalize the pathname of ld
+ ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
+ while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
+ ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
+ done
+ test -z "$LD" && LD="$ac_prog"
+ ;;
+ "")
+ # If it fails, then pretend we aren't using GCC.
+ ac_prog=ld
+ ;;
+ *)
+ # If it is relative, then search for the first ld in PATH.
+ with_gnu_ld=unknown
+ ;;
+ esac
+elif test "$with_gnu_ld" = yes; then
+ AC_MSG_CHECKING([for GNU ld])
+else
+ AC_MSG_CHECKING([for non-GNU ld])
+fi
+AC_CACHE_VAL(lt_cv_path_LD,
+[if test -z "$LD"; then
+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+ for ac_dir in $PATH; do
+ IFS="$lt_save_ifs"
+ test -z "$ac_dir" && ac_dir=.
+ if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+ lt_cv_path_LD="$ac_dir/$ac_prog"
+ # Check to see if the program is GNU ld. I'd rather use --version,
+ # but apparently some variants of GNU ld only accept -v.
+ # Break only if it was the GNU/non-GNU ld that we prefer.
+ case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
+ *GNU* | *'with BFD'*)
+ test "$with_gnu_ld" != no && break
+ ;;
+ *)
+ test "$with_gnu_ld" != yes && break
+ ;;
+ esac
+ fi
+ done
+ IFS="$lt_save_ifs"
+else
+ lt_cv_path_LD="$LD" # Let the user override the test with a path.
+fi])
+LD="$lt_cv_path_LD"
+if test -n "$LD"; then
+ AC_MSG_RESULT($LD)
+else
+ AC_MSG_RESULT(no)
+fi
+test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
+_LT_PATH_LD_GNU
+AC_SUBST([LD])
+
+_LT_TAGDECL([], [LD], [1], [The linker used to build libraries])
+])# LT_PATH_LD
+
+# Old names:
+AU_ALIAS([AM_PROG_LD], [LT_PATH_LD])
+AU_ALIAS([AC_PROG_LD], [LT_PATH_LD])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AM_PROG_LD], [])
+dnl AC_DEFUN([AC_PROG_LD], [])
+
+
+# _LT_PATH_LD_GNU
+#- --------------
+m4_defun([_LT_PATH_LD_GNU],
+[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
+[# I'd rather use --version here, but apparently some GNU lds only accept -v.
+case `$LD -v 2>&1 </dev/null` in
+*GNU* | *'with BFD'*)
+ lt_cv_prog_gnu_ld=yes
+ ;;
+*)
+ lt_cv_prog_gnu_ld=no
+ ;;
+esac])
+with_gnu_ld=$lt_cv_prog_gnu_ld
+])# _LT_PATH_LD_GNU
+
+
+# _LT_CMD_RELOAD
+# --------------
+# find reload flag for linker
+# -- PORTME Some linkers may need a different reload flag.
+m4_defun([_LT_CMD_RELOAD],
+[AC_CACHE_CHECK([for $LD option to reload object files],
+ lt_cv_ld_reload_flag,
+ [lt_cv_ld_reload_flag='-r'])
+reload_flag=$lt_cv_ld_reload_flag
+case $reload_flag in
+"" | " "*) ;;
+*) reload_flag=" $reload_flag" ;;
+esac
+reload_cmds='$LD$reload_flag -o $output$reload_objs'
+case $host_os in
+ darwin*)
+ if test "$GCC" = yes; then
+ reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
+ else
+ reload_cmds='$LD$reload_flag -o $output$reload_objs'
+ fi
+ ;;
+esac
+_LT_DECL([], [reload_flag], [1], [How to create reloadable object files])dnl
+_LT_DECL([], [reload_cmds], [2])dnl
+])# _LT_CMD_RELOAD
+
+
+# _LT_CHECK_MAGIC_METHOD
+# ----------------------
+# how to check for library dependencies
+# -- PORTME fill in with the dynamic library characteristics
+m4_defun([_LT_CHECK_MAGIC_METHOD],
+[m4_require([_LT_DECL_EGREP])
+m4_require([_LT_DECL_OBJDUMP])
+AC_CACHE_CHECK([how to recognize dependent libraries],
+lt_cv_deplibs_check_method,
+[lt_cv_file_magic_cmd='$MAGIC_CMD'
+lt_cv_file_magic_test_file=
+lt_cv_deplibs_check_method='unknown'
+# Need to set the preceding variable on all platforms that support
+# interlibrary dependencies.
+# 'none' -- dependencies not supported.
+# `unknown' -- same as none, but documents that we really don't know.
+# 'pass_all' -- all dependencies passed with no checks.
+# 'test_compile' -- check by making test program.
+# 'file_magic [[regex]]' -- check by looking for files in library path
+# which responds to the $file_magic_cmd with a given extended regex.
+# If you have `file' or equivalent on your system and you're not sure
+# whether `pass_all' will *always* work, you probably want this one.
+
+case $host_os in
+aix[[4-9]]*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+beos*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+bsdi[[45]]*)
+ lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
+ lt_cv_file_magic_cmd='/usr/bin/file -L'
+ lt_cv_file_magic_test_file=/shlib/libc.so
+ ;;
+
+cygwin*)
+ # func_win32_libid is a shell function defined in ltmain.sh
+ lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+ lt_cv_file_magic_cmd='func_win32_libid'
+ ;;
+
+mingw* | pw32*)
+ # Base MSYS/MinGW do not provide the 'file' command needed by
+ # func_win32_libid shell function, so use a weaker test based on 'objdump',
+ # unless we find 'file', for example because we are cross-compiling.
+ if ( file / ) >/dev/null 2>&1; then
+ lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+ lt_cv_file_magic_cmd='func_win32_libid'
+ else
+ lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+ lt_cv_file_magic_cmd='$OBJDUMP -f'
+ fi
+ ;;
+
+cegcc)
+ # use the weaker test based on 'objdump'. See mingw*.
+ lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
+ lt_cv_file_magic_cmd='$OBJDUMP -f'
+ ;;
+
+darwin* | rhapsody*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+freebsd* | dragonfly*)
+ if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+ case $host_cpu in
+ i*86 )
+ # Not sure whether the presence of OpenBSD here was a mistake.
+ # Let's accept both of them until this is cleared up.
+ lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
+ lt_cv_file_magic_cmd=/usr/bin/file
+ lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+ ;;
+ esac
+ else
+ lt_cv_deplibs_check_method=pass_all
+ fi
+ ;;
+
+gnu*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+hpux10.20* | hpux11*)
+ lt_cv_file_magic_cmd=/usr/bin/file
+ case $host_cpu in
+ ia64*)
+ lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
+ lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
+ ;;
+ hppa*64*)
+ [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]']
+ lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
+ ;;
+ *)
+ lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
+ lt_cv_file_magic_test_file=/usr/lib/libc.sl
+ ;;
+ esac
+ ;;
+
+interix[[3-9]]*)
+ # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
+ ;;
+
+irix5* | irix6* | nonstopux*)
+ case $LD in
+ *-32|*"-32 ") libmagic=32-bit;;
+ *-n32|*"-n32 ") libmagic=N32;;
+ *-64|*"-64 ") libmagic=64-bit;;
+ *) libmagic=never-match;;
+ esac
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+# This must be Linux ELF.
+linux* | k*bsd*-gnu)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+netbsd*)
+ if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+ else
+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
+ fi
+ ;;
+
+newos6*)
+ lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
+ lt_cv_file_magic_cmd=/usr/bin/file
+ lt_cv_file_magic_test_file=/usr/lib/libnls.so
+ ;;
+
+*nto* | *qnx*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+openbsd*)
+ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
+ else
+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+ fi
+ ;;
+
+osf3* | osf4* | osf5*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+rdos*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+solaris*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+sysv4 | sysv4.3*)
+ case $host_vendor in
+ motorola)
+ lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
+ lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
+ ;;
+ ncr)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+ sequent)
+ lt_cv_file_magic_cmd='/bin/file'
+ lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
+ ;;
+ sni)
+ lt_cv_file_magic_cmd='/bin/file'
+ lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
+ lt_cv_file_magic_test_file=/lib/libc.so
+ ;;
+ siemens)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+ pc)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+ esac
+ ;;
+
+tpf*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+esac
+])
+file_magic_cmd=$lt_cv_file_magic_cmd
+deplibs_check_method=$lt_cv_deplibs_check_method
+test -z "$deplibs_check_method" && deplibs_check_method=unknown
+
+_LT_DECL([], [deplibs_check_method], [1],
+ [Method to check whether dependent libraries are shared objects])
+_LT_DECL([], [file_magic_cmd], [1],
+ [Command to use when deplibs_check_method == "file_magic"])
+])# _LT_CHECK_MAGIC_METHOD
+
+
+# LT_PATH_NM
+# ----------
+# find the pathname to a BSD- or MS-compatible name lister
+AC_DEFUN([LT_PATH_NM],
+[AC_REQUIRE([AC_PROG_CC])dnl
+AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM,
+[if test -n "$NM"; then
+ # Let the user override the test.
+ lt_cv_path_NM="$NM"
+else
+ lt_nm_to_check="${ac_tool_prefix}nm"
+ if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
+ lt_nm_to_check="$lt_nm_to_check nm"
+ fi
+ for lt_tmp_nm in $lt_nm_to_check; do
+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+ for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
+ IFS="$lt_save_ifs"
+ test -z "$ac_dir" && ac_dir=.
+ tmp_nm="$ac_dir/$lt_tmp_nm"
+ if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
+ # Check to see if the nm accepts a BSD-compat flag.
+ # Adding the `sed 1q' prevents false positives on HP-UX, which says:
+ # nm: unknown option "B" ignored
+ # Tru64's nm complains that /dev/null is an invalid object file
+ case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
+ */dev/null* | *'Invalid file or object type'*)
+ lt_cv_path_NM="$tmp_nm -B"
+ break
+ ;;
+ *)
+ case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+ */dev/null*)
+ lt_cv_path_NM="$tmp_nm -p"
+ break
+ ;;
+ *)
+ lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+ continue # so that we can try to find one that supports BSD flags
+ ;;
+ esac
+ ;;
+ esac
+ fi
+ done
+ IFS="$lt_save_ifs"
+ done
+ : ${lt_cv_path_NM=no}
+fi])
+if test "$lt_cv_path_NM" != "no"; then
+ NM="$lt_cv_path_NM"
+else
+ # Didn't find any BSD compatible name lister, look for dumpbin.
+ AC_CHECK_TOOLS(DUMPBIN, ["dumpbin -symbols" "link -dump -symbols"], :)
+ AC_SUBST([DUMPBIN])
+ if test "$DUMPBIN" != ":"; then
+ NM="$DUMPBIN"
+ fi
+fi
+test -z "$NM" && NM=nm
+AC_SUBST([NM])
+_LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl
+
+AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface],
+ [lt_cv_nm_interface="BSD nm"
+ echo "int some_variable = 0;" > conftest.$ac_ext
+ (eval echo "\"\$as_me:__oline__: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
+ (eval "$ac_compile" 2>conftest.err)
+ cat conftest.err >&AS_MESSAGE_LOG_FD
+ (eval echo "\"\$as_me:__oline__: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
+ (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
+ cat conftest.err >&AS_MESSAGE_LOG_FD
+ (eval echo "\"\$as_me:__oline__: output\"" >&AS_MESSAGE_LOG_FD)
+ cat conftest.out >&AS_MESSAGE_LOG_FD
+ if $GREP 'External.*some_variable' conftest.out > /dev/null; then
+ lt_cv_nm_interface="MS dumpbin"
+ fi
+ rm -f conftest*])
+])# LT_PATH_NM
+
+# Old names:
+AU_ALIAS([AM_PROG_NM], [LT_PATH_NM])
+AU_ALIAS([AC_PROG_NM], [LT_PATH_NM])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AM_PROG_NM], [])
+dnl AC_DEFUN([AC_PROG_NM], [])
+
+
+# LT_LIB_M
+# --------
+# check for math library
+AC_DEFUN([LT_LIB_M],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+LIBM=
+case $host in
+*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
+ # These system don't have libm, or don't need it
+ ;;
+*-ncr-sysv4.3*)
+ AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
+ AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
+ ;;
+*)
+ AC_CHECK_LIB(m, cos, LIBM="-lm")
+ ;;
+esac
+AC_SUBST([LIBM])
+])# LT_LIB_M
+
+# Old name:
+AU_ALIAS([AC_CHECK_LIBM], [LT_LIB_M])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_CHECK_LIBM], [])
+
+
+# _LT_COMPILER_NO_RTTI([TAGNAME])
+# -------------------------------
+m4_defun([_LT_COMPILER_NO_RTTI],
+[m4_require([_LT_TAG_COMPILER])dnl
+
+_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
+
+if test "$GCC" = yes; then
+ _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
+
+ _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
+ lt_cv_prog_compiler_rtti_exceptions,
+ [-fno-rtti -fno-exceptions], [],
+ [_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
+fi
+_LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1],
+ [Compiler flag to turn off builtin functions])
+])# _LT_COMPILER_NO_RTTI
+
+
+# _LT_CMD_GLOBAL_SYMBOLS
+# ----------------------
+m4_defun([_LT_CMD_GLOBAL_SYMBOLS],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([LT_PATH_NM])dnl
+AC_REQUIRE([LT_PATH_LD])dnl
+m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_TAG_COMPILER])dnl
+
+# Check for command to grab the raw symbol name followed by C symbol from nm.
+AC_MSG_CHECKING([command to parse $NM output from $compiler object])
+AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe],
+[
+# These are sane defaults that work on at least a few old systems.
+# [They come from Ultrix. What could be older than Ultrix?!! ;)]
+
+# Character class describing NM global symbol codes.
+symcode='[[BCDEGRST]]'
+
+# Regexp to match symbols that can be accessed directly from C.
+sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
+
+# Define system-specific variables.
+case $host_os in
+aix*)
+ symcode='[[BCDT]]'
+ ;;
+cygwin* | mingw* | pw32* | cegcc*)
+ symcode='[[ABCDGISTW]]'
+ ;;
+hpux*)
+ if test "$host_cpu" = ia64; then
+ symcode='[[ABCDEGRST]]'
+ fi
+ ;;
+irix* | nonstopux*)
+ symcode='[[BCDEGRST]]'
+ ;;
+osf*)
+ symcode='[[BCDEGQRST]]'
+ ;;
+solaris*)
+ symcode='[[BDRT]]'
+ ;;
+sco3.2v5*)
+ symcode='[[DT]]'
+ ;;
+sysv4.2uw2*)
+ symcode='[[DT]]'
+ ;;
+sysv5* | sco5v6* | unixware* | OpenUNIX*)
+ symcode='[[ABDT]]'
+ ;;
+sysv4)
+ symcode='[[DFNSTU]]'
+ ;;
+esac
+
+# If we're using GNU nm, then use its standard symbol codes.
+case `$NM -V 2>&1` in
+*GNU* | *'with BFD'*)
+ symcode='[[ABCDGIRSTW]]' ;;
+esac
+
+# Transform an extracted symbol line into a proper C declaration.
+# Some systems (esp. on ia64) link data and code symbols differently,
+# so use this general approach.
+lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+
+# Transform an extracted symbol line into symbol name and symbol address
+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'"
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
+
+# Handle CRLF in mingw tool chain
+opt_cr=
+case $build_os in
+mingw*)
+ opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
+ ;;
+esac
+
+# Try without a prefix underscore, then with it.
+for ac_symprfx in "" "_"; do
+
+ # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
+ symxfrm="\\1 $ac_symprfx\\2 \\2"
+
+ # Write the raw and C identifiers.
+ if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+ # Fake it for dumpbin and say T for any non-static function
+ # and D for any global variable.
+ # Also find C++ and __fastcall symbols from MSVC++,
+ # which start with @ or ?.
+ lt_cv_sys_global_symbol_pipe="$AWK ['"\
+" {last_section=section; section=\$ 3};"\
+" /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
+" \$ 0!~/External *\|/{next};"\
+" / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
+" {if(hide[section]) next};"\
+" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
+" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
+" s[1]~/^[@?]/{print s[1], s[1]; next};"\
+" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
+" ' prfx=^$ac_symprfx]"
+ else
+ lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
+ fi
+
+ # Check to see that the pipe works correctly.
+ pipe_works=no
+
+ rm -f conftest*
+ cat > conftest.$ac_ext <<_LT_EOF
+#ifdef __cplusplus
+extern "C" {
+#endif
+char nm_test_var;
+void nm_test_func(void);
+void nm_test_func(void){}
+#ifdef __cplusplus
+}
+#endif
+int main(){nm_test_var='a';nm_test_func();return(0);}
+_LT_EOF
+
+ if AC_TRY_EVAL(ac_compile); then
+ # Now try to grab the symbols.
+ nlist=conftest.nm
+ if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
+ # Try sorting and uniquifying the output.
+ if sort "$nlist" | uniq > "$nlist"T; then
+ mv -f "$nlist"T "$nlist"
+ else
+ rm -f "$nlist"T
+ fi
+
+ # Make sure that we snagged all the symbols we need.
+ if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
+ if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
+ cat <<_LT_EOF > conftest.$ac_ext
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+_LT_EOF
+ # Now generate the symbol file.
+ eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
+
+ cat <<_LT_EOF >> conftest.$ac_ext
+
+/* The mapping between symbol names and symbols. */
+const struct {
+ const char *name;
+ void *address;
+}
+lt__PROGRAM__LTX_preloaded_symbols[[]] =
+{
+ { "@PROGRAM@", (void *) 0 },
+_LT_EOF
+ $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
+ cat <<\_LT_EOF >> conftest.$ac_ext
+ {0, (void *) 0}
+};
+
+/* This works around a problem in FreeBSD linker */
+#ifdef FREEBSD_WORKAROUND
+static const void *lt_preloaded_setup() {
+ return lt__PROGRAM__LTX_preloaded_symbols;
+}
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+_LT_EOF
+ # Now try linking the two files.
+ mv conftest.$ac_objext conftstm.$ac_objext
+ lt_save_LIBS="$LIBS"
+ lt_save_CFLAGS="$CFLAGS"
+ LIBS="conftstm.$ac_objext"
+ CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
+ if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
+ pipe_works=yes
+ fi
+ LIBS="$lt_save_LIBS"
+ CFLAGS="$lt_save_CFLAGS"
+ else
+ echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
+ fi
+ else
+ echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD
+ fi
+ else
+ echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
+ fi
+ else
+ echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
+ cat conftest.$ac_ext >&5
+ fi
+ rm -rf conftest* conftst*
+
+ # Do not use the global_symbol_pipe unless it works.
+ if test "$pipe_works" = yes; then
+ break
+ else
+ lt_cv_sys_global_symbol_pipe=
+ fi
+done
+])
+if test -z "$lt_cv_sys_global_symbol_pipe"; then
+ lt_cv_sys_global_symbol_to_cdecl=
+fi
+if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
+ AC_MSG_RESULT(failed)
+else
+ AC_MSG_RESULT(ok)
+fi
+
+_LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
+ [Take the output of nm and produce a listing of raw symbols and C names])
+_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
+ [Transform the output of nm in a proper C declaration])
+_LT_DECL([global_symbol_to_c_name_address],
+ [lt_cv_sys_global_symbol_to_c_name_address], [1],
+ [Transform the output of nm in a C name address pair])
+_LT_DECL([global_symbol_to_c_name_address_lib_prefix],
+ [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
+ [Transform the output of nm in a C name address pair when lib prefix is needed])
+]) # _LT_CMD_GLOBAL_SYMBOLS
+
+
+# _LT_COMPILER_PIC([TAGNAME])
+# ---------------------------
+m4_defun([_LT_COMPILER_PIC],
+[m4_require([_LT_TAG_COMPILER])dnl
+_LT_TAGVAR(lt_prog_compiler_wl, $1)=
+_LT_TAGVAR(lt_prog_compiler_pic, $1)=
+_LT_TAGVAR(lt_prog_compiler_static, $1)=
+
+AC_MSG_CHECKING([for $compiler option to produce PIC])
+m4_if([$1], [CXX], [
+ # C++ specific cases for pic, static, wl, etc.
+ if test "$GXX" = yes; then
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+
+ case $host_os in
+ aix*)
+ # All AIX code is PIC.
+ if test "$host_cpu" = ia64; then
+ # AIX 5 now supports IA64 processor
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ fi
+ ;;
+
+ amigaos*)
+ case $host_cpu in
+ powerpc)
+ # see comment about AmigaOS4 .so support
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+ ;;
+ m68k)
+ # FIXME: we need at least 68020 code to build shared libraries, but
+ # adding the `-m68020' flag to GCC prevents building anything better,
+ # like `-m68040'.
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+ ;;
+ esac
+ ;;
+
+ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+ # PIC is the default for these OSes.
+ ;;
+ mingw* | cygwin* | os2* | pw32* | cegcc*)
+ # This hack is so that the source file can tell whether it is being
+ # built for inclusion in a dll (and should export symbols for example).
+ # Although the cygwin gcc ignores -fPIC, still need this for old-style
+ # (--disable-auto-import) libraries
+ m4_if([$1], [GCJ], [],
+ [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+ ;;
+ darwin* | rhapsody*)
+ # PIC is the default on this platform
+ # Common symbols not allowed in MH_DYLIB files
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+ ;;
+ *djgpp*)
+ # DJGPP does not support shared libraries at all
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+ ;;
+ interix[[3-9]]*)
+ # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+ # Instead, we relocate shared libraries at runtime.
+ ;;
+ sysv4*MP*)
+ if test -d /usr/nec; then
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
+ fi
+ ;;
+ hpux*)
+ # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
+ # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag
+ # sets the default TLS model and affects inlining.
+ case $host_cpu in
+ hppa*64*)
+ ;;
+ *)
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+ ;;
+ esac
+ ;;
+ *qnx* | *nto*)
+ # QNX uses GNU C++, but need to define -shared option too, otherwise
+ # it will coredump.
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
+ ;;
+ *)
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+ ;;
+ esac
+ else
+ case $host_os in
+ aix[[4-9]]*)
+ # All AIX code is PIC.
+ if test "$host_cpu" = ia64; then
+ # AIX 5 now supports IA64 processor
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ else
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
+ fi
+ ;;
+ chorus*)
+ case $cc_basename in
+ cxch68*)
+ # Green Hills C++ Compiler
+ # _LT_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
+ ;;
+ esac
+ ;;
+ dgux*)
+ case $cc_basename in
+ ec++*)
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ ;;
+ ghcx*)
+ # Green Hills C++ Compiler
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+ ;;
+ *)
+ ;;
+ esac
+ ;;
+ freebsd* | dragonfly*)
+ # FreeBSD uses GNU C++
+ ;;
+ hpux9* | hpux10* | hpux11*)
+ case $cc_basename in
+ CC*)
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+ if test "$host_cpu" != ia64; then
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+ fi
+ ;;
+ aCC*)
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+ case $host_cpu in
+ hppa*64*|ia64*)
+ # +Z the default
+ ;;
+ *)
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+ ;;
+ esac
+ ;;
+ *)
+ ;;
+ esac
+ ;;
+ interix*)
+ # This is c89, which is MS Visual C++ (no shared libs)
+ # Anyone wants to do a port?
+ ;;
+ irix5* | irix6* | nonstopux*)
+ case $cc_basename in
+ CC*)
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+ # CC pic flag -KPIC is the default.
+ ;;
+ *)
+ ;;
+ esac
+ ;;
+ linux* | k*bsd*-gnu)
+ case $cc_basename in
+ KCC*)
+ # KAI C++ Compiler
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+ ;;
+ ecpc* )
+ # old Intel C++ for x86_64 which still supported -KPIC.
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+ ;;
+ icpc* )
+ # Intel C++, used to be incompatible with GCC.
+ # ICC 10 doesn't accept -KPIC any more.
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+ ;;
+ pgCC* | pgcpp*)
+ # Portland Group C++ compiler
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ ;;
+ cxx*)
+ # Compaq C++
+ # Make sure the PIC flag is empty. It appears that all Alpha
+ # Linux and Compaq Tru64 Unix objects are PIC.
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+ ;;
+ xlc* | xlC*)
+ # IBM XL 8.0 on PPC
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
+ ;;
+ *)
+ case `$CC -V 2>&1 | sed 5q` in
+ *Sun\ C*)
+ # Sun C++ 5.9
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+ ;;
+ esac
+ ;;
+ esac
+ ;;
+ lynxos*)
+ ;;
+ m88k*)
+ ;;
+ mvs*)
+ case $cc_basename in
+ cxx*)
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
+ ;;
+ *)
+ ;;
+ esac
+ ;;
+ netbsd*)
+ ;;
+ *qnx* | *nto*)
+ # QNX uses GNU C++, but need to define -shared option too, otherwise
+ # it will coredump.
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
+ ;;
+ osf3* | osf4* | osf5*)
+ case $cc_basename in
+ KCC*)
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+ ;;
+ RCC*)
+ # Rational C++ 2.4.1
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+ ;;
+ cxx*)
+ # Digital/Compaq C++
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ # Make sure the PIC flag is empty. It appears that all Alpha
+ # Linux and Compaq Tru64 Unix objects are PIC.
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+ ;;
+ *)
+ ;;
+ esac
+ ;;
+ psos*)
+ ;;
+ solaris*)
+ case $cc_basename in
+ CC*)
+ # Sun C++ 4.2, 5.x and Centerline C++
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+ ;;
+ gcx*)
+ # Green Hills C++ Compiler
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+ ;;
+ *)
+ ;;
+ esac
+ ;;
+ sunos4*)
+ case $cc_basename in
+ CC*)
+ # Sun C++ 4.x
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ ;;
+ lcc*)
+ # Lucid
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+ ;;
+ *)
+ ;;
+ esac
+ ;;
+ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+ case $cc_basename in
+ CC*)
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ ;;
+ esac
+ ;;
+ tandem*)
+ case $cc_basename in
+ NCC*)
+ # NonStop-UX NCC 3.20
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ ;;
+ *)
+ ;;
+ esac
+ ;;
+ vxworks*)
+ ;;
+ *)
+ _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+ ;;
+ esac
+ fi
+],
+[
+ if test "$GCC" = yes; then
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+
+ case $host_os in
+ aix*)
+ # All AIX code is PIC.
+ if test "$host_cpu" = ia64; then
+ # AIX 5 now supports IA64 processor
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ fi
+ ;;
+
+ amigaos*)
+ case $host_cpu in
+ powerpc)
+ # see comment about AmigaOS4 .so support
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+ ;;
+ m68k)
+ # FIXME: we need at least 68020 code to build shared libraries, but
+ # adding the `-m68020' flag to GCC prevents building anything better,
+ # like `-m68040'.
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+ ;;
+ esac
+ ;;
+
+ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+ # PIC is the default for these OSes.
+ ;;
+
+ mingw* | cygwin* | pw32* | os2* | cegcc*)
+ # This hack is so that the source file can tell whether it is being
+ # built for inclusion in a dll (and should export symbols for example).
+ # Although the cygwin gcc ignores -fPIC, still need this for old-style
+ # (--disable-auto-import) libraries
+ m4_if([$1], [GCJ], [],
+ [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+ ;;
+
+ darwin* | rhapsody*)
+ # PIC is the default on this platform
+ # Common symbols not allowed in MH_DYLIB files
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+ ;;
+
+ hpux*)
+ # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
+ # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag
+ # sets the default TLS model and affects inlining.
+ case $host_cpu in
+ hppa*64*)
+ # +Z the default
+ ;;
+ *)
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+ ;;
+ esac
+ ;;
+
+ interix[[3-9]]*)
+ # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+ # Instead, we relocate shared libraries at runtime.
+ ;;
+
+ msdosdjgpp*)
+ # Just because we use GCC doesn't mean we suddenly get shared libraries
+ # on systems that don't support them.
+ _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+ enable_shared=no
+ ;;
+
+ *nto* | *qnx*)
+ # QNX uses GNU C++, but need to define -shared option too, otherwise
+ # it will coredump.
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
+ ;;
+
+ sysv4*MP*)
+ if test -d /usr/nec; then
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
+ fi
+ ;;
+
+ *)
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+ ;;
+ esac
+ else
+ # PORTME Check for flag to pass linker flags through the system compiler.
+ case $host_os in
+ aix*)
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ if test "$host_cpu" = ia64; then
+ # AIX 5 now supports IA64 processor
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ else
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
+ fi
+ ;;
+
+ mingw* | cygwin* | pw32* | os2* | cegcc*)
+ # This hack is so that the source file can tell whether it is being
+ # built for inclusion in a dll (and should export symbols for example).
+ m4_if([$1], [GCJ], [],
+ [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+ ;;
+
+ hpux9* | hpux10* | hpux11*)
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+ # not for PA HP-UX.
+ case $host_cpu in
+ hppa*64*|ia64*)
+ # +Z the default
+ ;;
+ *)
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+ ;;
+ esac
+ # Is there a better lt_prog_compiler_static that works with the bundled CC?
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+ ;;
+
+ irix5* | irix6* | nonstopux*)
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ # PIC (with -KPIC) is the default.
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+ ;;
+
+ linux* | k*bsd*-gnu)
+ case $cc_basename in
+ # old Intel for x86_64 which still supported -KPIC.
+ ecc*)
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+ ;;
+ # icc used to be incompatible with GCC.
+ # ICC 10 doesn't accept -KPIC any more.
+ icc* | ifort*)
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+ ;;
+ # Lahey Fortran 8.1.
+ lf95*)
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
+ ;;
+ pgcc* | pgf77* | pgf90* | pgf95*)
+ # Portland Group compilers (*not* the Pentium gcc compiler,
+ # which looks to be a dead project)
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ ;;
+ ccc*)
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ # All Alpha code is PIC.
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+ ;;
+ xl*)
+ # IBM XL C 8.0/Fortran 10.1 on PPC
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
+ ;;
+ *)
+ case `$CC -V 2>&1 | sed 5q` in
+ *Sun\ C*)
+ # Sun C 5.9
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ ;;
+ *Sun\ F*)
+ # Sun Fortran 8.3 passes all unrecognized flags to the linker
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
+ ;;
+ esac
+ ;;
+ esac
+ ;;
+
+ newsos6)
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ ;;
+
+ *nto* | *qnx*)
+ # QNX uses GNU C++, but need to define -shared option too, otherwise
+ # it will coredump.
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
+ ;;
+
+ osf3* | osf4* | osf5*)
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ # All OSF/1 code is PIC.
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+ ;;
+
+ rdos*)
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+ ;;
+
+ solaris*)
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ case $cc_basename in
+ f77* | f90* | f95*)
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
+ *)
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
+ esac
+ ;;
+
+ sunos4*)
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ ;;
+
+ sysv4 | sysv4.2uw2* | sysv4.3*)
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ ;;
+
+ sysv4*MP*)
+ if test -d /usr/nec ;then
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ fi
+ ;;
+
+ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ ;;
+
+ unicos*)
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+ ;;
+
+ uts4*)
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ ;;
+
+ *)
+ _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+ ;;
+ esac
+ fi
+])
+case $host_os in
+ # For platforms which do not support PIC, -DPIC is meaningless:
+ *djgpp*)
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+ ;;
+ *)
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t at m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])"
+ ;;
+esac
+AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
+_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
+ [How to pass a linker flag through the compiler])
+
+#
+# Check to make sure the PIC flag actually works.
+#
+if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
+ _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, $1) works],
+ [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, $1)],
+ [$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t at m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])], [],
+ [case $_LT_TAGVAR(lt_prog_compiler_pic, $1) in
+ "" | " "*) ;;
+ *) _LT_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_TAGVAR(lt_prog_compiler_pic, $1)" ;;
+ esac],
+ [_LT_TAGVAR(lt_prog_compiler_pic, $1)=
+ _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
+fi
+_LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],
+ [Additional compiler flags for building library objects])
+
+#
+# Check to make sure the static flag actually works.
+#
+wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_TAGVAR(lt_prog_compiler_static, $1)\"
+_LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
+ _LT_TAGVAR(lt_cv_prog_compiler_static_works, $1),
+ $lt_tmp_static_flag,
+ [],
+ [_LT_TAGVAR(lt_prog_compiler_static, $1)=])
+_LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1],
+ [Compiler flag to prevent dynamic linking])
+])# _LT_COMPILER_PIC
+
+
+# _LT_LINKER_SHLIBS([TAGNAME])
+# ----------------------------
+# See if the linker supports building shared libraries.
+m4_defun([_LT_LINKER_SHLIBS],
+[AC_REQUIRE([LT_PATH_LD])dnl
+AC_REQUIRE([LT_PATH_NM])dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
+m4_require([_LT_TAG_COMPILER])dnl
+AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+m4_if([$1], [CXX], [
+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+ case $host_os in
+ aix[[4-9]]*)
+ # If we're using GNU nm, then we don't want the "-C" option.
+ # -C means demangle to AIX nm, but means don't demangle with GNU nm
+ if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ else
+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ fi
+ ;;
+ pw32*)
+ _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
+ ;;
+ cygwin* | mingw* | cegcc*)
+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
+ ;;
+ *)
+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+ ;;
+ esac
+ _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
+], [
+ runpath_var=
+ _LT_TAGVAR(allow_undefined_flag, $1)=
+ _LT_TAGVAR(always_export_symbols, $1)=no
+ _LT_TAGVAR(archive_cmds, $1)=
+ _LT_TAGVAR(archive_expsym_cmds, $1)=
+ _LT_TAGVAR(compiler_needs_object, $1)=no
+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)=
+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+ _LT_TAGVAR(hardcode_automatic, $1)=no
+ _LT_TAGVAR(hardcode_direct, $1)=no
+ _LT_TAGVAR(hardcode_direct_absolute, $1)=no
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+ _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
+ _LT_TAGVAR(hardcode_libdir_separator, $1)=
+ _LT_TAGVAR(hardcode_minus_L, $1)=no
+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+ _LT_TAGVAR(inherit_rpath, $1)=no
+ _LT_TAGVAR(link_all_deplibs, $1)=unknown
+ _LT_TAGVAR(module_cmds, $1)=
+ _LT_TAGVAR(module_expsym_cmds, $1)=
+ _LT_TAGVAR(old_archive_from_new_cmds, $1)=
+ _LT_TAGVAR(old_archive_from_expsyms_cmds, $1)=
+ _LT_TAGVAR(thread_safe_flag_spec, $1)=
+ _LT_TAGVAR(whole_archive_flag_spec, $1)=
+ # include_expsyms should be a list of space-separated symbols to be *always*
+ # included in the symbol list
+ _LT_TAGVAR(include_expsyms, $1)=
+ # exclude_expsyms can be an extended regexp of symbols to exclude
+ # it will be wrapped by ` (' and `)$', so one must not match beginning or
+ # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
+ # as well as any symbol that contains `d'.
+ _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
+ # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+ # platforms (ab)use it in PIC code, but their linkers get confused if
+ # the symbol is explicitly referenced. Since portable code cannot
+ # rely on this symbol name, it's probably fine to never include it in
+ # preloaded symbol tables.
+ # Exclude shared library initialization/finalization symbols.
+dnl Note also adjust exclude_expsyms for C++ above.
+ extract_expsyms_cmds=
+
+ case $host_os in
+ cygwin* | mingw* | pw32* | cegcc*)
+ # FIXME: the MSVC++ port hasn't been tested in a loooong time
+ # When not using gcc, we currently assume that we are using
+ # Microsoft Visual C++.
+ if test "$GCC" != yes; then
+ with_gnu_ld=no
+ fi
+ ;;
+ interix*)
+ # we just hope/assume this is gcc and not c89 (= MSVC++)
+ with_gnu_ld=yes
+ ;;
+ openbsd*)
+ with_gnu_ld=no
+ ;;
+ esac
+
+ _LT_TAGVAR(ld_shlibs, $1)=yes
+ if test "$with_gnu_ld" = yes; then
+ # If archive_cmds runs LD, not CC, wlarc should be empty
+ wlarc='${wl}'
+
+ # Set some defaults for GNU ld with shared library support. These
+ # are reset later if shared libraries are not supported. Putting them
+ # here allows them to be overridden if necessary.
+ runpath_var=LD_RUN_PATH
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+ # ancient GNU ld didn't support --whole-archive et. al.
+ if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
+ _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+ else
+ _LT_TAGVAR(whole_archive_flag_spec, $1)=
+ fi
+ supports_anon_versioning=no
+ case `$LD -v 2>&1` in
+ *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
+ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+ *\ 2.11.*) ;; # other 2.11 versions
+ *) supports_anon_versioning=yes ;;
+ esac
+
+ # See if GNU ld supports shared libraries.
+ case $host_os in
+ aix[[3-9]]*)
+ # On AIX/PPC, the GNU linker is very broken
+ if test "$host_cpu" != ia64; then
+ _LT_TAGVAR(ld_shlibs, $1)=no
+ cat <<_LT_EOF 1>&2
+
+*** Warning: the GNU linker, at least up to release 2.9.1, is reported
+*** to be unable to reliably create shared libraries on AIX.
+*** Therefore, libtool is disabling shared libraries support. If you
+*** really care for shared libraries, you may want to modify your PATH
+*** so that a non-GNU linker is found, and then restart.
+
+_LT_EOF
+ fi
+ ;;
+
+ amigaos*)
+ case $host_cpu in
+ powerpc)
+ # see comment about AmigaOS4 .so support
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)=''
+ ;;
+ m68k)
+ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+ _LT_TAGVAR(hardcode_minus_L, $1)=yes
+ ;;
+ esac
+ ;;
+
+ beos*)
+ if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+ # Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
+ # support --undefined. This deserves some investigation. FIXME
+ _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ else
+ _LT_TAGVAR(ld_shlibs, $1)=no
+ fi
+ ;;
+
+ cygwin* | mingw* | pw32* | cegcc*)
+ # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+ # as there is no search path for DLLs.
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+ _LT_TAGVAR(always_export_symbols, $1)=no
+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
+
+ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+ # If the export-symbols file already is a .def file (1st line
+ # is EXPORTS), use it as is; otherwise, prepend...
+ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+ cp $export_symbols $output_objdir/$soname.def;
+ else
+ echo EXPORTS > $output_objdir/$soname.def;
+ cat $export_symbols >> $output_objdir/$soname.def;
+ fi~
+ $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+ else
+ _LT_TAGVAR(ld_shlibs, $1)=no
+ fi
+ ;;
+
+ interix[[3-9]]*)
+ _LT_TAGVAR(hardcode_direct, $1)=no
+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+ # Instead, shared libraries are loaded at an image base (0x10000000 by
+ # default) and relocated if they conflict, which is a slow very memory
+ # consuming and fragmenting process. To avoid this, we pick a random,
+ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+ # time. Moving up from 0x10000000 also allows more sbrk(2) space.
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ ;;
+
+ gnu* | linux* | tpf* | k*bsd*-gnu)
+ tmp_diet=no
+ if test "$host_os" = linux-dietlibc; then
+ case $cc_basename in
+ diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn)
+ esac
+ fi
+ if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
+ && test "$tmp_diet" = no
+ then
+ tmp_addflag=
+ tmp_sharedflag='-shared'
+ case $cc_basename,$host_cpu in
+ pgcc*) # Portland Group C compiler
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+ tmp_addflag=' $pic_flag'
+ ;;
+ pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+ tmp_addflag=' $pic_flag -Mnomain' ;;
+ ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
+ tmp_addflag=' -i_dynamic' ;;
+ efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64
+ tmp_addflag=' -i_dynamic -nofor_main' ;;
+ ifc* | ifort*) # Intel Fortran compiler
+ tmp_addflag=' -nofor_main' ;;
+ lf95*) # Lahey Fortran 8.1
+ _LT_TAGVAR(whole_archive_flag_spec, $1)=
+ tmp_sharedflag='--shared' ;;
+ xl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below)
+ tmp_sharedflag='-qmkshrobj'
+ tmp_addflag= ;;
+ esac
+ case `$CC -V 2>&1 | sed 5q` in
+ *Sun\ C*) # Sun C 5.9
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+ _LT_TAGVAR(compiler_needs_object, $1)=yes
+ tmp_sharedflag='-G' ;;
+ *Sun\ F*) # Sun Fortran 8.3
+ tmp_sharedflag='-G' ;;
+ esac
+ _LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+
+ if test "x$supports_anon_versioning" = xyes; then
+ _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
+ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+ echo "local: *; };" >> $output_objdir/$libname.ver~
+ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ fi
+
+ case $cc_basename in
+ xlf*)
+ # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+ _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
+ _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
+ if test "x$supports_anon_versioning" = xyes; then
+ _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
+ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+ echo "local: *; };" >> $output_objdir/$libname.ver~
+ $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+ fi
+ ;;
+ esac
+ else
+ _LT_TAGVAR(ld_shlibs, $1)=no
+ fi
+ ;;
+
+ netbsd*)
+ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+ _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+ wlarc=
+ else
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ fi
+ ;;
+
+ solaris*)
+ if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
+ _LT_TAGVAR(ld_shlibs, $1)=no
+ cat <<_LT_EOF 1>&2
+
+*** Warning: The releases 2.8.* of the GNU linker cannot reliably
+*** create shared libraries on Solaris systems. Therefore, libtool
+*** is disabling shared libraries support. We urge you to upgrade GNU
+*** binutils to release 2.9.1 or newer. Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+ elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ else
+ _LT_TAGVAR(ld_shlibs, $1)=no
+ fi
+ ;;
+
+ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+ case `$LD -v 2>&1` in
+ *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
+ _LT_TAGVAR(ld_shlibs, $1)=no
+ cat <<_LT_EOF 1>&2
+
+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
+*** reliably create shared libraries on SCO systems. Therefore, libtool
+*** is disabling shared libraries support. We urge you to upgrade GNU
+*** binutils to release 2.16.91.0.3 or newer. Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+ ;;
+ *)
+ # For security reasons, it is highly recommended that you always
+ # use absolute paths for naming shared libraries, and exclude the
+ # DT_RUNPATH tag from executables and libraries. But doing so
+ # requires that you compile everything twice, which is a pain.
+ if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ else
+ _LT_TAGVAR(ld_shlibs, $1)=no
+ fi
+ ;;
+ esac
+ ;;
+
+ sunos4*)
+ _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+ wlarc=
+ _LT_TAGVAR(hardcode_direct, $1)=yes
+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+ ;;
+
+ *)
+ if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ else
+ _LT_TAGVAR(ld_shlibs, $1)=no
+ fi
+ ;;
+ esac
+
+ if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then
+ runpath_var=
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)=
+ _LT_TAGVAR(whole_archive_flag_spec, $1)=
+ fi
+ else
+ # PORTME fill in a description of your system's linker (not GNU ld)
+ case $host_os in
+ aix3*)
+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+ _LT_TAGVAR(always_export_symbols, $1)=yes
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
+ # Note: this linker hardcodes the directories in LIBPATH if there
+ # are no directories specified by -L.
+ _LT_TAGVAR(hardcode_minus_L, $1)=yes
+ if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
+ # Neither direct hardcoding nor static linking is supported with a
+ # broken collect2.
+ _LT_TAGVAR(hardcode_direct, $1)=unsupported
+ fi
+ ;;
+
+ aix[[4-9]]*)
+ if test "$host_cpu" = ia64; then
+ # On IA64, the linker does run time linking by default, so we don't
+ # have to do anything special.
+ aix_use_runtimelinking=no
+ exp_sym_flag='-Bexport'
+ no_entry_flag=""
+ else
+ # If we're using GNU nm, then we don't want the "-C" option.
+ # -C means demangle to AIX nm, but means don't demangle with GNU nm
+ if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ else
+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ fi
+ aix_use_runtimelinking=no
+
+ # Test if we are trying to use run time linking or normal
+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+ # need to do runtime linking.
+ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
+ for ld_flag in $LDFLAGS; do
+ if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+ aix_use_runtimelinking=yes
+ break
+ fi
+ done
+ ;;
+ esac
+
+ exp_sym_flag='-bexport'
+ no_entry_flag='-bnoentry'
+ fi
+
+ # When large executables or shared objects are built, AIX ld can
+ # have problems creating the table of contents. If linking a library
+ # or program results in "error TOC overflow" add -mminimal-toc to
+ # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not
+ # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+ _LT_TAGVAR(archive_cmds, $1)=''
+ _LT_TAGVAR(hardcode_direct, $1)=yes
+ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+ _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+ _LT_TAGVAR(link_all_deplibs, $1)=yes
+ _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
+
+ if test "$GCC" = yes; then
+ case $host_os in aix4.[[012]]|aix4.[[012]].*)
+ # We only want to do this on AIX 4.2 and lower, the check
+ # below for broken collect2 doesn't work under 4.3+
+ collect2name=`${CC} -print-prog-name=collect2`
+ if test -f "$collect2name" &&
+ strings "$collect2name" | $GREP resolve_lib_name >/dev/null
+ then
+ # We have reworked collect2
+ :
+ else
+ # We have old collect2
+ _LT_TAGVAR(hardcode_direct, $1)=unsupported
+ # It fails to find uninstalled libraries when the uninstalled
+ # path is not listed in the libpath. Setting hardcode_minus_L
+ # to unsupported forces relinking
+ _LT_TAGVAR(hardcode_minus_L, $1)=yes
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+ _LT_TAGVAR(hardcode_libdir_separator, $1)=
+ fi
+ ;;
+ esac
+ shared_flag='-shared'
+ if test "$aix_use_runtimelinking" = yes; then
+ shared_flag="$shared_flag "'${wl}-G'
+ fi
+ else
+ # not using gcc
+ if test "$host_cpu" = ia64; then
+ # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+ # chokes on -Wl,-G. The following line is correct:
+ shared_flag='-G'
+ else
+ if test "$aix_use_runtimelinking" = yes; then
+ shared_flag='${wl}-G'
+ else
+ shared_flag='${wl}-bM:SRE'
+ fi
+ fi
+ fi
+
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
+ # It seems that -bexpall does not export symbols beginning with
+ # underscore (_), so it is better to generate a list of symbols to export.
+ _LT_TAGVAR(always_export_symbols, $1)=yes
+ if test "$aix_use_runtimelinking" = yes; then
+ # Warning - without using the other runtime loading flags (-brtl),
+ # -berok will link without error, but may produce a broken library.
+ _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
+ # Determine the default libpath from the value encoded in an
+ # empty executable.
+ _LT_SYS_MODULE_PATH_AIX
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+ else
+ if test "$host_cpu" = ia64; then
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+ _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+ _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+ else
+ # Determine the default libpath from the value encoded in an
+ # empty executable.
+ _LT_SYS_MODULE_PATH_AIX
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+ # Warning - without using the other run time loading flags,
+ # -berok will link without error, but may produce a broken library.
+ _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
+ _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
+ # Exported symbols can be pulled into shared objects from archives
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+ _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+ # This is similar to how AIX traditionally builds its shared libraries.
+ _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+ fi
+ fi
+ ;;
+
+ amigaos*)
+ case $host_cpu in
+ powerpc)
+ # see comment about AmigaOS4 .so support
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)=''
+ ;;
+ m68k)
+ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+ _LT_TAGVAR(hardcode_minus_L, $1)=yes
+ ;;
+ esac
+ ;;
+
+ bsdi[[45]]*)
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
+ ;;
+
+ cygwin* | mingw* | pw32* | cegcc*)
+ # When not using gcc, we currently assume that we are using
+ # Microsoft Visual C++.
+ # hardcode_libdir_flag_spec is actually meaningless, as there is
+ # no search path for DLLs.
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+ # Tell ltmain to make .lib files, not .a files.
+ libext=lib
+ # Tell ltmain to make .dll files, not .so files.
+ shrext_cmds=".dll"
+ # FIXME: Setting linknames here is a bad hack.
+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames='
+ # The linker will automatically build a .lib file if we build a DLL.
+ _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
+ # FIXME: Should let the user specify the lib program.
+ _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
+ _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+ ;;
+
+ darwin* | rhapsody*)
+ _LT_DARWIN_LINKER_FEATURES($1)
+ ;;
+
+ dgux*)
+ _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+ ;;
+
+ freebsd1*)
+ _LT_TAGVAR(ld_shlibs, $1)=no
+ ;;
+
+ # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
+ # support. Future versions do this automatically, but an explicit c++rt0.o
+ # does not break anything, and helps significantly (at the cost of a little
+ # extra space).
+ freebsd2.2*)
+ _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+ _LT_TAGVAR(hardcode_direct, $1)=yes
+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+ ;;
+
+ # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+ freebsd2*)
+ _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+ _LT_TAGVAR(hardcode_direct, $1)=yes
+ _LT_TAGVAR(hardcode_minus_L, $1)=yes
+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+ ;;
+
+ # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+ freebsd* | dragonfly*)
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+ _LT_TAGVAR(hardcode_direct, $1)=yes
+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+ ;;
+
+ hpux9*)
+ if test "$GCC" = yes; then
+ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+ else
+ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+ fi
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+ _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+ _LT_TAGVAR(hardcode_direct, $1)=yes
+
+ # hardcode_minus_L: Not really in the search PATH,
+ # but as the default location of the library.
+ _LT_TAGVAR(hardcode_minus_L, $1)=yes
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ ;;
+
+ hpux10*)
+ if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ else
+ _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+ fi
+ if test "$with_gnu_ld" = no; then
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+ _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
+ _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+ _LT_TAGVAR(hardcode_direct, $1)=yes
+ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ # hardcode_minus_L: Not really in the search PATH,
+ # but as the default location of the library.
+ _LT_TAGVAR(hardcode_minus_L, $1)=yes
+ fi
+ ;;
+
+ hpux11*)
+ if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+ case $host_cpu in
+ hppa*64*)
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ ia64*)
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ *)
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ esac
+ else
+ case $host_cpu in
+ hppa*64*)
+ _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ ia64*)
+ _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ *)
+ _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ esac
+ fi
+ if test "$with_gnu_ld" = no; then
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+ _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+ case $host_cpu in
+ hppa*64*|ia64*)
+ _LT_TAGVAR(hardcode_direct, $1)=no
+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+ ;;
+ *)
+ _LT_TAGVAR(hardcode_direct, $1)=yes
+ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+
+ # hardcode_minus_L: Not really in the search PATH,
+ # but as the default location of the library.
+ _LT_TAGVAR(hardcode_minus_L, $1)=yes
+ ;;
+ esac
+ fi
+ ;;
+
+ irix5* | irix6* | nonstopux*)
+ if test "$GCC" = yes; then
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ # Try to use the -exported_symbol ld option, if it does not
+ # work, assume that -exports_file does not work either and
+ # implicitly export all symbols.
+ save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
+ AC_LINK_IFELSE(int foo(void) {},
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
+ )
+ LDFLAGS="$save_LDFLAGS"
+ else
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
+ fi
+ _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+ _LT_TAGVAR(inherit_rpath, $1)=yes
+ _LT_TAGVAR(link_all_deplibs, $1)=yes
+ ;;
+
+ netbsd*)
+ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+ _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
+ else
+ _LT_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF
+ fi
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+ _LT_TAGVAR(hardcode_direct, $1)=yes
+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+ ;;
+
+ newsos6)
+ _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ _LT_TAGVAR(hardcode_direct, $1)=yes
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+ ;;
+
+ *nto* | *qnx*)
+ ;;
+
+ openbsd*)
+ if test -f /usr/libexec/ld.so; then
+ _LT_TAGVAR(hardcode_direct, $1)=yes
+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ else
+ case $host_os in
+ openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
+ _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+ ;;
+ *)
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ ;;
+ esac
+ fi
+ else
+ _LT_TAGVAR(ld_shlibs, $1)=no
+ fi
+ ;;
+
+ os2*)
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+ _LT_TAGVAR(hardcode_minus_L, $1)=yes
+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+ _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+ _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+ ;;
+
+ osf3*)
+ if test "$GCC" = yes; then
+ _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ else
+ _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+ fi
+ _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+ ;;
+
+ osf4* | osf5*) # as osf3* with the addition of -msym flag
+ if test "$GCC" = yes; then
+ _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ else
+ _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
+ $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
+
+ # Both c and cxx compiler support -rpath directly
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+ fi
+ _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
+ _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+ ;;
+
+ solaris*)
+ _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
+ if test "$GCC" = yes; then
+ wlarc='${wl}'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+ $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+ else
+ case `$CC -V 2>&1` in
+ *"Compilers 5.0"*)
+ wlarc=''
+ _LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
+ ;;
+ *)
+ wlarc='${wl}'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+ $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+ ;;
+ esac
+ fi
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+ case $host_os in
+ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+ *)
+ # The compiler driver will combine and reorder linker options,
+ # but understands `-z linker_flag'. GCC discards it without `$wl',
+ # but is careful enough not to reorder.
+ # Supported since Solaris 2.6 (maybe 2.5.1?)
+ if test "$GCC" = yes; then
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+ else
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
+ fi
+ ;;
+ esac
+ _LT_TAGVAR(link_all_deplibs, $1)=yes
+ ;;
+
+ sunos4*)
+ if test "x$host_vendor" = xsequent; then
+ # Use $CC to link under sequent, because it throws in some extra .o
+ # files that make .init and .fini sections work.
+ _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+ else
+ _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+ fi
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+ _LT_TAGVAR(hardcode_direct, $1)=yes
+ _LT_TAGVAR(hardcode_minus_L, $1)=yes
+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+ ;;
+
+ sysv4)
+ case $host_vendor in
+ sni)
+ _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ _LT_TAGVAR(hardcode_direct, $1)=yes # is this really true???
+ ;;
+ siemens)
+ ## LD is ld it makes a PLAMLIB
+ ## CC just makes a GrossModule.
+ _LT_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+ _LT_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
+ _LT_TAGVAR(hardcode_direct, $1)=no
+ ;;
+ motorola)
+ _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ _LT_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
+ ;;
+ esac
+ runpath_var='LD_RUN_PATH'
+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+ ;;
+
+ sysv4.3*)
+ _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
+ ;;
+
+ sysv4*MP*)
+ if test -d /usr/nec; then
+ _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+ runpath_var=LD_RUN_PATH
+ hardcode_runpath_var=yes
+ _LT_TAGVAR(ld_shlibs, $1)=yes
+ fi
+ ;;
+
+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
+ _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+ _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+ runpath_var='LD_RUN_PATH'
+
+ if test "$GCC" = yes; then
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ else
+ _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ fi
+ ;;
+
+ sysv5* | sco3.2v5* | sco5v6*)
+ # Note: We can NOT use -z defs as we might desire, because we do not
+ # link with -lc, and that would cause any symbols used from libc to
+ # always be unresolved, which means just about no library would
+ # ever link correctly. If we're not using GNU ld we use -z text
+ # though, which does catch some bad symbols but isn't as heavy-handed
+ # as -z defs.
+ _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+ _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
+ _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
+ _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+ _LT_TAGVAR(link_all_deplibs, $1)=yes
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+ runpath_var='LD_RUN_PATH'
+
+ if test "$GCC" = yes; then
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ else
+ _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ fi
+ ;;
+
+ uts4*)
+ _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+ ;;
+
+ *)
+ _LT_TAGVAR(ld_shlibs, $1)=no
+ ;;
+ esac
+
+ if test x$host_vendor = xsni; then
+ case $host in
+ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Blargedynsym'
+ ;;
+ esac
+ fi
+ fi
+])
+AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
+test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+
+_LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld
+
+_LT_DECL([], [libext], [0], [Old archive suffix (normally "a")])dnl
+_LT_DECL([], [shrext_cmds], [1], [Shared library suffix (normally ".so")])dnl
+_LT_DECL([], [extract_expsyms_cmds], [2],
+ [The commands to extract the exported symbol list from a shared archive])
+
+#
+# Do we need to explicitly link libc?
+#
+case "x$_LT_TAGVAR(archive_cmds_need_lc, $1)" in
+x|xyes)
+ # Assume -lc should be added
+ _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+
+ if test "$enable_shared" = yes && test "$GCC" = yes; then
+ case $_LT_TAGVAR(archive_cmds, $1) in
+ *'~'*)
+ # FIXME: we may have to deal with multi-command sequences.
+ ;;
+ '$CC '*)
+ # Test whether the compiler implicitly links with -lc since on some
+ # systems, -lgcc has to come before -lc. If gcc already passes -lc
+ # to ld, don't add -lc before -lgcc.
+ AC_MSG_CHECKING([whether -lc should be explicitly linked in])
+ $RM conftest*
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+ if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
+ soname=conftest
+ lib=conftest
+ libobjs=conftest.$ac_objext
+ deplibs=
+ wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)
+ pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
+ compiler_flags=-v
+ linker_flags=-v
+ verstring=
+ output_objdir=.
+ libname=conftest
+ lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)
+ _LT_TAGVAR(allow_undefined_flag, $1)=
+ if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
+ then
+ _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+ else
+ _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+ fi
+ _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
+ else
+ cat conftest.err 1>&5
+ fi
+ $RM conftest*
+ AC_MSG_RESULT([$_LT_TAGVAR(archive_cmds_need_lc, $1)])
+ ;;
+ esac
+ fi
+ ;;
+esac
+
+_LT_TAGDECL([build_libtool_need_lc], [archive_cmds_need_lc], [0],
+ [Whether or not to add -lc for building shared libraries])
+_LT_TAGDECL([allow_libtool_libs_with_static_runtimes],
+ [enable_shared_with_static_runtimes], [0],
+ [Whether or not to disallow shared libs when runtime libs are static])
+_LT_TAGDECL([], [export_dynamic_flag_spec], [1],
+ [Compiler flag to allow reflexive dlopens])
+_LT_TAGDECL([], [whole_archive_flag_spec], [1],
+ [Compiler flag to generate shared objects directly from archives])
+_LT_TAGDECL([], [compiler_needs_object], [1],
+ [Whether the compiler copes with passing no objects directly])
+_LT_TAGDECL([], [old_archive_from_new_cmds], [2],
+ [Create an old-style archive from a shared archive])
+_LT_TAGDECL([], [old_archive_from_expsyms_cmds], [2],
+ [Create a temporary old-style archive to link instead of a shared archive])
+_LT_TAGDECL([], [archive_cmds], [2], [Commands used to build a shared archive])
+_LT_TAGDECL([], [archive_expsym_cmds], [2])
+_LT_TAGDECL([], [module_cmds], [2],
+ [Commands used to build a loadable module if different from building
+ a shared archive.])
+_LT_TAGDECL([], [module_expsym_cmds], [2])
+_LT_TAGDECL([], [with_gnu_ld], [1],
+ [Whether we are building with GNU ld or not])
+_LT_TAGDECL([], [allow_undefined_flag], [1],
+ [Flag that allows shared libraries with undefined symbols to be built])
+_LT_TAGDECL([], [no_undefined_flag], [1],
+ [Flag that enforces no undefined symbols])
+_LT_TAGDECL([], [hardcode_libdir_flag_spec], [1],
+ [Flag to hardcode $libdir into a binary during linking.
+ This must work even if $libdir does not exist])
+_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1],
+ [[If ld is used when linking, flag to hardcode $libdir into a binary
+ during linking. This must work even if $libdir does not exist]])
+_LT_TAGDECL([], [hardcode_libdir_separator], [1],
+ [Whether we need a single "-rpath" flag with a separated argument])
+_LT_TAGDECL([], [hardcode_direct], [0],
+ [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
+ DIR into the resulting binary])
+_LT_TAGDECL([], [hardcode_direct_absolute], [0],
+ [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
+ DIR into the resulting binary and the resulting library dependency is
+ "absolute", i.e impossible to change by setting ${shlibpath_var} if the
+ library is relocated])
+_LT_TAGDECL([], [hardcode_minus_L], [0],
+ [Set to "yes" if using the -LDIR flag during linking hardcodes DIR
+ into the resulting binary])
+_LT_TAGDECL([], [hardcode_shlibpath_var], [0],
+ [Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
+ into the resulting binary])
+_LT_TAGDECL([], [hardcode_automatic], [0],
+ [Set to "yes" if building a shared library automatically hardcodes DIR
+ into the library and all subsequent libraries and executables linked
+ against it])
+_LT_TAGDECL([], [inherit_rpath], [0],
+ [Set to yes if linker adds runtime paths of dependent libraries
+ to runtime path list])
+_LT_TAGDECL([], [link_all_deplibs], [0],
+ [Whether libtool must link a program against all its dependency libraries])
+_LT_TAGDECL([], [fix_srcfile_path], [1],
+ [Fix the shell variable $srcfile for the compiler])
+_LT_TAGDECL([], [always_export_symbols], [0],
+ [Set to "yes" if exported symbols are required])
+_LT_TAGDECL([], [export_symbols_cmds], [2],
+ [The commands to list exported symbols])
+_LT_TAGDECL([], [exclude_expsyms], [1],
+ [Symbols that should not be listed in the preloaded symbols])
+_LT_TAGDECL([], [include_expsyms], [1],
+ [Symbols that must always be exported])
+_LT_TAGDECL([], [prelink_cmds], [2],
+ [Commands necessary for linking programs (against libraries) with templates])
+_LT_TAGDECL([], [file_list_spec], [1],
+ [Specify filename containing input files])
+dnl FIXME: Not yet implemented
+dnl _LT_TAGDECL([], [thread_safe_flag_spec], [1],
+dnl [Compiler flag to generate thread safe objects])
+])# _LT_LINKER_SHLIBS
+
+
+# _LT_LANG_C_CONFIG([TAG])
+# ------------------------
+# Ensure that the configuration variables for a C compiler are suitably
+# defined. These variables are subsequently used by _LT_CONFIG to write
+# the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_C_CONFIG],
+[m4_require([_LT_DECL_EGREP])dnl
+lt_save_CC="$CC"
+AC_LANG_PUSH(C)
+
+# Source file extension for C test sources.
+ac_ext=c
+
+# Object file extension for compiled C test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="int some_variable = 0;"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='int main(){return(0);}'
+
+_LT_TAG_COMPILER
+# Save the default compiler, since it gets overwritten when the other
+# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP.
+compiler_DEFAULT=$CC
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+## CAVEAT EMPTOR:
+## There is no encapsulation within the following macros, do not change
+## the running order or otherwise move them around unless you know exactly
+## what you are doing...
+if test -n "$compiler"; then
+ _LT_COMPILER_NO_RTTI($1)
+ _LT_COMPILER_PIC($1)
+ _LT_COMPILER_C_O($1)
+ _LT_COMPILER_FILE_LOCKS($1)
+ _LT_LINKER_SHLIBS($1)
+ _LT_SYS_DYNAMIC_LINKER($1)
+ _LT_LINKER_HARDCODE_LIBPATH($1)
+ LT_SYS_DLOPEN_SELF
+ _LT_CMD_STRIPLIB
+
+ # Report which library types will actually be built
+ AC_MSG_CHECKING([if libtool supports shared libraries])
+ AC_MSG_RESULT([$can_build_shared])
+
+ AC_MSG_CHECKING([whether to build shared libraries])
+ test "$can_build_shared" = "no" && enable_shared=no
+
+ # On AIX, shared libraries and static libraries use the same namespace, and
+ # are all built from PIC.
+ case $host_os in
+ aix3*)
+ test "$enable_shared" = yes && enable_static=no
+ if test -n "$RANLIB"; then
+ archive_cmds="$archive_cmds~\$RANLIB \$lib"
+ postinstall_cmds='$RANLIB $lib'
+ fi
+ ;;
+
+ aix[[4-9]]*)
+ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+ test "$enable_shared" = yes && enable_static=no
+ fi
+ ;;
+ esac
+ AC_MSG_RESULT([$enable_shared])
+
+ AC_MSG_CHECKING([whether to build static libraries])
+ # Make sure either enable_shared or enable_static is yes.
+ test "$enable_shared" = yes || enable_static=yes
+ AC_MSG_RESULT([$enable_static])
+
+ _LT_CONFIG($1)
+fi
+AC_LANG_POP
+CC="$lt_save_CC"
+])# _LT_LANG_C_CONFIG
+
+
+# _LT_PROG_CXX
+# ------------
+# Since AC_PROG_CXX is broken, in that it returns g++ if there is no c++
+# compiler, we have our own version here.
+m4_defun([_LT_PROG_CXX],
+[
+pushdef([AC_MSG_ERROR], [_lt_caught_CXX_error=yes])
+AC_PROG_CXX
+if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
+ (test "X$CXX" != "Xg++"))) ; then
+ AC_PROG_CXXCPP
+else
+ _lt_caught_CXX_error=yes
+fi
+popdef([AC_MSG_ERROR])
+])# _LT_PROG_CXX
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([_LT_PROG_CXX], [])
+
+
+# _LT_LANG_CXX_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for a C++ compiler are suitably
+# defined. These variables are subsequently used by _LT_CONFIG to write
+# the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_CXX_CONFIG],
+[AC_REQUIRE([_LT_PROG_CXX])dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_EGREP])dnl
+
+AC_LANG_PUSH(C++)
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+_LT_TAGVAR(allow_undefined_flag, $1)=
+_LT_TAGVAR(always_export_symbols, $1)=no
+_LT_TAGVAR(archive_expsym_cmds, $1)=
+_LT_TAGVAR(compiler_needs_object, $1)=no
+_LT_TAGVAR(export_dynamic_flag_spec, $1)=
+_LT_TAGVAR(hardcode_direct, $1)=no
+_LT_TAGVAR(hardcode_direct_absolute, $1)=no
+_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
+_LT_TAGVAR(hardcode_libdir_separator, $1)=
+_LT_TAGVAR(hardcode_minus_L, $1)=no
+_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+_LT_TAGVAR(hardcode_automatic, $1)=no
+_LT_TAGVAR(inherit_rpath, $1)=no
+_LT_TAGVAR(module_cmds, $1)=
+_LT_TAGVAR(module_expsym_cmds, $1)=
+_LT_TAGVAR(link_all_deplibs, $1)=unknown
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(no_undefined_flag, $1)=
+_LT_TAGVAR(whole_archive_flag_spec, $1)=
+_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+
+# Source file extension for C++ test sources.
+ac_ext=cpp
+
+# Object file extension for compiled C++ test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# No sense in running all these tests if we already determined that
+# the CXX compiler isn't working. Some variables (like enable_shared)
+# are currently assumed to apply to all compilers on this platform,
+# and will be corrupted by setting them based on a non-working compiler.
+if test "$_lt_caught_CXX_error" != yes; then
+ # Code to be used in simple compile tests
+ lt_simple_compile_test_code="int some_variable = 0;"
+
+ # Code to be used in simple link tests
+ lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'
+
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+ _LT_TAG_COMPILER
+
+ # save warnings/boilerplate of simple test code
+ _LT_COMPILER_BOILERPLATE
+ _LT_LINKER_BOILERPLATE
+
+ # Allow CC to be a program name with arguments.
+ lt_save_CC=$CC
+ lt_save_LD=$LD
+ lt_save_GCC=$GCC
+ GCC=$GXX
+ lt_save_with_gnu_ld=$with_gnu_ld
+ lt_save_path_LD=$lt_cv_path_LD
+ if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
+ lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
+ else
+ $as_unset lt_cv_prog_gnu_ld
+ fi
+ if test -n "${lt_cv_path_LDCXX+set}"; then
+ lt_cv_path_LD=$lt_cv_path_LDCXX
+ else
+ $as_unset lt_cv_path_LD
+ fi
+ test -z "${LDCXX+set}" || LD=$LDCXX
+ CC=${CXX-"c++"}
+ compiler=$CC
+ _LT_TAGVAR(compiler, $1)=$CC
+ _LT_CC_BASENAME([$compiler])
+
+ if test -n "$compiler"; then
+ # We don't want -fno-exception when compiling C++ code, so set the
+ # no_builtin_flag separately
+ if test "$GXX" = yes; then
+ _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
+ else
+ _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
+ fi
+
+ if test "$GXX" = yes; then
+ # Set up default GNU C++ configuration
+
+ LT_PATH_LD
+
+ # Check if GNU C++ uses GNU ld as the underlying linker, since the
+ # archiving commands below assume that GNU ld is being used.
+ if test "$with_gnu_ld" = yes; then
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+
+ # If archive_cmds runs LD, not CC, wlarc should be empty
+ # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
+ # investigate it a little bit more. (MM)
+ wlarc='${wl}'
+
+ # ancient GNU ld didn't support --whole-archive et. al.
+ if eval "`$CC -print-prog-name=ld` --help 2>&1" |
+ $GREP 'no-whole-archive' > /dev/null; then
+ _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+ else
+ _LT_TAGVAR(whole_archive_flag_spec, $1)=
+ fi
+ else
+ with_gnu_ld=no
+ wlarc=
+
+ # A generic and very simple default shared library creation
+ # command for GNU C++ for the case where it uses the native
+ # linker, instead of GNU ld. If possible, this setting should
+ # overridden to take advantage of the native linker features on
+ # the platform it is being used on.
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+ fi
+
+ # Commands to make compiler produce verbose output that lists
+ # what "hidden" libraries, object files and flags are used when
+ # linking a shared library.
+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+
+ else
+ GXX=no
+ with_gnu_ld=no
+ wlarc=
+ fi
+
+ # PORTME: fill in a description of your system's C++ link characteristics
+ AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+ _LT_TAGVAR(ld_shlibs, $1)=yes
+ case $host_os in
+ aix3*)
+ # FIXME: insert proper C++ library support
+ _LT_TAGVAR(ld_shlibs, $1)=no
+ ;;
+ aix[[4-9]]*)
+ if test "$host_cpu" = ia64; then
+ # On IA64, the linker does run time linking by default, so we don't
+ # have to do anything special.
+ aix_use_runtimelinking=no
+ exp_sym_flag='-Bexport'
+ no_entry_flag=""
+ else
+ aix_use_runtimelinking=no
+
+ # Test if we are trying to use run time linking or normal
+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+ # need to do runtime linking.
+ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
+ for ld_flag in $LDFLAGS; do
+ case $ld_flag in
+ *-brtl*)
+ aix_use_runtimelinking=yes
+ break
+ ;;
+ esac
+ done
+ ;;
+ esac
+
+ exp_sym_flag='-bexport'
+ no_entry_flag='-bnoentry'
+ fi
+
+ # When large executables or shared objects are built, AIX ld can
+ # have problems creating the table of contents. If linking a library
+ # or program results in "error TOC overflow" add -mminimal-toc to
+ # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not
+ # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+ _LT_TAGVAR(archive_cmds, $1)=''
+ _LT_TAGVAR(hardcode_direct, $1)=yes
+ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+ _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+ _LT_TAGVAR(link_all_deplibs, $1)=yes
+ _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
+
+ if test "$GXX" = yes; then
+ case $host_os in aix4.[[012]]|aix4.[[012]].*)
+ # We only want to do this on AIX 4.2 and lower, the check
+ # below for broken collect2 doesn't work under 4.3+
+ collect2name=`${CC} -print-prog-name=collect2`
+ if test -f "$collect2name" &&
+ strings "$collect2name" | $GREP resolve_lib_name >/dev/null
+ then
+ # We have reworked collect2
+ :
+ else
+ # We have old collect2
+ _LT_TAGVAR(hardcode_direct, $1)=unsupported
+ # It fails to find uninstalled libraries when the uninstalled
+ # path is not listed in the libpath. Setting hardcode_minus_L
+ # to unsupported forces relinking
+ _LT_TAGVAR(hardcode_minus_L, $1)=yes
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+ _LT_TAGVAR(hardcode_libdir_separator, $1)=
+ fi
+ esac
+ shared_flag='-shared'
+ if test "$aix_use_runtimelinking" = yes; then
+ shared_flag="$shared_flag "'${wl}-G'
+ fi
+ else
+ # not using gcc
+ if test "$host_cpu" = ia64; then
+ # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+ # chokes on -Wl,-G. The following line is correct:
+ shared_flag='-G'
+ else
+ if test "$aix_use_runtimelinking" = yes; then
+ shared_flag='${wl}-G'
+ else
+ shared_flag='${wl}-bM:SRE'
+ fi
+ fi
+ fi
+
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
+ # It seems that -bexpall does not export symbols beginning with
+ # underscore (_), so it is better to generate a list of symbols to
+ # export.
+ _LT_TAGVAR(always_export_symbols, $1)=yes
+ if test "$aix_use_runtimelinking" = yes; then
+ # Warning - without using the other runtime loading flags (-brtl),
+ # -berok will link without error, but may produce a broken library.
+ _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
+ # Determine the default libpath from the value encoded in an empty
+ # executable.
+ _LT_SYS_MODULE_PATH_AIX
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+ else
+ if test "$host_cpu" = ia64; then
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+ _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+ _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+ else
+ # Determine the default libpath from the value encoded in an
+ # empty executable.
+ _LT_SYS_MODULE_PATH_AIX
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+ # Warning - without using the other run time loading flags,
+ # -berok will link without error, but may produce a broken library.
+ _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
+ _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
+ # Exported symbols can be pulled into shared objects from archives
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+ _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+ # This is similar to how AIX traditionally builds its shared
+ # libraries.
+ _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+ fi
+ fi
+ ;;
+
+ beos*)
+ if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+ # Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
+ # support --undefined. This deserves some investigation. FIXME
+ _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ else
+ _LT_TAGVAR(ld_shlibs, $1)=no
+ fi
+ ;;
+
+ chorus*)
+ case $cc_basename in
+ *)
+ # FIXME: insert proper C++ library support
+ _LT_TAGVAR(ld_shlibs, $1)=no
+ ;;
+ esac
+ ;;
+
+ cygwin* | mingw* | pw32* | cegcc*)
+ # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+ # as there is no search path for DLLs.
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+ _LT_TAGVAR(always_export_symbols, $1)=no
+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+
+ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+ # If the export-symbols file already is a .def file (1st line
+ # is EXPORTS), use it as is; otherwise, prepend...
+ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+ cp $export_symbols $output_objdir/$soname.def;
+ else
+ echo EXPORTS > $output_objdir/$soname.def;
+ cat $export_symbols >> $output_objdir/$soname.def;
+ fi~
+ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+ else
+ _LT_TAGVAR(ld_shlibs, $1)=no
+ fi
+ ;;
+ darwin* | rhapsody*)
+ _LT_DARWIN_LINKER_FEATURES($1)
+ ;;
+
+ dgux*)
+ case $cc_basename in
+ ec++*)
+ # FIXME: insert proper C++ library support
+ _LT_TAGVAR(ld_shlibs, $1)=no
+ ;;
+ ghcx*)
+ # Green Hills C++ Compiler
+ # FIXME: insert proper C++ library support
+ _LT_TAGVAR(ld_shlibs, $1)=no
+ ;;
+ *)
+ # FIXME: insert proper C++ library support
+ _LT_TAGVAR(ld_shlibs, $1)=no
+ ;;
+ esac
+ ;;
+
+ freebsd[[12]]*)
+ # C++ shared libraries reported to be fairly broken before
+ # switch to ELF
+ _LT_TAGVAR(ld_shlibs, $1)=no
+ ;;
+
+ freebsd-elf*)
+ _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+ ;;
+
+ freebsd* | dragonfly*)
+ # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
+ # conventions
+ _LT_TAGVAR(ld_shlibs, $1)=yes
+ ;;
+
+ gnu*)
+ ;;
+
+ hpux9*)
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+ _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ _LT_TAGVAR(hardcode_direct, $1)=yes
+ _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
+ # but as the default
+ # location of the library.
+
+ case $cc_basename in
+ CC*)
+ # FIXME: insert proper C++ library support
+ _LT_TAGVAR(ld_shlibs, $1)=no
+ ;;
+ aCC*)
+ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+ # Commands to make compiler produce verbose output that lists
+ # what "hidden" libraries, object files and flags are used when
+ # linking a shared library.
+ #
+ # There doesn't appear to be a way to prevent this compiler from
+ # explicitly linking system object files so we need to strip them
+ # from the output so that they don't get included in the library
+ # dependencies.
+ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+ ;;
+ *)
+ if test "$GXX" = yes; then
+ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+ else
+ # FIXME: insert proper C++ library support
+ _LT_TAGVAR(ld_shlibs, $1)=no
+ fi
+ ;;
+ esac
+ ;;
+
+ hpux10*|hpux11*)
+ if test $with_gnu_ld = no; then
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+ _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+ case $host_cpu in
+ hppa*64*|ia64*)
+ ;;
+ *)
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ ;;
+ esac
+ fi
+ case $host_cpu in
+ hppa*64*|ia64*)
+ _LT_TAGVAR(hardcode_direct, $1)=no
+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+ ;;
+ *)
+ _LT_TAGVAR(hardcode_direct, $1)=yes
+ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+ _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
+ # but as the default
+ # location of the library.
+ ;;
+ esac
+
+ case $cc_basename in
+ CC*)
+ # FIXME: insert proper C++ library support
+ _LT_TAGVAR(ld_shlibs, $1)=no
+ ;;
+ aCC*)
+ case $host_cpu in
+ hppa*64*)
+ _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ ;;
+ ia64*)
+ _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ ;;
+ *)
+ _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ ;;
+ esac
+ # Commands to make compiler produce verbose output that lists
+ # what "hidden" libraries, object files and flags are used when
+ # linking a shared library.
+ #
+ # There doesn't appear to be a way to prevent this compiler from
+ # explicitly linking system object files so we need to strip them
+ # from the output so that they don't get included in the library
+ # dependencies.
+ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+ ;;
+ *)
+ if test "$GXX" = yes; then
+ if test $with_gnu_ld = no; then
+ case $host_cpu in
+ hppa*64*)
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ ;;
+ ia64*)
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ ;;
+ *)
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ ;;
+ esac
+ fi
+ else
+ # FIXME: insert proper C++ library support
+ _LT_TAGVAR(ld_shlibs, $1)=no
+ fi
+ ;;
+ esac
+ ;;
+
+ interix[[3-9]]*)
+ _LT_TAGVAR(hardcode_direct, $1)=no
+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+ # Instead, shared libraries are loaded at an image base (0x10000000 by
+ # default) and relocated if they conflict, which is a slow very memory
+ # consuming and fragmenting process. To avoid this, we pick a random,
+ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+ # time. Moving up from 0x10000000 also allows more sbrk(2) space.
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ ;;
+ irix5* | irix6*)
+ case $cc_basename in
+ CC*)
+ # SGI C++
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+
+ # Archives containing C++ object files must be created using
+ # "CC -ar", where "CC" is the IRIX C++ compiler. This is
+ # necessary to make sure instantiated templates are included
+ # in the archive.
+ _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
+ ;;
+ *)
+ if test "$GXX" = yes; then
+ if test "$with_gnu_ld" = no; then
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ else
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib'
+ fi
+ fi
+ _LT_TAGVAR(link_all_deplibs, $1)=yes
+ ;;
+ esac
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+ _LT_TAGVAR(inherit_rpath, $1)=yes
+ ;;
+
+ linux* | k*bsd*-gnu)
+ case $cc_basename in
+ KCC*)
+ # Kuck and Associates, Inc. (KAI) C++ Compiler
+
+ # KCC will only create a shared library if the output file
+ # ends with ".so" (or ".sl" for HP-UX), so rename the library
+ # to its proper name (with version) after linking.
+ _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
+ # Commands to make compiler produce verbose output that lists
+ # what "hidden" libraries, object files and flags are used when
+ # linking a shared library.
+ #
+ # There doesn't appear to be a way to prevent this compiler from
+ # explicitly linking system object files so we need to strip them
+ # from the output so that they don't get included in the library
+ # dependencies.
+ output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+
+ # Archives containing C++ object files must be created using
+ # "CC -Bstatic", where "CC" is the KAI C++ compiler.
+ _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
+ ;;
+ icpc* | ecpc* )
+ # Intel C++
+ with_gnu_ld=yes
+ # version 8.0 and above of icpc choke on multiply defined symbols
+ # if we add $predep_objects and $postdep_objects, however 7.1 and
+ # earlier do not add the objects themselves.
+ case `$CC -V 2>&1` in
+ *"Version 7."*)
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ ;;
+ *) # Version 8.0 or newer
+ tmp_idyn=
+ case $host_cpu in
+ ia64*) tmp_idyn=' -i_dynamic';;
+ esac
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ ;;
+ esac
+ _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+ ;;
+ pgCC* | pgcpp*)
+ # Portland Group C++ compiler
+ case `$CC -V` in
+ *pgCC\ [[1-5]]* | *pgcpp\ [[1-5]]*)
+ _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
+ rm -rf $tpldir~
+ $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
+ compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
+ _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
+ rm -rf $tpldir~
+ $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
+ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
+ $RANLIB $oldlib'
+ _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
+ rm -rf $tpldir~
+ $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
+ rm -rf $tpldir~
+ $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+ ;;
+ *) # Version 6 will use weak symbols
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+ ;;
+ esac
+
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+ ;;
+ cxx*)
+ # Compaq C++
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
+
+ runpath_var=LD_RUN_PATH
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+ _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+ # Commands to make compiler produce verbose output that lists
+ # what "hidden" libraries, object files and flags are used when
+ # linking a shared library.
+ #
+ # There doesn't appear to be a way to prevent this compiler from
+ # explicitly linking system object files so we need to strip them
+ # from the output so that they don't get included in the library
+ # dependencies.
+ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+ ;;
+ xl*)
+ # IBM XL 8.0 on PPC, with GNU ld
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ if test "x$supports_anon_versioning" = xyes; then
+ _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
+ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+ echo "local: *; };" >> $output_objdir/$libname.ver~
+ $CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ fi
+ ;;
+ *)
+ case `$CC -V 2>&1 | sed 5q` in
+ *Sun\ C*)
+ # Sun C++ 5.9
+ _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+ _LT_TAGVAR(compiler_needs_object, $1)=yes
+
+ # Not sure whether something based on
+ # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
+ # would be better.
+ output_verbose_link_cmd='echo'
+
+ # Archives containing C++ object files must be created using
+ # "CC -xar", where "CC" is the Sun C++ compiler. This is
+ # necessary to make sure instantiated templates are included
+ # in the archive.
+ _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
+ ;;
+ esac
+ ;;
+ esac
+ ;;
+
+ lynxos*)
+ # FIXME: insert proper C++ library support
+ _LT_TAGVAR(ld_shlibs, $1)=no
+ ;;
+
+ m88k*)
+ # FIXME: insert proper C++ library support
+ _LT_TAGVAR(ld_shlibs, $1)=no
+ ;;
+
+ mvs*)
+ case $cc_basename in
+ cxx*)
+ # FIXME: insert proper C++ library support
+ _LT_TAGVAR(ld_shlibs, $1)=no
+ ;;
+ *)
+ # FIXME: insert proper C++ library support
+ _LT_TAGVAR(ld_shlibs, $1)=no
+ ;;
+ esac
+ ;;
+
+ netbsd*)
+ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+ _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
+ wlarc=
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+ _LT_TAGVAR(hardcode_direct, $1)=yes
+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+ fi
+ # Workaround some broken pre-1.5 toolchains
+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
+ ;;
+
+ *nto* | *qnx*)
+ _LT_TAGVAR(ld_shlibs, $1)=yes
+ ;;
+
+ openbsd2*)
+ # C++ shared libraries are fairly broken
+ _LT_TAGVAR(ld_shlibs, $1)=no
+ ;;
+
+ openbsd*)
+ if test -f /usr/libexec/ld.so; then
+ _LT_TAGVAR(hardcode_direct, $1)=yes
+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+ fi
+ output_verbose_link_cmd=echo
+ else
+ _LT_TAGVAR(ld_shlibs, $1)=no
+ fi
+ ;;
+
+ osf3* | osf4* | osf5*)
+ case $cc_basename in
+ KCC*)
+ # Kuck and Associates, Inc. (KAI) C++ Compiler
+
+ # KCC will only create a shared library if the output file
+ # ends with ".so" (or ".sl" for HP-UX), so rename the library
+ # to its proper name (with version) after linking.
+ _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+ # Archives containing C++ object files must be created using
+ # the KAI C++ compiler.
+ case $host in
+ osf3*) _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ;;
+ *) _LT_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' ;;
+ esac
+ ;;
+ RCC*)
+ # Rational C++ 2.4.1
+ # FIXME: insert proper C++ library support
+ _LT_TAGVAR(ld_shlibs, $1)=no
+ ;;
+ cxx*)
+ case $host in
+ osf3*)
+ _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ ;;
+ *)
+ _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
+ echo "-hidden">> $lib.exp~
+ $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~
+ $RM $lib.exp'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+ ;;
+ esac
+
+ _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+ # Commands to make compiler produce verbose output that lists
+ # what "hidden" libraries, object files and flags are used when
+ # linking a shared library.
+ #
+ # There doesn't appear to be a way to prevent this compiler from
+ # explicitly linking system object files so we need to strip them
+ # from the output so that they don't get included in the library
+ # dependencies.
+ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+ ;;
+ *)
+ if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+ _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+ case $host in
+ osf3*)
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ ;;
+ *)
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ ;;
+ esac
+
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+ # Commands to make compiler produce verbose output that lists
+ # what "hidden" libraries, object files and flags are used when
+ # linking a shared library.
+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+
+ else
+ # FIXME: insert proper C++ library support
+ _LT_TAGVAR(ld_shlibs, $1)=no
+ fi
+ ;;
+ esac
+ ;;
+
+ psos*)
+ # FIXME: insert proper C++ library support
+ _LT_TAGVAR(ld_shlibs, $1)=no
+ ;;
+
+ sunos4*)
+ case $cc_basename in
+ CC*)
+ # Sun C++ 4.x
+ # FIXME: insert proper C++ library support
+ _LT_TAGVAR(ld_shlibs, $1)=no
+ ;;
+ lcc*)
+ # Lucid
+ # FIXME: insert proper C++ library support
+ _LT_TAGVAR(ld_shlibs, $1)=no
+ ;;
+ *)
+ # FIXME: insert proper C++ library support
+ _LT_TAGVAR(ld_shlibs, $1)=no
+ ;;
+ esac
+ ;;
+
+ solaris*)
+ case $cc_basename in
+ CC*)
+ # Sun C++ 4.2, 5.x and Centerline C++
+ _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
+ _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+ $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+ case $host_os in
+ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+ *)
+ # The compiler driver will combine and reorder linker options,
+ # but understands `-z linker_flag'.
+ # Supported since Solaris 2.6 (maybe 2.5.1?)
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
+ ;;
+ esac
+ _LT_TAGVAR(link_all_deplibs, $1)=yes
+
+ output_verbose_link_cmd='echo'
+
+ # Archives containing C++ object files must be created using
+ # "CC -xar", where "CC" is the Sun C++ compiler. This is
+ # necessary to make sure instantiated templates are included
+ # in the archive.
+ _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
+ ;;
+ gcx*)
+ # Green Hills C++ Compiler
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+
+ # The C++ compiler must be used to create the archive.
+ _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
+ ;;
+ *)
+ # GNU C++ compiler with Solaris linker
+ if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+ _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
+ if $CC --version | $GREP -v '^2\.7' > /dev/null; then
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+ $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+ # Commands to make compiler produce verbose output that lists
+ # what "hidden" libraries, object files and flags are used when
+ # linking a shared library.
+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+ else
+ # g++ 2.7 appears to require `-G' NOT `-shared' on this
+ # platform.
+ _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+ $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+ # Commands to make compiler produce verbose output that lists
+ # what "hidden" libraries, object files and flags are used when
+ # linking a shared library.
+ output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+ fi
+
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
+ case $host_os in
+ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+ *)
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+ ;;
+ esac
+ fi
+ ;;
+ esac
+ ;;
+
+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
+ _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+ _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+ runpath_var='LD_RUN_PATH'
+
+ case $cc_basename in
+ CC*)
+ _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ *)
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ esac
+ ;;
+
+ sysv5* | sco3.2v5* | sco5v6*)
+ # Note: We can NOT use -z defs as we might desire, because we do not
+ # link with -lc, and that would cause any symbols used from libc to
+ # always be unresolved, which means just about no library would
+ # ever link correctly. If we're not using GNU ld we use -z text
+ # though, which does catch some bad symbols but isn't as heavy-handed
+ # as -z defs.
+ _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+ _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
+ _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
+ _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+ _LT_TAGVAR(link_all_deplibs, $1)=yes
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+ runpath_var='LD_RUN_PATH'
+
+ case $cc_basename in
+ CC*)
+ _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ *)
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ esac
+ ;;
+
+ tandem*)
+ case $cc_basename in
+ NCC*)
+ # NonStop-UX NCC 3.20
+ # FIXME: insert proper C++ library support
+ _LT_TAGVAR(ld_shlibs, $1)=no
+ ;;
+ *)
+ # FIXME: insert proper C++ library support
+ _LT_TAGVAR(ld_shlibs, $1)=no
+ ;;
+ esac
+ ;;
+
+ vxworks*)
+ # FIXME: insert proper C++ library support
+ _LT_TAGVAR(ld_shlibs, $1)=no
+ ;;
+
+ *)
+ # FIXME: insert proper C++ library support
+ _LT_TAGVAR(ld_shlibs, $1)=no
+ ;;
+ esac
+
+ AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
+ test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+
+ _LT_TAGVAR(GCC, $1)="$GXX"
+ _LT_TAGVAR(LD, $1)="$LD"
+
+ ## CAVEAT EMPTOR:
+ ## There is no encapsulation within the following macros, do not change
+ ## the running order or otherwise move them around unless you know exactly
+ ## what you are doing...
+ _LT_SYS_HIDDEN_LIBDEPS($1)
+ _LT_COMPILER_PIC($1)
+ _LT_COMPILER_C_O($1)
+ _LT_COMPILER_FILE_LOCKS($1)
+ _LT_LINKER_SHLIBS($1)
+ _LT_SYS_DYNAMIC_LINKER($1)
+ _LT_LINKER_HARDCODE_LIBPATH($1)
+
+ _LT_CONFIG($1)
+ fi # test -n "$compiler"
+
+ CC=$lt_save_CC
+ LDCXX=$LD
+ LD=$lt_save_LD
+ GCC=$lt_save_GCC
+ with_gnu_ld=$lt_save_with_gnu_ld
+ lt_cv_path_LDCXX=$lt_cv_path_LD
+ lt_cv_path_LD=$lt_save_path_LD
+ lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
+ lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
+fi # test "$_lt_caught_CXX_error" != yes
+
+AC_LANG_POP
+])# _LT_LANG_CXX_CONFIG
+
+
+# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
+# ---------------------------------
+# Figure out "hidden" library dependencies from verbose
+# compiler output when linking a shared library.
+# Parse the compiler output and extract the necessary
+# objects, libraries and library flags.
+m4_defun([_LT_SYS_HIDDEN_LIBDEPS],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+# Dependencies to place before and after the object being linked:
+_LT_TAGVAR(predep_objects, $1)=
+_LT_TAGVAR(postdep_objects, $1)=
+_LT_TAGVAR(predeps, $1)=
+_LT_TAGVAR(postdeps, $1)=
+_LT_TAGVAR(compiler_lib_search_path, $1)=
+
+dnl we can't use the lt_simple_compile_test_code here,
+dnl because it contains code intended for an executable,
+dnl not a library. It's possible we should let each
+dnl tag define a new lt_????_link_test_code variable,
+dnl but it's only used here...
+m4_if([$1], [], [cat > conftest.$ac_ext <<_LT_EOF
+int a;
+void foo (void) { a = 0; }
+_LT_EOF
+], [$1], [CXX], [cat > conftest.$ac_ext <<_LT_EOF
+class Foo
+{
+public:
+ Foo (void) { a = 0; }
+private:
+ int a;
+};
+_LT_EOF
+], [$1], [F77], [cat > conftest.$ac_ext <<_LT_EOF
+ subroutine foo
+ implicit none
+ integer*4 a
+ a=0
+ return
+ end
+_LT_EOF
+], [$1], [FC], [cat > conftest.$ac_ext <<_LT_EOF
+ subroutine foo
+ implicit none
+ integer a
+ a=0
+ return
+ end
+_LT_EOF
+], [$1], [GCJ], [cat > conftest.$ac_ext <<_LT_EOF
+public class foo {
+ private int a;
+ public void bar (void) {
+ a = 0;
+ }
+};
+_LT_EOF
+])
+dnl Parse the compiler output and extract the necessary
+dnl objects, libraries and library flags.
+if AC_TRY_EVAL(ac_compile); then
+ # Parse the compiler output and extract the necessary
+ # objects, libraries and library flags.
+
+ # Sentinel used to keep track of whether or not we are before
+ # the conftest object file.
+ pre_test_object_deps_done=no
+
+ for p in `eval "$output_verbose_link_cmd"`; do
+ case $p in
+
+ -L* | -R* | -l*)
+ # Some compilers place space between "-{L,R}" and the path.
+ # Remove the space.
+ if test $p = "-L" ||
+ test $p = "-R"; then
+ prev=$p
+ continue
+ else
+ prev=
+ fi
+
+ if test "$pre_test_object_deps_done" = no; then
+ case $p in
+ -L* | -R*)
+ # Internal compiler library paths should come after those
+ # provided the user. The postdeps already come after the
+ # user supplied libs so there is no need to process them.
+ if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then
+ _LT_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
+ else
+ _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
+ fi
+ ;;
+ # The "-l" case would never come before the object being
+ # linked, so don't bother handling this case.
+ esac
+ else
+ if test -z "$_LT_TAGVAR(postdeps, $1)"; then
+ _LT_TAGVAR(postdeps, $1)="${prev}${p}"
+ else
+ _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
+ fi
+ fi
+ ;;
+
+ *.$objext)
+ # This assumes that the test object file only shows up
+ # once in the compiler output.
+ if test "$p" = "conftest.$objext"; then
+ pre_test_object_deps_done=yes
+ continue
+ fi
+
+ if test "$pre_test_object_deps_done" = no; then
+ if test -z "$_LT_TAGVAR(predep_objects, $1)"; then
+ _LT_TAGVAR(predep_objects, $1)="$p"
+ else
+ _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p"
+ fi
+ else
+ if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then
+ _LT_TAGVAR(postdep_objects, $1)="$p"
+ else
+ _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p"
+ fi
+ fi
+ ;;
+
+ *) ;; # Ignore the rest.
+
+ esac
+ done
+
+ # Clean up.
+ rm -f a.out a.exe
+else
+ echo "libtool.m4: error: problem compiling $1 test program"
+fi
+
+$RM -f confest.$objext
+
+# PORTME: override above test on systems where it is broken
+m4_if([$1], [CXX],
+[case $host_os in
+interix[[3-9]]*)
+ # Interix 3.5 installs completely hosed .la files for C++, so rather than
+ # hack all around it, let's just trust "g++" to DTRT.
+ _LT_TAGVAR(predep_objects,$1)=
+ _LT_TAGVAR(postdep_objects,$1)=
+ _LT_TAGVAR(postdeps,$1)=
+ ;;
+
+linux*)
+ case `$CC -V 2>&1 | sed 5q` in
+ *Sun\ C*)
+ # Sun C++ 5.9
+
+ # The more standards-conforming stlport4 library is
+ # incompatible with the Cstd library. Avoid specifying
+ # it if it's in CXXFLAGS. Ignore libCrun as
+ # -library=stlport4 depends on it.
+ case " $CXX $CXXFLAGS " in
+ *" -library=stlport4 "*)
+ solaris_use_stlport4=yes
+ ;;
+ esac
+
+ if test "$solaris_use_stlport4" != yes; then
+ _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
+ fi
+ ;;
+ esac
+ ;;
+
+solaris*)
+ case $cc_basename in
+ CC*)
+ # The more standards-conforming stlport4 library is
+ # incompatible with the Cstd library. Avoid specifying
+ # it if it's in CXXFLAGS. Ignore libCrun as
+ # -library=stlport4 depends on it.
+ case " $CXX $CXXFLAGS " in
+ *" -library=stlport4 "*)
+ solaris_use_stlport4=yes
+ ;;
+ esac
+
+ # Adding this requires a known-good setup of shared libraries for
+ # Sun compiler versions before 5.6, else PIC objects from an old
+ # archive will be linked into the output, leading to subtle bugs.
+ if test "$solaris_use_stlport4" != yes; then
+ _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
+ fi
+ ;;
+ esac
+ ;;
+esac
+])
+
+case " $_LT_TAGVAR(postdeps, $1) " in
+*" -lc "*) _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;;
+esac
+ _LT_TAGVAR(compiler_lib_search_dirs, $1)=
+if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then
+ _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
+fi
+_LT_TAGDECL([], [compiler_lib_search_dirs], [1],
+ [The directories searched by this compiler when creating a shared library])
+_LT_TAGDECL([], [predep_objects], [1],
+ [Dependencies to place before and after the objects being linked to
+ create a shared library])
+_LT_TAGDECL([], [postdep_objects], [1])
+_LT_TAGDECL([], [predeps], [1])
+_LT_TAGDECL([], [postdeps], [1])
+_LT_TAGDECL([], [compiler_lib_search_path], [1],
+ [The library search path used internally by the compiler when linking
+ a shared library])
+])# _LT_SYS_HIDDEN_LIBDEPS
+
+
+# _LT_PROG_F77
+# ------------
+# Since AC_PROG_F77 is broken, in that it returns the empty string
+# if there is no fortran compiler, we have our own version here.
+m4_defun([_LT_PROG_F77],
+[
+pushdef([AC_MSG_ERROR], [_lt_disable_F77=yes])
+AC_PROG_F77
+if test -z "$F77" || test "X$F77" = "Xno"; then
+ _lt_disable_F77=yes
+fi
+popdef([AC_MSG_ERROR])
+])# _LT_PROG_F77
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([_LT_PROG_F77], [])
+
+
+# _LT_LANG_F77_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for a Fortran 77 compiler are
+# suitably defined. These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_F77_CONFIG],
+[AC_REQUIRE([_LT_PROG_F77])dnl
+AC_LANG_PUSH(Fortran 77)
+
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+_LT_TAGVAR(allow_undefined_flag, $1)=
+_LT_TAGVAR(always_export_symbols, $1)=no
+_LT_TAGVAR(archive_expsym_cmds, $1)=
+_LT_TAGVAR(export_dynamic_flag_spec, $1)=
+_LT_TAGVAR(hardcode_direct, $1)=no
+_LT_TAGVAR(hardcode_direct_absolute, $1)=no
+_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
+_LT_TAGVAR(hardcode_libdir_separator, $1)=
+_LT_TAGVAR(hardcode_minus_L, $1)=no
+_LT_TAGVAR(hardcode_automatic, $1)=no
+_LT_TAGVAR(inherit_rpath, $1)=no
+_LT_TAGVAR(module_cmds, $1)=
+_LT_TAGVAR(module_expsym_cmds, $1)=
+_LT_TAGVAR(link_all_deplibs, $1)=unknown
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(no_undefined_flag, $1)=
+_LT_TAGVAR(whole_archive_flag_spec, $1)=
+_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+
+# Source file extension for f77 test sources.
+ac_ext=f
+
+# Object file extension for compiled f77 test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# No sense in running all these tests if we already determined that
+# the F77 compiler isn't working. Some variables (like enable_shared)
+# are currently assumed to apply to all compilers on this platform,
+# and will be corrupted by setting them based on a non-working compiler.
+if test "$_lt_disable_F77" != yes; then
+ # Code to be used in simple compile tests
+ lt_simple_compile_test_code="\
+ subroutine t
+ return
+ end
+"
+
+ # Code to be used in simple link tests
+ lt_simple_link_test_code="\
+ program t
+ end
+"
+
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+ _LT_TAG_COMPILER
+
+ # save warnings/boilerplate of simple test code
+ _LT_COMPILER_BOILERPLATE
+ _LT_LINKER_BOILERPLATE
+
+ # Allow CC to be a program name with arguments.
+ lt_save_CC="$CC"
+ lt_save_GCC=$GCC
+ CC=${F77-"f77"}
+ compiler=$CC
+ _LT_TAGVAR(compiler, $1)=$CC
+ _LT_CC_BASENAME([$compiler])
+ GCC=$G77
+ if test -n "$compiler"; then
+ AC_MSG_CHECKING([if libtool supports shared libraries])
+ AC_MSG_RESULT([$can_build_shared])
+
+ AC_MSG_CHECKING([whether to build shared libraries])
+ test "$can_build_shared" = "no" && enable_shared=no
+
+ # On AIX, shared libraries and static libraries use the same namespace, and
+ # are all built from PIC.
+ case $host_os in
+ aix3*)
+ test "$enable_shared" = yes && enable_static=no
+ if test -n "$RANLIB"; then
+ archive_cmds="$archive_cmds~\$RANLIB \$lib"
+ postinstall_cmds='$RANLIB $lib'
+ fi
+ ;;
+ aix[[4-9]]*)
+ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+ test "$enable_shared" = yes && enable_static=no
+ fi
+ ;;
+ esac
+ AC_MSG_RESULT([$enable_shared])
+
+ AC_MSG_CHECKING([whether to build static libraries])
+ # Make sure either enable_shared or enable_static is yes.
+ test "$enable_shared" = yes || enable_static=yes
+ AC_MSG_RESULT([$enable_static])
+
+ _LT_TAGVAR(GCC, $1)="$G77"
+ _LT_TAGVAR(LD, $1)="$LD"
+
+ ## CAVEAT EMPTOR:
+ ## There is no encapsulation within the following macros, do not change
+ ## the running order or otherwise move them around unless you know exactly
+ ## what you are doing...
+ _LT_COMPILER_PIC($1)
+ _LT_COMPILER_C_O($1)
+ _LT_COMPILER_FILE_LOCKS($1)
+ _LT_LINKER_SHLIBS($1)
+ _LT_SYS_DYNAMIC_LINKER($1)
+ _LT_LINKER_HARDCODE_LIBPATH($1)
+
+ _LT_CONFIG($1)
+ fi # test -n "$compiler"
+
+ GCC=$lt_save_GCC
+ CC="$lt_save_CC"
+fi # test "$_lt_disable_F77" != yes
+
+AC_LANG_POP
+])# _LT_LANG_F77_CONFIG
+
+
+# _LT_PROG_FC
+# -----------
+# Since AC_PROG_FC is broken, in that it returns the empty string
+# if there is no fortran compiler, we have our own version here.
+m4_defun([_LT_PROG_FC],
+[
+pushdef([AC_MSG_ERROR], [_lt_disable_FC=yes])
+AC_PROG_FC
+if test -z "$FC" || test "X$FC" = "Xno"; then
+ _lt_disable_FC=yes
+fi
+popdef([AC_MSG_ERROR])
+])# _LT_PROG_FC
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([_LT_PROG_FC], [])
+
+
+# _LT_LANG_FC_CONFIG([TAG])
+# -------------------------
+# Ensure that the configuration variables for a Fortran compiler are
+# suitably defined. These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_FC_CONFIG],
+[AC_REQUIRE([_LT_PROG_FC])dnl
+AC_LANG_PUSH(Fortran)
+
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+_LT_TAGVAR(allow_undefined_flag, $1)=
+_LT_TAGVAR(always_export_symbols, $1)=no
+_LT_TAGVAR(archive_expsym_cmds, $1)=
+_LT_TAGVAR(export_dynamic_flag_spec, $1)=
+_LT_TAGVAR(hardcode_direct, $1)=no
+_LT_TAGVAR(hardcode_direct_absolute, $1)=no
+_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
+_LT_TAGVAR(hardcode_libdir_separator, $1)=
+_LT_TAGVAR(hardcode_minus_L, $1)=no
+_LT_TAGVAR(hardcode_automatic, $1)=no
+_LT_TAGVAR(inherit_rpath, $1)=no
+_LT_TAGVAR(module_cmds, $1)=
+_LT_TAGVAR(module_expsym_cmds, $1)=
+_LT_TAGVAR(link_all_deplibs, $1)=unknown
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(no_undefined_flag, $1)=
+_LT_TAGVAR(whole_archive_flag_spec, $1)=
+_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+
+# Source file extension for fc test sources.
+ac_ext=${ac_fc_srcext-f}
+
+# Object file extension for compiled fc test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# No sense in running all these tests if we already determined that
+# the FC compiler isn't working. Some variables (like enable_shared)
+# are currently assumed to apply to all compilers on this platform,
+# and will be corrupted by setting them based on a non-working compiler.
+if test "$_lt_disable_FC" != yes; then
+ # Code to be used in simple compile tests
+ lt_simple_compile_test_code="\
+ subroutine t
+ return
+ end
+"
+
+ # Code to be used in simple link tests
+ lt_simple_link_test_code="\
+ program t
+ end
+"
+
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+ _LT_TAG_COMPILER
+
+ # save warnings/boilerplate of simple test code
+ _LT_COMPILER_BOILERPLATE
+ _LT_LINKER_BOILERPLATE
+
+ # Allow CC to be a program name with arguments.
+ lt_save_CC="$CC"
+ lt_save_GCC=$GCC
+ CC=${FC-"f95"}
+ compiler=$CC
+ GCC=$ac_cv_fc_compiler_gnu
+
+ _LT_TAGVAR(compiler, $1)=$CC
+ _LT_CC_BASENAME([$compiler])
+
+ if test -n "$compiler"; then
+ AC_MSG_CHECKING([if libtool supports shared libraries])
+ AC_MSG_RESULT([$can_build_shared])
+
+ AC_MSG_CHECKING([whether to build shared libraries])
+ test "$can_build_shared" = "no" && enable_shared=no
+
+ # On AIX, shared libraries and static libraries use the same namespace, and
+ # are all built from PIC.
+ case $host_os in
+ aix3*)
+ test "$enable_shared" = yes && enable_static=no
+ if test -n "$RANLIB"; then
+ archive_cmds="$archive_cmds~\$RANLIB \$lib"
+ postinstall_cmds='$RANLIB $lib'
+ fi
+ ;;
+ aix[[4-9]]*)
+ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+ test "$enable_shared" = yes && enable_static=no
+ fi
+ ;;
+ esac
+ AC_MSG_RESULT([$enable_shared])
+
+ AC_MSG_CHECKING([whether to build static libraries])
+ # Make sure either enable_shared or enable_static is yes.
+ test "$enable_shared" = yes || enable_static=yes
+ AC_MSG_RESULT([$enable_static])
+
+ _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu"
+ _LT_TAGVAR(LD, $1)="$LD"
+
+ ## CAVEAT EMPTOR:
+ ## There is no encapsulation within the following macros, do not change
+ ## the running order or otherwise move them around unless you know exactly
+ ## what you are doing...
+ _LT_SYS_HIDDEN_LIBDEPS($1)
+ _LT_COMPILER_PIC($1)
+ _LT_COMPILER_C_O($1)
+ _LT_COMPILER_FILE_LOCKS($1)
+ _LT_LINKER_SHLIBS($1)
+ _LT_SYS_DYNAMIC_LINKER($1)
+ _LT_LINKER_HARDCODE_LIBPATH($1)
+
+ _LT_CONFIG($1)
+ fi # test -n "$compiler"
+
+ GCC=$lt_save_GCC
+ CC="$lt_save_CC"
+fi # test "$_lt_disable_FC" != yes
+
+AC_LANG_POP
+])# _LT_LANG_FC_CONFIG
+
+
+# _LT_LANG_GCJ_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for the GNU Java Compiler compiler
+# are suitably defined. These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_GCJ_CONFIG],
+[AC_REQUIRE([LT_PROG_GCJ])dnl
+AC_LANG_SAVE
+
+# Source file extension for Java test sources.
+ac_ext=java
+
+# Object file extension for compiled Java test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="class foo {}"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }'
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_TAG_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC="$CC"
+lt_save_GCC=$GCC
+GCC=yes
+CC=${GCJ-"gcj"}
+compiler=$CC
+_LT_TAGVAR(compiler, $1)=$CC
+_LT_TAGVAR(LD, $1)="$LD"
+_LT_CC_BASENAME([$compiler])
+
+# GCJ did not exist at the time GCC didn't implicitly link libc in.
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+
+## CAVEAT EMPTOR:
+## There is no encapsulation within the following macros, do not change
+## the running order or otherwise move them around unless you know exactly
+## what you are doing...
+if test -n "$compiler"; then
+ _LT_COMPILER_NO_RTTI($1)
+ _LT_COMPILER_PIC($1)
+ _LT_COMPILER_C_O($1)
+ _LT_COMPILER_FILE_LOCKS($1)
+ _LT_LINKER_SHLIBS($1)
+ _LT_LINKER_HARDCODE_LIBPATH($1)
+
+ _LT_CONFIG($1)
+fi
+
+AC_LANG_RESTORE
+
+GCC=$lt_save_GCC
+CC="$lt_save_CC"
+])# _LT_LANG_GCJ_CONFIG
+
+
+# _LT_LANG_RC_CONFIG([TAG])
+# -------------------------
+# Ensure that the configuration variables for the Windows resource compiler
+# are suitably defined. These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_RC_CONFIG],
+[AC_REQUIRE([LT_PROG_RC])dnl
+AC_LANG_SAVE
+
+# Source file extension for RC test sources.
+ac_ext=rc
+
+# Object file extension for compiled RC test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
+
+# Code to be used in simple link tests
+lt_simple_link_test_code="$lt_simple_compile_test_code"
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_TAG_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC="$CC"
+lt_save_GCC=$GCC
+GCC=
+CC=${RC-"windres"}
+compiler=$CC
+_LT_TAGVAR(compiler, $1)=$CC
+_LT_CC_BASENAME([$compiler])
+_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+
+if test -n "$compiler"; then
+ :
+ _LT_CONFIG($1)
+fi
+
+GCC=$lt_save_GCC
+AC_LANG_RESTORE
+CC="$lt_save_CC"
+])# _LT_LANG_RC_CONFIG
+
+
+# LT_PROG_GCJ
+# -----------
+AC_DEFUN([LT_PROG_GCJ],
+[m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ],
+ [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ],
+ [AC_CHECK_TOOL(GCJ, gcj,)
+ test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
+ AC_SUBST(GCJFLAGS)])])[]dnl
+])
+
+# Old name:
+AU_ALIAS([LT_AC_PROG_GCJ], [LT_PROG_GCJ])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([LT_AC_PROG_GCJ], [])
+
+
+# LT_PROG_RC
+# ----------
+AC_DEFUN([LT_PROG_RC],
+[AC_CHECK_TOOL(RC, windres,)
+])
+
+# Old name:
+AU_ALIAS([LT_AC_PROG_RC], [LT_PROG_RC])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([LT_AC_PROG_RC], [])
+
+
+# _LT_DECL_EGREP
+# --------------
+# If we don't have a new enough Autoconf to choose the best grep
+# available, choose the one first in the user's PATH.
+m4_defun([_LT_DECL_EGREP],
+[AC_REQUIRE([AC_PROG_EGREP])dnl
+AC_REQUIRE([AC_PROG_FGREP])dnl
+test -z "$GREP" && GREP=grep
+_LT_DECL([], [GREP], [1], [A grep program that handles long lines])
+_LT_DECL([], [EGREP], [1], [An ERE matcher])
+_LT_DECL([], [FGREP], [1], [A literal string matcher])
+dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too
+AC_SUBST([GREP])
+])
+
+
+# _LT_DECL_OBJDUMP
+# --------------
+# If we don't have a new enough Autoconf to choose the best objdump
+# available, choose the one first in the user's PATH.
+m4_defun([_LT_DECL_OBJDUMP],
+[AC_CHECK_TOOL(OBJDUMP, objdump, false)
+test -z "$OBJDUMP" && OBJDUMP=objdump
+_LT_DECL([], [OBJDUMP], [1], [An object symbol dumper])
+AC_SUBST([OBJDUMP])
+])
+
+
+# _LT_DECL_SED
+# ------------
+# Check for a fully-functional sed program, that truncates
+# as few characters as possible. Prefer GNU sed if found.
+m4_defun([_LT_DECL_SED],
+[AC_PROG_SED
+test -z "$SED" && SED=sed
+Xsed="$SED -e 1s/^X//"
+_LT_DECL([], [SED], [1], [A sed program that does not truncate output])
+_LT_DECL([], [Xsed], ["\$SED -e 1s/^X//"],
+ [Sed that helps us avoid accidentally triggering echo(1) options like -n])
+])# _LT_DECL_SED
+
+m4_ifndef([AC_PROG_SED], [
+############################################################
+# NOTE: This macro has been submitted for inclusion into #
+# GNU Autoconf as AC_PROG_SED. When it is available in #
+# a released version of Autoconf we should remove this #
+# macro and use it instead. #
+############################################################
+
+m4_defun([AC_PROG_SED],
+[AC_MSG_CHECKING([for a sed that does not truncate output])
+AC_CACHE_VAL(lt_cv_path_SED,
+[# Loop through the user's path and test for sed and gsed.
+# Then use that list of sed's as ones to test for truncation.
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for lt_ac_prog in sed gsed; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
+ lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
+ fi
+ done
+ done
+done
+IFS=$as_save_IFS
+lt_ac_max=0
+lt_ac_count=0
+# Add /usr/xpg4/bin/sed as it is typically found on Solaris
+# along with /bin/sed that truncates output.
+for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
+ test ! -f $lt_ac_sed && continue
+ cat /dev/null > conftest.in
+ lt_ac_count=0
+ echo $ECHO_N "0123456789$ECHO_C" >conftest.in
+ # Check for GNU sed and select it if it is found.
+ if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
+ lt_cv_path_SED=$lt_ac_sed
+ break
+ fi
+ while true; do
+ cat conftest.in conftest.in >conftest.tmp
+ mv conftest.tmp conftest.in
+ cp conftest.in conftest.nl
+ echo >>conftest.nl
+ $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
+ cmp -s conftest.out conftest.nl || break
+ # 10000 chars as input seems more than enough
+ test $lt_ac_count -gt 10 && break
+ lt_ac_count=`expr $lt_ac_count + 1`
+ if test $lt_ac_count -gt $lt_ac_max; then
+ lt_ac_max=$lt_ac_count
+ lt_cv_path_SED=$lt_ac_sed
+ fi
+ done
+done
+])
+SED=$lt_cv_path_SED
+AC_SUBST([SED])
+AC_MSG_RESULT([$SED])
+])#AC_PROG_SED
+])#m4_ifndef
+
+# Old name:
+AU_ALIAS([LT_AC_PROG_SED], [AC_PROG_SED])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([LT_AC_PROG_SED], [])
+
+
+# _LT_CHECK_SHELL_FEATURES
+# ------------------------
+# Find out whether the shell is Bourne or XSI compatible,
+# or has some other useful features.
+m4_defun([_LT_CHECK_SHELL_FEATURES],
+[AC_MSG_CHECKING([whether the shell understands some XSI constructs])
+# Try some XSI features
+xsi_shell=no
+( _lt_dummy="a/b/c"
+ test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
+ = c,a/b,, \
+ && eval 'test $(( 1 + 1 )) -eq 2 \
+ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
+ && xsi_shell=yes
+AC_MSG_RESULT([$xsi_shell])
+_LT_CONFIG_LIBTOOL_INIT([xsi_shell='$xsi_shell'])
+
+AC_MSG_CHECKING([whether the shell understands "+="])
+lt_shell_append=no
+( foo=bar; set foo baz; eval "$[1]+=\$[2]" && test "$foo" = barbaz ) \
+ >/dev/null 2>&1 \
+ && lt_shell_append=yes
+AC_MSG_RESULT([$lt_shell_append])
+_LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append'])
+
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+ lt_unset=unset
+else
+ lt_unset=false
+fi
+_LT_DECL([], [lt_unset], [0], [whether the shell understands "unset"])dnl
+
+# test EBCDIC or ASCII
+case `echo X|tr X '\101'` in
+ A) # ASCII based system
+ # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
+ lt_SP2NL='tr \040 \012'
+ lt_NL2SP='tr \015\012 \040\040'
+ ;;
+ *) # EBCDIC based system
+ lt_SP2NL='tr \100 \n'
+ lt_NL2SP='tr \r\n \100\100'
+ ;;
+esac
+_LT_DECL([SP2NL], [lt_SP2NL], [1], [turn spaces into newlines])dnl
+_LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl
+])# _LT_CHECK_SHELL_FEATURES
+
+
+# _LT_PROG_XSI_SHELLFNS
+# ---------------------
+# Bourne and XSI compatible variants of some useful shell functions.
+m4_defun([_LT_PROG_XSI_SHELLFNS],
+[case $xsi_shell in
+ yes)
+ cat << \_LT_EOF >> "$cfgfile"
+
+# func_dirname file append nondir_replacement
+# Compute the dirname of FILE. If nonempty, add APPEND to the result,
+# otherwise set result to NONDIR_REPLACEMENT.
+func_dirname ()
+{
+ case ${1} in
+ */*) func_dirname_result="${1%/*}${2}" ;;
+ * ) func_dirname_result="${3}" ;;
+ esac
+}
+
+# func_basename file
+func_basename ()
+{
+ func_basename_result="${1##*/}"
+}
+
+# func_dirname_and_basename file append nondir_replacement
+# perform func_basename and func_dirname in a single function
+# call:
+# dirname: Compute the dirname of FILE. If nonempty,
+# add APPEND to the result, otherwise set result
+# to NONDIR_REPLACEMENT.
+# value returned in "$func_dirname_result"
+# basename: Compute filename of FILE.
+# value retuned in "$func_basename_result"
+# Implementation must be kept synchronized with func_dirname
+# and func_basename. For efficiency, we do not delegate to
+# those functions but instead duplicate the functionality here.
+func_dirname_and_basename ()
+{
+ case ${1} in
+ */*) func_dirname_result="${1%/*}${2}" ;;
+ * ) func_dirname_result="${3}" ;;
+ esac
+ func_basename_result="${1##*/}"
+}
+
+# func_stripname prefix suffix name
+# strip PREFIX and SUFFIX off of NAME.
+# PREFIX and SUFFIX must not contain globbing or regex special
+# characters, hashes, percent signs, but SUFFIX may contain a leading
+# dot (in which case that matches only a dot).
+func_stripname ()
+{
+ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
+ # positional parameters, so assign one to ordinary parameter first.
+ func_stripname_result=${3}
+ func_stripname_result=${func_stripname_result#"${1}"}
+ func_stripname_result=${func_stripname_result%"${2}"}
+}
+
+# func_opt_split
+func_opt_split ()
+{
+ func_opt_split_opt=${1%%=*}
+ func_opt_split_arg=${1#*=}
+}
+
+# func_lo2o object
+func_lo2o ()
+{
+ case ${1} in
+ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
+ *) func_lo2o_result=${1} ;;
+ esac
+}
+
+# func_xform libobj-or-source
+func_xform ()
+{
+ func_xform_result=${1%.*}.lo
+}
+
+# func_arith arithmetic-term...
+func_arith ()
+{
+ func_arith_result=$(( $[*] ))
+}
+
+# func_len string
+# STRING may not start with a hyphen.
+func_len ()
+{
+ func_len_result=${#1}
+}
+
+_LT_EOF
+ ;;
+ *) # Bourne compatible functions.
+ cat << \_LT_EOF >> "$cfgfile"
+
+# func_dirname file append nondir_replacement
+# Compute the dirname of FILE. If nonempty, add APPEND to the result,
+# otherwise set result to NONDIR_REPLACEMENT.
+func_dirname ()
+{
+ # Extract subdirectory from the argument.
+ func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
+ if test "X$func_dirname_result" = "X${1}"; then
+ func_dirname_result="${3}"
+ else
+ func_dirname_result="$func_dirname_result${2}"
+ fi
+}
+
+# func_basename file
+func_basename ()
+{
+ func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
+}
+
+dnl func_dirname_and_basename
+dnl A portable version of this function is already defined in general.m4sh
+dnl so there is no need for it here.
+
+# func_stripname prefix suffix name
+# strip PREFIX and SUFFIX off of NAME.
+# PREFIX and SUFFIX must not contain globbing or regex special
+# characters, hashes, percent signs, but SUFFIX may contain a leading
+# dot (in which case that matches only a dot).
+# func_strip_suffix prefix name
+func_stripname ()
+{
+ case ${2} in
+ .*) func_stripname_result=`$ECHO "X${3}" \
+ | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;;
+ *) func_stripname_result=`$ECHO "X${3}" \
+ | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;
+ esac
+}
+
+# sed scripts:
+my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q'
+my_sed_long_arg='1s/^-[[^=]]*=//'
+
+# func_opt_split
+func_opt_split ()
+{
+ func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`
+ func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`
+}
+
+# func_lo2o object
+func_lo2o ()
+{
+ func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
+}
+
+# func_xform libobj-or-source
+func_xform ()
+{
+ func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[[^.]]*$/.lo/'`
+}
+
+# func_arith arithmetic-term...
+func_arith ()
+{
+ func_arith_result=`expr "$[@]"`
+}
+
+# func_len string
+# STRING may not start with a hyphen.
+func_len ()
+{
+ func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len`
+}
+
+_LT_EOF
+esac
+
+case $lt_shell_append in
+ yes)
+ cat << \_LT_EOF >> "$cfgfile"
+
+# func_append var value
+# Append VALUE to the end of shell variable VAR.
+func_append ()
+{
+ eval "$[1]+=\$[2]"
+}
+_LT_EOF
+ ;;
+ *)
+ cat << \_LT_EOF >> "$cfgfile"
+
+# func_append var value
+# Append VALUE to the end of shell variable VAR.
+func_append ()
+{
+ eval "$[1]=\$$[1]\$[2]"
+}
+
+_LT_EOF
+ ;;
+ esac
+])
diff --git a/config/ltmain.sh b/config/ltmain.sh
old mode 100644
new mode 100755
index 4598ec6..a72f2fd
--- a/config/ltmain.sh
+++ b/config/ltmain.sh
@@ -1,52 +1,83 @@
-# ltmain.sh - Provide generalized library-building support services.
-# NOTE: Changing this file will not affect anything until you rerun configure.
-#
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
-# 2007 Free Software Foundation, Inc.
-# Originally by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
-#
-# This program is free software; you can redistribute it and/or modify
+# Generated from ltmain.m4sh.
+
+# ltmain.sh (GNU libtool) 2.2.6b
+# Written by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
+
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc.
+# This is free software; see the source for copying conditions. There is NO
+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+# GNU Libtool is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
-# This program is distributed in the hope that it will be useful, but
+# As a special exception to the GNU General Public License,
+# if you distribute this file as part of a program or library that
+# is built using GNU Libtool, you may include this file under the
+# same distribution terms that you use for the rest of that program.
+#
+# GNU Libtool is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-basename="s,^.*/,,g"
-
-# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
-# is ksh but when the shell is invoked as "sh" and the current value of
-# the _XPG environment variable is not equal to 1 (one), the special
-# positional parameter $0, within a function call, is the name of the
-# function.
-progpath="$0"
-
-# The name of this program:
-progname=`echo "$progpath" | $SED $basename`
-modename="$progname"
+# along with GNU Libtool; see the file COPYING. If not, a copy
+# can be downloaded from http://www.gnu.org/licenses/gpl.html,
+# or obtained by writing to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-# Global variables:
-EXIT_SUCCESS=0
-EXIT_FAILURE=1
+# Usage: $progname [OPTION]... [MODE-ARG]...
+#
+# Provide generalized library-building support services.
+#
+# --config show all configuration variables
+# --debug enable verbose shell tracing
+# -n, --dry-run display commands without modifying any files
+# --features display basic configuration information and exit
+# --mode=MODE use operation mode MODE
+# --preserve-dup-deps don't remove duplicate dependency libraries
+# --quiet, --silent don't print informational messages
+# --tag=TAG use configuration variables from tag TAG
+# -v, --verbose print informational messages (default)
+# --version print version information
+# -h, --help print short or long help message
+#
+# MODE must be one of the following:
+#
+# clean remove files from the build directory
+# compile compile a source file into a libtool object
+# execute automatically set library path, then run a program
+# finish complete the installation of libtool libraries
+# install install libraries or executables
+# link create a library or an executable
+# uninstall remove libraries from an installed directory
+#
+# MODE-ARGS vary depending on the MODE.
+# Try `$progname --help --mode=MODE' for a more detailed description of MODE.
+#
+# When reporting a bug, please describe a test case to reproduce it and
+# include the following information:
+#
+# host-triplet: $host
+# shell: $SHELL
+# compiler: $LTCC
+# compiler flags: $LTCFLAGS
+# linker: $LD (gnu? $with_gnu_ld)
+# $progname: (GNU libtool) 2.2.6b
+# automake: $automake_version
+# autoconf: $autoconf_version
+#
+# Report bugs to <bug-libtool at gnu.org>.
PROGRAM=ltmain.sh
PACKAGE=libtool
-VERSION=1.5.24
-TIMESTAMP=" (1.1220.2.455 2007/06/24 02:13:29)"
+VERSION=2.2.6b
+TIMESTAMP=""
+package_revision=1.3017
-# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
+# Be Bourne compatible
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
@@ -60,98 +91,261 @@ fi
BIN_SH=xpg4; export BIN_SH # for Tru64
DUALCASE=1; export DUALCASE # for MKS sh
-# Check that we have a working $echo.
-if test "X$1" = X--no-reexec; then
- # Discard the --no-reexec flag, and continue.
- shift
-elif test "X$1" = X--fallback-echo; then
- # Avoid inline document here, it may be left over
- :
-elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
- # Yippee, $echo works!
- :
-else
- # Restart under the correct shell, and then maybe $echo will work.
- exec $SHELL "$progpath" --no-reexec ${1+"$@"}
-fi
-
-if test "X$1" = X--fallback-echo; then
- # used as fallback echo
- shift
- cat <<EOF
-$*
-EOF
- exit $EXIT_SUCCESS
-fi
-
-default_mode=
-help="Try \`$progname --help' for more information."
-magic="%%%MAGIC variable%%%"
-mkdir="mkdir"
-mv="mv -f"
-rm="rm -f"
-
-# Sed substitution that helps us do robust quoting. It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed="${SED}"' -e 1s/^X//'
-sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
-# test EBCDIC or ASCII
-case `echo X|tr X '\101'` in
- A) # ASCII based system
- # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
- SP2NL='tr \040 \012'
- NL2SP='tr \015\012 \040\040'
- ;;
- *) # EBCDIC based system
- SP2NL='tr \100 \n'
- NL2SP='tr \r\n \100\100'
- ;;
-esac
-
-# NLS nuisances.
+# NLS nuisances: We save the old values to restore during execute mode.
# Only set LANG and LC_ALL to C if already set.
# These must not be set unconditionally because not all systems understand
# e.g. LANG=C (notably SCO).
-# We save the old values to restore during execute mode.
-for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+lt_user_locale=
+lt_safe_locale=
+for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
do
eval "if test \"\${$lt_var+set}\" = set; then
- save_$lt_var=\$$lt_var
- $lt_var=C
+ save_$lt_var=\$$lt_var
+ $lt_var=C
export $lt_var
+ lt_user_locale=\"$lt_var=\\\$save_\$lt_var; \$lt_user_locale\"
+ lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"
fi"
done
+$lt_unset CDPATH
+
+
+
+
+
+: ${CP="cp -f"}
+: ${ECHO="echo"}
+: ${EGREP="/bin/grep -E"}
+: ${FGREP="/bin/grep -F"}
+: ${GREP="/bin/grep"}
+: ${LN_S="ln -s"}
+: ${MAKE="make"}
+: ${MKDIR="mkdir"}
+: ${MV="mv -f"}
+: ${RM="rm -f"}
+: ${SED="/bin/sed"}
+: ${SHELL="${CONFIG_SHELL-/bin/sh}"}
+: ${Xsed="$SED -e 1s/^X//"}
+
+# Global variables:
+EXIT_SUCCESS=0
+EXIT_FAILURE=1
+EXIT_MISMATCH=63 # $? = 63 is used to indicate version mismatch to missing.
+EXIT_SKIP=77 # $? = 77 is used to indicate a skipped test to automake.
+
+exit_status=$EXIT_SUCCESS
+
# Make sure IFS has a sensible default
lt_nl='
'
IFS=" $lt_nl"
-if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
- $echo "$modename: not configured to build any kind of library" 1>&2
- $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2
- exit $EXIT_FAILURE
-fi
+dirname="s,/[^/]*$,,"
+basename="s,^.*/,,"
+
+# func_dirname_and_basename file append nondir_replacement
+# perform func_basename and func_dirname in a single function
+# call:
+# dirname: Compute the dirname of FILE. If nonempty,
+# add APPEND to the result, otherwise set result
+# to NONDIR_REPLACEMENT.
+# value returned in "$func_dirname_result"
+# basename: Compute filename of FILE.
+# value retuned in "$func_basename_result"
+# Implementation must be kept synchronized with func_dirname
+# and func_basename. For efficiency, we do not delegate to
+# those functions but instead duplicate the functionality here.
+func_dirname_and_basename ()
+{
+ # Extract subdirectory from the argument.
+ func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
+ if test "X$func_dirname_result" = "X${1}"; then
+ func_dirname_result="${3}"
+ else
+ func_dirname_result="$func_dirname_result${2}"
+ fi
+ func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
+}
-# Global variables.
-mode=$default_mode
-nonopt=
-prev=
-prevopt=
-run=
-show="$echo"
-show_help=
-execute_dlfiles=
-duplicate_deps=no
-preserve_args=
-lo2o="s/\\.lo\$/.${objext}/"
-o2lo="s/\\.${objext}\$/.lo/"
-extracted_archives=
-extracted_serial=0
+# Generated shell functions inserted here.
+
+# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
+# is ksh but when the shell is invoked as "sh" and the current value of
+# the _XPG environment variable is not equal to 1 (one), the special
+# positional parameter $0, within a function call, is the name of the
+# function.
+progpath="$0"
+
+# The name of this program:
+# In the unlikely event $progname began with a '-', it would play havoc with
+# func_echo (imagine progname=-n), so we prepend ./ in that case:
+func_dirname_and_basename "$progpath"
+progname=$func_basename_result
+case $progname in
+ -*) progname=./$progname ;;
+esac
+
+# Make sure we have an absolute path for reexecution:
+case $progpath in
+ [\\/]*|[A-Za-z]:\\*) ;;
+ *[\\/]*)
+ progdir=$func_dirname_result
+ progdir=`cd "$progdir" && pwd`
+ progpath="$progdir/$progname"
+ ;;
+ *)
+ save_IFS="$IFS"
+ IFS=:
+ for progdir in $PATH; do
+ IFS="$save_IFS"
+ test -x "$progdir/$progname" && break
+ done
+ IFS="$save_IFS"
+ test -n "$progdir" || progdir=`pwd`
+ progpath="$progdir/$progname"
+ ;;
+esac
+
+# Sed substitution that helps us do robust quoting. It backslashifies
+# metacharacters that are still active within double-quoted strings.
+Xsed="${SED}"' -e 1s/^X//'
+sed_quote_subst='s/\([`"$\\]\)/\\\1/g'
+
+# Same as above, but do not quote variable references.
+double_quote_subst='s/\(["`\\]\)/\\\1/g'
+
+# Re-`\' parameter expansions in output of double_quote_subst that were
+# `\'-ed in input to the same. If an odd number of `\' preceded a '$'
+# in input to double_quote_subst, that '$' was protected from expansion.
+# Since each input `\' is now two `\'s, look for any number of runs of
+# four `\'s followed by two `\'s and then a '$'. `\' that '$'.
+bs='\\'
+bs2='\\\\'
+bs4='\\\\\\\\'
+dollar='\$'
+sed_double_backslash="\
+ s/$bs4/&\\
+/g
+ s/^$bs2$dollar/$bs&/
+ s/\\([^$bs]\\)$bs2$dollar/\\1$bs2$bs$dollar/g
+ s/\n//g"
+
+# Standard options:
+opt_dry_run=false
+opt_help=false
+opt_quiet=false
+opt_verbose=false
+opt_warning=:
+
+# func_echo arg...
+# Echo program name prefixed message, along with the current mode
+# name if it has been set yet.
+func_echo ()
+{
+ $ECHO "$progname${mode+: }$mode: $*"
+}
+
+# func_verbose arg...
+# Echo program name prefixed message in verbose mode only.
+func_verbose ()
+{
+ $opt_verbose && func_echo ${1+"$@"}
+
+ # A bug in bash halts the script if the last line of a function
+ # fails when set -e is in force, so we need another command to
+ # work around that:
+ :
+}
+
+# func_error arg...
+# Echo program name prefixed message to standard error.
+func_error ()
+{
+ $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2
+}
+
+# func_warning arg...
+# Echo program name prefixed warning message to standard error.
+func_warning ()
+{
+ $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2
+
+ # bash bug again:
+ :
+}
+
+# func_fatal_error arg...
+# Echo program name prefixed message to standard error, and exit.
+func_fatal_error ()
+{
+ func_error ${1+"$@"}
+ exit $EXIT_FAILURE
+}
+
+# func_fatal_help arg...
+# Echo program name prefixed message to standard error, followed by
+# a help hint, and exit.
+func_fatal_help ()
+{
+ func_error ${1+"$@"}
+ func_fatal_error "$help"
+}
+help="Try \`$progname --help' for more information." ## default
+
+
+# func_grep expression filename
+# Check whether EXPRESSION matches any line of FILENAME, without output.
+func_grep ()
+{
+ $GREP "$1" "$2" >/dev/null 2>&1
+}
+
+
+# func_mkdir_p directory-path
+# Make sure the entire path to DIRECTORY-PATH is available.
+func_mkdir_p ()
+{
+ my_directory_path="$1"
+ my_dir_list=
+
+ if test -n "$my_directory_path" && test "$opt_dry_run" != ":"; then
+
+ # Protect directory names starting with `-'
+ case $my_directory_path in
+ -*) my_directory_path="./$my_directory_path" ;;
+ esac
+
+ # While some portion of DIR does not yet exist...
+ while test ! -d "$my_directory_path"; do
+ # ...make a list in topmost first order. Use a colon delimited
+ # list incase some portion of path contains whitespace.
+ my_dir_list="$my_directory_path:$my_dir_list"
+
+ # If the last portion added has no slash in it, the list is done
+ case $my_directory_path in */*) ;; *) break ;; esac
+
+ # ...otherwise throw away the child directory and loop
+ my_directory_path=`$ECHO "X$my_directory_path" | $Xsed -e "$dirname"`
+ done
+ my_dir_list=`$ECHO "X$my_dir_list" | $Xsed -e 's,:*$,,'`
+
+ save_mkdir_p_IFS="$IFS"; IFS=':'
+ for my_dir in $my_dir_list; do
+ IFS="$save_mkdir_p_IFS"
+ # mkdir can fail with a `File exist' error if two processes
+ # try to create one of the directories concurrently. Don't
+ # stop in that case!
+ $MKDIR "$my_dir" 2>/dev/null || :
+ done
+ IFS="$save_mkdir_p_IFS"
+
+ # Bail out if we (or some other process) failed to create a directory.
+ test -d "$my_directory_path" || \
+ func_fatal_error "Failed to create \`$1'"
+ fi
+}
-#####################################
-# Shell function definitions:
-# This seems to be the best place for them
# func_mktempdir [string]
# Make a temporary directory that won't clash with other running
@@ -161,7 +355,7 @@ func_mktempdir ()
{
my_template="${TMPDIR-/tmp}/${1-$progname}"
- if test "$run" = ":"; then
+ if test "$opt_dry_run" = ":"; then
# Return a directory name, but don't create it in dry-run mode
my_tmpdir="${my_template}-$$"
else
@@ -170,528 +364,789 @@ func_mktempdir ()
my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null`
if test ! -d "$my_tmpdir"; then
- # Failing that, at least try and use $RANDOM to avoid a race
- my_tmpdir="${my_template}-${RANDOM-0}$$"
+ # Failing that, at least try and use $RANDOM to avoid a race
+ my_tmpdir="${my_template}-${RANDOM-0}$$"
- save_mktempdir_umask=`umask`
- umask 0077
- $mkdir "$my_tmpdir"
- umask $save_mktempdir_umask
+ save_mktempdir_umask=`umask`
+ umask 0077
+ $MKDIR "$my_tmpdir"
+ umask $save_mktempdir_umask
fi
# If we're not in dry-run mode, bomb out on failure
- test -d "$my_tmpdir" || {
- $echo "cannot create temporary directory \`$my_tmpdir'" 1>&2
- exit $EXIT_FAILURE
- }
+ test -d "$my_tmpdir" || \
+ func_fatal_error "cannot create temporary directory \`$my_tmpdir'"
fi
- $echo "X$my_tmpdir" | $Xsed
+ $ECHO "X$my_tmpdir" | $Xsed
}
-# func_win32_libid arg
-# return the library type of file 'arg'
-#
-# Need a lot of goo to handle *both* DLLs and import libs
-# Has to be a shell function in order to 'eat' the argument
-# that is supplied when $file_magic_command is called.
-func_win32_libid ()
+# func_quote_for_eval arg
+# Aesthetically quote ARG to be evaled later.
+# This function returns two values: FUNC_QUOTE_FOR_EVAL_RESULT
+# is double-quoted, suitable for a subsequent eval, whereas
+# FUNC_QUOTE_FOR_EVAL_UNQUOTED_RESULT has merely all characters
+# which are still active within double quotes backslashified.
+func_quote_for_eval ()
{
- win32_libid_type="unknown"
- win32_fileres=`file -L $1 2>/dev/null`
- case $win32_fileres in
- *ar\ archive\ import\ library*) # definitely import
- win32_libid_type="x86 archive import"
- ;;
- *ar\ archive*) # could be an import, or static
- if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
- $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
- win32_nmres=`eval $NM -f posix -A $1 | \
- $SED -n -e '1,100{
- / I /{
- s,.*,import,
- p
- q
- }
- }'`
- case $win32_nmres in
- import*) win32_libid_type="x86 archive import";;
- *) win32_libid_type="x86 archive static";;
- esac
- fi
- ;;
- *DLL*)
- win32_libid_type="x86 DLL"
- ;;
- *executable*) # but shell scripts are "executable" too...
- case $win32_fileres in
- *MS\ Windows\ PE\ Intel*)
- win32_libid_type="x86 DLL"
- ;;
+ case $1 in
+ *[\\\`\"\$]*)
+ func_quote_for_eval_unquoted_result=`$ECHO "X$1" | $Xsed -e "$sed_quote_subst"` ;;
+ *)
+ func_quote_for_eval_unquoted_result="$1" ;;
+ esac
+
+ case $func_quote_for_eval_unquoted_result in
+ # Double-quote args containing shell metacharacters to delay
+ # word splitting, command substitution and and variable
+ # expansion for a subsequent eval.
+ # Many Bourne shells cannot handle close brackets correctly
+ # in scan sets, so we specify it separately.
+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
+ func_quote_for_eval_result="\"$func_quote_for_eval_unquoted_result\""
+ ;;
+ *)
+ func_quote_for_eval_result="$func_quote_for_eval_unquoted_result"
esac
- ;;
- esac
- $echo $win32_libid_type
}
-# func_infer_tag arg
-# Infer tagged configuration to use if any are available and
-# if one wasn't chosen via the "--tag" command line option.
-# Only attempt this if the compiler in the base compile
-# command doesn't match the default compiler.
-# arg is usually of the form 'gcc ...'
-func_infer_tag ()
+# func_quote_for_expand arg
+# Aesthetically quote ARG to be evaled later; same as above,
+# but do not quote variable references.
+func_quote_for_expand ()
{
- if test -n "$available_tags" && test -z "$tagname"; then
- CC_quoted=
- for arg in $CC; do
- case $arg in
- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
- arg="\"$arg\""
- ;;
- esac
- CC_quoted="$CC_quoted $arg"
- done
- case $@ in
- # Blanks in the command may have been stripped by the calling shell,
- # but not from the CC environment variable when configure was run.
- " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*) ;;
- # Blanks at the start of $base_compile will cause this to fail
- # if we don't check for them as well.
+ case $1 in
+ *[\\\`\"]*)
+ my_arg=`$ECHO "X$1" | $Xsed \
+ -e "$double_quote_subst" -e "$sed_double_backslash"` ;;
*)
- for z in $available_tags; do
- if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
- # Evaluate the configuration.
- eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
- CC_quoted=
- for arg in $CC; do
- # Double-quote args containing other shell metacharacters.
- case $arg in
- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
- arg="\"$arg\""
- ;;
- esac
- CC_quoted="$CC_quoted $arg"
- done
- case "$@ " in
- " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*)
- # The compiler in the base compile command matches
- # the one in the tagged configuration.
- # Assume this is the tagged configuration we want.
- tagname=$z
- break
- ;;
- esac
- fi
- done
- # If $tagname still isn't set, then no tagged configuration
- # was found and let the user know that the "--tag" command
- # line option must be used.
- if test -z "$tagname"; then
- $echo "$modename: unable to infer tagged configuration"
- $echo "$modename: specify a tag with \`--tag'" 1>&2
- exit $EXIT_FAILURE
-# else
-# $echo "$modename: using $tagname tagged configuration"
- fi
- ;;
- esac
- fi
+ my_arg="$1" ;;
+ esac
+
+ case $my_arg in
+ # Double-quote args containing shell metacharacters to delay
+ # word splitting and command substitution for a subsequent eval.
+ # Many Bourne shells cannot handle close brackets correctly
+ # in scan sets, so we specify it separately.
+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
+ my_arg="\"$my_arg\""
+ ;;
+ esac
+
+ func_quote_for_expand_result="$my_arg"
}
-# func_extract_an_archive dir oldlib
-func_extract_an_archive ()
+# func_show_eval cmd [fail_exp]
+# Unless opt_silent is true, then output CMD. Then, if opt_dryrun is
+# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP
+# is given, then evaluate it.
+func_show_eval ()
{
- f_ex_an_ar_dir="$1"; shift
- f_ex_an_ar_oldlib="$1"
+ my_cmd="$1"
+ my_fail_exp="${2-:}"
- $show "(cd $f_ex_an_ar_dir && $AR x $f_ex_an_ar_oldlib)"
- $run eval "(cd \$f_ex_an_ar_dir && $AR x \$f_ex_an_ar_oldlib)" || exit $?
- if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
- :
- else
- $echo "$modename: ERROR: object name conflicts: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib" 1>&2
- exit $EXIT_FAILURE
+ ${opt_silent-false} || {
+ func_quote_for_expand "$my_cmd"
+ eval "func_echo $func_quote_for_expand_result"
+ }
+
+ if ${opt_dry_run-false}; then :; else
+ eval "$my_cmd"
+ my_status=$?
+ if test "$my_status" -eq 0; then :; else
+ eval "(exit $my_status); $my_fail_exp"
+ fi
fi
}
-# func_extract_archives gentop oldlib ...
-func_extract_archives ()
+
+# func_show_eval_locale cmd [fail_exp]
+# Unless opt_silent is true, then output CMD. Then, if opt_dryrun is
+# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP
+# is given, then evaluate it. Use the saved locale for evaluation.
+func_show_eval_locale ()
{
- my_gentop="$1"; shift
- my_oldlibs=${1+"$@"}
- my_oldobjs=""
- my_xlib=""
- my_xabs=""
- my_xdir=""
- my_status=""
-
- $show "${rm}r $my_gentop"
- $run ${rm}r "$my_gentop"
- $show "$mkdir $my_gentop"
- $run $mkdir "$my_gentop"
- my_status=$?
- if test "$my_status" -ne 0 && test ! -d "$my_gentop"; then
- exit $my_status
+ my_cmd="$1"
+ my_fail_exp="${2-:}"
+
+ ${opt_silent-false} || {
+ func_quote_for_expand "$my_cmd"
+ eval "func_echo $func_quote_for_expand_result"
+ }
+
+ if ${opt_dry_run-false}; then :; else
+ eval "$lt_user_locale
+ $my_cmd"
+ my_status=$?
+ eval "$lt_safe_locale"
+ if test "$my_status" -eq 0; then :; else
+ eval "(exit $my_status); $my_fail_exp"
+ fi
fi
+}
- for my_xlib in $my_oldlibs; do
- # Extract the objects.
- case $my_xlib in
- [\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;;
- *) my_xabs=`pwd`"/$my_xlib" ;;
- esac
- my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
- my_xlib_u=$my_xlib
- while :; do
- case " $extracted_archives " in
- *" $my_xlib_u "*)
- extracted_serial=`expr $extracted_serial + 1`
- my_xlib_u=lt$extracted_serial-$my_xlib ;;
- *) break ;;
- esac
- done
- extracted_archives="$extracted_archives $my_xlib_u"
- my_xdir="$my_gentop/$my_xlib_u"
- $show "${rm}r $my_xdir"
- $run ${rm}r "$my_xdir"
- $show "$mkdir $my_xdir"
- $run $mkdir "$my_xdir"
- exit_status=$?
- if test "$exit_status" -ne 0 && test ! -d "$my_xdir"; then
- exit $exit_status
- fi
- case $host in
- *-darwin*)
- $show "Extracting $my_xabs"
- # Do not bother doing anything if just a dry run
- if test -z "$run"; then
- darwin_orig_dir=`pwd`
- cd $my_xdir || exit $?
- darwin_archive=$my_xabs
- darwin_curdir=`pwd`
- darwin_base_archive=`$echo "X$darwin_archive" | $Xsed -e 's%^.*/%%'`
- darwin_arches=`lipo -info "$darwin_archive" 2>/dev/null | $EGREP Architectures 2>/dev/null`
- if test -n "$darwin_arches"; then
- darwin_arches=`echo "$darwin_arches" | $SED -e 's/.*are://'`
- darwin_arch=
- $show "$darwin_base_archive has multiple architectures $darwin_arches"
- for darwin_arch in $darwin_arches ; do
- mkdir -p "unfat-$$/${darwin_base_archive}-${darwin_arch}"
- lipo -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}"
- cd "unfat-$$/${darwin_base_archive}-${darwin_arch}"
- func_extract_an_archive "`pwd`" "${darwin_base_archive}"
- cd "$darwin_curdir"
- $rm "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}"
- done # $darwin_arches
- ## Okay now we have a bunch of thin objects, gotta fatten them up :)
- darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print| xargs basename | sort -u | $NL2SP`
- darwin_file=
- darwin_files=
- for darwin_file in $darwin_filelist; do
- darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
- lipo -create -output "$darwin_file" $darwin_files
- done # $darwin_filelist
- ${rm}r unfat-$$
- cd "$darwin_orig_dir"
- else
- cd "$darwin_orig_dir"
- func_extract_an_archive "$my_xdir" "$my_xabs"
- fi # $darwin_arches
- fi # $run
- ;;
- *)
- func_extract_an_archive "$my_xdir" "$my_xabs"
- ;;
- esac
- my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
- done
- func_extract_archives_result="$my_oldobjs"
+
+
+
+# func_version
+# Echo version message to standard output and exit.
+func_version ()
+{
+ $SED -n '/^# '$PROGRAM' (GNU /,/# warranty; / {
+ s/^# //
+ s/^# *$//
+ s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/
+ p
+ }' < "$progpath"
+ exit $?
+}
+
+# func_usage
+# Echo short help message to standard output and exit.
+func_usage ()
+{
+ $SED -n '/^# Usage:/,/# -h/ {
+ s/^# //
+ s/^# *$//
+ s/\$progname/'$progname'/
+ p
+ }' < "$progpath"
+ $ECHO
+ $ECHO "run \`$progname --help | more' for full usage"
+ exit $?
+}
+
+# func_help
+# Echo long help message to standard output and exit.
+func_help ()
+{
+ $SED -n '/^# Usage:/,/# Report bugs to/ {
+ s/^# //
+ s/^# *$//
+ s*\$progname*'$progname'*
+ s*\$host*'"$host"'*
+ s*\$SHELL*'"$SHELL"'*
+ s*\$LTCC*'"$LTCC"'*
+ s*\$LTCFLAGS*'"$LTCFLAGS"'*
+ s*\$LD*'"$LD"'*
+ s/\$with_gnu_ld/'"$with_gnu_ld"'/
+ s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/
+ s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
+ p
+ }' < "$progpath"
+ exit $?
+}
+
+# func_missing_arg argname
+# Echo program name prefixed message to standard error and set global
+# exit_cmd.
+func_missing_arg ()
+{
+ func_error "missing argument for $1"
+ exit_cmd=exit
}
-# End of Shell function definitions
-#####################################
-# Darwin sucks
-eval std_shrext=\"$shrext_cmds\"
+exit_cmd=:
-disable_libs=no
-# Parse our command line options once, thoroughly.
-while test "$#" -gt 0
-do
- arg="$1"
+
+
+
+# Check that we have a working $ECHO.
+if test "X$1" = X--no-reexec; then
+ # Discard the --no-reexec flag, and continue.
shift
+elif test "X$1" = X--fallback-echo; then
+ # Avoid inline document here, it may be left over
+ :
+elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t'; then
+ # Yippee, $ECHO works!
+ :
+else
+ # Restart under the correct shell, and then maybe $ECHO will work.
+ exec $SHELL "$progpath" --no-reexec ${1+"$@"}
+fi
- case $arg in
- -*=*) optarg=`$echo "X$arg" | $Xsed -e 's/[-_a-zA-Z0-9]*=//'` ;;
- *) optarg= ;;
- esac
+if test "X$1" = X--fallback-echo; then
+ # used as fallback echo
+ shift
+ cat <<EOF
+$*
+EOF
+ exit $EXIT_SUCCESS
+fi
- # If the previous option needs an argument, assign it.
- if test -n "$prev"; then
- case $prev in
- execute_dlfiles)
- execute_dlfiles="$execute_dlfiles $arg"
- ;;
- tag)
- tagname="$arg"
- preserve_args="${preserve_args}=$arg"
-
- # Check whether tagname contains only valid characters
- case $tagname in
- *[!-_A-Za-z0-9,/]*)
- $echo "$progname: invalid tag name: $tagname" 1>&2
- exit $EXIT_FAILURE
- ;;
- esac
+magic="%%%MAGIC variable%%%"
+magic_exe="%%%MAGIC EXE variable%%%"
- case $tagname in
- CC)
- # Don't test for the "default" C tag, as we know, it's there, but
- # not specially marked.
- ;;
- *)
- if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$progpath" > /dev/null; then
- taglist="$taglist $tagname"
- # Evaluate the configuration.
- eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $progpath`"
- else
- $echo "$progname: ignoring unknown tag $tagname" 1>&2
- fi
- ;;
- esac
- ;;
- *)
- eval "$prev=\$arg"
- ;;
- esac
+# Global variables.
+# $mode is unset
+nonopt=
+execute_dlfiles=
+preserve_args=
+lo2o="s/\\.lo\$/.${objext}/"
+o2lo="s/\\.${objext}\$/.lo/"
+extracted_archives=
+extracted_serial=0
- prev=
- prevopt=
- continue
- fi
+opt_dry_run=false
+opt_duplicate_deps=false
+opt_silent=false
+opt_debug=:
- # Have we seen a non-optional argument yet?
- case $arg in
- --help)
- show_help=yes
- ;;
+# If this variable is set in any of the actions, the command in it
+# will be execed at the end. This prevents here-documents from being
+# left over by shells.
+exec_cmd=
+
+# func_fatal_configuration arg...
+# Echo program name prefixed message to standard error, followed by
+# a configuration failure hint, and exit.
+func_fatal_configuration ()
+{
+ func_error ${1+"$@"}
+ func_error "See the $PACKAGE documentation for more information."
+ func_fatal_error "Fatal configuration error."
+}
- --version)
- echo "\
-$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP
-Copyright (C) 2007 Free Software Foundation, Inc.
-This is free software; see the source for copying conditions. There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
- exit $?
- ;;
+# func_config
+# Display the configuration for all the tags in this script.
+func_config ()
+{
+ re_begincf='^# ### BEGIN LIBTOOL'
+ re_endcf='^# ### END LIBTOOL'
+
+ # Default configuration.
+ $SED "1,/$re_begincf CONFIG/d;/$re_endcf CONFIG/,\$d" < "$progpath"
- --config)
- ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $progpath
# Now print the configurations for the tags.
for tagname in $taglist; do
- ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$progpath"
+ $SED -n "/$re_begincf TAG CONFIG: $tagname\$/,/$re_endcf TAG CONFIG: $tagname\$/p" < "$progpath"
done
- exit $?
- ;;
-
- --debug)
- $echo "$progname: enabling shell trace mode"
- set -x
- preserve_args="$preserve_args $arg"
- ;;
- --dry-run | -n)
- run=:
- ;;
+ exit $?
+}
- --features)
- $echo "host: $host"
+# func_features
+# Display the features supported by this script.
+func_features ()
+{
+ $ECHO "host: $host"
if test "$build_libtool_libs" = yes; then
- $echo "enable shared libraries"
+ $ECHO "enable shared libraries"
else
- $echo "disable shared libraries"
+ $ECHO "disable shared libraries"
fi
if test "$build_old_libs" = yes; then
- $echo "enable static libraries"
+ $ECHO "enable static libraries"
else
- $echo "disable static libraries"
+ $ECHO "disable static libraries"
fi
+
exit $?
- ;;
+}
- --finish) mode="finish" ;;
+# func_enable_tag tagname
+# Verify that TAGNAME is valid, and either flag an error and exit, or
+# enable the TAGNAME tag. We also add TAGNAME to the global $taglist
+# variable here.
+func_enable_tag ()
+{
+ # Global variable:
+ tagname="$1"
- --mode) prevopt="--mode" prev=mode ;;
- --mode=*) mode="$optarg" ;;
+ re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$"
+ re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$"
+ sed_extractcf="/$re_begincf/,/$re_endcf/p"
- --preserve-dup-deps) duplicate_deps="yes" ;;
+ # Validate tagname.
+ case $tagname in
+ *[!-_A-Za-z0-9,/]*)
+ func_fatal_error "invalid tag name: $tagname"
+ ;;
+ esac
- --quiet | --silent)
- show=:
- preserve_args="$preserve_args $arg"
- ;;
+ # Don't test for the "default" C tag, as we know it's
+ # there but not specially marked.
+ case $tagname in
+ CC) ;;
+ *)
+ if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then
+ taglist="$taglist $tagname"
+
+ # Evaluate the configuration. Be careful to quote the path
+ # and the sed script, to avoid splitting on whitespace, but
+ # also don't use non-portable quotes within backquotes within
+ # quotes we have to do it in 2 steps:
+ extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"`
+ eval "$extractedcf"
+ else
+ func_error "ignoring unknown tag $tagname"
+ fi
+ ;;
+ esac
+}
+
+# Parse options once, thoroughly. This comes as soon as possible in
+# the script to make things like `libtool --version' happen quickly.
+{
- --tag)
- prevopt="--tag"
- prev=tag
- preserve_args="$preserve_args --tag"
+ # Shorthand for --mode=foo, only valid as the first argument
+ case $1 in
+ clean|clea|cle|cl)
+ shift; set dummy --mode clean ${1+"$@"}; shift
;;
- --tag=*)
- set tag "$optarg" ${1+"$@"}
- shift
- prev=tag
- preserve_args="$preserve_args --tag"
+ compile|compil|compi|comp|com|co|c)
+ shift; set dummy --mode compile ${1+"$@"}; shift
;;
-
- -dlopen)
- prevopt="-dlopen"
- prev=execute_dlfiles
+ execute|execut|execu|exec|exe|ex|e)
+ shift; set dummy --mode execute ${1+"$@"}; shift
;;
-
- -*)
- $echo "$modename: unrecognized option \`$arg'" 1>&2
- $echo "$help" 1>&2
- exit $EXIT_FAILURE
+ finish|finis|fini|fin|fi|f)
+ shift; set dummy --mode finish ${1+"$@"}; shift
;;
-
- *)
- nonopt="$arg"
- break
+ install|instal|insta|inst|ins|in|i)
+ shift; set dummy --mode install ${1+"$@"}; shift
+ ;;
+ link|lin|li|l)
+ shift; set dummy --mode link ${1+"$@"}; shift
+ ;;
+ uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
+ shift; set dummy --mode uninstall ${1+"$@"}; shift
;;
esac
-done
-if test -n "$prevopt"; then
- $echo "$modename: option \`$prevopt' requires an argument" 1>&2
- $echo "$help" 1>&2
- exit $EXIT_FAILURE
-fi
+ # Parse non-mode specific arguments:
+ while test "$#" -gt 0; do
+ opt="$1"
+ shift
-case $disable_libs in
-no)
- ;;
-shared)
- build_libtool_libs=no
- build_old_libs=yes
- ;;
-static)
- build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac`
- ;;
-esac
+ case $opt in
+ --config) func_config ;;
-# If this variable is set in any of the actions, the command in it
-# will be execed at the end. This prevents here-documents from being
-# left over by shells.
-exec_cmd=
+ --debug) preserve_args="$preserve_args $opt"
+ func_echo "enabling shell trace mode"
+ opt_debug='set -x'
+ $opt_debug
+ ;;
-if test -z "$show_help"; then
+ -dlopen) test "$#" -eq 0 && func_missing_arg "$opt" && break
+ execute_dlfiles="$execute_dlfiles $1"
+ shift
+ ;;
- # Infer the operation mode.
- if test -z "$mode"; then
- $echo "*** Warning: inferring the mode of operation is deprecated." 1>&2
- $echo "*** Future versions of Libtool will require --mode=MODE be specified." 1>&2
- case $nonopt in
- *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*)
- mode=link
- for arg
- do
- case $arg in
- -c)
- mode=compile
- break
- ;;
- esac
- done
- ;;
- *db | *dbx | *strace | *truss)
- mode=execute
- ;;
- *install*|cp|mv)
- mode=install
- ;;
- *rm)
- mode=uninstall
+ --dry-run | -n) opt_dry_run=: ;;
+ --features) func_features ;;
+ --finish) mode="finish" ;;
+
+ --mode) test "$#" -eq 0 && func_missing_arg "$opt" && break
+ case $1 in
+ # Valid mode arguments:
+ clean) ;;
+ compile) ;;
+ execute) ;;
+ finish) ;;
+ install) ;;
+ link) ;;
+ relink) ;;
+ uninstall) ;;
+
+ # Catch anything else as an error
+ *) func_error "invalid argument for $opt"
+ exit_cmd=exit
+ break
+ ;;
+ esac
+
+ mode="$1"
+ shift
+ ;;
+
+ --preserve-dup-deps)
+ opt_duplicate_deps=: ;;
+
+ --quiet|--silent) preserve_args="$preserve_args $opt"
+ opt_silent=:
+ ;;
+
+ --verbose| -v) preserve_args="$preserve_args $opt"
+ opt_silent=false
+ ;;
+
+ --tag) test "$#" -eq 0 && func_missing_arg "$opt" && break
+ preserve_args="$preserve_args $opt $1"
+ func_enable_tag "$1" # tagname is set here
+ shift
+ ;;
+
+ # Separate optargs to long options:
+ -dlopen=*|--mode=*|--tag=*)
+ func_opt_split "$opt"
+ set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"}
+ shift
+ ;;
+
+ -\?|-h) func_usage ;;
+ --help) opt_help=: ;;
+ --version) func_version ;;
+
+ -*) func_fatal_help "unrecognized option \`$opt'" ;;
+
+ *) nonopt="$opt"
+ break
+ ;;
+ esac
+ done
+
+
+ case $host in
+ *cygwin* | *mingw* | *pw32* | *cegcc*)
+ # don't eliminate duplications in $postdeps and $predeps
+ opt_duplicate_compiler_generated_deps=:
;;
*)
- # If we have no mode, but dlfiles were specified, then do execute mode.
- test -n "$execute_dlfiles" && mode=execute
+ opt_duplicate_compiler_generated_deps=$opt_duplicate_deps
+ ;;
+ esac
- # Just use the default operation mode.
- if test -z "$mode"; then
- if test -n "$nonopt"; then
- $echo "$modename: warning: cannot infer operation mode from \`$nonopt'" 1>&2
- else
- $echo "$modename: warning: cannot infer operation mode without MODE-ARGS" 1>&2
- fi
+ # Having warned about all mis-specified options, bail out if
+ # anything was wrong.
+ $exit_cmd $EXIT_FAILURE
+}
+
+# func_check_version_match
+# Ensure that we are using m4 macros, and libtool script from the same
+# release of libtool.
+func_check_version_match ()
+{
+ if test "$package_revision" != "$macro_revision"; then
+ if test "$VERSION" != "$macro_version"; then
+ if test -z "$macro_version"; then
+ cat >&2 <<_LT_EOF
+$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
+$progname: definition of this LT_INIT comes from an older release.
+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
+$progname: and run autoconf again.
+_LT_EOF
+ else
+ cat >&2 <<_LT_EOF
+$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
+$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
+$progname: and run autoconf again.
+_LT_EOF
fi
- ;;
- esac
+ else
+ cat >&2 <<_LT_EOF
+$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision,
+$progname: but the definition of this LT_INIT comes from revision $macro_revision.
+$progname: You should recreate aclocal.m4 with macros from revision $package_revision
+$progname: of $PACKAGE $VERSION and run autoconf again.
+_LT_EOF
+ fi
+
+ exit $EXIT_MISMATCH
+ fi
+}
+
+
+## ----------- ##
+## Main. ##
+## ----------- ##
+
+$opt_help || {
+ # Sanity checks first:
+ func_check_version_match
+
+ if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
+ func_fatal_configuration "not configured to build any kind of library"
fi
+ test -z "$mode" && func_fatal_error "error: you must specify a MODE."
+
+
+ # Darwin sucks
+ eval std_shrext=\"$shrext_cmds\"
+
+
# Only execute mode is allowed to have -dlopen flags.
if test -n "$execute_dlfiles" && test "$mode" != execute; then
- $echo "$modename: unrecognized option \`-dlopen'" 1>&2
- $echo "$help" 1>&2
+ func_error "unrecognized option \`-dlopen'"
+ $ECHO "$help" 1>&2
exit $EXIT_FAILURE
fi
# Change the help message to a mode-specific one.
generic_help="$help"
- help="Try \`$modename --help --mode=$mode' for more information."
+ help="Try \`$progname --help --mode=$mode' for more information."
+}
- # These modes are in order of execution frequency so that they run quickly.
- case $mode in
- # libtool compile mode
- compile)
- modename="$modename: compile"
- # Get the compilation command and the source file.
- base_compile=
- srcfile="$nonopt" # always keep a non-empty value in "srcfile"
- suppress_opt=yes
- suppress_output=
- arg_mode=normal
- libobj=
- later=
- for arg
- do
- case $arg_mode in
- arg )
- # do not "continue". Instead, add this to base_compile
- lastarg="$arg"
- arg_mode=normal
- ;;
+# func_lalib_p file
+# True iff FILE is a libtool `.la' library or `.lo' object file.
+# This function is only a basic sanity check; it will hardly flush out
+# determined imposters.
+func_lalib_p ()
+{
+ test -f "$1" &&
+ $SED -e 4q "$1" 2>/dev/null \
+ | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1
+}
- target )
- libobj="$arg"
- arg_mode=normal
- continue
- ;;
+# func_lalib_unsafe_p file
+# True iff FILE is a libtool `.la' library or `.lo' object file.
+# This function implements the same check as func_lalib_p without
+# resorting to external programs. To this end, it redirects stdin and
+# closes it afterwards, without saving the original file descriptor.
+# As a safety measure, use it only where a negative result would be
+# fatal anyway. Works if `file' does not exist.
+func_lalib_unsafe_p ()
+{
+ lalib_p=no
+ if test -f "$1" && test -r "$1" && exec 5<&0 <"$1"; then
+ for lalib_p_l in 1 2 3 4
+ do
+ read lalib_p_line
+ case "$lalib_p_line" in
+ \#\ Generated\ by\ *$PACKAGE* ) lalib_p=yes; break;;
+ esac
+ done
+ exec 0<&5 5<&-
+ fi
+ test "$lalib_p" = yes
+}
- normal )
- # Accept any command-line options.
- case $arg in
- -o)
- if test -n "$libobj" ; then
- $echo "$modename: you cannot specify \`-o' more than once" 1>&2
- exit $EXIT_FAILURE
- fi
- arg_mode=target
- continue
- ;;
+# func_ltwrapper_script_p file
+# True iff FILE is a libtool wrapper script
+# This function is only a basic sanity check; it will hardly flush out
+# determined imposters.
+func_ltwrapper_script_p ()
+{
+ func_lalib_p "$1"
+}
- -static | -prefer-pic | -prefer-non-pic)
- later="$later $arg"
- continue
- ;;
+# func_ltwrapper_executable_p file
+# True iff FILE is a libtool wrapper executable
+# This function is only a basic sanity check; it will hardly flush out
+# determined imposters.
+func_ltwrapper_executable_p ()
+{
+ func_ltwrapper_exec_suffix=
+ case $1 in
+ *.exe) ;;
+ *) func_ltwrapper_exec_suffix=.exe ;;
+ esac
+ $GREP "$magic_exe" "$1$func_ltwrapper_exec_suffix" >/dev/null 2>&1
+}
- -no-suppress)
+# func_ltwrapper_scriptname file
+# Assumes file is an ltwrapper_executable
+# uses $file to determine the appropriate filename for a
+# temporary ltwrapper_script.
+func_ltwrapper_scriptname ()
+{
+ func_ltwrapper_scriptname_result=""
+ if func_ltwrapper_executable_p "$1"; then
+ func_dirname_and_basename "$1" "" "."
+ func_stripname '' '.exe' "$func_basename_result"
+ func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
+ fi
+}
+
+# func_ltwrapper_p file
+# True iff FILE is a libtool wrapper script or wrapper executable
+# This function is only a basic sanity check; it will hardly flush out
+# determined imposters.
+func_ltwrapper_p ()
+{
+ func_ltwrapper_script_p "$1" || func_ltwrapper_executable_p "$1"
+}
+
+
+# func_execute_cmds commands fail_cmd
+# Execute tilde-delimited COMMANDS.
+# If FAIL_CMD is given, eval that upon failure.
+# FAIL_CMD may read-access the current command in variable CMD!
+func_execute_cmds ()
+{
+ $opt_debug
+ save_ifs=$IFS; IFS='~'
+ for cmd in $1; do
+ IFS=$save_ifs
+ eval cmd=\"$cmd\"
+ func_show_eval "$cmd" "${2-:}"
+ done
+ IFS=$save_ifs
+}
+
+
+# func_source file
+# Source FILE, adding directory component if necessary.
+# Note that it is not necessary on cygwin/mingw to append a dot to
+# FILE even if both FILE and FILE.exe exist: automatic-append-.exe
+# behavior happens only for exec(3), not for open(2)! Also, sourcing
+# `FILE.' does not work on cygwin managed mounts.
+func_source ()
+{
+ $opt_debug
+ case $1 in
+ */* | *\\*) . "$1" ;;
+ *) . "./$1" ;;
+ esac
+}
+
+
+# func_infer_tag arg
+# Infer tagged configuration to use if any are available and
+# if one wasn't chosen via the "--tag" command line option.
+# Only attempt this if the compiler in the base compile
+# command doesn't match the default compiler.
+# arg is usually of the form 'gcc ...'
+func_infer_tag ()
+{
+ $opt_debug
+ if test -n "$available_tags" && test -z "$tagname"; then
+ CC_quoted=
+ for arg in $CC; do
+ func_quote_for_eval "$arg"
+ CC_quoted="$CC_quoted $func_quote_for_eval_result"
+ done
+ case $@ in
+ # Blanks in the command may have been stripped by the calling shell,
+ # but not from the CC environment variable when configure was run.
+ " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*) ;;
+ # Blanks at the start of $base_compile will cause this to fail
+ # if we don't check for them as well.
+ *)
+ for z in $available_tags; do
+ if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
+ # Evaluate the configuration.
+ eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
+ CC_quoted=
+ for arg in $CC; do
+ # Double-quote args containing other shell metacharacters.
+ func_quote_for_eval "$arg"
+ CC_quoted="$CC_quoted $func_quote_for_eval_result"
+ done
+ case "$@ " in
+ " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*)
+ # The compiler in the base compile command matches
+ # the one in the tagged configuration.
+ # Assume this is the tagged configuration we want.
+ tagname=$z
+ break
+ ;;
+ esac
+ fi
+ done
+ # If $tagname still isn't set, then no tagged configuration
+ # was found and let the user know that the "--tag" command
+ # line option must be used.
+ if test -z "$tagname"; then
+ func_echo "unable to infer tagged configuration"
+ func_fatal_error "specify a tag with \`--tag'"
+# else
+# func_verbose "using $tagname tagged configuration"
+ fi
+ ;;
+ esac
+ fi
+}
+
+
+
+# func_write_libtool_object output_name pic_name nonpic_name
+# Create a libtool object file (analogous to a ".la" file),
+# but don't create it if we're doing a dry run.
+func_write_libtool_object ()
+{
+ write_libobj=${1}
+ if test "$build_libtool_libs" = yes; then
+ write_lobj=\'${2}\'
+ else
+ write_lobj=none
+ fi
+
+ if test "$build_old_libs" = yes; then
+ write_oldobj=\'${3}\'
+ else
+ write_oldobj=none
+ fi
+
+ $opt_dry_run || {
+ cat >${write_libobj}T <<EOF
+# $write_libobj - a libtool object file
+# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+#
+# Please DO NOT delete this file!
+# It is necessary for linking the library.
+
+# Name of the PIC object.
+pic_object=$write_lobj
+
+# Name of the non-PIC object
+non_pic_object=$write_oldobj
+
+EOF
+ $MV "${write_libobj}T" "${write_libobj}"
+ }
+}
+
+# func_mode_compile arg...
+func_mode_compile ()
+{
+ $opt_debug
+ # Get the compilation command and the source file.
+ base_compile=
+ srcfile="$nonopt" # always keep a non-empty value in "srcfile"
+ suppress_opt=yes
+ suppress_output=
+ arg_mode=normal
+ libobj=
+ later=
+ pie_flag=
+
+ for arg
+ do
+ case $arg_mode in
+ arg )
+ # do not "continue". Instead, add this to base_compile
+ lastarg="$arg"
+ arg_mode=normal
+ ;;
+
+ target )
+ libobj="$arg"
+ arg_mode=normal
+ continue
+ ;;
+
+ normal )
+ # Accept any command-line options.
+ case $arg in
+ -o)
+ test -n "$libobj" && \
+ func_fatal_error "you cannot specify \`-o' more than once"
+ arg_mode=target
+ continue
+ ;;
+
+ -pie | -fpie | -fPIE)
+ pie_flag="$pie_flag $arg"
+ continue
+ ;;
+
+ -shared | -static | -prefer-pic | -prefer-non-pic)
+ later="$later $arg"
+ continue
+ ;;
+
+ -no-suppress)
suppress_opt=no
continue
;;
@@ -702,31 +1157,25 @@ if test -z "$show_help"; then
;; # replaced later. I would guess that would be a bug.
-Wc,*)
- args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"`
+ func_stripname '-Wc,' '' "$arg"
+ args=$func_stripname_result
lastarg=
save_ifs="$IFS"; IFS=','
- for arg in $args; do
+ for arg in $args; do
IFS="$save_ifs"
-
- # Double-quote args containing other shell metacharacters.
- # Many Bourne shells cannot handle close brackets correctly
- # in scan sets, so we specify it separately.
- case $arg in
- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
- arg="\"$arg\""
- ;;
- esac
- lastarg="$lastarg $arg"
+ func_quote_for_eval "$arg"
+ lastarg="$lastarg $func_quote_for_eval_result"
done
IFS="$save_ifs"
- lastarg=`$echo "X$lastarg" | $Xsed -e "s/^ //"`
+ func_stripname ' ' '' "$lastarg"
+ lastarg=$func_stripname_result
# Add the arguments to base_compile.
base_compile="$base_compile $lastarg"
continue
;;
- * )
+ *)
# Accept the current argument as the source file.
# The previous "srcfile" becomes the current argument.
#
@@ -738,65 +1187,42 @@ if test -z "$show_help"; then
esac # case $arg_mode
# Aesthetically quote the previous argument.
- lastarg=`$echo "X$lastarg" | $Xsed -e "$sed_quote_subst"`
-
- case $lastarg in
- # Double-quote args containing other shell metacharacters.
- # Many Bourne shells cannot handle close brackets correctly
- # in scan sets, and some SunOS ksh mistreat backslash-escaping
- # in scan sets (worked around with variable expansion),
- # and furthermore cannot handle '|' '&' '(' ')' in scan sets
- # at all, so we specify them separately.
- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
- lastarg="\"$lastarg\""
- ;;
- esac
-
- base_compile="$base_compile $lastarg"
+ func_quote_for_eval "$lastarg"
+ base_compile="$base_compile $func_quote_for_eval_result"
done # for arg
case $arg_mode in
arg)
- $echo "$modename: you must specify an argument for -Xcompile"
- exit $EXIT_FAILURE
+ func_fatal_error "you must specify an argument for -Xcompile"
;;
target)
- $echo "$modename: you must specify a target with \`-o'" 1>&2
- exit $EXIT_FAILURE
+ func_fatal_error "you must specify a target with \`-o'"
;;
*)
# Get the name of the library object.
- [ -z "$libobj" ] && libobj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%'`
+ test -z "$libobj" && {
+ func_basename "$srcfile"
+ libobj="$func_basename_result"
+ }
;;
esac
# Recognize several different file suffixes.
# If the user specifies -o file.o, it is replaced with file.lo
- xform='[cCFSifmso]'
case $libobj in
- *.ada) xform=ada ;;
- *.adb) xform=adb ;;
- *.ads) xform=ads ;;
- *.asm) xform=asm ;;
- *.c++) xform=c++ ;;
- *.cc) xform=cc ;;
- *.ii) xform=ii ;;
- *.class) xform=class ;;
- *.cpp) xform=cpp ;;
- *.cxx) xform=cxx ;;
- *.[fF][09]?) xform=[fF][09]. ;;
- *.for) xform=for ;;
- *.java) xform=java ;;
- *.obj) xform=obj ;;
+ *.[cCFSifmso] | \
+ *.ada | *.adb | *.ads | *.asm | \
+ *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
+ *.[fF][09]? | *.for | *.java | *.obj | *.sx)
+ func_xform "$libobj"
+ libobj=$func_xform_result
+ ;;
esac
- libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
-
case $libobj in
- *.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;;
+ *.lo) func_lo2o "$libobj"; obj=$func_lo2o_result ;;
*)
- $echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2
- exit $EXIT_FAILURE
+ func_fatal_error "cannot determine name of library object from \`$libobj'"
;;
esac
@@ -804,7 +1230,15 @@ if test -z "$show_help"; then
for arg in $later; do
case $arg in
+ -shared)
+ test "$build_libtool_libs" != yes && \
+ func_fatal_configuration "can not build a shared library"
+ build_old_libs=no
+ continue
+ ;;
+
-static)
+ build_libtool_libs=no
build_old_libs=yes
continue
;;
@@ -821,28 +1255,17 @@ if test -z "$show_help"; then
esac
done
- qlibobj=`$echo "X$libobj" | $Xsed -e "$sed_quote_subst"`
- case $qlibobj in
- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
- qlibobj="\"$qlibobj\"" ;;
- esac
- test "X$libobj" != "X$qlibobj" \
- && $echo "X$libobj" | grep '[]~#^*{};<>?"'"'"' &()|`$[]' \
- && $echo "$modename: libobj name \`$libobj' may not contain shell special characters."
- objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
- xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
- if test "X$xdir" = "X$obj"; then
- xdir=
- else
- xdir=$xdir/
- fi
+ func_quote_for_eval "$libobj"
+ test "X$libobj" != "X$func_quote_for_eval_result" \
+ && $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"' &()|`$[]' \
+ && func_warning "libobj name \`$libobj' may not contain shell special characters."
+ func_dirname_and_basename "$obj" "/" ""
+ objname="$func_basename_result"
+ xdir="$func_dirname_result"
lobj=${xdir}$objdir/$objname
- if test -z "$base_compile"; then
- $echo "$modename: you must specify a compilation command" 1>&2
- $echo "$help" 1>&2
- exit $EXIT_FAILURE
- fi
+ test -z "$base_compile" && \
+ func_fatal_help "you must specify a compilation command"
# Delete any leftover library objects.
if test "$build_old_libs" = yes; then
@@ -851,12 +1274,9 @@ if test -z "$show_help"; then
removelist="$lobj $libobj ${libobj}T"
fi
- $run $rm $removelist
- trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15
-
# On Cygwin there's no "real" PIC flag so we must build both object types
case $host_os in
- cygwin* | mingw* | pw32* | os2*)
+ cygwin* | mingw* | pw32* | os2* | cegcc*)
pic_mode=default
;;
esac
@@ -868,10 +1288,8 @@ if test -z "$show_help"; then
# Calculate the filename of the output object if compiler does
# not support -o with -c
if test "$compiler_c_o" = no; then
- output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
+ output_obj=`$ECHO "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
lockfile="$output_obj.lock"
- removelist="$removelist $output_obj $lockfile"
- trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15
else
output_obj=
need_locks=no
@@ -881,13 +1299,13 @@ if test -z "$show_help"; then
# Lock this critical section if it is needed
# We use this script file to make the link, it avoids creating a new file
if test "$need_locks" = yes; then
- until $run ln "$progpath" "$lockfile" 2>/dev/null; do
- $show "Waiting for $lockfile to be removed"
+ until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
+ func_echo "Waiting for $lockfile to be removed"
sleep 2
done
elif test "$need_locks" = warn; then
if test -f "$lockfile"; then
- $echo "\
+ $ECHO "\
*** ERROR, $lockfile exists and contains:
`cat $lockfile 2>/dev/null`
@@ -898,34 +1316,22 @@ repeat this compilation, it may succeed, by chance, but you had better
avoid parallel builds (make -j) in this platform, or get a better
compiler."
- $run $rm $removelist
+ $opt_dry_run || $RM $removelist
exit $EXIT_FAILURE
fi
- $echo "$srcfile" > "$lockfile"
+ removelist="$removelist $output_obj"
+ $ECHO "$srcfile" > "$lockfile"
fi
+ $opt_dry_run || $RM $removelist
+ removelist="$removelist $lockfile"
+ trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15
+
if test -n "$fix_srcfile_path"; then
eval srcfile=\"$fix_srcfile_path\"
fi
- qsrcfile=`$echo "X$srcfile" | $Xsed -e "$sed_quote_subst"`
- case $qsrcfile in
- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
- qsrcfile="\"$qsrcfile\"" ;;
- esac
-
- $run $rm "$libobj" "${libobj}T"
-
- # Create a libtool object file (analogous to a ".la" file),
- # but don't create it if we're doing a dry run.
- test -z "$run" && cat > ${libobj}T <<EOF
-# $libobj - a libtool object file
-# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# Name of the PIC object.
-EOF
+ func_quote_for_eval "$srcfile"
+ qsrcfile=$func_quote_for_eval_result
# Only build a PIC object if we are building libtool libraries.
if test "$build_libtool_libs" = yes; then
@@ -939,32 +1345,19 @@ EOF
command="$base_compile $qsrcfile"
fi
- if test ! -d "${xdir}$objdir"; then
- $show "$mkdir ${xdir}$objdir"
- $run $mkdir ${xdir}$objdir
- exit_status=$?
- if test "$exit_status" -ne 0 && test ! -d "${xdir}$objdir"; then
- exit $exit_status
- fi
- fi
+ func_mkdir_p "$xdir$objdir"
if test -z "$output_obj"; then
# Place PIC objects in $objdir
command="$command -o $lobj"
fi
- $run $rm "$lobj" "$output_obj"
-
- $show "$command"
- if $run eval "$command"; then :
- else
- test -n "$output_obj" && $run $rm $removelist
- exit $EXIT_FAILURE
- fi
+ func_show_eval_locale "$command" \
+ 'test -n "$output_obj" && $RM $removelist; exit $EXIT_FAILURE'
if test "$need_locks" = warn &&
test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
- $echo "\
+ $ECHO "\
*** ERROR, $lockfile contains:
`cat $lockfile 2>/dev/null`
@@ -978,45 +1371,27 @@ repeat this compilation, it may succeed, by chance, but you had better
avoid parallel builds (make -j) in this platform, or get a better
compiler."
- $run $rm $removelist
+ $opt_dry_run || $RM $removelist
exit $EXIT_FAILURE
fi
# Just move the object if needed, then go on to compile the next one
if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then
- $show "$mv $output_obj $lobj"
- if $run $mv $output_obj $lobj; then :
- else
- error=$?
- $run $rm $removelist
- exit $error
- fi
+ func_show_eval '$MV "$output_obj" "$lobj"' \
+ 'error=$?; $opt_dry_run || $RM $removelist; exit $error'
fi
- # Append the name of the PIC object to the libtool object file.
- test -z "$run" && cat >> ${libobj}T <<EOF
-pic_object='$objdir/$objname'
-
-EOF
-
# Allow error messages only from the first compilation.
if test "$suppress_opt" = yes; then
- suppress_output=' >/dev/null 2>&1'
+ suppress_output=' >/dev/null 2>&1'
fi
- else
- # No PIC object so indicate it doesn't exist in the libtool
- # object file.
- test -z "$run" && cat >> ${libobj}T <<EOF
-pic_object=none
-
-EOF
fi
# Only build a position-dependent object if we build old libraries.
if test "$build_old_libs" = yes; then
if test "$pic_mode" != yes; then
# Don't build PIC code
- command="$base_compile $qsrcfile"
+ command="$base_compile $qsrcfile$pie_flag"
else
command="$base_compile $qsrcfile $pic_flag"
fi
@@ -1026,17 +1401,12 @@ EOF
# Suppress compiler output if we already did a PIC compilation.
command="$command$suppress_output"
- $run $rm "$obj" "$output_obj"
- $show "$command"
- if $run eval "$command"; then :
- else
- $run $rm $removelist
- exit $EXIT_FAILURE
- fi
+ func_show_eval_locale "$command" \
+ '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'
if test "$need_locks" = warn &&
test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
- $echo "\
+ $ECHO "\
*** ERROR, $lockfile contains:
`cat $lockfile 2>/dev/null`
@@ -1050,5458 +1420,6777 @@ repeat this compilation, it may succeed, by chance, but you had better
avoid parallel builds (make -j) in this platform, or get a better
compiler."
- $run $rm $removelist
+ $opt_dry_run || $RM $removelist
exit $EXIT_FAILURE
fi
# Just move the object if needed
if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then
- $show "$mv $output_obj $obj"
- if $run $mv $output_obj $obj; then :
- else
- error=$?
- $run $rm $removelist
- exit $error
- fi
+ func_show_eval '$MV "$output_obj" "$obj"' \
+ 'error=$?; $opt_dry_run || $RM $removelist; exit $error'
fi
-
- # Append the name of the non-PIC object the libtool object file.
- # Only append if the libtool object file exists.
- test -z "$run" && cat >> ${libobj}T <<EOF
-# Name of the non-PIC object.
-non_pic_object='$objname'
-
-EOF
- else
- # Append the name of the non-PIC object the libtool object file.
- # Only append if the libtool object file exists.
- test -z "$run" && cat >> ${libobj}T <<EOF
-# Name of the non-PIC object.
-non_pic_object=none
-
-EOF
fi
- $run $mv "${libobj}T" "${libobj}"
+ $opt_dry_run || {
+ func_write_libtool_object "$libobj" "$objdir/$objname" "$objname"
- # Unlock the critical section if it was locked
- if test "$need_locks" != no; then
- $run $rm "$lockfile"
- fi
+ # Unlock the critical section if it was locked
+ if test "$need_locks" != no; then
+ removelist=$lockfile
+ $RM "$lockfile"
+ fi
+ }
exit $EXIT_SUCCESS
- ;;
-
- # libtool link mode
- link | relink)
- modename="$modename: link"
- case $host in
- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
- # It is impossible to link a dll without this setting, and
- # we shouldn't force the makefile maintainer to figure out
- # which system we are compiling for in order to pass an extra
- # flag for every libtool invocation.
- # allow_undefined=no
+}
- # FIXME: Unfortunately, there are problems with the above when trying
- # to make a dll which has undefined symbols, in which case not
- # even a static library is built. For now, we need to specify
- # -no-undefined on the libtool link line when we can be certain
- # that all symbols are satisfied, otherwise we get a static library.
- allow_undefined=yes
- ;;
- *)
- allow_undefined=yes
- ;;
- esac
- libtool_args="$nonopt"
- base_compile="$nonopt $@"
- compile_command="$nonopt"
- finalize_command="$nonopt"
+$opt_help || {
+test "$mode" = compile && func_mode_compile ${1+"$@"}
+}
- compile_rpath=
- finalize_rpath=
- compile_shlibpath=
- finalize_shlibpath=
- convenience=
- old_convenience=
- deplibs=
- old_deplibs=
- compiler_flags=
- linker_flags=
- dllsearchpath=
- lib_search_path=`pwd`
- inst_prefix_dir=
+func_mode_help ()
+{
+ # We need to display help for each of the modes.
+ case $mode in
+ "")
+ # Generic help is extracted from the usage comments
+ # at the start of this file.
+ func_help
+ ;;
- avoid_version=no
- dlfiles=
- dlprefiles=
- dlself=no
- export_dynamic=no
- export_symbols=
- export_symbols_regex=
- generated=
- libobjs=
- ltlibs=
- module=no
- no_install=no
- objs=
- non_pic_objects=
- notinst_path= # paths that contain not-installed libtool libraries
- precious_files_regex=
- prefer_static_libs=no
- preload=no
- prev=
- prevarg=
- release=
- rpath=
- xrpath=
- perm_rpath=
- temp_rpath=
- thread_safe=no
- vinfo=
- vinfo_number=no
+ clean)
+ $ECHO \
+"Usage: $progname [OPTION]... --mode=clean RM [RM-OPTION]... FILE...
- func_infer_tag $base_compile
+Remove files from the build directory.
- # We need to know -static, to get the right output filenames.
- for arg
- do
- case $arg in
- -all-static | -static | -static-libtool-libs)
- case $arg in
- -all-static)
- if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
- $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
- fi
- if test -n "$link_static_flag"; then
- dlopen_self=$dlopen_self_static
- fi
- prefer_static_libs=yes
- ;;
- -static)
- if test -z "$pic_flag" && test -n "$link_static_flag"; then
- dlopen_self=$dlopen_self_static
- fi
- prefer_static_libs=built
- ;;
- -static-libtool-libs)
- if test -z "$pic_flag" && test -n "$link_static_flag"; then
- dlopen_self=$dlopen_self_static
- fi
- prefer_static_libs=yes
- ;;
- esac
- build_libtool_libs=no
- build_old_libs=yes
- break
- ;;
- esac
- done
+RM is the name of the program to use to delete files associated with each FILE
+(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed
+to RM.
- # See if our shared archives depend on static archives.
- test -n "$old_archive_from_new_cmds" && build_old_libs=yes
+If FILE is a libtool library, object or program, all the files associated
+with it are deleted. Otherwise, only FILE itself is deleted using RM."
+ ;;
- # Go through the arguments, transforming them on the way.
- while test "$#" -gt 0; do
- arg="$1"
- shift
- case $arg in
- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
- qarg=\"`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`\" ### testsuite: skip nested quoting test
- ;;
- *) qarg=$arg ;;
- esac
- libtool_args="$libtool_args $qarg"
+ compile)
+ $ECHO \
+"Usage: $progname [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE
- # If the previous option needs an argument, assign it.
- if test -n "$prev"; then
- case $prev in
- output)
- compile_command="$compile_command @OUTPUT@"
- finalize_command="$finalize_command @OUTPUT@"
- ;;
- esac
+Compile a source file into a libtool library object.
- case $prev in
- dlfiles|dlprefiles)
- if test "$preload" = no; then
- # Add the symbol object into the linking commands.
- compile_command="$compile_command @SYMFILE@"
- finalize_command="$finalize_command @SYMFILE@"
- preload=yes
- fi
- case $arg in
- *.la | *.lo) ;; # We handle these cases below.
- force)
- if test "$dlself" = no; then
- dlself=needless
- export_dynamic=yes
- fi
- prev=
- continue
- ;;
- self)
- if test "$prev" = dlprefiles; then
- dlself=yes
- elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then
- dlself=yes
- else
- dlself=needless
- export_dynamic=yes
- fi
- prev=
- continue
- ;;
- *)
- if test "$prev" = dlfiles; then
- dlfiles="$dlfiles $arg"
- else
- dlprefiles="$dlprefiles $arg"
- fi
- prev=
- continue
- ;;
- esac
- ;;
- expsyms)
- export_symbols="$arg"
- if test ! -f "$arg"; then
- $echo "$modename: symbol file \`$arg' does not exist"
- exit $EXIT_FAILURE
- fi
- prev=
- continue
- ;;
- expsyms_regex)
- export_symbols_regex="$arg"
- prev=
- continue
- ;;
- inst_prefix)
- inst_prefix_dir="$arg"
- prev=
- continue
- ;;
- precious_regex)
- precious_files_regex="$arg"
- prev=
- continue
- ;;
- release)
- release="-$arg"
- prev=
- continue
- ;;
- objectlist)
- if test -f "$arg"; then
- save_arg=$arg
- moreargs=
- for fil in `cat $save_arg`
- do
-# moreargs="$moreargs $fil"
- arg=$fil
- # A libtool-controlled object.
+This mode accepts the following additional options:
- # Check to see that this really is a libtool object.
- if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
- pic_object=
- non_pic_object=
+ -o OUTPUT-FILE set the output file name to OUTPUT-FILE
+ -no-suppress do not suppress compiler output for multiple passes
+ -prefer-pic try to building PIC objects only
+ -prefer-non-pic try to building non-PIC objects only
+ -shared do not build a \`.o' file suitable for static linking
+ -static only build a \`.o' file suitable for static linking
- # Read the .lo file
- # If there is no directory component, then add one.
- case $arg in
- */* | *\\*) . $arg ;;
- *) . ./$arg ;;
- esac
+COMPILE-COMMAND is a command to be used in creating a \`standard' object file
+from the given SOURCEFILE.
- if test -z "$pic_object" || \
- test -z "$non_pic_object" ||
- test "$pic_object" = none && \
- test "$non_pic_object" = none; then
- $echo "$modename: cannot find name of object for \`$arg'" 1>&2
- exit $EXIT_FAILURE
- fi
+The output file name is determined by removing the directory component from
+SOURCEFILE, then substituting the C source code suffix \`.c' with the
+library object suffix, \`.lo'."
+ ;;
- # Extract subdirectory from the argument.
- xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
- if test "X$xdir" = "X$arg"; then
- xdir=
- else
- xdir="$xdir/"
- fi
+ execute)
+ $ECHO \
+"Usage: $progname [OPTION]... --mode=execute COMMAND [ARGS]...
- if test "$pic_object" != none; then
- # Prepend the subdirectory the object is found in.
- pic_object="$xdir$pic_object"
+Automatically set library path, then run a program.
- if test "$prev" = dlfiles; then
- if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
- dlfiles="$dlfiles $pic_object"
- prev=
- continue
- else
- # If libtool objects are unsupported, then we need to preload.
- prev=dlprefiles
- fi
- fi
+This mode accepts the following additional options:
- # CHECK ME: I think I busted this. -Ossama
- if test "$prev" = dlprefiles; then
- # Preload the old-style object.
- dlprefiles="$dlprefiles $pic_object"
- prev=
- fi
+ -dlopen FILE add the directory containing FILE to the library path
- # A PIC object.
- libobjs="$libobjs $pic_object"
- arg="$pic_object"
- fi
+This mode sets the library path environment variable according to \`-dlopen'
+flags.
- # Non-PIC object.
- if test "$non_pic_object" != none; then
- # Prepend the subdirectory the object is found in.
- non_pic_object="$xdir$non_pic_object"
+If any of the ARGS are libtool executable wrappers, then they are translated
+into their corresponding uninstalled binary, and any of their required library
+directories are added to the library path.
- # A standard non-PIC object
- non_pic_objects="$non_pic_objects $non_pic_object"
- if test -z "$pic_object" || test "$pic_object" = none ; then
- arg="$non_pic_object"
- fi
- else
- # If the PIC object exists, use it instead.
- # $xdir was prepended to $pic_object above.
- non_pic_object="$pic_object"
- non_pic_objects="$non_pic_objects $non_pic_object"
- fi
- else
- # Only an error if not doing a dry-run.
- if test -z "$run"; then
- $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
- exit $EXIT_FAILURE
- else
- # Dry-run case.
+Then, COMMAND is executed, with ARGS as arguments."
+ ;;
- # Extract subdirectory from the argument.
- xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
- if test "X$xdir" = "X$arg"; then
- xdir=
- else
- xdir="$xdir/"
- fi
+ finish)
+ $ECHO \
+"Usage: $progname [OPTION]... --mode=finish [LIBDIR]...
- pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"`
- non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"`
- libobjs="$libobjs $pic_object"
- non_pic_objects="$non_pic_objects $non_pic_object"
- fi
- fi
- done
- else
- $echo "$modename: link input file \`$save_arg' does not exist"
- exit $EXIT_FAILURE
- fi
- arg=$save_arg
- prev=
- continue
- ;;
- rpath | xrpath)
- # We need an absolute path.
- case $arg in
- [\\/]* | [A-Za-z]:[\\/]*) ;;
- *)
- $echo "$modename: only absolute run-paths are allowed" 1>&2
- exit $EXIT_FAILURE
- ;;
- esac
- if test "$prev" = rpath; then
- case "$rpath " in
- *" $arg "*) ;;
- *) rpath="$rpath $arg" ;;
- esac
- else
- case "$xrpath " in
- *" $arg "*) ;;
- *) xrpath="$xrpath $arg" ;;
- esac
- fi
- prev=
- continue
- ;;
- xcompiler)
- compiler_flags="$compiler_flags $qarg"
- prev=
- compile_command="$compile_command $qarg"
- finalize_command="$finalize_command $qarg"
- continue
- ;;
- xlinker)
- linker_flags="$linker_flags $qarg"
- compiler_flags="$compiler_flags $wl$qarg"
- prev=
- compile_command="$compile_command $wl$qarg"
- finalize_command="$finalize_command $wl$qarg"
- continue
- ;;
- xcclinker)
- linker_flags="$linker_flags $qarg"
- compiler_flags="$compiler_flags $qarg"
- prev=
- compile_command="$compile_command $qarg"
- finalize_command="$finalize_command $qarg"
- continue
- ;;
- shrext)
- shrext_cmds="$arg"
- prev=
- continue
- ;;
- darwin_framework|darwin_framework_skip)
- test "$prev" = "darwin_framework" && compiler_flags="$compiler_flags $arg"
- compile_command="$compile_command $arg"
- finalize_command="$finalize_command $arg"
- prev=
- continue
- ;;
- *)
- eval "$prev=\"\$arg\""
- prev=
- continue
- ;;
- esac
- fi # test -n "$prev"
+Complete the installation of libtool libraries.
- prevarg="$arg"
+Each LIBDIR is a directory that contains libtool libraries.
- case $arg in
- -all-static)
- if test -n "$link_static_flag"; then
- compile_command="$compile_command $link_static_flag"
- finalize_command="$finalize_command $link_static_flag"
- fi
- continue
- ;;
+The commands that this mode executes may require superuser privileges. Use
+the \`--dry-run' option if you just want to see what would be executed."
+ ;;
- -allow-undefined)
- # FIXME: remove this flag sometime in the future.
- $echo "$modename: \`-allow-undefined' is deprecated because it is the default" 1>&2
- continue
- ;;
+ install)
+ $ECHO \
+"Usage: $progname [OPTION]... --mode=install INSTALL-COMMAND...
- -avoid-version)
- avoid_version=yes
- continue
- ;;
+Install executables or libraries.
- -dlopen)
- prev=dlfiles
- continue
- ;;
+INSTALL-COMMAND is the installation command. The first component should be
+either the \`install' or \`cp' program.
- -dlpreopen)
- prev=dlprefiles
- continue
- ;;
+The following components of INSTALL-COMMAND are treated specially:
- -export-dynamic)
- export_dynamic=yes
- continue
- ;;
+ -inst-prefix PREFIX-DIR Use PREFIX-DIR as a staging area for installation
- -export-symbols | -export-symbols-regex)
- if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
- $echo "$modename: more than one -exported-symbols argument is not allowed"
- exit $EXIT_FAILURE
- fi
- if test "X$arg" = "X-export-symbols"; then
- prev=expsyms
- else
- prev=expsyms_regex
- fi
- continue
- ;;
+The rest of the components are interpreted as arguments to that command (only
+BSD-compatible install options are recognized)."
+ ;;
- -framework|-arch|-isysroot)
- case " $CC " in
- *" ${arg} ${1} "* | *" ${arg} ${1} "*)
- prev=darwin_framework_skip ;;
- *) compiler_flags="$compiler_flags $arg"
- prev=darwin_framework ;;
- esac
- compile_command="$compile_command $arg"
- finalize_command="$finalize_command $arg"
- continue
- ;;
+ link)
+ $ECHO \
+"Usage: $progname [OPTION]... --mode=link LINK-COMMAND...
- -inst-prefix-dir)
- prev=inst_prefix
- continue
- ;;
+Link object files or libraries together to form another library, or to
+create an executable program.
- # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
- # so, if we see these flags be careful not to treat them like -L
- -L[A-Z][A-Z]*:*)
- case $with_gcc/$host in
- no/*-*-irix* | /*-*-irix*)
- compile_command="$compile_command $arg"
- finalize_command="$finalize_command $arg"
- ;;
- esac
- continue
- ;;
+LINK-COMMAND is a command using the C compiler that you would use to create
+a program from several object files.
- -L*)
- dir=`$echo "X$arg" | $Xsed -e 's/^-L//'`
- # We need an absolute path.
- case $dir in
- [\\/]* | [A-Za-z]:[\\/]*) ;;
- *)
- absdir=`cd "$dir" && pwd`
- if test -z "$absdir"; then
- $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
- absdir="$dir"
- notinst_path="$notinst_path $dir"
- fi
- dir="$absdir"
- ;;
- esac
- case "$deplibs " in
- *" -L$dir "*) ;;
- *)
- deplibs="$deplibs -L$dir"
- lib_search_path="$lib_search_path $dir"
- ;;
- esac
- case $host in
- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
- testbindir=`$echo "X$dir" | $Xsed -e 's*/lib$*/bin*'`
- case :$dllsearchpath: in
- *":$dir:"*) ;;
- *) dllsearchpath="$dllsearchpath:$dir";;
- esac
- case :$dllsearchpath: in
- *":$testbindir:"*) ;;
- *) dllsearchpath="$dllsearchpath:$testbindir";;
- esac
- ;;
- esac
- continue
- ;;
+The following components of LINK-COMMAND are treated specially:
- -l*)
- if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
- case $host in
- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos*)
- # These systems don't actually have a C or math library (as such)
- continue
- ;;
- *-*-os2*)
- # These systems don't actually have a C library (as such)
- test "X$arg" = "X-lc" && continue
- ;;
- *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
- # Do not include libc due to us having libc/libc_r.
- test "X$arg" = "X-lc" && continue
- ;;
- *-*-rhapsody* | *-*-darwin1.[012])
- # Rhapsody C and math libraries are in the System framework
- deplibs="$deplibs -framework System"
- continue
- ;;
- *-*-sco3.2v5* | *-*-sco5v6*)
- # Causes problems with __ctype
- test "X$arg" = "X-lc" && continue
- ;;
- *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
- # Compiler inserts libc in the correct place for threads to work
- test "X$arg" = "X-lc" && continue
- ;;
- esac
- elif test "X$arg" = "X-lc_r"; then
- case $host in
- *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
- # Do not include libc_r directly, use -pthread flag.
- continue
- ;;
- esac
- fi
- deplibs="$deplibs $arg"
- continue
- ;;
+ -all-static do not do any dynamic linking at all
+ -avoid-version do not add a version suffix if possible
+ -dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime
+ -dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols
+ -export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
+ -export-symbols SYMFILE
+ try to export only the symbols listed in SYMFILE
+ -export-symbols-regex REGEX
+ try to export only the symbols matching REGEX
+ -LLIBDIR search LIBDIR for required installed libraries
+ -lNAME OUTPUT-FILE requires the installed library libNAME
+ -module build a library that can dlopened
+ -no-fast-install disable the fast-install mode
+ -no-install link a not-installable executable
+ -no-undefined declare that a library does not refer to external symbols
+ -o OUTPUT-FILE create OUTPUT-FILE from the specified objects
+ -objectlist FILE Use a list of object files found in FILE to specify objects
+ -precious-files-regex REGEX
+ don't remove output files matching REGEX
+ -release RELEASE specify package release information
+ -rpath LIBDIR the created library will eventually be installed in LIBDIR
+ -R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries
+ -shared only do dynamic linking of libtool libraries
+ -shrext SUFFIX override the standard shared library file extension
+ -static do not do any dynamic linking of uninstalled libtool libraries
+ -static-libtool-libs
+ do not do any dynamic linking of libtool libraries
+ -version-info CURRENT[:REVISION[:AGE]]
+ specify library version info [each variable defaults to 0]
+ -weak LIBNAME declare that the target provides the LIBNAME interface
- # Tru64 UNIX uses -model [arg] to determine the layout of C++
- # classes, name mangling, and exception handling.
- -model)
- compile_command="$compile_command $arg"
- compiler_flags="$compiler_flags $arg"
- finalize_command="$finalize_command $arg"
- prev=xcompiler
- continue
- ;;
+All other options (arguments beginning with \`-') are ignored.
- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
- compiler_flags="$compiler_flags $arg"
- compile_command="$compile_command $arg"
- finalize_command="$finalize_command $arg"
- continue
- ;;
+Every other argument is treated as a filename. Files ending in \`.la' are
+treated as uninstalled libtool libraries, other files are standard or library
+object files.
- -module)
- module=yes
- continue
- ;;
+If the OUTPUT-FILE ends in \`.la', then a libtool library is created,
+only library objects (\`.lo' files) may be specified, and \`-rpath' is
+required, except when creating a convenience library.
- # -64, -mips[0-9] enable 64-bit mode on the SGI compiler
- # -r[0-9][0-9]* specifies the processor on the SGI compiler
- # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler
- # +DA*, +DD* enable 64-bit mode on the HP compiler
- # -q* pass through compiler args for the IBM compiler
- # -m* pass through architecture-specific compiler args for GCC
- # -m*, -t[45]*, -txscale* pass through architecture-specific
- # compiler args for GCC
- # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
- # -F/path gives path to uninstalled frameworks, gcc on darwin
- # @file GCC response files
- -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
+If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created
+using \`ar' and \`ranlib', or on Windows using \`lib'.
- # Unknown arguments in both finalize_command and compile_command need
- # to be aesthetically quoted because they are evaled later.
- arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
- case $arg in
- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
- arg="\"$arg\""
- ;;
- esac
- compile_command="$compile_command $arg"
- finalize_command="$finalize_command $arg"
- compiler_flags="$compiler_flags $arg"
- continue
+If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file
+is created, otherwise an executable program is created."
;;
- -shrext)
- prev=shrext
- continue
- ;;
+ uninstall)
+ $ECHO \
+"Usage: $progname [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE...
- -no-fast-install)
- fast_install=no
- continue
- ;;
+Remove libraries from an installation directory.
- -no-install)
- case $host in
- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin*)
- # The PATH hackery in wrapper scripts is required on Windows
- # and Darwin in order for the loader to find any dlls it needs.
- $echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2
- $echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2
- fast_install=no
- ;;
- *) no_install=yes ;;
- esac
- continue
- ;;
+RM is the name of the program to use to delete files associated with each FILE
+(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed
+to RM.
- -no-undefined)
- allow_undefined=no
- continue
- ;;
+If FILE is a libtool library, all the files associated with it are deleted.
+Otherwise, only FILE itself is deleted using RM."
+ ;;
- -objectlist)
- prev=objectlist
- continue
- ;;
+ *)
+ func_fatal_help "invalid operation mode \`$mode'"
+ ;;
+ esac
- -o) prev=output ;;
+ $ECHO
+ $ECHO "Try \`$progname --help' for more information about other modes."
- -precious-files-regex)
- prev=precious_regex
- continue
- ;;
+ exit $?
+}
- -release)
- prev=release
- continue
- ;;
-
- -rpath)
- prev=rpath
- continue
- ;;
+ # Now that we've collected a possible --mode arg, show help if necessary
+ $opt_help && func_mode_help
- -R)
- prev=xrpath
- continue
- ;;
- -R*)
- dir=`$echo "X$arg" | $Xsed -e 's/^-R//'`
- # We need an absolute path.
- case $dir in
- [\\/]* | [A-Za-z]:[\\/]*) ;;
- *)
- $echo "$modename: only absolute run-paths are allowed" 1>&2
- exit $EXIT_FAILURE
- ;;
- esac
- case "$xrpath " in
- *" $dir "*) ;;
- *) xrpath="$xrpath $dir" ;;
- esac
- continue
- ;;
+# func_mode_execute arg...
+func_mode_execute ()
+{
+ $opt_debug
+ # The first argument is the command name.
+ cmd="$nonopt"
+ test -z "$cmd" && \
+ func_fatal_help "you must specify a COMMAND"
- -static | -static-libtool-libs)
- # The effects of -static are defined in a previous loop.
- # We used to do the same as -all-static on platforms that
- # didn't have a PIC flag, but the assumption that the effects
- # would be equivalent was wrong. It would break on at least
- # Digital Unix and AIX.
- continue
- ;;
+ # Handle -dlopen flags immediately.
+ for file in $execute_dlfiles; do
+ test -f "$file" \
+ || func_fatal_help "\`$file' is not a file"
- -thread-safe)
- thread_safe=yes
- continue
- ;;
+ dir=
+ case $file in
+ *.la)
+ # Check to see that this really is a libtool archive.
+ func_lalib_unsafe_p "$file" \
+ || func_fatal_help "\`$lib' is not a valid libtool archive"
- -version-info)
- prev=vinfo
- continue
- ;;
- -version-number)
- prev=vinfo
- vinfo_number=yes
- continue
- ;;
+ # Read the libtool library.
+ dlname=
+ library_names=
+ func_source "$file"
- -Wc,*)
- args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wc,//'`
- arg=
- save_ifs="$IFS"; IFS=','
- for flag in $args; do
- IFS="$save_ifs"
- case $flag in
- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
- flag="\"$flag\""
- ;;
- esac
- arg="$arg $wl$flag"
- compiler_flags="$compiler_flags $flag"
- done
- IFS="$save_ifs"
- arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
- ;;
+ # Skip this library if it cannot be dlopened.
+ if test -z "$dlname"; then
+ # Warn if it was a shared library.
+ test -n "$library_names" && \
+ func_warning "\`$file' was not linked with \`-export-dynamic'"
+ continue
+ fi
- -Wl,*)
- args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'`
- arg=
- save_ifs="$IFS"; IFS=','
- for flag in $args; do
- IFS="$save_ifs"
- case $flag in
- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
- flag="\"$flag\""
- ;;
- esac
- arg="$arg $wl$flag"
- compiler_flags="$compiler_flags $wl$flag"
- linker_flags="$linker_flags $flag"
- done
- IFS="$save_ifs"
- arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
- ;;
+ func_dirname "$file" "" "."
+ dir="$func_dirname_result"
- -Xcompiler)
- prev=xcompiler
- continue
+ if test -f "$dir/$objdir/$dlname"; then
+ dir="$dir/$objdir"
+ else
+ if test ! -f "$dir/$dlname"; then
+ func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'"
+ fi
+ fi
;;
- -Xlinker)
- prev=xlinker
- continue
+ *.lo)
+ # Just add the directory containing the .lo file.
+ func_dirname "$file" "" "."
+ dir="$func_dirname_result"
;;
- -XCClinker)
- prev=xcclinker
+ *)
+ func_warning "\`-dlopen' is ignored for non-libtool libraries and objects"
continue
;;
+ esac
- # Some other compiler flag.
- -* | +*)
- # Unknown arguments in both finalize_command and compile_command need
- # to be aesthetically quoted because they are evaled later.
- arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
- case $arg in
- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
- arg="\"$arg\""
- ;;
- esac
- ;;
-
- *.$objext)
- # A standard object.
- objs="$objs $arg"
- ;;
-
- *.lo)
- # A libtool-controlled object.
-
- # Check to see that this really is a libtool object.
- if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
- pic_object=
- non_pic_object=
+ # Get the absolute pathname.
+ absdir=`cd "$dir" && pwd`
+ test -n "$absdir" && dir="$absdir"
- # Read the .lo file
- # If there is no directory component, then add one.
- case $arg in
- */* | *\\*) . $arg ;;
- *) . ./$arg ;;
- esac
+ # Now add the directory to shlibpath_var.
+ if eval "test -z \"\$$shlibpath_var\""; then
+ eval "$shlibpath_var=\"\$dir\""
+ else
+ eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\""
+ fi
+ done
- if test -z "$pic_object" || \
- test -z "$non_pic_object" ||
- test "$pic_object" = none && \
- test "$non_pic_object" = none; then
- $echo "$modename: cannot find name of object for \`$arg'" 1>&2
- exit $EXIT_FAILURE
- fi
+ # This variable tells wrapper scripts just to set shlibpath_var
+ # rather than running their programs.
+ libtool_execute_magic="$magic"
- # Extract subdirectory from the argument.
- xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
- if test "X$xdir" = "X$arg"; then
- xdir=
- else
- xdir="$xdir/"
- fi
+ # Check if any of the arguments is a wrapper script.
+ args=
+ for file
+ do
+ case $file in
+ -*) ;;
+ *)
+ # Do a test to see if this is really a libtool program.
+ if func_ltwrapper_script_p "$file"; then
+ func_source "$file"
+ # Transform arg to wrapped name.
+ file="$progdir/$program"
+ elif func_ltwrapper_executable_p "$file"; then
+ func_ltwrapper_scriptname "$file"
+ func_source "$func_ltwrapper_scriptname_result"
+ # Transform arg to wrapped name.
+ file="$progdir/$program"
+ fi
+ ;;
+ esac
+ # Quote arguments (to preserve shell metacharacters).
+ func_quote_for_eval "$file"
+ args="$args $func_quote_for_eval_result"
+ done
- if test "$pic_object" != none; then
- # Prepend the subdirectory the object is found in.
- pic_object="$xdir$pic_object"
+ if test "X$opt_dry_run" = Xfalse; then
+ if test -n "$shlibpath_var"; then
+ # Export the shlibpath_var.
+ eval "export $shlibpath_var"
+ fi
- if test "$prev" = dlfiles; then
- if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
- dlfiles="$dlfiles $pic_object"
- prev=
- continue
+ # Restore saved environment variables
+ for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+ do
+ eval "if test \"\${save_$lt_var+set}\" = set; then
+ $lt_var=\$save_$lt_var; export $lt_var
else
- # If libtool objects are unsupported, then we need to preload.
- prev=dlprefiles
- fi
- fi
+ $lt_unset $lt_var
+ fi"
+ done
- # CHECK ME: I think I busted this. -Ossama
- if test "$prev" = dlprefiles; then
- # Preload the old-style object.
- dlprefiles="$dlprefiles $pic_object"
- prev=
- fi
+ # Now prepare to actually exec the command.
+ exec_cmd="\$cmd$args"
+ else
+ # Display what would be done.
+ if test -n "$shlibpath_var"; then
+ eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
+ $ECHO "export $shlibpath_var"
+ fi
+ $ECHO "$cmd$args"
+ exit $EXIT_SUCCESS
+ fi
+}
- # A PIC object.
- libobjs="$libobjs $pic_object"
- arg="$pic_object"
- fi
+test "$mode" = execute && func_mode_execute ${1+"$@"}
- # Non-PIC object.
- if test "$non_pic_object" != none; then
- # Prepend the subdirectory the object is found in.
- non_pic_object="$xdir$non_pic_object"
- # A standard non-PIC object
- non_pic_objects="$non_pic_objects $non_pic_object"
- if test -z "$pic_object" || test "$pic_object" = none ; then
- arg="$non_pic_object"
- fi
- else
- # If the PIC object exists, use it instead.
- # $xdir was prepended to $pic_object above.
- non_pic_object="$pic_object"
- non_pic_objects="$non_pic_objects $non_pic_object"
- fi
- else
- # Only an error if not doing a dry-run.
- if test -z "$run"; then
- $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
- exit $EXIT_FAILURE
- else
- # Dry-run case.
+# func_mode_finish arg...
+func_mode_finish ()
+{
+ $opt_debug
+ libdirs="$nonopt"
+ admincmds=
- # Extract subdirectory from the argument.
- xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
- if test "X$xdir" = "X$arg"; then
- xdir=
- else
- xdir="$xdir/"
- fi
+ if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
+ for dir
+ do
+ libdirs="$libdirs $dir"
+ done
- pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"`
- non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"`
- libobjs="$libobjs $pic_object"
- non_pic_objects="$non_pic_objects $non_pic_object"
- fi
+ for libdir in $libdirs; do
+ if test -n "$finish_cmds"; then
+ # Do each command in the finish commands.
+ func_execute_cmds "$finish_cmds" 'admincmds="$admincmds
+'"$cmd"'"'
fi
- ;;
+ if test -n "$finish_eval"; then
+ # Do the single finish_eval.
+ eval cmds=\"$finish_eval\"
+ $opt_dry_run || eval "$cmds" || admincmds="$admincmds
+ $cmds"
+ fi
+ done
+ fi
- *.$libext)
- # An archive.
- deplibs="$deplibs $arg"
- old_deplibs="$old_deplibs $arg"
- continue
- ;;
+ # Exit here if they wanted silent mode.
+ $opt_silent && exit $EXIT_SUCCESS
- *.la)
- # A libtool-controlled library.
+ $ECHO "X----------------------------------------------------------------------" | $Xsed
+ $ECHO "Libraries have been installed in:"
+ for libdir in $libdirs; do
+ $ECHO " $libdir"
+ done
+ $ECHO
+ $ECHO "If you ever happen to want to link against installed libraries"
+ $ECHO "in a given directory, LIBDIR, you must either use libtool, and"
+ $ECHO "specify the full pathname of the library, or use the \`-LLIBDIR'"
+ $ECHO "flag during linking and do at least one of the following:"
+ if test -n "$shlibpath_var"; then
+ $ECHO " - add LIBDIR to the \`$shlibpath_var' environment variable"
+ $ECHO " during execution"
+ fi
+ if test -n "$runpath_var"; then
+ $ECHO " - add LIBDIR to the \`$runpath_var' environment variable"
+ $ECHO " during linking"
+ fi
+ if test -n "$hardcode_libdir_flag_spec"; then
+ libdir=LIBDIR
+ eval flag=\"$hardcode_libdir_flag_spec\"
- if test "$prev" = dlfiles; then
- # This library was specified with -dlopen.
- dlfiles="$dlfiles $arg"
- prev=
- elif test "$prev" = dlprefiles; then
- # The library was specified with -dlpreopen.
- dlprefiles="$dlprefiles $arg"
+ $ECHO " - use the \`$flag' linker flag"
+ fi
+ if test -n "$admincmds"; then
+ $ECHO " - have your system administrator run these commands:$admincmds"
+ fi
+ if test -f /etc/ld.so.conf; then
+ $ECHO " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
+ fi
+ $ECHO
+
+ $ECHO "See any operating system documentation about shared libraries for"
+ case $host in
+ solaris2.[6789]|solaris2.1[0-9])
+ $ECHO "more information, such as the ld(1), crle(1) and ld.so(8) manual"
+ $ECHO "pages."
+ ;;
+ *)
+ $ECHO "more information, such as the ld(1) and ld.so(8) manual pages."
+ ;;
+ esac
+ $ECHO "X----------------------------------------------------------------------" | $Xsed
+ exit $EXIT_SUCCESS
+}
+
+test "$mode" = finish && func_mode_finish ${1+"$@"}
+
+
+# func_mode_install arg...
+func_mode_install ()
+{
+ $opt_debug
+ # There may be an optional sh(1) argument at the beginning of
+ # install_prog (especially on Windows NT).
+ if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
+ # Allow the use of GNU shtool's install command.
+ $ECHO "X$nonopt" | $GREP shtool >/dev/null; then
+ # Aesthetically quote it.
+ func_quote_for_eval "$nonopt"
+ install_prog="$func_quote_for_eval_result "
+ arg=$1
+ shift
+ else
+ install_prog=
+ arg=$nonopt
+ fi
+
+ # The real first argument should be the name of the installation program.
+ # Aesthetically quote it.
+ func_quote_for_eval "$arg"
+ install_prog="$install_prog$func_quote_for_eval_result"
+
+ # We need to accept at least all the BSD install flags.
+ dest=
+ files=
+ opts=
+ prev=
+ install_type=
+ isdir=no
+ stripme=
+ for arg
+ do
+ if test -n "$dest"; then
+ files="$files $dest"
+ dest=$arg
+ continue
+ fi
+
+ case $arg in
+ -d) isdir=yes ;;
+ -f)
+ case " $install_prog " in
+ *[\\\ /]cp\ *) ;;
+ *) prev=$arg ;;
+ esac
+ ;;
+ -g | -m | -o)
+ prev=$arg
+ ;;
+ -s)
+ stripme=" -s"
+ continue
+ ;;
+ -*)
+ ;;
+ *)
+ # If the previous option needed an argument, then skip it.
+ if test -n "$prev"; then
prev=
else
- deplibs="$deplibs $arg"
+ dest=$arg
+ continue
fi
- continue
;;
+ esac
- # Some other compiler argument.
- *)
- # Unknown arguments in both finalize_command and compile_command need
- # to be aesthetically quoted because they are evaled later.
- arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
- case $arg in
- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
- arg="\"$arg\""
- ;;
- esac
- ;;
- esac # arg
+ # Aesthetically quote the argument.
+ func_quote_for_eval "$arg"
+ install_prog="$install_prog $func_quote_for_eval_result"
+ done
- # Now actually substitute the argument into the commands.
- if test -n "$arg"; then
- compile_command="$compile_command $arg"
- finalize_command="$finalize_command $arg"
- fi
- done # argument parsing loop
+ test -z "$install_prog" && \
+ func_fatal_help "you must specify an install program"
- if test -n "$prev"; then
- $echo "$modename: the \`$prevarg' option requires an argument" 1>&2
- $echo "$help" 1>&2
- exit $EXIT_FAILURE
- fi
+ test -n "$prev" && \
+ func_fatal_help "the \`$prev' option requires an argument"
- if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
- eval arg=\"$export_dynamic_flag_spec\"
- compile_command="$compile_command $arg"
- finalize_command="$finalize_command $arg"
+ if test -z "$files"; then
+ if test -z "$dest"; then
+ func_fatal_help "no file or destination specified"
+ else
+ func_fatal_help "you must specify a destination"
+ fi
fi
- oldlibs=
- # calculate the name of the file, without its directory
- outputname=`$echo "X$output" | $Xsed -e 's%^.*/%%'`
- libobjs_save="$libobjs"
+ # Strip any trailing slash from the destination.
+ func_stripname '' '/' "$dest"
+ dest=$func_stripname_result
- if test -n "$shlibpath_var"; then
- # get the directories listed in $shlibpath_var
- eval shlib_search_path=\`\$echo \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\`
+ # Check to see that the destination is a directory.
+ test -d "$dest" && isdir=yes
+ if test "$isdir" = yes; then
+ destdir="$dest"
+ destname=
else
- shlib_search_path=
- fi
- eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
- eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
+ func_dirname_and_basename "$dest" "" "."
+ destdir="$func_dirname_result"
+ destname="$func_basename_result"
- output_objdir=`$echo "X$output" | $Xsed -e 's%/[^/]*$%%'`
- if test "X$output_objdir" = "X$output"; then
- output_objdir="$objdir"
- else
- output_objdir="$output_objdir/$objdir"
- fi
- # Create the object directory.
- if test ! -d "$output_objdir"; then
- $show "$mkdir $output_objdir"
- $run $mkdir $output_objdir
- exit_status=$?
- if test "$exit_status" -ne 0 && test ! -d "$output_objdir"; then
- exit $exit_status
- fi
+ # Not a directory, so check to see that there is only one file specified.
+ set dummy $files; shift
+ test "$#" -gt 1 && \
+ func_fatal_help "\`$dest' is not a directory"
fi
-
- # Determine the type of output
- case $output in
- "")
- $echo "$modename: you must specify an output file" 1>&2
- $echo "$help" 1>&2
- exit $EXIT_FAILURE
- ;;
- *.$libext) linkmode=oldlib ;;
- *.lo | *.$objext) linkmode=obj ;;
- *.la) linkmode=lib ;;
- *) linkmode=prog ;; # Anything else should be a program.
- esac
-
- case $host in
- *cygwin* | *mingw* | *pw32*)
- # don't eliminate duplications in $postdeps and $predeps
- duplicate_compiler_generated_deps=yes
- ;;
+ case $destdir in
+ [\\/]* | [A-Za-z]:[\\/]*) ;;
*)
- duplicate_compiler_generated_deps=$duplicate_deps
+ for file in $files; do
+ case $file in
+ *.lo) ;;
+ *)
+ func_fatal_help "\`$destdir' must be an absolute directory name"
+ ;;
+ esac
+ done
;;
esac
- specialdeplibs=
- libs=
- # Find all interdependent deplibs by searching for libraries
- # that are linked more than once (e.g. -la -lb -la)
- for deplib in $deplibs; do
- if test "X$duplicate_deps" = "Xyes" ; then
- case "$libs " in
- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
- esac
- fi
- libs="$libs $deplib"
- done
+ # This variable tells wrapper scripts just to set variables rather
+ # than running their programs.
+ libtool_install_magic="$magic"
- if test "$linkmode" = lib; then
- libs="$predeps $libs $compiler_lib_search_path $postdeps"
+ staticlibs=
+ future_libdirs=
+ current_libdirs=
+ for file in $files; do
- # Compute libraries that are listed more than once in $predeps
- # $postdeps and mark them as special (i.e., whose duplicates are
- # not to be eliminated).
- pre_post_deps=
- if test "X$duplicate_compiler_generated_deps" = "Xyes" ; then
- for pre_post_dep in $predeps $postdeps; do
- case "$pre_post_deps " in
- *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;
+ # Do each installation.
+ case $file in
+ *.$libext)
+ # Do the static libraries later.
+ staticlibs="$staticlibs $file"
+ ;;
+
+ *.la)
+ # Check to see that this really is a libtool archive.
+ func_lalib_unsafe_p "$file" \
+ || func_fatal_help "\`$file' is not a valid libtool archive"
+
+ library_names=
+ old_library=
+ relink_command=
+ func_source "$file"
+
+ # Add the libdir to current_libdirs if it is the destination.
+ if test "X$destdir" = "X$libdir"; then
+ case "$current_libdirs " in
+ *" $libdir "*) ;;
+ *) current_libdirs="$current_libdirs $libdir" ;;
esac
- pre_post_deps="$pre_post_deps $pre_post_dep"
- done
- fi
- pre_post_deps=
- fi
+ else
+ # Note the libdir as a future libdir.
+ case "$future_libdirs " in
+ *" $libdir "*) ;;
+ *) future_libdirs="$future_libdirs $libdir" ;;
+ esac
+ fi
- deplibs=
- newdependency_libs=
- newlib_search_path=
- need_relink=no # whether we're linking any uninstalled libtool libraries
- notinst_deplibs= # not-installed libtool libraries
- case $linkmode in
- lib)
- passes="conv link"
- for file in $dlfiles $dlprefiles; do
- case $file in
- *.la) ;;
- *)
- $echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2
- exit $EXIT_FAILURE
+ func_dirname "$file" "/" ""
+ dir="$func_dirname_result"
+ dir="$dir$objdir"
+
+ if test -n "$relink_command"; then
+ # Determine the prefix the user has applied to our future dir.
+ inst_prefix_dir=`$ECHO "X$destdir" | $Xsed -e "s%$libdir\$%%"`
+
+ # Don't allow the user to place us outside of our expected
+ # location b/c this prevents finding dependent libraries that
+ # are installed to the same prefix.
+ # At present, this check doesn't affect windows .dll's that
+ # are installed into $libdir/../bin (currently, that works fine)
+ # but it's something to keep an eye on.
+ test "$inst_prefix_dir" = "$destdir" && \
+ func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir"
+
+ if test -n "$inst_prefix_dir"; then
+ # Stick the inst_prefix_dir data into the link command.
+ relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
+ else
+ relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%%"`
+ fi
+
+ func_warning "relinking \`$file'"
+ func_show_eval "$relink_command" \
+ 'func_fatal_error "error: relink \`$file'\'' with the above command before installing it"'
+ fi
+
+ # See the names of the shared library.
+ set dummy $library_names; shift
+ if test -n "$1"; then
+ realname="$1"
+ shift
+
+ srcname="$realname"
+ test -n "$relink_command" && srcname="$realname"T
+
+ # Install the shared library and build the symlinks.
+ func_show_eval "$install_prog $dir/$srcname $destdir/$realname" \
+ 'exit $?'
+ tstripme="$stripme"
+ case $host_os in
+ cygwin* | mingw* | pw32* | cegcc*)
+ case $realname in
+ *.dll.a)
+ tstripme=""
+ ;;
+ esac
;;
esac
- done
- ;;
- prog)
- compile_deplibs=
- finalize_deplibs=
- alldeplibs=no
- newdlfiles=
- newdlprefiles=
- passes="conv scan dlopen dlpreopen link"
- ;;
- *) passes="conv"
- ;;
- esac
- for pass in $passes; do
- if test "$linkmode,$pass" = "lib,link" ||
- test "$linkmode,$pass" = "prog,scan"; then
- libs="$deplibs"
- deplibs=
- fi
- if test "$linkmode" = prog; then
- case $pass in
- dlopen) libs="$dlfiles" ;;
- dlpreopen) libs="$dlprefiles" ;;
- link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
- esac
- fi
- if test "$pass" = dlopen; then
- # Collect dlpreopened libraries
- save_deplibs="$deplibs"
- deplibs=
- fi
- for deplib in $libs; do
- lib=
- found=no
- case $deplib in
- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
- if test "$linkmode,$pass" = "prog,link"; then
- compile_deplibs="$deplib $compile_deplibs"
- finalize_deplibs="$deplib $finalize_deplibs"
- else
- compiler_flags="$compiler_flags $deplib"
- fi
- continue
- ;;
- -l*)
- if test "$linkmode" != lib && test "$linkmode" != prog; then
- $echo "$modename: warning: \`-l' is ignored for archives/objects" 1>&2
- continue
+ if test -n "$tstripme" && test -n "$striplib"; then
+ func_show_eval "$striplib $destdir/$realname" 'exit $?'
fi
- name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
- for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do
- for search_ext in .la $std_shrext .so .a; do
- # Search the libtool library
- lib="$searchdir/lib${name}${search_ext}"
- if test -f "$lib"; then
- if test "$search_ext" = ".la"; then
- found=yes
- else
- found=no
- fi
- break 2
- fi
+
+ if test "$#" -gt 0; then
+ # Delete the old symlinks, and create new ones.
+ # Try `ln -sf' first, because the `ln' binary might depend on
+ # the symlink we replace! Solaris /bin/ln does not understand -f,
+ # so we also need to try rm && ln -s.
+ for linkname
+ do
+ test "$linkname" != "$realname" \
+ && func_show_eval "(cd $destdir && { $LN_S -f $realname $linkname || { $RM $linkname && $LN_S $realname $linkname; }; })"
done
- done
- if test "$found" != yes; then
- # deplib doesn't seem to be a libtool library
- if test "$linkmode,$pass" = "prog,link"; then
- compile_deplibs="$deplib $compile_deplibs"
- finalize_deplibs="$deplib $finalize_deplibs"
- else
- deplibs="$deplib $deplibs"
- test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
- fi
- continue
- else # deplib is a libtool library
- # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib,
- # We need to do some special things here, and not later.
- if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
- case " $predeps $postdeps " in
- *" $deplib "*)
- if (${SED} -e '2q' $lib |
- grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
- library_names=
- old_library=
- case $lib in
- */* | *\\*) . $lib ;;
- *) . ./$lib ;;
- esac
- for l in $old_library $library_names; do
- ll="$l"
- done
- if test "X$ll" = "X$old_library" ; then # only static version available
- found=no
- ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
- test "X$ladir" = "X$lib" && ladir="."
- lib=$ladir/$old_library
- if test "$linkmode,$pass" = "prog,link"; then
- compile_deplibs="$deplib $compile_deplibs"
- finalize_deplibs="$deplib $finalize_deplibs"
- else
- deplibs="$deplib $deplibs"
- test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
- fi
- continue
- fi
- fi
- ;;
- *) ;;
- esac
- fi
- fi
- ;; # -l
- -L*)
- case $linkmode in
- lib)
- deplibs="$deplib $deplibs"
- test "$pass" = conv && continue
- newdependency_libs="$deplib $newdependency_libs"
- newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
- ;;
- prog)
- if test "$pass" = conv; then
- deplibs="$deplib $deplibs"
- continue
- fi
- if test "$pass" = scan; then
- deplibs="$deplib $deplibs"
- else
- compile_deplibs="$deplib $compile_deplibs"
- finalize_deplibs="$deplib $finalize_deplibs"
- fi
- newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
- ;;
- *)
- $echo "$modename: warning: \`-L' is ignored for archives/objects" 1>&2
- ;;
- esac # linkmode
- continue
- ;; # -L
- -R*)
- if test "$pass" = link; then
- dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'`
- # Make sure the xrpath contains only unique directories.
- case "$xrpath " in
- *" $dir "*) ;;
- *) xrpath="$xrpath $dir" ;;
- esac
- fi
- deplibs="$deplib $deplibs"
- continue
- ;;
- *.la) lib="$deplib" ;;
- *.$libext)
- if test "$pass" = conv; then
- deplibs="$deplib $deplibs"
- continue
- fi
- case $linkmode in
- lib)
- valid_a_lib=no
- case $deplibs_check_method in
- match_pattern*)
- set dummy $deplibs_check_method
- match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
- if eval $echo \"$deplib\" 2>/dev/null \
- | $SED 10q \
- | $EGREP "$match_pattern_regex" > /dev/null; then
- valid_a_lib=yes
- fi
- ;;
- pass_all)
- valid_a_lib=yes
- ;;
- esac
- if test "$valid_a_lib" != yes; then
- $echo
- $echo "*** Warning: Trying to link with static lib archive $deplib."
- $echo "*** I have the capability to make that library automatically link in when"
- $echo "*** you link to this library. But I can only do this if you have a"
- $echo "*** shared version of the library, which you do not appear to have"
- $echo "*** because the file extensions .$libext of this argument makes me believe"
- $echo "*** that it is just a static archive that I should not used here."
- else
- $echo
- $echo "*** Warning: Linking the shared library $output against the"
- $echo "*** static library $deplib is not portable!"
- deplibs="$deplib $deplibs"
- fi
- continue
- ;;
- prog)
- if test "$pass" != link; then
- deplibs="$deplib $deplibs"
- else
- compile_deplibs="$deplib $compile_deplibs"
- finalize_deplibs="$deplib $finalize_deplibs"
- fi
- continue
- ;;
- esac # linkmode
- ;; # *.$libext
- *.lo | *.$objext)
- if test "$pass" = conv; then
- deplibs="$deplib $deplibs"
- elif test "$linkmode" = prog; then
- if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
- # If there is no dlopen support or we're linking statically,
- # we need to preload.
- newdlprefiles="$newdlprefiles $deplib"
- compile_deplibs="$deplib $compile_deplibs"
- finalize_deplibs="$deplib $finalize_deplibs"
- else
- newdlfiles="$newdlfiles $deplib"
- fi
fi
- continue
- ;;
- %DEPLIBS%)
- alldeplibs=yes
- continue
- ;;
- esac # case $deplib
- if test "$found" = yes || test -f "$lib"; then :
- else
- $echo "$modename: cannot find the library \`$lib' or unhandled argument \`$deplib'" 1>&2
- exit $EXIT_FAILURE
- fi
- # Check to see that this really is a libtool archive.
- if (${SED} -e '2q' $lib | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
- else
- $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
- exit $EXIT_FAILURE
+ # Do each command in the postinstall commands.
+ lib="$destdir/$realname"
+ func_execute_cmds "$postinstall_cmds" 'exit $?'
fi
- ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
- test "X$ladir" = "X$lib" && ladir="."
-
- dlname=
- dlopen=
- dlpreopen=
- libdir=
- library_names=
- old_library=
- # If the library was installed with an old release of libtool,
- # it will not redefine variables installed, or shouldnotlink
- installed=yes
- shouldnotlink=no
- avoidtemprpath=
+ # Install the pseudo-library for information purposes.
+ func_basename "$file"
+ name="$func_basename_result"
+ instname="$dir/$name"i
+ func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
+ # Maybe install the static library, too.
+ test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
+ ;;
- # Read the .la file
- case $lib in
- */* | *\\*) . $lib ;;
- *) . ./$lib ;;
- esac
+ *.lo)
+ # Install (i.e. copy) a libtool object.
- if test "$linkmode,$pass" = "lib,link" ||
- test "$linkmode,$pass" = "prog,scan" ||
- { test "$linkmode" != prog && test "$linkmode" != lib; }; then
- test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
- test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
+ # Figure out destination file name, if it wasn't already specified.
+ if test -n "$destname"; then
+ destfile="$destdir/$destname"
+ else
+ func_basename "$file"
+ destfile="$func_basename_result"
+ destfile="$destdir/$destfile"
fi
- if test "$pass" = conv; then
- # Only check for convenience libraries
- deplibs="$lib $deplibs"
- if test -z "$libdir"; then
- if test -z "$old_library"; then
- $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
- exit $EXIT_FAILURE
- fi
- # It is a libtool convenience library, so add in its objects.
- convenience="$convenience $ladir/$objdir/$old_library"
- old_convenience="$old_convenience $ladir/$objdir/$old_library"
- tmp_libs=
- for deplib in $dependency_libs; do
- deplibs="$deplib $deplibs"
- if test "X$duplicate_deps" = "Xyes" ; then
- case "$tmp_libs " in
- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
- esac
- fi
- tmp_libs="$tmp_libs $deplib"
- done
- elif test "$linkmode" != prog && test "$linkmode" != lib; then
- $echo "$modename: \`$lib' is not a convenience library" 1>&2
- exit $EXIT_FAILURE
- fi
- continue
- fi # $pass = conv
+ # Deduce the name of the destination old-style object file.
+ case $destfile in
+ *.lo)
+ func_lo2o "$destfile"
+ staticdest=$func_lo2o_result
+ ;;
+ *.$objext)
+ staticdest="$destfile"
+ destfile=
+ ;;
+ *)
+ func_fatal_help "cannot copy a libtool object to \`$destfile'"
+ ;;
+ esac
+ # Install the libtool object if requested.
+ test -n "$destfile" && \
+ func_show_eval "$install_prog $file $destfile" 'exit $?'
- # Get the name of the library we link against.
- linklib=
- for l in $old_library $library_names; do
- linklib="$l"
- done
- if test -z "$linklib"; then
- $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
- exit $EXIT_FAILURE
+ # Install the old object if enabled.
+ if test "$build_old_libs" = yes; then
+ # Deduce the name of the old-style object file.
+ func_lo2o "$file"
+ staticobj=$func_lo2o_result
+ func_show_eval "$install_prog \$staticobj \$staticdest" 'exit $?'
fi
+ exit $EXIT_SUCCESS
+ ;;
- # This library was specified with -dlopen.
- if test "$pass" = dlopen; then
- if test -z "$libdir"; then
- $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2
- exit $EXIT_FAILURE
- fi
- if test -z "$dlname" ||
- test "$dlopen_support" != yes ||
- test "$build_libtool_libs" = no; then
- # If there is no dlname, no dlopen support or we're linking
- # statically, we need to preload. We also need to preload any
- # dependent libraries so libltdl's deplib preloader doesn't
- # bomb out in the load deplibs phase.
- dlprefiles="$dlprefiles $lib $dependency_libs"
- else
- newdlfiles="$newdlfiles $lib"
- fi
- continue
- fi # $pass = dlopen
+ *)
+ # Figure out destination file name, if it wasn't already specified.
+ if test -n "$destname"; then
+ destfile="$destdir/$destname"
+ else
+ func_basename "$file"
+ destfile="$func_basename_result"
+ destfile="$destdir/$destfile"
+ fi
- # We need an absolute path.
- case $ladir in
- [\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;;
+ # If the file is missing, and there is a .exe on the end, strip it
+ # because it is most likely a libtool script we actually want to
+ # install
+ stripped_ext=""
+ case $file in
+ *.exe)
+ if test ! -f "$file"; then
+ func_stripname '' '.exe' "$file"
+ file=$func_stripname_result
+ stripped_ext=".exe"
+ fi
+ ;;
+ esac
+
+ # Do a test to see if this is really a libtool program.
+ case $host in
+ *cygwin* | *mingw*)
+ if func_ltwrapper_executable_p "$file"; then
+ func_ltwrapper_scriptname "$file"
+ wrapper=$func_ltwrapper_scriptname_result
+ else
+ func_stripname '' '.exe' "$file"
+ wrapper=$func_stripname_result
+ fi
+ ;;
*)
- abs_ladir=`cd "$ladir" && pwd`
- if test -z "$abs_ladir"; then
- $echo "$modename: warning: cannot determine absolute directory name of \`$ladir'" 1>&2
- $echo "$modename: passing it literally to the linker, although it might fail" 1>&2
- abs_ladir="$ladir"
+ wrapper=$file
+ ;;
+ esac
+ if func_ltwrapper_script_p "$wrapper"; then
+ notinst_deplibs=
+ relink_command=
+
+ func_source "$wrapper"
+
+ # Check the variables that should have been set.
+ test -z "$generated_by_libtool_version" && \
+ func_fatal_error "invalid libtool wrapper script \`$wrapper'"
+
+ finalize=yes
+ for lib in $notinst_deplibs; do
+ # Check to see that each library is installed.
+ libdir=
+ if test -f "$lib"; then
+ func_source "$lib"
+ fi
+ libfile="$libdir/"`$ECHO "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test
+ if test -n "$libdir" && test ! -f "$libfile"; then
+ func_warning "\`$lib' has not been installed in \`$libdir'"
+ finalize=no
+ fi
+ done
+
+ relink_command=
+ func_source "$wrapper"
+
+ outputname=
+ if test "$fast_install" = no && test -n "$relink_command"; then
+ $opt_dry_run || {
+ if test "$finalize" = yes; then
+ tmpdir=`func_mktempdir`
+ func_basename "$file$stripped_ext"
+ file="$func_basename_result"
+ outputname="$tmpdir/$file"
+ # Replace the output file specification.
+ relink_command=`$ECHO "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
+
+ $opt_silent || {
+ func_quote_for_expand "$relink_command"
+ eval "func_echo $func_quote_for_expand_result"
+ }
+ if eval "$relink_command"; then :
+ else
+ func_error "error: relink \`$file' with the above command before installing it"
+ $opt_dry_run || ${RM}r "$tmpdir"
+ continue
+ fi
+ file="$outputname"
+ else
+ func_warning "cannot relink \`$file'"
+ fi
+ }
+ else
+ # Install the binary that we compiled earlier.
+ file=`$ECHO "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"`
fi
+ fi
+
+ # remove .exe since cygwin /usr/bin/install will append another
+ # one anyway
+ case $install_prog,$host in
+ */usr/bin/install*,*cygwin*)
+ case $file:$destfile in
+ *.exe:*.exe)
+ # this is ok
+ ;;
+ *.exe:*)
+ destfile=$destfile.exe
+ ;;
+ *:*.exe)
+ func_stripname '' '.exe' "$destfile"
+ destfile=$func_stripname_result
+ ;;
+ esac
;;
esac
- laname=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
+ func_show_eval "$install_prog\$stripme \$file \$destfile" 'exit $?'
+ $opt_dry_run || if test -n "$outputname"; then
+ ${RM}r "$tmpdir"
+ fi
+ ;;
+ esac
+ done
- # Find the relevant object directory and library name.
- if test "X$installed" = Xyes; then
- if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
- $echo "$modename: warning: library \`$lib' was moved." 1>&2
- dir="$ladir"
- absdir="$abs_ladir"
- libdir="$abs_ladir"
- else
- dir="$libdir"
- absdir="$libdir"
+ for file in $staticlibs; do
+ func_basename "$file"
+ name="$func_basename_result"
+
+ # Set up the ranlib parameters.
+ oldlib="$destdir/$name"
+
+ func_show_eval "$install_prog \$file \$oldlib" 'exit $?'
+
+ if test -n "$stripme" && test -n "$old_striplib"; then
+ func_show_eval "$old_striplib $oldlib" 'exit $?'
+ fi
+
+ # Do each command in the postinstall commands.
+ func_execute_cmds "$old_postinstall_cmds" 'exit $?'
+ done
+
+ test -n "$future_libdirs" && \
+ func_warning "remember to run \`$progname --finish$future_libdirs'"
+
+ if test -n "$current_libdirs"; then
+ # Maybe just do a dry run.
+ $opt_dry_run && current_libdirs=" -n$current_libdirs"
+ exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
+ else
+ exit $EXIT_SUCCESS
+ fi
+}
+
+test "$mode" = install && func_mode_install ${1+"$@"}
+
+
+# func_generate_dlsyms outputname originator pic_p
+# Extract symbols from dlprefiles and create ${outputname}S.o with
+# a dlpreopen symbol table.
+func_generate_dlsyms ()
+{
+ $opt_debug
+ my_outputname="$1"
+ my_originator="$2"
+ my_pic_p="${3-no}"
+ my_prefix=`$ECHO "$my_originator" | sed 's%[^a-zA-Z0-9]%_%g'`
+ my_dlsyms=
+
+ if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+ if test -n "$NM" && test -n "$global_symbol_pipe"; then
+ my_dlsyms="${my_outputname}S.c"
+ else
+ func_error "not configured to extract global symbols from dlpreopened files"
+ fi
+ fi
+
+ if test -n "$my_dlsyms"; then
+ case $my_dlsyms in
+ "") ;;
+ *.c)
+ # Discover the nlist of each of the dlfiles.
+ nlist="$output_objdir/${my_outputname}.nm"
+
+ func_show_eval "$RM $nlist ${nlist}S ${nlist}T"
+
+ # Parse the name list into a source file.
+ func_verbose "creating $output_objdir/$my_dlsyms"
+
+ $opt_dry_run || $ECHO > "$output_objdir/$my_dlsyms" "\
+/* $my_dlsyms - symbol resolution table for \`$my_outputname' dlsym emulation. */
+/* Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION */
+
+#ifdef __cplusplus
+extern \"C\" {
+#endif
+
+/* External symbol declarations for the compiler. */\
+"
+
+ if test "$dlself" = yes; then
+ func_verbose "generating symbol list for \`$output'"
+
+ $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist"
+
+ # Add our own program objects to the symbol list.
+ progfiles=`$ECHO "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+ for progfile in $progfiles; do
+ func_verbose "extracting global C symbols from \`$progfile'"
+ $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'"
+ done
+
+ if test -n "$exclude_expsyms"; then
+ $opt_dry_run || {
+ eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
+ eval '$MV "$nlist"T "$nlist"'
+ }
fi
- test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
- else
- if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
- dir="$ladir"
- absdir="$abs_ladir"
- # Remove this search path later
- notinst_path="$notinst_path $abs_ladir"
+
+ if test -n "$export_symbols_regex"; then
+ $opt_dry_run || {
+ eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T'
+ eval '$MV "$nlist"T "$nlist"'
+ }
+ fi
+
+ # Prepare the list of exported symbols
+ if test -z "$export_symbols"; then
+ export_symbols="$output_objdir/$outputname.exp"
+ $opt_dry_run || {
+ $RM $export_symbols
+ eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
+ case $host in
+ *cygwin* | *mingw* | *cegcc* )
+ eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
+ eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
+ ;;
+ esac
+ }
else
- dir="$ladir/$objdir"
- absdir="$abs_ladir/$objdir"
- # Remove this search path later
- notinst_path="$notinst_path $abs_ladir"
+ $opt_dry_run || {
+ eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
+ eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
+ eval '$MV "$nlist"T "$nlist"'
+ case $host in
+ *cygwin | *mingw* | *cegcc* )
+ eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
+ eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
+ ;;
+ esac
+ }
fi
- fi # $installed = yes
- name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
+ fi
- # This library was specified with -dlpreopen.
- if test "$pass" = dlpreopen; then
- if test -z "$libdir"; then
- $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2
- exit $EXIT_FAILURE
+ for dlprefile in $dlprefiles; do
+ func_verbose "extracting global C symbols from \`$dlprefile'"
+ func_basename "$dlprefile"
+ name="$func_basename_result"
+ $opt_dry_run || {
+ eval '$ECHO ": $name " >> "$nlist"'
+ eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'"
+ }
+ done
+
+ $opt_dry_run || {
+ # Make sure we have at least an empty file.
+ test -f "$nlist" || : > "$nlist"
+
+ if test -n "$exclude_expsyms"; then
+ $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
+ $MV "$nlist"T "$nlist"
fi
- # Prefer using a static library (so that no silly _DYNAMIC symbols
- # are required to link).
- if test -n "$old_library"; then
- newdlprefiles="$newdlprefiles $dir/$old_library"
- # Otherwise, use the dlname, so that lt_dlopen finds it.
- elif test -n "$dlname"; then
- newdlprefiles="$newdlprefiles $dir/$dlname"
+
+ # Try sorting and uniquifying the output.
+ if $GREP -v "^: " < "$nlist" |
+ if sort -k 3 </dev/null >/dev/null 2>&1; then
+ sort -k 3
+ else
+ sort +2
+ fi |
+ uniq > "$nlist"S; then
+ :
else
- newdlprefiles="$newdlprefiles $dir/$linklib"
+ $GREP -v "^: " < "$nlist" > "$nlist"S
fi
- fi # $pass = dlpreopen
- if test -z "$libdir"; then
- # Link the convenience library
- if test "$linkmode" = lib; then
- deplibs="$dir/$old_library $deplibs"
- elif test "$linkmode,$pass" = "prog,link"; then
- compile_deplibs="$dir/$old_library $compile_deplibs"
- finalize_deplibs="$dir/$old_library $finalize_deplibs"
+ if test -f "$nlist"S; then
+ eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"'
else
- deplibs="$lib $deplibs" # used for prog,scan pass
+ $ECHO '/* NONE */' >> "$output_objdir/$my_dlsyms"
fi
- continue
- fi
+ $ECHO >> "$output_objdir/$my_dlsyms" "\
- if test "$linkmode" = prog && test "$pass" != link; then
- newlib_search_path="$newlib_search_path $ladir"
- deplibs="$lib $deplibs"
+/* The mapping between symbol names and symbols. */
+typedef struct {
+ const char *name;
+ void *address;
+} lt_dlsymlist;
+"
+ case $host in
+ *cygwin* | *mingw* | *cegcc* )
+ $ECHO >> "$output_objdir/$my_dlsyms" "\
+/* DATA imports from DLLs on WIN32 con't be const, because
+ runtime relocations are performed -- see ld's documentation
+ on pseudo-relocs. */"
+ lt_dlsym_const= ;;
+ *osf5*)
+ echo >> "$output_objdir/$my_dlsyms" "\
+/* This system does not cope well with relocations in const data */"
+ lt_dlsym_const= ;;
+ *)
+ lt_dlsym_const=const ;;
+ esac
- linkalldeplibs=no
- if test "$link_all_deplibs" != no || test -z "$library_names" ||
- test "$build_libtool_libs" = no; then
- linkalldeplibs=yes
- fi
+ $ECHO >> "$output_objdir/$my_dlsyms" "\
+extern $lt_dlsym_const lt_dlsymlist
+lt_${my_prefix}_LTX_preloaded_symbols[];
+$lt_dlsym_const lt_dlsymlist
+lt_${my_prefix}_LTX_preloaded_symbols[] =
+{\
+ { \"$my_originator\", (void *) 0 },"
- tmp_libs=
- for deplib in $dependency_libs; do
- case $deplib in
- -L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test
- esac
- # Need to link against all dependency_libs?
- if test "$linkalldeplibs" = yes; then
- deplibs="$deplib $deplibs"
- else
- # Need to hardcode shared library paths
- # or/and link against static libraries
- newdependency_libs="$deplib $newdependency_libs"
- fi
- if test "X$duplicate_deps" = "Xyes" ; then
- case "$tmp_libs " in
- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
- esac
- fi
- tmp_libs="$tmp_libs $deplib"
- done # for deplib
- continue
- fi # $linkmode = prog...
+ case $need_lib_prefix in
+ no)
+ eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$my_dlsyms"
+ ;;
+ *)
+ eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms"
+ ;;
+ esac
+ $ECHO >> "$output_objdir/$my_dlsyms" "\
+ {0, (void *) 0}
+};
- if test "$linkmode,$pass" = "prog,link"; then
- if test -n "$library_names" &&
- { { test "$prefer_static_libs" = no ||
- test "$prefer_static_libs,$installed" = "built,yes"; } ||
- test -z "$old_library"; }; then
- # We need to hardcode the library path
- if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
- # Make sure the rpath contains only unique directories.
- case "$temp_rpath " in
- *" $dir "*) ;;
- *" $absdir "*) ;;
- *) temp_rpath="$temp_rpath $absdir" ;;
- esac
- fi
+/* This works around a problem in FreeBSD linker */
+#ifdef FREEBSD_WORKAROUND
+static const void *lt_preloaded_setup() {
+ return lt_${my_prefix}_LTX_preloaded_symbols;
+}
+#endif
- # Hardcode the library path.
- # Skip directories that are in the system default run-time
- # search path.
- case " $sys_lib_dlsearch_path " in
- *" $absdir "*) ;;
- *)
- case "$compile_rpath " in
- *" $absdir "*) ;;
- *) compile_rpath="$compile_rpath $absdir"
- esac
- ;;
- esac
- case " $sys_lib_dlsearch_path " in
- *" $libdir "*) ;;
- *)
- case "$finalize_rpath " in
- *" $libdir "*) ;;
- *) finalize_rpath="$finalize_rpath $libdir"
- esac
- ;;
- esac
- fi # $linkmode,$pass = prog,link...
+#ifdef __cplusplus
+}
+#endif\
+"
+ } # !$opt_dry_run
- if test "$alldeplibs" = yes &&
- { test "$deplibs_check_method" = pass_all ||
- { test "$build_libtool_libs" = yes &&
- test -n "$library_names"; }; }; then
- # We only need to search for static libraries
- continue
- fi
- fi
+ pic_flag_for_symtable=
+ case "$compile_command " in
+ *" -static "*) ;;
+ *)
+ case $host in
+ # compiling the symbol table file with pic_flag works around
+ # a FreeBSD bug that causes programs to crash when -lm is
+ # linked before any other PIC object. But we must not use
+ # pic_flag when linking with -static. The problem exists in
+ # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
+ *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
+ pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;;
+ *-*-hpux*)
+ pic_flag_for_symtable=" $pic_flag" ;;
+ *)
+ if test "X$my_pic_p" != Xno; then
+ pic_flag_for_symtable=" $pic_flag"
+ fi
+ ;;
+ esac
+ ;;
+ esac
+ symtab_cflags=
+ for arg in $LTCFLAGS; do
+ case $arg in
+ -pie | -fpie | -fPIE) ;;
+ *) symtab_cflags="$symtab_cflags $arg" ;;
+ esac
+ done
- link_static=no # Whether the deplib will be linked statically
- use_static_libs=$prefer_static_libs
- if test "$use_static_libs" = built && test "$installed" = yes ; then
- use_static_libs=no
- fi
- if test -n "$library_names" &&
- { test "$use_static_libs" = no || test -z "$old_library"; }; then
- if test "$installed" = no; then
- notinst_deplibs="$notinst_deplibs $lib"
- need_relink=yes
- fi
- # This is a shared library
+ # Now compile the dynamic symbol file.
+ func_show_eval '(cd $output_objdir && $LTCC$symtab_cflags -c$no_builtin_flag$pic_flag_for_symtable "$my_dlsyms")' 'exit $?'
- # Warn about portability, can't link against -module's on
- # some systems (darwin)
- if test "$shouldnotlink" = yes && test "$pass" = link ; then
- $echo
- if test "$linkmode" = prog; then
- $echo "*** Warning: Linking the executable $output against the loadable module"
- else
- $echo "*** Warning: Linking the shared library $output against the loadable module"
- fi
- $echo "*** $linklib is not portable!"
- fi
- if test "$linkmode" = lib &&
- test "$hardcode_into_libs" = yes; then
- # Hardcode the library path.
- # Skip directories that are in the system default run-time
- # search path.
- case " $sys_lib_dlsearch_path " in
- *" $absdir "*) ;;
- *)
- case "$compile_rpath " in
- *" $absdir "*) ;;
- *) compile_rpath="$compile_rpath $absdir"
- esac
- ;;
- esac
- case " $sys_lib_dlsearch_path " in
- *" $libdir "*) ;;
- *)
- case "$finalize_rpath " in
- *" $libdir "*) ;;
- *) finalize_rpath="$finalize_rpath $libdir"
- esac
- ;;
- esac
- fi
+ # Clean up the generated files.
+ func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T"'
- if test -n "$old_archive_from_expsyms_cmds"; then
- # figure out the soname
- set dummy $library_names
- realname="$2"
- shift; shift
- libname=`eval \\$echo \"$libname_spec\"`
- # use dlname if we got it. it's perfectly good, no?
- if test -n "$dlname"; then
- soname="$dlname"
- elif test -n "$soname_spec"; then
- # bleh windows
- case $host in
- *cygwin* | mingw*)
- major=`expr $current - $age`
- versuffix="-$major"
- ;;
- esac
- eval soname=\"$soname_spec\"
- else
- soname="$realname"
- fi
+ # Transform the symbol file into the correct name.
+ symfileobj="$output_objdir/${my_outputname}S.$objext"
+ case $host in
+ *cygwin* | *mingw* | *cegcc* )
+ if test -f "$output_objdir/$my_outputname.def"; then
+ compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
+ finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
+ else
+ compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
+ finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
+ fi
+ ;;
+ *)
+ compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
+ finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
+ ;;
+ esac
+ ;;
+ *)
+ func_fatal_error "unknown suffix for \`$my_dlsyms'"
+ ;;
+ esac
+ else
+ # We keep going just in case the user didn't refer to
+ # lt_preloaded_symbols. The linker will fail if global_symbol_pipe
+ # really was required.
- # Make a new name for the extract_expsyms_cmds to use
- soroot="$soname"
- soname=`$echo $soroot | ${SED} -e 's/^.*\///'`
- newlib="libimp-`$echo $soname | ${SED} 's/^lib//;s/\.dll$//'`.a"
+ # Nullify the symbol file.
+ compile_command=`$ECHO "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
+ finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
+ fi
+}
- # If the library has no export list, then create one now
- if test -f "$output_objdir/$soname-def"; then :
- else
- $show "extracting exported symbol list from \`$soname'"
- save_ifs="$IFS"; IFS='~'
- cmds=$extract_expsyms_cmds
- for cmd in $cmds; do
- IFS="$save_ifs"
- eval cmd=\"$cmd\"
- $show "$cmd"
- $run eval "$cmd" || exit $?
- done
- IFS="$save_ifs"
- fi
+# func_win32_libid arg
+# return the library type of file 'arg'
+#
+# Need a lot of goo to handle *both* DLLs and import libs
+# Has to be a shell function in order to 'eat' the argument
+# that is supplied when $file_magic_command is called.
+func_win32_libid ()
+{
+ $opt_debug
+ win32_libid_type="unknown"
+ win32_fileres=`file -L $1 2>/dev/null`
+ case $win32_fileres in
+ *ar\ archive\ import\ library*) # definitely import
+ win32_libid_type="x86 archive import"
+ ;;
+ *ar\ archive*) # could be an import, or static
+ if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
+ $EGREP 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
+ win32_nmres=`eval $NM -f posix -A $1 |
+ $SED -n -e '
+ 1,100{
+ / I /{
+ s,.*,import,
+ p
+ q
+ }
+ }'`
+ case $win32_nmres in
+ import*) win32_libid_type="x86 archive import";;
+ *) win32_libid_type="x86 archive static";;
+ esac
+ fi
+ ;;
+ *DLL*)
+ win32_libid_type="x86 DLL"
+ ;;
+ *executable*) # but shell scripts are "executable" too...
+ case $win32_fileres in
+ *MS\ Windows\ PE\ Intel*)
+ win32_libid_type="x86 DLL"
+ ;;
+ esac
+ ;;
+ esac
+ $ECHO "$win32_libid_type"
+}
- # Create $newlib
- if test -f "$output_objdir/$newlib"; then :; else
- $show "generating import library for \`$soname'"
- save_ifs="$IFS"; IFS='~'
- cmds=$old_archive_from_expsyms_cmds
- for cmd in $cmds; do
- IFS="$save_ifs"
- eval cmd=\"$cmd\"
- $show "$cmd"
- $run eval "$cmd" || exit $?
- done
- IFS="$save_ifs"
- fi
- # make sure the library variables are pointing to the new library
- dir=$output_objdir
- linklib=$newlib
- fi # test -n "$old_archive_from_expsyms_cmds"
- if test "$linkmode" = prog || test "$mode" != relink; then
- add_shlibpath=
- add_dir=
- add=
- lib_linked=yes
- case $hardcode_action in
- immediate | unsupported)
- if test "$hardcode_direct" = no; then
- add="$dir/$linklib"
- case $host in
- *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;;
- *-*-sysv4*uw2*) add_dir="-L$dir" ;;
- *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \
- *-*-unixware7*) add_dir="-L$dir" ;;
- *-*-darwin* )
- # if the lib is a module then we can not link against
- # it, someone is ignoring the new warnings I added
- if /usr/bin/file -L $add 2> /dev/null |
- $EGREP ": [^:]* bundle" >/dev/null ; then
- $echo "** Warning, lib $linklib is a module, not a shared library"
- if test -z "$old_library" ; then
- $echo
- $echo "** And there doesn't seem to be a static archive available"
- $echo "** The link will probably fail, sorry"
- else
- add="$dir/$old_library"
- fi
- fi
- esac
- elif test "$hardcode_minus_L" = no; then
- case $host in
- *-*-sunos*) add_shlibpath="$dir" ;;
- esac
- add_dir="-L$dir"
- add="-l$name"
- elif test "$hardcode_shlibpath_var" = no; then
- add_shlibpath="$dir"
- add="-l$name"
- else
- lib_linked=no
- fi
- ;;
- relink)
- if test "$hardcode_direct" = yes; then
- add="$dir/$linklib"
- elif test "$hardcode_minus_L" = yes; then
- add_dir="-L$dir"
- # Try looking first in the location we're being installed to.
- if test -n "$inst_prefix_dir"; then
- case $libdir in
- [\\/]*)
- add_dir="$add_dir -L$inst_prefix_dir$libdir"
- ;;
- esac
- fi
- add="-l$name"
- elif test "$hardcode_shlibpath_var" = yes; then
- add_shlibpath="$dir"
- add="-l$name"
- else
- lib_linked=no
- fi
- ;;
- *) lib_linked=no ;;
- esac
- if test "$lib_linked" != yes; then
- $echo "$modename: configuration error: unsupported hardcode properties"
- exit $EXIT_FAILURE
- fi
+# func_extract_an_archive dir oldlib
+func_extract_an_archive ()
+{
+ $opt_debug
+ f_ex_an_ar_dir="$1"; shift
+ f_ex_an_ar_oldlib="$1"
+ func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" 'exit $?'
+ if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
+ :
+ else
+ func_fatal_error "object name conflicts in archive: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib"
+ fi
+}
- if test -n "$add_shlibpath"; then
- case :$compile_shlibpath: in
- *":$add_shlibpath:"*) ;;
- *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
- esac
- fi
- if test "$linkmode" = prog; then
- test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
- test -n "$add" && compile_deplibs="$add $compile_deplibs"
- else
- test -n "$add_dir" && deplibs="$add_dir $deplibs"
- test -n "$add" && deplibs="$add $deplibs"
- if test "$hardcode_direct" != yes && \
- test "$hardcode_minus_L" != yes && \
- test "$hardcode_shlibpath_var" = yes; then
- case :$finalize_shlibpath: in
- *":$libdir:"*) ;;
- *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
- esac
- fi
- fi
- fi
- if test "$linkmode" = prog || test "$mode" = relink; then
- add_shlibpath=
- add_dir=
- add=
- # Finalize command for both is simple: just hardcode it.
- if test "$hardcode_direct" = yes; then
- add="$libdir/$linklib"
- elif test "$hardcode_minus_L" = yes; then
- add_dir="-L$libdir"
- add="-l$name"
- elif test "$hardcode_shlibpath_var" = yes; then
- case :$finalize_shlibpath: in
- *":$libdir:"*) ;;
- *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
- esac
- add="-l$name"
- elif test "$hardcode_automatic" = yes; then
- if test -n "$inst_prefix_dir" &&
- test -f "$inst_prefix_dir$libdir/$linklib" ; then
- add="$inst_prefix_dir$libdir/$linklib"
- else
- add="$libdir/$linklib"
- fi
- else
- # We cannot seem to hardcode it, guess we'll fake it.
- add_dir="-L$libdir"
- # Try looking first in the location we're being installed to.
- if test -n "$inst_prefix_dir"; then
- case $libdir in
- [\\/]*)
- add_dir="$add_dir -L$inst_prefix_dir$libdir"
- ;;
- esac
- fi
- add="-l$name"
- fi
+# func_extract_archives gentop oldlib ...
+func_extract_archives ()
+{
+ $opt_debug
+ my_gentop="$1"; shift
+ my_oldlibs=${1+"$@"}
+ my_oldobjs=""
+ my_xlib=""
+ my_xabs=""
+ my_xdir=""
- if test "$linkmode" = prog; then
- test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
- test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
- else
- test -n "$add_dir" && deplibs="$add_dir $deplibs"
- test -n "$add" && deplibs="$add $deplibs"
- fi
- fi
- elif test "$linkmode" = prog; then
- # Here we assume that one of hardcode_direct or hardcode_minus_L
- # is not unsupported. This is valid on all known static and
- # shared platforms.
- if test "$hardcode_direct" != unsupported; then
- test -n "$old_library" && linklib="$old_library"
- compile_deplibs="$dir/$linklib $compile_deplibs"
- finalize_deplibs="$dir/$linklib $finalize_deplibs"
- else
- compile_deplibs="-l$name -L$dir $compile_deplibs"
- finalize_deplibs="-l$name -L$dir $finalize_deplibs"
- fi
- elif test "$build_libtool_libs" = yes; then
- # Not a shared library
- if test "$deplibs_check_method" != pass_all; then
- # We're trying link a shared library against a static one
- # but the system doesn't support it.
+ for my_xlib in $my_oldlibs; do
+ # Extract the objects.
+ case $my_xlib in
+ [\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;;
+ *) my_xabs=`pwd`"/$my_xlib" ;;
+ esac
+ func_basename "$my_xlib"
+ my_xlib="$func_basename_result"
+ my_xlib_u=$my_xlib
+ while :; do
+ case " $extracted_archives " in
+ *" $my_xlib_u "*)
+ func_arith $extracted_serial + 1
+ extracted_serial=$func_arith_result
+ my_xlib_u=lt$extracted_serial-$my_xlib ;;
+ *) break ;;
+ esac
+ done
+ extracted_archives="$extracted_archives $my_xlib_u"
+ my_xdir="$my_gentop/$my_xlib_u"
- # Just print a warning and add the library to dependency_libs so
- # that the program can be linked against the static library.
- $echo
- $echo "*** Warning: This system can not link to static lib archive $lib."
- $echo "*** I have the capability to make that library automatically link in when"
- $echo "*** you link to this library. But I can only do this if you have a"
- $echo "*** shared version of the library, which you do not appear to have."
- if test "$module" = yes; then
- $echo "*** But as you try to build a module library, libtool will still create "
- $echo "*** a static module, that should work as long as the dlopening application"
- $echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
- if test -z "$global_symbol_pipe"; then
- $echo
- $echo "*** However, this would only work if libtool was able to extract symbol"
- $echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
- $echo "*** not find such a program. So, this module is probably useless."
- $echo "*** \`nm' from GNU binutils and a full rebuild may help."
- fi
- if test "$build_old_libs" = no; then
- build_libtool_libs=module
- build_old_libs=yes
- else
- build_libtool_libs=no
- fi
- fi
+ func_mkdir_p "$my_xdir"
+
+ case $host in
+ *-darwin*)
+ func_verbose "Extracting $my_xabs"
+ # Do not bother doing anything if just a dry run
+ $opt_dry_run || {
+ darwin_orig_dir=`pwd`
+ cd $my_xdir || exit $?
+ darwin_archive=$my_xabs
+ darwin_curdir=`pwd`
+ darwin_base_archive=`basename "$darwin_archive"`
+ darwin_arches=`$LIPO -info "$darwin_archive" 2>/dev/null | $GREP Architectures 2>/dev/null || true`
+ if test -n "$darwin_arches"; then
+ darwin_arches=`$ECHO "$darwin_arches" | $SED -e 's/.*are://'`
+ darwin_arch=
+ func_verbose "$darwin_base_archive has multiple architectures $darwin_arches"
+ for darwin_arch in $darwin_arches ; do
+ func_mkdir_p "unfat-$$/${darwin_base_archive}-${darwin_arch}"
+ $LIPO -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}"
+ cd "unfat-$$/${darwin_base_archive}-${darwin_arch}"
+ func_extract_an_archive "`pwd`" "${darwin_base_archive}"
+ cd "$darwin_curdir"
+ $RM "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}"
+ done # $darwin_arches
+ ## Okay now we've a bunch of thin objects, gotta fatten them up :)
+ darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$basename" | sort -u`
+ darwin_file=
+ darwin_files=
+ for darwin_file in $darwin_filelist; do
+ darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
+ $LIPO -create -output "$darwin_file" $darwin_files
+ done # $darwin_filelist
+ $RM -rf unfat-$$
+ cd "$darwin_orig_dir"
else
- deplibs="$dir/$old_library $deplibs"
- link_static=yes
- fi
- fi # link shared/static library?
+ cd $darwin_orig_dir
+ func_extract_an_archive "$my_xdir" "$my_xabs"
+ fi # $darwin_arches
+ } # !$opt_dry_run
+ ;;
+ *)
+ func_extract_an_archive "$my_xdir" "$my_xabs"
+ ;;
+ esac
+ my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
+ done
- if test "$linkmode" = lib; then
- if test -n "$dependency_libs" &&
- { test "$hardcode_into_libs" != yes ||
- test "$build_old_libs" = yes ||
- test "$link_static" = yes; }; then
- # Extract -R from dependency_libs
- temp_deplibs=
- for libdir in $dependency_libs; do
- case $libdir in
- -R*) temp_xrpath=`$echo "X$libdir" | $Xsed -e 's/^-R//'`
- case " $xrpath " in
- *" $temp_xrpath "*) ;;
- *) xrpath="$xrpath $temp_xrpath";;
- esac;;
- *) temp_deplibs="$temp_deplibs $libdir";;
- esac
- done
- dependency_libs="$temp_deplibs"
- fi
+ func_extract_archives_result="$my_oldobjs"
+}
- newlib_search_path="$newlib_search_path $absdir"
- # Link against this library
- test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
- # ... and its dependency_libs
- tmp_libs=
- for deplib in $dependency_libs; do
- newdependency_libs="$deplib $newdependency_libs"
- if test "X$duplicate_deps" = "Xyes" ; then
- case "$tmp_libs " in
- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
- esac
- fi
- tmp_libs="$tmp_libs $deplib"
- done
- if test "$link_all_deplibs" != no; then
- # Add the search paths of all dependency libraries
- for deplib in $dependency_libs; do
- case $deplib in
- -L*) path="$deplib" ;;
- *.la)
- dir=`$echo "X$deplib" | $Xsed -e 's%/[^/]*$%%'`
- test "X$dir" = "X$deplib" && dir="."
- # We need an absolute path.
- case $dir in
- [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
- *)
- absdir=`cd "$dir" && pwd`
- if test -z "$absdir"; then
- $echo "$modename: warning: cannot determine absolute directory name of \`$dir'" 1>&2
- absdir="$dir"
- fi
- ;;
- esac
- if grep "^installed=no" $deplib > /dev/null; then
- path="$absdir/$objdir"
- else
- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
- if test -z "$libdir"; then
- $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
- exit $EXIT_FAILURE
- fi
- if test "$absdir" != "$libdir"; then
- $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
- fi
- path="$absdir"
- fi
- depdepl=
- case $host in
- *-*-darwin*)
- # we do not want to link against static libs,
- # but need to link against shared
- eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
- if test -n "$deplibrary_names" ; then
- for tmp in $deplibrary_names ; do
- depdepl=$tmp
- done
- if test -f "$path/$depdepl" ; then
- depdepl="$path/$depdepl"
- fi
- # do not add paths which are already there
- case " $newlib_search_path " in
- *" $path "*) ;;
- *) newlib_search_path="$newlib_search_path $path";;
- esac
- fi
- path=""
- ;;
- *)
- path="-L$path"
- ;;
- esac
- ;;
- -l*)
- case $host in
- *-*-darwin*)
- # Again, we only want to link against shared libraries
- eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"`
- for tmp in $newlib_search_path ; do
- if test -f "$tmp/lib$tmp_libs.dylib" ; then
- eval depdepl="$tmp/lib$tmp_libs.dylib"
- break
- fi
- done
- path=""
- ;;
- *) continue ;;
- esac
- ;;
- *) continue ;;
- esac
- case " $deplibs " in
- *" $path "*) ;;
- *) deplibs="$path $deplibs" ;;
- esac
- case " $deplibs " in
- *" $depdepl "*) ;;
- *) deplibs="$depdepl $deplibs" ;;
- esac
- done
- fi # link_all_deplibs != no
- fi # linkmode = lib
- done # for deplib in $libs
- dependency_libs="$newdependency_libs"
- if test "$pass" = dlpreopen; then
- # Link the dlpreopened libraries before other libraries
- for deplib in $save_deplibs; do
- deplibs="$deplib $deplibs"
- done
- fi
- if test "$pass" != dlopen; then
- if test "$pass" != conv; then
- # Make sure lib_search_path contains only unique directories.
- lib_search_path=
- for dir in $newlib_search_path; do
- case "$lib_search_path " in
- *" $dir "*) ;;
- *) lib_search_path="$lib_search_path $dir" ;;
- esac
- done
- newlib_search_path=
- fi
- if test "$linkmode,$pass" != "prog,link"; then
- vars="deplibs"
- else
- vars="compile_deplibs finalize_deplibs"
+# func_emit_wrapper_part1 [arg=no]
+#
+# Emit the first part of a libtool wrapper script on stdout.
+# For more information, see the description associated with
+# func_emit_wrapper(), below.
+func_emit_wrapper_part1 ()
+{
+ func_emit_wrapper_part1_arg1=no
+ if test -n "$1" ; then
+ func_emit_wrapper_part1_arg1=$1
fi
- for var in $vars dependency_libs; do
- # Add libraries to $var in reverse order
- eval tmp_libs=\"\$$var\"
- new_libs=
- for deplib in $tmp_libs; do
- # FIXME: Pedantically, this is the right thing to do, so
- # that some nasty dependency loop isn't accidentally
- # broken:
- #new_libs="$deplib $new_libs"
- # Pragmatically, this seems to cause very few problems in
- # practice:
- case $deplib in
- -L*) new_libs="$deplib $new_libs" ;;
- -R*) ;;
- *)
- # And here is the reason: when a library appears more
- # than once as an explicit dependence of a library, or
- # is implicitly linked in more than once by the
- # compiler, it is considered special, and multiple
- # occurrences thereof are not removed. Compare this
- # with having the same library being listed as a
- # dependency of multiple other libraries: in this case,
- # we know (pedantically, we assume) the library does not
- # need to be listed more than once, so we keep only the
- # last copy. This is not always right, but it is rare
- # enough that we require users that really mean to play
- # such unportable linking tricks to link the library
- # using -Wl,-lname, so that libtool does not consider it
- # for duplicate removal.
- case " $specialdeplibs " in
- *" $deplib "*) new_libs="$deplib $new_libs" ;;
- *)
- case " $new_libs " in
- *" $deplib "*) ;;
- *) new_libs="$deplib $new_libs" ;;
- esac
- ;;
- esac
- ;;
- esac
- done
- tmp_libs=
- for deplib in $new_libs; do
- case $deplib in
- -L*)
- case " $tmp_libs " in
- *" $deplib "*) ;;
- *) tmp_libs="$tmp_libs $deplib" ;;
- esac
- ;;
- *) tmp_libs="$tmp_libs $deplib" ;;
- esac
- done
- eval $var=\"$tmp_libs\"
- done # for var
- fi
- # Last step: remove runtime libs from dependency_libs
- # (they stay in deplibs)
- tmp_libs=
- for i in $dependency_libs ; do
- case " $predeps $postdeps $compiler_lib_search_path " in
- *" $i "*)
- i=""
- ;;
- esac
- if test -n "$i" ; then
- tmp_libs="$tmp_libs $i"
- fi
- done
- dependency_libs=$tmp_libs
- done # for pass
- if test "$linkmode" = prog; then
- dlfiles="$newdlfiles"
- dlprefiles="$newdlprefiles"
- fi
- case $linkmode in
- oldlib)
- if test -n "$deplibs"; then
- $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2
- fi
+ $ECHO "\
+#! $SHELL
- if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
- $echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2
- fi
+# $output - temporary wrapper script for $objdir/$outputname
+# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+#
+# The $output program cannot be directly executed until all the libtool
+# libraries that it depends on are installed.
+#
+# This wrapper script should never be moved out of the build directory.
+# If it is, it will not operate correctly.
- if test -n "$rpath"; then
- $echo "$modename: warning: \`-rpath' is ignored for archives" 1>&2
- fi
+# Sed substitution that helps us do robust quoting. It backslashifies
+# metacharacters that are still active within double-quoted strings.
+Xsed='${SED} -e 1s/^X//'
+sed_quote_subst='$sed_quote_subst'
- if test -n "$xrpath"; then
- $echo "$modename: warning: \`-R' is ignored for archives" 1>&2
- fi
+# Be Bourne compatible
+if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
+ emulate sh
+ NULLCMD=:
+ # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which
+ # is contrary to our usage. Disable this feature.
+ alias -g '\${1+\"\$@\"}'='\"\$@\"'
+ setopt NO_GLOB_SUBST
+else
+ case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac
+fi
+BIN_SH=xpg4; export BIN_SH # for Tru64
+DUALCASE=1; export DUALCASE # for MKS sh
- if test -n "$vinfo"; then
- $echo "$modename: warning: \`-version-info/-version-number' is ignored for archives" 1>&2
- fi
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
- if test -n "$release"; then
- $echo "$modename: warning: \`-release' is ignored for archives" 1>&2
- fi
+relink_command=\"$relink_command\"
- if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
- $echo "$modename: warning: \`-export-symbols' is ignored for archives" 1>&2
- fi
+# This environment variable determines our operation mode.
+if test \"\$libtool_install_magic\" = \"$magic\"; then
+ # install mode needs the following variables:
+ generated_by_libtool_version='$macro_version'
+ notinst_deplibs='$notinst_deplibs'
+else
+ # When we are sourced in execute mode, \$file and \$ECHO are already set.
+ if test \"\$libtool_execute_magic\" != \"$magic\"; then
+ ECHO=\"$qecho\"
+ file=\"\$0\"
+ # Make sure echo works.
+ if test \"X\$1\" = X--no-reexec; then
+ # Discard the --no-reexec flag, and continue.
+ shift
+ elif test \"X\`{ \$ECHO '\t'; } 2>/dev/null\`\" = 'X\t'; then
+ # Yippee, \$ECHO works!
+ :
+ else
+ # Restart under the correct shell, and then maybe \$ECHO will work.
+ exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"}
+ fi
+ fi\
+"
+ $ECHO "\
- # Now set the variables for building old libraries.
- build_libtool_libs=no
- oldlibs="$output"
- objs="$objs$old_deplibs"
- ;;
+ # Find the directory that this script lives in.
+ thisdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\`
+ test \"x\$thisdir\" = \"x\$file\" && thisdir=.
- lib)
- # Make sure we only generate libraries of the form `libNAME.la'.
- case $outputname in
- lib*)
- name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
- eval shared_ext=\"$shrext_cmds\"
- eval libname=\"$libname_spec\"
- ;;
- *)
- if test "$module" = no; then
- $echo "$modename: libtool library \`$output' must begin with \`lib'" 1>&2
- $echo "$help" 1>&2
- exit $EXIT_FAILURE
- fi
- if test "$need_lib_prefix" != no; then
- # Add the "lib" prefix for modules if required
- name=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
- eval shared_ext=\"$shrext_cmds\"
- eval libname=\"$libname_spec\"
- else
- libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
- fi
- ;;
+ # Follow symbolic links until we get to the real thisdir.
+ file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\`
+ while test -n \"\$file\"; do
+ destdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
+
+ # If there was a directory component, then change thisdir.
+ if test \"x\$destdir\" != \"x\$file\"; then
+ case \"\$destdir\" in
+ [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;;
+ *) thisdir=\"\$thisdir/\$destdir\" ;;
esac
+ fi
- if test -n "$objs"; then
- if test "$deplibs_check_method" != pass_all; then
- $echo "$modename: cannot build libtool library \`$output' from non-libtool objects on this host:$objs" 2>&1
- exit $EXIT_FAILURE
- else
- $echo
- $echo "*** Warning: Linking the shared library $output against the non-libtool"
- $echo "*** objects $objs is not portable!"
- libobjs="$libobjs $objs"
+ file=\`\$ECHO \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
+ file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`
+ done
+"
+}
+# end: func_emit_wrapper_part1
+
+# func_emit_wrapper_part2 [arg=no]
+#
+# Emit the second part of a libtool wrapper script on stdout.
+# For more information, see the description associated with
+# func_emit_wrapper(), below.
+func_emit_wrapper_part2 ()
+{
+ func_emit_wrapper_part2_arg1=no
+ if test -n "$1" ; then
+ func_emit_wrapper_part2_arg1=$1
fi
- fi
- if test "$dlself" != no; then
- $echo "$modename: warning: \`-dlopen self' is ignored for libtool libraries" 1>&2
- fi
+ $ECHO "\
- set dummy $rpath
- if test "$#" -gt 2; then
- $echo "$modename: warning: ignoring multiple \`-rpath's for a libtool library" 1>&2
+ # Usually 'no', except on cygwin/mingw when embedded into
+ # the cwrapper.
+ WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_part2_arg1
+ if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then
+ # special case for '.'
+ if test \"\$thisdir\" = \".\"; then
+ thisdir=\`pwd\`
+ fi
+ # remove .libs from thisdir
+ case \"\$thisdir\" in
+ *[\\\\/]$objdir ) thisdir=\`\$ECHO \"X\$thisdir\" | \$Xsed -e 's%[\\\\/][^\\\\/]*$%%'\` ;;
+ $objdir ) thisdir=. ;;
+ esac
+ fi
+
+ # Try to get the absolute directory name.
+ absdir=\`cd \"\$thisdir\" && pwd\`
+ test -n \"\$absdir\" && thisdir=\"\$absdir\"
+"
+
+ if test "$fast_install" = yes; then
+ $ECHO "\
+ program=lt-'$outputname'$exeext
+ progdir=\"\$thisdir/$objdir\"
+
+ if test ! -f \"\$progdir/\$program\" ||
+ { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\
+ test \"X\$file\" != \"X\$progdir/\$program\"; }; then
+
+ file=\"\$\$-\$program\"
+
+ if test ! -d \"\$progdir\"; then
+ $MKDIR \"\$progdir\"
+ else
+ $RM \"\$progdir/\$file\"
+ fi"
+
+ $ECHO "\
+
+ # relink executable if necessary
+ if test -n \"\$relink_command\"; then
+ if relink_command_output=\`eval \$relink_command 2>&1\`; then :
+ else
+ $ECHO \"\$relink_command_output\" >&2
+ $RM \"\$progdir/\$file\"
+ exit 1
fi
- install_libdir="$2"
+ fi
- oldlibs=
- if test -z "$rpath"; then
- if test "$build_libtool_libs" = yes; then
- # Building a libtool convenience library.
- # Some compilers have problems with a `.al' extension so
- # convenience libraries should have the same extension an
- # archive normally would.
- oldlibs="$output_objdir/$libname.$libext $oldlibs"
- build_libtool_libs=convenience
- build_old_libs=yes
+ $MV \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null ||
+ { $RM \"\$progdir/\$program\";
+ $MV \"\$progdir/\$file\" \"\$progdir/\$program\"; }
+ $RM \"\$progdir/\$file\"
+ fi"
+ else
+ $ECHO "\
+ program='$outputname'
+ progdir=\"\$thisdir/$objdir\"
+"
fi
- if test -n "$vinfo"; then
- $echo "$modename: warning: \`-version-info/-version-number' is ignored for convenience libraries" 1>&2
+ $ECHO "\
+
+ if test -f \"\$progdir/\$program\"; then"
+
+ # Export our shlibpath_var if we have one.
+ if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
+ $ECHO "\
+ # Add our own library path to $shlibpath_var
+ $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
+
+ # Some systems cannot cope with colon-terminated $shlibpath_var
+ # The second colon is a workaround for a bug in BeOS R4 sed
+ $shlibpath_var=\`\$ECHO \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\`
+
+ export $shlibpath_var
+"
fi
- if test -n "$release"; then
- $echo "$modename: warning: \`-release' is ignored for convenience libraries" 1>&2
+ # fixup the dll searchpath if we need to.
+ if test -n "$dllsearchpath"; then
+ $ECHO "\
+ # Add the dll search path components to the executable PATH
+ PATH=$dllsearchpath:\$PATH
+"
fi
- else
- # Parse the version information argument.
- save_ifs="$IFS"; IFS=':'
- set dummy $vinfo 0 0 0
- IFS="$save_ifs"
+ $ECHO "\
+ if test \"\$libtool_execute_magic\" != \"$magic\"; then
+ # Run the actual program with our arguments.
+"
+ case $host in
+ # Backslashes separate directories on plain windows
+ *-*-mingw | *-*-os2* | *-cegcc*)
+ $ECHO "\
+ exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
+"
+ ;;
+
+ *)
+ $ECHO "\
+ exec \"\$progdir/\$program\" \${1+\"\$@\"}
+"
+ ;;
+ esac
+ $ECHO "\
+ \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
+ exit 1
+ fi
+ else
+ # The program doesn't exist.
+ \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
+ \$ECHO \"This script is just a wrapper for \$program.\" 1>&2
+ $ECHO \"See the $PACKAGE documentation for more information.\" 1>&2
+ exit 1
+ fi
+fi\
+"
+}
+# end: func_emit_wrapper_part2
+
- if test -n "$8"; then
- $echo "$modename: too many parameters to \`-version-info'" 1>&2
- $echo "$help" 1>&2
- exit $EXIT_FAILURE
+# func_emit_wrapper [arg=no]
+#
+# Emit a libtool wrapper script on stdout.
+# Don't directly open a file because we may want to
+# incorporate the script contents within a cygwin/mingw
+# wrapper executable. Must ONLY be called from within
+# func_mode_link because it depends on a number of variables
+# set therein.
+#
+# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
+# variable will take. If 'yes', then the emitted script
+# will assume that the directory in which it is stored is
+# the $objdir directory. This is a cygwin/mingw-specific
+# behavior.
+func_emit_wrapper ()
+{
+ func_emit_wrapper_arg1=no
+ if test -n "$1" ; then
+ func_emit_wrapper_arg1=$1
fi
- # convert absolute version numbers to libtool ages
- # this retains compatibility with .la files and attempts
- # to make the code below a bit more comprehensible
+ # split this up so that func_emit_cwrapperexe_src
+ # can call each part independently.
+ func_emit_wrapper_part1 "${func_emit_wrapper_arg1}"
+ func_emit_wrapper_part2 "${func_emit_wrapper_arg1}"
+}
- case $vinfo_number in
- yes)
- number_major="$2"
- number_minor="$3"
- number_revision="$4"
- #
- # There are really only two kinds -- those that
- # use the current revision as the major version
- # and those that subtract age and use age as
- # a minor version. But, then there is irix
- # which has an extra 1 added just for fun
- #
- case $version_type in
- darwin|linux|osf|windows|none)
- current=`expr $number_major + $number_minor`
- age="$number_minor"
- revision="$number_revision"
- ;;
- freebsd-aout|freebsd-elf|sunos)
- current="$number_major"
- revision="$number_minor"
- age="0"
- ;;
- irix|nonstopux)
- current=`expr $number_major + $number_minor`
- age="$number_minor"
- revision="$number_minor"
- lt_irix_increment=no
- ;;
- esac
- ;;
- no)
- current="$2"
- revision="$3"
- age="$4"
- ;;
- esac
- # Check that each of the things are valid numbers.
- case $current in
- 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
- *)
- $echo "$modename: CURRENT \`$current' must be a nonnegative integer" 1>&2
- $echo "$modename: \`$vinfo' is not valid version information" 1>&2
- exit $EXIT_FAILURE
- ;;
- esac
+# func_to_host_path arg
+#
+# Convert paths to host format when used with build tools.
+# Intended for use with "native" mingw (where libtool itself
+# is running under the msys shell), or in the following cross-
+# build environments:
+# $build $host
+# mingw (msys) mingw [e.g. native]
+# cygwin mingw
+# *nix + wine mingw
+# where wine is equipped with the `winepath' executable.
+# In the native mingw case, the (msys) shell automatically
+# converts paths for any non-msys applications it launches,
+# but that facility isn't available from inside the cwrapper.
+# Similar accommodations are necessary for $host mingw and
+# $build cygwin. Calling this function does no harm for other
+# $host/$build combinations not listed above.
+#
+# ARG is the path (on $build) that should be converted to
+# the proper representation for $host. The result is stored
+# in $func_to_host_path_result.
+func_to_host_path ()
+{
+ func_to_host_path_result="$1"
+ if test -n "$1" ; then
+ case $host in
+ *mingw* )
+ lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
+ case $build in
+ *mingw* ) # actually, msys
+ # awkward: cmd appends spaces to result
+ lt_sed_strip_trailing_spaces="s/[ ]*\$//"
+ func_to_host_path_tmp1=`( cmd //c echo "$1" |\
+ $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""`
+ func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
+ $SED -e "$lt_sed_naive_backslashify"`
+ ;;
+ *cygwin* )
+ func_to_host_path_tmp1=`cygpath -w "$1"`
+ func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
+ $SED -e "$lt_sed_naive_backslashify"`
+ ;;
+ * )
+ # Unfortunately, winepath does not exit with a non-zero
+ # error code, so we are forced to check the contents of
+ # stdout. On the other hand, if the command is not
+ # found, the shell will set an exit code of 127 and print
+ # *an error message* to stdout. So we must check for both
+ # error code of zero AND non-empty stdout, which explains
+ # the odd construction:
+ func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null`
+ if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then
+ func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
+ $SED -e "$lt_sed_naive_backslashify"`
+ else
+ # Allow warning below.
+ func_to_host_path_result=""
+ fi
+ ;;
+ esac
+ if test -z "$func_to_host_path_result" ; then
+ func_error "Could not determine host path corresponding to"
+ func_error " '$1'"
+ func_error "Continuing, but uninstalled executables may not work."
+ # Fallback:
+ func_to_host_path_result="$1"
+ fi
+ ;;
+ esac
+ fi
+}
+# end: func_to_host_path
- case $revision in
- 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
- *)
- $echo "$modename: REVISION \`$revision' must be a nonnegative integer" 1>&2
- $echo "$modename: \`$vinfo' is not valid version information" 1>&2
- exit $EXIT_FAILURE
- ;;
- esac
+# func_to_host_pathlist arg
+#
+# Convert pathlists to host format when used with build tools.
+# See func_to_host_path(), above. This function supports the
+# following $build/$host combinations (but does no harm for
+# combinations not listed here):
+# $build $host
+# mingw (msys) mingw [e.g. native]
+# cygwin mingw
+# *nix + wine mingw
+#
+# Path separators are also converted from $build format to
+# $host format. If ARG begins or ends with a path separator
+# character, it is preserved (but converted to $host format)
+# on output.
+#
+# ARG is a pathlist (on $build) that should be converted to
+# the proper representation on $host. The result is stored
+# in $func_to_host_pathlist_result.
+func_to_host_pathlist ()
+{
+ func_to_host_pathlist_result="$1"
+ if test -n "$1" ; then
+ case $host in
+ *mingw* )
+ lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
+ # Remove leading and trailing path separator characters from
+ # ARG. msys behavior is inconsistent here, cygpath turns them
+ # into '.;' and ';.', and winepath ignores them completely.
+ func_to_host_pathlist_tmp2="$1"
+ # Once set for this call, this variable should not be
+ # reassigned. It is used in tha fallback case.
+ func_to_host_pathlist_tmp1=`echo "$func_to_host_pathlist_tmp2" |\
+ $SED -e 's|^:*||' -e 's|:*$||'`
+ case $build in
+ *mingw* ) # Actually, msys.
+ # Awkward: cmd appends spaces to result.
+ lt_sed_strip_trailing_spaces="s/[ ]*\$//"
+ func_to_host_pathlist_tmp2=`( cmd //c echo "$func_to_host_pathlist_tmp1" |\
+ $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""`
+ func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\
+ $SED -e "$lt_sed_naive_backslashify"`
+ ;;
+ *cygwin* )
+ func_to_host_pathlist_tmp2=`cygpath -w -p "$func_to_host_pathlist_tmp1"`
+ func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\
+ $SED -e "$lt_sed_naive_backslashify"`
+ ;;
+ * )
+ # unfortunately, winepath doesn't convert pathlists
+ func_to_host_pathlist_result=""
+ func_to_host_pathlist_oldIFS=$IFS
+ IFS=:
+ for func_to_host_pathlist_f in $func_to_host_pathlist_tmp1 ; do
+ IFS=$func_to_host_pathlist_oldIFS
+ if test -n "$func_to_host_pathlist_f" ; then
+ func_to_host_path "$func_to_host_pathlist_f"
+ if test -n "$func_to_host_path_result" ; then
+ if test -z "$func_to_host_pathlist_result" ; then
+ func_to_host_pathlist_result="$func_to_host_path_result"
+ else
+ func_to_host_pathlist_result="$func_to_host_pathlist_result;$func_to_host_path_result"
+ fi
+ fi
+ fi
+ IFS=:
+ done
+ IFS=$func_to_host_pathlist_oldIFS
+ ;;
+ esac
+ if test -z "$func_to_host_pathlist_result" ; then
+ func_error "Could not determine the host path(s) corresponding to"
+ func_error " '$1'"
+ func_error "Continuing, but uninstalled executables may not work."
+ # Fallback. This may break if $1 contains DOS-style drive
+ # specifications. The fix is not to complicate the expression
+ # below, but for the user to provide a working wine installation
+ # with winepath so that path translation in the cross-to-mingw
+ # case works properly.
+ lt_replace_pathsep_nix_to_dos="s|:|;|g"
+ func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp1" |\
+ $SED -e "$lt_replace_pathsep_nix_to_dos"`
+ fi
+ # Now, add the leading and trailing path separators back
+ case "$1" in
+ :* ) func_to_host_pathlist_result=";$func_to_host_pathlist_result"
+ ;;
+ esac
+ case "$1" in
+ *: ) func_to_host_pathlist_result="$func_to_host_pathlist_result;"
+ ;;
+ esac
+ ;;
+ esac
+ fi
+}
+# end: func_to_host_pathlist
- case $age in
- 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
- *)
- $echo "$modename: AGE \`$age' must be a nonnegative integer" 1>&2
- $echo "$modename: \`$vinfo' is not valid version information" 1>&2
- exit $EXIT_FAILURE
- ;;
- esac
+# func_emit_cwrapperexe_src
+# emit the source code for a wrapper executable on stdout
+# Must ONLY be called from within func_mode_link because
+# it depends on a number of variable set therein.
+func_emit_cwrapperexe_src ()
+{
+ cat <<EOF
- if test "$age" -gt "$current"; then
- $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2
- $echo "$modename: \`$vinfo' is not valid version information" 1>&2
- exit $EXIT_FAILURE
- fi
+/* $cwrappersource - temporary wrapper executable for $objdir/$outputname
+ Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
- # Calculate the version variables.
- major=
- versuffix=
- verstring=
- case $version_type in
- none) ;;
+ The $output program cannot be directly executed until all the libtool
+ libraries that it depends on are installed.
- darwin)
- # Like Linux, but with the current version available in
- # verstring for coding it into the library header
- major=.`expr $current - $age`
- versuffix="$major.$age.$revision"
- # Darwin ld doesn't like 0 for these options...
- minor_current=`expr $current + 1`
- xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
- verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
- ;;
+ This wrapper executable should never be moved out of the build directory.
+ If it is, it will not operate correctly.
- freebsd-aout)
- major=".$current"
- versuffix=".$current.$revision";
- ;;
+ Currently, it simply execs the wrapper *script* "$SHELL $output",
+ but could eventually absorb all of the scripts functionality and
+ exec $objdir/$outputname directly.
+*/
+EOF
+ cat <<"EOF"
+#include <stdio.h>
+#include <stdlib.h>
+#ifdef _MSC_VER
+# include <direct.h>
+# include <process.h>
+# include <io.h>
+# define setmode _setmode
+#else
+# include <unistd.h>
+# include <stdint.h>
+# ifdef __CYGWIN__
+# include <io.h>
+# define HAVE_SETENV
+# ifdef __STRICT_ANSI__
+char *realpath (const char *, char *);
+int putenv (char *);
+int setenv (const char *, const char *, int);
+# endif
+# endif
+#endif
+#include <malloc.h>
+#include <stdarg.h>
+#include <assert.h>
+#include <string.h>
+#include <ctype.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <sys/stat.h>
- freebsd-elf)
- major=".$current"
- versuffix=".$current";
- ;;
+#if defined(PATH_MAX)
+# define LT_PATHMAX PATH_MAX
+#elif defined(MAXPATHLEN)
+# define LT_PATHMAX MAXPATHLEN
+#else
+# define LT_PATHMAX 1024
+#endif
- irix | nonstopux)
- if test "X$lt_irix_increment" = "Xno"; then
- major=`expr $current - $age`
- else
- major=`expr $current - $age + 1`
- fi
- case $version_type in
- nonstopux) verstring_prefix=nonstopux ;;
- *) verstring_prefix=sgi ;;
- esac
- verstring="$verstring_prefix$major.$revision"
+#ifndef S_IXOTH
+# define S_IXOTH 0
+#endif
+#ifndef S_IXGRP
+# define S_IXGRP 0
+#endif
- # Add in all the interfaces that we are compatible with.
- loop=$revision
- while test "$loop" -ne 0; do
- iface=`expr $revision - $loop`
- loop=`expr $loop - 1`
- verstring="$verstring_prefix$major.$iface:$verstring"
- done
+#ifdef _MSC_VER
+# define S_IXUSR _S_IEXEC
+# define stat _stat
+# ifndef _INTPTR_T_DEFINED
+# define intptr_t int
+# endif
+#endif
- # Before this point, $major must not contain `.'.
- major=.$major
- versuffix="$major.$revision"
- ;;
+#ifndef DIR_SEPARATOR
+# define DIR_SEPARATOR '/'
+# define PATH_SEPARATOR ':'
+#endif
- linux)
- major=.`expr $current - $age`
- versuffix="$major.$age.$revision"
- ;;
+#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
+ defined (__OS2__)
+# define HAVE_DOS_BASED_FILE_SYSTEM
+# define FOPEN_WB "wb"
+# ifndef DIR_SEPARATOR_2
+# define DIR_SEPARATOR_2 '\\'
+# endif
+# ifndef PATH_SEPARATOR_2
+# define PATH_SEPARATOR_2 ';'
+# endif
+#endif
- osf)
- major=.`expr $current - $age`
- versuffix=".$current.$age.$revision"
- verstring="$current.$age.$revision"
+#ifndef DIR_SEPARATOR_2
+# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR)
+#else /* DIR_SEPARATOR_2 */
+# define IS_DIR_SEPARATOR(ch) \
+ (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
+#endif /* DIR_SEPARATOR_2 */
- # Add in all the interfaces that we are compatible with.
- loop=$age
- while test "$loop" -ne 0; do
- iface=`expr $current - $loop`
- loop=`expr $loop - 1`
- verstring="$verstring:${iface}.0"
- done
+#ifndef PATH_SEPARATOR_2
+# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR)
+#else /* PATH_SEPARATOR_2 */
+# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
+#endif /* PATH_SEPARATOR_2 */
- # Make executables depend on our current version.
- verstring="$verstring:${current}.0"
- ;;
+#ifdef __CYGWIN__
+# define FOPEN_WB "wb"
+#endif
- sunos)
- major=".$current"
- versuffix=".$current.$revision"
- ;;
+#ifndef FOPEN_WB
+# define FOPEN_WB "w"
+#endif
+#ifndef _O_BINARY
+# define _O_BINARY 0
+#endif
- windows)
- # Use '-' rather than '.', since we only want one
- # extension on DOS 8.3 filesystems.
- major=`expr $current - $age`
- versuffix="-$major"
- ;;
+#define XMALLOC(type, num) ((type *) xmalloc ((num) * sizeof(type)))
+#define XFREE(stale) do { \
+ if (stale) { free ((void *) stale); stale = 0; } \
+} while (0)
- *)
- $echo "$modename: unknown library version type \`$version_type'" 1>&2
- $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2
- exit $EXIT_FAILURE
- ;;
- esac
+#undef LTWRAPPER_DEBUGPRINTF
+#if defined DEBUGWRAPPER
+# define LTWRAPPER_DEBUGPRINTF(args) ltwrapper_debugprintf args
+static void
+ltwrapper_debugprintf (const char *fmt, ...)
+{
+ va_list args;
+ va_start (args, fmt);
+ (void) vfprintf (stderr, fmt, args);
+ va_end (args);
+}
+#else
+# define LTWRAPPER_DEBUGPRINTF(args)
+#endif
- # Clear the version info if we defaulted, and they specified a release.
- if test -z "$vinfo" && test -n "$release"; then
- major=
- case $version_type in
- darwin)
- # we can't check for "0.0" in archive_cmds due to quoting
- # problems, so we reset it completely
- verstring=
- ;;
- *)
- verstring="0.0"
- ;;
- esac
- if test "$need_version" = no; then
- versuffix=
- else
- versuffix=".0.0"
- fi
- fi
+const char *program_name = NULL;
- # Remove version info from name if versioning should be avoided
- if test "$avoid_version" = yes && test "$need_version" = no; then
- major=
- versuffix=
- verstring=""
- fi
+void *xmalloc (size_t num);
+char *xstrdup (const char *string);
+const char *base_name (const char *name);
+char *find_executable (const char *wrapper);
+char *chase_symlinks (const char *pathspec);
+int make_executable (const char *path);
+int check_executable (const char *path);
+char *strendzap (char *str, const char *pat);
+void lt_fatal (const char *message, ...);
+void lt_setenv (const char *name, const char *value);
+char *lt_extend_str (const char *orig_value, const char *add, int to_end);
+void lt_opt_process_env_set (const char *arg);
+void lt_opt_process_env_prepend (const char *arg);
+void lt_opt_process_env_append (const char *arg);
+int lt_split_name_value (const char *arg, char** name, char** value);
+void lt_update_exe_path (const char *name, const char *value);
+void lt_update_lib_path (const char *name, const char *value);
+
+static const char *script_text_part1 =
+EOF
- # Check to see if the archive will have undefined symbols.
- if test "$allow_undefined" = yes; then
- if test "$allow_undefined_flag" = unsupported; then
- $echo "$modename: warning: undefined symbols not allowed in $host shared libraries" 1>&2
- build_libtool_libs=no
- build_old_libs=yes
- fi
- else
- # Don't allow undefined symbols.
- allow_undefined_flag="$no_undefined_flag"
- fi
- fi
+ func_emit_wrapper_part1 yes |
+ $SED -e 's/\([\\"]\)/\\\1/g' \
+ -e 's/^/ "/' -e 's/$/\\n"/'
+ echo ";"
+ cat <<EOF
- if test "$mode" != relink; then
- # Remove our outputs, but don't remove object files since they
- # may have been created when compiling PIC objects.
- removelist=
- tempremovelist=`$echo "$output_objdir/*"`
- for p in $tempremovelist; do
- case $p in
- *.$objext)
- ;;
- $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
- if test "X$precious_files_regex" != "X"; then
- if echo $p | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
- then
- continue
- fi
- fi
- removelist="$removelist $p"
- ;;
- *) ;;
- esac
- done
- if test -n "$removelist"; then
- $show "${rm}r $removelist"
- $run ${rm}r $removelist
- fi
- fi
+static const char *script_text_part2 =
+EOF
+ func_emit_wrapper_part2 yes |
+ $SED -e 's/\([\\"]\)/\\\1/g' \
+ -e 's/^/ "/' -e 's/$/\\n"/'
+ echo ";"
+
+ cat <<EOF
+const char * MAGIC_EXE = "$magic_exe";
+const char * LIB_PATH_VARNAME = "$shlibpath_var";
+EOF
- # Now set the variables for building old libraries.
- if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
- oldlibs="$oldlibs $output_objdir/$libname.$libext"
+ if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
+ func_to_host_pathlist "$temp_rpath"
+ cat <<EOF
+const char * LIB_PATH_VALUE = "$func_to_host_pathlist_result";
+EOF
+ else
+ cat <<"EOF"
+const char * LIB_PATH_VALUE = "";
+EOF
+ fi
- # Transform .lo files to .o files.
- oldobjs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`
- fi
+ if test -n "$dllsearchpath"; then
+ func_to_host_pathlist "$dllsearchpath:"
+ cat <<EOF
+const char * EXE_PATH_VARNAME = "PATH";
+const char * EXE_PATH_VALUE = "$func_to_host_pathlist_result";
+EOF
+ else
+ cat <<"EOF"
+const char * EXE_PATH_VARNAME = "";
+const char * EXE_PATH_VALUE = "";
+EOF
+ fi
- # Eliminate all temporary directories.
- #for path in $notinst_path; do
- # lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
- # deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
- # dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
- #done
+ if test "$fast_install" = yes; then
+ cat <<EOF
+const char * TARGET_PROGRAM_NAME = "lt-$outputname"; /* hopefully, no .exe */
+EOF
+ else
+ cat <<EOF
+const char * TARGET_PROGRAM_NAME = "$outputname"; /* hopefully, no .exe */
+EOF
+ fi
- if test -n "$xrpath"; then
- # If the user specified any rpath flags, then add them.
- temp_xrpath=
- for libdir in $xrpath; do
- temp_xrpath="$temp_xrpath -R$libdir"
- case "$finalize_rpath " in
- *" $libdir "*) ;;
- *) finalize_rpath="$finalize_rpath $libdir" ;;
- esac
- done
- if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
- dependency_libs="$temp_xrpath $dependency_libs"
- fi
- fi
- # Make sure dlfiles contains only unique files that won't be dlpreopened
- old_dlfiles="$dlfiles"
- dlfiles=
- for lib in $old_dlfiles; do
- case " $dlprefiles $dlfiles " in
- *" $lib "*) ;;
- *) dlfiles="$dlfiles $lib" ;;
- esac
- done
+ cat <<"EOF"
- # Make sure dlprefiles contains only unique files
- old_dlprefiles="$dlprefiles"
- dlprefiles=
- for lib in $old_dlprefiles; do
- case "$dlprefiles " in
- *" $lib "*) ;;
- *) dlprefiles="$dlprefiles $lib" ;;
- esac
- done
+#define LTWRAPPER_OPTION_PREFIX "--lt-"
+#define LTWRAPPER_OPTION_PREFIX_LENGTH 5
- if test "$build_libtool_libs" = yes; then
- if test -n "$rpath"; then
- case $host in
- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*)
- # these systems don't actually have a c library (as such)!
- ;;
- *-*-rhapsody* | *-*-darwin1.[012])
- # Rhapsody C library is in the System framework
- deplibs="$deplibs -framework System"
- ;;
- *-*-netbsd*)
- # Don't link with libc until the a.out ld.so is fixed.
- ;;
- *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
- # Do not include libc due to us having libc/libc_r.
- ;;
- *-*-sco3.2v5* | *-*-sco5v6*)
- # Causes problems with __ctype
- ;;
- *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
- # Compiler inserts libc in the correct place for threads to work
- ;;
- *)
- # Add libc to deplibs on all other systems if necessary.
- if test "$build_libtool_need_lc" = "yes"; then
- deplibs="$deplibs -lc"
- fi
+static const size_t opt_prefix_len = LTWRAPPER_OPTION_PREFIX_LENGTH;
+static const char *ltwrapper_option_prefix = LTWRAPPER_OPTION_PREFIX;
+
+static const char *dumpscript_opt = LTWRAPPER_OPTION_PREFIX "dump-script";
+
+static const size_t env_set_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 7;
+static const char *env_set_opt = LTWRAPPER_OPTION_PREFIX "env-set";
+ /* argument is putenv-style "foo=bar", value of foo is set to bar */
+
+static const size_t env_prepend_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 11;
+static const char *env_prepend_opt = LTWRAPPER_OPTION_PREFIX "env-prepend";
+ /* argument is putenv-style "foo=bar", new value of foo is bar${foo} */
+
+static const size_t env_append_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 10;
+static const char *env_append_opt = LTWRAPPER_OPTION_PREFIX "env-append";
+ /* argument is putenv-style "foo=bar", new value of foo is ${foo}bar */
+
+int
+main (int argc, char *argv[])
+{
+ char **newargz;
+ int newargc;
+ char *tmp_pathspec;
+ char *actual_cwrapper_path;
+ char *actual_cwrapper_name;
+ char *target_name;
+ char *lt_argv_zero;
+ intptr_t rval = 127;
+
+ int i;
+
+ program_name = (char *) xstrdup (base_name (argv[0]));
+ LTWRAPPER_DEBUGPRINTF (("(main) argv[0] : %s\n", argv[0]));
+ LTWRAPPER_DEBUGPRINTF (("(main) program_name : %s\n", program_name));
+
+ /* very simple arg parsing; don't want to rely on getopt */
+ for (i = 1; i < argc; i++)
+ {
+ if (strcmp (argv[i], dumpscript_opt) == 0)
+ {
+EOF
+ case "$host" in
+ *mingw* | *cygwin* )
+ # make stdout use "unix" line endings
+ echo " setmode(1,_O_BINARY);"
+ ;;
+ esac
+
+ cat <<"EOF"
+ printf ("%s", script_text_part1);
+ printf ("%s", script_text_part2);
+ return 0;
+ }
+ }
+
+ newargz = XMALLOC (char *, argc + 1);
+ tmp_pathspec = find_executable (argv[0]);
+ if (tmp_pathspec == NULL)
+ lt_fatal ("Couldn't find %s", argv[0]);
+ LTWRAPPER_DEBUGPRINTF (("(main) found exe (before symlink chase) at : %s\n",
+ tmp_pathspec));
+
+ actual_cwrapper_path = chase_symlinks (tmp_pathspec);
+ LTWRAPPER_DEBUGPRINTF (("(main) found exe (after symlink chase) at : %s\n",
+ actual_cwrapper_path));
+ XFREE (tmp_pathspec);
+
+ actual_cwrapper_name = xstrdup( base_name (actual_cwrapper_path));
+ strendzap (actual_cwrapper_path, actual_cwrapper_name);
+
+ /* wrapper name transforms */
+ strendzap (actual_cwrapper_name, ".exe");
+ tmp_pathspec = lt_extend_str (actual_cwrapper_name, ".exe", 1);
+ XFREE (actual_cwrapper_name);
+ actual_cwrapper_name = tmp_pathspec;
+ tmp_pathspec = 0;
+
+ /* target_name transforms -- use actual target program name; might have lt- prefix */
+ target_name = xstrdup (base_name (TARGET_PROGRAM_NAME));
+ strendzap (target_name, ".exe");
+ tmp_pathspec = lt_extend_str (target_name, ".exe", 1);
+ XFREE (target_name);
+ target_name = tmp_pathspec;
+ tmp_pathspec = 0;
+
+ LTWRAPPER_DEBUGPRINTF (("(main) libtool target name: %s\n",
+ target_name));
+EOF
+
+ cat <<EOF
+ newargz[0] =
+ XMALLOC (char, (strlen (actual_cwrapper_path) +
+ strlen ("$objdir") + 1 + strlen (actual_cwrapper_name) + 1));
+ strcpy (newargz[0], actual_cwrapper_path);
+ strcat (newargz[0], "$objdir");
+ strcat (newargz[0], "/");
+EOF
+
+ cat <<"EOF"
+ /* stop here, and copy so we don't have to do this twice */
+ tmp_pathspec = xstrdup (newargz[0]);
+
+ /* do NOT want the lt- prefix here, so use actual_cwrapper_name */
+ strcat (newargz[0], actual_cwrapper_name);
+
+ /* DO want the lt- prefix here if it exists, so use target_name */
+ lt_argv_zero = lt_extend_str (tmp_pathspec, target_name, 1);
+ XFREE (tmp_pathspec);
+ tmp_pathspec = NULL;
+EOF
+
+ case $host_os in
+ mingw*)
+ cat <<"EOF"
+ {
+ char* p;
+ while ((p = strchr (newargz[0], '\\')) != NULL)
+ {
+ *p = '/';
+ }
+ while ((p = strchr (lt_argv_zero, '\\')) != NULL)
+ {
+ *p = '/';
+ }
+ }
+EOF
;;
- esac
- fi
+ esac
+
+ cat <<"EOF"
+ XFREE (target_name);
+ XFREE (actual_cwrapper_path);
+ XFREE (actual_cwrapper_name);
+
+ lt_setenv ("BIN_SH", "xpg4"); /* for Tru64 */
+ lt_setenv ("DUALCASE", "1"); /* for MSK sh */
+ lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
+ lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE);
+
+ newargc=0;
+ for (i = 1; i < argc; i++)
+ {
+ if (strncmp (argv[i], env_set_opt, env_set_opt_len) == 0)
+ {
+ if (argv[i][env_set_opt_len] == '=')
+ {
+ const char *p = argv[i] + env_set_opt_len + 1;
+ lt_opt_process_env_set (p);
+ }
+ else if (argv[i][env_set_opt_len] == '\0' && i + 1 < argc)
+ {
+ lt_opt_process_env_set (argv[++i]); /* don't copy */
+ }
+ else
+ lt_fatal ("%s missing required argument", env_set_opt);
+ continue;
+ }
+ if (strncmp (argv[i], env_prepend_opt, env_prepend_opt_len) == 0)
+ {
+ if (argv[i][env_prepend_opt_len] == '=')
+ {
+ const char *p = argv[i] + env_prepend_opt_len + 1;
+ lt_opt_process_env_prepend (p);
+ }
+ else if (argv[i][env_prepend_opt_len] == '\0' && i + 1 < argc)
+ {
+ lt_opt_process_env_prepend (argv[++i]); /* don't copy */
+ }
+ else
+ lt_fatal ("%s missing required argument", env_prepend_opt);
+ continue;
+ }
+ if (strncmp (argv[i], env_append_opt, env_append_opt_len) == 0)
+ {
+ if (argv[i][env_append_opt_len] == '=')
+ {
+ const char *p = argv[i] + env_append_opt_len + 1;
+ lt_opt_process_env_append (p);
+ }
+ else if (argv[i][env_append_opt_len] == '\0' && i + 1 < argc)
+ {
+ lt_opt_process_env_append (argv[++i]); /* don't copy */
+ }
+ else
+ lt_fatal ("%s missing required argument", env_append_opt);
+ continue;
+ }
+ if (strncmp (argv[i], ltwrapper_option_prefix, opt_prefix_len) == 0)
+ {
+ /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
+ namespace, but it is not one of the ones we know about and
+ have already dealt with, above (inluding dump-script), then
+ report an error. Otherwise, targets might begin to believe
+ they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
+ namespace. The first time any user complains about this, we'll
+ need to make LTWRAPPER_OPTION_PREFIX a configure-time option
+ or a configure.ac-settable value.
+ */
+ lt_fatal ("Unrecognized option in %s namespace: '%s'",
+ ltwrapper_option_prefix, argv[i]);
+ }
+ /* otherwise ... */
+ newargz[++newargc] = xstrdup (argv[i]);
+ }
+ newargz[++newargc] = NULL;
+
+ LTWRAPPER_DEBUGPRINTF (("(main) lt_argv_zero : %s\n", (lt_argv_zero ? lt_argv_zero : "<NULL>")));
+ for (i = 0; i < newargc; i++)
+ {
+ LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d] : %s\n", i, (newargz[i] ? newargz[i] : "<NULL>")));
+ }
- # Transform deplibs into only deplibs that can be linked in shared.
- name_save=$name
- libname_save=$libname
- release_save=$release
- versuffix_save=$versuffix
- major_save=$major
- # I'm not sure if I'm treating the release correctly. I think
- # release should show up in the -l (ie -lgmp5) so we don't want to
- # add it in twice. Is that correct?
- release=""
- versuffix=""
- major=""
- newdeplibs=
- droppeddeps=no
- case $deplibs_check_method in
- pass_all)
- # Don't check for shared/static. Everything works.
- # This might be a little naive. We might want to check
- # whether the library exists or not. But this is on
- # osf3 & osf4 and I'm not really sure... Just
- # implementing what was already the behavior.
- newdeplibs=$deplibs
- ;;
- test_compile)
- # This code stresses the "libraries are programs" paradigm to its
- # limits. Maybe even breaks it. We compile a program, linking it
- # against the deplibs as a proxy for the library. Then we can check
- # whether they linked in statically or dynamically with ldd.
- $rm conftest.c
- cat > conftest.c <<EOF
- int main() { return 0; }
EOF
- $rm conftest
- if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
- ldd_output=`ldd conftest`
- for i in $deplibs; do
- name=`expr $i : '-l\(.*\)'`
- # If $name is empty we are operating on a -L argument.
- if test "$name" != "" && test "$name" != "0"; then
- if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
- case " $predeps $postdeps " in
- *" $i "*)
- newdeplibs="$newdeplibs $i"
- i=""
- ;;
- esac
- fi
- if test -n "$i" ; then
- libname=`eval \\$echo \"$libname_spec\"`
- deplib_matches=`eval \\$echo \"$library_names_spec\"`
- set dummy $deplib_matches
- deplib_match=$2
- if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
- newdeplibs="$newdeplibs $i"
- else
- droppeddeps=yes
- $echo
- $echo "*** Warning: dynamic linker does not accept needed library $i."
- $echo "*** I have the capability to make that library automatically link in when"
- $echo "*** you link to this library. But I can only do this if you have a"
- $echo "*** shared version of the library, which I believe you do not have"
- $echo "*** because a test_compile did reveal that the linker did not use it for"
- $echo "*** its dynamic dependency list that programs get resolved with at runtime."
- fi
- fi
- else
- newdeplibs="$newdeplibs $i"
- fi
- done
- else
- # Error occurred in the first compile. Let's try to salvage
- # the situation: Compile a separate program for each library.
- for i in $deplibs; do
- name=`expr $i : '-l\(.*\)'`
- # If $name is empty we are operating on a -L argument.
- if test "$name" != "" && test "$name" != "0"; then
- $rm conftest
- if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
- ldd_output=`ldd conftest`
- if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
- case " $predeps $postdeps " in
- *" $i "*)
- newdeplibs="$newdeplibs $i"
- i=""
- ;;
- esac
- fi
- if test -n "$i" ; then
- libname=`eval \\$echo \"$libname_spec\"`
- deplib_matches=`eval \\$echo \"$library_names_spec\"`
- set dummy $deplib_matches
- deplib_match=$2
- if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
- newdeplibs="$newdeplibs $i"
- else
- droppeddeps=yes
- $echo
- $echo "*** Warning: dynamic linker does not accept needed library $i."
- $echo "*** I have the capability to make that library automatically link in when"
- $echo "*** you link to this library. But I can only do this if you have a"
- $echo "*** shared version of the library, which you do not appear to have"
- $echo "*** because a test_compile did reveal that the linker did not use this one"
- $echo "*** as a dynamic dependency that programs can get resolved with at runtime."
- fi
- fi
- else
- droppeddeps=yes
- $echo
- $echo "*** Warning! Library $i is needed by this library but I was not able to"
- $echo "*** make it link in! You will probably need to install it or some"
- $echo "*** library that it depends on before this library will be fully"
- $echo "*** functional. Installing it before continuing would be even better."
- fi
- else
- newdeplibs="$newdeplibs $i"
- fi
- done
- fi
- ;;
- file_magic*)
- set dummy $deplibs_check_method
- file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
- for a_deplib in $deplibs; do
- name=`expr $a_deplib : '-l\(.*\)'`
- # If $name is empty we are operating on a -L argument.
- if test "$name" != "" && test "$name" != "0"; then
- if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
- case " $predeps $postdeps " in
- *" $a_deplib "*)
- newdeplibs="$newdeplibs $a_deplib"
- a_deplib=""
- ;;
- esac
- fi
- if test -n "$a_deplib" ; then
- libname=`eval \\$echo \"$libname_spec\"`
- for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
- potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
- for potent_lib in $potential_libs; do
- # Follow soft links.
- if ls -lLd "$potent_lib" 2>/dev/null \
- | grep " -> " >/dev/null; then
- continue
- fi
- # The statement above tries to avoid entering an
- # endless loop below, in case of cyclic links.
- # We might still enter an endless loop, since a link
- # loop can be closed while we follow links,
- # but so what?
- potlib="$potent_lib"
- while test -h "$potlib" 2>/dev/null; do
- potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
- case $potliblink in
- [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
- *) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
- esac
- done
- if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \
- | ${SED} 10q \
- | $EGREP "$file_magic_regex" > /dev/null; then
- newdeplibs="$newdeplibs $a_deplib"
- a_deplib=""
- break 2
- fi
- done
- done
- fi
- if test -n "$a_deplib" ; then
- droppeddeps=yes
- $echo
- $echo "*** Warning: linker path does not have real file for library $a_deplib."
- $echo "*** I have the capability to make that library automatically link in when"
- $echo "*** you link to this library. But I can only do this if you have a"
- $echo "*** shared version of the library, which you do not appear to have"
- $echo "*** because I did check the linker path looking for a file starting"
- if test -z "$potlib" ; then
- $echo "*** with $libname but no candidates were found. (...for file magic test)"
- else
- $echo "*** with $libname and none of the candidates passed a file format test"
- $echo "*** using a file magic. Last file checked: $potlib"
- fi
- fi
- else
- # Add a -L argument.
- newdeplibs="$newdeplibs $a_deplib"
- fi
- done # Gone through all deplibs.
- ;;
- match_pattern*)
- set dummy $deplibs_check_method
- match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
- for a_deplib in $deplibs; do
- name=`expr $a_deplib : '-l\(.*\)'`
- # If $name is empty we are operating on a -L argument.
- if test -n "$name" && test "$name" != "0"; then
- if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
- case " $predeps $postdeps " in
- *" $a_deplib "*)
- newdeplibs="$newdeplibs $a_deplib"
- a_deplib=""
- ;;
- esac
- fi
- if test -n "$a_deplib" ; then
- libname=`eval \\$echo \"$libname_spec\"`
- for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
- potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
- for potent_lib in $potential_libs; do
- potlib="$potent_lib" # see symlink-check above in file_magic test
- if eval $echo \"$potent_lib\" 2>/dev/null \
- | ${SED} 10q \
- | $EGREP "$match_pattern_regex" > /dev/null; then
- newdeplibs="$newdeplibs $a_deplib"
- a_deplib=""
- break 2
- fi
- done
- done
- fi
- if test -n "$a_deplib" ; then
- droppeddeps=yes
- $echo
- $echo "*** Warning: linker path does not have real file for library $a_deplib."
- $echo "*** I have the capability to make that library automatically link in when"
- $echo "*** you link to this library. But I can only do this if you have a"
- $echo "*** shared version of the library, which you do not appear to have"
- $echo "*** because I did check the linker path looking for a file starting"
- if test -z "$potlib" ; then
- $echo "*** with $libname but no candidates were found. (...for regex pattern test)"
- else
- $echo "*** with $libname and none of the candidates passed a file format test"
- $echo "*** using a regex pattern. Last file checked: $potlib"
- fi
- fi
- else
- # Add a -L argument.
- newdeplibs="$newdeplibs $a_deplib"
- fi
- done # Gone through all deplibs.
- ;;
- none | unknown | *)
- newdeplibs=""
- tmp_deplibs=`$echo "X $deplibs" | $Xsed -e 's/ -lc$//' \
- -e 's/ -[LR][^ ]*//g'`
- if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
- for i in $predeps $postdeps ; do
- # can't use Xsed below, because $i might contain '/'
- tmp_deplibs=`$echo "X $tmp_deplibs" | ${SED} -e "1s,^X,," -e "s,$i,,"`
- done
- fi
- if $echo "X $tmp_deplibs" | $Xsed -e 's/[ ]//g' \
- | grep . >/dev/null; then
- $echo
- if test "X$deplibs_check_method" = "Xnone"; then
- $echo "*** Warning: inter-library dependencies are not supported in this platform."
- else
- $echo "*** Warning: inter-library dependencies are not known to be supported."
- fi
- $echo "*** All declared inter-library dependencies are being dropped."
- droppeddeps=yes
- fi
- ;;
- esac
- versuffix=$versuffix_save
- major=$major_save
- release=$release_save
- libname=$libname_save
- name=$name_save
-
- case $host in
- *-*-rhapsody* | *-*-darwin1.[012])
- # On Rhapsody replace the C library is the System framework
- newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's/ -lc / -framework System /'`
- ;;
- esac
- if test "$droppeddeps" = yes; then
- if test "$module" = yes; then
- $echo
- $echo "*** Warning: libtool could not satisfy all declared inter-library"
- $echo "*** dependencies of module $libname. Therefore, libtool will create"
- $echo "*** a static module, that should work as long as the dlopening"
- $echo "*** application is linked with the -dlopen flag."
- if test -z "$global_symbol_pipe"; then
- $echo
- $echo "*** However, this would only work if libtool was able to extract symbol"
- $echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
- $echo "*** not find such a program. So, this module is probably useless."
- $echo "*** \`nm' from GNU binutils and a full rebuild may help."
- fi
- if test "$build_old_libs" = no; then
- oldlibs="$output_objdir/$libname.$libext"
- build_libtool_libs=module
- build_old_libs=yes
- else
- build_libtool_libs=no
- fi
- else
- $echo "*** The inter-library dependencies that have been dropped here will be"
- $echo "*** automatically added whenever a program is linked with this library"
- $echo "*** or is declared to -dlopen it."
+ case $host_os in
+ mingw*)
+ cat <<"EOF"
+ /* execv doesn't actually work on mingw as expected on unix */
+ rval = _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz);
+ if (rval == -1)
+ {
+ /* failed to start process */
+ LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"%s\": errno = %d\n", lt_argv_zero, errno));
+ return 127;
+ }
+ return rval;
+EOF
+ ;;
+ *)
+ cat <<"EOF"
+ execv (lt_argv_zero, newargz);
+ return rval; /* =127, but avoids unused variable warning */
+EOF
+ ;;
+ esac
- if test "$allow_undefined" = no; then
- $echo
- $echo "*** Since this library must not contain undefined symbols,"
- $echo "*** because either the platform does not support them or"
- $echo "*** it was explicitly requested with -no-undefined,"
- $echo "*** libtool will only create a static version of it."
- if test "$build_old_libs" = no; then
- oldlibs="$output_objdir/$libname.$libext"
- build_libtool_libs=module
- build_old_libs=yes
- else
- build_libtool_libs=no
- fi
- fi
- fi
- fi
- # Done checking deplibs!
- deplibs=$newdeplibs
- fi
+ cat <<"EOF"
+}
+void *
+xmalloc (size_t num)
+{
+ void *p = (void *) malloc (num);
+ if (!p)
+ lt_fatal ("Memory exhausted");
- # move library search paths that coincide with paths to not yet
- # installed libraries to the beginning of the library search list
- new_libs=
- for path in $notinst_path; do
- case " $new_libs " in
- *" -L$path/$objdir "*) ;;
- *)
- case " $deplibs " in
- *" -L$path/$objdir "*)
- new_libs="$new_libs -L$path/$objdir" ;;
- esac
- ;;
- esac
- done
- for deplib in $deplibs; do
- case $deplib in
- -L*)
- case " $new_libs " in
- *" $deplib "*) ;;
- *) new_libs="$new_libs $deplib" ;;
- esac
- ;;
- *) new_libs="$new_libs $deplib" ;;
- esac
- done
- deplibs="$new_libs"
+ return p;
+}
+char *
+xstrdup (const char *string)
+{
+ return string ? strcpy ((char *) xmalloc (strlen (string) + 1),
+ string) : NULL;
+}
- # All the library-specific variables (install_libdir is set above).
- library_names=
- old_library=
- dlname=
+const char *
+base_name (const char *name)
+{
+ const char *base;
- # Test again, we may have decided not to build it any more
- if test "$build_libtool_libs" = yes; then
- if test "$hardcode_into_libs" = yes; then
- # Hardcode the library paths
- hardcode_libdirs=
- dep_rpath=
- rpath="$finalize_rpath"
- test "$mode" != relink && rpath="$compile_rpath$rpath"
- for libdir in $rpath; do
- if test -n "$hardcode_libdir_flag_spec"; then
- if test -n "$hardcode_libdir_separator"; then
- if test -z "$hardcode_libdirs"; then
- hardcode_libdirs="$libdir"
- else
- # Just accumulate the unique libdirs.
- case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
- *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
- ;;
- *)
- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
- ;;
- esac
- fi
- else
- eval flag=\"$hardcode_libdir_flag_spec\"
- dep_rpath="$dep_rpath $flag"
- fi
- elif test -n "$runpath_var"; then
- case "$perm_rpath " in
- *" $libdir "*) ;;
- *) perm_rpath="$perm_rpath $libdir" ;;
- esac
- fi
- done
- # Substitute the hardcoded libdirs into the rpath.
- if test -n "$hardcode_libdir_separator" &&
- test -n "$hardcode_libdirs"; then
- libdir="$hardcode_libdirs"
- if test -n "$hardcode_libdir_flag_spec_ld"; then
- case $archive_cmds in
- *\$LD*) eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" ;;
- *) eval dep_rpath=\"$hardcode_libdir_flag_spec\" ;;
- esac
- else
- eval dep_rpath=\"$hardcode_libdir_flag_spec\"
- fi
- fi
- if test -n "$runpath_var" && test -n "$perm_rpath"; then
- # We should set the runpath_var.
- rpath=
- for dir in $perm_rpath; do
- rpath="$rpath$dir:"
- done
- eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
- fi
- test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
- fi
+#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+ /* Skip over the disk name in MSDOS pathnames. */
+ if (isalpha ((unsigned char) name[0]) && name[1] == ':')
+ name += 2;
+#endif
- shlibpath="$finalize_shlibpath"
- test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
- if test -n "$shlibpath"; then
- eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
- fi
+ for (base = name; *name; name++)
+ if (IS_DIR_SEPARATOR (*name))
+ base = name + 1;
+ return base;
+}
- # Get the real and link names of the library.
- eval shared_ext=\"$shrext_cmds\"
- eval library_names=\"$library_names_spec\"
- set dummy $library_names
- realname="$2"
- shift; shift
+int
+check_executable (const char *path)
+{
+ struct stat st;
- if test -n "$soname_spec"; then
- eval soname=\"$soname_spec\"
- else
- soname="$realname"
- fi
- if test -z "$dlname"; then
- dlname=$soname
- fi
+ LTWRAPPER_DEBUGPRINTF (("(check_executable) : %s\n",
+ path ? (*path ? path : "EMPTY!") : "NULL!"));
+ if ((!path) || (!*path))
+ return 0;
- lib="$output_objdir/$realname"
- linknames=
- for link
- do
- linknames="$linknames $link"
- done
+ if ((stat (path, &st) >= 0)
+ && (st.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH)))
+ return 1;
+ else
+ return 0;
+}
- # Use standard objects if they are pic
- test -z "$pic_flag" && libobjs=`$echo "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+int
+make_executable (const char *path)
+{
+ int rval = 0;
+ struct stat st;
- # Prepare the list of exported symbols
- if test -z "$export_symbols"; then
- if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then
- $show "generating symbol list for \`$libname.la'"
- export_symbols="$output_objdir/$libname.exp"
- $run $rm $export_symbols
- cmds=$export_symbols_cmds
- save_ifs="$IFS"; IFS='~'
- for cmd in $cmds; do
- IFS="$save_ifs"
- eval cmd=\"$cmd\"
- if len=`expr "X$cmd" : ".*"` &&
- test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
- $show "$cmd"
- $run eval "$cmd" || exit $?
- skipped_export=false
- else
- # The command line is too long to execute in one step.
- $show "using reloadable object file for export list..."
- skipped_export=:
- # Break out early, otherwise skipped_export may be
- # set to false by a later but shorter cmd.
- break
- fi
- done
- IFS="$save_ifs"
- if test -n "$export_symbols_regex"; then
- $show "$EGREP -e \"$export_symbols_regex\" \"$export_symbols\" > \"${export_symbols}T\""
- $run eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
- $show "$mv \"${export_symbols}T\" \"$export_symbols\""
- $run eval '$mv "${export_symbols}T" "$export_symbols"'
- fi
- fi
- fi
+ LTWRAPPER_DEBUGPRINTF (("(make_executable) : %s\n",
+ path ? (*path ? path : "EMPTY!") : "NULL!"));
+ if ((!path) || (!*path))
+ return 0;
- if test -n "$export_symbols" && test -n "$include_expsyms"; then
- $run eval '$echo "X$include_expsyms" | $SP2NL >> "$export_symbols"'
- fi
+ if (stat (path, &st) >= 0)
+ {
+ rval = chmod (path, st.st_mode | S_IXOTH | S_IXGRP | S_IXUSR);
+ }
+ return rval;
+}
- tmp_deplibs=
- for test_deplib in $deplibs; do
- case " $convenience " in
- *" $test_deplib "*) ;;
- *)
- tmp_deplibs="$tmp_deplibs $test_deplib"
- ;;
- esac
- done
- deplibs="$tmp_deplibs"
+/* Searches for the full path of the wrapper. Returns
+ newly allocated full path name if found, NULL otherwise
+ Does not chase symlinks, even on platforms that support them.
+*/
+char *
+find_executable (const char *wrapper)
+{
+ int has_slash = 0;
+ const char *p;
+ const char *p_next;
+ /* static buffer for getcwd */
+ char tmp[LT_PATHMAX + 1];
+ int tmp_len;
+ char *concat_name;
- if test -n "$convenience"; then
- if test -n "$whole_archive_flag_spec"; then
- save_libobjs=$libobjs
- eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
- else
- gentop="$output_objdir/${outputname}x"
- generated="$generated $gentop"
+ LTWRAPPER_DEBUGPRINTF (("(find_executable) : %s\n",
+ wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!"));
- func_extract_archives $gentop $convenience
- libobjs="$libobjs $func_extract_archives_result"
- fi
- fi
-
- if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
- eval flag=\"$thread_safe_flag_spec\"
- linker_flags="$linker_flags $flag"
- fi
+ if ((wrapper == NULL) || (*wrapper == '\0'))
+ return NULL;
- # Make a backup of the uninstalled library when relinking
- if test "$mode" = relink; then
- $run eval '(cd $output_objdir && $rm ${realname}U && $mv $realname ${realname}U)' || exit $?
- fi
+ /* Absolute path? */
+#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+ if (isalpha ((unsigned char) wrapper[0]) && wrapper[1] == ':')
+ {
+ concat_name = xstrdup (wrapper);
+ if (check_executable (concat_name))
+ return concat_name;
+ XFREE (concat_name);
+ }
+ else
+ {
+#endif
+ if (IS_DIR_SEPARATOR (wrapper[0]))
+ {
+ concat_name = xstrdup (wrapper);
+ if (check_executable (concat_name))
+ return concat_name;
+ XFREE (concat_name);
+ }
+#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+ }
+#endif
- # Do each of the archive commands.
- if test "$module" = yes && test -n "$module_cmds" ; then
- if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
- eval test_cmds=\"$module_expsym_cmds\"
- cmds=$module_expsym_cmds
- else
- eval test_cmds=\"$module_cmds\"
- cmds=$module_cmds
- fi
- else
- if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
- eval test_cmds=\"$archive_expsym_cmds\"
- cmds=$archive_expsym_cmds
- else
- eval test_cmds=\"$archive_cmds\"
- cmds=$archive_cmds
- fi
- fi
+ for (p = wrapper; *p; p++)
+ if (*p == '/')
+ {
+ has_slash = 1;
+ break;
+ }
+ if (!has_slash)
+ {
+ /* no slashes; search PATH */
+ const char *path = getenv ("PATH");
+ if (path != NULL)
+ {
+ for (p = path; *p; p = p_next)
+ {
+ const char *q;
+ size_t p_len;
+ for (q = p; *q; q++)
+ if (IS_PATH_SEPARATOR (*q))
+ break;
+ p_len = q - p;
+ p_next = (*q == '\0' ? q : q + 1);
+ if (p_len == 0)
+ {
+ /* empty path: current directory */
+ if (getcwd (tmp, LT_PATHMAX) == NULL)
+ lt_fatal ("getcwd failed");
+ tmp_len = strlen (tmp);
+ concat_name =
+ XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
+ memcpy (concat_name, tmp, tmp_len);
+ concat_name[tmp_len] = '/';
+ strcpy (concat_name + tmp_len + 1, wrapper);
+ }
+ else
+ {
+ concat_name =
+ XMALLOC (char, p_len + 1 + strlen (wrapper) + 1);
+ memcpy (concat_name, p, p_len);
+ concat_name[p_len] = '/';
+ strcpy (concat_name + p_len + 1, wrapper);
+ }
+ if (check_executable (concat_name))
+ return concat_name;
+ XFREE (concat_name);
+ }
+ }
+ /* not found in PATH; assume curdir */
+ }
+ /* Relative path | not found in path: prepend cwd */
+ if (getcwd (tmp, LT_PATHMAX) == NULL)
+ lt_fatal ("getcwd failed");
+ tmp_len = strlen (tmp);
+ concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
+ memcpy (concat_name, tmp, tmp_len);
+ concat_name[tmp_len] = '/';
+ strcpy (concat_name + tmp_len + 1, wrapper);
- if test "X$skipped_export" != "X:" &&
- len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
- test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
- :
- else
- # The command line is too long to link in one step, link piecewise.
- $echo "creating reloadable object files..."
+ if (check_executable (concat_name))
+ return concat_name;
+ XFREE (concat_name);
+ return NULL;
+}
- # Save the value of $output and $libobjs because we want to
- # use them later. If we have whole_archive_flag_spec, we
- # want to use save_libobjs as it was before
- # whole_archive_flag_spec was expanded, because we can't
- # assume the linker understands whole_archive_flag_spec.
- # This may have to be revisited, in case too many
- # convenience libraries get linked in and end up exceeding
- # the spec.
- if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then
- save_libobjs=$libobjs
- fi
- save_output=$output
- output_la=`$echo "X$output" | $Xsed -e "$basename"`
+char *
+chase_symlinks (const char *pathspec)
+{
+#ifndef S_ISLNK
+ return xstrdup (pathspec);
+#else
+ char buf[LT_PATHMAX];
+ struct stat s;
+ char *tmp_pathspec = xstrdup (pathspec);
+ char *p;
+ int has_symlinks = 0;
+ while (strlen (tmp_pathspec) && !has_symlinks)
+ {
+ LTWRAPPER_DEBUGPRINTF (("checking path component for symlinks: %s\n",
+ tmp_pathspec));
+ if (lstat (tmp_pathspec, &s) == 0)
+ {
+ if (S_ISLNK (s.st_mode) != 0)
+ {
+ has_symlinks = 1;
+ break;
+ }
- # Clear the reloadable object creation command queue and
- # initialize k to one.
- test_cmds=
- concat_cmds=
- objlist=
- delfiles=
- last_robj=
- k=1
- output=$output_objdir/$output_la-${k}.$objext
- # Loop over the list of objects to be linked.
- for obj in $save_libobjs
- do
- eval test_cmds=\"$reload_cmds $objlist $last_robj\"
- if test "X$objlist" = X ||
- { len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
- test "$len" -le "$max_cmd_len"; }; then
- objlist="$objlist $obj"
- else
- # The command $test_cmds is almost too long, add a
- # command to the queue.
- if test "$k" -eq 1 ; then
- # The first file doesn't have a previous command to add.
- eval concat_cmds=\"$reload_cmds $objlist $last_robj\"
- else
- # All subsequent reloadable object files will link in
- # the last one created.
- eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\"
- fi
- last_robj=$output_objdir/$output_la-${k}.$objext
- k=`expr $k + 1`
- output=$output_objdir/$output_la-${k}.$objext
- objlist=$obj
- len=1
- fi
- done
- # Handle the remaining objects by creating one last
- # reloadable object file. All subsequent reloadable object
- # files will link in the last one created.
- test -z "$concat_cmds" || concat_cmds=$concat_cmds~
- eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\"
-
- if ${skipped_export-false}; then
- $show "generating symbol list for \`$libname.la'"
- export_symbols="$output_objdir/$libname.exp"
- $run $rm $export_symbols
- libobjs=$output
- # Append the command to create the export file.
- eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\"
- fi
-
- # Set up a command to remove the reloadable object files
- # after they are used.
- i=0
- while test "$i" -lt "$k"
- do
- i=`expr $i + 1`
- delfiles="$delfiles $output_objdir/$output_la-${i}.$objext"
- done
+ /* search backwards for last DIR_SEPARATOR */
+ p = tmp_pathspec + strlen (tmp_pathspec) - 1;
+ while ((p > tmp_pathspec) && (!IS_DIR_SEPARATOR (*p)))
+ p--;
+ if ((p == tmp_pathspec) && (!IS_DIR_SEPARATOR (*p)))
+ {
+ /* no more DIR_SEPARATORS left */
+ break;
+ }
+ *p = '\0';
+ }
+ else
+ {
+ char *errstr = strerror (errno);
+ lt_fatal ("Error accessing file %s (%s)", tmp_pathspec, errstr);
+ }
+ }
+ XFREE (tmp_pathspec);
- $echo "creating a temporary reloadable object file: $output"
+ if (!has_symlinks)
+ {
+ return xstrdup (pathspec);
+ }
- # Loop through the commands generated above and execute them.
- save_ifs="$IFS"; IFS='~'
- for cmd in $concat_cmds; do
- IFS="$save_ifs"
- $show "$cmd"
- $run eval "$cmd" || exit $?
- done
- IFS="$save_ifs"
+ tmp_pathspec = realpath (pathspec, buf);
+ if (tmp_pathspec == 0)
+ {
+ lt_fatal ("Could not follow symlinks for %s", pathspec);
+ }
+ return xstrdup (tmp_pathspec);
+#endif
+}
- libobjs=$output
- # Restore the value of output.
- output=$save_output
+char *
+strendzap (char *str, const char *pat)
+{
+ size_t len, patlen;
- if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then
- eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
- fi
- # Expand the library linking commands again to reset the
- # value of $libobjs for piecewise linking.
+ assert (str != NULL);
+ assert (pat != NULL);
- # Do each of the archive commands.
- if test "$module" = yes && test -n "$module_cmds" ; then
- if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
- cmds=$module_expsym_cmds
- else
- cmds=$module_cmds
- fi
- else
- if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
- cmds=$archive_expsym_cmds
- else
- cmds=$archive_cmds
- fi
- fi
+ len = strlen (str);
+ patlen = strlen (pat);
- # Append the command to remove the reloadable object files
- # to the just-reset $cmds.
- eval cmds=\"\$cmds~\$rm $delfiles\"
- fi
- save_ifs="$IFS"; IFS='~'
- for cmd in $cmds; do
- IFS="$save_ifs"
- eval cmd=\"$cmd\"
- $show "$cmd"
- $run eval "$cmd" || {
- lt_exit=$?
+ if (patlen <= len)
+ {
+ str += len - patlen;
+ if (strcmp (str, pat) == 0)
+ *str = '\0';
+ }
+ return str;
+}
- # Restore the uninstalled library and exit
- if test "$mode" = relink; then
- $run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)'
- fi
+static void
+lt_error_core (int exit_status, const char *mode,
+ const char *message, va_list ap)
+{
+ fprintf (stderr, "%s: %s: ", program_name, mode);
+ vfprintf (stderr, message, ap);
+ fprintf (stderr, ".\n");
- exit $lt_exit
- }
- done
- IFS="$save_ifs"
+ if (exit_status >= 0)
+ exit (exit_status);
+}
- # Restore the uninstalled library and exit
- if test "$mode" = relink; then
- $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $?
+void
+lt_fatal (const char *message, ...)
+{
+ va_list ap;
+ va_start (ap, message);
+ lt_error_core (EXIT_FAILURE, "FATAL", message, ap);
+ va_end (ap);
+}
- if test -n "$convenience"; then
- if test -z "$whole_archive_flag_spec"; then
- $show "${rm}r $gentop"
- $run ${rm}r "$gentop"
- fi
- fi
+void
+lt_setenv (const char *name, const char *value)
+{
+ LTWRAPPER_DEBUGPRINTF (("(lt_setenv) setting '%s' to '%s'\n",
+ (name ? name : "<NULL>"),
+ (value ? value : "<NULL>")));
+ {
+#ifdef HAVE_SETENV
+ /* always make a copy, for consistency with !HAVE_SETENV */
+ char *str = xstrdup (value);
+ setenv (name, str, 1);
+#else
+ int len = strlen (name) + 1 + strlen (value) + 1;
+ char *str = XMALLOC (char, len);
+ sprintf (str, "%s=%s", name, value);
+ if (putenv (str) != EXIT_SUCCESS)
+ {
+ XFREE (str);
+ }
+#endif
+ }
+}
- exit $EXIT_SUCCESS
- fi
+char *
+lt_extend_str (const char *orig_value, const char *add, int to_end)
+{
+ char *new_value;
+ if (orig_value && *orig_value)
+ {
+ int orig_value_len = strlen (orig_value);
+ int add_len = strlen (add);
+ new_value = XMALLOC (char, add_len + orig_value_len + 1);
+ if (to_end)
+ {
+ strcpy (new_value, orig_value);
+ strcpy (new_value + orig_value_len, add);
+ }
+ else
+ {
+ strcpy (new_value, add);
+ strcpy (new_value + add_len, orig_value);
+ }
+ }
+ else
+ {
+ new_value = xstrdup (add);
+ }
+ return new_value;
+}
- # Create links to the real library.
- for linkname in $linknames; do
- if test "$realname" != "$linkname"; then
- $show "(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)"
- $run eval '(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)' || exit $?
- fi
- done
+int
+lt_split_name_value (const char *arg, char** name, char** value)
+{
+ const char *p;
+ int len;
+ if (!arg || !*arg)
+ return 1;
- # If -module or -export-dynamic was specified, set the dlname.
- if test "$module" = yes || test "$export_dynamic" = yes; then
- # On all known operating systems, these are identical.
- dlname="$soname"
- fi
- fi
- ;;
+ p = strchr (arg, (int)'=');
- obj)
- if test -n "$deplibs"; then
- $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2
- fi
+ if (!p)
+ return 1;
- if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
- $echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2
- fi
+ *value = xstrdup (++p);
- if test -n "$rpath"; then
- $echo "$modename: warning: \`-rpath' is ignored for objects" 1>&2
- fi
+ len = strlen (arg) - strlen (*value);
+ *name = XMALLOC (char, len);
+ strncpy (*name, arg, len-1);
+ (*name)[len - 1] = '\0';
- if test -n "$xrpath"; then
- $echo "$modename: warning: \`-R' is ignored for objects" 1>&2
- fi
+ return 0;
+}
- if test -n "$vinfo"; then
- $echo "$modename: warning: \`-version-info' is ignored for objects" 1>&2
- fi
+void
+lt_opt_process_env_set (const char *arg)
+{
+ char *name = NULL;
+ char *value = NULL;
- if test -n "$release"; then
- $echo "$modename: warning: \`-release' is ignored for objects" 1>&2
- fi
+ if (lt_split_name_value (arg, &name, &value) != 0)
+ {
+ XFREE (name);
+ XFREE (value);
+ lt_fatal ("bad argument for %s: '%s'", env_set_opt, arg);
+ }
- case $output in
- *.lo)
- if test -n "$objs$old_deplibs"; then
- $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2
- exit $EXIT_FAILURE
- fi
- libobj="$output"
- obj=`$echo "X$output" | $Xsed -e "$lo2o"`
- ;;
- *)
- libobj=
- obj="$output"
- ;;
- esac
+ lt_setenv (name, value);
+ XFREE (name);
+ XFREE (value);
+}
- # Delete the old objects.
- $run $rm $obj $libobj
+void
+lt_opt_process_env_prepend (const char *arg)
+{
+ char *name = NULL;
+ char *value = NULL;
+ char *new_value = NULL;
- # Objects from convenience libraries. This assumes
- # single-version convenience libraries. Whenever we create
- # different ones for PIC/non-PIC, this we'll have to duplicate
- # the extraction.
- reload_conv_objs=
- gentop=
- # reload_cmds runs $LD directly, so let us get rid of
- # -Wl from whole_archive_flag_spec and hope we can get by with
- # turning comma into space..
- wl=
+ if (lt_split_name_value (arg, &name, &value) != 0)
+ {
+ XFREE (name);
+ XFREE (value);
+ lt_fatal ("bad argument for %s: '%s'", env_prepend_opt, arg);
+ }
- if test -n "$convenience"; then
- if test -n "$whole_archive_flag_spec"; then
- eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
- reload_conv_objs=$reload_objs\ `$echo "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
- else
- gentop="$output_objdir/${obj}x"
- generated="$generated $gentop"
+ new_value = lt_extend_str (getenv (name), value, 0);
+ lt_setenv (name, new_value);
+ XFREE (new_value);
+ XFREE (name);
+ XFREE (value);
+}
- func_extract_archives $gentop $convenience
- reload_conv_objs="$reload_objs $func_extract_archives_result"
- fi
- fi
+void
+lt_opt_process_env_append (const char *arg)
+{
+ char *name = NULL;
+ char *value = NULL;
+ char *new_value = NULL;
- # Create the old-style object.
- reload_objs="$objs$old_deplibs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
+ if (lt_split_name_value (arg, &name, &value) != 0)
+ {
+ XFREE (name);
+ XFREE (value);
+ lt_fatal ("bad argument for %s: '%s'", env_append_opt, arg);
+ }
- output="$obj"
- cmds=$reload_cmds
- save_ifs="$IFS"; IFS='~'
- for cmd in $cmds; do
- IFS="$save_ifs"
- eval cmd=\"$cmd\"
- $show "$cmd"
- $run eval "$cmd" || exit $?
- done
- IFS="$save_ifs"
+ new_value = lt_extend_str (getenv (name), value, 1);
+ lt_setenv (name, new_value);
+ XFREE (new_value);
+ XFREE (name);
+ XFREE (value);
+}
- # Exit if we aren't doing a library object file.
- if test -z "$libobj"; then
- if test -n "$gentop"; then
- $show "${rm}r $gentop"
- $run ${rm}r $gentop
- fi
+void
+lt_update_exe_path (const char *name, const char *value)
+{
+ LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
+ (name ? name : "<NULL>"),
+ (value ? value : "<NULL>")));
- exit $EXIT_SUCCESS
- fi
+ if (name && *name && value && *value)
+ {
+ char *new_value = lt_extend_str (getenv (name), value, 0);
+ /* some systems can't cope with a ':'-terminated path #' */
+ int len = strlen (new_value);
+ while (((len = strlen (new_value)) > 0) && IS_PATH_SEPARATOR (new_value[len-1]))
+ {
+ new_value[len-1] = '\0';
+ }
+ lt_setenv (name, new_value);
+ XFREE (new_value);
+ }
+}
- if test "$build_libtool_libs" != yes; then
- if test -n "$gentop"; then
- $show "${rm}r $gentop"
- $run ${rm}r $gentop
- fi
+void
+lt_update_lib_path (const char *name, const char *value)
+{
+ LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
+ (name ? name : "<NULL>"),
+ (value ? value : "<NULL>")));
- # Create an invalid libtool object if no PIC, so that we don't
- # accidentally link it into a program.
- # $show "echo timestamp > $libobj"
- # $run eval "echo timestamp > $libobj" || exit $?
- exit $EXIT_SUCCESS
- fi
+ if (name && *name && value && *value)
+ {
+ char *new_value = lt_extend_str (getenv (name), value, 0);
+ lt_setenv (name, new_value);
+ XFREE (new_value);
+ }
+}
- if test -n "$pic_flag" || test "$pic_mode" != default; then
- # Only do commands if we really have different PIC objects.
- reload_objs="$libobjs $reload_conv_objs"
- output="$libobj"
- cmds=$reload_cmds
- save_ifs="$IFS"; IFS='~'
- for cmd in $cmds; do
- IFS="$save_ifs"
- eval cmd=\"$cmd\"
- $show "$cmd"
- $run eval "$cmd" || exit $?
- done
- IFS="$save_ifs"
- fi
- if test -n "$gentop"; then
- $show "${rm}r $gentop"
- $run ${rm}r $gentop
- fi
+EOF
+}
+# end: func_emit_cwrapperexe_src
- exit $EXIT_SUCCESS
- ;;
+# func_mode_link arg...
+func_mode_link ()
+{
+ $opt_debug
+ case $host in
+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
+ # It is impossible to link a dll without this setting, and
+ # we shouldn't force the makefile maintainer to figure out
+ # which system we are compiling for in order to pass an extra
+ # flag for every libtool invocation.
+ # allow_undefined=no
- prog)
- case $host in
- *cygwin*) output=`$echo $output | ${SED} -e 's,.exe$,,;s,$,.exe,'` ;;
- esac
- if test -n "$vinfo"; then
- $echo "$modename: warning: \`-version-info' is ignored for programs" 1>&2
- fi
+ # FIXME: Unfortunately, there are problems with the above when trying
+ # to make a dll which has undefined symbols, in which case not
+ # even a static library is built. For now, we need to specify
+ # -no-undefined on the libtool link line when we can be certain
+ # that all symbols are satisfied, otherwise we get a static library.
+ allow_undefined=yes
+ ;;
+ *)
+ allow_undefined=yes
+ ;;
+ esac
+ libtool_args=$nonopt
+ base_compile="$nonopt $@"
+ compile_command=$nonopt
+ finalize_command=$nonopt
- if test -n "$release"; then
- $echo "$modename: warning: \`-release' is ignored for programs" 1>&2
- fi
+ compile_rpath=
+ finalize_rpath=
+ compile_shlibpath=
+ finalize_shlibpath=
+ convenience=
+ old_convenience=
+ deplibs=
+ old_deplibs=
+ compiler_flags=
+ linker_flags=
+ dllsearchpath=
+ lib_search_path=`pwd`
+ inst_prefix_dir=
+ new_inherited_linker_flags=
- if test "$preload" = yes; then
- if test "$dlopen_support" = unknown && test "$dlopen_self" = unknown &&
- test "$dlopen_self_static" = unknown; then
- $echo "$modename: warning: \`AC_LIBTOOL_DLOPEN' not used. Assuming no dlopen support."
- fi
- fi
+ avoid_version=no
+ dlfiles=
+ dlprefiles=
+ dlself=no
+ export_dynamic=no
+ export_symbols=
+ export_symbols_regex=
+ generated=
+ libobjs=
+ ltlibs=
+ module=no
+ no_install=no
+ objs=
+ non_pic_objects=
+ precious_files_regex=
+ prefer_static_libs=no
+ preload=no
+ prev=
+ prevarg=
+ release=
+ rpath=
+ xrpath=
+ perm_rpath=
+ temp_rpath=
+ thread_safe=no
+ vinfo=
+ vinfo_number=no
+ weak_libs=
+ single_module="${wl}-single_module"
+ func_infer_tag $base_compile
- case $host in
- *-*-rhapsody* | *-*-darwin1.[012])
- # On Rhapsody replace the C library is the System framework
- compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
- finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
+ # We need to know -static, to get the right output filenames.
+ for arg
+ do
+ case $arg in
+ -shared)
+ test "$build_libtool_libs" != yes && \
+ func_fatal_configuration "can not build a shared library"
+ build_old_libs=no
+ break
+ ;;
+ -all-static | -static | -static-libtool-libs)
+ case $arg in
+ -all-static)
+ if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
+ func_warning "complete static linking is impossible in this configuration"
+ fi
+ if test -n "$link_static_flag"; then
+ dlopen_self=$dlopen_self_static
+ fi
+ prefer_static_libs=yes
+ ;;
+ -static)
+ if test -z "$pic_flag" && test -n "$link_static_flag"; then
+ dlopen_self=$dlopen_self_static
+ fi
+ prefer_static_libs=built
+ ;;
+ -static-libtool-libs)
+ if test -z "$pic_flag" && test -n "$link_static_flag"; then
+ dlopen_self=$dlopen_self_static
+ fi
+ prefer_static_libs=yes
+ ;;
+ esac
+ build_libtool_libs=no
+ build_old_libs=yes
+ break
;;
esac
+ done
- case $host in
- *darwin*)
- # Don't allow lazy linking, it breaks C++ global constructors
- if test "$tagname" = CXX ; then
- compile_command="$compile_command ${wl}-bind_at_load"
- finalize_command="$finalize_command ${wl}-bind_at_load"
- fi
- ;;
- esac
+ # See if our shared archives depend on static archives.
+ test -n "$old_archive_from_new_cmds" && build_old_libs=yes
+ # Go through the arguments, transforming them on the way.
+ while test "$#" -gt 0; do
+ arg="$1"
+ shift
+ func_quote_for_eval "$arg"
+ qarg=$func_quote_for_eval_unquoted_result
+ func_append libtool_args " $func_quote_for_eval_result"
- # move library search paths that coincide with paths to not yet
- # installed libraries to the beginning of the library search list
- new_libs=
- for path in $notinst_path; do
- case " $new_libs " in
- *" -L$path/$objdir "*) ;;
- *)
- case " $compile_deplibs " in
- *" -L$path/$objdir "*)
- new_libs="$new_libs -L$path/$objdir" ;;
- esac
- ;;
- esac
- done
- for deplib in $compile_deplibs; do
- case $deplib in
- -L*)
- case " $new_libs " in
- *" $deplib "*) ;;
- *) new_libs="$new_libs $deplib" ;;
- esac
+ # If the previous option needs an argument, assign it.
+ if test -n "$prev"; then
+ case $prev in
+ output)
+ func_append compile_command " @OUTPUT@"
+ func_append finalize_command " @OUTPUT@"
;;
- *) new_libs="$new_libs $deplib" ;;
esac
- done
- compile_deplibs="$new_libs"
-
- compile_command="$compile_command $compile_deplibs"
- finalize_command="$finalize_command $finalize_deplibs"
-
- if test -n "$rpath$xrpath"; then
- # If the user specified any rpath flags, then add them.
- for libdir in $rpath $xrpath; do
- # This is the magic to use -rpath.
- case "$finalize_rpath " in
- *" $libdir "*) ;;
- *) finalize_rpath="$finalize_rpath $libdir" ;;
- esac
- done
- fi
-
- # Now hardcode the library paths
- rpath=
- hardcode_libdirs=
- for libdir in $compile_rpath $finalize_rpath; do
- if test -n "$hardcode_libdir_flag_spec"; then
- if test -n "$hardcode_libdir_separator"; then
- if test -z "$hardcode_libdirs"; then
- hardcode_libdirs="$libdir"
+ case $prev in
+ dlfiles|dlprefiles)
+ if test "$preload" = no; then
+ # Add the symbol object into the linking commands.
+ func_append compile_command " @SYMFILE@"
+ func_append finalize_command " @SYMFILE@"
+ preload=yes
+ fi
+ case $arg in
+ *.la | *.lo) ;; # We handle these cases below.
+ force)
+ if test "$dlself" = no; then
+ dlself=needless
+ export_dynamic=yes
+ fi
+ prev=
+ continue
+ ;;
+ self)
+ if test "$prev" = dlprefiles; then
+ dlself=yes
+ elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then
+ dlself=yes
else
- # Just accumulate the unique libdirs.
- case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
- *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
- ;;
- *)
- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
- ;;
- esac
+ dlself=needless
+ export_dynamic=yes
fi
- else
- eval flag=\"$hardcode_libdir_flag_spec\"
- rpath="$rpath $flag"
- fi
- elif test -n "$runpath_var"; then
- case "$perm_rpath " in
- *" $libdir "*) ;;
- *) perm_rpath="$perm_rpath $libdir" ;;
- esac
- fi
- case $host in
- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
- testbindir=`$echo "X$libdir" | $Xsed -e 's*/lib$*/bin*'`
- case :$dllsearchpath: in
- *":$libdir:"*) ;;
- *) dllsearchpath="$dllsearchpath:$libdir";;
- esac
- case :$dllsearchpath: in
- *":$testbindir:"*) ;;
- *) dllsearchpath="$dllsearchpath:$testbindir";;
+ prev=
+ continue
+ ;;
+ *)
+ if test "$prev" = dlfiles; then
+ dlfiles="$dlfiles $arg"
+ else
+ dlprefiles="$dlprefiles $arg"
+ fi
+ prev=
+ continue
+ ;;
esac
;;
- esac
- done
- # Substitute the hardcoded libdirs into the rpath.
- if test -n "$hardcode_libdir_separator" &&
- test -n "$hardcode_libdirs"; then
- libdir="$hardcode_libdirs"
- eval rpath=\" $hardcode_libdir_flag_spec\"
- fi
- compile_rpath="$rpath"
-
- rpath=
- hardcode_libdirs=
- for libdir in $finalize_rpath; do
- if test -n "$hardcode_libdir_flag_spec"; then
- if test -n "$hardcode_libdir_separator"; then
- if test -z "$hardcode_libdirs"; then
- hardcode_libdirs="$libdir"
- else
- # Just accumulate the unique libdirs.
- case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
- *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
- ;;
- *)
- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
- ;;
+ expsyms)
+ export_symbols="$arg"
+ test -f "$arg" \
+ || func_fatal_error "symbol file \`$arg' does not exist"
+ prev=
+ continue
+ ;;
+ expsyms_regex)
+ export_symbols_regex="$arg"
+ prev=
+ continue
+ ;;
+ framework)
+ case $host in
+ *-*-darwin*)
+ case "$deplibs " in
+ *" $qarg.ltframework "*) ;;
+ *) deplibs="$deplibs $qarg.ltframework" # this is fixed later
+ ;;
esac
- fi
- else
- eval flag=\"$hardcode_libdir_flag_spec\"
- rpath="$rpath $flag"
- fi
- elif test -n "$runpath_var"; then
- case "$finalize_perm_rpath " in
- *" $libdir "*) ;;
- *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;;
+ ;;
esac
- fi
- done
- # Substitute the hardcoded libdirs into the rpath.
- if test -n "$hardcode_libdir_separator" &&
- test -n "$hardcode_libdirs"; then
- libdir="$hardcode_libdirs"
- eval rpath=\" $hardcode_libdir_flag_spec\"
- fi
- finalize_rpath="$rpath"
-
- if test -n "$libobjs" && test "$build_old_libs" = yes; then
- # Transform all the library objects into standard objects.
- compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
- finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
- fi
-
- dlsyms=
- if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
- if test -n "$NM" && test -n "$global_symbol_pipe"; then
- dlsyms="${outputname}S.c"
- else
- $echo "$modename: not configured to extract global symbols from dlpreopened files" 1>&2
- fi
- fi
+ prev=
+ continue
+ ;;
+ inst_prefix)
+ inst_prefix_dir="$arg"
+ prev=
+ continue
+ ;;
+ objectlist)
+ if test -f "$arg"; then
+ save_arg=$arg
+ moreargs=
+ for fil in `cat "$save_arg"`
+ do
+# moreargs="$moreargs $fil"
+ arg=$fil
+ # A libtool-controlled object.
- if test -n "$dlsyms"; then
- case $dlsyms in
- "") ;;
- *.c)
- # Discover the nlist of each of the dlfiles.
- nlist="$output_objdir/${outputname}.nm"
+ # Check to see that this really is a libtool object.
+ if func_lalib_unsafe_p "$arg"; then
+ pic_object=
+ non_pic_object=
- $show "$rm $nlist ${nlist}S ${nlist}T"
- $run $rm "$nlist" "${nlist}S" "${nlist}T"
+ # Read the .lo file
+ func_source "$arg"
- # Parse the name list into a source file.
- $show "creating $output_objdir/$dlsyms"
+ if test -z "$pic_object" ||
+ test -z "$non_pic_object" ||
+ test "$pic_object" = none &&
+ test "$non_pic_object" = none; then
+ func_fatal_error "cannot find name of object for \`$arg'"
+ fi
- test -z "$run" && $echo > "$output_objdir/$dlsyms" "\
-/* $dlsyms - symbol resolution table for \`$outputname' dlsym emulation. */
-/* Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP */
+ # Extract subdirectory from the argument.
+ func_dirname "$arg" "/" ""
+ xdir="$func_dirname_result"
-#ifdef __cplusplus
-extern \"C\" {
-#endif
+ if test "$pic_object" != none; then
+ # Prepend the subdirectory the object is found in.
+ pic_object="$xdir$pic_object"
-/* Prevent the only kind of declaration conflicts we can make. */
-#define lt_preloaded_symbols some_other_symbol
+ if test "$prev" = dlfiles; then
+ if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
+ dlfiles="$dlfiles $pic_object"
+ prev=
+ continue
+ else
+ # If libtool objects are unsupported, then we need to preload.
+ prev=dlprefiles
+ fi
+ fi
-/* External symbol declarations for the compiler. */\
-"
+ # CHECK ME: I think I busted this. -Ossama
+ if test "$prev" = dlprefiles; then
+ # Preload the old-style object.
+ dlprefiles="$dlprefiles $pic_object"
+ prev=
+ fi
- if test "$dlself" = yes; then
- $show "generating symbol list for \`$output'"
+ # A PIC object.
+ func_append libobjs " $pic_object"
+ arg="$pic_object"
+ fi
- test -z "$run" && $echo ': @PROGRAM@ ' > "$nlist"
+ # Non-PIC object.
+ if test "$non_pic_object" != none; then
+ # Prepend the subdirectory the object is found in.
+ non_pic_object="$xdir$non_pic_object"
- # Add our own program objects to the symbol list.
- progfiles=`$echo "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
- for arg in $progfiles; do
- $show "extracting global C symbols from \`$arg'"
- $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
+ # A standard non-PIC object
+ func_append non_pic_objects " $non_pic_object"
+ if test -z "$pic_object" || test "$pic_object" = none ; then
+ arg="$non_pic_object"
+ fi
+ else
+ # If the PIC object exists, use it instead.
+ # $xdir was prepended to $pic_object above.
+ non_pic_object="$pic_object"
+ func_append non_pic_objects " $non_pic_object"
+ fi
+ else
+ # Only an error if not doing a dry-run.
+ if $opt_dry_run; then
+ # Extract subdirectory from the argument.
+ func_dirname "$arg" "/" ""
+ xdir="$func_dirname_result"
+
+ func_lo2o "$arg"
+ pic_object=$xdir$objdir/$func_lo2o_result
+ non_pic_object=$xdir$func_lo2o_result
+ func_append libobjs " $pic_object"
+ func_append non_pic_objects " $non_pic_object"
+ else
+ func_fatal_error "\`$arg' is not a valid libtool object"
+ fi
+ fi
done
-
- if test -n "$exclude_expsyms"; then
- $run eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
- $run eval '$mv "$nlist"T "$nlist"'
- fi
-
- if test -n "$export_symbols_regex"; then
- $run eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T'
- $run eval '$mv "$nlist"T "$nlist"'
- fi
-
- # Prepare the list of exported symbols
- if test -z "$export_symbols"; then
- export_symbols="$output_objdir/$outputname.exp"
- $run $rm $export_symbols
- $run eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
- case $host in
- *cygwin* | *mingw* )
- $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
- $run eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
- ;;
- esac
- else
- $run eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
- $run eval 'grep -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
- $run eval 'mv "$nlist"T "$nlist"'
- case $host in
- *cygwin* | *mingw* )
- $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
- $run eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
- ;;
- esac
- fi
+ else
+ func_fatal_error "link input file \`$arg' does not exist"
fi
-
- for arg in $dlprefiles; do
- $show "extracting global C symbols from \`$arg'"
- name=`$echo "$arg" | ${SED} -e 's%^.*/%%'`
- $run eval '$echo ": $name " >> "$nlist"'
- $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
- done
-
- if test -z "$run"; then
- # Make sure we have at least an empty file.
- test -f "$nlist" || : > "$nlist"
-
- if test -n "$exclude_expsyms"; then
- $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
- $mv "$nlist"T "$nlist"
- fi
-
- # Try sorting and uniquifying the output.
- if grep -v "^: " < "$nlist" |
- if sort -k 3 </dev/null >/dev/null 2>&1; then
- sort -k 3
- else
- sort +2
- fi |
- uniq > "$nlist"S; then
- :
- else
- grep -v "^: " < "$nlist" > "$nlist"S
- fi
-
- if test -f "$nlist"S; then
- eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$dlsyms"'
- else
- $echo '/* NONE */' >> "$output_objdir/$dlsyms"
- fi
-
- $echo >> "$output_objdir/$dlsyms" "\
-
-#undef lt_preloaded_symbols
-
-#if defined (__STDC__) && __STDC__
-# define lt_ptr void *
-#else
-# define lt_ptr char *
-# define const
-#endif
-
-/* The mapping between symbol names and symbols. */
-"
-
- case $host in
- *cygwin* | *mingw* )
- $echo >> "$output_objdir/$dlsyms" "\
-/* DATA imports from DLLs on WIN32 can't be const, because
- runtime relocations are performed -- see ld's documentation
- on pseudo-relocs */
-struct {
-"
- ;;
- * )
- $echo >> "$output_objdir/$dlsyms" "\
-const struct {
-"
- ;;
- esac
-
-
- $echo >> "$output_objdir/$dlsyms" "\
- const char *name;
- lt_ptr address;
-}
-lt_preloaded_symbols[] =
-{\
-"
-
- eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$dlsyms"
-
- $echo >> "$output_objdir/$dlsyms" "\
- {0, (lt_ptr) 0}
-};
-
-/* This works around a problem in FreeBSD linker */
-#ifdef FREEBSD_WORKAROUND
-static const void *lt_preloaded_setup() {
- return lt_preloaded_symbols;
-}
-#endif
-
-#ifdef __cplusplus
-}
-#endif\
-"
- fi
-
- pic_flag_for_symtable=
- case $host in
- # compiling the symbol table file with pic_flag works around
- # a FreeBSD bug that causes programs to crash when -lm is
- # linked before any other PIC object. But we must not use
- # pic_flag when linking with -static. The problem exists in
- # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
- *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
- case "$compile_command " in
- *" -static "*) ;;
- *) pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND";;
- esac;;
- *-*-hpux*)
- case "$compile_command " in
- *" -static "*) ;;
- *) pic_flag_for_symtable=" $pic_flag";;
- esac
+ arg=$save_arg
+ prev=
+ continue
+ ;;
+ precious_regex)
+ precious_files_regex="$arg"
+ prev=
+ continue
+ ;;
+ release)
+ release="-$arg"
+ prev=
+ continue
+ ;;
+ rpath | xrpath)
+ # We need an absolute path.
+ case $arg in
+ [\\/]* | [A-Za-z]:[\\/]*) ;;
+ *)
+ func_fatal_error "only absolute run-paths are allowed"
+ ;;
esac
-
- # Now compile the dynamic symbol file.
- $show "(cd $output_objdir && $LTCC $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")"
- $run eval '(cd $output_objdir && $LTCC $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $?
-
- # Clean up the generated files.
- $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T"
- $run $rm "$output_objdir/$dlsyms" "$nlist" "${nlist}S" "${nlist}T"
-
- # Transform the symbol file into the correct name.
- case $host in
- *cygwin* | *mingw* )
- if test -f "$output_objdir/${outputname}.def" ; then
- compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
- finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
- else
- compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
- finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
- fi
- ;;
- * )
- compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
- finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
- ;;
- esac
+ if test "$prev" = rpath; then
+ case "$rpath " in
+ *" $arg "*) ;;
+ *) rpath="$rpath $arg" ;;
+ esac
+ else
+ case "$xrpath " in
+ *" $arg "*) ;;
+ *) xrpath="$xrpath $arg" ;;
+ esac
+ fi
+ prev=
+ continue
+ ;;
+ shrext)
+ shrext_cmds="$arg"
+ prev=
+ continue
+ ;;
+ weak)
+ weak_libs="$weak_libs $arg"
+ prev=
+ continue
+ ;;
+ xcclinker)
+ linker_flags="$linker_flags $qarg"
+ compiler_flags="$compiler_flags $qarg"
+ prev=
+ func_append compile_command " $qarg"
+ func_append finalize_command " $qarg"
+ continue
+ ;;
+ xcompiler)
+ compiler_flags="$compiler_flags $qarg"
+ prev=
+ func_append compile_command " $qarg"
+ func_append finalize_command " $qarg"
+ continue
+ ;;
+ xlinker)
+ linker_flags="$linker_flags $qarg"
+ compiler_flags="$compiler_flags $wl$qarg"
+ prev=
+ func_append compile_command " $wl$qarg"
+ func_append finalize_command " $wl$qarg"
+ continue
;;
*)
- $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2
- exit $EXIT_FAILURE
+ eval "$prev=\"\$arg\""
+ prev=
+ continue
;;
esac
- else
- # We keep going just in case the user didn't refer to
- # lt_preloaded_symbols. The linker will fail if global_symbol_pipe
- # really was required.
-
- # Nullify the symbol file.
- compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
- finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
- fi
-
- if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
- # Replace the output file specification.
- compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$output"'%g' | $NL2SP`
- link_command="$compile_command$compile_rpath"
+ fi # test -n "$prev"
- # We have no uninstalled library dependencies, so finalize right now.
- $show "$link_command"
- $run eval "$link_command"
- exit_status=$?
+ prevarg="$arg"
- # Delete the generated files.
- if test -n "$dlsyms"; then
- $show "$rm $output_objdir/${outputname}S.${objext}"
- $run $rm "$output_objdir/${outputname}S.${objext}"
+ case $arg in
+ -all-static)
+ if test -n "$link_static_flag"; then
+ # See comment for -static flag below, for more details.
+ func_append compile_command " $link_static_flag"
+ func_append finalize_command " $link_static_flag"
fi
+ continue
+ ;;
- exit $exit_status
- fi
-
- if test -n "$shlibpath_var"; then
- # We should set the shlibpath_var
- rpath=
- for dir in $temp_rpath; do
- case $dir in
- [\\/]* | [A-Za-z]:[\\/]*)
- # Absolute path.
- rpath="$rpath$dir:"
- ;;
- *)
- # Relative path: add a thisdir entry.
- rpath="$rpath\$thisdir/$dir:"
- ;;
- esac
- done
- temp_rpath="$rpath"
- fi
+ -allow-undefined)
+ # FIXME: remove this flag sometime in the future.
+ func_fatal_error "\`-allow-undefined' must not be used because it is the default"
+ ;;
- if test -n "$compile_shlibpath$finalize_shlibpath"; then
- compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command"
- fi
- if test -n "$finalize_shlibpath"; then
- finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command"
- fi
+ -avoid-version)
+ avoid_version=yes
+ continue
+ ;;
- compile_var=
- finalize_var=
- if test -n "$runpath_var"; then
- if test -n "$perm_rpath"; then
- # We should set the runpath_var.
- rpath=
- for dir in $perm_rpath; do
- rpath="$rpath$dir:"
- done
- compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
- fi
- if test -n "$finalize_perm_rpath"; then
- # We should set the runpath_var.
- rpath=
- for dir in $finalize_perm_rpath; do
- rpath="$rpath$dir:"
- done
- finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
- fi
- fi
+ -dlopen)
+ prev=dlfiles
+ continue
+ ;;
- if test "$no_install" = yes; then
- # We don't need to create a wrapper script.
- link_command="$compile_var$compile_command$compile_rpath"
- # Replace the output file specification.
- link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
- # Delete the old output file.
- $run $rm $output
- # Link the executable and exit
- $show "$link_command"
- $run eval "$link_command" || exit $?
- exit $EXIT_SUCCESS
- fi
+ -dlpreopen)
+ prev=dlprefiles
+ continue
+ ;;
- if test "$hardcode_action" = relink; then
- # Fast installation is not supported
- link_command="$compile_var$compile_command$compile_rpath"
- relink_command="$finalize_var$finalize_command$finalize_rpath"
+ -export-dynamic)
+ export_dynamic=yes
+ continue
+ ;;
- $echo "$modename: warning: this platform does not like uninstalled shared libraries" 1>&2
- $echo "$modename: \`$output' will be relinked during installation" 1>&2
- else
- if test "$fast_install" != no; then
- link_command="$finalize_var$compile_command$finalize_rpath"
- if test "$fast_install" = yes; then
- relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $SP2NL | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g' | $NL2SP`
- else
- # fast_install is set to needless
- relink_command=
- fi
+ -export-symbols | -export-symbols-regex)
+ if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
+ func_fatal_error "more than one -exported-symbols argument is not allowed"
+ fi
+ if test "X$arg" = "X-export-symbols"; then
+ prev=expsyms
else
- link_command="$compile_var$compile_command$compile_rpath"
- relink_command="$finalize_var$finalize_command$finalize_rpath"
+ prev=expsyms_regex
fi
- fi
-
- # Replace the output file specification.
- link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
+ continue
+ ;;
- # Delete the old output files.
- $run $rm $output $output_objdir/$outputname $output_objdir/lt-$outputname
+ -framework)
+ prev=framework
+ continue
+ ;;
- $show "$link_command"
- $run eval "$link_command" || exit $?
+ -inst-prefix-dir)
+ prev=inst_prefix
+ continue
+ ;;
- # Now create the wrapper script.
- $show "creating $output"
+ # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
+ # so, if we see these flags be careful not to treat them like -L
+ -L[A-Z][A-Z]*:*)
+ case $with_gcc/$host in
+ no/*-*-irix* | /*-*-irix*)
+ func_append compile_command " $arg"
+ func_append finalize_command " $arg"
+ ;;
+ esac
+ continue
+ ;;
- # Quote the relink command for shipping.
- if test -n "$relink_command"; then
- # Preserve any variables that may affect compiler behavior
- for var in $variables_saved_for_relink; do
- if eval test -z \"\${$var+set}\"; then
- relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command"
- elif eval var_value=\$$var; test -z "$var_value"; then
- relink_command="$var=; export $var; $relink_command"
+ -L*)
+ func_stripname '-L' '' "$arg"
+ dir=$func_stripname_result
+ if test -z "$dir"; then
+ if test "$#" -gt 0; then
+ func_fatal_error "require no space between \`-L' and \`$1'"
else
- var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"`
- relink_command="$var=\"$var_value\"; export $var; $relink_command"
+ func_fatal_error "need path for \`-L' option"
fi
- done
- relink_command="(cd `pwd`; $relink_command)"
- relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
- fi
-
- # Quote $echo for shipping.
- if test "X$echo" = "X$SHELL $progpath --fallback-echo"; then
- case $progpath in
- [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";;
- *) qecho="$SHELL `pwd`/$progpath --fallback-echo";;
+ fi
+ # We need an absolute path.
+ case $dir in
+ [\\/]* | [A-Za-z]:[\\/]*) ;;
+ *)
+ absdir=`cd "$dir" && pwd`
+ test -z "$absdir" && \
+ func_fatal_error "cannot determine absolute directory name of \`$dir'"
+ dir="$absdir"
+ ;;
esac
- qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"`
- else
- qecho=`$echo "X$echo" | $Xsed -e "$sed_quote_subst"`
- fi
-
- # Only actually do things if our run command is non-null.
- if test -z "$run"; then
- # win32 will think the script is a binary if it has
- # a .exe suffix, so we strip it off here.
- case $output in
- *.exe) output=`$echo $output|${SED} 's,.exe$,,'` ;;
+ case "$deplibs " in
+ *" -L$dir "*) ;;
+ *)
+ deplibs="$deplibs -L$dir"
+ lib_search_path="$lib_search_path $dir"
+ ;;
esac
- # test for cygwin because mv fails w/o .exe extensions
case $host in
- *cygwin*)
- exeext=.exe
- outputname=`$echo $outputname|${SED} 's,.exe$,,'` ;;
- *) exeext= ;;
+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
+ testbindir=`$ECHO "X$dir" | $Xsed -e 's*/lib$*/bin*'`
+ case :$dllsearchpath: in
+ *":$dir:"*) ;;
+ ::) dllsearchpath=$dir;;
+ *) dllsearchpath="$dllsearchpath:$dir";;
+ esac
+ case :$dllsearchpath: in
+ *":$testbindir:"*) ;;
+ ::) dllsearchpath=$testbindir;;
+ *) dllsearchpath="$dllsearchpath:$testbindir";;
+ esac
+ ;;
esac
- case $host in
- *cygwin* | *mingw* )
- output_name=`basename $output`
- output_path=`dirname $output`
- cwrappersource="$output_path/$objdir/lt-$output_name.c"
- cwrapper="$output_path/$output_name.exe"
- $rm $cwrappersource $cwrapper
- trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
-
- cat > $cwrappersource <<EOF
+ continue
+ ;;
-/* $cwrappersource - temporary wrapper executable for $objdir/$outputname
- Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
+ -l*)
+ if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
+ case $host in
+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc*)
+ # These systems don't actually have a C or math library (as such)
+ continue
+ ;;
+ *-*-os2*)
+ # These systems don't actually have a C library (as such)
+ test "X$arg" = "X-lc" && continue
+ ;;
+ *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+ # Do not include libc due to us having libc/libc_r.
+ test "X$arg" = "X-lc" && continue
+ ;;
+ *-*-rhapsody* | *-*-darwin1.[012])
+ # Rhapsody C and math libraries are in the System framework
+ deplibs="$deplibs System.ltframework"
+ continue
+ ;;
+ *-*-sco3.2v5* | *-*-sco5v6*)
+ # Causes problems with __ctype
+ test "X$arg" = "X-lc" && continue
+ ;;
+ *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
+ # Compiler inserts libc in the correct place for threads to work
+ test "X$arg" = "X-lc" && continue
+ ;;
+ esac
+ elif test "X$arg" = "X-lc_r"; then
+ case $host in
+ *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+ # Do not include libc_r directly, use -pthread flag.
+ continue
+ ;;
+ esac
+ fi
+ deplibs="$deplibs $arg"
+ continue
+ ;;
- The $output program cannot be directly executed until all the libtool
- libraries that it depends on are installed.
+ -module)
+ module=yes
+ continue
+ ;;
- This wrapper executable should never be moved out of the build directory.
- If it is, it will not operate correctly.
+ # Tru64 UNIX uses -model [arg] to determine the layout of C++
+ # classes, name mangling, and exception handling.
+ # Darwin uses the -arch flag to determine output architecture.
+ -model|-arch|-isysroot)
+ compiler_flags="$compiler_flags $arg"
+ func_append compile_command " $arg"
+ func_append finalize_command " $arg"
+ prev=xcompiler
+ continue
+ ;;
- Currently, it simply execs the wrapper *script* "/bin/sh $output",
- but could eventually absorb all of the scripts functionality and
- exec $objdir/$outputname directly.
-*/
-EOF
- cat >> $cwrappersource<<"EOF"
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <malloc.h>
-#include <stdarg.h>
-#include <assert.h>
-#include <string.h>
-#include <ctype.h>
-#include <sys/stat.h>
+ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+ compiler_flags="$compiler_flags $arg"
+ func_append compile_command " $arg"
+ func_append finalize_command " $arg"
+ case "$new_inherited_linker_flags " in
+ *" $arg "*) ;;
+ * ) new_inherited_linker_flags="$new_inherited_linker_flags $arg" ;;
+ esac
+ continue
+ ;;
-#if defined(PATH_MAX)
-# define LT_PATHMAX PATH_MAX
-#elif defined(MAXPATHLEN)
-# define LT_PATHMAX MAXPATHLEN
-#else
-# define LT_PATHMAX 1024
-#endif
+ -multi_module)
+ single_module="${wl}-multi_module"
+ continue
+ ;;
-#ifndef DIR_SEPARATOR
-# define DIR_SEPARATOR '/'
-# define PATH_SEPARATOR ':'
-#endif
+ -no-fast-install)
+ fast_install=no
+ continue
+ ;;
-#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
- defined (__OS2__)
-# define HAVE_DOS_BASED_FILE_SYSTEM
-# ifndef DIR_SEPARATOR_2
-# define DIR_SEPARATOR_2 '\\'
-# endif
-# ifndef PATH_SEPARATOR_2
-# define PATH_SEPARATOR_2 ';'
-# endif
-#endif
+ -no-install)
+ case $host in
+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*)
+ # The PATH hackery in wrapper scripts is required on Windows
+ # and Darwin in order for the loader to find any dlls it needs.
+ func_warning "\`-no-install' is ignored for $host"
+ func_warning "assuming \`-no-fast-install' instead"
+ fast_install=no
+ ;;
+ *) no_install=yes ;;
+ esac
+ continue
+ ;;
-#ifndef DIR_SEPARATOR_2
-# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR)
-#else /* DIR_SEPARATOR_2 */
-# define IS_DIR_SEPARATOR(ch) \
- (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
-#endif /* DIR_SEPARATOR_2 */
+ -no-undefined)
+ allow_undefined=no
+ continue
+ ;;
-#ifndef PATH_SEPARATOR_2
-# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR)
-#else /* PATH_SEPARATOR_2 */
-# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
-#endif /* PATH_SEPARATOR_2 */
+ -objectlist)
+ prev=objectlist
+ continue
+ ;;
-#define XMALLOC(type, num) ((type *) xmalloc ((num) * sizeof(type)))
-#define XFREE(stale) do { \
- if (stale) { free ((void *) stale); stale = 0; } \
-} while (0)
+ -o) prev=output ;;
-/* -DDEBUG is fairly common in CFLAGS. */
-#undef DEBUG
-#if defined DEBUGWRAPPER
-# define DEBUG(format, ...) fprintf(stderr, format, __VA_ARGS__)
-#else
-# define DEBUG(format, ...)
-#endif
+ -precious-files-regex)
+ prev=precious_regex
+ continue
+ ;;
-const char *program_name = NULL;
+ -release)
+ prev=release
+ continue
+ ;;
-void * xmalloc (size_t num);
-char * xstrdup (const char *string);
-const char * base_name (const char *name);
-char * find_executable(const char *wrapper);
-int check_executable(const char *path);
-char * strendzap(char *str, const char *pat);
-void lt_fatal (const char *message, ...);
+ -rpath)
+ prev=rpath
+ continue
+ ;;
-int
-main (int argc, char *argv[])
-{
- char **newargz;
- int i;
+ -R)
+ prev=xrpath
+ continue
+ ;;
- program_name = (char *) xstrdup (base_name (argv[0]));
- DEBUG("(main) argv[0] : %s\n",argv[0]);
- DEBUG("(main) program_name : %s\n",program_name);
- newargz = XMALLOC(char *, argc+2);
-EOF
+ -R*)
+ func_stripname '-R' '' "$arg"
+ dir=$func_stripname_result
+ # We need an absolute path.
+ case $dir in
+ [\\/]* | [A-Za-z]:[\\/]*) ;;
+ *)
+ func_fatal_error "only absolute run-paths are allowed"
+ ;;
+ esac
+ case "$xrpath " in
+ *" $dir "*) ;;
+ *) xrpath="$xrpath $dir" ;;
+ esac
+ continue
+ ;;
- cat >> $cwrappersource <<EOF
- newargz[0] = (char *) xstrdup("$SHELL");
-EOF
+ -shared)
+ # The effects of -shared are defined in a previous loop.
+ continue
+ ;;
- cat >> $cwrappersource <<"EOF"
- newargz[1] = find_executable(argv[0]);
- if (newargz[1] == NULL)
- lt_fatal("Couldn't find %s", argv[0]);
- DEBUG("(main) found exe at : %s\n",newargz[1]);
- /* we know the script has the same name, without the .exe */
- /* so make sure newargz[1] doesn't end in .exe */
- strendzap(newargz[1],".exe");
- for (i = 1; i < argc; i++)
- newargz[i+1] = xstrdup(argv[i]);
- newargz[argc+1] = NULL;
+ -shrext)
+ prev=shrext
+ continue
+ ;;
- for (i=0; i<argc+1; i++)
- {
- DEBUG("(main) newargz[%d] : %s\n",i,newargz[i]);
- ;
- }
+ -static | -static-libtool-libs)
+ # The effects of -static are defined in a previous loop.
+ # We used to do the same as -all-static on platforms that
+ # didn't have a PIC flag, but the assumption that the effects
+ # would be equivalent was wrong. It would break on at least
+ # Digital Unix and AIX.
+ continue
+ ;;
-EOF
+ -thread-safe)
+ thread_safe=yes
+ continue
+ ;;
- case $host_os in
- mingw*)
- cat >> $cwrappersource <<EOF
- execv("$SHELL",(char const **)newargz);
-EOF
- ;;
- *)
- cat >> $cwrappersource <<EOF
- execv("$SHELL",newargz);
-EOF
- ;;
- esac
+ -version-info)
+ prev=vinfo
+ continue
+ ;;
- cat >> $cwrappersource <<"EOF"
- return 127;
-}
+ -version-number)
+ prev=vinfo
+ vinfo_number=yes
+ continue
+ ;;
-void *
-xmalloc (size_t num)
-{
- void * p = (void *) malloc (num);
- if (!p)
- lt_fatal ("Memory exhausted");
+ -weak)
+ prev=weak
+ continue
+ ;;
- return p;
-}
+ -Wc,*)
+ func_stripname '-Wc,' '' "$arg"
+ args=$func_stripname_result
+ arg=
+ save_ifs="$IFS"; IFS=','
+ for flag in $args; do
+ IFS="$save_ifs"
+ func_quote_for_eval "$flag"
+ arg="$arg $wl$func_quote_for_eval_result"
+ compiler_flags="$compiler_flags $func_quote_for_eval_result"
+ done
+ IFS="$save_ifs"
+ func_stripname ' ' '' "$arg"
+ arg=$func_stripname_result
+ ;;
-char *
-xstrdup (const char *string)
-{
- return string ? strcpy ((char *) xmalloc (strlen (string) + 1), string) : NULL
-;
-}
+ -Wl,*)
+ func_stripname '-Wl,' '' "$arg"
+ args=$func_stripname_result
+ arg=
+ save_ifs="$IFS"; IFS=','
+ for flag in $args; do
+ IFS="$save_ifs"
+ func_quote_for_eval "$flag"
+ arg="$arg $wl$func_quote_for_eval_result"
+ compiler_flags="$compiler_flags $wl$func_quote_for_eval_result"
+ linker_flags="$linker_flags $func_quote_for_eval_result"
+ done
+ IFS="$save_ifs"
+ func_stripname ' ' '' "$arg"
+ arg=$func_stripname_result
+ ;;
-const char *
-base_name (const char *name)
-{
- const char *base;
+ -Xcompiler)
+ prev=xcompiler
+ continue
+ ;;
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
- /* Skip over the disk name in MSDOS pathnames. */
- if (isalpha ((unsigned char)name[0]) && name[1] == ':')
- name += 2;
-#endif
+ -Xlinker)
+ prev=xlinker
+ continue
+ ;;
- for (base = name; *name; name++)
- if (IS_DIR_SEPARATOR (*name))
- base = name + 1;
- return base;
-}
+ -XCClinker)
+ prev=xcclinker
+ continue
+ ;;
-int
-check_executable(const char * path)
-{
- struct stat st;
+ # -msg_* for osf cc
+ -msg_*)
+ func_quote_for_eval "$arg"
+ arg="$func_quote_for_eval_result"
+ ;;
- DEBUG("(check_executable) : %s\n", path ? (*path ? path : "EMPTY!") : "NULL!");
- if ((!path) || (!*path))
- return 0;
+ # -64, -mips[0-9] enable 64-bit mode on the SGI compiler
+ # -r[0-9][0-9]* specifies the processor on the SGI compiler
+ # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler
+ # +DA*, +DD* enable 64-bit mode on the HP compiler
+ # -q* pass through compiler args for the IBM compiler
+ # -m*, -t[45]*, -txscale* pass through architecture-specific
+ # compiler args for GCC
+ # -F/path gives path to uninstalled frameworks, gcc on darwin
+ # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
+ # @file GCC response files
+ -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
+ func_quote_for_eval "$arg"
+ arg="$func_quote_for_eval_result"
+ func_append compile_command " $arg"
+ func_append finalize_command " $arg"
+ compiler_flags="$compiler_flags $arg"
+ continue
+ ;;
- if ((stat (path, &st) >= 0) &&
- (
- /* MinGW & native WIN32 do not support S_IXOTH or S_IXGRP */
-#if defined (S_IXOTH)
- ((st.st_mode & S_IXOTH) == S_IXOTH) ||
-#endif
-#if defined (S_IXGRP)
- ((st.st_mode & S_IXGRP) == S_IXGRP) ||
-#endif
- ((st.st_mode & S_IXUSR) == S_IXUSR))
- )
- return 1;
- else
- return 0;
-}
+ # Some other compiler flag.
+ -* | +*)
+ func_quote_for_eval "$arg"
+ arg="$func_quote_for_eval_result"
+ ;;
-/* Searches for the full path of the wrapper. Returns
- newly allocated full path name if found, NULL otherwise */
-char *
-find_executable (const char* wrapper)
-{
- int has_slash = 0;
- const char* p;
- const char* p_next;
- /* static buffer for getcwd */
- char tmp[LT_PATHMAX + 1];
- int tmp_len;
- char* concat_name;
+ *.$objext)
+ # A standard object.
+ objs="$objs $arg"
+ ;;
- DEBUG("(find_executable) : %s\n", wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!");
+ *.lo)
+ # A libtool-controlled object.
- if ((wrapper == NULL) || (*wrapper == '\0'))
- return NULL;
+ # Check to see that this really is a libtool object.
+ if func_lalib_unsafe_p "$arg"; then
+ pic_object=
+ non_pic_object=
- /* Absolute path? */
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
- if (isalpha ((unsigned char)wrapper[0]) && wrapper[1] == ':')
- {
- concat_name = xstrdup (wrapper);
- if (check_executable(concat_name))
- return concat_name;
- XFREE(concat_name);
- }
- else
- {
-#endif
- if (IS_DIR_SEPARATOR (wrapper[0]))
- {
- concat_name = xstrdup (wrapper);
- if (check_executable(concat_name))
- return concat_name;
- XFREE(concat_name);
- }
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
- }
-#endif
+ # Read the .lo file
+ func_source "$arg"
- for (p = wrapper; *p; p++)
- if (*p == '/')
- {
- has_slash = 1;
- break;
- }
- if (!has_slash)
- {
- /* no slashes; search PATH */
- const char* path = getenv ("PATH");
- if (path != NULL)
- {
- for (p = path; *p; p = p_next)
- {
- const char* q;
- size_t p_len;
- for (q = p; *q; q++)
- if (IS_PATH_SEPARATOR(*q))
- break;
- p_len = q - p;
- p_next = (*q == '\0' ? q : q + 1);
- if (p_len == 0)
- {
- /* empty path: current directory */
- if (getcwd (tmp, LT_PATHMAX) == NULL)
- lt_fatal ("getcwd failed");
- tmp_len = strlen(tmp);
- concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1);
- memcpy (concat_name, tmp, tmp_len);
- concat_name[tmp_len] = '/';
- strcpy (concat_name + tmp_len + 1, wrapper);
- }
- else
- {
- concat_name = XMALLOC(char, p_len + 1 + strlen(wrapper) + 1);
- memcpy (concat_name, p, p_len);
- concat_name[p_len] = '/';
- strcpy (concat_name + p_len + 1, wrapper);
- }
- if (check_executable(concat_name))
- return concat_name;
- XFREE(concat_name);
- }
- }
- /* not found in PATH; assume curdir */
- }
- /* Relative path | not found in path: prepend cwd */
- if (getcwd (tmp, LT_PATHMAX) == NULL)
- lt_fatal ("getcwd failed");
- tmp_len = strlen(tmp);
- concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1);
- memcpy (concat_name, tmp, tmp_len);
- concat_name[tmp_len] = '/';
- strcpy (concat_name + tmp_len + 1, wrapper);
+ if test -z "$pic_object" ||
+ test -z "$non_pic_object" ||
+ test "$pic_object" = none &&
+ test "$non_pic_object" = none; then
+ func_fatal_error "cannot find name of object for \`$arg'"
+ fi
- if (check_executable(concat_name))
- return concat_name;
- XFREE(concat_name);
- return NULL;
-}
+ # Extract subdirectory from the argument.
+ func_dirname "$arg" "/" ""
+ xdir="$func_dirname_result"
-char *
-strendzap(char *str, const char *pat)
-{
- size_t len, patlen;
+ if test "$pic_object" != none; then
+ # Prepend the subdirectory the object is found in.
+ pic_object="$xdir$pic_object"
- assert(str != NULL);
- assert(pat != NULL);
+ if test "$prev" = dlfiles; then
+ if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
+ dlfiles="$dlfiles $pic_object"
+ prev=
+ continue
+ else
+ # If libtool objects are unsupported, then we need to preload.
+ prev=dlprefiles
+ fi
+ fi
- len = strlen(str);
- patlen = strlen(pat);
+ # CHECK ME: I think I busted this. -Ossama
+ if test "$prev" = dlprefiles; then
+ # Preload the old-style object.
+ dlprefiles="$dlprefiles $pic_object"
+ prev=
+ fi
- if (patlen <= len)
- {
- str += len - patlen;
- if (strcmp(str, pat) == 0)
- *str = '\0';
- }
- return str;
-}
+ # A PIC object.
+ func_append libobjs " $pic_object"
+ arg="$pic_object"
+ fi
-static void
-lt_error_core (int exit_status, const char * mode,
- const char * message, va_list ap)
-{
- fprintf (stderr, "%s: %s: ", program_name, mode);
- vfprintf (stderr, message, ap);
- fprintf (stderr, ".\n");
+ # Non-PIC object.
+ if test "$non_pic_object" != none; then
+ # Prepend the subdirectory the object is found in.
+ non_pic_object="$xdir$non_pic_object"
- if (exit_status >= 0)
- exit (exit_status);
-}
+ # A standard non-PIC object
+ func_append non_pic_objects " $non_pic_object"
+ if test -z "$pic_object" || test "$pic_object" = none ; then
+ arg="$non_pic_object"
+ fi
+ else
+ # If the PIC object exists, use it instead.
+ # $xdir was prepended to $pic_object above.
+ non_pic_object="$pic_object"
+ func_append non_pic_objects " $non_pic_object"
+ fi
+ else
+ # Only an error if not doing a dry-run.
+ if $opt_dry_run; then
+ # Extract subdirectory from the argument.
+ func_dirname "$arg" "/" ""
+ xdir="$func_dirname_result"
+
+ func_lo2o "$arg"
+ pic_object=$xdir$objdir/$func_lo2o_result
+ non_pic_object=$xdir$func_lo2o_result
+ func_append libobjs " $pic_object"
+ func_append non_pic_objects " $non_pic_object"
+ else
+ func_fatal_error "\`$arg' is not a valid libtool object"
+ fi
+ fi
+ ;;
-void
-lt_fatal (const char *message, ...)
-{
- va_list ap;
- va_start (ap, message);
- lt_error_core (EXIT_FAILURE, "FATAL", message, ap);
- va_end (ap);
-}
-EOF
- # we should really use a build-platform specific compiler
- # here, but OTOH, the wrappers (shell script and this C one)
- # are only useful if you want to execute the "real" binary.
- # Since the "real" binary is built for $host, then this
- # wrapper might as well be built for $host, too.
- $run $LTCC $LTCFLAGS -s -o $cwrapper $cwrappersource
- ;;
- esac
- $rm $output
- trap "$rm $output; exit $EXIT_FAILURE" 1 2 15
+ *.$libext)
+ # An archive.
+ deplibs="$deplibs $arg"
+ old_deplibs="$old_deplibs $arg"
+ continue
+ ;;
- $echo > $output "\
-#! $SHELL
+ *.la)
+ # A libtool-controlled library.
-# $output - temporary wrapper script for $objdir/$outputname
-# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
-#
-# The $output program cannot be directly executed until all the libtool
-# libraries that it depends on are installed.
-#
-# This wrapper script should never be moved out of the build directory.
-# If it is, it will not operate correctly.
+ if test "$prev" = dlfiles; then
+ # This library was specified with -dlopen.
+ dlfiles="$dlfiles $arg"
+ prev=
+ elif test "$prev" = dlprefiles; then
+ # The library was specified with -dlpreopen.
+ dlprefiles="$dlprefiles $arg"
+ prev=
+ else
+ deplibs="$deplibs $arg"
+ fi
+ continue
+ ;;
-# Sed substitution that helps us do robust quoting. It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed='${SED} -e 1s/^X//'
-sed_quote_subst='$sed_quote_subst'
+ # Some other compiler argument.
+ *)
+ # Unknown arguments in both finalize_command and compile_command need
+ # to be aesthetically quoted because they are evaled later.
+ func_quote_for_eval "$arg"
+ arg="$func_quote_for_eval_result"
+ ;;
+ esac # arg
-# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
-if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
- emulate sh
- NULLCMD=:
- # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which
- # is contrary to our usage. Disable this feature.
- alias -g '\${1+\"\$@\"}'='\"\$@\"'
- setopt NO_GLOB_SUBST
-else
- case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac
-fi
-BIN_SH=xpg4; export BIN_SH # for Tru64
-DUALCASE=1; export DUALCASE # for MKS sh
+ # Now actually substitute the argument into the commands.
+ if test -n "$arg"; then
+ func_append compile_command " $arg"
+ func_append finalize_command " $arg"
+ fi
+ done # argument parsing loop
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+ test -n "$prev" && \
+ func_fatal_help "the \`$prevarg' option requires an argument"
-relink_command=\"$relink_command\"
+ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
+ eval arg=\"$export_dynamic_flag_spec\"
+ func_append compile_command " $arg"
+ func_append finalize_command " $arg"
+ fi
-# This environment variable determines our operation mode.
-if test \"\$libtool_install_magic\" = \"$magic\"; then
- # install mode needs the following variable:
- notinst_deplibs='$notinst_deplibs'
-else
- # When we are sourced in execute mode, \$file and \$echo are already set.
- if test \"\$libtool_execute_magic\" != \"$magic\"; then
- echo=\"$qecho\"
- file=\"\$0\"
- # Make sure echo works.
- if test \"X\$1\" = X--no-reexec; then
- # Discard the --no-reexec flag, and continue.
- shift
- elif test \"X\`(\$echo '\t') 2>/dev/null\`\" = 'X\t'; then
- # Yippee, \$echo works!
- :
+ oldlibs=
+ # calculate the name of the file, without its directory
+ func_basename "$output"
+ outputname="$func_basename_result"
+ libobjs_save="$libobjs"
+
+ if test -n "$shlibpath_var"; then
+ # get the directories listed in $shlibpath_var
+ eval shlib_search_path=\`\$ECHO \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\`
else
- # Restart under the correct shell, and then maybe \$echo will work.
- exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"}
+ shlib_search_path=
fi
- fi\
-"
- $echo >> $output "\
+ eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
+ eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
- # Find the directory that this script lives in.
- thisdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\`
- test \"x\$thisdir\" = \"x\$file\" && thisdir=.
+ func_dirname "$output" "/" ""
+ output_objdir="$func_dirname_result$objdir"
+ # Create the object directory.
+ func_mkdir_p "$output_objdir"
- # Follow symbolic links until we get to the real thisdir.
- file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\`
- while test -n \"\$file\"; do
- destdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
+ # Determine the type of output
+ case $output in
+ "")
+ func_fatal_help "you must specify an output file"
+ ;;
+ *.$libext) linkmode=oldlib ;;
+ *.lo | *.$objext) linkmode=obj ;;
+ *.la) linkmode=lib ;;
+ *) linkmode=prog ;; # Anything else should be a program.
+ esac
+
+ specialdeplibs=
+
+ libs=
+ # Find all interdependent deplibs by searching for libraries
+ # that are linked more than once (e.g. -la -lb -la)
+ for deplib in $deplibs; do
+ if $opt_duplicate_deps ; then
+ case "$libs " in
+ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+ esac
+ fi
+ libs="$libs $deplib"
+ done
+
+ if test "$linkmode" = lib; then
+ libs="$predeps $libs $compiler_lib_search_path $postdeps"
+
+ # Compute libraries that are listed more than once in $predeps
+ # $postdeps and mark them as special (i.e., whose duplicates are
+ # not to be eliminated).
+ pre_post_deps=
+ if $opt_duplicate_compiler_generated_deps; then
+ for pre_post_dep in $predeps $postdeps; do
+ case "$pre_post_deps " in
+ *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;
+ esac
+ pre_post_deps="$pre_post_deps $pre_post_dep"
+ done
+ fi
+ pre_post_deps=
+ fi
+
+ deplibs=
+ newdependency_libs=
+ newlib_search_path=
+ need_relink=no # whether we're linking any uninstalled libtool libraries
+ notinst_deplibs= # not-installed libtool libraries
+ notinst_path= # paths that contain not-installed libtool libraries
+
+ case $linkmode in
+ lib)
+ passes="conv dlpreopen link"
+ for file in $dlfiles $dlprefiles; do
+ case $file in
+ *.la) ;;
+ *)
+ func_fatal_help "libraries can \`-dlopen' only libtool libraries: $file"
+ ;;
+ esac
+ done
+ ;;
+ prog)
+ compile_deplibs=
+ finalize_deplibs=
+ alldeplibs=no
+ newdlfiles=
+ newdlprefiles=
+ passes="conv scan dlopen dlpreopen link"
+ ;;
+ *) passes="conv"
+ ;;
+ esac
+
+ for pass in $passes; do
+ # The preopen pass in lib mode reverses $deplibs; put it back here
+ # so that -L comes before libs that need it for instance...
+ if test "$linkmode,$pass" = "lib,link"; then
+ ## FIXME: Find the place where the list is rebuilt in the wrong
+ ## order, and fix it there properly
+ tmp_deplibs=
+ for deplib in $deplibs; do
+ tmp_deplibs="$deplib $tmp_deplibs"
+ done
+ deplibs="$tmp_deplibs"
+ fi
+
+ if test "$linkmode,$pass" = "lib,link" ||
+ test "$linkmode,$pass" = "prog,scan"; then
+ libs="$deplibs"
+ deplibs=
+ fi
+ if test "$linkmode" = prog; then
+ case $pass in
+ dlopen) libs="$dlfiles" ;;
+ dlpreopen) libs="$dlprefiles" ;;
+ link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
+ esac
+ fi
+ if test "$linkmode,$pass" = "lib,dlpreopen"; then
+ # Collect and forward deplibs of preopened libtool libs
+ for lib in $dlprefiles; do
+ # Ignore non-libtool-libs
+ dependency_libs=
+ case $lib in
+ *.la) func_source "$lib" ;;
+ esac
+
+ # Collect preopened libtool deplibs, except any this library
+ # has declared as weak libs
+ for deplib in $dependency_libs; do
+ deplib_base=`$ECHO "X$deplib" | $Xsed -e "$basename"`
+ case " $weak_libs " in
+ *" $deplib_base "*) ;;
+ *) deplibs="$deplibs $deplib" ;;
+ esac
+ done
+ done
+ libs="$dlprefiles"
+ fi
+ if test "$pass" = dlopen; then
+ # Collect dlpreopened libraries
+ save_deplibs="$deplibs"
+ deplibs=
+ fi
+
+ for deplib in $libs; do
+ lib=
+ found=no
+ case $deplib in
+ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+ if test "$linkmode,$pass" = "prog,link"; then
+ compile_deplibs="$deplib $compile_deplibs"
+ finalize_deplibs="$deplib $finalize_deplibs"
+ else
+ compiler_flags="$compiler_flags $deplib"
+ if test "$linkmode" = lib ; then
+ case "$new_inherited_linker_flags " in
+ *" $deplib "*) ;;
+ * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
+ esac
+ fi
+ fi
+ continue
+ ;;
+ -l*)
+ if test "$linkmode" != lib && test "$linkmode" != prog; then
+ func_warning "\`-l' is ignored for archives/objects"
+ continue
+ fi
+ func_stripname '-l' '' "$deplib"
+ name=$func_stripname_result
+ if test "$linkmode" = lib; then
+ searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path"
+ else
+ searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path"
+ fi
+ for searchdir in $searchdirs; do
+ for search_ext in .la $std_shrext .so .a; do
+ # Search the libtool library
+ lib="$searchdir/lib${name}${search_ext}"
+ if test -f "$lib"; then
+ if test "$search_ext" = ".la"; then
+ found=yes
+ else
+ found=no
+ fi
+ break 2
+ fi
+ done
+ done
+ if test "$found" != yes; then
+ # deplib doesn't seem to be a libtool library
+ if test "$linkmode,$pass" = "prog,link"; then
+ compile_deplibs="$deplib $compile_deplibs"
+ finalize_deplibs="$deplib $finalize_deplibs"
+ else
+ deplibs="$deplib $deplibs"
+ test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
+ fi
+ continue
+ else # deplib is a libtool library
+ # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib,
+ # We need to do some special things here, and not later.
+ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+ case " $predeps $postdeps " in
+ *" $deplib "*)
+ if func_lalib_p "$lib"; then
+ library_names=
+ old_library=
+ func_source "$lib"
+ for l in $old_library $library_names; do
+ ll="$l"
+ done
+ if test "X$ll" = "X$old_library" ; then # only static version available
+ found=no
+ func_dirname "$lib" "" "."
+ ladir="$func_dirname_result"
+ lib=$ladir/$old_library
+ if test "$linkmode,$pass" = "prog,link"; then
+ compile_deplibs="$deplib $compile_deplibs"
+ finalize_deplibs="$deplib $finalize_deplibs"
+ else
+ deplibs="$deplib $deplibs"
+ test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
+ fi
+ continue
+ fi
+ fi
+ ;;
+ *) ;;
+ esac
+ fi
+ fi
+ ;; # -l
+ *.ltframework)
+ if test "$linkmode,$pass" = "prog,link"; then
+ compile_deplibs="$deplib $compile_deplibs"
+ finalize_deplibs="$deplib $finalize_deplibs"
+ else
+ deplibs="$deplib $deplibs"
+ if test "$linkmode" = lib ; then
+ case "$new_inherited_linker_flags " in
+ *" $deplib "*) ;;
+ * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
+ esac
+ fi
+ fi
+ continue
+ ;;
+ -L*)
+ case $linkmode in
+ lib)
+ deplibs="$deplib $deplibs"
+ test "$pass" = conv && continue
+ newdependency_libs="$deplib $newdependency_libs"
+ func_stripname '-L' '' "$deplib"
+ newlib_search_path="$newlib_search_path $func_stripname_result"
+ ;;
+ prog)
+ if test "$pass" = conv; then
+ deplibs="$deplib $deplibs"
+ continue
+ fi
+ if test "$pass" = scan; then
+ deplibs="$deplib $deplibs"
+ else
+ compile_deplibs="$deplib $compile_deplibs"
+ finalize_deplibs="$deplib $finalize_deplibs"
+ fi
+ func_stripname '-L' '' "$deplib"
+ newlib_search_path="$newlib_search_path $func_stripname_result"
+ ;;
+ *)
+ func_warning "\`-L' is ignored for archives/objects"
+ ;;
+ esac # linkmode
+ continue
+ ;; # -L
+ -R*)
+ if test "$pass" = link; then
+ func_stripname '-R' '' "$deplib"
+ dir=$func_stripname_result
+ # Make sure the xrpath contains only unique directories.
+ case "$xrpath " in
+ *" $dir "*) ;;
+ *) xrpath="$xrpath $dir" ;;
+ esac
+ fi
+ deplibs="$deplib $deplibs"
+ continue
+ ;;
+ *.la) lib="$deplib" ;;
+ *.$libext)
+ if test "$pass" = conv; then
+ deplibs="$deplib $deplibs"
+ continue
+ fi
+ case $linkmode in
+ lib)
+ # Linking convenience modules into shared libraries is allowed,
+ # but linking other static libraries is non-portable.
+ case " $dlpreconveniencelibs " in
+ *" $deplib "*) ;;
+ *)
+ valid_a_lib=no
+ case $deplibs_check_method in
+ match_pattern*)
+ set dummy $deplibs_check_method; shift
+ match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
+ if eval "\$ECHO \"X$deplib\"" 2>/dev/null | $Xsed -e 10q \
+ | $EGREP "$match_pattern_regex" > /dev/null; then
+ valid_a_lib=yes
+ fi
+ ;;
+ pass_all)
+ valid_a_lib=yes
+ ;;
+ esac
+ if test "$valid_a_lib" != yes; then
+ $ECHO
+ $ECHO "*** Warning: Trying to link with static lib archive $deplib."
+ $ECHO "*** I have the capability to make that library automatically link in when"
+ $ECHO "*** you link to this library. But I can only do this if you have a"
+ $ECHO "*** shared version of the library, which you do not appear to have"
+ $ECHO "*** because the file extensions .$libext of this argument makes me believe"
+ $ECHO "*** that it is just a static archive that I should not use here."
+ else
+ $ECHO
+ $ECHO "*** Warning: Linking the shared library $output against the"
+ $ECHO "*** static library $deplib is not portable!"
+ deplibs="$deplib $deplibs"
+ fi
+ ;;
+ esac
+ continue
+ ;;
+ prog)
+ if test "$pass" != link; then
+ deplibs="$deplib $deplibs"
+ else
+ compile_deplibs="$deplib $compile_deplibs"
+ finalize_deplibs="$deplib $finalize_deplibs"
+ fi
+ continue
+ ;;
+ esac # linkmode
+ ;; # *.$libext
+ *.lo | *.$objext)
+ if test "$pass" = conv; then
+ deplibs="$deplib $deplibs"
+ elif test "$linkmode" = prog; then
+ if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
+ # If there is no dlopen support or we're linking statically,
+ # we need to preload.
+ newdlprefiles="$newdlprefiles $deplib"
+ compile_deplibs="$deplib $compile_deplibs"
+ finalize_deplibs="$deplib $finalize_deplibs"
+ else
+ newdlfiles="$newdlfiles $deplib"
+ fi
+ fi
+ continue
+ ;;
+ %DEPLIBS%)
+ alldeplibs=yes
+ continue
+ ;;
+ esac # case $deplib
+
+ if test "$found" = yes || test -f "$lib"; then :
+ else
+ func_fatal_error "cannot find the library \`$lib' or unhandled argument \`$deplib'"
+ fi
+
+ # Check to see that this really is a libtool archive.
+ func_lalib_unsafe_p "$lib" \
+ || func_fatal_error "\`$lib' is not a valid libtool archive"
+
+ func_dirname "$lib" "" "."
+ ladir="$func_dirname_result"
+
+ dlname=
+ dlopen=
+ dlpreopen=
+ libdir=
+ library_names=
+ old_library=
+ inherited_linker_flags=
+ # If the library was installed with an old release of libtool,
+ # it will not redefine variables installed, or shouldnotlink
+ installed=yes
+ shouldnotlink=no
+ avoidtemprpath=
+
+
+ # Read the .la file
+ func_source "$lib"
+
+ # Convert "-framework foo" to "foo.ltframework"
+ if test -n "$inherited_linker_flags"; then
+ tmp_inherited_linker_flags=`$ECHO "X$inherited_linker_flags" | $Xsed -e 's/-framework \([^ $]*\)/\1.ltframework/g'`
+ for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do
+ case " $new_inherited_linker_flags " in
+ *" $tmp_inherited_linker_flag "*) ;;
+ *) new_inherited_linker_flags="$new_inherited_linker_flags $tmp_inherited_linker_flag";;
+ esac
+ done
+ fi
+ dependency_libs=`$ECHO "X $dependency_libs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+ if test "$linkmode,$pass" = "lib,link" ||
+ test "$linkmode,$pass" = "prog,scan" ||
+ { test "$linkmode" != prog && test "$linkmode" != lib; }; then
+ test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
+ test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
+ fi
+
+ if test "$pass" = conv; then
+ # Only check for convenience libraries
+ deplibs="$lib $deplibs"
+ if test -z "$libdir"; then
+ if test -z "$old_library"; then
+ func_fatal_error "cannot find name of link library for \`$lib'"
+ fi
+ # It is a libtool convenience library, so add in its objects.
+ convenience="$convenience $ladir/$objdir/$old_library"
+ old_convenience="$old_convenience $ladir/$objdir/$old_library"
+ elif test "$linkmode" != prog && test "$linkmode" != lib; then
+ func_fatal_error "\`$lib' is not a convenience library"
+ fi
+ tmp_libs=
+ for deplib in $dependency_libs; do
+ deplibs="$deplib $deplibs"
+ if $opt_duplicate_deps ; then
+ case "$tmp_libs " in
+ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+ esac
+ fi
+ tmp_libs="$tmp_libs $deplib"
+ done
+ continue
+ fi # $pass = conv
+
+
+ # Get the name of the library we link against.
+ linklib=
+ for l in $old_library $library_names; do
+ linklib="$l"
+ done
+ if test -z "$linklib"; then
+ func_fatal_error "cannot find name of link library for \`$lib'"
+ fi
+
+ # This library was specified with -dlopen.
+ if test "$pass" = dlopen; then
+ if test -z "$libdir"; then
+ func_fatal_error "cannot -dlopen a convenience library: \`$lib'"
+ fi
+ if test -z "$dlname" ||
+ test "$dlopen_support" != yes ||
+ test "$build_libtool_libs" = no; then
+ # If there is no dlname, no dlopen support or we're linking
+ # statically, we need to preload. We also need to preload any
+ # dependent libraries so libltdl's deplib preloader doesn't
+ # bomb out in the load deplibs phase.
+ dlprefiles="$dlprefiles $lib $dependency_libs"
+ else
+ newdlfiles="$newdlfiles $lib"
+ fi
+ continue
+ fi # $pass = dlopen
+
+ # We need an absolute path.
+ case $ladir in
+ [\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;;
+ *)
+ abs_ladir=`cd "$ladir" && pwd`
+ if test -z "$abs_ladir"; then
+ func_warning "cannot determine absolute directory name of \`$ladir'"
+ func_warning "passing it literally to the linker, although it might fail"
+ abs_ladir="$ladir"
+ fi
+ ;;
+ esac
+ func_basename "$lib"
+ laname="$func_basename_result"
+
+ # Find the relevant object directory and library name.
+ if test "X$installed" = Xyes; then
+ if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
+ func_warning "library \`$lib' was moved."
+ dir="$ladir"
+ absdir="$abs_ladir"
+ libdir="$abs_ladir"
+ else
+ dir="$libdir"
+ absdir="$libdir"
+ fi
+ test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
+ else
+ if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
+ dir="$ladir"
+ absdir="$abs_ladir"
+ # Remove this search path later
+ notinst_path="$notinst_path $abs_ladir"
+ else
+ dir="$ladir/$objdir"
+ absdir="$abs_ladir/$objdir"
+ # Remove this search path later
+ notinst_path="$notinst_path $abs_ladir"
+ fi
+ fi # $installed = yes
+ func_stripname 'lib' '.la' "$laname"
+ name=$func_stripname_result
+
+ # This library was specified with -dlpreopen.
+ if test "$pass" = dlpreopen; then
+ if test -z "$libdir" && test "$linkmode" = prog; then
+ func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'"
+ fi
+ # Prefer using a static library (so that no silly _DYNAMIC symbols
+ # are required to link).
+ if test -n "$old_library"; then
+ newdlprefiles="$newdlprefiles $dir/$old_library"
+ # Keep a list of preopened convenience libraries to check
+ # that they are being used correctly in the link pass.
+ test -z "$libdir" && \
+ dlpreconveniencelibs="$dlpreconveniencelibs $dir/$old_library"
+ # Otherwise, use the dlname, so that lt_dlopen finds it.
+ elif test -n "$dlname"; then
+ newdlprefiles="$newdlprefiles $dir/$dlname"
+ else
+ newdlprefiles="$newdlprefiles $dir/$linklib"
+ fi
+ fi # $pass = dlpreopen
+
+ if test -z "$libdir"; then
+ # Link the convenience library
+ if test "$linkmode" = lib; then
+ deplibs="$dir/$old_library $deplibs"
+ elif test "$linkmode,$pass" = "prog,link"; then
+ compile_deplibs="$dir/$old_library $compile_deplibs"
+ finalize_deplibs="$dir/$old_library $finalize_deplibs"
+ else
+ deplibs="$lib $deplibs" # used for prog,scan pass
+ fi
+ continue
+ fi
+
+
+ if test "$linkmode" = prog && test "$pass" != link; then
+ newlib_search_path="$newlib_search_path $ladir"
+ deplibs="$lib $deplibs"
+
+ linkalldeplibs=no
+ if test "$link_all_deplibs" != no || test -z "$library_names" ||
+ test "$build_libtool_libs" = no; then
+ linkalldeplibs=yes
+ fi
+
+ tmp_libs=
+ for deplib in $dependency_libs; do
+ case $deplib in
+ -L*) func_stripname '-L' '' "$deplib"
+ newlib_search_path="$newlib_search_path $func_stripname_result"
+ ;;
+ esac
+ # Need to link against all dependency_libs?
+ if test "$linkalldeplibs" = yes; then
+ deplibs="$deplib $deplibs"
+ else
+ # Need to hardcode shared library paths
+ # or/and link against static libraries
+ newdependency_libs="$deplib $newdependency_libs"
+ fi
+ if $opt_duplicate_deps ; then
+ case "$tmp_libs " in
+ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+ esac
+ fi
+ tmp_libs="$tmp_libs $deplib"
+ done # for deplib
+ continue
+ fi # $linkmode = prog...
+
+ if test "$linkmode,$pass" = "prog,link"; then
+ if test -n "$library_names" &&
+ { { test "$prefer_static_libs" = no ||
+ test "$prefer_static_libs,$installed" = "built,yes"; } ||
+ test -z "$old_library"; }; then
+ # We need to hardcode the library path
+ if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
+ # Make sure the rpath contains only unique directories.
+ case "$temp_rpath:" in
+ *"$absdir:"*) ;;
+ *) temp_rpath="$temp_rpath$absdir:" ;;
+ esac
+ fi
+
+ # Hardcode the library path.
+ # Skip directories that are in the system default run-time
+ # search path.
+ case " $sys_lib_dlsearch_path " in
+ *" $absdir "*) ;;
+ *)
+ case "$compile_rpath " in
+ *" $absdir "*) ;;
+ *) compile_rpath="$compile_rpath $absdir"
+ esac
+ ;;
+ esac
+ case " $sys_lib_dlsearch_path " in
+ *" $libdir "*) ;;
+ *)
+ case "$finalize_rpath " in
+ *" $libdir "*) ;;
+ *) finalize_rpath="$finalize_rpath $libdir"
+ esac
+ ;;
+ esac
+ fi # $linkmode,$pass = prog,link...
+
+ if test "$alldeplibs" = yes &&
+ { test "$deplibs_check_method" = pass_all ||
+ { test "$build_libtool_libs" = yes &&
+ test -n "$library_names"; }; }; then
+ # We only need to search for static libraries
+ continue
+ fi
+ fi
+
+ link_static=no # Whether the deplib will be linked statically
+ use_static_libs=$prefer_static_libs
+ if test "$use_static_libs" = built && test "$installed" = yes; then
+ use_static_libs=no
+ fi
+ if test -n "$library_names" &&
+ { test "$use_static_libs" = no || test -z "$old_library"; }; then
+ case $host in
+ *cygwin* | *mingw* | *cegcc*)
+ # No point in relinking DLLs because paths are not encoded
+ notinst_deplibs="$notinst_deplibs $lib"
+ need_relink=no
+ ;;
+ *)
+ if test "$installed" = no; then
+ notinst_deplibs="$notinst_deplibs $lib"
+ need_relink=yes
+ fi
+ ;;
+ esac
+ # This is a shared library
+
+ # Warn about portability, can't link against -module's on some
+ # systems (darwin). Don't bleat about dlopened modules though!
+ dlopenmodule=""
+ for dlpremoduletest in $dlprefiles; do
+ if test "X$dlpremoduletest" = "X$lib"; then
+ dlopenmodule="$dlpremoduletest"
+ break
+ fi
+ done
+ if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then
+ $ECHO
+ if test "$linkmode" = prog; then
+ $ECHO "*** Warning: Linking the executable $output against the loadable module"
+ else
+ $ECHO "*** Warning: Linking the shared library $output against the loadable module"
+ fi
+ $ECHO "*** $linklib is not portable!"
+ fi
+ if test "$linkmode" = lib &&
+ test "$hardcode_into_libs" = yes; then
+ # Hardcode the library path.
+ # Skip directories that are in the system default run-time
+ # search path.
+ case " $sys_lib_dlsearch_path " in
+ *" $absdir "*) ;;
+ *)
+ case "$compile_rpath " in
+ *" $absdir "*) ;;
+ *) compile_rpath="$compile_rpath $absdir"
+ esac
+ ;;
+ esac
+ case " $sys_lib_dlsearch_path " in
+ *" $libdir "*) ;;
+ *)
+ case "$finalize_rpath " in
+ *" $libdir "*) ;;
+ *) finalize_rpath="$finalize_rpath $libdir"
+ esac
+ ;;
+ esac
+ fi
+
+ if test -n "$old_archive_from_expsyms_cmds"; then
+ # figure out the soname
+ set dummy $library_names
+ shift
+ realname="$1"
+ shift
+ libname=`eval "\\$ECHO \"$libname_spec\""`
+ # use dlname if we got it. it's perfectly good, no?
+ if test -n "$dlname"; then
+ soname="$dlname"
+ elif test -n "$soname_spec"; then
+ # bleh windows
+ case $host in
+ *cygwin* | mingw* | *cegcc*)
+ func_arith $current - $age
+ major=$func_arith_result
+ versuffix="-$major"
+ ;;
+ esac
+ eval soname=\"$soname_spec\"
+ else
+ soname="$realname"
+ fi
+
+ # Make a new name for the extract_expsyms_cmds to use
+ soroot="$soname"
+ func_basename "$soroot"
+ soname="$func_basename_result"
+ func_stripname 'lib' '.dll' "$soname"
+ newlib=libimp-$func_stripname_result.a
+
+ # If the library has no export list, then create one now
+ if test -f "$output_objdir/$soname-def"; then :
+ else
+ func_verbose "extracting exported symbol list from \`$soname'"
+ func_execute_cmds "$extract_expsyms_cmds" 'exit $?'
+ fi
+
+ # Create $newlib
+ if test -f "$output_objdir/$newlib"; then :; else
+ func_verbose "generating import library for \`$soname'"
+ func_execute_cmds "$old_archive_from_expsyms_cmds" 'exit $?'
+ fi
+ # make sure the library variables are pointing to the new library
+ dir=$output_objdir
+ linklib=$newlib
+ fi # test -n "$old_archive_from_expsyms_cmds"
+
+ if test "$linkmode" = prog || test "$mode" != relink; then
+ add_shlibpath=
+ add_dir=
+ add=
+ lib_linked=yes
+ case $hardcode_action in
+ immediate | unsupported)
+ if test "$hardcode_direct" = no; then
+ add="$dir/$linklib"
+ case $host in
+ *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;;
+ *-*-sysv4*uw2*) add_dir="-L$dir" ;;
+ *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \
+ *-*-unixware7*) add_dir="-L$dir" ;;
+ *-*-darwin* )
+ # if the lib is a (non-dlopened) module then we can not
+ # link against it, someone is ignoring the earlier warnings
+ if /usr/bin/file -L $add 2> /dev/null |
+ $GREP ": [^:]* bundle" >/dev/null ; then
+ if test "X$dlopenmodule" != "X$lib"; then
+ $ECHO "*** Warning: lib $linklib is a module, not a shared library"
+ if test -z "$old_library" ; then
+ $ECHO
+ $ECHO "*** And there doesn't seem to be a static archive available"
+ $ECHO "*** The link will probably fail, sorry"
+ else
+ add="$dir/$old_library"
+ fi
+ elif test -n "$old_library"; then
+ add="$dir/$old_library"
+ fi
+ fi
+ esac
+ elif test "$hardcode_minus_L" = no; then
+ case $host in
+ *-*-sunos*) add_shlibpath="$dir" ;;
+ esac
+ add_dir="-L$dir"
+ add="-l$name"
+ elif test "$hardcode_shlibpath_var" = no; then
+ add_shlibpath="$dir"
+ add="-l$name"
+ else
+ lib_linked=no
+ fi
+ ;;
+ relink)
+ if test "$hardcode_direct" = yes &&
+ test "$hardcode_direct_absolute" = no; then
+ add="$dir/$linklib"
+ elif test "$hardcode_minus_L" = yes; then
+ add_dir="-L$dir"
+ # Try looking first in the location we're being installed to.
+ if test -n "$inst_prefix_dir"; then
+ case $libdir in
+ [\\/]*)
+ add_dir="$add_dir -L$inst_prefix_dir$libdir"
+ ;;
+ esac
+ fi
+ add="-l$name"
+ elif test "$hardcode_shlibpath_var" = yes; then
+ add_shlibpath="$dir"
+ add="-l$name"
+ else
+ lib_linked=no
+ fi
+ ;;
+ *) lib_linked=no ;;
+ esac
+
+ if test "$lib_linked" != yes; then
+ func_fatal_configuration "unsupported hardcode properties"
+ fi
+
+ if test -n "$add_shlibpath"; then
+ case :$compile_shlibpath: in
+ *":$add_shlibpath:"*) ;;
+ *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
+ esac
+ fi
+ if test "$linkmode" = prog; then
+ test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
+ test -n "$add" && compile_deplibs="$add $compile_deplibs"
+ else
+ test -n "$add_dir" && deplibs="$add_dir $deplibs"
+ test -n "$add" && deplibs="$add $deplibs"
+ if test "$hardcode_direct" != yes &&
+ test "$hardcode_minus_L" != yes &&
+ test "$hardcode_shlibpath_var" = yes; then
+ case :$finalize_shlibpath: in
+ *":$libdir:"*) ;;
+ *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
+ esac
+ fi
+ fi
+ fi
+
+ if test "$linkmode" = prog || test "$mode" = relink; then
+ add_shlibpath=
+ add_dir=
+ add=
+ # Finalize command for both is simple: just hardcode it.
+ if test "$hardcode_direct" = yes &&
+ test "$hardcode_direct_absolute" = no; then
+ add="$libdir/$linklib"
+ elif test "$hardcode_minus_L" = yes; then
+ add_dir="-L$libdir"
+ add="-l$name"
+ elif test "$hardcode_shlibpath_var" = yes; then
+ case :$finalize_shlibpath: in
+ *":$libdir:"*) ;;
+ *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
+ esac
+ add="-l$name"
+ elif test "$hardcode_automatic" = yes; then
+ if test -n "$inst_prefix_dir" &&
+ test -f "$inst_prefix_dir$libdir/$linklib" ; then
+ add="$inst_prefix_dir$libdir/$linklib"
+ else
+ add="$libdir/$linklib"
+ fi
+ else
+ # We cannot seem to hardcode it, guess we'll fake it.
+ add_dir="-L$libdir"
+ # Try looking first in the location we're being installed to.
+ if test -n "$inst_prefix_dir"; then
+ case $libdir in
+ [\\/]*)
+ add_dir="$add_dir -L$inst_prefix_dir$libdir"
+ ;;
+ esac
+ fi
+ add="-l$name"
+ fi
+
+ if test "$linkmode" = prog; then
+ test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
+ test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
+ else
+ test -n "$add_dir" && deplibs="$add_dir $deplibs"
+ test -n "$add" && deplibs="$add $deplibs"
+ fi
+ fi
+ elif test "$linkmode" = prog; then
+ # Here we assume that one of hardcode_direct or hardcode_minus_L
+ # is not unsupported. This is valid on all known static and
+ # shared platforms.
+ if test "$hardcode_direct" != unsupported; then
+ test -n "$old_library" && linklib="$old_library"
+ compile_deplibs="$dir/$linklib $compile_deplibs"
+ finalize_deplibs="$dir/$linklib $finalize_deplibs"
+ else
+ compile_deplibs="-l$name -L$dir $compile_deplibs"
+ finalize_deplibs="-l$name -L$dir $finalize_deplibs"
+ fi
+ elif test "$build_libtool_libs" = yes; then
+ # Not a shared library
+ if test "$deplibs_check_method" != pass_all; then
+ # We're trying link a shared library against a static one
+ # but the system doesn't support it.
+
+ # Just print a warning and add the library to dependency_libs so
+ # that the program can be linked against the static library.
+ $ECHO
+ $ECHO "*** Warning: This system can not link to static lib archive $lib."
+ $ECHO "*** I have the capability to make that library automatically link in when"
+ $ECHO "*** you link to this library. But I can only do this if you have a"
+ $ECHO "*** shared version of the library, which you do not appear to have."
+ if test "$module" = yes; then
+ $ECHO "*** But as you try to build a module library, libtool will still create "
+ $ECHO "*** a static module, that should work as long as the dlopening application"
+ $ECHO "*** is linked with the -dlopen flag to resolve symbols at runtime."
+ if test -z "$global_symbol_pipe"; then
+ $ECHO
+ $ECHO "*** However, this would only work if libtool was able to extract symbol"
+ $ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could"
+ $ECHO "*** not find such a program. So, this module is probably useless."
+ $ECHO "*** \`nm' from GNU binutils and a full rebuild may help."
+ fi
+ if test "$build_old_libs" = no; then
+ build_libtool_libs=module
+ build_old_libs=yes
+ else
+ build_libtool_libs=no
+ fi
+ fi
+ else
+ deplibs="$dir/$old_library $deplibs"
+ link_static=yes
+ fi
+ fi # link shared/static library?
+
+ if test "$linkmode" = lib; then
+ if test -n "$dependency_libs" &&
+ { test "$hardcode_into_libs" != yes ||
+ test "$build_old_libs" = yes ||
+ test "$link_static" = yes; }; then
+ # Extract -R from dependency_libs
+ temp_deplibs=
+ for libdir in $dependency_libs; do
+ case $libdir in
+ -R*) func_stripname '-R' '' "$libdir"
+ temp_xrpath=$func_stripname_result
+ case " $xrpath " in
+ *" $temp_xrpath "*) ;;
+ *) xrpath="$xrpath $temp_xrpath";;
+ esac;;
+ *) temp_deplibs="$temp_deplibs $libdir";;
+ esac
+ done
+ dependency_libs="$temp_deplibs"
+ fi
+
+ newlib_search_path="$newlib_search_path $absdir"
+ # Link against this library
+ test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
+ # ... and its dependency_libs
+ tmp_libs=
+ for deplib in $dependency_libs; do
+ newdependency_libs="$deplib $newdependency_libs"
+ if $opt_duplicate_deps ; then
+ case "$tmp_libs " in
+ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+ esac
+ fi
+ tmp_libs="$tmp_libs $deplib"
+ done
+
+ if test "$link_all_deplibs" != no; then
+ # Add the search paths of all dependency libraries
+ for deplib in $dependency_libs; do
+ case $deplib in
+ -L*) path="$deplib" ;;
+ *.la)
+ func_dirname "$deplib" "" "."
+ dir="$func_dirname_result"
+ # We need an absolute path.
+ case $dir in
+ [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
+ *)
+ absdir=`cd "$dir" && pwd`
+ if test -z "$absdir"; then
+ func_warning "cannot determine absolute directory name of \`$dir'"
+ absdir="$dir"
+ fi
+ ;;
+ esac
+ if $GREP "^installed=no" $deplib > /dev/null; then
+ case $host in
+ *-*-darwin*)
+ depdepl=
+ eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
+ if test -n "$deplibrary_names" ; then
+ for tmp in $deplibrary_names ; do
+ depdepl=$tmp
+ done
+ if test -f "$absdir/$objdir/$depdepl" ; then
+ depdepl="$absdir/$objdir/$depdepl"
+ darwin_install_name=`${OTOOL} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
+ if test -z "$darwin_install_name"; then
+ darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
+ fi
+ compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
+ linker_flags="$linker_flags -dylib_file ${darwin_install_name}:${depdepl}"
+ path=
+ fi
+ fi
+ ;;
+ *)
+ path="-L$absdir/$objdir"
+ ;;
+ esac
+ else
+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+ test -z "$libdir" && \
+ func_fatal_error "\`$deplib' is not a valid libtool archive"
+ test "$absdir" != "$libdir" && \
+ func_warning "\`$deplib' seems to be moved"
+
+ path="-L$absdir"
+ fi
+ ;;
+ esac
+ case " $deplibs " in
+ *" $path "*) ;;
+ *) deplibs="$path $deplibs" ;;
+ esac
+ done
+ fi # link_all_deplibs != no
+ fi # linkmode = lib
+ done # for deplib in $libs
+ if test "$pass" = link; then
+ if test "$linkmode" = "prog"; then
+ compile_deplibs="$new_inherited_linker_flags $compile_deplibs"
+ finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs"
+ else
+ compiler_flags="$compiler_flags "`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+ fi
+ fi
+ dependency_libs="$newdependency_libs"
+ if test "$pass" = dlpreopen; then
+ # Link the dlpreopened libraries before other libraries
+ for deplib in $save_deplibs; do
+ deplibs="$deplib $deplibs"
+ done
+ fi
+ if test "$pass" != dlopen; then
+ if test "$pass" != conv; then
+ # Make sure lib_search_path contains only unique directories.
+ lib_search_path=
+ for dir in $newlib_search_path; do
+ case "$lib_search_path " in
+ *" $dir "*) ;;
+ *) lib_search_path="$lib_search_path $dir" ;;
+ esac
+ done
+ newlib_search_path=
+ fi
+
+ if test "$linkmode,$pass" != "prog,link"; then
+ vars="deplibs"
+ else
+ vars="compile_deplibs finalize_deplibs"
+ fi
+ for var in $vars dependency_libs; do
+ # Add libraries to $var in reverse order
+ eval tmp_libs=\"\$$var\"
+ new_libs=
+ for deplib in $tmp_libs; do
+ # FIXME: Pedantically, this is the right thing to do, so
+ # that some nasty dependency loop isn't accidentally
+ # broken:
+ #new_libs="$deplib $new_libs"
+ # Pragmatically, this seems to cause very few problems in
+ # practice:
+ case $deplib in
+ -L*) new_libs="$deplib $new_libs" ;;
+ -R*) ;;
+ *)
+ # And here is the reason: when a library appears more
+ # than once as an explicit dependence of a library, or
+ # is implicitly linked in more than once by the
+ # compiler, it is considered special, and multiple
+ # occurrences thereof are not removed. Compare this
+ # with having the same library being listed as a
+ # dependency of multiple other libraries: in this case,
+ # we know (pedantically, we assume) the library does not
+ # need to be listed more than once, so we keep only the
+ # last copy. This is not always right, but it is rare
+ # enough that we require users that really mean to play
+ # such unportable linking tricks to link the library
+ # using -Wl,-lname, so that libtool does not consider it
+ # for duplicate removal.
+ case " $specialdeplibs " in
+ *" $deplib "*) new_libs="$deplib $new_libs" ;;
+ *)
+ case " $new_libs " in
+ *" $deplib "*) ;;
+ *) new_libs="$deplib $new_libs" ;;
+ esac
+ ;;
+ esac
+ ;;
+ esac
+ done
+ tmp_libs=
+ for deplib in $new_libs; do
+ case $deplib in
+ -L*)
+ case " $tmp_libs " in
+ *" $deplib "*) ;;
+ *) tmp_libs="$tmp_libs $deplib" ;;
+ esac
+ ;;
+ *) tmp_libs="$tmp_libs $deplib" ;;
+ esac
+ done
+ eval $var=\"$tmp_libs\"
+ done # for var
+ fi
+ # Last step: remove runtime libs from dependency_libs
+ # (they stay in deplibs)
+ tmp_libs=
+ for i in $dependency_libs ; do
+ case " $predeps $postdeps $compiler_lib_search_path " in
+ *" $i "*)
+ i=""
+ ;;
+ esac
+ if test -n "$i" ; then
+ tmp_libs="$tmp_libs $i"
+ fi
+ done
+ dependency_libs=$tmp_libs
+ done # for pass
+ if test "$linkmode" = prog; then
+ dlfiles="$newdlfiles"
+ fi
+ if test "$linkmode" = prog || test "$linkmode" = lib; then
+ dlprefiles="$newdlprefiles"
+ fi
+
+ case $linkmode in
+ oldlib)
+ if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+ func_warning "\`-dlopen' is ignored for archives"
+ fi
+
+ case " $deplibs" in
+ *\ -l* | *\ -L*)
+ func_warning "\`-l' and \`-L' are ignored for archives" ;;
+ esac
+
+ test -n "$rpath" && \
+ func_warning "\`-rpath' is ignored for archives"
+
+ test -n "$xrpath" && \
+ func_warning "\`-R' is ignored for archives"
+
+ test -n "$vinfo" && \
+ func_warning "\`-version-info/-version-number' is ignored for archives"
+
+ test -n "$release" && \
+ func_warning "\`-release' is ignored for archives"
+
+ test -n "$export_symbols$export_symbols_regex" && \
+ func_warning "\`-export-symbols' is ignored for archives"
+
+ # Now set the variables for building old libraries.
+ build_libtool_libs=no
+ oldlibs="$output"
+ objs="$objs$old_deplibs"
+ ;;
+
+ lib)
+ # Make sure we only generate libraries of the form `libNAME.la'.
+ case $outputname in
+ lib*)
+ func_stripname 'lib' '.la' "$outputname"
+ name=$func_stripname_result
+ eval shared_ext=\"$shrext_cmds\"
+ eval libname=\"$libname_spec\"
+ ;;
+ *)
+ test "$module" = no && \
+ func_fatal_help "libtool library \`$output' must begin with \`lib'"
+
+ if test "$need_lib_prefix" != no; then
+ # Add the "lib" prefix for modules if required
+ func_stripname '' '.la' "$outputname"
+ name=$func_stripname_result
+ eval shared_ext=\"$shrext_cmds\"
+ eval libname=\"$libname_spec\"
+ else
+ func_stripname '' '.la' "$outputname"
+ libname=$func_stripname_result
+ fi
+ ;;
+ esac
+
+ if test -n "$objs"; then
+ if test "$deplibs_check_method" != pass_all; then
+ func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs"
+ else
+ $ECHO
+ $ECHO "*** Warning: Linking the shared library $output against the non-libtool"
+ $ECHO "*** objects $objs is not portable!"
+ libobjs="$libobjs $objs"
+ fi
+ fi
+
+ test "$dlself" != no && \
+ func_warning "\`-dlopen self' is ignored for libtool libraries"
+
+ set dummy $rpath
+ shift
+ test "$#" -gt 1 && \
+ func_warning "ignoring multiple \`-rpath's for a libtool library"
+
+ install_libdir="$1"
+
+ oldlibs=
+ if test -z "$rpath"; then
+ if test "$build_libtool_libs" = yes; then
+ # Building a libtool convenience library.
+ # Some compilers have problems with a `.al' extension so
+ # convenience libraries should have the same extension an
+ # archive normally would.
+ oldlibs="$output_objdir/$libname.$libext $oldlibs"
+ build_libtool_libs=convenience
+ build_old_libs=yes
+ fi
+
+ test -n "$vinfo" && \
+ func_warning "\`-version-info/-version-number' is ignored for convenience libraries"
+
+ test -n "$release" && \
+ func_warning "\`-release' is ignored for convenience libraries"
+ else
+
+ # Parse the version information argument.
+ save_ifs="$IFS"; IFS=':'
+ set dummy $vinfo 0 0 0
+ shift
+ IFS="$save_ifs"
+
+ test -n "$7" && \
+ func_fatal_help "too many parameters to \`-version-info'"
+
+ # convert absolute version numbers to libtool ages
+ # this retains compatibility with .la files and attempts
+ # to make the code below a bit more comprehensible
+
+ case $vinfo_number in
+ yes)
+ number_major="$1"
+ number_minor="$2"
+ number_revision="$3"
+ #
+ # There are really only two kinds -- those that
+ # use the current revision as the major version
+ # and those that subtract age and use age as
+ # a minor version. But, then there is irix
+ # which has an extra 1 added just for fun
+ #
+ case $version_type in
+ darwin|linux|osf|windows|none)
+ func_arith $number_major + $number_minor
+ current=$func_arith_result
+ age="$number_minor"
+ revision="$number_revision"
+ ;;
+ freebsd-aout|freebsd-elf|sunos)
+ current="$number_major"
+ revision="$number_minor"
+ age="0"
+ ;;
+ irix|nonstopux)
+ func_arith $number_major + $number_minor
+ current=$func_arith_result
+ age="$number_minor"
+ revision="$number_minor"
+ lt_irix_increment=no
+ ;;
+ esac
+ ;;
+ no)
+ current="$1"
+ revision="$2"
+ age="$3"
+ ;;
+ esac
+
+ # Check that each of the things are valid numbers.
+ case $current in
+ 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+ *)
+ func_error "CURRENT \`$current' must be a nonnegative integer"
+ func_fatal_error "\`$vinfo' is not valid version information"
+ ;;
+ esac
+
+ case $revision in
+ 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+ *)
+ func_error "REVISION \`$revision' must be a nonnegative integer"
+ func_fatal_error "\`$vinfo' is not valid version information"
+ ;;
+ esac
+
+ case $age in
+ 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+ *)
+ func_error "AGE \`$age' must be a nonnegative integer"
+ func_fatal_error "\`$vinfo' is not valid version information"
+ ;;
+ esac
+
+ if test "$age" -gt "$current"; then
+ func_error "AGE \`$age' is greater than the current interface number \`$current'"
+ func_fatal_error "\`$vinfo' is not valid version information"
+ fi
+
+ # Calculate the version variables.
+ major=
+ versuffix=
+ verstring=
+ case $version_type in
+ none) ;;
+
+ darwin)
+ # Like Linux, but with the current version available in
+ # verstring for coding it into the library header
+ func_arith $current - $age
+ major=.$func_arith_result
+ versuffix="$major.$age.$revision"
+ # Darwin ld doesn't like 0 for these options...
+ func_arith $current + 1
+ minor_current=$func_arith_result
+ xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
+ verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
+ ;;
+
+ freebsd-aout)
+ major=".$current"
+ versuffix=".$current.$revision";
+ ;;
+
+ freebsd-elf)
+ major=".$current"
+ versuffix=".$current"
+ ;;
+
+ irix | nonstopux)
+ if test "X$lt_irix_increment" = "Xno"; then
+ func_arith $current - $age
+ else
+ func_arith $current - $age + 1
+ fi
+ major=$func_arith_result
+
+ case $version_type in
+ nonstopux) verstring_prefix=nonstopux ;;
+ *) verstring_prefix=sgi ;;
+ esac
+ verstring="$verstring_prefix$major.$revision"
+
+ # Add in all the interfaces that we are compatible with.
+ loop=$revision
+ while test "$loop" -ne 0; do
+ func_arith $revision - $loop
+ iface=$func_arith_result
+ func_arith $loop - 1
+ loop=$func_arith_result
+ verstring="$verstring_prefix$major.$iface:$verstring"
+ done
+
+ # Before this point, $major must not contain `.'.
+ major=.$major
+ versuffix="$major.$revision"
+ ;;
+
+ linux)
+ func_arith $current - $age
+ major=.$func_arith_result
+ versuffix="$major.$age.$revision"
+ ;;
+
+ osf)
+ func_arith $current - $age
+ major=.$func_arith_result
+ versuffix=".$current.$age.$revision"
+ verstring="$current.$age.$revision"
+
+ # Add in all the interfaces that we are compatible with.
+ loop=$age
+ while test "$loop" -ne 0; do
+ func_arith $current - $loop
+ iface=$func_arith_result
+ func_arith $loop - 1
+ loop=$func_arith_result
+ verstring="$verstring:${iface}.0"
+ done
+
+ # Make executables depend on our current version.
+ verstring="$verstring:${current}.0"
+ ;;
+
+ qnx)
+ major=".$current"
+ versuffix=".$current"
+ ;;
+
+ sunos)
+ major=".$current"
+ versuffix=".$current.$revision"
+ ;;
+
+ windows)
+ # Use '-' rather than '.', since we only want one
+ # extension on DOS 8.3 filesystems.
+ func_arith $current - $age
+ major=$func_arith_result
+ versuffix="-$major"
+ ;;
+
+ *)
+ func_fatal_configuration "unknown library version type \`$version_type'"
+ ;;
+ esac
+
+ # Clear the version info if we defaulted, and they specified a release.
+ if test -z "$vinfo" && test -n "$release"; then
+ major=
+ case $version_type in
+ darwin)
+ # we can't check for "0.0" in archive_cmds due to quoting
+ # problems, so we reset it completely
+ verstring=
+ ;;
+ *)
+ verstring="0.0"
+ ;;
+ esac
+ if test "$need_version" = no; then
+ versuffix=
+ else
+ versuffix=".0.0"
+ fi
+ fi
+
+ # Remove version info from name if versioning should be avoided
+ if test "$avoid_version" = yes && test "$need_version" = no; then
+ major=
+ versuffix=
+ verstring=""
+ fi
+
+ # Check to see if the archive will have undefined symbols.
+ if test "$allow_undefined" = yes; then
+ if test "$allow_undefined_flag" = unsupported; then
+ func_warning "undefined symbols not allowed in $host shared libraries"
+ build_libtool_libs=no
+ build_old_libs=yes
+ fi
+ else
+ # Don't allow undefined symbols.
+ allow_undefined_flag="$no_undefined_flag"
+ fi
+
+ fi
+
+ func_generate_dlsyms "$libname" "$libname" "yes"
+ libobjs="$libobjs $symfileobj"
+ test "X$libobjs" = "X " && libobjs=
+
+ if test "$mode" != relink; then
+ # Remove our outputs, but don't remove object files since they
+ # may have been created when compiling PIC objects.
+ removelist=
+ tempremovelist=`$ECHO "$output_objdir/*"`
+ for p in $tempremovelist; do
+ case $p in
+ *.$objext | *.gcno)
+ ;;
+ $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
+ if test "X$precious_files_regex" != "X"; then
+ if $ECHO "$p" | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
+ then
+ continue
+ fi
+ fi
+ removelist="$removelist $p"
+ ;;
+ *) ;;
+ esac
+ done
+ test -n "$removelist" && \
+ func_show_eval "${RM}r \$removelist"
+ fi
+
+ # Now set the variables for building old libraries.
+ if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
+ oldlibs="$oldlibs $output_objdir/$libname.$libext"
+
+ # Transform .lo files to .o files.
+ oldobjs="$objs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`
+ fi
+
+ # Eliminate all temporary directories.
+ #for path in $notinst_path; do
+ # lib_search_path=`$ECHO "X$lib_search_path " | $Xsed -e "s% $path % %g"`
+ # deplibs=`$ECHO "X$deplibs " | $Xsed -e "s% -L$path % %g"`
+ # dependency_libs=`$ECHO "X$dependency_libs " | $Xsed -e "s% -L$path % %g"`
+ #done
+
+ if test -n "$xrpath"; then
+ # If the user specified any rpath flags, then add them.
+ temp_xrpath=
+ for libdir in $xrpath; do
+ temp_xrpath="$temp_xrpath -R$libdir"
+ case "$finalize_rpath " in
+ *" $libdir "*) ;;
+ *) finalize_rpath="$finalize_rpath $libdir" ;;
+ esac
+ done
+ if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
+ dependency_libs="$temp_xrpath $dependency_libs"
+ fi
+ fi
+
+ # Make sure dlfiles contains only unique files that won't be dlpreopened
+ old_dlfiles="$dlfiles"
+ dlfiles=
+ for lib in $old_dlfiles; do
+ case " $dlprefiles $dlfiles " in
+ *" $lib "*) ;;
+ *) dlfiles="$dlfiles $lib" ;;
+ esac
+ done
+
+ # Make sure dlprefiles contains only unique files
+ old_dlprefiles="$dlprefiles"
+ dlprefiles=
+ for lib in $old_dlprefiles; do
+ case "$dlprefiles " in
+ *" $lib "*) ;;
+ *) dlprefiles="$dlprefiles $lib" ;;
+ esac
+ done
+
+ if test "$build_libtool_libs" = yes; then
+ if test -n "$rpath"; then
+ case $host in
+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc*)
+ # these systems don't actually have a c library (as such)!
+ ;;
+ *-*-rhapsody* | *-*-darwin1.[012])
+ # Rhapsody C library is in the System framework
+ deplibs="$deplibs System.ltframework"
+ ;;
+ *-*-netbsd*)
+ # Don't link with libc until the a.out ld.so is fixed.
+ ;;
+ *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+ # Do not include libc due to us having libc/libc_r.
+ ;;
+ *-*-sco3.2v5* | *-*-sco5v6*)
+ # Causes problems with __ctype
+ ;;
+ *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
+ # Compiler inserts libc in the correct place for threads to work
+ ;;
+ *)
+ # Add libc to deplibs on all other systems if necessary.
+ if test "$build_libtool_need_lc" = "yes"; then
+ deplibs="$deplibs -lc"
+ fi
+ ;;
+ esac
+ fi
+
+ # Transform deplibs into only deplibs that can be linked in shared.
+ name_save=$name
+ libname_save=$libname
+ release_save=$release
+ versuffix_save=$versuffix
+ major_save=$major
+ # I'm not sure if I'm treating the release correctly. I think
+ # release should show up in the -l (ie -lgmp5) so we don't want to
+ # add it in twice. Is that correct?
+ release=""
+ versuffix=""
+ major=""
+ newdeplibs=
+ droppeddeps=no
+ case $deplibs_check_method in
+ pass_all)
+ # Don't check for shared/static. Everything works.
+ # This might be a little naive. We might want to check
+ # whether the library exists or not. But this is on
+ # osf3 & osf4 and I'm not really sure... Just
+ # implementing what was already the behavior.
+ newdeplibs=$deplibs
+ ;;
+ test_compile)
+ # This code stresses the "libraries are programs" paradigm to its
+ # limits. Maybe even breaks it. We compile a program, linking it
+ # against the deplibs as a proxy for the library. Then we can check
+ # whether they linked in statically or dynamically with ldd.
+ $opt_dry_run || $RM conftest.c
+ cat > conftest.c <<EOF
+ int main() { return 0; }
+EOF
+ $opt_dry_run || $RM conftest
+ if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
+ ldd_output=`ldd conftest`
+ for i in $deplibs; do
+ case $i in
+ -l*)
+ func_stripname -l '' "$i"
+ name=$func_stripname_result
+ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+ case " $predeps $postdeps " in
+ *" $i "*)
+ newdeplibs="$newdeplibs $i"
+ i=""
+ ;;
+ esac
+ fi
+ if test -n "$i" ; then
+ libname=`eval "\\$ECHO \"$libname_spec\""`
+ deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
+ set dummy $deplib_matches; shift
+ deplib_match=$1
+ if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
+ newdeplibs="$newdeplibs $i"
+ else
+ droppeddeps=yes
+ $ECHO
+ $ECHO "*** Warning: dynamic linker does not accept needed library $i."
+ $ECHO "*** I have the capability to make that library automatically link in when"
+ $ECHO "*** you link to this library. But I can only do this if you have a"
+ $ECHO "*** shared version of the library, which I believe you do not have"
+ $ECHO "*** because a test_compile did reveal that the linker did not use it for"
+ $ECHO "*** its dynamic dependency list that programs get resolved with at runtime."
+ fi
+ fi
+ ;;
+ *)
+ newdeplibs="$newdeplibs $i"
+ ;;
+ esac
+ done
+ else
+ # Error occurred in the first compile. Let's try to salvage
+ # the situation: Compile a separate program for each library.
+ for i in $deplibs; do
+ case $i in
+ -l*)
+ func_stripname -l '' "$i"
+ name=$func_stripname_result
+ $opt_dry_run || $RM conftest
+ if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
+ ldd_output=`ldd conftest`
+ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+ case " $predeps $postdeps " in
+ *" $i "*)
+ newdeplibs="$newdeplibs $i"
+ i=""
+ ;;
+ esac
+ fi
+ if test -n "$i" ; then
+ libname=`eval "\\$ECHO \"$libname_spec\""`
+ deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
+ set dummy $deplib_matches; shift
+ deplib_match=$1
+ if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
+ newdeplibs="$newdeplibs $i"
+ else
+ droppeddeps=yes
+ $ECHO
+ $ECHO "*** Warning: dynamic linker does not accept needed library $i."
+ $ECHO "*** I have the capability to make that library automatically link in when"
+ $ECHO "*** you link to this library. But I can only do this if you have a"
+ $ECHO "*** shared version of the library, which you do not appear to have"
+ $ECHO "*** because a test_compile did reveal that the linker did not use this one"
+ $ECHO "*** as a dynamic dependency that programs can get resolved with at runtime."
+ fi
+ fi
+ else
+ droppeddeps=yes
+ $ECHO
+ $ECHO "*** Warning! Library $i is needed by this library but I was not able to"
+ $ECHO "*** make it link in! You will probably need to install it or some"
+ $ECHO "*** library that it depends on before this library will be fully"
+ $ECHO "*** functional. Installing it before continuing would be even better."
+ fi
+ ;;
+ *)
+ newdeplibs="$newdeplibs $i"
+ ;;
+ esac
+ done
+ fi
+ ;;
+ file_magic*)
+ set dummy $deplibs_check_method; shift
+ file_magic_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
+ for a_deplib in $deplibs; do
+ case $a_deplib in
+ -l*)
+ func_stripname -l '' "$a_deplib"
+ name=$func_stripname_result
+ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+ case " $predeps $postdeps " in
+ *" $a_deplib "*)
+ newdeplibs="$newdeplibs $a_deplib"
+ a_deplib=""
+ ;;
+ esac
+ fi
+ if test -n "$a_deplib" ; then
+ libname=`eval "\\$ECHO \"$libname_spec\""`
+ for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
+ potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
+ for potent_lib in $potential_libs; do
+ # Follow soft links.
+ if ls -lLd "$potent_lib" 2>/dev/null |
+ $GREP " -> " >/dev/null; then
+ continue
+ fi
+ # The statement above tries to avoid entering an
+ # endless loop below, in case of cyclic links.
+ # We might still enter an endless loop, since a link
+ # loop can be closed while we follow links,
+ # but so what?
+ potlib="$potent_lib"
+ while test -h "$potlib" 2>/dev/null; do
+ potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
+ case $potliblink in
+ [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
+ *) potlib=`$ECHO "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
+ esac
+ done
+ if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |
+ $SED -e 10q |
+ $EGREP "$file_magic_regex" > /dev/null; then
+ newdeplibs="$newdeplibs $a_deplib"
+ a_deplib=""
+ break 2
+ fi
+ done
+ done
+ fi
+ if test -n "$a_deplib" ; then
+ droppeddeps=yes
+ $ECHO
+ $ECHO "*** Warning: linker path does not have real file for library $a_deplib."
+ $ECHO "*** I have the capability to make that library automatically link in when"
+ $ECHO "*** you link to this library. But I can only do this if you have a"
+ $ECHO "*** shared version of the library, which you do not appear to have"
+ $ECHO "*** because I did check the linker path looking for a file starting"
+ if test -z "$potlib" ; then
+ $ECHO "*** with $libname but no candidates were found. (...for file magic test)"
+ else
+ $ECHO "*** with $libname and none of the candidates passed a file format test"
+ $ECHO "*** using a file magic. Last file checked: $potlib"
+ fi
+ fi
+ ;;
+ *)
+ # Add a -L argument.
+ newdeplibs="$newdeplibs $a_deplib"
+ ;;
+ esac
+ done # Gone through all deplibs.
+ ;;
+ match_pattern*)
+ set dummy $deplibs_check_method; shift
+ match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
+ for a_deplib in $deplibs; do
+ case $a_deplib in
+ -l*)
+ func_stripname -l '' "$a_deplib"
+ name=$func_stripname_result
+ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+ case " $predeps $postdeps " in
+ *" $a_deplib "*)
+ newdeplibs="$newdeplibs $a_deplib"
+ a_deplib=""
+ ;;
+ esac
+ fi
+ if test -n "$a_deplib" ; then
+ libname=`eval "\\$ECHO \"$libname_spec\""`
+ for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
+ potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
+ for potent_lib in $potential_libs; do
+ potlib="$potent_lib" # see symlink-check above in file_magic test
+ if eval "\$ECHO \"X$potent_lib\"" 2>/dev/null | $Xsed -e 10q | \
+ $EGREP "$match_pattern_regex" > /dev/null; then
+ newdeplibs="$newdeplibs $a_deplib"
+ a_deplib=""
+ break 2
+ fi
+ done
+ done
+ fi
+ if test -n "$a_deplib" ; then
+ droppeddeps=yes
+ $ECHO
+ $ECHO "*** Warning: linker path does not have real file for library $a_deplib."
+ $ECHO "*** I have the capability to make that library automatically link in when"
+ $ECHO "*** you link to this library. But I can only do this if you have a"
+ $ECHO "*** shared version of the library, which you do not appear to have"
+ $ECHO "*** because I did check the linker path looking for a file starting"
+ if test -z "$potlib" ; then
+ $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)"
+ else
+ $ECHO "*** with $libname and none of the candidates passed a file format test"
+ $ECHO "*** using a regex pattern. Last file checked: $potlib"
+ fi
+ fi
+ ;;
+ *)
+ # Add a -L argument.
+ newdeplibs="$newdeplibs $a_deplib"
+ ;;
+ esac
+ done # Gone through all deplibs.
+ ;;
+ none | unknown | *)
+ newdeplibs=""
+ tmp_deplibs=`$ECHO "X $deplibs" | $Xsed \
+ -e 's/ -lc$//' -e 's/ -[LR][^ ]*//g'`
+ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+ for i in $predeps $postdeps ; do
+ # can't use Xsed below, because $i might contain '/'
+ tmp_deplibs=`$ECHO "X $tmp_deplibs" | $Xsed -e "s,$i,,"`
+ done
+ fi
+ if $ECHO "X $tmp_deplibs" | $Xsed -e 's/[ ]//g' |
+ $GREP . >/dev/null; then
+ $ECHO
+ if test "X$deplibs_check_method" = "Xnone"; then
+ $ECHO "*** Warning: inter-library dependencies are not supported in this platform."
+ else
+ $ECHO "*** Warning: inter-library dependencies are not known to be supported."
+ fi
+ $ECHO "*** All declared inter-library dependencies are being dropped."
+ droppeddeps=yes
+ fi
+ ;;
+ esac
+ versuffix=$versuffix_save
+ major=$major_save
+ release=$release_save
+ libname=$libname_save
+ name=$name_save
+
+ case $host in
+ *-*-rhapsody* | *-*-darwin1.[012])
+ # On Rhapsody replace the C library with the System framework
+ newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
+ ;;
+ esac
+
+ if test "$droppeddeps" = yes; then
+ if test "$module" = yes; then
+ $ECHO
+ $ECHO "*** Warning: libtool could not satisfy all declared inter-library"
+ $ECHO "*** dependencies of module $libname. Therefore, libtool will create"
+ $ECHO "*** a static module, that should work as long as the dlopening"
+ $ECHO "*** application is linked with the -dlopen flag."
+ if test -z "$global_symbol_pipe"; then
+ $ECHO
+ $ECHO "*** However, this would only work if libtool was able to extract symbol"
+ $ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could"
+ $ECHO "*** not find such a program. So, this module is probably useless."
+ $ECHO "*** \`nm' from GNU binutils and a full rebuild may help."
+ fi
+ if test "$build_old_libs" = no; then
+ oldlibs="$output_objdir/$libname.$libext"
+ build_libtool_libs=module
+ build_old_libs=yes
+ else
+ build_libtool_libs=no
+ fi
+ else
+ $ECHO "*** The inter-library dependencies that have been dropped here will be"
+ $ECHO "*** automatically added whenever a program is linked with this library"
+ $ECHO "*** or is declared to -dlopen it."
+
+ if test "$allow_undefined" = no; then
+ $ECHO
+ $ECHO "*** Since this library must not contain undefined symbols,"
+ $ECHO "*** because either the platform does not support them or"
+ $ECHO "*** it was explicitly requested with -no-undefined,"
+ $ECHO "*** libtool will only create a static version of it."
+ if test "$build_old_libs" = no; then
+ oldlibs="$output_objdir/$libname.$libext"
+ build_libtool_libs=module
+ build_old_libs=yes
+ else
+ build_libtool_libs=no
+ fi
+ fi
+ fi
+ fi
+ # Done checking deplibs!
+ deplibs=$newdeplibs
+ fi
+ # Time to change all our "foo.ltframework" stuff back to "-framework foo"
+ case $host in
+ *-*-darwin*)
+ newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+ new_inherited_linker_flags=`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+ deplibs=`$ECHO "X $deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+ ;;
+ esac
+
+ # move library search paths that coincide with paths to not yet
+ # installed libraries to the beginning of the library search list
+ new_libs=
+ for path in $notinst_path; do
+ case " $new_libs " in
+ *" -L$path/$objdir "*) ;;
+ *)
+ case " $deplibs " in
+ *" -L$path/$objdir "*)
+ new_libs="$new_libs -L$path/$objdir" ;;
+ esac
+ ;;
+ esac
+ done
+ for deplib in $deplibs; do
+ case $deplib in
+ -L*)
+ case " $new_libs " in
+ *" $deplib "*) ;;
+ *) new_libs="$new_libs $deplib" ;;
+ esac
+ ;;
+ *) new_libs="$new_libs $deplib" ;;
+ esac
+ done
+ deplibs="$new_libs"
+
+ # All the library-specific variables (install_libdir is set above).
+ library_names=
+ old_library=
+ dlname=
+
+ # Test again, we may have decided not to build it any more
+ if test "$build_libtool_libs" = yes; then
+ if test "$hardcode_into_libs" = yes; then
+ # Hardcode the library paths
+ hardcode_libdirs=
+ dep_rpath=
+ rpath="$finalize_rpath"
+ test "$mode" != relink && rpath="$compile_rpath$rpath"
+ for libdir in $rpath; do
+ if test -n "$hardcode_libdir_flag_spec"; then
+ if test -n "$hardcode_libdir_separator"; then
+ if test -z "$hardcode_libdirs"; then
+ hardcode_libdirs="$libdir"
+ else
+ # Just accumulate the unique libdirs.
+ case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
+ *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
+ ;;
+ *)
+ hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
+ ;;
+ esac
+ fi
+ else
+ eval flag=\"$hardcode_libdir_flag_spec\"
+ dep_rpath="$dep_rpath $flag"
+ fi
+ elif test -n "$runpath_var"; then
+ case "$perm_rpath " in
+ *" $libdir "*) ;;
+ *) perm_rpath="$perm_rpath $libdir" ;;
+ esac
+ fi
+ done
+ # Substitute the hardcoded libdirs into the rpath.
+ if test -n "$hardcode_libdir_separator" &&
+ test -n "$hardcode_libdirs"; then
+ libdir="$hardcode_libdirs"
+ if test -n "$hardcode_libdir_flag_spec_ld"; then
+ eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
+ else
+ eval dep_rpath=\"$hardcode_libdir_flag_spec\"
+ fi
+ fi
+ if test -n "$runpath_var" && test -n "$perm_rpath"; then
+ # We should set the runpath_var.
+ rpath=
+ for dir in $perm_rpath; do
+ rpath="$rpath$dir:"
+ done
+ eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
+ fi
+ test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
+ fi
- # If there was a directory component, then change thisdir.
- if test \"x\$destdir\" != \"x\$file\"; then
- case \"\$destdir\" in
- [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;;
- *) thisdir=\"\$thisdir/\$destdir\" ;;
- esac
- fi
+ shlibpath="$finalize_shlibpath"
+ test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
+ if test -n "$shlibpath"; then
+ eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
+ fi
- file=\`\$echo \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
- file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`
- done
+ # Get the real and link names of the library.
+ eval shared_ext=\"$shrext_cmds\"
+ eval library_names=\"$library_names_spec\"
+ set dummy $library_names
+ shift
+ realname="$1"
+ shift
- # Try to get the absolute directory name.
- absdir=\`cd \"\$thisdir\" && pwd\`
- test -n \"\$absdir\" && thisdir=\"\$absdir\"
-"
+ if test -n "$soname_spec"; then
+ eval soname=\"$soname_spec\"
+ else
+ soname="$realname"
+ fi
+ if test -z "$dlname"; then
+ dlname=$soname
+ fi
- if test "$fast_install" = yes; then
- $echo >> $output "\
- program=lt-'$outputname'$exeext
- progdir=\"\$thisdir/$objdir\"
+ lib="$output_objdir/$realname"
+ linknames=
+ for link
+ do
+ linknames="$linknames $link"
+ done
- if test ! -f \"\$progdir/\$program\" || \\
- { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\
- test \"X\$file\" != \"X\$progdir/\$program\"; }; then
+ # Use standard objects if they are pic
+ test -z "$pic_flag" && libobjs=`$ECHO "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+ test "X$libobjs" = "X " && libobjs=
- file=\"\$\$-\$program\"
+ delfiles=
+ if test -n "$export_symbols" && test -n "$include_expsyms"; then
+ $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp"
+ export_symbols="$output_objdir/$libname.uexp"
+ delfiles="$delfiles $export_symbols"
+ fi
- if test ! -d \"\$progdir\"; then
- $mkdir \"\$progdir\"
- else
- $rm \"\$progdir/\$file\"
- fi"
+ orig_export_symbols=
+ case $host_os in
+ cygwin* | mingw* | cegcc*)
+ if test -n "$export_symbols" && test -z "$export_symbols_regex"; then
+ # exporting using user supplied symfile
+ if test "x`$SED 1q $export_symbols`" != xEXPORTS; then
+ # and it's NOT already a .def file. Must figure out
+ # which of the given symbols are data symbols and tag
+ # them as such. So, trigger use of export_symbols_cmds.
+ # export_symbols gets reassigned inside the "prepare
+ # the list of exported symbols" if statement, so the
+ # include_expsyms logic still works.
+ orig_export_symbols="$export_symbols"
+ export_symbols=
+ always_export_symbols=yes
+ fi
+ fi
+ ;;
+ esac
- $echo >> $output "\
+ # Prepare the list of exported symbols
+ if test -z "$export_symbols"; then
+ if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then
+ func_verbose "generating symbol list for \`$libname.la'"
+ export_symbols="$output_objdir/$libname.exp"
+ $opt_dry_run || $RM $export_symbols
+ cmds=$export_symbols_cmds
+ save_ifs="$IFS"; IFS='~'
+ for cmd in $cmds; do
+ IFS="$save_ifs"
+ eval cmd=\"$cmd\"
+ func_len " $cmd"
+ len=$func_len_result
+ if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+ func_show_eval "$cmd" 'exit $?'
+ skipped_export=false
+ else
+ # The command line is too long to execute in one step.
+ func_verbose "using reloadable object file for export list..."
+ skipped_export=:
+ # Break out early, otherwise skipped_export may be
+ # set to false by a later but shorter cmd.
+ break
+ fi
+ done
+ IFS="$save_ifs"
+ if test -n "$export_symbols_regex" && test "X$skipped_export" != "X:"; then
+ func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
+ func_show_eval '$MV "${export_symbols}T" "$export_symbols"'
+ fi
+ fi
+ fi
- # relink executable if necessary
- if test -n \"\$relink_command\"; then
- if relink_command_output=\`eval \$relink_command 2>&1\`; then :
- else
- $echo \"\$relink_command_output\" >&2
- $rm \"\$progdir/\$file\"
- exit $EXIT_FAILURE
- fi
- fi
+ if test -n "$export_symbols" && test -n "$include_expsyms"; then
+ tmp_export_symbols="$export_symbols"
+ test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
+ $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"'
+ fi
- $mv \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null ||
- { $rm \"\$progdir/\$program\";
- $mv \"\$progdir/\$file\" \"\$progdir/\$program\"; }
- $rm \"\$progdir/\$file\"
- fi"
- else
- $echo >> $output "\
- program='$outputname'
- progdir=\"\$thisdir/$objdir\"
-"
+ if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then
+ # The given exports_symbols file has to be filtered, so filter it.
+ func_verbose "filter symbol list for \`$libname.la' to tag DATA exports"
+ # FIXME: $output_objdir/$libname.filter potentially contains lots of
+ # 's' commands which not all seds can handle. GNU sed should be fine
+ # though. Also, the filter scales superlinearly with the number of
+ # global variables. join(1) would be nice here, but unfortunately
+ # isn't a blessed tool.
+ $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
+ delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
+ export_symbols=$output_objdir/$libname.def
+ $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
fi
- $echo >> $output "\
+ tmp_deplibs=
+ for test_deplib in $deplibs; do
+ case " $convenience " in
+ *" $test_deplib "*) ;;
+ *)
+ tmp_deplibs="$tmp_deplibs $test_deplib"
+ ;;
+ esac
+ done
+ deplibs="$tmp_deplibs"
- if test -f \"\$progdir/\$program\"; then"
+ if test -n "$convenience"; then
+ if test -n "$whole_archive_flag_spec" &&
+ test "$compiler_needs_object" = yes &&
+ test -z "$libobjs"; then
+ # extract the archives, so we have objects to list.
+ # TODO: could optimize this to just extract one archive.
+ whole_archive_flag_spec=
+ fi
+ if test -n "$whole_archive_flag_spec"; then
+ save_libobjs=$libobjs
+ eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
+ test "X$libobjs" = "X " && libobjs=
+ else
+ gentop="$output_objdir/${outputname}x"
+ generated="$generated $gentop"
- # Export our shlibpath_var if we have one.
- if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
- $echo >> $output "\
- # Add our own library path to $shlibpath_var
- $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
+ func_extract_archives $gentop $convenience
+ libobjs="$libobjs $func_extract_archives_result"
+ test "X$libobjs" = "X " && libobjs=
+ fi
+ fi
- # Some systems cannot cope with colon-terminated $shlibpath_var
- # The second colon is a workaround for a bug in BeOS R4 sed
- $shlibpath_var=\`\$echo \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\`
+ if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
+ eval flag=\"$thread_safe_flag_spec\"
+ linker_flags="$linker_flags $flag"
+ fi
- export $shlibpath_var
-"
+ # Make a backup of the uninstalled library when relinking
+ if test "$mode" = relink; then
+ $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $?
fi
- # fixup the dll searchpath if we need to.
- if test -n "$dllsearchpath"; then
- $echo >> $output "\
- # Add the dll search path components to the executable PATH
- PATH=$dllsearchpath:\$PATH
-"
+ # Do each of the archive commands.
+ if test "$module" = yes && test -n "$module_cmds" ; then
+ if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
+ eval test_cmds=\"$module_expsym_cmds\"
+ cmds=$module_expsym_cmds
+ else
+ eval test_cmds=\"$module_cmds\"
+ cmds=$module_cmds
+ fi
+ else
+ if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
+ eval test_cmds=\"$archive_expsym_cmds\"
+ cmds=$archive_expsym_cmds
+ else
+ eval test_cmds=\"$archive_cmds\"
+ cmds=$archive_cmds
+ fi
fi
- $echo >> $output "\
- if test \"\$libtool_execute_magic\" != \"$magic\"; then
- # Run the actual program with our arguments.
-"
- case $host in
- # Backslashes separate directories on plain windows
- *-*-mingw | *-*-os2*)
- $echo >> $output "\
- exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
-"
- ;;
+ if test "X$skipped_export" != "X:" &&
+ func_len " $test_cmds" &&
+ len=$func_len_result &&
+ test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+ :
+ else
+ # The command line is too long to link in one step, link piecewise
+ # or, if using GNU ld and skipped_export is not :, use a linker
+ # script.
- *)
- $echo >> $output "\
- exec \"\$progdir/\$program\" \${1+\"\$@\"}
-"
- ;;
- esac
- $echo >> $output "\
- \$echo \"\$0: cannot exec \$program \$*\"
- exit $EXIT_FAILURE
- fi
- else
- # The program doesn't exist.
- \$echo \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
- \$echo \"This script is just a wrapper for \$program.\" 1>&2
- $echo \"See the $PACKAGE documentation for more information.\" 1>&2
- exit $EXIT_FAILURE
- fi
-fi\
-"
- chmod +x $output
- fi
- exit $EXIT_SUCCESS
- ;;
- esac
+ # Save the value of $output and $libobjs because we want to
+ # use them later. If we have whole_archive_flag_spec, we
+ # want to use save_libobjs as it was before
+ # whole_archive_flag_spec was expanded, because we can't
+ # assume the linker understands whole_archive_flag_spec.
+ # This may have to be revisited, in case too many
+ # convenience libraries get linked in and end up exceeding
+ # the spec.
+ if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then
+ save_libobjs=$libobjs
+ fi
+ save_output=$output
+ output_la=`$ECHO "X$output" | $Xsed -e "$basename"`
- # See if we need to build an old-fashioned archive.
- for oldlib in $oldlibs; do
+ # Clear the reloadable object creation command queue and
+ # initialize k to one.
+ test_cmds=
+ concat_cmds=
+ objlist=
+ last_robj=
+ k=1
- if test "$build_libtool_libs" = convenience; then
- oldobjs="$libobjs_save"
- addlibs="$convenience"
- build_libtool_libs=no
- else
- if test "$build_libtool_libs" = module; then
- oldobjs="$libobjs_save"
- build_libtool_libs=no
- else
- oldobjs="$old_deplibs $non_pic_objects"
- fi
- addlibs="$old_convenience"
- fi
+ if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then
+ output=${output_objdir}/${output_la}.lnkscript
+ func_verbose "creating GNU ld script: $output"
+ $ECHO 'INPUT (' > $output
+ for obj in $save_libobjs
+ do
+ $ECHO "$obj" >> $output
+ done
+ $ECHO ')' >> $output
+ delfiles="$delfiles $output"
+ elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then
+ output=${output_objdir}/${output_la}.lnk
+ func_verbose "creating linker input file list: $output"
+ : > $output
+ set x $save_libobjs
+ shift
+ firstobj=
+ if test "$compiler_needs_object" = yes; then
+ firstobj="$1 "
+ shift
+ fi
+ for obj
+ do
+ $ECHO "$obj" >> $output
+ done
+ delfiles="$delfiles $output"
+ output=$firstobj\"$file_list_spec$output\"
+ else
+ if test -n "$save_libobjs"; then
+ func_verbose "creating reloadable object files..."
+ output=$output_objdir/$output_la-${k}.$objext
+ eval test_cmds=\"$reload_cmds\"
+ func_len " $test_cmds"
+ len0=$func_len_result
+ len=$len0
+
+ # Loop over the list of objects to be linked.
+ for obj in $save_libobjs
+ do
+ func_len " $obj"
+ func_arith $len + $func_len_result
+ len=$func_arith_result
+ if test "X$objlist" = X ||
+ test "$len" -lt "$max_cmd_len"; then
+ func_append objlist " $obj"
+ else
+ # The command $test_cmds is almost too long, add a
+ # command to the queue.
+ if test "$k" -eq 1 ; then
+ # The first file doesn't have a previous command to add.
+ eval concat_cmds=\"$reload_cmds $objlist $last_robj\"
+ else
+ # All subsequent reloadable object files will link in
+ # the last one created.
+ eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj~\$RM $last_robj\"
+ fi
+ last_robj=$output_objdir/$output_la-${k}.$objext
+ func_arith $k + 1
+ k=$func_arith_result
+ output=$output_objdir/$output_la-${k}.$objext
+ objlist=$obj
+ func_len " $last_robj"
+ func_arith $len0 + $func_len_result
+ len=$func_arith_result
+ fi
+ done
+ # Handle the remaining objects by creating one last
+ # reloadable object file. All subsequent reloadable object
+ # files will link in the last one created.
+ test -z "$concat_cmds" || concat_cmds=$concat_cmds~
+ eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\"
+ if test -n "$last_robj"; then
+ eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"
+ fi
+ delfiles="$delfiles $output"
- if test -n "$addlibs"; then
- gentop="$output_objdir/${outputname}x"
- generated="$generated $gentop"
+ else
+ output=
+ fi
+
+ if ${skipped_export-false}; then
+ func_verbose "generating symbol list for \`$libname.la'"
+ export_symbols="$output_objdir/$libname.exp"
+ $opt_dry_run || $RM $export_symbols
+ libobjs=$output
+ # Append the command to create the export file.
+ test -z "$concat_cmds" || concat_cmds=$concat_cmds~
+ eval concat_cmds=\"\$concat_cmds$export_symbols_cmds\"
+ if test -n "$last_robj"; then
+ eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\"
+ fi
+ fi
- func_extract_archives $gentop $addlibs
- oldobjs="$oldobjs $func_extract_archives_result"
- fi
+ test -n "$save_libobjs" &&
+ func_verbose "creating a temporary reloadable object file: $output"
- # Do each command in the archive commands.
- if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
- cmds=$old_archive_from_new_cmds
- else
- # POSIX demands no paths to be encoded in archives. We have
- # to avoid creating archives with duplicate basenames if we
- # might have to extract them afterwards, e.g., when creating a
- # static archive out of a convenience library, or when linking
- # the entirety of a libtool archive into another (currently
- # not supported by libtool).
- if (for obj in $oldobjs
- do
- $echo "X$obj" | $Xsed -e 's%^.*/%%'
- done | sort | sort -uc >/dev/null 2>&1); then
- :
- else
- $echo "copying selected object files to avoid basename conflicts..."
+ # Loop through the commands generated above and execute them.
+ save_ifs="$IFS"; IFS='~'
+ for cmd in $concat_cmds; do
+ IFS="$save_ifs"
+ $opt_silent || {
+ func_quote_for_expand "$cmd"
+ eval "func_echo $func_quote_for_expand_result"
+ }
+ $opt_dry_run || eval "$cmd" || {
+ lt_exit=$?
+
+ # Restore the uninstalled library and exit
+ if test "$mode" = relink; then
+ ( cd "$output_objdir" && \
+ $RM "${realname}T" && \
+ $MV "${realname}U" "$realname" )
+ fi
- if test -z "$gentop"; then
- gentop="$output_objdir/${outputname}x"
- generated="$generated $gentop"
+ exit $lt_exit
+ }
+ done
+ IFS="$save_ifs"
- $show "${rm}r $gentop"
- $run ${rm}r "$gentop"
- $show "$mkdir $gentop"
- $run $mkdir "$gentop"
- exit_status=$?
- if test "$exit_status" -ne 0 && test ! -d "$gentop"; then
- exit $exit_status
+ if test -n "$export_symbols_regex" && ${skipped_export-false}; then
+ func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
+ func_show_eval '$MV "${export_symbols}T" "$export_symbols"'
fi
fi
- save_oldobjs=$oldobjs
- oldobjs=
- counter=1
- for obj in $save_oldobjs
- do
- objbase=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
- case " $oldobjs " in
- " ") oldobjs=$obj ;;
- *[\ /]"$objbase "*)
- while :; do
- # Make sure we don't pick an alternate name that also
- # overlaps.
- newobj=lt$counter-$objbase
- counter=`expr $counter + 1`
- case " $oldobjs " in
- *[\ /]"$newobj "*) ;;
- *) if test ! -f "$gentop/$newobj"; then break; fi ;;
- esac
- done
- $show "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
- $run ln "$obj" "$gentop/$newobj" ||
- $run cp "$obj" "$gentop/$newobj"
- oldobjs="$oldobjs $gentop/$newobj"
- ;;
- *) oldobjs="$oldobjs $obj" ;;
- esac
- done
- fi
+ if ${skipped_export-false}; then
+ if test -n "$export_symbols" && test -n "$include_expsyms"; then
+ tmp_export_symbols="$export_symbols"
+ test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
+ $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"'
+ fi
- eval cmds=\"$old_archive_cmds\"
+ if test -n "$orig_export_symbols"; then
+ # The given exports_symbols file has to be filtered, so filter it.
+ func_verbose "filter symbol list for \`$libname.la' to tag DATA exports"
+ # FIXME: $output_objdir/$libname.filter potentially contains lots of
+ # 's' commands which not all seds can handle. GNU sed should be fine
+ # though. Also, the filter scales superlinearly with the number of
+ # global variables. join(1) would be nice here, but unfortunately
+ # isn't a blessed tool.
+ $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
+ delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
+ export_symbols=$output_objdir/$libname.def
+ $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
+ fi
+ fi
- if len=`expr "X$cmds" : ".*"` &&
- test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
- cmds=$old_archive_cmds
- else
- # the command line is too long to link in one step, link in parts
- $echo "using piecewise archive linking..."
- save_RANLIB=$RANLIB
- RANLIB=:
- objlist=
- concat_cmds=
- save_oldobjs=$oldobjs
+ libobjs=$output
+ # Restore the value of output.
+ output=$save_output
- # Is there a better way of finding the last object in the list?
- for obj in $save_oldobjs
- do
- last_oldobj=$obj
- done
- for obj in $save_oldobjs
- do
- oldobjs="$objlist $obj"
- objlist="$objlist $obj"
- eval test_cmds=\"$old_archive_cmds\"
- if len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
- test "$len" -le "$max_cmd_len"; then
- :
+ if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then
+ eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
+ test "X$libobjs" = "X " && libobjs=
+ fi
+ # Expand the library linking commands again to reset the
+ # value of $libobjs for piecewise linking.
+
+ # Do each of the archive commands.
+ if test "$module" = yes && test -n "$module_cmds" ; then
+ if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
+ cmds=$module_expsym_cmds
else
- # the above command should be used before it gets too long
- oldobjs=$objlist
- if test "$obj" = "$last_oldobj" ; then
- RANLIB=$save_RANLIB
- fi
- test -z "$concat_cmds" || concat_cmds=$concat_cmds~
- eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
- objlist=
+ cmds=$module_cmds
fi
- done
- RANLIB=$save_RANLIB
- oldobjs=$objlist
- if test "X$oldobjs" = "X" ; then
- eval cmds=\"\$concat_cmds\"
else
- eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
+ if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
+ cmds=$archive_expsym_cmds
+ else
+ cmds=$archive_cmds
+ fi
fi
fi
- fi
- save_ifs="$IFS"; IFS='~'
- for cmd in $cmds; do
- eval cmd=\"$cmd\"
- IFS="$save_ifs"
- $show "$cmd"
- $run eval "$cmd" || exit $?
- done
- IFS="$save_ifs"
- done
- if test -n "$generated"; then
- $show "${rm}r$generated"
- $run ${rm}r$generated
- fi
+ if test -n "$delfiles"; then
+ # Append the command to remove temporary files to $cmds.
+ eval cmds=\"\$cmds~\$RM $delfiles\"
+ fi
- # Now create the libtool archive.
- case $output in
- *.la)
- old_library=
- test "$build_old_libs" = yes && old_library="$libname.$libext"
- $show "creating $output"
+ # Add any objects from preloaded convenience libraries
+ if test -n "$dlprefiles"; then
+ gentop="$output_objdir/${outputname}x"
+ generated="$generated $gentop"
- # Preserve any variables that may affect compiler behavior
- for var in $variables_saved_for_relink; do
- if eval test -z \"\${$var+set}\"; then
- relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command"
- elif eval var_value=\$$var; test -z "$var_value"; then
- relink_command="$var=; export $var; $relink_command"
- else
- var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"`
- relink_command="$var=\"$var_value\"; export $var; $relink_command"
+ func_extract_archives $gentop $dlprefiles
+ libobjs="$libobjs $func_extract_archives_result"
+ test "X$libobjs" = "X " && libobjs=
fi
- done
- # Quote the link command for shipping.
- relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
- relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
- if test "$hardcode_automatic" = yes ; then
- relink_command=
- fi
+ save_ifs="$IFS"; IFS='~'
+ for cmd in $cmds; do
+ IFS="$save_ifs"
+ eval cmd=\"$cmd\"
+ $opt_silent || {
+ func_quote_for_expand "$cmd"
+ eval "func_echo $func_quote_for_expand_result"
+ }
+ $opt_dry_run || eval "$cmd" || {
+ lt_exit=$?
- # Only create the output if not a dry run.
- if test -z "$run"; then
- for installed in no yes; do
- if test "$installed" = yes; then
- if test -z "$install_libdir"; then
- break
+ # Restore the uninstalled library and exit
+ if test "$mode" = relink; then
+ ( cd "$output_objdir" && \
+ $RM "${realname}T" && \
+ $MV "${realname}U" "$realname" )
fi
- output="$output_objdir/$outputname"i
- # Replace all uninstalled libtool libraries with the installed ones
- newdependency_libs=
- for deplib in $dependency_libs; do
- case $deplib in
- *.la)
- name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'`
- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
- if test -z "$libdir"; then
- $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
- exit $EXIT_FAILURE
- fi
- newdependency_libs="$newdependency_libs $libdir/$name"
- ;;
- *) newdependency_libs="$newdependency_libs $deplib" ;;
- esac
- done
- dependency_libs="$newdependency_libs"
- newdlfiles=
- for lib in $dlfiles; do
- name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
- if test -z "$libdir"; then
- $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
- exit $EXIT_FAILURE
- fi
- newdlfiles="$newdlfiles $libdir/$name"
- done
- dlfiles="$newdlfiles"
- newdlprefiles=
- for lib in $dlprefiles; do
- name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
- if test -z "$libdir"; then
- $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
- exit $EXIT_FAILURE
- fi
- newdlprefiles="$newdlprefiles $libdir/$name"
- done
- dlprefiles="$newdlprefiles"
- else
- newdlfiles=
- for lib in $dlfiles; do
- case $lib in
- [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
- *) abs=`pwd`"/$lib" ;;
- esac
- newdlfiles="$newdlfiles $abs"
- done
- dlfiles="$newdlfiles"
- newdlprefiles=
- for lib in $dlprefiles; do
- case $lib in
- [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
- *) abs=`pwd`"/$lib" ;;
- esac
- newdlprefiles="$newdlprefiles $abs"
- done
- dlprefiles="$newdlprefiles"
- fi
- $rm $output
- # place dlname in correct position for cygwin
- tdlname=$dlname
- case $host,$output,$installed,$module,$dlname in
- *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
- esac
- $echo > $output "\
-# $outputname - a libtool library file
-# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# The name that we can dlopen(3).
-dlname='$tdlname'
-
-# Names of this library.
-library_names='$library_names'
-
-# The name of the static archive.
-old_library='$old_library'
-
-# Libraries that this one depends upon.
-dependency_libs='$dependency_libs'
-# Version information for $libname.
-current=$current
-age=$age
-revision=$revision
+ exit $lt_exit
+ }
+ done
+ IFS="$save_ifs"
-# Is this an already installed library?
-installed=$installed
+ # Restore the uninstalled library and exit
+ if test "$mode" = relink; then
+ $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $?
-# Should we warn about portability when linking against -modules?
-shouldnotlink=$module
+ if test -n "$convenience"; then
+ if test -z "$whole_archive_flag_spec"; then
+ func_show_eval '${RM}r "$gentop"'
+ fi
+ fi
-# Files to dlopen/dlpreopen
-dlopen='$dlfiles'
-dlpreopen='$dlprefiles'
+ exit $EXIT_SUCCESS
+ fi
-# Directory that this library needs to be installed in:
-libdir='$install_libdir'"
- if test "$installed" = no && test "$need_relink" = yes; then
- $echo >> $output "\
-relink_command=\"$relink_command\""
+ # Create links to the real library.
+ for linkname in $linknames; do
+ if test "$realname" != "$linkname"; then
+ func_show_eval '(cd "$output_objdir" && $RM "$linkname" && $LN_S "$realname" "$linkname")' 'exit $?'
fi
done
- fi
- # Do a symbolic link so that the libtool archive can be found in
- # LD_LIBRARY_PATH before the program is installed.
- $show "(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)"
- $run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $?
+ # If -module or -export-dynamic was specified, set the dlname.
+ if test "$module" = yes || test "$export_dynamic" = yes; then
+ # On all known operating systems, these are identical.
+ dlname="$soname"
+ fi
+ fi
;;
- esac
- exit $EXIT_SUCCESS
- ;;
- # libtool install mode
- install)
- modename="$modename: install"
+ obj)
+ if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+ func_warning "\`-dlopen' is ignored for objects"
+ fi
- # There may be an optional sh(1) argument at the beginning of
- # install_prog (especially on Windows NT).
- if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
- # Allow the use of GNU shtool's install command.
- $echo "X$nonopt" | grep shtool > /dev/null; then
- # Aesthetically quote it.
- arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"`
- case $arg in
- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
- arg="\"$arg\""
- ;;
+ case " $deplibs" in
+ *\ -l* | *\ -L*)
+ func_warning "\`-l' and \`-L' are ignored for objects" ;;
esac
- install_prog="$arg "
- arg="$1"
- shift
- else
- install_prog=
- arg=$nonopt
- fi
- # The real first argument should be the name of the installation program.
- # Aesthetically quote it.
- arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
- case $arg in
- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
- arg="\"$arg\""
- ;;
- esac
- install_prog="$install_prog$arg"
+ test -n "$rpath" && \
+ func_warning "\`-rpath' is ignored for objects"
- # We need to accept at least all the BSD install flags.
- dest=
- files=
- opts=
- prev=
- install_type=
- isdir=no
- stripme=
- for arg
- do
- if test -n "$dest"; then
- files="$files $dest"
- dest=$arg
- continue
- fi
+ test -n "$xrpath" && \
+ func_warning "\`-R' is ignored for objects"
- case $arg in
- -d) isdir=yes ;;
- -f)
- case " $install_prog " in
- *[\\\ /]cp\ *) ;;
- *) prev=$arg ;;
- esac
- ;;
- -g | -m | -o) prev=$arg ;;
- -s)
- stripme=" -s"
- continue
- ;;
- -*)
+ test -n "$vinfo" && \
+ func_warning "\`-version-info' is ignored for objects"
+
+ test -n "$release" && \
+ func_warning "\`-release' is ignored for objects"
+
+ case $output in
+ *.lo)
+ test -n "$objs$old_deplibs" && \
+ func_fatal_error "cannot build library object \`$output' from non-libtool objects"
+
+ libobj=$output
+ func_lo2o "$libobj"
+ obj=$func_lo2o_result
;;
*)
- # If the previous option needed an argument, then skip it.
- if test -n "$prev"; then
- prev=
- else
- dest=$arg
- continue
- fi
+ libobj=
+ obj="$output"
;;
esac
- # Aesthetically quote the argument.
- arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
- case $arg in
- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
- arg="\"$arg\""
- ;;
- esac
- install_prog="$install_prog $arg"
- done
+ # Delete the old objects.
+ $opt_dry_run || $RM $obj $libobj
- if test -z "$install_prog"; then
- $echo "$modename: you must specify an install program" 1>&2
- $echo "$help" 1>&2
- exit $EXIT_FAILURE
- fi
+ # Objects from convenience libraries. This assumes
+ # single-version convenience libraries. Whenever we create
+ # different ones for PIC/non-PIC, this we'll have to duplicate
+ # the extraction.
+ reload_conv_objs=
+ gentop=
+ # reload_cmds runs $LD directly, so let us get rid of
+ # -Wl from whole_archive_flag_spec and hope we can get by with
+ # turning comma into space..
+ wl=
- if test -n "$prev"; then
- $echo "$modename: the \`$prev' option requires an argument" 1>&2
- $echo "$help" 1>&2
- exit $EXIT_FAILURE
- fi
+ if test -n "$convenience"; then
+ if test -n "$whole_archive_flag_spec"; then
+ eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
+ reload_conv_objs=$reload_objs\ `$ECHO "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
+ else
+ gentop="$output_objdir/${obj}x"
+ generated="$generated $gentop"
- if test -z "$files"; then
- if test -z "$dest"; then
- $echo "$modename: no file or destination specified" 1>&2
- else
- $echo "$modename: you must specify a destination" 1>&2
+ func_extract_archives $gentop $convenience
+ reload_conv_objs="$reload_objs $func_extract_archives_result"
+ fi
fi
- $echo "$help" 1>&2
- exit $EXIT_FAILURE
- fi
- # Strip any trailing slash from the destination.
- dest=`$echo "X$dest" | $Xsed -e 's%/$%%'`
+ # Create the old-style object.
+ reload_objs="$objs$old_deplibs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
- # Check to see that the destination is a directory.
- test -d "$dest" && isdir=yes
- if test "$isdir" = yes; then
- destdir="$dest"
- destname=
- else
- destdir=`$echo "X$dest" | $Xsed -e 's%/[^/]*$%%'`
- test "X$destdir" = "X$dest" && destdir=.
- destname=`$echo "X$dest" | $Xsed -e 's%^.*/%%'`
+ output="$obj"
+ func_execute_cmds "$reload_cmds" 'exit $?'
- # Not a directory, so check to see that there is only one file specified.
- set dummy $files
- if test "$#" -gt 2; then
- $echo "$modename: \`$dest' is not a directory" 1>&2
- $echo "$help" 1>&2
- exit $EXIT_FAILURE
+ # Exit if we aren't doing a library object file.
+ if test -z "$libobj"; then
+ if test -n "$gentop"; then
+ func_show_eval '${RM}r "$gentop"'
+ fi
+
+ exit $EXIT_SUCCESS
fi
- fi
- case $destdir in
- [\\/]* | [A-Za-z]:[\\/]*) ;;
- *)
- for file in $files; do
- case $file in
- *.lo) ;;
- *)
- $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2
- $echo "$help" 1>&2
- exit $EXIT_FAILURE
- ;;
- esac
- done
+
+ if test "$build_libtool_libs" != yes; then
+ if test -n "$gentop"; then
+ func_show_eval '${RM}r "$gentop"'
+ fi
+
+ # Create an invalid libtool object if no PIC, so that we don't
+ # accidentally link it into a program.
+ # $show "echo timestamp > $libobj"
+ # $opt_dry_run || eval "echo timestamp > $libobj" || exit $?
+ exit $EXIT_SUCCESS
+ fi
+
+ if test -n "$pic_flag" || test "$pic_mode" != default; then
+ # Only do commands if we really have different PIC objects.
+ reload_objs="$libobjs $reload_conv_objs"
+ output="$libobj"
+ func_execute_cmds "$reload_cmds" 'exit $?'
+ fi
+
+ if test -n "$gentop"; then
+ func_show_eval '${RM}r "$gentop"'
+ fi
+
+ exit $EXIT_SUCCESS
;;
- esac
- # This variable tells wrapper scripts just to set variables rather
- # than running their programs.
- libtool_install_magic="$magic"
+ prog)
+ case $host in
+ *cygwin*) func_stripname '' '.exe' "$output"
+ output=$func_stripname_result.exe;;
+ esac
+ test -n "$vinfo" && \
+ func_warning "\`-version-info' is ignored for programs"
- staticlibs=
- future_libdirs=
- current_libdirs=
- for file in $files; do
+ test -n "$release" && \
+ func_warning "\`-release' is ignored for programs"
- # Do each installation.
- case $file in
- *.$libext)
- # Do the static libraries later.
- staticlibs="$staticlibs $file"
+ test "$preload" = yes \
+ && test "$dlopen_support" = unknown \
+ && test "$dlopen_self" = unknown \
+ && test "$dlopen_self_static" = unknown && \
+ func_warning "\`LT_INIT([dlopen])' not used. Assuming no dlopen support."
+
+ case $host in
+ *-*-rhapsody* | *-*-darwin1.[012])
+ # On Rhapsody replace the C library is the System framework
+ compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
+ finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
;;
+ esac
- *.la)
- # Check to see that this really is a libtool archive.
- if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
- else
- $echo "$modename: \`$file' is not a valid libtool archive" 1>&2
- $echo "$help" 1>&2
- exit $EXIT_FAILURE
+ case $host in
+ *-*-darwin*)
+ # Don't allow lazy linking, it breaks C++ global constructors
+ # But is supposedly fixed on 10.4 or later (yay!).
+ if test "$tagname" = CXX ; then
+ case ${MACOSX_DEPLOYMENT_TARGET-10.0} in
+ 10.[0123])
+ compile_command="$compile_command ${wl}-bind_at_load"
+ finalize_command="$finalize_command ${wl}-bind_at_load"
+ ;;
+ esac
fi
+ # Time to change all our "foo.ltframework" stuff back to "-framework foo"
+ compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+ finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+ ;;
+ esac
- library_names=
- old_library=
- relink_command=
- # If there is no directory component, then add one.
- case $file in
- */* | *\\*) . $file ;;
- *) . ./$file ;;
- esac
- # Add the libdir to current_libdirs if it is the destination.
- if test "X$destdir" = "X$libdir"; then
- case "$current_libdirs " in
- *" $libdir "*) ;;
- *) current_libdirs="$current_libdirs $libdir" ;;
+ # move library search paths that coincide with paths to not yet
+ # installed libraries to the beginning of the library search list
+ new_libs=
+ for path in $notinst_path; do
+ case " $new_libs " in
+ *" -L$path/$objdir "*) ;;
+ *)
+ case " $compile_deplibs " in
+ *" -L$path/$objdir "*)
+ new_libs="$new_libs -L$path/$objdir" ;;
esac
- else
- # Note the libdir as a future libdir.
- case "$future_libdirs " in
- *" $libdir "*) ;;
- *) future_libdirs="$future_libdirs $libdir" ;;
+ ;;
+ esac
+ done
+ for deplib in $compile_deplibs; do
+ case $deplib in
+ -L*)
+ case " $new_libs " in
+ *" $deplib "*) ;;
+ *) new_libs="$new_libs $deplib" ;;
esac
- fi
+ ;;
+ *) new_libs="$new_libs $deplib" ;;
+ esac
+ done
+ compile_deplibs="$new_libs"
- dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`/
- test "X$dir" = "X$file/" && dir=
- dir="$dir$objdir"
- if test -n "$relink_command"; then
- # Determine the prefix the user has applied to our future dir.
- inst_prefix_dir=`$echo "$destdir" | $SED "s%$libdir\$%%"`
+ compile_command="$compile_command $compile_deplibs"
+ finalize_command="$finalize_command $finalize_deplibs"
- # Don't allow the user to place us outside of our expected
- # location b/c this prevents finding dependent libraries that
- # are installed to the same prefix.
- # At present, this check doesn't affect windows .dll's that
- # are installed into $libdir/../bin (currently, that works fine)
- # but it's something to keep an eye on.
- if test "$inst_prefix_dir" = "$destdir"; then
- $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
- exit $EXIT_FAILURE
- fi
+ if test -n "$rpath$xrpath"; then
+ # If the user specified any rpath flags, then add them.
+ for libdir in $rpath $xrpath; do
+ # This is the magic to use -rpath.
+ case "$finalize_rpath " in
+ *" $libdir "*) ;;
+ *) finalize_rpath="$finalize_rpath $libdir" ;;
+ esac
+ done
+ fi
- if test -n "$inst_prefix_dir"; then
- # Stick the inst_prefix_dir data into the link command.
- relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%" | $NL2SP`
+ # Now hardcode the library paths
+ rpath=
+ hardcode_libdirs=
+ for libdir in $compile_rpath $finalize_rpath; do
+ if test -n "$hardcode_libdir_flag_spec"; then
+ if test -n "$hardcode_libdir_separator"; then
+ if test -z "$hardcode_libdirs"; then
+ hardcode_libdirs="$libdir"
+ else
+ # Just accumulate the unique libdirs.
+ case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
+ *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
+ ;;
+ *)
+ hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
+ ;;
+ esac
+ fi
else
- relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%%" | $NL2SP`
+ eval flag=\"$hardcode_libdir_flag_spec\"
+ rpath="$rpath $flag"
fi
+ elif test -n "$runpath_var"; then
+ case "$perm_rpath " in
+ *" $libdir "*) ;;
+ *) perm_rpath="$perm_rpath $libdir" ;;
+ esac
+ fi
+ case $host in
+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
+ testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'`
+ case :$dllsearchpath: in
+ *":$libdir:"*) ;;
+ ::) dllsearchpath=$libdir;;
+ *) dllsearchpath="$dllsearchpath:$libdir";;
+ esac
+ case :$dllsearchpath: in
+ *":$testbindir:"*) ;;
+ ::) dllsearchpath=$testbindir;;
+ *) dllsearchpath="$dllsearchpath:$testbindir";;
+ esac
+ ;;
+ esac
+ done
+ # Substitute the hardcoded libdirs into the rpath.
+ if test -n "$hardcode_libdir_separator" &&
+ test -n "$hardcode_libdirs"; then
+ libdir="$hardcode_libdirs"
+ eval rpath=\" $hardcode_libdir_flag_spec\"
+ fi
+ compile_rpath="$rpath"
- $echo "$modename: warning: relinking \`$file'" 1>&2
- $show "$relink_command"
- if $run eval "$relink_command"; then :
+ rpath=
+ hardcode_libdirs=
+ for libdir in $finalize_rpath; do
+ if test -n "$hardcode_libdir_flag_spec"; then
+ if test -n "$hardcode_libdir_separator"; then
+ if test -z "$hardcode_libdirs"; then
+ hardcode_libdirs="$libdir"
+ else
+ # Just accumulate the unique libdirs.
+ case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
+ *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
+ ;;
+ *)
+ hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
+ ;;
+ esac
+ fi
else
- $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
- exit $EXIT_FAILURE
+ eval flag=\"$hardcode_libdir_flag_spec\"
+ rpath="$rpath $flag"
fi
+ elif test -n "$runpath_var"; then
+ case "$finalize_perm_rpath " in
+ *" $libdir "*) ;;
+ *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;;
+ esac
fi
+ done
+ # Substitute the hardcoded libdirs into the rpath.
+ if test -n "$hardcode_libdir_separator" &&
+ test -n "$hardcode_libdirs"; then
+ libdir="$hardcode_libdirs"
+ eval rpath=\" $hardcode_libdir_flag_spec\"
+ fi
+ finalize_rpath="$rpath"
- # See the names of the shared library.
- set dummy $library_names
- if test -n "$2"; then
- realname="$2"
- shift
- shift
+ if test -n "$libobjs" && test "$build_old_libs" = yes; then
+ # Transform all the library objects into standard objects.
+ compile_command=`$ECHO "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+ finalize_command=`$ECHO "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+ fi
- srcname="$realname"
- test -n "$relink_command" && srcname="$realname"T
+ func_generate_dlsyms "$outputname" "@PROGRAM@" "no"
- # Install the shared library and build the symlinks.
- $show "$install_prog $dir/$srcname $destdir/$realname"
- $run eval "$install_prog $dir/$srcname $destdir/$realname" || exit $?
- if test -n "$stripme" && test -n "$striplib"; then
- $show "$striplib $destdir/$realname"
- $run eval "$striplib $destdir/$realname" || exit $?
- fi
+ # template prelinking step
+ if test -n "$prelink_cmds"; then
+ func_execute_cmds "$prelink_cmds" 'exit $?'
+ fi
- if test "$#" -gt 0; then
- # Delete the old symlinks, and create new ones.
- # Try `ln -sf' first, because the `ln' binary might depend on
- # the symlink we replace! Solaris /bin/ln does not understand -f,
- # so we also need to try rm && ln -s.
- for linkname
- do
- if test "$linkname" != "$realname"; then
- $show "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })"
- $run eval "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })"
- fi
- done
- fi
+ wrappers_required=yes
+ case $host in
+ *cygwin* | *mingw* )
+ if test "$build_libtool_libs" != yes; then
+ wrappers_required=no
+ fi
+ ;;
+ *cegcc)
+ # Disable wrappers for cegcc, we are cross compiling anyway.
+ wrappers_required=no
+ ;;
+ *)
+ if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
+ wrappers_required=no
+ fi
+ ;;
+ esac
+ if test "$wrappers_required" = no; then
+ # Replace the output file specification.
+ compile_command=`$ECHO "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
+ link_command="$compile_command$compile_rpath"
- # Do each command in the postinstall commands.
- lib="$destdir/$realname"
- cmds=$postinstall_cmds
- save_ifs="$IFS"; IFS='~'
- for cmd in $cmds; do
- IFS="$save_ifs"
- eval cmd=\"$cmd\"
- $show "$cmd"
- $run eval "$cmd" || {
- lt_exit=$?
-
- # Restore the uninstalled library and exit
- if test "$mode" = relink; then
- $run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)'
- fi
+ # We have no uninstalled library dependencies, so finalize right now.
+ exit_status=0
+ func_show_eval "$link_command" 'exit_status=$?'
- exit $lt_exit
- }
- done
- IFS="$save_ifs"
+ # Delete the generated files.
+ if test -f "$output_objdir/${outputname}S.${objext}"; then
+ func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"'
fi
- # Install the pseudo-library for information purposes.
- name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- instname="$dir/$name"i
- $show "$install_prog $instname $destdir/$name"
- $run eval "$install_prog $instname $destdir/$name" || exit $?
-
- # Maybe install the static library, too.
- test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
- ;;
+ exit $exit_status
+ fi
- *.lo)
- # Install (i.e. copy) a libtool object.
+ if test -n "$compile_shlibpath$finalize_shlibpath"; then
+ compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command"
+ fi
+ if test -n "$finalize_shlibpath"; then
+ finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command"
+ fi
- # Figure out destination file name, if it wasn't already specified.
- if test -n "$destname"; then
- destfile="$destdir/$destname"
- else
- destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- destfile="$destdir/$destfile"
+ compile_var=
+ finalize_var=
+ if test -n "$runpath_var"; then
+ if test -n "$perm_rpath"; then
+ # We should set the runpath_var.
+ rpath=
+ for dir in $perm_rpath; do
+ rpath="$rpath$dir:"
+ done
+ compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
fi
-
- # Deduce the name of the destination old-style object file.
- case $destfile in
- *.lo)
- staticdest=`$echo "X$destfile" | $Xsed -e "$lo2o"`
- ;;
- *.$objext)
- staticdest="$destfile"
- destfile=
- ;;
- *)
- $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2
- $echo "$help" 1>&2
- exit $EXIT_FAILURE
- ;;
- esac
-
- # Install the libtool object if requested.
- if test -n "$destfile"; then
- $show "$install_prog $file $destfile"
- $run eval "$install_prog $file $destfile" || exit $?
+ if test -n "$finalize_perm_rpath"; then
+ # We should set the runpath_var.
+ rpath=
+ for dir in $finalize_perm_rpath; do
+ rpath="$rpath$dir:"
+ done
+ finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
fi
+ fi
- # Install the old object if enabled.
- if test "$build_old_libs" = yes; then
- # Deduce the name of the old-style object file.
- staticobj=`$echo "X$file" | $Xsed -e "$lo2o"`
-
- $show "$install_prog $staticobj $staticdest"
- $run eval "$install_prog \$staticobj \$staticdest" || exit $?
- fi
+ if test "$no_install" = yes; then
+ # We don't need to create a wrapper script.
+ link_command="$compile_var$compile_command$compile_rpath"
+ # Replace the output file specification.
+ link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
+ # Delete the old output file.
+ $opt_dry_run || $RM $output
+ # Link the executable and exit
+ func_show_eval "$link_command" 'exit $?'
exit $EXIT_SUCCESS
- ;;
+ fi
- *)
- # Figure out destination file name, if it wasn't already specified.
- if test -n "$destname"; then
- destfile="$destdir/$destname"
+ if test "$hardcode_action" = relink; then
+ # Fast installation is not supported
+ link_command="$compile_var$compile_command$compile_rpath"
+ relink_command="$finalize_var$finalize_command$finalize_rpath"
+
+ func_warning "this platform does not like uninstalled shared libraries"
+ func_warning "\`$output' will be relinked during installation"
+ else
+ if test "$fast_install" != no; then
+ link_command="$finalize_var$compile_command$finalize_rpath"
+ if test "$fast_install" = yes; then
+ relink_command=`$ECHO "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
+ else
+ # fast_install is set to needless
+ relink_command=
+ fi
else
- destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- destfile="$destdir/$destfile"
+ link_command="$compile_var$compile_command$compile_rpath"
+ relink_command="$finalize_var$finalize_command$finalize_rpath"
fi
+ fi
- # If the file is missing, and there is a .exe on the end, strip it
- # because it is most likely a libtool script we actually want to
- # install
- stripped_ext=""
- case $file in
- *.exe)
- if test ! -f "$file"; then
- file=`$echo $file|${SED} 's,.exe$,,'`
- stripped_ext=".exe"
- fi
- ;;
- esac
-
- # Do a test to see if this is really a libtool program.
- case $host in
- *cygwin*|*mingw*)
- wrapper=`$echo $file | ${SED} -e 's,.exe$,,'`
- ;;
- *)
- wrapper=$file
- ;;
- esac
- if (${SED} -e '4q' $wrapper | grep "^# Generated by .*$PACKAGE")>/dev/null 2>&1; then
- notinst_deplibs=
- relink_command=
-
- # Note that it is not necessary on cygwin/mingw to append a dot to
- # foo even if both foo and FILE.exe exist: automatic-append-.exe
- # behavior happens only for exec(3), not for open(2)! Also, sourcing
- # `FILE.' does not work on cygwin managed mounts.
- #
- # If there is no directory component, then add one.
- case $wrapper in
- */* | *\\*) . ${wrapper} ;;
- *) . ./${wrapper} ;;
- esac
+ # Replace the output file specification.
+ link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
- # Check the variables that should have been set.
- if test -z "$notinst_deplibs"; then
- $echo "$modename: invalid libtool wrapper script \`$wrapper'" 1>&2
- exit $EXIT_FAILURE
- fi
+ # Delete the old output files.
+ $opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname
- finalize=yes
- for lib in $notinst_deplibs; do
- # Check to see that each library is installed.
- libdir=
- if test -f "$lib"; then
- # If there is no directory component, then add one.
- case $lib in
- */* | *\\*) . $lib ;;
- *) . ./$lib ;;
- esac
- fi
- libfile="$libdir/"`$echo "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test
- if test -n "$libdir" && test ! -f "$libfile"; then
- $echo "$modename: warning: \`$lib' has not been installed in \`$libdir'" 1>&2
- finalize=no
- fi
- done
+ func_show_eval "$link_command" 'exit $?'
- relink_command=
- # Note that it is not necessary on cygwin/mingw to append a dot to
- # foo even if both foo and FILE.exe exist: automatic-append-.exe
- # behavior happens only for exec(3), not for open(2)! Also, sourcing
- # `FILE.' does not work on cygwin managed mounts.
- #
- # If there is no directory component, then add one.
- case $wrapper in
- */* | *\\*) . ${wrapper} ;;
- *) . ./${wrapper} ;;
- esac
+ # Now create the wrapper script.
+ func_verbose "creating $output"
- outputname=
- if test "$fast_install" = no && test -n "$relink_command"; then
- if test "$finalize" = yes && test -z "$run"; then
- tmpdir=`func_mktempdir`
- file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
- outputname="$tmpdir/$file"
- # Replace the output file specification.
- relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g' | $NL2SP`
-
- $show "$relink_command"
- if $run eval "$relink_command"; then :
- else
- $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
- ${rm}r "$tmpdir"
- continue
- fi
- file="$outputname"
- else
- $echo "$modename: warning: cannot relink \`$file'" 1>&2
- fi
+ # Quote the relink command for shipping.
+ if test -n "$relink_command"; then
+ # Preserve any variables that may affect compiler behavior
+ for var in $variables_saved_for_relink; do
+ if eval test -z \"\${$var+set}\"; then
+ relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command"
+ elif eval var_value=\$$var; test -z "$var_value"; then
+ relink_command="$var=; export $var; $relink_command"
else
- # Install the binary that we compiled earlier.
- file=`$echo "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"`
+ func_quote_for_eval "$var_value"
+ relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
fi
- fi
+ done
+ relink_command="(cd `pwd`; $relink_command)"
+ relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+ fi
- # remove .exe since cygwin /usr/bin/install will append another
- # one anyway
- case $install_prog,$host in
- */usr/bin/install*,*cygwin*)
- case $file:$destfile in
- *.exe:*.exe)
- # this is ok
- ;;
- *.exe:*)
- destfile=$destfile.exe
- ;;
- *:*.exe)
- destfile=`$echo $destfile | ${SED} -e 's,.exe$,,'`
- ;;
- esac
- ;;
+ # Quote $ECHO for shipping.
+ if test "X$ECHO" = "X$SHELL $progpath --fallback-echo"; then
+ case $progpath in
+ [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";;
+ *) qecho="$SHELL `pwd`/$progpath --fallback-echo";;
+ esac
+ qecho=`$ECHO "X$qecho" | $Xsed -e "$sed_quote_subst"`
+ else
+ qecho=`$ECHO "X$ECHO" | $Xsed -e "$sed_quote_subst"`
+ fi
+
+ # Only actually do things if not in dry run mode.
+ $opt_dry_run || {
+ # win32 will think the script is a binary if it has
+ # a .exe suffix, so we strip it off here.
+ case $output in
+ *.exe) func_stripname '' '.exe' "$output"
+ output=$func_stripname_result ;;
+ esac
+ # test for cygwin because mv fails w/o .exe extensions
+ case $host in
+ *cygwin*)
+ exeext=.exe
+ func_stripname '' '.exe' "$outputname"
+ outputname=$func_stripname_result ;;
+ *) exeext= ;;
esac
- $show "$install_prog$stripme $file $destfile"
- $run eval "$install_prog\$stripme \$file \$destfile" || exit $?
- test -n "$outputname" && ${rm}r "$tmpdir"
- ;;
- esac
- done
+ case $host in
+ *cygwin* | *mingw* )
+ func_dirname_and_basename "$output" "" "."
+ output_name=$func_basename_result
+ output_path=$func_dirname_result
+ cwrappersource="$output_path/$objdir/lt-$output_name.c"
+ cwrapper="$output_path/$output_name.exe"
+ $RM $cwrappersource $cwrapper
+ trap "$RM $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
+
+ func_emit_cwrapperexe_src > $cwrappersource
+
+ # The wrapper executable is built using the $host compiler,
+ # because it contains $host paths and files. If cross-
+ # compiling, it, like the target executable, must be
+ # executed on the $host or under an emulation environment.
+ $opt_dry_run || {
+ $LTCC $LTCFLAGS -o $cwrapper $cwrappersource
+ $STRIP $cwrapper
+ }
- for file in $staticlibs; do
- name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ # Now, create the wrapper script for func_source use:
+ func_ltwrapper_scriptname $cwrapper
+ $RM $func_ltwrapper_scriptname_result
+ trap "$RM $func_ltwrapper_scriptname_result; exit $EXIT_FAILURE" 1 2 15
+ $opt_dry_run || {
+ # note: this script will not be executed, so do not chmod.
+ if test "x$build" = "x$host" ; then
+ $cwrapper --lt-dump-script > $func_ltwrapper_scriptname_result
+ else
+ func_emit_wrapper no > $func_ltwrapper_scriptname_result
+ fi
+ }
+ ;;
+ * )
+ $RM $output
+ trap "$RM $output; exit $EXIT_FAILURE" 1 2 15
- # Set up the ranlib parameters.
- oldlib="$destdir/$name"
+ func_emit_wrapper no > $output
+ chmod +x $output
+ ;;
+ esac
+ }
+ exit $EXIT_SUCCESS
+ ;;
+ esac
- $show "$install_prog $file $oldlib"
- $run eval "$install_prog \$file \$oldlib" || exit $?
+ # See if we need to build an old-fashioned archive.
+ for oldlib in $oldlibs; do
- if test -n "$stripme" && test -n "$old_striplib"; then
- $show "$old_striplib $oldlib"
- $run eval "$old_striplib $oldlib" || exit $?
+ if test "$build_libtool_libs" = convenience; then
+ oldobjs="$libobjs_save $symfileobj"
+ addlibs="$convenience"
+ build_libtool_libs=no
+ else
+ if test "$build_libtool_libs" = module; then
+ oldobjs="$libobjs_save"
+ build_libtool_libs=no
+ else
+ oldobjs="$old_deplibs $non_pic_objects"
+ if test "$preload" = yes && test -f "$symfileobj"; then
+ oldobjs="$oldobjs $symfileobj"
+ fi
+ fi
+ addlibs="$old_convenience"
fi
- # Do each command in the postinstall commands.
- cmds=$old_postinstall_cmds
- save_ifs="$IFS"; IFS='~'
- for cmd in $cmds; do
- IFS="$save_ifs"
- eval cmd=\"$cmd\"
- $show "$cmd"
- $run eval "$cmd" || exit $?
- done
- IFS="$save_ifs"
- done
+ if test -n "$addlibs"; then
+ gentop="$output_objdir/${outputname}x"
+ generated="$generated $gentop"
- if test -n "$future_libdirs"; then
- $echo "$modename: warning: remember to run \`$progname --finish$future_libdirs'" 1>&2
- fi
+ func_extract_archives $gentop $addlibs
+ oldobjs="$oldobjs $func_extract_archives_result"
+ fi
- if test -n "$current_libdirs"; then
- # Maybe just do a dry run.
- test -n "$run" && current_libdirs=" -n$current_libdirs"
- exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
- else
- exit $EXIT_SUCCESS
- fi
- ;;
+ # Do each command in the archive commands.
+ if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
+ cmds=$old_archive_from_new_cmds
+ else
- # libtool finish mode
- finish)
- modename="$modename: finish"
- libdirs="$nonopt"
- admincmds=
+ # Add any objects from preloaded convenience libraries
+ if test -n "$dlprefiles"; then
+ gentop="$output_objdir/${outputname}x"
+ generated="$generated $gentop"
- if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
- for dir
- do
- libdirs="$libdirs $dir"
- done
+ func_extract_archives $gentop $dlprefiles
+ oldobjs="$oldobjs $func_extract_archives_result"
+ fi
- for libdir in $libdirs; do
- if test -n "$finish_cmds"; then
- # Do each command in the finish commands.
- cmds=$finish_cmds
- save_ifs="$IFS"; IFS='~'
- for cmd in $cmds; do
- IFS="$save_ifs"
- eval cmd=\"$cmd\"
- $show "$cmd"
- $run eval "$cmd" || admincmds="$admincmds
- $cmd"
+ # POSIX demands no paths to be encoded in archives. We have
+ # to avoid creating archives with duplicate basenames if we
+ # might have to extract them afterwards, e.g., when creating a
+ # static archive out of a convenience library, or when linking
+ # the entirety of a libtool archive into another (currently
+ # not supported by libtool).
+ if (for obj in $oldobjs
+ do
+ func_basename "$obj"
+ $ECHO "$func_basename_result"
+ done | sort | sort -uc >/dev/null 2>&1); then
+ :
+ else
+ $ECHO "copying selected object files to avoid basename conflicts..."
+ gentop="$output_objdir/${outputname}x"
+ generated="$generated $gentop"
+ func_mkdir_p "$gentop"
+ save_oldobjs=$oldobjs
+ oldobjs=
+ counter=1
+ for obj in $save_oldobjs
+ do
+ func_basename "$obj"
+ objbase="$func_basename_result"
+ case " $oldobjs " in
+ " ") oldobjs=$obj ;;
+ *[\ /]"$objbase "*)
+ while :; do
+ # Make sure we don't pick an alternate name that also
+ # overlaps.
+ newobj=lt$counter-$objbase
+ func_arith $counter + 1
+ counter=$func_arith_result
+ case " $oldobjs " in
+ *[\ /]"$newobj "*) ;;
+ *) if test ! -f "$gentop/$newobj"; then break; fi ;;
+ esac
+ done
+ func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
+ oldobjs="$oldobjs $gentop/$newobj"
+ ;;
+ *) oldobjs="$oldobjs $obj" ;;
+ esac
done
- IFS="$save_ifs"
- fi
- if test -n "$finish_eval"; then
- # Do the single finish_eval.
- eval cmds=\"$finish_eval\"
- $run eval "$cmds" || admincmds="$admincmds
- $cmds"
fi
- done
- fi
-
- # Exit here if they wanted silent mode.
- test "$show" = : && exit $EXIT_SUCCESS
+ eval cmds=\"$old_archive_cmds\"
- $echo "X----------------------------------------------------------------------" | $Xsed
- $echo "Libraries have been installed in:"
- for libdir in $libdirs; do
- $echo " $libdir"
+ func_len " $cmds"
+ len=$func_len_result
+ if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+ cmds=$old_archive_cmds
+ else
+ # the command line is too long to link in one step, link in parts
+ func_verbose "using piecewise archive linking..."
+ save_RANLIB=$RANLIB
+ RANLIB=:
+ objlist=
+ concat_cmds=
+ save_oldobjs=$oldobjs
+ oldobjs=
+ # Is there a better way of finding the last object in the list?
+ for obj in $save_oldobjs
+ do
+ last_oldobj=$obj
+ done
+ eval test_cmds=\"$old_archive_cmds\"
+ func_len " $test_cmds"
+ len0=$func_len_result
+ len=$len0
+ for obj in $save_oldobjs
+ do
+ func_len " $obj"
+ func_arith $len + $func_len_result
+ len=$func_arith_result
+ func_append objlist " $obj"
+ if test "$len" -lt "$max_cmd_len"; then
+ :
+ else
+ # the above command should be used before it gets too long
+ oldobjs=$objlist
+ if test "$obj" = "$last_oldobj" ; then
+ RANLIB=$save_RANLIB
+ fi
+ test -z "$concat_cmds" || concat_cmds=$concat_cmds~
+ eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
+ objlist=
+ len=$len0
+ fi
+ done
+ RANLIB=$save_RANLIB
+ oldobjs=$objlist
+ if test "X$oldobjs" = "X" ; then
+ eval cmds=\"\$concat_cmds\"
+ else
+ eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
+ fi
+ fi
+ fi
+ func_execute_cmds "$cmds" 'exit $?'
done
- $echo
- $echo "If you ever happen to want to link against installed libraries"
- $echo "in a given directory, LIBDIR, you must either use libtool, and"
- $echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
- $echo "flag during linking and do at least one of the following:"
- if test -n "$shlibpath_var"; then
- $echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
- $echo " during execution"
- fi
- if test -n "$runpath_var"; then
- $echo " - add LIBDIR to the \`$runpath_var' environment variable"
- $echo " during linking"
- fi
- if test -n "$hardcode_libdir_flag_spec"; then
- libdir=LIBDIR
- eval flag=\"$hardcode_libdir_flag_spec\"
- $echo " - use the \`$flag' linker flag"
- fi
- if test -n "$admincmds"; then
- $echo " - have your system administrator run these commands:$admincmds"
- fi
- if test -f /etc/ld.so.conf; then
- $echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
- fi
- $echo
- $echo "See any operating system documentation about shared libraries for"
- $echo "more information, such as the ld(1) and ld.so(8) manual pages."
- $echo "X----------------------------------------------------------------------" | $Xsed
- exit $EXIT_SUCCESS
- ;;
-
- # libtool execute mode
- execute)
- modename="$modename: execute"
+ test -n "$generated" && \
+ func_show_eval "${RM}r$generated"
- # The first argument is the command name.
- cmd="$nonopt"
- if test -z "$cmd"; then
- $echo "$modename: you must specify a COMMAND" 1>&2
- $echo "$help"
- exit $EXIT_FAILURE
- fi
-
- # Handle -dlopen flags immediately.
- for file in $execute_dlfiles; do
- if test ! -f "$file"; then
- $echo "$modename: \`$file' is not a file" 1>&2
- $echo "$help" 1>&2
- exit $EXIT_FAILURE
- fi
+ # Now create the libtool archive.
+ case $output in
+ *.la)
+ old_library=
+ test "$build_old_libs" = yes && old_library="$libname.$libext"
+ func_verbose "creating $output"
- dir=
- case $file in
- *.la)
- # Check to see that this really is a libtool archive.
- if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
+ # Preserve any variables that may affect compiler behavior
+ for var in $variables_saved_for_relink; do
+ if eval test -z \"\${$var+set}\"; then
+ relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command"
+ elif eval var_value=\$$var; test -z "$var_value"; then
+ relink_command="$var=; export $var; $relink_command"
else
- $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
- $echo "$help" 1>&2
- exit $EXIT_FAILURE
+ func_quote_for_eval "$var_value"
+ relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
fi
+ done
+ # Quote the link command for shipping.
+ relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
+ relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+ if test "$hardcode_automatic" = yes ; then
+ relink_command=
+ fi
- # Read the libtool library.
- dlname=
- library_names=
+ # Only create the output if not a dry run.
+ $opt_dry_run || {
+ for installed in no yes; do
+ if test "$installed" = yes; then
+ if test -z "$install_libdir"; then
+ break
+ fi
+ output="$output_objdir/$outputname"i
+ # Replace all uninstalled libtool libraries with the installed ones
+ newdependency_libs=
+ for deplib in $dependency_libs; do
+ case $deplib in
+ *.la)
+ func_basename "$deplib"
+ name="$func_basename_result"
+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+ test -z "$libdir" && \
+ func_fatal_error "\`$deplib' is not a valid libtool archive"
+ newdependency_libs="$newdependency_libs $libdir/$name"
+ ;;
+ *) newdependency_libs="$newdependency_libs $deplib" ;;
+ esac
+ done
+ dependency_libs="$newdependency_libs"
+ newdlfiles=
+
+ for lib in $dlfiles; do
+ case $lib in
+ *.la)
+ func_basename "$lib"
+ name="$func_basename_result"
+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+ test -z "$libdir" && \
+ func_fatal_error "\`$lib' is not a valid libtool archive"
+ newdlfiles="$newdlfiles $libdir/$name"
+ ;;
+ *) newdlfiles="$newdlfiles $lib" ;;
+ esac
+ done
+ dlfiles="$newdlfiles"
+ newdlprefiles=
+ for lib in $dlprefiles; do
+ case $lib in
+ *.la)
+ # Only pass preopened files to the pseudo-archive (for
+ # eventual linking with the app. that links it) if we
+ # didn't already link the preopened objects directly into
+ # the library:
+ func_basename "$lib"
+ name="$func_basename_result"
+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+ test -z "$libdir" && \
+ func_fatal_error "\`$lib' is not a valid libtool archive"
+ newdlprefiles="$newdlprefiles $libdir/$name"
+ ;;
+ esac
+ done
+ dlprefiles="$newdlprefiles"
+ else
+ newdlfiles=
+ for lib in $dlfiles; do
+ case $lib in
+ [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
+ *) abs=`pwd`"/$lib" ;;
+ esac
+ newdlfiles="$newdlfiles $abs"
+ done
+ dlfiles="$newdlfiles"
+ newdlprefiles=
+ for lib in $dlprefiles; do
+ case $lib in
+ [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
+ *) abs=`pwd`"/$lib" ;;
+ esac
+ newdlprefiles="$newdlprefiles $abs"
+ done
+ dlprefiles="$newdlprefiles"
+ fi
+ $RM $output
+ # place dlname in correct position for cygwin
+ tdlname=$dlname
+ case $host,$output,$installed,$module,$dlname in
+ *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
+ esac
+ $ECHO > $output "\
+# $outputname - a libtool library file
+# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+#
+# Please DO NOT delete this file!
+# It is necessary for linking the library.
- # If there is no directory component, then add one.
- case $file in
- */* | *\\*) . $file ;;
- *) . ./$file ;;
- esac
+# The name that we can dlopen(3).
+dlname='$tdlname'
- # Skip this library if it cannot be dlopened.
- if test -z "$dlname"; then
- # Warn if it was a shared library.
- test -n "$library_names" && $echo "$modename: warning: \`$file' was not linked with \`-export-dynamic'"
- continue
- fi
+# Names of this library.
+library_names='$library_names'
- dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
- test "X$dir" = "X$file" && dir=.
+# The name of the static archive.
+old_library='$old_library'
- if test -f "$dir/$objdir/$dlname"; then
- dir="$dir/$objdir"
- else
- if test ! -f "$dir/$dlname"; then
- $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
- exit $EXIT_FAILURE
- fi
- fi
- ;;
+# Linker flags that can not go in dependency_libs.
+inherited_linker_flags='$new_inherited_linker_flags'
- *.lo)
- # Just add the directory containing the .lo file.
- dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
- test "X$dir" = "X$file" && dir=.
- ;;
+# Libraries that this one depends upon.
+dependency_libs='$dependency_libs'
- *)
- $echo "$modename: warning \`-dlopen' is ignored for non-libtool libraries and objects" 1>&2
- continue
- ;;
- esac
+# Names of additional weak libraries provided by this library
+weak_library_names='$weak_libs'
- # Get the absolute pathname.
- absdir=`cd "$dir" && pwd`
- test -n "$absdir" && dir="$absdir"
+# Version information for $libname.
+current=$current
+age=$age
+revision=$revision
- # Now add the directory to shlibpath_var.
- if eval "test -z \"\$$shlibpath_var\""; then
- eval "$shlibpath_var=\"\$dir\""
- else
- eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\""
- fi
- done
+# Is this an already installed library?
+installed=$installed
- # This variable tells wrapper scripts just to set shlibpath_var
- # rather than running their programs.
- libtool_execute_magic="$magic"
+# Should we warn about portability when linking against -modules?
+shouldnotlink=$module
- # Check if any of the arguments is a wrapper script.
- args=
- for file
- do
- case $file in
- -*) ;;
- *)
- # Do a test to see if this is really a libtool program.
- if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
- # If there is no directory component, then add one.
- case $file in
- */* | *\\*) . $file ;;
- *) . ./$file ;;
- esac
+# Files to dlopen/dlpreopen
+dlopen='$dlfiles'
+dlpreopen='$dlprefiles'
- # Transform arg to wrapped name.
- file="$progdir/$program"
- fi
- ;;
- esac
- # Quote arguments (to preserve shell metacharacters).
- file=`$echo "X$file" | $Xsed -e "$sed_quote_subst"`
- args="$args \"$file\""
- done
+# Directory that this library needs to be installed in:
+libdir='$install_libdir'"
+ if test "$installed" = no && test "$need_relink" = yes; then
+ $ECHO >> $output "\
+relink_command=\"$relink_command\""
+ fi
+ done
+ }
- if test -z "$run"; then
- if test -n "$shlibpath_var"; then
- # Export the shlibpath_var.
- eval "export $shlibpath_var"
- fi
+ # Do a symbolic link so that the libtool archive can be found in
+ # LD_LIBRARY_PATH before the program is installed.
+ func_show_eval '( cd "$output_objdir" && $RM "$outputname" && $LN_S "../$outputname" "$outputname" )' 'exit $?'
+ ;;
+ esac
+ exit $EXIT_SUCCESS
+}
- # Restore saved environment variables
- for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
- do
- eval "if test \"\${save_$lt_var+set}\" = set; then
- $lt_var=\$save_$lt_var; export $lt_var
- fi"
- done
+{ test "$mode" = link || test "$mode" = relink; } &&
+ func_mode_link ${1+"$@"}
- # Now prepare to actually exec the command.
- exec_cmd="\$cmd$args"
- else
- # Display what would be done.
- if test -n "$shlibpath_var"; then
- eval "\$echo \"\$shlibpath_var=\$$shlibpath_var\""
- $echo "export $shlibpath_var"
- fi
- $echo "$cmd$args"
- exit $EXIT_SUCCESS
- fi
- ;;
- # libtool clean and uninstall mode
- clean | uninstall)
- modename="$modename: $mode"
- rm="$nonopt"
+# func_mode_uninstall arg...
+func_mode_uninstall ()
+{
+ $opt_debug
+ RM="$nonopt"
files=
rmforce=
exit_status=0
@@ -6513,30 +8202,28 @@ relink_command=\"$relink_command\""
for arg
do
case $arg in
- -f) rm="$rm $arg"; rmforce=yes ;;
- -*) rm="$rm $arg" ;;
+ -f) RM="$RM $arg"; rmforce=yes ;;
+ -*) RM="$RM $arg" ;;
*) files="$files $arg" ;;
esac
done
- if test -z "$rm"; then
- $echo "$modename: you must specify an RM program" 1>&2
- $echo "$help" 1>&2
- exit $EXIT_FAILURE
- fi
+ test -z "$RM" && \
+ func_fatal_help "you must specify an RM program"
rmdirs=
origobjdir="$objdir"
for file in $files; do
- dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
- if test "X$dir" = "X$file"; then
- dir=.
+ func_dirname "$file" "" "."
+ dir="$func_dirname_result"
+ if test "X$dir" = X.; then
objdir="$origobjdir"
else
objdir="$dir/$origobjdir"
fi
- name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ func_basename "$file"
+ name="$func_basename_result"
test "$mode" = uninstall && objdir="$dir"
# Remember objdir for removal later, being careful to avoid duplicates
@@ -6548,9 +8235,9 @@ relink_command=\"$relink_command\""
fi
# Don't error if the file doesn't exist and rm -f was used.
- if (test -L "$file") >/dev/null 2>&1 \
- || (test -h "$file") >/dev/null 2>&1 \
- || test -f "$file"; then
+ if { test -L "$file"; } >/dev/null 2>&1 ||
+ { test -h "$file"; } >/dev/null 2>&1 ||
+ test -f "$file"; then
:
elif test -d "$file"; then
exit_status=1
@@ -6564,8 +8251,8 @@ relink_command=\"$relink_command\""
case $name in
*.la)
# Possibly a libtool archive, so verify it.
- if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
- . $dir/$name
+ if func_lalib_p "$file"; then
+ func_source $dir/$name
# Delete the libtool libraries and symlinks.
for n in $library_names; do
@@ -6580,39 +8267,17 @@ relink_command=\"$relink_command\""
*" $dlname "*) ;;
*) rmfiles="$rmfiles $objdir/$dlname" ;;
esac
- test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
+ test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
;;
uninstall)
if test -n "$library_names"; then
# Do each command in the postuninstall commands.
- cmds=$postuninstall_cmds
- save_ifs="$IFS"; IFS='~'
- for cmd in $cmds; do
- IFS="$save_ifs"
- eval cmd=\"$cmd\"
- $show "$cmd"
- $run eval "$cmd"
- if test "$?" -ne 0 && test "$rmforce" != yes; then
- exit_status=1
- fi
- done
- IFS="$save_ifs"
+ func_execute_cmds "$postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1'
fi
if test -n "$old_library"; then
# Do each command in the old_postuninstall commands.
- cmds=$old_postuninstall_cmds
- save_ifs="$IFS"; IFS='~'
- for cmd in $cmds; do
- IFS="$save_ifs"
- eval cmd=\"$cmd\"
- $show "$cmd"
- $run eval "$cmd"
- if test "$?" -ne 0 && test "$rmforce" != yes; then
- exit_status=1
- fi
- done
- IFS="$save_ifs"
+ func_execute_cmds "$old_postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1'
fi
# FIXME: should reinstall the best remaining shared library.
;;
@@ -6622,20 +8287,20 @@ relink_command=\"$relink_command\""
*.lo)
# Possibly a libtool object, so verify it.
- if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+ if func_lalib_p "$file"; then
# Read the .lo file
- . $dir/$name
+ func_source $dir/$name
# Add PIC object to the list of files to remove.
- if test -n "$pic_object" \
- && test "$pic_object" != none; then
+ if test -n "$pic_object" &&
+ test "$pic_object" != none; then
rmfiles="$rmfiles $dir/$pic_object"
fi
# Add non-PIC object to the list of files to remove.
- if test -n "$non_pic_object" \
- && test "$non_pic_object" != none; then
+ if test -n "$non_pic_object" &&
+ test "$non_pic_object" != none; then
rmfiles="$rmfiles $dir/$non_pic_object"
fi
fi
@@ -6646,17 +8311,26 @@ relink_command=\"$relink_command\""
noexename=$name
case $file in
*.exe)
- file=`$echo $file|${SED} 's,.exe$,,'`
- noexename=`$echo $name|${SED} 's,.exe$,,'`
+ func_stripname '' '.exe' "$file"
+ file=$func_stripname_result
+ func_stripname '' '.exe' "$name"
+ noexename=$func_stripname_result
# $file with .exe has already been added to rmfiles,
# add $file without .exe
rmfiles="$rmfiles $file"
;;
esac
# Do a test to see if this is a libtool program.
- if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
- relink_command=
- . $dir/$noexename
+ if func_ltwrapper_p "$file"; then
+ if func_ltwrapper_executable_p "$file"; then
+ func_ltwrapper_scriptname "$file"
+ relink_command=
+ func_source $func_ltwrapper_scriptname_result
+ rmfiles="$rmfiles $func_ltwrapper_scriptname_result"
+ else
+ relink_command=
+ func_source $dir/$noexename
+ fi
# note $name still contains .exe if it was in $file originally
# as does the version of $file that was added into $rmfiles
@@ -6671,239 +8345,38 @@ relink_command=\"$relink_command\""
fi
;;
esac
- $show "$rm $rmfiles"
- $run $rm $rmfiles || exit_status=1
+ func_show_eval "$RM $rmfiles" 'exit_status=1'
done
objdir="$origobjdir"
# Try to remove the ${objdir}s in the directories where we deleted files
for dir in $rmdirs; do
if test -d "$dir"; then
- $show "rmdir $dir"
- $run rmdir $dir >/dev/null 2>&1
+ func_show_eval "rmdir $dir >/dev/null 2>&1"
fi
done
exit $exit_status
- ;;
+}
- "")
- $echo "$modename: you must specify a MODE" 1>&2
- $echo "$generic_help" 1>&2
- exit $EXIT_FAILURE
- ;;
- esac
+{ test "$mode" = uninstall || test "$mode" = clean; } &&
+ func_mode_uninstall ${1+"$@"}
- if test -z "$exec_cmd"; then
- $echo "$modename: invalid operation mode \`$mode'" 1>&2
- $echo "$generic_help" 1>&2
- exit $EXIT_FAILURE
- fi
-fi # test -z "$show_help"
+test -z "$mode" && {
+ help="$generic_help"
+ func_fatal_help "you must specify a MODE"
+}
+
+test -z "$exec_cmd" && \
+ func_fatal_help "invalid operation mode \`$mode'"
if test -n "$exec_cmd"; then
- eval exec $exec_cmd
+ eval exec "$exec_cmd"
exit $EXIT_FAILURE
fi
-# We need to display help for each of the modes.
-case $mode in
-"") $echo \
-"Usage: $modename [OPTION]... [MODE-ARG]...
-
-Provide generalized library-building support services.
-
- --config show all configuration variables
- --debug enable verbose shell tracing
--n, --dry-run display commands without modifying any files
- --features display basic configuration information and exit
- --finish same as \`--mode=finish'
- --help display this help message and exit
- --mode=MODE use operation mode MODE [default=inferred from MODE-ARGS]
- --quiet same as \`--silent'
- --silent don't print informational messages
- --tag=TAG use configuration variables from tag TAG
- --version print version information
-
-MODE must be one of the following:
-
- clean remove files from the build directory
- compile compile a source file into a libtool object
- execute automatically set library path, then run a program
- finish complete the installation of libtool libraries
- install install libraries or executables
- link create a library or an executable
- uninstall remove libraries from an installed directory
-
-MODE-ARGS vary depending on the MODE. Try \`$modename --help --mode=MODE' for
-a more detailed description of MODE.
-
-Report bugs to <bug-libtool at gnu.org>."
- exit $EXIT_SUCCESS
- ;;
-
-clean)
- $echo \
-"Usage: $modename [OPTION]... --mode=clean RM [RM-OPTION]... FILE...
-
-Remove files from the build directory.
-
-RM is the name of the program to use to delete files associated with each FILE
-(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed
-to RM.
-
-If FILE is a libtool library, object or program, all the files associated
-with it are deleted. Otherwise, only FILE itself is deleted using RM."
- ;;
-
-compile)
- $echo \
-"Usage: $modename [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE
-
-Compile a source file into a libtool library object.
-
-This mode accepts the following additional options:
-
- -o OUTPUT-FILE set the output file name to OUTPUT-FILE
- -prefer-pic try to building PIC objects only
- -prefer-non-pic try to building non-PIC objects only
- -static always build a \`.o' file suitable for static linking
-
-COMPILE-COMMAND is a command to be used in creating a \`standard' object file
-from the given SOURCEFILE.
-
-The output file name is determined by removing the directory component from
-SOURCEFILE, then substituting the C source code suffix \`.c' with the
-library object suffix, \`.lo'."
- ;;
-
-execute)
- $echo \
-"Usage: $modename [OPTION]... --mode=execute COMMAND [ARGS]...
-
-Automatically set library path, then run a program.
-
-This mode accepts the following additional options:
-
- -dlopen FILE add the directory containing FILE to the library path
-
-This mode sets the library path environment variable according to \`-dlopen'
-flags.
-
-If any of the ARGS are libtool executable wrappers, then they are translated
-into their corresponding uninstalled binary, and any of their required library
-directories are added to the library path.
-
-Then, COMMAND is executed, with ARGS as arguments."
- ;;
-
-finish)
- $echo \
-"Usage: $modename [OPTION]... --mode=finish [LIBDIR]...
-
-Complete the installation of libtool libraries.
-
-Each LIBDIR is a directory that contains libtool libraries.
-
-The commands that this mode executes may require superuser privileges. Use
-the \`--dry-run' option if you just want to see what would be executed."
- ;;
-
-install)
- $echo \
-"Usage: $modename [OPTION]... --mode=install INSTALL-COMMAND...
-
-Install executables or libraries.
-
-INSTALL-COMMAND is the installation command. The first component should be
-either the \`install' or \`cp' program.
-
-The rest of the components are interpreted as arguments to that command (only
-BSD-compatible install options are recognized)."
- ;;
-
-link)
- $echo \
-"Usage: $modename [OPTION]... --mode=link LINK-COMMAND...
-
-Link object files or libraries together to form another library, or to
-create an executable program.
+exit $exit_status
-LINK-COMMAND is a command using the C compiler that you would use to create
-a program from several object files.
-
-The following components of LINK-COMMAND are treated specially:
-
- -all-static do not do any dynamic linking at all
- -avoid-version do not add a version suffix if possible
- -dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime
- -dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols
- -export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
- -export-symbols SYMFILE
- try to export only the symbols listed in SYMFILE
- -export-symbols-regex REGEX
- try to export only the symbols matching REGEX
- -LLIBDIR search LIBDIR for required installed libraries
- -lNAME OUTPUT-FILE requires the installed library libNAME
- -module build a library that can dlopened
- -no-fast-install disable the fast-install mode
- -no-install link a not-installable executable
- -no-undefined declare that a library does not refer to external symbols
- -o OUTPUT-FILE create OUTPUT-FILE from the specified objects
- -objectlist FILE Use a list of object files found in FILE to specify objects
- -precious-files-regex REGEX
- don't remove output files matching REGEX
- -release RELEASE specify package release information
- -rpath LIBDIR the created library will eventually be installed in LIBDIR
- -R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries
- -static do not do any dynamic linking of uninstalled libtool libraries
- -static-libtool-libs
- do not do any dynamic linking of libtool libraries
- -version-info CURRENT[:REVISION[:AGE]]
- specify library version info [each variable defaults to 0]
-
-All other options (arguments beginning with \`-') are ignored.
-
-Every other argument is treated as a filename. Files ending in \`.la' are
-treated as uninstalled libtool libraries, other files are standard or library
-object files.
-
-If the OUTPUT-FILE ends in \`.la', then a libtool library is created,
-only library objects (\`.lo' files) may be specified, and \`-rpath' is
-required, except when creating a convenience library.
-
-If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created
-using \`ar' and \`ranlib', or on Windows using \`lib'.
-
-If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file
-is created, otherwise an executable program is created."
- ;;
-
-uninstall)
- $echo \
-"Usage: $modename [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE...
-
-Remove libraries from an installation directory.
-
-RM is the name of the program to use to delete files associated with each FILE
-(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed
-to RM.
-
-If FILE is a libtool library, all the files associated with it are deleted.
-Otherwise, only FILE itself is deleted using RM."
- ;;
-
-*)
- $echo "$modename: invalid operation mode \`$mode'" 1>&2
- $echo "$help" 1>&2
- exit $EXIT_FAILURE
- ;;
-esac
-
-$echo
-$echo "Try \`$modename --help' for more information about other modes."
-
-exit $?
# The TAGs below are defined such that we never get into a situation
# in which we disable both kinds of libraries. Given conflicting
@@ -6917,14 +8390,17 @@ exit $?
# configuration. But we'll never go from static-only to shared-only.
# ### BEGIN LIBTOOL TAG CONFIG: disable-shared
-disable_libs=shared
+build_libtool_libs=no
+build_old_libs=yes
# ### END LIBTOOL TAG CONFIG: disable-shared
# ### BEGIN LIBTOOL TAG CONFIG: disable-static
-disable_libs=static
+build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac`
# ### END LIBTOOL TAG CONFIG: disable-static
# Local Variables:
# mode:shell-script
# sh-indentation:2
# End:
+# vi:sw=2
+
diff --git a/config/ltoptions.m4 b/config/ltoptions.m4
new file mode 100644
index 0000000..34151a3
--- /dev/null
+++ b/config/ltoptions.m4
@@ -0,0 +1,368 @@
+# Helper functions for option handling. -*- Autoconf -*-
+#
+# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
+# Written by Gary V. Vaughan, 2004
+#
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+
+# serial 6 ltoptions.m4
+
+# This is to help aclocal find these macros, as it can't see m4_define.
+AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
+
+
+# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME)
+# ------------------------------------------
+m4_define([_LT_MANGLE_OPTION],
+[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])])
+
+
+# _LT_SET_OPTION(MACRO-NAME, OPTION-NAME)
+# ---------------------------------------
+# Set option OPTION-NAME for macro MACRO-NAME, and if there is a
+# matching handler defined, dispatch to it. Other OPTION-NAMEs are
+# saved as a flag.
+m4_define([_LT_SET_OPTION],
+[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl
+m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]),
+ _LT_MANGLE_DEFUN([$1], [$2]),
+ [m4_warning([Unknown $1 option `$2'])])[]dnl
+])
+
+
+# _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, [IF-NOT-SET])
+# ------------------------------------------------------------
+# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
+m4_define([_LT_IF_OPTION],
+[m4_ifdef(_LT_MANGLE_OPTION([$1], [$2]), [$3], [$4])])
+
+
+# _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET)
+# -------------------------------------------------------
+# Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME
+# are set.
+m4_define([_LT_UNLESS_OPTIONS],
+[m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
+ [m4_ifdef(_LT_MANGLE_OPTION([$1], _LT_Option),
+ [m4_define([$0_found])])])[]dnl
+m4_ifdef([$0_found], [m4_undefine([$0_found])], [$3
+])[]dnl
+])
+
+
+# _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST)
+# ----------------------------------------
+# OPTION-LIST is a space-separated list of Libtool options associated
+# with MACRO-NAME. If any OPTION has a matching handler declared with
+# LT_OPTION_DEFINE, dispatch to that macro; otherwise complain about
+# the unknown option and exit.
+m4_defun([_LT_SET_OPTIONS],
+[# Set options
+m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
+ [_LT_SET_OPTION([$1], _LT_Option)])
+
+m4_if([$1],[LT_INIT],[
+ dnl
+ dnl Simply set some default values (i.e off) if boolean options were not
+ dnl specified:
+ _LT_UNLESS_OPTIONS([LT_INIT], [dlopen], [enable_dlopen=no
+ ])
+ _LT_UNLESS_OPTIONS([LT_INIT], [win32-dll], [enable_win32_dll=no
+ ])
+ dnl
+ dnl If no reference was made to various pairs of opposing options, then
+ dnl we run the default mode handler for the pair. For example, if neither
+ dnl `shared' nor `disable-shared' was passed, we enable building of shared
+ dnl archives by default:
+ _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED])
+ _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC])
+ _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC])
+ _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install],
+ [_LT_ENABLE_FAST_INSTALL])
+ ])
+])# _LT_SET_OPTIONS
+
+
+## --------------------------------- ##
+## Macros to handle LT_INIT options. ##
+## --------------------------------- ##
+
+# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME)
+# -----------------------------------------
+m4_define([_LT_MANGLE_DEFUN],
+[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])])
+
+
+# LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE)
+# -----------------------------------------------
+m4_define([LT_OPTION_DEFINE],
+[m4_define(_LT_MANGLE_DEFUN([$1], [$2]), [$3])[]dnl
+])# LT_OPTION_DEFINE
+
+
+# dlopen
+# ------
+LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes
+])
+
+AU_DEFUN([AC_LIBTOOL_DLOPEN],
+[_LT_SET_OPTION([LT_INIT], [dlopen])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you
+put the `dlopen' option into LT_INIT's first parameter.])
+])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], [])
+
+
+# win32-dll
+# ---------
+# Declare package support for building win32 dll's.
+LT_OPTION_DEFINE([LT_INIT], [win32-dll],
+[enable_win32_dll=yes
+
+case $host in
+*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)
+ AC_CHECK_TOOL(AS, as, false)
+ AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+ AC_CHECK_TOOL(OBJDUMP, objdump, false)
+ ;;
+esac
+
+test -z "$AS" && AS=as
+_LT_DECL([], [AS], [0], [Assembler program])dnl
+
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl
+
+test -z "$OBJDUMP" && OBJDUMP=objdump
+_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl
+])# win32-dll
+
+AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+_LT_SET_OPTION([LT_INIT], [win32-dll])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you
+put the `win32-dll' option into LT_INIT's first parameter.])
+])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [])
+
+
+# _LT_ENABLE_SHARED([DEFAULT])
+# ----------------------------
+# implement the --enable-shared flag, and supports the `shared' and
+# `disable-shared' LT_INIT options.
+# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
+m4_define([_LT_ENABLE_SHARED],
+[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl
+AC_ARG_ENABLE([shared],
+ [AS_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
+ [build shared libraries @<:@default=]_LT_ENABLE_SHARED_DEFAULT[@:>@])],
+ [p=${PACKAGE-default}
+ case $enableval in
+ yes) enable_shared=yes ;;
+ no) enable_shared=no ;;
+ *)
+ enable_shared=no
+ # Look at the argument we got. We use all the common list separators.
+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+ for pkg in $enableval; do
+ IFS="$lt_save_ifs"
+ if test "X$pkg" = "X$p"; then
+ enable_shared=yes
+ fi
+ done
+ IFS="$lt_save_ifs"
+ ;;
+ esac],
+ [enable_shared=]_LT_ENABLE_SHARED_DEFAULT)
+
+ _LT_DECL([build_libtool_libs], [enable_shared], [0],
+ [Whether or not to build shared libraries])
+])# _LT_ENABLE_SHARED
+
+LT_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])])
+LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])])
+
+# Old names:
+AC_DEFUN([AC_ENABLE_SHARED],
+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared])
+])
+
+AC_DEFUN([AC_DISABLE_SHARED],
+[_LT_SET_OPTION([LT_INIT], [disable-shared])
+])
+
+AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)])
+AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AM_ENABLE_SHARED], [])
+dnl AC_DEFUN([AM_DISABLE_SHARED], [])
+
+
+
+# _LT_ENABLE_STATIC([DEFAULT])
+# ----------------------------
+# implement the --enable-static flag, and support the `static' and
+# `disable-static' LT_INIT options.
+# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
+m4_define([_LT_ENABLE_STATIC],
+[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl
+AC_ARG_ENABLE([static],
+ [AS_HELP_STRING([--enable-static@<:@=PKGS@:>@],
+ [build static libraries @<:@default=]_LT_ENABLE_STATIC_DEFAULT[@:>@])],
+ [p=${PACKAGE-default}
+ case $enableval in
+ yes) enable_static=yes ;;
+ no) enable_static=no ;;
+ *)
+ enable_static=no
+ # Look at the argument we got. We use all the common list separators.
+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+ for pkg in $enableval; do
+ IFS="$lt_save_ifs"
+ if test "X$pkg" = "X$p"; then
+ enable_static=yes
+ fi
+ done
+ IFS="$lt_save_ifs"
+ ;;
+ esac],
+ [enable_static=]_LT_ENABLE_STATIC_DEFAULT)
+
+ _LT_DECL([build_old_libs], [enable_static], [0],
+ [Whether or not to build static libraries])
+])# _LT_ENABLE_STATIC
+
+LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])])
+LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])])
+
+# Old names:
+AC_DEFUN([AC_ENABLE_STATIC],
+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static])
+])
+
+AC_DEFUN([AC_DISABLE_STATIC],
+[_LT_SET_OPTION([LT_INIT], [disable-static])
+])
+
+AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)])
+AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AM_ENABLE_STATIC], [])
+dnl AC_DEFUN([AM_DISABLE_STATIC], [])
+
+
+
+# _LT_ENABLE_FAST_INSTALL([DEFAULT])
+# ----------------------------------
+# implement the --enable-fast-install flag, and support the `fast-install'
+# and `disable-fast-install' LT_INIT options.
+# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
+m4_define([_LT_ENABLE_FAST_INSTALL],
+[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl
+AC_ARG_ENABLE([fast-install],
+ [AS_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
+ [optimize for fast installation @<:@default=]_LT_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
+ [p=${PACKAGE-default}
+ case $enableval in
+ yes) enable_fast_install=yes ;;
+ no) enable_fast_install=no ;;
+ *)
+ enable_fast_install=no
+ # Look at the argument we got. We use all the common list separators.
+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+ for pkg in $enableval; do
+ IFS="$lt_save_ifs"
+ if test "X$pkg" = "X$p"; then
+ enable_fast_install=yes
+ fi
+ done
+ IFS="$lt_save_ifs"
+ ;;
+ esac],
+ [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT)
+
+_LT_DECL([fast_install], [enable_fast_install], [0],
+ [Whether or not to optimize for fast installation])dnl
+])# _LT_ENABLE_FAST_INSTALL
+
+LT_OPTION_DEFINE([LT_INIT], [fast-install], [_LT_ENABLE_FAST_INSTALL([yes])])
+LT_OPTION_DEFINE([LT_INIT], [disable-fast-install], [_LT_ENABLE_FAST_INSTALL([no])])
+
+# Old names:
+AU_DEFUN([AC_ENABLE_FAST_INSTALL],
+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you put
+the `fast-install' option into LT_INIT's first parameter.])
+])
+
+AU_DEFUN([AC_DISABLE_FAST_INSTALL],
+[_LT_SET_OPTION([LT_INIT], [disable-fast-install])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you put
+the `disable-fast-install' option into LT_INIT's first parameter.])
+])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], [])
+dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])
+
+
+# _LT_WITH_PIC([MODE])
+# --------------------
+# implement the --with-pic flag, and support the `pic-only' and `no-pic'
+# LT_INIT options.
+# MODE is either `yes' or `no'. If omitted, it defaults to `both'.
+m4_define([_LT_WITH_PIC],
+[AC_ARG_WITH([pic],
+ [AS_HELP_STRING([--with-pic],
+ [try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
+ [pic_mode="$withval"],
+ [pic_mode=default])
+
+test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
+
+_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl
+])# _LT_WITH_PIC
+
+LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])])
+LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])])
+
+# Old name:
+AU_DEFUN([AC_LIBTOOL_PICMODE],
+[_LT_SET_OPTION([LT_INIT], [pic-only])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you
+put the `pic-only' option into LT_INIT's first parameter.])
+])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_PICMODE], [])
+
+## ----------------- ##
+## LTDL_INIT Options ##
+## ----------------- ##
+
+m4_define([_LTDL_MODE], [])
+LT_OPTION_DEFINE([LTDL_INIT], [nonrecursive],
+ [m4_define([_LTDL_MODE], [nonrecursive])])
+LT_OPTION_DEFINE([LTDL_INIT], [recursive],
+ [m4_define([_LTDL_MODE], [recursive])])
+LT_OPTION_DEFINE([LTDL_INIT], [subproject],
+ [m4_define([_LTDL_MODE], [subproject])])
+
+m4_define([_LTDL_TYPE], [])
+LT_OPTION_DEFINE([LTDL_INIT], [installable],
+ [m4_define([_LTDL_TYPE], [installable])])
+LT_OPTION_DEFINE([LTDL_INIT], [convenience],
+ [m4_define([_LTDL_TYPE], [convenience])])
diff --git a/config/ltsugar.m4 b/config/ltsugar.m4
new file mode 100644
index 0000000..9000a05
--- /dev/null
+++ b/config/ltsugar.m4
@@ -0,0 +1,123 @@
+# ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*-
+#
+# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
+# Written by Gary V. Vaughan, 2004
+#
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+
+# serial 6 ltsugar.m4
+
+# This is to help aclocal find these macros, as it can't see m4_define.
+AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])])
+
+
+# lt_join(SEP, ARG1, [ARG2...])
+# -----------------------------
+# Produce ARG1SEPARG2...SEPARGn, omitting [] arguments and their
+# associated separator.
+# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier
+# versions in m4sugar had bugs.
+m4_define([lt_join],
+[m4_if([$#], [1], [],
+ [$#], [2], [[$2]],
+ [m4_if([$2], [], [], [[$2]_])$0([$1], m4_shift(m4_shift($@)))])])
+m4_define([_lt_join],
+[m4_if([$#$2], [2], [],
+ [m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift(m4_shift($@)))])])
+
+
+# lt_car(LIST)
+# lt_cdr(LIST)
+# ------------
+# Manipulate m4 lists.
+# These macros are necessary as long as will still need to support
+# Autoconf-2.59 which quotes differently.
+m4_define([lt_car], [[$1]])
+m4_define([lt_cdr],
+[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])],
+ [$#], 1, [],
+ [m4_dquote(m4_shift($@))])])
+m4_define([lt_unquote], $1)
+
+
+# lt_append(MACRO-NAME, STRING, [SEPARATOR])
+# ------------------------------------------
+# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'.
+# Note that neither SEPARATOR nor STRING are expanded; they are appended
+# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked).
+# No SEPARATOR is output if MACRO-NAME was previously undefined (different
+# than defined and empty).
+#
+# This macro is needed until we can rely on Autoconf 2.62, since earlier
+# versions of m4sugar mistakenly expanded SEPARATOR but not STRING.
+m4_define([lt_append],
+[m4_define([$1],
+ m4_ifdef([$1], [m4_defn([$1])[$3]])[$2])])
+
+
+
+# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...])
+# ----------------------------------------------------------
+# Produce a SEP delimited list of all paired combinations of elements of
+# PREFIX-LIST with SUFFIX1 through SUFFIXn. Each element of the list
+# has the form PREFIXmINFIXSUFFIXn.
+# Needed until we can rely on m4_combine added in Autoconf 2.62.
+m4_define([lt_combine],
+[m4_if(m4_eval([$# > 3]), [1],
+ [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl
+[[m4_foreach([_Lt_prefix], [$2],
+ [m4_foreach([_Lt_suffix],
+ ]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[,
+ [_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])])
+
+
+# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ])
+# -----------------------------------------------------------------------
+# Iff MACRO-NAME does not yet contain VARNAME, then append it (delimited
+# by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ.
+m4_define([lt_if_append_uniq],
+[m4_ifdef([$1],
+ [m4_if(m4_index([$3]m4_defn([$1])[$3], [$3$2$3]), [-1],
+ [lt_append([$1], [$2], [$3])$4],
+ [$5])],
+ [lt_append([$1], [$2], [$3])$4])])
+
+
+# lt_dict_add(DICT, KEY, VALUE)
+# -----------------------------
+m4_define([lt_dict_add],
+[m4_define([$1($2)], [$3])])
+
+
+# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE)
+# --------------------------------------------
+m4_define([lt_dict_add_subkey],
+[m4_define([$1($2:$3)], [$4])])
+
+
+# lt_dict_fetch(DICT, KEY, [SUBKEY])
+# ----------------------------------
+m4_define([lt_dict_fetch],
+[m4_ifval([$3],
+ m4_ifdef([$1($2:$3)], [m4_defn([$1($2:$3)])]),
+ m4_ifdef([$1($2)], [m4_defn([$1($2)])]))])
+
+
+# lt_if_dict_fetch(DICT, KEY, [SUBKEY], VALUE, IF-TRUE, [IF-FALSE])
+# -----------------------------------------------------------------
+m4_define([lt_if_dict_fetch],
+[m4_if(lt_dict_fetch([$1], [$2], [$3]), [$4],
+ [$5],
+ [$6])])
+
+
+# lt_dict_filter(DICT, [SUBKEY], VALUE, [SEPARATOR], KEY, [...])
+# --------------------------------------------------------------
+m4_define([lt_dict_filter],
+[m4_if([$5], [], [],
+ [lt_join(m4_quote(m4_default([$4], [[, ]])),
+ lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]),
+ [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl
+])
diff --git a/config/ltversion.m4 b/config/ltversion.m4
new file mode 100644
index 0000000..f3c5309
--- /dev/null
+++ b/config/ltversion.m4
@@ -0,0 +1,23 @@
+# ltversion.m4 -- version numbers -*- Autoconf -*-
+#
+# Copyright (C) 2004 Free Software Foundation, Inc.
+# Written by Scott James Remnant, 2004
+#
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+
+# Generated from ltversion.in.
+
+# serial 3017 ltversion.m4
+# This file is part of GNU Libtool
+
+m4_define([LT_PACKAGE_VERSION], [2.2.6b])
+m4_define([LT_PACKAGE_REVISION], [1.3017])
+
+AC_DEFUN([LTVERSION_VERSION],
+[macro_version='2.2.6b'
+macro_revision='1.3017'
+_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
+_LT_DECL(, macro_revision, 0)
+])
diff --git a/config/lt~obsolete.m4 b/config/lt~obsolete.m4
new file mode 100644
index 0000000..637bb20
--- /dev/null
+++ b/config/lt~obsolete.m4
@@ -0,0 +1,92 @@
+# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*-
+#
+# Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc.
+# Written by Scott James Remnant, 2004.
+#
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+
+# serial 4 lt~obsolete.m4
+
+# These exist entirely to fool aclocal when bootstrapping libtool.
+#
+# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN)
+# which have later been changed to m4_define as they aren't part of the
+# exported API, or moved to Autoconf or Automake where they belong.
+#
+# The trouble is, aclocal is a bit thick. It'll see the old AC_DEFUN
+# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us
+# using a macro with the same name in our local m4/libtool.m4 it'll
+# pull the old libtool.m4 in (it doesn't see our shiny new m4_define
+# and doesn't know about Autoconf macros at all.)
+#
+# So we provide this file, which has a silly filename so it's always
+# included after everything else. This provides aclocal with the
+# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything
+# because those macros already exist, or will be overwritten later.
+# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6.
+#
+# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here.
+# Yes, that means every name once taken will need to remain here until
+# we give up compatibility with versions before 1.7, at which point
+# we need to keep only those names which we still refer to.
+
+# This is to help aclocal find these macros, as it can't see m4_define.
+AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])])
+
+m4_ifndef([AC_LIBTOOL_LINKER_OPTION], [AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])])
+m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP])])
+m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])])
+m4_ifndef([_LT_AC_SHELL_INIT], [AC_DEFUN([_LT_AC_SHELL_INIT])])
+m4_ifndef([_LT_AC_SYS_LIBPATH_AIX], [AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])])
+m4_ifndef([_LT_PROG_LTMAIN], [AC_DEFUN([_LT_PROG_LTMAIN])])
+m4_ifndef([_LT_AC_TAGVAR], [AC_DEFUN([_LT_AC_TAGVAR])])
+m4_ifndef([AC_LTDL_ENABLE_INSTALL], [AC_DEFUN([AC_LTDL_ENABLE_INSTALL])])
+m4_ifndef([AC_LTDL_PREOPEN], [AC_DEFUN([AC_LTDL_PREOPEN])])
+m4_ifndef([_LT_AC_SYS_COMPILER], [AC_DEFUN([_LT_AC_SYS_COMPILER])])
+m4_ifndef([_LT_AC_LOCK], [AC_DEFUN([_LT_AC_LOCK])])
+m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE], [AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])])
+m4_ifndef([_LT_AC_TRY_DLOPEN_SELF], [AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])])
+m4_ifndef([AC_LIBTOOL_PROG_CC_C_O], [AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])])
+m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])])
+m4_ifndef([AC_LIBTOOL_OBJDIR], [AC_DEFUN([AC_LIBTOOL_OBJDIR])])
+m4_ifndef([AC_LTDL_OBJDIR], [AC_DEFUN([AC_LTDL_OBJDIR])])
+m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])])
+m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP], [AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])])
+m4_ifndef([AC_PATH_MAGIC], [AC_DEFUN([AC_PATH_MAGIC])])
+m4_ifndef([AC_PROG_LD_GNU], [AC_DEFUN([AC_PROG_LD_GNU])])
+m4_ifndef([AC_PROG_LD_RELOAD_FLAG], [AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])])
+m4_ifndef([AC_DEPLIBS_CHECK_METHOD], [AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])])
+m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])])
+m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])])
+m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])])
+m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS], [AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])])
+m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP], [AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])])
+m4_ifndef([LT_AC_PROG_EGREP], [AC_DEFUN([LT_AC_PROG_EGREP])])
+m4_ifndef([LT_AC_PROG_SED], [AC_DEFUN([LT_AC_PROG_SED])])
+m4_ifndef([_LT_CC_BASENAME], [AC_DEFUN([_LT_CC_BASENAME])])
+m4_ifndef([_LT_COMPILER_BOILERPLATE], [AC_DEFUN([_LT_COMPILER_BOILERPLATE])])
+m4_ifndef([_LT_LINKER_BOILERPLATE], [AC_DEFUN([_LT_LINKER_BOILERPLATE])])
+m4_ifndef([_AC_PROG_LIBTOOL], [AC_DEFUN([_AC_PROG_LIBTOOL])])
+m4_ifndef([AC_LIBTOOL_SETUP], [AC_DEFUN([AC_LIBTOOL_SETUP])])
+m4_ifndef([_LT_AC_CHECK_DLFCN], [AC_DEFUN([_LT_AC_CHECK_DLFCN])])
+m4_ifndef([AC_LIBTOOL_SYS_DYNAMIC_LINKER], [AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])])
+m4_ifndef([_LT_AC_TAGCONFIG], [AC_DEFUN([_LT_AC_TAGCONFIG])])
+m4_ifndef([AC_DISABLE_FAST_INSTALL], [AC_DEFUN([AC_DISABLE_FAST_INSTALL])])
+m4_ifndef([_LT_AC_LANG_CXX], [AC_DEFUN([_LT_AC_LANG_CXX])])
+m4_ifndef([_LT_AC_LANG_F77], [AC_DEFUN([_LT_AC_LANG_F77])])
+m4_ifndef([_LT_AC_LANG_GCJ], [AC_DEFUN([_LT_AC_LANG_GCJ])])
+m4_ifndef([AC_LIBTOOL_RC], [AC_DEFUN([AC_LIBTOOL_RC])])
+m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])])
+m4_ifndef([_LT_AC_LANG_C_CONFIG], [AC_DEFUN([_LT_AC_LANG_C_CONFIG])])
+m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])])
+m4_ifndef([_LT_AC_LANG_CXX_CONFIG], [AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])])
+m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])])
+m4_ifndef([_LT_AC_LANG_F77_CONFIG], [AC_DEFUN([_LT_AC_LANG_F77_CONFIG])])
+m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])])
+m4_ifndef([_LT_AC_LANG_GCJ_CONFIG], [AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])])
+m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])])
+m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
+m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])])
+m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
diff --git a/config/missing b/config/missing
index 1c8ff70..28055d2 100755
--- a/config/missing
+++ b/config/missing
@@ -1,10 +1,10 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2006-05-10.23
+scriptversion=2009-04-28.21; # UTC
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
+# 2008, 2009 Free Software Foundation, Inc.
# Originally by Fran,cois Pinard <pinard at iro.umontreal.ca>, 1996.
# This program is free software; you can redistribute it and/or modify
@@ -18,9 +18,7 @@ scriptversion=2006-05-10.23
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -89,6 +87,9 @@ Supported PROGRAM values:
tar try tar, gnutar, gtar, then tar without non-portable flags
yacc create \`y.tab.[ch]', if possible, from existing .[ch]
+Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
+\`g' are ignored when checking the name.
+
Send bug reports to <bug-automake at gnu.org>."
exit $?
;;
@@ -106,15 +107,22 @@ Send bug reports to <bug-automake at gnu.org>."
esac
+# normalize program name to check for.
+program=`echo "$1" | sed '
+ s/^gnu-//; t
+ s/^gnu//; t
+ s/^g//; t'`
+
# Now exit if we have it, but it failed. Also exit now if we
# don't have it and --version was passed (most likely to detect
-# the program).
+# the program). This is about non-GNU programs, so use $1 not
+# $program.
case $1 in
- lex|yacc)
+ lex*|yacc*)
# Not GNU programs, they don't have --version.
;;
- tar)
+ tar*)
if test -n "$run"; then
echo 1>&2 "ERROR: \`tar' requires --run"
exit 1
@@ -138,7 +146,7 @@ esac
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case $1 in
+case $program in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -148,7 +156,7 @@ WARNING: \`$1' is $msg. You should only need it if
touch aclocal.m4
;;
- autoconf)
+ autoconf*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified \`${configure_ac}'. You might want to install the
@@ -157,7 +165,7 @@ WARNING: \`$1' is $msg. You should only need it if
touch configure
;;
- autoheader)
+ autoheader*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified \`acconfig.h' or \`${configure_ac}'. You might want
@@ -187,7 +195,7 @@ WARNING: \`$1' is $msg. You should only need it if
while read f; do touch "$f"; done
;;
- autom4te)
+ autom4te*)
echo 1>&2 "\
WARNING: \`$1' is needed, but is $msg.
You might have modified some files without having the
@@ -210,7 +218,7 @@ WARNING: \`$1' is needed, but is $msg.
fi
;;
- bison|yacc)
+ bison*|yacc*)
echo 1>&2 "\
WARNING: \`$1' $msg. You should only need it if
you modified a \`.y' file. You may need the \`Bison' package
@@ -240,7 +248,7 @@ WARNING: \`$1' $msg. You should only need it if
fi
;;
- lex|flex)
+ lex*|flex*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a \`.l' file. You may need the \`Flex' package
@@ -263,7 +271,7 @@ WARNING: \`$1' is $msg. You should only need it if
fi
;;
- help2man)
+ help2man*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a dependency of a manual page. You may need the
@@ -277,11 +285,11 @@ WARNING: \`$1' is $msg. You should only need it if
else
test -z "$file" || exec >$file
echo ".ab help2man is required to generate this page"
- exit 1
+ exit $?
fi
;;
- makeinfo)
+ makeinfo*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a \`.texi' or \`.texinfo' file, or any other file
@@ -310,7 +318,7 @@ WARNING: \`$1' is $msg. You should only need it if
touch $file
;;
- tar)
+ tar*)
shift
# We have already tried tar in the generic part.
@@ -363,5 +371,6 @@ exit 0
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
# End:
diff --git a/config/mkinc b/config/mkinc
index 636e6b7..6f5a591 100755
--- a/config/mkinc
+++ b/config/mkinc
@@ -81,6 +81,7 @@ $0 = shift @ARGV;
#
# mv silo.inc silo.inc~
# mkinc < silo.h > silo.inc
+# cat silo.h silo_f.h | ../../config/mkinc > silo.inc
#
# Programmer: Robb Matzke, Wed Nov 30 10:44:43 PST 1994
#
@@ -114,6 +115,10 @@ $0 = shift @ARGV;
# Thomas R. Treadway, Thu Oct 11 15:21:03 PDT 2007
# Modfied to handle new Fortran name-mangling
#
+# Olivier Cessenat, Sat Sep 25 12:14:45 CEST 2010
+# Right hand side values computed so that couples (name,value) fit
+# within 72 characters to hold on a single unwrapped line.
+#
#########################################################################
@@ -122,6 +127,7 @@ local ($sdx) = 0;
local($enum_body) = 0;
local($brace_level) = 0;
+local(%vals) = () ;
### Gather the info...
while (<>) {
@@ -279,7 +285,36 @@ foreach $var (@temparray) {
local ($g1, $g2) = split ( '\)', $bar);
$value = "DB_HDF5X+$g1*2048";
}
- $line = sprintf(" parameter (%-25s = %-15s)", $name, $value);
+ # Evaluate the RHS using array %vals:
+ if ($value =~ /^\d+$/) {
+ $vals{$name} = $value ;
+ } else {
+ # Let us look at the RHS expression:
+ my $rhs = $value ;
+ my $nhs = "" ;
+ while($rhs =~ /(.*?)(\w+)(.*)/i) {
+ # $nhs .= $1 . '${' . $2 . '}' ;
+ if (exists $vals{$2}) {
+ $nhs .= $1 . $vals{$2} ;
+ } else {
+ # print STDERR "KO var $2\n" ;
+ $nhs .= $1 . $2 ;
+ }
+ $rhs = $3 ;
+ }
+ $nhs .= $rhs ;
+ my $aval = eval("$nhs") ;
+ $vals{$name} = $aval unless (exists $vals{$name}) ;
+ # print STDERR "nhs = $nhs, val=$aval (line=$.:$value)\n" ;
+ }
+ # Replace the old symbolic value with the new perl evaluated one:
+ unless ($name =~ /DB_F77NULL/) {
+ $value = $vals{$name} if (exists $vals{$name}) ;
+ }
+ # Why make the line human readable whereas it only needs be compiler compliant ?
+ # $line = sprintf(" parameter (%-25s = %-15s)", $name, $value);
+ # Written in a FORTRAN 77/Fortran 90 manner:
+ $line = sprintf(" parameter(%s=%s)", $name, $value);
if (length($line)>72) {
local $off=0;
while ($off < length($line)) {
diff --git a/config/mklite b/config/mklite
new file mode 100755
index 0000000..f9394a9
--- /dev/null
+++ b/config/mklite
@@ -0,0 +1,85 @@
+#!/usr/bin/perl
+
+#
+# Tool to generate lite_pdb.h file from pdb.h and score.h headers.
+#
+# Mark C. Miller, Tue Jan 22 13:07:48 PST 2013
+#
+#
+
+#
+# usage block
+#
+sub usage {
+ print "$0 <input header file path> <output LITE header file path>\n";
+ exit 1;
+}
+
+#
+# Function to generate LITE header
+#
+sub genlite {
+ local(@apimap);
+ local(@hdrlines);
+
+ #
+ # Build the API mapping macros that map "PD_<whatever>" to "lite_PD_<whatever>"
+ #
+ open(my $hdrfile, "<", $infile) or die "Can't open \"$infile\": $!";
+ while (<$hdrfile>) {
+ push(@hdrlines,$_);
+ if (/NOT_LITE_API/) {
+ # skip these lines
+ }
+ elsif (/_lite/) {
+ # skip these lines
+ }
+ elsif (/extern(.*)[ *]*lite_([a-zA-Z0-9_]*)\s?[[(;](.*)/) {
+ push(@apimap, "#define $2 lite_$2\n");
+ } else {
+ }
+ }
+ close $hdrfile or die "$hdrfile: $!";
+
+ #
+ # Generate lite header file
+ #
+ open(my $litehdrfile, ">", $outfile) or die "Can't open \"$outfile\": $!";
+ local($line) = 0;
+ foreach (@hdrlines) {
+ if (/^#ifndef _(PDB|SCORE)_H/) {
+ print $litehdrfile "#ifndef _LITE_$1_H\n";
+ }
+ elsif (/^#define _(PDB|SCORE)_H/) {
+ print $litehdrfile "#define _LITE_$1_H\n";
+ }
+ elsif (/^#include "score.h"\s*(.*)$/) {
+ print $litehdrfile "#include \"lite_score.h\" $1\n";
+ }
+ elsif (/^#include "config.h"/) {
+ # skip this line
+ }
+ elsif (/INSERT FUNCTION NAME MAPPING MACROS HERE/) {
+ foreach (@apimap) {
+ print $litehdrfile $_;
+ }
+ }
+ else {
+ print $litehdrfile $_;
+ }
+ }
+}
+
+local($infile) = $ARGV[0];
+local($outfile) = $ARGV[1];
+local($ispdb) = 0;
+
+if ($infile eq "" || $outfile eq "") {
+ usage();
+}
+
+if ($infile =~ /pdb/) {
+ $ispdb = 1;
+}
+
+genlite();
diff --git a/config/vl_lib_readline.m4 b/config/vl_lib_readline.m4
new file mode 100644
index 0000000..ea2539b
--- /dev/null
+++ b/config/vl_lib_readline.m4
@@ -0,0 +1,106 @@
+##### http://autoconf-archive.cryp.to/vl_lib_readline.html
+#
+# SYNOPSIS
+#
+# VL_LIB_READLINE
+#
+# DESCRIPTION
+#
+# Searches for a readline compatible library. If found, defines
+# `HAVE_LIBREADLINE'. If the found library has the `add_history'
+# function, sets also `HAVE_READLINE_HISTORY'. Also checks for the
+# locations of the necessary include files and sets `HAVE_READLINE_H'
+# or `HAVE_READLINE_READLINE_H' and `HAVE_READLINE_HISTORY_H' or
+# 'HAVE_HISTORY_H' if the corresponding include files exists.
+#
+# The libraries that may be readline compatible are `libedit',
+# `libeditline' and `libreadline'. Sometimes we need to link a
+# termcap library for readline to work, this macro tests these cases
+# too by trying to link with `libtermcap', `libcurses' or
+# `libncurses' before giving up.
+#
+# Here is an example of how to use the information provided by this
+# macro to perform the necessary includes or declarations in a C
+# file:
+#
+# #ifdef HAVE_LIBREADLINE
+# # if defined(HAVE_READLINE_READLINE_H)
+# # include <readline/readline.h>
+# # elif defined(HAVE_READLINE_H)
+# # include <readline.h>
+# # else /* !defined(HAVE_READLINE_H) */
+# extern char *readline ();
+# # endif /* !defined(HAVE_READLINE_H) */
+# char *cmdline = NULL;
+# #else /* !defined(HAVE_READLINE_READLINE_H) */
+# /* no readline */
+# #endif /* HAVE_LIBREADLINE */
+#
+# #ifdef HAVE_READLINE_HISTORY
+# # if defined(HAVE_READLINE_HISTORY_H)
+# # include <readline/history.h>
+# # elif defined(HAVE_HISTORY_H)
+# # include <history.h>
+# # else /* !defined(HAVE_HISTORY_H) */
+# extern void add_history ();
+# extern int write_history ();
+# extern int read_history ();
+# # endif /* defined(HAVE_READLINE_HISTORY_H) */
+# /* no history */
+# #endif /* HAVE_READLINE_HISTORY */
+#
+# LAST MODIFICATION
+#
+# 2002-04-04
+#
+# COPYLEFT
+#
+# Copyright (c) 2002 Ville Laurikari <vl at iki.fi>
+#
+# Copying and distribution of this file, with or without
+# modification, are permitted in any medium without royalty provided
+# the copyright notice and this notice are preserved.
+
+AC_DEFUN([VL_LIB_READLINE], [
+ AC_CACHE_CHECK([for a readline compatible library],
+ vl_cv_lib_readline, [
+ ORIG_LIBS="$LIBS"
+ for readline_lib in readline edit editline; do
+ for termcap_lib in "" termcap curses ncurses; do
+ if test -z "$termcap_lib"; then
+ TRY_LIB="-l$readline_lib"
+ else
+ TRY_LIB="-l$readline_lib -l$termcap_lib"
+ fi
+ LIBS="$ORIG_LIBS $TRY_LIB"
+ AC_TRY_LINK_FUNC(readline, vl_cv_lib_readline="$TRY_LIB")
+ if test -n "$vl_cv_lib_readline"; then
+ break
+ fi
+ done
+ if test -n "$vl_cv_lib_readline"; then
+ break
+ fi
+ done
+ if test -z "$vl_cv_lib_readline"; then
+ vl_cv_lib_readline="no"
+ LIBS="$ORIG_LIBS"
+ fi
+ ])
+
+ if test "$vl_cv_lib_readline" != "no"; then
+ AC_DEFINE(HAVE_LIBREADLINE, 1,
+ [Define if you have a readline compatible library])
+ AC_CHECK_HEADERS(readline.h readline/readline.h)
+ AC_CACHE_CHECK([whether readline supports history],
+ vl_cv_lib_readline_history, [
+ vl_cv_lib_readline_history="no"
+ AC_TRY_LINK_FUNC(add_history, vl_cv_lib_readline_history="yes")
+ ])
+ if test "$vl_cv_lib_readline_history" = "yes"; then
+ AC_DEFINE(HAVE_READLINE_HISTORY, 1,
+ [Define if your readline library has \`add_history'])
+ AC_CHECK_HEADERS(history.h readline/history.h)
+ fi
+ fi
+])dnl
diff --git a/configure b/configure
index ae99642..70d7b0c 100755
--- a/configure
+++ b/configure
@@ -1,12 +1,12 @@
#! /bin/sh
# From configure.ac Id.
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for silo 4.8.
+# Generated by GNU Autoconf 2.63 for silo 4.9.1.
#
# Report bugs to <visit-users at email.ornl.gov>.
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This configure script is free software; the Free Software Foundation
# gives unlimited permission to copy, distribute and modify it.
#
@@ -23,7 +23,7 @@ DUALCASE=1; export DUALCASE # for MKS sh
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
@@ -45,17 +45,45 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS
as_cr_digits='0123456789'
as_cr_alnum=$as_cr_Letters$as_cr_digits
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
- echo "#! /bin/sh" >conf$$.sh
- echo "exit 0" >>conf$$.sh
- chmod +x conf$$.sh
- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
- PATH_SEPARATOR=';'
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+ as_echo='printf %s\n'
+ as_echo_n='printf %s'
+else
+ if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+ as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+ as_echo_n='/usr/ucb/echo -n'
else
- PATH_SEPARATOR=:
+ as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+ as_echo_n_body='eval
+ arg=$1;
+ case $arg in
+ *"$as_nl"*)
+ expr "X$arg" : "X\\(.*\\)$as_nl";
+ arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+ esac;
+ expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+ '
+ export as_echo_n_body
+ as_echo_n='sh -c $as_echo_n_body as_echo'
fi
- rm -f conf$$.sh
+ export as_echo_body
+ as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+ PATH_SEPARATOR=:
+ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+ PATH_SEPARATOR=';'
+ }
fi
# Support unset when possible.
@@ -71,8 +99,6 @@ fi
# there to prevent editors from complaining about space-tab.
# (If _AS_PATH_WALK were called with IFS unset, it would disable word
# splitting by setting IFS to empty value.)
-as_nl='
-'
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
@@ -95,7 +121,7 @@ if test "x$as_myself" = x; then
as_myself=$0
fi
if test ! -f "$as_myself"; then
- echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+ $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
{ (exit 1); exit 1; }
fi
@@ -108,17 +134,10 @@ PS2='> '
PS4='+ '
# NLS nuisances.
-for as_var in \
- LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
- LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
- LC_TELEPHONE LC_TIME
-do
- if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
- eval $as_var=C; export $as_var
- else
- ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
- fi
-done
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
# Required to use basename.
if expr a : '\(a\)' >/dev/null 2>&1 &&
@@ -140,7 +159,7 @@ as_me=`$as_basename -- "$0" ||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X/"$0" |
+$as_echo X/"$0" |
sed '/^.*\/\([^/][^/]*\)\/*$/{
s//\1/
q
@@ -166,7 +185,7 @@ else
as_have_required=no
fi
- if test $as_have_required = yes && (eval ":
+ if test $as_have_required = yes && (eval ":
(as_func_return () {
(exit \$1)
}
@@ -248,7 +267,7 @@ IFS=$as_save_IFS
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
@@ -269,7 +288,7 @@ _ASEOF
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
@@ -349,10 +368,10 @@ fi
if test "x$CONFIG_SHELL" != x; then
for as_var in BASH_ENV ENV
- do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
- done
- export CONFIG_SHELL
- exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+ do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+ done
+ export CONFIG_SHELL
+ exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
fi
@@ -421,9 +440,10 @@ fi
test \$exitcode = 0") || {
echo No shell found that supports shell functions.
- echo Please tell autoconf at gnu.org about your system,
- echo including any error possibly output before this
- echo message
+ echo Please tell bug-autoconf at gnu.org about your system,
+ echo including any error possibly output before this message.
+ echo This can help us improve future autoconf versions.
+ echo Configuration will now proceed without shell functions.
}
@@ -459,7 +479,7 @@ test \$exitcode = 0") || {
s/-\n.*//
' >$as_me.lineno &&
chmod +x "$as_me.lineno" ||
- { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+ { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
{ (exit 1); exit 1; }; }
# Don't try to exec as it changes $[0], causing all sort of problems
@@ -487,7 +507,6 @@ case `echo -n x` in
*)
ECHO_N='-n';;
esac
-
if expr a : '\(a\)' >/dev/null 2>&1 &&
test "X`expr 00001 : '.*\(...\)'`" = X001; then
as_expr=expr
@@ -500,19 +519,22 @@ if test -d conf$$.dir; then
rm -f conf$$.dir/conf$$.file
else
rm -f conf$$.dir
- mkdir conf$$.dir
-fi
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
- as_ln_s='ln -s'
- # ... but there are two gotchas:
- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
- # In both cases, we have to default to `cp -p'.
- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+ mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+ if ln -s conf$$.file conf$$ 2>/dev/null; then
+ as_ln_s='ln -s'
+ # ... but there are two gotchas:
+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+ # In both cases, we have to default to `cp -p'.
+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+ as_ln_s='cp -p'
+ elif ln conf$$.file conf$$ 2>/dev/null; then
+ as_ln_s=ln
+ else
as_ln_s='cp -p'
-elif ln conf$$.file conf$$ 2>/dev/null; then
- as_ln_s=ln
+ fi
else
as_ln_s='cp -p'
fi
@@ -537,10 +559,10 @@ else
as_test_x='
eval sh -c '\''
if test -d "$1"; then
- test -d "$1/.";
+ test -d "$1/.";
else
case $1 in
- -*)set "./$1";;
+ -*)set "./$1";;
esac;
case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
???[sx]*):;;*)false;;esac;fi
@@ -561,22 +583,22 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
# Check that we are running under the correct shell.
SHELL=${CONFIG_SHELL-/bin/sh}
-case X$ECHO in
+case X$lt_ECHO in
X*--fallback-echo)
# Remove one level of quotation (which was required for Make).
- ECHO=`echo "$ECHO" | sed 's,\\\\\$\\$0,'$0','`
+ ECHO=`echo "$lt_ECHO" | sed 's,\\\\\$\\$0,'$0','`
;;
esac
-echo=${ECHO-echo}
+ECHO=${lt_ECHO-echo}
if test "X$1" = X--no-reexec; then
# Discard the --no-reexec flag, and continue.
shift
elif test "X$1" = X--fallback-echo; then
# Avoid inline document here, it may be left over
:
-elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then
- # Yippee, $echo works!
+elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then
+ # Yippee, $ECHO works!
:
else
# Restart under the correct shell.
@@ -586,9 +608,9 @@ fi
if test "X$1" = X--fallback-echo; then
# used as fallback echo
shift
- cat <<EOF
+ cat <<_LT_EOF
$*
-EOF
+_LT_EOF
exit 0
fi
@@ -596,121 +618,116 @@ fi
# if CDPATH is set.
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-if test -z "$ECHO"; then
-if test "X${echo_test_string+set}" != Xset; then
-# find a string as large as possible, as long as the shell can cope with it
- for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
- # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
- if (echo_test_string=`eval $cmd`) 2>/dev/null &&
- echo_test_string=`eval $cmd` &&
- (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
- then
- break
- fi
- done
-fi
+if test -z "$lt_ECHO"; then
+ if test "X${echo_test_string+set}" != Xset; then
+ # find a string as large as possible, as long as the shell can cope with it
+ for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
+ # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
+ if { echo_test_string=`eval $cmd`; } 2>/dev/null &&
+ { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null
+ then
+ break
+ fi
+ done
+ fi
-if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
- echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- :
-else
- # The Solaris, AIX, and Digital Unix default echo programs unquote
- # backslashes. This makes it impossible to quote backslashes using
- # echo "$something" | sed 's/\\/\\\\/g'
- #
- # So, first we look for a working echo in the user's PATH.
+ if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
+ echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
+ test "X$echo_testing_string" = "X$echo_test_string"; then
+ :
+ else
+ # The Solaris, AIX, and Digital Unix default echo programs unquote
+ # backslashes. This makes it impossible to quote backslashes using
+ # echo "$something" | sed 's/\\/\\\\/g'
+ #
+ # So, first we look for a working echo in the user's PATH.
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
- for dir in $PATH /usr/ucb; do
+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+ for dir in $PATH /usr/ucb; do
+ IFS="$lt_save_ifs"
+ if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
+ test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
+ echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
+ test "X$echo_testing_string" = "X$echo_test_string"; then
+ ECHO="$dir/echo"
+ break
+ fi
+ done
IFS="$lt_save_ifs"
- if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
- test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
- echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- echo="$dir/echo"
- break
- fi
- done
- IFS="$lt_save_ifs"
- if test "X$echo" = Xecho; then
- # We didn't find a better echo, so look for alternatives.
- if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
- echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- # This shell has a builtin print -r that does the trick.
- echo='print -r'
- elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
- test "X$CONFIG_SHELL" != X/bin/ksh; then
- # If we have ksh, try running configure again with it.
- ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
- export ORIGINAL_CONFIG_SHELL
- CONFIG_SHELL=/bin/ksh
- export CONFIG_SHELL
- exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"}
- else
- # Try using printf.
- echo='printf %s\n'
- if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
- echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- # Cool, printf works
- :
- elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
- test "X$echo_testing_string" = 'X\t' &&
- echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
- export CONFIG_SHELL
- SHELL="$CONFIG_SHELL"
- export SHELL
- echo="$CONFIG_SHELL $0 --fallback-echo"
- elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
- test "X$echo_testing_string" = 'X\t' &&
- echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- echo="$CONFIG_SHELL $0 --fallback-echo"
+ if test "X$ECHO" = Xecho; then
+ # We didn't find a better echo, so look for alternatives.
+ if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' &&
+ echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` &&
+ test "X$echo_testing_string" = "X$echo_test_string"; then
+ # This shell has a builtin print -r that does the trick.
+ ECHO='print -r'
+ elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } &&
+ test "X$CONFIG_SHELL" != X/bin/ksh; then
+ # If we have ksh, try running configure again with it.
+ ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
+ export ORIGINAL_CONFIG_SHELL
+ CONFIG_SHELL=/bin/ksh
+ export CONFIG_SHELL
+ exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"}
else
- # maybe with a smaller string...
- prev=:
+ # Try using printf.
+ ECHO='printf %s\n'
+ if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
+ echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
+ test "X$echo_testing_string" = "X$echo_test_string"; then
+ # Cool, printf works
+ :
+ elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
+ test "X$echo_testing_string" = 'X\t' &&
+ echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
+ test "X$echo_testing_string" = "X$echo_test_string"; then
+ CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
+ export CONFIG_SHELL
+ SHELL="$CONFIG_SHELL"
+ export SHELL
+ ECHO="$CONFIG_SHELL $0 --fallback-echo"
+ elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
+ test "X$echo_testing_string" = 'X\t' &&
+ echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
+ test "X$echo_testing_string" = "X$echo_test_string"; then
+ ECHO="$CONFIG_SHELL $0 --fallback-echo"
+ else
+ # maybe with a smaller string...
+ prev=:
- for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do
- if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null
- then
- break
- fi
- prev="$cmd"
- done
+ for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do
+ if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null
+ then
+ break
+ fi
+ prev="$cmd"
+ done
- if test "$prev" != 'sed 50q "$0"'; then
- echo_test_string=`eval $prev`
- export echo_test_string
- exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"}
- else
- # Oops. We lost completely, so just stick with echo.
- echo=echo
- fi
+ if test "$prev" != 'sed 50q "$0"'; then
+ echo_test_string=`eval $prev`
+ export echo_test_string
+ exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"}
+ else
+ # Oops. We lost completely, so just stick with echo.
+ ECHO=echo
+ fi
+ fi
fi
fi
fi
fi
-fi
# Copy echo and quote the copy suitably for passing to libtool from
# the Makefile, instead of quoting the original, which is used later.
-ECHO=$echo
-if test "X$ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then
- ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo"
+lt_ECHO=$ECHO
+if test "X$lt_ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then
+ lt_ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo"
fi
-tagnames=${tagnames+${tagnames},}CXX
-
-tagnames=${tagnames+${tagnames},}F77
-
exec 7<&0 </dev/null 6>&1
# Name of the host.
@@ -734,8 +751,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='silo'
PACKAGE_TARNAME='silo'
-PACKAGE_VERSION='4.8'
-PACKAGE_STRING='silo 4.8'
+PACKAGE_VERSION='4.9.1'
+PACKAGE_STRING='silo 4.9.1'
PACKAGE_BUGREPORT='visit-users at email.ornl.gov'
ac_unique_file="src/silo/silo.h.in"
@@ -776,194 +793,243 @@ ac_includes_default="\
# include <unistd.h>
#endif"
-ac_subst_vars='SHELL
-PATH_SEPARATOR
-PACKAGE_NAME
-PACKAGE_TARNAME
-PACKAGE_VERSION
-PACKAGE_STRING
-PACKAGE_BUGREPORT
-exec_prefix
-prefix
-program_transform_name
-bindir
-sbindir
-libexecdir
-datarootdir
-datadir
-sysconfdir
-sharedstatedir
-localstatedir
-includedir
-oldincludedir
-docdir
-infodir
-htmldir
-dvidir
-pdfdir
-psdir
-libdir
-localedir
-mandir
-DEFS
-ECHO_C
-ECHO_N
-ECHO_T
-LIBS
-build_alias
-host_alias
-target_alias
-INSTALL_PROGRAM
-INSTALL_SCRIPT
-INSTALL_DATA
-am__isrc
-CYGPATH_W
-PACKAGE
-VERSION
-ACLOCAL
-AUTOCONF
-AUTOMAKE
-AUTOHEADER
-MAKEINFO
-install_sh
-STRIP
-INSTALL_STRIP_PROGRAM
-mkdir_p
-AWK
-SET_MAKE
-am__leading_dot
-AMTAR
-am__tar
-am__untar
-MAINTAINER_MODE_TRUE
-MAINTAINER_MODE_FALSE
-MAINT
-PYTHONMODULE
-build
-build_cpu
-build_vendor
-build_os
-host
-host_cpu
-host_vendor
-host_os
-SILO_VERS_MAJ
-SILO_VERS_MIN
-SILO_VERS_PAT
-SILO_VERS_PRE
-SILO_VERS_TAG
-CONFIG_CMD
-CONFIG_DATE
-CONFIG_USER
-FORTRAN
-CXX
-CXXFLAGS
-LDFLAGS
-CPPFLAGS
-ac_ct_CXX
-EXEEXT
-OBJEXT
-DEPDIR
-am__include
-am__quote
-AMDEP_TRUE
-AMDEP_FALSE
-AMDEPBACKSLASH
-CXXDEPMODE
-am__fastdepCXX_TRUE
-am__fastdepCXX_FALSE
-CC
-CFLAGS
-ac_ct_CC
-CCDEPMODE
-am__fastdepCC_TRUE
-am__fastdepCC_FALSE
-CPP
-FC
-FCFLAGS
-ac_ct_FC
-FCLIBS
-SED
-GREP
-EGREP
-LN_S
-ECHO
-AR
-RANLIB
-CXXCPP
-F77
-FFLAGS
-ac_ct_F77
-LIBTOOL
-SILO_DTYPPTR
-SILO_DTYPPTR1
-SILO_DTYPPTR2
-NETCDF
-PDB_DRV
-TAURUS
-HDF5_DRV
-BROWSER
-SILEX
-HZIP
-ZLIB
-FPZIP
-PRTDIAG
-PDBP_DRV
+ac_subst_vars='am__EXEEXT_FALSE
+am__EXEEXT_TRUE
+LTLIBOBJS
+LIBOBJS
+FC_FULLPATH
+CXX_FULLPATH
+CC_FULLPATH
+CXX_LINK_NEEDED_FALSE
+CXX_LINK_NEEDED_TRUE
+ZLIB_AVAILABLE_FALSE
+ZLIB_AVAILABLE_TRUE
+FPZIP_NEEDED_FALSE
+FPZIP_NEEDED_TRUE
+HZIP_NEEDED_FALSE
+HZIP_NEEDED_TRUE
+SILEX_NEEDED_FALSE
+SILEX_NEEDED_TRUE
+FORTRAN_NEEDED_FALSE
+FORTRAN_NEEDED_TRUE
+PYTHON_NEEDED_FALSE
+PYTHON_NEEDED_TRUE
+BROWSER_NEEDED_FALSE
+BROWSER_NEEDED_TRUE
+HDF5_DRV_NEEDED_FALSE
+HDF5_DRV_NEEDED_TRUE
+TAURUS_NEEDED_FALSE
+TAURUS_NEEDED_TRUE
+PDBP_DRV_NEEDED_FALSE
+PDBP_DRV_NEEDED_TRUE
+PDB_DRV_NEEDED_FALSE
+PDB_DRV_NEEDED_TRUE
+NETCDF_NEEDED_FALSE
+NETCDF_NEEDED_TRUE
+INSTALL_LITE_HEADERS_FALSE
+INSTALL_LITE_HEADERS_TRUE
+BUNDLE_TARGET
+PYTHON_CPPFLAGS
+pkgpyexecdir
+pyexecdir
+pkgpythondir
+pythondir
+PYTHON_PLATFORM
+PYTHON_EXEC_PREFIX
+PYTHON_PREFIX
+PYTHON_VERSION
+PYTHON
READLINE_LIBS
-QT_BIN
-QT_INCLUDE
-QT_LIB
-QT_LDFLAGS
+PDBP_DRV
+LIBM
+QT_LUPDATE
+QT_LRELEASE
+QT_MOC
+QT_UIC
QT_LIBS
-QT_CORE
-QT_CORE_LIB
-QT_GUI
-QT_GUI_LIB
+QT_DIR
QT_CXXFLAGS
-QT_MOC
-PYTHON
-PYTHON_VERSION
-PYTHON_PREFIX
-PYTHON_EXEC_PREFIX
-PYTHON_PLATFORM
-pythondir
-pkgpythondir
-pyexecdir
-pkgpyexecdir
-PYTHON_CPPFLAGS
-BUNDLE_TARGET
-NETCDF_NEEDED_TRUE
-NETCDF_NEEDED_FALSE
-PDB_DRV_NEEDED_TRUE
-PDB_DRV_NEEDED_FALSE
-PDBP_DRV_NEEDED_TRUE
-PDBP_DRV_NEEDED_FALSE
-TAURUS_NEEDED_TRUE
-TAURUS_NEEDED_FALSE
-HDF5_DRV_NEEDED_TRUE
-HDF5_DRV_NEEDED_FALSE
-BROWSER_NEEDED_TRUE
-BROWSER_NEEDED_FALSE
-PYTHON_NEEDED_TRUE
-PYTHON_NEEDED_FALSE
-FORTRAN_NEEDED_TRUE
-FORTRAN_NEEDED_FALSE
-SILEX_NEEDED_TRUE
-SILEX_NEEDED_FALSE
-HZIP_NEEDED_TRUE
-HZIP_NEEDED_FALSE
-FPZIP_NEEDED_TRUE
-FPZIP_NEEDED_FALSE
-ZLIB_AVAILABLE_TRUE
-ZLIB_AVAILABLE_FALSE
-CXX_LINK_NEEDED_TRUE
-CXX_LINK_NEEDED_FALSE
-CC_FULLPATH
-CXX_FULLPATH
-FC_FULLPATH
-LIBOBJS
-LTLIBOBJS'
+X_EXTRA_LIBS
+X_LIBS
+X_PRE_LIBS
+X_CFLAGS
+XMKMF
+FPZIP
+ZLIB
+HZIP
+SILEX
+BROWSER
+HDF5_DRV
+TAURUS
+PDB_DRV
+NETCDF
+SILO_DTYPPTR2
+SILO_DTYPPTR1
+SILO_DTYPPTR
+CXXCPP
+OTOOL64
+OTOOL
+LIPO
+NMEDIT
+DSYMUTIL
+lt_ECHO
+RANLIB
+AR
+OBJDUMP
+LN_S
+NM
+ac_ct_DUMPBIN
+DUMPBIN
+LD
+FGREP
+EGREP
+GREP
+SED
+LIBTOOL
+FCLIBS
+ac_ct_F77
+FFLAGS
+F77
+ac_ct_FC
+FCFLAGS
+FC
+CPP
+am__fastdepCC_FALSE
+am__fastdepCC_TRUE
+CCDEPMODE
+ac_ct_CC
+CFLAGS
+CC
+am__fastdepCXX_FALSE
+am__fastdepCXX_TRUE
+CXXDEPMODE
+AMDEPBACKSLASH
+AMDEP_FALSE
+AMDEP_TRUE
+am__quote
+am__include
+DEPDIR
+OBJEXT
+EXEEXT
+ac_ct_CXX
+CPPFLAGS
+LDFLAGS
+CXXFLAGS
+CXX
+FORTRAN
+CONFIG_USER
+CONFIG_DATE
+CONFIG_CMD
+SILO_VERS_TAG
+SILO_VERS_PRE
+SILO_VERS_PAT
+SILO_VERS_MIN
+SILO_VERS_MAJ
+host_os
+host_vendor
+host_cpu
+host
+build_os
+build_vendor
+build_cpu
+build
+PYTHONMODULE
+MAINT
+MAINTAINER_MODE_FALSE
+MAINTAINER_MODE_TRUE
+am__untar
+am__tar
+AMTAR
+am__leading_dot
+SET_MAKE
+AWK
+mkdir_p
+MKDIR_P
+INSTALL_STRIP_PROGRAM
+STRIP
+install_sh
+MAKEINFO
+AUTOHEADER
+AUTOMAKE
+AUTOCONF
+ACLOCAL
+VERSION
+PACKAGE
+CYGPATH_W
+am__isrc
+INSTALL_DATA
+INSTALL_SCRIPT
+INSTALL_PROGRAM
+target_alias
+host_alias
+build_alias
+LIBS
+ECHO_T
+ECHO_N
+ECHO_C
+DEFS
+mandir
+localedir
+libdir
+psdir
+pdfdir
+dvidir
+htmldir
+infodir
+docdir
+oldincludedir
+includedir
+localstatedir
+sharedstatedir
+sysconfdir
+datadir
+datarootdir
+libexecdir
+sbindir
+bindir
+program_transform_name
+prefix
+exec_prefix
+PACKAGE_BUGREPORT
+PACKAGE_STRING
+PACKAGE_VERSION
+PACKAGE_TARNAME
+PACKAGE_NAME
+PATH_SEPARATOR
+SHELL'
ac_subst_files=''
+ac_user_opts='
+enable_option_checking
+enable_maintainer_mode
+enable_pythonmodule
+enable_shared
+enable_fortran
+enable_dependency_tracking
+enable_static
+with_pic
+enable_fast_install
+with_gnu_ld
+enable_libtool_lock
+enable_optimization
+enable_legacy_datatyped_pointers
+enable_normal_sclite_mem_headers
+enable_install_lite_headers
+with_readline
+enable_browser
+enable_silex
+with_zlib
+enable_hzip
+enable_fpzip
+with_x
+with_Qt_dir
+with_Qt_include_dir
+with_Qt_bin_dir
+with_Qt_lib_dir
+with_Qt_lib
+with_szlib
+with_hdf5
+with_pdb_proper
+'
ac_precious_vars='build_alias
host_alias
target_alias
@@ -978,14 +1044,17 @@ CFLAGS
CPP
FC
FCFLAGS
-CXXCPP
F77
-FFLAGS'
+FFLAGS
+CXXCPP
+XMKMF'
# Initialize some variables set by options.
ac_init_help=
ac_init_version=false
+ac_unrecognized_opts=
+ac_unrecognized_sep=
# The variables have the same names as the options, with
# dashes changed to underlines.
cache_file=/dev/null
@@ -1084,13 +1153,21 @@ do
datarootdir=$ac_optarg ;;
-disable-* | --disable-*)
- ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+ ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
# Reject names that are not valid shell variable names.
- expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
- { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+ { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
{ (exit 1); exit 1; }; }
- ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
- eval enable_$ac_feature=no ;;
+ ac_useropt_orig=$ac_useropt
+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+ case $ac_user_opts in
+ *"
+"enable_$ac_useropt"
+"*) ;;
+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
+ ac_unrecognized_sep=', ';;
+ esac
+ eval enable_$ac_useropt=no ;;
-docdir | --docdir | --docdi | --doc | --do)
ac_prev=docdir ;;
@@ -1103,13 +1180,21 @@ do
dvidir=$ac_optarg ;;
-enable-* | --enable-*)
- ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+ ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
# Reject names that are not valid shell variable names.
- expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
- { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+ { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
{ (exit 1); exit 1; }; }
- ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
- eval enable_$ac_feature=\$ac_optarg ;;
+ ac_useropt_orig=$ac_useropt
+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+ case $ac_user_opts in
+ *"
+"enable_$ac_useropt"
+"*) ;;
+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
+ ac_unrecognized_sep=', ';;
+ esac
+ eval enable_$ac_useropt=\$ac_optarg ;;
-exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
| --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
@@ -1300,22 +1385,38 @@ do
ac_init_version=: ;;
-with-* | --with-*)
- ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+ ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
# Reject names that are not valid shell variable names.
- expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
- { echo "$as_me: error: invalid package name: $ac_package" >&2
+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+ { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
{ (exit 1); exit 1; }; }
- ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
- eval with_$ac_package=\$ac_optarg ;;
+ ac_useropt_orig=$ac_useropt
+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+ case $ac_user_opts in
+ *"
+"with_$ac_useropt"
+"*) ;;
+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
+ ac_unrecognized_sep=', ';;
+ esac
+ eval with_$ac_useropt=\$ac_optarg ;;
-without-* | --without-*)
- ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+ ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
# Reject names that are not valid shell variable names.
- expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
- { echo "$as_me: error: invalid package name: $ac_package" >&2
+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+ { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
{ (exit 1); exit 1; }; }
- ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
- eval with_$ac_package=no ;;
+ ac_useropt_orig=$ac_useropt
+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+ case $ac_user_opts in
+ *"
+"with_$ac_useropt"
+"*) ;;
+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
+ ac_unrecognized_sep=', ';;
+ esac
+ eval with_$ac_useropt=no ;;
--x)
# Obsolete; use --with-x.
@@ -1335,7 +1436,7 @@ do
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
x_libraries=$ac_optarg ;;
- -*) { echo "$as_me: error: unrecognized option: $ac_option
+ -*) { $as_echo "$as_me: error: unrecognized option: $ac_option
Try \`$0 --help' for more information." >&2
{ (exit 1); exit 1; }; }
;;
@@ -1344,16 +1445,16 @@ Try \`$0 --help' for more information." >&2
ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
# Reject names that are not valid shell variable names.
expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
- { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
+ { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2
{ (exit 1); exit 1; }; }
eval $ac_envvar=\$ac_optarg
export $ac_envvar ;;
*)
# FIXME: should be removed in autoconf 3.0.
- echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+ $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
- echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+ $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
: ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
;;
@@ -1362,22 +1463,38 @@ done
if test -n "$ac_prev"; then
ac_option=--`echo $ac_prev | sed 's/_/-/g'`
- { echo "$as_me: error: missing argument to $ac_option" >&2
+ { $as_echo "$as_me: error: missing argument to $ac_option" >&2
{ (exit 1); exit 1; }; }
fi
-# Be sure to have absolute directory names.
+if test -n "$ac_unrecognized_opts"; then
+ case $enable_option_checking in
+ no) ;;
+ fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2
+ { (exit 1); exit 1; }; } ;;
+ *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+ esac
+fi
+
+# Check all directory arguments for consistency.
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
datadir sysconfdir sharedstatedir localstatedir includedir \
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
libdir localedir mandir
do
eval ac_val=\$$ac_var
+ # Remove trailing slashes.
+ case $ac_val in
+ */ )
+ ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
+ eval $ac_var=\$ac_val;;
+ esac
+ # Be sure to have absolute directory names.
case $ac_val in
[\\/$]* | ?:[\\/]* ) continue;;
NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
esac
- { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+ { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
{ (exit 1); exit 1; }; }
done
@@ -1392,7 +1509,7 @@ target=$target_alias
if test "x$host_alias" != x; then
if test "x$build_alias" = x; then
cross_compiling=maybe
- echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+ $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
If a cross compiler is detected then cross compile mode will be used." >&2
elif test "x$build_alias" != "x$host_alias"; then
cross_compiling=yes
@@ -1408,10 +1525,10 @@ test "$silent" = yes && exec 6>/dev/null
ac_pwd=`pwd` && test -n "$ac_pwd" &&
ac_ls_di=`ls -di .` &&
ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
- { echo "$as_me: error: Working directory cannot be determined" >&2
+ { $as_echo "$as_me: error: working directory cannot be determined" >&2
{ (exit 1); exit 1; }; }
test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
- { echo "$as_me: error: pwd does not report name of working directory" >&2
+ { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
{ (exit 1); exit 1; }; }
@@ -1419,12 +1536,12 @@ test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
if test -z "$srcdir"; then
ac_srcdir_defaulted=yes
# Try the directory containing this script, then the parent directory.
- ac_confdir=`$as_dirname -- "$0" ||
-$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$0" : 'X\(//\)[^/]' \| \
- X"$0" : 'X\(//\)$' \| \
- X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$0" |
+ ac_confdir=`$as_dirname -- "$as_myself" ||
+$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$as_myself" : 'X\(//\)[^/]' \| \
+ X"$as_myself" : 'X\(//\)$' \| \
+ X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_myself" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
@@ -1451,12 +1568,12 @@ else
fi
if test ! -r "$srcdir/$ac_unique_file"; then
test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
+ { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
{ (exit 1); exit 1; }; }
fi
ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
ac_abs_confdir=`(
- cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
+ cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2
{ (exit 1); exit 1; }; }
pwd)`
# When building in place, set srcdir=.
@@ -1483,7 +1600,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures silo 4.8 to adapt to many kinds of systems.
+\`configure' configures silo 4.9.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1505,9 +1622,9 @@ Configuration:
Installation directories:
--prefix=PREFIX install architecture-independent files in PREFIX
- [$ac_default_prefix]
+ [$ac_default_prefix]
--exec-prefix=EPREFIX install architecture-dependent files in EPREFIX
- [PREFIX]
+ [PREFIX]
By default, \`make install' will install all the files in
\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify
@@ -1517,25 +1634,25 @@ for instance \`--prefix=\$HOME'.
For better control, use the options below.
Fine tuning of the installation directories:
- --bindir=DIR user executables [EPREFIX/bin]
- --sbindir=DIR system admin executables [EPREFIX/sbin]
- --libexecdir=DIR program executables [EPREFIX/libexec]
- --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
- --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
- --localstatedir=DIR modifiable single-machine data [PREFIX/var]
- --libdir=DIR object code libraries [EPREFIX/lib]
- --includedir=DIR C header files [PREFIX/include]
- --oldincludedir=DIR C header files for non-gcc [/usr/include]
- --datarootdir=DIR read-only arch.-independent data root [PREFIX/share]
- --datadir=DIR read-only architecture-independent data [DATAROOTDIR]
- --infodir=DIR info documentation [DATAROOTDIR/info]
- --localedir=DIR locale-dependent data [DATAROOTDIR/locale]
- --mandir=DIR man documentation [DATAROOTDIR/man]
- --docdir=DIR documentation root [DATAROOTDIR/doc/silo]
- --htmldir=DIR html documentation [DOCDIR]
- --dvidir=DIR dvi documentation [DOCDIR]
- --pdfdir=DIR pdf documentation [DOCDIR]
- --psdir=DIR ps documentation [DOCDIR]
+ --bindir=DIR user executables [EPREFIX/bin]
+ --sbindir=DIR system admin executables [EPREFIX/sbin]
+ --libexecdir=DIR program executables [EPREFIX/libexec]
+ --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
+ --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
+ --localstatedir=DIR modifiable single-machine data [PREFIX/var]
+ --libdir=DIR object code libraries [EPREFIX/lib]
+ --includedir=DIR C header files [PREFIX/include]
+ --oldincludedir=DIR C header files for non-gcc [/usr/include]
+ --datarootdir=DIR read-only arch.-independent data root [PREFIX/share]
+ --datadir=DIR read-only architecture-independent data [DATAROOTDIR]
+ --infodir=DIR info documentation [DATAROOTDIR/info]
+ --localedir=DIR locale-dependent data [DATAROOTDIR/locale]
+ --mandir=DIR man documentation [DATAROOTDIR/man]
+ --docdir=DIR documentation root [DATAROOTDIR/doc/silo]
+ --htmldir=DIR html documentation [DOCDIR]
+ --dvidir=DIR dvi documentation [DOCDIR]
+ --pdfdir=DIR pdf documentation [DOCDIR]
+ --psdir=DIR ps documentation [DOCDIR]
_ACEOF
cat <<\_ACEOF
@@ -1545,6 +1662,10 @@ Program names:
--program-suffix=SUFFIX append SUFFIX to installed program names
--program-transform-name=PROGRAM run sed PROGRAM on installed program names
+X features:
+ --x-includes=DIR X include files are in DIR
+ --x-libraries=DIR X library files are in DIR
+
System types:
--build=BUILD configure for building on BUILD [guessed]
--host=HOST cross-compile to build programs to run on HOST [BUILD]
@@ -1553,11 +1674,12 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of silo 4.8:";;
+ short | recursive ) echo "Configuration of silo 4.9.1:";;
esac
cat <<\_ACEOF
Optional Features:
+ --disable-option-checking ignore unrecognized --enable/--with options
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
--enable-maintainer-mode enable make rules and dependencies not useful
@@ -1575,35 +1697,41 @@ Optional Features:
--enable-legacy-datatyped-pointers
compile using legacy (float) pointers for datatype'd
pointers [default=no]
+ --enable-normal-sclite-mem-headers
+ compile with normal score lite memory headers
+ [default=no]
+ --enable-install-lite-headers
+ Install SCORE/PDB lite header files [default=no]
--enable-browser build browser [default=yes]
--enable-silex build the silex browser [default=no]
--enable-hzip enable Lindstrom hex/quad mesh compression
[default=yes]
--enable-fpzip enable Lindstrom float 1,2,3D array compression
[default=yes]
- --enable-portable-binary
- disable compiler optimizations that would produce
- unportable binaries
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
- --with-gnu-ld assume the C compiler uses GNU ld [default=no]
--with-pic try to use only PIC/non-PIC objects [default=use
both]
- --with-tags[=TAGS] include additional configurations [automatic]
+ --with-gnu-ld assume the C compiler uses GNU ld [default=no]
--with-readline enable detection of GNU readline [default=yes]
--with-zlib=INC,DIR Use the GNU zlib compression [default=yes]
- --with-gcc-arch=<arch> use architecture <arch> for gcc -march/-mtune,
- instead of guessing
+ --with-x use the X Window System
+ --with-Qt-dir=DIR DIR is equal to $QTDIR if you have followed the
+ installation instructions of Trolltech. Header files
+ are in DIR/include, binary utilities are in DIR/bin.
+ The library is in DIR/lib, unless --with-Qt-lib-dir
+ is also set.
+ --with-Qt-include-dir=DIR
+ Qt header files are in DIR
+ --with-Qt-bin-dir=DIR Qt utilities such as moc and uic are in DIR
+ --with-Qt-lib-dir=DIR The Qt library is in DIR
+ --with-Qt-lib=LIB Use -lLIB to link with the Qt library
--with-szlib=DIR Use szlib library for external szlib I/O filter
[default=no]
--with-hdf5=INC,LIB Location of HDF5 header and library
--with-pdb-proper directory where PDB proper is installed [default=no]
- --with-qt specify top-level Qt directory [default=yes]
- --with-qt-bin specify Qt bin directory
- --with-qt-include specify Qt include directory
- --with-qt-lib specify Qt lib directory
Some influential environment variables:
CXX C++ compiler command
@@ -1618,9 +1746,10 @@ Some influential environment variables:
CPP C preprocessor
FC Fortran compiler command
FCFLAGS Fortran compiler flags
- CXXCPP C++ preprocessor
F77 Fortran 77 compiler command
FFLAGS Fortran 77 compiler flags
+ CXXCPP C++ preprocessor
+ XMKMF Path to xmkmf, Makefile generator for X Window System
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
@@ -1633,15 +1762,17 @@ fi
if test "$ac_init_help" = "recursive"; then
# If there are subdirs, report their specific --help.
for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
- test -d "$ac_dir" || continue
+ test -d "$ac_dir" ||
+ { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
+ continue
ac_builddir=.
case "$ac_dir" in
.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
*)
- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+ ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
# A ".." for each directory in $ac_dir_suffix.
- ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+ ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
case $ac_top_builddir_sub in
"") ac_top_builddir_sub=. ac_top_build_prefix= ;;
*) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -1677,7 +1808,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
echo &&
$SHELL "$ac_srcdir/configure" --help=recursive
else
- echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+ $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
fi || ac_status=$?
cd "$ac_pwd" || { ac_status=$?; break; }
done
@@ -1686,11 +1817,11 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-silo configure 4.8
-generated by GNU Autoconf 2.61
+silo configure 4.9.1
+generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it.
@@ -1705,8 +1836,8 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by silo $as_me 4.8, which was
-generated by GNU Autoconf 2.61. Invocation command line was
+It was created by silo $as_me 4.9.1, which was
+generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@
@@ -1742,7 +1873,7 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- echo "PATH: $as_dir"
+ $as_echo "PATH: $as_dir"
done
IFS=$as_save_IFS
@@ -1777,7 +1908,7 @@ do
| -silent | --silent | --silen | --sile | --sil)
continue ;;
*\'*)
- ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+ ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
case $ac_pass in
1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
@@ -1829,11 +1960,12 @@ _ASBOX
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
- *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+ *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
esac
case $ac_var in #(
_ | IFS | as_nl) ;; #(
+ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
*) $as_unset $ac_var ;;
esac ;;
esac
@@ -1863,9 +1995,9 @@ _ASBOX
do
eval ac_val=\$$ac_var
case $ac_val in
- *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+ *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
esac
- echo "$ac_var='\''$ac_val'\''"
+ $as_echo "$ac_var='\''$ac_val'\''"
done | sort
echo
@@ -1880,9 +2012,9 @@ _ASBOX
do
eval ac_val=\$$ac_var
case $ac_val in
- *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+ *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
esac
- echo "$ac_var='\''$ac_val'\''"
+ $as_echo "$ac_var='\''$ac_val'\''"
done | sort
echo
fi
@@ -1898,8 +2030,8 @@ _ASBOX
echo
fi
test "$ac_signal" != 0 &&
- echo "$as_me: caught signal $ac_signal"
- echo "$as_me: exit $exit_status"
+ $as_echo "$as_me: caught signal $ac_signal"
+ $as_echo "$as_me: exit $exit_status"
} >&5
rm -f core *.core core.conftest.* &&
rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
@@ -1941,21 +2073,24 @@ _ACEOF
# Let the site file select an alternate cache file if it wants to.
-# Prefer explicitly selected file to automatically selected ones.
+# Prefer an explicitly selected file to automatically selected ones.
+ac_site_file1=NONE
+ac_site_file2=NONE
if test -n "$CONFIG_SITE"; then
- set x "$CONFIG_SITE"
+ ac_site_file1=$CONFIG_SITE
elif test "x$prefix" != xNONE; then
- set x "$prefix/share/config.site" "$prefix/etc/config.site"
+ ac_site_file1=$prefix/share/config.site
+ ac_site_file2=$prefix/etc/config.site
else
- set x "$ac_default_prefix/share/config.site" \
- "$ac_default_prefix/etc/config.site"
+ ac_site_file1=$ac_default_prefix/share/config.site
+ ac_site_file2=$ac_default_prefix/etc/config.site
fi
-shift
-for ac_site_file
+for ac_site_file in "$ac_site_file1" "$ac_site_file2"
do
+ test "x$ac_site_file" = xNONE && continue
if test -r "$ac_site_file"; then
- { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
-echo "$as_me: loading site script $ac_site_file" >&6;}
+ { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
+$as_echo "$as_me: loading site script $ac_site_file" >&6;}
sed 's/^/| /' "$ac_site_file" >&5
. "$ac_site_file"
fi
@@ -1965,16 +2100,16 @@ if test -r "$cache_file"; then
# Some versions of bash will fail to source /dev/null (special
# files actually), so we avoid doing that.
if test -f "$cache_file"; then
- { echo "$as_me:$LINENO: loading cache $cache_file" >&5
-echo "$as_me: loading cache $cache_file" >&6;}
+ { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
+$as_echo "$as_me: loading cache $cache_file" >&6;}
case $cache_file in
[\\/]* | ?:[\\/]* ) . "$cache_file";;
*) . "./$cache_file";;
esac
fi
else
- { echo "$as_me:$LINENO: creating cache $cache_file" >&5
-echo "$as_me: creating cache $cache_file" >&6;}
+ { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
+$as_echo "$as_me: creating cache $cache_file" >&6;}
>$cache_file
fi
@@ -1988,29 +2123,38 @@ for ac_var in $ac_precious_vars; do
eval ac_new_val=\$ac_env_${ac_var}_value
case $ac_old_set,$ac_new_set in
set,)
- { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+ { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
ac_cache_corrupted=: ;;
,set)
- { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+ { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
ac_cache_corrupted=: ;;
,);;
*)
if test "x$ac_old_val" != "x$ac_new_val"; then
- { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
-echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
- { echo "$as_me:$LINENO: former value: $ac_old_val" >&5
-echo "$as_me: former value: $ac_old_val" >&2;}
- { echo "$as_me:$LINENO: current value: $ac_new_val" >&5
-echo "$as_me: current value: $ac_new_val" >&2;}
- ac_cache_corrupted=:
+ # differences in whitespace do not lead to failure.
+ ac_old_val_w=`echo x $ac_old_val`
+ ac_new_val_w=`echo x $ac_new_val`
+ if test "$ac_old_val_w" != "$ac_new_val_w"; then
+ { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
+$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+ ac_cache_corrupted=:
+ else
+ { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
+ eval $ac_var=\$ac_old_val
+ fi
+ { $as_echo "$as_me:$LINENO: former value: \`$ac_old_val'" >&5
+$as_echo "$as_me: former value: \`$ac_old_val'" >&2;}
+ { $as_echo "$as_me:$LINENO: current value: \`$ac_new_val'" >&5
+$as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
fi;;
esac
# Pass precious variables to config.status.
if test "$ac_new_set" = set; then
case $ac_new_val in
- *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+ *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
*) ac_arg=$ac_var=$ac_new_val ;;
esac
case " $ac_configure_args " in
@@ -2020,10 +2164,12 @@ echo "$as_me: current value: $ac_new_val" >&2;}
fi
done
if $ac_cache_corrupted; then
- { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
-echo "$as_me: error: changes in the environment can compromise the build" >&2;}
- { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
+ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
+$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+ { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -2076,8 +2222,8 @@ for ac_dir in config "$srcdir"/config; do
fi
done
if test -z "$ac_aux_dir"; then
- { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in config \"$srcdir\"/config" >&5
-echo "$as_me: error: cannot find install-sh or install.sh in config \"$srcdir\"/config" >&2;}
+ { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in config \"$srcdir\"/config" >&5
+$as_echo "$as_me: error: cannot find install-sh or install.sh in config \"$srcdir\"/config" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -2090,7 +2236,7 @@ ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var.
ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
-am__api_version='1.10'
+am__api_version='1.11'
# Find a good install program. We prefer a C program (faster),
# so one script is as good as another. But avoid the broken or
@@ -2105,11 +2251,12 @@ am__api_version='1.10'
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# OS/2's system install, which has a completely different semantic
# ./install, which can be erroneously created by make from ./install.sh.
-{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
+# Reject install programs that cannot install multiple files.
+{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
+$as_echo_n "checking for a BSD-compatible install... " >&6; }
if test -z "$INSTALL"; then
if test "${ac_cv_path_install+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
@@ -2138,17 +2285,29 @@ case $as_dir/ in
# program-specific install script used by HP pwplus--don't use.
:
else
- ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
- break 3
+ rm -rf conftest.one conftest.two conftest.dir
+ echo one > conftest.one
+ echo two > conftest.two
+ mkdir conftest.dir
+ if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
+ test -s conftest.one && test -s conftest.two &&
+ test -s conftest.dir/conftest.one &&
+ test -s conftest.dir/conftest.two
+ then
+ ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+ break 3
+ fi
fi
fi
done
done
;;
esac
+
done
IFS=$as_save_IFS
+rm -rf conftest.one conftest.two conftest.dir
fi
if test "${ac_cv_path_install+set}" = set; then
@@ -2161,8 +2320,8 @@ fi
INSTALL=$ac_install_sh
fi
fi
-{ echo "$as_me:$LINENO: result: $INSTALL" >&5
-echo "${ECHO_T}$INSTALL" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
+$as_echo "$INSTALL" >&6; }
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
# It thinks the first close brace ends the variable substitution.
@@ -2172,21 +2331,38 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5
-echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5
+$as_echo_n "checking whether build environment is sane... " >&6; }
# Just in case
sleep 1
echo timestamp > conftest.file
+# Reject unsafe characters in $srcdir or the absolute working directory
+# name. Accept space and tab only in the latter.
+am_lf='
+'
+case `pwd` in
+ *[\\\"\#\$\&\'\`$am_lf]*)
+ { { $as_echo "$as_me:$LINENO: error: unsafe absolute working directory name" >&5
+$as_echo "$as_me: error: unsafe absolute working directory name" >&2;}
+ { (exit 1); exit 1; }; };;
+esac
+case $srcdir in
+ *[\\\"\#\$\&\'\`$am_lf\ \ ]*)
+ { { $as_echo "$as_me:$LINENO: error: unsafe srcdir value: \`$srcdir'" >&5
+$as_echo "$as_me: error: unsafe srcdir value: \`$srcdir'" >&2;}
+ { (exit 1); exit 1; }; };;
+esac
+
# Do `set' in a subshell so we don't clobber the current shell's
# arguments. Must try -L first in case configure is actually a
# symlink; some systems play weird games with the mod time of symlinks
# (eg FreeBSD returns the mod time of the symlink's containing
# directory).
if (
- set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
+ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
if test "$*" = "X"; then
# -L didn't work.
- set X `ls -t $srcdir/configure conftest.file`
+ set X `ls -t "$srcdir/configure" conftest.file`
fi
rm -f conftest.file
if test "$*" != "X $srcdir/configure conftest.file" \
@@ -2196,9 +2372,9 @@ if (
# if, for instance, CONFIG_SHELL is bash and it inherits a
# broken ls alias from the environment. This has actually
# happened. Such a system could not be considered "sane".
- { { echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken
+ { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken
alias in your environment" >&5
-echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken
+$as_echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken
alias in your environment" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -2209,96 +2385,209 @@ then
# Ok.
:
else
- { { echo "$as_me:$LINENO: error: newly created file is older than distributed files!
+ { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files!
Check your system clock" >&5
-echo "$as_me: error: newly created file is older than distributed files!
+$as_echo "$as_me: error: newly created file is older than distributed files!
Check your system clock" >&2;}
{ (exit 1); exit 1; }; }
fi
-{ echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+{ $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
test "$program_prefix" != NONE &&
program_transform_name="s&^&$program_prefix&;$program_transform_name"
# Use a double $ so make ignores it.
test "$program_suffix" != NONE &&
program_transform_name="s&\$&$program_suffix&;$program_transform_name"
-# Double any \ or $. echo might interpret backslashes.
+# Double any \ or $.
# By default was `s,x,x', remove it if useless.
-cat <<\_ACEOF >conftest.sed
-s/[\\$]/&&/g;s/;s,x,x,$//
-_ACEOF
-program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
-rm -f conftest.sed
+ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
+program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
# expand $ac_aux_dir to an absolute path
am_aux_dir=`cd $ac_aux_dir && pwd`
-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
+if test x"${MISSING+set}" != xset; then
+ case $am_aux_dir in
+ *\ * | *\ *)
+ MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
+ *)
+ MISSING="\${SHELL} $am_aux_dir/missing" ;;
+ esac
+fi
# Use eval to expand $SHELL
if eval "$MISSING --run true"; then
am_missing_run="$MISSING --run "
else
am_missing_run=
- { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
-echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
+$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
fi
-{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
-echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; }
-if test -z "$MKDIR_P"; then
- if test "${ac_cv_path_mkdir+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+if test x"${install_sh}" != xset; then
+ case $am_aux_dir in
+ *\ * | *\ *)
+ install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
+ *)
+ install_sh="\${SHELL} $am_aux_dir/install-sh"
+ esac
+fi
+
+# Installed binaries are usually stripped using `strip' when the user
+# run `make install-strip'. However `strip' might not be the right
+# tool to use in cross-compilation environments, therefore Automake
+# will honor the `STRIP' environment variable to overrule this program.
+if test "$cross_compiling" != no; then
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+set dummy ${ac_tool_prefix}strip; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_STRIP+set}" = set; then
+ $as_echo_n "(cached) " >&6
else
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
+ if test -n "$STRIP"; then
+ ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_prog in mkdir gmkdir; do
- for ac_exec_ext in '' $ac_executable_extensions; do
- { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
- case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
- 'mkdir (GNU coreutils) '* | \
- 'mkdir (coreutils) '* | \
- 'mkdir (fileutils) '4.1*)
- ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
- break 3;;
- esac
- done
- done
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
done
IFS=$as_save_IFS
fi
-
- if test "${ac_cv_path_mkdir+set}" = set; then
- MKDIR_P="$ac_cv_path_mkdir -p"
- else
- # As a last resort, use the slow shell script. Don't cache a
- # value for MKDIR_P within a source directory, because that will
- # break other packages using the cache if that directory is
- # removed, or if the value is a relative name.
- test -d ./--version && rmdir ./--version
- MKDIR_P="$ac_install_sh -d"
- fi
fi
-{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5
-echo "${ECHO_T}$MKDIR_P" >&6; }
+STRIP=$ac_cv_prog_STRIP
+if test -n "$STRIP"; then
+ { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
+$as_echo "$STRIP" >&6; }
+else
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
-mkdir_p="$MKDIR_P"
-case $mkdir_p in
- [\\/$]* | ?:[\\/]*) ;;
- */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
+
+fi
+if test -z "$ac_cv_prog_STRIP"; then
+ ac_ct_STRIP=$STRIP
+ # Extract the first word of "strip", so it can be a program name with args.
+set dummy strip; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$ac_ct_STRIP"; then
+ ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_STRIP="strip"
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+if test -n "$ac_ct_STRIP"; then
+ { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
+$as_echo "$ac_ct_STRIP" >&6; }
+else
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+ if test "x$ac_ct_STRIP" = x; then
+ STRIP=":"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ STRIP=$ac_ct_STRIP
+ fi
+else
+ STRIP="$ac_cv_prog_STRIP"
+fi
+
+fi
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+
+{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
+$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
+if test -z "$MKDIR_P"; then
+ if test "${ac_cv_path_mkdir+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_prog in mkdir gmkdir; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
+ case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
+ 'mkdir (GNU coreutils) '* | \
+ 'mkdir (coreutils) '* | \
+ 'mkdir (fileutils) '4.1*)
+ ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
+ break 3;;
+ esac
+ done
+ done
+done
+IFS=$as_save_IFS
+
+fi
+
+ if test "${ac_cv_path_mkdir+set}" = set; then
+ MKDIR_P="$ac_cv_path_mkdir -p"
+ else
+ # As a last resort, use the slow shell script. Don't cache a
+ # value for MKDIR_P within a source directory, because that will
+ # break other packages using the cache if that directory is
+ # removed, or if the value is a relative name.
+ test -d ./--version && rmdir ./--version
+ MKDIR_P="$ac_install_sh -d"
+ fi
+fi
+{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5
+$as_echo "$MKDIR_P" >&6; }
+
+mkdir_p="$MKDIR_P"
+case $mkdir_p in
+ [\\/$]* | ?:[\\/]*) ;;
+ */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+esac
for ac_prog in gawk mawk nawk awk
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_AWK+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$AWK"; then
ac_cv_prog_AWK="$AWK" # Let the user override the test.
@@ -2311,7 +2600,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_AWK="$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -2322,22 +2611,23 @@ fi
fi
AWK=$ac_cv_prog_AWK
if test -n "$AWK"; then
- { echo "$as_me:$LINENO: result: $AWK" >&5
-echo "${ECHO_T}$AWK" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $AWK" >&5
+$as_echo "$AWK" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
test -n "$AWK" && break
done
-{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
-set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
+set x ${MAKE-make}
+ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
cat >conftest.make <<\_ACEOF
SHELL = /bin/sh
@@ -2354,12 +2644,12 @@ esac
rm -f conftest.make
fi
if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
SET_MAKE=
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
SET_MAKE="MAKE=${MAKE-make}"
fi
@@ -2378,8 +2668,8 @@ if test "`cd $srcdir && pwd`" != "`pwd`"; then
am__isrc=' -I$(srcdir)'
# test to see if srcdir already configured
if test -f $srcdir/config.status; then
- { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
-echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
+ { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
+$as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
{ (exit 1); exit 1; }; }
fi
fi
@@ -2396,7 +2686,7 @@ fi
# Define the identity of the package.
PACKAGE='silo'
- VERSION='4.8'
+ VERSION='4.9.1'
cat >>confdefs.h <<_ACEOF
@@ -2424,112 +2714,6 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
-install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
-
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'. However `strip' might not be the right
-# tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-if test "$cross_compiling" != no; then
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_STRIP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$STRIP"; then
- ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_STRIP="${ac_tool_prefix}strip"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-STRIP=$ac_cv_prog_STRIP
-if test -n "$STRIP"; then
- { echo "$as_me:$LINENO: result: $STRIP" >&5
-echo "${ECHO_T}$STRIP" >&6; }
-else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_STRIP"; then
- ac_ct_STRIP=$STRIP
- # Extract the first word of "strip", so it can be a program name with args.
-set dummy strip; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$ac_ct_STRIP"; then
- ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_STRIP="strip"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
-if test -n "$ac_ct_STRIP"; then
- { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-echo "${ECHO_T}$ac_ct_STRIP" >&6; }
-else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
- if test "x$ac_ct_STRIP" = x; then
- STRIP=":"
- else
- case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
- STRIP=$ac_ct_STRIP
- fi
-else
- STRIP="$ac_cv_prog_STRIP"
-fi
-
-fi
-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
-
# We need awk for the "check" target. The system "awk" is bad on
# some platforms.
# Always define AMTAR for backward compatibility.
@@ -2545,8 +2729,9 @@ am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
ac_config_headers="$ac_config_headers config.h:config/config.h.in"
-{ echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
-echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6; }
+
+{ $as_echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
+$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
# Check whether --enable-maintainer-mode was given.
if test "${enable_maintainer_mode+set}" = set; then
enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
@@ -2554,8 +2739,8 @@ else
USE_MAINTAINER_MODE=no
fi
- { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
-echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
+$as_echo "$USE_MAINTAINER_MODE" >&6; }
if test $USE_MAINTAINER_MODE = yes; then
MAINTAINER_MODE_TRUE=
MAINTAINER_MODE_FALSE='#'
@@ -2609,6 +2794,13 @@ else
fi
+
+
+
+
+
+
+
else
# Check whether --enable-shared was given.
if test "${enable_shared+set}" = set; then
@@ -2635,38 +2827,41 @@ fi
+
+
+
fi
# Make sure we can run config.sub.
$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
- { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
-echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
+ { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
+$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
{ (exit 1); exit 1; }; }
-{ echo "$as_me:$LINENO: checking build system type" >&5
-echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking build system type" >&5
+$as_echo_n "checking build system type... " >&6; }
if test "${ac_cv_build+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
ac_build_alias=$build_alias
test "x$ac_build_alias" = x &&
ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
test "x$ac_build_alias" = x &&
- { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
-echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
+ { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
+$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
{ (exit 1); exit 1; }; }
ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
- { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
+ { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
+$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
{ (exit 1); exit 1; }; }
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-echo "${ECHO_T}$ac_cv_build" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5
+$as_echo "$ac_cv_build" >&6; }
case $ac_cv_build in
*-*-*) ;;
-*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
-echo "$as_me: error: invalid value of canonical build" >&2;}
+*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
+$as_echo "$as_me: error: invalid value of canonical build" >&2;}
{ (exit 1); exit 1; }; };;
esac
build=$ac_cv_build
@@ -2683,27 +2878,27 @@ IFS=$ac_save_IFS
case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
-{ echo "$as_me:$LINENO: checking host system type" >&5
-echo $ECHO_N "checking host system type... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking host system type" >&5
+$as_echo_n "checking host system type... " >&6; }
if test "${ac_cv_host+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test "x$host_alias" = x; then
ac_cv_host=$ac_cv_build
else
ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
- { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
+ { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
+$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
{ (exit 1); exit 1; }; }
fi
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-echo "${ECHO_T}$ac_cv_host" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5
+$as_echo "$ac_cv_host" >&6; }
case $ac_cv_host in
*-*-*) ;;
-*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
-echo "$as_me: error: invalid value of canonical host" >&2;}
+*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
+$as_echo "$as_me: error: invalid value of canonical host" >&2;}
{ (exit 1); exit 1; }; };;
esac
host=$ac_cv_host
@@ -2722,15 +2917,15 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
# Grab the version number
-{ echo "$as_me:$LINENO: checking what version the package is" >&5
-echo $ECHO_N "checking what version the package is... $ECHO_C" >&6; }
-{ echo "$as_me:$LINENO: result: 4.8" >&5
-echo "${ECHO_T}4.8" >&6; }
- SILO_VERS_MAJ="`echo 4.8 | cut -d'.' -f1`"
- SILO_VERS_MIN="`echo 4.8 | cut -d'.' -f2 | cut -d'-' -f1`"
- SILO_VERS_PAT="`echo 4.8 | cut -d'.' -f3 | cut -d'-' -f1`"
- SILO_VERS_PRE="`echo 4.8 | grep pre | cut -d'-' -f2 | cut -d'e' -f2`"
- SILO_VERS_TAG="`echo Silo_version 4.8 | sed -e 's/ /_/' -e 's/\./_/g' -e 's/-/_/g'`"
+{ $as_echo "$as_me:$LINENO: checking what version the package is" >&5
+$as_echo_n "checking what version the package is... " >&6; }
+{ $as_echo "$as_me:$LINENO: result: 4.9.1" >&5
+$as_echo "4.9.1" >&6; }
+ SILO_VERS_MAJ="`echo 4.9.1 | cut -d'.' -f1`"
+ SILO_VERS_MIN="`echo 4.9.1 | cut -d'.' -f2 | cut -d'-' -f1`"
+ SILO_VERS_PAT="`echo 4.9.1 | cut -d'.' -f3 | cut -d'-' -f1`"
+ SILO_VERS_PRE="`echo 4.9.1 | grep pre | cut -d'-' -f2 | cut -d'e' -f2`"
+ SILO_VERS_TAG="`echo Silo_version 4.9.1 | sed -e 's/ /_/' -e 's/\./_/g' -e 's/-/_/g'`"
CONFIG_CMD="`echo $0 $ac_configure_args`"
@@ -2753,22 +2948,22 @@ default_detect_readline="yes"
hname="`hostname`"
file=$srcdir/config-site/$hname.conf
-{ echo "$as_me:$LINENO: checking for site config host file" >&5
-echo $ECHO_N "checking for site config host file... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for site config host file" >&5
+$as_echo_n "checking for site config host file... " >&6; }
if test -f "$file"; then
. $file
- { echo "$as_me:$LINENO: result: found $file" >&5
-echo "${ECHO_T}found $file" >&6; }
+ { $as_echo "$as_me:$LINENO: result: found $file" >&5
+$as_echo "found $file" >&6; }
else
hname="`hostname | cut -f1 -d.`"
file=$srcdir/config-site/$hname.conf
if test -f "$file"; then
. $file
- { echo "$as_me:$LINENO: result: found $file" >&5
-echo "${ECHO_T}found $file" >&6; }
+ { $as_echo "$as_me:$LINENO: result: found $file" >&5
+$as_echo "found $file" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
fi
@@ -2816,16 +3011,16 @@ for f in $host_cpu-$host_vendor-$host_os \
$host_vendor \
$host_cpu \
$UNAME; do
- { echo "$as_me:$LINENO: checking for config-site $f" >&5
-echo $ECHO_N "checking for config-site $f... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for config-site $f" >&5
+$as_echo_n "checking for config-site $f... " >&6; }
if test -f "$srcdir/config-site/$f.conf"; then
host_config=$srcdir/config-site/$f.conf
- { echo "$as_me:$LINENO: result: found" >&5
-echo "${ECHO_T}found" >&6; }
+ { $as_echo "$as_me:$LINENO: result: found" >&5
+$as_echo "found" >&6; }
break
fi
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
done
if test "X$host_config" != "Xnone"; then
. $host_config
@@ -2865,10 +3060,10 @@ if test -z "$CXX"; then
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_CXX+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$CXX"; then
ac_cv_prog_CXX="$CXX" # Let the user override the test.
@@ -2881,7 +3076,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -2892,11 +3087,11 @@ fi
fi
CXX=$ac_cv_prog_CXX
if test -n "$CXX"; then
- { echo "$as_me:$LINENO: result: $CXX" >&5
-echo "${ECHO_T}$CXX" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $CXX" >&5
+$as_echo "$CXX" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -2909,10 +3104,10 @@ if test -z "$CXX"; then
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CXX"; then
ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
@@ -2925,7 +3120,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_CXX="$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -2936,11 +3131,11 @@ fi
fi
ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
if test -n "$ac_ct_CXX"; then
- { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
-echo "${ECHO_T}$ac_ct_CXX" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
+$as_echo "$ac_ct_CXX" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -2952,12 +3147,8 @@ done
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
CXX=$ac_ct_CXX
@@ -2967,37 +3158,41 @@ fi
fi
fi
# Provide some information about the compiler.
-echo "$as_me:$LINENO: checking for C++ compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
+$as_echo "$as_me:$LINENO: checking for C++ compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
{ (ac_try="$ac_compiler --version >&5"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_compiler --version >&5") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
{ (ac_try="$ac_compiler -v >&5"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_compiler -v >&5") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
{ (ac_try="$ac_compiler -V >&5"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_compiler -V >&5") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
cat >conftest.$ac_ext <<_ACEOF
@@ -3016,27 +3211,22 @@ main ()
}
_ACEOF
ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.exe b.out"
+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
# Try to create an executable without -o first, disregard a.out.
# It will help us diagnose broken compilers, and finding out an intuition
# of exeext.
-{ echo "$as_me:$LINENO: checking for C++ compiler default output file name" >&5
-echo $ECHO_N "checking for C++ compiler default output file name... $ECHO_C" >&6; }
-ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-#
-# List of possible output files, starting from the most likely.
-# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
-# only as a last resort. b.out is created by i960 compilers.
-ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
-#
-# The IRIX 6 linker writes into existing files which may not be
-# executable, retaining their permissions. Remove them first so a
-# subsequent execution test works.
+{ $as_echo "$as_me:$LINENO: checking for C++ compiler default output file name" >&5
+$as_echo_n "checking for C++ compiler default output file name... " >&6; }
+ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+
+# The possible output files:
+ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
+
ac_rmfiles=
for ac_file in $ac_files
do
case $ac_file in
- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
* ) ac_rmfiles="$ac_rmfiles $ac_file";;
esac
done
@@ -3047,10 +3237,11 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_link_default") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
# Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
@@ -3061,7 +3252,7 @@ for ac_file in $ac_files ''
do
test -f "$ac_file" || continue
case $ac_file in
- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
;;
[ab].out )
# We found the default executable, but exeext='' is most
@@ -3088,25 +3279,27 @@ else
ac_file=''
fi
-{ echo "$as_me:$LINENO: result: $ac_file" >&5
-echo "${ECHO_T}$ac_file" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
+$as_echo "$ac_file" >&6; }
if test -z "$ac_file"; then
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-{ { echo "$as_me:$LINENO: error: C++ compiler cannot create executables
+{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: C++ compiler cannot create executables
See \`config.log' for more details." >&5
-echo "$as_me: error: C++ compiler cannot create executables
+$as_echo "$as_me: error: C++ compiler cannot create executables
See \`config.log' for more details." >&2;}
- { (exit 77); exit 77; }; }
+ { (exit 77); exit 77; }; }; }
fi
ac_exeext=$ac_cv_exeext
# Check that the compiler produces executables we can run. If not, either
# the compiler is broken, or we cross compile.
-{ echo "$as_me:$LINENO: checking whether the C++ compiler works" >&5
-echo $ECHO_N "checking whether the C++ compiler works... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether the C++ compiler works" >&5
+$as_echo_n "checking whether the C++ compiler works... " >&6; }
# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
# If not cross compiling, check that we can run a simple program.
if test "$cross_compiling" != yes; then
@@ -3115,49 +3308,53 @@ if test "$cross_compiling" != yes; then
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_try") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cross_compiling=no
else
if test "$cross_compiling" = maybe; then
cross_compiling=yes
else
- { { echo "$as_me:$LINENO: error: cannot run C++ compiled programs.
+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot run C++ compiled programs.
If you meant to cross compile, use \`--host'.
See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run C++ compiled programs.
+$as_echo "$as_me: error: cannot run C++ compiled programs.
If you meant to cross compile, use \`--host'.
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+ { (exit 1); exit 1; }; }; }
fi
fi
fi
-{ echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+{ $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
-rm -f a.out a.exe conftest$ac_cv_exeext b.out
+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
ac_clean_files=$ac_clean_files_save
# Check that the compiler produces executables we can run. If not, either
# the compiler is broken, or we cross compile.
-{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
-{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
-echo "${ECHO_T}$cross_compiling" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
+$as_echo_n "checking whether we are cross compiling... " >&6; }
+{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
+$as_echo "$cross_compiling" >&6; }
-{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
+$as_echo_n "checking for suffix of executables... " >&6; }
if { (ac_try="$ac_link"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
# If both `conftest.exe' and `conftest' are `present' (well, observable)
# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
@@ -3166,31 +3363,33 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
for ac_file in conftest.exe conftest conftest.*; do
test -f "$ac_file" || continue
case $ac_file in
- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
*.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
break;;
* ) break;;
esac
done
else
- { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
+$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+ { (exit 1); exit 1; }; }; }
fi
rm -f conftest$ac_cv_exeext
-{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-echo "${ECHO_T}$ac_cv_exeext" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
+$as_echo "$ac_cv_exeext" >&6; }
rm -f conftest.$ac_ext
EXEEXT=$ac_cv_exeext
ac_exeext=$EXEEXT
-{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
+$as_echo_n "checking for suffix of object files... " >&6; }
if test "${ac_cv_objext+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -3213,40 +3412,43 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_compile") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
for ac_file in conftest.o conftest.obj conftest.*; do
test -f "$ac_file" || continue;
case $ac_file in
- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
*) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
break;;
esac
done
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
+{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of object files: cannot compile
+$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+ { (exit 1); exit 1; }; }; }
fi
rm -f conftest.$ac_cv_objext conftest.$ac_ext
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-echo "${ECHO_T}$ac_cv_objext" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
+$as_echo "$ac_cv_objext" >&6; }
OBJEXT=$ac_cv_objext
ac_objext=$OBJEXT
-{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
+$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -3272,20 +3474,21 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_cxx_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_compiler_gnu=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_compiler_gnu=no
@@ -3295,15 +3498,19 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; }
-GXX=`test $ac_compiler_gnu = yes && echo yes`
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
+$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+ GXX=yes
+else
+ GXX=
+fi
ac_test_CXXFLAGS=${CXXFLAGS+set}
ac_save_CXXFLAGS=$CXXFLAGS
-{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
-echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
+$as_echo_n "checking whether $CXX accepts -g... " >&6; }
if test "${ac_cv_prog_cxx_g+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
ac_save_cxx_werror_flag=$ac_cxx_werror_flag
ac_cxx_werror_flag=yes
@@ -3330,20 +3537,21 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_cxx_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_cv_prog_cxx_g=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
CXXFLAGS=""
@@ -3368,20 +3576,21 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_cxx_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
:
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cxx_werror_flag=$ac_save_cxx_werror_flag
@@ -3407,20 +3616,21 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_cxx_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_cv_prog_cxx_g=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -3435,8 +3645,8 @@ fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ac_cxx_werror_flag=$ac_save_cxx_werror_flag
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
+$as_echo "$ac_cv_prog_cxx_g" >&6; }
if test "$ac_test_CXXFLAGS" = set; then
CXXFLAGS=$ac_save_CXXFLAGS
elif test $ac_cv_prog_cxx_g = yes; then
@@ -3465,40 +3675,40 @@ ac_config_commands="$ac_config_commands depfiles"
am_make=${MAKE-make}
cat > confinc << 'END'
am__doit:
- @echo done
+ @echo this is the am__doit target
.PHONY: am__doit
END
# If we don't find an include directive, just comment out the code.
-{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
-echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
+$as_echo_n "checking for style of include used by $am_make... " >&6; }
am__include="#"
am__quote=
_am_result=none
# First try GNU make style include.
echo "include confinc" > confmf
-# We grep out `Entering directory' and `Leaving directory'
-# messages which can occur if `w' ends up in MAKEFLAGS.
-# In particular we don't look at `^make:' because GNU make might
-# be invoked under some other name (usually "gmake"), in which
-# case it prints its new name instead of `make'.
-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
- am__include=include
- am__quote=
- _am_result=GNU
-fi
+# Ignore all kinds of additional output from `make'.
+case `$am_make -s -f confmf 2> /dev/null` in #(
+*the\ am__doit\ target*)
+ am__include=include
+ am__quote=
+ _am_result=GNU
+ ;;
+esac
# Now try BSD make style include.
if test "$am__include" = "#"; then
echo '.include "confinc"' > confmf
- if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
- am__include=.include
- am__quote="\""
- _am_result=BSD
- fi
+ case `$am_make -s -f confmf 2> /dev/null` in #(
+ *the\ am__doit\ target*)
+ am__include=.include
+ am__quote="\""
+ _am_result=BSD
+ ;;
+ esac
fi
-{ echo "$as_me:$LINENO: result: $_am_result" >&5
-echo "${ECHO_T}$_am_result" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $_am_result" >&5
+$as_echo "$_am_result" >&6; }
rm -f confinc confmf
# Check whether --enable-dependency-tracking was given.
@@ -3522,10 +3732,10 @@ fi
depcc="$CXX" am_compiler_list=
-{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
+$as_echo_n "checking dependency style of $depcc... " >&6; }
if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
# We make a subdir and do the tests there. Otherwise we can end up
@@ -3550,6 +3760,11 @@ else
if test "$am_compiler_list" = ""; then
am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
fi
+ am__universal=false
+ case " $depcc " in #(
+ *\ -arch\ *\ -arch\ *) am__universal=true ;;
+ esac
+
for depmode in $am_compiler_list; do
# Setup a source with many dependencies, because some compilers
# like to wrap large dependency lists on column 80 (with \), and
@@ -3567,7 +3782,17 @@ else
done
echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+ # We check with `-c' and `-o' for the sake of the "dashmstdout"
+ # mode. It turns out that the SunPro C++ compiler does not properly
+ # handle `-M -o', and we need to detect this. Also, some Intel
+ # versions had trouble with output in subdirs
+ am__obj=sub/conftest.${OBJEXT-o}
+ am__minus_obj="-o $am__obj"
case $depmode in
+ gcc)
+ # This depmode causes a compiler race in universal mode.
+ test "$am__universal" = false || continue
+ ;;
nosideeffect)
# after this tag, mechanisms are not by side-effect, so they'll
# only be used when explicitly requested
@@ -3577,19 +3802,23 @@ else
break
fi
;;
+ msvisualcpp | msvcmsys)
+ # This compiler won't grok `-c -o', but also, the minuso test has
+ # not run yet. These depmodes are late enough in the game, and
+ # so weak that their functioning should not be impacted.
+ am__obj=conftest.${OBJEXT-o}
+ am__minus_obj=
+ ;;
none) break ;;
esac
- # We check with `-c' and `-o' for the sake of the "dashmstdout"
- # mode. It turns out that the SunPro C++ compiler does not properly
- # handle `-M -o', and we need to detect this.
if depmode=$depmode \
- source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
+ source=sub/conftest.c object=$am__obj \
depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+ $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
>/dev/null 2>conftest.err &&
grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
+ grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
# icc doesn't choke on unknown options, it will just issue warnings
# or remarks (even with -Werror). So we grep stderr for any message
@@ -3613,8 +3842,8 @@ else
fi
fi
-{ echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
-echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
+$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
if
@@ -3636,10 +3865,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -3652,7 +3881,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="${ac_tool_prefix}gcc"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -3663,11 +3892,11 @@ fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -3676,10 +3905,10 @@ if test -z "$ac_cv_prog_CC"; then
ac_ct_CC=$CC
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
@@ -3692,7 +3921,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_CC="gcc"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -3703,11 +3932,11 @@ fi
fi
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
- { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
if test "x$ac_ct_CC" = x; then
@@ -3715,12 +3944,8 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
CC=$ac_ct_CC
@@ -3733,10 +3958,10 @@ if test -z "$CC"; then
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -3749,7 +3974,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="${ac_tool_prefix}cc"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -3760,11 +3985,11 @@ fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -3773,10 +3998,10 @@ fi
if test -z "$CC"; then
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -3794,7 +4019,7 @@ do
continue
fi
ac_cv_prog_CC="cc"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -3817,11 +4042,11 @@ fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -3832,10 +4057,10 @@ if test -z "$CC"; then
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -3848,7 +4073,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -3859,11 +4084,11 @@ fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -3876,10 +4101,10 @@ if test -z "$CC"; then
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
@@ -3892,7 +4117,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_CC="$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -3903,11 +4128,11 @@ fi
fi
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
- { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -3919,12 +4144,8 @@ done
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
CC=$ac_ct_CC
@@ -3934,50 +4155,56 @@ fi
fi
-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
+test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
See \`config.log' for more details." >&5
-echo "$as_me: error: no acceptable C compiler found in \$PATH
+$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+ { (exit 1); exit 1; }; }; }
# Provide some information about the compiler.
-echo "$as_me:$LINENO: checking for C compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
+$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
{ (ac_try="$ac_compiler --version >&5"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_compiler --version >&5") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
{ (ac_try="$ac_compiler -v >&5"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_compiler -v >&5") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
{ (ac_try="$ac_compiler -V >&5"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_compiler -V >&5") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
-{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
if test "${ac_cv_c_compiler_gnu+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -4003,20 +4230,21 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_compiler_gnu=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_compiler_gnu=no
@@ -4026,15 +4254,19 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ac_cv_c_compiler_gnu=$ac_compiler_gnu
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
-GCC=`test $ac_compiler_gnu = yes && echo yes`
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+ GCC=yes
+else
+ GCC=
+fi
ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
-{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+$as_echo_n "checking whether $CC accepts -g... " >&6; }
if test "${ac_cv_prog_cc_g+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
ac_save_c_werror_flag=$ac_c_werror_flag
ac_c_werror_flag=yes
@@ -4061,20 +4293,21 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_cv_prog_cc_g=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
CFLAGS=""
@@ -4099,20 +4332,21 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
:
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_c_werror_flag=$ac_save_c_werror_flag
@@ -4138,20 +4372,21 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_cv_prog_cc_g=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -4166,8 +4401,8 @@ fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ac_c_werror_flag=$ac_save_c_werror_flag
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+$as_echo "$ac_cv_prog_cc_g" >&6; }
if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
elif test $ac_cv_prog_cc_g = yes; then
@@ -4183,10 +4418,10 @@ else
CFLAGS=
fi
fi
-{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
-echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
if test "${ac_cv_prog_cc_c89+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
ac_cv_prog_cc_c89=no
ac_save_CC=$CC
@@ -4257,20 +4492,21 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_cv_prog_cc_c89=$ac_arg
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -4286,15 +4522,15 @@ fi
# AC_CACHE_VAL
case "x$ac_cv_prog_cc_c89" in
x)
- { echo "$as_me:$LINENO: result: none needed" >&5
-echo "${ECHO_T}none needed" >&6; } ;;
+ { $as_echo "$as_me:$LINENO: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
xno)
- { echo "$as_me:$LINENO: result: unsupported" >&5
-echo "${ECHO_T}unsupported" >&6; } ;;
+ { $as_echo "$as_me:$LINENO: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
*)
CC="$CC $ac_cv_prog_cc_c89"
- { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
esac
@@ -4306,10 +4542,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
depcc="$CC" am_compiler_list=
-{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
+$as_echo_n "checking dependency style of $depcc... " >&6; }
if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
# We make a subdir and do the tests there. Otherwise we can end up
@@ -4334,6 +4570,11 @@ else
if test "$am_compiler_list" = ""; then
am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
fi
+ am__universal=false
+ case " $depcc " in #(
+ *\ -arch\ *\ -arch\ *) am__universal=true ;;
+ esac
+
for depmode in $am_compiler_list; do
# Setup a source with many dependencies, because some compilers
# like to wrap large dependency lists on column 80 (with \), and
@@ -4351,7 +4592,17 @@ else
done
echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+ # We check with `-c' and `-o' for the sake of the "dashmstdout"
+ # mode. It turns out that the SunPro C++ compiler does not properly
+ # handle `-M -o', and we need to detect this. Also, some Intel
+ # versions had trouble with output in subdirs
+ am__obj=sub/conftest.${OBJEXT-o}
+ am__minus_obj="-o $am__obj"
case $depmode in
+ gcc)
+ # This depmode causes a compiler race in universal mode.
+ test "$am__universal" = false || continue
+ ;;
nosideeffect)
# after this tag, mechanisms are not by side-effect, so they'll
# only be used when explicitly requested
@@ -4361,19 +4612,23 @@ else
break
fi
;;
+ msvisualcpp | msvcmsys)
+ # This compiler won't grok `-c -o', but also, the minuso test has
+ # not run yet. These depmodes are late enough in the game, and
+ # so weak that their functioning should not be impacted.
+ am__obj=conftest.${OBJEXT-o}
+ am__minus_obj=
+ ;;
none) break ;;
esac
- # We check with `-c' and `-o' for the sake of the "dashmstdout"
- # mode. It turns out that the SunPro C++ compiler does not properly
- # handle `-M -o', and we need to detect this.
if depmode=$depmode \
- source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
+ source=sub/conftest.c object=$am__obj \
depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+ $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
>/dev/null 2>conftest.err &&
grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
+ grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
# icc doesn't choke on unknown options, it will just issue warnings
# or remarks (even with -Werror). So we grep stderr for any message
@@ -4397,8 +4652,8 @@ else
fi
fi
-{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
-echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
+$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
if
@@ -4417,15 +4672,15 @@ ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
+$as_echo_n "checking how to run the C preprocessor... " >&6; }
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
fi
if test -z "$CPP"; then
if test "${ac_cv_prog_CPP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
# Double quotes because CPP needs to be expanded
for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
@@ -4457,20 +4712,21 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null && {
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
test ! -s conftest.err
}; then
:
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
# Broken: fails on valid input.
@@ -4494,13 +4750,14 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null && {
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
test ! -s conftest.err
@@ -4508,7 +4765,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
# Broken: success on invalid input.
continue
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
# Passes both tests.
@@ -4533,8 +4790,8 @@ fi
else
ac_cv_prog_CPP=$CPP
fi
-{ echo "$as_me:$LINENO: result: $CPP" >&5
-echo "${ECHO_T}$CPP" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $CPP" >&5
+$as_echo "$CPP" >&6; }
ac_preproc_ok=false
for ac_c_preproc_warn_flag in '' yes
do
@@ -4562,20 +4819,21 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null && {
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
test ! -s conftest.err
}; then
:
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
# Broken: fails on valid input.
@@ -4599,13 +4857,14 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null && {
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
test ! -s conftest.err
@@ -4613,7 +4872,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
# Broken: success on invalid input.
continue
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
# Passes both tests.
@@ -4629,11 +4888,13 @@ rm -f conftest.err conftest.$ac_ext
if $ac_preproc_ok; then
:
else
- { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
See \`config.log' for more details." >&5
-echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
+$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+ { (exit 1); exit 1; }; }; }
fi
ac_ext=c
@@ -4652,10 +4913,10 @@ if test -n "$ac_tool_prefix"; then
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_FC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$FC"; then
ac_cv_prog_FC="$FC" # Let the user override the test.
@@ -4668,7 +4929,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_FC="$ac_tool_prefix$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -4679,11 +4940,11 @@ fi
fi
FC=$ac_cv_prog_FC
if test -n "$FC"; then
- { echo "$as_me:$LINENO: result: $FC" >&5
-echo "${ECHO_T}$FC" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $FC" >&5
+$as_echo "$FC" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -4696,10 +4957,10 @@ if test -z "$FC"; then
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_ac_ct_FC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_FC"; then
ac_cv_prog_ac_ct_FC="$ac_ct_FC" # Let the user override the test.
@@ -4712,7 +4973,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_FC="$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -4723,11 +4984,11 @@ fi
fi
ac_ct_FC=$ac_cv_prog_ac_ct_FC
if test -n "$ac_ct_FC"; then
- { echo "$as_me:$LINENO: result: $ac_ct_FC" >&5
-echo "${ECHO_T}$ac_ct_FC" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_ct_FC" >&5
+$as_echo "$ac_ct_FC" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -4739,12 +5000,8 @@ done
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
FC=$ac_ct_FC
@@ -4753,37 +5010,41 @@ fi
# Provide some information about the compiler.
-echo "$as_me:$LINENO: checking for Fortran compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
+$as_echo "$as_me:$LINENO: checking for Fortran compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
{ (ac_try="$ac_compiler --version >&5"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_compiler --version >&5") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
{ (ac_try="$ac_compiler -v >&5"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_compiler -v >&5") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
{ (ac_try="$ac_compiler -V >&5"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_compiler -V >&5") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
rm -f a.out
@@ -4791,10 +5052,10 @@ rm -f a.out
# input file. (Note that this only needs to work for GNU compilers.)
ac_save_ext=$ac_ext
ac_ext=F
-{ echo "$as_me:$LINENO: checking whether we are using the GNU Fortran compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU Fortran compiler... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU Fortran compiler" >&5
+$as_echo_n "checking whether we are using the GNU Fortran compiler... " >&6; }
if test "${ac_cv_fc_compiler_gnu+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
cat >conftest.$ac_ext <<_ACEOF
program main
@@ -4810,20 +5071,21 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_fc_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_compiler_gnu=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_compiler_gnu=no
@@ -4833,16 +5095,16 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ac_cv_fc_compiler_gnu=$ac_compiler_gnu
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_fc_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_fc_compiler_gnu" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_fc_compiler_gnu" >&5
+$as_echo "$ac_cv_fc_compiler_gnu" >&6; }
ac_ext=$ac_save_ext
ac_test_FFLAGS=${FCFLAGS+set}
ac_save_FFLAGS=$FCFLAGS
FCFLAGS=
-{ echo "$as_me:$LINENO: checking whether $FC accepts -g" >&5
-echo $ECHO_N "checking whether $FC accepts -g... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether $FC accepts -g" >&5
+$as_echo_n "checking whether $FC accepts -g... " >&6; }
if test "${ac_cv_prog_fc_g+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
FCFLAGS=-g
cat >conftest.$ac_ext <<_ACEOF
@@ -4856,20 +5118,21 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_fc_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_cv_prog_fc_g=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_prog_fc_g=no
@@ -4878,8 +5141,8 @@ fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_fc_g" >&5
-echo "${ECHO_T}$ac_cv_prog_fc_g" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_fc_g" >&5
+$as_echo "$ac_cv_prog_fc_g" >&6; }
if test "$ac_test_FFLAGS" = set; then
FCFLAGS=$ac_save_FFLAGS
elif test $ac_cv_prog_fc_g = yes; then
@@ -4902,35 +5165,302 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-ac_ext=${ac_fc_srcext-f}
-ac_compile='$FC -c $FCFLAGS $ac_fcflags_srcext conftest.$ac_ext >&5'
-ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_fc_compiler_gnu
-{ echo "$as_me:$LINENO: checking how to get verbose linking output from $FC" >&5
-echo $ECHO_N "checking how to get verbose linking output from $FC... $ECHO_C" >&6; }
-if test "${ac_cv_prog_fc_v+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ ac_ext=f
+ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
+ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_f77_compiler_gnu
+if test -n "$ac_tool_prefix"; then
+ for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn
+ do
+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_F77+set}" = set; then
+ $as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
- program main
-
- end
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
+ if test -n "$F77"; then
+ ac_cv_prog_F77="$F77" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_F77="$ac_tool_prefix$ac_prog"
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+F77=$ac_cv_prog_F77
+if test -n "$F77"; then
+ { $as_echo "$as_me:$LINENO: result: $F77" >&5
+$as_echo "$F77" >&6; }
+else
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ test -n "$F77" && break
+ done
+fi
+if test -z "$F77"; then
+ ac_ct_F77=$F77
+ for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_F77+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$ac_ct_F77"; then
+ ac_cv_prog_ac_ct_F77="$ac_ct_F77" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_F77="$ac_prog"
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_F77=$ac_cv_prog_ac_ct_F77
+if test -n "$ac_ct_F77"; then
+ { $as_echo "$as_me:$LINENO: result: $ac_ct_F77" >&5
+$as_echo "$ac_ct_F77" >&6; }
+else
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ test -n "$ac_ct_F77" && break
+done
+
+ if test "x$ac_ct_F77" = x; then
+ F77=""
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ F77=$ac_ct_F77
+ fi
+fi
+
+
+# Provide some information about the compiler.
+$as_echo "$as_me:$LINENO: checking for Fortran 77 compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
+{ (ac_try="$ac_compiler --version >&5"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compiler --version >&5") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+{ (ac_try="$ac_compiler -v >&5"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compiler -v >&5") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+{ (ac_try="$ac_compiler -V >&5"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compiler -V >&5") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+rm -f a.out
+
+# If we don't use `.F' as extension, the preprocessor is not run on the
+# input file. (Note that this only needs to work for GNU compilers.)
+ac_save_ext=$ac_ext
+ac_ext=F
+{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5
+$as_echo_n "checking whether we are using the GNU Fortran 77 compiler... " >&6; }
+if test "${ac_cv_f77_compiler_gnu+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+ program main
+#ifndef __GNUC__
+ choke me
+#endif
+
+ end
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_f77_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_compiler_gnu=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_compiler_gnu=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ac_cv_f77_compiler_gnu=$ac_compiler_gnu
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5
+$as_echo "$ac_cv_f77_compiler_gnu" >&6; }
+ac_ext=$ac_save_ext
+ac_test_FFLAGS=${FFLAGS+set}
+ac_save_FFLAGS=$FFLAGS
+FFLAGS=
+{ $as_echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5
+$as_echo_n "checking whether $F77 accepts -g... " >&6; }
+if test "${ac_cv_prog_f77_g+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ FFLAGS=-g
+cat >conftest.$ac_ext <<_ACEOF
+ program main
+
+ end
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_f77_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_prog_f77_g=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_prog_f77_g=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5
+$as_echo "$ac_cv_prog_f77_g" >&6; }
+if test "$ac_test_FFLAGS" = set; then
+ FFLAGS=$ac_save_FFLAGS
+elif test $ac_cv_prog_f77_g = yes; then
+ if test "x$ac_cv_f77_compiler_gnu" = xyes; then
+ FFLAGS="-g -O2"
+ else
+ FFLAGS="-g"
+ fi
+else
+ if test "x$ac_cv_f77_compiler_gnu" = xyes; then
+ FFLAGS="-O2"
+ else
+ FFLAGS=
+ fi
+fi
+
+if test $ac_compiler_gnu = yes; then
+ G77=yes
+else
+ G77=
+fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+ac_ext=${ac_fc_srcext-f}
+ac_compile='$FC -c $FCFLAGS $ac_fcflags_srcext conftest.$ac_ext >&5'
+ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_fc_compiler_gnu
+{ $as_echo "$as_me:$LINENO: checking how to get verbose linking output from $FC" >&5
+$as_echo_n "checking how to get verbose linking output from $FC... " >&6; }
+if test "${ac_cv_prog_fc_v+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+ program main
+
+ end
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
test -z "$ac_fc_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
@@ -4951,19 +5481,22 @@ ac_save_FFLAGS=$FCFLAGS
FCFLAGS="$FCFLAGS $ac_verb"
eval "set x $ac_link"
shift
-echo "$as_me:$LINENO: $*" >&5
-ac_fc_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
-echo "$ac_fc_v_output" >&5
+$as_echo "$as_me:$LINENO: $*" >&5
+# gfortran 4.3 outputs lines setting COLLECT_GCC_OPTIONS, COMPILER_PATH,
+# LIBRARY_PATH; skip all such settings.
+ac_fc_v_output=`eval $ac_link 5>&1 2>&1 |
+ grep -v 'Driving:' | grep -v "^[_$as_cr_Letters][_$as_cr_alnum]*="`
+$as_echo "$ac_fc_v_output" >&5
FCFLAGS=$ac_save_FFLAGS
-rm -f conftest*
+rm -rf conftest*
# On HP/UX there is a line like: "LPATH is: /foo:/bar:/baz" where
# /foo, /bar, and /baz are search directories for the Fortran linker.
# Here, we change these into -L/foo -L/bar -L/baz (and put it first):
ac_fc_v_output="`echo $ac_fc_v_output |
grep 'LPATH is:' |
- sed 's,.*LPATH is\(: *[^ ]*\).*,\1,;s,: */, -L/,g'` $ac_fc_v_output"
+ sed 's|.*LPATH is\(: *[^ ]*\).*|\1|;s|: */| -L/|g'` $ac_fc_v_output"
# FIXME: we keep getting bitten by quoted arguments; a more general fix
# that detects unbalanced quotes in FLIBS should be implemented
@@ -5003,26 +5536,26 @@ esac
done
done
if test -z "$ac_cv_prog_fc_v"; then
- { echo "$as_me:$LINENO: WARNING: cannot determine how to obtain linking information from $FC" >&5
-echo "$as_me: WARNING: cannot determine how to obtain linking information from $FC" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: cannot determine how to obtain linking information from $FC" >&5
+$as_echo "$as_me: WARNING: cannot determine how to obtain linking information from $FC" >&2;}
fi
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- { echo "$as_me:$LINENO: WARNING: compilation failed" >&5
-echo "$as_me: WARNING: compilation failed" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: compilation failed" >&5
+$as_echo "$as_me: WARNING: compilation failed" >&2;}
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_fc_v" >&5
-echo "${ECHO_T}$ac_cv_prog_fc_v" >&6; }
-{ echo "$as_me:$LINENO: checking for Fortran libraries of $FC" >&5
-echo $ECHO_N "checking for Fortran libraries of $FC... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_fc_v" >&5
+$as_echo "$ac_cv_prog_fc_v" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for Fortran libraries of $FC" >&5
+$as_echo_n "checking for Fortran libraries of $FC... " >&6; }
if test "${ac_cv_fc_libs+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test "x$FCLIBS" != "x"; then
ac_cv_fc_libs="$FCLIBS" # Let the user override the test.
@@ -5042,19 +5575,22 @@ ac_save_FFLAGS=$FCFLAGS
FCFLAGS="$FCFLAGS $ac_cv_prog_fc_v"
eval "set x $ac_link"
shift
-echo "$as_me:$LINENO: $*" >&5
-ac_fc_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
-echo "$ac_fc_v_output" >&5
+$as_echo "$as_me:$LINENO: $*" >&5
+# gfortran 4.3 outputs lines setting COLLECT_GCC_OPTIONS, COMPILER_PATH,
+# LIBRARY_PATH; skip all such settings.
+ac_fc_v_output=`eval $ac_link 5>&1 2>&1 |
+ grep -v 'Driving:' | grep -v "^[_$as_cr_Letters][_$as_cr_alnum]*="`
+$as_echo "$ac_fc_v_output" >&5
FCFLAGS=$ac_save_FFLAGS
-rm -f conftest*
+rm -rf conftest*
# On HP/UX there is a line like: "LPATH is: /foo:/bar:/baz" where
# /foo, /bar, and /baz are search directories for the Fortran linker.
# Here, we change these into -L/foo -L/bar -L/baz (and put it first):
ac_fc_v_output="`echo $ac_fc_v_output |
grep 'LPATH is:' |
- sed 's,.*LPATH is\(: *[^ ]*\).*,\1,;s,: */, -L/,g'` $ac_fc_v_output"
+ sed 's|.*LPATH is\(: *[^ ]*\).*|\1|;s|: */| -L/|g'` $ac_fc_v_output"
# FIXME: we keep getting bitten by quoted arguments; a more general fix
# that detects unbalanced quotes in FLIBS should be implemented
@@ -5153,7 +5689,7 @@ fi
esac
;;
-YP,*)
- for ac_j in `echo $ac_arg | sed -e 's/-YP,/-L/;s/:/ -L/g'`; do
+ for ac_j in `$as_echo "$ac_arg" | sed -e 's/-YP,/-L/;s/:/ -L/g'`; do
ac_exists=false
for ac_i in $ac_cv_fc_libs; do
if test x"$ac_j" = x"$ac_i"; then
@@ -5201,7 +5737,7 @@ set X $ac_save_positional; shift
# must begin with a "/").
case `(uname -sr) 2>/dev/null` in
"SunOS 5"*)
- ac_ld_run_path=`echo $ac_fc_v_output |
+ ac_ld_run_path=`$as_echo "$ac_fc_v_output" |
sed -n 's,^.*LD_RUN_PATH *= *\(/[^ ]*\).*$,-R\1,p'`
test "x$ac_ld_run_path" != x &&
if test "$ac_compiler_gnu" = yes; then
@@ -5216,8 +5752,8 @@ esac
fi # test "x$[]_AC_LANG_PREFIX[]LIBS" = "x"
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_fc_libs" >&5
-echo "${ECHO_T}$ac_cv_fc_libs" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_fc_libs" >&5
+$as_echo "$ac_cv_fc_libs" >&6; }
FCLIBS="$ac_cv_fc_libs"
@@ -5233,10 +5769,10 @@ ac_compile='$FC -c $FCFLAGS $ac_fcflags_srcext conftest.$ac_ext >&5'
ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_fc_compiler_gnu
-{ echo "$as_me:$LINENO: checking for dummy main to link with Fortran libraries" >&5
-echo $ECHO_N "checking for dummy main to link with Fortran libraries... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for dummy main to link with Fortran libraries" >&5
+$as_echo_n "checking for dummy main to link with Fortran libraries... " >&6; }
if test "${ac_cv_fc_dummy_main+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
ac_fc_dm_save_LIBS=$LIBS
LIBS="$LIBS $FCLIBS"
@@ -5277,26 +5813,30 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
ac_cv_fortran_dummy_main=none
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_fortran_dummy_main=unknown
fi
+rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
@@ -5331,26 +5871,30 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
ac_cv_fortran_dummy_main=$ac_func; break
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
fi
+rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
done
@@ -5360,12 +5904,12 @@ ac_compile='$FC -c $FCFLAGS $ac_fcflags_srcext conftest.$ac_ext >&5'
ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_fc_compiler_gnu
ac_cv_fc_dummy_main=$ac_cv_fortran_dummy_main
- rm -f conftest*
+ rm -rf conftest*
LIBS=$ac_fc_dm_save_LIBS
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_fc_dummy_main" >&5
-echo "${ECHO_T}$ac_cv_fc_dummy_main" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_fc_dummy_main" >&5
+$as_echo "$ac_cv_fc_dummy_main" >&6; }
FC_DUMMY_MAIN=$ac_cv_fc_dummy_main
if test "$FC_DUMMY_MAIN" != unknown; then
if test $FC_DUMMY_MAIN != none; then
@@ -5383,11 +5927,13 @@ _ACEOF
fi
fi
else
- { { echo "$as_me:$LINENO: error: linking to Fortran libraries from C fails
+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: linking to Fortran libraries from C fails
See \`config.log' for more details." >&5
-echo "$as_me: error: linking to Fortran libraries from C fails
+$as_echo "$as_me: error: linking to Fortran libraries from C fails
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+ { (exit 1); exit 1; }; }; }
fi
@@ -5401,10 +5947,10 @@ ac_ext=${ac_fc_srcext-f}
ac_compile='$FC -c $FCFLAGS $ac_fcflags_srcext conftest.$ac_ext >&5'
ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_fc_compiler_gnu
-{ echo "$as_me:$LINENO: checking for Fortran name-mangling scheme" >&5
-echo $ECHO_N "checking for Fortran name-mangling scheme... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for Fortran name-mangling scheme" >&5
+$as_echo_n "checking for Fortran name-mangling scheme... " >&6; }
if test "${ac_cv_fc_mangling+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
cat >conftest.$ac_ext <<_ACEOF
subroutine foobar()
@@ -5420,13 +5966,14 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_fc_werror_flag" ||
test ! -s conftest.err
@@ -5481,26 +6028,30 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
ac_success=yes; break 2
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
fi
+rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
done
@@ -5566,26 +6117,30 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
ac_success_extra=yes; break
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
fi
+rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
done
@@ -5614,23 +6169,26 @@ ac_compiler_gnu=$ac_cv_fc_compiler_gnu
fi
LIBS=$ac_save_LIBS
- rm -f cfortran_test* conftest*
+ rm -rf conftest*
+ rm -f cfortran_test*
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- { { echo "$as_me:$LINENO: error: cannot compile a simple Fortran program
+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot compile a simple Fortran program
See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compile a simple Fortran program
+$as_echo "$as_me: error: cannot compile a simple Fortran program
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+ { (exit 1); exit 1; }; }; }
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_fc_mangling" >&5
-echo "${ECHO_T}$ac_cv_fc_mangling" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_fc_mangling" >&5
+$as_echo "$ac_cv_fc_mangling" >&6; }
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
@@ -5718,8 +6276,8 @@ _ACEOF
_ACEOF
;;
*)
- { echo "$as_me:$LINENO: WARNING: unknown Fortran name-mangling scheme" >&5
-echo "$as_me: WARNING: unknown Fortran name-mangling scheme" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: unknown Fortran name-mangling scheme" >&5
+$as_echo "$as_me: WARNING: unknown Fortran name-mangling scheme" >&2;}
;;
esac
@@ -5730,11 +6288,12 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
ac_compiler_gnu=$ac_cv_c_compiler_gnu
fi
-{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
-set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
+set x ${MAKE-make}
+ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
cat >conftest.make <<\_ACEOF
SHELL = /bin/sh
@@ -5751,158 +6310,155 @@ esac
rm -f conftest.make
fi
if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
SET_MAKE=
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
SET_MAKE="MAKE=${MAKE-make}"
fi
-# Check whether --enable-static was given.
-if test "${enable_static+set}" = set; then
- enableval=$enable_static; p=${PACKAGE-default}
- case $enableval in
- yes) enable_static=yes ;;
- no) enable_static=no ;;
- *)
- enable_static=no
- # Look at the argument we got. We use all the common list separators.
- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
- for pkg in $enableval; do
- IFS="$lt_save_ifs"
- if test "X$pkg" = "X$p"; then
- enable_static=yes
- fi
- done
- IFS="$lt_save_ifs"
- ;;
- esac
-else
- enable_static=yes
-fi
+case `pwd` in
+ *\ * | *\ *)
+ { $as_echo "$as_me:$LINENO: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
+$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
+esac
+
+
+
+macro_version='2.2.6b'
+macro_revision='1.3017'
+
+
+
-# Check whether --enable-fast-install was given.
-if test "${enable_fast_install+set}" = set; then
- enableval=$enable_fast_install; p=${PACKAGE-default}
- case $enableval in
- yes) enable_fast_install=yes ;;
- no) enable_fast_install=no ;;
- *)
- enable_fast_install=no
- # Look at the argument we got. We use all the common list separators.
- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
- for pkg in $enableval; do
- IFS="$lt_save_ifs"
- if test "X$pkg" = "X$p"; then
- enable_fast_install=yes
- fi
- done
- IFS="$lt_save_ifs"
- ;;
- esac
-else
- enable_fast_install=yes
-fi
-{ echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
-echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6; }
-if test "${lt_cv_path_SED+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+
+
+
+
+
+
+ltmain="$ac_aux_dir/ltmain.sh"
+
+{ $as_echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
+$as_echo_n "checking for a sed that does not truncate output... " >&6; }
+if test "${ac_cv_path_SED+set}" = set; then
+ $as_echo_n "(cached) " >&6
else
- # Loop through the user's path and test for sed and gsed.
-# Then use that list of sed's as ones to test for truncation.
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
+ for ac_i in 1 2 3 4 5 6 7; do
+ ac_script="$ac_script$as_nl$ac_script"
+ done
+ echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
+ $as_unset ac_script || ac_script=
+ if test -z "$SED"; then
+ ac_path_SED_found=false
+ # Loop through the user's path and test for each of PROGNAME-LIST
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for lt_ac_prog in sed gsed; do
+ for ac_prog in sed gsed; do
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$lt_ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$lt_ac_prog$ac_exec_ext"; }; then
- lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
- fi
+ ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
+ { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
+# Check for GNU ac_path_SED and select it if it is found.
+ # Check for GNU $ac_path_SED
+case `"$ac_path_SED" --version 2>&1` in
+*GNU*)
+ ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
+*)
+ ac_count=0
+ $as_echo_n 0123456789 >"conftest.in"
+ while :
+ do
+ cat "conftest.in" "conftest.in" >"conftest.tmp"
+ mv "conftest.tmp" "conftest.in"
+ cp "conftest.in" "conftest.nl"
+ $as_echo '' >> "conftest.nl"
+ "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+ ac_count=`expr $ac_count + 1`
+ if test $ac_count -gt ${ac_path_SED_max-0}; then
+ # Best one so far, save it but keep looking for a better one
+ ac_cv_path_SED="$ac_path_SED"
+ ac_path_SED_max=$ac_count
+ fi
+ # 10*(2^10) chars as input seems more than enough
+ test $ac_count -gt 10 && break
+ done
+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+ $ac_path_SED_found && break 3
done
done
done
IFS=$as_save_IFS
-lt_ac_max=0
-lt_ac_count=0
-# Add /usr/xpg4/bin/sed as it is typically found on Solaris
-# along with /bin/sed that truncates output.
-for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
- test ! -f $lt_ac_sed && continue
- cat /dev/null > conftest.in
- lt_ac_count=0
- echo $ECHO_N "0123456789$ECHO_C" >conftest.in
- # Check for GNU sed and select it if it is found.
- if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
- lt_cv_path_SED=$lt_ac_sed
- break
+ if test -z "$ac_cv_path_SED"; then
+ { { $as_echo "$as_me:$LINENO: error: no acceptable sed could be found in \$PATH" >&5
+$as_echo "$as_me: error: no acceptable sed could be found in \$PATH" >&2;}
+ { (exit 1); exit 1; }; }
fi
- while true; do
- cat conftest.in conftest.in >conftest.tmp
- mv conftest.tmp conftest.in
- cp conftest.in conftest.nl
- echo >>conftest.nl
- $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
- cmp -s conftest.out conftest.nl || break
- # 10000 chars as input seems more than enough
- test $lt_ac_count -gt 10 && break
- lt_ac_count=`expr $lt_ac_count + 1`
- if test $lt_ac_count -gt $lt_ac_max; then
- lt_ac_max=$lt_ac_count
- lt_cv_path_SED=$lt_ac_sed
- fi
- done
-done
+else
+ ac_cv_path_SED=$SED
+fi
fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_SED" >&5
+$as_echo "$ac_cv_path_SED" >&6; }
+ SED="$ac_cv_path_SED"
+ rm -f conftest.sed
-SED=$lt_cv_path_SED
+test -z "$SED" && SED=sed
+Xsed="$SED -e 1s/^X//"
-{ echo "$as_me:$LINENO: result: $SED" >&5
-echo "${ECHO_T}$SED" >&6; }
-{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
-echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
-if test "${ac_cv_path_GREP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- # Extract the first word of "grep ggrep" to use in msg output
-if test -z "$GREP"; then
-set dummy grep ggrep; ac_prog_name=$2
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
+$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
if test "${ac_cv_path_GREP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
+ if test -z "$GREP"; then
ac_path_GREP_found=false
-# Loop through the user's path and test for each of PROGNAME-LIST
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ # Loop through the user's path and test for each of PROGNAME-LIST
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_prog in grep ggrep; do
- for ac_exec_ext in '' $ac_executable_extensions; do
- ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
- { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
- # Check for GNU ac_path_GREP and select it if it is found.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
+ { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+# Check for GNU ac_path_GREP and select it if it is found.
# Check for GNU $ac_path_GREP
case `"$ac_path_GREP" --version 2>&1` in
*GNU*)
ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
*)
ac_count=0
- echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+ $as_echo_n 0123456789 >"conftest.in"
while :
do
cat "conftest.in" "conftest.in" >"conftest.tmp"
mv "conftest.tmp" "conftest.in"
cp "conftest.in" "conftest.nl"
- echo 'GREP' >> "conftest.nl"
+ $as_echo 'GREP' >> "conftest.nl"
"$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
ac_count=`expr $ac_count + 1`
@@ -5917,74 +6473,60 @@ case `"$ac_path_GREP" --version 2>&1` in
rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
esac
-
- $ac_path_GREP_found && break 3
+ $ac_path_GREP_found && break 3
+ done
done
done
-
-done
IFS=$as_save_IFS
-
-
-fi
-
-GREP="$ac_cv_path_GREP"
-if test -z "$GREP"; then
- { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+ if test -z "$ac_cv_path_GREP"; then
+ { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
{ (exit 1); exit 1; }; }
-fi
-
+ fi
else
ac_cv_path_GREP=$GREP
fi
-
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
-echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
+$as_echo "$ac_cv_path_GREP" >&6; }
GREP="$ac_cv_path_GREP"
-{ echo "$as_me:$LINENO: checking for egrep" >&5
-echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for egrep" >&5
+$as_echo_n "checking for egrep... " >&6; }
if test "${ac_cv_path_EGREP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
then ac_cv_path_EGREP="$GREP -E"
else
- # Extract the first word of "egrep" to use in msg output
-if test -z "$EGREP"; then
-set dummy egrep; ac_prog_name=$2
-if test "${ac_cv_path_EGREP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
+ if test -z "$EGREP"; then
ac_path_EGREP_found=false
-# Loop through the user's path and test for each of PROGNAME-LIST
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ # Loop through the user's path and test for each of PROGNAME-LIST
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_prog in egrep; do
- for ac_exec_ext in '' $ac_executable_extensions; do
- ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
- { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
- # Check for GNU ac_path_EGREP and select it if it is found.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+ { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+# Check for GNU ac_path_EGREP and select it if it is found.
# Check for GNU $ac_path_EGREP
case `"$ac_path_EGREP" --version 2>&1` in
*GNU*)
ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
*)
ac_count=0
- echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+ $as_echo_n 0123456789 >"conftest.in"
while :
do
cat "conftest.in" "conftest.in" >"conftest.tmp"
mv "conftest.tmp" "conftest.in"
cp "conftest.in" "conftest.nl"
- echo 'EGREP' >> "conftest.nl"
+ $as_echo 'EGREP' >> "conftest.nl"
"$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
ac_count=`expr $ac_count + 1`
@@ -5999,34 +6541,113 @@ case `"$ac_path_EGREP" --version 2>&1` in
rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
esac
-
- $ac_path_EGREP_found && break 3
+ $ac_path_EGREP_found && break 3
+ done
done
done
-
-done
IFS=$as_save_IFS
-
-
+ if test -z "$ac_cv_path_EGREP"; then
+ { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+else
+ ac_cv_path_EGREP=$EGREP
fi
-EGREP="$ac_cv_path_EGREP"
-if test -z "$EGREP"; then
- { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
- { (exit 1); exit 1; }; }
+ fi
fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
+$as_echo "$ac_cv_path_EGREP" >&6; }
+ EGREP="$ac_cv_path_EGREP"
+
+{ $as_echo "$as_me:$LINENO: checking for fgrep" >&5
+$as_echo_n "checking for fgrep... " >&6; }
+if test "${ac_cv_path_FGREP+set}" = set; then
+ $as_echo_n "(cached) " >&6
else
- ac_cv_path_EGREP=$EGREP
-fi
+ if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
+ then ac_cv_path_FGREP="$GREP -F"
+ else
+ if test -z "$FGREP"; then
+ ac_path_FGREP_found=false
+ # Loop through the user's path and test for each of PROGNAME-LIST
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_prog in fgrep; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
+ { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
+# Check for GNU ac_path_FGREP and select it if it is found.
+ # Check for GNU $ac_path_FGREP
+case `"$ac_path_FGREP" --version 2>&1` in
+*GNU*)
+ ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;;
+*)
+ ac_count=0
+ $as_echo_n 0123456789 >"conftest.in"
+ while :
+ do
+ cat "conftest.in" "conftest.in" >"conftest.tmp"
+ mv "conftest.tmp" "conftest.in"
+ cp "conftest.in" "conftest.nl"
+ $as_echo 'FGREP' >> "conftest.nl"
+ "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+ ac_count=`expr $ac_count + 1`
+ if test $ac_count -gt ${ac_path_FGREP_max-0}; then
+ # Best one so far, save it but keep looking for a better one
+ ac_cv_path_FGREP="$ac_path_FGREP"
+ ac_path_FGREP_max=$ac_count
+ fi
+ # 10*(2^10) chars as input seems more than enough
+ test $ac_count -gt 10 && break
+ done
+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+ $ac_path_FGREP_found && break 3
+ done
+ done
+done
+IFS=$as_save_IFS
+ if test -z "$ac_cv_path_FGREP"; then
+ { { $as_echo "$as_me:$LINENO: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+$as_echo "$as_me: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+else
+ ac_cv_path_FGREP=$FGREP
+fi
fi
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
-echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
- EGREP="$ac_cv_path_EGREP"
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_FGREP" >&5
+$as_echo "$ac_cv_path_FGREP" >&6; }
+ FGREP="$ac_cv_path_FGREP"
+
+
+test -z "$GREP" && GREP=grep
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -6040,8 +6661,8 @@ fi
ac_prog=ld
if test "$GCC" = yes; then
# Check if gcc -print-prog-name=ld gives a path.
- { echo "$as_me:$LINENO: checking for ld used by $CC" >&5
-echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5
+$as_echo_n "checking for ld used by $CC... " >&6; }
case $host in
*-*-mingw*)
# gcc leaves a trailing carriage return which upsets mingw
@@ -6054,9 +6675,9 @@ echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }
[\\/]* | ?:[\\/]*)
re_direlt='/[^/][^/]*/\.\./'
# Canonicalize the pathname of ld
- ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
- while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
- ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
+ ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
+ while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
+ ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
done
test -z "$LD" && LD="$ac_prog"
;;
@@ -6070,14 +6691,14 @@ echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }
;;
esac
elif test "$with_gnu_ld" = yes; then
- { echo "$as_me:$LINENO: checking for GNU ld" >&5
-echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5
+$as_echo_n "checking for GNU ld... " >&6; }
else
- { echo "$as_me:$LINENO: checking for non-GNU ld" >&5
-echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5
+$as_echo_n "checking for non-GNU ld... " >&6; }
fi
if test "${lt_cv_path_LD+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -z "$LD"; then
lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
@@ -6107,19 +6728,19 @@ fi
LD="$lt_cv_path_LD"
if test -n "$LD"; then
- { echo "$as_me:$LINENO: result: $LD" >&5
-echo "${ECHO_T}$LD" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $LD" >&5
+$as_echo "$LD" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
-test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
-echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
+test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
+$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
{ (exit 1); exit 1; }; }
-{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
-echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
+$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
if test "${lt_cv_prog_gnu_ld+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
# I'd rather use --version here, but apparently some GNU lds only accept -v.
case `$LD -v 2>&1 </dev/null` in
@@ -6131,40 +6752,22 @@ case `$LD -v 2>&1 </dev/null` in
;;
esac
fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
-echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
+$as_echo "$lt_cv_prog_gnu_ld" >&6; }
with_gnu_ld=$lt_cv_prog_gnu_ld
-{ echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
-echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6; }
-if test "${lt_cv_ld_reload_flag+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- lt_cv_ld_reload_flag='-r'
-fi
-{ echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
-echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6; }
-reload_flag=$lt_cv_ld_reload_flag
-case $reload_flag in
-"" | " "*) ;;
-*) reload_flag=" $reload_flag" ;;
-esac
-reload_cmds='$LD$reload_flag -o $output$reload_objs'
-case $host_os in
- darwin*)
- if test "$GCC" = yes; then
- reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
- else
- reload_cmds='$LD$reload_flag -o $output$reload_objs'
- fi
- ;;
-esac
-{ echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
-echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6; }
+
+
+
+
+
+
+{ $as_echo "$as_me:$LINENO: checking for BSD- or MS-compatible name lister (nm)" >&5
+$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
if test "${lt_cv_path_NM+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$NM"; then
# Let the user override the test.
@@ -6207,638 +6810,480 @@ else
done
IFS="$lt_save_ifs"
done
- test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
+ : ${lt_cv_path_NM=no}
fi
fi
-{ echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
-echo "${ECHO_T}$lt_cv_path_NM" >&6; }
-NM="$lt_cv_path_NM"
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
+$as_echo "$lt_cv_path_NM" >&6; }
+if test "$lt_cv_path_NM" != "no"; then
+ NM="$lt_cv_path_NM"
+else
+ # Didn't find any BSD compatible name lister, look for dumpbin.
+ if test -n "$ac_tool_prefix"; then
+ for ac_prog in "dumpbin -symbols" "link -dump -symbols"
+ do
+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_DUMPBIN+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$DUMPBIN"; then
+ ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
-{ echo "$as_me:$LINENO: checking whether ln -s works" >&5
-echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; }
-LN_S=$as_ln_s
-if test "$LN_S" = "ln -s"; then
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+fi
+fi
+DUMPBIN=$ac_cv_prog_DUMPBIN
+if test -n "$DUMPBIN"; then
+ { $as_echo "$as_me:$LINENO: result: $DUMPBIN" >&5
+$as_echo "$DUMPBIN" >&6; }
else
- { echo "$as_me:$LINENO: result: no, using $LN_S" >&5
-echo "${ECHO_T}no, using $LN_S" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
-{ echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5
-echo $ECHO_N "checking how to recognize dependent libraries... $ECHO_C" >&6; }
-if test "${lt_cv_deplibs_check_method+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- lt_cv_file_magic_cmd='$MAGIC_CMD'
-lt_cv_file_magic_test_file=
-lt_cv_deplibs_check_method='unknown'
-# Need to set the preceding variable on all platforms that support
-# interlibrary dependencies.
-# 'none' -- dependencies not supported.
-# `unknown' -- same as none, but documents that we really don't know.
-# 'pass_all' -- all dependencies passed with no checks.
-# 'test_compile' -- check by making test program.
-# 'file_magic [[regex]]' -- check by looking for files in library path
-# which responds to the $file_magic_cmd with a given extended regex.
-# If you have `file' or equivalent on your system and you're not sure
-# whether `pass_all' will *always* work, you probably want this one.
-case $host_os in
-aix4* | aix5*)
- lt_cv_deplibs_check_method=pass_all
- ;;
+ test -n "$DUMPBIN" && break
+ done
+fi
+if test -z "$DUMPBIN"; then
+ ac_ct_DUMPBIN=$DUMPBIN
+ for ac_prog in "dumpbin -symbols" "link -dump -symbols"
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$ac_ct_DUMPBIN"; then
+ ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
-beos*)
- lt_cv_deplibs_check_method=pass_all
- ;;
+fi
+fi
+ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN
+if test -n "$ac_ct_DUMPBIN"; then
+ { $as_echo "$as_me:$LINENO: result: $ac_ct_DUMPBIN" >&5
+$as_echo "$ac_ct_DUMPBIN" >&6; }
+else
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
-bsdi[45]*)
- lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
- lt_cv_file_magic_cmd='/usr/bin/file -L'
- lt_cv_file_magic_test_file=/shlib/libc.so
- ;;
-cygwin*)
- # func_win32_libid is a shell function defined in ltmain.sh
- lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
- lt_cv_file_magic_cmd='func_win32_libid'
- ;;
+ test -n "$ac_ct_DUMPBIN" && break
+done
-mingw* | pw32*)
- # Base MSYS/MinGW do not provide the 'file' command needed by
- # func_win32_libid shell function, so use a weaker test based on 'objdump',
- # unless we find 'file', for example because we are cross-compiling.
- if ( file / ) >/dev/null 2>&1; then
- lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
- lt_cv_file_magic_cmd='func_win32_libid'
+ if test "x$ac_ct_DUMPBIN" = x; then
+ DUMPBIN=":"
else
- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
- lt_cv_file_magic_cmd='$OBJDUMP -f'
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ DUMPBIN=$ac_ct_DUMPBIN
fi
- ;;
+fi
-darwin* | rhapsody*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-freebsd* | dragonfly*)
- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
- case $host_cpu in
- i*86 )
- # Not sure whether the presence of OpenBSD here was a mistake.
- # Let's accept both of them until this is cleared up.
- lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library'
- lt_cv_file_magic_cmd=/usr/bin/file
- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
- ;;
- esac
- else
- lt_cv_deplibs_check_method=pass_all
+ if test "$DUMPBIN" != ":"; then
+ NM="$DUMPBIN"
fi
- ;;
+fi
+test -z "$NM" && NM=nm
-gnu*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-hpux10.20* | hpux11*)
- lt_cv_file_magic_cmd=/usr/bin/file
- case $host_cpu in
- ia64*)
- lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
- lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
- ;;
- hppa*64*)
- lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'
- lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
- ;;
- *)
- lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
- lt_cv_file_magic_test_file=/usr/lib/libc.sl
- ;;
- esac
- ;;
-interix[3-9]*)
- # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
- lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
- ;;
-irix5* | irix6* | nonstopux*)
- case $LD in
- *-32|*"-32 ") libmagic=32-bit;;
- *-n32|*"-n32 ") libmagic=N32;;
- *-64|*"-64 ") libmagic=64-bit;;
- *) libmagic=never-match;;
- esac
- lt_cv_deplibs_check_method=pass_all
- ;;
-# This must be Linux ELF.
-linux* | k*bsd*-gnu)
- lt_cv_deplibs_check_method=pass_all
- ;;
-netbsd*)
- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
- lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
- else
- lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$'
+{ $as_echo "$as_me:$LINENO: checking the name lister ($NM) interface" >&5
+$as_echo_n "checking the name lister ($NM) interface... " >&6; }
+if test "${lt_cv_nm_interface+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ lt_cv_nm_interface="BSD nm"
+ echo "int some_variable = 0;" > conftest.$ac_ext
+ (eval echo "\"\$as_me:6941: $ac_compile\"" >&5)
+ (eval "$ac_compile" 2>conftest.err)
+ cat conftest.err >&5
+ (eval echo "\"\$as_me:6944: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+ (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
+ cat conftest.err >&5
+ (eval echo "\"\$as_me:6947: output\"" >&5)
+ cat conftest.out >&5
+ if $GREP 'External.*some_variable' conftest.out > /dev/null; then
+ lt_cv_nm_interface="MS dumpbin"
fi
- ;;
+ rm -f conftest*
+fi
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_nm_interface" >&5
+$as_echo "$lt_cv_nm_interface" >&6; }
-newos6*)
- lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'
- lt_cv_file_magic_cmd=/usr/bin/file
- lt_cv_file_magic_test_file=/usr/lib/libnls.so
- ;;
+{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5
+$as_echo_n "checking whether ln -s works... " >&6; }
+LN_S=$as_ln_s
+if test "$LN_S" = "ln -s"; then
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+ { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5
+$as_echo "no, using $LN_S" >&6; }
+fi
-nto-qnx*)
- lt_cv_deplibs_check_method=unknown
- ;;
+# find the maximum length of command line arguments
+{ $as_echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
+$as_echo_n "checking the maximum length of command line arguments... " >&6; }
+if test "${lt_cv_sys_max_cmd_len+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ i=0
+ teststring="ABCD"
-openbsd*)
- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'
- else
- lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
- fi
- ;;
+ case $build_os in
+ msdosdjgpp*)
+ # On DJGPP, this test can blow up pretty badly due to problems in libc
+ # (any single argument exceeding 2000 bytes causes a buffer overrun
+ # during glob expansion). Even if it were fixed, the result of this
+ # check would be larger than it should be.
+ lt_cv_sys_max_cmd_len=12288; # 12K is about right
+ ;;
-osf3* | osf4* | osf5*)
- lt_cv_deplibs_check_method=pass_all
- ;;
+ gnu*)
+ # Under GNU Hurd, this test is not required because there is
+ # no limit to the length of command line arguments.
+ # Libtool will interpret -1 as no limit whatsoever
+ lt_cv_sys_max_cmd_len=-1;
+ ;;
-rdos*)
- lt_cv_deplibs_check_method=pass_all
- ;;
+ cygwin* | mingw* | cegcc*)
+ # On Win9x/ME, this test blows up -- it succeeds, but takes
+ # about 5 minutes as the teststring grows exponentially.
+ # Worse, since 9x/ME are not pre-emptively multitasking,
+ # you end up with a "frozen" computer, even though with patience
+ # the test eventually succeeds (with a max line length of 256k).
+ # Instead, let's just punt: use the minimum linelength reported by
+ # all of the supported platforms: 8192 (on NT/2K/XP).
+ lt_cv_sys_max_cmd_len=8192;
+ ;;
-solaris*)
- lt_cv_deplibs_check_method=pass_all
- ;;
+ amigaos*)
+ # On AmigaOS with pdksh, this test takes hours, literally.
+ # So we just punt and use a minimum line length of 8192.
+ lt_cv_sys_max_cmd_len=8192;
+ ;;
-sysv4 | sysv4.3*)
- case $host_vendor in
- motorola)
- lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
+ netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+ # This has been around since 386BSD, at least. Likely further.
+ if test -x /sbin/sysctl; then
+ lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
+ elif test -x /usr/sbin/sysctl; then
+ lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
+ else
+ lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs
+ fi
+ # And add a safety zone
+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
;;
- ncr)
- lt_cv_deplibs_check_method=pass_all
+
+ interix*)
+ # We know the value 262144 and hardcode it with a safety zone (like BSD)
+ lt_cv_sys_max_cmd_len=196608
;;
- sequent)
- lt_cv_file_magic_cmd='/bin/file'
- lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'
+
+ osf*)
+ # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
+ # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
+ # nice to cause kernel panics so lets avoid the loop below.
+ # First set a reasonable default.
+ lt_cv_sys_max_cmd_len=16384
+ #
+ if test -x /sbin/sysconfig; then
+ case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
+ *1*) lt_cv_sys_max_cmd_len=-1 ;;
+ esac
+ fi
;;
- sni)
- lt_cv_file_magic_cmd='/bin/file'
- lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib"
- lt_cv_file_magic_test_file=/lib/libc.so
+ sco3.2v5*)
+ lt_cv_sys_max_cmd_len=102400
;;
- siemens)
- lt_cv_deplibs_check_method=pass_all
+ sysv5* | sco5v6* | sysv4.2uw2*)
+ kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
+ if test -n "$kargmax"; then
+ lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[ ]//'`
+ else
+ lt_cv_sys_max_cmd_len=32768
+ fi
;;
- pc)
- lt_cv_deplibs_check_method=pass_all
+ *)
+ lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
+ if test -n "$lt_cv_sys_max_cmd_len"; then
+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+ else
+ # Make teststring a little bigger before we do anything with it.
+ # a 1K string should be a reasonable start.
+ for i in 1 2 3 4 5 6 7 8 ; do
+ teststring=$teststring$teststring
+ done
+ SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+ # If test is not a shell built-in, we'll probably end up computing a
+ # maximum length that is only half of the actual maximum length, but
+ # we can't tell.
+ while { test "X"`$SHELL $0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \
+ = "XX$teststring$teststring"; } >/dev/null 2>&1 &&
+ test $i != 17 # 1/2 MB should be enough
+ do
+ i=`expr $i + 1`
+ teststring=$teststring$teststring
+ done
+ # Only check the string length outside the loop.
+ lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
+ teststring=
+ # Add a significant safety factor because C++ compilers can tack on
+ # massive amounts of additional arguments before passing them to the
+ # linker. It appears as though 1/2 is a usable value.
+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+ fi
;;
esac
- ;;
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-esac
+fi
+if test -n $lt_cv_sys_max_cmd_len ; then
+ { $as_echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
+$as_echo "$lt_cv_sys_max_cmd_len" >&6; }
+else
+ { $as_echo "$as_me:$LINENO: result: none" >&5
+$as_echo "none" >&6; }
fi
-{ echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
-echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6; }
-file_magic_cmd=$lt_cv_file_magic_cmd
-deplibs_check_method=$lt_cv_deplibs_check_method
-test -z "$deplibs_check_method" && deplibs_check_method=unknown
+max_cmd_len=$lt_cv_sys_max_cmd_len
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-# If no C compiler flags were specified, use CFLAGS.
-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-# Allow CC to be a program name with arguments.
-compiler=$CC
+: ${CP="cp -f"}
+: ${MV="mv -f"}
+: ${RM="rm -f"}
-# Check whether --enable-libtool-lock was given.
-if test "${enable_libtool_lock+set}" = set; then
- enableval=$enable_libtool_lock;
+{ $as_echo "$as_me:$LINENO: checking whether the shell understands some XSI constructs" >&5
+$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
+# Try some XSI features
+xsi_shell=no
+( _lt_dummy="a/b/c"
+ test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
+ = c,a/b,, \
+ && eval 'test $(( 1 + 1 )) -eq 2 \
+ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
+ && xsi_shell=yes
+{ $as_echo "$as_me:$LINENO: result: $xsi_shell" >&5
+$as_echo "$xsi_shell" >&6; }
+
+
+{ $as_echo "$as_me:$LINENO: checking whether the shell understands \"+=\"" >&5
+$as_echo_n "checking whether the shell understands \"+=\"... " >&6; }
+lt_shell_append=no
+( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \
+ >/dev/null 2>&1 \
+ && lt_shell_append=yes
+{ $as_echo "$as_me:$LINENO: result: $lt_shell_append" >&5
+$as_echo "$lt_shell_append" >&6; }
+
+
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+ lt_unset=unset
+else
+ lt_unset=false
fi
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-# Some flags need to be propagated to the compiler or linker for good
-# libtool support.
-case $host in
-ia64-*-hpux*)
- # Find out which ABI we are using.
- echo 'int i;' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- case `/usr/bin/file conftest.$ac_objext` in
- *ELF-32*)
- HPUX_IA64_MODE="32"
- ;;
- *ELF-64*)
- HPUX_IA64_MODE="64"
- ;;
- esac
- fi
- rm -rf conftest*
- ;;
-*-*-irix6*)
- # Find out which ABI we are using.
- echo '#line 6463 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- if test "$lt_cv_prog_gnu_ld" = yes; then
- case `/usr/bin/file conftest.$ac_objext` in
- *32-bit*)
- LD="${LD-ld} -melf32bsmip"
- ;;
- *N32*)
- LD="${LD-ld} -melf32bmipn32"
- ;;
- *64-bit*)
- LD="${LD-ld} -melf64bmip"
- ;;
- esac
- else
- case `/usr/bin/file conftest.$ac_objext` in
- *32-bit*)
- LD="${LD-ld} -32"
- ;;
- *N32*)
- LD="${LD-ld} -n32"
- ;;
- *64-bit*)
- LD="${LD-ld} -64"
- ;;
- esac
- fi
- fi
- rm -rf conftest*
- ;;
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
-s390*-*linux*|sparc*-*linux*)
- # Find out which ABI we are using.
- echo 'int i;' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- case `/usr/bin/file conftest.o` in
- *32-bit*)
- case $host in
- x86_64-*kfreebsd*-gnu)
- LD="${LD-ld} -m elf_i386_fbsd"
- ;;
- x86_64-*linux*)
- LD="${LD-ld} -m elf_i386"
- ;;
- ppc64-*linux*|powerpc64-*linux*)
- LD="${LD-ld} -m elf32ppclinux"
- ;;
- s390x-*linux*)
- LD="${LD-ld} -m elf_s390"
- ;;
- sparc64-*linux*)
- LD="${LD-ld} -m elf32_sparc"
- ;;
- esac
- ;;
- *64-bit*)
- case $host in
- x86_64-*kfreebsd*-gnu)
- LD="${LD-ld} -m elf_x86_64_fbsd"
- ;;
- x86_64-*linux*)
- LD="${LD-ld} -m elf_x86_64"
- ;;
- ppc*-*linux*|powerpc*-*linux*)
- LD="${LD-ld} -m elf64ppc"
- ;;
- s390*-*linux*)
- LD="${LD-ld} -m elf64_s390"
- ;;
- sparc*-*linux*)
- LD="${LD-ld} -m elf64_sparc"
- ;;
- esac
- ;;
- esac
- fi
- rm -rf conftest*
+
+
+# test EBCDIC or ASCII
+case `echo X|tr X '\101'` in
+ A) # ASCII based system
+ # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
+ lt_SP2NL='tr \040 \012'
+ lt_NL2SP='tr \015\012 \040\040'
;;
+ *) # EBCDIC based system
+ lt_SP2NL='tr \100 \n'
+ lt_NL2SP='tr \r\n \100\100'
+ ;;
+esac
-*-*-sco3.2v5*)
- # On SCO OpenServer 5, we need -belf to get full-featured binaries.
- SAVE_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS -belf"
- { echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
-echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6; }
-if test "${lt_cv_cc_needs_belf+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-# ifdef __cplusplus
- extern "C"
-# endif
- int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- lt_cv_cc_needs_belf=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
- lt_cv_cc_needs_belf=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-fi
-{ echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
-echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6; }
- if test x"$lt_cv_cc_needs_belf" != x"yes"; then
- # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
- CFLAGS="$SAVE_CFLAGS"
- fi
- ;;
-sparc*-*solaris*)
- # Find out which ABI we are using.
- echo 'int i;' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- case `/usr/bin/file conftest.o` in
- *64-bit*)
- case $lt_cv_prog_gnu_ld in
- yes*) LD="${LD-ld} -m elf64_sparc" ;;
- *) LD="${LD-ld} -64" ;;
- esac
- ;;
- esac
- fi
- rm -rf conftest*
- ;;
+{ $as_echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
+$as_echo_n "checking for $LD option to reload object files... " >&6; }
+if test "${lt_cv_ld_reload_flag+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ lt_cv_ld_reload_flag='-r'
+fi
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
+$as_echo "$lt_cv_ld_reload_flag" >&6; }
+reload_flag=$lt_cv_ld_reload_flag
+case $reload_flag in
+"" | " "*) ;;
+*) reload_flag=" $reload_flag" ;;
+esac
+reload_cmds='$LD$reload_flag -o $output$reload_objs'
+case $host_os in
+ darwin*)
+ if test "$GCC" = yes; then
+ reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
+ else
+ reload_cmds='$LD$reload_flag -o $output$reload_objs'
+ fi
+ ;;
esac
-need_locks="$enable_libtool_lock"
-{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
-if test "${ac_cv_header_stdc+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-# ifdef __cplusplus
- extern "C"
-# endif
- int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_header_stdc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
- ac_cv_header_stdc=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-if test $ac_cv_header_stdc = yes; then
- # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <string.h>
+if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
+set dummy ${ac_tool_prefix}objdump; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_OBJDUMP+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$OBJDUMP"; then
+ ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "memchr" >/dev/null 2>&1; then
- :
+fi
+fi
+OBJDUMP=$ac_cv_prog_OBJDUMP
+if test -n "$OBJDUMP"; then
+ { $as_echo "$as_me:$LINENO: result: $OBJDUMP" >&5
+$as_echo "$OBJDUMP" >&6; }
else
- ac_cv_header_stdc=no
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
-rm -f conftest*
-fi
-
-if test $ac_cv_header_stdc = yes; then
- # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <stdlib.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "free" >/dev/null 2>&1; then
- :
-else
- ac_cv_header_stdc=no
-fi
-rm -f conftest*
fi
-
-if test $ac_cv_header_stdc = yes; then
- # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
- if test "$cross_compiling" = yes; then
- :
+if test -z "$ac_cv_prog_OBJDUMP"; then
+ ac_ct_OBJDUMP=$OBJDUMP
+ # Extract the first word of "objdump", so it can be a program name with args.
+set dummy objdump; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then
+ $as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <ctype.h>
-#include <stdlib.h>
-#if ((' ' & 0x0FF) == 0x020)
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#else
-# define ISLOWER(c) \
- (('a' <= (c) && (c) <= 'i') \
- || ('j' <= (c) && (c) <= 'r') \
- || ('s' <= (c) && (c) <= 'z'))
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-#endif
-
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int
-main ()
-{
- int i;
- for (i = 0; i < 256; i++)
- if (XOR (islower (i), ISLOWER (i))
- || toupper (i) != TOUPPER (i))
- return 2;
- return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- :
+ if test -n "$ac_ct_OBJDUMP"; then
+ ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
else
- echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_OBJDUMP="objdump"
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
-( exit $ac_status )
-ac_cv_header_stdc=no
fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-
-
fi
+ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
+if test -n "$ac_ct_OBJDUMP"; then
+ { $as_echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5
+$as_echo "$ac_ct_OBJDUMP" >&6; }
+else
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
-if test $ac_cv_header_stdc = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define STDC_HEADERS 1
-_ACEOF
+ if test "x$ac_ct_OBJDUMP" = x; then
+ OBJDUMP="false"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ OBJDUMP=$ac_ct_OBJDUMP
+ fi
+else
+ OBJDUMP="$ac_cv_prog_OBJDUMP"
fi
-# On IRIX 5.3, sys/types and inttypes.h are conflicting.
-
+test -z "$OBJDUMP" && OBJDUMP=objdump
@@ -6847,460 +7292,335 @@ fi
-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
- inttypes.h stdint.h unistd.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- eval "$as_ac_Header=yes"
+{ $as_echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5
+$as_echo_n "checking how to recognize dependent libraries... " >&6; }
+if test "${lt_cv_deplibs_check_method+set}" = set; then
+ $as_echo_n "(cached) " >&6
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+ lt_cv_file_magic_cmd='$MAGIC_CMD'
+lt_cv_file_magic_test_file=
+lt_cv_deplibs_check_method='unknown'
+# Need to set the preceding variable on all platforms that support
+# interlibrary dependencies.
+# 'none' -- dependencies not supported.
+# `unknown' -- same as none, but documents that we really don't know.
+# 'pass_all' -- all dependencies passed with no checks.
+# 'test_compile' -- check by making test program.
+# 'file_magic [[regex]]' -- check by looking for files in library path
+# which responds to the $file_magic_cmd with a given extended regex.
+# If you have `file' or equivalent on your system and you're not sure
+# whether `pass_all' will *always* work, you probably want this one.
- eval "$as_ac_Header=no"
-fi
+case $host_os in
+aix[4-9]*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
+beos*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
-fi
+bsdi[45]*)
+ lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
+ lt_cv_file_magic_cmd='/usr/bin/file -L'
+ lt_cv_file_magic_test_file=/shlib/libc.so
+ ;;
-done
+cygwin*)
+ # func_win32_libid is a shell function defined in ltmain.sh
+ lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+ lt_cv_file_magic_cmd='func_win32_libid'
+ ;;
+mingw* | pw32*)
+ # Base MSYS/MinGW do not provide the 'file' command needed by
+ # func_win32_libid shell function, so use a weaker test based on 'objdump',
+ # unless we find 'file', for example because we are cross-compiling.
+ if ( file / ) >/dev/null 2>&1; then
+ lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+ lt_cv_file_magic_cmd='func_win32_libid'
+ else
+ lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+ lt_cv_file_magic_cmd='$OBJDUMP -f'
+ fi
+ ;;
+cegcc)
+ # use the weaker test based on 'objdump'. See mingw*.
+ lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
+ lt_cv_file_magic_cmd='$OBJDUMP -f'
+ ;;
-for ac_header in dlfcn.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-else
- # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+darwin* | rhapsody*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
- ac_header_compiler=no
-fi
+freebsd* | dragonfly*)
+ if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+ case $host_cpu in
+ i*86 )
+ # Not sure whether the presence of OpenBSD here was a mistake.
+ # Let's accept both of them until this is cleared up.
+ lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library'
+ lt_cv_file_magic_cmd=/usr/bin/file
+ lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+ ;;
+ esac
+ else
+ lt_cv_deplibs_check_method=pass_all
+ fi
+ ;;
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+gnu*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
-# Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+hpux10.20* | hpux11*)
+ lt_cv_file_magic_cmd=/usr/bin/file
+ case $host_cpu in
+ ia64*)
+ lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
+ lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
+ ;;
+ hppa*64*)
+ lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'
+ lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
+ ;;
+ *)
+ lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
+ lt_cv_file_magic_test_file=/usr/lib/libc.sl
+ ;;
+ esac
+ ;;
- ac_header_preproc=no
-fi
+interix[3-9]*)
+ # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
+ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
+ ;;
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+irix5* | irix6* | nonstopux*)
+ case $LD in
+ *-32|*"-32 ") libmagic=32-bit;;
+ *-n32|*"-n32 ") libmagic=N32;;
+ *-64|*"-64 ") libmagic=64-bit;;
+ *) libmagic=never-match;;
+ esac
+ lt_cv_deplibs_check_method=pass_all
+ ;;
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
+# This must be Linux ELF.
+linux* | k*bsd*-gnu)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+netbsd*)
+ if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+ else
+ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$'
+ fi
+ ;;
+
+newos6*)
+ lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'
+ lt_cv_file_magic_cmd=/usr/bin/file
+ lt_cv_file_magic_test_file=/usr/lib/libnls.so
+ ;;
+
+*nto* | *qnx*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+openbsd*)
+ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'
+ else
+ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+ fi
+ ;;
+
+osf3* | osf4* | osf5*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+rdos*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+solaris*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+sysv4 | sysv4.3*)
+ case $host_vendor in
+ motorola)
+ lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
+ lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
- ( cat <<\_ASBOX
-## ----------------------------------------- ##
-## Report this to visit-users at email.ornl.gov ##
-## ----------------------------------------- ##
-_ASBOX
- ) | sed "s/^/$as_me: WARNING: /" >&2
+ ncr)
+ lt_cv_deplibs_check_method=pass_all
;;
-esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ sequent)
+ lt_cv_file_magic_cmd='/bin/file'
+ lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'
+ ;;
+ sni)
+ lt_cv_file_magic_cmd='/bin/file'
+ lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib"
+ lt_cv_file_magic_test_file=/lib/libc.so
+ ;;
+ siemens)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+ pc)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+ esac
+ ;;
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
+tpf*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+esac
fi
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
+$as_echo "$lt_cv_deplibs_check_method" >&6; }
+file_magic_cmd=$lt_cv_file_magic_cmd
+deplibs_check_method=$lt_cv_deplibs_check_method
+test -z "$deplibs_check_method" && deplibs_check_method=unknown
-done
-if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
- ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
- (test "X$CXX" != "Xg++"))) ; then
- ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-{ echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
-echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6; }
-if test -z "$CXXCPP"; then
- if test "${ac_cv_prog_CXXCPP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- # Double quotes because CXXCPP needs to be expanded
- for CXXCPP in "$CXX -E" "/lib/cpp"
- do
- ac_preproc_ok=false
-for ac_cxx_preproc_warn_flag in '' yes
-do
- # Use a header file that comes with gcc, so configuring glibc
- # with a fresh cross-compiler works.
- # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- # <limits.h> exists even on freestanding compilers.
- # On the NeXT, cc -E runs the code through the compiler's parser,
- # not just through cpp. "Syntax error" is here to catch this case.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
- Syntax error
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- }; then
- :
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
- # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.$ac_ext
- # OK, works on sane cases. Now check whether nonexistent headers
- # can be detected and how.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <ac_nonexistent.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- }; then
- # Broken: success on invalid input.
-continue
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
- # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.$ac_ext
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
- break
-fi
- done
- ac_cv_prog_CXXCPP=$CXXCPP
-fi
- CXXCPP=$ac_cv_prog_CXXCPP
+if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
+set dummy ${ac_tool_prefix}ar; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_AR+set}" = set; then
+ $as_echo_n "(cached) " >&6
else
- ac_cv_prog_CXXCPP=$CXXCPP
-fi
-{ echo "$as_me:$LINENO: result: $CXXCPP" >&5
-echo "${ECHO_T}$CXXCPP" >&6; }
-ac_preproc_ok=false
-for ac_cxx_preproc_warn_flag in '' yes
+ if test -n "$AR"; then
+ ac_cv_prog_AR="$AR" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
do
- # Use a header file that comes with gcc, so configuring glibc
- # with a fresh cross-compiler works.
- # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- # <limits.h> exists even on freestanding compilers.
- # On the NeXT, cc -E runs the code through the compiler's parser,
- # not just through cpp. "Syntax error" is here to catch this case.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
- Syntax error
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- }; then
- :
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_AR="${ac_tool_prefix}ar"
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
- # Broken: fails on valid input.
-continue
+fi
+fi
+AR=$ac_cv_prog_AR
+if test -n "$AR"; then
+ { $as_echo "$as_me:$LINENO: result: $AR" >&5
+$as_echo "$AR" >&6; }
+else
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
-rm -f conftest.err conftest.$ac_ext
- # OK, works on sane cases. Now check whether nonexistent headers
- # can be detected and how.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <ac_nonexistent.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- }; then
- # Broken: success on invalid input.
-continue
+fi
+if test -z "$ac_cv_prog_AR"; then
+ ac_ct_AR=$AR
+ # Extract the first word of "ar", so it can be a program name with args.
+set dummy ar; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
+ $as_echo_n "(cached) " >&6
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+ if test -n "$ac_ct_AR"; then
+ ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_AR="ar"
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
- # Passes both tests.
-ac_preproc_ok=:
-break
+fi
+fi
+ac_ct_AR=$ac_cv_prog_ac_ct_AR
+if test -n "$ac_ct_AR"; then
+ { $as_echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
+$as_echo "$ac_ct_AR" >&6; }
+else
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
- :
+ if test "x$ac_ct_AR" = x; then
+ AR="false"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ AR=$ac_ct_AR
+ fi
else
- { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check
-See \`config.log' for more details." >&5
-echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+ AR="$ac_cv_prog_AR"
fi
-ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+test -z "$AR" && AR=ar
+test -z "$AR_FLAGS" && AR_FLAGS=cru
+
+
+
+
+
+
+
+
-fi
-ac_ext=f
-ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
-ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_f77_compiler_gnu
if test -n "$ac_tool_prefix"; then
- for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn
- do
- # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_F77+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+set dummy ${ac_tool_prefix}strip; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_STRIP+set}" = set; then
+ $as_echo_n "(cached) " >&6
else
- if test -n "$F77"; then
- ac_cv_prog_F77="$F77" # Let the user override the test.
+ if test -n "$STRIP"; then
+ ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
@@ -7309,8 +7629,8 @@ do
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_F77="$ac_tool_prefix$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -7319,32 +7639,28 @@ IFS=$as_save_IFS
fi
fi
-F77=$ac_cv_prog_F77
-if test -n "$F77"; then
- { echo "$as_me:$LINENO: result: $F77" >&5
-echo "${ECHO_T}$F77" >&6; }
+STRIP=$ac_cv_prog_STRIP
+if test -n "$STRIP"; then
+ { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
+$as_echo "$STRIP" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
- test -n "$F77" && break
- done
fi
-if test -z "$F77"; then
- ac_ct_F77=$F77
- for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_F77+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+if test -z "$ac_cv_prog_STRIP"; then
+ ac_ct_STRIP=$STRIP
+ # Extract the first word of "strip", so it can be a program name with args.
+set dummy strip; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
+ $as_echo_n "(cached) " >&6
else
- if test -n "$ac_ct_F77"; then
- ac_cv_prog_ac_ct_F77="$ac_ct_F77" # Let the user override the test.
+ if test -n "$ac_ct_STRIP"; then
+ ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
@@ -7353,8 +7669,8 @@ do
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_F77="$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ ac_cv_prog_ac_ct_STRIP="strip"
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -7363,321 +7679,201 @@ IFS=$as_save_IFS
fi
fi
-ac_ct_F77=$ac_cv_prog_ac_ct_F77
-if test -n "$ac_ct_F77"; then
- { echo "$as_me:$LINENO: result: $ac_ct_F77" >&5
-echo "${ECHO_T}$ac_ct_F77" >&6; }
+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+if test -n "$ac_ct_STRIP"; then
+ { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
+$as_echo "$ac_ct_STRIP" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
-
- test -n "$ac_ct_F77" && break
-done
-
- if test "x$ac_ct_F77" = x; then
- F77=""
+ if test "x$ac_ct_STRIP" = x; then
+ STRIP=":"
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
- F77=$ac_ct_F77
+ STRIP=$ac_ct_STRIP
fi
+else
+ STRIP="$ac_cv_prog_STRIP"
fi
+test -z "$STRIP" && STRIP=:
-# Provide some information about the compiler.
-echo "$as_me:$LINENO: checking for Fortran 77 compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
-{ (ac_try="$ac_compiler --version >&5"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compiler --version >&5") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
-{ (ac_try="$ac_compiler -v >&5"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compiler -v >&5") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
-{ (ac_try="$ac_compiler -V >&5"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compiler -V >&5") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
-rm -f a.out
-# If we don't use `.F' as extension, the preprocessor is not run on the
-# input file. (Note that this only needs to work for GNU compilers.)
-ac_save_ext=$ac_ext
-ac_ext=F
-{ echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6; }
-if test "${ac_cv_f77_compiler_gnu+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
- program main
-#ifndef __GNUC__
- choke me
-#endif
- end
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_f77_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_compiler_gnu=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
- ac_compiler_gnu=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_f77_compiler_gnu=$ac_compiler_gnu
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6; }
-ac_ext=$ac_save_ext
-ac_test_FFLAGS=${FFLAGS+set}
-ac_save_FFLAGS=$FFLAGS
-FFLAGS=
-{ echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5
-echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6; }
-if test "${ac_cv_prog_f77_g+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
+set dummy ${ac_tool_prefix}ranlib; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_RANLIB+set}" = set; then
+ $as_echo_n "(cached) " >&6
else
- FFLAGS=-g
-cat >conftest.$ac_ext <<_ACEOF
- program main
-
- end
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_f77_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_prog_f77_g=yes
+ if test -n "$RANLIB"; then
+ ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
- ac_cv_prog_f77_g=no
+fi
+fi
+RANLIB=$ac_cv_prog_RANLIB
+if test -n "$RANLIB"; then
+ { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5
+$as_echo "$RANLIB" >&6; }
+else
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5
-echo "${ECHO_T}$ac_cv_prog_f77_g" >&6; }
-if test "$ac_test_FFLAGS" = set; then
- FFLAGS=$ac_save_FFLAGS
-elif test $ac_cv_prog_f77_g = yes; then
- if test "x$ac_cv_f77_compiler_gnu" = xyes; then
- FFLAGS="-g -O2"
- else
- FFLAGS="-g"
+if test -z "$ac_cv_prog_RANLIB"; then
+ ac_ct_RANLIB=$RANLIB
+ # Extract the first word of "ranlib", so it can be a program name with args.
+set dummy ranlib; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$ac_ct_RANLIB"; then
+ ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_RANLIB="ranlib"
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+if test -n "$ac_ct_RANLIB"; then
+ { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
+$as_echo "$ac_ct_RANLIB" >&6; }
else
- if test "x$ac_cv_f77_compiler_gnu" = xyes; then
- FFLAGS="-O2"
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+ if test "x$ac_ct_RANLIB" = x; then
+ RANLIB=":"
else
- FFLAGS=
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ RANLIB=$ac_ct_RANLIB
fi
+else
+ RANLIB="$ac_cv_prog_RANLIB"
fi
-G77=`test $ac_compiler_gnu = yes && echo yes`
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+test -z "$RANLIB" && RANLIB=:
-# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
-# find the maximum length of command line arguments
-{ echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
-echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; }
-if test "${lt_cv_sys_max_cmd_len+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- i=0
- teststring="ABCD"
- case $build_os in
- msdosdjgpp*)
- # On DJGPP, this test can blow up pretty badly due to problems in libc
- # (any single argument exceeding 2000 bytes causes a buffer overrun
- # during glob expansion). Even if it were fixed, the result of this
- # check would be larger than it should be.
- lt_cv_sys_max_cmd_len=12288; # 12K is about right
- ;;
- gnu*)
- # Under GNU Hurd, this test is not required because there is
- # no limit to the length of command line arguments.
- # Libtool will interpret -1 as no limit whatsoever
- lt_cv_sys_max_cmd_len=-1;
- ;;
+# Determine commands to create old-style static archives.
+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
+old_postinstall_cmds='chmod 644 $oldlib'
+old_postuninstall_cmds=
- cygwin* | mingw*)
- # On Win9x/ME, this test blows up -- it succeeds, but takes
- # about 5 minutes as the teststring grows exponentially.
- # Worse, since 9x/ME are not pre-emptively multitasking,
- # you end up with a "frozen" computer, even though with patience
- # the test eventually succeeds (with a max line length of 256k).
- # Instead, let's just punt: use the minimum linelength reported by
- # all of the supported platforms: 8192 (on NT/2K/XP).
- lt_cv_sys_max_cmd_len=8192;
+if test -n "$RANLIB"; then
+ case $host_os in
+ openbsd*)
+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
;;
-
- amigaos*)
- # On AmigaOS with pdksh, this test takes hours, literally.
- # So we just punt and use a minimum line length of 8192.
- lt_cv_sys_max_cmd_len=8192;
+ *)
+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
;;
+ esac
+ old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+fi
+
+
- netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
- # This has been around since 386BSD, at least. Likely further.
- if test -x /sbin/sysctl; then
- lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
- elif test -x /usr/sbin/sysctl; then
- lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
- else
- lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs
- fi
- # And add a safety zone
- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
- ;;
- interix*)
- # We know the value 262144 and hardcode it with a safety zone (like BSD)
- lt_cv_sys_max_cmd_len=196608
- ;;
- osf*)
- # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
- # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
- # nice to cause kernel panics so lets avoid the loop below.
- # First set a reasonable default.
- lt_cv_sys_max_cmd_len=16384
- #
- if test -x /sbin/sysconfig; then
- case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
- *1*) lt_cv_sys_max_cmd_len=-1 ;;
- esac
- fi
- ;;
- sco3.2v5*)
- lt_cv_sys_max_cmd_len=102400
- ;;
- sysv5* | sco5v6* | sysv4.2uw2*)
- kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
- if test -n "$kargmax"; then
- lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[ ]//'`
- else
- lt_cv_sys_max_cmd_len=32768
- fi
- ;;
- *)
- lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
- if test -n "$lt_cv_sys_max_cmd_len"; then
- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
- else
- SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
- while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \
- = "XX$teststring") >/dev/null 2>&1 &&
- new_result=`expr "X$teststring" : ".*" 2>&1` &&
- lt_cv_sys_max_cmd_len=$new_result &&
- test $i != 17 # 1/2 MB should be enough
- do
- i=`expr $i + 1`
- teststring=$teststring$teststring
- done
- teststring=
- # Add a significant safety factor because C++ compilers can tack on massive
- # amounts of additional arguments before passing them to the linker.
- # It appears as though 1/2 is a usable value.
- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
- fi
- ;;
- esac
-fi
-if test -n $lt_cv_sys_max_cmd_len ; then
- { echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
-echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6; }
-else
- { echo "$as_me:$LINENO: result: none" >&5
-echo "${ECHO_T}none" >&6; }
-fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
+
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
+# Allow CC to be a program name with arguments.
+compiler=$CC
+
+
# Check for command to grab the raw symbol name followed by C symbol from nm.
-{ echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
-echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
+$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
# These are sane defaults that work on at least a few old systems.
@@ -7689,33 +7885,18 @@ symcode='[BCDEGRST]'
# Regexp to match symbols that can be accessed directly from C.
sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
-# Transform an extracted symbol line into a proper C declaration
-lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
-
-# Transform an extracted symbol line into symbol name and symbol address
-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
-
# Define system-specific variables.
case $host_os in
aix*)
symcode='[BCDT]'
;;
-cygwin* | mingw* | pw32*)
+cygwin* | mingw* | pw32* | cegcc*)
symcode='[ABCDGISTW]'
;;
-hpux*) # Its linker distinguishes data from code symbols
+hpux*)
if test "$host_cpu" = ia64; then
symcode='[ABCDEGRST]'
fi
- lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
- lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
- ;;
-linux* | k*bsd*-gnu)
- if test "$host_cpu" = ia64; then
- symcode='[ABCDGIRSTW]'
- lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
- lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
- fi
;;
irix* | nonstopux*)
symcode='[BCDEGRST]'
@@ -7740,56 +7921,84 @@ sysv4)
;;
esac
+# If we're using GNU nm, then use its standard symbol codes.
+case `$NM -V 2>&1` in
+*GNU* | *'with BFD'*)
+ symcode='[ABCDGIRSTW]' ;;
+esac
+
+# Transform an extracted symbol line into a proper C declaration.
+# Some systems (esp. on ia64) link data and code symbols differently,
+# so use this general approach.
+lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+
+# Transform an extracted symbol line into symbol name and symbol address
+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
+
# Handle CRLF in mingw tool chain
opt_cr=
case $build_os in
mingw*)
- opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp
+ opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
;;
esac
-# If we're using GNU nm, then use its standard symbol codes.
-case `$NM -V 2>&1` in
-*GNU* | *'with BFD'*)
- symcode='[ABCDGIRSTW]' ;;
-esac
-
-# Try without a prefix undercore, then with it.
+# Try without a prefix underscore, then with it.
for ac_symprfx in "" "_"; do
# Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
symxfrm="\\1 $ac_symprfx\\2 \\2"
# Write the raw and C identifiers.
- lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
+ if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+ # Fake it for dumpbin and say T for any non-static function
+ # and D for any global variable.
+ # Also find C++ and __fastcall symbols from MSVC++,
+ # which start with @ or ?.
+ lt_cv_sys_global_symbol_pipe="$AWK '"\
+" {last_section=section; section=\$ 3};"\
+" /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
+" \$ 0!~/External *\|/{next};"\
+" / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
+" {if(hide[section]) next};"\
+" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
+" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
+" s[1]~/^[@?]/{print s[1], s[1]; next};"\
+" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
+" ' prfx=^$ac_symprfx"
+ else
+ lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
+ fi
# Check to see that the pipe works correctly.
pipe_works=no
rm -f conftest*
- cat > conftest.$ac_ext <<EOF
+ cat > conftest.$ac_ext <<_LT_EOF
#ifdef __cplusplus
extern "C" {
#endif
char nm_test_var;
-void nm_test_func(){}
+void nm_test_func(void);
+void nm_test_func(void){}
#ifdef __cplusplus
}
#endif
int main(){nm_test_var='a';nm_test_func();return(0);}
-EOF
+_LT_EOF
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
# Now try to grab the symbols.
nlist=conftest.nm
if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5
(eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s "$nlist"; then
# Try sorting and uniquifying the output.
if sort "$nlist" | uniq > "$nlist"T; then
@@ -7799,42 +8008,44 @@ EOF
fi
# Make sure that we snagged all the symbols we need.
- if grep ' nm_test_var$' "$nlist" >/dev/null; then
- if grep ' nm_test_func$' "$nlist" >/dev/null; then
- cat <<EOF > conftest.$ac_ext
+ if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
+ if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
+ cat <<_LT_EOF > conftest.$ac_ext
#ifdef __cplusplus
extern "C" {
#endif
-EOF
+_LT_EOF
# Now generate the symbol file.
- eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext'
+ eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
- cat <<EOF >> conftest.$ac_ext
-#if defined (__STDC__) && __STDC__
-# define lt_ptr_t void *
-#else
-# define lt_ptr_t char *
-# define const
-#endif
+ cat <<_LT_EOF >> conftest.$ac_ext
-/* The mapping between symbol names and symbols. */
+/* The mapping between symbol names and symbols. */
const struct {
const char *name;
- lt_ptr_t address;
+ void *address;
}
-lt_preloaded_symbols[] =
+lt__PROGRAM__LTX_preloaded_symbols[] =
{
-EOF
- $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext
- cat <<\EOF >> conftest.$ac_ext
- {0, (lt_ptr_t) 0}
+ { "@PROGRAM@", (void *) 0 },
+_LT_EOF
+ $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
+ cat <<\_LT_EOF >> conftest.$ac_ext
+ {0, (void *) 0}
};
+/* This works around a problem in FreeBSD linker */
+#ifdef FREEBSD_WORKAROUND
+static const void *lt_preloaded_setup() {
+ return lt__PROGRAM__LTX_preloaded_symbols;
+}
+#endif
+
#ifdef __cplusplus
}
#endif
-EOF
+_LT_EOF
# Now try linking the two files.
mv conftest.$ac_objext conftstm.$ac_objext
lt_save_LIBS="$LIBS"
@@ -7844,7 +8055,7 @@ EOF
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext}; then
pipe_works=yes
fi
@@ -7863,7 +8074,7 @@ EOF
echo "$progname: failed program was:" >&5
cat conftest.$ac_ext >&5
fi
- rm -f conftest* conftst*
+ rm -rf conftest* conftst*
# Do not use the global_symbol_pipe unless it works.
if test "$pipe_works" = yes; then
@@ -7879,87 +8090,277 @@ if test -z "$lt_cv_sys_global_symbol_pipe"; then
lt_cv_sys_global_symbol_to_cdecl=
fi
if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
- { echo "$as_me:$LINENO: result: failed" >&5
-echo "${ECHO_T}failed" >&6; }
+ { $as_echo "$as_me:$LINENO: result: failed" >&5
+$as_echo "failed" >&6; }
else
- { echo "$as_me:$LINENO: result: ok" >&5
-echo "${ECHO_T}ok" >&6; }
+ { $as_echo "$as_me:$LINENO: result: ok" >&5
+$as_echo "ok" >&6; }
fi
-{ echo "$as_me:$LINENO: checking for objdir" >&5
-echo $ECHO_N "checking for objdir... $ECHO_C" >&6; }
-if test "${lt_cv_objdir+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- rm -f .libs 2>/dev/null
-mkdir .libs 2>/dev/null
-if test -d .libs; then
- lt_cv_objdir=.libs
-else
- # MS-DOS does not allow filenames that begin with a dot.
- lt_cv_objdir=_libs
-fi
-rmdir .libs 2>/dev/null
-fi
-{ echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
-echo "${ECHO_T}$lt_cv_objdir" >&6; }
-objdir=$lt_cv_objdir
-case $host_os in
-aix3*)
- # AIX sometimes has problems with the GCC collect2 program. For some
- # reason, if we set the COLLECT_NAMES environment variable, the problems
- # vanish in a puff of smoke.
- if test "X${COLLECT_NAMES+set}" != Xset; then
- COLLECT_NAMES=
- export COLLECT_NAMES
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Check whether --enable-libtool-lock was given.
+if test "${enable_libtool_lock+set}" = set; then
+ enableval=$enable_libtool_lock;
+fi
+
+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+
+# Some flags need to be propagated to the compiler or linker for good
+# libtool support.
+case $host in
+ia64-*-hpux*)
+ # Find out which ABI we are using.
+ echo 'int i;' > conftest.$ac_ext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ case `/usr/bin/file conftest.$ac_objext` in
+ *ELF-32*)
+ HPUX_IA64_MODE="32"
+ ;;
+ *ELF-64*)
+ HPUX_IA64_MODE="64"
+ ;;
+ esac
+ fi
+ rm -rf conftest*
+ ;;
+*-*-irix6*)
+ # Find out which ABI we are using.
+ echo '#line 8152 "configure"' > conftest.$ac_ext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ if test "$lt_cv_prog_gnu_ld" = yes; then
+ case `/usr/bin/file conftest.$ac_objext` in
+ *32-bit*)
+ LD="${LD-ld} -melf32bsmip"
+ ;;
+ *N32*)
+ LD="${LD-ld} -melf32bmipn32"
+ ;;
+ *64-bit*)
+ LD="${LD-ld} -melf64bmip"
+ ;;
+ esac
+ else
+ case `/usr/bin/file conftest.$ac_objext` in
+ *32-bit*)
+ LD="${LD-ld} -32"
+ ;;
+ *N32*)
+ LD="${LD-ld} -n32"
+ ;;
+ *64-bit*)
+ LD="${LD-ld} -64"
+ ;;
+ esac
+ fi
fi
+ rm -rf conftest*
;;
-esac
-# Sed substitution that helps us do robust quoting. It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed='sed -e 1s/^X//'
-sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
+ # Find out which ABI we are using.
+ echo 'int i;' > conftest.$ac_ext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ case `/usr/bin/file conftest.o` in
+ *32-bit*)
+ case $host in
+ x86_64-*kfreebsd*-gnu)
+ LD="${LD-ld} -m elf_i386_fbsd"
+ ;;
+ x86_64-*linux*)
+ LD="${LD-ld} -m elf_i386"
+ ;;
+ ppc64-*linux*|powerpc64-*linux*)
+ LD="${LD-ld} -m elf32ppclinux"
+ ;;
+ s390x-*linux*)
+ LD="${LD-ld} -m elf_s390"
+ ;;
+ sparc64-*linux*)
+ LD="${LD-ld} -m elf32_sparc"
+ ;;
+ esac
+ ;;
+ *64-bit*)
+ case $host in
+ x86_64-*kfreebsd*-gnu)
+ LD="${LD-ld} -m elf_x86_64_fbsd"
+ ;;
+ x86_64-*linux*)
+ LD="${LD-ld} -m elf_x86_64"
+ ;;
+ ppc*-*linux*|powerpc*-*linux*)
+ LD="${LD-ld} -m elf64ppc"
+ ;;
+ s390*-*linux*|s390*-*tpf*)
+ LD="${LD-ld} -m elf64_s390"
+ ;;
+ sparc*-*linux*)
+ LD="${LD-ld} -m elf64_sparc"
+ ;;
+ esac
+ ;;
+ esac
+ fi
+ rm -rf conftest*
+ ;;
-# Same as above, but do not quote variable references.
-double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g'
+*-*-sco3.2v5*)
+ # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+ SAVE_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS -belf"
+ { $as_echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
+$as_echo_n "checking whether the C compiler needs -belf... " >&6; }
+if test "${lt_cv_cc_needs_belf+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-# Sed substitution to delay expansion of an escaped shell variable in a
-# double_quote_subst'ed string.
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
-# Sed substitution to avoid accidental globbing in evaled expressions
-no_glob_subst='s/\*/\\\*/g'
+#ifdef FC_DUMMY_MAIN
+#ifndef FC_DUMMY_MAIN_EQ_F77
+# ifdef __cplusplus
+ extern "C"
+# endif
+ int FC_DUMMY_MAIN() { return 1; }
+#endif
+#endif
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+ lt_cv_cc_needs_belf=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
-# Constants:
-rm="rm -f"
+ lt_cv_cc_needs_belf=no
+fi
-# Global variables:
-default_ofile=libtool
-can_build_shared=yes
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-# All known linkers require a `.a' archive for static linking (except MSVC,
-# which needs '.lib').
-libext=a
-ltmain="$ac_aux_dir/ltmain.sh"
-ofile="$default_ofile"
-with_gnu_ld="$lt_cv_prog_gnu_ld"
+fi
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
+$as_echo "$lt_cv_cc_needs_belf" >&6; }
+ if test x"$lt_cv_cc_needs_belf" != x"yes"; then
+ # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
+ CFLAGS="$SAVE_CFLAGS"
+ fi
+ ;;
+sparc*-*solaris*)
+ # Find out which ABI we are using.
+ echo 'int i;' > conftest.$ac_ext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ case `/usr/bin/file conftest.o` in
+ *64-bit*)
+ case $lt_cv_prog_gnu_ld in
+ yes*) LD="${LD-ld} -m elf64_sparc" ;;
+ *)
+ if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
+ LD="${LD-ld} -64"
+ fi
+ ;;
+ esac
+ ;;
+ esac
+ fi
+ rm -rf conftest*
+ ;;
+esac
-if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ar; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_AR+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+need_locks="$enable_libtool_lock"
+
+
+ case $host_os in
+ rhapsody* | darwin*)
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
+set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_DSYMUTIL+set}" = set; then
+ $as_echo_n "(cached) " >&6
else
- if test -n "$AR"; then
- ac_cv_prog_AR="$AR" # Let the user override the test.
+ if test -n "$DSYMUTIL"; then
+ ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
@@ -7968,8 +8369,8 @@ do
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_AR="${ac_tool_prefix}ar"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -7978,28 +8379,28 @@ IFS=$as_save_IFS
fi
fi
-AR=$ac_cv_prog_AR
-if test -n "$AR"; then
- { echo "$as_me:$LINENO: result: $AR" >&5
-echo "${ECHO_T}$AR" >&6; }
+DSYMUTIL=$ac_cv_prog_DSYMUTIL
+if test -n "$DSYMUTIL"; then
+ { $as_echo "$as_me:$LINENO: result: $DSYMUTIL" >&5
+$as_echo "$DSYMUTIL" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
fi
-if test -z "$ac_cv_prog_AR"; then
- ac_ct_AR=$AR
- # Extract the first word of "ar", so it can be a program name with args.
-set dummy ar; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+if test -z "$ac_cv_prog_DSYMUTIL"; then
+ ac_ct_DSYMUTIL=$DSYMUTIL
+ # Extract the first word of "dsymutil", so it can be a program name with args.
+set dummy dsymutil; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then
+ $as_echo_n "(cached) " >&6
else
- if test -n "$ac_ct_AR"; then
- ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
+ if test -n "$ac_ct_DSYMUTIL"; then
+ ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
@@ -8008,8 +8409,8 @@ do
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_AR="ar"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -8018,44 +8419,40 @@ IFS=$as_save_IFS
fi
fi
-ac_ct_AR=$ac_cv_prog_ac_ct_AR
-if test -n "$ac_ct_AR"; then
- { echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
-echo "${ECHO_T}$ac_ct_AR" >&6; }
+ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
+if test -n "$ac_ct_DSYMUTIL"; then
+ { $as_echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5
+$as_echo "$ac_ct_DSYMUTIL" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
- if test "x$ac_ct_AR" = x; then
- AR="false"
+ if test "x$ac_ct_DSYMUTIL" = x; then
+ DSYMUTIL=":"
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
- AR=$ac_ct_AR
+ DSYMUTIL=$ac_ct_DSYMUTIL
fi
else
- AR="$ac_cv_prog_AR"
+ DSYMUTIL="$ac_cv_prog_DSYMUTIL"
fi
-if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_RANLIB+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
+set dummy ${ac_tool_prefix}nmedit; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_NMEDIT+set}" = set; then
+ $as_echo_n "(cached) " >&6
else
- if test -n "$RANLIB"; then
- ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
+ if test -n "$NMEDIT"; then
+ ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
@@ -8064,8 +8461,8 @@ do
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -8074,28 +8471,28 @@ IFS=$as_save_IFS
fi
fi
-RANLIB=$ac_cv_prog_RANLIB
-if test -n "$RANLIB"; then
- { echo "$as_me:$LINENO: result: $RANLIB" >&5
-echo "${ECHO_T}$RANLIB" >&6; }
+NMEDIT=$ac_cv_prog_NMEDIT
+if test -n "$NMEDIT"; then
+ { $as_echo "$as_me:$LINENO: result: $NMEDIT" >&5
+$as_echo "$NMEDIT" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
fi
-if test -z "$ac_cv_prog_RANLIB"; then
- ac_ct_RANLIB=$RANLIB
- # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+if test -z "$ac_cv_prog_NMEDIT"; then
+ ac_ct_NMEDIT=$NMEDIT
+ # Extract the first word of "nmedit", so it can be a program name with args.
+set dummy nmedit; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then
+ $as_echo_n "(cached) " >&6
else
- if test -n "$ac_ct_RANLIB"; then
- ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
+ if test -n "$ac_ct_NMEDIT"; then
+ ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
@@ -8104,8 +8501,8 @@ do
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_RANLIB="ranlib"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ ac_cv_prog_ac_ct_NMEDIT="nmedit"
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -8114,44 +8511,40 @@ IFS=$as_save_IFS
fi
fi
-ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
-if test -n "$ac_ct_RANLIB"; then
- { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
-echo "${ECHO_T}$ac_ct_RANLIB" >&6; }
+ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
+if test -n "$ac_ct_NMEDIT"; then
+ { $as_echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5
+$as_echo "$ac_ct_NMEDIT" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
- if test "x$ac_ct_RANLIB" = x; then
- RANLIB=":"
+ if test "x$ac_ct_NMEDIT" = x; then
+ NMEDIT=":"
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
- RANLIB=$ac_ct_RANLIB
+ NMEDIT=$ac_ct_NMEDIT
fi
else
- RANLIB="$ac_cv_prog_RANLIB"
+ NMEDIT="$ac_cv_prog_NMEDIT"
fi
-if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_STRIP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
+set dummy ${ac_tool_prefix}lipo; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_LIPO+set}" = set; then
+ $as_echo_n "(cached) " >&6
else
- if test -n "$STRIP"; then
- ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+ if test -n "$LIPO"; then
+ ac_cv_prog_LIPO="$LIPO" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
@@ -8160,8 +8553,8 @@ do
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_STRIP="${ac_tool_prefix}strip"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -8170,28 +8563,28 @@ IFS=$as_save_IFS
fi
fi
-STRIP=$ac_cv_prog_STRIP
-if test -n "$STRIP"; then
- { echo "$as_me:$LINENO: result: $STRIP" >&5
-echo "${ECHO_T}$STRIP" >&6; }
+LIPO=$ac_cv_prog_LIPO
+if test -n "$LIPO"; then
+ { $as_echo "$as_me:$LINENO: result: $LIPO" >&5
+$as_echo "$LIPO" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
fi
-if test -z "$ac_cv_prog_STRIP"; then
- ac_ct_STRIP=$STRIP
- # Extract the first word of "strip", so it can be a program name with args.
-set dummy strip; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+if test -z "$ac_cv_prog_LIPO"; then
+ ac_ct_LIPO=$LIPO
+ # Extract the first word of "lipo", so it can be a program name with args.
+set dummy lipo; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then
+ $as_echo_n "(cached) " >&6
else
- if test -n "$ac_ct_STRIP"; then
- ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
+ if test -n "$ac_ct_LIPO"; then
+ ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
@@ -8200,8 +8593,8 @@ do
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_STRIP="strip"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ ac_cv_prog_ac_ct_LIPO="lipo"
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -8210,1168 +8603,926 @@ IFS=$as_save_IFS
fi
fi
-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
-if test -n "$ac_ct_STRIP"; then
- { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-echo "${ECHO_T}$ac_ct_STRIP" >&6; }
+ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO
+if test -n "$ac_ct_LIPO"; then
+ { $as_echo "$as_me:$LINENO: result: $ac_ct_LIPO" >&5
+$as_echo "$ac_ct_LIPO" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
- if test "x$ac_ct_STRIP" = x; then
- STRIP=":"
+ if test "x$ac_ct_LIPO" = x; then
+ LIPO=":"
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
- STRIP=$ac_ct_STRIP
+ LIPO=$ac_ct_LIPO
fi
else
- STRIP="$ac_cv_prog_STRIP"
+ LIPO="$ac_cv_prog_LIPO"
fi
-
-old_CC="$CC"
-old_CFLAGS="$CFLAGS"
-
-# Set sane defaults for various variables
-test -z "$AR" && AR=ar
-test -z "$AR_FLAGS" && AR_FLAGS=cru
-test -z "$AS" && AS=as
-test -z "$CC" && CC=cc
-test -z "$LTCC" && LTCC=$CC
-test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
-test -z "$DLLTOOL" && DLLTOOL=dlltool
-test -z "$LD" && LD=ld
-test -z "$LN_S" && LN_S="ln -s"
-test -z "$MAGIC_CMD" && MAGIC_CMD=file
-test -z "$NM" && NM=nm
-test -z "$SED" && SED=sed
-test -z "$OBJDUMP" && OBJDUMP=objdump
-test -z "$RANLIB" && RANLIB=:
-test -z "$STRIP" && STRIP=:
-test -z "$ac_objext" && ac_objext=o
-
-# Determine commands to create old-style static archives.
-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
-old_postinstall_cmds='chmod 644 $oldlib'
-old_postuninstall_cmds=
-
-if test -n "$RANLIB"; then
- case $host_os in
- openbsd*)
- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
- ;;
- *)
- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
- ;;
- esac
- old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
-fi
-
-for cc_temp in $compiler""; do
- case $cc_temp in
- compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
- distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
- \-*) ;;
- *) break;;
- esac
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
+set dummy ${ac_tool_prefix}otool; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_OTOOL+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$OTOOL"; then
+ ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
done
-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-
+done
+IFS=$as_save_IFS
-# Only perform the check for file, if the check method requires it
-case $deplibs_check_method in
-file_magic*)
- if test "$file_magic_cmd" = '$MAGIC_CMD'; then
- { echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
-echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6; }
-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+fi
+OTOOL=$ac_cv_prog_OTOOL
+if test -n "$OTOOL"; then
+ { $as_echo "$as_me:$LINENO: result: $OTOOL" >&5
+$as_echo "$OTOOL" >&6; }
else
- case $MAGIC_CMD in
-[\\/*] | ?:[\\/]*)
- lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
- ;;
-*)
- lt_save_MAGIC_CMD="$MAGIC_CMD"
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
- ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
- for ac_dir in $ac_dummy; do
- IFS="$lt_save_ifs"
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/${ac_tool_prefix}file; then
- lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file"
- if test -n "$file_magic_test_file"; then
- case $deplibs_check_method in
- "file_magic "*)
- file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
- MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
- if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
- $EGREP "$file_magic_regex" > /dev/null; then
- :
- else
- cat <<EOF 1>&2
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such. This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem. Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool at gnu.org
-EOF
- fi ;;
- esac
- fi
- break
- fi
- done
- IFS="$lt_save_ifs"
- MAGIC_CMD="$lt_save_MAGIC_CMD"
- ;;
-esac
fi
-
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
- { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
-echo "${ECHO_T}$MAGIC_CMD" >&6; }
+if test -z "$ac_cv_prog_OTOOL"; then
+ ac_ct_OTOOL=$OTOOL
+ # Extract the first word of "otool", so it can be a program name with args.
+set dummy otool; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then
+ $as_echo_n "(cached) " >&6
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-if test -z "$lt_cv_path_MAGIC_CMD"; then
- if test -n "$ac_tool_prefix"; then
- { echo "$as_me:$LINENO: checking for file" >&5
-echo $ECHO_N "checking for file... $ECHO_C" >&6; }
-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ if test -n "$ac_ct_OTOOL"; then
+ ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # Let the user override the test.
else
- case $MAGIC_CMD in
-[\\/*] | ?:[\\/]*)
- lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
- ;;
-*)
- lt_save_MAGIC_CMD="$MAGIC_CMD"
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
- ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
- for ac_dir in $ac_dummy; do
- IFS="$lt_save_ifs"
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/file; then
- lt_cv_path_MAGIC_CMD="$ac_dir/file"
- if test -n "$file_magic_test_file"; then
- case $deplibs_check_method in
- "file_magic "*)
- file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
- MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
- if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
- $EGREP "$file_magic_regex" > /dev/null; then
- :
- else
- cat <<EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such. This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem. Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool at gnu.org
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_OTOOL="otool"
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
-EOF
- fi ;;
- esac
- fi
- break
- fi
- done
- IFS="$lt_save_ifs"
- MAGIC_CMD="$lt_save_MAGIC_CMD"
- ;;
-esac
fi
-
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
- { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
-echo "${ECHO_T}$MAGIC_CMD" >&6; }
+fi
+ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL
+if test -n "$ac_ct_OTOOL"; then
+ { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL" >&5
+$as_echo "$ac_ct_OTOOL" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
+ if test "x$ac_ct_OTOOL" = x; then
+ OTOOL=":"
else
- MAGIC_CMD=:
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ OTOOL=$ac_ct_OTOOL
fi
+else
+ OTOOL="$ac_cv_prog_OTOOL"
fi
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
+set dummy ${ac_tool_prefix}otool64; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_OTOOL64+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$OTOOL64"; then
+ ac_cv_prog_OTOOL64="$OTOOL64" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
fi
- ;;
-esac
-
-enable_dlopen=no
-enable_win32_dll=no
+done
+done
+IFS=$as_save_IFS
-# Check whether --enable-libtool-lock was given.
-if test "${enable_libtool_lock+set}" = set; then
- enableval=$enable_libtool_lock;
+fi
+fi
+OTOOL64=$ac_cv_prog_OTOOL64
+if test -n "$OTOOL64"; then
+ { $as_echo "$as_me:$LINENO: result: $OTOOL64" >&5
+$as_echo "$OTOOL64" >&6; }
+else
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+fi
+if test -z "$ac_cv_prog_OTOOL64"; then
+ ac_ct_OTOOL64=$OTOOL64
+ # Extract the first word of "otool64", so it can be a program name with args.
+set dummy otool64; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$ac_ct_OTOOL64"; then
+ ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_OTOOL64="otool64"
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
-# Check whether --with-pic was given.
-if test "${with_pic+set}" = set; then
- withval=$with_pic; pic_mode="$withval"
+fi
+fi
+ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64
+if test -n "$ac_ct_OTOOL64"; then
+ { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL64" >&5
+$as_echo "$ac_ct_OTOOL64" >&6; }
else
- pic_mode=default
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
-test -z "$pic_mode" && pic_mode=default
+ if test "x$ac_ct_OTOOL64" = x; then
+ OTOOL64=":"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ OTOOL64=$ac_ct_OTOOL64
+ fi
+else
+ OTOOL64="$ac_cv_prog_OTOOL64"
+fi
-# Use C for the default configuration in the libtool script
-tagname=
-lt_save_CC="$CC"
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-# Source file extension for C test sources.
-ac_ext=c
-# Object file extension for compiled C test sources.
-objext=o
-objext=$objext
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;"
-# Code to be used in simple link tests
-lt_simple_link_test_code='int main(){return(0);}'
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-# If no C compiler flags were specified, use CFLAGS.
-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-# Allow CC to be a program name with arguments.
-compiler=$CC
-# save warnings/boilerplate of simple test code
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_compile_test_code" >conftest.$ac_ext
-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_compiler_boilerplate=`cat conftest.err`
-$rm conftest*
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_link_test_code" >conftest.$ac_ext
-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_linker_boilerplate=`cat conftest.err`
-$rm conftest*
-lt_prog_compiler_no_builtin_flag=
-if test "$GCC" = yes; then
- lt_prog_compiler_no_builtin_flag=' -fno-builtin'
-{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
-echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; }
-if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- lt_cv_prog_compiler_rtti_exceptions=no
- ac_outfile=conftest.$ac_objext
- echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- lt_compiler_flag="-fno-rtti -fno-exceptions"
- # Insert the option either (1) after the last *FLAGS variable, or
- # (2) before a word containing "conftest.", or (3) at the end.
- # Note that $ac_compile itself does not contain backslashes and begins
- # with a dollar sign (not a hyphen), so the echo should work correctly.
- # The option is referenced via a variable to avoid confusing sed.
- lt_compile=`echo "$ac_compile" | $SED \
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8519: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
- echo "$as_me:8523: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s "$ac_outfile"; then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings other than the usual output.
- $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
- $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
- if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
- lt_cv_prog_compiler_rtti_exceptions=yes
- fi
- fi
- $rm conftest*
-fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; }
-if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
- lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
-else
- :
-fi
-fi
-lt_prog_compiler_wl=
-lt_prog_compiler_pic=
-lt_prog_compiler_static=
-{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
- if test "$GCC" = yes; then
- lt_prog_compiler_wl='-Wl,'
- lt_prog_compiler_static='-static'
- case $host_os in
- aix*)
- # All AIX code is PIC.
- if test "$host_cpu" = ia64; then
- # AIX 5 now supports IA64 processor
- lt_prog_compiler_static='-Bstatic'
+
+ { $as_echo "$as_me:$LINENO: checking for -single_module linker flag" >&5
+$as_echo_n "checking for -single_module linker flag... " >&6; }
+if test "${lt_cv_apple_cc_single_mod+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ lt_cv_apple_cc_single_mod=no
+ if test -z "${LT_MULTI_MODULE}"; then
+ # By default we will add the -single_module flag. You can override
+ # by either setting the environment variable LT_MULTI_MODULE
+ # non-empty at configure time, or by adding -multi_module to the
+ # link flags.
+ rm -rf libconftest.dylib*
+ echo "int foo(void){return 1;}" > conftest.c
+ echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+-dynamiclib -Wl,-single_module conftest.c" >&5
+ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+ -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
+ _lt_result=$?
+ if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
+ lt_cv_apple_cc_single_mod=yes
+ else
+ cat conftest.err >&5
+ fi
+ rm -rf libconftest.dylib*
+ rm -f conftest.*
fi
- ;;
+fi
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5
+$as_echo "$lt_cv_apple_cc_single_mod" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5
+$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
+if test "${lt_cv_ld_exported_symbols_list+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ lt_cv_ld_exported_symbols_list=no
+ save_LDFLAGS=$LDFLAGS
+ echo "_main" > conftest.sym
+ LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
- amigaos*)
- # FIXME: we need at least 68020 code to build shared libraries, but
- # adding the `-m68020' flag to GCC prevents building anything better,
- # like `-m68040'.
- lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
- ;;
+#ifdef FC_DUMMY_MAIN
+#ifndef FC_DUMMY_MAIN_EQ_F77
+# ifdef __cplusplus
+ extern "C"
+# endif
+ int FC_DUMMY_MAIN() { return 1; }
+#endif
+#endif
+int
+main ()
+{
- beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
- # PIC is the default for these OSes.
- ;;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+ lt_cv_ld_exported_symbols_list=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
- mingw* | cygwin* | pw32* | os2*)
- # This hack is so that the source file can tell whether it is being
- # built for inclusion in a dll (and should export symbols for example).
- # Although the cygwin gcc ignores -fPIC, still need this for old-style
- # (--disable-auto-import) libraries
- lt_prog_compiler_pic='-DDLL_EXPORT'
- ;;
+ lt_cv_ld_exported_symbols_list=no
+fi
- darwin* | rhapsody*)
- # PIC is the default on this platform
- # Common symbols not allowed in MH_DYLIB files
- lt_prog_compiler_pic='-fno-common'
- ;;
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ LDFLAGS="$save_LDFLAGS"
- interix[3-9]*)
- # Interix 3.x gcc -fpic/-fPIC options generate broken code.
- # Instead, we relocate shared libraries at runtime.
- ;;
+fi
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5
+$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
+ case $host_os in
+ rhapsody* | darwin1.[012])
+ _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
+ darwin1.*)
+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+ darwin*) # darwin 5.x on
+ # if running on 10.5 or later, the deployment target defaults
+ # to the OS version, if on x86, and 10.4, the deployment
+ # target defaults to 10.4. Don't you love it?
+ case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
+ 10.0,*86*-darwin8*|10.0,*-darwin[91]*)
+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+ 10.[012]*)
+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+ 10.*)
+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+ esac
+ ;;
+ esac
+ if test "$lt_cv_apple_cc_single_mod" = "yes"; then
+ _lt_dar_single_mod='$single_module'
+ fi
+ if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
+ _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
+ else
+ _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ fi
+ if test "$DSYMUTIL" != ":"; then
+ _lt_dsymutil='~$DSYMUTIL $lib || :'
+ else
+ _lt_dsymutil=
+ fi
+ ;;
+ esac
- msdosdjgpp*)
- # Just because we use GCC doesn't mean we suddenly get shared libraries
- # on systems that don't support them.
- lt_prog_compiler_can_build_shared=no
- enable_shared=no
- ;;
- sysv4*MP*)
- if test -d /usr/nec; then
- lt_prog_compiler_pic=-Kconform_pic
- fi
- ;;
+{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+$as_echo_n "checking for ANSI C header files... " >&6; }
+if test "${ac_cv_header_stdc+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <float.h>
- hpux*)
- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
- # not for PA HP-UX.
- case $host_cpu in
- hppa*64*|ia64*)
- # +Z the default
- ;;
- *)
- lt_prog_compiler_pic='-fPIC'
- ;;
- esac
- ;;
+#ifdef FC_DUMMY_MAIN
+#ifndef FC_DUMMY_MAIN_EQ_F77
+# ifdef __cplusplus
+ extern "C"
+# endif
+ int FC_DUMMY_MAIN() { return 1; }
+#endif
+#endif
+int
+main ()
+{
- *)
- lt_prog_compiler_pic='-fPIC'
- ;;
- esac
- else
- # PORTME Check for flag to pass linker flags through the system compiler.
- case $host_os in
- aix*)
- lt_prog_compiler_wl='-Wl,'
- if test "$host_cpu" = ia64; then
- # AIX 5 now supports IA64 processor
- lt_prog_compiler_static='-Bstatic'
- else
- lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
- fi
- ;;
- darwin*)
- # PIC is the default on this platform
- # Common symbols not allowed in MH_DYLIB files
- case $cc_basename in
- xlc*)
- lt_prog_compiler_pic='-qnocommon'
- lt_prog_compiler_wl='-Wl,'
- ;;
- esac
- ;;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_header_stdc=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
- mingw* | cygwin* | pw32* | os2*)
- # This hack is so that the source file can tell whether it is being
- # built for inclusion in a dll (and should export symbols for example).
- lt_prog_compiler_pic='-DDLL_EXPORT'
- ;;
+ ac_cv_header_stdc=no
+fi
- hpux9* | hpux10* | hpux11*)
- lt_prog_compiler_wl='-Wl,'
- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
- # not for PA HP-UX.
- case $host_cpu in
- hppa*64*|ia64*)
- # +Z the default
- ;;
- *)
- lt_prog_compiler_pic='+Z'
- ;;
- esac
- # Is there a better lt_prog_compiler_static that works with the bundled CC?
- lt_prog_compiler_static='${wl}-a ${wl}archive'
- ;;
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- irix5* | irix6* | nonstopux*)
- lt_prog_compiler_wl='-Wl,'
- # PIC (with -KPIC) is the default.
- lt_prog_compiler_static='-non_shared'
- ;;
+if test $ac_cv_header_stdc = yes; then
+ # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <string.h>
- newsos6)
- lt_prog_compiler_pic='-KPIC'
- lt_prog_compiler_static='-Bstatic'
- ;;
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ $EGREP "memchr" >/dev/null 2>&1; then
+ :
+else
+ ac_cv_header_stdc=no
+fi
+rm -f conftest*
- linux* | k*bsd*-gnu)
- case $cc_basename in
- icc* | ecc*)
- lt_prog_compiler_wl='-Wl,'
- lt_prog_compiler_pic='-KPIC'
- lt_prog_compiler_static='-static'
- ;;
- pgcc* | pgf77* | pgf90* | pgf95*)
- # Portland Group compilers (*not* the Pentium gcc compiler,
- # which looks to be a dead project)
- lt_prog_compiler_wl='-Wl,'
- lt_prog_compiler_pic='-fpic'
- lt_prog_compiler_static='-Bstatic'
- ;;
- ccc*)
- lt_prog_compiler_wl='-Wl,'
- # All Alpha code is PIC.
- lt_prog_compiler_static='-non_shared'
- ;;
- *)
- case `$CC -V 2>&1 | sed 5q` in
- *Sun\ C*)
- # Sun C 5.9
- lt_prog_compiler_pic='-KPIC'
- lt_prog_compiler_static='-Bstatic'
- lt_prog_compiler_wl='-Wl,'
- ;;
- *Sun\ F*)
- # Sun Fortran 8.3 passes all unrecognized flags to the linker
- lt_prog_compiler_pic='-KPIC'
- lt_prog_compiler_static='-Bstatic'
- lt_prog_compiler_wl=''
- ;;
- esac
- ;;
- esac
- ;;
+fi
- osf3* | osf4* | osf5*)
- lt_prog_compiler_wl='-Wl,'
- # All OSF/1 code is PIC.
- lt_prog_compiler_static='-non_shared'
- ;;
+if test $ac_cv_header_stdc = yes; then
+ # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <stdlib.h>
- rdos*)
- lt_prog_compiler_static='-non_shared'
- ;;
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ $EGREP "free" >/dev/null 2>&1; then
+ :
+else
+ ac_cv_header_stdc=no
+fi
+rm -f conftest*
- solaris*)
- lt_prog_compiler_pic='-KPIC'
- lt_prog_compiler_static='-Bstatic'
- case $cc_basename in
- f77* | f90* | f95*)
- lt_prog_compiler_wl='-Qoption ld ';;
- *)
- lt_prog_compiler_wl='-Wl,';;
- esac
- ;;
+fi
- sunos4*)
- lt_prog_compiler_wl='-Qoption ld '
- lt_prog_compiler_pic='-PIC'
- lt_prog_compiler_static='-Bstatic'
- ;;
+if test $ac_cv_header_stdc = yes; then
+ # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
+ if test "$cross_compiling" = yes; then
+ :
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <ctype.h>
+#include <stdlib.h>
+#if ((' ' & 0x0FF) == 0x020)
+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+#else
+# define ISLOWER(c) \
+ (('a' <= (c) && (c) <= 'i') \
+ || ('j' <= (c) && (c) <= 'r') \
+ || ('s' <= (c) && (c) <= 'z'))
+# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
+#endif
- sysv4 | sysv4.2uw2* | sysv4.3*)
- lt_prog_compiler_wl='-Wl,'
- lt_prog_compiler_pic='-KPIC'
- lt_prog_compiler_static='-Bstatic'
- ;;
+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+int
+main ()
+{
+ int i;
+ for (i = 0; i < 256; i++)
+ if (XOR (islower (i), ISLOWER (i))
+ || toupper (i) != TOUPPER (i))
+ return 2;
+ return 0;
+}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ :
+else
+ $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
- sysv4*MP*)
- if test -d /usr/nec ;then
- lt_prog_compiler_pic='-Kconform_pic'
- lt_prog_compiler_static='-Bstatic'
- fi
- ;;
+( exit $ac_status )
+ac_cv_header_stdc=no
+fi
+rm -rf conftest.dSYM
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
- sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
- lt_prog_compiler_wl='-Wl,'
- lt_prog_compiler_pic='-KPIC'
- lt_prog_compiler_static='-Bstatic'
- ;;
- unicos*)
- lt_prog_compiler_wl='-Wl,'
- lt_prog_compiler_can_build_shared=no
- ;;
+fi
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+$as_echo "$ac_cv_header_stdc" >&6; }
+if test $ac_cv_header_stdc = yes; then
- uts4*)
- lt_prog_compiler_pic='-pic'
- lt_prog_compiler_static='-Bstatic'
- ;;
+cat >>confdefs.h <<\_ACEOF
+#define STDC_HEADERS 1
+_ACEOF
- *)
- lt_prog_compiler_can_build_shared=no
- ;;
- esac
- fi
+fi
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic" >&6; }
+# On IRIX 5.3, sys/types and inttypes.h are conflicting.
-#
-# Check to make sure the PIC flag actually works.
-#
-if test -n "$lt_prog_compiler_pic"; then
-{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; }
-if test "${lt_prog_compiler_pic_works+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- lt_prog_compiler_pic_works=no
- ac_outfile=conftest.$ac_objext
- echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
- # Insert the option either (1) after the last *FLAGS variable, or
- # (2) before a word containing "conftest.", or (3) at the end.
- # Note that $ac_compile itself does not contain backslashes and begins
- # with a dollar sign (not a hyphen), so the echo should work correctly.
- # The option is referenced via a variable to avoid confusing sed.
- lt_compile=`echo "$ac_compile" | $SED \
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8809: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
- echo "$as_me:8813: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s "$ac_outfile"; then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings other than the usual output.
- $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
- $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
- if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
- lt_prog_compiler_pic_works=yes
- fi
- fi
- $rm conftest*
-fi
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6; }
-if test x"$lt_prog_compiler_pic_works" = xyes; then
- case $lt_prog_compiler_pic in
- "" | " "*) ;;
- *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
- esac
+
+
+
+
+
+for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
+ inttypes.h stdint.h unistd.h
+do
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ $as_echo_n "(cached) " >&6
else
- lt_prog_compiler_pic=
- lt_prog_compiler_can_build_shared=no
-fi
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
-fi
-case $host_os in
- # For platforms which do not support PIC, -DPIC is meaningless:
- *djgpp*)
- lt_prog_compiler_pic=
- ;;
- *)
- lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
- ;;
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
esac
-
-#
-# Check to make sure the static flag actually works.
-#
-wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
-{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
-if test "${lt_prog_compiler_static_works+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ eval "$as_ac_Header=yes"
else
- lt_prog_compiler_static_works=no
- save_LDFLAGS="$LDFLAGS"
- LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
- echo "$lt_simple_link_test_code" > conftest.$ac_ext
- if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
- # The linker can only warn and ignore the option if not recognized
- # So say no if there are warnings
- if test -s conftest.err; then
- # Append any errors to the config.log.
- cat conftest.err 1>&5
- $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
- $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
- if diff conftest.exp conftest.er2 >/dev/null; then
- lt_prog_compiler_static_works=yes
- fi
- else
- lt_prog_compiler_static_works=yes
- fi
- fi
- $rm conftest*
- LDFLAGS="$save_LDFLAGS"
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+ eval "$as_ac_Header=no"
fi
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5
-echo "${ECHO_T}$lt_prog_compiler_static_works" >&6; }
-if test x"$lt_prog_compiler_static_works" = xyes; then
- :
-else
- lt_prog_compiler_static=
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ if test "x$as_val" = x""yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+fi
-{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
-if test "${lt_cv_prog_compiler_c_o+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- lt_cv_prog_compiler_c_o=no
- $rm -r conftest 2>/dev/null
- mkdir conftest
- cd conftest
- mkdir out
- echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+done
- lt_compiler_flag="-o out/conftest2.$ac_objext"
- # Insert the option either (1) after the last *FLAGS variable, or
- # (2) before a word containing "conftest.", or (3) at the end.
- # Note that $ac_compile itself does not contain backslashes and begins
- # with a dollar sign (not a hyphen), so the echo should work correctly.
- lt_compile=`echo "$ac_compile" | $SED \
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8913: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>out/conftest.err)
- ac_status=$?
- cat out/conftest.err >&5
- echo "$as_me:8917: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s out/conftest2.$ac_objext
- then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings
- $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
- $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
- if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
- lt_cv_prog_compiler_c_o=yes
- fi
- fi
- chmod u+w . 2>&5
- $rm conftest*
- # SGI C++ compiler will create directory out/ii_files/ for
- # template instantiation
- test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
- $rm out/* && rmdir out
- cd ..
- rmdir conftest
- $rm conftest*
-fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6; }
+for ac_header in dlfcn.h
+do
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ $as_echo_n "(cached) " >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
-hard_links="nottested"
-if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
- # do not overwrite the value of need_locks provided by the user
- { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
- hard_links=yes
- $rm conftest*
- ln conftest.a conftest.b 2>/dev/null && hard_links=no
- touch conftest.a
- ln conftest.a conftest.b 2>&5 || hard_links=no
- ln conftest.a conftest.b 2>/dev/null && hard_links=no
- { echo "$as_me:$LINENO: result: $hard_links" >&5
-echo "${ECHO_T}$hard_links" >&6; }
- if test "$hard_links" = no; then
- { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
- need_locks=warn
- fi
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ eval "$as_ac_Header=yes"
else
- need_locks=no
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ eval "$as_ac_Header=no"
fi
-{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ if test "x$as_val" = x""yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
- runpath_var=
- allow_undefined_flag=
- enable_shared_with_static_runtimes=no
- archive_cmds=
- archive_expsym_cmds=
- old_archive_From_new_cmds=
- old_archive_from_expsyms_cmds=
- export_dynamic_flag_spec=
- whole_archive_flag_spec=
- thread_safe_flag_spec=
- hardcode_libdir_flag_spec=
- hardcode_libdir_flag_spec_ld=
- hardcode_libdir_separator=
- hardcode_direct=no
- hardcode_minus_L=no
- hardcode_shlibpath_var=unsupported
- link_all_deplibs=unknown
- hardcode_automatic=no
- module_cmds=
- module_expsym_cmds=
- always_export_symbols=no
- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
- # include_expsyms should be a list of space-separated symbols to be *always*
- # included in the symbol list
- include_expsyms=
- # exclude_expsyms can be an extended regexp of symbols to exclude
- # it will be wrapped by ` (' and `)$', so one must not match beginning or
- # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
- # as well as any symbol that contains `d'.
- exclude_expsyms="_GLOBAL_OFFSET_TABLE_"
- # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
- # platforms (ab)use it in PIC code, but their linkers get confused if
- # the symbol is explicitly referenced. Since portable code cannot
- # rely on this symbol name, it's probably fine to never include it in
- # preloaded symbol tables.
- extract_expsyms_cmds=
- # Just being paranoid about ensuring that cc_basename is set.
- for cc_temp in $compiler""; do
- case $cc_temp in
- compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
- distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
- \-*) ;;
- *) break;;
- esac
done
-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
- case $host_os in
- cygwin* | mingw* | pw32*)
- # FIXME: the MSVC++ port hasn't been tested in a loooong time
- # When not using gcc, we currently assume that we are using
- # Microsoft Visual C++.
- if test "$GCC" != yes; then
- with_gnu_ld=no
- fi
- ;;
- interix*)
- # we just hope/assume this is gcc and not c89 (= MSVC++)
- with_gnu_ld=yes
- ;;
- openbsd*)
- with_gnu_ld=no
- ;;
- esac
- ld_shlibs=yes
- if test "$with_gnu_ld" = yes; then
- # If archive_cmds runs LD, not CC, wlarc should be empty
- wlarc='${wl}'
- # Set some defaults for GNU ld with shared library support. These
- # are reset later if shared libraries are not supported. Putting them
- # here allows them to be overridden if necessary.
- runpath_var=LD_RUN_PATH
- hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
- export_dynamic_flag_spec='${wl}--export-dynamic'
- # ancient GNU ld didn't support --whole-archive et. al.
- if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
- whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
- else
- whole_archive_flag_spec=
- fi
- supports_anon_versioning=no
- case `$LD -v 2>/dev/null` in
- *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
- *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
- *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
- *\ 2.11.*) ;; # other 2.11 versions
- *) supports_anon_versioning=yes ;;
- esac
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+if test -z "$CXX"; then
+ if test -n "$CCC"; then
+ CXX=$CCC
+ else
+ if test -n "$ac_tool_prefix"; then
+ for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
+ do
+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CXX+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$CXX"; then
+ ac_cv_prog_CXX="$CXX" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
- # See if GNU ld supports shared libraries.
- case $host_os in
- aix3* | aix4* | aix5*)
- # On AIX/PPC, the GNU linker is very broken
- if test "$host_cpu" != ia64; then
- ld_shlibs=no
- cat <<EOF 1>&2
+fi
+fi
+CXX=$ac_cv_prog_CXX
+if test -n "$CXX"; then
+ { $as_echo "$as_me:$LINENO: result: $CXX" >&5
+$as_echo "$CXX" >&6; }
+else
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
-*** Warning: the GNU linker, at least up to release 2.9.1, is reported
-*** to be unable to reliably create shared libraries on AIX.
-*** Therefore, libtool is disabling shared libraries support. If you
-*** really care for shared libraries, you may want to modify your PATH
-*** so that a non-GNU linker is found, and then restart.
-EOF
- fi
- ;;
+ test -n "$CXX" && break
+ done
+fi
+if test -z "$CXX"; then
+ ac_ct_CXX=$CXX
+ for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$ac_ct_CXX"; then
+ ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_CXX="$ac_prog"
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
- amigaos*)
- archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
- hardcode_libdir_flag_spec='-L$libdir'
- hardcode_minus_L=yes
+fi
+fi
+ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
+if test -n "$ac_ct_CXX"; then
+ { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
+$as_echo "$ac_ct_CXX" >&6; }
+else
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
- # Samuel A. Falvo II <kc5tja at dolphin.openprojects.net> reports
- # that the semantics of dynamic libraries on AmigaOS, at least up
- # to version 4, is to share data among multiple programs linked
- # with the same dynamic library. Since this doesn't match the
- # behavior of shared libraries on other platforms, we can't use
- # them.
- ld_shlibs=no
- ;;
- beos*)
- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
- allow_undefined_flag=unsupported
- # Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
- # support --undefined. This deserves some investigation. FIXME
- archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- else
- ld_shlibs=no
- fi
- ;;
+ test -n "$ac_ct_CXX" && break
+done
- cygwin* | mingw* | pw32*)
- # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
- # as there is no search path for DLLs.
- hardcode_libdir_flag_spec='-L$libdir'
- allow_undefined_flag=unsupported
- always_export_symbols=no
- enable_shared_with_static_runtimes=yes
- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
+ if test "x$ac_ct_CXX" = x; then
+ CXX="g++"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ CXX=$ac_ct_CXX
+ fi
+fi
- if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
- # If the export-symbols file already is a .def file (1st line
- # is EXPORTS), use it as is; otherwise, prepend...
- archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
- cp $export_symbols $output_objdir/$soname.def;
- else
- echo EXPORTS > $output_objdir/$soname.def;
- cat $export_symbols >> $output_objdir/$soname.def;
- fi~
- $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
- else
- ld_shlibs=no
- fi
- ;;
+ fi
+fi
+# Provide some information about the compiler.
+$as_echo "$as_me:$LINENO: checking for C++ compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
+{ (ac_try="$ac_compiler --version >&5"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compiler --version >&5") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+{ (ac_try="$ac_compiler -v >&5"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compiler -v >&5") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+{ (ac_try="$ac_compiler -V >&5"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compiler -V >&5") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
- interix[3-9]*)
- hardcode_direct=no
- hardcode_shlibpath_var=no
- hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
- export_dynamic_flag_spec='${wl}-E'
- # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
- # Instead, shared libraries are loaded at an image base (0x10000000 by
- # default) and relocated if they conflict, which is a slow very memory
- # consuming and fragmenting process. To avoid this, we pick a random,
- # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
- # time. Moving up from 0x10000000 also allows more sbrk(2) space.
- archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
- archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
- ;;
+{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
+$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
+if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
- gnu* | linux* | k*bsd*-gnu)
- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
- tmp_addflag=
- case $cc_basename,$host_cpu in
- pgcc*) # Portland Group C compiler
- whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
- tmp_addflag=' $pic_flag'
- ;;
- pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers
- whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
- tmp_addflag=' $pic_flag -Mnomain' ;;
- ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
- tmp_addflag=' -i_dynamic' ;;
- efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64
- tmp_addflag=' -i_dynamic -nofor_main' ;;
- ifc* | ifort*) # Intel Fortran compiler
- tmp_addflag=' -nofor_main' ;;
- esac
- case `$CC -V 2>&1 | sed 5q` in
- *Sun\ C*) # Sun C 5.9
- whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
- tmp_sharedflag='-G' ;;
- *Sun\ F*) # Sun Fortran 8.3
- tmp_sharedflag='-G' ;;
- *)
- tmp_sharedflag='-shared' ;;
- esac
- archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+#ifdef FC_DUMMY_MAIN
+#ifndef FC_DUMMY_MAIN_EQ_F77
+# ifdef __cplusplus
+ extern "C"
+# endif
+ int FC_DUMMY_MAIN() { return 1; }
+#endif
+#endif
+int
+main ()
+{
+#ifndef __GNUC__
+ choke me
+#endif
- if test $supports_anon_versioning = yes; then
- archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~
- cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
- $echo "local: *; };" >> $output_objdir/$libname.ver~
- $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
- fi
- else
- ld_shlibs=no
- fi
- ;;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_compiler_gnu=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
- netbsd*)
- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
- wlarc=
- else
- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- fi
- ;;
+ ac_compiler_gnu=no
+fi
- solaris*)
- if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
- ld_shlibs=no
- cat <<EOF 1>&2
-
-*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-*** create shared libraries on Solaris systems. Therefore, libtool
-*** is disabling shared libraries support. We urge you to upgrade GNU
-*** binutils to release 2.9.1 or newer. Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-EOF
- elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- else
- ld_shlibs=no
- fi
- ;;
-
- sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
- case `$LD -v 2>&1` in
- *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
- ld_shlibs=no
- cat <<_LT_EOF 1>&2
-
-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
-*** reliably create shared libraries on SCO systems. Therefore, libtool
-*** is disabling shared libraries support. We urge you to upgrade GNU
-*** binutils to release 2.16.91.0.3 or newer. Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-_LT_EOF
- ;;
- *)
- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
- hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
- else
- ld_shlibs=no
- fi
- ;;
- esac
- ;;
-
- sunos4*)
- archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
- wlarc=
- hardcode_direct=yes
- hardcode_shlibpath_var=no
- ;;
-
- *)
- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- else
- ld_shlibs=no
- fi
- ;;
- esac
-
- if test "$ld_shlibs" = no; then
- runpath_var=
- hardcode_libdir_flag_spec=
- export_dynamic_flag_spec=
- whole_archive_flag_spec=
- fi
- else
- # PORTME fill in a description of your system's linker (not GNU ld)
- case $host_os in
- aix3*)
- allow_undefined_flag=unsupported
- always_export_symbols=yes
- archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
- # Note: this linker hardcodes the directories in LIBPATH if there
- # are no directories specified by -L.
- hardcode_minus_L=yes
- if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
- # Neither direct hardcoding nor static linking is supported with a
- # broken collect2.
- hardcode_direct=unsupported
- fi
- ;;
-
- aix4* | aix5*)
- if test "$host_cpu" = ia64; then
- # On IA64, the linker does run time linking by default, so we don't
- # have to do anything special.
- aix_use_runtimelinking=no
- exp_sym_flag='-Bexport'
- no_entry_flag=""
- else
- # If we're using GNU nm, then we don't want the "-C" option.
- # -C means demangle to AIX nm, but means don't demangle with GNU nm
- if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
- export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
- else
- export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
- fi
- aix_use_runtimelinking=no
-
- # Test if we are trying to use run time linking or normal
- # AIX style linking. If -brtl is somewhere in LDFLAGS, we
- # need to do runtime linking.
- case $host_os in aix4.[23]|aix4.[23].*|aix5*)
- for ld_flag in $LDFLAGS; do
- if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
- aix_use_runtimelinking=yes
- break
- fi
- done
- ;;
- esac
-
- exp_sym_flag='-bexport'
- no_entry_flag='-bnoentry'
- fi
-
- # When large executables or shared objects are built, AIX ld can
- # have problems creating the table of contents. If linking a library
- # or program results in "error TOC overflow" add -mminimal-toc to
- # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not
- # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
- archive_cmds=''
- hardcode_direct=yes
- hardcode_libdir_separator=':'
- link_all_deplibs=yes
-
- if test "$GCC" = yes; then
- case $host_os in aix4.[012]|aix4.[012].*)
- # We only want to do this on AIX 4.2 and lower, the check
- # below for broken collect2 doesn't work under 4.3+
- collect2name=`${CC} -print-prog-name=collect2`
- if test -f "$collect2name" && \
- strings "$collect2name" | grep resolve_lib_name >/dev/null
- then
- # We have reworked collect2
- :
- else
- # We have old collect2
- hardcode_direct=unsupported
- # It fails to find uninstalled libraries when the uninstalled
- # path is not listed in the libpath. Setting hardcode_minus_L
- # to unsupported forces relinking
- hardcode_minus_L=yes
- hardcode_libdir_flag_spec='-L$libdir'
- hardcode_libdir_separator=
- fi
- ;;
- esac
- shared_flag='-shared'
- if test "$aix_use_runtimelinking" = yes; then
- shared_flag="$shared_flag "'${wl}-G'
- fi
- else
- # not using gcc
- if test "$host_cpu" = ia64; then
- # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
- # chokes on -Wl,-G. The following line is correct:
- shared_flag='-G'
- else
- if test "$aix_use_runtimelinking" = yes; then
- shared_flag='${wl}-G'
- else
- shared_flag='${wl}-bM:SRE'
- fi
- fi
- fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
- # It seems that -bexpall does not export symbols beginning with
- # underscore (_), so it is better to generate a list of symbols to export.
- always_export_symbols=yes
- if test "$aix_use_runtimelinking" = yes; then
- # Warning - without using the other runtime loading flags (-brtl),
- # -berok will link without error, but may produce a broken library.
- allow_undefined_flag='-berok'
- # Determine the default libpath from the value encoded in an empty executable.
- cat >conftest.$ac_ext <<_ACEOF
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
+$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+ GXX=yes
+else
+ GXX=
+fi
+ac_test_CXXFLAGS=${CXXFLAGS+set}
+ac_save_CXXFLAGS=$CXXFLAGS
+{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
+$as_echo_n "checking whether $CXX accepts -g... " >&6; }
+if test "${ac_cv_prog_cxx_g+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ ac_save_cxx_werror_flag=$ac_cxx_werror_flag
+ ac_cxx_werror_flag=yes
+ ac_cv_prog_cxx_g=no
+ CXXFLAGS="-g"
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -9394,58 +9545,31 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
+ test -z "$ac_cxx_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
-
-lt_aix_libpath_sed='
- /Import File Strings/,/^$/ {
- /^0/ {
- s/^0 *\(.*\)$/\1/
- p
- }
- }'
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then
- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-fi
+ } && test -s conftest.$ac_objext; then
+ ac_cv_prog_cxx_g=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
- hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
- archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
- else
- if test "$host_cpu" = ia64; then
- hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
- allow_undefined_flag="-z nodefs"
- archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
- else
- # Determine the default libpath from the value encoded in an empty executable.
- cat >conftest.$ac_ext <<_ACEOF
+ CXXFLAGS=""
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -9468,1555 +9592,3805 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
+ test -z "$ac_cxx_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
-
-lt_aix_libpath_sed='
- /Import File Strings/,/^$/ {
- /^0/ {
- s/^0 *\(.*\)$/\1/
- p
- }
- }'
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then
- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-fi
+ } && test -s conftest.$ac_objext; then
+ :
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+ ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+ CXXFLAGS="-g"
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+#ifdef FC_DUMMY_MAIN
+#ifndef FC_DUMMY_MAIN_EQ_F77
+# ifdef __cplusplus
+ extern "C"
+# endif
+ int FC_DUMMY_MAIN() { return 1; }
+#endif
+#endif
+int
+main ()
+{
- hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
- # Warning - without using the other run time loading flags,
- # -berok will link without error, but may produce a broken library.
- no_undefined_flag=' ${wl}-bernotok'
- allow_undefined_flag=' ${wl}-berok'
- # Exported symbols can be pulled into shared objects from archives
- whole_archive_flag_spec='$convenience'
- archive_cmds_need_lc=yes
- # This is similar to how AIX traditionally builds its shared libraries.
- archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
- fi
- fi
- ;;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_prog_cxx_g=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
- amigaos*)
- archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
- hardcode_libdir_flag_spec='-L$libdir'
- hardcode_minus_L=yes
- # see comment about different semantics on the GNU ld section
- ld_shlibs=no
- ;;
- bsdi[45]*)
- export_dynamic_flag_spec=-rdynamic
- ;;
+fi
- cygwin* | mingw* | pw32*)
- # When not using gcc, we currently assume that we are using
- # Microsoft Visual C++.
- # hardcode_libdir_flag_spec is actually meaningless, as there is
- # no search path for DLLs.
- hardcode_libdir_flag_spec=' '
- allow_undefined_flag=unsupported
- # Tell ltmain to make .lib files, not .a files.
- libext=lib
- # Tell ltmain to make .dll files, not .so files.
- shrext_cmds=".dll"
- # FIXME: Setting linknames here is a bad hack.
- archive_cmds='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
- # The linker will automatically build a .lib file if we build a DLL.
- old_archive_From_new_cmds='true'
- # FIXME: Should let the user specify the lib program.
- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
- fix_srcfile_path='`cygpath -w "$srcfile"`'
- enable_shared_with_static_runtimes=yes
- ;;
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
- darwin* | rhapsody*)
- case $host_os in
- rhapsody* | darwin1.[012])
- allow_undefined_flag='${wl}-undefined ${wl}suppress'
- ;;
- *) # Darwin 1.3 on
- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
- allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
- else
- case ${MACOSX_DEPLOYMENT_TARGET} in
- 10.[012])
- allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
- ;;
- 10.*)
- allow_undefined_flag='${wl}-undefined ${wl}dynamic_lookup'
- ;;
- esac
- fi
- ;;
- esac
- archive_cmds_need_lc=no
- hardcode_direct=no
- hardcode_automatic=yes
- hardcode_shlibpath_var=unsupported
- whole_archive_flag_spec=''
- link_all_deplibs=yes
- if test "$GCC" = yes ; then
- output_verbose_link_cmd='echo'
- archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
- module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
- archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- else
- case $cc_basename in
- xlc*)
- output_verbose_link_cmd='echo'
- archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
- module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
- archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- ;;
- *)
- ld_shlibs=no
- ;;
- esac
- fi
- ;;
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
- dgux*)
- archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
- hardcode_libdir_flag_spec='-L$libdir'
- hardcode_shlibpath_var=no
- ;;
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
+$as_echo "$ac_cv_prog_cxx_g" >&6; }
+if test "$ac_test_CXXFLAGS" = set; then
+ CXXFLAGS=$ac_save_CXXFLAGS
+elif test $ac_cv_prog_cxx_g = yes; then
+ if test "$GXX" = yes; then
+ CXXFLAGS="-g -O2"
+ else
+ CXXFLAGS="-g"
+ fi
+else
+ if test "$GXX" = yes; then
+ CXXFLAGS="-O2"
+ else
+ CXXFLAGS=
+ fi
+fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
- freebsd1*)
- ld_shlibs=no
- ;;
+depcc="$CXX" am_compiler_list=
- # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
- # support. Future versions do this automatically, but an explicit c++rt0.o
- # does not break anything, and helps significantly (at the cost of a little
- # extra space).
- freebsd2.2*)
- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
- hardcode_libdir_flag_spec='-R$libdir'
- hardcode_direct=yes
- hardcode_shlibpath_var=no
- ;;
+{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
+$as_echo_n "checking dependency style of $depcc... " >&6; }
+if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+ # We make a subdir and do the tests there. Otherwise we can end up
+ # making bogus files that we don't know about and never remove. For
+ # instance it was reported that on HP-UX the gcc test will end up
+ # making a dummy file named `D' -- because `-MD' means `put the output
+ # in D'.
+ mkdir conftest.dir
+ # Copy depcomp to subdir because otherwise we won't find it if we're
+ # using a relative directory.
+ cp "$am_depcomp" conftest.dir
+ cd conftest.dir
+ # We will build objects and dependencies in a subdirectory because
+ # it helps to detect inapplicable dependency modes. For instance
+ # both Tru64's cc and ICC support -MD to output dependencies as a
+ # side effect of compilation, but ICC will put the dependencies in
+ # the current directory while Tru64 will put them in the object
+ # directory.
+ mkdir sub
- # Unfortunately, older versions of FreeBSD 2 do not have this feature.
- freebsd2*)
- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
- hardcode_direct=yes
- hardcode_minus_L=yes
- hardcode_shlibpath_var=no
- ;;
+ am_cv_CXX_dependencies_compiler_type=none
+ if test "$am_compiler_list" = ""; then
+ am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
+ fi
+ am__universal=false
+ case " $depcc " in #(
+ *\ -arch\ *\ -arch\ *) am__universal=true ;;
+ esac
- # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
- freebsd* | dragonfly*)
- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
- hardcode_libdir_flag_spec='-R$libdir'
- hardcode_direct=yes
- hardcode_shlibpath_var=no
- ;;
+ for depmode in $am_compiler_list; do
+ # Setup a source with many dependencies, because some compilers
+ # like to wrap large dependency lists on column 80 (with \), and
+ # we should not choose a depcomp mode which is confused by this.
+ #
+ # We need to recreate these files for each test, as the compiler may
+ # overwrite some of them when testing with obscure command lines.
+ # This happens at least with the AIX C compiler.
+ : > sub/conftest.c
+ for i in 1 2 3 4 5 6; do
+ echo '#include "conftst'$i'.h"' >> sub/conftest.c
+ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+ # Solaris 8's {/usr,}/bin/sh.
+ touch sub/conftst$i.h
+ done
+ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
- hpux9*)
- if test "$GCC" = yes; then
- archive_cmds='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+ # We check with `-c' and `-o' for the sake of the "dashmstdout"
+ # mode. It turns out that the SunPro C++ compiler does not properly
+ # handle `-M -o', and we need to detect this. Also, some Intel
+ # versions had trouble with output in subdirs
+ am__obj=sub/conftest.${OBJEXT-o}
+ am__minus_obj="-o $am__obj"
+ case $depmode in
+ gcc)
+ # This depmode causes a compiler race in universal mode.
+ test "$am__universal" = false || continue
+ ;;
+ nosideeffect)
+ # after this tag, mechanisms are not by side-effect, so they'll
+ # only be used when explicitly requested
+ if test "x$enable_dependency_tracking" = xyes; then
+ continue
else
- archive_cmds='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+ break
fi
- hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
- hardcode_libdir_separator=:
- hardcode_direct=yes
-
- # hardcode_minus_L: Not really in the search PATH,
- # but as the default location of the library.
- hardcode_minus_L=yes
- export_dynamic_flag_spec='${wl}-E'
;;
-
- hpux10*)
- if test "$GCC" = yes -a "$with_gnu_ld" = no; then
- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
- else
- archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+ msvisualcpp | msvcmsys)
+ # This compiler won't grok `-c -o', but also, the minuso test has
+ # not run yet. These depmodes are late enough in the game, and
+ # so weak that their functioning should not be impacted.
+ am__obj=conftest.${OBJEXT-o}
+ am__minus_obj=
+ ;;
+ none) break ;;
+ esac
+ if depmode=$depmode \
+ source=sub/conftest.c object=$am__obj \
+ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+ $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
+ >/dev/null 2>conftest.err &&
+ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+ grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
+ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+ # icc doesn't choke on unknown options, it will just issue warnings
+ # or remarks (even with -Werror). So we grep stderr for any message
+ # that says an option was ignored or not supported.
+ # When given -MP, icc 7.0 and 7.1 complain thusly:
+ # icc: Command line warning: ignoring option '-M'; no argument required
+ # The diagnosis changed in icc 8.0:
+ # icc: Command line remark: option '-MP' not supported
+ if (grep 'ignoring option' conftest.err ||
+ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+ am_cv_CXX_dependencies_compiler_type=$depmode
+ break
fi
- if test "$with_gnu_ld" = no; then
- hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
- hardcode_libdir_separator=:
+ fi
+ done
- hardcode_direct=yes
- export_dynamic_flag_spec='${wl}-E'
+ cd ..
+ rm -rf conftest.dir
+else
+ am_cv_CXX_dependencies_compiler_type=none
+fi
- # hardcode_minus_L: Not really in the search PATH,
- # but as the default location of the library.
- hardcode_minus_L=yes
- fi
- ;;
+fi
+{ $as_echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
+$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
+CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
- hpux11*)
- if test "$GCC" = yes -a "$with_gnu_ld" = no; then
- case $host_cpu in
- hppa*64*)
- archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
- ;;
- ia64*)
- archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
- ;;
- *)
- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
- ;;
- esac
- else
- case $host_cpu in
- hppa*64*)
- archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
- ;;
- ia64*)
- archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
- ;;
- *)
- archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
- ;;
- esac
- fi
- if test "$with_gnu_ld" = no; then
- hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
- hardcode_libdir_separator=:
+ if
+ test "x$enable_dependency_tracking" != xno \
+ && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
+ am__fastdepCXX_TRUE=
+ am__fastdepCXX_FALSE='#'
+else
+ am__fastdepCXX_TRUE='#'
+ am__fastdepCXX_FALSE=
+fi
- case $host_cpu in
- hppa*64*|ia64*)
- hardcode_libdir_flag_spec_ld='+b $libdir'
- hardcode_direct=no
- hardcode_shlibpath_var=no
- ;;
- *)
- hardcode_direct=yes
- export_dynamic_flag_spec='${wl}-E'
- # hardcode_minus_L: Not really in the search PATH,
- # but as the default location of the library.
- hardcode_minus_L=yes
- ;;
- esac
- fi
- ;;
+if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
+ (test "X$CXX" != "Xg++"))) ; then
+ ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+{ $as_echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
+$as_echo_n "checking how to run the C++ preprocessor... " >&6; }
+if test -z "$CXXCPP"; then
+ if test "${ac_cv_prog_CXXCPP+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ # Double quotes because CXXCPP needs to be expanded
+ for CXXCPP in "$CXX -E" "/lib/cpp"
+ do
+ ac_preproc_ok=false
+for ac_cxx_preproc_warn_flag in '' yes
+do
+ # Use a header file that comes with gcc, so configuring glibc
+ # with a fresh cross-compiler works.
+ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ # <limits.h> exists even on freestanding compilers.
+ # On the NeXT, cc -E runs the code through the compiler's parser,
+ # not just through cpp. "Syntax error" is here to catch this case.
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+ Syntax error
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ :
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
- irix5* | irix6* | nonstopux*)
- if test "$GCC" = yes; then
- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
- else
- archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
- hardcode_libdir_flag_spec_ld='-rpath $libdir'
- fi
- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
- hardcode_libdir_separator=:
- link_all_deplibs=yes
- ;;
+ # Broken: fails on valid input.
+continue
+fi
- netbsd*)
- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
- else
- archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF
- fi
- hardcode_libdir_flag_spec='-R$libdir'
- hardcode_direct=yes
- hardcode_shlibpath_var=no
- ;;
+rm -f conftest.err conftest.$ac_ext
- newsos6)
- archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
- hardcode_direct=yes
- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
- hardcode_libdir_separator=:
- hardcode_shlibpath_var=no
- ;;
+ # OK, works on sane cases. Now check whether nonexistent headers
+ # can be detected and how.
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <ac_nonexistent.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ # Broken: success on invalid input.
+continue
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
- openbsd*)
- if test -f /usr/libexec/ld.so; then
- hardcode_direct=yes
- hardcode_shlibpath_var=no
- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
- archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
- hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
- export_dynamic_flag_spec='${wl}-E'
- else
- case $host_os in
- openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
- hardcode_libdir_flag_spec='-R$libdir'
- ;;
- *)
- archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
- hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
- ;;
- esac
- fi
- else
- ld_shlibs=no
- fi
- ;;
+ # Passes both tests.
+ac_preproc_ok=:
+break
+fi
- os2*)
- hardcode_libdir_flag_spec='-L$libdir'
- hardcode_minus_L=yes
- allow_undefined_flag=unsupported
- archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
- old_archive_From_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
- ;;
+rm -f conftest.err conftest.$ac_ext
- osf3*)
- if test "$GCC" = yes; then
- allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
- else
- allow_undefined_flag=' -expect_unresolved \*'
- archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
- fi
- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
- hardcode_libdir_separator=:
- ;;
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then
+ break
+fi
- osf4* | osf5*) # as osf3* with the addition of -msym flag
- if test "$GCC" = yes; then
- allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
- else
- allow_undefined_flag=' -expect_unresolved \*'
- archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
- archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
- $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
+ done
+ ac_cv_prog_CXXCPP=$CXXCPP
- # Both c and cxx compiler support -rpath directly
- hardcode_libdir_flag_spec='-rpath $libdir'
- fi
- hardcode_libdir_separator=:
- ;;
+fi
+ CXXCPP=$ac_cv_prog_CXXCPP
+else
+ ac_cv_prog_CXXCPP=$CXXCPP
+fi
+{ $as_echo "$as_me:$LINENO: result: $CXXCPP" >&5
+$as_echo "$CXXCPP" >&6; }
+ac_preproc_ok=false
+for ac_cxx_preproc_warn_flag in '' yes
+do
+ # Use a header file that comes with gcc, so configuring glibc
+ # with a fresh cross-compiler works.
+ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ # <limits.h> exists even on freestanding compilers.
+ # On the NeXT, cc -E runs the code through the compiler's parser,
+ # not just through cpp. "Syntax error" is here to catch this case.
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+ Syntax error
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ :
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
- solaris*)
- no_undefined_flag=' -z text'
- if test "$GCC" = yes; then
- wlarc='${wl}'
- archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
- archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
- $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
- else
- wlarc=''
- archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
- archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
- fi
- hardcode_libdir_flag_spec='-R$libdir'
- hardcode_shlibpath_var=no
- case $host_os in
- solaris2.[0-5] | solaris2.[0-5].*) ;;
- *)
- # The compiler driver will combine and reorder linker options,
- # but understands `-z linker_flag'. GCC discards it without `$wl',
- # but is careful enough not to reorder.
- # Supported since Solaris 2.6 (maybe 2.5.1?)
- if test "$GCC" = yes; then
- whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
- else
- whole_archive_flag_spec='-z allextract$convenience -z defaultextract'
- fi
- ;;
- esac
- link_all_deplibs=yes
- ;;
-
- sunos4*)
- if test "x$host_vendor" = xsequent; then
- # Use $CC to link under sequent, because it throws in some extra .o
- # files that make .init and .fini sections work.
- archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
- else
- archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
- fi
- hardcode_libdir_flag_spec='-L$libdir'
- hardcode_direct=yes
- hardcode_minus_L=yes
- hardcode_shlibpath_var=no
- ;;
-
- sysv4)
- case $host_vendor in
- sni)
- archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
- hardcode_direct=yes # is this really true???
- ;;
- siemens)
- ## LD is ld it makes a PLAMLIB
- ## CC just makes a GrossModule.
- archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
- reload_cmds='$CC -r -o $output$reload_objs'
- hardcode_direct=no
- ;;
- motorola)
- archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
- hardcode_direct=no #Motorola manual says yes, but my tests say they lie
- ;;
- esac
- runpath_var='LD_RUN_PATH'
- hardcode_shlibpath_var=no
- ;;
+ # Broken: fails on valid input.
+continue
+fi
- sysv4.3*)
- archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
- hardcode_shlibpath_var=no
- export_dynamic_flag_spec='-Bexport'
- ;;
+rm -f conftest.err conftest.$ac_ext
- sysv4*MP*)
- if test -d /usr/nec; then
- archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
- hardcode_shlibpath_var=no
- runpath_var=LD_RUN_PATH
- hardcode_runpath_var=yes
- ld_shlibs=yes
- fi
- ;;
+ # OK, works on sane cases. Now check whether nonexistent headers
+ # can be detected and how.
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <ac_nonexistent.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ # Broken: success on invalid input.
+continue
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
- sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
- no_undefined_flag='${wl}-z,text'
- archive_cmds_need_lc=no
- hardcode_shlibpath_var=no
- runpath_var='LD_RUN_PATH'
+ # Passes both tests.
+ac_preproc_ok=:
+break
+fi
- if test "$GCC" = yes; then
- archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- else
- archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- fi
- ;;
+rm -f conftest.err conftest.$ac_ext
- sysv5* | sco3.2v5* | sco5v6*)
- # Note: We can NOT use -z defs as we might desire, because we do not
- # link with -lc, and that would cause any symbols used from libc to
- # always be unresolved, which means just about no library would
- # ever link correctly. If we're not using GNU ld we use -z text
- # though, which does catch some bad symbols but isn't as heavy-handed
- # as -z defs.
- no_undefined_flag='${wl}-z,text'
- allow_undefined_flag='${wl}-z,nodefs'
- archive_cmds_need_lc=no
- hardcode_shlibpath_var=no
- hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
- hardcode_libdir_separator=':'
- link_all_deplibs=yes
- export_dynamic_flag_spec='${wl}-Bexport'
- runpath_var='LD_RUN_PATH'
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then
+ :
+else
+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+_lt_caught_CXX_error=yes; }
+fi
- if test "$GCC" = yes; then
- archive_cmds='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
- archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
- else
- archive_cmds='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
- archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
- fi
- ;;
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
- uts4*)
- archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
- hardcode_libdir_flag_spec='-L$libdir'
- hardcode_shlibpath_var=no
- ;;
+else
+ _lt_caught_CXX_error=yes
+fi
- *)
- ld_shlibs=no
- ;;
- esac
- fi
-{ echo "$as_me:$LINENO: result: $ld_shlibs" >&5
-echo "${ECHO_T}$ld_shlibs" >&6; }
-test "$ld_shlibs" = no && can_build_shared=no
-#
-# Do we need to explicitly link libc?
-#
-case "x$archive_cmds_need_lc" in
-x|xyes)
- # Assume -lc should be added
- archive_cmds_need_lc=yes
- if test "$enable_shared" = yes && test "$GCC" = yes; then
- case $archive_cmds in
- *'~'*)
- # FIXME: we may have to deal with multi-command sequences.
- ;;
- '$CC '*)
- # Test whether the compiler implicitly links with -lc since on some
- # systems, -lgcc has to come before -lc. If gcc already passes -lc
- # to ld, don't add -lc before -lgcc.
- { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
- $rm conftest*
- echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } 2>conftest.err; then
- soname=conftest
- lib=conftest
- libobjs=conftest.$ac_objext
- deplibs=
- wl=$lt_prog_compiler_wl
- pic_flag=$lt_prog_compiler_pic
- compiler_flags=-v
- linker_flags=-v
- verstring=
- output_objdir=.
- libname=conftest
- lt_save_allow_undefined_flag=$allow_undefined_flag
- allow_undefined_flag=
- if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
- (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
- then
- archive_cmds_need_lc=no
- else
- archive_cmds_need_lc=yes
- fi
- allow_undefined_flag=$lt_save_allow_undefined_flag
- else
- cat conftest.err 1>&5
- fi
- $rm conftest*
- { echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
-echo "${ECHO_T}$archive_cmds_need_lc" >&6; }
- ;;
- esac
+ac_ext=f
+ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
+ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_f77_compiler_gnu
+if test -n "$ac_tool_prefix"; then
+ for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn
+ do
+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_F77+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$F77"; then
+ ac_cv_prog_F77="$F77" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_F77="$ac_tool_prefix$ac_prog"
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
fi
- ;;
-esac
+done
+done
+IFS=$as_save_IFS
-{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
-library_names_spec=
-libname_spec='lib$name'
-soname_spec=
-shrext_cmds=".so"
-postinstall_cmds=
-postuninstall_cmds=
-finish_cmds=
-finish_eval=
-shlibpath_var=
-shlibpath_overrides_runpath=unknown
-version_type=none
-dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
+fi
+fi
+F77=$ac_cv_prog_F77
+if test -n "$F77"; then
+ { $as_echo "$as_me:$LINENO: result: $F77" >&5
+$as_echo "$F77" >&6; }
+else
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
-if test "$GCC" = yes; then
- case $host_os in
- darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
- *) lt_awk_arg="/^libraries:/" ;;
- esac
- lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
- if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then
- # if the path contains ";" then we assume it to be the separator
- # otherwise default to the standard path separator (i.e. ":") - it is
- # assumed that no part of a normal pathname contains ";" but that should
- # okay in the real world where ";" in dirpaths is itself problematic.
- lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'`
- else
- lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
- fi
- # Ok, now we have the path, separated by spaces, we can step through it
- # and add multilib dir if necessary.
- lt_tmp_lt_search_path_spec=
- lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
- for lt_sys_path in $lt_search_path_spec; do
- if test -d "$lt_sys_path/$lt_multi_os_dir"; then
- lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
- else
- test -d "$lt_sys_path" && \
- lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
- fi
+
+ test -n "$F77" && break
done
- lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk '
-BEGIN {RS=" "; FS="/|\n";} {
- lt_foo="";
- lt_count=0;
- for (lt_i = NF; lt_i > 0; lt_i--) {
- if ($lt_i != "" && $lt_i != ".") {
- if ($lt_i == "..") {
- lt_count++;
- } else {
- if (lt_count == 0) {
- lt_foo="/" $lt_i lt_foo;
- } else {
- lt_count--;
- }
- }
- }
- }
- if (lt_foo != "") { lt_freq[lt_foo]++; }
- if (lt_freq[lt_foo] == 1) { print lt_foo; }
-}'`
- sys_lib_search_path_spec=`echo $lt_search_path_spec`
-else
- sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
fi
-need_lib_prefix=unknown
-hardcode_into_libs=no
+if test -z "$F77"; then
+ ac_ct_F77=$F77
+ for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_F77+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$ac_ct_F77"; then
+ ac_cv_prog_ac_ct_F77="$ac_ct_F77" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_F77="$ac_prog"
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
-# when you set need_version to no, make sure it does not cause -set_version
-# flags to be left without arguments
-need_version=unknown
+fi
+fi
+ac_ct_F77=$ac_cv_prog_ac_ct_F77
+if test -n "$ac_ct_F77"; then
+ { $as_echo "$as_me:$LINENO: result: $ac_ct_F77" >&5
+$as_echo "$ac_ct_F77" >&6; }
+else
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
-case $host_os in
-aix3*)
- version_type=linux
- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
- shlibpath_var=LIBPATH
- # AIX 3 has no versioning support, so we append a major version to the name.
- soname_spec='${libname}${release}${shared_ext}$major'
- ;;
+ test -n "$ac_ct_F77" && break
+done
-aix4* | aix5*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- hardcode_into_libs=yes
- if test "$host_cpu" = ia64; then
- # AIX 5 supports IA64
- library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
- shlibpath_var=LD_LIBRARY_PATH
+ if test "x$ac_ct_F77" = x; then
+ F77=""
else
- # With GCC up to 2.95.x, collect2 would create an import file
- # for dependence libraries. The import file would start with
- # the line `#! .'. This would cause the generated library to
- # depend on `.', always an invalid library. This was fixed in
- # development snapshots of GCC prior to 3.0.
- case $host_os in
- aix4 | aix4.[01] | aix4.[01].*)
- if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
- echo ' yes '
- echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
- :
- else
- can_build_shared=no
- fi
- ;;
- esac
- # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
- # soname into executable. Probably we can add versioning support to
- # collect2, so additional links can be useful in future.
- if test "$aix_use_runtimelinking" = yes; then
- # If using run time linking (on AIX 4.2 or later) use lib<name>.so
- # instead of lib<name>.a to let people know that these are not
- # typical AIX shared libraries.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- else
- # We preserve .a as extension for shared libraries through AIX4.2
- # and later when we are not doing run time linking.
- library_names_spec='${libname}${release}.a $libname.a'
- soname_spec='${libname}${release}${shared_ext}$major'
- fi
- shlibpath_var=LIBPATH
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ F77=$ac_ct_F77
fi
- ;;
+fi
-amigaos*)
- library_names_spec='$libname.ixlibrary $libname.a'
- # Create ${libname}_ixlibrary.a entries in /sys/libs.
- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
- ;;
-beos*)
- library_names_spec='${libname}${shared_ext}'
- dynamic_linker="$host_os ld.so"
- shlibpath_var=LIBRARY_PATH
- ;;
+# Provide some information about the compiler.
+$as_echo "$as_me:$LINENO: checking for Fortran 77 compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
+{ (ac_try="$ac_compiler --version >&5"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compiler --version >&5") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+{ (ac_try="$ac_compiler -v >&5"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compiler -v >&5") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+{ (ac_try="$ac_compiler -V >&5"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compiler -V >&5") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+rm -f a.out
-bsdi[45]*)
- version_type=linux
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
- shlibpath_var=LD_LIBRARY_PATH
- sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
- sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
- # the default ld.so.conf also contains /usr/contrib/lib and
- # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
- # libtool to hard-code these into programs
- ;;
+# If we don't use `.F' as extension, the preprocessor is not run on the
+# input file. (Note that this only needs to work for GNU compilers.)
+ac_save_ext=$ac_ext
+ac_ext=F
+{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5
+$as_echo_n "checking whether we are using the GNU Fortran 77 compiler... " >&6; }
+if test "${ac_cv_f77_compiler_gnu+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+ program main
+#ifndef __GNUC__
+ choke me
+#endif
-cygwin* | mingw* | pw32*)
- version_type=windows
- shrext_cmds=".dll"
- need_version=no
- need_lib_prefix=no
+ end
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_f77_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_compiler_gnu=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
- case $GCC,$host_os in
- yes,cygwin* | yes,mingw* | yes,pw32*)
- library_names_spec='$libname.dll.a'
- # DLL is installed to $(libdir)/../bin by postinstall_cmds
- postinstall_cmds='base_file=`basename \${file}`~
- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
- dldir=$destdir/`dirname \$dlpath`~
- test -d \$dldir || mkdir -p \$dldir~
- $install_prog $dir/$dlname \$dldir/$dlname~
- chmod a+x \$dldir/$dlname'
- postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
- dlpath=$dir/\$dldll~
- $rm \$dlpath'
- shlibpath_overrides_runpath=yes
+ ac_compiler_gnu=no
+fi
- case $host_os in
- cygwin*)
- # Cygwin DLLs use 'cyg' prefix rather than 'lib'
- soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
- sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
- ;;
- mingw*)
- # MinGW DLLs use traditional 'lib' prefix
- soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
- if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
- # It is most probably a Windows format PATH printed by
- # mingw gcc, but we are running on Cygwin. Gcc prints its search
- # path with ; separators, and with drive letters. We can handle the
- # drive letters (cygwin fileutils understands them), so leave them,
- # especially as we might pass files found there to a mingw objdump,
- # which wouldn't understand a cygwinified path. Ahh.
- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
- else
- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
- fi
- ;;
- pw32*)
- # pw32 DLLs use 'pw' prefix rather than 'lib'
- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
- ;;
- esac
- ;;
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ac_cv_f77_compiler_gnu=$ac_compiler_gnu
- *)
- library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
- ;;
- esac
- dynamic_linker='Win32 ld.exe'
- # FIXME: first we should search . and the directory the executable is in
- shlibpath_var=PATH
- ;;
-
-darwin* | rhapsody*)
- dynamic_linker="$host_os dyld"
- version_type=darwin
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
- soname_spec='${libname}${release}${major}$shared_ext'
- shlibpath_overrides_runpath=yes
- shlibpath_var=DYLD_LIBRARY_PATH
- shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5
+$as_echo "$ac_cv_f77_compiler_gnu" >&6; }
+ac_ext=$ac_save_ext
+ac_test_FFLAGS=${FFLAGS+set}
+ac_save_FFLAGS=$FFLAGS
+FFLAGS=
+{ $as_echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5
+$as_echo_n "checking whether $F77 accepts -g... " >&6; }
+if test "${ac_cv_prog_f77_g+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ FFLAGS=-g
+cat >conftest.$ac_ext <<_ACEOF
+ program main
- sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"
- sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
- ;;
+ end
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_f77_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_prog_f77_g=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
-dgux*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- ;;
+ ac_cv_prog_f77_g=no
+fi
-freebsd1*)
- dynamic_linker=no
- ;;
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-freebsd* | dragonfly*)
- # DragonFly does not have aout. When/if they implement a new
- # versioning mechanism, adjust this.
- if test -x /usr/bin/objformat; then
- objformat=`/usr/bin/objformat`
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5
+$as_echo "$ac_cv_prog_f77_g" >&6; }
+if test "$ac_test_FFLAGS" = set; then
+ FFLAGS=$ac_save_FFLAGS
+elif test $ac_cv_prog_f77_g = yes; then
+ if test "x$ac_cv_f77_compiler_gnu" = xyes; then
+ FFLAGS="-g -O2"
else
- case $host_os in
- freebsd[123]*) objformat=aout ;;
- *) objformat=elf ;;
- esac
+ FFLAGS="-g"
fi
- version_type=freebsd-$objformat
- case $version_type in
- freebsd-elf*)
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
- need_version=no
- need_lib_prefix=no
- ;;
- freebsd-*)
- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
- need_version=yes
- ;;
- esac
- shlibpath_var=LD_LIBRARY_PATH
- case $host_os in
- freebsd2*)
- shlibpath_overrides_runpath=yes
- ;;
- freebsd3.[01]* | freebsdelf3.[01]*)
- shlibpath_overrides_runpath=yes
- hardcode_into_libs=yes
- ;;
- freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
- freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- ;;
- *) # from 4.6 on, and DragonFly
- shlibpath_overrides_runpath=yes
- hardcode_into_libs=yes
- ;;
- esac
- ;;
+else
+ if test "x$ac_cv_f77_compiler_gnu" = xyes; then
+ FFLAGS="-O2"
+ else
+ FFLAGS=
+ fi
+fi
-gnu*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- hardcode_into_libs=yes
- ;;
+if test $ac_compiler_gnu = yes; then
+ G77=yes
+else
+ G77=
+fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-hpux9* | hpux10* | hpux11*)
- # Give a soname corresponding to the major version so that dld.sl refuses to
- # link against other versions.
- version_type=sunos
- need_lib_prefix=no
- need_version=no
- case $host_cpu in
- ia64*)
- shrext_cmds='.so'
- hardcode_into_libs=yes
- dynamic_linker="$host_os dld.so"
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- if test "X$HPUX_IA64_MODE" = X32; then
- sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
- else
- sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
- fi
- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
- ;;
- hppa*64*)
- shrext_cmds='.sl'
- hardcode_into_libs=yes
- dynamic_linker="$host_os dld.sl"
- shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
- shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
- ;;
- *)
- shrext_cmds='.sl'
- dynamic_linker="$host_os dld.sl"
- shlibpath_var=SHLIB_PATH
- shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- ;;
- esac
- # HP-UX runs *really* slowly unless shared libraries are mode 555.
- postinstall_cmds='chmod 555 $lib'
- ;;
+if test -z "$F77" || test "X$F77" = "Xno"; then
+ _lt_disable_F77=yes
+fi
-interix[3-9]*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- ;;
-irix5* | irix6* | nonstopux*)
- case $host_os in
- nonstopux*) version_type=nonstopux ;;
- *)
- if test "$lt_cv_prog_gnu_ld" = yes; then
- version_type=linux
- else
- version_type=irix
- fi ;;
- esac
- need_lib_prefix=no
- need_version=no
- soname_spec='${libname}${release}${shared_ext}$major'
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
- case $host_os in
- irix5* | nonstopux*)
- libsuff= shlibsuff=
- ;;
- *)
- case $LD in # libtool.m4 will add one of these switches to LD
- *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
- libsuff= shlibsuff= libmagic=32-bit;;
- *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
- libsuff=32 shlibsuff=N32 libmagic=N32;;
- *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
- libsuff=64 shlibsuff=64 libmagic=64-bit;;
- *) libsuff= shlibsuff= libmagic=never-match;;
- esac
- ;;
- esac
- shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
- shlibpath_overrides_runpath=no
- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
- hardcode_into_libs=yes
- ;;
-# No shared lib support for Linux oldld, aout, or coff.
-linux*oldld* | linux*aout* | linux*coff*)
- dynamic_linker=no
- ;;
-# This must be Linux ELF.
-linux* | k*bsd*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- # This implies no fast_install, which is unacceptable.
- # Some rework will be needed to allow for fast_install
- # before this can be enabled.
- hardcode_into_libs=yes
- # Append ld.so.conf contents to the search path
- if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ac_ext=${ac_fc_srcext-f}
+ac_compile='$FC -c $FCFLAGS $ac_fcflags_srcext conftest.$ac_ext >&5'
+ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_fc_compiler_gnu
+if test -n "$ac_tool_prefix"; then
+ for ac_prog in gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn xlf90 f90 pgf90 pghpf epcf90 g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77
+ do
+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_FC+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$FC"; then
+ ac_cv_prog_FC="$FC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_FC="$ac_tool_prefix$ac_prog"
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
fi
+done
+done
+IFS=$as_save_IFS
- # We used to test for /lib/ld.so.1 and disable shared libraries on
- # powerpc, because MkLinux only supported shared libraries with the
- # GNU dynamic linker. Since this was broken with cross compilers,
- # most powerpc-linux boxes support dynamic linking these days and
- # people can always --disable-shared, the test was removed, and we
- # assume the GNU/Linux dynamic linker is in use.
- dynamic_linker='GNU/Linux ld.so'
- ;;
-
-netbsd*)
- version_type=sunos
- need_lib_prefix=no
- need_version=no
- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
- dynamic_linker='NetBSD (a.out) ld.so'
- else
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- dynamic_linker='NetBSD ld.elf_so'
+fi
+fi
+FC=$ac_cv_prog_FC
+if test -n "$FC"; then
+ { $as_echo "$as_me:$LINENO: result: $FC" >&5
+$as_echo "$FC" >&6; }
+else
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ test -n "$FC" && break
+ done
+fi
+if test -z "$FC"; then
+ ac_ct_FC=$FC
+ for ac_prog in gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn xlf90 f90 pgf90 pghpf epcf90 g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_FC+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$ac_ct_FC"; then
+ ac_cv_prog_ac_ct_FC="$ac_ct_FC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_FC="$ac_prog"
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
fi
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes
- hardcode_into_libs=yes
- ;;
+done
+done
+IFS=$as_save_IFS
-newsos6)
- version_type=linux
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes
- ;;
+fi
+fi
+ac_ct_FC=$ac_cv_prog_ac_ct_FC
+if test -n "$ac_ct_FC"; then
+ { $as_echo "$as_me:$LINENO: result: $ac_ct_FC" >&5
+$as_echo "$ac_ct_FC" >&6; }
+else
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
-nto-qnx*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes
- ;;
-openbsd*)
- version_type=sunos
- sys_lib_dlsearch_path_spec="/usr/lib"
- need_lib_prefix=no
- # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
- case $host_os in
- openbsd3.3 | openbsd3.3.*) need_version=yes ;;
- *) need_version=no ;;
- esac
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
- shlibpath_var=LD_LIBRARY_PATH
- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- case $host_os in
- openbsd2.[89] | openbsd2.[89].*)
- shlibpath_overrides_runpath=no
- ;;
- *)
- shlibpath_overrides_runpath=yes
- ;;
- esac
+ test -n "$ac_ct_FC" && break
+done
+
+ if test "x$ac_ct_FC" = x; then
+ FC=""
else
- shlibpath_overrides_runpath=yes
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ FC=$ac_ct_FC
fi
- ;;
+fi
-os2*)
- libname_spec='$name'
- shrext_cmds=".dll"
- need_lib_prefix=no
- library_names_spec='$libname${shared_ext} $libname.a'
- dynamic_linker='OS/2 ld.exe'
- shlibpath_var=LIBPATH
- ;;
-osf3* | osf4* | osf5*)
- version_type=osf
- need_lib_prefix=no
- need_version=no
- soname_spec='${libname}${release}${shared_ext}$major'
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- shlibpath_var=LD_LIBRARY_PATH
- sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
- sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
- ;;
+# Provide some information about the compiler.
+$as_echo "$as_me:$LINENO: checking for Fortran compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
+{ (ac_try="$ac_compiler --version >&5"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compiler --version >&5") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+{ (ac_try="$ac_compiler -v >&5"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compiler -v >&5") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+{ (ac_try="$ac_compiler -V >&5"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compiler -V >&5") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+rm -f a.out
-rdos*)
- dynamic_linker=no
- ;;
+# If we don't use `.F' as extension, the preprocessor is not run on the
+# input file. (Note that this only needs to work for GNU compilers.)
+ac_save_ext=$ac_ext
+ac_ext=F
+{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU Fortran compiler" >&5
+$as_echo_n "checking whether we are using the GNU Fortran compiler... " >&6; }
+if test "${ac_cv_fc_compiler_gnu+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+ program main
+#ifndef __GNUC__
+ choke me
+#endif
-solaris*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes
- hardcode_into_libs=yes
- # ldd complains unless libraries are executable
- postinstall_cmds='chmod +x $lib'
- ;;
+ end
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_fc_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_compiler_gnu=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
-sunos4*)
- version_type=sunos
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
- finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes
- if test "$with_gnu_ld" = yes; then
- need_lib_prefix=no
- fi
- need_version=yes
- ;;
+ ac_compiler_gnu=no
+fi
-sysv4 | sysv4.3*)
- version_type=linux
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- case $host_vendor in
- sni)
- shlibpath_overrides_runpath=no
- need_lib_prefix=no
- export_dynamic_flag_spec='${wl}-Blargedynsym'
- runpath_var=LD_RUN_PATH
- ;;
- siemens)
- need_lib_prefix=no
- ;;
- motorola)
- need_lib_prefix=no
- need_version=no
- shlibpath_overrides_runpath=no
- sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
- ;;
- esac
- ;;
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ac_cv_fc_compiler_gnu=$ac_compiler_gnu
-sysv4*MP*)
- if test -d /usr/nec ;then
- version_type=linux
- library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
- soname_spec='$libname${shared_ext}.$major'
- shlibpath_var=LD_LIBRARY_PATH
- fi
- ;;
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_fc_compiler_gnu" >&5
+$as_echo "$ac_cv_fc_compiler_gnu" >&6; }
+ac_ext=$ac_save_ext
+ac_test_FFLAGS=${FCFLAGS+set}
+ac_save_FFLAGS=$FCFLAGS
+FCFLAGS=
+{ $as_echo "$as_me:$LINENO: checking whether $FC accepts -g" >&5
+$as_echo_n "checking whether $FC accepts -g... " >&6; }
+if test "${ac_cv_prog_fc_g+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ FCFLAGS=-g
+cat >conftest.$ac_ext <<_ACEOF
+ program main
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
- version_type=freebsd-elf
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- hardcode_into_libs=yes
- if test "$with_gnu_ld" = yes; then
- sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
- shlibpath_overrides_runpath=no
- else
- sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
- shlibpath_overrides_runpath=yes
- case $host_os in
- sco3.2v5*)
- sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
- ;;
- esac
- fi
- sys_lib_dlsearch_path_spec='/usr/lib'
- ;;
-
-uts4*)
- version_type=linux
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- ;;
-
-*)
- dynamic_linker=no
- ;;
+ end
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
esac
-{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-echo "${ECHO_T}$dynamic_linker" >&6; }
-test "$dynamic_linker" = no && can_build_shared=no
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_fc_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_prog_fc_g=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+ ac_cv_prog_fc_g=no
fi
-{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
-hardcode_action=
-if test -n "$hardcode_libdir_flag_spec" || \
- test -n "$runpath_var" || \
- test "X$hardcode_automatic" = "Xyes" ; then
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- # We can hardcode non-existant directories.
- if test "$hardcode_direct" != no &&
- # If the only mechanism to avoid hardcoding is shlibpath_var, we
- # have to relink, otherwise we might link with an installed library
- # when we should be linking with a yet-to-be-installed one
- ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, )" != no &&
- test "$hardcode_minus_L" != no; then
- # Linking always hardcodes the temporary library directory.
- hardcode_action=relink
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_fc_g" >&5
+$as_echo "$ac_cv_prog_fc_g" >&6; }
+if test "$ac_test_FFLAGS" = set; then
+ FCFLAGS=$ac_save_FFLAGS
+elif test $ac_cv_prog_fc_g = yes; then
+ if test "x$ac_cv_fc_compiler_gnu" = xyes; then
+ FCFLAGS="-g -O2"
else
- # We can link without hardcoding, and we can hardcode nonexisting dirs.
- hardcode_action=immediate
+ FCFLAGS="-g"
fi
else
- # We cannot hardcode anything, or else we can only hardcode existing
- # directories.
- hardcode_action=unsupported
+ if test "x$ac_cv_fc_compiler_gnu" = xyes; then
+ FCFLAGS="-O2"
+ else
+ FCFLAGS=
+ fi
fi
-{ echo "$as_me:$LINENO: result: $hardcode_action" >&5
-echo "${ECHO_T}$hardcode_action" >&6; }
-if test "$hardcode_action" = relink; then
- # Fast installation is not supported
- enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
- test "$enable_shared" = no; then
- # Fast installation is not necessary
- enable_fast_install=needless
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+if test -z "$FC" || test "X$FC" = "Xno"; then
+ _lt_disable_FC=yes
fi
-striplib=
-old_striplib=
-{ echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6; }
-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
- test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
- test -z "$striplib" && striplib="$STRIP --strip-unneeded"
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+
+
+
+# Set options
+
+
+
+ enable_dlopen=no
+
+
+ enable_win32_dll=no
+
+
+
+ # Check whether --enable-static was given.
+if test "${enable_static+set}" = set; then
+ enableval=$enable_static; p=${PACKAGE-default}
+ case $enableval in
+ yes) enable_static=yes ;;
+ no) enable_static=no ;;
+ *)
+ enable_static=no
+ # Look at the argument we got. We use all the common list separators.
+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+ for pkg in $enableval; do
+ IFS="$lt_save_ifs"
+ if test "X$pkg" = "X$p"; then
+ enable_static=yes
+ fi
+ done
+ IFS="$lt_save_ifs"
+ ;;
+ esac
else
-# FIXME - insert some real tests, host_os isn't really good enough
- case $host_os in
- darwin*)
- if test -n "$STRIP" ; then
- striplib="$STRIP -x"
- old_striplib="$STRIP -S"
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
- else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
- ;;
- *)
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
- ;;
- esac
+ enable_static=yes
fi
-if test "x$enable_dlopen" != xyes; then
- enable_dlopen=unknown
- enable_dlopen_self=unknown
- enable_dlopen_self_static=unknown
-else
- lt_cv_dlopen=no
- lt_cv_dlopen_libs=
- case $host_os in
- beos*)
- lt_cv_dlopen="load_add_on"
- lt_cv_dlopen_libs=
- lt_cv_dlopen_self=yes
- ;;
- mingw* | pw32*)
- lt_cv_dlopen="LoadLibrary"
- lt_cv_dlopen_libs=
- ;;
- cygwin*)
- lt_cv_dlopen="dlopen"
- lt_cv_dlopen_libs=
- ;;
- darwin*)
- # if libdl is installed we need to link against it
- { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen ();
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-# ifdef __cplusplus
- extern "C"
-# endif
- int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
-return dlopen ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- ac_cv_lib_dl_dlopen=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
- ac_cv_lib_dl_dlopen=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
-if test $ac_cv_lib_dl_dlopen = yes; then
- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-else
- lt_cv_dlopen="dyld"
- lt_cv_dlopen_libs=
- lt_cv_dlopen_self=yes
+# Check whether --with-pic was given.
+if test "${with_pic+set}" = set; then
+ withval=$with_pic; pic_mode="$withval"
+else
+ pic_mode=default
fi
- ;;
- *)
- { echo "$as_me:$LINENO: checking for shl_load" >&5
-echo $ECHO_N "checking for shl_load... $ECHO_C" >&6; }
-if test "${ac_cv_func_shl_load+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define shl_load innocuous_shl_load
+test -z "$pic_mode" && pic_mode=default
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char shl_load (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-#undef shl_load
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char shl_load ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined __stub_shl_load || defined __stub___shl_load
-choke me
-#endif
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-# ifdef __cplusplus
- extern "C"
-# endif
- int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
-return shl_load ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- ac_cv_func_shl_load=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
- ac_cv_func_shl_load=no
+
+ # Check whether --enable-fast-install was given.
+if test "${enable_fast_install+set}" = set; then
+ enableval=$enable_fast_install; p=${PACKAGE-default}
+ case $enableval in
+ yes) enable_fast_install=yes ;;
+ no) enable_fast_install=no ;;
+ *)
+ enable_fast_install=no
+ # Look at the argument we got. We use all the common list separators.
+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+ for pkg in $enableval; do
+ IFS="$lt_save_ifs"
+ if test "X$pkg" = "X$p"; then
+ enable_fast_install=yes
+ fi
+ done
+ IFS="$lt_save_ifs"
+ ;;
+ esac
+else
+ enable_fast_install=yes
fi
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+
+
+
+
+
+
+
+
+
+
+# This can be used to rebuild libtool when needed
+LIBTOOL_DEPS="$ltmain"
+
+# Always use our own libtool.
+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+test -z "$LN_S" && LN_S="ln -s"
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+if test -n "${ZSH_VERSION+set}" ; then
+ setopt NO_GLOB_SUBST
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
-echo "${ECHO_T}$ac_cv_func_shl_load" >&6; }
-if test $ac_cv_func_shl_load = yes; then
- lt_cv_dlopen="shl_load"
+
+{ $as_echo "$as_me:$LINENO: checking for objdir" >&5
+$as_echo_n "checking for objdir... " >&6; }
+if test "${lt_cv_objdir+set}" = set; then
+ $as_echo_n "(cached) " >&6
else
- { echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
-echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; }
-if test "${ac_cv_lib_dld_shl_load+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ rm -f .libs 2>/dev/null
+mkdir .libs 2>/dev/null
+if test -d .libs; then
+ lt_cv_objdir=.libs
else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldld $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
+ # MS-DOS does not allow filenames that begin with a dot.
+ lt_cv_objdir=_libs
+fi
+rmdir .libs 2>/dev/null
+fi
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
+$as_echo "$lt_cv_objdir" >&6; }
+objdir=$lt_cv_objdir
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char shl_load ();
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-# ifdef __cplusplus
- extern "C"
-# endif
- int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
-return shl_load ();
- ;
- return 0;
-}
+
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define LT_OBJDIR "$lt_cv_objdir/"
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+case $host_os in
+aix3*)
+ # AIX sometimes has problems with the GCC collect2 program. For some
+ # reason, if we set the COLLECT_NAMES environment variable, the problems
+ # vanish in a puff of smoke.
+ if test "X${COLLECT_NAMES+set}" != Xset; then
+ COLLECT_NAMES=
+ export COLLECT_NAMES
+ fi
+ ;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- ac_cv_lib_dld_shl_load=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
- ac_cv_lib_dld_shl_load=no
-fi
+# Sed substitution that helps us do robust quoting. It backslashifies
+# metacharacters that are still active within double-quoted strings.
+sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
-echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }
-if test $ac_cv_lib_dld_shl_load = yes; then
- lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
-else
- { echo "$as_me:$LINENO: checking for dlopen" >&5
-echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; }
-if test "${ac_cv_func_dlopen+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
+# Same as above, but do not quote variable references.
+double_quote_subst='s/\(["`\\]\)/\\\1/g'
+
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+
+# Sed substitution to delay expansion of an escaped single quote.
+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
+
+# Sed substitution to avoid accidental globbing in evaled expressions
+no_glob_subst='s/\*/\\\*/g'
+
+# Global variables:
+ofile=libtool
+can_build_shared=yes
+
+# All known linkers require a `.a' archive for static linking (except MSVC,
+# which needs '.lib').
+libext=a
+
+with_gnu_ld="$lt_cv_prog_gnu_ld"
+
+old_CC="$CC"
+old_CFLAGS="$CFLAGS"
+
+# Set sane defaults for various variables
+test -z "$CC" && CC=cc
+test -z "$LTCC" && LTCC=$CC
+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
+test -z "$LD" && LD=ld
+test -z "$ac_objext" && ac_objext=o
+
+for cc_temp in $compiler""; do
+ case $cc_temp in
+ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+ \-*) ;;
+ *) break;;
+ esac
+done
+cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+
+
+# Only perform the check for file, if the check method requires it
+test -z "$MAGIC_CMD" && MAGIC_CMD=file
+case $deplibs_check_method in
+file_magic*)
+ if test "$file_magic_cmd" = '$MAGIC_CMD'; then
+ { $as_echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
+$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
+if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ case $MAGIC_CMD in
+[\\/*] | ?:[\\/]*)
+ lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
+ ;;
+*)
+ lt_save_MAGIC_CMD="$MAGIC_CMD"
+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+ ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
+ for ac_dir in $ac_dummy; do
+ IFS="$lt_save_ifs"
+ test -z "$ac_dir" && ac_dir=.
+ if test -f $ac_dir/${ac_tool_prefix}file; then
+ lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file"
+ if test -n "$file_magic_test_file"; then
+ case $deplibs_check_method in
+ "file_magic "*)
+ file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
+ MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+ if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+ $EGREP "$file_magic_regex" > /dev/null; then
+ :
+ else
+ cat <<_LT_EOF 1>&2
+
+*** Warning: the command libtool uses to detect shared libraries,
+*** $file_magic_cmd, produces output that libtool cannot recognize.
+*** The result is that libtool may fail to recognize shared libraries
+*** as such. This will affect the creation of libtool libraries that
+*** depend on shared libraries, but programs linked with such libtool
+*** libraries will work regardless of this problem. Nevertheless, you
+*** may want to report the problem to your system manager and/or to
+*** bug-libtool at gnu.org
+
+_LT_EOF
+ fi ;;
+ esac
+ fi
+ break
+ fi
+ done
+ IFS="$lt_save_ifs"
+ MAGIC_CMD="$lt_save_MAGIC_CMD"
+ ;;
+esac
+fi
+
+MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+if test -n "$MAGIC_CMD"; then
+ { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
+$as_echo "$MAGIC_CMD" >&6; }
+else
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+
+
+
+if test -z "$lt_cv_path_MAGIC_CMD"; then
+ if test -n "$ac_tool_prefix"; then
+ { $as_echo "$as_me:$LINENO: checking for file" >&5
+$as_echo_n "checking for file... " >&6; }
+if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ case $MAGIC_CMD in
+[\\/*] | ?:[\\/]*)
+ lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
+ ;;
+*)
+ lt_save_MAGIC_CMD="$MAGIC_CMD"
+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+ ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
+ for ac_dir in $ac_dummy; do
+ IFS="$lt_save_ifs"
+ test -z "$ac_dir" && ac_dir=.
+ if test -f $ac_dir/file; then
+ lt_cv_path_MAGIC_CMD="$ac_dir/file"
+ if test -n "$file_magic_test_file"; then
+ case $deplibs_check_method in
+ "file_magic "*)
+ file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
+ MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+ if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+ $EGREP "$file_magic_regex" > /dev/null; then
+ :
+ else
+ cat <<_LT_EOF 1>&2
+
+*** Warning: the command libtool uses to detect shared libraries,
+*** $file_magic_cmd, produces output that libtool cannot recognize.
+*** The result is that libtool may fail to recognize shared libraries
+*** as such. This will affect the creation of libtool libraries that
+*** depend on shared libraries, but programs linked with such libtool
+*** libraries will work regardless of this problem. Nevertheless, you
+*** may want to report the problem to your system manager and/or to
+*** bug-libtool at gnu.org
+
+_LT_EOF
+ fi ;;
+ esac
+ fi
+ break
+ fi
+ done
+ IFS="$lt_save_ifs"
+ MAGIC_CMD="$lt_save_MAGIC_CMD"
+ ;;
+esac
+fi
+
+MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+if test -n "$MAGIC_CMD"; then
+ { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
+$as_echo "$MAGIC_CMD" >&6; }
+else
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ else
+ MAGIC_CMD=:
+ fi
+fi
+
+ fi
+ ;;
+esac
+
+# Use C for the default configuration in the libtool script
+
+lt_save_CC="$CC"
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+# Source file extension for C test sources.
+ac_ext=c
+
+# Object file extension for compiled C test sources.
+objext=o
+objext=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="int some_variable = 0;"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='int main(){return(0);}'
+
+
+
+
+
+
+
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
+
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
+# Allow CC to be a program name with arguments.
+compiler=$CC
+
+# Save the default compiler, since it gets overwritten when the other
+# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP.
+compiler_DEFAULT=$CC
+
+# save warnings/boilerplate of simple test code
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$RM conftest*
+
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$RM -r conftest*
+
+
+## CAVEAT EMPTOR:
+## There is no encapsulation within the following macros, do not change
+## the running order or otherwise move them around unless you know exactly
+## what you are doing...
+if test -n "$compiler"; then
+
+lt_prog_compiler_no_builtin_flag=
+
+if test "$GCC" = yes; then
+ lt_prog_compiler_no_builtin_flag=' -fno-builtin'
+
+ { $as_echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
+if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ lt_cv_prog_compiler_rtti_exceptions=no
+ ac_outfile=conftest.$ac_objext
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+ lt_compiler_flag="-fno-rtti -fno-exceptions"
+ # Insert the option either (1) after the last *FLAGS variable, or
+ # (2) before a word containing "conftest.", or (3) at the end.
+ # Note that $ac_compile itself does not contain backslashes and begins
+ # with a dollar sign (not a hyphen), so the echo should work correctly.
+ # The option is referenced via a variable to avoid confusing sed.
+ lt_compile=`echo "$ac_compile" | $SED \
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+ (eval echo "\"\$as_me:11079: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+ echo "$as_me:11083: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+ lt_cv_prog_compiler_rtti_exceptions=yes
+ fi
+ fi
+ $RM conftest*
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
+$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
+
+if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
+ lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
+else
+ :
+fi
+
+fi
+
+
+
+
+
+
+ lt_prog_compiler_wl=
+lt_prog_compiler_pic=
+lt_prog_compiler_static=
+
+{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+
+ if test "$GCC" = yes; then
+ lt_prog_compiler_wl='-Wl,'
+ lt_prog_compiler_static='-static'
+
+ case $host_os in
+ aix*)
+ # All AIX code is PIC.
+ if test "$host_cpu" = ia64; then
+ # AIX 5 now supports IA64 processor
+ lt_prog_compiler_static='-Bstatic'
+ fi
+ ;;
+
+ amigaos*)
+ case $host_cpu in
+ powerpc)
+ # see comment about AmigaOS4 .so support
+ lt_prog_compiler_pic='-fPIC'
+ ;;
+ m68k)
+ # FIXME: we need at least 68020 code to build shared libraries, but
+ # adding the `-m68020' flag to GCC prevents building anything better,
+ # like `-m68040'.
+ lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
+ ;;
+ esac
+ ;;
+
+ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+ # PIC is the default for these OSes.
+ ;;
+
+ mingw* | cygwin* | pw32* | os2* | cegcc*)
+ # This hack is so that the source file can tell whether it is being
+ # built for inclusion in a dll (and should export symbols for example).
+ # Although the cygwin gcc ignores -fPIC, still need this for old-style
+ # (--disable-auto-import) libraries
+ lt_prog_compiler_pic='-DDLL_EXPORT'
+ ;;
+
+ darwin* | rhapsody*)
+ # PIC is the default on this platform
+ # Common symbols not allowed in MH_DYLIB files
+ lt_prog_compiler_pic='-fno-common'
+ ;;
+
+ hpux*)
+ # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
+ # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag
+ # sets the default TLS model and affects inlining.
+ case $host_cpu in
+ hppa*64*)
+ # +Z the default
+ ;;
+ *)
+ lt_prog_compiler_pic='-fPIC'
+ ;;
+ esac
+ ;;
+
+ interix[3-9]*)
+ # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+ # Instead, we relocate shared libraries at runtime.
+ ;;
+
+ msdosdjgpp*)
+ # Just because we use GCC doesn't mean we suddenly get shared libraries
+ # on systems that don't support them.
+ lt_prog_compiler_can_build_shared=no
+ enable_shared=no
+ ;;
+
+ *nto* | *qnx*)
+ # QNX uses GNU C++, but need to define -shared option too, otherwise
+ # it will coredump.
+ lt_prog_compiler_pic='-fPIC -shared'
+ ;;
+
+ sysv4*MP*)
+ if test -d /usr/nec; then
+ lt_prog_compiler_pic=-Kconform_pic
+ fi
+ ;;
+
+ *)
+ lt_prog_compiler_pic='-fPIC'
+ ;;
+ esac
+ else
+ # PORTME Check for flag to pass linker flags through the system compiler.
+ case $host_os in
+ aix*)
+ lt_prog_compiler_wl='-Wl,'
+ if test "$host_cpu" = ia64; then
+ # AIX 5 now supports IA64 processor
+ lt_prog_compiler_static='-Bstatic'
+ else
+ lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
+ fi
+ ;;
+
+ mingw* | cygwin* | pw32* | os2* | cegcc*)
+ # This hack is so that the source file can tell whether it is being
+ # built for inclusion in a dll (and should export symbols for example).
+ lt_prog_compiler_pic='-DDLL_EXPORT'
+ ;;
+
+ hpux9* | hpux10* | hpux11*)
+ lt_prog_compiler_wl='-Wl,'
+ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+ # not for PA HP-UX.
+ case $host_cpu in
+ hppa*64*|ia64*)
+ # +Z the default
+ ;;
+ *)
+ lt_prog_compiler_pic='+Z'
+ ;;
+ esac
+ # Is there a better lt_prog_compiler_static that works with the bundled CC?
+ lt_prog_compiler_static='${wl}-a ${wl}archive'
+ ;;
+
+ irix5* | irix6* | nonstopux*)
+ lt_prog_compiler_wl='-Wl,'
+ # PIC (with -KPIC) is the default.
+ lt_prog_compiler_static='-non_shared'
+ ;;
+
+ linux* | k*bsd*-gnu)
+ case $cc_basename in
+ # old Intel for x86_64 which still supported -KPIC.
+ ecc*)
+ lt_prog_compiler_wl='-Wl,'
+ lt_prog_compiler_pic='-KPIC'
+ lt_prog_compiler_static='-static'
+ ;;
+ # icc used to be incompatible with GCC.
+ # ICC 10 doesn't accept -KPIC any more.
+ icc* | ifort*)
+ lt_prog_compiler_wl='-Wl,'
+ lt_prog_compiler_pic='-fPIC'
+ lt_prog_compiler_static='-static'
+ ;;
+ # Lahey Fortran 8.1.
+ lf95*)
+ lt_prog_compiler_wl='-Wl,'
+ lt_prog_compiler_pic='--shared'
+ lt_prog_compiler_static='--static'
+ ;;
+ pgcc* | pgf77* | pgf90* | pgf95*)
+ # Portland Group compilers (*not* the Pentium gcc compiler,
+ # which looks to be a dead project)
+ lt_prog_compiler_wl='-Wl,'
+ lt_prog_compiler_pic='-fpic'
+ lt_prog_compiler_static='-Bstatic'
+ ;;
+ ccc*)
+ lt_prog_compiler_wl='-Wl,'
+ # All Alpha code is PIC.
+ lt_prog_compiler_static='-non_shared'
+ ;;
+ xl*)
+ # IBM XL C 8.0/Fortran 10.1 on PPC
+ lt_prog_compiler_wl='-Wl,'
+ lt_prog_compiler_pic='-qpic'
+ lt_prog_compiler_static='-qstaticlink'
+ ;;
+ *)
+ case `$CC -V 2>&1 | sed 5q` in
+ *Sun\ C*)
+ # Sun C 5.9
+ lt_prog_compiler_pic='-KPIC'
+ lt_prog_compiler_static='-Bstatic'
+ lt_prog_compiler_wl='-Wl,'
+ ;;
+ *Sun\ F*)
+ # Sun Fortran 8.3 passes all unrecognized flags to the linker
+ lt_prog_compiler_pic='-KPIC'
+ lt_prog_compiler_static='-Bstatic'
+ lt_prog_compiler_wl=''
+ ;;
+ esac
+ ;;
+ esac
+ ;;
+
+ newsos6)
+ lt_prog_compiler_pic='-KPIC'
+ lt_prog_compiler_static='-Bstatic'
+ ;;
+
+ *nto* | *qnx*)
+ # QNX uses GNU C++, but need to define -shared option too, otherwise
+ # it will coredump.
+ lt_prog_compiler_pic='-fPIC -shared'
+ ;;
+
+ osf3* | osf4* | osf5*)
+ lt_prog_compiler_wl='-Wl,'
+ # All OSF/1 code is PIC.
+ lt_prog_compiler_static='-non_shared'
+ ;;
+
+ rdos*)
+ lt_prog_compiler_static='-non_shared'
+ ;;
+
+ solaris*)
+ lt_prog_compiler_pic='-KPIC'
+ lt_prog_compiler_static='-Bstatic'
+ case $cc_basename in
+ f77* | f90* | f95*)
+ lt_prog_compiler_wl='-Qoption ld ';;
+ *)
+ lt_prog_compiler_wl='-Wl,';;
+ esac
+ ;;
+
+ sunos4*)
+ lt_prog_compiler_wl='-Qoption ld '
+ lt_prog_compiler_pic='-PIC'
+ lt_prog_compiler_static='-Bstatic'
+ ;;
+
+ sysv4 | sysv4.2uw2* | sysv4.3*)
+ lt_prog_compiler_wl='-Wl,'
+ lt_prog_compiler_pic='-KPIC'
+ lt_prog_compiler_static='-Bstatic'
+ ;;
+
+ sysv4*MP*)
+ if test -d /usr/nec ;then
+ lt_prog_compiler_pic='-Kconform_pic'
+ lt_prog_compiler_static='-Bstatic'
+ fi
+ ;;
+
+ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+ lt_prog_compiler_wl='-Wl,'
+ lt_prog_compiler_pic='-KPIC'
+ lt_prog_compiler_static='-Bstatic'
+ ;;
+
+ unicos*)
+ lt_prog_compiler_wl='-Wl,'
+ lt_prog_compiler_can_build_shared=no
+ ;;
+
+ uts4*)
+ lt_prog_compiler_pic='-pic'
+ lt_prog_compiler_static='-Bstatic'
+ ;;
+
+ *)
+ lt_prog_compiler_can_build_shared=no
+ ;;
+ esac
+ fi
+
+case $host_os in
+ # For platforms which do not support PIC, -DPIC is meaningless:
+ *djgpp*)
+ lt_prog_compiler_pic=
+ ;;
+ *)
+ lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
+ ;;
+esac
+{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
+$as_echo "$lt_prog_compiler_pic" >&6; }
+
+
+
+
+
+
+#
+# Check to make sure the PIC flag actually works.
+#
+if test -n "$lt_prog_compiler_pic"; then
+ { $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
+$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
+if test "${lt_cv_prog_compiler_pic_works+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ lt_cv_prog_compiler_pic_works=no
+ ac_outfile=conftest.$ac_objext
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+ lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
+ # Insert the option either (1) after the last *FLAGS variable, or
+ # (2) before a word containing "conftest.", or (3) at the end.
+ # Note that $ac_compile itself does not contain backslashes and begins
+ # with a dollar sign (not a hyphen), so the echo should work correctly.
+ # The option is referenced via a variable to avoid confusing sed.
+ lt_compile=`echo "$ac_compile" | $SED \
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+ (eval echo "\"\$as_me:11418: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+ echo "$as_me:11422: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+ lt_cv_prog_compiler_pic_works=yes
+ fi
+ fi
+ $RM conftest*
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5
+$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
+
+if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
+ case $lt_prog_compiler_pic in
+ "" | " "*) ;;
+ *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
+ esac
+else
+ lt_prog_compiler_pic=
+ lt_prog_compiler_can_build_shared=no
+fi
+
+fi
+
+
+
+
+
+
+#
+# Check to make sure the static flag actually works.
+#
+wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
+{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
+if test "${lt_cv_prog_compiler_static_works+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ lt_cv_prog_compiler_static_works=no
+ save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+ echo "$lt_simple_link_test_code" > conftest.$ac_ext
+ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+ # The linker can only warn and ignore the option if not recognized
+ # So say no if there are warnings
+ if test -s conftest.err; then
+ # Append any errors to the config.log.
+ cat conftest.err 1>&5
+ $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+ if diff conftest.exp conftest.er2 >/dev/null; then
+ lt_cv_prog_compiler_static_works=yes
+ fi
+ else
+ lt_cv_prog_compiler_static_works=yes
+ fi
+ fi
+ $RM -r conftest*
+ LDFLAGS="$save_LDFLAGS"
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5
+$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
+
+if test x"$lt_cv_prog_compiler_static_works" = xyes; then
+ :
+else
+ lt_prog_compiler_static=
+fi
+
+
+
+
+
+
+
+ { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+if test "${lt_cv_prog_compiler_c_o+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ lt_cv_prog_compiler_c_o=no
+ $RM -r conftest 2>/dev/null
+ mkdir conftest
+ cd conftest
+ mkdir out
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+ lt_compiler_flag="-o out/conftest2.$ac_objext"
+ # Insert the option either (1) after the last *FLAGS variable, or
+ # (2) before a word containing "conftest.", or (3) at the end.
+ # Note that $ac_compile itself does not contain backslashes and begins
+ # with a dollar sign (not a hyphen), so the echo should work correctly.
+ lt_compile=`echo "$ac_compile" | $SED \
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+ (eval echo "\"\$as_me:11523: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+ echo "$as_me:11527: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings
+ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+ lt_cv_prog_compiler_c_o=yes
+ fi
+ fi
+ chmod u+w . 2>&5
+ $RM conftest*
+ # SGI C++ compiler will create directory out/ii_files/ for
+ # template instantiation
+ test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
+ $RM out/* && rmdir out
+ cd ..
+ $RM -r conftest
+ $RM conftest*
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
+$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
+
+
+
+
+
+
+ { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+if test "${lt_cv_prog_compiler_c_o+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ lt_cv_prog_compiler_c_o=no
+ $RM -r conftest 2>/dev/null
+ mkdir conftest
+ cd conftest
+ mkdir out
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+ lt_compiler_flag="-o out/conftest2.$ac_objext"
+ # Insert the option either (1) after the last *FLAGS variable, or
+ # (2) before a word containing "conftest.", or (3) at the end.
+ # Note that $ac_compile itself does not contain backslashes and begins
+ # with a dollar sign (not a hyphen), so the echo should work correctly.
+ lt_compile=`echo "$ac_compile" | $SED \
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+ (eval echo "\"\$as_me:11578: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+ echo "$as_me:11582: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings
+ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+ lt_cv_prog_compiler_c_o=yes
+ fi
+ fi
+ chmod u+w . 2>&5
+ $RM conftest*
+ # SGI C++ compiler will create directory out/ii_files/ for
+ # template instantiation
+ test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
+ $RM out/* && rmdir out
+ cd ..
+ $RM -r conftest
+ $RM conftest*
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
+$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
+
+
+
+
+hard_links="nottested"
+if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
+ # do not overwrite the value of need_locks provided by the user
+ { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+$as_echo_n "checking if we can lock with hard links... " >&6; }
+ hard_links=yes
+ $RM conftest*
+ ln conftest.a conftest.b 2>/dev/null && hard_links=no
+ touch conftest.a
+ ln conftest.a conftest.b 2>&5 || hard_links=no
+ ln conftest.a conftest.b 2>/dev/null && hard_links=no
+ { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
+$as_echo "$hard_links" >&6; }
+ if test "$hard_links" = no; then
+ { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+ need_locks=warn
+ fi
+else
+ need_locks=no
+fi
+
+
+
+
+
+
+ { $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
+
+ runpath_var=
+ allow_undefined_flag=
+ always_export_symbols=no
+ archive_cmds=
+ archive_expsym_cmds=
+ compiler_needs_object=no
+ enable_shared_with_static_runtimes=no
+ export_dynamic_flag_spec=
+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+ hardcode_automatic=no
+ hardcode_direct=no
+ hardcode_direct_absolute=no
+ hardcode_libdir_flag_spec=
+ hardcode_libdir_flag_spec_ld=
+ hardcode_libdir_separator=
+ hardcode_minus_L=no
+ hardcode_shlibpath_var=unsupported
+ inherit_rpath=no
+ link_all_deplibs=unknown
+ module_cmds=
+ module_expsym_cmds=
+ old_archive_from_new_cmds=
+ old_archive_from_expsyms_cmds=
+ thread_safe_flag_spec=
+ whole_archive_flag_spec=
+ # include_expsyms should be a list of space-separated symbols to be *always*
+ # included in the symbol list
+ include_expsyms=
+ # exclude_expsyms can be an extended regexp of symbols to exclude
+ # it will be wrapped by ` (' and `)$', so one must not match beginning or
+ # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
+ # as well as any symbol that contains `d'.
+ exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
+ # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+ # platforms (ab)use it in PIC code, but their linkers get confused if
+ # the symbol is explicitly referenced. Since portable code cannot
+ # rely on this symbol name, it's probably fine to never include it in
+ # preloaded symbol tables.
+ # Exclude shared library initialization/finalization symbols.
+ extract_expsyms_cmds=
+
+ case $host_os in
+ cygwin* | mingw* | pw32* | cegcc*)
+ # FIXME: the MSVC++ port hasn't been tested in a loooong time
+ # When not using gcc, we currently assume that we are using
+ # Microsoft Visual C++.
+ if test "$GCC" != yes; then
+ with_gnu_ld=no
+ fi
+ ;;
+ interix*)
+ # we just hope/assume this is gcc and not c89 (= MSVC++)
+ with_gnu_ld=yes
+ ;;
+ openbsd*)
+ with_gnu_ld=no
+ ;;
+ esac
+
+ ld_shlibs=yes
+ if test "$with_gnu_ld" = yes; then
+ # If archive_cmds runs LD, not CC, wlarc should be empty
+ wlarc='${wl}'
+
+ # Set some defaults for GNU ld with shared library support. These
+ # are reset later if shared libraries are not supported. Putting them
+ # here allows them to be overridden if necessary.
+ runpath_var=LD_RUN_PATH
+ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+ export_dynamic_flag_spec='${wl}--export-dynamic'
+ # ancient GNU ld didn't support --whole-archive et. al.
+ if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
+ whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+ else
+ whole_archive_flag_spec=
+ fi
+ supports_anon_versioning=no
+ case `$LD -v 2>&1` in
+ *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
+ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+ *\ 2.11.*) ;; # other 2.11 versions
+ *) supports_anon_versioning=yes ;;
+ esac
+
+ # See if GNU ld supports shared libraries.
+ case $host_os in
+ aix[3-9]*)
+ # On AIX/PPC, the GNU linker is very broken
+ if test "$host_cpu" != ia64; then
+ ld_shlibs=no
+ cat <<_LT_EOF 1>&2
+
+*** Warning: the GNU linker, at least up to release 2.9.1, is reported
+*** to be unable to reliably create shared libraries on AIX.
+*** Therefore, libtool is disabling shared libraries support. If you
+*** really care for shared libraries, you may want to modify your PATH
+*** so that a non-GNU linker is found, and then restart.
+
+_LT_EOF
+ fi
+ ;;
+
+ amigaos*)
+ case $host_cpu in
+ powerpc)
+ # see comment about AmigaOS4 .so support
+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ archive_expsym_cmds=''
+ ;;
+ m68k)
+ archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+ hardcode_libdir_flag_spec='-L$libdir'
+ hardcode_minus_L=yes
+ ;;
+ esac
+ ;;
+
+ beos*)
+ if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+ allow_undefined_flag=unsupported
+ # Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
+ # support --undefined. This deserves some investigation. FIXME
+ archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ else
+ ld_shlibs=no
+ fi
+ ;;
+
+ cygwin* | mingw* | pw32* | cegcc*)
+ # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
+ # as there is no search path for DLLs.
+ hardcode_libdir_flag_spec='-L$libdir'
+ allow_undefined_flag=unsupported
+ always_export_symbols=no
+ enable_shared_with_static_runtimes=yes
+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
+
+ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+ # If the export-symbols file already is a .def file (1st line
+ # is EXPORTS), use it as is; otherwise, prepend...
+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+ cp $export_symbols $output_objdir/$soname.def;
+ else
+ echo EXPORTS > $output_objdir/$soname.def;
+ cat $export_symbols >> $output_objdir/$soname.def;
+ fi~
+ $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+ else
+ ld_shlibs=no
+ fi
+ ;;
+
+ interix[3-9]*)
+ hardcode_direct=no
+ hardcode_shlibpath_var=no
+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+ export_dynamic_flag_spec='${wl}-E'
+ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+ # Instead, shared libraries are loaded at an image base (0x10000000 by
+ # default) and relocated if they conflict, which is a slow very memory
+ # consuming and fragmenting process. To avoid this, we pick a random,
+ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+ # time. Moving up from 0x10000000 also allows more sbrk(2) space.
+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ ;;
+
+ gnu* | linux* | tpf* | k*bsd*-gnu)
+ tmp_diet=no
+ if test "$host_os" = linux-dietlibc; then
+ case $cc_basename in
+ diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn)
+ esac
+ fi
+ if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
+ && test "$tmp_diet" = no
+ then
+ tmp_addflag=
+ tmp_sharedflag='-shared'
+ case $cc_basename,$host_cpu in
+ pgcc*) # Portland Group C compiler
+ whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+ tmp_addflag=' $pic_flag'
+ ;;
+ pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers
+ whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+ tmp_addflag=' $pic_flag -Mnomain' ;;
+ ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
+ tmp_addflag=' -i_dynamic' ;;
+ efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64
+ tmp_addflag=' -i_dynamic -nofor_main' ;;
+ ifc* | ifort*) # Intel Fortran compiler
+ tmp_addflag=' -nofor_main' ;;
+ lf95*) # Lahey Fortran 8.1
+ whole_archive_flag_spec=
+ tmp_sharedflag='--shared' ;;
+ xl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below)
+ tmp_sharedflag='-qmkshrobj'
+ tmp_addflag= ;;
+ esac
+ case `$CC -V 2>&1 | sed 5q` in
+ *Sun\ C*) # Sun C 5.9
+ whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+ compiler_needs_object=yes
+ tmp_sharedflag='-G' ;;
+ *Sun\ F*) # Sun Fortran 8.3
+ tmp_sharedflag='-G' ;;
+ esac
+ archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+
+ if test "x$supports_anon_versioning" = xyes; then
+ archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
+ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+ echo "local: *; };" >> $output_objdir/$libname.ver~
+ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ fi
+
+ case $cc_basename in
+ xlf*)
+ # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
+ whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
+ hardcode_libdir_flag_spec=
+ hardcode_libdir_flag_spec_ld='-rpath $libdir'
+ archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
+ if test "x$supports_anon_versioning" = xyes; then
+ archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
+ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+ echo "local: *; };" >> $output_objdir/$libname.ver~
+ $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+ fi
+ ;;
+ esac
+ else
+ ld_shlibs=no
+ fi
+ ;;
+
+ netbsd*)
+ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+ archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+ wlarc=
+ else
+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ fi
+ ;;
+
+ solaris*)
+ if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
+ ld_shlibs=no
+ cat <<_LT_EOF 1>&2
+
+*** Warning: The releases 2.8.* of the GNU linker cannot reliably
+*** create shared libraries on Solaris systems. Therefore, libtool
+*** is disabling shared libraries support. We urge you to upgrade GNU
+*** binutils to release 2.9.1 or newer. Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+ elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ else
+ ld_shlibs=no
+ fi
+ ;;
+
+ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+ case `$LD -v 2>&1` in
+ *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
+ ld_shlibs=no
+ cat <<_LT_EOF 1>&2
+
+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
+*** reliably create shared libraries on SCO systems. Therefore, libtool
+*** is disabling shared libraries support. We urge you to upgrade GNU
+*** binutils to release 2.16.91.0.3 or newer. Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+ ;;
+ *)
+ # For security reasons, it is highly recommended that you always
+ # use absolute paths for naming shared libraries, and exclude the
+ # DT_RUNPATH tag from executables and libraries. But doing so
+ # requires that you compile everything twice, which is a pain.
+ if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ else
+ ld_shlibs=no
+ fi
+ ;;
+ esac
+ ;;
+
+ sunos4*)
+ archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+ wlarc=
+ hardcode_direct=yes
+ hardcode_shlibpath_var=no
+ ;;
+
+ *)
+ if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ else
+ ld_shlibs=no
+ fi
+ ;;
+ esac
+
+ if test "$ld_shlibs" = no; then
+ runpath_var=
+ hardcode_libdir_flag_spec=
+ export_dynamic_flag_spec=
+ whole_archive_flag_spec=
+ fi
+ else
+ # PORTME fill in a description of your system's linker (not GNU ld)
+ case $host_os in
+ aix3*)
+ allow_undefined_flag=unsupported
+ always_export_symbols=yes
+ archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
+ # Note: this linker hardcodes the directories in LIBPATH if there
+ # are no directories specified by -L.
+ hardcode_minus_L=yes
+ if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
+ # Neither direct hardcoding nor static linking is supported with a
+ # broken collect2.
+ hardcode_direct=unsupported
+ fi
+ ;;
+
+ aix[4-9]*)
+ if test "$host_cpu" = ia64; then
+ # On IA64, the linker does run time linking by default, so we don't
+ # have to do anything special.
+ aix_use_runtimelinking=no
+ exp_sym_flag='-Bexport'
+ no_entry_flag=""
+ else
+ # If we're using GNU nm, then we don't want the "-C" option.
+ # -C means demangle to AIX nm, but means don't demangle with GNU nm
+ if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+ export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ else
+ export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ fi
+ aix_use_runtimelinking=no
+
+ # Test if we are trying to use run time linking or normal
+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+ # need to do runtime linking.
+ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
+ for ld_flag in $LDFLAGS; do
+ if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+ aix_use_runtimelinking=yes
+ break
+ fi
+ done
+ ;;
+ esac
+
+ exp_sym_flag='-bexport'
+ no_entry_flag='-bnoentry'
+ fi
+
+ # When large executables or shared objects are built, AIX ld can
+ # have problems creating the table of contents. If linking a library
+ # or program results in "error TOC overflow" add -mminimal-toc to
+ # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not
+ # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+ archive_cmds=''
+ hardcode_direct=yes
+ hardcode_direct_absolute=yes
+ hardcode_libdir_separator=':'
+ link_all_deplibs=yes
+ file_list_spec='${wl}-f,'
+
+ if test "$GCC" = yes; then
+ case $host_os in aix4.[012]|aix4.[012].*)
+ # We only want to do this on AIX 4.2 and lower, the check
+ # below for broken collect2 doesn't work under 4.3+
+ collect2name=`${CC} -print-prog-name=collect2`
+ if test -f "$collect2name" &&
+ strings "$collect2name" | $GREP resolve_lib_name >/dev/null
+ then
+ # We have reworked collect2
+ :
+ else
+ # We have old collect2
+ hardcode_direct=unsupported
+ # It fails to find uninstalled libraries when the uninstalled
+ # path is not listed in the libpath. Setting hardcode_minus_L
+ # to unsupported forces relinking
+ hardcode_minus_L=yes
+ hardcode_libdir_flag_spec='-L$libdir'
+ hardcode_libdir_separator=
+ fi
+ ;;
+ esac
+ shared_flag='-shared'
+ if test "$aix_use_runtimelinking" = yes; then
+ shared_flag="$shared_flag "'${wl}-G'
+ fi
+ else
+ # not using gcc
+ if test "$host_cpu" = ia64; then
+ # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+ # chokes on -Wl,-G. The following line is correct:
+ shared_flag='-G'
+ else
+ if test "$aix_use_runtimelinking" = yes; then
+ shared_flag='${wl}-G'
+ else
+ shared_flag='${wl}-bM:SRE'
+ fi
+ fi
+ fi
+
+ export_dynamic_flag_spec='${wl}-bexpall'
+ # It seems that -bexpall does not export symbols beginning with
+ # underscore (_), so it is better to generate a list of symbols to export.
+ always_export_symbols=yes
+ if test "$aix_use_runtimelinking" = yes; then
+ # Warning - without using the other runtime loading flags (-brtl),
+ # -berok will link without error, but may produce a broken library.
+ allow_undefined_flag='-berok'
+ # Determine the default libpath from the value encoded in an
+ # empty executable.
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+#ifdef FC_DUMMY_MAIN
+#ifndef FC_DUMMY_MAIN_EQ_F77
+# ifdef __cplusplus
+ extern "C"
+# endif
+ int FC_DUMMY_MAIN() { return 1; }
+#endif
+#endif
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+
+lt_aix_libpath_sed='
+ /Import File Strings/,/^$/ {
+ /^0/ {
+ s/^0 *\(.*\)$/\1/
+ p
+ }
+ }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+# Check for a 64-bit object if we didn't find anything.
+if test -z "$aix_libpath"; then
+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+
+ hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
+ archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+ else
+ if test "$host_cpu" = ia64; then
+ hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
+ allow_undefined_flag="-z nodefs"
+ archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+ else
+ # Determine the default libpath from the value encoded in an
+ # empty executable.
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+#ifdef FC_DUMMY_MAIN
+#ifndef FC_DUMMY_MAIN_EQ_F77
+# ifdef __cplusplus
+ extern "C"
+# endif
+ int FC_DUMMY_MAIN() { return 1; }
+#endif
+#endif
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+
+lt_aix_libpath_sed='
+ /Import File Strings/,/^$/ {
+ /^0/ {
+ s/^0 *\(.*\)$/\1/
+ p
+ }
+ }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+# Check for a 64-bit object if we didn't find anything.
+if test -z "$aix_libpath"; then
+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+
+ hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
+ # Warning - without using the other run time loading flags,
+ # -berok will link without error, but may produce a broken library.
+ no_undefined_flag=' ${wl}-bernotok'
+ allow_undefined_flag=' ${wl}-berok'
+ # Exported symbols can be pulled into shared objects from archives
+ whole_archive_flag_spec='$convenience'
+ archive_cmds_need_lc=yes
+ # This is similar to how AIX traditionally builds its shared libraries.
+ archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+ fi
+ fi
+ ;;
+
+ amigaos*)
+ case $host_cpu in
+ powerpc)
+ # see comment about AmigaOS4 .so support
+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ archive_expsym_cmds=''
+ ;;
+ m68k)
+ archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+ hardcode_libdir_flag_spec='-L$libdir'
+ hardcode_minus_L=yes
+ ;;
+ esac
+ ;;
+
+ bsdi[45]*)
+ export_dynamic_flag_spec=-rdynamic
+ ;;
+
+ cygwin* | mingw* | pw32* | cegcc*)
+ # When not using gcc, we currently assume that we are using
+ # Microsoft Visual C++.
+ # hardcode_libdir_flag_spec is actually meaningless, as there is
+ # no search path for DLLs.
+ hardcode_libdir_flag_spec=' '
+ allow_undefined_flag=unsupported
+ # Tell ltmain to make .lib files, not .a files.
+ libext=lib
+ # Tell ltmain to make .dll files, not .so files.
+ shrext_cmds=".dll"
+ # FIXME: Setting linknames here is a bad hack.
+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames='
+ # The linker will automatically build a .lib file if we build a DLL.
+ old_archive_from_new_cmds='true'
+ # FIXME: Should let the user specify the lib program.
+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
+ fix_srcfile_path='`cygpath -w "$srcfile"`'
+ enable_shared_with_static_runtimes=yes
+ ;;
+
+ darwin* | rhapsody*)
+
+
+ archive_cmds_need_lc=no
+ hardcode_direct=no
+ hardcode_automatic=yes
+ hardcode_shlibpath_var=unsupported
+ whole_archive_flag_spec=''
+ link_all_deplibs=yes
+ allow_undefined_flag="$_lt_dar_allow_undefined"
+ case $cc_basename in
+ ifort*) _lt_dar_can_shared=yes ;;
+ *) _lt_dar_can_shared=$GCC ;;
+ esac
+ if test "$_lt_dar_can_shared" = "yes"; then
+ output_verbose_link_cmd=echo
+ archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+ module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+ archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+ module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+
+ else
+ ld_shlibs=no
+ fi
+
+ ;;
+
+ dgux*)
+ archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ hardcode_libdir_flag_spec='-L$libdir'
+ hardcode_shlibpath_var=no
+ ;;
+
+ freebsd1*)
+ ld_shlibs=no
+ ;;
+
+ # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
+ # support. Future versions do this automatically, but an explicit c++rt0.o
+ # does not break anything, and helps significantly (at the cost of a little
+ # extra space).
+ freebsd2.2*)
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
+ hardcode_libdir_flag_spec='-R$libdir'
+ hardcode_direct=yes
+ hardcode_shlibpath_var=no
+ ;;
+
+ # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+ freebsd2*)
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+ hardcode_direct=yes
+ hardcode_minus_L=yes
+ hardcode_shlibpath_var=no
+ ;;
+
+ # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+ freebsd* | dragonfly*)
+ archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+ hardcode_libdir_flag_spec='-R$libdir'
+ hardcode_direct=yes
+ hardcode_shlibpath_var=no
+ ;;
+
+ hpux9*)
+ if test "$GCC" = yes; then
+ archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+ else
+ archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+ fi
+ hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+ hardcode_libdir_separator=:
+ hardcode_direct=yes
+
+ # hardcode_minus_L: Not really in the search PATH,
+ # but as the default location of the library.
+ hardcode_minus_L=yes
+ export_dynamic_flag_spec='${wl}-E'
+ ;;
+
+ hpux10*)
+ if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+ archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ else
+ archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+ fi
+ if test "$with_gnu_ld" = no; then
+ hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+ hardcode_libdir_flag_spec_ld='+b $libdir'
+ hardcode_libdir_separator=:
+ hardcode_direct=yes
+ hardcode_direct_absolute=yes
+ export_dynamic_flag_spec='${wl}-E'
+ # hardcode_minus_L: Not really in the search PATH,
+ # but as the default location of the library.
+ hardcode_minus_L=yes
+ fi
+ ;;
+
+ hpux11*)
+ if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+ case $host_cpu in
+ hppa*64*)
+ archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ ia64*)
+ archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ *)
+ archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ esac
+ else
+ case $host_cpu in
+ hppa*64*)
+ archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ ia64*)
+ archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ *)
+ archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ esac
+ fi
+ if test "$with_gnu_ld" = no; then
+ hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+ hardcode_libdir_separator=:
+
+ case $host_cpu in
+ hppa*64*|ia64*)
+ hardcode_direct=no
+ hardcode_shlibpath_var=no
+ ;;
+ *)
+ hardcode_direct=yes
+ hardcode_direct_absolute=yes
+ export_dynamic_flag_spec='${wl}-E'
+
+ # hardcode_minus_L: Not really in the search PATH,
+ # but as the default location of the library.
+ hardcode_minus_L=yes
+ ;;
+ esac
+ fi
+ ;;
+
+ irix5* | irix6* | nonstopux*)
+ if test "$GCC" = yes; then
+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ # Try to use the -exported_symbol ld option, if it does not
+ # work, assume that -exports_file does not work either and
+ # implicitly export all symbols.
+ save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
+ cat >conftest.$ac_ext <<_ACEOF
+int foo(void) {}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
+
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ LDFLAGS="$save_LDFLAGS"
+ else
+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
+ fi
+ archive_cmds_need_lc='no'
+ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+ hardcode_libdir_separator=:
+ inherit_rpath=yes
+ link_all_deplibs=yes
+ ;;
+
+ netbsd*)
+ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
+ else
+ archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF
+ fi
+ hardcode_libdir_flag_spec='-R$libdir'
+ hardcode_direct=yes
+ hardcode_shlibpath_var=no
+ ;;
+
+ newsos6)
+ archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ hardcode_direct=yes
+ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+ hardcode_libdir_separator=:
+ hardcode_shlibpath_var=no
+ ;;
+
+ *nto* | *qnx*)
+ ;;
+
+ openbsd*)
+ if test -f /usr/libexec/ld.so; then
+ hardcode_direct=yes
+ hardcode_shlibpath_var=no
+ hardcode_direct_absolute=yes
+ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+ export_dynamic_flag_spec='${wl}-E'
+ else
+ case $host_os in
+ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+ hardcode_libdir_flag_spec='-R$libdir'
+ ;;
+ *)
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+ ;;
+ esac
+ fi
+ else
+ ld_shlibs=no
+ fi
+ ;;
+
+ os2*)
+ hardcode_libdir_flag_spec='-L$libdir'
+ hardcode_minus_L=yes
+ allow_undefined_flag=unsupported
+ archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+ old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+ ;;
+
+ osf3*)
+ if test "$GCC" = yes; then
+ allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
+ archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ else
+ allow_undefined_flag=' -expect_unresolved \*'
+ archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+ fi
+ archive_cmds_need_lc='no'
+ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+ hardcode_libdir_separator=:
+ ;;
+
+ osf4* | osf5*) # as osf3* with the addition of -msym flag
+ if test "$GCC" = yes; then
+ allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
+ archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+ else
+ allow_undefined_flag=' -expect_unresolved \*'
+ archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+ archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
+ $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
+
+ # Both c and cxx compiler support -rpath directly
+ hardcode_libdir_flag_spec='-rpath $libdir'
+ fi
+ archive_cmds_need_lc='no'
+ hardcode_libdir_separator=:
+ ;;
+
+ solaris*)
+ no_undefined_flag=' -z defs'
+ if test "$GCC" = yes; then
+ wlarc='${wl}'
+ archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+ $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+ else
+ case `$CC -V 2>&1` in
+ *"Compilers 5.0"*)
+ wlarc=''
+ archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
+ ;;
+ *)
+ wlarc='${wl}'
+ archive_cmds='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+ $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+ ;;
+ esac
+ fi
+ hardcode_libdir_flag_spec='-R$libdir'
+ hardcode_shlibpath_var=no
+ case $host_os in
+ solaris2.[0-5] | solaris2.[0-5].*) ;;
+ *)
+ # The compiler driver will combine and reorder linker options,
+ # but understands `-z linker_flag'. GCC discards it without `$wl',
+ # but is careful enough not to reorder.
+ # Supported since Solaris 2.6 (maybe 2.5.1?)
+ if test "$GCC" = yes; then
+ whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+ else
+ whole_archive_flag_spec='-z allextract$convenience -z defaultextract'
+ fi
+ ;;
+ esac
+ link_all_deplibs=yes
+ ;;
+
+ sunos4*)
+ if test "x$host_vendor" = xsequent; then
+ # Use $CC to link under sequent, because it throws in some extra .o
+ # files that make .init and .fini sections work.
+ archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+ else
+ archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+ fi
+ hardcode_libdir_flag_spec='-L$libdir'
+ hardcode_direct=yes
+ hardcode_minus_L=yes
+ hardcode_shlibpath_var=no
+ ;;
+
+ sysv4)
+ case $host_vendor in
+ sni)
+ archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ hardcode_direct=yes # is this really true???
+ ;;
+ siemens)
+ ## LD is ld it makes a PLAMLIB
+ ## CC just makes a GrossModule.
+ archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+ reload_cmds='$CC -r -o $output$reload_objs'
+ hardcode_direct=no
+ ;;
+ motorola)
+ archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ hardcode_direct=no #Motorola manual says yes, but my tests say they lie
+ ;;
+ esac
+ runpath_var='LD_RUN_PATH'
+ hardcode_shlibpath_var=no
+ ;;
+
+ sysv4.3*)
+ archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ hardcode_shlibpath_var=no
+ export_dynamic_flag_spec='-Bexport'
+ ;;
+
+ sysv4*MP*)
+ if test -d /usr/nec; then
+ archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ hardcode_shlibpath_var=no
+ runpath_var=LD_RUN_PATH
+ hardcode_runpath_var=yes
+ ld_shlibs=yes
+ fi
+ ;;
+
+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
+ no_undefined_flag='${wl}-z,text'
+ archive_cmds_need_lc=no
+ hardcode_shlibpath_var=no
+ runpath_var='LD_RUN_PATH'
+
+ if test "$GCC" = yes; then
+ archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ else
+ archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ fi
+ ;;
+
+ sysv5* | sco3.2v5* | sco5v6*)
+ # Note: We can NOT use -z defs as we might desire, because we do not
+ # link with -lc, and that would cause any symbols used from libc to
+ # always be unresolved, which means just about no library would
+ # ever link correctly. If we're not using GNU ld we use -z text
+ # though, which does catch some bad symbols but isn't as heavy-handed
+ # as -z defs.
+ no_undefined_flag='${wl}-z,text'
+ allow_undefined_flag='${wl}-z,nodefs'
+ archive_cmds_need_lc=no
+ hardcode_shlibpath_var=no
+ hardcode_libdir_flag_spec='${wl}-R,$libdir'
+ hardcode_libdir_separator=':'
+ link_all_deplibs=yes
+ export_dynamic_flag_spec='${wl}-Bexport'
+ runpath_var='LD_RUN_PATH'
+
+ if test "$GCC" = yes; then
+ archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ else
+ archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ fi
+ ;;
+
+ uts4*)
+ archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ hardcode_libdir_flag_spec='-L$libdir'
+ hardcode_shlibpath_var=no
+ ;;
+
+ *)
+ ld_shlibs=no
+ ;;
+ esac
+
+ if test x$host_vendor = xsni; then
+ case $host in
+ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+ export_dynamic_flag_spec='${wl}-Blargedynsym'
+ ;;
+ esac
+ fi
+ fi
+
+{ $as_echo "$as_me:$LINENO: result: $ld_shlibs" >&5
+$as_echo "$ld_shlibs" >&6; }
+test "$ld_shlibs" = no && can_build_shared=no
+
+with_gnu_ld=$with_gnu_ld
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#
+# Do we need to explicitly link libc?
+#
+case "x$archive_cmds_need_lc" in
+x|xyes)
+ # Assume -lc should be added
+ archive_cmds_need_lc=yes
+
+ if test "$enable_shared" = yes && test "$GCC" = yes; then
+ case $archive_cmds in
+ *'~'*)
+ # FIXME: we may have to deal with multi-command sequences.
+ ;;
+ '$CC '*)
+ # Test whether the compiler implicitly links with -lc since on some
+ # systems, -lgcc has to come before -lc. If gcc already passes -lc
+ # to ld, don't add -lc before -lgcc.
+ { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
+ $RM conftest*
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } 2>conftest.err; then
+ soname=conftest
+ lib=conftest
+ libobjs=conftest.$ac_objext
+ deplibs=
+ wl=$lt_prog_compiler_wl
+ pic_flag=$lt_prog_compiler_pic
+ compiler_flags=-v
+ linker_flags=-v
+ verstring=
+ output_objdir=.
+ libname=conftest
+ lt_save_allow_undefined_flag=$allow_undefined_flag
+ allow_undefined_flag=
+ if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\"") >&5
+ (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+ then
+ archive_cmds_need_lc=no
+ else
+ archive_cmds_need_lc=yes
+ fi
+ allow_undefined_flag=$lt_save_allow_undefined_flag
+ else
+ cat conftest.err 1>&5
+ fi
+ $RM conftest*
+ { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
+$as_echo "$archive_cmds_need_lc" >&6; }
+ ;;
+ esac
+ fi
+ ;;
+esac
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ { $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+$as_echo_n "checking dynamic linker characteristics... " >&6; }
+
+if test "$GCC" = yes; then
+ case $host_os in
+ darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
+ *) lt_awk_arg="/^libraries:/" ;;
+ esac
+ lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+ if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then
+ # if the path contains ";" then we assume it to be the separator
+ # otherwise default to the standard path separator (i.e. ":") - it is
+ # assumed that no part of a normal pathname contains ";" but that should
+ # okay in the real world where ";" in dirpaths is itself problematic.
+ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'`
+ else
+ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+ fi
+ # Ok, now we have the path, separated by spaces, we can step through it
+ # and add multilib dir if necessary.
+ lt_tmp_lt_search_path_spec=
+ lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+ for lt_sys_path in $lt_search_path_spec; do
+ if test -d "$lt_sys_path/$lt_multi_os_dir"; then
+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
+ else
+ test -d "$lt_sys_path" && \
+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
+ fi
+ done
+ lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk '
+BEGIN {RS=" "; FS="/|\n";} {
+ lt_foo="";
+ lt_count=0;
+ for (lt_i = NF; lt_i > 0; lt_i--) {
+ if ($lt_i != "" && $lt_i != ".") {
+ if ($lt_i == "..") {
+ lt_count++;
+ } else {
+ if (lt_count == 0) {
+ lt_foo="/" $lt_i lt_foo;
+ } else {
+ lt_count--;
+ }
+ }
+ }
+ }
+ if (lt_foo != "") { lt_freq[lt_foo]++; }
+ if (lt_freq[lt_foo] == 1) { print lt_foo; }
+}'`
+ sys_lib_search_path_spec=`$ECHO $lt_search_path_spec`
+else
+ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+fi
+library_names_spec=
+libname_spec='lib$name'
+soname_spec=
+shrext_cmds=".so"
+postinstall_cmds=
+postuninstall_cmds=
+finish_cmds=
+finish_eval=
+shlibpath_var=
+shlibpath_overrides_runpath=unknown
+version_type=none
+dynamic_linker="$host_os ld.so"
+sys_lib_dlsearch_path_spec="/lib /usr/lib"
+need_lib_prefix=unknown
+hardcode_into_libs=no
+
+# when you set need_version to no, make sure it does not cause -set_version
+# flags to be left without arguments
+need_version=unknown
+
+case $host_os in
+aix3*)
+ version_type=linux
+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+ shlibpath_var=LIBPATH
+
+ # AIX 3 has no versioning support, so we append a major version to the name.
+ soname_spec='${libname}${release}${shared_ext}$major'
+ ;;
+
+aix[4-9]*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ hardcode_into_libs=yes
+ if test "$host_cpu" = ia64; then
+ # AIX 5 supports IA64
+ library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
+ shlibpath_var=LD_LIBRARY_PATH
+ else
+ # With GCC up to 2.95.x, collect2 would create an import file
+ # for dependence libraries. The import file would start with
+ # the line `#! .'. This would cause the generated library to
+ # depend on `.', always an invalid library. This was fixed in
+ # development snapshots of GCC prior to 3.0.
+ case $host_os in
+ aix4 | aix4.[01] | aix4.[01].*)
+ if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
+ echo ' yes '
+ echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
+ :
+ else
+ can_build_shared=no
+ fi
+ ;;
+ esac
+ # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
+ # soname into executable. Probably we can add versioning support to
+ # collect2, so additional links can be useful in future.
+ if test "$aix_use_runtimelinking" = yes; then
+ # If using run time linking (on AIX 4.2 or later) use lib<name>.so
+ # instead of lib<name>.a to let people know that these are not
+ # typical AIX shared libraries.
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ else
+ # We preserve .a as extension for shared libraries through AIX4.2
+ # and later when we are not doing run time linking.
+ library_names_spec='${libname}${release}.a $libname.a'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ fi
+ shlibpath_var=LIBPATH
+ fi
+ ;;
+
+amigaos*)
+ case $host_cpu in
+ powerpc)
+ # Since July 2007 AmigaOS4 officially supports .so libraries.
+ # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ ;;
+ m68k)
+ library_names_spec='$libname.ixlibrary $libname.a'
+ # Create ${libname}_ixlibrary.a entries in /sys/libs.
+ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+ ;;
+ esac
+ ;;
+
+beos*)
+ library_names_spec='${libname}${shared_ext}'
+ dynamic_linker="$host_os ld.so"
+ shlibpath_var=LIBRARY_PATH
+ ;;
+
+bsdi[45]*)
+ version_type=linux
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+ shlibpath_var=LD_LIBRARY_PATH
+ sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
+ sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
+ # the default ld.so.conf also contains /usr/contrib/lib and
+ # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
+ # libtool to hard-code these into programs
+ ;;
+
+cygwin* | mingw* | pw32* | cegcc*)
+ version_type=windows
+ shrext_cmds=".dll"
+ need_version=no
+ need_lib_prefix=no
+
+ case $GCC,$host_os in
+ yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
+ library_names_spec='$libname.dll.a'
+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
+ postinstall_cmds='base_file=`basename \${file}`~
+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+ dldir=$destdir/`dirname \$dlpath`~
+ test -d \$dldir || mkdir -p \$dldir~
+ $install_prog $dir/$dlname \$dldir/$dlname~
+ chmod a+x \$dldir/$dlname~
+ if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+ eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+ fi'
+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+ dlpath=$dir/\$dldll~
+ $RM \$dlpath'
+ shlibpath_overrides_runpath=yes
+
+ case $host_os in
+ cygwin*)
+ # Cygwin DLLs use 'cyg' prefix rather than 'lib'
+ soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+ sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
+ ;;
+ mingw* | cegcc*)
+ # MinGW DLLs use traditional 'lib' prefix
+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+ sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
+ # It is most probably a Windows format PATH printed by
+ # mingw gcc, but we are running on Cygwin. Gcc prints its search
+ # path with ; separators, and with drive letters. We can handle the
+ # drive letters (cygwin fileutils understands them), so leave them,
+ # especially as we might pass files found there to a mingw objdump,
+ # which wouldn't understand a cygwinified path. Ahh.
+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+ else
+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+ fi
+ ;;
+ pw32*)
+ # pw32 DLLs use 'pw' prefix rather than 'lib'
+ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+ ;;
+ esac
+ ;;
+
+ *)
+ library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
+ ;;
+ esac
+ dynamic_linker='Win32 ld.exe'
+ # FIXME: first we should search . and the directory the executable is in
+ shlibpath_var=PATH
+ ;;
+
+darwin* | rhapsody*)
+ dynamic_linker="$host_os dyld"
+ version_type=darwin
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
+ soname_spec='${libname}${release}${major}$shared_ext'
+ shlibpath_overrides_runpath=yes
+ shlibpath_var=DYLD_LIBRARY_PATH
+ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+
+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"
+ sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+ ;;
+
+dgux*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ ;;
+
+freebsd1*)
+ dynamic_linker=no
+ ;;
+
+freebsd* | dragonfly*)
+ # DragonFly does not have aout. When/if they implement a new
+ # versioning mechanism, adjust this.
+ if test -x /usr/bin/objformat; then
+ objformat=`/usr/bin/objformat`
+ else
+ case $host_os in
+ freebsd[123]*) objformat=aout ;;
+ *) objformat=elf ;;
+ esac
+ fi
+ version_type=freebsd-$objformat
+ case $version_type in
+ freebsd-elf*)
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+ need_version=no
+ need_lib_prefix=no
+ ;;
+ freebsd-*)
+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+ need_version=yes
+ ;;
+ esac
+ shlibpath_var=LD_LIBRARY_PATH
+ case $host_os in
+ freebsd2*)
+ shlibpath_overrides_runpath=yes
+ ;;
+ freebsd3.[01]* | freebsdelf3.[01]*)
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+ ;;
+ freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
+ freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ ;;
+ *) # from 4.6 on, and DragonFly
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+ ;;
+ esac
+ ;;
+
+gnu*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ hardcode_into_libs=yes
+ ;;
+
+hpux9* | hpux10* | hpux11*)
+ # Give a soname corresponding to the major version so that dld.sl refuses to
+ # link against other versions.
+ version_type=sunos
+ need_lib_prefix=no
+ need_version=no
+ case $host_cpu in
+ ia64*)
+ shrext_cmds='.so'
+ hardcode_into_libs=yes
+ dynamic_linker="$host_os dld.so"
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ if test "X$HPUX_IA64_MODE" = X32; then
+ sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+ else
+ sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+ fi
+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+ ;;
+ hppa*64*)
+ shrext_cmds='.sl'
+ hardcode_into_libs=yes
+ dynamic_linker="$host_os dld.sl"
+ shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+ ;;
+ *)
+ shrext_cmds='.sl'
+ dynamic_linker="$host_os dld.sl"
+ shlibpath_var=SHLIB_PATH
+ shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ ;;
+ esac
+ # HP-UX runs *really* slowly unless shared libraries are mode 555.
+ postinstall_cmds='chmod 555 $lib'
+ ;;
+
+interix[3-9]*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ ;;
+
+irix5* | irix6* | nonstopux*)
+ case $host_os in
+ nonstopux*) version_type=nonstopux ;;
+ *)
+ if test "$lt_cv_prog_gnu_ld" = yes; then
+ version_type=linux
+ else
+ version_type=irix
+ fi ;;
+ esac
+ need_lib_prefix=no
+ need_version=no
+ soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
+ case $host_os in
+ irix5* | nonstopux*)
+ libsuff= shlibsuff=
+ ;;
+ *)
+ case $LD in # libtool.m4 will add one of these switches to LD
+ *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
+ libsuff= shlibsuff= libmagic=32-bit;;
+ *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
+ libsuff=32 shlibsuff=N32 libmagic=N32;;
+ *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
+ libsuff=64 shlibsuff=64 libmagic=64-bit;;
+ *) libsuff= shlibsuff= libmagic=never-match;;
+ esac
+ ;;
+ esac
+ shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
+ shlibpath_overrides_runpath=no
+ sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+ sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+ hardcode_into_libs=yes
+ ;;
+
+# No shared lib support for Linux oldld, aout, or coff.
+linux*oldld* | linux*aout* | linux*coff*)
+ dynamic_linker=no
+ ;;
+
+# This must be Linux ELF.
+linux* | k*bsd*-gnu)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ # Some binutils ld are patched to set DT_RUNPATH
+ save_LDFLAGS=$LDFLAGS
+ save_libdir=$libdir
+ eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
+ LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define dlopen innocuous_dlopen
-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char dlopen (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef dlopen
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined __stub_dlopen || defined __stub___dlopen
-choke me
-#endif
#ifdef FC_DUMMY_MAIN
#ifndef FC_DUMMY_MAIN_EQ_F77
@@ -11029,7 +13403,7 @@ choke me
int
main ()
{
-return dlopen ();
+
;
return 0;
}
@@ -11040,1022 +13414,1345 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- ac_cv_func_dlopen=yes
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+ if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then
+ shlibpath_overrides_runpath=yes
+fi
+
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- ac_cv_func_dlopen=no
+
fi
+rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
-echo "${ECHO_T}$ac_cv_func_dlopen" >&6; }
-if test $ac_cv_func_dlopen = yes; then
- lt_cv_dlopen="dlopen"
-else
- { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
+ LDFLAGS=$save_LDFLAGS
+ libdir=$save_libdir
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen ();
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-# ifdef __cplusplus
- extern "C"
-# endif
- int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
-return dlopen ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- ac_cv_lib_dl_dlopen=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+ # This implies no fast_install, which is unacceptable.
+ # Some rework will be needed to allow for fast_install
+ # before this can be enabled.
+ hardcode_into_libs=yes
+
+ # Add ABI-specific directories to the system library path.
+ sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
+
+ # Append ld.so.conf contents to the search path
+ if test -f /etc/ld.so.conf; then
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
+ fi
+
+ # We used to test for /lib/ld.so.1 and disable shared libraries on
+ # powerpc, because MkLinux only supported shared libraries with the
+ # GNU dynamic linker. Since this was broken with cross compilers,
+ # most powerpc-linux boxes support dynamic linking these days and
+ # people can always --disable-shared, the test was removed, and we
+ # assume the GNU/Linux dynamic linker is in use.
+ dynamic_linker='GNU/Linux ld.so'
+ ;;
+
+netbsd*)
+ version_type=sunos
+ need_lib_prefix=no
+ need_version=no
+ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+ dynamic_linker='NetBSD (a.out) ld.so'
+ else
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ dynamic_linker='NetBSD ld.elf_so'
+ fi
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+ ;;
+
+newsos6)
+ version_type=linux
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+ ;;
+
+*nto* | *qnx*)
+ version_type=qnx
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ dynamic_linker='ldqnx.so'
+ ;;
+
+openbsd*)
+ version_type=sunos
+ sys_lib_dlsearch_path_spec="/usr/lib"
+ need_lib_prefix=no
+ # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
+ case $host_os in
+ openbsd3.3 | openbsd3.3.*) need_version=yes ;;
+ *) need_version=no ;;
+ esac
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+ shlibpath_var=LD_LIBRARY_PATH
+ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ case $host_os in
+ openbsd2.[89] | openbsd2.[89].*)
+ shlibpath_overrides_runpath=no
+ ;;
+ *)
+ shlibpath_overrides_runpath=yes
+ ;;
+ esac
+ else
+ shlibpath_overrides_runpath=yes
+ fi
+ ;;
+
+os2*)
+ libname_spec='$name'
+ shrext_cmds=".dll"
+ need_lib_prefix=no
+ library_names_spec='$libname${shared_ext} $libname.a'
+ dynamic_linker='OS/2 ld.exe'
+ shlibpath_var=LIBPATH
+ ;;
+
+osf3* | osf4* | osf5*)
+ version_type=osf
+ need_lib_prefix=no
+ need_version=no
+ soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ shlibpath_var=LD_LIBRARY_PATH
+ sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+ ;;
+
+rdos*)
+ dynamic_linker=no
+ ;;
+
+solaris*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+ # ldd complains unless libraries are executable
+ postinstall_cmds='chmod +x $lib'
+ ;;
+
+sunos4*)
+ version_type=sunos
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+ finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+ if test "$with_gnu_ld" = yes; then
+ need_lib_prefix=no
+ fi
+ need_version=yes
+ ;;
+
+sysv4 | sysv4.3*)
+ version_type=linux
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ case $host_vendor in
+ sni)
+ shlibpath_overrides_runpath=no
+ need_lib_prefix=no
+ runpath_var=LD_RUN_PATH
+ ;;
+ siemens)
+ need_lib_prefix=no
+ ;;
+ motorola)
+ need_lib_prefix=no
+ need_version=no
+ shlibpath_overrides_runpath=no
+ sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
+ ;;
+ esac
+ ;;
+
+sysv4*MP*)
+ if test -d /usr/nec ;then
+ version_type=linux
+ library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
+ soname_spec='$libname${shared_ext}.$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ fi
+ ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+ version_type=freebsd-elf
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+ if test "$with_gnu_ld" = yes; then
+ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+ else
+ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+ case $host_os in
+ sco3.2v5*)
+ sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
+ ;;
+ esac
+ fi
+ sys_lib_dlsearch_path_spec='/usr/lib'
+ ;;
- ac_cv_lib_dl_dlopen=no
-fi
+tpf*)
+ # TPF is a cross-target only. Preferred cross-host = GNU/Linux.
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ ;;
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
-if test $ac_cv_lib_dl_dlopen = yes; then
- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-else
- { echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
-echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6; }
-if test "${ac_cv_lib_svld_dlopen+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsvld $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
+uts4*)
+ version_type=linux
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ ;;
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen ();
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-# ifdef __cplusplus
- extern "C"
-# endif
- int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
-return dlopen ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
+*)
+ dynamic_linker=no
+ ;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- ac_cv_lib_svld_dlopen=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+$as_echo "$dynamic_linker" >&6; }
+test "$dynamic_linker" = no && can_build_shared=no
- ac_cv_lib_svld_dlopen=no
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test "$GCC" = yes; then
+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
fi
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
+ sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+fi
+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
+ sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6; }
-if test $ac_cv_lib_svld_dlopen = yes; then
- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
-else
- { echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
-echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6; }
-if test "${ac_cv_lib_dld_dld_link+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldld $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dld_link ();
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-# ifdef __cplusplus
- extern "C"
-# endif
- int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
-return dld_link ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- ac_cv_lib_dld_dld_link=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
- ac_cv_lib_dld_dld_link=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
-echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; }
-if test $ac_cv_lib_dld_dld_link = yes; then
- lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
-fi
-fi
-fi
-fi
-fi
-fi
- ;;
- esac
- if test "x$lt_cv_dlopen" != xno; then
- enable_dlopen=yes
- else
- enable_dlopen=no
- fi
- case $lt_cv_dlopen in
- dlopen)
- save_CPPFLAGS="$CPPFLAGS"
- test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
- save_LDFLAGS="$LDFLAGS"
- wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
- save_LIBS="$LIBS"
- LIBS="$lt_cv_dlopen_libs $LIBS"
- { echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
-echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6; }
-if test "${lt_cv_dlopen_self+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test "$cross_compiling" = yes; then :
- lt_cv_dlopen_self=cross
-else
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
-#line 11334 "configure"
-#include "confdefs.h"
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-#include <stdio.h>
-#ifdef RTLD_GLOBAL
-# define LT_DLGLOBAL RTLD_GLOBAL
-#else
-# ifdef DL_GLOBAL
-# define LT_DLGLOBAL DL_GLOBAL
-# else
-# define LT_DLGLOBAL 0
-# endif
-#endif
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
- find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-# ifdef RTLD_LAZY
-# define LT_DLLAZY_OR_NOW RTLD_LAZY
-# else
-# ifdef DL_LAZY
-# define LT_DLLAZY_OR_NOW DL_LAZY
-# else
-# ifdef RTLD_NOW
-# define LT_DLLAZY_OR_NOW RTLD_NOW
-# else
-# ifdef DL_NOW
-# define LT_DLLAZY_OR_NOW DL_NOW
-# else
-# define LT_DLLAZY_OR_NOW 0
-# endif
-# endif
-# endif
-# endif
-#endif
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
-void fnord() { int i=42;}
-int main ()
-{
- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
- int status = $lt_dlunknown;
- if (self)
- {
- if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
- /* dlclose (self); */
- }
- else
- puts (dlerror ());
- exit (status);
-}
-EOF
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
- (./conftest; exit; ) >&5 2>/dev/null
- lt_status=$?
- case x$lt_status in
- x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
- x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
- x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;;
- esac
- else :
- # compilation failed
- lt_cv_dlopen_self=no
- fi
-fi
-rm -fr conftest*
-fi
-{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
-echo "${ECHO_T}$lt_cv_dlopen_self" >&6; }
- if test "x$lt_cv_dlopen_self" = xyes; then
- wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
- { echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
-echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6; }
-if test "${lt_cv_dlopen_self_static+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test "$cross_compiling" = yes; then :
- lt_cv_dlopen_self_static=cross
-else
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
-#line 11434 "configure"
-#include "confdefs.h"
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-#include <stdio.h>
-#ifdef RTLD_GLOBAL
-# define LT_DLGLOBAL RTLD_GLOBAL
-#else
-# ifdef DL_GLOBAL
-# define LT_DLGLOBAL DL_GLOBAL
-# else
-# define LT_DLGLOBAL 0
-# endif
-#endif
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
- find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-# ifdef RTLD_LAZY
-# define LT_DLLAZY_OR_NOW RTLD_LAZY
-# else
-# ifdef DL_LAZY
-# define LT_DLLAZY_OR_NOW DL_LAZY
-# else
-# ifdef RTLD_NOW
-# define LT_DLLAZY_OR_NOW RTLD_NOW
-# else
-# ifdef DL_NOW
-# define LT_DLLAZY_OR_NOW DL_NOW
-# else
-# define LT_DLLAZY_OR_NOW 0
-# endif
-# endif
-# endif
-# endif
-#endif
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
-void fnord() { int i=42;}
-int main ()
-{
- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
- int status = $lt_dlunknown;
- if (self)
- {
- if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
- /* dlclose (self); */
- }
- else
- puts (dlerror ());
- exit (status);
-}
-EOF
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
- (./conftest; exit; ) >&5 2>/dev/null
- lt_status=$?
- case x$lt_status in
- x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
- x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
- x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;;
- esac
- else :
- # compilation failed
- lt_cv_dlopen_self_static=no
- fi
-fi
-rm -fr conftest*
-fi
-{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
-echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6; }
- fi
- CPPFLAGS="$save_CPPFLAGS"
- LDFLAGS="$save_LDFLAGS"
- LIBS="$save_LIBS"
- ;;
- esac
- case $lt_cv_dlopen_self in
- yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
- *) enable_dlopen_self=unknown ;;
- esac
- case $lt_cv_dlopen_self_static in
- yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
- *) enable_dlopen_self_static=unknown ;;
- esac
-fi
-# Report which library types will actually be built
-{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
-echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; }
-{ echo "$as_me:$LINENO: result: $can_build_shared" >&5
-echo "${ECHO_T}$can_build_shared" >&6; }
-{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
-echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; }
-test "$can_build_shared" = "no" && enable_shared=no
-# On AIX, shared libraries and static libraries use the same namespace, and
-# are all built from PIC.
-case $host_os in
-aix3*)
- test "$enable_shared" = yes && enable_static=no
- if test -n "$RANLIB"; then
- archive_cmds="$archive_cmds~\$RANLIB \$lib"
- postinstall_cmds='$RANLIB $lib'
- fi
- ;;
-aix4* | aix5*)
- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
- test "$enable_shared" = yes && enable_static=no
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ { $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
+hardcode_action=
+if test -n "$hardcode_libdir_flag_spec" ||
+ test -n "$runpath_var" ||
+ test "X$hardcode_automatic" = "Xyes" ; then
+
+ # We can hardcode non-existent directories.
+ if test "$hardcode_direct" != no &&
+ # If the only mechanism to avoid hardcoding is shlibpath_var, we
+ # have to relink, otherwise we might link with an installed library
+ # when we should be linking with a yet-to-be-installed one
+ ## test "$_LT_TAGVAR(hardcode_shlibpath_var, )" != no &&
+ test "$hardcode_minus_L" != no; then
+ # Linking always hardcodes the temporary library directory.
+ hardcode_action=relink
+ else
+ # We can link without hardcoding, and we can hardcode nonexisting dirs.
+ hardcode_action=immediate
fi
+else
+ # We cannot hardcode anything, or else we can only hardcode existing
+ # directories.
+ hardcode_action=unsupported
+fi
+{ $as_echo "$as_me:$LINENO: result: $hardcode_action" >&5
+$as_echo "$hardcode_action" >&6; }
+
+if test "$hardcode_action" = relink ||
+ test "$inherit_rpath" = yes; then
+ # Fast installation is not supported
+ enable_fast_install=no
+elif test "$shlibpath_overrides_runpath" = yes ||
+ test "$enable_shared" = no; then
+ # Fast installation is not necessary
+ enable_fast_install=needless
+fi
+
+
+
+
+
+
+ if test "x$enable_dlopen" != xyes; then
+ enable_dlopen=unknown
+ enable_dlopen_self=unknown
+ enable_dlopen_self_static=unknown
+else
+ lt_cv_dlopen=no
+ lt_cv_dlopen_libs=
+
+ case $host_os in
+ beos*)
+ lt_cv_dlopen="load_add_on"
+ lt_cv_dlopen_libs=
+ lt_cv_dlopen_self=yes
;;
-esac
-{ echo "$as_me:$LINENO: result: $enable_shared" >&5
-echo "${ECHO_T}$enable_shared" >&6; }
-
-{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5
-echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; }
-# Make sure either enable_shared or enable_static is yes.
-test "$enable_shared" = yes || enable_static=yes
-{ echo "$as_me:$LINENO: result: $enable_static" >&5
-echo "${ECHO_T}$enable_static" >&6; }
-
-# The else clause should only fire when bootstrapping the
-# libtool distribution, otherwise you forgot to ship ltmain.sh
-# with your package, and you will get complaints that there are
-# no rules to generate ltmain.sh.
-if test -f "$ltmain"; then
- # See if we are running on zsh, and set the options which allow our commands through
- # without removal of \ escapes.
- if test -n "${ZSH_VERSION+set}" ; then
- setopt NO_GLOB_SUBST
- fi
- # Now quote all the things that may contain metacharacters while being
- # careful not to overquote the AC_SUBSTed values. We take copies of the
- # variables and quote the copies for generation of the libtool script.
- for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
- SED SHELL STRIP \
- libname_spec library_names_spec soname_spec extract_expsyms_cmds \
- old_striplib striplib file_magic_cmd finish_cmds finish_eval \
- deplibs_check_method reload_flag reload_cmds need_locks \
- lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
- lt_cv_sys_global_symbol_to_c_name_address \
- sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
- old_postinstall_cmds old_postuninstall_cmds \
- compiler \
- CC \
- LD \
- lt_prog_compiler_wl \
- lt_prog_compiler_pic \
- lt_prog_compiler_static \
- lt_prog_compiler_no_builtin_flag \
- export_dynamic_flag_spec \
- thread_safe_flag_spec \
- whole_archive_flag_spec \
- enable_shared_with_static_runtimes \
- old_archive_cmds \
- old_archive_from_new_cmds \
- predep_objects \
- postdep_objects \
- predeps \
- postdeps \
- compiler_lib_search_path \
- archive_cmds \
- archive_expsym_cmds \
- postinstall_cmds \
- postuninstall_cmds \
- old_archive_from_expsyms_cmds \
- allow_undefined_flag \
- no_undefined_flag \
- export_symbols_cmds \
- hardcode_libdir_flag_spec \
- hardcode_libdir_flag_spec_ld \
- hardcode_libdir_separator \
- hardcode_automatic \
- module_cmds \
- module_expsym_cmds \
- lt_cv_prog_compiler_c_o \
- fix_srcfile_path \
- exclude_expsyms \
- include_expsyms; do
-
- case $var in
- old_archive_cmds | \
- old_archive_from_new_cmds | \
- archive_cmds | \
- archive_expsym_cmds | \
- module_cmds | \
- module_expsym_cmds | \
- old_archive_from_expsyms_cmds | \
- export_symbols_cmds | \
- extract_expsyms_cmds | reload_cmds | finish_cmds | \
- postinstall_cmds | postuninstall_cmds | \
- old_postinstall_cmds | old_postuninstall_cmds | \
- sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
- # Double-quote double-evaled strings.
- eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
- ;;
- *)
- eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
- ;;
- esac
- done
- case $lt_echo in
- *'\$0 --fallback-echo"')
- lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
+ mingw* | pw32* | cegcc*)
+ lt_cv_dlopen="LoadLibrary"
+ lt_cv_dlopen_libs=
;;
- esac
-cfgfile="${ofile}T"
- trap "$rm \"$cfgfile\"; exit 1" 1 2 15
- $rm -f "$cfgfile"
- { echo "$as_me:$LINENO: creating $ofile" >&5
-echo "$as_me: creating $ofile" >&6;}
+ cygwin*)
+ lt_cv_dlopen="dlopen"
+ lt_cv_dlopen_libs=
+ ;;
- cat <<__EOF__ >> "$cfgfile"
-#! $SHELL
+ darwin*)
+ # if libdl is installed we need to link against it
+ { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+$as_echo_n "checking for dlopen in -ldl... " >&6; }
+if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldl $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
-# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
-# NOTE: Changes made to this file will be lost: look at ltmain.sh.
-#
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
-# Free Software Foundation, Inc.
-#
-# This file is part of GNU Libtool:
-# Originally by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dlopen ();
+#ifdef FC_DUMMY_MAIN
+#ifndef FC_DUMMY_MAIN_EQ_F77
+# ifdef __cplusplus
+ extern "C"
+# endif
+ int FC_DUMMY_MAIN() { return 1; }
+#endif
+#endif
+int
+main ()
+{
+return dlopen ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+ ac_cv_lib_dl_dlopen=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
-# A sed program that does not truncate output.
-SED=$lt_SED
+ ac_cv_lib_dl_dlopen=no
+fi
-# Sed that helps us avoid accidentally triggering echo(1) options like -n.
-Xsed="$SED -e 1s/^X//"
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then
+ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+else
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+ lt_cv_dlopen="dyld"
+ lt_cv_dlopen_libs=
+ lt_cv_dlopen_self=yes
-# The names of the tagged configurations supported by this script.
-available_tags=
+fi
-# ### BEGIN LIBTOOL CONFIG
+ ;;
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+ *)
+ { $as_echo "$as_me:$LINENO: checking for shl_load" >&5
+$as_echo_n "checking for shl_load... " >&6; }
+if test "${ac_cv_func_shl_load+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define shl_load innocuous_shl_load
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char shl_load (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
+#undef shl_load
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$archive_cmds_need_lc
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char shl_load ();
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined __stub_shl_load || defined __stub___shl_load
+choke me
+#endif
-# Whether or not to disallow shared libs when runtime libs are static
-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes
+#ifdef FC_DUMMY_MAIN
+#ifndef FC_DUMMY_MAIN_EQ_F77
+# ifdef __cplusplus
+ extern "C"
+# endif
+ int FC_DUMMY_MAIN() { return 1; }
+#endif
+#endif
+int
+main ()
+{
+return shl_load ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+ ac_cv_func_shl_load=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
+ ac_cv_func_shl_load=no
+fi
-# The host system.
-host_alias=$host_alias
-host=$host
-host_os=$host_os
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
+$as_echo "$ac_cv_func_shl_load" >&6; }
+if test "x$ac_cv_func_shl_load" = x""yes; then
+ lt_cv_dlopen="shl_load"
+else
+ { $as_echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
+$as_echo_n "checking for shl_load in -ldld... " >&6; }
+if test "${ac_cv_lib_dld_shl_load+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldld $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
-# The build system.
-build_alias=$build_alias
-build=$build
-build_os=$build_os
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char shl_load ();
+#ifdef FC_DUMMY_MAIN
+#ifndef FC_DUMMY_MAIN_EQ_F77
+# ifdef __cplusplus
+ extern "C"
+# endif
+ int FC_DUMMY_MAIN() { return 1; }
+#endif
+#endif
+int
+main ()
+{
+return shl_load ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+ ac_cv_lib_dld_shl_load=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
-# An echo program that does not interpret backslashes.
-echo=$lt_echo
+ ac_cv_lib_dld_shl_load=no
+fi
-# The archiver.
-AR=$lt_AR
-AR_FLAGS=$lt_AR_FLAGS
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
+$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
+if test "x$ac_cv_lib_dld_shl_load" = x""yes; then
+ lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
+else
+ { $as_echo "$as_me:$LINENO: checking for dlopen" >&5
+$as_echo_n "checking for dlopen... " >&6; }
+if test "${ac_cv_func_dlopen+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define dlopen innocuous_dlopen
-# A C compiler.
-LTCC=$lt_LTCC
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char dlopen (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
-# LTCC compiler flags.
-LTCFLAGS=$lt_LTCFLAGS
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
-# A language-specific compiler.
-CC=$lt_compiler
+#undef dlopen
-# Is the compiler the GNU C compiler?
-with_gcc=$GCC
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dlopen ();
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined __stub_dlopen || defined __stub___dlopen
+choke me
+#endif
+
+#ifdef FC_DUMMY_MAIN
+#ifndef FC_DUMMY_MAIN_EQ_F77
+# ifdef __cplusplus
+ extern "C"
+# endif
+ int FC_DUMMY_MAIN() { return 1; }
+#endif
+#endif
+int
+main ()
+{
+return dlopen ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+ ac_cv_func_dlopen=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
-# An ERE matcher.
-EGREP=$lt_EGREP
+ ac_cv_func_dlopen=no
+fi
-# The linker used to build libraries.
-LD=$lt_LD
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
+$as_echo "$ac_cv_func_dlopen" >&6; }
+if test "x$ac_cv_func_dlopen" = x""yes; then
+ lt_cv_dlopen="dlopen"
+else
+ { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+$as_echo_n "checking for dlopen in -ldl... " >&6; }
+if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldl $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
-# Whether we need hard or soft links.
-LN_S=$lt_LN_S
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dlopen ();
+#ifdef FC_DUMMY_MAIN
+#ifndef FC_DUMMY_MAIN_EQ_F77
+# ifdef __cplusplus
+ extern "C"
+# endif
+ int FC_DUMMY_MAIN() { return 1; }
+#endif
+#endif
+int
+main ()
+{
+return dlopen ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+ ac_cv_lib_dl_dlopen=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
-# A BSD-compatible nm program.
-NM=$lt_NM
+ ac_cv_lib_dl_dlopen=no
+fi
-# A symbol stripping program
-STRIP=$lt_STRIP
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then
+ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+else
+ { $as_echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
+$as_echo_n "checking for dlopen in -lsvld... " >&6; }
+if test "${ac_cv_lib_svld_dlopen+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lsvld $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
-# Used to examine libraries when file_magic_cmd begins "file"
-MAGIC_CMD=$MAGIC_CMD
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dlopen ();
+#ifdef FC_DUMMY_MAIN
+#ifndef FC_DUMMY_MAIN_EQ_F77
+# ifdef __cplusplus
+ extern "C"
+# endif
+ int FC_DUMMY_MAIN() { return 1; }
+#endif
+#endif
+int
+main ()
+{
+return dlopen ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+ ac_cv_lib_svld_dlopen=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
-# Used on cygwin: DLL creation program.
-DLLTOOL="$DLLTOOL"
+ ac_cv_lib_svld_dlopen=no
+fi
-# Used on cygwin: object dumper.
-OBJDUMP="$OBJDUMP"
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
+$as_echo "$ac_cv_lib_svld_dlopen" >&6; }
+if test "x$ac_cv_lib_svld_dlopen" = x""yes; then
+ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
+else
+ { $as_echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
+$as_echo_n "checking for dld_link in -ldld... " >&6; }
+if test "${ac_cv_lib_dld_dld_link+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldld $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
-# Used on cygwin: assembler.
-AS="$AS"
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dld_link ();
+#ifdef FC_DUMMY_MAIN
+#ifndef FC_DUMMY_MAIN_EQ_F77
+# ifdef __cplusplus
+ extern "C"
+# endif
+ int FC_DUMMY_MAIN() { return 1; }
+#endif
+#endif
+int
+main ()
+{
+return dld_link ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+ ac_cv_lib_dld_dld_link=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
+ ac_cv_lib_dld_dld_link=no
+fi
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
+$as_echo "$ac_cv_lib_dld_dld_link" >&6; }
+if test "x$ac_cv_lib_dld_dld_link" = x""yes; then
+ lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
+fi
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl
-# Object file suffix (normally "o").
-objext="$ac_objext"
+fi
-# Old archive suffix (normally "a").
-libext="$libext"
-# Shared library suffix (normally ".so").
-shrext_cmds='$shrext_cmds'
+fi
-# Executable file suffix (normally "").
-exeext="$exeext"
-# Additional compiler flags for building library objects.
-pic_flag=$lt_lt_prog_compiler_pic
-pic_mode=$pic_mode
+fi
-# What is the maximum length of a command?
-max_cmd_len=$lt_cv_sys_max_cmd_len
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$lt_lt_cv_prog_compiler_c_o
+fi
-# Must we lock files when doing compilation?
-need_locks=$lt_need_locks
-# Do we need the lib prefix for modules?
-need_lib_prefix=$need_lib_prefix
+fi
-# Do we need a version for libraries?
-need_version=$need_version
+ ;;
+ esac
-# Whether dlopen is supported.
-dlopen_support=$enable_dlopen
+ if test "x$lt_cv_dlopen" != xno; then
+ enable_dlopen=yes
+ else
+ enable_dlopen=no
+ fi
-# Whether dlopen of programs is supported.
-dlopen_self=$enable_dlopen_self
+ case $lt_cv_dlopen in
+ dlopen)
+ save_CPPFLAGS="$CPPFLAGS"
+ test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-# Whether dlopen of statically linked programs is supported.
-dlopen_self_static=$enable_dlopen_self_static
+ save_LDFLAGS="$LDFLAGS"
+ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-# Compiler flag to prevent dynamic linking.
-link_static_flag=$lt_lt_prog_compiler_static
+ save_LIBS="$LIBS"
+ LIBS="$lt_cv_dlopen_libs $LIBS"
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
+ { $as_echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
+$as_echo_n "checking whether a program can dlopen itself... " >&6; }
+if test "${lt_cv_dlopen_self+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ if test "$cross_compiling" = yes; then :
+ lt_cv_dlopen_self=cross
+else
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<_LT_EOF
+#line 14461 "configure"
+#include "confdefs.h"
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec
+#if HAVE_DLFCN_H
+#include <dlfcn.h>
+#endif
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$lt_whole_archive_flag_spec
+#include <stdio.h>
-# Compiler flag to generate thread-safe objects.
-thread_safe_flag_spec=$lt_thread_safe_flag_spec
+#ifdef RTLD_GLOBAL
+# define LT_DLGLOBAL RTLD_GLOBAL
+#else
+# ifdef DL_GLOBAL
+# define LT_DLGLOBAL DL_GLOBAL
+# else
+# define LT_DLGLOBAL 0
+# endif
+#endif
-# Library versioning type.
-version_type=$version_type
+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+ find out it does not work in some platform. */
+#ifndef LT_DLLAZY_OR_NOW
+# ifdef RTLD_LAZY
+# define LT_DLLAZY_OR_NOW RTLD_LAZY
+# else
+# ifdef DL_LAZY
+# define LT_DLLAZY_OR_NOW DL_LAZY
+# else
+# ifdef RTLD_NOW
+# define LT_DLLAZY_OR_NOW RTLD_NOW
+# else
+# ifdef DL_NOW
+# define LT_DLLAZY_OR_NOW DL_NOW
+# else
+# define LT_DLLAZY_OR_NOW 0
+# endif
+# endif
+# endif
+# endif
+#endif
-# Format of library name prefix.
-libname_spec=$lt_libname_spec
+void fnord() { int i=42;}
+int main ()
+{
+ void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+ int status = $lt_dlunknown;
-# List of archive names. First name is the real one, the rest are links.
-# The last name is the one that the linker finds with -lNAME.
-library_names_spec=$lt_library_names_spec
+ if (self)
+ {
+ if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
+ else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+ /* dlclose (self); */
+ }
+ else
+ puts (dlerror ());
-# The coded name of the library, if different from the real name.
-soname_spec=$lt_soname_spec
+ return status;
+}
+_LT_EOF
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
+ (./conftest; exit; ) >&5 2>/dev/null
+ lt_status=$?
+ case x$lt_status in
+ x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
+ x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
+ x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;;
+ esac
+ else :
+ # compilation failed
+ lt_cv_dlopen_self=no
+ fi
+fi
+rm -fr conftest*
-# Commands used to build and install an old-style archive.
-RANLIB=$lt_RANLIB
-old_archive_cmds=$lt_old_archive_cmds
-old_postinstall_cmds=$lt_old_postinstall_cmds
-old_postuninstall_cmds=$lt_old_postuninstall_cmds
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds
+fi
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
+$as_echo "$lt_cv_dlopen_self" >&6; }
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
+ if test "x$lt_cv_dlopen_self" = xyes; then
+ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
+ { $as_echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
+$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
+if test "${lt_cv_dlopen_self_static+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ if test "$cross_compiling" = yes; then :
+ lt_cv_dlopen_self_static=cross
+else
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<_LT_EOF
+#line 14557 "configure"
+#include "confdefs.h"
-# Commands used to build and install a shared archive.
-archive_cmds=$lt_archive_cmds
-archive_expsym_cmds=$lt_archive_expsym_cmds
-postinstall_cmds=$lt_postinstall_cmds
-postuninstall_cmds=$lt_postuninstall_cmds
+#if HAVE_DLFCN_H
+#include <dlfcn.h>
+#endif
-# Commands used to build a loadable module (assumed same as above if empty)
-module_cmds=$lt_module_cmds
-module_expsym_cmds=$lt_module_expsym_cmds
+#include <stdio.h>
-# Commands to strip libraries.
-old_striplib=$lt_old_striplib
-striplib=$lt_striplib
+#ifdef RTLD_GLOBAL
+# define LT_DLGLOBAL RTLD_GLOBAL
+#else
+# ifdef DL_GLOBAL
+# define LT_DLGLOBAL DL_GLOBAL
+# else
+# define LT_DLGLOBAL 0
+# endif
+#endif
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predep_objects=$lt_predep_objects
+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+ find out it does not work in some platform. */
+#ifndef LT_DLLAZY_OR_NOW
+# ifdef RTLD_LAZY
+# define LT_DLLAZY_OR_NOW RTLD_LAZY
+# else
+# ifdef DL_LAZY
+# define LT_DLLAZY_OR_NOW DL_LAZY
+# else
+# ifdef RTLD_NOW
+# define LT_DLLAZY_OR_NOW RTLD_NOW
+# else
+# ifdef DL_NOW
+# define LT_DLLAZY_OR_NOW DL_NOW
+# else
+# define LT_DLLAZY_OR_NOW 0
+# endif
+# endif
+# endif
+# endif
+#endif
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdep_objects=$lt_postdep_objects
+void fnord() { int i=42;}
+int main ()
+{
+ void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+ int status = $lt_dlunknown;
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predeps=$lt_predeps
+ if (self)
+ {
+ if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
+ else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+ /* dlclose (self); */
+ }
+ else
+ puts (dlerror ());
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdeps=$lt_postdeps
+ return status;
+}
+_LT_EOF
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
+ (./conftest; exit; ) >&5 2>/dev/null
+ lt_status=$?
+ case x$lt_status in
+ x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
+ x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
+ x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;;
+ esac
+ else :
+ # compilation failed
+ lt_cv_dlopen_self_static=no
+ fi
+fi
+rm -fr conftest*
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method=$lt_deplibs_check_method
+fi
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
+$as_echo "$lt_cv_dlopen_self_static" >&6; }
+ fi
-# Command to use when deplibs_check_method == file_magic.
-file_magic_cmd=$lt_file_magic_cmd
+ CPPFLAGS="$save_CPPFLAGS"
+ LDFLAGS="$save_LDFLAGS"
+ LIBS="$save_LIBS"
+ ;;
+ esac
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$lt_allow_undefined_flag
+ case $lt_cv_dlopen_self in
+ yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
+ *) enable_dlopen_self=unknown ;;
+ esac
-# Flag that forces no undefined symbols.
-no_undefined_flag=$lt_no_undefined_flag
+ case $lt_cv_dlopen_self_static in
+ yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
+ *) enable_dlopen_self_static=unknown ;;
+ esac
+fi
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds=$lt_finish_cmds
-# Same as above, but a single script fragment to be evaled but not shown.
-finish_eval=$lt_finish_eval
-# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
-# Transform the output of nm in a proper C declaration
-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-# Transform the output of nm in a C name address pair
-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
-# This is the shared library runtime path variable.
-runpath_var=$runpath_var
-# This is the shared library path variable.
-shlibpath_var=$shlibpath_var
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-# How to hardcode a shared library path into an executable.
-hardcode_action=$hardcode_action
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=$hardcode_into_libs
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
-# If ld is used when linking, flag to hardcode \$libdir into
-# a binary during linking. This must work even if \$libdir does
-# not exist.
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld
-# Whether we need a single -rpath flag with a separated argument.
-hardcode_libdir_separator=$lt_hardcode_libdir_separator
-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
-# resulting binary.
-hardcode_direct=$hardcode_direct
-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-# resulting binary.
-hardcode_minus_L=$hardcode_minus_L
-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-# the resulting binary.
-hardcode_shlibpath_var=$hardcode_shlibpath_var
-# Set to yes if building a shared library automatically hardcodes DIR into the library
-# and all subsequent libraries and executables linked against it.
-hardcode_automatic=$hardcode_automatic
+striplib=
+old_striplib=
+{ $as_echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
+$as_echo_n "checking whether stripping libraries is possible... " >&6; }
+if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
+ test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+ test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+# FIXME - insert some real tests, host_os isn't really good enough
+ case $host_os in
+ darwin*)
+ if test -n "$STRIP" ; then
+ striplib="$STRIP -x"
+ old_striplib="$STRIP -S"
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+ else
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+ fi
+ ;;
+ *)
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+ ;;
+ esac
+fi
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at relink time.
-variables_saved_for_relink="$variables_saved_for_relink"
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=$link_all_deplibs
-# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-# Run-time system search path for libraries
-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path=$lt_fix_srcfile_path
-# Set to yes if exported symbols are required.
-always_export_symbols=$always_export_symbols
-# The commands to list exported symbols.
-export_symbols_cmds=$lt_export_symbols_cmds
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=$lt_extract_expsyms_cmds
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$lt_exclude_expsyms
-# Symbols that must always be exported.
-include_expsyms=$lt_include_expsyms
-# ### END LIBTOOL CONFIG
-__EOF__
+ # Report which library types will actually be built
+ { $as_echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
+$as_echo_n "checking if libtool supports shared libraries... " >&6; }
+ { $as_echo "$as_me:$LINENO: result: $can_build_shared" >&5
+$as_echo "$can_build_shared" >&6; }
+ { $as_echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
+$as_echo_n "checking whether to build shared libraries... " >&6; }
+ test "$can_build_shared" = "no" && enable_shared=no
+ # On AIX, shared libraries and static libraries use the same namespace, and
+ # are all built from PIC.
case $host_os in
aix3*)
- cat <<\EOF >> "$cfgfile"
+ test "$enable_shared" = yes && enable_static=no
+ if test -n "$RANLIB"; then
+ archive_cmds="$archive_cmds~\$RANLIB \$lib"
+ postinstall_cmds='$RANLIB $lib'
+ fi
+ ;;
-# AIX sometimes has problems with the GCC collect2 program. For some
-# reason, if we set the COLLECT_NAMES environment variable, the problems
-# vanish in a puff of smoke.
-if test "X${COLLECT_NAMES+set}" != Xset; then
- COLLECT_NAMES=
- export COLLECT_NAMES
-fi
-EOF
+ aix[4-9]*)
+ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+ test "$enable_shared" = yes && enable_static=no
+ fi
;;
esac
+ { $as_echo "$as_me:$LINENO: result: $enable_shared" >&5
+$as_echo "$enable_shared" >&6; }
- # We use sed instead of cat because bash on DJGPP gets confused if
- # if finds mixed CR/LF and LF-only lines. Since sed operates in
- # text mode, it properly converts lines to CR/LF. This bash problem
- # is reportedly fixed, but why not run on old versions too?
- sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1)
+ { $as_echo "$as_me:$LINENO: checking whether to build static libraries" >&5
+$as_echo_n "checking whether to build static libraries... " >&6; }
+ # Make sure either enable_shared or enable_static is yes.
+ test "$enable_shared" = yes || enable_static=yes
+ { $as_echo "$as_me:$LINENO: result: $enable_static" >&5
+$as_echo "$enable_static" >&6; }
- mv -f "$cfgfile" "$ofile" || \
- (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
- chmod +x "$ofile"
-else
- # If there is no Makefile yet, we rely on a make rule to execute
- # `config.status --recheck' to rerun these tests and create the
- # libtool script then.
- ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
- if test -f "$ltmain_in"; then
- test -f Makefile && make "$ltmain"
- fi
-fi
+fi
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -12065,85 +14762,27 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
CC="$lt_save_CC"
-# Check whether --with-tags was given.
-if test "${with_tags+set}" = set; then
- withval=$with_tags; tagnames="$withval"
-fi
-
-
-if test -f "$ltmain" && test -n "$tagnames"; then
- if test ! -f "${ofile}"; then
- { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not exist" >&5
-echo "$as_me: WARNING: output file \`$ofile' does not exist" >&2;}
- fi
-
- if test -z "$LTCC"; then
- eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
- if test -z "$LTCC"; then
- { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not look like a libtool script" >&5
-echo "$as_me: WARNING: output file \`$ofile' does not look like a libtool script" >&2;}
- else
- { echo "$as_me:$LINENO: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&5
-echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
- fi
- fi
- if test -z "$LTCFLAGS"; then
- eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`"
- fi
-
- # Extract list of available tagged configurations in $ofile.
- # Note that this assumes the entire list is on one line.
- available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'`
-
- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
- for tagname in $tagnames; do
- IFS="$lt_save_ifs"
- # Check whether tagname contains only valid characters
- case `$echo "X$tagname" | $Xsed -e 's:[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]::g'` in
- "") ;;
- *) { { echo "$as_me:$LINENO: error: invalid tag name: $tagname" >&5
-echo "$as_me: error: invalid tag name: $tagname" >&2;}
- { (exit 1); exit 1; }; }
- ;;
- esac
-
- if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
- then
- { { echo "$as_me:$LINENO: error: tag name \"$tagname\" already exists" >&5
-echo "$as_me: error: tag name \"$tagname\" already exists" >&2;}
- { (exit 1); exit 1; }; }
- fi
-
- # Update the list of available tags.
- if test -n "$tagname"; then
- echo appending configuration tag \"$tagname\" to $ofile
-
- case $tagname in
- CXX)
- if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
- ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
- (test "X$CXX" != "Xg++"))) ; then
- ac_ext=cpp
+ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-
-
archive_cmds_need_lc_CXX=no
allow_undefined_flag_CXX=
always_export_symbols_CXX=no
archive_expsym_cmds_CXX=
+compiler_needs_object_CXX=no
export_dynamic_flag_spec_CXX=
hardcode_direct_CXX=no
+hardcode_direct_absolute_CXX=no
hardcode_libdir_flag_spec_CXX=
hardcode_libdir_flag_spec_ld_CXX=
hardcode_libdir_separator_CXX=
hardcode_minus_L_CXX=no
hardcode_shlibpath_var_CXX=unsupported
hardcode_automatic_CXX=no
+inherit_rpath_CXX=no
module_cmds_CXX=
module_expsym_cmds_CXX=
link_all_deplibs_CXX=unknown
@@ -12152,13 +14791,6 @@ no_undefined_flag_CXX=
whole_archive_flag_spec_CXX=
enable_shared_with_static_runtimes_CXX=no
-# Dependencies to place before and after the object being linked:
-predep_objects_CXX=
-postdep_objects_CXX=
-predeps_CXX=
-postdeps_CXX=
-compiler_lib_search_path_CXX=
-
# Source file extension for C++ test sources.
ac_ext=cpp
@@ -12166,13 +14798,23 @@ ac_ext=cpp
objext=o
objext_CXX=$objext
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;"
+# No sense in running all these tests if we already determined that
+# the CXX compiler isn't working. Some variables (like enable_shared)
+# are currently assumed to apply to all compilers on this platform,
+# and will be corrupted by setting them based on a non-working compiler.
+if test "$_lt_caught_CXX_error" != yes; then
+ # Code to be used in simple compile tests
+ lt_simple_compile_test_code="int some_variable = 0;"
+
+ # Code to be used in simple link tests
+ lt_simple_link_test_code='int main(int, char *[]) { return(0); }'
+
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+
+
+
-# Code to be used in simple link tests
-lt_simple_link_test_code='int main(int, char *[]) { return(0); }'
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -12184,42 +14826,42 @@ LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
compiler=$CC
-# save warnings/boilerplate of simple test code
-ac_outfile=conftest.$ac_objext
+ # save warnings/boilerplate of simple test code
+ ac_outfile=conftest.$ac_objext
echo "$lt_simple_compile_test_code" >conftest.$ac_ext
eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_compiler_boilerplate=`cat conftest.err`
-$rm conftest*
+$RM conftest*
-ac_outfile=conftest.$ac_objext
+ ac_outfile=conftest.$ac_objext
echo "$lt_simple_link_test_code" >conftest.$ac_ext
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
-$rm conftest*
-
-
-# Allow CC to be a program name with arguments.
-lt_save_CC=$CC
-lt_save_LD=$LD
-lt_save_GCC=$GCC
-GCC=$GXX
-lt_save_with_gnu_ld=$with_gnu_ld
-lt_save_path_LD=$lt_cv_path_LD
-if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
- lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
-else
- $as_unset lt_cv_prog_gnu_ld
-fi
-if test -n "${lt_cv_path_LDCXX+set}"; then
- lt_cv_path_LD=$lt_cv_path_LDCXX
-else
- $as_unset lt_cv_path_LD
-fi
-test -z "${LDCXX+set}" || LD=$LDCXX
-CC=${CXX-"c++"}
-compiler=$CC
-compiler_CXX=$CC
-for cc_temp in $compiler""; do
+$RM -r conftest*
+
+
+ # Allow CC to be a program name with arguments.
+ lt_save_CC=$CC
+ lt_save_LD=$LD
+ lt_save_GCC=$GCC
+ GCC=$GXX
+ lt_save_with_gnu_ld=$with_gnu_ld
+ lt_save_path_LD=$lt_cv_path_LD
+ if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
+ lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
+ else
+ $as_unset lt_cv_prog_gnu_ld
+ fi
+ if test -n "${lt_cv_path_LDCXX+set}"; then
+ lt_cv_path_LD=$lt_cv_path_LDCXX
+ else
+ $as_unset lt_cv_path_LD
+ fi
+ test -z "${LDCXX+set}" || LD=$LDCXX
+ CC=${CXX-"c++"}
+ compiler=$CC
+ compiler_CXX=$CC
+ for cc_temp in $compiler""; do
case $cc_temp in
compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
@@ -12227,19 +14869,21 @@ for cc_temp in $compiler""; do
*) break;;
esac
done
-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-# We don't want -fno-exception wen compiling C++ code, so set the
-# no_builtin_flag separately
-if test "$GXX" = yes; then
- lt_prog_compiler_no_builtin_flag_CXX=' -fno-builtin'
-else
- lt_prog_compiler_no_builtin_flag_CXX=
-fi
+ if test -n "$compiler"; then
+ # We don't want -fno-exception when compiling C++ code, so set the
+ # no_builtin_flag separately
+ if test "$GXX" = yes; then
+ lt_prog_compiler_no_builtin_flag_CXX=' -fno-builtin'
+ else
+ lt_prog_compiler_no_builtin_flag_CXX=
+ fi
+
+ if test "$GXX" = yes; then
+ # Set up default GNU C++ configuration
-if test "$GXX" = yes; then
- # Set up default GNU C++ configuration
# Check whether --with-gnu-ld was given.
@@ -12252,8 +14896,8 @@ fi
ac_prog=ld
if test "$GCC" = yes; then
# Check if gcc -print-prog-name=ld gives a path.
- { echo "$as_me:$LINENO: checking for ld used by $CC" >&5
-echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5
+$as_echo_n "checking for ld used by $CC... " >&6; }
case $host in
*-*-mingw*)
# gcc leaves a trailing carriage return which upsets mingw
@@ -12266,9 +14910,9 @@ echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }
[\\/]* | ?:[\\/]*)
re_direlt='/[^/][^/]*/\.\./'
# Canonicalize the pathname of ld
- ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
- while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
- ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
+ ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
+ while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
+ ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
done
test -z "$LD" && LD="$ac_prog"
;;
@@ -12282,14 +14926,14 @@ echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }
;;
esac
elif test "$with_gnu_ld" = yes; then
- { echo "$as_me:$LINENO: checking for GNU ld" >&5
-echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5
+$as_echo_n "checking for GNU ld... " >&6; }
else
- { echo "$as_me:$LINENO: checking for non-GNU ld" >&5
-echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5
+$as_echo_n "checking for non-GNU ld... " >&6; }
fi
if test "${lt_cv_path_LD+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -z "$LD"; then
lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
@@ -12319,19 +14963,19 @@ fi
LD="$lt_cv_path_LD"
if test -n "$LD"; then
- { echo "$as_me:$LINENO: result: $LD" >&5
-echo "${ECHO_T}$LD" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $LD" >&5
+$as_echo "$LD" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
-test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
-echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
+test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
+$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
{ (exit 1); exit 1; }; }
-{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
-echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
+$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
if test "${lt_cv_prog_gnu_ld+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
# I'd rather use --version here, but apparently some GNU lds only accept -v.
case `$LD -v 2>&1 </dev/null` in
@@ -12343,155 +14987,163 @@ case `$LD -v 2>&1 </dev/null` in
;;
esac
fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
-echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
+$as_echo "$lt_cv_prog_gnu_ld" >&6; }
with_gnu_ld=$lt_cv_prog_gnu_ld
- # Check if GNU C++ uses GNU ld as the underlying linker, since the
- # archiving commands below assume that GNU ld is being used.
- if test "$with_gnu_ld" = yes; then
- archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
- archive_expsym_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-
- hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
- export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
- # If archive_cmds runs LD, not CC, wlarc should be empty
- # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
- # investigate it a little bit more. (MM)
- wlarc='${wl}'
- # ancient GNU ld didn't support --whole-archive et. al.
- if eval "`$CC -print-prog-name=ld` --help 2>&1" | \
- grep 'no-whole-archive' > /dev/null; then
- whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
- else
- whole_archive_flag_spec_CXX=
- fi
- else
- with_gnu_ld=no
- wlarc=
-
- # A generic and very simple default shared library creation
- # command for GNU C++ for the case where it uses the native
- # linker, instead of GNU ld. If possible, this setting should
- # overridden to take advantage of the native linker features on
- # the platform it is being used on.
- archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
- fi
- # Commands to make compiler produce verbose output that lists
- # what "hidden" libraries, object files and flags are used when
- # linking a shared library.
- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
-else
- GXX=no
- with_gnu_ld=no
- wlarc=
-fi
+ # Check if GNU C++ uses GNU ld as the underlying linker, since the
+ # archiving commands below assume that GNU ld is being used.
+ if test "$with_gnu_ld" = yes; then
+ archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ archive_expsym_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-# PORTME: fill in a description of your system's C++ link characteristics
-{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
-ld_shlibs_CXX=yes
-case $host_os in
- aix3*)
- # FIXME: insert proper C++ library support
- ld_shlibs_CXX=no
- ;;
- aix4* | aix5*)
- if test "$host_cpu" = ia64; then
- # On IA64, the linker does run time linking by default, so we don't
- # have to do anything special.
- aix_use_runtimelinking=no
- exp_sym_flag='-Bexport'
- no_entry_flag=""
- else
- aix_use_runtimelinking=no
-
- # Test if we are trying to use run time linking or normal
- # AIX style linking. If -brtl is somewhere in LDFLAGS, we
- # need to do runtime linking.
- case $host_os in aix4.[23]|aix4.[23].*|aix5*)
- for ld_flag in $LDFLAGS; do
- case $ld_flag in
- *-brtl*)
- aix_use_runtimelinking=yes
- break
- ;;
- esac
- done
- ;;
- esac
+ hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+ export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
- exp_sym_flag='-bexport'
- no_entry_flag='-bnoentry'
- fi
+ # If archive_cmds runs LD, not CC, wlarc should be empty
+ # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
+ # investigate it a little bit more. (MM)
+ wlarc='${wl}'
- # When large executables or shared objects are built, AIX ld can
- # have problems creating the table of contents. If linking a library
- # or program results in "error TOC overflow" add -mminimal-toc to
- # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not
- # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+ # ancient GNU ld didn't support --whole-archive et. al.
+ if eval "`$CC -print-prog-name=ld` --help 2>&1" |
+ $GREP 'no-whole-archive' > /dev/null; then
+ whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+ else
+ whole_archive_flag_spec_CXX=
+ fi
+ else
+ with_gnu_ld=no
+ wlarc=
+
+ # A generic and very simple default shared library creation
+ # command for GNU C++ for the case where it uses the native
+ # linker, instead of GNU ld. If possible, this setting should
+ # overridden to take advantage of the native linker features on
+ # the platform it is being used on.
+ archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+ fi
- archive_cmds_CXX=''
- hardcode_direct_CXX=yes
- hardcode_libdir_separator_CXX=':'
- link_all_deplibs_CXX=yes
+ # Commands to make compiler produce verbose output that lists
+ # what "hidden" libraries, object files and flags are used when
+ # linking a shared library.
+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
- if test "$GXX" = yes; then
- case $host_os in aix4.[012]|aix4.[012].*)
- # We only want to do this on AIX 4.2 and lower, the check
- # below for broken collect2 doesn't work under 4.3+
- collect2name=`${CC} -print-prog-name=collect2`
- if test -f "$collect2name" && \
- strings "$collect2name" | grep resolve_lib_name >/dev/null
- then
- # We have reworked collect2
- :
- else
- # We have old collect2
- hardcode_direct_CXX=unsupported
- # It fails to find uninstalled libraries when the uninstalled
- # path is not listed in the libpath. Setting hardcode_minus_L
- # to unsupported forces relinking
- hardcode_minus_L_CXX=yes
- hardcode_libdir_flag_spec_CXX='-L$libdir'
- hardcode_libdir_separator_CXX=
- fi
- ;;
- esac
- shared_flag='-shared'
- if test "$aix_use_runtimelinking" = yes; then
- shared_flag="$shared_flag "'${wl}-G'
- fi
else
- # not using gcc
- if test "$host_cpu" = ia64; then
- # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
- # chokes on -Wl,-G. The following line is correct:
- shared_flag='-G'
- else
- if test "$aix_use_runtimelinking" = yes; then
- shared_flag='${wl}-G'
- else
- shared_flag='${wl}-bM:SRE'
- fi
- fi
+ GXX=no
+ with_gnu_ld=no
+ wlarc=
fi
- # It seems that -bexpall does not export symbols beginning with
- # underscore (_), so it is better to generate a list of symbols to export.
- always_export_symbols_CXX=yes
- if test "$aix_use_runtimelinking" = yes; then
- # Warning - without using the other runtime loading flags (-brtl),
- # -berok will link without error, but may produce a broken library.
- allow_undefined_flag_CXX='-berok'
- # Determine the default libpath from the value encoded in an empty executable.
- cat >conftest.$ac_ext <<_ACEOF
+ # PORTME: fill in a description of your system's C++ link characteristics
+ { $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
+ ld_shlibs_CXX=yes
+ case $host_os in
+ aix3*)
+ # FIXME: insert proper C++ library support
+ ld_shlibs_CXX=no
+ ;;
+ aix[4-9]*)
+ if test "$host_cpu" = ia64; then
+ # On IA64, the linker does run time linking by default, so we don't
+ # have to do anything special.
+ aix_use_runtimelinking=no
+ exp_sym_flag='-Bexport'
+ no_entry_flag=""
+ else
+ aix_use_runtimelinking=no
+
+ # Test if we are trying to use run time linking or normal
+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+ # need to do runtime linking.
+ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
+ for ld_flag in $LDFLAGS; do
+ case $ld_flag in
+ *-brtl*)
+ aix_use_runtimelinking=yes
+ break
+ ;;
+ esac
+ done
+ ;;
+ esac
+
+ exp_sym_flag='-bexport'
+ no_entry_flag='-bnoentry'
+ fi
+
+ # When large executables or shared objects are built, AIX ld can
+ # have problems creating the table of contents. If linking a library
+ # or program results in "error TOC overflow" add -mminimal-toc to
+ # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not
+ # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+ archive_cmds_CXX=''
+ hardcode_direct_CXX=yes
+ hardcode_direct_absolute_CXX=yes
+ hardcode_libdir_separator_CXX=':'
+ link_all_deplibs_CXX=yes
+ file_list_spec_CXX='${wl}-f,'
+
+ if test "$GXX" = yes; then
+ case $host_os in aix4.[012]|aix4.[012].*)
+ # We only want to do this on AIX 4.2 and lower, the check
+ # below for broken collect2 doesn't work under 4.3+
+ collect2name=`${CC} -print-prog-name=collect2`
+ if test -f "$collect2name" &&
+ strings "$collect2name" | $GREP resolve_lib_name >/dev/null
+ then
+ # We have reworked collect2
+ :
+ else
+ # We have old collect2
+ hardcode_direct_CXX=unsupported
+ # It fails to find uninstalled libraries when the uninstalled
+ # path is not listed in the libpath. Setting hardcode_minus_L
+ # to unsupported forces relinking
+ hardcode_minus_L_CXX=yes
+ hardcode_libdir_flag_spec_CXX='-L$libdir'
+ hardcode_libdir_separator_CXX=
+ fi
+ esac
+ shared_flag='-shared'
+ if test "$aix_use_runtimelinking" = yes; then
+ shared_flag="$shared_flag "'${wl}-G'
+ fi
+ else
+ # not using gcc
+ if test "$host_cpu" = ia64; then
+ # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+ # chokes on -Wl,-G. The following line is correct:
+ shared_flag='-G'
+ else
+ if test "$aix_use_runtimelinking" = yes; then
+ shared_flag='${wl}-G'
+ else
+ shared_flag='${wl}-bM:SRE'
+ fi
+ fi
+ fi
+
+ export_dynamic_flag_spec_CXX='${wl}-bexpall'
+ # It seems that -bexpall does not export symbols beginning with
+ # underscore (_), so it is better to generate a list of symbols to
+ # export.
+ always_export_symbols_CXX=yes
+ if test "$aix_use_runtimelinking" = yes; then
+ # Warning - without using the other runtime loading flags (-brtl),
+ # -berok will link without error, but may produce a broken library.
+ allow_undefined_flag_CXX='-berok'
+ # Determine the default libpath from the value encoded in an empty
+ # executable.
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -12520,18 +15172,21 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_cxx_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
@@ -12546,27 +15201,29 @@ if test -z "$aix_libpath"; then
aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
fi
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
fi
+rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
+ hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
- archive_expsym_cmds_CXX="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
- else
- if test "$host_cpu" = ia64; then
- hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib'
- allow_undefined_flag_CXX="-z nodefs"
- archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
- else
- # Determine the default libpath from the value encoded in an empty executable.
- cat >conftest.$ac_ext <<_ACEOF
+ archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+ else
+ if test "$host_cpu" = ia64; then
+ hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib'
+ allow_undefined_flag_CXX="-z nodefs"
+ archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+ else
+ # Determine the default libpath from the value encoded in an
+ # empty executable.
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -12595,18 +15252,21 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_cxx_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
@@ -12621,778 +15281,777 @@ if test -z "$aix_libpath"; then
aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
fi
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
fi
+rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
- # Warning - without using the other run time loading flags,
- # -berok will link without error, but may produce a broken library.
- no_undefined_flag_CXX=' ${wl}-bernotok'
- allow_undefined_flag_CXX=' ${wl}-berok'
- # Exported symbols can be pulled into shared objects from archives
- whole_archive_flag_spec_CXX='$convenience'
- archive_cmds_need_lc_CXX=yes
- # This is similar to how AIX traditionally builds its shared libraries.
- archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
- fi
- fi
- ;;
+ hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
+ # Warning - without using the other run time loading flags,
+ # -berok will link without error, but may produce a broken library.
+ no_undefined_flag_CXX=' ${wl}-bernotok'
+ allow_undefined_flag_CXX=' ${wl}-berok'
+ # Exported symbols can be pulled into shared objects from archives
+ whole_archive_flag_spec_CXX='$convenience'
+ archive_cmds_need_lc_CXX=yes
+ # This is similar to how AIX traditionally builds its shared
+ # libraries.
+ archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+ fi
+ fi
+ ;;
- beos*)
- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
- allow_undefined_flag_CXX=unsupported
- # Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
- # support --undefined. This deserves some investigation. FIXME
- archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- else
- ld_shlibs_CXX=no
+ beos*)
+ if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+ allow_undefined_flag_CXX=unsupported
+ # Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
+ # support --undefined. This deserves some investigation. FIXME
+ archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ else
+ ld_shlibs_CXX=no
+ fi
+ ;;
+
+ chorus*)
+ case $cc_basename in
+ *)
+ # FIXME: insert proper C++ library support
+ ld_shlibs_CXX=no
+ ;;
+ esac
+ ;;
+
+ cygwin* | mingw* | pw32* | cegcc*)
+ # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
+ # as there is no search path for DLLs.
+ hardcode_libdir_flag_spec_CXX='-L$libdir'
+ allow_undefined_flag_CXX=unsupported
+ always_export_symbols_CXX=no
+ enable_shared_with_static_runtimes_CXX=yes
+
+ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+ archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+ # If the export-symbols file already is a .def file (1st line
+ # is EXPORTS), use it as is; otherwise, prepend...
+ archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+ cp $export_symbols $output_objdir/$soname.def;
+ else
+ echo EXPORTS > $output_objdir/$soname.def;
+ cat $export_symbols >> $output_objdir/$soname.def;
+ fi~
+ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+ else
+ ld_shlibs_CXX=no
+ fi
+ ;;
+ darwin* | rhapsody*)
+
+
+ archive_cmds_need_lc_CXX=no
+ hardcode_direct_CXX=no
+ hardcode_automatic_CXX=yes
+ hardcode_shlibpath_var_CXX=unsupported
+ whole_archive_flag_spec_CXX=''
+ link_all_deplibs_CXX=yes
+ allow_undefined_flag_CXX="$_lt_dar_allow_undefined"
+ case $cc_basename in
+ ifort*) _lt_dar_can_shared=yes ;;
+ *) _lt_dar_can_shared=$GCC ;;
+ esac
+ if test "$_lt_dar_can_shared" = "yes"; then
+ output_verbose_link_cmd=echo
+ archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+ module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+ archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+ module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+ if test "$lt_cv_apple_cc_single_mod" != "yes"; then
+ archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
+ archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
fi
- ;;
- chorus*)
- case $cc_basename in
- *)
- # FIXME: insert proper C++ library support
- ld_shlibs_CXX=no
+ else
+ ld_shlibs_CXX=no
+ fi
+
;;
- esac
- ;;
- cygwin* | mingw* | pw32*)
- # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
- # as there is no search path for DLLs.
- hardcode_libdir_flag_spec_CXX='-L$libdir'
- allow_undefined_flag_CXX=unsupported
- always_export_symbols_CXX=no
- enable_shared_with_static_runtimes_CXX=yes
-
- if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
- archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
- # If the export-symbols file already is a .def file (1st line
- # is EXPORTS), use it as is; otherwise, prepend...
- archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
- cp $export_symbols $output_objdir/$soname.def;
- else
- echo EXPORTS > $output_objdir/$soname.def;
- cat $export_symbols >> $output_objdir/$soname.def;
- fi~
- $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
- else
- ld_shlibs_CXX=no
- fi
- ;;
- darwin* | rhapsody*)
- case $host_os in
- rhapsody* | darwin1.[012])
- allow_undefined_flag_CXX='${wl}-undefined ${wl}suppress'
- ;;
- *) # Darwin 1.3 on
- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
- allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
- else
- case ${MACOSX_DEPLOYMENT_TARGET} in
- 10.[012])
- allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
- ;;
- 10.*)
- allow_undefined_flag_CXX='${wl}-undefined ${wl}dynamic_lookup'
- ;;
- esac
- fi
- ;;
+ dgux*)
+ case $cc_basename in
+ ec++*)
+ # FIXME: insert proper C++ library support
+ ld_shlibs_CXX=no
+ ;;
+ ghcx*)
+ # Green Hills C++ Compiler
+ # FIXME: insert proper C++ library support
+ ld_shlibs_CXX=no
+ ;;
+ *)
+ # FIXME: insert proper C++ library support
+ ld_shlibs_CXX=no
+ ;;
+ esac
+ ;;
+
+ freebsd[12]*)
+ # C++ shared libraries reported to be fairly broken before
+ # switch to ELF
+ ld_shlibs_CXX=no
+ ;;
+
+ freebsd-elf*)
+ archive_cmds_need_lc_CXX=no
+ ;;
+
+ freebsd* | dragonfly*)
+ # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
+ # conventions
+ ld_shlibs_CXX=yes
+ ;;
+
+ gnu*)
+ ;;
+
+ hpux9*)
+ hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
+ hardcode_libdir_separator_CXX=:
+ export_dynamic_flag_spec_CXX='${wl}-E'
+ hardcode_direct_CXX=yes
+ hardcode_minus_L_CXX=yes # Not in the search PATH,
+ # but as the default
+ # location of the library.
+
+ case $cc_basename in
+ CC*)
+ # FIXME: insert proper C++ library support
+ ld_shlibs_CXX=no
+ ;;
+ aCC*)
+ archive_cmds_CXX='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+ # Commands to make compiler produce verbose output that lists
+ # what "hidden" libraries, object files and flags are used when
+ # linking a shared library.
+ #
+ # There doesn't appear to be a way to prevent this compiler from
+ # explicitly linking system object files so we need to strip them
+ # from the output so that they don't get included in the library
+ # dependencies.
+ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+ ;;
+ *)
+ if test "$GXX" = yes; then
+ archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+ else
+ # FIXME: insert proper C++ library support
+ ld_shlibs_CXX=no
+ fi
+ ;;
+ esac
+ ;;
+
+ hpux10*|hpux11*)
+ if test $with_gnu_ld = no; then
+ hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
+ hardcode_libdir_separator_CXX=:
+
+ case $host_cpu in
+ hppa*64*|ia64*)
+ ;;
+ *)
+ export_dynamic_flag_spec_CXX='${wl}-E'
+ ;;
+ esac
+ fi
+ case $host_cpu in
+ hppa*64*|ia64*)
+ hardcode_direct_CXX=no
+ hardcode_shlibpath_var_CXX=no
+ ;;
+ *)
+ hardcode_direct_CXX=yes
+ hardcode_direct_absolute_CXX=yes
+ hardcode_minus_L_CXX=yes # Not in the search PATH,
+ # but as the default
+ # location of the library.
+ ;;
+ esac
+
+ case $cc_basename in
+ CC*)
+ # FIXME: insert proper C++ library support
+ ld_shlibs_CXX=no
+ ;;
+ aCC*)
+ case $host_cpu in
+ hppa*64*)
+ archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ ;;
+ ia64*)
+ archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ ;;
+ *)
+ archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ ;;
+ esac
+ # Commands to make compiler produce verbose output that lists
+ # what "hidden" libraries, object files and flags are used when
+ # linking a shared library.
+ #
+ # There doesn't appear to be a way to prevent this compiler from
+ # explicitly linking system object files so we need to strip them
+ # from the output so that they don't get included in the library
+ # dependencies.
+ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+ ;;
+ *)
+ if test "$GXX" = yes; then
+ if test $with_gnu_ld = no; then
+ case $host_cpu in
+ hppa*64*)
+ archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ ;;
+ ia64*)
+ archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ ;;
+ *)
+ archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ ;;
+ esac
+ fi
+ else
+ # FIXME: insert proper C++ library support
+ ld_shlibs_CXX=no
+ fi
+ ;;
esac
- archive_cmds_need_lc_CXX=no
- hardcode_direct_CXX=no
- hardcode_automatic_CXX=yes
- hardcode_shlibpath_var_CXX=unsupported
- whole_archive_flag_spec_CXX=''
- link_all_deplibs_CXX=yes
-
- if test "$GXX" = yes ; then
- lt_int_apple_cc_single_mod=no
- output_verbose_link_cmd='echo'
- if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
- lt_int_apple_cc_single_mod=yes
- fi
- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
- archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
- else
- archive_cmds_CXX='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
- fi
- module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
- archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- else
- archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- fi
- module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- else
- case $cc_basename in
- xlc*)
- output_verbose_link_cmd='echo'
- archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
- module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
- archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- ;;
- *)
- ld_shlibs_CXX=no
- ;;
- esac
- fi
;;
- dgux*)
- case $cc_basename in
- ec++*)
- # FIXME: insert proper C++ library support
- ld_shlibs_CXX=no
- ;;
- ghcx*)
- # Green Hills C++ Compiler
- # FIXME: insert proper C++ library support
- ld_shlibs_CXX=no
- ;;
- *)
- # FIXME: insert proper C++ library support
- ld_shlibs_CXX=no
- ;;
- esac
- ;;
- freebsd[12]*)
- # C++ shared libraries reported to be fairly broken before switch to ELF
- ld_shlibs_CXX=no
- ;;
- freebsd-elf*)
- archive_cmds_need_lc_CXX=no
- ;;
- freebsd* | dragonfly*)
- # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
- # conventions
- ld_shlibs_CXX=yes
- ;;
- gnu*)
- ;;
- hpux9*)
- hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
- hardcode_libdir_separator_CXX=:
- export_dynamic_flag_spec_CXX='${wl}-E'
- hardcode_direct_CXX=yes
- hardcode_minus_L_CXX=yes # Not in the search PATH,
- # but as the default
- # location of the library.
-
- case $cc_basename in
- CC*)
- # FIXME: insert proper C++ library support
- ld_shlibs_CXX=no
- ;;
- aCC*)
- archive_cmds_CXX='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
- # Commands to make compiler produce verbose output that lists
- # what "hidden" libraries, object files and flags are used when
- # linking a shared library.
- #
- # There doesn't appear to be a way to prevent this compiler from
- # explicitly linking system object files so we need to strip them
- # from the output so that they don't get included in the library
- # dependencies.
- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[-]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
- ;;
- *)
- if test "$GXX" = yes; then
- archive_cmds_CXX='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
- else
- # FIXME: insert proper C++ library support
- ld_shlibs_CXX=no
- fi
- ;;
- esac
- ;;
- hpux10*|hpux11*)
- if test $with_gnu_ld = no; then
- hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
- hardcode_libdir_separator_CXX=:
-
- case $host_cpu in
- hppa*64*|ia64*) ;;
- *)
+ interix[3-9]*)
+ hardcode_direct_CXX=no
+ hardcode_shlibpath_var_CXX=no
+ hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
export_dynamic_flag_spec_CXX='${wl}-E'
+ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+ # Instead, shared libraries are loaded at an image base (0x10000000 by
+ # default) and relocated if they conflict, which is a slow very memory
+ # consuming and fragmenting process. To avoid this, we pick a random,
+ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+ # time. Moving up from 0x10000000 also allows more sbrk(2) space.
+ archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ archive_expsym_cmds_CXX='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ ;;
+ irix5* | irix6*)
+ case $cc_basename in
+ CC*)
+ # SGI C++
+ archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+
+ # Archives containing C++ object files must be created using
+ # "CC -ar", where "CC" is the IRIX C++ compiler. This is
+ # necessary to make sure instantiated templates are included
+ # in the archive.
+ old_archive_cmds_CXX='$CC -ar -WR,-u -o $oldlib $oldobjs'
+ ;;
+ *)
+ if test "$GXX" = yes; then
+ if test "$with_gnu_ld" = no; then
+ archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ else
+ archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib'
+ fi
+ fi
+ link_all_deplibs_CXX=yes
+ ;;
+ esac
+ hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+ hardcode_libdir_separator_CXX=:
+ inherit_rpath_CXX=yes
;;
- esac
- fi
- case $host_cpu in
- hppa*64*|ia64*)
- hardcode_direct_CXX=no
- hardcode_shlibpath_var_CXX=no
- ;;
- *)
- hardcode_direct_CXX=yes
- hardcode_minus_L_CXX=yes # Not in the search PATH,
- # but as the default
- # location of the library.
- ;;
- esac
- case $cc_basename in
- CC*)
- # FIXME: insert proper C++ library support
- ld_shlibs_CXX=no
- ;;
- aCC*)
- case $host_cpu in
- hppa*64*)
- archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
- ;;
- ia64*)
- archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
- ;;
- *)
- archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
- ;;
- esac
- # Commands to make compiler produce verbose output that lists
- # what "hidden" libraries, object files and flags are used when
- # linking a shared library.
- #
- # There doesn't appear to be a way to prevent this compiler from
- # explicitly linking system object files so we need to strip them
- # from the output so that they don't get included in the library
- # dependencies.
- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
- ;;
- *)
- if test "$GXX" = yes; then
- if test $with_gnu_ld = no; then
- case $host_cpu in
- hppa*64*)
- archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ linux* | k*bsd*-gnu)
+ case $cc_basename in
+ KCC*)
+ # Kuck and Associates, Inc. (KAI) C++ Compiler
+
+ # KCC will only create a shared library if the output file
+ # ends with ".so" (or ".sl" for HP-UX), so rename the library
+ # to its proper name (with version) after linking.
+ archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+ archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
+ # Commands to make compiler produce verbose output that lists
+ # what "hidden" libraries, object files and flags are used when
+ # linking a shared library.
+ #
+ # There doesn't appear to be a way to prevent this compiler from
+ # explicitly linking system object files so we need to strip them
+ # from the output so that they don't get included in the library
+ # dependencies.
+ output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+
+ hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+ export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
+
+ # Archives containing C++ object files must be created using
+ # "CC -Bstatic", where "CC" is the KAI C++ compiler.
+ old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
+ ;;
+ icpc* | ecpc* )
+ # Intel C++
+ with_gnu_ld=yes
+ # version 8.0 and above of icpc choke on multiply defined symbols
+ # if we add $predep_objects and $postdep_objects, however 7.1 and
+ # earlier do not add the objects themselves.
+ case `$CC -V 2>&1` in
+ *"Version 7."*)
+ archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ ;;
+ *) # Version 8.0 or newer
+ tmp_idyn=
+ case $host_cpu in
+ ia64*) tmp_idyn=' -i_dynamic';;
+ esac
+ archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ ;;
+ esac
+ archive_cmds_need_lc_CXX=no
+ hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+ export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
+ whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+ ;;
+ pgCC* | pgcpp*)
+ # Portland Group C++ compiler
+ case `$CC -V` in
+ *pgCC\ [1-5]* | *pgcpp\ [1-5]*)
+ prelink_cmds_CXX='tpldir=Template.dir~
+ rm -rf $tpldir~
+ $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
+ compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
+ old_archive_cmds_CXX='tpldir=Template.dir~
+ rm -rf $tpldir~
+ $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
+ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
+ $RANLIB $oldlib'
+ archive_cmds_CXX='tpldir=Template.dir~
+ rm -rf $tpldir~
+ $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+ archive_expsym_cmds_CXX='tpldir=Template.dir~
+ rm -rf $tpldir~
+ $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
;;
- ia64*)
- archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ *) # Version 6 will use weak symbols
+ archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+ archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
;;
- *)
- archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ esac
+
+ hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
+ export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
+ whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+ ;;
+ cxx*)
+ # Compaq C++
+ archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
+
+ runpath_var=LD_RUN_PATH
+ hardcode_libdir_flag_spec_CXX='-rpath $libdir'
+ hardcode_libdir_separator_CXX=:
+
+ # Commands to make compiler produce verbose output that lists
+ # what "hidden" libraries, object files and flags are used when
+ # linking a shared library.
+ #
+ # There doesn't appear to be a way to prevent this compiler from
+ # explicitly linking system object files so we need to strip them
+ # from the output so that they don't get included in the library
+ # dependencies.
+ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+ ;;
+ xl*)
+ # IBM XL 8.0 on PPC, with GNU ld
+ hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+ export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
+ archive_cmds_CXX='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ if test "x$supports_anon_versioning" = xyes; then
+ archive_expsym_cmds_CXX='echo "{ global:" > $output_objdir/$libname.ver~
+ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+ echo "local: *; };" >> $output_objdir/$libname.ver~
+ $CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ fi
+ ;;
+ *)
+ case `$CC -V 2>&1 | sed 5q` in
+ *Sun\ C*)
+ # Sun C++ 5.9
+ no_undefined_flag_CXX=' -zdefs'
+ archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
+ hardcode_libdir_flag_spec_CXX='-R$libdir'
+ whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+ compiler_needs_object_CXX=yes
+
+ # Not sure whether something based on
+ # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
+ # would be better.
+ output_verbose_link_cmd='echo'
+
+ # Archives containing C++ object files must be created using
+ # "CC -xar", where "CC" is the Sun C++ compiler. This is
+ # necessary to make sure instantiated templates are included
+ # in the archive.
+ old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
;;
esac
- fi
- else
- # FIXME: insert proper C++ library support
- ld_shlibs_CXX=no
- fi
- ;;
- esac
- ;;
- interix[3-9]*)
- hardcode_direct_CXX=no
- hardcode_shlibpath_var_CXX=no
- hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
- export_dynamic_flag_spec_CXX='${wl}-E'
- # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
- # Instead, shared libraries are loaded at an image base (0x10000000 by
- # default) and relocated if they conflict, which is a slow very memory
- # consuming and fragmenting process. To avoid this, we pick a random,
- # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
- # time. Moving up from 0x10000000 also allows more sbrk(2) space.
- archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
- archive_expsym_cmds_CXX='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
- ;;
- irix5* | irix6*)
- case $cc_basename in
- CC*)
- # SGI C++
- archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-
- # Archives containing C++ object files must be created using
- # "CC -ar", where "CC" is the IRIX C++ compiler. This is
- # necessary to make sure instantiated templates are included
- # in the archive.
- old_archive_cmds_CXX='$CC -ar -WR,-u -o $oldlib $oldobjs'
- ;;
- *)
- if test "$GXX" = yes; then
- if test "$with_gnu_ld" = no; then
- archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
- else
- archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
- fi
- fi
- link_all_deplibs_CXX=yes
- ;;
- esac
- hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
- hardcode_libdir_separator_CXX=:
- ;;
- linux* | k*bsd*-gnu)
- case $cc_basename in
- KCC*)
- # Kuck and Associates, Inc. (KAI) C++ Compiler
-
- # KCC will only create a shared library if the output file
- # ends with ".so" (or ".sl" for HP-UX), so rename the library
- # to its proper name (with version) after linking.
- archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
- archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
- # Commands to make compiler produce verbose output that lists
- # what "hidden" libraries, object files and flags are used when
- # linking a shared library.
- #
- # There doesn't appear to be a way to prevent this compiler from
- # explicitly linking system object files so we need to strip them
- # from the output so that they don't get included in the library
- # dependencies.
- output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-
- hardcode_libdir_flag_spec_CXX='${wl}--rpath,$libdir'
- export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-
- # Archives containing C++ object files must be created using
- # "CC -Bstatic", where "CC" is the KAI C++ compiler.
- old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
- ;;
- icpc*)
- # Intel C++
- with_gnu_ld=yes
- # version 8.0 and above of icpc choke on multiply defined symbols
- # if we add $predep_objects and $postdep_objects, however 7.1 and
- # earlier do not add the objects themselves.
- case `$CC -V 2>&1` in
- *"Version 7."*)
- archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
- archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- ;;
- *) # Version 8.0 or newer
- tmp_idyn=
- case $host_cpu in
- ia64*) tmp_idyn=' -i_dynamic';;
- esac
- archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- ;;
+ ;;
esac
- archive_cmds_need_lc_CXX=no
- hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
- export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
- whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
;;
- pgCC*)
- # Portland Group C++ compiler
- archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
- archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
-
- hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
- export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
- whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
- ;;
- cxx*)
- # Compaq C++
- archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
- archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
- runpath_var=LD_RUN_PATH
- hardcode_libdir_flag_spec_CXX='-rpath $libdir'
- hardcode_libdir_separator_CXX=:
-
- # Commands to make compiler produce verbose output that lists
- # what "hidden" libraries, object files and flags are used when
- # linking a shared library.
- #
- # There doesn't appear to be a way to prevent this compiler from
- # explicitly linking system object files so we need to strip them
- # from the output so that they don't get included in the library
- # dependencies.
- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
- ;;
- *)
- case `$CC -V 2>&1 | sed 5q` in
- *Sun\ C*)
- # Sun C++ 5.9
- no_undefined_flag_CXX=' -zdefs'
- archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
- archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
- hardcode_libdir_flag_spec_CXX='-R$libdir'
- whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-
- # Not sure whether something based on
- # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
- # would be better.
- output_verbose_link_cmd='echo'
-
- # Archives containing C++ object files must be created using
- # "CC -xar", where "CC" is the Sun C++ compiler. This is
- # necessary to make sure instantiated templates are included
- # in the archive.
- old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
- ;;
- esac
- ;;
- esac
- ;;
- lynxos*)
- # FIXME: insert proper C++ library support
- ld_shlibs_CXX=no
- ;;
- m88k*)
- # FIXME: insert proper C++ library support
- ld_shlibs_CXX=no
- ;;
- mvs*)
- case $cc_basename in
- cxx*)
- # FIXME: insert proper C++ library support
- ld_shlibs_CXX=no
- ;;
- *)
- # FIXME: insert proper C++ library support
+ lynxos*)
+ # FIXME: insert proper C++ library support
ld_shlibs_CXX=no
;;
- esac
- ;;
- netbsd*)
- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
- wlarc=
- hardcode_libdir_flag_spec_CXX='-R$libdir'
- hardcode_direct_CXX=yes
- hardcode_shlibpath_var_CXX=no
- fi
- # Workaround some broken pre-1.5 toolchains
- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
- ;;
- openbsd2*)
- # C++ shared libraries are fairly broken
- ld_shlibs_CXX=no
- ;;
- openbsd*)
- if test -f /usr/libexec/ld.so; then
- hardcode_direct_CXX=yes
- hardcode_shlibpath_var_CXX=no
- archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
- hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
- export_dynamic_flag_spec_CXX='${wl}-E'
- whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
- fi
- output_verbose_link_cmd='echo'
- else
- ld_shlibs_CXX=no
- fi
- ;;
- osf3*)
- case $cc_basename in
- KCC*)
- # Kuck and Associates, Inc. (KAI) C++ Compiler
- # KCC will only create a shared library if the output file
- # ends with ".so" (or ".sl" for HP-UX), so rename the library
- # to its proper name (with version) after linking.
- archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+ m88k*)
+ # FIXME: insert proper C++ library support
+ ld_shlibs_CXX=no
+ ;;
- hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
- hardcode_libdir_separator_CXX=:
+ mvs*)
+ case $cc_basename in
+ cxx*)
+ # FIXME: insert proper C++ library support
+ ld_shlibs_CXX=no
+ ;;
+ *)
+ # FIXME: insert proper C++ library support
+ ld_shlibs_CXX=no
+ ;;
+ esac
+ ;;
- # Archives containing C++ object files must be created using
- # "CC -Bstatic", where "CC" is the KAI C++ compiler.
- old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
+ netbsd*)
+ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+ archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
+ wlarc=
+ hardcode_libdir_flag_spec_CXX='-R$libdir'
+ hardcode_direct_CXX=yes
+ hardcode_shlibpath_var_CXX=no
+ fi
+ # Workaround some broken pre-1.5 toolchains
+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
+ ;;
+ *nto* | *qnx*)
+ ld_shlibs_CXX=yes
;;
- RCC*)
- # Rational C++ 2.4.1
- # FIXME: insert proper C++ library support
+
+ openbsd2*)
+ # C++ shared libraries are fairly broken
ld_shlibs_CXX=no
;;
- cxx*)
- allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
- archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-
- hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
- hardcode_libdir_separator_CXX=:
-
- # Commands to make compiler produce verbose output that lists
- # what "hidden" libraries, object files and flags are used when
- # linking a shared library.
- #
- # There doesn't appear to be a way to prevent this compiler from
- # explicitly linking system object files so we need to strip them
- # from the output so that they don't get included in the library
- # dependencies.
- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
- ;;
- *)
- if test "$GXX" = yes && test "$with_gnu_ld" = no; then
- allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
- archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-
- hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
- hardcode_libdir_separator_CXX=:
-
- # Commands to make compiler produce verbose output that lists
- # what "hidden" libraries, object files and flags are used when
- # linking a shared library.
- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
+ openbsd*)
+ if test -f /usr/libexec/ld.so; then
+ hardcode_direct_CXX=yes
+ hardcode_shlibpath_var_CXX=no
+ hardcode_direct_absolute_CXX=yes
+ archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+ hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
+ export_dynamic_flag_spec_CXX='${wl}-E'
+ whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+ fi
+ output_verbose_link_cmd=echo
else
- # FIXME: insert proper C++ library support
ld_shlibs_CXX=no
fi
;;
- esac
- ;;
- osf4* | osf5*)
- case $cc_basename in
- KCC*)
- # Kuck and Associates, Inc. (KAI) C++ Compiler
- # KCC will only create a shared library if the output file
- # ends with ".so" (or ".sl" for HP-UX), so rename the library
- # to its proper name (with version) after linking.
- archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+ osf3* | osf4* | osf5*)
+ case $cc_basename in
+ KCC*)
+ # Kuck and Associates, Inc. (KAI) C++ Compiler
+
+ # KCC will only create a shared library if the output file
+ # ends with ".so" (or ".sl" for HP-UX), so rename the library
+ # to its proper name (with version) after linking.
+ archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+
+ hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+ hardcode_libdir_separator_CXX=:
+
+ # Archives containing C++ object files must be created using
+ # the KAI C++ compiler.
+ case $host in
+ osf3*) old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs' ;;
+ *) old_archive_cmds_CXX='$CC -o $oldlib $oldobjs' ;;
+ esac
+ ;;
+ RCC*)
+ # Rational C++ 2.4.1
+ # FIXME: insert proper C++ library support
+ ld_shlibs_CXX=no
+ ;;
+ cxx*)
+ case $host in
+ osf3*)
+ allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
+ archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+ hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+ ;;
+ *)
+ allow_undefined_flag_CXX=' -expect_unresolved \*'
+ archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+ archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
+ echo "-hidden">> $lib.exp~
+ $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~
+ $RM $lib.exp'
+ hardcode_libdir_flag_spec_CXX='-rpath $libdir'
+ ;;
+ esac
+
+ hardcode_libdir_separator_CXX=:
- hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
- hardcode_libdir_separator_CXX=:
+ # Commands to make compiler produce verbose output that lists
+ # what "hidden" libraries, object files and flags are used when
+ # linking a shared library.
+ #
+ # There doesn't appear to be a way to prevent this compiler from
+ # explicitly linking system object files so we need to strip them
+ # from the output so that they don't get included in the library
+ # dependencies.
+ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+ ;;
+ *)
+ if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+ allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
+ case $host in
+ osf3*)
+ archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ ;;
+ *)
+ archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ ;;
+ esac
+
+ hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+ hardcode_libdir_separator_CXX=:
+
+ # Commands to make compiler produce verbose output that lists
+ # what "hidden" libraries, object files and flags are used when
+ # linking a shared library.
+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+
+ else
+ # FIXME: insert proper C++ library support
+ ld_shlibs_CXX=no
+ fi
+ ;;
+ esac
+ ;;
- # Archives containing C++ object files must be created using
- # the KAI C++ compiler.
- old_archive_cmds_CXX='$CC -o $oldlib $oldobjs'
- ;;
- RCC*)
- # Rational C++ 2.4.1
- # FIXME: insert proper C++ library support
- ld_shlibs_CXX=no
- ;;
- cxx*)
- allow_undefined_flag_CXX=' -expect_unresolved \*'
- archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
- archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
- echo "-hidden">> $lib.exp~
- $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~
- $rm $lib.exp'
-
- hardcode_libdir_flag_spec_CXX='-rpath $libdir'
- hardcode_libdir_separator_CXX=:
-
- # Commands to make compiler produce verbose output that lists
- # what "hidden" libraries, object files and flags are used when
- # linking a shared library.
- #
- # There doesn't appear to be a way to prevent this compiler from
- # explicitly linking system object files so we need to strip them
- # from the output so that they don't get included in the library
- # dependencies.
- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
- ;;
- *)
- if test "$GXX" = yes && test "$with_gnu_ld" = no; then
- allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
- archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ psos*)
+ # FIXME: insert proper C++ library support
+ ld_shlibs_CXX=no
+ ;;
- hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
- hardcode_libdir_separator_CXX=:
+ sunos4*)
+ case $cc_basename in
+ CC*)
+ # Sun C++ 4.x
+ # FIXME: insert proper C++ library support
+ ld_shlibs_CXX=no
+ ;;
+ lcc*)
+ # Lucid
+ # FIXME: insert proper C++ library support
+ ld_shlibs_CXX=no
+ ;;
+ *)
+ # FIXME: insert proper C++ library support
+ ld_shlibs_CXX=no
+ ;;
+ esac
+ ;;
+
+ solaris*)
+ case $cc_basename in
+ CC*)
+ # Sun C++ 4.2, 5.x and Centerline C++
+ archive_cmds_need_lc_CXX=yes
+ no_undefined_flag_CXX=' -zdefs'
+ archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+ $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+ hardcode_libdir_flag_spec_CXX='-R$libdir'
+ hardcode_shlibpath_var_CXX=no
+ case $host_os in
+ solaris2.[0-5] | solaris2.[0-5].*) ;;
+ *)
+ # The compiler driver will combine and reorder linker options,
+ # but understands `-z linker_flag'.
+ # Supported since Solaris 2.6 (maybe 2.5.1?)
+ whole_archive_flag_spec_CXX='-z allextract$convenience -z defaultextract'
+ ;;
+ esac
+ link_all_deplibs_CXX=yes
- # Commands to make compiler produce verbose output that lists
- # what "hidden" libraries, object files and flags are used when
- # linking a shared library.
- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
+ output_verbose_link_cmd='echo'
- else
- # FIXME: insert proper C++ library support
- ld_shlibs_CXX=no
- fi
- ;;
- esac
- ;;
- psos*)
- # FIXME: insert proper C++ library support
- ld_shlibs_CXX=no
- ;;
- sunos4*)
- case $cc_basename in
- CC*)
- # Sun C++ 4.x
- # FIXME: insert proper C++ library support
- ld_shlibs_CXX=no
- ;;
- lcc*)
- # Lucid
- # FIXME: insert proper C++ library support
- ld_shlibs_CXX=no
- ;;
- *)
- # FIXME: insert proper C++ library support
- ld_shlibs_CXX=no
- ;;
- esac
- ;;
- solaris*)
- case $cc_basename in
- CC*)
- # Sun C++ 4.2, 5.x and Centerline C++
- archive_cmds_need_lc_CXX=yes
- no_undefined_flag_CXX=' -zdefs'
- archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
- archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
- $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
-
- hardcode_libdir_flag_spec_CXX='-R$libdir'
+ # Archives containing C++ object files must be created using
+ # "CC -xar", where "CC" is the Sun C++ compiler. This is
+ # necessary to make sure instantiated templates are included
+ # in the archive.
+ old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
+ ;;
+ gcx*)
+ # Green Hills C++ Compiler
+ archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+
+ # The C++ compiler must be used to create the archive.
+ old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
+ ;;
+ *)
+ # GNU C++ compiler with Solaris linker
+ if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+ no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
+ if $CC --version | $GREP -v '^2\.7' > /dev/null; then
+ archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+ archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+ $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+ # Commands to make compiler produce verbose output that lists
+ # what "hidden" libraries, object files and flags are used when
+ # linking a shared library.
+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+ else
+ # g++ 2.7 appears to require `-G' NOT `-shared' on this
+ # platform.
+ archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+ archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+ $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+ # Commands to make compiler produce verbose output that lists
+ # what "hidden" libraries, object files and flags are used when
+ # linking a shared library.
+ output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+ fi
+
+ hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
+ case $host_os in
+ solaris2.[0-5] | solaris2.[0-5].*) ;;
+ *)
+ whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+ ;;
+ esac
+ fi
+ ;;
+ esac
+ ;;
+
+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
+ no_undefined_flag_CXX='${wl}-z,text'
+ archive_cmds_need_lc_CXX=no
+ hardcode_shlibpath_var_CXX=no
+ runpath_var='LD_RUN_PATH'
+
+ case $cc_basename in
+ CC*)
+ archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ *)
+ archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ esac
+ ;;
+
+ sysv5* | sco3.2v5* | sco5v6*)
+ # Note: We can NOT use -z defs as we might desire, because we do not
+ # link with -lc, and that would cause any symbols used from libc to
+ # always be unresolved, which means just about no library would
+ # ever link correctly. If we're not using GNU ld we use -z text
+ # though, which does catch some bad symbols but isn't as heavy-handed
+ # as -z defs.
+ no_undefined_flag_CXX='${wl}-z,text'
+ allow_undefined_flag_CXX='${wl}-z,nodefs'
+ archive_cmds_need_lc_CXX=no
hardcode_shlibpath_var_CXX=no
- case $host_os in
- solaris2.[0-5] | solaris2.[0-5].*) ;;
+ hardcode_libdir_flag_spec_CXX='${wl}-R,$libdir'
+ hardcode_libdir_separator_CXX=':'
+ link_all_deplibs_CXX=yes
+ export_dynamic_flag_spec_CXX='${wl}-Bexport'
+ runpath_var='LD_RUN_PATH'
+
+ case $cc_basename in
+ CC*)
+ archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
*)
- # The compiler driver will combine and reorder linker options,
- # but understands `-z linker_flag'.
- # Supported since Solaris 2.6 (maybe 2.5.1?)
- whole_archive_flag_spec_CXX='-z allextract$convenience -z defaultextract'
+ archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
;;
esac
- link_all_deplibs_CXX=yes
-
- output_verbose_link_cmd='echo'
-
- # Archives containing C++ object files must be created using
- # "CC -xar", where "CC" is the Sun C++ compiler. This is
- # necessary to make sure instantiated templates are included
- # in the archive.
- old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
- ;;
- gcx*)
- # Green Hills C++ Compiler
- archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-
- # The C++ compiler must be used to create the archive.
- old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
- ;;
- *)
- # GNU C++ compiler with Solaris linker
- if test "$GXX" = yes && test "$with_gnu_ld" = no; then
- no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
- if $CC --version | grep -v '^2\.7' > /dev/null; then
- archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
- archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
- $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+ ;;
- # Commands to make compiler produce verbose output that lists
- # what "hidden" libraries, object files and flags are used when
- # linking a shared library.
- output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
- else
- # g++ 2.7 appears to require `-G' NOT `-shared' on this
- # platform.
- archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
- archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
- $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+ tandem*)
+ case $cc_basename in
+ NCC*)
+ # NonStop-UX NCC 3.20
+ # FIXME: insert proper C++ library support
+ ld_shlibs_CXX=no
+ ;;
+ *)
+ # FIXME: insert proper C++ library support
+ ld_shlibs_CXX=no
+ ;;
+ esac
+ ;;
- # Commands to make compiler produce verbose output that lists
- # what "hidden" libraries, object files and flags are used when
- # linking a shared library.
- output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
- fi
+ vxworks*)
+ # FIXME: insert proper C++ library support
+ ld_shlibs_CXX=no
+ ;;
- hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
- case $host_os in
- solaris2.[0-5] | solaris2.[0-5].*) ;;
- *)
- whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
- ;;
- esac
- fi
- ;;
- esac
- ;;
- sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
- no_undefined_flag_CXX='${wl}-z,text'
- archive_cmds_need_lc_CXX=no
- hardcode_shlibpath_var_CXX=no
- runpath_var='LD_RUN_PATH'
-
- case $cc_basename in
- CC*)
- archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- ;;
*)
- archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- ;;
- esac
- ;;
- sysv5* | sco3.2v5* | sco5v6*)
- # Note: We can NOT use -z defs as we might desire, because we do not
- # link with -lc, and that would cause any symbols used from libc to
- # always be unresolved, which means just about no library would
- # ever link correctly. If we're not using GNU ld we use -z text
- # though, which does catch some bad symbols but isn't as heavy-handed
- # as -z defs.
- # For security reasons, it is highly recommended that you always
- # use absolute paths for naming shared libraries, and exclude the
- # DT_RUNPATH tag from executables and libraries. But doing so
- # requires that you compile everything twice, which is a pain.
- # So that behaviour is only enabled if SCOABSPATH is set to a
- # non-empty value in the environment. Most likely only useful for
- # creating official distributions of packages.
- # This is a hack until libtool officially supports absolute path
- # names for shared libraries.
- no_undefined_flag_CXX='${wl}-z,text'
- allow_undefined_flag_CXX='${wl}-z,nodefs'
- archive_cmds_need_lc_CXX=no
- hardcode_shlibpath_var_CXX=no
- hardcode_libdir_flag_spec_CXX='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
- hardcode_libdir_separator_CXX=':'
- link_all_deplibs_CXX=yes
- export_dynamic_flag_spec_CXX='${wl}-Bexport'
- runpath_var='LD_RUN_PATH'
-
- case $cc_basename in
- CC*)
- archive_cmds_CXX='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
- archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
- ;;
- *)
- archive_cmds_CXX='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
- archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
- ;;
- esac
- ;;
- tandem*)
- case $cc_basename in
- NCC*)
- # NonStop-UX NCC 3.20
- # FIXME: insert proper C++ library support
- ld_shlibs_CXX=no
- ;;
- *)
- # FIXME: insert proper C++ library support
- ld_shlibs_CXX=no
- ;;
+ # FIXME: insert proper C++ library support
+ ld_shlibs_CXX=no
+ ;;
esac
- ;;
- vxworks*)
- # FIXME: insert proper C++ library support
- ld_shlibs_CXX=no
- ;;
- *)
- # FIXME: insert proper C++ library support
- ld_shlibs_CXX=no
- ;;
-esac
-{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
-echo "${ECHO_T}$ld_shlibs_CXX" >&6; }
-test "$ld_shlibs_CXX" = no && can_build_shared=no
-GCC_CXX="$GXX"
-LD_CXX="$LD"
+ { $as_echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
+$as_echo "$ld_shlibs_CXX" >&6; }
+ test "$ld_shlibs_CXX" = no && can_build_shared=no
+ GCC_CXX="$GXX"
+ LD_CXX="$LD"
+
+ ## CAVEAT EMPTOR:
+ ## There is no encapsulation within the following macros, do not change
+ ## the running order or otherwise move them around unless you know exactly
+ ## what you are doing...
+ # Dependencies to place before and after the object being linked:
+predep_objects_CXX=
+postdep_objects_CXX=
+predeps_CXX=
+postdeps_CXX=
+compiler_lib_search_path_CXX=
-cat > conftest.$ac_ext <<EOF
+cat > conftest.$ac_ext <<_LT_EOF
class Foo
{
public:
@@ -13400,12 +16059,12 @@ public:
private:
int a;
};
-EOF
+_LT_EOF
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
# Parse the compiler output and extract the necessary
# objects, libraries and library flags.
@@ -13414,19 +16073,14 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
# the conftest object file.
pre_test_object_deps_done=no
- # The `*' in the case matches for architectures that use `case' in
- # $output_verbose_cmd can trigger glob expansion during the loop
- # eval without this substitution.
- output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"`
-
- for p in `eval $output_verbose_link_cmd`; do
+ for p in `eval "$output_verbose_link_cmd"`; do
case $p in
-L* | -R* | -l*)
# Some compilers place space between "-{L,R}" and the path.
# Remove the space.
- if test $p = "-L" \
- || test $p = "-R"; then
+ if test $p = "-L" ||
+ test $p = "-R"; then
prev=$p
continue
else
@@ -13491,7 +16145,7 @@ else
echo "libtool.m4: error: problem compiling CXX test program"
fi
-$rm -f confest.$objext
+$RM -f confest.$objext
# PORTME: override above test on systems where it is broken
case $host_os in
@@ -13507,7 +16161,7 @@ linux*)
case `$CC -V 2>&1 | sed 5q` in
*Sun\ C*)
# Sun C++ 5.9
- #
+
# The more standards-conforming stlport4 library is
# incompatible with the Cstd library. Avoid specifying
# it if it's in CXXFLAGS. Ignore libCrun as
@@ -13517,6 +16171,7 @@ linux*)
solaris_use_stlport4=yes
;;
esac
+
if test "$solaris_use_stlport4" != yes; then
postdeps_CXX='-library=Cstd -library=Crun'
fi
@@ -13552,13 +16207,47 @@ esac
case " $postdeps_CXX " in
*" -lc "*) archive_cmds_need_lc_CXX=no ;;
esac
+ compiler_lib_search_dirs_CXX=
+if test -n "${compiler_lib_search_path_CXX}"; then
+ compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+
-lt_prog_compiler_wl_CXX=
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ lt_prog_compiler_wl_CXX=
lt_prog_compiler_pic_CXX=
lt_prog_compiler_static_CXX=
-{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
# C++ specific cases for pic, static, wl, etc.
if test "$GXX" = yes; then
@@ -13573,16 +16262,26 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
lt_prog_compiler_static_CXX='-Bstatic'
fi
;;
+
amigaos*)
- # FIXME: we need at least 68020 code to build shared libraries, but
- # adding the `-m68020' flag to GCC prevents building anything better,
- # like `-m68040'.
- lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4'
+ case $host_cpu in
+ powerpc)
+ # see comment about AmigaOS4 .so support
+ lt_prog_compiler_pic_CXX='-fPIC'
+ ;;
+ m68k)
+ # FIXME: we need at least 68020 code to build shared libraries, but
+ # adding the `-m68020' flag to GCC prevents building anything better,
+ # like `-m68040'.
+ lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4'
+ ;;
+ esac
;;
+
beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
# PIC is the default for these OSes.
;;
- mingw* | cygwin* | os2* | pw32*)
+ mingw* | cygwin* | os2* | pw32* | cegcc*)
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
# Although the cygwin gcc ignores -fPIC, still need this for old-style
@@ -13608,23 +16307,29 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
fi
;;
hpux*)
- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
- # not for PA HP-UX.
+ # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
+ # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag
+ # sets the default TLS model and affects inlining.
case $host_cpu in
- hppa*64*|ia64*)
+ hppa*64*)
;;
*)
lt_prog_compiler_pic_CXX='-fPIC'
;;
esac
;;
+ *qnx* | *nto*)
+ # QNX uses GNU C++, but need to define -shared option too, otherwise
+ # it will coredump.
+ lt_prog_compiler_pic_CXX='-fPIC -shared'
+ ;;
*)
lt_prog_compiler_pic_CXX='-fPIC'
;;
esac
else
case $host_os in
- aix4* | aix5*)
+ aix[4-9]*)
# All AIX code is PIC.
if test "$host_cpu" = ia64; then
# AIX 5 now supports IA64 processor
@@ -13637,20 +16342,10 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
case $cc_basename in
cxch68*)
# Green Hills C++ Compiler
- # _LT_AC_TAGVAR(lt_prog_compiler_static, CXX)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
+ # _LT_TAGVAR(lt_prog_compiler_static, CXX)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
;;
esac
;;
- darwin*)
- # PIC is the default on this platform
- # Common symbols not allowed in MH_DYLIB files
- case $cc_basename in
- xlc*)
- lt_prog_compiler_pic_CXX='-qnocommon'
- lt_prog_compiler_wl_CXX='-Wl,'
- ;;
- esac
- ;;
dgux*)
case $cc_basename in
ec++*)
@@ -13714,14 +16409,21 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
lt_prog_compiler_wl_CXX='--backend -Wl,'
lt_prog_compiler_pic_CXX='-fPIC'
;;
- icpc* | ecpc*)
- # Intel C++
+ ecpc* )
+ # old Intel C++ for x86_64 which still supported -KPIC.
lt_prog_compiler_wl_CXX='-Wl,'
lt_prog_compiler_pic_CXX='-KPIC'
lt_prog_compiler_static_CXX='-static'
;;
- pgCC*)
- # Portland Group C++ compiler.
+ icpc* )
+ # Intel C++, used to be incompatible with GCC.
+ # ICC 10 doesn't accept -KPIC any more.
+ lt_prog_compiler_wl_CXX='-Wl,'
+ lt_prog_compiler_pic_CXX='-fPIC'
+ lt_prog_compiler_static_CXX='-static'
+ ;;
+ pgCC* | pgcpp*)
+ # Portland Group C++ compiler
lt_prog_compiler_wl_CXX='-Wl,'
lt_prog_compiler_pic_CXX='-fpic'
lt_prog_compiler_static_CXX='-Bstatic'
@@ -13733,6 +16435,12 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
lt_prog_compiler_pic_CXX=
lt_prog_compiler_static_CXX='-non_shared'
;;
+ xlc* | xlC*)
+ # IBM XL 8.0 on PPC
+ lt_prog_compiler_wl_CXX='-Wl,'
+ lt_prog_compiler_pic_CXX='-qpic'
+ lt_prog_compiler_static_CXX='-qstaticlink'
+ ;;
*)
case `$CC -V 2>&1 | sed 5q` in
*Sun\ C*)
@@ -13760,6 +16468,11 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
;;
netbsd*)
;;
+ *qnx* | *nto*)
+ # QNX uses GNU C++, but need to define -shared option too, otherwise
+ # it will coredump.
+ lt_prog_compiler_pic_CXX='-fPIC -shared'
+ ;;
osf3* | osf4* | osf5*)
case $cc_basename in
KCC*)
@@ -13814,22 +16527,22 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
;;
esac
;;
- tandem*)
+ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
case $cc_basename in
- NCC*)
- # NonStop-UX NCC 3.20
+ CC*)
+ lt_prog_compiler_wl_CXX='-Wl,'
lt_prog_compiler_pic_CXX='-KPIC'
- ;;
- *)
+ lt_prog_compiler_static_CXX='-Bstatic'
;;
esac
;;
- sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+ tandem*)
case $cc_basename in
- CC*)
- lt_prog_compiler_wl_CXX='-Wl,'
+ NCC*)
+ # NonStop-UX NCC 3.20
lt_prog_compiler_pic_CXX='-KPIC'
- lt_prog_compiler_static_CXX='-Bstatic'
+ ;;
+ *)
;;
esac
;;
@@ -13841,21 +16554,31 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
esac
fi
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6; }
+case $host_os in
+ # For platforms which do not support PIC, -DPIC is meaningless:
+ *djgpp*)
+ lt_prog_compiler_pic_CXX=
+ ;;
+ *)
+ lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
+ ;;
+esac
+{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5
+$as_echo "$lt_prog_compiler_pic_CXX" >&6; }
+
+
#
# Check to make sure the PIC flag actually works.
#
if test -n "$lt_prog_compiler_pic_CXX"; then
-
-{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; }
-if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
+$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; }
+if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then
+ $as_echo_n "(cached) " >&6
else
- lt_prog_compiler_pic_works_CXX=no
- ac_outfile=conftest.$ac_objext
+ lt_cv_prog_compiler_pic_works_CXX=no
+ ac_outfile=conftest.$ac_objext
echo "$lt_simple_compile_test_code" > conftest.$ac_ext
lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"
# Insert the option either (1) after the last *FLAGS variable, or
@@ -13867,27 +16590,27 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13870: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16593: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13874: \$? = $ac_status" >&5
+ echo "$as_me:16597: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
- $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
- lt_prog_compiler_pic_works_CXX=yes
+ lt_cv_prog_compiler_pic_works_CXX=yes
fi
fi
- $rm conftest*
+ $RM conftest*
fi
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
+$as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; }
-if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then
+if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then
case $lt_prog_compiler_pic_CXX in
"" | " "*) ;;
*) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;;
@@ -13898,26 +16621,19 @@ else
fi
fi
-case $host_os in
- # For platforms which do not support PIC, -DPIC is meaningless:
- *djgpp*)
- lt_prog_compiler_pic_CXX=
- ;;
- *)
- lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
- ;;
-esac
+
+
#
# Check to make sure the static flag actually works.
#
wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
-{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
-if test "${lt_prog_compiler_static_works_CXX+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
+if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then
+ $as_echo_n "(cached) " >&6
else
- lt_prog_compiler_static_works_CXX=no
+ lt_cv_prog_compiler_static_works_CXX=no
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
echo "$lt_simple_link_test_code" > conftest.$ac_ext
@@ -13927,36 +16643,90 @@ else
if test -s conftest.err; then
# Append any errors to the config.log.
cat conftest.err 1>&5
- $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+ $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if diff conftest.exp conftest.er2 >/dev/null; then
- lt_prog_compiler_static_works_CXX=yes
+ lt_cv_prog_compiler_static_works_CXX=yes
fi
else
- lt_prog_compiler_static_works_CXX=yes
+ lt_cv_prog_compiler_static_works_CXX=yes
fi
fi
- $rm conftest*
+ $RM -r conftest*
LDFLAGS="$save_LDFLAGS"
fi
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5
-echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5
+$as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; }
-if test x"$lt_prog_compiler_static_works_CXX" = xyes; then
+if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then
:
else
lt_prog_compiler_static_CXX=
fi
-{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
+
+
+ { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ lt_cv_prog_compiler_c_o_CXX=no
+ $RM -r conftest 2>/dev/null
+ mkdir conftest
+ cd conftest
+ mkdir out
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+ lt_compiler_flag="-o out/conftest2.$ac_objext"
+ # Insert the option either (1) after the last *FLAGS variable, or
+ # (2) before a word containing "conftest.", or (3) at the end.
+ # Note that $ac_compile itself does not contain backslashes and begins
+ # with a dollar sign (not a hyphen), so the echo should work correctly.
+ lt_compile=`echo "$ac_compile" | $SED \
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+ (eval echo "\"\$as_me:16692: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+ echo "$as_me:16696: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings
+ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+ lt_cv_prog_compiler_c_o_CXX=yes
+ fi
+ fi
+ chmod u+w . 2>&5
+ $RM conftest*
+ # SGI C++ compiler will create directory out/ii_files/ for
+ # template instantiation
+ test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
+ $RM out/* && rmdir out
+ cd ..
+ $RM -r conftest
+ $RM conftest*
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
+$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
+
+
+
+ { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o_CXX=no
- $rm -r conftest 2>/dev/null
+ $RM -r conftest 2>/dev/null
mkdir conftest
cd conftest
mkdir out
@@ -13971,87 +16741,99 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13974: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16744: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13978: \$? = $ac_status" >&5
+ echo "$as_me:16748: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
- $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
$SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
lt_cv_prog_compiler_c_o_CXX=yes
fi
fi
chmod u+w . 2>&5
- $rm conftest*
+ $RM conftest*
# SGI C++ compiler will create directory out/ii_files/ for
# template instantiation
- test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
- $rm out/* && rmdir out
+ test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
+ $RM out/* && rmdir out
cd ..
- rmdir conftest
- $rm conftest*
+ $RM -r conftest
+ $RM conftest*
fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
+$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
+
+
hard_links="nottested"
if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then
# do not overwrite the value of need_locks provided by the user
- { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+$as_echo_n "checking if we can lock with hard links... " >&6; }
hard_links=yes
- $rm conftest*
+ $RM conftest*
ln conftest.a conftest.b 2>/dev/null && hard_links=no
touch conftest.a
ln conftest.a conftest.b 2>&5 || hard_links=no
ln conftest.a conftest.b 2>/dev/null && hard_links=no
- { echo "$as_me:$LINENO: result: $hard_links" >&5
-echo "${ECHO_T}$hard_links" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
+$as_echo "$hard_links" >&6; }
if test "$hard_links" = no; then
- { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
need_locks=warn
fi
else
need_locks=no
fi
-{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
+
+
+ { $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
case $host_os in
- aix4* | aix5*)
+ aix[4-9]*)
# If we're using GNU nm, then we don't want the "-C" option.
# -C means demangle to AIX nm, but means don't demangle with GNU nm
- if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
- export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
+ if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+ export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
else
- export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
+ export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
fi
;;
pw32*)
export_symbols_cmds_CXX="$ltdll_cmds"
;;
- cygwin* | mingw*)
- export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
+ cygwin* | mingw* | cegcc*)
+ export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
;;
*)
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
esac
+ exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
-{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
-echo "${ECHO_T}$ld_shlibs_CXX" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
+$as_echo "$ld_shlibs_CXX" >&6; }
test "$ld_shlibs_CXX" = no && can_build_shared=no
+with_gnu_ld_CXX=$with_gnu_ld
+
+
+
+
+
+
#
# Do we need to explicitly link libc?
#
@@ -14069,15 +16851,15 @@ x|xyes)
# Test whether the compiler implicitly links with -lc since on some
# systems, -lgcc has to come before -lc. If gcc already passes -lc
# to ld, don't add -lc before -lgcc.
- { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
- $rm conftest*
+ { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
+ $RM conftest*
echo "$lt_simple_compile_test_code" > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } 2>conftest.err; then
soname=conftest
lib=conftest
@@ -14092,10 +16874,10 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&
libname=conftest
lt_save_allow_undefined_flag=$allow_undefined_flag_CXX
allow_undefined_flag_CXX=
- if { (eval echo "$as_me:$LINENO: \"$archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
- (eval $archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
+ if { (eval echo "$as_me:$LINENO: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\"") >&5
+ (eval $archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
then
archive_cmds_need_lc_CXX=no
@@ -14106,17 +16888,81 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&
else
cat conftest.err 1>&5
fi
- $rm conftest*
- { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5
-echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6; }
+ $RM conftest*
+ { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5
+$as_echo "$archive_cmds_need_lc_CXX" >&6; }
;;
esac
fi
;;
esac
-{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ { $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+$as_echo_n "checking dynamic linker characteristics... " >&6; }
+
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -14130,7 +16976,6 @@ shlibpath_overrides_runpath=unknown
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
-
need_lib_prefix=unknown
hardcode_into_libs=no
@@ -14148,7 +16993,7 @@ aix3*)
soname_spec='${libname}${release}${shared_ext}$major'
;;
-aix4* | aix5*)
+aix[4-9]*)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -14167,7 +17012,7 @@ aix4* | aix5*)
aix4 | aix4.[01] | aix4.[01].*)
if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
echo ' yes '
- echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
+ echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
:
else
can_build_shared=no
@@ -14193,9 +17038,18 @@ aix4* | aix5*)
;;
amigaos*)
- library_names_spec='$libname.ixlibrary $libname.a'
- # Create ${libname}_ixlibrary.a entries in /sys/libs.
- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+ case $host_cpu in
+ powerpc)
+ # Since July 2007 AmigaOS4 officially supports .so libraries.
+ # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ ;;
+ m68k)
+ library_names_spec='$libname.ixlibrary $libname.a'
+ # Create ${libname}_ixlibrary.a entries in /sys/libs.
+ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+ ;;
+ esac
;;
beos*)
@@ -14218,25 +17072,28 @@ bsdi[45]*)
# libtool to hard-code these into programs
;;
-cygwin* | mingw* | pw32*)
+cygwin* | mingw* | pw32* | cegcc*)
version_type=windows
shrext_cmds=".dll"
need_version=no
need_lib_prefix=no
case $GCC,$host_os in
- yes,cygwin* | yes,mingw* | yes,pw32*)
+ yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
library_names_spec='$libname.dll.a'
# DLL is installed to $(libdir)/../bin by postinstall_cmds
postinstall_cmds='base_file=`basename \${file}`~
- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
$install_prog $dir/$dlname \$dldir/$dlname~
- chmod a+x \$dldir/$dlname'
+ chmod a+x \$dldir/$dlname~
+ if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+ eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+ fi'
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
- $rm \$dlpath'
+ $RM \$dlpath'
shlibpath_overrides_runpath=yes
case $host_os in
@@ -14245,20 +17102,20 @@ cygwin* | mingw* | pw32*)
soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
;;
- mingw*)
+ mingw* | cegcc*)
# MinGW DLLs use traditional 'lib' prefix
soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
- if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
+ sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
# It is most probably a Windows format PATH printed by
# mingw gcc, but we are running on Cygwin. Gcc prints its search
# path with ; separators, and with drive letters. We can handle the
# drive letters (cygwin fileutils understands them), so leave them,
# especially as we might pass files found there to a mingw objdump,
# which wouldn't understand a cygwinified path. Ahh.
- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
else
- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
fi
;;
pw32*)
@@ -14282,7 +17139,7 @@ darwin* | rhapsody*)
version_type=darwin
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
+ library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -14380,18 +17237,18 @@ hpux9* | hpux10* | hpux11*)
fi
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
- hppa*64*)
- shrext_cmds='.sl'
- hardcode_into_libs=yes
- dynamic_linker="$host_os dld.sl"
- shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
- shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
- ;;
- *)
+ hppa*64*)
+ shrext_cmds='.sl'
+ hardcode_into_libs=yes
+ dynamic_linker="$host_os dld.sl"
+ shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+ ;;
+ *)
shrext_cmds='.sl'
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
@@ -14434,719 +17291,434 @@ irix5* | irix6* | nonstopux*)
irix5* | nonstopux*)
libsuff= shlibsuff=
;;
- *)
- case $LD in # libtool.m4 will add one of these switches to LD
- *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
- libsuff= shlibsuff= libmagic=32-bit;;
- *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
- libsuff=32 shlibsuff=N32 libmagic=N32;;
- *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
- libsuff=64 shlibsuff=64 libmagic=64-bit;;
- *) libsuff= shlibsuff= libmagic=never-match;;
- esac
- ;;
- esac
- shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
- shlibpath_overrides_runpath=no
- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
- hardcode_into_libs=yes
- ;;
-
-# No shared lib support for Linux oldld, aout, or coff.
-linux*oldld* | linux*aout* | linux*coff*)
- dynamic_linker=no
- ;;
-
-# This must be Linux ELF.
-linux* | k*bsd*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- # This implies no fast_install, which is unacceptable.
- # Some rework will be needed to allow for fast_install
- # before this can be enabled.
- hardcode_into_libs=yes
-
- # Append ld.so.conf contents to the search path
- if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
- fi
-
- # We used to test for /lib/ld.so.1 and disable shared libraries on
- # powerpc, because MkLinux only supported shared libraries with the
- # GNU dynamic linker. Since this was broken with cross compilers,
- # most powerpc-linux boxes support dynamic linking these days and
- # people can always --disable-shared, the test was removed, and we
- # assume the GNU/Linux dynamic linker is in use.
- dynamic_linker='GNU/Linux ld.so'
- ;;
-
-netbsd*)
- version_type=sunos
- need_lib_prefix=no
- need_version=no
- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
- dynamic_linker='NetBSD (a.out) ld.so'
- else
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- dynamic_linker='NetBSD ld.elf_so'
- fi
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes
- hardcode_into_libs=yes
- ;;
-
-newsos6)
- version_type=linux
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes
- ;;
-
-nto-qnx*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes
- ;;
-
-openbsd*)
- version_type=sunos
- sys_lib_dlsearch_path_spec="/usr/lib"
- need_lib_prefix=no
- # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
- case $host_os in
- openbsd3.3 | openbsd3.3.*) need_version=yes ;;
- *) need_version=no ;;
- esac
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
- shlibpath_var=LD_LIBRARY_PATH
- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- case $host_os in
- openbsd2.[89] | openbsd2.[89].*)
- shlibpath_overrides_runpath=no
- ;;
- *)
- shlibpath_overrides_runpath=yes
- ;;
- esac
- else
- shlibpath_overrides_runpath=yes
- fi
- ;;
-
-os2*)
- libname_spec='$name'
- shrext_cmds=".dll"
- need_lib_prefix=no
- library_names_spec='$libname${shared_ext} $libname.a'
- dynamic_linker='OS/2 ld.exe'
- shlibpath_var=LIBPATH
- ;;
-
-osf3* | osf4* | osf5*)
- version_type=osf
- need_lib_prefix=no
- need_version=no
- soname_spec='${libname}${release}${shared_ext}$major'
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- shlibpath_var=LD_LIBRARY_PATH
- sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
- sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
- ;;
-
-rdos*)
- dynamic_linker=no
- ;;
-
-solaris*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes
- hardcode_into_libs=yes
- # ldd complains unless libraries are executable
- postinstall_cmds='chmod +x $lib'
- ;;
-
-sunos4*)
- version_type=sunos
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
- finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes
- if test "$with_gnu_ld" = yes; then
- need_lib_prefix=no
- fi
- need_version=yes
- ;;
-
-sysv4 | sysv4.3*)
- version_type=linux
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- case $host_vendor in
- sni)
- shlibpath_overrides_runpath=no
- need_lib_prefix=no
- export_dynamic_flag_spec='${wl}-Blargedynsym'
- runpath_var=LD_RUN_PATH
- ;;
- siemens)
- need_lib_prefix=no
- ;;
- motorola)
- need_lib_prefix=no
- need_version=no
- shlibpath_overrides_runpath=no
- sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
- ;;
- esac
- ;;
-
-sysv4*MP*)
- if test -d /usr/nec ;then
- version_type=linux
- library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
- soname_spec='$libname${shared_ext}.$major'
- shlibpath_var=LD_LIBRARY_PATH
- fi
- ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
- version_type=freebsd-elf
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- hardcode_into_libs=yes
- if test "$with_gnu_ld" = yes; then
- sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
- shlibpath_overrides_runpath=no
- else
- sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
- shlibpath_overrides_runpath=yes
- case $host_os in
- sco3.2v5*)
- sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
- ;;
+ *)
+ case $LD in # libtool.m4 will add one of these switches to LD
+ *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
+ libsuff= shlibsuff= libmagic=32-bit;;
+ *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
+ libsuff=32 shlibsuff=N32 libmagic=N32;;
+ *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
+ libsuff=64 shlibsuff=64 libmagic=64-bit;;
+ *) libsuff= shlibsuff= libmagic=never-match;;
esac
- fi
- sys_lib_dlsearch_path_spec='/usr/lib'
+ ;;
+ esac
+ shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
+ shlibpath_overrides_runpath=no
+ sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+ sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+ hardcode_into_libs=yes
;;
-uts4*)
+# No shared lib support for Linux oldld, aout, or coff.
+linux*oldld* | linux*aout* | linux*coff*)
+ dynamic_linker=no
+ ;;
+
+# This must be Linux ELF.
+linux* | k*bsd*-gnu)
version_type=linux
+ need_lib_prefix=no
+ need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
shlibpath_var=LD_LIBRARY_PATH
- ;;
+ shlibpath_overrides_runpath=no
+ # Some binutils ld are patched to set DT_RUNPATH
+ save_LDFLAGS=$LDFLAGS
+ save_libdir=$libdir
+ eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \
+ LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\""
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
-*)
- dynamic_linker=no
- ;;
-esac
-{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-echo "${ECHO_T}$dynamic_linker" >&6; }
-test "$dynamic_linker" = no && can_build_shared=no
+#ifdef FC_DUMMY_MAIN
+#ifndef FC_DUMMY_MAIN_EQ_F77
+# ifdef __cplusplus
+ extern "C"
+# endif
+ int FC_DUMMY_MAIN() { return 1; }
+#endif
+#endif
+int
+main ()
+{
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+ if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then
+ shlibpath_overrides_runpath=yes
fi
-{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
-hardcode_action_CXX=
-if test -n "$hardcode_libdir_flag_spec_CXX" || \
- test -n "$runpath_var_CXX" || \
- test "X$hardcode_automatic_CXX" = "Xyes" ; then
-
- # We can hardcode non-existant directories.
- if test "$hardcode_direct_CXX" != no &&
- # If the only mechanism to avoid hardcoding is shlibpath_var, we
- # have to relink, otherwise we might link with an installed library
- # when we should be linking with a yet-to-be-installed one
- ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, CXX)" != no &&
- test "$hardcode_minus_L_CXX" != no; then
- # Linking always hardcodes the temporary library directory.
- hardcode_action_CXX=relink
- else
- # We can link without hardcoding, and we can hardcode nonexisting dirs.
- hardcode_action_CXX=immediate
- fi
else
- # We cannot hardcode anything, or else we can only hardcode existing
- # directories.
- hardcode_action_CXX=unsupported
-fi
-{ echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5
-echo "${ECHO_T}$hardcode_action_CXX" >&6; }
-
-if test "$hardcode_action_CXX" = relink; then
- # Fast installation is not supported
- enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
- test "$enable_shared" = no; then
- # Fast installation is not necessary
- enable_fast_install=needless
-fi
-
-
-# The else clause should only fire when bootstrapping the
-# libtool distribution, otherwise you forgot to ship ltmain.sh
-# with your package, and you will get complaints that there are
-# no rules to generate ltmain.sh.
-if test -f "$ltmain"; then
- # See if we are running on zsh, and set the options which allow our commands through
- # without removal of \ escapes.
- if test -n "${ZSH_VERSION+set}" ; then
- setopt NO_GLOB_SUBST
- fi
- # Now quote all the things that may contain metacharacters while being
- # careful not to overquote the AC_SUBSTed values. We take copies of the
- # variables and quote the copies for generation of the libtool script.
- for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
- SED SHELL STRIP \
- libname_spec library_names_spec soname_spec extract_expsyms_cmds \
- old_striplib striplib file_magic_cmd finish_cmds finish_eval \
- deplibs_check_method reload_flag reload_cmds need_locks \
- lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
- lt_cv_sys_global_symbol_to_c_name_address \
- sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
- old_postinstall_cmds old_postuninstall_cmds \
- compiler_CXX \
- CC_CXX \
- LD_CXX \
- lt_prog_compiler_wl_CXX \
- lt_prog_compiler_pic_CXX \
- lt_prog_compiler_static_CXX \
- lt_prog_compiler_no_builtin_flag_CXX \
- export_dynamic_flag_spec_CXX \
- thread_safe_flag_spec_CXX \
- whole_archive_flag_spec_CXX \
- enable_shared_with_static_runtimes_CXX \
- old_archive_cmds_CXX \
- old_archive_from_new_cmds_CXX \
- predep_objects_CXX \
- postdep_objects_CXX \
- predeps_CXX \
- postdeps_CXX \
- compiler_lib_search_path_CXX \
- archive_cmds_CXX \
- archive_expsym_cmds_CXX \
- postinstall_cmds_CXX \
- postuninstall_cmds_CXX \
- old_archive_from_expsyms_cmds_CXX \
- allow_undefined_flag_CXX \
- no_undefined_flag_CXX \
- export_symbols_cmds_CXX \
- hardcode_libdir_flag_spec_CXX \
- hardcode_libdir_flag_spec_ld_CXX \
- hardcode_libdir_separator_CXX \
- hardcode_automatic_CXX \
- module_cmds_CXX \
- module_expsym_cmds_CXX \
- lt_cv_prog_compiler_c_o_CXX \
- fix_srcfile_path_CXX \
- exclude_expsyms_CXX \
- include_expsyms_CXX; do
-
- case $var in
- old_archive_cmds_CXX | \
- old_archive_from_new_cmds_CXX | \
- archive_cmds_CXX | \
- archive_expsym_cmds_CXX | \
- module_cmds_CXX | \
- module_expsym_cmds_CXX | \
- old_archive_from_expsyms_cmds_CXX | \
- export_symbols_cmds_CXX | \
- extract_expsyms_cmds | reload_cmds | finish_cmds | \
- postinstall_cmds | postuninstall_cmds | \
- old_postinstall_cmds | old_postuninstall_cmds | \
- sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
- # Double-quote double-evaled strings.
- eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
- ;;
- *)
- eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
- ;;
- esac
- done
-
- case $lt_echo in
- *'\$0 --fallback-echo"')
- lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
- ;;
- esac
-
-cfgfile="$ofile"
-
- cat <<__EOF__ >> "$cfgfile"
-# ### BEGIN LIBTOOL TAG CONFIG: $tagname
-
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
-
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
-
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$archive_cmds_need_lc_CXX
-
-# Whether or not to disallow shared libs when runtime libs are static
-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX
-
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
-
-# The host system.
-host_alias=$host_alias
-host=$host
-host_os=$host_os
-
-# The build system.
-build_alias=$build_alias
-build=$build
-build_os=$build_os
-
-# An echo program that does not interpret backslashes.
-echo=$lt_echo
-
-# The archiver.
-AR=$lt_AR
-AR_FLAGS=$lt_AR_FLAGS
-
-# A C compiler.
-LTCC=$lt_LTCC
-
-# LTCC compiler flags.
-LTCFLAGS=$lt_LTCFLAGS
-
-# A language-specific compiler.
-CC=$lt_compiler_CXX
-
-# Is the compiler the GNU C compiler?
-with_gcc=$GCC_CXX
-
-# An ERE matcher.
-EGREP=$lt_EGREP
-
-# The linker used to build libraries.
-LD=$lt_LD_CXX
-
-# Whether we need hard or soft links.
-LN_S=$lt_LN_S
-
-# A BSD-compatible nm program.
-NM=$lt_NM
-
-# A symbol stripping program
-STRIP=$lt_STRIP
-
-# Used to examine libraries when file_magic_cmd begins "file"
-MAGIC_CMD=$MAGIC_CMD
-
-# Used on cygwin: DLL creation program.
-DLLTOOL="$DLLTOOL"
-
-# Used on cygwin: object dumper.
-OBJDUMP="$OBJDUMP"
-
-# Used on cygwin: assembler.
-AS="$AS"
-
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
-
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
-
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl_CXX
-
-# Object file suffix (normally "o").
-objext="$ac_objext"
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
-# Old archive suffix (normally "a").
-libext="$libext"
-# Shared library suffix (normally ".so").
-shrext_cmds='$shrext_cmds'
+fi
-# Executable file suffix (normally "").
-exeext="$exeext"
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ LDFLAGS=$save_LDFLAGS
+ libdir=$save_libdir
-# Additional compiler flags for building library objects.
-pic_flag=$lt_lt_prog_compiler_pic_CXX
-pic_mode=$pic_mode
+ # This implies no fast_install, which is unacceptable.
+ # Some rework will be needed to allow for fast_install
+ # before this can be enabled.
+ hardcode_into_libs=yes
-# What is the maximum length of a command?
-max_cmd_len=$lt_cv_sys_max_cmd_len
+ # Add ABI-specific directories to the system library path.
+ sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
+ # Append ld.so.conf contents to the search path
+ if test -f /etc/ld.so.conf; then
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
+ fi
-# Must we lock files when doing compilation?
-need_locks=$lt_need_locks
+ # We used to test for /lib/ld.so.1 and disable shared libraries on
+ # powerpc, because MkLinux only supported shared libraries with the
+ # GNU dynamic linker. Since this was broken with cross compilers,
+ # most powerpc-linux boxes support dynamic linking these days and
+ # people can always --disable-shared, the test was removed, and we
+ # assume the GNU/Linux dynamic linker is in use.
+ dynamic_linker='GNU/Linux ld.so'
+ ;;
-# Do we need the lib prefix for modules?
-need_lib_prefix=$need_lib_prefix
+netbsd*)
+ version_type=sunos
+ need_lib_prefix=no
+ need_version=no
+ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+ dynamic_linker='NetBSD (a.out) ld.so'
+ else
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ dynamic_linker='NetBSD ld.elf_so'
+ fi
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+ ;;
-# Do we need a version for libraries?
-need_version=$need_version
+newsos6)
+ version_type=linux
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+ ;;
-# Whether dlopen is supported.
-dlopen_support=$enable_dlopen
+*nto* | *qnx*)
+ version_type=qnx
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ dynamic_linker='ldqnx.so'
+ ;;
-# Whether dlopen of programs is supported.
-dlopen_self=$enable_dlopen_self
+openbsd*)
+ version_type=sunos
+ sys_lib_dlsearch_path_spec="/usr/lib"
+ need_lib_prefix=no
+ # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
+ case $host_os in
+ openbsd3.3 | openbsd3.3.*) need_version=yes ;;
+ *) need_version=no ;;
+ esac
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+ shlibpath_var=LD_LIBRARY_PATH
+ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ case $host_os in
+ openbsd2.[89] | openbsd2.[89].*)
+ shlibpath_overrides_runpath=no
+ ;;
+ *)
+ shlibpath_overrides_runpath=yes
+ ;;
+ esac
+ else
+ shlibpath_overrides_runpath=yes
+ fi
+ ;;
-# Whether dlopen of statically linked programs is supported.
-dlopen_self_static=$enable_dlopen_self_static
+os2*)
+ libname_spec='$name'
+ shrext_cmds=".dll"
+ need_lib_prefix=no
+ library_names_spec='$libname${shared_ext} $libname.a'
+ dynamic_linker='OS/2 ld.exe'
+ shlibpath_var=LIBPATH
+ ;;
-# Compiler flag to prevent dynamic linking.
-link_static_flag=$lt_lt_prog_compiler_static_CXX
+osf3* | osf4* | osf5*)
+ version_type=osf
+ need_lib_prefix=no
+ need_version=no
+ soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ shlibpath_var=LD_LIBRARY_PATH
+ sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+ ;;
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
+rdos*)
+ dynamic_linker=no
+ ;;
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX
+solaris*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+ # ldd complains unless libraries are executable
+ postinstall_cmds='chmod +x $lib'
+ ;;
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX
+sunos4*)
+ version_type=sunos
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+ finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+ if test "$with_gnu_ld" = yes; then
+ need_lib_prefix=no
+ fi
+ need_version=yes
+ ;;
-# Compiler flag to generate thread-safe objects.
-thread_safe_flag_spec=$lt_thread_safe_flag_spec_CXX
+sysv4 | sysv4.3*)
+ version_type=linux
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ case $host_vendor in
+ sni)
+ shlibpath_overrides_runpath=no
+ need_lib_prefix=no
+ runpath_var=LD_RUN_PATH
+ ;;
+ siemens)
+ need_lib_prefix=no
+ ;;
+ motorola)
+ need_lib_prefix=no
+ need_version=no
+ shlibpath_overrides_runpath=no
+ sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
+ ;;
+ esac
+ ;;
-# Library versioning type.
-version_type=$version_type
+sysv4*MP*)
+ if test -d /usr/nec ;then
+ version_type=linux
+ library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
+ soname_spec='$libname${shared_ext}.$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ fi
+ ;;
-# Format of library name prefix.
-libname_spec=$lt_libname_spec
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+ version_type=freebsd-elf
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+ if test "$with_gnu_ld" = yes; then
+ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+ else
+ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+ case $host_os in
+ sco3.2v5*)
+ sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
+ ;;
+ esac
+ fi
+ sys_lib_dlsearch_path_spec='/usr/lib'
+ ;;
-# List of archive names. First name is the real one, the rest are links.
-# The last name is the one that the linker finds with -lNAME.
-library_names_spec=$lt_library_names_spec
+tpf*)
+ # TPF is a cross-target only. Preferred cross-host = GNU/Linux.
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ ;;
-# The coded name of the library, if different from the real name.
-soname_spec=$lt_soname_spec
+uts4*)
+ version_type=linux
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ ;;
-# Commands used to build and install an old-style archive.
-RANLIB=$lt_RANLIB
-old_archive_cmds=$lt_old_archive_cmds_CXX
-old_postinstall_cmds=$lt_old_postinstall_cmds
-old_postuninstall_cmds=$lt_old_postuninstall_cmds
+*)
+ dynamic_linker=no
+ ;;
+esac
+{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+$as_echo "$dynamic_linker" >&6; }
+test "$dynamic_linker" = no && can_build_shared=no
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test "$GCC" = yes; then
+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+fi
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX
+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
+ sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+fi
+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
+ sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+fi
-# Commands used to build and install a shared archive.
-archive_cmds=$lt_archive_cmds_CXX
-archive_expsym_cmds=$lt_archive_expsym_cmds_CXX
-postinstall_cmds=$lt_postinstall_cmds
-postuninstall_cmds=$lt_postuninstall_cmds
-# Commands used to build a loadable module (assumed same as above if empty)
-module_cmds=$lt_module_cmds_CXX
-module_expsym_cmds=$lt_module_expsym_cmds_CXX
-# Commands to strip libraries.
-old_striplib=$lt_old_striplib
-striplib=$lt_striplib
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predep_objects=$lt_predep_objects_CXX
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdep_objects=$lt_postdep_objects_CXX
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predeps=$lt_predeps_CXX
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdeps=$lt_postdeps_CXX
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method=$lt_deplibs_check_method
-# Command to use when deplibs_check_method == file_magic.
-file_magic_cmd=$lt_file_magic_cmd
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$lt_allow_undefined_flag_CXX
-# Flag that forces no undefined symbols.
-no_undefined_flag=$lt_no_undefined_flag_CXX
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds=$lt_finish_cmds
-# Same as above, but a single script fragment to be evaled but not shown.
-finish_eval=$lt_finish_eval
-# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
-# Transform the output of nm in a proper C declaration
-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-# Transform the output of nm in a C name address pair
-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
-# This is the shared library runtime path variable.
-runpath_var=$runpath_var
-# This is the shared library path variable.
-shlibpath_var=$shlibpath_var
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-# How to hardcode a shared library path into an executable.
-hardcode_action=$hardcode_action_CXX
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=$hardcode_into_libs
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX
-# If ld is used when linking, flag to hardcode \$libdir into
-# a binary during linking. This must work even if \$libdir does
-# not exist.
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX
-# Whether we need a single -rpath flag with a separated argument.
-hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX
-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
-# resulting binary.
-hardcode_direct=$hardcode_direct_CXX
-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-# resulting binary.
-hardcode_minus_L=$hardcode_minus_L_CXX
-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-# the resulting binary.
-hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX
-# Set to yes if building a shared library automatically hardcodes DIR into the library
-# and all subsequent libraries and executables linked against it.
-hardcode_automatic=$hardcode_automatic_CXX
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at relink time.
-variables_saved_for_relink="$variables_saved_for_relink"
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=$link_all_deplibs_CXX
-# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-# Run-time system search path for libraries
-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path=$lt_fix_srcfile_path
-# Set to yes if exported symbols are required.
-always_export_symbols=$always_export_symbols_CXX
-# The commands to list exported symbols.
-export_symbols_cmds=$lt_export_symbols_cmds_CXX
+ { $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
+hardcode_action_CXX=
+if test -n "$hardcode_libdir_flag_spec_CXX" ||
+ test -n "$runpath_var_CXX" ||
+ test "X$hardcode_automatic_CXX" = "Xyes" ; then
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=$lt_extract_expsyms_cmds
+ # We can hardcode non-existent directories.
+ if test "$hardcode_direct_CXX" != no &&
+ # If the only mechanism to avoid hardcoding is shlibpath_var, we
+ # have to relink, otherwise we might link with an installed library
+ # when we should be linking with a yet-to-be-installed one
+ ## test "$_LT_TAGVAR(hardcode_shlibpath_var, CXX)" != no &&
+ test "$hardcode_minus_L_CXX" != no; then
+ # Linking always hardcodes the temporary library directory.
+ hardcode_action_CXX=relink
+ else
+ # We can link without hardcoding, and we can hardcode nonexisting dirs.
+ hardcode_action_CXX=immediate
+ fi
+else
+ # We cannot hardcode anything, or else we can only hardcode existing
+ # directories.
+ hardcode_action_CXX=unsupported
+fi
+{ $as_echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5
+$as_echo "$hardcode_action_CXX" >&6; }
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$lt_exclude_expsyms_CXX
+if test "$hardcode_action_CXX" = relink ||
+ test "$inherit_rpath_CXX" = yes; then
+ # Fast installation is not supported
+ enable_fast_install=no
+elif test "$shlibpath_overrides_runpath" = yes ||
+ test "$enable_shared" = no; then
+ # Fast installation is not necessary
+ enable_fast_install=needless
+fi
-# Symbols that must always be exported.
-include_expsyms=$lt_include_expsyms_CXX
-# ### END LIBTOOL TAG CONFIG: $tagname
-__EOF__
-else
- # If there is no Makefile yet, we rely on a make rule to execute
- # `config.status --recheck' to rerun these tests and create the
- # libtool script then.
- ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
- if test -f "$ltmain_in"; then
- test -f Makefile && make "$ltmain"
- fi
-fi
+ fi # test -n "$compiler"
+
+ CC=$lt_save_CC
+ LDCXX=$LD
+ LD=$lt_save_LD
+ GCC=$lt_save_GCC
+ with_gnu_ld=$lt_save_with_gnu_ld
+ lt_cv_path_LDCXX=$lt_cv_path_LD
+ lt_cv_path_LD=$lt_save_path_LD
+ lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
+ lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
+fi # test "$_lt_caught_CXX_error" != yes
+
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-CC=$lt_save_CC
-LDCXX=$LD
-LD=$lt_save_LD
-GCC=$lt_save_GCC
-with_gnu_ldcxx=$with_gnu_ld
-with_gnu_ld=$lt_save_with_gnu_ld
-lt_cv_path_LDCXX=$lt_cv_path_LD
-lt_cv_path_LD=$lt_save_path_LD
-lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
-lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
-
- else
- tagname=""
- fi
- ;;
- F77)
- if test -n "$F77" && test "X$F77" != "Xno"; then
-ac_ext=f
+ ac_ext=f
ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_f77_compiler_gnu
@@ -15158,11 +17730,13 @@ always_export_symbols_F77=no
archive_expsym_cmds_F77=
export_dynamic_flag_spec_F77=
hardcode_direct_F77=no
+hardcode_direct_absolute_F77=no
hardcode_libdir_flag_spec_F77=
hardcode_libdir_flag_spec_ld_F77=
hardcode_libdir_separator_F77=
hardcode_minus_L_F77=no
hardcode_automatic_F77=no
+inherit_rpath_F77=no
module_cmds_F77=
module_expsym_cmds_F77=
link_all_deplibs_F77=unknown
@@ -15178,20 +17752,30 @@ ac_ext=f
objext=o
objext_F77=$objext
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="\
+# No sense in running all these tests if we already determined that
+# the F77 compiler isn't working. Some variables (like enable_shared)
+# are currently assumed to apply to all compilers on this platform,
+# and will be corrupted by setting them based on a non-working compiler.
+if test "$_lt_disable_F77" != yes; then
+ # Code to be used in simple compile tests
+ lt_simple_compile_test_code="\
subroutine t
return
end
"
-# Code to be used in simple link tests
-lt_simple_link_test_code="\
+ # Code to be used in simple link tests
+ lt_simple_link_test_code="\
program t
end
"
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+
+
+
+
+
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -15203,26 +17787,27 @@ LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
compiler=$CC
-# save warnings/boilerplate of simple test code
-ac_outfile=conftest.$ac_objext
+ # save warnings/boilerplate of simple test code
+ ac_outfile=conftest.$ac_objext
echo "$lt_simple_compile_test_code" >conftest.$ac_ext
eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_compiler_boilerplate=`cat conftest.err`
-$rm conftest*
+$RM conftest*
-ac_outfile=conftest.$ac_objext
+ ac_outfile=conftest.$ac_objext
echo "$lt_simple_link_test_code" >conftest.$ac_ext
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
-$rm conftest*
+$RM -r conftest*
-# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
-CC=${F77-"f77"}
-compiler=$CC
-compiler_F77=$CC
-for cc_temp in $compiler""; do
+ # Allow CC to be a program name with arguments.
+ lt_save_CC="$CC"
+ lt_save_GCC=$GCC
+ CC=${F77-"f77"}
+ compiler=$CC
+ compiler_F77=$CC
+ for cc_temp in $compiler""; do
case $cc_temp in
compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
@@ -15230,53 +17815,58 @@ for cc_temp in $compiler""; do
*) break;;
esac
done
-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-
-
-{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
-echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; }
-{ echo "$as_me:$LINENO: result: $can_build_shared" >&5
-echo "${ECHO_T}$can_build_shared" >&6; }
-
-{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
-echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; }
-test "$can_build_shared" = "no" && enable_shared=no
-
-# On AIX, shared libraries and static libraries use the same namespace, and
-# are all built from PIC.
-case $host_os in
-aix3*)
- test "$enable_shared" = yes && enable_static=no
- if test -n "$RANLIB"; then
- archive_cmds="$archive_cmds~\$RANLIB \$lib"
- postinstall_cmds='$RANLIB $lib'
- fi
- ;;
-aix4* | aix5*)
- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
- test "$enable_shared" = yes && enable_static=no
- fi
- ;;
-esac
-{ echo "$as_me:$LINENO: result: $enable_shared" >&5
-echo "${ECHO_T}$enable_shared" >&6; }
+cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5
-echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; }
-# Make sure either enable_shared or enable_static is yes.
-test "$enable_shared" = yes || enable_static=yes
-{ echo "$as_me:$LINENO: result: $enable_static" >&5
-echo "${ECHO_T}$enable_static" >&6; }
+ GCC=$G77
+ if test -n "$compiler"; then
+ { $as_echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
+$as_echo_n "checking if libtool supports shared libraries... " >&6; }
+ { $as_echo "$as_me:$LINENO: result: $can_build_shared" >&5
+$as_echo "$can_build_shared" >&6; }
-GCC_F77="$G77"
-LD_F77="$LD"
+ { $as_echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
+$as_echo_n "checking whether to build shared libraries... " >&6; }
+ test "$can_build_shared" = "no" && enable_shared=no
-lt_prog_compiler_wl_F77=
+ # On AIX, shared libraries and static libraries use the same namespace, and
+ # are all built from PIC.
+ case $host_os in
+ aix3*)
+ test "$enable_shared" = yes && enable_static=no
+ if test -n "$RANLIB"; then
+ archive_cmds="$archive_cmds~\$RANLIB \$lib"
+ postinstall_cmds='$RANLIB $lib'
+ fi
+ ;;
+ aix[4-9]*)
+ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+ test "$enable_shared" = yes && enable_static=no
+ fi
+ ;;
+ esac
+ { $as_echo "$as_me:$LINENO: result: $enable_shared" >&5
+$as_echo "$enable_shared" >&6; }
+
+ { $as_echo "$as_me:$LINENO: checking whether to build static libraries" >&5
+$as_echo_n "checking whether to build static libraries... " >&6; }
+ # Make sure either enable_shared or enable_static is yes.
+ test "$enable_shared" = yes || enable_static=yes
+ { $as_echo "$as_me:$LINENO: result: $enable_static" >&5
+$as_echo "$enable_static" >&6; }
+
+ GCC_F77="$G77"
+ LD_F77="$LD"
+
+ ## CAVEAT EMPTOR:
+ ## There is no encapsulation within the following macros, do not change
+ ## the running order or otherwise move them around unless you know exactly
+ ## what you are doing...
+ lt_prog_compiler_wl_F77=
lt_prog_compiler_pic_F77=
lt_prog_compiler_static_F77=
-{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
if test "$GCC" = yes; then
lt_prog_compiler_wl_F77='-Wl,'
@@ -15292,17 +17882,25 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
;;
amigaos*)
- # FIXME: we need at least 68020 code to build shared libraries, but
- # adding the `-m68020' flag to GCC prevents building anything better,
- # like `-m68040'.
- lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4'
+ case $host_cpu in
+ powerpc)
+ # see comment about AmigaOS4 .so support
+ lt_prog_compiler_pic_F77='-fPIC'
+ ;;
+ m68k)
+ # FIXME: we need at least 68020 code to build shared libraries, but
+ # adding the `-m68020' flag to GCC prevents building anything better,
+ # like `-m68040'.
+ lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4'
+ ;;
+ esac
;;
beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
# PIC is the default for these OSes.
;;
- mingw* | cygwin* | pw32* | os2*)
+ mingw* | cygwin* | pw32* | os2* | cegcc*)
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
# Although the cygwin gcc ignores -fPIC, still need this for old-style
@@ -15316,6 +17914,20 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
lt_prog_compiler_pic_F77='-fno-common'
;;
+ hpux*)
+ # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
+ # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag
+ # sets the default TLS model and affects inlining.
+ case $host_cpu in
+ hppa*64*)
+ # +Z the default
+ ;;
+ *)
+ lt_prog_compiler_pic_F77='-fPIC'
+ ;;
+ esac
+ ;;
+
interix[3-9]*)
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
# Instead, we relocate shared libraries at runtime.
@@ -15328,25 +17940,18 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
enable_shared=no
;;
+ *nto* | *qnx*)
+ # QNX uses GNU C++, but need to define -shared option too, otherwise
+ # it will coredump.
+ lt_prog_compiler_pic_F77='-fPIC -shared'
+ ;;
+
sysv4*MP*)
if test -d /usr/nec; then
lt_prog_compiler_pic_F77=-Kconform_pic
fi
;;
- hpux*)
- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
- # not for PA HP-UX.
- case $host_cpu in
- hppa*64*|ia64*)
- # +Z the default
- ;;
- *)
- lt_prog_compiler_pic_F77='-fPIC'
- ;;
- esac
- ;;
-
*)
lt_prog_compiler_pic_F77='-fPIC'
;;
@@ -15363,18 +17968,8 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp'
fi
;;
- darwin*)
- # PIC is the default on this platform
- # Common symbols not allowed in MH_DYLIB files
- case $cc_basename in
- xlc*)
- lt_prog_compiler_pic_F77='-qnocommon'
- lt_prog_compiler_wl_F77='-Wl,'
- ;;
- esac
- ;;
- mingw* | cygwin* | pw32* | os2*)
+ mingw* | cygwin* | pw32* | os2* | cegcc*)
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
lt_prog_compiler_pic_F77='-DDLL_EXPORT'
@@ -15402,18 +17997,27 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
lt_prog_compiler_static_F77='-non_shared'
;;
- newsos6)
- lt_prog_compiler_pic_F77='-KPIC'
- lt_prog_compiler_static_F77='-Bstatic'
- ;;
-
linux* | k*bsd*-gnu)
case $cc_basename in
- icc* | ecc*)
+ # old Intel for x86_64 which still supported -KPIC.
+ ecc*)
lt_prog_compiler_wl_F77='-Wl,'
lt_prog_compiler_pic_F77='-KPIC'
lt_prog_compiler_static_F77='-static'
;;
+ # icc used to be incompatible with GCC.
+ # ICC 10 doesn't accept -KPIC any more.
+ icc* | ifort*)
+ lt_prog_compiler_wl_F77='-Wl,'
+ lt_prog_compiler_pic_F77='-fPIC'
+ lt_prog_compiler_static_F77='-static'
+ ;;
+ # Lahey Fortran 8.1.
+ lf95*)
+ lt_prog_compiler_wl_F77='-Wl,'
+ lt_prog_compiler_pic_F77='--shared'
+ lt_prog_compiler_static_F77='--static'
+ ;;
pgcc* | pgf77* | pgf90* | pgf95*)
# Portland Group compilers (*not* the Pentium gcc compiler,
# which looks to be a dead project)
@@ -15426,8 +18030,14 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
# All Alpha code is PIC.
lt_prog_compiler_static_F77='-non_shared'
;;
+ xl*)
+ # IBM XL C 8.0/Fortran 10.1 on PPC
+ lt_prog_compiler_wl_F77='-Wl,'
+ lt_prog_compiler_pic_F77='-qpic'
+ lt_prog_compiler_static_F77='-qstaticlink'
+ ;;
*)
- case `$CC -V 2>&1 | sed 5q` in
+ case `$CC -V 2>&1 | sed 5q` in
*Sun\ C*)
# Sun C 5.9
lt_prog_compiler_pic_F77='-KPIC'
@@ -15445,6 +18055,17 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
esac
;;
+ newsos6)
+ lt_prog_compiler_pic_F77='-KPIC'
+ lt_prog_compiler_static_F77='-Bstatic'
+ ;;
+
+ *nto* | *qnx*)
+ # QNX uses GNU C++, but need to define -shared option too, otherwise
+ # it will coredump.
+ lt_prog_compiler_pic_F77='-fPIC -shared'
+ ;;
+
osf3* | osf4* | osf5*)
lt_prog_compiler_wl_F77='-Wl,'
# All OSF/1 code is PIC.
@@ -15507,21 +18128,31 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
esac
fi
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6; }
+case $host_os in
+ # For platforms which do not support PIC, -DPIC is meaningless:
+ *djgpp*)
+ lt_prog_compiler_pic_F77=
+ ;;
+ *)
+ lt_prog_compiler_pic_F77="$lt_prog_compiler_pic_F77"
+ ;;
+esac
+{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5
+$as_echo "$lt_prog_compiler_pic_F77" >&6; }
+
+
#
# Check to make sure the PIC flag actually works.
#
if test -n "$lt_prog_compiler_pic_F77"; then
-
-{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6; }
-if test "${lt_prog_compiler_pic_works_F77+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
+$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... " >&6; }
+if test "${lt_cv_prog_compiler_pic_works_F77+set}" = set; then
+ $as_echo_n "(cached) " >&6
else
- lt_prog_compiler_pic_works_F77=no
- ac_outfile=conftest.$ac_objext
+ lt_cv_prog_compiler_pic_works_F77=no
+ ac_outfile=conftest.$ac_objext
echo "$lt_simple_compile_test_code" > conftest.$ac_ext
lt_compiler_flag="$lt_prog_compiler_pic_F77"
# Insert the option either (1) after the last *FLAGS variable, or
@@ -15533,27 +18164,27 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15536: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:18167: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15540: \$? = $ac_status" >&5
+ echo "$as_me:18171: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
- $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
- lt_prog_compiler_pic_works_F77=yes
+ lt_cv_prog_compiler_pic_works_F77=yes
fi
fi
- $rm conftest*
+ $RM conftest*
fi
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_F77" >&5
+$as_echo "$lt_cv_prog_compiler_pic_works_F77" >&6; }
-if test x"$lt_prog_compiler_pic_works_F77" = xyes; then
+if test x"$lt_cv_prog_compiler_pic_works_F77" = xyes; then
case $lt_prog_compiler_pic_F77 in
"" | " "*) ;;
*) lt_prog_compiler_pic_F77=" $lt_prog_compiler_pic_F77" ;;
@@ -15564,26 +18195,19 @@ else
fi
fi
-case $host_os in
- # For platforms which do not support PIC, -DPIC is meaningless:
- *djgpp*)
- lt_prog_compiler_pic_F77=
- ;;
- *)
- lt_prog_compiler_pic_F77="$lt_prog_compiler_pic_F77"
- ;;
-esac
+
+
#
# Check to make sure the static flag actually works.
#
wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\"
-{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
-if test "${lt_prog_compiler_static_works_F77+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
+if test "${lt_cv_prog_compiler_static_works_F77+set}" = set; then
+ $as_echo_n "(cached) " >&6
else
- lt_prog_compiler_static_works_F77=no
+ lt_cv_prog_compiler_static_works_F77=no
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
echo "$lt_simple_link_test_code" > conftest.$ac_ext
@@ -15593,36 +18217,90 @@ else
if test -s conftest.err; then
# Append any errors to the config.log.
cat conftest.err 1>&5
- $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+ $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if diff conftest.exp conftest.er2 >/dev/null; then
- lt_prog_compiler_static_works_F77=yes
+ lt_cv_prog_compiler_static_works_F77=yes
fi
else
- lt_prog_compiler_static_works_F77=yes
+ lt_cv_prog_compiler_static_works_F77=yes
fi
fi
- $rm conftest*
+ $RM -r conftest*
LDFLAGS="$save_LDFLAGS"
fi
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5
-echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_F77" >&5
+$as_echo "$lt_cv_prog_compiler_static_works_F77" >&6; }
-if test x"$lt_prog_compiler_static_works_F77" = xyes; then
+if test x"$lt_cv_prog_compiler_static_works_F77" = xyes; then
:
else
lt_prog_compiler_static_F77=
fi
-{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
+
+
+ { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ lt_cv_prog_compiler_c_o_F77=no
+ $RM -r conftest 2>/dev/null
+ mkdir conftest
+ cd conftest
+ mkdir out
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+ lt_compiler_flag="-o out/conftest2.$ac_objext"
+ # Insert the option either (1) after the last *FLAGS variable, or
+ # (2) before a word containing "conftest.", or (3) at the end.
+ # Note that $ac_compile itself does not contain backslashes and begins
+ # with a dollar sign (not a hyphen), so the echo should work correctly.
+ lt_compile=`echo "$ac_compile" | $SED \
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+ (eval echo "\"\$as_me:18266: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+ echo "$as_me:18270: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings
+ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+ lt_cv_prog_compiler_c_o_F77=yes
+ fi
+ fi
+ chmod u+w . 2>&5
+ $RM conftest*
+ # SGI C++ compiler will create directory out/ii_files/ for
+ # template instantiation
+ test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
+ $RM out/* && rmdir out
+ cd ..
+ $RM -r conftest
+ $RM conftest*
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5
+$as_echo "$lt_cv_prog_compiler_c_o_F77" >&6; }
+
+
+
+ { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o_F77=no
- $rm -r conftest 2>/dev/null
+ $RM -r conftest 2>/dev/null
mkdir conftest
cd conftest
mkdir out
@@ -15637,83 +18315,90 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15640: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:18318: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:15644: \$? = $ac_status" >&5
+ echo "$as_me:18322: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
- $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
$SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
lt_cv_prog_compiler_c_o_F77=yes
fi
fi
chmod u+w . 2>&5
- $rm conftest*
+ $RM conftest*
# SGI C++ compiler will create directory out/ii_files/ for
# template instantiation
- test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
- $rm out/* && rmdir out
+ test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
+ $RM out/* && rmdir out
cd ..
- rmdir conftest
- $rm conftest*
+ $RM -r conftest
+ $RM conftest*
fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5
+$as_echo "$lt_cv_prog_compiler_c_o_F77" >&6; }
+
+
hard_links="nottested"
if test "$lt_cv_prog_compiler_c_o_F77" = no && test "$need_locks" != no; then
# do not overwrite the value of need_locks provided by the user
- { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+$as_echo_n "checking if we can lock with hard links... " >&6; }
hard_links=yes
- $rm conftest*
+ $RM conftest*
ln conftest.a conftest.b 2>/dev/null && hard_links=no
touch conftest.a
ln conftest.a conftest.b 2>&5 || hard_links=no
ln conftest.a conftest.b 2>/dev/null && hard_links=no
- { echo "$as_me:$LINENO: result: $hard_links" >&5
-echo "${ECHO_T}$hard_links" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
+$as_echo "$hard_links" >&6; }
if test "$hard_links" = no; then
- { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
need_locks=warn
fi
else
need_locks=no
fi
-{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
+
+
+ { $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
runpath_var=
allow_undefined_flag_F77=
- enable_shared_with_static_runtimes_F77=no
+ always_export_symbols_F77=no
archive_cmds_F77=
archive_expsym_cmds_F77=
- old_archive_From_new_cmds_F77=
- old_archive_from_expsyms_cmds_F77=
+ compiler_needs_object_F77=no
+ enable_shared_with_static_runtimes_F77=no
export_dynamic_flag_spec_F77=
- whole_archive_flag_spec_F77=
- thread_safe_flag_spec_F77=
+ export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+ hardcode_automatic_F77=no
+ hardcode_direct_F77=no
+ hardcode_direct_absolute_F77=no
hardcode_libdir_flag_spec_F77=
hardcode_libdir_flag_spec_ld_F77=
hardcode_libdir_separator_F77=
- hardcode_direct_F77=no
hardcode_minus_L_F77=no
hardcode_shlibpath_var_F77=unsupported
+ inherit_rpath_F77=no
link_all_deplibs_F77=unknown
- hardcode_automatic_F77=no
module_cmds_F77=
module_expsym_cmds_F77=
- always_export_symbols_F77=no
- export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+ old_archive_from_new_cmds_F77=
+ old_archive_from_expsyms_cmds_F77=
+ thread_safe_flag_spec_F77=
+ whole_archive_flag_spec_F77=
# include_expsyms should be a list of space-separated symbols to be *always*
# included in the symbol list
include_expsyms_F77=
@@ -15721,26 +18406,17 @@ echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared librar
# it will be wrapped by ` (' and `)$', so one must not match beginning or
# end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
# as well as any symbol that contains `d'.
- exclude_expsyms_F77="_GLOBAL_OFFSET_TABLE_"
+ exclude_expsyms_F77='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
# Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
# platforms (ab)use it in PIC code, but their linkers get confused if
# the symbol is explicitly referenced. Since portable code cannot
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
+ # Exclude shared library initialization/finalization symbols.
extract_expsyms_cmds=
- # Just being paranoid about ensuring that cc_basename is set.
- for cc_temp in $compiler""; do
- case $cc_temp in
- compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
- distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
- \-*) ;;
- *) break;;
- esac
-done
-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
case $host_os in
- cygwin* | mingw* | pw32*)
+ cygwin* | mingw* | pw32* | cegcc*)
# FIXME: the MSVC++ port hasn't been tested in a loooong time
# When not using gcc, we currently assume that we are using
# Microsoft Visual C++.
@@ -15766,16 +18442,16 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
# are reset later if shared libraries are not supported. Putting them
# here allows them to be overridden if necessary.
runpath_var=LD_RUN_PATH
- hardcode_libdir_flag_spec_F77='${wl}--rpath ${wl}$libdir'
+ hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
export_dynamic_flag_spec_F77='${wl}--export-dynamic'
# ancient GNU ld didn't support --whole-archive et. al.
- if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
- whole_archive_flag_spec_F77="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
- else
- whole_archive_flag_spec_F77=
+ if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
+ whole_archive_flag_spec_F77="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+ else
+ whole_archive_flag_spec_F77=
fi
supports_anon_versioning=no
- case `$LD -v 2>/dev/null` in
+ case `$LD -v 2>&1` in
*\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
*\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
*\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
@@ -15785,11 +18461,11 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
# See if GNU ld supports shared libraries.
case $host_os in
- aix3* | aix4* | aix5*)
+ aix[3-9]*)
# On AIX/PPC, the GNU linker is very broken
if test "$host_cpu" != ia64; then
ld_shlibs_F77=no
- cat <<EOF 1>&2
+ cat <<_LT_EOF 1>&2
*** Warning: the GNU linker, at least up to release 2.9.1, is reported
*** to be unable to reliably create shared libraries on AIX.
@@ -15797,26 +18473,27 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
*** really care for shared libraries, you may want to modify your PATH
*** so that a non-GNU linker is found, and then restart.
-EOF
+_LT_EOF
fi
;;
amigaos*)
- archive_cmds_F77='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
- hardcode_libdir_flag_spec_F77='-L$libdir'
- hardcode_minus_L_F77=yes
-
- # Samuel A. Falvo II <kc5tja at dolphin.openprojects.net> reports
- # that the semantics of dynamic libraries on AmigaOS, at least up
- # to version 4, is to share data among multiple programs linked
- # with the same dynamic library. Since this doesn't match the
- # behavior of shared libraries on other platforms, we can't use
- # them.
- ld_shlibs_F77=no
+ case $host_cpu in
+ powerpc)
+ # see comment about AmigaOS4 .so support
+ archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ archive_expsym_cmds_F77=''
+ ;;
+ m68k)
+ archive_cmds_F77='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+ hardcode_libdir_flag_spec_F77='-L$libdir'
+ hardcode_minus_L_F77=yes
+ ;;
+ esac
;;
beos*)
- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
allow_undefined_flag_F77=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -15826,16 +18503,16 @@ EOF
fi
;;
- cygwin* | mingw* | pw32*)
- # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, F77) is actually meaningless,
+ cygwin* | mingw* | pw32* | cegcc*)
+ # _LT_TAGVAR(hardcode_libdir_flag_spec, F77) is actually meaningless,
# as there is no search path for DLLs.
hardcode_libdir_flag_spec_F77='-L$libdir'
allow_undefined_flag_F77=unsupported
always_export_symbols_F77=no
enable_shared_with_static_runtimes_F77=yes
- export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
+ export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
- if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
@@ -15866,48 +18543,78 @@ EOF
archive_expsym_cmds_F77='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
- gnu* | linux* | k*bsd*-gnu)
- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ gnu* | linux* | tpf* | k*bsd*-gnu)
+ tmp_diet=no
+ if test "$host_os" = linux-dietlibc; then
+ case $cc_basename in
+ diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn)
+ esac
+ fi
+ if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
+ && test "$tmp_diet" = no
+ then
tmp_addflag=
+ tmp_sharedflag='-shared'
case $cc_basename,$host_cpu in
- pgcc*) # Portland Group C compiler
- whole_archive_flag_spec_F77='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+ pgcc*) # Portland Group C compiler
+ whole_archive_flag_spec_F77='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
tmp_addflag=' $pic_flag'
;;
pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers
- whole_archive_flag_spec_F77='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+ whole_archive_flag_spec_F77='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
tmp_addflag=' $pic_flag -Mnomain' ;;
- ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
+ ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
tmp_addflag=' -i_dynamic' ;;
efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64
tmp_addflag=' -i_dynamic -nofor_main' ;;
ifc* | ifort*) # Intel Fortran compiler
tmp_addflag=' -nofor_main' ;;
+ lf95*) # Lahey Fortran 8.1
+ whole_archive_flag_spec_F77=
+ tmp_sharedflag='--shared' ;;
+ xl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below)
+ tmp_sharedflag='-qmkshrobj'
+ tmp_addflag= ;;
esac
case `$CC -V 2>&1 | sed 5q` in
*Sun\ C*) # Sun C 5.9
- whole_archive_flag_spec_F77='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+ whole_archive_flag_spec_F77='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+ compiler_needs_object_F77=yes
tmp_sharedflag='-G' ;;
*Sun\ F*) # Sun Fortran 8.3
tmp_sharedflag='-G' ;;
- *)
- tmp_sharedflag='-shared' ;;
esac
archive_cmds_F77='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- if test $supports_anon_versioning = yes; then
- archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~
- cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
- $echo "local: *; };" >> $output_objdir/$libname.ver~
- $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
- fi
+ if test "x$supports_anon_versioning" = xyes; then
+ archive_expsym_cmds_F77='echo "{ global:" > $output_objdir/$libname.ver~
+ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+ echo "local: *; };" >> $output_objdir/$libname.ver~
+ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ fi
+
+ case $cc_basename in
+ xlf*)
+ # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
+ whole_archive_flag_spec_F77='--whole-archive$convenience --no-whole-archive'
+ hardcode_libdir_flag_spec_F77=
+ hardcode_libdir_flag_spec_ld_F77='-rpath $libdir'
+ archive_cmds_F77='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
+ if test "x$supports_anon_versioning" = xyes; then
+ archive_expsym_cmds_F77='echo "{ global:" > $output_objdir/$libname.ver~
+ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+ echo "local: *; };" >> $output_objdir/$libname.ver~
+ $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+ fi
+ ;;
+ esac
else
- ld_shlibs_F77=no
+ ld_shlibs_F77=no
fi
;;
netbsd*)
- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
else
@@ -15917,9 +18624,9 @@ EOF
;;
solaris*)
- if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
+ if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
ld_shlibs_F77=no
- cat <<EOF 1>&2
+ cat <<_LT_EOF 1>&2
*** Warning: The releases 2.8.* of the GNU linker cannot reliably
*** create shared libraries on Solaris systems. Therefore, libtool
@@ -15928,8 +18635,8 @@ EOF
*** your PATH or compiler configuration so that the native linker is
*** used, and then restart.
-EOF
- elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+_LT_EOF
+ elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
else
@@ -15953,10 +18660,14 @@ EOF
_LT_EOF
;;
*)
- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
- hardcode_libdir_flag_spec_F77='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
- archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
- archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
+ # For security reasons, it is highly recommended that you always
+ # use absolute paths for naming shared libraries, and exclude the
+ # DT_RUNPATH tag from executables and libraries. But doing so
+ # requires that you compile everything twice, which is a pain.
+ if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+ hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
+ archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
else
ld_shlibs_F77=no
fi
@@ -15972,7 +18683,7 @@ _LT_EOF
;;
*)
- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
else
@@ -16004,7 +18715,7 @@ _LT_EOF
fi
;;
- aix4* | aix5*)
+ aix[4-9]*)
if test "$host_cpu" = ia64; then
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
@@ -16014,22 +18725,22 @@ _LT_EOF
else
# If we're using GNU nm, then we don't want the "-C" option.
# -C means demangle to AIX nm, but means don't demangle with GNU nm
- if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
- export_symbols_cmds_F77='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
+ if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+ export_symbols_cmds_F77='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
else
- export_symbols_cmds_F77='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
+ export_symbols_cmds_F77='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
fi
aix_use_runtimelinking=no
# Test if we are trying to use run time linking or normal
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
# need to do runtime linking.
- case $host_os in aix4.[23]|aix4.[23].*|aix5*)
+ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
for ld_flag in $LDFLAGS; do
- if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
- aix_use_runtimelinking=yes
- break
- fi
+ if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+ aix_use_runtimelinking=yes
+ break
+ fi
done
;;
esac
@@ -16046,28 +18757,30 @@ _LT_EOF
archive_cmds_F77=''
hardcode_direct_F77=yes
+ hardcode_direct_absolute_F77=yes
hardcode_libdir_separator_F77=':'
link_all_deplibs_F77=yes
+ file_list_spec_F77='${wl}-f,'
if test "$GCC" = yes; then
case $host_os in aix4.[012]|aix4.[012].*)
# We only want to do this on AIX 4.2 and lower, the check
# below for broken collect2 doesn't work under 4.3+
collect2name=`${CC} -print-prog-name=collect2`
- if test -f "$collect2name" && \
- strings "$collect2name" | grep resolve_lib_name >/dev/null
+ if test -f "$collect2name" &&
+ strings "$collect2name" | $GREP resolve_lib_name >/dev/null
then
- # We have reworked collect2
- :
+ # We have reworked collect2
+ :
else
- # We have old collect2
- hardcode_direct_F77=unsupported
- # It fails to find uninstalled libraries when the uninstalled
- # path is not listed in the libpath. Setting hardcode_minus_L
- # to unsupported forces relinking
- hardcode_minus_L_F77=yes
- hardcode_libdir_flag_spec_F77='-L$libdir'
- hardcode_libdir_separator_F77=
+ # We have old collect2
+ hardcode_direct_F77=unsupported
+ # It fails to find uninstalled libraries when the uninstalled
+ # path is not listed in the libpath. Setting hardcode_minus_L
+ # to unsupported forces relinking
+ hardcode_minus_L_F77=yes
+ hardcode_libdir_flag_spec_F77='-L$libdir'
+ hardcode_libdir_separator_F77=
fi
;;
esac
@@ -16078,8 +18791,8 @@ _LT_EOF
else
# not using gcc
if test "$host_cpu" = ia64; then
- # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
- # chokes on -Wl,-G. The following line is correct:
+ # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+ # chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -16090,6 +18803,7 @@ _LT_EOF
fi
fi
+ export_dynamic_flag_spec_F77='${wl}-bexpall'
# It seems that -bexpall does not export symbols beginning with
# underscore (_), so it is better to generate a list of symbols to export.
always_export_symbols_F77=yes
@@ -16097,8 +18811,9 @@ _LT_EOF
# Warning - without using the other runtime loading flags (-brtl),
# -berok will link without error, but may produce a broken library.
allow_undefined_flag_F77='-berok'
- # Determine the default libpath from the value encoded in an empty executable.
- cat >conftest.$ac_ext <<_ACEOF
+ # Determine the default libpath from the value encoded in an
+ # empty executable.
+ cat >conftest.$ac_ext <<_ACEOF
program main
end
@@ -16109,18 +18824,21 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_f77_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
@@ -16135,25 +18853,27 @@ if test -z "$aix_libpath"; then
aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
fi
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
fi
+rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath"
- archive_expsym_cmds_F77="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
- else
+ hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath"
+ archive_expsym_cmds_F77='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+ else
if test "$host_cpu" = ia64; then
hardcode_libdir_flag_spec_F77='${wl}-R $libdir:/usr/lib:/lib'
allow_undefined_flag_F77="-z nodefs"
archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
else
- # Determine the default libpath from the value encoded in an empty executable.
+ # Determine the default libpath from the value encoded in an
+ # empty executable.
cat >conftest.$ac_ext <<_ACEOF
program main
@@ -16165,18 +18885,21 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_f77_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
@@ -16191,12 +18914,13 @@ if test -z "$aix_libpath"; then
aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
fi
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
fi
+rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -16216,18 +18940,25 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
;;
amigaos*)
- archive_cmds_F77='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
- hardcode_libdir_flag_spec_F77='-L$libdir'
- hardcode_minus_L_F77=yes
- # see comment about different semantics on the GNU ld section
- ld_shlibs_F77=no
+ case $host_cpu in
+ powerpc)
+ # see comment about AmigaOS4 .so support
+ archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ archive_expsym_cmds_F77=''
+ ;;
+ m68k)
+ archive_cmds_F77='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+ hardcode_libdir_flag_spec_F77='-L$libdir'
+ hardcode_minus_L_F77=yes
+ ;;
+ esac
;;
bsdi[45]*)
export_dynamic_flag_spec_F77=-rdynamic
;;
- cygwin* | mingw* | pw32*)
+ cygwin* | mingw* | pw32* | cegcc*)
# When not using gcc, we currently assume that we are using
# Microsoft Visual C++.
# hardcode_libdir_flag_spec is actually meaningless, as there is
@@ -16239,9 +18970,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
# Tell ltmain to make .dll files, not .so files.
shrext_cmds=".dll"
# FIXME: Setting linknames here is a bad hack.
- archive_cmds_F77='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
+ archive_cmds_F77='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames='
# The linker will automatically build a .lib file if we build a DLL.
- old_archive_From_new_cmds_F77='true'
+ old_archive_from_new_cmds_F77='true'
# FIXME: Should let the user specify the lib program.
old_archive_cmds_F77='lib -OUT:$oldlib$oldobjs$old_deplibs'
fix_srcfile_path_F77='`cygpath -w "$srcfile"`'
@@ -16249,53 +18980,30 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
;;
darwin* | rhapsody*)
- case $host_os in
- rhapsody* | darwin1.[012])
- allow_undefined_flag_F77='${wl}-undefined ${wl}suppress'
- ;;
- *) # Darwin 1.3 on
- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
- allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
- else
- case ${MACOSX_DEPLOYMENT_TARGET} in
- 10.[012])
- allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
- ;;
- 10.*)
- allow_undefined_flag_F77='${wl}-undefined ${wl}dynamic_lookup'
- ;;
- esac
- fi
- ;;
- esac
- archive_cmds_need_lc_F77=no
- hardcode_direct_F77=no
- hardcode_automatic_F77=yes
- hardcode_shlibpath_var_F77=unsupported
- whole_archive_flag_spec_F77=''
- link_all_deplibs_F77=yes
- if test "$GCC" = yes ; then
- output_verbose_link_cmd='echo'
- archive_cmds_F77='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
- module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
- archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- else
- case $cc_basename in
- xlc*)
- output_verbose_link_cmd='echo'
- archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
- module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
- archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- ;;
- *)
- ld_shlibs_F77=no
- ;;
- esac
- fi
+
+
+ archive_cmds_need_lc_F77=no
+ hardcode_direct_F77=no
+ hardcode_automatic_F77=yes
+ hardcode_shlibpath_var_F77=unsupported
+ whole_archive_flag_spec_F77=''
+ link_all_deplibs_F77=yes
+ allow_undefined_flag_F77="$_lt_dar_allow_undefined"
+ case $cc_basename in
+ ifort*) _lt_dar_can_shared=yes ;;
+ *) _lt_dar_can_shared=$GCC ;;
+ esac
+ if test "$_lt_dar_can_shared" = "yes"; then
+ output_verbose_link_cmd=echo
+ archive_cmds_F77="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+ module_cmds_F77="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+ archive_expsym_cmds_F77="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+ module_expsym_cmds_F77="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+
+ else
+ ld_shlibs_F77=no
+ fi
+
;;
dgux*)
@@ -16337,9 +19045,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hpux9*)
if test "$GCC" = yes; then
- archive_cmds_F77='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+ archive_cmds_F77='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
else
- archive_cmds_F77='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+ archive_cmds_F77='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
fi
hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
hardcode_libdir_separator_F77=:
@@ -16359,11 +19067,11 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
fi
if test "$with_gnu_ld" = no; then
hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
+ hardcode_libdir_flag_spec_ld_F77='+b $libdir'
hardcode_libdir_separator_F77=:
-
hardcode_direct_F77=yes
+ hardcode_direct_absolute_F77=yes
export_dynamic_flag_spec_F77='${wl}-E'
-
# hardcode_minus_L: Not really in the search PATH,
# but as the default location of the library.
hardcode_minus_L_F77=yes
@@ -16377,7 +19085,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
;;
ia64*)
- archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+ archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
;;
*)
archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
@@ -16402,12 +19110,12 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
case $host_cpu in
hppa*64*|ia64*)
- hardcode_libdir_flag_spec_ld_F77='+b $libdir'
hardcode_direct_F77=no
hardcode_shlibpath_var_F77=no
;;
*)
hardcode_direct_F77=yes
+ hardcode_direct_absolute_F77=yes
export_dynamic_flag_spec_F77='${wl}-E'
# hardcode_minus_L: Not really in the search PATH,
@@ -16420,18 +19128,62 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
- archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ # Try to use the -exported_symbol ld option, if it does not
+ # work, assume that -exports_file does not work either and
+ # implicitly export all symbols.
+ save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
+ cat >conftest.$ac_ext <<_ACEOF
+int foo(void) {}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_f77_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+ archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
+
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ LDFLAGS="$save_LDFLAGS"
else
- archive_cmds_F77='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
- hardcode_libdir_flag_spec_ld_F77='-rpath $libdir'
+ archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+ archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
fi
+ archive_cmds_need_lc_F77='no'
hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_F77=:
+ inherit_rpath_F77=yes
link_all_deplibs_F77=yes
;;
netbsd*)
- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
archive_cmds_F77='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF
@@ -16449,11 +19201,15 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_shlibpath_var_F77=no
;;
+ *nto* | *qnx*)
+ ;;
+
openbsd*)
if test -f /usr/libexec/ld.so; then
hardcode_direct_F77=yes
hardcode_shlibpath_var_F77=no
- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ hardcode_direct_absolute_F77=yes
+ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
@@ -16469,7 +19225,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
;;
esac
- fi
+ fi
else
ld_shlibs_F77=no
fi
@@ -16479,18 +19235,19 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec_F77='-L$libdir'
hardcode_minus_L_F77=yes
allow_undefined_flag_F77=unsupported
- archive_cmds_F77='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
- old_archive_From_new_cmds_F77='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+ archive_cmds_F77='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+ old_archive_from_new_cmds_F77='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
;;
osf3*)
if test "$GCC" = yes; then
allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
- archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
else
allow_undefined_flag_F77=' -expect_unresolved \*'
- archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+ archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
fi
+ archive_cmds_need_lc_F77='no'
hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_F77=:
;;
@@ -16498,32 +19255,43 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
- archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
else
allow_undefined_flag_F77=' -expect_unresolved \*'
- archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
- archive_expsym_cmds_F77='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
- $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
+ archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+ archive_expsym_cmds_F77='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
+ $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec_F77='-rpath $libdir'
fi
+ archive_cmds_need_lc_F77='no'
hardcode_libdir_separator_F77=:
;;
solaris*)
- no_undefined_flag_F77=' -z text'
+ no_undefined_flag_F77=' -z defs'
if test "$GCC" = yes; then
wlarc='${wl}'
- archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
- archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
- $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
+ archive_cmds_F77='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds_F77='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+ $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
else
- wlarc=''
- archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
- archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+ case `$CC -V 2>&1` in
+ *"Compilers 5.0"*)
+ wlarc=''
+ archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ archive_expsym_cmds_F77='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
+ ;;
+ *)
+ wlarc='${wl}'
+ archive_cmds_F77='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds_F77='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+ $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+ ;;
+ esac
fi
hardcode_libdir_flag_spec_F77='-R$libdir'
hardcode_shlibpath_var_F77=no
@@ -16533,7 +19301,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
# The compiler driver will combine and reorder linker options,
# but understands `-z linker_flag'. GCC discards it without `$wl',
# but is careful enough not to reorder.
- # Supported since Solaris 2.6 (maybe 2.5.1?)
+ # Supported since Solaris 2.6 (maybe 2.5.1?)
if test "$GCC" = yes; then
whole_archive_flag_spec_F77='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
else
@@ -16622,18 +19390,18 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
allow_undefined_flag_F77='${wl}-z,nodefs'
archive_cmds_need_lc_F77=no
hardcode_shlibpath_var_F77=no
- hardcode_libdir_flag_spec_F77='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
+ hardcode_libdir_flag_spec_F77='${wl}-R,$libdir'
hardcode_libdir_separator_F77=':'
link_all_deplibs_F77=yes
export_dynamic_flag_spec_F77='${wl}-Bexport'
runpath_var='LD_RUN_PATH'
if test "$GCC" = yes; then
- archive_cmds_F77='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
- archive_expsym_cmds_F77='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_cmds_F77='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds_F77='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
else
- archive_cmds_F77='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
- archive_expsym_cmds_F77='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_cmds_F77='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds_F77='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
fi
;;
@@ -16647,12 +19415,27 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
ld_shlibs_F77=no
;;
esac
+
+ if test x$host_vendor = xsni; then
+ case $host in
+ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+ export_dynamic_flag_spec_F77='${wl}-Blargedynsym'
+ ;;
+ esac
+ fi
fi
-{ echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5
-echo "${ECHO_T}$ld_shlibs_F77" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5
+$as_echo "$ld_shlibs_F77" >&6; }
test "$ld_shlibs_F77" = no && can_build_shared=no
+with_gnu_ld_F77=$with_gnu_ld
+
+
+
+
+
+
#
# Do we need to explicitly link libc?
#
@@ -16670,15 +19453,15 @@ x|xyes)
# Test whether the compiler implicitly links with -lc since on some
# systems, -lgcc has to come before -lc. If gcc already passes -lc
# to ld, don't add -lc before -lgcc.
- { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
- $rm conftest*
+ { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
+ $RM conftest*
echo "$lt_simple_compile_test_code" > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } 2>conftest.err; then
soname=conftest
lib=conftest
@@ -16693,10 +19476,10 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&
libname=conftest
lt_save_allow_undefined_flag=$allow_undefined_flag_F77
allow_undefined_flag_F77=
- if { (eval echo "$as_me:$LINENO: \"$archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
- (eval $archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
+ if { (eval echo "$as_me:$LINENO: \"$archive_cmds_F77 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\"") >&5
+ (eval $archive_cmds_F77 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
then
archive_cmds_need_lc_F77=no
@@ -16707,17 +19490,81 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&
else
cat conftest.err 1>&5
fi
- $rm conftest*
- { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5
-echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6; }
+ $RM conftest*
+ { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5
+$as_echo "$archive_cmds_need_lc_F77" >&6; }
;;
esac
fi
;;
esac
-{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ { $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+$as_echo_n "checking dynamic linker characteristics... " >&6; }
+
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -16731,7 +19578,6 @@ shlibpath_overrides_runpath=unknown
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
-
need_lib_prefix=unknown
hardcode_into_libs=no
@@ -16749,7 +19595,7 @@ aix3*)
soname_spec='${libname}${release}${shared_ext}$major'
;;
-aix4* | aix5*)
+aix[4-9]*)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -16768,7 +19614,7 @@ aix4* | aix5*)
aix4 | aix4.[01] | aix4.[01].*)
if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
echo ' yes '
- echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
+ echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
:
else
can_build_shared=no
@@ -16794,9 +19640,18 @@ aix4* | aix5*)
;;
amigaos*)
- library_names_spec='$libname.ixlibrary $libname.a'
- # Create ${libname}_ixlibrary.a entries in /sys/libs.
- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+ case $host_cpu in
+ powerpc)
+ # Since July 2007 AmigaOS4 officially supports .so libraries.
+ # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ ;;
+ m68k)
+ library_names_spec='$libname.ixlibrary $libname.a'
+ # Create ${libname}_ixlibrary.a entries in /sys/libs.
+ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+ ;;
+ esac
;;
beos*)
@@ -16819,25 +19674,28 @@ bsdi[45]*)
# libtool to hard-code these into programs
;;
-cygwin* | mingw* | pw32*)
+cygwin* | mingw* | pw32* | cegcc*)
version_type=windows
shrext_cmds=".dll"
need_version=no
need_lib_prefix=no
case $GCC,$host_os in
- yes,cygwin* | yes,mingw* | yes,pw32*)
+ yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
library_names_spec='$libname.dll.a'
# DLL is installed to $(libdir)/../bin by postinstall_cmds
postinstall_cmds='base_file=`basename \${file}`~
- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
$install_prog $dir/$dlname \$dldir/$dlname~
- chmod a+x \$dldir/$dlname'
+ chmod a+x \$dldir/$dlname~
+ if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+ eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+ fi'
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
- $rm \$dlpath'
+ $RM \$dlpath'
shlibpath_overrides_runpath=yes
case $host_os in
@@ -16846,20 +19704,20 @@ cygwin* | mingw* | pw32*)
soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
;;
- mingw*)
+ mingw* | cegcc*)
# MinGW DLLs use traditional 'lib' prefix
soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
- if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
+ sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
# It is most probably a Windows format PATH printed by
# mingw gcc, but we are running on Cygwin. Gcc prints its search
# path with ; separators, and with drive letters. We can handle the
# drive letters (cygwin fileutils understands them), so leave them,
# especially as we might pass files found there to a mingw objdump,
# which wouldn't understand a cygwinified path. Ahh.
- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
else
- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
fi
;;
pw32*)
@@ -16883,7 +19741,7 @@ darwin* | rhapsody*)
version_type=darwin
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
+ library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -16981,18 +19839,18 @@ hpux9* | hpux10* | hpux11*)
fi
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
- hppa*64*)
- shrext_cmds='.sl'
- hardcode_into_libs=yes
- dynamic_linker="$host_os dld.sl"
- shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
- shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
- ;;
- *)
+ hppa*64*)
+ shrext_cmds='.sl'
+ hardcode_into_libs=yes
+ dynamic_linker="$host_os dld.sl"
+ shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+ ;;
+ *)
shrext_cmds='.sl'
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
@@ -17069,658 +19927,365 @@ linux* | k*bsd*-gnu)
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
- # This implies no fast_install, which is unacceptable.
- # Some rework will be needed to allow for fast_install
- # before this can be enabled.
- hardcode_into_libs=yes
+ # Some binutils ld are patched to set DT_RUNPATH
+ save_LDFLAGS=$LDFLAGS
+ save_libdir=$libdir
+ eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_F77\"; \
+ LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_F77\""
+ cat >conftest.$ac_ext <<_ACEOF
+ program main
- # Append ld.so.conf contents to the search path
- if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
- fi
+ end
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_f77_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+ if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then
+ shlibpath_overrides_runpath=yes
+fi
- # We used to test for /lib/ld.so.1 and disable shared libraries on
- # powerpc, because MkLinux only supported shared libraries with the
- # GNU dynamic linker. Since this was broken with cross compilers,
- # most powerpc-linux boxes support dynamic linking these days and
- # people can always --disable-shared, the test was removed, and we
- # assume the GNU/Linux dynamic linker is in use.
- dynamic_linker='GNU/Linux ld.so'
- ;;
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
-netbsd*)
- version_type=sunos
- need_lib_prefix=no
- need_version=no
- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
- dynamic_linker='NetBSD (a.out) ld.so'
- else
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- dynamic_linker='NetBSD ld.elf_so'
- fi
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes
- hardcode_into_libs=yes
- ;;
-newsos6)
- version_type=linux
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes
- ;;
+fi
-nto-qnx*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes
- ;;
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ LDFLAGS=$save_LDFLAGS
+ libdir=$save_libdir
-openbsd*)
- version_type=sunos
- sys_lib_dlsearch_path_spec="/usr/lib"
- need_lib_prefix=no
- # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
- case $host_os in
- openbsd3.3 | openbsd3.3.*) need_version=yes ;;
- *) need_version=no ;;
- esac
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
- shlibpath_var=LD_LIBRARY_PATH
- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- case $host_os in
- openbsd2.[89] | openbsd2.[89].*)
- shlibpath_overrides_runpath=no
- ;;
- *)
- shlibpath_overrides_runpath=yes
- ;;
- esac
- else
- shlibpath_overrides_runpath=yes
- fi
- ;;
+ # This implies no fast_install, which is unacceptable.
+ # Some rework will be needed to allow for fast_install
+ # before this can be enabled.
+ hardcode_into_libs=yes
-os2*)
- libname_spec='$name'
- shrext_cmds=".dll"
- need_lib_prefix=no
- library_names_spec='$libname${shared_ext} $libname.a'
- dynamic_linker='OS/2 ld.exe'
- shlibpath_var=LIBPATH
- ;;
+ # Add ABI-specific directories to the system library path.
+ sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
-osf3* | osf4* | osf5*)
- version_type=osf
- need_lib_prefix=no
- need_version=no
- soname_spec='${libname}${release}${shared_ext}$major'
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- shlibpath_var=LD_LIBRARY_PATH
- sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
- sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
- ;;
+ # Append ld.so.conf contents to the search path
+ if test -f /etc/ld.so.conf; then
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
+ fi
-rdos*)
- dynamic_linker=no
+ # We used to test for /lib/ld.so.1 and disable shared libraries on
+ # powerpc, because MkLinux only supported shared libraries with the
+ # GNU dynamic linker. Since this was broken with cross compilers,
+ # most powerpc-linux boxes support dynamic linking these days and
+ # people can always --disable-shared, the test was removed, and we
+ # assume the GNU/Linux dynamic linker is in use.
+ dynamic_linker='GNU/Linux ld.so'
;;
-solaris*)
- version_type=linux
+netbsd*)
+ version_type=sunos
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+ dynamic_linker='NetBSD (a.out) ld.so'
+ else
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ dynamic_linker='NetBSD ld.elf_so'
+ fi
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
- # ldd complains unless libraries are executable
- postinstall_cmds='chmod +x $lib'
- ;;
-
-sunos4*)
- version_type=sunos
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
- finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes
- if test "$with_gnu_ld" = yes; then
- need_lib_prefix=no
- fi
- need_version=yes
;;
-sysv4 | sysv4.3*)
+newsos6)
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
shlibpath_var=LD_LIBRARY_PATH
- case $host_vendor in
- sni)
- shlibpath_overrides_runpath=no
- need_lib_prefix=no
- export_dynamic_flag_spec='${wl}-Blargedynsym'
- runpath_var=LD_RUN_PATH
- ;;
- siemens)
- need_lib_prefix=no
- ;;
- motorola)
- need_lib_prefix=no
- need_version=no
- shlibpath_overrides_runpath=no
- sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
- ;;
- esac
- ;;
-
-sysv4*MP*)
- if test -d /usr/nec ;then
- version_type=linux
- library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
- soname_spec='$libname${shared_ext}.$major'
- shlibpath_var=LD_LIBRARY_PATH
- fi
+ shlibpath_overrides_runpath=yes
;;
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
- version_type=freebsd-elf
+*nto* | *qnx*)
+ version_type=qnx
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
hardcode_into_libs=yes
- if test "$with_gnu_ld" = yes; then
- sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
- shlibpath_overrides_runpath=no
- else
- sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
- shlibpath_overrides_runpath=yes
- case $host_os in
- sco3.2v5*)
- sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
- ;;
- esac
- fi
- sys_lib_dlsearch_path_spec='/usr/lib'
+ dynamic_linker='ldqnx.so'
;;
-uts4*)
- version_type=linux
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+openbsd*)
+ version_type=sunos
+ sys_lib_dlsearch_path_spec="/usr/lib"
+ need_lib_prefix=no
+ # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
+ case $host_os in
+ openbsd3.3 | openbsd3.3.*) need_version=yes ;;
+ *) need_version=no ;;
+ esac
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
- ;;
-
-*)
- dynamic_linker=no
- ;;
-esac
-{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-echo "${ECHO_T}$dynamic_linker" >&6; }
-test "$dynamic_linker" = no && can_build_shared=no
-
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
-
-{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
-hardcode_action_F77=
-if test -n "$hardcode_libdir_flag_spec_F77" || \
- test -n "$runpath_var_F77" || \
- test "X$hardcode_automatic_F77" = "Xyes" ; then
-
- # We can hardcode non-existant directories.
- if test "$hardcode_direct_F77" != no &&
- # If the only mechanism to avoid hardcoding is shlibpath_var, we
- # have to relink, otherwise we might link with an installed library
- # when we should be linking with a yet-to-be-installed one
- ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, F77)" != no &&
- test "$hardcode_minus_L_F77" != no; then
- # Linking always hardcodes the temporary library directory.
- hardcode_action_F77=relink
+ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ case $host_os in
+ openbsd2.[89] | openbsd2.[89].*)
+ shlibpath_overrides_runpath=no
+ ;;
+ *)
+ shlibpath_overrides_runpath=yes
+ ;;
+ esac
else
- # We can link without hardcoding, and we can hardcode nonexisting dirs.
- hardcode_action_F77=immediate
- fi
-else
- # We cannot hardcode anything, or else we can only hardcode existing
- # directories.
- hardcode_action_F77=unsupported
-fi
-{ echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5
-echo "${ECHO_T}$hardcode_action_F77" >&6; }
-
-if test "$hardcode_action_F77" = relink; then
- # Fast installation is not supported
- enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
- test "$enable_shared" = no; then
- # Fast installation is not necessary
- enable_fast_install=needless
-fi
-
-
-# The else clause should only fire when bootstrapping the
-# libtool distribution, otherwise you forgot to ship ltmain.sh
-# with your package, and you will get complaints that there are
-# no rules to generate ltmain.sh.
-if test -f "$ltmain"; then
- # See if we are running on zsh, and set the options which allow our commands through
- # without removal of \ escapes.
- if test -n "${ZSH_VERSION+set}" ; then
- setopt NO_GLOB_SUBST
+ shlibpath_overrides_runpath=yes
fi
- # Now quote all the things that may contain metacharacters while being
- # careful not to overquote the AC_SUBSTed values. We take copies of the
- # variables and quote the copies for generation of the libtool script.
- for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
- SED SHELL STRIP \
- libname_spec library_names_spec soname_spec extract_expsyms_cmds \
- old_striplib striplib file_magic_cmd finish_cmds finish_eval \
- deplibs_check_method reload_flag reload_cmds need_locks \
- lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
- lt_cv_sys_global_symbol_to_c_name_address \
- sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
- old_postinstall_cmds old_postuninstall_cmds \
- compiler_F77 \
- CC_F77 \
- LD_F77 \
- lt_prog_compiler_wl_F77 \
- lt_prog_compiler_pic_F77 \
- lt_prog_compiler_static_F77 \
- lt_prog_compiler_no_builtin_flag_F77 \
- export_dynamic_flag_spec_F77 \
- thread_safe_flag_spec_F77 \
- whole_archive_flag_spec_F77 \
- enable_shared_with_static_runtimes_F77 \
- old_archive_cmds_F77 \
- old_archive_from_new_cmds_F77 \
- predep_objects_F77 \
- postdep_objects_F77 \
- predeps_F77 \
- postdeps_F77 \
- compiler_lib_search_path_F77 \
- archive_cmds_F77 \
- archive_expsym_cmds_F77 \
- postinstall_cmds_F77 \
- postuninstall_cmds_F77 \
- old_archive_from_expsyms_cmds_F77 \
- allow_undefined_flag_F77 \
- no_undefined_flag_F77 \
- export_symbols_cmds_F77 \
- hardcode_libdir_flag_spec_F77 \
- hardcode_libdir_flag_spec_ld_F77 \
- hardcode_libdir_separator_F77 \
- hardcode_automatic_F77 \
- module_cmds_F77 \
- module_expsym_cmds_F77 \
- lt_cv_prog_compiler_c_o_F77 \
- fix_srcfile_path_F77 \
- exclude_expsyms_F77 \
- include_expsyms_F77; do
-
- case $var in
- old_archive_cmds_F77 | \
- old_archive_from_new_cmds_F77 | \
- archive_cmds_F77 | \
- archive_expsym_cmds_F77 | \
- module_cmds_F77 | \
- module_expsym_cmds_F77 | \
- old_archive_from_expsyms_cmds_F77 | \
- export_symbols_cmds_F77 | \
- extract_expsyms_cmds | reload_cmds | finish_cmds | \
- postinstall_cmds | postuninstall_cmds | \
- old_postinstall_cmds | old_postuninstall_cmds | \
- sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
- # Double-quote double-evaled strings.
- eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
- ;;
- *)
- eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
- ;;
- esac
- done
-
- case $lt_echo in
- *'\$0 --fallback-echo"')
- lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
- ;;
- esac
-
-cfgfile="$ofile"
-
- cat <<__EOF__ >> "$cfgfile"
-# ### BEGIN LIBTOOL TAG CONFIG: $tagname
-
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
-
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
-
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$archive_cmds_need_lc_F77
-
-# Whether or not to disallow shared libs when runtime libs are static
-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_F77
-
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
-
-# The host system.
-host_alias=$host_alias
-host=$host
-host_os=$host_os
-
-# The build system.
-build_alias=$build_alias
-build=$build
-build_os=$build_os
-
-# An echo program that does not interpret backslashes.
-echo=$lt_echo
-
-# The archiver.
-AR=$lt_AR
-AR_FLAGS=$lt_AR_FLAGS
-
-# A C compiler.
-LTCC=$lt_LTCC
-
-# LTCC compiler flags.
-LTCFLAGS=$lt_LTCFLAGS
-
-# A language-specific compiler.
-CC=$lt_compiler_F77
-
-# Is the compiler the GNU C compiler?
-with_gcc=$GCC_F77
-
-# An ERE matcher.
-EGREP=$lt_EGREP
-
-# The linker used to build libraries.
-LD=$lt_LD_F77
-
-# Whether we need hard or soft links.
-LN_S=$lt_LN_S
-
-# A BSD-compatible nm program.
-NM=$lt_NM
-
-# A symbol stripping program
-STRIP=$lt_STRIP
-
-# Used to examine libraries when file_magic_cmd begins "file"
-MAGIC_CMD=$MAGIC_CMD
-
-# Used on cygwin: DLL creation program.
-DLLTOOL="$DLLTOOL"
-
-# Used on cygwin: object dumper.
-OBJDUMP="$OBJDUMP"
-
-# Used on cygwin: assembler.
-AS="$AS"
-
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
-
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
-
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl_F77
-
-# Object file suffix (normally "o").
-objext="$ac_objext"
-
-# Old archive suffix (normally "a").
-libext="$libext"
-
-# Shared library suffix (normally ".so").
-shrext_cmds='$shrext_cmds'
-
-# Executable file suffix (normally "").
-exeext="$exeext"
-
-# Additional compiler flags for building library objects.
-pic_flag=$lt_lt_prog_compiler_pic_F77
-pic_mode=$pic_mode
-
-# What is the maximum length of a command?
-max_cmd_len=$lt_cv_sys_max_cmd_len
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77
-
-# Must we lock files when doing compilation?
-need_locks=$lt_need_locks
-
-# Do we need the lib prefix for modules?
-need_lib_prefix=$need_lib_prefix
-
-# Do we need a version for libraries?
-need_version=$need_version
+ ;;
-# Whether dlopen is supported.
-dlopen_support=$enable_dlopen
+os2*)
+ libname_spec='$name'
+ shrext_cmds=".dll"
+ need_lib_prefix=no
+ library_names_spec='$libname${shared_ext} $libname.a'
+ dynamic_linker='OS/2 ld.exe'
+ shlibpath_var=LIBPATH
+ ;;
-# Whether dlopen of programs is supported.
-dlopen_self=$enable_dlopen_self
+osf3* | osf4* | osf5*)
+ version_type=osf
+ need_lib_prefix=no
+ need_version=no
+ soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ shlibpath_var=LD_LIBRARY_PATH
+ sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+ ;;
-# Whether dlopen of statically linked programs is supported.
-dlopen_self_static=$enable_dlopen_self_static
+rdos*)
+ dynamic_linker=no
+ ;;
-# Compiler flag to prevent dynamic linking.
-link_static_flag=$lt_lt_prog_compiler_static_F77
+solaris*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+ # ldd complains unless libraries are executable
+ postinstall_cmds='chmod +x $lib'
+ ;;
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_F77
+sunos4*)
+ version_type=sunos
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+ finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+ if test "$with_gnu_ld" = yes; then
+ need_lib_prefix=no
+ fi
+ need_version=yes
+ ;;
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_F77
+sysv4 | sysv4.3*)
+ version_type=linux
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ case $host_vendor in
+ sni)
+ shlibpath_overrides_runpath=no
+ need_lib_prefix=no
+ runpath_var=LD_RUN_PATH
+ ;;
+ siemens)
+ need_lib_prefix=no
+ ;;
+ motorola)
+ need_lib_prefix=no
+ need_version=no
+ shlibpath_overrides_runpath=no
+ sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
+ ;;
+ esac
+ ;;
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$lt_whole_archive_flag_spec_F77
+sysv4*MP*)
+ if test -d /usr/nec ;then
+ version_type=linux
+ library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
+ soname_spec='$libname${shared_ext}.$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ fi
+ ;;
-# Compiler flag to generate thread-safe objects.
-thread_safe_flag_spec=$lt_thread_safe_flag_spec_F77
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+ version_type=freebsd-elf
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+ if test "$with_gnu_ld" = yes; then
+ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+ else
+ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+ case $host_os in
+ sco3.2v5*)
+ sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
+ ;;
+ esac
+ fi
+ sys_lib_dlsearch_path_spec='/usr/lib'
+ ;;
-# Library versioning type.
-version_type=$version_type
+tpf*)
+ # TPF is a cross-target only. Preferred cross-host = GNU/Linux.
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ ;;
-# Format of library name prefix.
-libname_spec=$lt_libname_spec
+uts4*)
+ version_type=linux
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ ;;
-# List of archive names. First name is the real one, the rest are links.
-# The last name is the one that the linker finds with -lNAME.
-library_names_spec=$lt_library_names_spec
+*)
+ dynamic_linker=no
+ ;;
+esac
+{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+$as_echo "$dynamic_linker" >&6; }
+test "$dynamic_linker" = no && can_build_shared=no
-# The coded name of the library, if different from the real name.
-soname_spec=$lt_soname_spec
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test "$GCC" = yes; then
+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+fi
-# Commands used to build and install an old-style archive.
-RANLIB=$lt_RANLIB
-old_archive_cmds=$lt_old_archive_cmds_F77
-old_postinstall_cmds=$lt_old_postinstall_cmds
-old_postuninstall_cmds=$lt_old_postuninstall_cmds
+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
+ sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+fi
+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
+ sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+fi
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_F77
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_F77
-# Commands used to build and install a shared archive.
-archive_cmds=$lt_archive_cmds_F77
-archive_expsym_cmds=$lt_archive_expsym_cmds_F77
-postinstall_cmds=$lt_postinstall_cmds
-postuninstall_cmds=$lt_postuninstall_cmds
-# Commands used to build a loadable module (assumed same as above if empty)
-module_cmds=$lt_module_cmds_F77
-module_expsym_cmds=$lt_module_expsym_cmds_F77
-# Commands to strip libraries.
-old_striplib=$lt_old_striplib
-striplib=$lt_striplib
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predep_objects=$lt_predep_objects_F77
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdep_objects=$lt_postdep_objects_F77
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predeps=$lt_predeps_F77
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdeps=$lt_postdeps_F77
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path_F77
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method=$lt_deplibs_check_method
-# Command to use when deplibs_check_method == file_magic.
-file_magic_cmd=$lt_file_magic_cmd
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$lt_allow_undefined_flag_F77
-# Flag that forces no undefined symbols.
-no_undefined_flag=$lt_no_undefined_flag_F77
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds=$lt_finish_cmds
-# Same as above, but a single script fragment to be evaled but not shown.
-finish_eval=$lt_finish_eval
-# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
-# Transform the output of nm in a proper C declaration
-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-# Transform the output of nm in a C name address pair
-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
-# This is the shared library runtime path variable.
-runpath_var=$runpath_var
-# This is the shared library path variable.
-shlibpath_var=$shlibpath_var
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-# How to hardcode a shared library path into an executable.
-hardcode_action=$hardcode_action_F77
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=$hardcode_into_libs
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_F77
-# If ld is used when linking, flag to hardcode \$libdir into
-# a binary during linking. This must work even if \$libdir does
-# not exist.
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_F77
-# Whether we need a single -rpath flag with a separated argument.
-hardcode_libdir_separator=$lt_hardcode_libdir_separator_F77
-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
-# resulting binary.
-hardcode_direct=$hardcode_direct_F77
-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-# resulting binary.
-hardcode_minus_L=$hardcode_minus_L_F77
-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-# the resulting binary.
-hardcode_shlibpath_var=$hardcode_shlibpath_var_F77
-# Set to yes if building a shared library automatically hardcodes DIR into the library
-# and all subsequent libraries and executables linked against it.
-hardcode_automatic=$hardcode_automatic_F77
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at relink time.
-variables_saved_for_relink="$variables_saved_for_relink"
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=$link_all_deplibs_F77
-# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-# Run-time system search path for libraries
-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path=$lt_fix_srcfile_path
+ { $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
+hardcode_action_F77=
+if test -n "$hardcode_libdir_flag_spec_F77" ||
+ test -n "$runpath_var_F77" ||
+ test "X$hardcode_automatic_F77" = "Xyes" ; then
-# Set to yes if exported symbols are required.
-always_export_symbols=$always_export_symbols_F77
+ # We can hardcode non-existent directories.
+ if test "$hardcode_direct_F77" != no &&
+ # If the only mechanism to avoid hardcoding is shlibpath_var, we
+ # have to relink, otherwise we might link with an installed library
+ # when we should be linking with a yet-to-be-installed one
+ ## test "$_LT_TAGVAR(hardcode_shlibpath_var, F77)" != no &&
+ test "$hardcode_minus_L_F77" != no; then
+ # Linking always hardcodes the temporary library directory.
+ hardcode_action_F77=relink
+ else
+ # We can link without hardcoding, and we can hardcode nonexisting dirs.
+ hardcode_action_F77=immediate
+ fi
+else
+ # We cannot hardcode anything, or else we can only hardcode existing
+ # directories.
+ hardcode_action_F77=unsupported
+fi
+{ $as_echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5
+$as_echo "$hardcode_action_F77" >&6; }
-# The commands to list exported symbols.
-export_symbols_cmds=$lt_export_symbols_cmds_F77
+if test "$hardcode_action_F77" = relink ||
+ test "$inherit_rpath_F77" = yes; then
+ # Fast installation is not supported
+ enable_fast_install=no
+elif test "$shlibpath_overrides_runpath" = yes ||
+ test "$enable_shared" = no; then
+ # Fast installation is not necessary
+ enable_fast_install=needless
+fi
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=$lt_extract_expsyms_cmds
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$lt_exclude_expsyms_F77
-# Symbols that must always be exported.
-include_expsyms=$lt_include_expsyms_F77
-# ### END LIBTOOL TAG CONFIG: $tagname
-__EOF__
-else
- # If there is no Makefile yet, we rely on a make rule to execute
- # `config.status --recheck' to rerun these tests and create the
- # libtool script then.
- ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
- if test -f "$ltmain_in"; then
- test -f Makefile && make "$ltmain"
- fi
-fi
+ fi # test -n "$compiler"
+ GCC=$lt_save_GCC
+ CC="$lt_save_CC"
+fi # test "$_lt_disable_F77" != yes
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
@@ -17728,31 +20293,66 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-CC="$lt_save_CC"
- else
- tagname=""
- fi
- ;;
- GCJ)
- if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
+ ac_ext=${ac_fc_srcext-f}
+ac_compile='$FC -c $FCFLAGS $ac_fcflags_srcext conftest.$ac_ext >&5'
+ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_fc_compiler_gnu
+
+
+archive_cmds_need_lc_FC=no
+allow_undefined_flag_FC=
+always_export_symbols_FC=no
+archive_expsym_cmds_FC=
+export_dynamic_flag_spec_FC=
+hardcode_direct_FC=no
+hardcode_direct_absolute_FC=no
+hardcode_libdir_flag_spec_FC=
+hardcode_libdir_flag_spec_ld_FC=
+hardcode_libdir_separator_FC=
+hardcode_minus_L_FC=no
+hardcode_automatic_FC=no
+inherit_rpath_FC=no
+module_cmds_FC=
+module_expsym_cmds_FC=
+link_all_deplibs_FC=unknown
+old_archive_cmds_FC=$old_archive_cmds
+no_undefined_flag_FC=
+whole_archive_flag_spec_FC=
+enable_shared_with_static_runtimes_FC=no
+
+# Source file extension for fc test sources.
+ac_ext=${ac_fc_srcext-f}
+
+# Object file extension for compiled fc test sources.
+objext=o
+objext_FC=$objext
+
+# No sense in running all these tests if we already determined that
+# the FC compiler isn't working. Some variables (like enable_shared)
+# are currently assumed to apply to all compilers on this platform,
+# and will be corrupted by setting them based on a non-working compiler.
+if test "$_lt_disable_FC" != yes; then
+ # Code to be used in simple compile tests
+ lt_simple_compile_test_code="\
+ subroutine t
+ return
+ end
+"
+
+ # Code to be used in simple link tests
+ lt_simple_link_test_code="\
+ program t
+ end
+"
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
-# Source file extension for Java test sources.
-ac_ext=java
-# Object file extension for compiled Java test sources.
-objext=o
-objext_GCJ=$objext
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="class foo {}"
-# Code to be used in simple link tests
-lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }'
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -17764,26 +20364,29 @@ LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
compiler=$CC
-# save warnings/boilerplate of simple test code
-ac_outfile=conftest.$ac_objext
+ # save warnings/boilerplate of simple test code
+ ac_outfile=conftest.$ac_objext
echo "$lt_simple_compile_test_code" >conftest.$ac_ext
eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_compiler_boilerplate=`cat conftest.err`
-$rm conftest*
+$RM conftest*
-ac_outfile=conftest.$ac_objext
+ ac_outfile=conftest.$ac_objext
echo "$lt_simple_link_test_code" >conftest.$ac_ext
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
-$rm conftest*
+$RM -r conftest*
-# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
-CC=${GCJ-"gcj"}
-compiler=$CC
-compiler_GCJ=$CC
-for cc_temp in $compiler""; do
+ # Allow CC to be a program name with arguments.
+ lt_save_CC="$CC"
+ lt_save_GCC=$GCC
+ CC=${FC-"f95"}
+ compiler=$CC
+ GCC=$ac_cv_fc_compiler_gnu
+
+ compiler_FC=$CC
+ for cc_temp in $compiler""; do
case $cc_temp in
compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
@@ -17791,110 +20394,242 @@ for cc_temp in $compiler""; do
*) break;;
esac
done
-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-# GCJ did not exist at the time GCC didn't implicitly link libc in.
-archive_cmds_need_lc_GCJ=no
+ if test -n "$compiler"; then
+ { $as_echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
+$as_echo_n "checking if libtool supports shared libraries... " >&6; }
+ { $as_echo "$as_me:$LINENO: result: $can_build_shared" >&5
+$as_echo "$can_build_shared" >&6; }
-old_archive_cmds_GCJ=$old_archive_cmds
+ { $as_echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
+$as_echo_n "checking whether to build shared libraries... " >&6; }
+ test "$can_build_shared" = "no" && enable_shared=no
+ # On AIX, shared libraries and static libraries use the same namespace, and
+ # are all built from PIC.
+ case $host_os in
+ aix3*)
+ test "$enable_shared" = yes && enable_static=no
+ if test -n "$RANLIB"; then
+ archive_cmds="$archive_cmds~\$RANLIB \$lib"
+ postinstall_cmds='$RANLIB $lib'
+ fi
+ ;;
+ aix[4-9]*)
+ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+ test "$enable_shared" = yes && enable_static=no
+ fi
+ ;;
+ esac
+ { $as_echo "$as_me:$LINENO: result: $enable_shared" >&5
+$as_echo "$enable_shared" >&6; }
+
+ { $as_echo "$as_me:$LINENO: checking whether to build static libraries" >&5
+$as_echo_n "checking whether to build static libraries... " >&6; }
+ # Make sure either enable_shared or enable_static is yes.
+ test "$enable_shared" = yes || enable_static=yes
+ { $as_echo "$as_me:$LINENO: result: $enable_static" >&5
+$as_echo "$enable_static" >&6; }
+
+ GCC_FC="$ac_cv_fc_compiler_gnu"
+ LD_FC="$LD"
+
+ ## CAVEAT EMPTOR:
+ ## There is no encapsulation within the following macros, do not change
+ ## the running order or otherwise move them around unless you know exactly
+ ## what you are doing...
+ # Dependencies to place before and after the object being linked:
+predep_objects_FC=
+postdep_objects_FC=
+predeps_FC=
+postdeps_FC=
+compiler_lib_search_path_FC=
+
+cat > conftest.$ac_ext <<_LT_EOF
+ subroutine foo
+ implicit none
+ integer a
+ a=0
+ return
+ end
+_LT_EOF
-lt_prog_compiler_no_builtin_flag_GCJ=
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ # Parse the compiler output and extract the necessary
+ # objects, libraries and library flags.
-if test "$GCC" = yes; then
- lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin'
+ # Sentinel used to keep track of whether or not we are before
+ # the conftest object file.
+ pre_test_object_deps_done=no
+ for p in `eval "$output_verbose_link_cmd"`; do
+ case $p in
-{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
-echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; }
-if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- lt_cv_prog_compiler_rtti_exceptions=no
- ac_outfile=conftest.$ac_objext
- echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- lt_compiler_flag="-fno-rtti -fno-exceptions"
- # Insert the option either (1) after the last *FLAGS variable, or
- # (2) before a word containing "conftest.", or (3) at the end.
- # Note that $ac_compile itself does not contain backslashes and begins
- # with a dollar sign (not a hyphen), so the echo should work correctly.
- # The option is referenced via a variable to avoid confusing sed.
- lt_compile=`echo "$ac_compile" | $SED \
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17827: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
- echo "$as_me:17831: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s "$ac_outfile"; then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings other than the usual output.
- $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
- $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
- if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
- lt_cv_prog_compiler_rtti_exceptions=yes
- fi
- fi
- $rm conftest*
+ -L* | -R* | -l*)
+ # Some compilers place space between "-{L,R}" and the path.
+ # Remove the space.
+ if test $p = "-L" ||
+ test $p = "-R"; then
+ prev=$p
+ continue
+ else
+ prev=
+ fi
-fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; }
+ if test "$pre_test_object_deps_done" = no; then
+ case $p in
+ -L* | -R*)
+ # Internal compiler library paths should come after those
+ # provided the user. The postdeps already come after the
+ # user supplied libs so there is no need to process them.
+ if test -z "$compiler_lib_search_path_FC"; then
+ compiler_lib_search_path_FC="${prev}${p}"
+ else
+ compiler_lib_search_path_FC="${compiler_lib_search_path_FC} ${prev}${p}"
+ fi
+ ;;
+ # The "-l" case would never come before the object being
+ # linked, so don't bother handling this case.
+ esac
+ else
+ if test -z "$postdeps_FC"; then
+ postdeps_FC="${prev}${p}"
+ else
+ postdeps_FC="${postdeps_FC} ${prev}${p}"
+ fi
+ fi
+ ;;
-if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
- lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions"
+ *.$objext)
+ # This assumes that the test object file only shows up
+ # once in the compiler output.
+ if test "$p" = "conftest.$objext"; then
+ pre_test_object_deps_done=yes
+ continue
+ fi
+
+ if test "$pre_test_object_deps_done" = no; then
+ if test -z "$predep_objects_FC"; then
+ predep_objects_FC="$p"
+ else
+ predep_objects_FC="$predep_objects_FC $p"
+ fi
+ else
+ if test -z "$postdep_objects_FC"; then
+ postdep_objects_FC="$p"
+ else
+ postdep_objects_FC="$postdep_objects_FC $p"
+ fi
+ fi
+ ;;
+
+ *) ;; # Ignore the rest.
+
+ esac
+ done
+
+ # Clean up.
+ rm -f a.out a.exe
else
- :
+ echo "libtool.m4: error: problem compiling FC test program"
fi
+$RM -f confest.$objext
+
+# PORTME: override above test on systems where it is broken
+
+
+case " $postdeps_FC " in
+*" -lc "*) archive_cmds_need_lc_FC=no ;;
+esac
+ compiler_lib_search_dirs_FC=
+if test -n "${compiler_lib_search_path_FC}"; then
+ compiler_lib_search_dirs_FC=`echo " ${compiler_lib_search_path_FC}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
fi
-lt_prog_compiler_wl_GCJ=
-lt_prog_compiler_pic_GCJ=
-lt_prog_compiler_static_GCJ=
-{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
+
+
+
+
+
+
+
+
+
+
+
+ lt_prog_compiler_wl_FC=
+lt_prog_compiler_pic_FC=
+lt_prog_compiler_static_FC=
+
+{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
if test "$GCC" = yes; then
- lt_prog_compiler_wl_GCJ='-Wl,'
- lt_prog_compiler_static_GCJ='-static'
+ lt_prog_compiler_wl_FC='-Wl,'
+ lt_prog_compiler_static_FC='-static'
case $host_os in
aix*)
# All AIX code is PIC.
if test "$host_cpu" = ia64; then
# AIX 5 now supports IA64 processor
- lt_prog_compiler_static_GCJ='-Bstatic'
+ lt_prog_compiler_static_FC='-Bstatic'
fi
;;
amigaos*)
- # FIXME: we need at least 68020 code to build shared libraries, but
- # adding the `-m68020' flag to GCC prevents building anything better,
- # like `-m68040'.
- lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4'
+ case $host_cpu in
+ powerpc)
+ # see comment about AmigaOS4 .so support
+ lt_prog_compiler_pic_FC='-fPIC'
+ ;;
+ m68k)
+ # FIXME: we need at least 68020 code to build shared libraries, but
+ # adding the `-m68020' flag to GCC prevents building anything better,
+ # like `-m68040'.
+ lt_prog_compiler_pic_FC='-m68020 -resident32 -malways-restore-a4'
+ ;;
+ esac
;;
beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
# PIC is the default for these OSes.
;;
- mingw* | cygwin* | pw32* | os2*)
+ mingw* | cygwin* | pw32* | os2* | cegcc*)
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
# Although the cygwin gcc ignores -fPIC, still need this for old-style
# (--disable-auto-import) libraries
- lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
+ lt_prog_compiler_pic_FC='-DDLL_EXPORT'
;;
darwin* | rhapsody*)
# PIC is the default on this platform
# Common symbols not allowed in MH_DYLIB files
- lt_prog_compiler_pic_GCJ='-fno-common'
+ lt_prog_compiler_pic_FC='-fno-common'
+ ;;
+
+ hpux*)
+ # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
+ # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag
+ # sets the default TLS model and affects inlining.
+ case $host_cpu in
+ hppa*64*)
+ # +Z the default
+ ;;
+ *)
+ lt_prog_compiler_pic_FC='-fPIC'
+ ;;
+ esac
;;
interix[3-9]*)
@@ -17905,64 +20640,47 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
msdosdjgpp*)
# Just because we use GCC doesn't mean we suddenly get shared libraries
# on systems that don't support them.
- lt_prog_compiler_can_build_shared_GCJ=no
+ lt_prog_compiler_can_build_shared_FC=no
enable_shared=no
;;
+ *nto* | *qnx*)
+ # QNX uses GNU C++, but need to define -shared option too, otherwise
+ # it will coredump.
+ lt_prog_compiler_pic_FC='-fPIC -shared'
+ ;;
+
sysv4*MP*)
if test -d /usr/nec; then
- lt_prog_compiler_pic_GCJ=-Kconform_pic
+ lt_prog_compiler_pic_FC=-Kconform_pic
fi
;;
- hpux*)
- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
- # not for PA HP-UX.
- case $host_cpu in
- hppa*64*|ia64*)
- # +Z the default
- ;;
- *)
- lt_prog_compiler_pic_GCJ='-fPIC'
- ;;
- esac
- ;;
-
*)
- lt_prog_compiler_pic_GCJ='-fPIC'
+ lt_prog_compiler_pic_FC='-fPIC'
;;
esac
else
# PORTME Check for flag to pass linker flags through the system compiler.
case $host_os in
aix*)
- lt_prog_compiler_wl_GCJ='-Wl,'
+ lt_prog_compiler_wl_FC='-Wl,'
if test "$host_cpu" = ia64; then
# AIX 5 now supports IA64 processor
- lt_prog_compiler_static_GCJ='-Bstatic'
+ lt_prog_compiler_static_FC='-Bstatic'
else
- lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp'
+ lt_prog_compiler_static_FC='-bnso -bI:/lib/syscalls.exp'
fi
;;
- darwin*)
- # PIC is the default on this platform
- # Common symbols not allowed in MH_DYLIB files
- case $cc_basename in
- xlc*)
- lt_prog_compiler_pic_GCJ='-qnocommon'
- lt_prog_compiler_wl_GCJ='-Wl,'
- ;;
- esac
- ;;
- mingw* | cygwin* | pw32* | os2*)
+ mingw* | cygwin* | pw32* | os2* | cegcc*)
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
- lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
+ lt_prog_compiler_pic_FC='-DDLL_EXPORT'
;;
hpux9* | hpux10* | hpux11*)
- lt_prog_compiler_wl_GCJ='-Wl,'
+ lt_prog_compiler_wl_FC='-Wl,'
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
case $host_cpu in
@@ -17970,141 +20688,177 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
# +Z the default
;;
*)
- lt_prog_compiler_pic_GCJ='+Z'
+ lt_prog_compiler_pic_FC='+Z'
;;
esac
# Is there a better lt_prog_compiler_static that works with the bundled CC?
- lt_prog_compiler_static_GCJ='${wl}-a ${wl}archive'
+ lt_prog_compiler_static_FC='${wl}-a ${wl}archive'
;;
irix5* | irix6* | nonstopux*)
- lt_prog_compiler_wl_GCJ='-Wl,'
+ lt_prog_compiler_wl_FC='-Wl,'
# PIC (with -KPIC) is the default.
- lt_prog_compiler_static_GCJ='-non_shared'
- ;;
-
- newsos6)
- lt_prog_compiler_pic_GCJ='-KPIC'
- lt_prog_compiler_static_GCJ='-Bstatic'
+ lt_prog_compiler_static_FC='-non_shared'
;;
linux* | k*bsd*-gnu)
case $cc_basename in
- icc* | ecc*)
- lt_prog_compiler_wl_GCJ='-Wl,'
- lt_prog_compiler_pic_GCJ='-KPIC'
- lt_prog_compiler_static_GCJ='-static'
+ # old Intel for x86_64 which still supported -KPIC.
+ ecc*)
+ lt_prog_compiler_wl_FC='-Wl,'
+ lt_prog_compiler_pic_FC='-KPIC'
+ lt_prog_compiler_static_FC='-static'
+ ;;
+ # icc used to be incompatible with GCC.
+ # ICC 10 doesn't accept -KPIC any more.
+ icc* | ifort*)
+ lt_prog_compiler_wl_FC='-Wl,'
+ lt_prog_compiler_pic_FC='-fPIC'
+ lt_prog_compiler_static_FC='-static'
;;
+ # Lahey Fortran 8.1.
+ lf95*)
+ lt_prog_compiler_wl_FC='-Wl,'
+ lt_prog_compiler_pic_FC='--shared'
+ lt_prog_compiler_static_FC='--static'
+ ;;
pgcc* | pgf77* | pgf90* | pgf95*)
# Portland Group compilers (*not* the Pentium gcc compiler,
# which looks to be a dead project)
- lt_prog_compiler_wl_GCJ='-Wl,'
- lt_prog_compiler_pic_GCJ='-fpic'
- lt_prog_compiler_static_GCJ='-Bstatic'
+ lt_prog_compiler_wl_FC='-Wl,'
+ lt_prog_compiler_pic_FC='-fpic'
+ lt_prog_compiler_static_FC='-Bstatic'
;;
ccc*)
- lt_prog_compiler_wl_GCJ='-Wl,'
+ lt_prog_compiler_wl_FC='-Wl,'
# All Alpha code is PIC.
- lt_prog_compiler_static_GCJ='-non_shared'
+ lt_prog_compiler_static_FC='-non_shared'
;;
+ xl*)
+ # IBM XL C 8.0/Fortran 10.1 on PPC
+ lt_prog_compiler_wl_FC='-Wl,'
+ lt_prog_compiler_pic_FC='-qpic'
+ lt_prog_compiler_static_FC='-qstaticlink'
+ ;;
*)
- case `$CC -V 2>&1 | sed 5q` in
+ case `$CC -V 2>&1 | sed 5q` in
*Sun\ C*)
# Sun C 5.9
- lt_prog_compiler_pic_GCJ='-KPIC'
- lt_prog_compiler_static_GCJ='-Bstatic'
- lt_prog_compiler_wl_GCJ='-Wl,'
+ lt_prog_compiler_pic_FC='-KPIC'
+ lt_prog_compiler_static_FC='-Bstatic'
+ lt_prog_compiler_wl_FC='-Wl,'
;;
*Sun\ F*)
# Sun Fortran 8.3 passes all unrecognized flags to the linker
- lt_prog_compiler_pic_GCJ='-KPIC'
- lt_prog_compiler_static_GCJ='-Bstatic'
- lt_prog_compiler_wl_GCJ=''
+ lt_prog_compiler_pic_FC='-KPIC'
+ lt_prog_compiler_static_FC='-Bstatic'
+ lt_prog_compiler_wl_FC=''
;;
esac
;;
esac
;;
+ newsos6)
+ lt_prog_compiler_pic_FC='-KPIC'
+ lt_prog_compiler_static_FC='-Bstatic'
+ ;;
+
+ *nto* | *qnx*)
+ # QNX uses GNU C++, but need to define -shared option too, otherwise
+ # it will coredump.
+ lt_prog_compiler_pic_FC='-fPIC -shared'
+ ;;
+
osf3* | osf4* | osf5*)
- lt_prog_compiler_wl_GCJ='-Wl,'
+ lt_prog_compiler_wl_FC='-Wl,'
# All OSF/1 code is PIC.
- lt_prog_compiler_static_GCJ='-non_shared'
+ lt_prog_compiler_static_FC='-non_shared'
;;
rdos*)
- lt_prog_compiler_static_GCJ='-non_shared'
+ lt_prog_compiler_static_FC='-non_shared'
;;
solaris*)
- lt_prog_compiler_pic_GCJ='-KPIC'
- lt_prog_compiler_static_GCJ='-Bstatic'
+ lt_prog_compiler_pic_FC='-KPIC'
+ lt_prog_compiler_static_FC='-Bstatic'
case $cc_basename in
f77* | f90* | f95*)
- lt_prog_compiler_wl_GCJ='-Qoption ld ';;
+ lt_prog_compiler_wl_FC='-Qoption ld ';;
*)
- lt_prog_compiler_wl_GCJ='-Wl,';;
+ lt_prog_compiler_wl_FC='-Wl,';;
esac
;;
sunos4*)
- lt_prog_compiler_wl_GCJ='-Qoption ld '
- lt_prog_compiler_pic_GCJ='-PIC'
- lt_prog_compiler_static_GCJ='-Bstatic'
+ lt_prog_compiler_wl_FC='-Qoption ld '
+ lt_prog_compiler_pic_FC='-PIC'
+ lt_prog_compiler_static_FC='-Bstatic'
;;
sysv4 | sysv4.2uw2* | sysv4.3*)
- lt_prog_compiler_wl_GCJ='-Wl,'
- lt_prog_compiler_pic_GCJ='-KPIC'
- lt_prog_compiler_static_GCJ='-Bstatic'
+ lt_prog_compiler_wl_FC='-Wl,'
+ lt_prog_compiler_pic_FC='-KPIC'
+ lt_prog_compiler_static_FC='-Bstatic'
;;
sysv4*MP*)
if test -d /usr/nec ;then
- lt_prog_compiler_pic_GCJ='-Kconform_pic'
- lt_prog_compiler_static_GCJ='-Bstatic'
+ lt_prog_compiler_pic_FC='-Kconform_pic'
+ lt_prog_compiler_static_FC='-Bstatic'
fi
;;
sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
- lt_prog_compiler_wl_GCJ='-Wl,'
- lt_prog_compiler_pic_GCJ='-KPIC'
- lt_prog_compiler_static_GCJ='-Bstatic'
+ lt_prog_compiler_wl_FC='-Wl,'
+ lt_prog_compiler_pic_FC='-KPIC'
+ lt_prog_compiler_static_FC='-Bstatic'
;;
unicos*)
- lt_prog_compiler_wl_GCJ='-Wl,'
- lt_prog_compiler_can_build_shared_GCJ=no
+ lt_prog_compiler_wl_FC='-Wl,'
+ lt_prog_compiler_can_build_shared_FC=no
;;
uts4*)
- lt_prog_compiler_pic_GCJ='-pic'
- lt_prog_compiler_static_GCJ='-Bstatic'
+ lt_prog_compiler_pic_FC='-pic'
+ lt_prog_compiler_static_FC='-Bstatic'
;;
*)
- lt_prog_compiler_can_build_shared_GCJ=no
+ lt_prog_compiler_can_build_shared_FC=no
;;
esac
fi
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6; }
+case $host_os in
+ # For platforms which do not support PIC, -DPIC is meaningless:
+ *djgpp*)
+ lt_prog_compiler_pic_FC=
+ ;;
+ *)
+ lt_prog_compiler_pic_FC="$lt_prog_compiler_pic_FC"
+ ;;
+esac
+{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_FC" >&5
+$as_echo "$lt_prog_compiler_pic_FC" >&6; }
+
+
#
# Check to make sure the PIC flag actually works.
#
-if test -n "$lt_prog_compiler_pic_GCJ"; then
-
-{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6; }
-if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- lt_prog_compiler_pic_works_GCJ=no
- ac_outfile=conftest.$ac_objext
+if test -n "$lt_prog_compiler_pic_FC"; then
+ { $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_FC works" >&5
+$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_FC works... " >&6; }
+if test "${lt_cv_prog_compiler_pic_works_FC+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ lt_cv_prog_compiler_pic_works_FC=no
+ ac_outfile=conftest.$ac_objext
echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- lt_compiler_flag="$lt_prog_compiler_pic_GCJ"
+ lt_compiler_flag="$lt_prog_compiler_pic_FC"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
# Note that $ac_compile itself does not contain backslashes and begins
@@ -18114,57 +20868,50 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18117: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:20871: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:18121: \$? = $ac_status" >&5
+ echo "$as_me:20875: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
- $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
- lt_prog_compiler_pic_works_GCJ=yes
+ lt_cv_prog_compiler_pic_works_FC=yes
fi
fi
- $rm conftest*
+ $RM conftest*
fi
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_FC" >&5
+$as_echo "$lt_cv_prog_compiler_pic_works_FC" >&6; }
-if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then
- case $lt_prog_compiler_pic_GCJ in
+if test x"$lt_cv_prog_compiler_pic_works_FC" = xyes; then
+ case $lt_prog_compiler_pic_FC in
"" | " "*) ;;
- *) lt_prog_compiler_pic_GCJ=" $lt_prog_compiler_pic_GCJ" ;;
+ *) lt_prog_compiler_pic_FC=" $lt_prog_compiler_pic_FC" ;;
esac
else
- lt_prog_compiler_pic_GCJ=
- lt_prog_compiler_can_build_shared_GCJ=no
+ lt_prog_compiler_pic_FC=
+ lt_prog_compiler_can_build_shared_FC=no
fi
fi
-case $host_os in
- # For platforms which do not support PIC, -DPIC is meaningless:
- *djgpp*)
- lt_prog_compiler_pic_GCJ=
- ;;
- *)
- lt_prog_compiler_pic_GCJ="$lt_prog_compiler_pic_GCJ"
- ;;
-esac
+
+
#
# Check to make sure the static flag actually works.
#
-wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\"
-{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
-if test "${lt_prog_compiler_static_works_GCJ+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+wl=$lt_prog_compiler_wl_FC eval lt_tmp_static_flag=\"$lt_prog_compiler_static_FC\"
+{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
+if test "${lt_cv_prog_compiler_static_works_FC+set}" = set; then
+ $as_echo_n "(cached) " >&6
else
- lt_prog_compiler_static_works_GCJ=no
+ lt_cv_prog_compiler_static_works_FC=no
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
echo "$lt_simple_link_test_code" > conftest.$ac_ext
@@ -18174,36 +20921,90 @@ else
if test -s conftest.err; then
# Append any errors to the config.log.
cat conftest.err 1>&5
- $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+ $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if diff conftest.exp conftest.er2 >/dev/null; then
- lt_prog_compiler_static_works_GCJ=yes
+ lt_cv_prog_compiler_static_works_FC=yes
fi
else
- lt_prog_compiler_static_works_GCJ=yes
+ lt_cv_prog_compiler_static_works_FC=yes
fi
fi
- $rm conftest*
+ $RM -r conftest*
LDFLAGS="$save_LDFLAGS"
fi
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5
-echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_FC" >&5
+$as_echo "$lt_cv_prog_compiler_static_works_FC" >&6; }
-if test x"$lt_prog_compiler_static_works_GCJ" = xyes; then
+if test x"$lt_cv_prog_compiler_static_works_FC" = xyes; then
:
else
- lt_prog_compiler_static_GCJ=
+ lt_prog_compiler_static_FC=
+fi
+
+
+
+
+ { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+if test "${lt_cv_prog_compiler_c_o_FC+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ lt_cv_prog_compiler_c_o_FC=no
+ $RM -r conftest 2>/dev/null
+ mkdir conftest
+ cd conftest
+ mkdir out
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+ lt_compiler_flag="-o out/conftest2.$ac_objext"
+ # Insert the option either (1) after the last *FLAGS variable, or
+ # (2) before a word containing "conftest.", or (3) at the end.
+ # Note that $ac_compile itself does not contain backslashes and begins
+ # with a dollar sign (not a hyphen), so the echo should work correctly.
+ lt_compile=`echo "$ac_compile" | $SED \
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+ (eval echo "\"\$as_me:20970: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+ echo "$as_me:20974: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings
+ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+ lt_cv_prog_compiler_c_o_FC=yes
+ fi
+ fi
+ chmod u+w . 2>&5
+ $RM conftest*
+ # SGI C++ compiler will create directory out/ii_files/ for
+ # template instantiation
+ test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
+ $RM out/* && rmdir out
+ cd ..
+ $RM -r conftest
+ $RM conftest*
+
fi
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_FC" >&5
+$as_echo "$lt_cv_prog_compiler_c_o_FC" >&6; }
+
-{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
-if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+if test "${lt_cv_prog_compiler_c_o_FC+set}" = set; then
+ $as_echo_n "(cached) " >&6
else
- lt_cv_prog_compiler_c_o_GCJ=no
- $rm -r conftest 2>/dev/null
+ lt_cv_prog_compiler_c_o_FC=no
+ $RM -r conftest 2>/dev/null
mkdir conftest
cd conftest
mkdir out
@@ -18218,110 +21019,108 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18221: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:21022: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:18225: \$? = $ac_status" >&5
+ echo "$as_me:21026: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
- $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
$SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
- lt_cv_prog_compiler_c_o_GCJ=yes
+ lt_cv_prog_compiler_c_o_FC=yes
fi
fi
chmod u+w . 2>&5
- $rm conftest*
+ $RM conftest*
# SGI C++ compiler will create directory out/ii_files/ for
# template instantiation
- test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
- $rm out/* && rmdir out
+ test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
+ $RM out/* && rmdir out
cd ..
- rmdir conftest
- $rm conftest*
+ $RM -r conftest
+ $RM conftest*
fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_FC" >&5
+$as_echo "$lt_cv_prog_compiler_c_o_FC" >&6; }
+
+
hard_links="nottested"
-if test "$lt_cv_prog_compiler_c_o_GCJ" = no && test "$need_locks" != no; then
+if test "$lt_cv_prog_compiler_c_o_FC" = no && test "$need_locks" != no; then
# do not overwrite the value of need_locks provided by the user
- { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+$as_echo_n "checking if we can lock with hard links... " >&6; }
hard_links=yes
- $rm conftest*
+ $RM conftest*
ln conftest.a conftest.b 2>/dev/null && hard_links=no
touch conftest.a
ln conftest.a conftest.b 2>&5 || hard_links=no
ln conftest.a conftest.b 2>/dev/null && hard_links=no
- { echo "$as_me:$LINENO: result: $hard_links" >&5
-echo "${ECHO_T}$hard_links" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
+$as_echo "$hard_links" >&6; }
if test "$hard_links" = no; then
- { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
need_locks=warn
fi
else
need_locks=no
fi
-{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
+
+
+ { $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
runpath_var=
- allow_undefined_flag_GCJ=
- enable_shared_with_static_runtimes_GCJ=no
- archive_cmds_GCJ=
- archive_expsym_cmds_GCJ=
- old_archive_From_new_cmds_GCJ=
- old_archive_from_expsyms_cmds_GCJ=
- export_dynamic_flag_spec_GCJ=
- whole_archive_flag_spec_GCJ=
- thread_safe_flag_spec_GCJ=
- hardcode_libdir_flag_spec_GCJ=
- hardcode_libdir_flag_spec_ld_GCJ=
- hardcode_libdir_separator_GCJ=
- hardcode_direct_GCJ=no
- hardcode_minus_L_GCJ=no
- hardcode_shlibpath_var_GCJ=unsupported
- link_all_deplibs_GCJ=unknown
- hardcode_automatic_GCJ=no
- module_cmds_GCJ=
- module_expsym_cmds_GCJ=
- always_export_symbols_GCJ=no
- export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+ allow_undefined_flag_FC=
+ always_export_symbols_FC=no
+ archive_cmds_FC=
+ archive_expsym_cmds_FC=
+ compiler_needs_object_FC=no
+ enable_shared_with_static_runtimes_FC=no
+ export_dynamic_flag_spec_FC=
+ export_symbols_cmds_FC='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+ hardcode_automatic_FC=no
+ hardcode_direct_FC=no
+ hardcode_direct_absolute_FC=no
+ hardcode_libdir_flag_spec_FC=
+ hardcode_libdir_flag_spec_ld_FC=
+ hardcode_libdir_separator_FC=
+ hardcode_minus_L_FC=no
+ hardcode_shlibpath_var_FC=unsupported
+ inherit_rpath_FC=no
+ link_all_deplibs_FC=unknown
+ module_cmds_FC=
+ module_expsym_cmds_FC=
+ old_archive_from_new_cmds_FC=
+ old_archive_from_expsyms_cmds_FC=
+ thread_safe_flag_spec_FC=
+ whole_archive_flag_spec_FC=
# include_expsyms should be a list of space-separated symbols to be *always*
# included in the symbol list
- include_expsyms_GCJ=
+ include_expsyms_FC=
# exclude_expsyms can be an extended regexp of symbols to exclude
# it will be wrapped by ` (' and `)$', so one must not match beginning or
# end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
# as well as any symbol that contains `d'.
- exclude_expsyms_GCJ="_GLOBAL_OFFSET_TABLE_"
+ exclude_expsyms_FC='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
# Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
# platforms (ab)use it in PIC code, but their linkers get confused if
# the symbol is explicitly referenced. Since portable code cannot
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
+ # Exclude shared library initialization/finalization symbols.
extract_expsyms_cmds=
- # Just being paranoid about ensuring that cc_basename is set.
- for cc_temp in $compiler""; do
- case $cc_temp in
- compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
- distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
- \-*) ;;
- *) break;;
- esac
-done
-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
case $host_os in
- cygwin* | mingw* | pw32*)
+ cygwin* | mingw* | pw32* | cegcc*)
# FIXME: the MSVC++ port hasn't been tested in a loooong time
# When not using gcc, we currently assume that we are using
# Microsoft Visual C++.
@@ -18338,7 +21137,7 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
;;
esac
- ld_shlibs_GCJ=yes
+ ld_shlibs_FC=yes
if test "$with_gnu_ld" = yes; then
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -18347,16 +21146,16 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
# are reset later if shared libraries are not supported. Putting them
# here allows them to be overridden if necessary.
runpath_var=LD_RUN_PATH
- hardcode_libdir_flag_spec_GCJ='${wl}--rpath ${wl}$libdir'
- export_dynamic_flag_spec_GCJ='${wl}--export-dynamic'
+ hardcode_libdir_flag_spec_FC='${wl}-rpath ${wl}$libdir'
+ export_dynamic_flag_spec_FC='${wl}--export-dynamic'
# ancient GNU ld didn't support --whole-archive et. al.
- if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
- whole_archive_flag_spec_GCJ="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
- else
- whole_archive_flag_spec_GCJ=
+ if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
+ whole_archive_flag_spec_FC="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+ else
+ whole_archive_flag_spec_FC=
fi
supports_anon_versioning=no
- case `$LD -v 2>/dev/null` in
+ case `$LD -v 2>&1` in
*\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
*\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
*\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
@@ -18366,11 +21165,11 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
# See if GNU ld supports shared libraries.
case $host_os in
- aix3* | aix4* | aix5*)
+ aix[3-9]*)
# On AIX/PPC, the GNU linker is very broken
if test "$host_cpu" != ia64; then
- ld_shlibs_GCJ=no
- cat <<EOF 1>&2
+ ld_shlibs_FC=no
+ cat <<_LT_EOF 1>&2
*** Warning: the GNU linker, at least up to release 2.9.1, is reported
*** to be unable to reliably create shared libraries on AIX.
@@ -18378,49 +21177,50 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
*** really care for shared libraries, you may want to modify your PATH
*** so that a non-GNU linker is found, and then restart.
-EOF
+_LT_EOF
fi
;;
amigaos*)
- archive_cmds_GCJ='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
- hardcode_libdir_flag_spec_GCJ='-L$libdir'
- hardcode_minus_L_GCJ=yes
-
- # Samuel A. Falvo II <kc5tja at dolphin.openprojects.net> reports
- # that the semantics of dynamic libraries on AmigaOS, at least up
- # to version 4, is to share data among multiple programs linked
- # with the same dynamic library. Since this doesn't match the
- # behavior of shared libraries on other platforms, we can't use
- # them.
- ld_shlibs_GCJ=no
+ case $host_cpu in
+ powerpc)
+ # see comment about AmigaOS4 .so support
+ archive_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ archive_expsym_cmds_FC=''
+ ;;
+ m68k)
+ archive_cmds_FC='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+ hardcode_libdir_flag_spec_FC='-L$libdir'
+ hardcode_minus_L_FC=yes
+ ;;
+ esac
;;
beos*)
- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
- allow_undefined_flag_GCJ=unsupported
+ if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+ allow_undefined_flag_FC=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
- archive_cmds_GCJ='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ archive_cmds_FC='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
else
- ld_shlibs_GCJ=no
+ ld_shlibs_FC=no
fi
;;
- cygwin* | mingw* | pw32*)
- # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, GCJ) is actually meaningless,
+ cygwin* | mingw* | pw32* | cegcc*)
+ # _LT_TAGVAR(hardcode_libdir_flag_spec, FC) is actually meaningless,
# as there is no search path for DLLs.
- hardcode_libdir_flag_spec_GCJ='-L$libdir'
- allow_undefined_flag_GCJ=unsupported
- always_export_symbols_GCJ=no
- enable_shared_with_static_runtimes_GCJ=yes
- export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
-
- if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
- archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+ hardcode_libdir_flag_spec_FC='-L$libdir'
+ allow_undefined_flag_FC=unsupported
+ always_export_symbols_FC=no
+ enable_shared_with_static_runtimes_FC=yes
+ export_symbols_cmds_FC='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
+
+ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+ archive_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
- archive_expsym_cmds_GCJ='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+ archive_expsym_cmds_FC='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
cp $export_symbols $output_objdir/$soname.def;
else
echo EXPORTS > $output_objdir/$soname.def;
@@ -18428,79 +21228,109 @@ EOF
fi~
$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
else
- ld_shlibs_GCJ=no
+ ld_shlibs_FC=no
fi
;;
interix[3-9]*)
- hardcode_direct_GCJ=no
- hardcode_shlibpath_var_GCJ=no
- hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
- export_dynamic_flag_spec_GCJ='${wl}-E'
+ hardcode_direct_FC=no
+ hardcode_shlibpath_var_FC=no
+ hardcode_libdir_flag_spec_FC='${wl}-rpath,$libdir'
+ export_dynamic_flag_spec_FC='${wl}-E'
# Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
# Instead, shared libraries are loaded at an image base (0x10000000 by
# default) and relocated if they conflict, which is a slow very memory
# consuming and fragmenting process. To avoid this, we pick a random,
# 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
# time. Moving up from 0x10000000 also allows more sbrk(2) space.
- archive_cmds_GCJ='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
- archive_expsym_cmds_GCJ='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ archive_cmds_FC='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ archive_expsym_cmds_FC='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
- gnu* | linux* | k*bsd*-gnu)
- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ gnu* | linux* | tpf* | k*bsd*-gnu)
+ tmp_diet=no
+ if test "$host_os" = linux-dietlibc; then
+ case $cc_basename in
+ diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn)
+ esac
+ fi
+ if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
+ && test "$tmp_diet" = no
+ then
tmp_addflag=
+ tmp_sharedflag='-shared'
case $cc_basename,$host_cpu in
- pgcc*) # Portland Group C compiler
- whole_archive_flag_spec_GCJ='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+ pgcc*) # Portland Group C compiler
+ whole_archive_flag_spec_FC='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
tmp_addflag=' $pic_flag'
;;
pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers
- whole_archive_flag_spec_GCJ='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+ whole_archive_flag_spec_FC='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
tmp_addflag=' $pic_flag -Mnomain' ;;
- ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
+ ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
tmp_addflag=' -i_dynamic' ;;
efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64
tmp_addflag=' -i_dynamic -nofor_main' ;;
ifc* | ifort*) # Intel Fortran compiler
tmp_addflag=' -nofor_main' ;;
+ lf95*) # Lahey Fortran 8.1
+ whole_archive_flag_spec_FC=
+ tmp_sharedflag='--shared' ;;
+ xl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below)
+ tmp_sharedflag='-qmkshrobj'
+ tmp_addflag= ;;
esac
case `$CC -V 2>&1 | sed 5q` in
*Sun\ C*) # Sun C 5.9
- whole_archive_flag_spec_GCJ='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+ whole_archive_flag_spec_FC='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+ compiler_needs_object_FC=yes
tmp_sharedflag='-G' ;;
*Sun\ F*) # Sun Fortran 8.3
tmp_sharedflag='-G' ;;
- *)
- tmp_sharedflag='-shared' ;;
esac
- archive_cmds_GCJ='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ archive_cmds_FC='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- if test $supports_anon_versioning = yes; then
- archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~
- cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
- $echo "local: *; };" >> $output_objdir/$libname.ver~
- $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
- fi
+ if test "x$supports_anon_versioning" = xyes; then
+ archive_expsym_cmds_FC='echo "{ global:" > $output_objdir/$libname.ver~
+ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+ echo "local: *; };" >> $output_objdir/$libname.ver~
+ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ fi
+
+ case $cc_basename in
+ xlf*)
+ # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
+ whole_archive_flag_spec_FC='--whole-archive$convenience --no-whole-archive'
+ hardcode_libdir_flag_spec_FC=
+ hardcode_libdir_flag_spec_ld_FC='-rpath $libdir'
+ archive_cmds_FC='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
+ if test "x$supports_anon_versioning" = xyes; then
+ archive_expsym_cmds_FC='echo "{ global:" > $output_objdir/$libname.ver~
+ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+ echo "local: *; };" >> $output_objdir/$libname.ver~
+ $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+ fi
+ ;;
+ esac
else
- ld_shlibs_GCJ=no
+ ld_shlibs_FC=no
fi
;;
netbsd*)
- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+ archive_cmds_FC='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
else
- archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ archive_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ archive_expsym_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
fi
;;
solaris*)
- if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
- ld_shlibs_GCJ=no
- cat <<EOF 1>&2
+ if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
+ ld_shlibs_FC=no
+ cat <<_LT_EOF 1>&2
*** Warning: The releases 2.8.* of the GNU linker cannot reliably
*** create shared libraries on Solaris systems. Therefore, libtool
@@ -18509,19 +21339,19 @@ EOF
*** your PATH or compiler configuration so that the native linker is
*** used, and then restart.
-EOF
- elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
- archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+_LT_EOF
+ elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+ archive_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ archive_expsym_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
else
- ld_shlibs_GCJ=no
+ ld_shlibs_FC=no
fi
;;
sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
case `$LD -v 2>&1` in
*\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
- ld_shlibs_GCJ=no
+ ld_shlibs_FC=no
cat <<_LT_EOF 1>&2
*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
@@ -18534,58 +21364,62 @@ EOF
_LT_EOF
;;
*)
- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
- hardcode_libdir_flag_spec_GCJ='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
- archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
- archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
+ # For security reasons, it is highly recommended that you always
+ # use absolute paths for naming shared libraries, and exclude the
+ # DT_RUNPATH tag from executables and libraries. But doing so
+ # requires that you compile everything twice, which is a pain.
+ if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+ hardcode_libdir_flag_spec_FC='${wl}-rpath ${wl}$libdir'
+ archive_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ archive_expsym_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
else
- ld_shlibs_GCJ=no
+ ld_shlibs_FC=no
fi
;;
esac
;;
sunos4*)
- archive_cmds_GCJ='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+ archive_cmds_FC='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
wlarc=
- hardcode_direct_GCJ=yes
- hardcode_shlibpath_var_GCJ=no
+ hardcode_direct_FC=yes
+ hardcode_shlibpath_var_FC=no
;;
*)
- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
- archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+ archive_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ archive_expsym_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
else
- ld_shlibs_GCJ=no
+ ld_shlibs_FC=no
fi
;;
esac
- if test "$ld_shlibs_GCJ" = no; then
+ if test "$ld_shlibs_FC" = no; then
runpath_var=
- hardcode_libdir_flag_spec_GCJ=
- export_dynamic_flag_spec_GCJ=
- whole_archive_flag_spec_GCJ=
+ hardcode_libdir_flag_spec_FC=
+ export_dynamic_flag_spec_FC=
+ whole_archive_flag_spec_FC=
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
case $host_os in
aix3*)
- allow_undefined_flag_GCJ=unsupported
- always_export_symbols_GCJ=yes
- archive_expsym_cmds_GCJ='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
+ allow_undefined_flag_FC=unsupported
+ always_export_symbols_FC=yes
+ archive_expsym_cmds_FC='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
- hardcode_minus_L_GCJ=yes
+ hardcode_minus_L_FC=yes
if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
- hardcode_direct_GCJ=unsupported
+ hardcode_direct_FC=unsupported
fi
;;
- aix4* | aix5*)
+ aix[4-9]*)
if test "$host_cpu" = ia64; then
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
@@ -18595,22 +21429,22 @@ _LT_EOF
else
# If we're using GNU nm, then we don't want the "-C" option.
# -C means demangle to AIX nm, but means don't demangle with GNU nm
- if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
- export_symbols_cmds_GCJ='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
+ if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+ export_symbols_cmds_FC='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
else
- export_symbols_cmds_GCJ='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
+ export_symbols_cmds_FC='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
fi
aix_use_runtimelinking=no
# Test if we are trying to use run time linking or normal
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
# need to do runtime linking.
- case $host_os in aix4.[23]|aix4.[23].*|aix5*)
+ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
for ld_flag in $LDFLAGS; do
- if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
- aix_use_runtimelinking=yes
- break
- fi
+ if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+ aix_use_runtimelinking=yes
+ break
+ fi
done
;;
esac
@@ -18625,30 +21459,32 @@ _LT_EOF
# CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not
# enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
- archive_cmds_GCJ=''
- hardcode_direct_GCJ=yes
- hardcode_libdir_separator_GCJ=':'
- link_all_deplibs_GCJ=yes
+ archive_cmds_FC=''
+ hardcode_direct_FC=yes
+ hardcode_direct_absolute_FC=yes
+ hardcode_libdir_separator_FC=':'
+ link_all_deplibs_FC=yes
+ file_list_spec_FC='${wl}-f,'
if test "$GCC" = yes; then
case $host_os in aix4.[012]|aix4.[012].*)
# We only want to do this on AIX 4.2 and lower, the check
# below for broken collect2 doesn't work under 4.3+
collect2name=`${CC} -print-prog-name=collect2`
- if test -f "$collect2name" && \
- strings "$collect2name" | grep resolve_lib_name >/dev/null
+ if test -f "$collect2name" &&
+ strings "$collect2name" | $GREP resolve_lib_name >/dev/null
then
- # We have reworked collect2
- :
+ # We have reworked collect2
+ :
else
- # We have old collect2
- hardcode_direct_GCJ=unsupported
- # It fails to find uninstalled libraries when the uninstalled
- # path is not listed in the libpath. Setting hardcode_minus_L
- # to unsupported forces relinking
- hardcode_minus_L_GCJ=yes
- hardcode_libdir_flag_spec_GCJ='-L$libdir'
- hardcode_libdir_separator_GCJ=
+ # We have old collect2
+ hardcode_direct_FC=unsupported
+ # It fails to find uninstalled libraries when the uninstalled
+ # path is not listed in the libpath. Setting hardcode_minus_L
+ # to unsupported forces relinking
+ hardcode_minus_L_FC=yes
+ hardcode_libdir_flag_spec_FC='-L$libdir'
+ hardcode_libdir_separator_FC=
fi
;;
esac
@@ -18659,8 +21495,8 @@ _LT_EOF
else
# not using gcc
if test "$host_cpu" = ia64; then
- # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
- # chokes on -Wl,-G. The following line is correct:
+ # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+ # chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -18671,36 +21507,20 @@ _LT_EOF
fi
fi
+ export_dynamic_flag_spec_FC='${wl}-bexpall'
# It seems that -bexpall does not export symbols beginning with
# underscore (_), so it is better to generate a list of symbols to export.
- always_export_symbols_GCJ=yes
+ always_export_symbols_FC=yes
if test "$aix_use_runtimelinking" = yes; then
# Warning - without using the other runtime loading flags (-brtl),
# -berok will link without error, but may produce a broken library.
- allow_undefined_flag_GCJ='-berok'
- # Determine the default libpath from the value encoded in an empty executable.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-# ifdef __cplusplus
- extern "C"
-# endif
- int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
+ allow_undefined_flag_FC='-berok'
+ # Determine the default libpath from the value encoded in an
+ # empty executable.
+ cat >conftest.$ac_ext <<_ACEOF
+ program main
- ;
- return 0;
-}
+ end
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (ac_try="$ac_link"
@@ -18708,18 +21528,21 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
+ test -z "$ac_fc_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
@@ -18734,47 +21557,31 @@ if test -z "$aix_libpath"; then
aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
fi
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
fi
+rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath"
- archive_expsym_cmds_GCJ="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
- else
+ hardcode_libdir_flag_spec_FC='${wl}-blibpath:$libdir:'"$aix_libpath"
+ archive_expsym_cmds_FC='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+ else
if test "$host_cpu" = ia64; then
- hardcode_libdir_flag_spec_GCJ='${wl}-R $libdir:/usr/lib:/lib'
- allow_undefined_flag_GCJ="-z nodefs"
- archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+ hardcode_libdir_flag_spec_FC='${wl}-R $libdir:/usr/lib:/lib'
+ allow_undefined_flag_FC="-z nodefs"
+ archive_expsym_cmds_FC="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
else
- # Determine the default libpath from the value encoded in an empty executable.
+ # Determine the default libpath from the value encoded in an
+ # empty executable.
cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-# ifdef __cplusplus
- extern "C"
-# endif
- int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
+ program main
- ;
- return 0;
-}
+ end
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (ac_try="$ac_link"
@@ -18782,18 +21589,21 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
+ test -z "$ac_fc_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
@@ -18808,121 +21618,106 @@ if test -z "$aix_libpath"; then
aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
fi
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
fi
+rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath"
+ hardcode_libdir_flag_spec_FC='${wl}-blibpath:$libdir:'"$aix_libpath"
# Warning - without using the other run time loading flags,
# -berok will link without error, but may produce a broken library.
- no_undefined_flag_GCJ=' ${wl}-bernotok'
- allow_undefined_flag_GCJ=' ${wl}-berok'
+ no_undefined_flag_FC=' ${wl}-bernotok'
+ allow_undefined_flag_FC=' ${wl}-berok'
# Exported symbols can be pulled into shared objects from archives
- whole_archive_flag_spec_GCJ='$convenience'
- archive_cmds_need_lc_GCJ=yes
+ whole_archive_flag_spec_FC='$convenience'
+ archive_cmds_need_lc_FC=yes
# This is similar to how AIX traditionally builds its shared libraries.
- archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+ archive_expsym_cmds_FC="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
fi
fi
;;
amigaos*)
- archive_cmds_GCJ='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
- hardcode_libdir_flag_spec_GCJ='-L$libdir'
- hardcode_minus_L_GCJ=yes
- # see comment about different semantics on the GNU ld section
- ld_shlibs_GCJ=no
+ case $host_cpu in
+ powerpc)
+ # see comment about AmigaOS4 .so support
+ archive_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ archive_expsym_cmds_FC=''
+ ;;
+ m68k)
+ archive_cmds_FC='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+ hardcode_libdir_flag_spec_FC='-L$libdir'
+ hardcode_minus_L_FC=yes
+ ;;
+ esac
;;
bsdi[45]*)
- export_dynamic_flag_spec_GCJ=-rdynamic
+ export_dynamic_flag_spec_FC=-rdynamic
;;
- cygwin* | mingw* | pw32*)
+ cygwin* | mingw* | pw32* | cegcc*)
# When not using gcc, we currently assume that we are using
# Microsoft Visual C++.
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
- hardcode_libdir_flag_spec_GCJ=' '
- allow_undefined_flag_GCJ=unsupported
+ hardcode_libdir_flag_spec_FC=' '
+ allow_undefined_flag_FC=unsupported
# Tell ltmain to make .lib files, not .a files.
libext=lib
# Tell ltmain to make .dll files, not .so files.
shrext_cmds=".dll"
# FIXME: Setting linknames here is a bad hack.
- archive_cmds_GCJ='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
+ archive_cmds_FC='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames='
# The linker will automatically build a .lib file if we build a DLL.
- old_archive_From_new_cmds_GCJ='true'
+ old_archive_from_new_cmds_FC='true'
# FIXME: Should let the user specify the lib program.
- old_archive_cmds_GCJ='lib -OUT:$oldlib$oldobjs$old_deplibs'
- fix_srcfile_path_GCJ='`cygpath -w "$srcfile"`'
- enable_shared_with_static_runtimes_GCJ=yes
+ old_archive_cmds_FC='lib -OUT:$oldlib$oldobjs$old_deplibs'
+ fix_srcfile_path_FC='`cygpath -w "$srcfile"`'
+ enable_shared_with_static_runtimes_FC=yes
;;
darwin* | rhapsody*)
- case $host_os in
- rhapsody* | darwin1.[012])
- allow_undefined_flag_GCJ='${wl}-undefined ${wl}suppress'
- ;;
- *) # Darwin 1.3 on
- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
- allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
- else
- case ${MACOSX_DEPLOYMENT_TARGET} in
- 10.[012])
- allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
- ;;
- 10.*)
- allow_undefined_flag_GCJ='${wl}-undefined ${wl}dynamic_lookup'
- ;;
- esac
- fi
- ;;
- esac
- archive_cmds_need_lc_GCJ=no
- hardcode_direct_GCJ=no
- hardcode_automatic_GCJ=yes
- hardcode_shlibpath_var_GCJ=unsupported
- whole_archive_flag_spec_GCJ=''
- link_all_deplibs_GCJ=yes
- if test "$GCC" = yes ; then
- output_verbose_link_cmd='echo'
- archive_cmds_GCJ='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
- module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
- archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- else
- case $cc_basename in
- xlc*)
- output_verbose_link_cmd='echo'
- archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
- module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
- archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- ;;
- *)
- ld_shlibs_GCJ=no
- ;;
- esac
- fi
+
+
+ archive_cmds_need_lc_FC=no
+ hardcode_direct_FC=no
+ hardcode_automatic_FC=yes
+ hardcode_shlibpath_var_FC=unsupported
+ whole_archive_flag_spec_FC=''
+ link_all_deplibs_FC=yes
+ allow_undefined_flag_FC="$_lt_dar_allow_undefined"
+ case $cc_basename in
+ ifort*) _lt_dar_can_shared=yes ;;
+ *) _lt_dar_can_shared=$GCC ;;
+ esac
+ if test "$_lt_dar_can_shared" = "yes"; then
+ output_verbose_link_cmd=echo
+ archive_cmds_FC="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+ module_cmds_FC="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+ archive_expsym_cmds_FC="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+ module_expsym_cmds_FC="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+
+ else
+ ld_shlibs_FC=no
+ fi
+
;;
dgux*)
- archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
- hardcode_libdir_flag_spec_GCJ='-L$libdir'
- hardcode_shlibpath_var_GCJ=no
+ archive_cmds_FC='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ hardcode_libdir_flag_spec_FC='-L$libdir'
+ hardcode_shlibpath_var_FC=no
;;
freebsd1*)
- ld_shlibs_GCJ=no
+ ld_shlibs_FC=no
;;
# FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
@@ -18930,60 +21725,60 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
# does not break anything, and helps significantly (at the cost of a little
# extra space).
freebsd2.2*)
- archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
- hardcode_libdir_flag_spec_GCJ='-R$libdir'
- hardcode_direct_GCJ=yes
- hardcode_shlibpath_var_GCJ=no
+ archive_cmds_FC='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
+ hardcode_libdir_flag_spec_FC='-R$libdir'
+ hardcode_direct_FC=yes
+ hardcode_shlibpath_var_FC=no
;;
# Unfortunately, older versions of FreeBSD 2 do not have this feature.
freebsd2*)
- archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
- hardcode_direct_GCJ=yes
- hardcode_minus_L_GCJ=yes
- hardcode_shlibpath_var_GCJ=no
+ archive_cmds_FC='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+ hardcode_direct_FC=yes
+ hardcode_minus_L_FC=yes
+ hardcode_shlibpath_var_FC=no
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
freebsd* | dragonfly*)
- archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
- hardcode_libdir_flag_spec_GCJ='-R$libdir'
- hardcode_direct_GCJ=yes
- hardcode_shlibpath_var_GCJ=no
+ archive_cmds_FC='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+ hardcode_libdir_flag_spec_FC='-R$libdir'
+ hardcode_direct_FC=yes
+ hardcode_shlibpath_var_FC=no
;;
hpux9*)
if test "$GCC" = yes; then
- archive_cmds_GCJ='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+ archive_cmds_FC='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
else
- archive_cmds_GCJ='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+ archive_cmds_FC='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
fi
- hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
- hardcode_libdir_separator_GCJ=:
- hardcode_direct_GCJ=yes
+ hardcode_libdir_flag_spec_FC='${wl}+b ${wl}$libdir'
+ hardcode_libdir_separator_FC=:
+ hardcode_direct_FC=yes
# hardcode_minus_L: Not really in the search PATH,
# but as the default location of the library.
- hardcode_minus_L_GCJ=yes
- export_dynamic_flag_spec_GCJ='${wl}-E'
+ hardcode_minus_L_FC=yes
+ export_dynamic_flag_spec_FC='${wl}-E'
;;
hpux10*)
if test "$GCC" = yes -a "$with_gnu_ld" = no; then
- archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ archive_cmds_FC='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
else
- archive_cmds_GCJ='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+ archive_cmds_FC='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
fi
if test "$with_gnu_ld" = no; then
- hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
- hardcode_libdir_separator_GCJ=:
-
- hardcode_direct_GCJ=yes
- export_dynamic_flag_spec_GCJ='${wl}-E'
-
+ hardcode_libdir_flag_spec_FC='${wl}+b ${wl}$libdir'
+ hardcode_libdir_flag_spec_ld_FC='+b $libdir'
+ hardcode_libdir_separator_FC=:
+ hardcode_direct_FC=yes
+ hardcode_direct_absolute_FC=yes
+ export_dynamic_flag_spec_FC='${wl}-E'
# hardcode_minus_L: Not really in the search PATH,
# but as the default location of the library.
- hardcode_minus_L_GCJ=yes
+ hardcode_minus_L_FC=yes
fi
;;
@@ -18991,45 +21786,45 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
if test "$GCC" = yes -a "$with_gnu_ld" = no; then
case $host_cpu in
hppa*64*)
- archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_cmds_FC='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
;;
ia64*)
- archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+ archive_cmds_FC='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
;;
*)
- archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ archive_cmds_FC='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
;;
esac
else
case $host_cpu in
hppa*64*)
- archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_cmds_FC='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
;;
ia64*)
- archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+ archive_cmds_FC='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
;;
*)
- archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ archive_cmds_FC='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
;;
esac
fi
if test "$with_gnu_ld" = no; then
- hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
- hardcode_libdir_separator_GCJ=:
+ hardcode_libdir_flag_spec_FC='${wl}+b ${wl}$libdir'
+ hardcode_libdir_separator_FC=:
case $host_cpu in
hppa*64*|ia64*)
- hardcode_libdir_flag_spec_ld_GCJ='+b $libdir'
- hardcode_direct_GCJ=no
- hardcode_shlibpath_var_GCJ=no
+ hardcode_direct_FC=no
+ hardcode_shlibpath_var_FC=no
;;
*)
- hardcode_direct_GCJ=yes
- export_dynamic_flag_spec_GCJ='${wl}-E'
+ hardcode_direct_FC=yes
+ hardcode_direct_absolute_FC=yes
+ export_dynamic_flag_spec_FC='${wl}-E'
# hardcode_minus_L: Not really in the search PATH,
# but as the default location of the library.
- hardcode_minus_L_GCJ=yes
+ hardcode_minus_L_FC=yes
;;
esac
fi
@@ -19037,194 +21832,254 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
- archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ archive_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ # Try to use the -exported_symbol ld option, if it does not
+ # work, assume that -exports_file does not work either and
+ # implicitly export all symbols.
+ save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
+ cat >conftest.$ac_ext <<_ACEOF
+int foo(void) {}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_fc_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+ archive_expsym_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
+
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ LDFLAGS="$save_LDFLAGS"
else
- archive_cmds_GCJ='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
- hardcode_libdir_flag_spec_ld_GCJ='-rpath $libdir'
+ archive_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+ archive_expsym_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
fi
- hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
- hardcode_libdir_separator_GCJ=:
- link_all_deplibs_GCJ=yes
+ archive_cmds_need_lc_FC='no'
+ hardcode_libdir_flag_spec_FC='${wl}-rpath ${wl}$libdir'
+ hardcode_libdir_separator_FC=:
+ inherit_rpath_FC=yes
+ link_all_deplibs_FC=yes
;;
netbsd*)
- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
+ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+ archive_cmds_FC='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
- archive_cmds_GCJ='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF
+ archive_cmds_FC='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF
fi
- hardcode_libdir_flag_spec_GCJ='-R$libdir'
- hardcode_direct_GCJ=yes
- hardcode_shlibpath_var_GCJ=no
+ hardcode_libdir_flag_spec_FC='-R$libdir'
+ hardcode_direct_FC=yes
+ hardcode_shlibpath_var_FC=no
;;
newsos6)
- archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
- hardcode_direct_GCJ=yes
- hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
- hardcode_libdir_separator_GCJ=:
- hardcode_shlibpath_var_GCJ=no
+ archive_cmds_FC='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ hardcode_direct_FC=yes
+ hardcode_libdir_flag_spec_FC='${wl}-rpath ${wl}$libdir'
+ hardcode_libdir_separator_FC=:
+ hardcode_shlibpath_var_FC=no
+ ;;
+
+ *nto* | *qnx*)
;;
openbsd*)
if test -f /usr/libexec/ld.so; then
- hardcode_direct_GCJ=yes
- hardcode_shlibpath_var_GCJ=no
- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
- archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
- hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
- export_dynamic_flag_spec_GCJ='${wl}-E'
+ hardcode_direct_FC=yes
+ hardcode_shlibpath_var_FC=no
+ hardcode_direct_absolute_FC=yes
+ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ archive_cmds_FC='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds_FC='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+ hardcode_libdir_flag_spec_FC='${wl}-rpath,$libdir'
+ export_dynamic_flag_spec_FC='${wl}-E'
else
case $host_os in
openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
- archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
- hardcode_libdir_flag_spec_GCJ='-R$libdir'
+ archive_cmds_FC='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+ hardcode_libdir_flag_spec_FC='-R$libdir'
;;
*)
- archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
- hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
+ archive_cmds_FC='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+ hardcode_libdir_flag_spec_FC='${wl}-rpath,$libdir'
;;
esac
- fi
+ fi
else
- ld_shlibs_GCJ=no
+ ld_shlibs_FC=no
fi
;;
os2*)
- hardcode_libdir_flag_spec_GCJ='-L$libdir'
- hardcode_minus_L_GCJ=yes
- allow_undefined_flag_GCJ=unsupported
- archive_cmds_GCJ='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
- old_archive_From_new_cmds_GCJ='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+ hardcode_libdir_flag_spec_FC='-L$libdir'
+ hardcode_minus_L_FC=yes
+ allow_undefined_flag_FC=unsupported
+ archive_cmds_FC='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+ old_archive_from_new_cmds_FC='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
;;
osf3*)
if test "$GCC" = yes; then
- allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
- archive_cmds_GCJ='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ allow_undefined_flag_FC=' ${wl}-expect_unresolved ${wl}\*'
+ archive_cmds_FC='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
else
- allow_undefined_flag_GCJ=' -expect_unresolved \*'
- archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+ allow_undefined_flag_FC=' -expect_unresolved \*'
+ archive_cmds_FC='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
fi
- hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
- hardcode_libdir_separator_GCJ=:
+ archive_cmds_need_lc_FC='no'
+ hardcode_libdir_flag_spec_FC='${wl}-rpath ${wl}$libdir'
+ hardcode_libdir_separator_FC=:
;;
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
- allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
- archive_cmds_GCJ='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
- hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
+ allow_undefined_flag_FC=' ${wl}-expect_unresolved ${wl}\*'
+ archive_cmds_FC='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ hardcode_libdir_flag_spec_FC='${wl}-rpath ${wl}$libdir'
else
- allow_undefined_flag_GCJ=' -expect_unresolved \*'
- archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
- archive_expsym_cmds_GCJ='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
- $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
+ allow_undefined_flag_FC=' -expect_unresolved \*'
+ archive_cmds_FC='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+ archive_expsym_cmds_FC='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
+ $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
# Both c and cxx compiler support -rpath directly
- hardcode_libdir_flag_spec_GCJ='-rpath $libdir'
+ hardcode_libdir_flag_spec_FC='-rpath $libdir'
fi
- hardcode_libdir_separator_GCJ=:
+ archive_cmds_need_lc_FC='no'
+ hardcode_libdir_separator_FC=:
;;
solaris*)
- no_undefined_flag_GCJ=' -z text'
+ no_undefined_flag_FC=' -z defs'
if test "$GCC" = yes; then
wlarc='${wl}'
- archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
- archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
- $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
+ archive_cmds_FC='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds_FC='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+ $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
else
- wlarc=''
- archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
- archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+ case `$CC -V 2>&1` in
+ *"Compilers 5.0"*)
+ wlarc=''
+ archive_cmds_FC='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ archive_expsym_cmds_FC='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
+ ;;
+ *)
+ wlarc='${wl}'
+ archive_cmds_FC='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds_FC='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+ $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+ ;;
+ esac
fi
- hardcode_libdir_flag_spec_GCJ='-R$libdir'
- hardcode_shlibpath_var_GCJ=no
+ hardcode_libdir_flag_spec_FC='-R$libdir'
+ hardcode_shlibpath_var_FC=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
*)
# The compiler driver will combine and reorder linker options,
# but understands `-z linker_flag'. GCC discards it without `$wl',
# but is careful enough not to reorder.
- # Supported since Solaris 2.6 (maybe 2.5.1?)
+ # Supported since Solaris 2.6 (maybe 2.5.1?)
if test "$GCC" = yes; then
- whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+ whole_archive_flag_spec_FC='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
else
- whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract'
+ whole_archive_flag_spec_FC='-z allextract$convenience -z defaultextract'
fi
;;
esac
- link_all_deplibs_GCJ=yes
+ link_all_deplibs_FC=yes
;;
sunos4*)
if test "x$host_vendor" = xsequent; then
# Use $CC to link under sequent, because it throws in some extra .o
# files that make .init and .fini sections work.
- archive_cmds_GCJ='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_cmds_FC='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
else
- archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+ archive_cmds_FC='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
- hardcode_libdir_flag_spec_GCJ='-L$libdir'
- hardcode_direct_GCJ=yes
- hardcode_minus_L_GCJ=yes
- hardcode_shlibpath_var_GCJ=no
+ hardcode_libdir_flag_spec_FC='-L$libdir'
+ hardcode_direct_FC=yes
+ hardcode_minus_L_FC=yes
+ hardcode_shlibpath_var_FC=no
;;
sysv4)
case $host_vendor in
sni)
- archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
- hardcode_direct_GCJ=yes # is this really true???
+ archive_cmds_FC='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ hardcode_direct_FC=yes # is this really true???
;;
siemens)
## LD is ld it makes a PLAMLIB
## CC just makes a GrossModule.
- archive_cmds_GCJ='$LD -G -o $lib $libobjs $deplibs $linker_flags'
- reload_cmds_GCJ='$CC -r -o $output$reload_objs'
- hardcode_direct_GCJ=no
+ archive_cmds_FC='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+ reload_cmds_FC='$CC -r -o $output$reload_objs'
+ hardcode_direct_FC=no
;;
motorola)
- archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
- hardcode_direct_GCJ=no #Motorola manual says yes, but my tests say they lie
+ archive_cmds_FC='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ hardcode_direct_FC=no #Motorola manual says yes, but my tests say they lie
;;
esac
runpath_var='LD_RUN_PATH'
- hardcode_shlibpath_var_GCJ=no
+ hardcode_shlibpath_var_FC=no
;;
sysv4.3*)
- archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
- hardcode_shlibpath_var_GCJ=no
- export_dynamic_flag_spec_GCJ='-Bexport'
+ archive_cmds_FC='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ hardcode_shlibpath_var_FC=no
+ export_dynamic_flag_spec_FC='-Bexport'
;;
sysv4*MP*)
if test -d /usr/nec; then
- archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
- hardcode_shlibpath_var_GCJ=no
+ archive_cmds_FC='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ hardcode_shlibpath_var_FC=no
runpath_var=LD_RUN_PATH
hardcode_runpath_var=yes
- ld_shlibs_GCJ=yes
+ ld_shlibs_FC=yes
fi
;;
sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
- no_undefined_flag_GCJ='${wl}-z,text'
- archive_cmds_need_lc_GCJ=no
- hardcode_shlibpath_var_GCJ=no
+ no_undefined_flag_FC='${wl}-z,text'
+ archive_cmds_need_lc_FC=no
+ hardcode_shlibpath_var_FC=no
runpath_var='LD_RUN_PATH'
if test "$GCC" = yes; then
- archive_cmds_GCJ='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_cmds_FC='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds_FC='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
else
- archive_cmds_GCJ='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_cmds_FC='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds_FC='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
fi
;;
@@ -19235,51 +22090,66 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
# ever link correctly. If we're not using GNU ld we use -z text
# though, which does catch some bad symbols but isn't as heavy-handed
# as -z defs.
- no_undefined_flag_GCJ='${wl}-z,text'
- allow_undefined_flag_GCJ='${wl}-z,nodefs'
- archive_cmds_need_lc_GCJ=no
- hardcode_shlibpath_var_GCJ=no
- hardcode_libdir_flag_spec_GCJ='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
- hardcode_libdir_separator_GCJ=':'
- link_all_deplibs_GCJ=yes
- export_dynamic_flag_spec_GCJ='${wl}-Bexport'
+ no_undefined_flag_FC='${wl}-z,text'
+ allow_undefined_flag_FC='${wl}-z,nodefs'
+ archive_cmds_need_lc_FC=no
+ hardcode_shlibpath_var_FC=no
+ hardcode_libdir_flag_spec_FC='${wl}-R,$libdir'
+ hardcode_libdir_separator_FC=':'
+ link_all_deplibs_FC=yes
+ export_dynamic_flag_spec_FC='${wl}-Bexport'
runpath_var='LD_RUN_PATH'
if test "$GCC" = yes; then
- archive_cmds_GCJ='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
- archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_cmds_FC='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds_FC='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
else
- archive_cmds_GCJ='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
- archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_cmds_FC='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds_FC='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
fi
;;
uts4*)
- archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
- hardcode_libdir_flag_spec_GCJ='-L$libdir'
- hardcode_shlibpath_var_GCJ=no
+ archive_cmds_FC='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ hardcode_libdir_flag_spec_FC='-L$libdir'
+ hardcode_shlibpath_var_FC=no
;;
*)
- ld_shlibs_GCJ=no
+ ld_shlibs_FC=no
;;
esac
+
+ if test x$host_vendor = xsni; then
+ case $host in
+ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+ export_dynamic_flag_spec_FC='${wl}-Blargedynsym'
+ ;;
+ esac
+ fi
fi
-{ echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5
-echo "${ECHO_T}$ld_shlibs_GCJ" >&6; }
-test "$ld_shlibs_GCJ" = no && can_build_shared=no
+{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_FC" >&5
+$as_echo "$ld_shlibs_FC" >&6; }
+test "$ld_shlibs_FC" = no && can_build_shared=no
+
+with_gnu_ld_FC=$with_gnu_ld
+
+
+
+
+
#
# Do we need to explicitly link libc?
#
-case "x$archive_cmds_need_lc_GCJ" in
+case "x$archive_cmds_need_lc_FC" in
x|xyes)
# Assume -lc should be added
- archive_cmds_need_lc_GCJ=yes
+ archive_cmds_need_lc_FC=yes
if test "$enable_shared" = yes && test "$GCC" = yes; then
- case $archive_cmds_GCJ in
+ case $archive_cmds_FC in
*'~'*)
# FIXME: we may have to deal with multi-command sequences.
;;
@@ -19287,54 +22157,118 @@ x|xyes)
# Test whether the compiler implicitly links with -lc since on some
# systems, -lgcc has to come before -lc. If gcc already passes -lc
# to ld, don't add -lc before -lgcc.
- { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
- $rm conftest*
+ { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
+ $RM conftest*
echo "$lt_simple_compile_test_code" > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } 2>conftest.err; then
soname=conftest
lib=conftest
libobjs=conftest.$ac_objext
deplibs=
- wl=$lt_prog_compiler_wl_GCJ
- pic_flag=$lt_prog_compiler_pic_GCJ
+ wl=$lt_prog_compiler_wl_FC
+ pic_flag=$lt_prog_compiler_pic_FC
compiler_flags=-v
linker_flags=-v
verstring=
output_objdir=.
libname=conftest
- lt_save_allow_undefined_flag=$allow_undefined_flag_GCJ
- allow_undefined_flag_GCJ=
- if { (eval echo "$as_me:$LINENO: \"$archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
- (eval $archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
+ lt_save_allow_undefined_flag=$allow_undefined_flag_FC
+ allow_undefined_flag_FC=
+ if { (eval echo "$as_me:$LINENO: \"$archive_cmds_FC 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\"") >&5
+ (eval $archive_cmds_FC 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
then
- archive_cmds_need_lc_GCJ=no
+ archive_cmds_need_lc_FC=no
else
- archive_cmds_need_lc_GCJ=yes
+ archive_cmds_need_lc_FC=yes
fi
- allow_undefined_flag_GCJ=$lt_save_allow_undefined_flag
+ allow_undefined_flag_FC=$lt_save_allow_undefined_flag
else
cat conftest.err 1>&5
fi
- $rm conftest*
- { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5
-echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6; }
+ $RM conftest*
+ { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_FC" >&5
+$as_echo "$archive_cmds_need_lc_FC" >&6; }
;;
esac
fi
;;
esac
-{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ { $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+$as_echo_n "checking dynamic linker characteristics... " >&6; }
+
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -19348,7 +22282,6 @@ shlibpath_overrides_runpath=unknown
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
-
need_lib_prefix=unknown
hardcode_into_libs=no
@@ -19366,7 +22299,7 @@ aix3*)
soname_spec='${libname}${release}${shared_ext}$major'
;;
-aix4* | aix5*)
+aix[4-9]*)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -19385,7 +22318,7 @@ aix4* | aix5*)
aix4 | aix4.[01] | aix4.[01].*)
if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
echo ' yes '
- echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
+ echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
:
else
can_build_shared=no
@@ -19411,9 +22344,18 @@ aix4* | aix5*)
;;
amigaos*)
- library_names_spec='$libname.ixlibrary $libname.a'
- # Create ${libname}_ixlibrary.a entries in /sys/libs.
- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+ case $host_cpu in
+ powerpc)
+ # Since July 2007 AmigaOS4 officially supports .so libraries.
+ # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ ;;
+ m68k)
+ library_names_spec='$libname.ixlibrary $libname.a'
+ # Create ${libname}_ixlibrary.a entries in /sys/libs.
+ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+ ;;
+ esac
;;
beos*)
@@ -19436,25 +22378,28 @@ bsdi[45]*)
# libtool to hard-code these into programs
;;
-cygwin* | mingw* | pw32*)
+cygwin* | mingw* | pw32* | cegcc*)
version_type=windows
shrext_cmds=".dll"
need_version=no
need_lib_prefix=no
case $GCC,$host_os in
- yes,cygwin* | yes,mingw* | yes,pw32*)
+ yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
library_names_spec='$libname.dll.a'
# DLL is installed to $(libdir)/../bin by postinstall_cmds
postinstall_cmds='base_file=`basename \${file}`~
- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
$install_prog $dir/$dlname \$dldir/$dlname~
- chmod a+x \$dldir/$dlname'
+ chmod a+x \$dldir/$dlname~
+ if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+ eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+ fi'
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
- $rm \$dlpath'
+ $RM \$dlpath'
shlibpath_overrides_runpath=yes
case $host_os in
@@ -19463,20 +22408,20 @@ cygwin* | mingw* | pw32*)
soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
;;
- mingw*)
+ mingw* | cegcc*)
# MinGW DLLs use traditional 'lib' prefix
soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
- if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
+ sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
# It is most probably a Windows format PATH printed by
# mingw gcc, but we are running on Cygwin. Gcc prints its search
# path with ; separators, and with drive letters. We can handle the
# drive letters (cygwin fileutils understands them), so leave them,
# especially as we might pass files found there to a mingw objdump,
# which wouldn't understand a cygwinified path. Ahh.
- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
else
- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
fi
;;
pw32*)
@@ -19500,7 +22445,7 @@ darwin* | rhapsody*)
version_type=darwin
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
+ library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -19598,18 +22543,18 @@ hpux9* | hpux10* | hpux11*)
fi
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
- hppa*64*)
- shrext_cmds='.sl'
- hardcode_into_libs=yes
- dynamic_linker="$host_os dld.sl"
- shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
- shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
- ;;
- *)
+ hppa*64*)
+ shrext_cmds='.sl'
+ hardcode_into_libs=yes
+ dynamic_linker="$host_os dld.sl"
+ shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+ ;;
+ *)
shrext_cmds='.sl'
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
@@ -19686,15 +22631,66 @@ linux* | k*bsd*-gnu)
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
+ # Some binutils ld are patched to set DT_RUNPATH
+ save_LDFLAGS=$LDFLAGS
+ save_libdir=$libdir
+ eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_FC\"; \
+ LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_FC\""
+ cat >conftest.$ac_ext <<_ACEOF
+ program main
+
+ end
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_fc_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+ if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then
+ shlibpath_overrides_runpath=yes
+fi
+
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ LDFLAGS=$save_LDFLAGS
+ libdir=$save_libdir
+
# This implies no fast_install, which is unacceptable.
# Some rework will be needed to allow for fast_install
# before this can be enabled.
hardcode_into_libs=yes
+ # Add ABI-specific directories to the system library path.
+ sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
+
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -19710,7 +22706,7 @@ netbsd*)
version_type=sunos
need_lib_prefix=no
need_version=no
- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
@@ -19731,14 +22727,16 @@ newsos6)
shlibpath_overrides_runpath=yes
;;
-nto-qnx*)
- version_type=linux
+*nto* | *qnx*)
+ version_type=qnx
need_lib_prefix=no
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ dynamic_linker='ldqnx.so'
;;
openbsd*)
@@ -19747,13 +22745,13 @@ openbsd*)
need_lib_prefix=no
# Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
case $host_os in
- openbsd3.3 | openbsd3.3.*) need_version=yes ;;
- *) need_version=no ;;
+ openbsd3.3 | openbsd3.3.*) need_version=yes ;;
+ *) need_version=no ;;
esac
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
case $host_os in
openbsd2.[89] | openbsd2.[89].*)
shlibpath_overrides_runpath=no
@@ -19763,1141 +22761,2986 @@ openbsd*)
;;
esac
else
- shlibpath_overrides_runpath=yes
+ shlibpath_overrides_runpath=yes
+ fi
+ ;;
+
+os2*)
+ libname_spec='$name'
+ shrext_cmds=".dll"
+ need_lib_prefix=no
+ library_names_spec='$libname${shared_ext} $libname.a'
+ dynamic_linker='OS/2 ld.exe'
+ shlibpath_var=LIBPATH
+ ;;
+
+osf3* | osf4* | osf5*)
+ version_type=osf
+ need_lib_prefix=no
+ need_version=no
+ soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ shlibpath_var=LD_LIBRARY_PATH
+ sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+ ;;
+
+rdos*)
+ dynamic_linker=no
+ ;;
+
+solaris*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+ # ldd complains unless libraries are executable
+ postinstall_cmds='chmod +x $lib'
+ ;;
+
+sunos4*)
+ version_type=sunos
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+ finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+ if test "$with_gnu_ld" = yes; then
+ need_lib_prefix=no
+ fi
+ need_version=yes
+ ;;
+
+sysv4 | sysv4.3*)
+ version_type=linux
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ case $host_vendor in
+ sni)
+ shlibpath_overrides_runpath=no
+ need_lib_prefix=no
+ runpath_var=LD_RUN_PATH
+ ;;
+ siemens)
+ need_lib_prefix=no
+ ;;
+ motorola)
+ need_lib_prefix=no
+ need_version=no
+ shlibpath_overrides_runpath=no
+ sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
+ ;;
+ esac
+ ;;
+
+sysv4*MP*)
+ if test -d /usr/nec ;then
+ version_type=linux
+ library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
+ soname_spec='$libname${shared_ext}.$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ fi
+ ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+ version_type=freebsd-elf
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+ if test "$with_gnu_ld" = yes; then
+ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+ else
+ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+ case $host_os in
+ sco3.2v5*)
+ sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
+ ;;
+ esac
+ fi
+ sys_lib_dlsearch_path_spec='/usr/lib'
+ ;;
+
+tpf*)
+ # TPF is a cross-target only. Preferred cross-host = GNU/Linux.
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ ;;
+
+uts4*)
+ version_type=linux
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ ;;
+
+*)
+ dynamic_linker=no
+ ;;
+esac
+{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+$as_echo "$dynamic_linker" >&6; }
+test "$dynamic_linker" = no && can_build_shared=no
+
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test "$GCC" = yes; then
+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+fi
+
+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
+ sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+fi
+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
+ sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ { $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
+hardcode_action_FC=
+if test -n "$hardcode_libdir_flag_spec_FC" ||
+ test -n "$runpath_var_FC" ||
+ test "X$hardcode_automatic_FC" = "Xyes" ; then
+
+ # We can hardcode non-existent directories.
+ if test "$hardcode_direct_FC" != no &&
+ # If the only mechanism to avoid hardcoding is shlibpath_var, we
+ # have to relink, otherwise we might link with an installed library
+ # when we should be linking with a yet-to-be-installed one
+ ## test "$_LT_TAGVAR(hardcode_shlibpath_var, FC)" != no &&
+ test "$hardcode_minus_L_FC" != no; then
+ # Linking always hardcodes the temporary library directory.
+ hardcode_action_FC=relink
+ else
+ # We can link without hardcoding, and we can hardcode nonexisting dirs.
+ hardcode_action_FC=immediate
+ fi
+else
+ # We cannot hardcode anything, or else we can only hardcode existing
+ # directories.
+ hardcode_action_FC=unsupported
+fi
+{ $as_echo "$as_me:$LINENO: result: $hardcode_action_FC" >&5
+$as_echo "$hardcode_action_FC" >&6; }
+
+if test "$hardcode_action_FC" = relink ||
+ test "$inherit_rpath_FC" = yes; then
+ # Fast installation is not supported
+ enable_fast_install=no
+elif test "$shlibpath_overrides_runpath" = yes ||
+ test "$enable_shared" = no; then
+ # Fast installation is not necessary
+ enable_fast_install=needless
+fi
+
+
+
+
+
+
+
+ fi # test -n "$compiler"
+
+ GCC=$lt_save_GCC
+ CC="$lt_save_CC"
+fi # test "$_lt_disable_FC" != yes
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+
+
+
+
+
+
+
+ ac_config_commands="$ac_config_commands libtool"
+
+
+
+
+# Only expand once:
+
+
+{ $as_echo "$as_me:$LINENO: checking for library containing strerror" >&5
+$as_echo_n "checking for library containing strerror... " >&6; }
+if test "${ac_cv_search_strerror+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ ac_func_search_save_LIBS=$LIBS
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char strerror ();
+#ifdef FC_DUMMY_MAIN
+#ifndef FC_DUMMY_MAIN_EQ_F77
+# ifdef __cplusplus
+ extern "C"
+# endif
+ int FC_DUMMY_MAIN() { return 1; }
+#endif
+#endif
+int
+main ()
+{
+return strerror ();
+ ;
+ return 0;
+}
+_ACEOF
+for ac_lib in '' cposix; do
+ if test -z "$ac_lib"; then
+ ac_res="none required"
+ else
+ ac_res=-l$ac_lib
+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
fi
- ;;
+ rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+ ac_cv_search_strerror=$ac_res
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
-os2*)
- libname_spec='$name'
- shrext_cmds=".dll"
- need_lib_prefix=no
- library_names_spec='$libname${shared_ext} $libname.a'
- dynamic_linker='OS/2 ld.exe'
- shlibpath_var=LIBPATH
- ;;
-osf3* | osf4* | osf5*)
- version_type=osf
- need_lib_prefix=no
- need_version=no
- soname_spec='${libname}${release}${shared_ext}$major'
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- shlibpath_var=LD_LIBRARY_PATH
- sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
- sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
- ;;
+fi
-rdos*)
- dynamic_linker=no
- ;;
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext
+ if test "${ac_cv_search_strerror+set}" = set; then
+ break
+fi
+done
+if test "${ac_cv_search_strerror+set}" = set; then
+ :
+else
+ ac_cv_search_strerror=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5
+$as_echo "$ac_cv_search_strerror" >&6; }
+ac_res=$ac_cv_search_strerror
+if test "$ac_res" != no; then
+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-solaris*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes
- hardcode_into_libs=yes
- # ldd complains unless libraries are executable
- postinstall_cmds='chmod +x $lib'
- ;;
+fi
-sunos4*)
- version_type=sunos
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
- finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes
- if test "$with_gnu_ld" = yes; then
- need_lib_prefix=no
- fi
- need_version=yes
- ;;
+# save the cache so far
+cat >confcache <<\_ACEOF
+# This file is a shell script that caches the results of configure
+# tests run on this system so they can be shared between configure
+# scripts and configure runs, see configure's option --config-cache.
+# It is not useful on other systems. If it contains results you don't
+# want to keep, you may remove or edit it.
+#
+# config.status only pays attention to the cache file if you give it
+# the --recheck option to rerun configure.
+#
+# `ac_cv_env_foo' variables (set or unset) will be overridden when
+# loading this file, other *unset* `ac_cv_foo' will be assigned the
+# following values.
-sysv4 | sysv4.3*)
- version_type=linux
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- case $host_vendor in
- sni)
- shlibpath_overrides_runpath=no
- need_lib_prefix=no
- export_dynamic_flag_spec='${wl}-Blargedynsym'
- runpath_var=LD_RUN_PATH
- ;;
- siemens)
- need_lib_prefix=no
- ;;
- motorola)
- need_lib_prefix=no
- need_version=no
- shlibpath_overrides_runpath=no
- sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
- ;;
- esac
- ;;
+_ACEOF
-sysv4*MP*)
- if test -d /usr/nec ;then
- version_type=linux
- library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
- soname_spec='$libname${shared_ext}.$major'
- shlibpath_var=LD_LIBRARY_PATH
- fi
- ;;
+# The following way of writing the cache mishandles newlines in values,
+# but we know of no workaround that is simple, portable, and efficient.
+# So, we kill variables containing newlines.
+# Ultrix sh set writes to stderr and can't be redirected directly,
+# and sets the high bit in the cache file unless we assign to the vars.
+(
+ for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
+ eval ac_val=\$$ac_var
+ case $ac_val in #(
+ *${as_nl}*)
+ case $ac_var in #(
+ *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+ esac
+ case $ac_var in #(
+ _ | IFS | as_nl) ;; #(
+ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+ *) $as_unset $ac_var ;;
+ esac ;;
+ esac
+ done
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
- version_type=freebsd-elf
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- hardcode_into_libs=yes
- if test "$with_gnu_ld" = yes; then
- sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
- shlibpath_overrides_runpath=no
+ (set) 2>&1 |
+ case $as_nl`(ac_space=' '; set) 2>&1` in #(
+ *${as_nl}ac_space=\ *)
+ # `set' does not quote correctly, so add quotes (double-quote
+ # substitution turns \\\\ into \\, and sed turns \\ into \).
+ sed -n \
+ "s/'/'\\\\''/g;
+ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+ ;; #(
+ *)
+ # `set' quotes correctly as required by POSIX, so do not add quotes.
+ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+ ;;
+ esac |
+ sort
+) |
+ sed '
+ /^ac_cv_env_/b end
+ t clear
+ :clear
+ s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+ t end
+ s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+ :end' >>confcache
+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
+ if test -w "$cache_file"; then
+ test "x$cache_file" != "x/dev/null" &&
+ { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
+$as_echo "$as_me: updating cache $cache_file" >&6;}
+ cat confcache >$cache_file
else
- sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
- shlibpath_overrides_runpath=yes
- case $host_os in
- sco3.2v5*)
- sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
- ;;
- esac
+ { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
fi
- sys_lib_dlsearch_path_spec='/usr/lib'
- ;;
+fi
+rm -f confcache
-uts4*)
- version_type=linux
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- ;;
+# Check whether --enable-optimization was given.
+if test "${enable_optimization+set}" = set; then
+ enableval=$enable_optimization; case "${enableval}" in
+ yes) USING_DEBUG="no";;
+ no) USING_DEBUG="yes";;
+ *) { { $as_echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-optimization" >&5
+$as_echo "$as_me: error: bad value ${enableval} for --enable-optimization" >&2;}
+ { (exit 1); exit 1; }; } ;;
+ esac
+else
+ USING_DEBUG="yes"
+fi
-*)
- dynamic_linker=no
- ;;
-esac
-{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-echo "${ECHO_T}$dynamic_linker" >&6; }
-test "$dynamic_linker" = no && can_build_shared=no
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+SILO_DTYPPTR="void"
+SILO_DTYPPTR1="void*"
+SILO_DTYPPTR2="void*"
+# Check whether --enable-legacy-datatyped-pointers was given.
+if test "${enable_legacy_datatyped_pointers+set}" = set; then
+ enableval=$enable_legacy_datatyped_pointers; if test $enableval = yes; then
+ SILO_DTYPPTR="float"
+ SILO_DTYPPTR1="float*"
+ SILO_DTYPPTR2="float**"
+ fi
fi
-{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
-hardcode_action_GCJ=
-if test -n "$hardcode_libdir_flag_spec_GCJ" || \
- test -n "$runpath_var_GCJ" || \
- test "X$hardcode_automatic_GCJ" = "Xyes" ; then
- # We can hardcode non-existant directories.
- if test "$hardcode_direct_GCJ" != no &&
- # If the only mechanism to avoid hardcoding is shlibpath_var, we
- # have to relink, otherwise we might link with an installed library
- # when we should be linking with a yet-to-be-installed one
- ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, GCJ)" != no &&
- test "$hardcode_minus_L_GCJ" != no; then
- # Linking always hardcodes the temporary library directory.
- hardcode_action_GCJ=relink
- else
- # We can link without hardcoding, and we can hardcode nonexisting dirs.
- hardcode_action_GCJ=immediate
- fi
+
+
+
+# Check whether --enable-normal-sclite-mem-headers was given.
+if test "${enable_normal_sclite_mem_headers+set}" = set; then
+ enableval=$enable_normal_sclite_mem_headers; if test "$enableval" = "yes" ; then
+
+cat >>confdefs.h <<\_ACEOF
+#define NORMAL_SCLITE_HEADERS 1
+_ACEOF
+
+ fi
else
- # We cannot hardcode anything, or else we can only hardcode existing
- # directories.
- hardcode_action_GCJ=unsupported
+
+cat >>confdefs.h <<\_ACEOF
+#define NORMAL_SCLITE_HEADERS 0
+_ACEOF
+
fi
-{ echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
-echo "${ECHO_T}$hardcode_action_GCJ" >&6; }
-if test "$hardcode_action_GCJ" = relink; then
- # Fast installation is not supported
- enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
- test "$enable_shared" = no; then
- # Fast installation is not necessary
- enable_fast_install=needless
+
+# Check whether --enable-install-lite-headers was given.
+if test "${enable_install_lite_headers+set}" = set; then
+ enableval=$enable_install_lite_headers; INSTLITE="$enableval"
fi
-# The else clause should only fire when bootstrapping the
-# libtool distribution, otherwise you forgot to ship ltmain.sh
-# with your package, and you will get complaints that there are
-# no rules to generate ltmain.sh.
-if test -f "$ltmain"; then
- # See if we are running on zsh, and set the options which allow our commands through
- # without removal of \ escapes.
- if test -n "${ZSH_VERSION+set}" ; then
- setopt NO_GLOB_SUBST
- fi
- # Now quote all the things that may contain metacharacters while being
- # careful not to overquote the AC_SUBSTed values. We take copies of the
- # variables and quote the copies for generation of the libtool script.
- for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
- SED SHELL STRIP \
- libname_spec library_names_spec soname_spec extract_expsyms_cmds \
- old_striplib striplib file_magic_cmd finish_cmds finish_eval \
- deplibs_check_method reload_flag reload_cmds need_locks \
- lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
- lt_cv_sys_global_symbol_to_c_name_address \
- sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
- old_postinstall_cmds old_postuninstall_cmds \
- compiler_GCJ \
- CC_GCJ \
- LD_GCJ \
- lt_prog_compiler_wl_GCJ \
- lt_prog_compiler_pic_GCJ \
- lt_prog_compiler_static_GCJ \
- lt_prog_compiler_no_builtin_flag_GCJ \
- export_dynamic_flag_spec_GCJ \
- thread_safe_flag_spec_GCJ \
- whole_archive_flag_spec_GCJ \
- enable_shared_with_static_runtimes_GCJ \
- old_archive_cmds_GCJ \
- old_archive_from_new_cmds_GCJ \
- predep_objects_GCJ \
- postdep_objects_GCJ \
- predeps_GCJ \
- postdeps_GCJ \
- compiler_lib_search_path_GCJ \
- archive_cmds_GCJ \
- archive_expsym_cmds_GCJ \
- postinstall_cmds_GCJ \
- postuninstall_cmds_GCJ \
- old_archive_from_expsyms_cmds_GCJ \
- allow_undefined_flag_GCJ \
- no_undefined_flag_GCJ \
- export_symbols_cmds_GCJ \
- hardcode_libdir_flag_spec_GCJ \
- hardcode_libdir_flag_spec_ld_GCJ \
- hardcode_libdir_separator_GCJ \
- hardcode_automatic_GCJ \
- module_cmds_GCJ \
- module_expsym_cmds_GCJ \
- lt_cv_prog_compiler_c_o_GCJ \
- fix_srcfile_path_GCJ \
- exclude_expsyms_GCJ \
- include_expsyms_GCJ; do
-
- case $var in
- old_archive_cmds_GCJ | \
- old_archive_from_new_cmds_GCJ | \
- archive_cmds_GCJ | \
- archive_expsym_cmds_GCJ | \
- module_cmds_GCJ | \
- module_expsym_cmds_GCJ | \
- old_archive_from_expsyms_cmds_GCJ | \
- export_symbols_cmds_GCJ | \
- extract_expsyms_cmds | reload_cmds | finish_cmds | \
- postinstall_cmds | postuninstall_cmds | \
- old_postinstall_cmds | old_postuninstall_cmds | \
- sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
- # Double-quote double-evaled strings.
- eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
- ;;
- *)
- eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
- ;;
- esac
- done
+NETCDF="netcdf"
- case $lt_echo in
- *'\$0 --fallback-echo"')
- lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
- ;;
- esac
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_NETCDF_DRIVER 1
+_ACEOF
-cfgfile="$ofile"
- cat <<__EOF__ >> "$cfgfile"
-# ### BEGIN LIBTOOL TAG CONFIG: $tagname
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+PDB_DRV="pdb_drv"
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_PDB_DRIVER 1
+_ACEOF
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$archive_cmds_need_lc_GCJ
+TAURUS="taurus"
-# Whether or not to disallow shared libs when runtime libs are static
-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_GCJ
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_TAURUS_DRIVER 1
+_ACEOF
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
-# The host system.
-host_alias=$host_alias
-host=$host
-host_os=$host_os
-# The build system.
-build_alias=$build_alias
-build=$build
-build_os=$build_os
+HDF5_DRV="hdf5_drv"
-# An echo program that does not interpret backslashes.
-echo=$lt_echo
-# The archiver.
-AR=$lt_AR
-AR_FLAGS=$lt_AR_FLAGS
+# Some sites have the GNU readline header files and libraries installed
+# incorrectly which causes programs that use them to not link or possibly
+# not run. This configure doesn't check for misconfigured systems, but
+# it does allow the user to prevent the GNU readline files from being
+# detected.
-# A C compiler.
-LTCC=$lt_LTCC
+# Check whether --with-readline was given.
+if test "${with_readline+set}" = set; then
+ withval=$with_readline; detect_readline=$withval
+else
+ detect_readline=$default_detect_readline
+fi
-# LTCC compiler flags.
-LTCFLAGS=$lt_LTCFLAGS
-# A language-specific compiler.
-CC=$lt_compiler_GCJ
+BROWSER=$DEFAULT_BROWSER
+# Check whether --enable-browser was given.
+if test "${enable_browser+set}" = set; then
+ enableval=$enable_browser; if test "$enable_browser" = "no"; then
+ BROWSER=""
+ fi
+fi
-# Is the compiler the GNU C compiler?
-with_gcc=$GCC_GCJ
-# An ERE matcher.
-EGREP=$lt_EGREP
-# The linker used to build libraries.
-LD=$lt_LD_GCJ
+SILEX=$DEFAULT_SILEX
+# Check whether --enable-silex was given.
+if test "${enable_silex+set}" = set; then
+ enableval=$enable_silex; if test "$enable_silex" = "no"; then
+ SILEX=""
+ fi
+fi
-# Whether we need hard or soft links.
-LN_S=$lt_LN_S
-# A BSD-compatible nm program.
-NM=$lt_NM
-# A symbol stripping program
-STRIP=$lt_STRIP
-# Used to examine libraries when file_magic_cmd begins "file"
-MAGIC_CMD=$MAGIC_CMD
+# Check whether --with-zlib was given.
+if test "${with_zlib+set}" = set; then
+ withval=$with_zlib;
+fi
-# Used on cygwin: DLL creation program.
-DLLTOOL="$DLLTOOL"
+if test "$with_zlib" = no; then
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_ZLIB_H 0
+_ACEOF
-# Used on cygwin: object dumper.
-OBJDUMP="$OBJDUMP"
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_LIBZ 0
+_ACEOF
-# Used on cygwin: assembler.
-AS="$AS"
+ ZLIB=""
+elif test -n "$with_zlib" && test "$with_zlib" != yes; then
+ ZLIB_INCDIR="`echo $with_zlib |cut -f1 -d,`"
+ if test ! -f $ZLIB_INCDIR/zlib.h; then
+ { { $as_echo "$as_me:$LINENO: error: problem with directory specified for zlib includes" >&5
+$as_echo "$as_me: error: problem with directory specified for zlib includes" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ ZLIB_LIBDIR="`echo $with_zlib | cut -f2 -d, -s`"
+ if test ! -f $ZLIB_LIBDIR/libz.a && test ! -f $ZLIB_LIBDIR/libz.so; then
+ { { $as_echo "$as_me:$LINENO: error: problem with directory specified for zlib libs" >&5
+$as_echo "$as_me: error: problem with directory specified for zlib libs" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ CPPFLAGS="$CPPFLAGS -I$ZLIB_INCDIR"
+ LDFLAGS="$LDFLAGS -L$ZLIB_LIBDIR"
+ LIBS="$LIBS -lz"
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_ZLIB_H 1
+_ACEOF
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_LIBZ 1
+_ACEOF
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
+ ZLIB="zlib"
+fi
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl_GCJ
+{ $as_echo "$as_me:$LINENO: checking for hzip" >&5
+$as_echo_n "checking for hzip... " >&6; }
+if test -d $srcdir/src/hzip; then
+ { $as_echo "$as_me:$LINENO: result: found" >&5
+$as_echo "found" >&6; }
+ HZIP=$DEFAULT_HZIP
+else
+ { $as_echo "$as_me:$LINENO: result: hzip compression not available in BSD version" >&5
+$as_echo "hzip compression not available in BSD version" >&6; }
+ HZIP=""
+fi
+# Check whether --enable-hzip was given.
+if test "${enable_hzip+set}" = set; then
+ enableval=$enable_hzip; if test "$enable_hzip" = "no"; then
+ HZIP=""
+ fi
+fi
-# Object file suffix (normally "o").
-objext="$ac_objext"
-# Old archive suffix (normally "a").
-libext="$libext"
-# Shared library suffix (normally ".so").
-shrext_cmds='$shrext_cmds'
+if test -n "$HZIP" && test "$with_zlib" != no; then
-# Executable file suffix (normally "").
-exeext="$exeext"
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_HZIP 1
+_ACEOF
-# Additional compiler flags for building library objects.
-pic_flag=$lt_lt_prog_compiler_pic_GCJ
-pic_mode=$pic_mode
+ ZLIB="zlib"
-# What is the maximum length of a command?
-max_cmd_len=$lt_cv_sys_max_cmd_len
+for ac_header in zlib.h
+do
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ $as_echo_n "(cached) " >&6
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+else
+ # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ
+ ac_header_compiler=no
+fi
-# Must we lock files when doing compilation?
-need_locks=$lt_need_locks
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
-# Do we need the lib prefix for modules?
-need_lib_prefix=$need_lib_prefix
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <$ac_header>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
-# Do we need a version for libraries?
-need_version=$need_version
+ ac_header_preproc=no
+fi
-# Whether dlopen is supported.
-dlopen_support=$enable_dlopen
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
-# Whether dlopen of programs is supported.
-dlopen_self=$enable_dlopen_self
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+ ( cat <<\_ASBOX
+## ----------------------------------------- ##
+## Report this to visit-users at email.ornl.gov ##
+## ----------------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ $as_echo_n "(cached) " >&6
+else
+ eval "$as_ac_Header=\$ac_header_preproc"
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
-# Whether dlopen of statically linked programs is supported.
-dlopen_self_static=$enable_dlopen_self_static
+fi
+as_val=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ if test "x$as_val" = x""yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+ have_zlib_h="yes"
+fi
-# Compiler flag to prevent dynamic linking.
-link_static_flag=$lt_lt_prog_compiler_static_GCJ
+done
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_GCJ
+ if test -n "$have_zlib_h"; then
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_GCJ
+{ $as_echo "$as_me:$LINENO: checking for inflateEnd in -lz" >&5
+$as_echo_n "checking for inflateEnd in -lz... " >&6; }
+if test "${ac_cv_lib_z_inflateEnd+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lz $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$lt_whole_archive_flag_spec_GCJ
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char inflateEnd ();
+#ifdef FC_DUMMY_MAIN
+#ifndef FC_DUMMY_MAIN_EQ_F77
+# ifdef __cplusplus
+ extern "C"
+# endif
+ int FC_DUMMY_MAIN() { return 1; }
+#endif
+#endif
+int
+main ()
+{
+return inflateEnd ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+ ac_cv_lib_z_inflateEnd=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
-# Compiler flag to generate thread-safe objects.
-thread_safe_flag_spec=$lt_thread_safe_flag_spec_GCJ
+ ac_cv_lib_z_inflateEnd=no
+fi
-# Library versioning type.
-version_type=$version_type
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_z_inflateEnd" >&5
+$as_echo "$ac_cv_lib_z_inflateEnd" >&6; }
+if test "x$ac_cv_lib_z_inflateEnd" = x""yes; then
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBZ 1
+_ACEOF
-# Format of library name prefix.
-libname_spec=$lt_libname_spec
+ LIBS="-lz $LIBS"
-# List of archive names. First name is the real one, the rest are links.
-# The last name is the one that the linker finds with -lNAME.
-library_names_spec=$lt_library_names_spec
+fi
-# The coded name of the library, if different from the real name.
-soname_spec=$lt_soname_spec
+ if test -z "`echo $LIBS | tr ' ' '\n' | grep -x -e '-lz'`"; then
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_ZLIB_H 0
+_ACEOF
-# Commands used to build and install an old-style archive.
-RANLIB=$lt_RANLIB
-old_archive_cmds=$lt_old_archive_cmds_GCJ
-old_postinstall_cmds=$lt_old_postinstall_cmds
-old_postuninstall_cmds=$lt_old_postuninstall_cmds
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_LIBZ 0
+_ACEOF
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_GCJ
+ ZLIB=""
+ fi
+ fi
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_GCJ
+fi
-# Commands used to build and install a shared archive.
-archive_cmds=$lt_archive_cmds_GCJ
-archive_expsym_cmds=$lt_archive_expsym_cmds_GCJ
-postinstall_cmds=$lt_postinstall_cmds
-postuninstall_cmds=$lt_postuninstall_cmds
+{ $as_echo "$as_me:$LINENO: checking for fpzip" >&5
+$as_echo_n "checking for fpzip... " >&6; }
+if test -d $srcdir/src/fpzip; then
+ { $as_echo "$as_me:$LINENO: result: found" >&5
+$as_echo "found" >&6; }
+ FPZIP=$DEFAULT_FPZIP
+else
+ { $as_echo "$as_me:$LINENO: result: fpzip compression not available in BSD version" >&5
+$as_echo "fpzip compression not available in BSD version" >&6; }
+ FPZIP=""
+fi
+# Check whether --enable-fpzip was given.
+if test "${enable_fpzip+set}" = set; then
+ enableval=$enable_fpzip; if test "$enable_fpzip" = "no"; then
+ FPZIP=""
+ fi
+fi
-# Commands used to build a loadable module (assumed same as above if empty)
-module_cmds=$lt_module_cmds_GCJ
-module_expsym_cmds=$lt_module_expsym_cmds_GCJ
-# Commands to strip libraries.
-old_striplib=$lt_old_striplib
-striplib=$lt_striplib
+if test -n "$FPZIP"; then
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predep_objects=$lt_predep_objects_GCJ
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_FPZIP 1
+_ACEOF
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdep_objects=$lt_postdep_objects_GCJ
+fi
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predeps=$lt_predeps_GCJ
+# Turn on C optimization flags
+{ $as_echo "$as_me:$LINENO: checking compiler optimization" >&5
+$as_echo_n "checking compiler optimization... " >&6; }
+if test "X$USING_DEBUG" = Xno; then
+# use contributed GNU m4 macro library provided see:
+# autoconf-archive-2006-06-04/htmldoc/ax_cc_maxopt.html
+ AX_CC_MAXOPT
+ { $as_echo "$as_me:$LINENO: result: enabled" >&5
+$as_echo "enabled" >&6; }
+else
+ { $as_echo "$as_me:$LINENO: result: disabled" >&5
+$as_echo "disabled" >&6; }
+fi
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdeps=$lt_postdeps_GCJ
+#
+# MCM: I have no idea what good the following line does. I think
+# all compilers accept the -D argument and any string following
+# it is an argument to the -D argument. So, I think this is
+# just totally bogus!
+# Default to large file support
+ { $as_echo "$as_me:$LINENO: checking whether C compiler accepts \"-D_LARGEFILE_SOURCE\"" >&5
+$as_echo_n "checking whether C compiler accepts \"-D_LARGEFILE_SOURCE\"... " >&6; }
+if test "${ax_cv_c_flags___D_LARGEFILE_SOURCE_+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ
+ ax_save_FLAGS=$CFLAGS
+ CFLAGS=""-D_LARGEFILE_SOURCE""
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method=$lt_deplibs_check_method
+#ifdef FC_DUMMY_MAIN
+#ifndef FC_DUMMY_MAIN_EQ_F77
+# ifdef __cplusplus
+ extern "C"
+# endif
+ int FC_DUMMY_MAIN() { return 1; }
+#endif
+#endif
+int
+main ()
+{
-# Command to use when deplibs_check_method == file_magic.
-file_magic_cmd=$lt_file_magic_cmd
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ax_cv_c_flags___D_LARGEFILE_SOURCE_=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$lt_allow_undefined_flag_GCJ
+ ax_cv_c_flags___D_LARGEFILE_SOURCE_=no
+fi
-# Flag that forces no undefined symbols.
-no_undefined_flag=$lt_no_undefined_flag_GCJ
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ CFLAGS=$ax_save_FLAGS
+fi
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds=$lt_finish_cmds
+eval ax_check_compiler_flags=$ax_cv_c_flags___D_LARGEFILE_SOURCE_
+{ $as_echo "$as_me:$LINENO: result: $ax_check_compiler_flags" >&5
+$as_echo "$ax_check_compiler_flags" >&6; }
+if test "x$ax_check_compiler_flags" = xyes; then
+ CFLAGS="$CFLAGS -D_LARGEFILE_SOURCE";
+else
+ :
+fi
-# Same as above, but a single script fragment to be evaled but not shown.
-finish_eval=$lt_finish_eval
+ { $as_echo "$as_me:$LINENO: checking whether C compiler accepts \"-D_LARGEFILE64_SOURCE\"" >&5
+$as_echo_n "checking whether C compiler accepts \"-D_LARGEFILE64_SOURCE\"... " >&6; }
+if test "${ax_cv_c_flags___D_LARGEFILE64_SOURCE_+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
-# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
+ ax_save_FLAGS=$CFLAGS
+ CFLAGS=""-D_LARGEFILE64_SOURCE""
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
-# Transform the output of nm in a proper C declaration
-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
+#ifdef FC_DUMMY_MAIN
+#ifndef FC_DUMMY_MAIN_EQ_F77
+# ifdef __cplusplus
+ extern "C"
+# endif
+ int FC_DUMMY_MAIN() { return 1; }
+#endif
+#endif
+int
+main ()
+{
-# Transform the output of nm in a C name address pair
-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ax_cv_c_flags___D_LARGEFILE64_SOURCE_=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
-# This is the shared library runtime path variable.
-runpath_var=$runpath_var
+ ax_cv_c_flags___D_LARGEFILE64_SOURCE_=no
+fi
-# This is the shared library path variable.
-shlibpath_var=$shlibpath_var
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ CFLAGS=$ax_save_FLAGS
+fi
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
+eval ax_check_compiler_flags=$ax_cv_c_flags___D_LARGEFILE64_SOURCE_
+{ $as_echo "$as_me:$LINENO: result: $ax_check_compiler_flags" >&5
+$as_echo "$ax_check_compiler_flags" >&6; }
+if test "x$ax_check_compiler_flags" = xyes; then
+ CFLAGS="$CFLAGS -D_LARGEFILE64_SOURCE";
+else
+ :
+fi
-# How to hardcode a shared library path into an executable.
-hardcode_action=$hardcode_action_GCJ
+ { $as_echo "$as_me:$LINENO: checking whether C compiler accepts \"-D_FILE_OFFSET_BITS=64\"" >&5
+$as_echo_n "checking whether C compiler accepts \"-D_FILE_OFFSET_BITS=64\"... " >&6; }
+if test "${ax_cv_c_flags___D_FILE_OFFSET_BITS_64_+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=$hardcode_into_libs
+ ax_save_FLAGS=$CFLAGS
+ CFLAGS=""-D_FILE_OFFSET_BITS=64""
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_GCJ
+#ifdef FC_DUMMY_MAIN
+#ifndef FC_DUMMY_MAIN_EQ_F77
+# ifdef __cplusplus
+ extern "C"
+# endif
+ int FC_DUMMY_MAIN() { return 1; }
+#endif
+#endif
+int
+main ()
+{
-# If ld is used when linking, flag to hardcode \$libdir into
-# a binary during linking. This must work even if \$libdir does
-# not exist.
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_GCJ
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ax_cv_c_flags___D_FILE_OFFSET_BITS_64_=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
-# Whether we need a single -rpath flag with a separated argument.
-hardcode_libdir_separator=$lt_hardcode_libdir_separator_GCJ
+ ax_cv_c_flags___D_FILE_OFFSET_BITS_64_=no
+fi
-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
-# resulting binary.
-hardcode_direct=$hardcode_direct_GCJ
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ CFLAGS=$ax_save_FLAGS
+fi
-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-# resulting binary.
-hardcode_minus_L=$hardcode_minus_L_GCJ
+eval ax_check_compiler_flags=$ax_cv_c_flags___D_FILE_OFFSET_BITS_64_
+{ $as_echo "$as_me:$LINENO: result: $ax_check_compiler_flags" >&5
+$as_echo "$ax_check_compiler_flags" >&6; }
+if test "x$ax_check_compiler_flags" = xyes; then
+ CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64";
+else
+ :
+fi
-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-# the resulting binary.
-hardcode_shlibpath_var=$hardcode_shlibpath_var_GCJ
+ { $as_echo "$as_me:$LINENO: checking whether C compiler accepts \"-Wdeclaration-after-statement\"" >&5
+$as_echo_n "checking whether C compiler accepts \"-Wdeclaration-after-statement\"... " >&6; }
+if test "${ax_cv_c_flags___Wdeclaration_after_statement_+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
-# Set to yes if building a shared library automatically hardcodes DIR into the library
-# and all subsequent libraries and executables linked against it.
-hardcode_automatic=$hardcode_automatic_GCJ
+ ax_save_FLAGS=$CFLAGS
+ CFLAGS=""-Wdeclaration-after-statement""
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at relink time.
-variables_saved_for_relink="$variables_saved_for_relink"
+#ifdef FC_DUMMY_MAIN
+#ifndef FC_DUMMY_MAIN_EQ_F77
+# ifdef __cplusplus
+ extern "C"
+# endif
+ int FC_DUMMY_MAIN() { return 1; }
+#endif
+#endif
+int
+main ()
+{
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=$link_all_deplibs_GCJ
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ax_cv_c_flags___Wdeclaration_after_statement_=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
-# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+ ax_cv_c_flags___Wdeclaration_after_statement_=no
+fi
-# Run-time system search path for libraries
-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ CFLAGS=$ax_save_FLAGS
+fi
-# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path=$lt_fix_srcfile_path
+eval ax_check_compiler_flags=$ax_cv_c_flags___Wdeclaration_after_statement_
+{ $as_echo "$as_me:$LINENO: result: $ax_check_compiler_flags" >&5
+$as_echo "$ax_check_compiler_flags" >&6; }
+if test "x$ax_check_compiler_flags" = xyes; then
+ CFLAGS="$CFLAGS -Wdeclaration-after-statement";
+else
+ :
+fi
-# Set to yes if exported symbols are required.
-always_export_symbols=$always_export_symbols_GCJ
-# The commands to list exported symbols.
-export_symbols_cmds=$lt_export_symbols_cmds_GCJ
+#
+# Note: regardless of what the stuff above regarding large file support
+# appears to do, the following test is the one that affects Silo's
+# knowledge and support for large files. It may be that the result of
+# the sizeof check is dependent on whether -D_LARGEFILE64_SOURCE is
+# defined on the command line to the compiler though.
+# Use size of off64_t to determine which form of stat() calls to make
+#
+# The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
+{ $as_echo "$as_me:$LINENO: checking size of off64_t" >&5
+$as_echo_n "checking size of off64_t... " >&6; }
+if test "${ac_cv_sizeof_off64_t+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ if test "$cross_compiling" = yes; then
+ # Depending upon the size, compute the lo and hi bounds.
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#ifdef FC_DUMMY_MAIN
+#ifndef FC_DUMMY_MAIN_EQ_F77
+# ifdef __cplusplus
+ extern "C"
+# endif
+ int FC_DUMMY_MAIN() { return 1; }
+#endif
+#endif
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (off64_t))) >= 0)];
+test_array [0] = 0
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=$lt_extract_expsyms_cmds
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_lo=0 ac_mid=0
+ while :; do
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#ifdef FC_DUMMY_MAIN
+#ifndef FC_DUMMY_MAIN_EQ_F77
+# ifdef __cplusplus
+ extern "C"
+# endif
+ int FC_DUMMY_MAIN() { return 1; }
+#endif
+#endif
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (off64_t))) <= $ac_mid)];
+test_array [0] = 0
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$lt_exclude_expsyms_GCJ
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_hi=$ac_mid; break
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
-# Symbols that must always be exported.
-include_expsyms=$lt_include_expsyms_GCJ
+ ac_lo=`expr $ac_mid + 1`
+ if test $ac_lo -le $ac_mid; then
+ ac_lo= ac_hi=
+ break
+ fi
+ ac_mid=`expr 2 '*' $ac_mid + 1`
+fi
-# ### END LIBTOOL TAG CONFIG: $tagname
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
-__EOF__
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#ifdef FC_DUMMY_MAIN
+#ifndef FC_DUMMY_MAIN_EQ_F77
+# ifdef __cplusplus
+ extern "C"
+# endif
+ int FC_DUMMY_MAIN() { return 1; }
+#endif
+#endif
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (off64_t))) < 0)];
+test_array [0] = 0
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_hi=-1 ac_mid=-1
+ while :; do
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#ifdef FC_DUMMY_MAIN
+#ifndef FC_DUMMY_MAIN_EQ_F77
+# ifdef __cplusplus
+ extern "C"
+# endif
+ int FC_DUMMY_MAIN() { return 1; }
+#endif
+#endif
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (off64_t))) >= $ac_mid)];
+test_array [0] = 0
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_lo=$ac_mid; break
else
- # If there is no Makefile yet, we rely on a make rule to execute
- # `config.status --recheck' to rerun these tests and create the
- # libtool script then.
- ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
- if test -f "$ltmain_in"; then
- test -f Makefile && make "$ltmain"
- fi
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_hi=`expr '(' $ac_mid ')' - 1`
+ if test $ac_mid -le $ac_hi; then
+ ac_lo= ac_hi=
+ break
+ fi
+ ac_mid=`expr 2 '*' $ac_mid`
fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ ac_lo= ac_hi=
+fi
-CC="$lt_save_CC"
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
- else
- tagname=""
- fi
- ;;
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+# Binary search between lo and hi bounds.
+while test "x$ac_lo" != "x$ac_hi"; do
+ ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#ifdef FC_DUMMY_MAIN
+#ifndef FC_DUMMY_MAIN_EQ_F77
+# ifdef __cplusplus
+ extern "C"
+# endif
+ int FC_DUMMY_MAIN() { return 1; }
+#endif
+#endif
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (off64_t))) <= $ac_mid)];
+test_array [0] = 0
- RC)
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_hi=$ac_mid
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+ ac_lo=`expr '(' $ac_mid ')' + 1`
+fi
-# Source file extension for RC test sources.
-ac_ext=rc
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+done
+case $ac_lo in
+?*) ac_cv_sizeof_off64_t=$ac_lo;;
+'') if test "$ac_cv_type_off64_t" = yes; then
+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (off64_t)
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: cannot compute sizeof (off64_t)
+See \`config.log' for more details." >&2;}
+ { (exit 77); exit 77; }; }; }
+ else
+ ac_cv_sizeof_off64_t=0
+ fi ;;
+esac
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+static long int longval () { return (long int) (sizeof (off64_t)); }
+static unsigned long int ulongval () { return (long int) (sizeof (off64_t)); }
+#include <stdio.h>
+#include <stdlib.h>
+#ifdef FC_DUMMY_MAIN
+#ifndef FC_DUMMY_MAIN_EQ_F77
+# ifdef __cplusplus
+ extern "C"
+# endif
+ int FC_DUMMY_MAIN() { return 1; }
+#endif
+#endif
+int
+main ()
+{
-# Object file extension for compiled RC test sources.
-objext=o
-objext_RC=$objext
+ FILE *f = fopen ("conftest.val", "w");
+ if (! f)
+ return 1;
+ if (((long int) (sizeof (off64_t))) < 0)
+ {
+ long int i = longval ();
+ if (i != ((long int) (sizeof (off64_t))))
+ return 1;
+ fprintf (f, "%ld", i);
+ }
+ else
+ {
+ unsigned long int i = ulongval ();
+ if (i != ((long int) (sizeof (off64_t))))
+ return 1;
+ fprintf (f, "%lu", i);
+ }
+ /* Do not output a trailing newline, as this causes \r\n confusion
+ on some platforms. */
+ return ferror (f) || fclose (f) != 0;
-# Code to be used in simple compile tests
-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_sizeof_off64_t=`cat conftest.val`
+else
+ $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
-# Code to be used in simple link tests
-lt_simple_link_test_code="$lt_simple_compile_test_code"
+( exit $ac_status )
+if test "$ac_cv_type_off64_t" = yes; then
+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (off64_t)
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: cannot compute sizeof (off64_t)
+See \`config.log' for more details." >&2;}
+ { (exit 77); exit 77; }; }; }
+ else
+ ac_cv_sizeof_off64_t=0
+ fi
+fi
+rm -rf conftest.dSYM
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f conftest.val
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_off64_t" >&5
+$as_echo "$ac_cv_sizeof_off64_t" >&6; }
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-# If no C compiler flags were specified, use CFLAGS.
-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_OFF64_T $ac_cv_sizeof_off64_t
+_ACEOF
-# Allow CC to be a program name with arguments.
-compiler=$CC
-# save warnings/boilerplate of simple test code
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_compile_test_code" >conftest.$ac_ext
-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_compiler_boilerplate=`cat conftest.err`
-$rm conftest*
+# Find a good install program. We prefer a C program (faster),
+# so one script is as good as another. But avoid the broken or
+# incompatible versions:
+# SysV /etc/install, /usr/sbin/install
+# SunOS /usr/etc/install
+# IRIX /sbin/install
+# AIX /bin/install
+# AmigaOS /C/install, which installs bootblocks on floppy discs
+# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
+# AFS /usr/afsws/bin/install, which mishandles nonexistent args
+# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+# OS/2's system install, which has a completely different semantic
+# ./install, which can be erroneously created by make from ./install.sh.
+# Reject install programs that cannot install multiple files.
+{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
+$as_echo_n "checking for a BSD-compatible install... " >&6; }
+if test -z "$INSTALL"; then
+if test "${ac_cv_path_install+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ # Account for people who put trailing slashes in PATH elements.
+case $as_dir/ in
+ ./ | .// | /cC/* | \
+ /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
+ ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
+ /usr/ucb/* ) ;;
+ *)
+ # OSF1 and SCO ODT 3.0 have their own names for install.
+ # Don't use installbsd from OSF since it installs stuff as root
+ # by default.
+ for ac_prog in ginstall scoinst install; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
+ if test $ac_prog = install &&
+ grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+ # AIX install. It has an incompatible calling convention.
+ :
+ elif test $ac_prog = install &&
+ grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+ # program-specific install script used by HP pwplus--don't use.
+ :
+ else
+ rm -rf conftest.one conftest.two conftest.dir
+ echo one > conftest.one
+ echo two > conftest.two
+ mkdir conftest.dir
+ if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
+ test -s conftest.one && test -s conftest.two &&
+ test -s conftest.dir/conftest.one &&
+ test -s conftest.dir/conftest.two
+ then
+ ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+ break 3
+ fi
+ fi
+ fi
+ done
+ done
+ ;;
+esac
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_link_test_code" >conftest.$ac_ext
-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_linker_boilerplate=`cat conftest.err`
-$rm conftest*
+done
+IFS=$as_save_IFS
+rm -rf conftest.one conftest.two conftest.dir
-# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
-CC=${RC-"windres"}
-compiler=$CC
-compiler_RC=$CC
-for cc_temp in $compiler""; do
- case $cc_temp in
- compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
- distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
- \-*) ;;
- *) break;;
- esac
-done
-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-
-lt_cv_prog_compiler_c_o_RC=yes
-
-# The else clause should only fire when bootstrapping the
-# libtool distribution, otherwise you forgot to ship ltmain.sh
-# with your package, and you will get complaints that there are
-# no rules to generate ltmain.sh.
-if test -f "$ltmain"; then
- # See if we are running on zsh, and set the options which allow our commands through
- # without removal of \ escapes.
- if test -n "${ZSH_VERSION+set}" ; then
- setopt NO_GLOB_SUBST
+fi
+ if test "${ac_cv_path_install+set}" = set; then
+ INSTALL=$ac_cv_path_install
+ else
+ # As a last resort, use the slow shell script. Don't cache a
+ # value for INSTALL within a source directory, because that will
+ # break other packages using the cache if that directory is
+ # removed, or if the value is a relative name.
+ INSTALL=$ac_install_sh
fi
- # Now quote all the things that may contain metacharacters while being
- # careful not to overquote the AC_SUBSTed values. We take copies of the
- # variables and quote the copies for generation of the libtool script.
- for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
- SED SHELL STRIP \
- libname_spec library_names_spec soname_spec extract_expsyms_cmds \
- old_striplib striplib file_magic_cmd finish_cmds finish_eval \
- deplibs_check_method reload_flag reload_cmds need_locks \
- lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
- lt_cv_sys_global_symbol_to_c_name_address \
- sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
- old_postinstall_cmds old_postuninstall_cmds \
- compiler_RC \
- CC_RC \
- LD_RC \
- lt_prog_compiler_wl_RC \
- lt_prog_compiler_pic_RC \
- lt_prog_compiler_static_RC \
- lt_prog_compiler_no_builtin_flag_RC \
- export_dynamic_flag_spec_RC \
- thread_safe_flag_spec_RC \
- whole_archive_flag_spec_RC \
- enable_shared_with_static_runtimes_RC \
- old_archive_cmds_RC \
- old_archive_from_new_cmds_RC \
- predep_objects_RC \
- postdep_objects_RC \
- predeps_RC \
- postdeps_RC \
- compiler_lib_search_path_RC \
- archive_cmds_RC \
- archive_expsym_cmds_RC \
- postinstall_cmds_RC \
- postuninstall_cmds_RC \
- old_archive_from_expsyms_cmds_RC \
- allow_undefined_flag_RC \
- no_undefined_flag_RC \
- export_symbols_cmds_RC \
- hardcode_libdir_flag_spec_RC \
- hardcode_libdir_flag_spec_ld_RC \
- hardcode_libdir_separator_RC \
- hardcode_automatic_RC \
- module_cmds_RC \
- module_expsym_cmds_RC \
- lt_cv_prog_compiler_c_o_RC \
- fix_srcfile_path_RC \
- exclude_expsyms_RC \
- include_expsyms_RC; do
-
- case $var in
- old_archive_cmds_RC | \
- old_archive_from_new_cmds_RC | \
- archive_cmds_RC | \
- archive_expsym_cmds_RC | \
- module_cmds_RC | \
- module_expsym_cmds_RC | \
- old_archive_from_expsyms_cmds_RC | \
- export_symbols_cmds_RC | \
- extract_expsyms_cmds | reload_cmds | finish_cmds | \
- postinstall_cmds | postuninstall_cmds | \
- old_postinstall_cmds | old_postuninstall_cmds | \
- sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
- # Double-quote double-evaled strings.
- eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
- ;;
- *)
- eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
- ;;
- esac
- done
-
- case $lt_echo in
- *'\$0 --fallback-echo"')
- lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
- ;;
- esac
+fi
+{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
+$as_echo "$INSTALL" >&6; }
-cfgfile="$ofile"
+# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+# It thinks the first close brace ends the variable substitution.
+test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
- cat <<__EOF__ >> "$cfgfile"
-# ### BEGIN LIBTOOL TAG CONFIG: $tagname
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$archive_cmds_need_lc_RC
-# Whether or not to disallow shared libs when runtime libs are static
-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_RC
+for ac_header in sys/time.h stdarg.h sys/stat.h
+do
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ $as_echo_n "(cached) " >&6
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+else
+ # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
+ ac_header_compiler=no
+fi
-# The host system.
-host_alias=$host_alias
-host=$host
-host_os=$host_os
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
-# The build system.
-build_alias=$build_alias
-build=$build
-build_os=$build_os
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <$ac_header>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
-# An echo program that does not interpret backslashes.
-echo=$lt_echo
+ ac_header_preproc=no
+fi
-# The archiver.
-AR=$lt_AR
-AR_FLAGS=$lt_AR_FLAGS
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
-# A C compiler.
-LTCC=$lt_LTCC
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+ ( cat <<\_ASBOX
+## ----------------------------------------- ##
+## Report this to visit-users at email.ornl.gov ##
+## ----------------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ $as_echo_n "(cached) " >&6
+else
+ eval "$as_ac_Header=\$ac_header_preproc"
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
-# LTCC compiler flags.
-LTCFLAGS=$lt_LTCFLAGS
+fi
+as_val=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ if test "x$as_val" = x""yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
-# A language-specific compiler.
-CC=$lt_compiler_RC
+else
+ { { $as_echo "$as_me:$LINENO: error: $0 wasn't able to find a necessary header file
+(see above). Please rectify this and rerun configure.
+See the file INSTALL_FAQ in this directory for possible reasons
+this might have happened." >&5
+$as_echo "$as_me: error: $0 wasn't able to find a necessary header file
+(see above). Please rectify this and rerun configure.
+See the file INSTALL_FAQ in this directory for possible reasons
+this might have happened." >&2;}
+ { (exit 1); exit 1; }; }
+fi
-# Is the compiler the GNU C compiler?
-with_gcc=$GCC_RC
+done
-# An ERE matcher.
-EGREP=$lt_EGREP
-# The linker used to build libraries.
-LD=$lt_LD_RC
-# Whether we need hard or soft links.
-LN_S=$lt_LN_S
+for ac_header in fcntl.h
+do
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ $as_echo_n "(cached) " >&6
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+else
+ # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
-# A BSD-compatible nm program.
-NM=$lt_NM
+ ac_header_compiler=no
+fi
-# A symbol stripping program
-STRIP=$lt_STRIP
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
-# Used to examine libraries when file_magic_cmd begins "file"
-MAGIC_CMD=$MAGIC_CMD
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <$ac_header>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
-# Used on cygwin: DLL creation program.
-DLLTOOL="$DLLTOOL"
+ ac_header_preproc=no
+fi
-# Used on cygwin: object dumper.
-OBJDUMP="$OBJDUMP"
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
-# Used on cygwin: assembler.
-AS="$AS"
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+ ( cat <<\_ASBOX
+## ----------------------------------------- ##
+## Report this to visit-users at email.ornl.gov ##
+## ----------------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ $as_echo_n "(cached) " >&6
+else
+ eval "$as_ac_Header=\$ac_header_preproc"
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
+fi
+as_val=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ if test "x$as_val" = x""yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
+fi
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl_RC
+done
-# Object file suffix (normally "o").
-objext="$ac_objext"
-# Old archive suffix (normally "a").
-libext="$libext"
+for ac_header in sys/fcntl.h
+do
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ $as_echo_n "(cached) " >&6
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+else
+ # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
-# Shared library suffix (normally ".so").
-shrext_cmds='$shrext_cmds'
+ ac_header_compiler=no
+fi
-# Executable file suffix (normally "").
-exeext="$exeext"
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
-# Additional compiler flags for building library objects.
-pic_flag=$lt_lt_prog_compiler_pic_RC
-pic_mode=$pic_mode
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <$ac_header>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
-# What is the maximum length of a command?
-max_cmd_len=$lt_cv_sys_max_cmd_len
+ ac_header_preproc=no
+fi
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
-# Must we lock files when doing compilation?
-need_locks=$lt_need_locks
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+ ( cat <<\_ASBOX
+## ----------------------------------------- ##
+## Report this to visit-users at email.ornl.gov ##
+## ----------------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ $as_echo_n "(cached) " >&6
+else
+ eval "$as_ac_Header=\$ac_header_preproc"
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
-# Do we need the lib prefix for modules?
-need_lib_prefix=$need_lib_prefix
+fi
+as_val=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ if test "x$as_val" = x""yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
-# Do we need a version for libraries?
-need_version=$need_version
+fi
-# Whether dlopen is supported.
-dlopen_support=$enable_dlopen
+done
-# Whether dlopen of programs is supported.
-dlopen_self=$enable_dlopen_self
+if test ! "$ac_cv_header_fcntl_h"="yes" && test ! "$ac_cv_header_sys_fcntl_h"="yes" ; then
+{ { $as_echo "$as_me:$LINENO: error: $0 wasn't able to find a necessary fcntl.h or
+sys/fcntl.h header file.
+Please rectify this and rerun configure.
+See the file INSTALL_FAQ in this directory for possible reasons
+this might have happened." >&5
+$as_echo "$as_me: error: $0 wasn't able to find a necessary fcntl.h or
+sys/fcntl.h header file.
+Please rectify this and rerun configure.
+See the file INSTALL_FAQ in this directory for possible reasons
+this might have happened." >&2;}
+ { (exit 1); exit 1; }; }
+fi
-# Whether dlopen of statically linked programs is supported.
-dlopen_self_static=$enable_dlopen_self_static
-# Compiler flag to prevent dynamic linking.
-link_static_flag=$lt_lt_prog_compiler_static_RC
+for ac_header in fnmatch.h
+do
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ $as_echo_n "(cached) " >&6
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+else
+ # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_RC
+ ac_header_compiler=no
+fi
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_RC
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$lt_whole_archive_flag_spec_RC
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <$ac_header>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
-# Compiler flag to generate thread-safe objects.
-thread_safe_flag_spec=$lt_thread_safe_flag_spec_RC
+ ac_header_preproc=no
+fi
-# Library versioning type.
-version_type=$version_type
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
-# Format of library name prefix.
-libname_spec=$lt_libname_spec
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+ ( cat <<\_ASBOX
+## ----------------------------------------- ##
+## Report this to visit-users at email.ornl.gov ##
+## ----------------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ $as_echo_n "(cached) " >&6
+else
+ eval "$as_ac_Header=\$ac_header_preproc"
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
-# List of archive names. First name is the real one, the rest are links.
-# The last name is the one that the linker finds with -lNAME.
-library_names_spec=$lt_library_names_spec
+fi
+as_val=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ if test "x$as_val" = x""yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
-# The coded name of the library, if different from the real name.
-soname_spec=$lt_soname_spec
+fi
-# Commands used to build and install an old-style archive.
-RANLIB=$lt_RANLIB
-old_archive_cmds=$lt_old_archive_cmds_RC
-old_postinstall_cmds=$lt_old_postinstall_cmds
-old_postuninstall_cmds=$lt_old_postuninstall_cmds
+done
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_RC
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_RC
+for ac_header in ieeefp.h
+do
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ $as_echo_n "(cached) " >&6
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+else
+ # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
-# Commands used to build and install a shared archive.
-archive_cmds=$lt_archive_cmds_RC
-archive_expsym_cmds=$lt_archive_expsym_cmds_RC
-postinstall_cmds=$lt_postinstall_cmds
-postuninstall_cmds=$lt_postuninstall_cmds
+ ac_header_compiler=no
+fi
-# Commands used to build a loadable module (assumed same as above if empty)
-module_cmds=$lt_module_cmds_RC
-module_expsym_cmds=$lt_module_expsym_cmds_RC
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
-# Commands to strip libraries.
-old_striplib=$lt_old_striplib
-striplib=$lt_striplib
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <$ac_header>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predep_objects=$lt_predep_objects_RC
+ ac_header_preproc=no
+fi
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdep_objects=$lt_postdep_objects_RC
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predeps=$lt_predeps_RC
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+ ( cat <<\_ASBOX
+## ----------------------------------------- ##
+## Report this to visit-users at email.ornl.gov ##
+## ----------------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ $as_echo_n "(cached) " >&6
+else
+ eval "$as_ac_Header=\$ac_header_preproc"
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdeps=$lt_postdeps_RC
+fi
+as_val=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ if test "x$as_val" = x""yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path_RC
+fi
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method=$lt_deplibs_check_method
+done
-# Command to use when deplibs_check_method == file_magic.
-file_magic_cmd=$lt_file_magic_cmd
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$lt_allow_undefined_flag_RC
-# Flag that forces no undefined symbols.
-no_undefined_flag=$lt_no_undefined_flag_RC
+for ac_header in sys/types.h unistd.h
+do
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ $as_echo_n "(cached) " >&6
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+else
+ # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds=$lt_finish_cmds
+ ac_header_compiler=no
+fi
-# Same as above, but a single script fragment to be evaled but not shown.
-finish_eval=$lt_finish_eval
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
-# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <$ac_header>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
-# Transform the output of nm in a proper C declaration
-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
+ ac_header_preproc=no
+fi
-# Transform the output of nm in a C name address pair
-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
-# This is the shared library runtime path variable.
-runpath_var=$runpath_var
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+ ( cat <<\_ASBOX
+## ----------------------------------------- ##
+## Report this to visit-users at email.ornl.gov ##
+## ----------------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ $as_echo_n "(cached) " >&6
+else
+ eval "$as_ac_Header=\$ac_header_preproc"
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
-# This is the shared library path variable.
-shlibpath_var=$shlibpath_var
+fi
+as_val=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ if test "x$as_val" = x""yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
+fi
-# How to hardcode a shared library path into an executable.
-hardcode_action=$hardcode_action_RC
+done
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=$hardcode_into_libs
+{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+$as_echo_n "checking for ANSI C header files... " >&6; }
+if test "${ac_cv_header_stdc+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <float.h>
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_RC
+#ifdef FC_DUMMY_MAIN
+#ifndef FC_DUMMY_MAIN_EQ_F77
+# ifdef __cplusplus
+ extern "C"
+# endif
+ int FC_DUMMY_MAIN() { return 1; }
+#endif
+#endif
+int
+main ()
+{
-# If ld is used when linking, flag to hardcode \$libdir into
-# a binary during linking. This must work even if \$libdir does
-# not exist.
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_RC
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_header_stdc=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
-# Whether we need a single -rpath flag with a separated argument.
-hardcode_libdir_separator=$lt_hardcode_libdir_separator_RC
+ ac_cv_header_stdc=no
+fi
-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
-# resulting binary.
-hardcode_direct=$hardcode_direct_RC
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-# resulting binary.
-hardcode_minus_L=$hardcode_minus_L_RC
+if test $ac_cv_header_stdc = yes; then
+ # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <string.h>
-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-# the resulting binary.
-hardcode_shlibpath_var=$hardcode_shlibpath_var_RC
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ $EGREP "memchr" >/dev/null 2>&1; then
+ :
+else
+ ac_cv_header_stdc=no
+fi
+rm -f conftest*
-# Set to yes if building a shared library automatically hardcodes DIR into the library
-# and all subsequent libraries and executables linked against it.
-hardcode_automatic=$hardcode_automatic_RC
+fi
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at relink time.
-variables_saved_for_relink="$variables_saved_for_relink"
+if test $ac_cv_header_stdc = yes; then
+ # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <stdlib.h>
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=$link_all_deplibs_RC
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ $EGREP "free" >/dev/null 2>&1; then
+ :
+else
+ ac_cv_header_stdc=no
+fi
+rm -f conftest*
-# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+fi
-# Run-time system search path for libraries
-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+if test $ac_cv_header_stdc = yes; then
+ # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
+ if test "$cross_compiling" = yes; then
+ :
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <ctype.h>
+#include <stdlib.h>
+#if ((' ' & 0x0FF) == 0x020)
+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+#else
+# define ISLOWER(c) \
+ (('a' <= (c) && (c) <= 'i') \
+ || ('j' <= (c) && (c) <= 'r') \
+ || ('s' <= (c) && (c) <= 'z'))
+# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
+#endif
-# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path=$lt_fix_srcfile_path
+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+int
+main ()
+{
+ int i;
+ for (i = 0; i < 256; i++)
+ if (XOR (islower (i), ISLOWER (i))
+ || toupper (i) != TOUPPER (i))
+ return 2;
+ return 0;
+}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ :
+else
+ $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
-# Set to yes if exported symbols are required.
-always_export_symbols=$always_export_symbols_RC
+( exit $ac_status )
+ac_cv_header_stdc=no
+fi
+rm -rf conftest.dSYM
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
-# The commands to list exported symbols.
-export_symbols_cmds=$lt_export_symbols_cmds_RC
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=$lt_extract_expsyms_cmds
+fi
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+$as_echo "$ac_cv_header_stdc" >&6; }
+if test $ac_cv_header_stdc = yes; then
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$lt_exclude_expsyms_RC
+cat >>confdefs.h <<\_ACEOF
+#define STDC_HEADERS 1
+_ACEOF
-# Symbols that must always be exported.
-include_expsyms=$lt_include_expsyms_RC
+fi
-# ### END LIBTOOL TAG CONFIG: $tagname
-__EOF__
+if false; then
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_FCLOSE_POINTER 1
+_ACEOF
-else
- # If there is no Makefile yet, we rely on a make rule to execute
- # `config.status --recheck' to rerun these tests and create the
- # libtool script then.
- ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
- if test -f "$ltmain_in"; then
- test -f Makefile && make "$ltmain"
- fi
-fi
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_FFLUSH_POINTER 1
+_ACEOF
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-CC="$lt_save_CC"
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_FOPEN_POINTER 1
+_ACEOF
- ;;
- *)
- { { echo "$as_me:$LINENO: error: Unsupported tag name: $tagname" >&5
-echo "$as_me: error: Unsupported tag name: $tagname" >&2;}
- { (exit 1); exit 1; }; }
- ;;
- esac
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_FPRINTF_POINTER 1
+_ACEOF
- # Append the new tag name to the list of available tags.
- if test -n "$tagname" ; then
- available_tags="$available_tags $tagname"
- fi
- fi
- done
- IFS="$lt_save_ifs"
- # Now substitute the updated list of available tags.
- if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then
- mv "${ofile}T" "$ofile"
- chmod +x "$ofile"
- else
- rm -f "${ofile}T"
- { { echo "$as_me:$LINENO: error: unable to update list of available tagged configurations." >&5
-echo "$as_me: error: unable to update list of available tagged configurations." >&2;}
- { (exit 1); exit 1; }; }
- fi
-fi
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_FREAD_POINTER 1
+_ACEOF
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_FSEEK_POINTER 1
+_ACEOF
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_SETVBUF_POINTER 1
+_ACEOF
-# Prevent multiple expansion
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_FTELL_POINTER 1
+_ACEOF
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_FWRITE_POINTER 1
+_ACEOF
+fi
+for function in fclose fflush fopen fprintf fread fseek setvbuf ftell fwrite
+do
+ cap_func="`echo ${function}|tr [a-z] [A-Z]`"
+ cache_name="`echo vc_cv_${function}_pointer`"
+ have_name="`echo HAVE_${cap_func}_POINTER`"
+ { $as_echo "$as_me:$LINENO: checking for $function function pointer" >&5
+$as_echo_n "checking for $function function pointer... " >&6; }
+ if { as_var=$cache_name; eval "test \"\${$as_var+set}\" = set"; }; then
+ $as_echo_n "(cached) " >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <stdio.h>
+#ifdef FC_DUMMY_MAIN
+#ifndef FC_DUMMY_MAIN_EQ_F77
+# ifdef __cplusplus
+ extern "C"
+# endif
+ int FC_DUMMY_MAIN() { return 1; }
+#endif
+#endif
+int
+main ()
+{
+ int (*f)() = (int(*)())$function;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ eval $cache_name=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+ eval $cache_name=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+ if eval "test \"`echo '$''{'$cache_name'}'`\" = no"; then
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+ else
+cat >>confdefs.h <<_ACEOF
+#define ${have_name} 1
+_ACEOF
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+ fi
+done
-{ echo "$as_me:$LINENO: checking for library containing strerror" >&5
-echo $ECHO_N "checking for library containing strerror... $ECHO_C" >&6; }
-if test "${ac_cv_search_strerror+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+for ac_func in memmove fnmatch isnan fpclass strerror
+do
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+ $as_echo_n "(cached) " >&6
else
- ac_func_search_save_LIBS=$LIBS
-cat >conftest.$ac_ext <<_ACEOF
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define $ac_func innocuous_$ac_func
+
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $ac_func
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
@@ -20905,7 +25748,14 @@ cat >>conftest.$ac_ext <<_ACEOF
#ifdef __cplusplus
extern "C"
#endif
-char strerror ();
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined __stub_$ac_func || defined __stub___$ac_func
+choke me
+#endif
+
#ifdef FC_DUMMY_MAIN
#ifndef FC_DUMMY_MAIN_EQ_F77
# ifdef __cplusplus
@@ -20917,67 +25767,79 @@ char strerror ();
int
main ()
{
-return strerror ();
+return $ac_func ();
;
return 0;
}
_ACEOF
-for ac_lib in '' cposix; do
- if test -z "$ac_lib"; then
- ac_res="none required"
- else
- ac_res=-l$ac_lib
- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext
+rm -f conftest.$ac_objext conftest$ac_exeext
if { (ac_try="$ac_link"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- ac_cv_search_strerror=$ac_res
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+ eval "$as_ac_var=yes"
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-
+ eval "$as_ac_var=no"
fi
+rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext
- if test "${ac_cv_search_strerror+set}" = set; then
- break
-fi
-done
-if test "${ac_cv_search_strerror+set}" = set; then
- :
-else
- ac_cv_search_strerror=no
+ conftest$ac_exeext conftest.$ac_ext
fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
+ac_res=`eval 'as_val=${'$as_ac_var'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_var'}
+ $as_echo "$as_val"'`
+ if test "x$as_val" = x""yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5
-echo "${ECHO_T}$ac_cv_search_strerror" >&6; }
-ac_res=$ac_cv_search_strerror
-if test "$ac_res" != no; then
- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+done
+
+
+{ $as_echo "$as_me:$LINENO: checking if setjmp and longjmp work" >&5
+$as_echo_n "checking if setjmp and longjmp work... " >&6; }
+if test -n "$SETJMP_OVERRIDE"; then
+ { $as_echo "$as_me:$LINENO: result: no. Replacing with _setjmp and _longjmp." >&5
+$as_echo "no. Replacing with _setjmp and _longjmp." >&6; }
+
+cat >>confdefs.h <<\_ACEOF
+#define setjmp _setjmp
+_ACEOF
+
+
+cat >>confdefs.h <<\_ACEOF
+#define longjmp _longjmp
+_ACEOF
+else
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
fi
-# save the cache so far
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
# tests run on this system so they can be shared between configure
@@ -21005,11 +25867,12 @@ _ACEOF
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
- *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+ *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
esac
case $ac_var in #(
_ | IFS | as_nl) ;; #(
+ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
*) $as_unset $ac_var ;;
esac ;;
esac
@@ -21042,345 +25905,351 @@ echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
if test -w "$cache_file"; then
test "x$cache_file" != "x/dev/null" &&
- { echo "$as_me:$LINENO: updating cache $cache_file" >&5
-echo "$as_me: updating cache $cache_file" >&6;}
+ { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
+$as_echo "$as_me: updating cache $cache_file" >&6;}
cat confcache >$cache_file
else
- { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
-echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+ { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
fi
fi
rm -f confcache
-# Check whether --enable-optimization was given.
-if test "${enable_optimization+set}" = set; then
- enableval=$enable_optimization; case "${enableval}" in
- yes) USING_DEBUG="no";;
- no) USING_DEBUG="yes";;
- *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-optimization" >&5
-echo "$as_me: error: bad value ${enableval} for --enable-optimization" >&2;}
- { (exit 1); exit 1; }; } ;;
- esac
-else
- USING_DEBUG="yes"
-fi
+if test -n "$SILEX"; then
+ { $as_echo "$as_me:$LINENO: checking for X" >&5
+$as_echo_n "checking for X... " >&6; }
-SILO_DTYPPTR="void"
-SILO_DTYPPTR1="void*"
-SILO_DTYPPTR2="void*"
-# Check whether --enable-legacy-datatyped-pointers was given.
-if test "${enable_legacy_datatyped_pointers+set}" = set; then
- enableval=$enable_legacy_datatyped_pointers; if test $enableval = yes; then
- SILO_DTYPPTR="float"
- SILO_DTYPPTR1="float*"
- SILO_DTYPPTR2="float**"
- fi
+# Check whether --with-x was given.
+if test "${with_x+set}" = set; then
+ withval=$with_x;
fi
-
-
-
-
-NETCDF="netcdf"
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_NETCDF_DRIVER 1
-_ACEOF
-
-
-
-PDB_DRV="pdb_drv"
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_PDB_DRIVER 1
-_ACEOF
-
-
-
-TAURUS="taurus"
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_TAURUS_DRIVER 1
-_ACEOF
-
-
-
-HDF5_DRV="hdf5_drv"
-
-
-# Some sites have the GNU readline header files and libraries installed
-# incorrectly which causes programs that use them to not link or possibly
-# not run. This configure doesn't check for misconfigured systems, but
-# it does allow the user to prevent the GNU readline files from being
-# detected.
-
-# Check whether --with-readline was given.
-if test "${with_readline+set}" = set; then
- withval=$with_readline; detect_readline=$withval
+# $have_x is `yes', `no', `disabled', or empty when we do not yet know.
+if test "x$with_x" = xno; then
+ # The user explicitly disabled X.
+ have_x=disabled
else
- detect_readline=$default_detect_readline
-fi
-
-
-BROWSER=$DEFAULT_BROWSER
-# Check whether --enable-browser was given.
-if test "${enable_browser+set}" = set; then
- enableval=$enable_browser; if test "$enable_browser" = "no"; then
- BROWSER=""
- fi
-fi
-
-
-
-SILEX=$DEFAULT_SILEX
-# Check whether --enable-silex was given.
-if test "${enable_silex+set}" = set; then
- enableval=$enable_silex; if test "$enable_silex" = "no"; then
- SILEX=""
- fi
-fi
-
-
-
-
-# Check whether --with-zlib was given.
-if test "${with_zlib+set}" = set; then
- withval=$with_zlib;
-fi
-
-if test "$with_zlib" = no; then
- cat >>confdefs.h <<\_ACEOF
-#define HAVE_ZLIB_H 0
-_ACEOF
-
- cat >>confdefs.h <<\_ACEOF
-#define HAVE_LIBZ 0
-_ACEOF
-
- ZLIB=""
-elif test -n "$with_zlib" && test "$with_zlib" != yes; then
- ZLIB_INCDIR="`echo $with_zlib |cut -f1 -d,`"
- if test ! -f $ZLIB_INCDIR/zlib.h; then
- { { echo "$as_me:$LINENO: error: problem with directory specified for zlib includes" >&5
-echo "$as_me: error: problem with directory specified for zlib includes" >&2;}
- { (exit 1); exit 1; }; }
- fi
- ZLIB_LIBDIR="`echo $with_zlib | cut -f2 -d, -s`"
- if test ! -f $ZLIB_LIBDIR/libz.a && test ! -f $ZLIB_LIBDIR/libz.so; then
- { { echo "$as_me:$LINENO: error: problem with directory specified for zlib libs" >&5
-echo "$as_me: error: problem with directory specified for zlib libs" >&2;}
- { (exit 1); exit 1; }; }
- fi
- CPPFLAGS="$CPPFLAGS -I$ZLIB_INCDIR"
- LDFLAGS="$LDFLAGS -L$ZLIB_LIBDIR"
- LIBS="$LIBS -lz"
- cat >>confdefs.h <<\_ACEOF
-#define HAVE_ZLIB_H 1
+ case $x_includes,$x_libraries in #(
+ *\'*) { { $as_echo "$as_me:$LINENO: error: cannot use X directory names containing '" >&5
+$as_echo "$as_me: error: cannot use X directory names containing '" >&2;}
+ { (exit 1); exit 1; }; };; #(
+ *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ # One or both of the vars are not set, and there is no cached value.
+ac_x_includes=no ac_x_libraries=no
+rm -f -r conftest.dir
+if mkdir conftest.dir; then
+ cd conftest.dir
+ cat >Imakefile <<'_ACEOF'
+incroot:
+ @echo incroot='${INCROOT}'
+usrlibdir:
+ @echo usrlibdir='${USRLIBDIR}'
+libdir:
+ @echo libdir='${LIBDIR}'
+_ACEOF
+ if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then
+ # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+ for ac_var in incroot usrlibdir libdir; do
+ eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`"
+ done
+ # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
+ for ac_extension in a so sl dylib la dll; do
+ if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" &&
+ test -f "$ac_im_libdir/libX11.$ac_extension"; then
+ ac_im_usrlibdir=$ac_im_libdir; break
+ fi
+ done
+ # Screen out bogus values from the imake configuration. They are
+ # bogus both because they are the default anyway, and because
+ # using them would break gcc on systems where it needs fixed includes.
+ case $ac_im_incroot in
+ /usr/include) ac_x_includes= ;;
+ *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
+ esac
+ case $ac_im_usrlibdir in
+ /usr/lib | /usr/lib64 | /lib | /lib64) ;;
+ *) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;;
+ esac
+ fi
+ cd ..
+ rm -f -r conftest.dir
+fi
+
+# Standard set of common directories for X headers.
+# Check X11 before X11Rn because it is often a symlink to the current release.
+ac_x_header_dirs='
+/usr/X11/include
+/usr/X11R6/include
+/usr/X11R5/include
+/usr/X11R4/include
+
+/usr/include/X11
+/usr/include/X11R6
+/usr/include/X11R5
+/usr/include/X11R4
+
+/usr/local/X11/include
+/usr/local/X11R6/include
+/usr/local/X11R5/include
+/usr/local/X11R4/include
+
+/usr/local/include/X11
+/usr/local/include/X11R6
+/usr/local/include/X11R5
+/usr/local/include/X11R4
+
+/usr/X386/include
+/usr/x386/include
+/usr/XFree86/include/X11
+
+/usr/include
+/usr/local/include
+/usr/unsupported/include
+/usr/athena/include
+/usr/local/x11r5/include
+/usr/lpp/Xamples/include
+
+/usr/openwin/include
+/usr/openwin/share/include'
+
+if test "$ac_x_includes" = no; then
+ # Guess where to find include files, by looking for Xlib.h.
+ # First, try using that file with no special directory specified.
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
_ACEOF
-
- cat >>confdefs.h <<\_ACEOF
-#define HAVE_LIBZ 1
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <X11/Xlib.h>
_ACEOF
-
- ZLIB="zlib"
-fi
-
-{ echo "$as_me:$LINENO: checking for hzip" >&5
-echo $ECHO_N "checking for hzip... $ECHO_C" >&6; }
-if test -d $srcdir/src/hzip; then
- { echo "$as_me:$LINENO: result: found" >&5
-echo "${ECHO_T}found" >&6; }
- HZIP=$DEFAULT_HZIP
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ # We can compile using X headers with no special include directory.
+ac_x_includes=
else
- { echo "$as_me:$LINENO: result: hzip compression not available in BSD version" >&5
-echo "${ECHO_T}hzip compression not available in BSD version" >&6; }
- HZIP=""
-fi
-# Check whether --enable-hzip was given.
-if test "${enable_hzip+set}" = set; then
- enableval=$enable_hzip; if test "$enable_hzip" = "no"; then
- HZIP=""
- fi
-fi
-
-
-
-if test -n "$HZIP" && test "$with_zlib" != no; then
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_HZIP 1
-_ACEOF
+ for ac_dir in $ac_x_header_dirs; do
+ if test -r "$ac_dir/X11/Xlib.h"; then
+ ac_x_includes=$ac_dir
+ break
+ fi
+done
+fi
- ZLIB="zlib"
+rm -f conftest.err conftest.$ac_ext
+fi # $ac_x_includes = no
-for ac_header in zlib.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-else
- # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
+if test "$ac_x_libraries" = no; then
+ # Check for the libraries.
+ # See if we find them without any special options.
+ # Don't add to $LIBS permanently.
+ ac_save_LIBS=$LIBS
+ LIBS="-lX11 $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-$ac_includes_default
-#include <$ac_header>
+#include <X11/Xlib.h>
+#ifdef FC_DUMMY_MAIN
+#ifndef FC_DUMMY_MAIN_EQ_F77
+# ifdef __cplusplus
+ extern "C"
+# endif
+ int FC_DUMMY_MAIN() { return 1; }
+#endif
+#endif
+int
+main ()
+{
+XrmInitialize ()
+ ;
+ return 0;
+}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+ LIBS=$ac_save_LIBS
+# We can link X programs with no special library path.
+ac_x_libraries=
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- ac_header_compiler=no
+ LIBS=$ac_save_LIBS
+for ac_dir in `$as_echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
+do
+ # Don't even attempt the hair of trying to link an X program!
+ for ac_extension in a so sl dylib la dll; do
+ if test -r "$ac_dir/libX11.$ac_extension"; then
+ ac_x_libraries=$ac_dir
+ break 2
+ fi
+ done
+done
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+fi # $ac_x_libraries = no
+
+case $ac_x_includes,$ac_x_libraries in #(
+ no,* | *,no | *\'*)
+ # Didn't find X, or a directory has "'" in its name.
+ ac_cv_have_x="have_x=no";; #(
+ *)
+ # Record where we found X for the cache.
+ ac_cv_have_x="have_x=yes\
+ ac_x_includes='$ac_x_includes'\
+ ac_x_libraries='$ac_x_libraries'"
+esac
+fi
+;; #(
+ *) have_x=yes;;
+ esac
+ eval "$ac_cv_have_x"
+fi # $with_x != no
+
+if test "$have_x" != yes; then
+ { $as_echo "$as_me:$LINENO: result: $have_x" >&5
+$as_echo "$have_x" >&6; }
+ no_x=yes
+else
+ # If each of the values was on the command line, it overrides each guess.
+ test "x$x_includes" = xNONE && x_includes=$ac_x_includes
+ test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries
+ # Update the cache value to reflect the command line values.
+ ac_cv_have_x="have_x=yes\
+ ac_x_includes='$x_includes'\
+ ac_x_libraries='$x_libraries'"
+ { $as_echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5
+$as_echo "libraries $x_libraries, headers $x_includes" >&6; }
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+if test "$no_x" = yes; then
+ # Not all programs may use this symbol, but it does not hurt to define it.
-# Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
+cat >>confdefs.h <<\_ACEOF
+#define X_DISPLAY_MISSING 1
+_ACEOF
+
+ X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS=
+else
+ if test -n "$x_includes"; then
+ X_CFLAGS="$X_CFLAGS -I$x_includes"
+ fi
+
+ # It would also be nice to do this for all -L options, not just this one.
+ if test -n "$x_libraries"; then
+ X_LIBS="$X_LIBS -L$x_libraries"
+ # For Solaris; some versions of Sun CC require a space after -R and
+ # others require no space. Words are not sufficient . . . .
+ { $as_echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5
+$as_echo_n "checking whether -R must be followed by a space... " >&6; }
+ ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
+ ac_xsave_c_werror_flag=$ac_c_werror_flag
+ ac_c_werror_flag=yes
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <$ac_header>
+
+#ifdef FC_DUMMY_MAIN
+#ifndef FC_DUMMY_MAIN_EQ_F77
+# ifdef __cplusplus
+ extern "C"
+# endif
+ int FC_DUMMY_MAIN() { return 1; }
+#endif
+#endif
+int
+main ()
+{
+
+ ;
+ return 0;
+}
_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
}; then
- ac_header_preproc=yes
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+ X_LIBS="$X_LIBS -R$x_libraries"
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
- ( cat <<\_ASBOX
-## ----------------------------------------- ##
-## Report this to visit-users at email.ornl.gov ##
-## ----------------------------------------- ##
-_ASBOX
- ) | sed "s/^/$as_me: WARNING: /" >&2
- ;;
-esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
- have_zlib_h="yes"
-fi
-
-done
-
- if test -n "$have_zlib_h"; then
-
-{ echo "$as_me:$LINENO: checking for inflateEnd in -lz" >&5
-echo $ECHO_N "checking for inflateEnd in -lz... $ECHO_C" >&6; }
-if test "${ac_cv_lib_z_inflateEnd+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lz $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
+ LIBS="$ac_xsave_LIBS -R $x_libraries"
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char inflateEnd ();
#ifdef FC_DUMMY_MAIN
#ifndef FC_DUMMY_MAIN_EQ_F77
# ifdef __cplusplus
@@ -21392,7 +26261,7 @@ char inflateEnd ();
int
main ()
{
-return inflateEnd ();
+
;
return 0;
}
@@ -21403,99 +26272,55 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- ac_cv_lib_z_inflateEnd=yes
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+ X_LIBS="$X_LIBS -R $x_libraries"
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- ac_cv_lib_z_inflateEnd=no
+ { $as_echo "$as_me:$LINENO: result: neither works" >&5
+$as_echo "neither works" >&6; }
fi
+rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_z_inflateEnd" >&5
-echo "${ECHO_T}$ac_cv_lib_z_inflateEnd" >&6; }
-if test $ac_cv_lib_z_inflateEnd = yes; then
- cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBZ 1
-_ACEOF
-
- LIBS="-lz $LIBS"
-
-fi
-
- if test -z "`echo $LIBS | tr ' ' '\n' | grep -x -e '-lz'`"; then
- cat >>confdefs.h <<\_ACEOF
-#define HAVE_ZLIB_H 0
-_ACEOF
-
- cat >>confdefs.h <<\_ACEOF
-#define HAVE_LIBZ 0
-_ACEOF
-
- ZLIB=""
- fi
- fi
-
-fi
-
-{ echo "$as_me:$LINENO: checking for fpzip" >&5
-echo $ECHO_N "checking for fpzip... $ECHO_C" >&6; }
-if test -d $srcdir/src/fpzip; then
- { echo "$as_me:$LINENO: result: found" >&5
-echo "${ECHO_T}found" >&6; }
- FPZIP=$DEFAULT_FPZIP
-else
- { echo "$as_me:$LINENO: result: fpzip compression not available in BSD version" >&5
-echo "${ECHO_T}fpzip compression not available in BSD version" >&6; }
- FPZIP=""
-fi
-# Check whether --enable-fpzip was given.
-if test "${enable_fpzip+set}" = set; then
- enableval=$enable_fpzip; if test "$enable_fpzip" = "no"; then
- FPZIP=""
- fi
fi
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ ac_c_werror_flag=$ac_xsave_c_werror_flag
+ LIBS=$ac_xsave_LIBS
+ fi
-if test -n "$FPZIP"; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_FPZIP 1
-_ACEOF
-
-fi
-
-# Turn on C optimization flags
-{ echo "$as_me:$LINENO: checking compiler optimization" >&5
-echo $ECHO_N "checking compiler optimization... $ECHO_C" >&6; }
-if test "X$USING_DEBUG" = Xno; then
-# use contributed GNU m4 macro library provided see:
-# autoconf-archive-2006-06-04/htmldoc/ax_cc_maxopt.html
+ # Check for system-dependent libraries X programs must link with.
+ # Do this before checking for the system-independent R6 libraries
+ # (-lICE), since we may need -lsocket or whatever for X linking.
-{ echo "$as_me:$LINENO: checking for C compiler vendor" >&5
-echo $ECHO_N "checking for C compiler vendor... $ECHO_C" >&6; }
-if test "${ax_cv_c_compiler_vendor+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ax_cv_c_compiler_vendor=unknown
- # note: don't check for gcc first since some other compilers define __GNUC__
- for ventest in intel:__ICC,__ECC,__INTEL_COMPILER ibm:__xlc__,__xlC__,__IBMC__,__IBMCPP__ pathscale:__PATHCC__,__PATHSCALE__ gnu:__GNUC__ sun:__SUNPRO_C,__SUNPRO_CC hp:__HP_cc,__HP_aCC dec:__DECC,__DECCXX,__DECC_VER,__DECCXX_VER borland:__BORLANDC__,__TURBOC__ comeau:__COMO__ cray:_CRAYC kai:__KCC lcc:__LCC__ metrowerks:__MWERKS__ sgi:__sgi,sgi microsoft:_MSC_VER watcom:__WATCOMC__ portland:__PGI; do
- vencpp="defined("`echo $ventest | cut -d: -f2 | sed 's/,/) || defined(/g'`")"
+ if test "$ISC" = yes; then
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl_s -linet"
+ else
+ # Martyn Johnson says this is needed for Ultrix, if the X
+ # libraries were built with DECnet support. And Karl Berry says
+ # the Alpha needs dnet_stub (dnet does not exist).
+ ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -21503,6 +26328,13 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char XOpenDisplay ();
#ifdef FC_DUMMY_MAIN
#ifndef FC_DUMMY_MAIN_EQ_F77
# ifdef __cplusplus
@@ -21514,95 +26346,58 @@ cat >>conftest.$ac_ext <<_ACEOF
int
main ()
{
-
-#if !($vencpp)
- thisisanerror;
-#endif
-
+return XOpenDisplay ();
;
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ax_cv_c_compiler_vendor=`echo $ventest | cut -d: -f1`; break
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+ :
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
-
-fi
-{ echo "$as_me:$LINENO: result: $ax_cv_c_compiler_vendor" >&5
-echo "${ECHO_T}$ax_cv_c_compiler_vendor" >&6; }
-
-
-
-
-
-
-# Check whether --enable-portable-binary was given.
-if test "${enable_portable_binary+set}" = set; then
- enableval=$enable_portable_binary; acx_maxopt_portable=$withval
+ { $as_echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5
+$as_echo_n "checking for dnet_ntoa in -ldnet... " >&6; }
+if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
+ $as_echo_n "(cached) " >&6
else
- acx_maxopt_portable=no
-fi
-
-
-# Try to determine "good" native compiler flags if none specified via CFLAGS
-if test "$ac_test_CFLAGS" != "set"; then
- CFLAGS=""
- case $ax_cv_c_compiler_vendor in
- dec) CFLAGS="-newc -w0 -O5 -ansi_alias -ansi_args -fp_reorder -tune host"
- if test "x$acx_maxopt_portable" = xno; then
- CFLAGS="$CFLAGS -arch host"
- fi;;
-
- sun) CFLAGS="-native -fast -xO5 -dalign"
- if test "x$acx_maxopt_portable" = xyes; then
- CFLAGS="$CFLAGS -xarch=generic"
- fi;;
-
- hp) CFLAGS="+Oall +Optrs_ansi +DSnative"
- if test "x$acx_maxopt_portable" = xyes; then
- CFLAGS="$CFLAGS +DAportable"
- fi;;
-
- ibm) if test "x$acx_maxopt_portable" = xno; then
- xlc_opt="-qarch=auto -qtune=auto"
- else
- xlc_opt="-qtune=auto"
- fi
- { echo "$as_me:$LINENO: checking whether C compiler accepts $xlc_opt" >&5
-echo $ECHO_N "checking whether C compiler accepts $xlc_opt... $ECHO_C" >&6; }
-ax_save_FLAGS=$CFLAGS
- CFLAGS="$xlc_opt"
- cat >conftest.$ac_ext <<_ACEOF
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldnet $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dnet_ntoa ();
#ifdef FC_DUMMY_MAIN
#ifndef FC_DUMMY_MAIN_EQ_F77
# ifdef __cplusplus
@@ -21614,88 +26409,73 @@ cat >>conftest.$ac_ext <<_ACEOF
int
main ()
{
-
+return dnet_ntoa ();
;
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- eval `echo "ax_cv_c_flags_$xlc_opt" | $as_tr_sh`=yes
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+ ac_cv_lib_dnet_dnet_ntoa=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- eval `echo "ax_cv_c_flags_$xlc_opt" | $as_tr_sh`=no
+ ac_cv_lib_dnet_dnet_ntoa=no
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- CFLAGS=$ax_save_FLAGS
-eval ax_check_compiler_flags=$`echo "ax_cv_c_flags_$xlc_opt" | $as_tr_sh`
-{ echo "$as_me:$LINENO: result: $ax_check_compiler_flags" >&5
-echo "${ECHO_T}$ax_check_compiler_flags" >&6; }
-if test "x$ax_check_compiler_flags" = xyes; then
- CFLAGS="-O3 -qansialias -w $xlc_opt"
-else
- CFLAGS="-O3 -qansialias -w"
- echo "******************************************************"
- echo "* You seem to have the IBM C compiler. It is *"
- echo "* recommended for best performance that you use: *"
- echo "* *"
- echo "* CFLAGS=-O3 -qarch=xxx -qtune=xxx -qansialias -w *"
- echo "* ^^^ ^^^ *"
- echo "* where xxx is pwr2, pwr3, 604, or whatever kind of *"
- echo "* CPU you have. (Set the CFLAGS environment var. *"
- echo "* and re-run configure.) For more info, man cc. *"
- echo "******************************************************"
-fi
-
- ;;
-
- intel) CFLAGS="-O3 -ansi_alias"
- if test "x$acx_maxopt_portable" = xno; then
- icc_archflag=unknown
- icc_flags=""
- case $host_cpu in
- i686*|x86_64*)
- # icc accepts gcc assembly syntax, so these should work:
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+$as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; }
+if test "x$ac_cv_lib_dnet_dnet_ntoa" = x""yes; then
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
+fi
-{ echo "$as_me:$LINENO: checking for x86 cpuid 0 output" >&5
-echo $ECHO_N "checking for x86 cpuid 0 output... $ECHO_C" >&6; }
-if test "${ax_cv_gcc_x86_cpuid_0+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ if test $ac_cv_lib_dnet_dnet_ntoa = no; then
+ { $as_echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5
+$as_echo_n "checking for dnet_ntoa in -ldnet_stub... " >&6; }
+if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
+ $as_echo_n "(cached) " >&6
else
- if test "$cross_compiling" = yes; then
- ax_cv_gcc_x86_cpuid_0=unknown
-else
- cat >conftest.$ac_ext <<_ACEOF
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldnet_stub $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <stdio.h>
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dnet_ntoa ();
#ifdef FC_DUMMY_MAIN
#ifndef FC_DUMMY_MAIN_EQ_F77
# ifdef __cplusplus
@@ -21707,78 +26487,71 @@ cat >>conftest.$ac_ext <<_ACEOF
int
main ()
{
-
- int op = 0, eax, ebx, ecx, edx;
- FILE *f;
- __asm__("cpuid"
- : "=a" (eax), "=b" (ebx), "=c" (ecx), "=d" (edx)
- : "a" (op));
- f = fopen("conftest_cpuid", "w"); if (!f) return 1;
- fprintf(f, "%x:%x:%x:%x\n", eax, ebx, ecx, edx);
- fclose(f);
- return 0;
-
+return dnet_ntoa ();
;
return 0;
}
_ACEOF
-rm -f conftest$ac_exeext
+rm -f conftest.$ac_objext conftest$ac_exeext
if { (ac_try="$ac_link"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ax_cv_gcc_x86_cpuid_0=`cat conftest_cpuid`; rm -f conftest_cpuid
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+ ac_cv_lib_dnet_stub_dnet_ntoa=yes
else
- echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-( exit $ac_status )
-ax_cv_gcc_x86_cpuid_0=unknown; rm -f conftest_cpuid
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-
-
+ ac_cv_lib_dnet_stub_dnet_ntoa=no
fi
-{ echo "$as_me:$LINENO: result: $ax_cv_gcc_x86_cpuid_0" >&5
-echo "${ECHO_T}$ax_cv_gcc_x86_cpuid_0" >&6; }
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+$as_echo "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; }
+if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = x""yes; then
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
+fi
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ fi
+fi
-{ echo "$as_me:$LINENO: checking for x86 cpuid 1 output" >&5
-echo $ECHO_N "checking for x86 cpuid 1 output... $ECHO_C" >&6; }
-if test "${ax_cv_gcc_x86_cpuid_1+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test "$cross_compiling" = yes; then
- ax_cv_gcc_x86_cpuid_1=unknown
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS="$ac_xsave_LIBS"
+
+ # msh at cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT,
+ # to get the SysV transport functions.
+ # Chad R. Larson says the Pyramis MIS-ES running DC/OSx (SVR4)
+ # needs -lnsl.
+ # The nsl library prevents programs from opening the X display
+ # on Irix 5.2, according to T.E. Dickey.
+ # The functions gethostbyname, getservbyname, and inet_addr are
+ # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
+ { $as_echo "$as_me:$LINENO: checking for gethostbyname" >&5
+$as_echo_n "checking for gethostbyname... " >&6; }
+if test "${ac_cv_func_gethostbyname+set}" = set; then
+ $as_echo_n "(cached) " >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -21786,7 +26559,37 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <stdio.h>
+/* Define gethostbyname to an innocuous variant, in case <limits.h> declares gethostbyname.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define gethostbyname innocuous_gethostbyname
+
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char gethostbyname (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef gethostbyname
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char gethostbyname ();
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined __stub_gethostbyname || defined __stub___gethostbyname
+choke me
+#endif
+
#ifdef FC_DUMMY_MAIN
#ifndef FC_DUMMY_MAIN_EQ_F77
# ifdef __cplusplus
@@ -21798,86 +26601,69 @@ cat >>conftest.$ac_ext <<_ACEOF
int
main ()
{
-
- int op = 1, eax, ebx, ecx, edx;
- FILE *f;
- __asm__("cpuid"
- : "=a" (eax), "=b" (ebx), "=c" (ecx), "=d" (edx)
- : "a" (op));
- f = fopen("conftest_cpuid", "w"); if (!f) return 1;
- fprintf(f, "%x:%x:%x:%x\n", eax, ebx, ecx, edx);
- fclose(f);
- return 0;
-
+return gethostbyname ();
;
return 0;
}
_ACEOF
-rm -f conftest$ac_exeext
+rm -f conftest.$ac_objext conftest$ac_exeext
if { (ac_try="$ac_link"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ax_cv_gcc_x86_cpuid_1=`cat conftest_cpuid`; rm -f conftest_cpuid
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+ ac_cv_func_gethostbyname=yes
else
- echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-( exit $ac_status )
-ax_cv_gcc_x86_cpuid_1=unknown; rm -f conftest_cpuid
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ ac_cv_func_gethostbyname=no
fi
-
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
fi
-{ echo "$as_me:$LINENO: result: $ax_cv_gcc_x86_cpuid_1" >&5
-echo "${ECHO_T}$ax_cv_gcc_x86_cpuid_1" >&6; }
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5
+$as_echo "$ac_cv_func_gethostbyname" >&6; }
-
- case $ax_cv_gcc_x86_cpuid_0 in # see AX_GCC_ARCHFLAG
- *:756e6547:*:*) # Intel
- case $ax_cv_gcc_x86_cpuid_1 in
- *6a?:*[234]:*:*|*6[789b]?:*:*:*) icc_flags="-xK";;
- *f3[347]:*:*:*|*f41347:*:*:*) icc_flags="-xP -xN -xW -xK";;
- *f??:*:*:*) icc_flags="-xN -xW -xK";;
- esac ;;
- esac ;;
- esac
- if test "x$icc_flags" != x; then
- for flag in $icc_flags; do
- { echo "$as_me:$LINENO: checking whether C compiler accepts $flag" >&5
-echo $ECHO_N "checking whether C compiler accepts $flag... $ECHO_C" >&6; }
-ax_save_FLAGS=$CFLAGS
- CFLAGS="$flag"
- cat >conftest.$ac_ext <<_ACEOF
+ if test $ac_cv_func_gethostbyname = no; then
+ { $as_echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5
+$as_echo_n "checking for gethostbyname in -lnsl... " >&6; }
+if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lnsl $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char gethostbyname ();
#ifdef FC_DUMMY_MAIN
#ifndef FC_DUMMY_MAIN_EQ_F77
# ifdef __cplusplus
@@ -21889,79 +26675,73 @@ cat >>conftest.$ac_ext <<_ACEOF
int
main ()
{
-
+return gethostbyname ();
;
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- eval `echo "ax_cv_c_flags_$flag" | $as_tr_sh`=yes
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+ ac_cv_lib_nsl_gethostbyname=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- eval `echo "ax_cv_c_flags_$flag" | $as_tr_sh`=no
+ ac_cv_lib_nsl_gethostbyname=no
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- CFLAGS=$ax_save_FLAGS
-eval ax_check_compiler_flags=$`echo "ax_cv_c_flags_$flag" | $as_tr_sh`
-{ echo "$as_me:$LINENO: result: $ax_check_compiler_flags" >&5
-echo "${ECHO_T}$ax_check_compiler_flags" >&6; }
-if test "x$ax_check_compiler_flags" = xyes; then
- icc_archflag=$flag; break
-else
- :
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
+$as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
+if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
fi
- done
- fi
- { echo "$as_me:$LINENO: checking for icc architecture flag" >&5
-echo $ECHO_N "checking for icc architecture flag... $ECHO_C" >&6; }
- { echo "$as_me:$LINENO: result: $icc_archflag" >&5
-echo "${ECHO_T}$icc_archflag" >&6; }
- if test "x$icc_archflag" != xunknown; then
- CFLAGS="$CFLAGS $icc_archflag"
- fi
- fi
- ;;
-
- gnu)
- # default optimization flags for gcc on all systems
- CFLAGS="-O3 -fomit-frame-pointer"
-
- # -malign-double for x86 systems
- { echo "$as_me:$LINENO: checking whether C compiler accepts -malign-double" >&5
-echo $ECHO_N "checking whether C compiler accepts -malign-double... $ECHO_C" >&6; }
-if test "${ax_cv_c_flags__malign_double+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ if test $ac_cv_lib_nsl_gethostbyname = no; then
+ { $as_echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5
+$as_echo_n "checking for gethostbyname in -lbsd... " >&6; }
+if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
+ $as_echo_n "(cached) " >&6
else
-
- ax_save_FLAGS=$CFLAGS
- CFLAGS="-malign-double"
- cat >conftest.$ac_ext <<_ACEOF
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lbsd $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char gethostbyname ();
#ifdef FC_DUMMY_MAIN
#ifndef FC_DUMMY_MAIN_EQ_F77
# ifdef __cplusplus
@@ -21973,65 +26753,102 @@ cat >>conftest.$ac_ext <<_ACEOF
int
main ()
{
-
+return gethostbyname ();
;
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ax_cv_c_flags__malign_double=yes
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+ ac_cv_lib_bsd_gethostbyname=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- ax_cv_c_flags__malign_double=no
+ ac_cv_lib_bsd_gethostbyname=no
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- CFLAGS=$ax_save_FLAGS
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
fi
-
-eval ax_check_compiler_flags=$ax_cv_c_flags__malign_double
-{ echo "$as_me:$LINENO: result: $ax_check_compiler_flags" >&5
-echo "${ECHO_T}$ax_check_compiler_flags" >&6; }
-if test "x$ax_check_compiler_flags" = xyes; then
- CFLAGS="$CFLAGS -malign-double"
-else
- :
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5
+$as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; }
+if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
fi
+ fi
+ fi
- # -fstrict-aliasing for gcc-2.95+
- { echo "$as_me:$LINENO: checking whether C compiler accepts -fstrict-aliasing" >&5
-echo $ECHO_N "checking whether C compiler accepts -fstrict-aliasing... $ECHO_C" >&6; }
-if test "${ax_cv_c_flags__fstrict_aliasing+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ # lieder at skyler.mavd.honeywell.com says without -lsocket,
+ # socket/setsockopt and other routines are undefined under SCO ODT
+ # 2.0. But -lsocket is broken on IRIX 5.2 (and is not necessary
+ # on later versions), says Simon Leinen: it contains gethostby*
+ # variants that don't use the name server (or something). -lsocket
+ # must be given before -lnsl if both are needed. We assume that
+ # if connect needs -lnsl, so does gethostbyname.
+ { $as_echo "$as_me:$LINENO: checking for connect" >&5
+$as_echo_n "checking for connect... " >&6; }
+if test "${ac_cv_func_connect+set}" = set; then
+ $as_echo_n "(cached) " >&6
else
-
- ax_save_FLAGS=$CFLAGS
- CFLAGS="-fstrict-aliasing"
- cat >conftest.$ac_ext <<_ACEOF
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
+/* Define connect to an innocuous variant, in case <limits.h> declares connect.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define connect innocuous_connect
+
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char connect (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef connect
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char connect ();
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined __stub_connect || defined __stub___connect
+choke me
+#endif
#ifdef FC_DUMMY_MAIN
#ifndef FC_DUMMY_MAIN_EQ_F77
@@ -22044,66 +26861,69 @@ cat >>conftest.$ac_ext <<_ACEOF
int
main ()
{
-
+return connect ();
;
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ax_cv_c_flags__fstrict_aliasing=yes
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+ ac_cv_func_connect=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- ax_cv_c_flags__fstrict_aliasing=no
+ ac_cv_func_connect=no
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- CFLAGS=$ax_save_FLAGS
-fi
-
-eval ax_check_compiler_flags=$ax_cv_c_flags__fstrict_aliasing
-{ echo "$as_me:$LINENO: result: $ax_check_compiler_flags" >&5
-echo "${ECHO_T}$ax_check_compiler_flags" >&6; }
-if test "x$ax_check_compiler_flags" = xyes; then
- CFLAGS="$CFLAGS -fstrict-aliasing"
-else
- :
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
+$as_echo "$ac_cv_func_connect" >&6; }
-
- # note that we enable "unsafe" fp optimization with other compilers, too
- { echo "$as_me:$LINENO: checking whether C compiler accepts -ffast-math" >&5
-echo $ECHO_N "checking whether C compiler accepts -ffast-math... $ECHO_C" >&6; }
-if test "${ax_cv_c_flags__ffast_math+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ if test $ac_cv_func_connect = no; then
+ { $as_echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
+$as_echo_n "checking for connect in -lsocket... " >&6; }
+if test "${ac_cv_lib_socket_connect+set}" = set; then
+ $as_echo_n "(cached) " >&6
else
-
- ax_save_FLAGS=$CFLAGS
- CFLAGS="-ffast-math"
- cat >conftest.$ac_ext <<_ACEOF
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char connect ();
#ifdef FC_DUMMY_MAIN
#ifndef FC_DUMMY_MAIN_EQ_F77
# ifdef __cplusplus
@@ -22115,101 +26935,96 @@ cat >>conftest.$ac_ext <<_ACEOF
int
main ()
{
-
+return connect ();
;
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ax_cv_c_flags__ffast_math=yes
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+ ac_cv_lib_socket_connect=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- ax_cv_c_flags__ffast_math=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- CFLAGS=$ax_save_FLAGS
+ ac_cv_lib_socket_connect=no
fi
-eval ax_check_compiler_flags=$ax_cv_c_flags__ffast_math
-{ echo "$as_me:$LINENO: result: $ax_check_compiler_flags" >&5
-echo "${ECHO_T}$ax_check_compiler_flags" >&6; }
-if test "x$ax_check_compiler_flags" = xyes; then
- CFLAGS="$CFLAGS -ffast-math"
-else
- :
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
fi
-
-
-
-
-
-
-# Check whether --with-gcc-arch was given.
-if test "${with_gcc_arch+set}" = set; then
- withval=$with_gcc_arch; ax_gcc_arch=$withval
-else
- ax_gcc_arch=yes
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
+$as_echo "$ac_cv_lib_socket_connect" >&6; }
+if test "x$ac_cv_lib_socket_connect" = x""yes; then
+ X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
fi
+ fi
-{ echo "$as_me:$LINENO: checking for gcc architecture flag" >&5
-echo $ECHO_N "checking for gcc architecture flag... $ECHO_C" >&6; }
-{ echo "$as_me:$LINENO: result: " >&5
-echo "${ECHO_T}" >&6; }
-if test "${ax_cv_gcc_archflag+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ # Guillermo Gomez says -lposix is necessary on A/UX.
+ { $as_echo "$as_me:$LINENO: checking for remove" >&5
+$as_echo_n "checking for remove... " >&6; }
+if test "${ac_cv_func_remove+set}" = set; then
+ $as_echo_n "(cached) " >&6
else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+/* Define remove to an innocuous variant, in case <limits.h> declares remove.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define remove innocuous_remove
-ax_cv_gcc_archflag="unknown"
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char remove (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
-if test "$GCC" = yes; then
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
-if test "x$ax_gcc_arch" = xyes; then
-ax_gcc_arch=""
-if test "$cross_compiling" = no; then
-case $host_cpu in
- i[3456]86*|x86_64*) # use cpuid codes, in part from x86info-1.7 by D. Jones
+#undef remove
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char remove ();
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined __stub_remove || defined __stub___remove
+choke me
+#endif
-{ echo "$as_me:$LINENO: checking for x86 cpuid 0 output" >&5
-echo $ECHO_N "checking for x86 cpuid 0 output... $ECHO_C" >&6; }
-if test "${ax_cv_gcc_x86_cpuid_0+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test "$cross_compiling" = yes; then
- ax_cv_gcc_x86_cpuid_0=unknown
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <stdio.h>
#ifdef FC_DUMMY_MAIN
#ifndef FC_DUMMY_MAIN_EQ_F77
# ifdef __cplusplus
@@ -22221,86 +27036,69 @@ cat >>conftest.$ac_ext <<_ACEOF
int
main ()
{
-
- int op = 0, eax, ebx, ecx, edx;
- FILE *f;
- __asm__("cpuid"
- : "=a" (eax), "=b" (ebx), "=c" (ecx), "=d" (edx)
- : "a" (op));
- f = fopen("conftest_cpuid", "w"); if (!f) return 1;
- fprintf(f, "%x:%x:%x:%x\n", eax, ebx, ecx, edx);
- fclose(f);
- return 0;
-
+return remove ();
;
return 0;
}
_ACEOF
-rm -f conftest$ac_exeext
+rm -f conftest.$ac_objext conftest$ac_exeext
if { (ac_try="$ac_link"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ax_cv_gcc_x86_cpuid_0=`cat conftest_cpuid`; rm -f conftest_cpuid
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+ ac_cv_func_remove=yes
else
- echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-( exit $ac_status )
-ax_cv_gcc_x86_cpuid_0=unknown; rm -f conftest_cpuid
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ ac_cv_func_remove=no
fi
-
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
fi
-{ echo "$as_me:$LINENO: result: $ax_cv_gcc_x86_cpuid_0" >&5
-echo "${ECHO_T}$ax_cv_gcc_x86_cpuid_0" >&6; }
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
+$as_echo "$ac_cv_func_remove" >&6; }
-{ echo "$as_me:$LINENO: checking for x86 cpuid 1 output" >&5
-echo $ECHO_N "checking for x86 cpuid 1 output... $ECHO_C" >&6; }
-if test "${ax_cv_gcc_x86_cpuid_1+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test "$cross_compiling" = yes; then
- ax_cv_gcc_x86_cpuid_1=unknown
+ if test $ac_cv_func_remove = no; then
+ { $as_echo "$as_me:$LINENO: checking for remove in -lposix" >&5
+$as_echo_n "checking for remove in -lposix... " >&6; }
+if test "${ac_cv_lib_posix_remove+set}" = set; then
+ $as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lposix $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <stdio.h>
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char remove ();
#ifdef FC_DUMMY_MAIN
#ifndef FC_DUMMY_MAIN_EQ_F77
# ifdef __cplusplus
@@ -22312,106 +27110,58 @@ cat >>conftest.$ac_ext <<_ACEOF
int
main ()
{
-
- int op = 1, eax, ebx, ecx, edx;
- FILE *f;
- __asm__("cpuid"
- : "=a" (eax), "=b" (ebx), "=c" (ecx), "=d" (edx)
- : "a" (op));
- f = fopen("conftest_cpuid", "w"); if (!f) return 1;
- fprintf(f, "%x:%x:%x:%x\n", eax, ebx, ecx, edx);
- fclose(f);
- return 0;
-
+return remove ();
;
return 0;
}
_ACEOF
-rm -f conftest$ac_exeext
+rm -f conftest.$ac_objext conftest$ac_exeext
if { (ac_try="$ac_link"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ax_cv_gcc_x86_cpuid_1=`cat conftest_cpuid`; rm -f conftest_cpuid
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+ ac_cv_lib_posix_remove=yes
else
- echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-( exit $ac_status )
-ax_cv_gcc_x86_cpuid_1=unknown; rm -f conftest_cpuid
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ ac_cv_lib_posix_remove=no
fi
-
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5
+$as_echo "$ac_cv_lib_posix_remove" >&6; }
+if test "x$ac_cv_lib_posix_remove" = x""yes; then
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
fi
-{ echo "$as_me:$LINENO: result: $ax_cv_gcc_x86_cpuid_1" >&5
-echo "${ECHO_T}$ax_cv_gcc_x86_cpuid_1" >&6; }
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
- case $ax_cv_gcc_x86_cpuid_0 in
- *:756e6547:*:*) # Intel
- case $ax_cv_gcc_x86_cpuid_1 in
- *5[48]?:*:*:*) ax_gcc_arch="pentium-mmx pentium" ;;
- *5??:*:*:*) ax_gcc_arch=pentium ;;
- *6[3456]?:*:*:*) ax_gcc_arch="pentium2 pentiumpro" ;;
- *6a?:*[01]:*:*) ax_gcc_arch="pentium2 pentiumpro" ;;
- *6a?:*[234]:*:*) ax_gcc_arch="pentium3 pentiumpro" ;;
- *6[9d]?:*:*:*) ax_gcc_arch="pentium-m pentium3 pentiumpro" ;;
- *6[78b]?:*:*:*) ax_gcc_arch="pentium3 pentiumpro" ;;
- *6??:*:*:*) ax_gcc_arch=pentiumpro ;;
- *f3[347]:*:*:*|*f41347:*:*:*)
- case $host_cpu in
- x86_64*) ax_gcc_arch="nocona pentium4 pentiumpro" ;;
- *) ax_gcc_arch="prescott pentium4 pentiumpro" ;;
- esac ;;
- *f??:*:*:*) ax_gcc_arch="pentium4 pentiumpro";;
- esac ;;
- *:68747541:*:*) # AMD
- case $ax_cv_gcc_x86_cpuid_1 in
- *5[67]?:*:*:*) ax_gcc_arch=k6 ;;
- *5[8d]?:*:*:*) ax_gcc_arch="k6-2 k6" ;;
- *5[9]?:*:*:*) ax_gcc_arch="k6-3 k6" ;;
- *60?:*:*:*) ax_gcc_arch=k7 ;;
- *6[12]?:*:*:*) ax_gcc_arch="athlon k7" ;;
- *6[34]?:*:*:*) ax_gcc_arch="athlon-tbird k7" ;;
- *67?:*:*:*) ax_gcc_arch="athlon-4 athlon k7" ;;
- *6[68a]?:*:*:*)
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ fi
-{ echo "$as_me:$LINENO: checking for x86 cpuid 0x80000006 output" >&5
-echo $ECHO_N "checking for x86 cpuid 0x80000006 output... $ECHO_C" >&6; }
-if test "${ax_cv_gcc_x86_cpuid_0x80000006+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test "$cross_compiling" = yes; then
- ax_cv_gcc_x86_cpuid_0x80000006=unknown
+ # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
+ { $as_echo "$as_me:$LINENO: checking for shmat" >&5
+$as_echo_n "checking for shmat... " >&6; }
+if test "${ac_cv_func_shmat+set}" = set; then
+ $as_echo_n "(cached) " >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -22419,7 +27169,37 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <stdio.h>
+/* Define shmat to an innocuous variant, in case <limits.h> declares shmat.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define shmat innocuous_shmat
+
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char shmat (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef shmat
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char shmat ();
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined __stub_shmat || defined __stub___shmat
+choke me
+#endif
+
#ifdef FC_DUMMY_MAIN
#ifndef FC_DUMMY_MAIN_EQ_F77
# ifdef __cplusplus
@@ -22431,197 +27211,69 @@ cat >>conftest.$ac_ext <<_ACEOF
int
main ()
{
-
- int op = 0x80000006, eax, ebx, ecx, edx;
- FILE *f;
- __asm__("cpuid"
- : "=a" (eax), "=b" (ebx), "=c" (ecx), "=d" (edx)
- : "a" (op));
- f = fopen("conftest_cpuid", "w"); if (!f) return 1;
- fprintf(f, "%x:%x:%x:%x\n", eax, ebx, ecx, edx);
- fclose(f);
- return 0;
-
+return shmat ();
;
return 0;
}
_ACEOF
-rm -f conftest$ac_exeext
+rm -f conftest.$ac_objext conftest$ac_exeext
if { (ac_try="$ac_link"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ax_cv_gcc_x86_cpuid_0x80000006=`cat conftest_cpuid`; rm -f conftest_cpuid
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+ ac_cv_func_shmat=yes
else
- echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-( exit $ac_status )
-ax_cv_gcc_x86_cpuid_0x80000006=unknown; rm -f conftest_cpuid
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ ac_cv_func_shmat=no
fi
-
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
fi
-{ echo "$as_me:$LINENO: result: $ax_cv_gcc_x86_cpuid_0x80000006" >&5
-echo "${ECHO_T}$ax_cv_gcc_x86_cpuid_0x80000006" >&6; }
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
- # L2 cache size
- case $ax_cv_gcc_x86_cpuid_0x80000006 in
- *:*:*[1-9a-f]??????:*) # (L2 = ecx >> 16) >= 256
- ax_gcc_arch="athlon-xp athlon-4 athlon k7" ;;
- *) ax_gcc_arch="athlon-4 athlon k7" ;;
- esac ;;
- *f[4cef8b]?:*:*:*) ax_gcc_arch="athlon64 k8" ;;
- *f5?:*:*:*) ax_gcc_arch="opteron k8" ;;
- *f7?:*:*:*) ax_gcc_arch="athlon-fx opteron k8" ;;
- *f??:*:*:*) ax_gcc_arch="k8" ;;
- esac ;;
- *:746e6543:*:*) # IDT
- case $ax_cv_gcc_x86_cpuid_1 in
- *54?:*:*:*) ax_gcc_arch=winchip-c6 ;;
- *58?:*:*:*) ax_gcc_arch=winchip2 ;;
- *6[78]?:*:*:*) ax_gcc_arch=c3 ;;
- *69?:*:*:*) ax_gcc_arch="c3-2 c3" ;;
- esac ;;
- esac
- if test x"$ax_gcc_arch" = x; then # fallback
- case $host_cpu in
- i586*) ax_gcc_arch=pentium ;;
- i686*) ax_gcc_arch=pentiumpro ;;
- esac
- fi
- ;;
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
+$as_echo "$ac_cv_func_shmat" >&6; }
- sparc*)
- # Extract the first word of "prtdiag", so it can be a program name with args.
-set dummy prtdiag; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_path_PRTDIAG+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ if test $ac_cv_func_shmat = no; then
+ { $as_echo "$as_me:$LINENO: checking for shmat in -lipc" >&5
+$as_echo_n "checking for shmat in -lipc... " >&6; }
+if test "${ac_cv_lib_ipc_shmat+set}" = set; then
+ $as_echo_n "(cached) " >&6
else
- case $PRTDIAG in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_PRTDIAG="$PRTDIAG" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-as_dummy="$PATH:/usr/platform/`uname -i`/sbin/:/usr/platform/`uname -m`/sbin/"
-for as_dir in $as_dummy
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_PRTDIAG="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
- test -z "$ac_cv_path_PRTDIAG" && ac_cv_path_PRTDIAG="prtdiag"
- ;;
-esac
-fi
-PRTDIAG=$ac_cv_path_PRTDIAG
-if test -n "$PRTDIAG"; then
- { echo "$as_me:$LINENO: result: $PRTDIAG" >&5
-echo "${ECHO_T}$PRTDIAG" >&6; }
-else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
- cputype=`(((grep cpu /proc/cpuinfo | cut -d: -f2) ; ($PRTDIAG -v |grep -i sparc) ; grep -i cpu /var/run/dmesg.boot ) | head -n 1) 2> /dev/null`
- cputype=`echo "$cputype" | tr -d ' -' |tr $as_cr_LETTERS $as_cr_letters`
- case $cputype in
- *ultrasparciv*) ax_gcc_arch="ultrasparc4 ultrasparc3 ultrasparc v9" ;;
- *ultrasparciii*) ax_gcc_arch="ultrasparc3 ultrasparc v9" ;;
- *ultrasparc*) ax_gcc_arch="ultrasparc v9" ;;
- *supersparc*|*tms390z5[05]*) ax_gcc_arch="supersparc v8" ;;
- *hypersparc*|*rt62[056]*) ax_gcc_arch="hypersparc v8" ;;
- *cypress*) ax_gcc_arch=cypress ;;
- esac ;;
-
- alphaev5) ax_gcc_arch=ev5 ;;
- alphaev56) ax_gcc_arch=ev56 ;;
- alphapca56) ax_gcc_arch="pca56 ev56" ;;
- alphapca57) ax_gcc_arch="pca57 pca56 ev56" ;;
- alphaev6) ax_gcc_arch=ev6 ;;
- alphaev67) ax_gcc_arch=ev67 ;;
- alphaev68) ax_gcc_arch="ev68 ev67" ;;
- alphaev69) ax_gcc_arch="ev69 ev68 ev67" ;;
- alphaev7) ax_gcc_arch="ev7 ev69 ev68 ev67" ;;
- alphaev79) ax_gcc_arch="ev79 ev7 ev69 ev68 ev67" ;;
-
- powerpc*)
- cputype=`((grep cpu /proc/cpuinfo | head -n 1 | cut -d: -f2 | cut -d, -f1 | sed 's/ //g') ; /usr/bin/machine ; /bin/machine; grep CPU /var/run/dmesg.boot | head -n 1 | cut -d" " -f2) 2> /dev/null`
- cputype=`echo $cputype | sed -e 's/ppc//g;s/ *//g'`
- case $cputype in
- *750*) ax_gcc_arch="750 G3" ;;
- *740[0-9]*) ax_gcc_arch="$cputype 7400 G4" ;;
- *74[4-5][0-9]*) ax_gcc_arch="$cputype 7450 G4" ;;
- *74[0-9][0-9]*) ax_gcc_arch="$cputype G4" ;;
- *970*) ax_gcc_arch="970 G5 power4";;
- *POWER4*|*power4*|*gq*) ax_gcc_arch="power4 970";;
- *POWER5*|*power5*|*gr*|*gs*) ax_gcc_arch="power5 power4 970";;
- 603ev|8240) ax_gcc_arch="$cputype 603e 603";;
- *) ax_gcc_arch=$cputype ;;
- esac
- ax_gcc_arch="$ax_gcc_arch powerpc"
- ;;
-esac
-fi # not cross-compiling
-fi # guess arch
-
-if test "x$ax_gcc_arch" != x -a "x$ax_gcc_arch" != xno; then
-for arch in $ax_gcc_arch; do
- if test "x$acx_maxopt_portable" = xyes; then # if we require portable code
- flags="-mtune=$arch"
- # -mcpu=$arch and m$arch generate nonportable code on every arch except
- # x86. And some other arches (e.g. Alpha) don't accept -mtune. Grrr.
- case $host_cpu in i*86|x86_64*) flags="$flags -mcpu=$arch -m$arch";; esac
- else
- flags="-march=$arch -mcpu=$arch -m$arch"
- fi
- for flag in $flags; do
- { echo "$as_me:$LINENO: checking whether C compiler accepts $flag" >&5
-echo $ECHO_N "checking whether C compiler accepts $flag... $ECHO_C" >&6; }
-ax_save_FLAGS=$CFLAGS
- CFLAGS="$flag"
- cat >conftest.$ac_ext <<_ACEOF
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lipc $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char shmat ();
#ifdef FC_DUMMY_MAIN
#ifndef FC_DUMMY_MAIN_EQ_F77
# ifdef __cplusplus
@@ -22633,91 +27285,84 @@ cat >>conftest.$ac_ext <<_ACEOF
int
main ()
{
-
+return shmat ();
;
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- eval `echo "ax_cv_c_flags_$flag" | $as_tr_sh`=yes
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+ ac_cv_lib_ipc_shmat=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- eval `echo "ax_cv_c_flags_$flag" | $as_tr_sh`=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- CFLAGS=$ax_save_FLAGS
-eval ax_check_compiler_flags=$`echo "ax_cv_c_flags_$flag" | $as_tr_sh`
-{ echo "$as_me:$LINENO: result: $ax_check_compiler_flags" >&5
-echo "${ECHO_T}$ax_check_compiler_flags" >&6; }
-if test "x$ax_check_compiler_flags" = xyes; then
- ax_cv_gcc_archflag=$flag; break
-else
- :
-fi
-
- done
- test "x$ax_cv_gcc_archflag" = xunknown || break
-done
+ ac_cv_lib_ipc_shmat=no
fi
-fi # $GCC=yes
-
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
fi
-
-{ echo "$as_me:$LINENO: checking for gcc architecture flag" >&5
-echo $ECHO_N "checking for gcc architecture flag... $ECHO_C" >&6; }
-{ echo "$as_me:$LINENO: result: $ax_cv_gcc_archflag" >&5
-echo "${ECHO_T}$ax_cv_gcc_archflag" >&6; }
-if test "x$ax_cv_gcc_archflag" = xunknown; then
- :
-else
- CFLAGS="$CFLAGS $ax_cv_gcc_archflag"
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5
+$as_echo "$ac_cv_lib_ipc_shmat" >&6; }
+if test "x$ac_cv_lib_ipc_shmat" = x""yes; then
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
fi
- ;;
- esac
-
- if test -z "$CFLAGS"; then
- echo ""
- echo "********************************************************"
- echo "* WARNING: Don't know the best CFLAGS for this system *"
- echo "* Use ./configure CFLAGS=... to specify your own flags *"
- echo "* (otherwise, a default of CFLAGS=-O3 will be used) *"
- echo "********************************************************"
- echo ""
- CFLAGS="-O3"
+ fi
fi
- { echo "$as_me:$LINENO: checking whether C compiler accepts $CFLAGS" >&5
-echo $ECHO_N "checking whether C compiler accepts $CFLAGS... $ECHO_C" >&6; }
-ax_save_FLAGS=$CFLAGS
- CFLAGS="$CFLAGS"
- cat >conftest.$ac_ext <<_ACEOF
+ # Check for libraries that X11R6 Xt/Xaw programs need.
+ ac_save_LDFLAGS=$LDFLAGS
+ test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries"
+ # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to
+ # check for ICE first), but we must link in the order -lSM -lICE or
+ # we get undefined symbols. So assume we have SM if we have ICE.
+ # These have to be linked with before -lX11, unlike the other
+ # libraries we check for below, so use a different variable.
+ # John Interrante, Karl Berry
+ { $as_echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5
+$as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; }
+if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lICE $X_EXTRA_LIBS $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char IceConnectionNumber ();
#ifdef FC_DUMMY_MAIN
#ifndef FC_DUMMY_MAIN_EQ_F77
# ifdef __cplusplus
@@ -22729,87 +27374,250 @@ cat >>conftest.$ac_ext <<_ACEOF
int
main ()
{
-
+return IceConnectionNumber ();
;
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- eval `echo "ax_cv_c_flags_$CFLAGS" | $as_tr_sh`=yes
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+ ac_cv_lib_ICE_IceConnectionNumber=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- eval `echo "ax_cv_c_flags_$CFLAGS" | $as_tr_sh`=no
+ ac_cv_lib_ICE_IceConnectionNumber=no
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- CFLAGS=$ax_save_FLAGS
-eval ax_check_compiler_flags=$`echo "ax_cv_c_flags_$CFLAGS" | $as_tr_sh`
-{ echo "$as_me:$LINENO: result: $ax_check_compiler_flags" >&5
-echo "${ECHO_T}$ax_check_compiler_flags" >&6; }
-if test "x$ax_check_compiler_flags" = xyes; then
- :
-else
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+$as_echo "$ac_cv_lib_ICE_IceConnectionNumber" >&6; }
+if test "x$ac_cv_lib_ICE_IceConnectionNumber" = x""yes; then
+ X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
+fi
- echo ""
- echo "********************************************************"
- echo "* WARNING: The guessed CFLAGS don't seem to work with *"
- echo "* your compiler. *"
- echo "* Use ./configure CFLAGS=... to specify your own flags *"
- echo "********************************************************"
- echo ""
- CFLAGS=""
+ LDFLAGS=$ac_save_LDFLAGS
fi
+
+
+
+
+ { $as_echo "$as_me:$LINENO: checking for Qt" >&5
+$as_echo_n "checking for Qt... " >&6; }
+
+
+# Check whether --with-Qt-dir was given.
+if test "${with_Qt_dir+set}" = set; then
+ withval=$with_Qt_dir;
fi
- { echo "$as_me:$LINENO: result: enabled" >&5
-echo "${ECHO_T}enabled" >&6; }
-else
- { echo "$as_me:$LINENO: result: disabled" >&5
-echo "${ECHO_T}disabled" >&6; }
+
+# Check whether --with-Qt-include-dir was given.
+if test "${with_Qt_include_dir+set}" = set; then
+ withval=$with_Qt_include_dir;
fi
-#
-# MCM: I have no idea what good the following line does. I think
-# all compilers accept the -D argument and any string following
-# it is an argument to the -D argument. So, I think this is
-# just totally bogus!
-# Default to large file support
- { echo "$as_me:$LINENO: checking whether C compiler accepts \"-D_LARGEFILE_SOURCE\"" >&5
-echo $ECHO_N "checking whether C compiler accepts \"-D_LARGEFILE_SOURCE\"... $ECHO_C" >&6; }
-if test "${ax_cv_c_flags___D_LARGEFILE_SOURCE_+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ax_save_FLAGS=$CFLAGS
- CFLAGS=""-D_LARGEFILE_SOURCE""
+# Check whether --with-Qt-bin-dir was given.
+if test "${with_Qt_bin_dir+set}" = set; then
+ withval=$with_Qt_bin_dir;
+fi
+
+
+# Check whether --with-Qt-lib-dir was given.
+if test "${with_Qt_lib_dir+set}" = set; then
+ withval=$with_Qt_lib_dir;
+fi
+
+
+# Check whether --with-Qt-lib was given.
+if test "${with_Qt_lib+set}" = set; then
+ withval=$with_Qt_lib;
+fi
+
+ if test x"$with_Qt_dir" = x"no" ||
+ test x"$with_Qt_include-dir" = x"no" ||
+ test x"$with_Qt_bin_dir" = x"no" ||
+ test x"$with_Qt_lib_dir" = x"no" ||
+ test x"$with_Qt_lib" = x"no"; then
+ # user disabled Qt. Leave cache alone.
+ have_qt="User disabled Qt."
+ else
+ # "yes" is a bogus option
+ if test x"$with_Qt_dir" = xyes; then
+ with_Qt_dir=
+ fi
+ if test x"$with_Qt_include_dir" = xyes; then
+ with_Qt_include_dir=
+ fi
+ if test x"$with_Qt_bin_dir" = xyes; then
+ with_Qt_bin_dir=
+ fi
+ if test x"$with_Qt_lib_dir" = xyes; then
+ with_Qt_lib_dir=
+ fi
+ if test x"$with_Qt_lib" = xyes; then
+ with_Qt_lib=
+ fi
+ # No Qt unless we discover otherwise
+ have_qt=no
+ # Check whether we are requested to link with a specific version
+ if test x"$with_Qt_lib" != x; then
+ ax_qt_lib="$with_Qt_lib"
+ fi
+ # Check whether we were supplied with an answer already
+ if test x"$with_Qt_dir" != x; then
+ have_qt=yes
+ ax_qt_dir="$with_Qt_dir"
+ ax_qt_include_dir="$with_Qt_dir/include"
+ ax_qt_bin_dir="$with_Qt_dir/bin"
+ ax_qt_lib_dir="$with_Qt_dir/lib"
+ # Only search for the lib if the user did not define one already
+ if test x"$ax_qt_lib" = x; then
+ ax_qt_lib="`ls $ax_qt_lib_dir/libQt* | sed -n 1p |
+ sed s@$ax_qt_lib_dir/lib@@ | sed s@[.].*@@`"
+ fi
+ ax_qt_LIBS="-L$ax_qt_lib_dir -l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
+ else
+ # Use cached value or do search, starting with suggestions from
+ # the command line
+ if test "${ax_cv_have_qt+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+
+ # We are not given a solution and there is no cached value.
+ ax_qt_dir=NO
+ ax_qt_include_dir=NO
+ ax_qt_lib_dir=NO
+ if test x"$ax_qt_lib" = x; then
+ ax_qt_lib=NO
+ fi
+
+ ## Binary utilities ##
+ if test x"$with_Qt_bin_dir" != x; then
+ ax_qt_bin_dir=$with_Qt_bin_dir
+ fi
+ ## Look for header files ##
+ if test x"$with_Qt_include_dir" != x; then
+ ax_qt_include_dir="$with_Qt_include_dir"
+ else
+ # The following header file is expected to define QT_VERSION.
+ qt_direct_test_header=qglobal.h
+ # Look for the header file in a standard set of common directories.
+ ax_include_path_list="
+ /usr/include
+ `ls -dr ${QTDIR}/include 2>/dev/null`
+ `ls -dr /usr/include/qt* 2>/dev/null`
+ `ls -dr /usr/lib/qt*/include 2>/dev/null`
+ `ls -dr /usr/local/qt*/include 2>/dev/null`
+ `ls -dr /opt/qt*/include 2>/dev/null`
+ `ls -dr /Developer/qt*/include 2>/dev/null`
+ "
+ for ax_dir in $ax_include_path_list; do
+ if test -r "$ax_dir/$qt_direct_test_header"; then
+ ax_dirs="$ax_dirs $ax_dir"
+ fi
+ done
+ # Now look for the newest in this list
+ ax_prev_ver=0
+ for ax_dir in $ax_dirs; do
+ ax_this_ver=`egrep -w '#define QT_VERSION' $ax_dir/$qt_direct_test_header | sed s/'#define QT_VERSION'//`
+ if expr $ax_this_ver '>' $ax_prev_ver > /dev/null; then
+ ax_qt_include_dir=$ax_dir
+ ax_prev_ver=$ax_this_ver
+ fi
+ done
+ fi
+ # Are these headers located in a traditional Trolltech installation?
+ # That would be $ax_qt_include_dir stripped from its last element:
+ ax_possible_qt_dir=`dirname $ax_qt_include_dir`
+ if (test -x $ax_possible_qt_dir/bin/moc) &&
+ ((ls $ax_possible_qt_dir/lib/libQt* > /dev/null 2>/dev/null) ||
+ (ls $ax_possible_qt_dir/lib64/libQt* > /dev/null 2>/dev/null)); then
+ # Then the rest is a piece of cake
+ ax_qt_dir=$ax_possible_qt_dir
+ ax_qt_bin_dir="$ax_qt_dir/bin"
+ if test x"$with_Qt_lib_dir" != x; then
+ ax_qt_lib_dir="$with_Qt_lib_dir"
+ else
+ if (test -d $ax_qt_dir/lib64); then
+ ax_qt_lib_dir="$ax_qt_dir/lib64"
+ else
+ ax_qt_lib_dir="$ax_qt_dir/lib"
+ fi
+ fi
+ # Only look for lib if the user did not supply it already
+ if test x"$ax_qt_lib" = xNO; then
+ ax_qt_lib="`ls $ax_qt_lib_dir/libQt* | sed -n 1p |
+ sed s@$ax_qt_lib_dir/lib@@ | sed s@[.].*@@`"
+ fi
+ ax_qt_LIBS="-L$ax_qt_lib_dir -l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
+ else
+ # There is no valid definition for $QTDIR as Trolltech likes to see it
+ ax_qt_dir=
+ ## Look for Qt library ##
+ if test x"$with_Qt_lib_dir" != x; then
+ ax_qt_lib_dir="$with_Qt_lib_dir"
+ # Only look for lib if the user did not supply it already
+ if test x"$ax_qt_lib" = xNO; then
+ ax_qt_lib="`ls $ax_qt_lib_dir/libQt* | sed -n 1p |
+ sed s@$ax_qt_lib_dir/lib@@ | sed s@[.].*@@`"
+ fi
+ ax_qt_LIBS="-L$ax_qt_lib_dir -l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
+ else
+ # Normally, when there is no traditional Trolltech installation,
+ # the library is installed in a place where the linker finds it
+ # automatically.
+ # If the user did not define the library name, try with qt
+ if test x"$ax_qt_lib" = xNO; then
+ ax_qt_lib=qt
+ fi
+ qt_direct_test_header=qapplication.h
+ qt_direct_test_main="
+ int argc;
+ char ** argv;
+ QApplication app(argc,argv);
+ "
+ # See if we find the library without any special options.
+ # Don't add top $LIBS permanently yet
+ ax_save_LIBS="$LIBS"
+ LIBS="-l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
+ ax_qt_LIBS="$LIBS"
+ ax_save_CXXFLAGS="$CXXFLAGS"
+ CXXFLAGS="-I$ax_qt_include_dir -I$ax_qt_include_dir/Qt -I$ax_qt_include_dir/QtCore -I$ax_qt_include_dir/QtGui"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-
+#include <$qt_direct_test_header>
#ifdef FC_DUMMY_MAIN
#ifndef FC_DUMMY_MAIN_EQ_F77
# ifdef __cplusplus
@@ -22821,64 +27629,53 @@ cat >>conftest.$ac_ext <<_ACEOF
int
main ()
{
-
+$qt_direct_test_main
;
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ax_cv_c_flags___D_LARGEFILE_SOURCE_=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ax_cv_c_flags___D_LARGEFILE_SOURCE_=no
-fi
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- CFLAGS=$ax_save_FLAGS
-fi
+ # Success.
+ # We can link with no special library directory.
+ ax_qt_lib_dir=
-eval ax_check_compiler_flags=$ax_cv_c_flags___D_LARGEFILE_SOURCE_
-{ echo "$as_me:$LINENO: result: $ax_check_compiler_flags" >&5
-echo "${ECHO_T}$ax_check_compiler_flags" >&6; }
-if test "x$ax_check_compiler_flags" = xyes; then
- CFLAGS="$CFLAGS -D_LARGEFILE_SOURCE";
else
- :
-fi
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
- { echo "$as_me:$LINENO: checking whether C compiler accepts \"-D_LARGEFILE64_SOURCE\"" >&5
-echo $ECHO_N "checking whether C compiler accepts \"-D_LARGEFILE64_SOURCE\"... $ECHO_C" >&6; }
-if test "${ax_cv_c_flags___D_LARGEFILE64_SOURCE_+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ax_save_FLAGS=$CFLAGS
- CFLAGS=""-D_LARGEFILE64_SOURCE""
- cat >conftest.$ac_ext <<_ACEOF
+ # That did not work. Try the multi-threaded version
+ echo "Non-critical error, please neglect the above." >&5
+ ax_qt_lib=qt-mt
+ LIBS="-l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-
+#include <$qt_direct_test_header>
#ifdef FC_DUMMY_MAIN
#ifndef FC_DUMMY_MAIN_EQ_F77
# ifdef __cplusplus
@@ -22890,64 +27687,53 @@ cat >>conftest.$ac_ext <<_ACEOF
int
main ()
{
-
+$qt_direct_test_main
;
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ax_cv_c_flags___D_LARGEFILE64_SOURCE_=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ax_cv_c_flags___D_LARGEFILE64_SOURCE_=no
-fi
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- CFLAGS=$ax_save_FLAGS
-fi
+ # Success.
+ # We can link with no special library directory.
+ ax_qt_lib_dir=
-eval ax_check_compiler_flags=$ax_cv_c_flags___D_LARGEFILE64_SOURCE_
-{ echo "$as_me:$LINENO: result: $ax_check_compiler_flags" >&5
-echo "${ECHO_T}$ax_check_compiler_flags" >&6; }
-if test "x$ax_check_compiler_flags" = xyes; then
- CFLAGS="$CFLAGS -D_LARGEFILE64_SOURCE";
else
- :
-fi
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
- { echo "$as_me:$LINENO: checking whether C compiler accepts \"-D_FILE_OFFSET_BITS=64\"" >&5
-echo $ECHO_N "checking whether C compiler accepts \"-D_FILE_OFFSET_BITS=64\"... $ECHO_C" >&6; }
-if test "${ax_cv_c_flags___D_FILE_OFFSET_BITS_64_+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ax_save_FLAGS=$CFLAGS
- CFLAGS=""-D_FILE_OFFSET_BITS=64""
- cat >conftest.$ac_ext <<_ACEOF
+ # That did not work. Try the OpenGL version
+ echo "Non-critical error, please neglect the above." >&5
+ ax_qt_lib=qt-gl
+ LIBS="-l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-
+#include <$qt_direct_test_header>
#ifdef FC_DUMMY_MAIN
#ifndef FC_DUMMY_MAIN_EQ_F77
# ifdef __cplusplus
@@ -22959,64 +27745,78 @@ cat >>conftest.$ac_ext <<_ACEOF
int
main ()
{
-
+$qt_direct_test_main
;
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ax_cv_c_flags___D_FILE_OFFSET_BITS_64_=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ax_cv_c_flags___D_FILE_OFFSET_BITS_64_=no
-fi
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- CFLAGS=$ax_save_FLAGS
-fi
+ # Success.
+ # We can link with no special library directory.
+ ax_qt_lib_dir=
-eval ax_check_compiler_flags=$ax_cv_c_flags___D_FILE_OFFSET_BITS_64_
-{ echo "$as_me:$LINENO: result: $ax_check_compiler_flags" >&5
-echo "${ECHO_T}$ax_check_compiler_flags" >&6; }
-if test "x$ax_check_compiler_flags" = xyes; then
- CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64";
else
- :
-fi
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
- { echo "$as_me:$LINENO: checking whether C compiler accepts \"-Wdeclaration-after-statement\"" >&5
-echo $ECHO_N "checking whether C compiler accepts \"-Wdeclaration-after-statement\"... $ECHO_C" >&6; }
-if test "${ax_cv_c_flags___Wdeclaration_after_statement_+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ax_save_FLAGS=$CFLAGS
- CFLAGS=""-Wdeclaration-after-statement""
- cat >conftest.$ac_ext <<_ACEOF
+ # That did not work. Maybe a library version I don't know about?
+ echo "Non-critical error, please neglect the above." >&5
+ # Look for some Qt lib in a standard set of common directories.
+ ax_dir_list="
+ `echo $ax_qt_includes | sed ss/includess`
+ /lib
+ /usr/lib64
+ /usr/lib
+ /usr/local/lib64
+ /usr/local/lib
+ /opt/lib64
+ /opt/lib
+ `ls -dr /usr/lib64/qt* 2>/dev/null`
+ `ls -dr /usr/lib64/qt*/lib64 2>/dev/null`
+ `ls -dr /usr/lib/qt* 2>/dev/null`
+ `ls -dr /usr/local/qt* 2>/dev/null`
+ `ls -dr /opt/qt* 2>/dev/null`
+ "
+ for ax_dir in $ax_dir_list; do
+ if ls $ax_dir/libQt* >/dev/null 2>/dev/null; then
+ # Gamble that it's the first one...
+ ax_qt_lib="`ls $ax_dir/libQt* | sed -n 1p |
+ sed s@$ax_dir/lib@@ | sed s/[.].*//`"
+ ax_qt_lib_dir="$ax_dir"
+ break
+ fi
+ done
+ # Try with that one
+ LIBS="-l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-
+#include <$qt_direct_test_header>
#ifdef FC_DUMMY_MAIN
#ifndef FC_DUMMY_MAIN_EQ_F77
# ifdef __cplusplus
@@ -23028,71 +27828,298 @@ cat >>conftest.$ac_ext <<_ACEOF
int
main ()
{
-
+$qt_direct_test_main
;
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ax_cv_c_flags___Wdeclaration_after_statement_=yes
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+
+ # Success.
+ # We can link with no special library directory.
+ ax_qt_lib_dir=
+
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- ax_cv_c_flags___Wdeclaration_after_statement_=no
+
+ : # Leave ax_qt_lib_dir defined
+
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- CFLAGS=$ax_save_FLAGS
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+
fi
-eval ax_check_compiler_flags=$ax_cv_c_flags___Wdeclaration_after_statement_
-{ echo "$as_me:$LINENO: result: $ax_check_compiler_flags" >&5
-echo "${ECHO_T}$ax_check_compiler_flags" >&6; }
-if test "x$ax_check_compiler_flags" = xyes; then
- CFLAGS="$CFLAGS -Wdeclaration-after-statement";
-else
- :
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+
fi
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
-#
-# Note: regardless of what the stuff above regarding large file support
-# appears to do, the following test is the one that affects Silo's
-# knowledge and support for large files. It may be that the result of
-# the sizeof check is dependent on whether -D_LARGEFILE64_SOURCE is
-# defined on the command line to the compiler though.
-# Use size of off64_t to determine which form of stat() calls to make
-#
-{ echo "$as_me:$LINENO: checking for off64_t" >&5
-echo $ECHO_N "checking for off64_t... $ECHO_C" >&6; }
-if test "${ac_cv_type_off64_t+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ if test x"$ax_qt_lib_dir" != x; then
+ ax_qt_LIBS="-L$ax_qt_lib_dir $LIBS"
+ else
+ ax_qt_LIBS="$LIBS"
+ fi
+ LIBS="$ax_save_LIBS"
+ CXXFLAGS="$ax_save_CXXFLAGS"
+ fi fi
+ if test "$ax_qt_dir" = NO ||
+ test "$ax_qt_include_dir" = NO ||
+ test "$ax_qt_lib_dir" = NO ||
+ test "$ax_qt_lib" = NO; then
+ # Problem with finding complete Qt. Cache the known absence of Qt.
+ ax_cv_have_qt="have_qt=no"
+ else
+ # Record where we found Qt for the cache.
+ ax_cv_have_qt="have_qt=yes \
+ ax_qt_dir=$ax_qt_dir \
+ ax_qt_include_dir=$ax_qt_include_dir \
+ ax_qt_bin_dir=$ax_qt_bin_dir \
+ ax_qt_LIBS=\"$ax_qt_LIBS\""
+ fi
+
+fi
+ eval "$ax_cv_have_qt"
+ fi # all $ax_qt_* are set
+ fi # $have_qt reflects the system status
+ if test x"$have_qt" = xyes; then
+ QT_CXXFLAGS="-I$ax_qt_include_dir -I$ax_qt_include_dir/Qt -I$ax_qt_include_dir/QtCore -I$ax_qt_include_dir/QtGui"
+ if test x"$ax_qt_lib" = xqt-mt; then
+ QT_CXXFLAGS="$QT_CXXFLAGS -DQT_THREAD_SUPPORT"
+ fi
+ QT_DIR="$ax_qt_dir"
+ QT_LIBS="$ax_qt_LIBS"
+ # If ax_qt_dir is defined, utilities are expected to be in the
+ # bin subdirectory
+ if test x"$ax_qt_dir" != x; then
+ if test -x "$ax_qt_dir/bin/uic"; then
+ QT_UIC="$ax_qt_dir/bin/uic"
+ else
+ # Old versions of Qt don't have uic
+ QT_UIC=
+ fi
+ QT_MOC="$ax_qt_dir/bin/moc"
+ QT_LRELEASE="$ax_qt_dir/bin/lrelease"
+ QT_LUPDATE="$ax_qt_dir/bin/lupdate"
+ else
+ # Or maybe we are told where to look for the utilities
+ if test x"$ax_qt_bin_dir" != x; then
+ if test -x "$ax_qt_bin_dir/uic"; then
+ QT_UIC="$ax_qt_bin_dir/uic"
+ else
+ # Old versions of Qt don't have uic
+ QT_UIC=
+ fi
+ QT_MOC="$ax_qt_bin_dir/moc"
+ QT_LRELEASE="$ax_qt_bin_dir/lrelease"
+ QT_LUPDATE="$ax_qt_bin_dir/lupdate"
+ else
+ # Last possibility is that they are in $PATH
+ QT_UIC="`which uic`"
+ QT_MOC="`which moc`"
+ QT_LRELEASE="`which lrelease`"
+ QT_LUPDATE="`which lupdate`"
+ fi
+ fi
+ # All variables are defined, report the result
+ { $as_echo "$as_me:$LINENO: result: $have_qt:
+ QT_CXXFLAGS=$QT_CXXFLAGS
+ QT_DIR=$QT_DIR
+ QT_LIBS=$QT_LIBS
+ QT_UIC=$QT_UIC
+ QT_MOC=$QT_MOC
+ QT_LRELEASE=$QT_LRELEASE
+ QT_LUPDATE=$QT_LUPDATE" >&5
+$as_echo "$have_qt:
+ QT_CXXFLAGS=$QT_CXXFLAGS
+ QT_DIR=$QT_DIR
+ QT_LIBS=$QT_LIBS
+ QT_UIC=$QT_UIC
+ QT_MOC=$QT_MOC
+ QT_LRELEASE=$QT_LRELEASE
+ QT_LUPDATE=$QT_LUPDATE" >&6; }
+ else
+ # Qt was not found
+ QT_CXXFLAGS=
+ QT_DIR=
+ QT_LIBS=
+ QT_UIC=
+ QT_MOC=
+ QT_LRELEASE=
+ QT_LUPDATE=
+ { $as_echo "$as_me:$LINENO: result: $have_qt" >&5
+$as_echo "$have_qt" >&6; }
+ fi
+
+
+
+
+
+
+
+
+ #### Being paranoid:
+ if test x"$have_qt" = xyes; then
+ { $as_echo "$as_me:$LINENO: checking correct functioning of Qt installation" >&5
+$as_echo_n "checking correct functioning of Qt installation... " >&6; }
+ if test "${ax_cv_qt_test_result+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+
+ cat > ax_qt_test.h << EOF
+#include <QObject>
+class Test : public QObject
+{
+Q_OBJECT
+public:
+ Test() {}
+ ~Test() {}
+public slots:
+ void receive() {}
+signals:
+ void send();
+};
+EOF
+
+ cat > ax_qt_main.$ac_ext << EOF
+#include "ax_qt_test.h"
+#include <QApplication>
+int main( int argc, char **argv )
+{
+ QApplication app( argc, argv );
+ Test t;
+ QObject::connect( &t, SIGNAL(send()), &t, SLOT(receive()) );
+}
+EOF
+
+ ax_cv_qt_test_result="failure"
+ ax_try_1="$QT_MOC ax_qt_test.h -o moc_ax_qt_test.$ac_ext >/dev/null 2>/dev/null"
+ { (eval echo "$as_me:$LINENO: \"$ax_try_1\"") >&5
+ (eval $ax_try_1) 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+ if test x"$ac_status" != x0; then
+ echo "$ax_err_1" >&5
+ echo "configure: could not run $QT_MOC on:" >&5
+ cat ax_qt_test.h >&5
+ else
+ ax_try_2="$CXX $QT_CXXFLAGS -c $CXXFLAGS -o moc_ax_qt_test.o moc_ax_qt_test.$ac_ext >/dev/null 2>/dev/null"
+ { (eval echo "$as_me:$LINENO: \"$ax_try_2\"") >&5
+ (eval $ax_try_2) 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+ if test x"$ac_status" != x0; then
+ echo "$ax_err_2" >&5
+ echo "configure: could not compile:" >&5
+ cat moc_ax_qt_test.$ac_ext >&5
+ else
+ ax_try_3="$CXX $QT_CXXFLAGS -c $CXXFLAGS -o ax_qt_main.o ax_qt_main.$ac_ext >/dev/null 2>/dev/null"
+ { (eval echo "$as_me:$LINENO: \"$ax_try_3\"") >&5
+ (eval $ax_try_3) 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+ if test x"$ac_status" != x0; then
+ echo "$ax_err_3" >&5
+ echo "configure: could not compile:" >&5
+ cat ax_qt_main.$ac_ext >&5
+ else
+ ax_try_4="$CXX -o ax_qt_main ax_qt_main.o moc_ax_qt_test.o $QT_LIBS $LIBS >/dev/null 2>/dev/null"
+ { (eval echo "$as_me:$LINENO: \"$ax_try_4\"") >&5
+ (eval $ax_try_4) 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+ if test x"$ac_status" != x0; then
+ echo "$ax_err_4" >&5
+ else
+ ax_cv_qt_test_result="success"
+ fi
+ fi
+ fi
+ fi
+
+fi
+ { $as_echo "$as_me:$LINENO: result: $ax_cv_qt_test_result" >&5
+$as_echo "$ax_cv_qt_test_result" >&6; }
+ if test x"$ax_cv_qt_test_result" = "xfailure"; then
+ { { $as_echo "$as_me:$LINENO: error: Failed to find matching components of a complete
+ Qt installation. Try using more options,
+ see ./configure --help." >&5
+$as_echo "$as_me: error: Failed to find matching components of a complete
+ Qt installation. Try using more options,
+ see ./configure --help." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
+ rm -f ax_qt_test.h moc_ax_qt_test.$ac_ext moc_ax_qt_test.o \
+ ax_qt_main.$ac_ext ax_qt_main.o ax_qt_main
+ fi
+
+fi
+LIBM=
+case $host in
+*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
+ # These system don't have libm, or don't need it
+ ;;
+*-ncr-sysv4.3*)
+ { $as_echo "$as_me:$LINENO: checking for _mwvalidcheckl in -lmw" >&5
+$as_echo_n "checking for _mwvalidcheckl in -lmw... " >&6; }
+if test "${ac_cv_lib_mw__mwvalidcheckl+set}" = set; then
+ $as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lmw $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-$ac_includes_default
-typedef off64_t ac__type_new_;
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char _mwvalidcheckl ();
#ifdef FC_DUMMY_MAIN
#ifndef FC_DUMMY_MAIN_EQ_F77
# ifdef __cplusplus
@@ -23104,108 +28131,72 @@ typedef off64_t ac__type_new_;
int
main ()
{
-if ((ac__type_new_ *) 0)
- return 0;
-if (sizeof (ac__type_new_))
- return 0;
+return _mwvalidcheckl ();
;
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_type_off64_t=yes
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+ ac_cv_lib_mw__mwvalidcheckl=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- ac_cv_type_off64_t=no
+ ac_cv_lib_mw__mwvalidcheckl=no
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mw__mwvalidcheckl" >&5
+$as_echo "$ac_cv_lib_mw__mwvalidcheckl" >&6; }
+if test "x$ac_cv_lib_mw__mwvalidcheckl" = x""yes; then
+ LIBM="-lmw"
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_off64_t" >&5
-echo "${ECHO_T}$ac_cv_type_off64_t" >&6; }
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ echo "$as_me:$LINENO: checking size of off64_t" >&5
-echo $ECHO_N "checking size of off64_t... $ECHO_C" >&6; }
-if test "${ac_cv_sizeof_off64_t+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:$LINENO: checking for cos in -lm" >&5
+$as_echo_n "checking for cos in -lm... " >&6; }
+if test "${ac_cv_lib_m_cos+set}" = set; then
+ $as_echo_n "(cached) " >&6
else
- if test "$cross_compiling" = yes; then
- # Depending upon the size, compute the lo and hi bounds.
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lm $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-$ac_includes_default
- typedef off64_t ac__type_sizeof_;
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-# ifdef __cplusplus
- extern "C"
-# endif
- int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-test_array [0] = 0
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_lo=0 ac_mid=0
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
- typedef off64_t ac__type_sizeof_;
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char cos ();
#ifdef FC_DUMMY_MAIN
#ifndef FC_DUMMY_MAIN_EQ_F77
# ifdef __cplusplus
@@ -23217,102 +28208,74 @@ $ac_includes_default
int
main ()
{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-test_array [0] = 0
-
+return cos ();
;
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_hi=$ac_mid; break
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+ ac_cv_lib_m_cos=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- ac_lo=`expr $ac_mid + 1`
- if test $ac_lo -le $ac_mid; then
- ac_lo= ac_hi=
- break
- fi
- ac_mid=`expr 2 '*' $ac_mid + 1`
+ ac_cv_lib_m_cos=no
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_m_cos" >&5
+$as_echo "$ac_cv_lib_m_cos" >&6; }
+if test "x$ac_cv_lib_m_cos" = x""yes; then
+ LIBM="$LIBM -lm"
+fi
- cat >conftest.$ac_ext <<_ACEOF
+ ;;
+*)
+ { $as_echo "$as_me:$LINENO: checking for cos in -lm" >&5
+$as_echo_n "checking for cos in -lm... " >&6; }
+if test "${ac_cv_lib_m_cos+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lm $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-$ac_includes_default
- typedef off64_t ac__type_sizeof_;
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-# ifdef __cplusplus
- extern "C"
-# endif
- int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-test_array [0] = 0
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_hi=-1 ac_mid=-1
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
- typedef off64_t ac__type_sizeof_;
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char cos ();
#ifdef FC_DUMMY_MAIN
#ifndef FC_DUMMY_MAIN_EQ_F77
# ifdef __cplusplus
@@ -23324,67 +28287,176 @@ $ac_includes_default
int
main ()
{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-test_array [0] = 0
-
+return cos ();
;
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_lo=$ac_mid; break
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+ ac_cv_lib_m_cos=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- ac_hi=`expr '(' $ac_mid ')' - 1`
- if test $ac_mid -le $ac_hi; then
- ac_lo= ac_hi=
- break
- fi
- ac_mid=`expr 2 '*' $ac_mid`
-fi
+ ac_cv_lib_m_cos=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_m_cos" >&5
+$as_echo "$ac_cv_lib_m_cos" >&6; }
+if test "x$ac_cv_lib_m_cos" = x""yes; then
+ LIBM="-lm"
+fi
+
+ ;;
+esac
+
+
+LIBS="$LIBS $LIBM"
+
+
+# Check whether --with-szlib was given.
+if test "${with_szlib+set}" = set; then
+ withval=$with_szlib;
+else
+ withval=default
+fi
+
+
+case $withval in
+ default)
+ HAVE_SZLIB="no"
+ if test "$DEFAULT_SZIP" != "" ; then
+ LDFLAGS="$LDFLAGS -L$DEFAULT_SZIP/lib"
+ LIBS="$LIBS -lsz"
+ HAVE_SZLIB="yes"
+ szlib_lib="$DEFAULT_SZIP/lib"
+ fi
+ if test "$DEFAULT_SZIP_LIB" != "" ; then
+ LDFLAGS="$LDFLAGS -L$DEFAULT_SZIP_LIB"
+ LIBS="$LIBS -lsz"
+ HAVE_SZLIB="yes"
+ szlib_lib="$DEFAULT_SZIP_LIB"
+ fi
+ if test "$DEFAULT_SZIP_LIBDIR" != "" ; then
+ LDFLAGS="$LDFLAGS -L$DEFAULT_SZIP_LIBDIR"
+ LIBS="$LIBS -lsz"
+ HAVE_SZLIB="yes"
+ szlib_lib="$DEFAULT_SZIP_LIBDIR"
+ fi
+ if test "$HAVE_SZLIB" = "yes" ; then
+ { $as_echo "$as_me:$LINENO: checking default szlib path provided" >&5
+$as_echo_n "checking default szlib path provided... " >&6; }
+ { $as_echo "$as_me:$LINENO: result: $szlib_lib" >&5
+$as_echo "$szlib_lib" >&6; }
+ else
+ { $as_echo "$as_me:$LINENO: checking for szlib" >&5
+$as_echo_n "checking for szlib... " >&6; }
+ { $as_echo "$as_me:$LINENO: result: suppressed" >&5
+$as_echo "suppressed" >&6; }
+ fi
+ ;;
+ yes)
+ HAVE_SZLIB="no"
+ if test "$DEFAULT_SZIP" != "" ; then
+ LDFLAGS="$LDFLAGS -L$DEFAULT_SZIP/lib"
+ LIBS="$LIBS -lsz"
+ HAVE_SZLIB="yes"
+ szlib_lib="$DEFAULT_SZIP/lib"
+ fi
+ if test "$DEFAULT_SZIP_LIB" != "" ; then
+ LDFLAGS="$LDFLAGS -L$DEFAULT_SZIP_LIB"
+ LIBS="$LIBS -lsz"
+ HAVE_SZLIB="yes"
+ szlib_lib="$DEFAULT_SZIP_LIB"
+ fi
+ if test "$DEFAULT_SZIP_LIBDIR" != "" ; then
+ LDFLAGS="$LDFLAGS -L$DEFAULT_SZIP_LIBDIR"
+ LIBS="$LIBS -lsz"
+ HAVE_SZLIB="yes"
+ szlib_lib="$DEFAULT_SZIP_LIBDIR"
+ fi
+ if test "$HAVE_SZLIB" = "yes" ; then
+ { $as_echo "$as_me:$LINENO: checking using szlib path provided" >&5
+$as_echo_n "checking using szlib path provided... " >&6; }
+ { $as_echo "$as_me:$LINENO: result: $szlib_lib" >&5
+$as_echo "$szlib_lib" >&6; }
+ else
+ { { $as_echo "$as_me:$LINENO: error: expect to find szlib environment variables" >&5
+$as_echo "$as_me: error: expect to find szlib environment variables" >&2;}
+ { (exit 1); exit 1; }; }
+ { $as_echo "$as_me:$LINENO: checking for szlib" >&5
+$as_echo_n "checking for szlib... " >&6; }
+ { $as_echo "$as_me:$LINENO: result: suppressed" >&5
+$as_echo "suppressed" >&6; }
+ fi
+ ;;
+ no)
+ HAVE_SZLIB="no"
+ { $as_echo "$as_me:$LINENO: checking for szlib" >&5
+$as_echo_n "checking for szlib... " >&6; }
+ { $as_echo "$as_me:$LINENO: result: suppressed" >&5
+$as_echo "suppressed" >&6; }
+ ;;
+ *)
+ HAVE_SZLIB="yes"
+ case "$withval" in
+ *)
+ if test -n "$withval"; then
+ szlib_lib="$withval/lib"
+ fi
+ ;;
+ esac
+ if test -n "$szlib_lib"; then
+ LDFLAGS="$LDFLAGS -L$szlib_lib"
+ fi
+
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
+{ $as_echo "$as_me:$LINENO: checking for SZ_BufftoBuffCompress in -lsz" >&5
+$as_echo_n "checking for SZ_BufftoBuffCompress in -lsz... " >&6; }
+if test "${ac_cv_lib_sz_SZ_BufftoBuffCompress+set}" = set; then
+ $as_echo_n "(cached) " >&6
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_lo= ac_hi=
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
- cat >conftest.$ac_ext <<_ACEOF
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lsz $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-$ac_includes_default
- typedef off64_t ac__type_sizeof_;
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char SZ_BufftoBuffCompress ();
#ifdef FC_DUMMY_MAIN
#ifndef FC_DUMMY_MAIN_EQ_F77
# ifdef __cplusplus
@@ -23396,252 +28468,224 @@ $ac_includes_default
int
main ()
{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-test_array [0] = 0
-
+return SZ_BufftoBuffCompress ();
;
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_hi=$ac_mid
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+ ac_cv_lib_sz_SZ_BufftoBuffCompress=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- ac_lo=`expr '(' $ac_mid ')' + 1`
+ ac_cv_lib_sz_SZ_BufftoBuffCompress=no
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) ac_cv_sizeof_off64_t=$ac_lo;;
-'') if test "$ac_cv_type_off64_t" = yes; then
- { { echo "$as_me:$LINENO: error: cannot compute sizeof (off64_t)
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (off64_t)
-See \`config.log' for more details." >&2;}
- { (exit 77); exit 77; }; }
- else
- ac_cv_sizeof_off64_t=0
- fi ;;
-esac
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_sz_SZ_BufftoBuffCompress" >&5
+$as_echo "$ac_cv_lib_sz_SZ_BufftoBuffCompress" >&6; }
+if test "x$ac_cv_lib_sz_SZ_BufftoBuffCompress" = x""yes; then
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBSZ 1
_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
- typedef off64_t ac__type_sizeof_;
-static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
-static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
-#include <stdio.h>
-#include <stdlib.h>
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-# ifdef __cplusplus
- extern "C"
-# endif
- int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
- FILE *f = fopen ("conftest.val", "w");
- if (! f)
- return 1;
- if (((long int) (sizeof (ac__type_sizeof_))) < 0)
- {
- long int i = longval ();
- if (i != ((long int) (sizeof (ac__type_sizeof_))))
- return 1;
- fprintf (f, "%ld\n", i);
- }
- else
- {
- unsigned long int i = ulongval ();
- if (i != ((long int) (sizeof (ac__type_sizeof_))))
- return 1;
- fprintf (f, "%lu\n", i);
- }
- return ferror (f) || fclose (f) != 0;
+ LIBS="-lsz $LIBS"
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_sizeof_off64_t=`cat conftest.val`
else
- echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-if test "$ac_cv_type_off64_t" = yes; then
- { { echo "$as_me:$LINENO: error: cannot compute sizeof (off64_t)
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (off64_t)
-See \`config.log' for more details." >&2;}
- { (exit 77); exit 77; }; }
- else
- ac_cv_sizeof_off64_t=0
- fi
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.val
+ LDFLAGS="$saved_LDFLAGS"; unset HAVE_SZLIB
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_off64_t" >&5
-echo "${ECHO_T}$ac_cv_sizeof_off64_t" >&6; }
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_OFF64_T $ac_cv_sizeof_off64_t
-_ACEOF
-
-# Find a good install program. We prefer a C program (faster),
-# so one script is as good as another. But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AmigaOS /C/install, which installs bootblocks on floppy discs
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# OS/2's system install, which has a completely different semantic
-# ./install, which can be erroneously created by make from ./install.sh.
-{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
-if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in
- ./ | .// | /cC/* | \
- /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
- ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
- /usr/ucb/* ) ;;
- *)
- # OSF1 and SCO ODT 3.0 have their own names for install.
- # Don't use installbsd from OSF since it installs stuff as root
- # by default.
- for ac_prog in ginstall scoinst install; do
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
- if test $ac_prog = install &&
- grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
- # AIX install. It has an incompatible calling convention.
- :
- elif test $ac_prog = install &&
- grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
- # program-specific install script used by HP pwplus--don't use.
- :
- else
- ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
- break 3
- fi
- fi
- done
- done
+ if test -z "$HAVE_SZLIB" -a -n "$HDF5_CONFIG_ABORT"; then
+ { { $as_echo "$as_me:$LINENO: error: couldn't find szlib library" >&5
+$as_echo "$as_me: error: couldn't find szlib library" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
;;
esac
-done
-IFS=$as_save_IFS
+# Is HDF5 present (it's needed for the silo/hdf5 driver for pmesh/alec SAMI
+# files larger than 2GB until SAF is in place)? Normally check for
+# hdf5.h and libhdf5.a but skip the test if `--without-hdf5' is specified.
+# Alternate directories can be specified for hdf5.h and/or libhdf5.a by giving
+# the names like this `--with-hdf5=INC,LIB' (if only the LIB directory is
+# given then it must still be preceded by a comma).
+#
+# Checking for hdf5 is complicated by the fact that hdf5 may or may not
+# in turn depend on zlib compression lib. In and of itself, Silo does NOT
+# depend on zlib. So, we don't want -lz on the link line if zlib is either
+# not needed or, worse, not present as this generates warning messages
+# or fatal errors. So, we first test for hdf5 without -lz on the link line.
+# If this succeeds, we conclude hdf5 is present and we can build the hdf5
+# driver. If hdf5 fails, it may be that hdf5 was compiled with zlib. So, next
+# we make an independent test for zlib. If zlib fails, we conclude that the
+# failure on the hdf5 test was due to something other than lack of zlib and
+# decide libhdf5.a is NOT present and we cannot build the hdf5 driver. If
+# zlib succeeds, we re-try the hdf5 test with -lz on the link line. If that
+# succeeds, we conclude we need -lz on the link line and we can build the
+# hdf5 driver. Again, if it fails, we neither put -lz on the link line nor
+# build the hdf5 driver. One other possibility that could be tested for
+# and configure could make a reasonable comment on is to see if only the
+# binaries for hdf5 were installed AND they have zlib dependences which
+# are NOT resolvable on the platform they are installed on. This would be
+# a boneheaded thing to do, but nonetheless something that configure could
+# inform the user has gone wrong and what to do.
+#
+
+if test -n "$HDF5_DRV"; then
+ { $as_echo "$as_me:$LINENO: checking for hdf5" >&5
+$as_echo_n "checking for hdf5... " >&6; }
+ saved_CPPFLAGS="$CPPFLAGS"
+ saved_LDFLAGS="$LDFLAGS"
+ saved_LIBS="$LIBS"
+# Check whether --with-hdf5 was given.
+if test "${with_hdf5+set}" = set; then
+ withval=$with_hdf5;
+else
+ withval="default"
fi
- if test "${ac_cv_path_install+set}" = set; then
- INSTALL=$ac_cv_path_install
- else
- # As a last resort, use the slow shell script. Don't cache a
- # value for INSTALL within a source directory, because that will
- # break other packages using the cache if that directory is
- # removed, or if the value is a relative name.
- INSTALL=$ac_install_sh
- fi
-fi
-{ echo "$as_me:$LINENO: result: $INSTALL" >&5
-echo "${ECHO_T}$INSTALL" >&6; }
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
+ if test "$withval" = "no" ; then
+ { $as_echo "$as_me:$LINENO: result: suppressed" >&5
+$as_echo "suppressed" >&6; }
+ HDF5_DRV=""
+ elif test "$withval" = "default" ; then
+ if test "$DEFAULT_HDF5_LIBDIR" != "" ; then
+ LDFLAGS="$LDFLAGS -L$DEFAULT_HDF5_LIBDIR"
+ LIBS="$LIBS -lhdf5 -lz"
+ hdf5_lib=$DEFAULT_HDF5_LIBDIR
+ hdf5_explicit=true
+ fi
+ if test "$DEFAULT_HDF5_INCLUDE" != "" ; then
+ CPPFLAGS="$CPPFLAGS -I$DEFAULT_HDF5_INCLUDE"
+ hdf5_inc=$DEFAULT_HDF5_INCLUDE
+ hdf5_explicit=true
+ fi
+ if test -d "$hdf5_lib"; then
+ { $as_echo "$as_me:$LINENO: result: $hdf5_lib" >&5
+$as_echo "$hdf5_lib" >&6; }
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_HDF5_H 1
+_ACEOF
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_LIBHDF5 1
+_ACEOF
+
+ else
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+ HDF5_DRV=""
+ fi
+ elif test "$withval" = "yes" ; then
+ if test "$DEFAULT_HDF5_LIBDIR" != "" ; then
+ LDFLAGS="$LDFLAGS -L$DEFAULT_HDF5_LIBDIR"
+ LIBS="$LIBS -lhdf5 -lz"
+ hdf5_lib=$DEFAULT_HDF5_LIBDIR
+ hdf5_explicit=true
+ fi
+ if test "$DEFAULT_HDF5_INCLUDE" != "" ; then
+ CPPFLAGS="$CPPFLAGS -I$DEFAULT_HDF5_INCLUDE"
+ hdf5_inc=$DEFAULT_HDF5_INCLUDE
+ hdf5_explicit=true
+ fi
+ if test -d "$hdf5_lib"; then
+ { $as_echo "$as_me:$LINENO: result: $hdf5_lib" >&5
+$as_echo "$hdf5_lib" >&6; }
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_HDF5_H 1
+_ACEOF
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_LIBHDF5 1
+_ACEOF
+ else
+ { { $as_echo "$as_me:$LINENO: error: expected to find hdf5 environment variables" >&5
+$as_echo "$as_me: error: expected to find hdf5 environment variables" >&2;}
+ { (exit 1); exit 1; }; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+ HDF5_DRV=""
+ fi
+ else
+ { $as_echo "$as_me:$LINENO: checking for hdf5 and supporting libraries..." >&5
+$as_echo "$as_me: checking for hdf5 and supporting libraries..." >&6;}
+ hdf5_inc="`echo $withval |cut -f1 -d,`"
+ if test "$withval" != "yes" && test -n "$hdf5_inc"; then
+ hdf5_explicit=true
+ if test -d "$hdf5_inc"; then
+ CPPFLAGS="-I$hdf5_inc $CPPFLAGS"
+ else
+ { { $as_echo "$as_me:$LINENO: error: problem with directory specified for hdf5 includes" >&5
+$as_echo "$as_me: error: problem with directory specified for hdf5 includes" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ fi
+ hdf5_lib="`echo $withval |cut -f2 -d, -s`"
+ if test "$withval" != "yes" && test -n "$hdf5_lib"; then
+ hdf5_explicit=true
+ if test -d "$hdf5_lib"; then
+ if test -n "$szlib_lib"; then
+ LDFLAGS="-L$hdf5_lib -L$szlib_lib $LDFLAGS"
+ else
+ LDFLAGS="-L$hdf5_lib $LDFLAGS"
+ fi
+ else
+ { { $as_echo "$as_me:$LINENO: error: problem with directory specified for hdf5 library" >&5
+$as_echo "$as_me: error: problem with directory specified for hdf5 library" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ fi
+ notfound=""
-for ac_header in sys/time.h stdarg.h sys/stat.h
+for ac_header in hdf5.h
do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
else
# Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -23657,32 +28701,33 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_header_compiler=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_header_compiler=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
# Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -23696,51 +28741,52 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null && {
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
test ! -s conftest.err
}; then
ac_header_preproc=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_header_preproc=no
fi
rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
yes:no: )
- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
ac_header_preproc=yes
;;
no:yes:* )
- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
( cat <<\_ASBOX
## ----------------------------------------- ##
## Report this to visit-users at email.ornl.gov ##
@@ -23749,200 +28795,207 @@ _ASBOX
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
eval "$as_ac_Header=\$ac_header_preproc"
fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+as_val=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ if test "x$as_val" = x""yes; then
cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
else
- { { echo "$as_me:$LINENO: error: $0 wasn't able to find a necessary header file
-(see above). Please rectify this and rerun configure.
-See the file INSTALL_FAQ in this directory for possible reasons
-this might have happened." >&5
-echo "$as_me: error: $0 wasn't able to find a necessary header file
-(see above). Please rectify this and rerun configure.
-See the file INSTALL_FAQ in this directory for possible reasons
-this might have happened." >&2;}
- { (exit 1); exit 1; }; }
+ notfound="hdf5.h"
fi
done
-
-
-for ac_header in fcntl.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ tmp_LIBS="$LIBS"
+ if test -n "$szlib_lib"; then
+### LIBS="$hdf5_lib/libhdf5.a $LIBS"
+ LIBS="-lhdf5 -lsz $LIBS"
+ else
+ LIBS="-lhdf5 $LIBS"
+ fi
+ { $as_echo "$as_me:$LINENO: checking for H5open" >&5
+$as_echo_n "checking for H5open... " >&6; }
+if test "${ac_cv_func_H5open+set}" = set; then
+ $as_echo_n "(cached) " >&6
else
- # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+/* Define H5open to an innocuous variant, in case <limits.h> declares H5open.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define H5open innocuous_H5open
- ac_header_compiler=no
-fi
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char H5open (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
-# Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <$ac_header>
+#undef H5open
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char H5open ();
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined __stub_H5open || defined __stub___H5open
+choke me
+#endif
+
+#ifdef FC_DUMMY_MAIN
+#ifndef FC_DUMMY_MAIN_EQ_F77
+# ifdef __cplusplus
+ extern "C"
+# endif
+ int FC_DUMMY_MAIN() { return 1; }
+#endif
+#endif
+int
+main ()
+{
+return H5open ();
+ ;
+ return 0;
+}
_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
}; then
- ac_header_preproc=yes
+ ac_cv_func_H5open=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- ac_header_preproc=no
+ ac_cv_func_H5open=no
fi
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
- ( cat <<\_ASBOX
-## ----------------------------------------- ##
-## Report this to visit-users at email.ornl.gov ##
-## ----------------------------------------- ##
-_ASBOX
- ) | sed "s/^/$as_me: WARNING: /" >&2
- ;;
-esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- eval "$as_ac_Header=\$ac_header_preproc"
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_H5open" >&5
+$as_echo "$ac_cv_func_H5open" >&6; }
+if test "x$ac_cv_func_H5open" = x""yes; then
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_LIBHDF5 1
_ACEOF
+else
+ notfound="$notfound libhdf5.a"
fi
-done
-
+ if test -n "$notfound"; then
+ LIBS="$tmp_LIBS"
+ fi
+ #
+ # If the above tests did NOT find headers and lib for
+ # hdf5, it could be due to zlib, so now test for zlib
+ # MCM -- July, 2008: This code now looks completely useless
+ # It is supposed to attempt to check if '-lz' is needed to
+ # link with HDF5. However, it doesn't appear to do any of
+ # that and had a useless embedded AC_ARG_WITH in it which
+ # I removed and replaced all instances of 'withval' to the
+ # with variable the code needs, with_zlib
+ #
+ if test -n "$notfound"; then
+ # reset the compile and link flags
+ CPPFLAGS="$saved_CPPFLAGS"
+ LDFLAGS="$saved_LDFLAGS"
+ { $as_echo "$as_me:$LINENO: checking if lack of zlib caused tests for hdf5 to fail..." >&5
+$as_echo "$as_me: checking if lack of zlib caused tests for hdf5 to fail..." >&6;}
+ if test "no" = "$with_zlib"; then
+ { $as_echo "$as_me:$LINENO: checking for zlib" >&5
+$as_echo_n "checking for zlib... " >&6; }
+ { $as_echo "$as_me:$LINENO: result: suppressed" >&5
+$as_echo "suppressed" >&6; }
+ else
+ zlib_inc="`echo $with_zlibval |cut -f1 -d,`"
+ if test "$with_zlibval" != "yes" && test -n "$zlib_inc"; then
+ if test -d "$zlib_inc"; then
+ CPPFLAGS="-I$zlib_inc $CPPFLAGS"
+ else
+ { { $as_echo "$as_me:$LINENO: error: problem with directory specified for zlib includes" >&5
+$as_echo "$as_me: error: problem with directory specified for zlib includes" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ fi
+ zlib_lib="`echo $with_zlibval |cut -f2 -d, -s`"
+ if test "$with_zlibval" != "yes" && test -n "$zlib_lib"; then
+ if test -d "$zlib_lib"; then
+ LDFLAGS="-L$zlib_lib $LDFLAGS"
+ else
+ { { $as_echo "$as_me:$LINENO: error: problem with directory specified for zlib library" >&5
+$as_echo "$as_me: error: problem with directory specified for zlib library" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ fi
+ notfound=""
+ if test -z "`echo $LIBS | tr ' ' '\n' | grep -x -e '-lz'`"; then
-for ac_header in sys/fcntl.h
+for ac_header in zlib.h
do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
else
# Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -23958,32 +29011,33 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_header_compiler=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_header_compiler=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
# Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -23997,51 +29051,52 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null && {
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
test ! -s conftest.err
}; then
ac_header_preproc=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_header_preproc=no
fi
rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
yes:no: )
- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
ac_header_preproc=yes
;;
no:yes:* )
- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
( cat <<\_ASBOX
## ----------------------------------------- ##
## Report this to visit-users at email.ornl.gov ##
@@ -24050,58 +29105,176 @@ _ASBOX
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
eval "$as_ac_Header=\$ac_header_preproc"
fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+as_val=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ if test "x$as_val" = x""yes; then
cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
+else
+ notfound="zlib.h"
fi
done
-if test ! "$ac_cv_header_fcntl_h"="yes" && test ! "$ac_cv_header_sys_fcntl_h"="yes" ; then
-{ { echo "$as_me:$LINENO: error: $0 wasn't able to find a necessary fcntl.h or
-sys/fcntl.h header file.
-Please rectify this and rerun configure.
-See the file INSTALL_FAQ in this directory for possible reasons
-this might have happened." >&5
-echo "$as_me: error: $0 wasn't able to find a necessary fcntl.h or
-sys/fcntl.h header file.
-Please rectify this and rerun configure.
-See the file INSTALL_FAQ in this directory for possible reasons
-this might have happened." >&2;}
- { (exit 1); exit 1; }; }
+
+{ $as_echo "$as_me:$LINENO: checking for compress2 in -lz" >&5
+$as_echo_n "checking for compress2 in -lz... " >&6; }
+if test "${ac_cv_lib_z_compress2+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lz $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char compress2 ();
+#ifdef FC_DUMMY_MAIN
+#ifndef FC_DUMMY_MAIN_EQ_F77
+# ifdef __cplusplus
+ extern "C"
+# endif
+ int FC_DUMMY_MAIN() { return 1; }
+#endif
+#endif
+int
+main ()
+{
+return compress2 ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+ ac_cv_lib_z_compress2=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_z_compress2=no
fi
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_z_compress2" >&5
+$as_echo "$ac_cv_lib_z_compress2" >&6; }
+if test "x$ac_cv_lib_z_compress2" = x""yes; then
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBZ 1
+_ACEOF
-for ac_header in fnmatch.h
+ LIBS="-lz $LIBS"
+
+else
+ notfound="$notfound libz.a"
+fi
+
+ fi
+ fi
+ #
+ # If libz was not found, the failure of hdf5 must be something else.
+ #
+ if test -n "$notfound"; then
+ CPPFLAGS="$saved_CPPFLAGS"
+ LDFLAGS="$saved_LDFLAGS"
+ HDF5_DRV=""
+ if test -n "$hdf5_explicit"; then
+ { { $as_echo "$as_me:$LINENO: error:
+You have made an explicit request for hdf5 with the --with-hdf option
+and $0 is unable to find hdf5 and its supporting libs, if any.
+Please see INSTALL_FAQ for possible causes." >&5
+$as_echo "$as_me: error:
+You have made an explicit request for hdf5 with the --with-hdf option
+and $0 is unable to find hdf5 and its supporting libs, if any.
+Please see INSTALL_FAQ for possible causes." >&2;}
+ { (exit 1); exit 1; }; }
+ else
+ { $as_echo "$as_me:$LINENO: WARNING: hdf5 driver disabled" >&5
+$as_echo "$as_me: WARNING: hdf5 driver disabled" >&2;}
+ fi
+ else
+ # we unset these to defeat autoconf's cache
+ unset ac_cv_header_hdf5_h
+ unset ac_cv_lib_hdf5_H5open
+ #
+ # Now, retest for hdf5 with zlib
+ #
+ if test -n "$hdf5_inc"; then
+ CPPFLAGS="-I$hdf5_inc $CPPFLAGS"
+ fi
+ if test -n "$hdf5_lib"; then
+ if test -n "$szlib_lib"; then
+ LDFLAGS="-L$hdf5_lib -L$szlib_lib $LDFLAGS"
+ else
+ LDFLAGS="-L$hdf5_lib $LDFLAGS"
+ fi
+ fi
+ notfound=""
+
+for ac_header in hdf5.h
do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
else
# Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -24117,32 +29290,33 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_header_compiler=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_header_compiler=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
# Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -24156,51 +29330,52 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null && {
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
test ! -s conftest.err
}; then
ac_header_preproc=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_header_preproc=no
fi
rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
yes:no: )
- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
ac_header_preproc=yes
;;
no:yes:* )
- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
( cat <<\_ASBOX
## ----------------------------------------- ##
## Report this to visit-users at email.ornl.gov ##
@@ -24209,190 +29384,314 @@ _ASBOX
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
eval "$as_ac_Header=\$ac_header_preproc"
fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+as_val=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ if test "x$as_val" = x""yes; then
cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
+else
+ notfound="hdf5.h"
fi
done
+ tmp_LIBS="$LIBS"
-for ac_header in ieeefp.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for H5open in -lhdf5" >&5
+$as_echo_n "checking for H5open in -lhdf5... " >&6; }
+if test "${ac_cv_lib_hdf5_H5open+set}" = set; then
+ $as_echo_n "(cached) " >&6
else
- # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lhdf5 $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-$ac_includes_default
-#include <$ac_header>
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char H5open ();
+#ifdef FC_DUMMY_MAIN
+#ifndef FC_DUMMY_MAIN_EQ_F77
+# ifdef __cplusplus
+ extern "C"
+# endif
+ int FC_DUMMY_MAIN() { return 1; }
+#endif
+#endif
+int
+main ()
+{
+return H5open ();
+ ;
+ return 0;
+}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+ ac_cv_lib_hdf5_H5open=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- ac_header_compiler=no
+ ac_cv_lib_hdf5_H5open=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_hdf5_H5open" >&5
+$as_echo "$ac_cv_lib_hdf5_H5open" >&6; }
+if test "x$ac_cv_lib_hdf5_H5open" = x""yes; then
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBHDF5 1
+_ACEOF
+
+ LIBS="-lhdf5 $LIBS"
+
+else
+ notfound="$notfound libhdf5.a"
+fi
+
+ if test "$notfound" = ""; then
+ if test -n "$szlib_lib"; then
+### LIBS="$hdf5_lib/libhdf5.a $tmp_LIBS"
+ LIBS="-lhdf5 -lsz $tmp_LIBS"
+ else
+ LIBS="-lhdf5 $tmp_LIBS"
+ fi
+ fi
+ if test -n "$notfound"; then
+ CPPFLAGS="$saved_CPPFLAGS"
+ LDFLAGS="$saved_LDFLAGS"
+ HDF5_DRV=""
+ if test -n "$hdf5_explicit"; then
+ { { $as_echo "$as_me:$LINENO: error:
+You have made an explicit request for hdf5 with the --with-hdf option
+and $0 is unable to find hdf5 and its supporting libs, if any.
+Please see INSTALL_FAQ for possible causes." >&5
+$as_echo "$as_me: error:
+You have made an explicit request for hdf5 with the --with-hdf option
+and $0 is unable to find hdf5 and its supporting libs, if any.
+Please see INSTALL_FAQ for possible causes." >&2;}
+ { (exit 1); exit 1; }; }
+ else
+ { $as_echo "$as_me:$LINENO: WARNING: hdf5 driver disabled" >&5
+$as_echo "$as_me: WARNING: hdf5 driver disabled" >&2;}
+ fi
+ fi
+ fi # if test -n "$notfound" (for second hdf5 test)
+ fi # if test -n "$notfound" (for zlib)
+ fi # if test "no" = "$withval"
+fi # if test -n "$HDF5_DRV"
+
+# Check to see if the results of the above tests found the HDF5 libraries
+if test -n "$HDF5_DRV"; then
+ # Short-term hack to deal with bogus code above (too complex)
+ # putting -lsz AHEAD of -lhdf5 in libs
+ if test "$HAVE_SZLIB" = "yes"; then
+ LIBS="$LIBS -lsz"
+ fi
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_HDF5_DRIVER 1
+_ACEOF
+
+else
+ LIBS="$saved_LIBS"
+fi
+
+
+# Check whether --with-pdb-proper was given.
+if test "${with_pdb_proper+set}" = set; then
+ withval=$with_pdb_proper; if test $withval != yes; then
+ PDBP_DRV="pdbp_drv"
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_PDBP_DRIVER 1
+_ACEOF
+
+
+ CPPFLAGS="-I$withval/include $CPPFLAGS"
+ LDFLAGS="-L$withval/lib $LDFLAGS"
+ LIBS="-lpdb -lpml -lscore $LIBS"
+ else
+ { { $as_echo "$as_me:$LINENO: error: You must specify a directory for PDB proper" >&5
+$as_echo "$as_me: error: You must specify a directory for PDB proper" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-# Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
+READLINE_LIBS=""
+if test "X$detect_readline" = Xyes; then
+# use contributed GNU m4 macro library provided see:
+# autoconf-archive-2006-06-04/htmldoc/vl_lib_readline.html
+ saved_LIBS="$LIBS"
+
+ { $as_echo "$as_me:$LINENO: checking for a readline compatible library" >&5
+$as_echo_n "checking for a readline compatible library... " >&6; }
+if test "${vl_cv_lib_readline+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+
+ ORIG_LIBS="$LIBS"
+ for readline_lib in readline edit editline; do
+ for termcap_lib in "" termcap curses ncurses; do
+ if test -z "$termcap_lib"; then
+ TRY_LIB="-l$readline_lib"
+ else
+ TRY_LIB="-l$readline_lib -l$termcap_lib"
+ fi
+ LIBS="$ORIG_LIBS $TRY_LIB"
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <$ac_header>
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char readline ();
+#ifdef FC_DUMMY_MAIN
+#ifndef FC_DUMMY_MAIN_EQ_F77
+# ifdef __cplusplus
+ extern "C"
+# endif
+ int FC_DUMMY_MAIN() { return 1; }
+#endif
+#endif
+int
+main ()
+{
+return readline ();
+ ;
+ return 0;
+}
_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
}; then
- ac_header_preproc=yes
+ vl_cv_lib_readline="$TRY_LIB"
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
- ( cat <<\_ASBOX
-## ----------------------------------------- ##
-## Report this to visit-users at email.ornl.gov ##
-## ----------------------------------------- ##
-_ASBOX
- ) | sed "s/^/$as_me: WARNING: /" >&2
- ;;
-esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- eval "$as_ac_Header=\$ac_header_preproc"
fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ if test -n "$vl_cv_lib_readline"; then
+ break
+ fi
+ done
+ if test -n "$vl_cv_lib_readline"; then
+ break
+ fi
+ done
+ if test -z "$vl_cv_lib_readline"; then
+ vl_cv_lib_readline="no"
+ LIBS="$ORIG_LIBS"
+ fi
fi
+{ $as_echo "$as_me:$LINENO: result: $vl_cv_lib_readline" >&5
+$as_echo "$vl_cv_lib_readline" >&6; }
-done
+ if test "$vl_cv_lib_readline" != "no"; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_LIBREADLINE 1
+_ACEOF
-for ac_header in sys/types.h unistd.h
+for ac_header in readline.h readline/readline.h
do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
else
# Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -24408,32 +29707,33 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_header_compiler=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_header_compiler=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
# Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -24447,51 +29747,52 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null && {
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
test ! -s conftest.err
}; then
ac_header_preproc=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_header_preproc=no
fi
rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
yes:no: )
- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
ac_header_preproc=yes
;;
no:yes:* )
- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
( cat <<\_ASBOX
## ----------------------------------------- ##
## Report this to visit-users at email.ornl.gov ##
@@ -24500,43 +29801,51 @@ _ASBOX
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
eval "$as_ac_Header=\$ac_header_preproc"
fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+as_val=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ if test "x$as_val" = x""yes; then
cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
fi
done
-{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
-if test "${ac_cv_header_stdc+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:$LINENO: checking whether readline supports history" >&5
+$as_echo_n "checking whether readline supports history... " >&6; }
+if test "${vl_cv_lib_readline_history+set}" = set; then
+ $as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
+
+ vl_cv_lib_readline_history="no"
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char add_history ();
#ifdef FC_DUMMY_MAIN
#ifndef FC_DUMMY_MAIN_EQ_F77
# ifdef __cplusplus
@@ -24548,416 +29857,699 @@ cat >>conftest.$ac_ext <<_ACEOF
int
main ()
{
-
+return add_history ();
;
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_header_stdc=yes
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+ vl_cv_lib_readline_history="yes"
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- ac_cv_header_stdc=no
+
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
-if test $ac_cv_header_stdc = yes; then
- # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <string.h>
+fi
+{ $as_echo "$as_me:$LINENO: result: $vl_cv_lib_readline_history" >&5
+$as_echo "$vl_cv_lib_readline_history" >&6; }
+ if test "$vl_cv_lib_readline_history" = "yes"; then
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_READLINE_HISTORY 1
_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "memchr" >/dev/null 2>&1; then
- :
-else
- ac_cv_header_stdc=no
-fi
-rm -f conftest*
-fi
-if test $ac_cv_header_stdc = yes; then
- # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
- cat >conftest.$ac_ext <<_ACEOF
+
+for ac_header in history.h readline/history.h
+do
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ $as_echo_n "(cached) " >&6
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+else
+ # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <stdlib.h>
-
+$ac_includes_default
+#include <$ac_header>
_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "free" >/dev/null 2>&1; then
- :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
else
- ac_cv_header_stdc=no
-fi
-rm -f conftest*
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+ ac_header_compiler=no
fi
-if test $ac_cv_header_stdc = yes; then
- # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
- if test "$cross_compiling" = yes; then
- :
-else
- cat >conftest.$ac_ext <<_ACEOF
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <ctype.h>
-#include <stdlib.h>
-#if ((' ' & 0x0FF) == 0x020)
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#else
-# define ISLOWER(c) \
- (('a' <= (c) && (c) <= 'i') \
- || ('j' <= (c) && (c) <= 'r') \
- || ('s' <= (c) && (c) <= 'z'))
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-#endif
-
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int
-main ()
-{
- int i;
- for (i = 0; i < 256; i++)
- if (XOR (islower (i), ISLOWER (i))
- || toupper (i) != TOUPPER (i))
- return 2;
- return 0;
-}
+#include <$ac_header>
_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
+if { (ac_try="$ac_cpp conftest.$ac_ext"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- :
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
else
- echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-( exit $ac_status )
-ac_cv_header_stdc=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ ac_header_preproc=no
fi
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+ ( cat <<\_ASBOX
+## ----------------------------------------- ##
+## Report this to visit-users at email.ornl.gov ##
+## ----------------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ $as_echo_n "(cached) " >&6
+else
+ eval "$as_ac_Header=\$ac_header_preproc"
fi
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
-if test $ac_cv_header_stdc = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
-cat >>confdefs.h <<\_ACEOF
-#define STDC_HEADERS 1
+fi
+as_val=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ if test "x$as_val" = x""yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
fi
+done
-if false; then
+ fi
+ fi
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_FCLOSE_POINTER 1
-_ACEOF
+ # Put only the stuff NOT already in $LIBS into READLINE_LIBS
+ saved_LIBS_grep=$(echo $saved_LIBS | tr -s ' ' | sed 's% %\\|%g')
+ READLINE_LIBS=$(echo $LIBS | tr -s ' ' | tr ' ' '\n' | grep -v -e $saved_LIBS_grep | tr '\n' ' ')
+ LIBS="$saved_LIBS"
+else
+ { $as_echo "$as_me:$LINENO: checking for readline" >&5
+$as_echo_n "checking for readline... " >&6; }
+ { $as_echo "$as_me:$LINENO: result: disabled" >&5
+$as_echo "disabled" >&6; }
+fi
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_FFLUSH_POINTER 1
-_ACEOF
+if test -n "$PYTHONMODULE"; then
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_FOPEN_POINTER 1
-_ACEOF
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_FPRINTF_POINTER 1
-_ACEOF
+ if test -n "$PYTHON"; then
+ # If the user set $PYTHON, use it and don't search something else.
+ { $as_echo "$as_me:$LINENO: checking whether $PYTHON version >= 2.1" >&5
+$as_echo_n "checking whether $PYTHON version >= 2.1... " >&6; }
+ prog="import sys
+# split strings by '.' and convert to numeric. Append some zeros
+# because we need at least 4 digits for the hex conversion.
+# map returns an iterator in Python 3.0 and a list in 2.x
+minver = list(map(int, '2.1'.split('.'))) + [0, 0, 0]
+minverhex = 0
+# xrange is not present in Python 3.0 and range returns an iterator
+for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[i]
+sys.exit(sys.hexversion < minverhex)"
+ if { echo "$as_me:$LINENO: $PYTHON -c "$prog"" >&5
+ ($PYTHON -c "$prog") >&5 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+ { { $as_echo "$as_me:$LINENO: error: too old" >&5
+$as_echo "$as_me: error: too old" >&2;}
+ { (exit 1); exit 1; }; }
+fi
+ am_display_PYTHON=$PYTHON
+ else
+ # Otherwise, try each interpreter until we find one that satisfies
+ # VERSION.
+ { $as_echo "$as_me:$LINENO: checking for a Python interpreter with version >= 2.1" >&5
+$as_echo_n "checking for a Python interpreter with version >= 2.1... " >&6; }
+if test "${am_cv_pathless_PYTHON+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_FREAD_POINTER 1
-_ACEOF
+ for am_cv_pathless_PYTHON in python python2 python3 python3.0 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do
+ test "$am_cv_pathless_PYTHON" = none && break
+ prog="import sys
+# split strings by '.' and convert to numeric. Append some zeros
+# because we need at least 4 digits for the hex conversion.
+# map returns an iterator in Python 3.0 and a list in 2.x
+minver = list(map(int, '2.1'.split('.'))) + [0, 0, 0]
+minverhex = 0
+# xrange is not present in Python 3.0 and range returns an iterator
+for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[i]
+sys.exit(sys.hexversion < minverhex)"
+ if { echo "$as_me:$LINENO: $am_cv_pathless_PYTHON -c "$prog"" >&5
+ ($am_cv_pathless_PYTHON -c "$prog") >&5 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ break
+fi
+
+ done
+fi
+{ $as_echo "$as_me:$LINENO: result: $am_cv_pathless_PYTHON" >&5
+$as_echo "$am_cv_pathless_PYTHON" >&6; }
+ # Set $PYTHON to the absolute path of $am_cv_pathless_PYTHON.
+ if test "$am_cv_pathless_PYTHON" = none; then
+ PYTHON=:
+ else
+ # Extract the first word of "$am_cv_pathless_PYTHON", so it can be a program name with args.
+set dummy $am_cv_pathless_PYTHON; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_PYTHON+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ case $PYTHON in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_PYTHON="$PYTHON" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+ ;;
+esac
+fi
+PYTHON=$ac_cv_path_PYTHON
+if test -n "$PYTHON"; then
+ { $as_echo "$as_me:$LINENO: result: $PYTHON" >&5
+$as_echo "$PYTHON" >&6; }
+else
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_FSEEK_POINTER 1
-_ACEOF
+
+ fi
+ am_display_PYTHON=$am_cv_pathless_PYTHON
+ fi
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_SETVBUF_POINTER 1
-_ACEOF
+ if test "$PYTHON" = :; then
+ :
+ else
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_FTELL_POINTER 1
-_ACEOF
+ { $as_echo "$as_me:$LINENO: checking for $am_display_PYTHON version" >&5
+$as_echo_n "checking for $am_display_PYTHON version... " >&6; }
+if test "${am_cv_python_version+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"`
+fi
+{ $as_echo "$as_me:$LINENO: result: $am_cv_python_version" >&5
+$as_echo "$am_cv_python_version" >&6; }
+ PYTHON_VERSION=$am_cv_python_version
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_FWRITE_POINTER 1
-_ACEOF
+ PYTHON_PREFIX='${prefix}'
+
+ PYTHON_EXEC_PREFIX='${exec_prefix}'
+
+
+
+ { $as_echo "$as_me:$LINENO: checking for $am_display_PYTHON platform" >&5
+$as_echo_n "checking for $am_display_PYTHON platform... " >&6; }
+if test "${am_cv_python_platform+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"`
fi
+{ $as_echo "$as_me:$LINENO: result: $am_cv_python_platform" >&5
+$as_echo "$am_cv_python_platform" >&6; }
+ PYTHON_PLATFORM=$am_cv_python_platform
-for function in fclose fflush fopen fprintf fread fseek setvbuf ftell fwrite
-do
- cap_func="`echo ${function}|tr [a-z] [A-Z]`"
- cache_name="`echo vc_cv_${function}_pointer`"
- have_name="`echo HAVE_${cap_func}_POINTER`"
- { echo "$as_me:$LINENO: checking for $function function pointer" >&5
-echo $ECHO_N "checking for $function function pointer... $ECHO_C" >&6; }
- if { as_var=$cache_name; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+
+ { $as_echo "$as_me:$LINENO: checking for $am_display_PYTHON script directory" >&5
+$as_echo_n "checking for $am_display_PYTHON script directory... " >&6; }
+if test "${am_cv_python_pythondir+set}" = set; then
+ $as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <stdio.h>
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-# ifdef __cplusplus
- extern "C"
-# endif
- int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
- int (*f)() = (int(*)())$function;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- eval $cache_name=yes
+ if test "x$prefix" = xNONE
+ then
+ am_py_prefix=$ac_default_prefix
+ else
+ am_py_prefix=$prefix
+ fi
+ am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 2>/dev/null ||
+ echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
+ case $am_cv_python_pythondir in
+ $am_py_prefix*)
+ am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`
+ am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"`
+ ;;
+ *)
+ case $am_py_prefix in
+ /usr|/System*) ;;
+ *)
+ am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages
+ ;;
+ esac
+ ;;
+ esac
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $am_cv_python_pythondir" >&5
+$as_echo "$am_cv_python_pythondir" >&6; }
+ pythondir=$am_cv_python_pythondir
+
+
+
+ pkgpythondir=\${pythondir}/$PACKAGE
+
+
+ { $as_echo "$as_me:$LINENO: checking for $am_display_PYTHON extension module directory" >&5
+$as_echo_n "checking for $am_display_PYTHON extension module directory... " >&6; }
+if test "${am_cv_python_pyexecdir+set}" = set; then
+ $as_echo_n "(cached) " >&6
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+ if test "x$exec_prefix" = xNONE
+ then
+ am_py_exec_prefix=$am_py_prefix
+ else
+ am_py_exec_prefix=$exec_prefix
+ fi
+ am_cv_python_pyexecdir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(1,0,prefix='$am_py_exec_prefix'))" 2>/dev/null ||
+ echo "$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
+ case $am_cv_python_pyexecdir in
+ $am_py_exec_prefix*)
+ am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`
+ am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"`
+ ;;
+ *)
+ case $am_py_exec_prefix in
+ /usr|/System*) ;;
+ *)
+ am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages
+ ;;
+ esac
+ ;;
+ esac
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $am_cv_python_pyexecdir" >&5
+$as_echo "$am_cv_python_pyexecdir" >&6; }
+ pyexecdir=$am_cv_python_pyexecdir
+
+
+
+ pkgpyexecdir=\${pyexecdir}/$PACKAGE
+
+
- eval $cache_name=no
+ fi
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+# Check for Python include path
+#
+ { $as_echo "$as_me:$LINENO: checking for Python include path" >&5
+$as_echo_n "checking for Python include path... " >&6; }
+ if test -z "$PYTHON_CPPFLAGS"; then
+ python_path=`$PYTHON -c "import distutils.sysconfig; \
+ print distutils.sysconfig.get_python_inc();"`
+ if test -n "${python_path}"; then
+ python_path="-I$python_path"
+ fi
+ PYTHON_CPPFLAGS=$python_path
+ fi
+ { $as_echo "$as_me:$LINENO: result: $PYTHON_CPPFLAGS" >&5
+$as_echo "$PYTHON_CPPFLAGS" >&6; }
fi
- if eval "test \"`echo '$''{'$cache_name'}'`\" = no"; then
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
- else
+# skip for now
+#ACX_MPI
+
+# Create a bundle target for Darwin
+BUNDLE_TARGET=""
+case $host_os in
+ darwin*)
+ BUNDLE_TARGET="silo.app"
+ ;;
+esac
+
+
+cat >confcache <<\_ACEOF
+# This file is a shell script that caches the results of configure
+# tests run on this system so they can be shared between configure
+# scripts and configure runs, see configure's option --config-cache.
+# It is not useful on other systems. If it contains results you don't
+# want to keep, you may remove or edit it.
+#
+# config.status only pays attention to the cache file if you give it
+# the --recheck option to rerun configure.
+#
+# `ac_cv_env_foo' variables (set or unset) will be overridden when
+# loading this file, other *unset* `ac_cv_foo' will be assigned the
+# following values.
-cat >>confdefs.h <<_ACEOF
-#define ${have_name} 1
_ACEOF
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
- fi
-done
+# The following way of writing the cache mishandles newlines in values,
+# but we know of no workaround that is simple, portable, and efficient.
+# So, we kill variables containing newlines.
+# Ultrix sh set writes to stderr and can't be redirected directly,
+# and sets the high bit in the cache file unless we assign to the vars.
+(
+ for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
+ eval ac_val=\$$ac_var
+ case $ac_val in #(
+ *${as_nl}*)
+ case $ac_var in #(
+ *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+ esac
+ case $ac_var in #(
+ _ | IFS | as_nl) ;; #(
+ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+ *) $as_unset $ac_var ;;
+ esac ;;
+ esac
+ done
+ (set) 2>&1 |
+ case $as_nl`(ac_space=' '; set) 2>&1` in #(
+ *${as_nl}ac_space=\ *)
+ # `set' does not quote correctly, so add quotes (double-quote
+ # substitution turns \\\\ into \\, and sed turns \\ into \).
+ sed -n \
+ "s/'/'\\\\''/g;
+ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+ ;; #(
+ *)
+ # `set' quotes correctly as required by POSIX, so do not add quotes.
+ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+ ;;
+ esac |
+ sort
+) |
+ sed '
+ /^ac_cv_env_/b end
+ t clear
+ :clear
+ s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+ t end
+ s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+ :end' >>confcache
+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
+ if test -w "$cache_file"; then
+ test "x$cache_file" != "x/dev/null" &&
+ { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
+$as_echo "$as_me: updating cache $cache_file" >&6;}
+ cat confcache >$cache_file
+ else
+ { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+ fi
+fi
+rm -f confcache
+ if test "$INSTLITE" = "yes"; then
+ INSTALL_LITE_HEADERS_TRUE=
+ INSTALL_LITE_HEADERS_FALSE='#'
+else
+ INSTALL_LITE_HEADERS_TRUE='#'
+ INSTALL_LITE_HEADERS_FALSE=
+fi
+ if test -n "$NETCDF"; then
+ NETCDF_NEEDED_TRUE=
+ NETCDF_NEEDED_FALSE='#'
+else
+ NETCDF_NEEDED_TRUE='#'
+ NETCDF_NEEDED_FALSE=
+fi
+ if test -n "$PDB_DRV"; then
+ PDB_DRV_NEEDED_TRUE=
+ PDB_DRV_NEEDED_FALSE='#'
+else
+ PDB_DRV_NEEDED_TRUE='#'
+ PDB_DRV_NEEDED_FALSE=
+fi
+ if test -n "$PDBP_DRV"; then
+ PDBP_DRV_NEEDED_TRUE=
+ PDBP_DRV_NEEDED_FALSE='#'
+else
+ PDBP_DRV_NEEDED_TRUE='#'
+ PDBP_DRV_NEEDED_FALSE=
+fi
-for ac_func in memmove fnmatch isnan fpclass strerror
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ if test -n "$TAURUS"; then
+ TAURUS_NEEDED_TRUE=
+ TAURUS_NEEDED_FALSE='#'
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
+ TAURUS_NEEDED_TRUE='#'
+ TAURUS_NEEDED_FALSE=
+fi
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
+ if test -n "$HDF5_DRV"; then
+ HDF5_DRV_NEEDED_TRUE=
+ HDF5_DRV_NEEDED_FALSE='#'
+else
+ HDF5_DRV_NEEDED_TRUE='#'
+ HDF5_DRV_NEEDED_FALSE=
+fi
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
+ if test -n "$BROWSER"; then
+ BROWSER_NEEDED_TRUE=
+ BROWSER_NEEDED_FALSE='#'
+else
+ BROWSER_NEEDED_TRUE='#'
+ BROWSER_NEEDED_FALSE=
+fi
-#undef $ac_func
+ if test -n "$PYTHONMODULE"; then
+ PYTHON_NEEDED_TRUE=
+ PYTHON_NEEDED_FALSE='#'
+else
+ PYTHON_NEEDED_TRUE='#'
+ PYTHON_NEEDED_FALSE=
+fi
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
+ if test -n "$FORTRAN"; then
+ FORTRAN_NEEDED_TRUE=
+ FORTRAN_NEEDED_FALSE='#'
+else
+ FORTRAN_NEEDED_TRUE='#'
+ FORTRAN_NEEDED_FALSE=
+fi
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-# ifdef __cplusplus
- extern "C"
-# endif
- int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
-return $ac_func ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- eval "$as_ac_var=yes"
+ if test -n "$SILEX"; then
+ SILEX_NEEDED_TRUE=
+ SILEX_NEEDED_FALSE='#'
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+ SILEX_NEEDED_TRUE='#'
+ SILEX_NEEDED_FALSE=
+fi
- eval "$as_ac_var=no"
+ if test -n "$HZIP"; then
+ HZIP_NEEDED_TRUE=
+ HZIP_NEEDED_FALSE='#'
+else
+ HZIP_NEEDED_TRUE='#'
+ HZIP_NEEDED_FALSE=
fi
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+ if test -n "$FPZIP"; then
+ FPZIP_NEEDED_TRUE=
+ FPZIP_NEEDED_FALSE='#'
+else
+ FPZIP_NEEDED_TRUE='#'
+ FPZIP_NEEDED_FALSE=
fi
-ac_res=`eval echo '${'$as_ac_var'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
+ if test -n "$ZLIB"; then
+ ZLIB_AVAILABLE_TRUE=
+ ZLIB_AVAILABLE_FALSE='#'
+else
+ ZLIB_AVAILABLE_TRUE='#'
+ ZLIB_AVAILABLE_FALSE=
fi
-done
+ if test "$enable_shared" = "no" -a \( -n "$FPZIP" -o -n "$HZIP" \); then
+ CXX_LINK_NEEDED_TRUE=
+ CXX_LINK_NEEDED_FALSE='#'
+else
+ CXX_LINK_NEEDED_TRUE='#'
+ CXX_LINK_NEEDED_FALSE=
+fi
-{ echo "$as_me:$LINENO: checking if setjmp and longjmp work" >&5
-echo $ECHO_N "checking if setjmp and longjmp work... $ECHO_C" >&6; }
-if test -n "$SETJMP_OVERRIDE"; then
- { echo "$as_me:$LINENO: result: no. Replacing with _setjmp and _longjmp." >&5
-echo "${ECHO_T}no. Replacing with _setjmp and _longjmp." >&6; }
+ac_config_files="$ac_config_files Makefile SiloWindows/Makefile svn_bin/Makefile config/Makefile config-site/Makefile docs/Makefile src/Makefile src/score/Makefile src/pdb/Makefile src/silo/Makefile src/silo/silo.h src/debug/Makefile src/netcdf/Makefile src/pdb_drv/Makefile src/pdbp_drv/Makefile src/hdf5_drv/Makefile src/taurus/Makefile src/unknown/Makefile src/filters/Makefile tests/Makefile tools/Makefile tools/browser/Makefile tools/python/Makefile tools/silex/Makefile tools/silock/Makefile"
-cat >>confdefs.h <<\_ACEOF
-#define setjmp _setjmp
-_ACEOF
+if test -n "$HZIP"; then
+ ac_config_files="$ac_config_files src/hzip/Makefile"
+fi
+if test -n "$FPZIP"; then
+ ac_config_files="$ac_config_files src/fpzip/Makefile"
-cat >>confdefs.h <<\_ACEOF
-#define longjmp _longjmp
-_ACEOF
+fi
+if test -n "$HDF5_DRV"; then
+ ac_config_files="$ac_config_files src/libsiloh5.settings"
else
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+ ac_config_files="$ac_config_files src/libsilo.settings"
+
+fi
+CC_FULLPATH=""
+if test -n "$CC"; then
+ CC_FULLPATH=`which $CC`
+fi
+CXX_FULLPATH=""
+if test -n "$CXX"; then
+ CXX_FULLPATH=`which $CXX`
+fi
+FC_FULLPATH=""
+if test -n "$FC"; then
+ FC_FULLPATH=`which $FC`
fi
+
+
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
# tests run on this system so they can be shared between configure
@@ -24985,4113 +30577,3196 @@ _ACEOF
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
- *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
- esac
- case $ac_var in #(
- _ | IFS | as_nl) ;; #(
- *) $as_unset $ac_var ;;
- esac ;;
- esac
- done
-
- (set) 2>&1 |
- case $as_nl`(ac_space=' '; set) 2>&1` in #(
- *${as_nl}ac_space=\ *)
- # `set' does not quote correctly, so add quotes (double-quote
- # substitution turns \\\\ into \\, and sed turns \\ into \).
- sed -n \
- "s/'/'\\\\''/g;
- s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
- ;; #(
- *)
- # `set' quotes correctly as required by POSIX, so do not add quotes.
- sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
- ;;
- esac |
- sort
-) |
- sed '
- /^ac_cv_env_/b end
- t clear
- :clear
- s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
- t end
- s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
- :end' >>confcache
-if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
- if test -w "$cache_file"; then
- test "x$cache_file" != "x/dev/null" &&
- { echo "$as_me:$LINENO: updating cache $cache_file" >&5
-echo "$as_me: updating cache $cache_file" >&6;}
- cat confcache >$cache_file
- else
- { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
-echo "$as_me: not updating unwritable cache $cache_file" >&6;}
- fi
-fi
-rm -f confcache
-
-LIBM=
-case $host in
-*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
- # These system don't have libm, or don't need it
- ;;
-*-ncr-sysv4.3*)
- { echo "$as_me:$LINENO: checking for _mwvalidcheckl in -lmw" >&5
-echo $ECHO_N "checking for _mwvalidcheckl in -lmw... $ECHO_C" >&6; }
-if test "${ac_cv_lib_mw__mwvalidcheckl+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lmw $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char _mwvalidcheckl ();
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-# ifdef __cplusplus
- extern "C"
-# endif
- int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
-return _mwvalidcheckl ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- ac_cv_lib_mw__mwvalidcheckl=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_mw__mwvalidcheckl=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_mw__mwvalidcheckl" >&5
-echo "${ECHO_T}$ac_cv_lib_mw__mwvalidcheckl" >&6; }
-if test $ac_cv_lib_mw__mwvalidcheckl = yes; then
- LIBM="-lmw"
-fi
-
- { echo "$as_me:$LINENO: checking for cos in -lm" >&5
-echo $ECHO_N "checking for cos in -lm... $ECHO_C" >&6; }
-if test "${ac_cv_lib_m_cos+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lm $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char cos ();
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-# ifdef __cplusplus
- extern "C"
-# endif
- int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
-return cos ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- ac_cv_lib_m_cos=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_m_cos=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_m_cos" >&5
-echo "${ECHO_T}$ac_cv_lib_m_cos" >&6; }
-if test $ac_cv_lib_m_cos = yes; then
- LIBM="$LIBM -lm"
-fi
-
- ;;
-*)
- { echo "$as_me:$LINENO: checking for cos in -lm" >&5
-echo $ECHO_N "checking for cos in -lm... $ECHO_C" >&6; }
-if test "${ac_cv_lib_m_cos+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lm $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char cos ();
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-# ifdef __cplusplus
- extern "C"
-# endif
- int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
-return cos ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- ac_cv_lib_m_cos=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+ *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+ esac
+ case $ac_var in #(
+ _ | IFS | as_nl) ;; #(
+ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+ *) $as_unset $ac_var ;;
+ esac ;;
+ esac
+ done
- ac_cv_lib_m_cos=no
+ (set) 2>&1 |
+ case $as_nl`(ac_space=' '; set) 2>&1` in #(
+ *${as_nl}ac_space=\ *)
+ # `set' does not quote correctly, so add quotes (double-quote
+ # substitution turns \\\\ into \\, and sed turns \\ into \).
+ sed -n \
+ "s/'/'\\\\''/g;
+ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+ ;; #(
+ *)
+ # `set' quotes correctly as required by POSIX, so do not add quotes.
+ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+ ;;
+ esac |
+ sort
+) |
+ sed '
+ /^ac_cv_env_/b end
+ t clear
+ :clear
+ s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+ t end
+ s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+ :end' >>confcache
+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
+ if test -w "$cache_file"; then
+ test "x$cache_file" != "x/dev/null" &&
+ { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
+$as_echo "$as_me: updating cache $cache_file" >&6;}
+ cat confcache >$cache_file
+ else
+ { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+ fi
fi
+rm -f confcache
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_m_cos" >&5
-echo "${ECHO_T}$ac_cv_lib_m_cos" >&6; }
-if test $ac_cv_lib_m_cos = yes; then
- LIBM="-lm"
-fi
+test "x$prefix" = xNONE && prefix=$ac_default_prefix
+# Let make expand exec_prefix.
+test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
- ;;
-esac
+DEFS=-DHAVE_CONFIG_H
-LIBS="$LIBS $LIBM"
+ac_libobjs=
+ac_ltlibobjs=
+for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
+ # 1. Remove the extension, and $U if already installed.
+ ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
+ ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
+ # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
+ # will be set to the directory where LIBOBJS objects are built.
+ ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
+ ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
+done
+LIBOBJS=$ac_libobjs
+
+LTLIBOBJS=$ac_ltlibobjs
-# Check whether --with-szlib was given.
-if test "${with_szlib+set}" = set; then
- withval=$with_szlib;
+ if test -n "$EXEEXT"; then
+ am__EXEEXT_TRUE=
+ am__EXEEXT_FALSE='#'
else
- withval=default
+ am__EXEEXT_TRUE='#'
+ am__EXEEXT_FALSE=
fi
-
-case $withval in
- default)
- HAVE_SZLIB="no"
- if test "$DEFAULT_SZIP" != "" ; then
- LDFLAGS="$LDFLAGS -L$DEFAULT_SZIP/lib"
- LIBS="$LIBS -lsz"
- HAVE_SZLIB="yes"
- szlib_lib="$DEFAULT_SZIP/lib"
- fi
- if test "$DEFAULT_SZIP_LIB" != "" ; then
- LDFLAGS="$LDFLAGS -L$DEFAULT_SZIP_LIB"
- LIBS="$LIBS -lsz"
- HAVE_SZLIB="yes"
- szlib_lib="$DEFAULT_SZIP_LIB"
- fi
- if test "$DEFAULT_SZIP_LIBDIR" != "" ; then
- LDFLAGS="$LDFLAGS -L$DEFAULT_SZIP_LIBDIR"
- LIBS="$LIBS -lsz"
- HAVE_SZLIB="yes"
- szlib_lib="$DEFAULT_SZIP_LIBDIR"
- fi
- if test "$HAVE_SZLIB" = "yes" ; then
- { echo "$as_me:$LINENO: checking default szlib path provided" >&5
-echo $ECHO_N "checking default szlib path provided... $ECHO_C" >&6; }
- { echo "$as_me:$LINENO: result: $szlib_lib" >&5
-echo "${ECHO_T}$szlib_lib" >&6; }
- else
- { echo "$as_me:$LINENO: checking for szlib" >&5
-echo $ECHO_N "checking for szlib... $ECHO_C" >&6; }
- { echo "$as_me:$LINENO: result: suppressed" >&5
-echo "${ECHO_T}suppressed" >&6; }
- fi
- ;;
- yes)
- HAVE_SZLIB="no"
- if test "$DEFAULT_SZIP" != "" ; then
- LDFLAGS="$LDFLAGS -L$DEFAULT_SZIP/lib"
- LIBS="$LIBS -lsz"
- HAVE_SZLIB="yes"
- szlib_lib="$DEFAULT_SZIP/lib"
- fi
- if test "$DEFAULT_SZIP_LIB" != "" ; then
- LDFLAGS="$LDFLAGS -L$DEFAULT_SZIP_LIB"
- LIBS="$LIBS -lsz"
- HAVE_SZLIB="yes"
- szlib_lib="$DEFAULT_SZIP_LIB"
- fi
- if test "$DEFAULT_SZIP_LIBDIR" != "" ; then
- LDFLAGS="$LDFLAGS -L$DEFAULT_SZIP_LIBDIR"
- LIBS="$LIBS -lsz"
- HAVE_SZLIB="yes"
- szlib_lib="$DEFAULT_SZIP_LIBDIR"
- fi
- if test "$HAVE_SZLIB" = "yes" ; then
- { echo "$as_me:$LINENO: checking using szlib path provided" >&5
-echo $ECHO_N "checking using szlib path provided... $ECHO_C" >&6; }
- { echo "$as_me:$LINENO: result: $szlib_lib" >&5
-echo "${ECHO_T}$szlib_lib" >&6; }
- else
- { { echo "$as_me:$LINENO: error: expect to find szlib environment variables" >&5
-echo "$as_me: error: expect to find szlib environment variables" >&2;}
+if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
+ { { $as_echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
+if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
+ { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"AMDEP\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
+if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
+ { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
+if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
+ { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
+if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
+ { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
+if test -z "${INSTALL_LITE_HEADERS_TRUE}" && test -z "${INSTALL_LITE_HEADERS_FALSE}"; then
+ { { $as_echo "$as_me:$LINENO: error: conditional \"INSTALL_LITE_HEADERS\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"INSTALL_LITE_HEADERS\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
+if test -z "${NETCDF_NEEDED_TRUE}" && test -z "${NETCDF_NEEDED_FALSE}"; then
+ { { $as_echo "$as_me:$LINENO: error: conditional \"NETCDF_NEEDED\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"NETCDF_NEEDED\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
+if test -z "${PDB_DRV_NEEDED_TRUE}" && test -z "${PDB_DRV_NEEDED_FALSE}"; then
+ { { $as_echo "$as_me:$LINENO: error: conditional \"PDB_DRV_NEEDED\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"PDB_DRV_NEEDED\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
+if test -z "${PDBP_DRV_NEEDED_TRUE}" && test -z "${PDBP_DRV_NEEDED_FALSE}"; then
+ { { $as_echo "$as_me:$LINENO: error: conditional \"PDBP_DRV_NEEDED\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"PDBP_DRV_NEEDED\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
+if test -z "${TAURUS_NEEDED_TRUE}" && test -z "${TAURUS_NEEDED_FALSE}"; then
+ { { $as_echo "$as_me:$LINENO: error: conditional \"TAURUS_NEEDED\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"TAURUS_NEEDED\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
+if test -z "${HDF5_DRV_NEEDED_TRUE}" && test -z "${HDF5_DRV_NEEDED_FALSE}"; then
+ { { $as_echo "$as_me:$LINENO: error: conditional \"HDF5_DRV_NEEDED\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"HDF5_DRV_NEEDED\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
+if test -z "${BROWSER_NEEDED_TRUE}" && test -z "${BROWSER_NEEDED_FALSE}"; then
+ { { $as_echo "$as_me:$LINENO: error: conditional \"BROWSER_NEEDED\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"BROWSER_NEEDED\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
+if test -z "${PYTHON_NEEDED_TRUE}" && test -z "${PYTHON_NEEDED_FALSE}"; then
+ { { $as_echo "$as_me:$LINENO: error: conditional \"PYTHON_NEEDED\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"PYTHON_NEEDED\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
+if test -z "${FORTRAN_NEEDED_TRUE}" && test -z "${FORTRAN_NEEDED_FALSE}"; then
+ { { $as_echo "$as_me:$LINENO: error: conditional \"FORTRAN_NEEDED\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"FORTRAN_NEEDED\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
- { echo "$as_me:$LINENO: checking for szlib" >&5
-echo $ECHO_N "checking for szlib... $ECHO_C" >&6; }
- { echo "$as_me:$LINENO: result: suppressed" >&5
-echo "${ECHO_T}suppressed" >&6; }
- fi
- ;;
- no)
- HAVE_SZLIB="no"
- { echo "$as_me:$LINENO: checking for szlib" >&5
-echo $ECHO_N "checking for szlib... $ECHO_C" >&6; }
- { echo "$as_me:$LINENO: result: suppressed" >&5
-echo "${ECHO_T}suppressed" >&6; }
- ;;
- *)
- HAVE_SZLIB="yes"
- case "$withval" in
- *)
- if test -n "$withval"; then
- szlib_lib="$withval/lib"
- fi
- ;;
- esac
- if test -n "$szlib_lib"; then
- LDFLAGS="$LDFLAGS -L$szlib_lib"
- fi
-
-
-{ echo "$as_me:$LINENO: checking for SZ_BufftoBuffCompress in -lsz" >&5
-echo $ECHO_N "checking for SZ_BufftoBuffCompress in -lsz... $ECHO_C" >&6; }
-if test "${ac_cv_lib_sz_SZ_BufftoBuffCompress+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsz $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char SZ_BufftoBuffCompress ();
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-# ifdef __cplusplus
- extern "C"
-# endif
- int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
-return SZ_BufftoBuffCompress ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- ac_cv_lib_sz_SZ_BufftoBuffCompress=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_sz_SZ_BufftoBuffCompress=no
fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+if test -z "${SILEX_NEEDED_TRUE}" && test -z "${SILEX_NEEDED_FALSE}"; then
+ { { $as_echo "$as_me:$LINENO: error: conditional \"SILEX_NEEDED\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"SILEX_NEEDED\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_sz_SZ_BufftoBuffCompress" >&5
-echo "${ECHO_T}$ac_cv_lib_sz_SZ_BufftoBuffCompress" >&6; }
-if test $ac_cv_lib_sz_SZ_BufftoBuffCompress = yes; then
- cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBSZ 1
-_ACEOF
-
- LIBS="-lsz $LIBS"
-
-else
- LDFLAGS="$saved_LDFLAGS"; unset HAVE_SZLIB
+if test -z "${HZIP_NEEDED_TRUE}" && test -z "${HZIP_NEEDED_FALSE}"; then
+ { { $as_echo "$as_me:$LINENO: error: conditional \"HZIP_NEEDED\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"HZIP_NEEDED\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
fi
-
-
- if test -z "$HAVE_SZLIB" -a -n "$HDF5_CONFIG_ABORT"; then
- { { echo "$as_me:$LINENO: error: couldn't find szlib library" >&5
-echo "$as_me: error: couldn't find szlib library" >&2;}
+if test -z "${FPZIP_NEEDED_TRUE}" && test -z "${FPZIP_NEEDED_FALSE}"; then
+ { { $as_echo "$as_me:$LINENO: error: conditional \"FPZIP_NEEDED\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"FPZIP_NEEDED\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
- fi
- ;;
-esac
+fi
+if test -z "${ZLIB_AVAILABLE_TRUE}" && test -z "${ZLIB_AVAILABLE_FALSE}"; then
+ { { $as_echo "$as_me:$LINENO: error: conditional \"ZLIB_AVAILABLE\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"ZLIB_AVAILABLE\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
+if test -z "${CXX_LINK_NEEDED_TRUE}" && test -z "${CXX_LINK_NEEDED_FALSE}"; then
+ { { $as_echo "$as_me:$LINENO: error: conditional \"CXX_LINK_NEEDED\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"CXX_LINK_NEEDED\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
-# Is HDF5 present (it's needed for the silo/hdf5 driver for pmesh/alec SAMI
-# files larger than 2GB until SAF is in place)? Normally check for
-# hdf5.h and libhdf5.a but skip the test if `--without-hdf5' is specified.
-# Alternate directories can be specified for hdf5.h and/or libhdf5.a by giving
-# the names like this `--with-hdf5=INC,LIB' (if only the LIB directory is
-# given then it must still be preceded by a comma).
-#
-# Checking for hdf5 is complicated by the fact that hdf5 may or may not
-# in turn depend on zlib compression lib. In and of itself, Silo does NOT
-# depend on zlib. So, we don't want -lz on the link line if zlib is either
-# not needed or, worse, not present as this generates warning messages
-# or fatal errors. So, we first test for hdf5 without -lz on the link line.
-# If this succeeds, we conclude hdf5 is present and we can build the hdf5
-# driver. If hdf5 fails, it may be that hdf5 was compiled with zlib. So, next
-# we make an independent test for zlib. If zlib fails, we conclude that the
-# failure on the hdf5 test was due to something other than lack of zlib and
-# decide libhdf5.a is NOT present and we cannot build the hdf5 driver. If
-# zlib succeeds, we re-try the hdf5 test with -lz on the link line. If that
-# succeeds, we conclude we need -lz on the link line and we can build the
-# hdf5 driver. Again, if it fails, we neither put -lz on the link line nor
-# build the hdf5 driver. One other possibility that could be tested for
-# and configure could make a reasonable comment on is to see if only the
-# binaries for hdf5 were installed AND they have zlib dependences which
-# are NOT resolvable on the platform they are installed on. This would be
-# a boneheaded thing to do, but nonetheless something that configure could
-# inform the user has gone wrong and what to do.
-#
+: ${CONFIG_STATUS=./config.status}
+ac_write_fail=0
+ac_clean_files_save=$ac_clean_files
+ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
+cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+#! $SHELL
+# Generated by $as_me.
+# Run this file to recreate the current configuration.
+# Compiler output produced by configure, useful for debugging
+# configure, is in config.log if it exists.
-if test -n "$HDF5_DRV"; then
- { echo "$as_me:$LINENO: checking for hdf5" >&5
-echo $ECHO_N "checking for hdf5... $ECHO_C" >&6; }
- saved_CPPFLAGS="$CPPFLAGS"
- saved_LDFLAGS="$LDFLAGS"
- saved_LIBS="$LIBS"
+debug=false
+ac_cs_recheck=false
+ac_cs_silent=false
+SHELL=\${CONFIG_SHELL-$SHELL}
+_ACEOF
-# Check whether --with-hdf5 was given.
-if test "${with_hdf5+set}" = set; then
- withval=$with_hdf5;
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+## --------------------- ##
+## M4sh Initialization. ##
+## --------------------- ##
+
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+ emulate sh
+ NULLCMD=:
+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+ # is contrary to our usage. Disable this feature.
+ alias -g '${1+"$@"}'='"$@"'
+ setopt NO_GLOB_SUBST
else
- withval="default"
+ case `(set -o) 2>/dev/null` in
+ *posix*) set -o posix ;;
+esac
+
fi
- if test "$withval" = "no" ; then
- { echo "$as_me:$LINENO: result: suppressed" >&5
-echo "${ECHO_T}suppressed" >&6; }
- HDF5_DRV=""
- elif test "$withval" = "default" ; then
- if test "$DEFAULT_HDF5_LIBDIR" != "" ; then
- LDFLAGS="$LDFLAGS -L$DEFAULT_HDF5_LIBDIR"
- LIBS="$LIBS -lhdf5 -lz"
- hdf5_lib=$DEFAULT_HDF5_LIBDIR
- hdf5_explicit=true
- fi
- if test "$DEFAULT_HDF5_INCLUDE" != "" ; then
- CPPFLAGS="$CPPFLAGS -I$DEFAULT_HDF5_INCLUDE"
- hdf5_inc=$DEFAULT_HDF5_INCLUDE
- hdf5_explicit=true
- fi
- if test -d "$hdf5_lib"; then
- { echo "$as_me:$LINENO: result: $hdf5_lib" >&5
-echo "${ECHO_T}$hdf5_lib" >&6; }
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_HDF5_H 1
-_ACEOF
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LIBHDF5 1
-_ACEOF
+# PATH needs CR
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
- else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
- HDF5_DRV=""
- fi
- elif test "$withval" = "yes" ; then
- if test "$DEFAULT_HDF5_LIBDIR" != "" ; then
- LDFLAGS="$LDFLAGS -L$DEFAULT_HDF5_LIBDIR"
- LIBS="$LIBS -lhdf5 -lz"
- hdf5_lib=$DEFAULT_HDF5_LIBDIR
- hdf5_explicit=true
- fi
- if test "$DEFAULT_HDF5_INCLUDE" != "" ; then
- CPPFLAGS="$CPPFLAGS -I$DEFAULT_HDF5_INCLUDE"
- hdf5_inc=$DEFAULT_HDF5_INCLUDE
- hdf5_explicit=true
- fi
- if test -d "$hdf5_lib"; then
- { echo "$as_me:$LINENO: result: $hdf5_lib" >&5
-echo "${ECHO_T}$hdf5_lib" >&6; }
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+ as_echo='printf %s\n'
+ as_echo_n='printf %s'
+else
+ if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+ as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+ as_echo_n='/usr/ucb/echo -n'
+ else
+ as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+ as_echo_n_body='eval
+ arg=$1;
+ case $arg in
+ *"$as_nl"*)
+ expr "X$arg" : "X\\(.*\\)$as_nl";
+ arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+ esac;
+ expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+ '
+ export as_echo_n_body
+ as_echo_n='sh -c $as_echo_n_body as_echo'
+ fi
+ export as_echo_body
+ as_echo='sh -c $as_echo_body as_echo'
+fi
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_HDF5_H 1
-_ACEOF
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+ PATH_SEPARATOR=:
+ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+ PATH_SEPARATOR=';'
+ }
+fi
+# Support unset when possible.
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+ as_unset=unset
+else
+ as_unset=false
+fi
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LIBHDF5 1
-_ACEOF
- else
- { { echo "$as_me:$LINENO: error: expected to find hdf5 environment variables" >&5
-echo "$as_me: error: expected to find hdf5 environment variables" >&2;}
- { (exit 1); exit 1; }; }
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
- HDF5_DRV=""
- fi
- else
- { echo "$as_me:$LINENO: checking for hdf5 and supporting libraries..." >&5
-echo "$as_me: checking for hdf5 and supporting libraries..." >&6;}
- hdf5_inc="`echo $withval |cut -f1 -d,`"
- if test "$withval" != "yes" && test -n "$hdf5_inc"; then
- hdf5_explicit=true
- if test -d "$hdf5_inc"; then
- CPPFLAGS="-I$hdf5_inc $CPPFLAGS"
- else
- { { echo "$as_me:$LINENO: error: problem with directory specified for hdf5 includes" >&5
-echo "$as_me: error: problem with directory specified for hdf5 includes" >&2;}
- { (exit 1); exit 1; }; }
- fi
- fi
- hdf5_lib="`echo $withval |cut -f2 -d, -s`"
- if test "$withval" != "yes" && test -n "$hdf5_lib"; then
- hdf5_explicit=true
- if test -d "$hdf5_lib"; then
- if test -n "$szlib_lib"; then
- LDFLAGS="-L$hdf5_lib -L$szlib_lib $LDFLAGS"
- else
- LDFLAGS="-L$hdf5_lib $LDFLAGS"
- fi
- else
- { { echo "$as_me:$LINENO: error: problem with directory specified for hdf5 library" >&5
-echo "$as_me: error: problem with directory specified for hdf5 library" >&2;}
- { (exit 1); exit 1; }; }
- fi
- fi
- notfound=""
+# IFS
+# We need space, tab and new line, in precisely that order. Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+IFS=" "" $as_nl"
-for ac_header in hdf5.h
+# Find who we are. Look in the path if we contain no directory separator.
+case $0 in
+ *[\\/]* ) as_myself=$0 ;;
+ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-else
- # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+done
+IFS=$as_save_IFS
- ac_header_compiler=no
+ ;;
+esac
+# We did not find ourselves, most probably we were run as `sh COMMAND'
+# in which case we are not to be found in the path.
+if test "x$as_myself" = x; then
+ as_myself=$0
+fi
+if test ! -f "$as_myself"; then
+ $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+ { (exit 1); exit 1; }
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+# Work around bugs in pre-3.0 UWIN ksh.
+for as_var in ENV MAIL MAILPATH
+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+done
+PS1='$ '
+PS2='> '
+PS4='+ '
-# Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
+# NLS nuisances.
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# Required to use basename.
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+ test "X`expr 00001 : '.*\(...\)'`" = X001; then
+ as_expr=expr
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+ as_expr=false
+fi
- ac_header_preproc=no
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+ as_basename=basename
+else
+ as_basename=false
fi
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
- ( cat <<\_ASBOX
-## ----------------------------------------- ##
-## Report this to visit-users at email.ornl.gov ##
-## ----------------------------------------- ##
-_ASBOX
- ) | sed "s/^/$as_me: WARNING: /" >&2
- ;;
-esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+# Name of the executable.
+as_me=`$as_basename -- "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+ X"$0" : 'X\(//\)$' \| \
+ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$0" |
+ sed '/^.*\/\([^/][^/]*\)\/*$/{
+ s//\1/
+ q
+ }
+ /^X\/\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\/\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
+
+# CDPATH.
+$as_unset CDPATH
+
+
+
+ as_lineno_1=$LINENO
+ as_lineno_2=$LINENO
+ test "x$as_lineno_1" != "x$as_lineno_2" &&
+ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
+
+ # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
+ # uniformly replaced by the line number. The first 'sed' inserts a
+ # line-number line after each line using $LINENO; the second 'sed'
+ # does the real work. The second script uses 'N' to pair each
+ # line-number line with the line containing $LINENO, and appends
+ # trailing '-' during substitution so that $LINENO is not a special
+ # case at line end.
+ # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
+ # scripts with optimization help from Paolo Bonzini. Blame Lee
+ # E. McMahon (1931-1989) for sed's syntax. :-)
+ sed -n '
+ p
+ /[$]LINENO/=
+ ' <$as_myself |
+ sed '
+ s/[$]LINENO.*/&-/
+ t lineno
+ b
+ :lineno
+ N
+ :loop
+ s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
+ t loop
+ s/-\n.*//
+ ' >$as_me.lineno &&
+ chmod +x "$as_me.lineno" ||
+ { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+ { (exit 1); exit 1; }; }
+
+ # Don't try to exec as it changes $[0], causing all sort of problems
+ # (the dirname of $[0] is not the place where we might find the
+ # original and so on. Autoconf is especially sensitive to this).
+ . "./$as_me.lineno"
+ # Exit status is that of the last command.
+ exit
+}
+
+
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+ as_dirname=dirname
else
- eval "$as_ac_Header=\$ac_header_preproc"
+ as_dirname=false
fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ECHO_C= ECHO_N= ECHO_T=
+case `echo -n x` in
+-n*)
+ case `echo 'x\c'` in
+ *c*) ECHO_T=' ';; # ECHO_T is single tab character.
+ *) ECHO_C='\c';;
+ esac;;
+*)
+ ECHO_N='-n';;
+esac
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+ test "X`expr 00001 : '.*\(...\)'`" = X001; then
+ as_expr=expr
+else
+ as_expr=false
fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
+rm -f conf$$ conf$$.exe conf$$.file
+if test -d conf$$.dir; then
+ rm -f conf$$.dir/conf$$.file
else
- notfound="hdf5.h"
+ rm -f conf$$.dir
+ mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+ if ln -s conf$$.file conf$$ 2>/dev/null; then
+ as_ln_s='ln -s'
+ # ... but there are two gotchas:
+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+ # In both cases, we have to default to `cp -p'.
+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+ as_ln_s='cp -p'
+ elif ln conf$$.file conf$$ 2>/dev/null; then
+ as_ln_s=ln
+ else
+ as_ln_s='cp -p'
+ fi
+else
+ as_ln_s='cp -p'
fi
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+rmdir conf$$.dir 2>/dev/null
-done
+if mkdir -p . 2>/dev/null; then
+ as_mkdir_p=:
+else
+ test -d ./-p && rmdir ./-p
+ as_mkdir_p=false
+fi
- tmp_LIBS="$LIBS"
- if test -n "$szlib_lib"; then
-### LIBS="$hdf5_lib/libhdf5.a $LIBS"
- LIBS="-lhdf5 -lsz $LIBS"
- else
- LIBS="-lhdf5 $LIBS"
- fi
- { echo "$as_me:$LINENO: checking for H5open" >&5
-echo $ECHO_N "checking for H5open... $ECHO_C" >&6; }
-if test "${ac_cv_func_H5open+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+if test -x / >/dev/null 2>&1; then
+ as_test_x='test -x'
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-/* Define H5open to an innocuous variant, in case <limits.h> declares H5open.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define H5open innocuous_H5open
+ if ls -dL / >/dev/null 2>&1; then
+ as_ls_L_option=L
+ else
+ as_ls_L_option=
+ fi
+ as_test_x='
+ eval sh -c '\''
+ if test -d "$1"; then
+ test -d "$1/.";
+ else
+ case $1 in
+ -*)set "./$1";;
+ esac;
+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
+ ???[sx]*):;;*)false;;esac;fi
+ '\'' sh
+ '
+fi
+as_executable_p=$as_test_x
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char H5open (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
+# Sed expression to map a string onto a valid CPP name.
+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
+# Sed expression to map a string onto a valid variable name.
+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-#undef H5open
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char H5open ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined __stub_H5open || defined __stub___H5open
-choke me
-#endif
+exec 6>&1
+
+# Save the log message, to keep $[0] and so on meaningful, and to
+# report actual input values of CONFIG_FILES etc. instead of their
+# values after options handling.
+ac_log="
+This file was extended by silo $as_me 4.9.1, which was
+generated by GNU Autoconf 2.63. Invocation command line was
+
+ CONFIG_FILES = $CONFIG_FILES
+ CONFIG_HEADERS = $CONFIG_HEADERS
+ CONFIG_LINKS = $CONFIG_LINKS
+ CONFIG_COMMANDS = $CONFIG_COMMANDS
+ $ $0 $@
+
+on `(hostname || uname -n) 2>/dev/null | sed 1q`
+"
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-# ifdef __cplusplus
- extern "C"
-# endif
- int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
-return H5open ();
- ;
- return 0;
-}
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
+
+case $ac_config_files in *"
+"*) set x $ac_config_files; shift; ac_config_files=$*;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- ac_cv_func_H5open=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
- ac_cv_func_H5open=no
-fi
+case $ac_config_headers in *"
+"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
+esac
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_H5open" >&5
-echo "${ECHO_T}$ac_cv_func_H5open" >&6; }
-if test $ac_cv_func_H5open = yes; then
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LIBHDF5 1
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+# Files that config.status was made for.
+config_files="$ac_config_files"
+config_headers="$ac_config_headers"
+config_commands="$ac_config_commands"
+
_ACEOF
-else
- notfound="$notfound libhdf5.a"
-fi
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+ac_cs_usage="\
+\`$as_me' instantiates files from templates according to the
+current configuration.
- if test -n "$notfound"; then
- LIBS="$tmp_LIBS"
- fi
- #
- # If the above tests did NOT find headers and lib for
- # hdf5, it could be due to zlib, so now test for zlib
- # MCM -- July, 2008: This code now looks completely useless
- # It is supposed to attempt to check if '-lz' is needed to
- # link with HDF5. However, it doesn't appear to do any of
- # that and had a useless embedded AC_ARG_WITH in it which
- # I removed and replaced all instances of 'withval' to the
- # with variable the code needs, with_zlib
- #
- if test -n "$notfound"; then
- # reset the compile and link flags
- CPPFLAGS="$saved_CPPFLAGS"
- LDFLAGS="$saved_LDFLAGS"
- { echo "$as_me:$LINENO: checking if lack of zlib caused tests for hdf5 to fail..." >&5
-echo "$as_me: checking if lack of zlib caused tests for hdf5 to fail..." >&6;}
- if test "no" = "$with_zlib"; then
- { echo "$as_me:$LINENO: checking for zlib" >&5
-echo $ECHO_N "checking for zlib... $ECHO_C" >&6; }
- { echo "$as_me:$LINENO: result: suppressed" >&5
-echo "${ECHO_T}suppressed" >&6; }
- else
- zlib_inc="`echo $with_zlibval |cut -f1 -d,`"
- if test "$with_zlibval" != "yes" && test -n "$zlib_inc"; then
- if test -d "$zlib_inc"; then
- CPPFLAGS="-I$zlib_inc $CPPFLAGS"
- else
- { { echo "$as_me:$LINENO: error: problem with directory specified for zlib includes" >&5
-echo "$as_me: error: problem with directory specified for zlib includes" >&2;}
- { (exit 1); exit 1; }; }
- fi
- fi
- zlib_lib="`echo $with_zlibval |cut -f2 -d, -s`"
- if test "$with_zlibval" != "yes" && test -n "$zlib_lib"; then
- if test -d "$zlib_lib"; then
- LDFLAGS="-L$zlib_lib $LDFLAGS"
- else
- { { echo "$as_me:$LINENO: error: problem with directory specified for zlib library" >&5
-echo "$as_me: error: problem with directory specified for zlib library" >&2;}
- { (exit 1); exit 1; }; }
- fi
- fi
- notfound=""
- if test -z "`echo $LIBS | tr ' ' '\n' | grep -x -e '-lz'`"; then
+Usage: $0 [OPTION]... [FILE]...
+
+ -h, --help print this help, then exit
+ -V, --version print version number and configuration settings, then exit
+ -q, --quiet, --silent
+ do not print progress messages
+ -d, --debug don't remove temporary files
+ --recheck update $as_me by reconfiguring in the same conditions
+ --file=FILE[:TEMPLATE]
+ instantiate the configuration file FILE
+ --header=FILE[:TEMPLATE]
+ instantiate the configuration header FILE
+
+Configuration files:
+$config_files
+
+Configuration headers:
+$config_headers
+
+Configuration commands:
+$config_commands
+
+Report bugs to <bug-autoconf at gnu.org>."
-for ac_header in zlib.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-else
- # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <$ac_header>
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_cs_version="\\
+silo config.status 4.9.1
+configured by $0, generated by GNU Autoconf 2.63,
+ with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+
+Copyright (C) 2008 Free Software Foundation, Inc.
+This config.status script is free software; the Free Software Foundation
+gives unlimited permission to copy, distribute and modify it."
+
+ac_pwd='$ac_pwd'
+srcdir='$srcdir'
+INSTALL='$INSTALL'
+MKDIR_P='$MKDIR_P'
+AWK='$AWK'
+test -n "\$AWK" || AWK=awk
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
- ac_header_compiler=no
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# The default lists apply if the user does not specify any file.
+ac_need_defaults=:
+while test $# != 0
+do
+ case $1 in
+ --*=*)
+ ac_option=`expr "X$1" : 'X\([^=]*\)='`
+ ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
+ ac_shift=:
+ ;;
+ *)
+ ac_option=$1
+ ac_optarg=$2
+ ac_shift=shift
+ ;;
+ esac
+
+ case $ac_option in
+ # Handling of the options.
+ -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
+ ac_cs_recheck=: ;;
+ --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
+ $as_echo "$ac_cs_version"; exit ;;
+ --debug | --debu | --deb | --de | --d | -d )
+ debug=: ;;
+ --file | --fil | --fi | --f )
+ $ac_shift
+ case $ac_optarg in
+ *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+ esac
+ CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
+ ac_need_defaults=false;;
+ --header | --heade | --head | --hea )
+ $ac_shift
+ case $ac_optarg in
+ *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+ esac
+ CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'"
+ ac_need_defaults=false;;
+ --he | --h)
+ # Conflict between --help and --header
+ { $as_echo "$as_me: error: ambiguous option: $1
+Try \`$0 --help' for more information." >&2
+ { (exit 1); exit 1; }; };;
+ --help | --hel | -h )
+ $as_echo "$ac_cs_usage"; exit ;;
+ -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+ | -silent | --silent | --silen | --sile | --sil | --si | --s)
+ ac_cs_silent=: ;;
+
+ # This is an error.
+ -*) { $as_echo "$as_me: error: unrecognized option: $1
+Try \`$0 --help' for more information." >&2
+ { (exit 1); exit 1; }; } ;;
+
+ *) ac_config_targets="$ac_config_targets $1"
+ ac_need_defaults=false ;;
+
+ esac
+ shift
+done
+
+ac_configure_extra_args=
+
+if $ac_cs_silent; then
+ exec 6>/dev/null
+ ac_configure_extra_args="$ac_configure_extra_args --silent"
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+if \$ac_cs_recheck; then
+ set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+ shift
+ \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
+ CONFIG_SHELL='$SHELL'
+ export CONFIG_SHELL
+ exec "\$@"
+fi
-# Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <$ac_header>
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+exec 5>>config.log
+{
+ echo
+ sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
+## Running $as_me. ##
+_ASBOX
+ $as_echo "$ac_log"
+} >&5
+
_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+#
+# INIT-COMMANDS
+#
+AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
- ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
- ( cat <<\_ASBOX
-## ----------------------------------------- ##
-## Report this to visit-users at email.ornl.gov ##
-## ----------------------------------------- ##
-_ASBOX
- ) | sed "s/^/$as_me: WARNING: /" >&2
- ;;
+sed_quote_subst='$sed_quote_subst'
+double_quote_subst='$double_quote_subst'
+delay_variable_subst='$delay_variable_subst'
+enable_shared='`$ECHO "X$enable_shared" | $Xsed -e "$delay_single_quote_subst"`'
+macro_version='`$ECHO "X$macro_version" | $Xsed -e "$delay_single_quote_subst"`'
+macro_revision='`$ECHO "X$macro_revision" | $Xsed -e "$delay_single_quote_subst"`'
+enable_static='`$ECHO "X$enable_static" | $Xsed -e "$delay_single_quote_subst"`'
+pic_mode='`$ECHO "X$pic_mode" | $Xsed -e "$delay_single_quote_subst"`'
+enable_fast_install='`$ECHO "X$enable_fast_install" | $Xsed -e "$delay_single_quote_subst"`'
+host_alias='`$ECHO "X$host_alias" | $Xsed -e "$delay_single_quote_subst"`'
+host='`$ECHO "X$host" | $Xsed -e "$delay_single_quote_subst"`'
+host_os='`$ECHO "X$host_os" | $Xsed -e "$delay_single_quote_subst"`'
+build_alias='`$ECHO "X$build_alias" | $Xsed -e "$delay_single_quote_subst"`'
+build='`$ECHO "X$build" | $Xsed -e "$delay_single_quote_subst"`'
+build_os='`$ECHO "X$build_os" | $Xsed -e "$delay_single_quote_subst"`'
+SED='`$ECHO "X$SED" | $Xsed -e "$delay_single_quote_subst"`'
+Xsed='`$ECHO "X$Xsed" | $Xsed -e "$delay_single_quote_subst"`'
+GREP='`$ECHO "X$GREP" | $Xsed -e "$delay_single_quote_subst"`'
+EGREP='`$ECHO "X$EGREP" | $Xsed -e "$delay_single_quote_subst"`'
+FGREP='`$ECHO "X$FGREP" | $Xsed -e "$delay_single_quote_subst"`'
+LD='`$ECHO "X$LD" | $Xsed -e "$delay_single_quote_subst"`'
+NM='`$ECHO "X$NM" | $Xsed -e "$delay_single_quote_subst"`'
+LN_S='`$ECHO "X$LN_S" | $Xsed -e "$delay_single_quote_subst"`'
+max_cmd_len='`$ECHO "X$max_cmd_len" | $Xsed -e "$delay_single_quote_subst"`'
+ac_objext='`$ECHO "X$ac_objext" | $Xsed -e "$delay_single_quote_subst"`'
+exeext='`$ECHO "X$exeext" | $Xsed -e "$delay_single_quote_subst"`'
+lt_unset='`$ECHO "X$lt_unset" | $Xsed -e "$delay_single_quote_subst"`'
+lt_SP2NL='`$ECHO "X$lt_SP2NL" | $Xsed -e "$delay_single_quote_subst"`'
+lt_NL2SP='`$ECHO "X$lt_NL2SP" | $Xsed -e "$delay_single_quote_subst"`'
+reload_flag='`$ECHO "X$reload_flag" | $Xsed -e "$delay_single_quote_subst"`'
+reload_cmds='`$ECHO "X$reload_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+OBJDUMP='`$ECHO "X$OBJDUMP" | $Xsed -e "$delay_single_quote_subst"`'
+deplibs_check_method='`$ECHO "X$deplibs_check_method" | $Xsed -e "$delay_single_quote_subst"`'
+file_magic_cmd='`$ECHO "X$file_magic_cmd" | $Xsed -e "$delay_single_quote_subst"`'
+AR='`$ECHO "X$AR" | $Xsed -e "$delay_single_quote_subst"`'
+AR_FLAGS='`$ECHO "X$AR_FLAGS" | $Xsed -e "$delay_single_quote_subst"`'
+STRIP='`$ECHO "X$STRIP" | $Xsed -e "$delay_single_quote_subst"`'
+RANLIB='`$ECHO "X$RANLIB" | $Xsed -e "$delay_single_quote_subst"`'
+old_postinstall_cmds='`$ECHO "X$old_postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+old_postuninstall_cmds='`$ECHO "X$old_postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+old_archive_cmds='`$ECHO "X$old_archive_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+CC='`$ECHO "X$CC" | $Xsed -e "$delay_single_quote_subst"`'
+CFLAGS='`$ECHO "X$CFLAGS" | $Xsed -e "$delay_single_quote_subst"`'
+compiler='`$ECHO "X$compiler" | $Xsed -e "$delay_single_quote_subst"`'
+GCC='`$ECHO "X$GCC" | $Xsed -e "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_pipe='`$ECHO "X$lt_cv_sys_global_symbol_pipe" | $Xsed -e "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_cdecl='`$ECHO "X$lt_cv_sys_global_symbol_to_cdecl" | $Xsed -e "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address" | $Xsed -e "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`'
+objdir='`$ECHO "X$objdir" | $Xsed -e "$delay_single_quote_subst"`'
+SHELL='`$ECHO "X$SHELL" | $Xsed -e "$delay_single_quote_subst"`'
+ECHO='`$ECHO "X$ECHO" | $Xsed -e "$delay_single_quote_subst"`'
+MAGIC_CMD='`$ECHO "X$MAGIC_CMD" | $Xsed -e "$delay_single_quote_subst"`'
+lt_prog_compiler_no_builtin_flag='`$ECHO "X$lt_prog_compiler_no_builtin_flag" | $Xsed -e "$delay_single_quote_subst"`'
+lt_prog_compiler_wl='`$ECHO "X$lt_prog_compiler_wl" | $Xsed -e "$delay_single_quote_subst"`'
+lt_prog_compiler_pic='`$ECHO "X$lt_prog_compiler_pic" | $Xsed -e "$delay_single_quote_subst"`'
+lt_prog_compiler_static='`$ECHO "X$lt_prog_compiler_static" | $Xsed -e "$delay_single_quote_subst"`'
+lt_cv_prog_compiler_c_o='`$ECHO "X$lt_cv_prog_compiler_c_o" | $Xsed -e "$delay_single_quote_subst"`'
+need_locks='`$ECHO "X$need_locks" | $Xsed -e "$delay_single_quote_subst"`'
+DSYMUTIL='`$ECHO "X$DSYMUTIL" | $Xsed -e "$delay_single_quote_subst"`'
+NMEDIT='`$ECHO "X$NMEDIT" | $Xsed -e "$delay_single_quote_subst"`'
+LIPO='`$ECHO "X$LIPO" | $Xsed -e "$delay_single_quote_subst"`'
+OTOOL='`$ECHO "X$OTOOL" | $Xsed -e "$delay_single_quote_subst"`'
+OTOOL64='`$ECHO "X$OTOOL64" | $Xsed -e "$delay_single_quote_subst"`'
+libext='`$ECHO "X$libext" | $Xsed -e "$delay_single_quote_subst"`'
+shrext_cmds='`$ECHO "X$shrext_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+extract_expsyms_cmds='`$ECHO "X$extract_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+archive_cmds_need_lc='`$ECHO "X$archive_cmds_need_lc" | $Xsed -e "$delay_single_quote_subst"`'
+enable_shared_with_static_runtimes='`$ECHO "X$enable_shared_with_static_runtimes" | $Xsed -e "$delay_single_quote_subst"`'
+export_dynamic_flag_spec='`$ECHO "X$export_dynamic_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
+whole_archive_flag_spec='`$ECHO "X$whole_archive_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
+compiler_needs_object='`$ECHO "X$compiler_needs_object" | $Xsed -e "$delay_single_quote_subst"`'
+old_archive_from_new_cmds='`$ECHO "X$old_archive_from_new_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+old_archive_from_expsyms_cmds='`$ECHO "X$old_archive_from_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+archive_cmds='`$ECHO "X$archive_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+archive_expsym_cmds='`$ECHO "X$archive_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+module_cmds='`$ECHO "X$module_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+module_expsym_cmds='`$ECHO "X$module_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+with_gnu_ld='`$ECHO "X$with_gnu_ld" | $Xsed -e "$delay_single_quote_subst"`'
+allow_undefined_flag='`$ECHO "X$allow_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`'
+no_undefined_flag='`$ECHO "X$no_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_libdir_flag_spec='`$ECHO "X$hardcode_libdir_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_libdir_flag_spec_ld='`$ECHO "X$hardcode_libdir_flag_spec_ld" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_libdir_separator='`$ECHO "X$hardcode_libdir_separator" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_direct='`$ECHO "X$hardcode_direct" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_direct_absolute='`$ECHO "X$hardcode_direct_absolute" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_minus_L='`$ECHO "X$hardcode_minus_L" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_shlibpath_var='`$ECHO "X$hardcode_shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_automatic='`$ECHO "X$hardcode_automatic" | $Xsed -e "$delay_single_quote_subst"`'
+inherit_rpath='`$ECHO "X$inherit_rpath" | $Xsed -e "$delay_single_quote_subst"`'
+link_all_deplibs='`$ECHO "X$link_all_deplibs" | $Xsed -e "$delay_single_quote_subst"`'
+fix_srcfile_path='`$ECHO "X$fix_srcfile_path" | $Xsed -e "$delay_single_quote_subst"`'
+always_export_symbols='`$ECHO "X$always_export_symbols" | $Xsed -e "$delay_single_quote_subst"`'
+export_symbols_cmds='`$ECHO "X$export_symbols_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+exclude_expsyms='`$ECHO "X$exclude_expsyms" | $Xsed -e "$delay_single_quote_subst"`'
+include_expsyms='`$ECHO "X$include_expsyms" | $Xsed -e "$delay_single_quote_subst"`'
+prelink_cmds='`$ECHO "X$prelink_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+file_list_spec='`$ECHO "X$file_list_spec" | $Xsed -e "$delay_single_quote_subst"`'
+variables_saved_for_relink='`$ECHO "X$variables_saved_for_relink" | $Xsed -e "$delay_single_quote_subst"`'
+need_lib_prefix='`$ECHO "X$need_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`'
+need_version='`$ECHO "X$need_version" | $Xsed -e "$delay_single_quote_subst"`'
+version_type='`$ECHO "X$version_type" | $Xsed -e "$delay_single_quote_subst"`'
+runpath_var='`$ECHO "X$runpath_var" | $Xsed -e "$delay_single_quote_subst"`'
+shlibpath_var='`$ECHO "X$shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`'
+shlibpath_overrides_runpath='`$ECHO "X$shlibpath_overrides_runpath" | $Xsed -e "$delay_single_quote_subst"`'
+libname_spec='`$ECHO "X$libname_spec" | $Xsed -e "$delay_single_quote_subst"`'
+library_names_spec='`$ECHO "X$library_names_spec" | $Xsed -e "$delay_single_quote_subst"`'
+soname_spec='`$ECHO "X$soname_spec" | $Xsed -e "$delay_single_quote_subst"`'
+postinstall_cmds='`$ECHO "X$postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+postuninstall_cmds='`$ECHO "X$postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+finish_cmds='`$ECHO "X$finish_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+finish_eval='`$ECHO "X$finish_eval" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_into_libs='`$ECHO "X$hardcode_into_libs" | $Xsed -e "$delay_single_quote_subst"`'
+sys_lib_search_path_spec='`$ECHO "X$sys_lib_search_path_spec" | $Xsed -e "$delay_single_quote_subst"`'
+sys_lib_dlsearch_path_spec='`$ECHO "X$sys_lib_dlsearch_path_spec" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_action='`$ECHO "X$hardcode_action" | $Xsed -e "$delay_single_quote_subst"`'
+enable_dlopen='`$ECHO "X$enable_dlopen" | $Xsed -e "$delay_single_quote_subst"`'
+enable_dlopen_self='`$ECHO "X$enable_dlopen_self" | $Xsed -e "$delay_single_quote_subst"`'
+enable_dlopen_self_static='`$ECHO "X$enable_dlopen_self_static" | $Xsed -e "$delay_single_quote_subst"`'
+old_striplib='`$ECHO "X$old_striplib" | $Xsed -e "$delay_single_quote_subst"`'
+striplib='`$ECHO "X$striplib" | $Xsed -e "$delay_single_quote_subst"`'
+compiler_lib_search_dirs='`$ECHO "X$compiler_lib_search_dirs" | $Xsed -e "$delay_single_quote_subst"`'
+predep_objects='`$ECHO "X$predep_objects" | $Xsed -e "$delay_single_quote_subst"`'
+postdep_objects='`$ECHO "X$postdep_objects" | $Xsed -e "$delay_single_quote_subst"`'
+predeps='`$ECHO "X$predeps" | $Xsed -e "$delay_single_quote_subst"`'
+postdeps='`$ECHO "X$postdeps" | $Xsed -e "$delay_single_quote_subst"`'
+compiler_lib_search_path='`$ECHO "X$compiler_lib_search_path" | $Xsed -e "$delay_single_quote_subst"`'
+LD_CXX='`$ECHO "X$LD_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+LD_F77='`$ECHO "X$LD_F77" | $Xsed -e "$delay_single_quote_subst"`'
+LD_FC='`$ECHO "X$LD_FC" | $Xsed -e "$delay_single_quote_subst"`'
+old_archive_cmds_CXX='`$ECHO "X$old_archive_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+old_archive_cmds_F77='`$ECHO "X$old_archive_cmds_F77" | $Xsed -e "$delay_single_quote_subst"`'
+old_archive_cmds_FC='`$ECHO "X$old_archive_cmds_FC" | $Xsed -e "$delay_single_quote_subst"`'
+compiler_CXX='`$ECHO "X$compiler_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+compiler_F77='`$ECHO "X$compiler_F77" | $Xsed -e "$delay_single_quote_subst"`'
+compiler_FC='`$ECHO "X$compiler_FC" | $Xsed -e "$delay_single_quote_subst"`'
+GCC_CXX='`$ECHO "X$GCC_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+GCC_F77='`$ECHO "X$GCC_F77" | $Xsed -e "$delay_single_quote_subst"`'
+GCC_FC='`$ECHO "X$GCC_FC" | $Xsed -e "$delay_single_quote_subst"`'
+lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "X$lt_prog_compiler_no_builtin_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+lt_prog_compiler_no_builtin_flag_F77='`$ECHO "X$lt_prog_compiler_no_builtin_flag_F77" | $Xsed -e "$delay_single_quote_subst"`'
+lt_prog_compiler_no_builtin_flag_FC='`$ECHO "X$lt_prog_compiler_no_builtin_flag_FC" | $Xsed -e "$delay_single_quote_subst"`'
+lt_prog_compiler_wl_CXX='`$ECHO "X$lt_prog_compiler_wl_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+lt_prog_compiler_wl_F77='`$ECHO "X$lt_prog_compiler_wl_F77" | $Xsed -e "$delay_single_quote_subst"`'
+lt_prog_compiler_wl_FC='`$ECHO "X$lt_prog_compiler_wl_FC" | $Xsed -e "$delay_single_quote_subst"`'
+lt_prog_compiler_pic_CXX='`$ECHO "X$lt_prog_compiler_pic_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+lt_prog_compiler_pic_F77='`$ECHO "X$lt_prog_compiler_pic_F77" | $Xsed -e "$delay_single_quote_subst"`'
+lt_prog_compiler_pic_FC='`$ECHO "X$lt_prog_compiler_pic_FC" | $Xsed -e "$delay_single_quote_subst"`'
+lt_prog_compiler_static_CXX='`$ECHO "X$lt_prog_compiler_static_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+lt_prog_compiler_static_F77='`$ECHO "X$lt_prog_compiler_static_F77" | $Xsed -e "$delay_single_quote_subst"`'
+lt_prog_compiler_static_FC='`$ECHO "X$lt_prog_compiler_static_FC" | $Xsed -e "$delay_single_quote_subst"`'
+lt_cv_prog_compiler_c_o_CXX='`$ECHO "X$lt_cv_prog_compiler_c_o_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+lt_cv_prog_compiler_c_o_F77='`$ECHO "X$lt_cv_prog_compiler_c_o_F77" | $Xsed -e "$delay_single_quote_subst"`'
+lt_cv_prog_compiler_c_o_FC='`$ECHO "X$lt_cv_prog_compiler_c_o_FC" | $Xsed -e "$delay_single_quote_subst"`'
+archive_cmds_need_lc_CXX='`$ECHO "X$archive_cmds_need_lc_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+archive_cmds_need_lc_F77='`$ECHO "X$archive_cmds_need_lc_F77" | $Xsed -e "$delay_single_quote_subst"`'
+archive_cmds_need_lc_FC='`$ECHO "X$archive_cmds_need_lc_FC" | $Xsed -e "$delay_single_quote_subst"`'
+enable_shared_with_static_runtimes_CXX='`$ECHO "X$enable_shared_with_static_runtimes_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+enable_shared_with_static_runtimes_F77='`$ECHO "X$enable_shared_with_static_runtimes_F77" | $Xsed -e "$delay_single_quote_subst"`'
+enable_shared_with_static_runtimes_FC='`$ECHO "X$enable_shared_with_static_runtimes_FC" | $Xsed -e "$delay_single_quote_subst"`'
+export_dynamic_flag_spec_CXX='`$ECHO "X$export_dynamic_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+export_dynamic_flag_spec_F77='`$ECHO "X$export_dynamic_flag_spec_F77" | $Xsed -e "$delay_single_quote_subst"`'
+export_dynamic_flag_spec_FC='`$ECHO "X$export_dynamic_flag_spec_FC" | $Xsed -e "$delay_single_quote_subst"`'
+whole_archive_flag_spec_CXX='`$ECHO "X$whole_archive_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+whole_archive_flag_spec_F77='`$ECHO "X$whole_archive_flag_spec_F77" | $Xsed -e "$delay_single_quote_subst"`'
+whole_archive_flag_spec_FC='`$ECHO "X$whole_archive_flag_spec_FC" | $Xsed -e "$delay_single_quote_subst"`'
+compiler_needs_object_CXX='`$ECHO "X$compiler_needs_object_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+compiler_needs_object_F77='`$ECHO "X$compiler_needs_object_F77" | $Xsed -e "$delay_single_quote_subst"`'
+compiler_needs_object_FC='`$ECHO "X$compiler_needs_object_FC" | $Xsed -e "$delay_single_quote_subst"`'
+old_archive_from_new_cmds_CXX='`$ECHO "X$old_archive_from_new_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+old_archive_from_new_cmds_F77='`$ECHO "X$old_archive_from_new_cmds_F77" | $Xsed -e "$delay_single_quote_subst"`'
+old_archive_from_new_cmds_FC='`$ECHO "X$old_archive_from_new_cmds_FC" | $Xsed -e "$delay_single_quote_subst"`'
+old_archive_from_expsyms_cmds_CXX='`$ECHO "X$old_archive_from_expsyms_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+old_archive_from_expsyms_cmds_F77='`$ECHO "X$old_archive_from_expsyms_cmds_F77" | $Xsed -e "$delay_single_quote_subst"`'
+old_archive_from_expsyms_cmds_FC='`$ECHO "X$old_archive_from_expsyms_cmds_FC" | $Xsed -e "$delay_single_quote_subst"`'
+archive_cmds_CXX='`$ECHO "X$archive_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+archive_cmds_F77='`$ECHO "X$archive_cmds_F77" | $Xsed -e "$delay_single_quote_subst"`'
+archive_cmds_FC='`$ECHO "X$archive_cmds_FC" | $Xsed -e "$delay_single_quote_subst"`'
+archive_expsym_cmds_CXX='`$ECHO "X$archive_expsym_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+archive_expsym_cmds_F77='`$ECHO "X$archive_expsym_cmds_F77" | $Xsed -e "$delay_single_quote_subst"`'
+archive_expsym_cmds_FC='`$ECHO "X$archive_expsym_cmds_FC" | $Xsed -e "$delay_single_quote_subst"`'
+module_cmds_CXX='`$ECHO "X$module_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+module_cmds_F77='`$ECHO "X$module_cmds_F77" | $Xsed -e "$delay_single_quote_subst"`'
+module_cmds_FC='`$ECHO "X$module_cmds_FC" | $Xsed -e "$delay_single_quote_subst"`'
+module_expsym_cmds_CXX='`$ECHO "X$module_expsym_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+module_expsym_cmds_F77='`$ECHO "X$module_expsym_cmds_F77" | $Xsed -e "$delay_single_quote_subst"`'
+module_expsym_cmds_FC='`$ECHO "X$module_expsym_cmds_FC" | $Xsed -e "$delay_single_quote_subst"`'
+with_gnu_ld_CXX='`$ECHO "X$with_gnu_ld_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+with_gnu_ld_F77='`$ECHO "X$with_gnu_ld_F77" | $Xsed -e "$delay_single_quote_subst"`'
+with_gnu_ld_FC='`$ECHO "X$with_gnu_ld_FC" | $Xsed -e "$delay_single_quote_subst"`'
+allow_undefined_flag_CXX='`$ECHO "X$allow_undefined_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+allow_undefined_flag_F77='`$ECHO "X$allow_undefined_flag_F77" | $Xsed -e "$delay_single_quote_subst"`'
+allow_undefined_flag_FC='`$ECHO "X$allow_undefined_flag_FC" | $Xsed -e "$delay_single_quote_subst"`'
+no_undefined_flag_CXX='`$ECHO "X$no_undefined_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+no_undefined_flag_F77='`$ECHO "X$no_undefined_flag_F77" | $Xsed -e "$delay_single_quote_subst"`'
+no_undefined_flag_FC='`$ECHO "X$no_undefined_flag_FC" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_libdir_flag_spec_CXX='`$ECHO "X$hardcode_libdir_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_libdir_flag_spec_F77='`$ECHO "X$hardcode_libdir_flag_spec_F77" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_libdir_flag_spec_FC='`$ECHO "X$hardcode_libdir_flag_spec_FC" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_libdir_flag_spec_ld_CXX='`$ECHO "X$hardcode_libdir_flag_spec_ld_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_libdir_flag_spec_ld_F77='`$ECHO "X$hardcode_libdir_flag_spec_ld_F77" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_libdir_flag_spec_ld_FC='`$ECHO "X$hardcode_libdir_flag_spec_ld_FC" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_libdir_separator_CXX='`$ECHO "X$hardcode_libdir_separator_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_libdir_separator_F77='`$ECHO "X$hardcode_libdir_separator_F77" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_libdir_separator_FC='`$ECHO "X$hardcode_libdir_separator_FC" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_direct_CXX='`$ECHO "X$hardcode_direct_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_direct_F77='`$ECHO "X$hardcode_direct_F77" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_direct_FC='`$ECHO "X$hardcode_direct_FC" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_direct_absolute_CXX='`$ECHO "X$hardcode_direct_absolute_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_direct_absolute_F77='`$ECHO "X$hardcode_direct_absolute_F77" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_direct_absolute_FC='`$ECHO "X$hardcode_direct_absolute_FC" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_minus_L_CXX='`$ECHO "X$hardcode_minus_L_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_minus_L_F77='`$ECHO "X$hardcode_minus_L_F77" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_minus_L_FC='`$ECHO "X$hardcode_minus_L_FC" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_shlibpath_var_CXX='`$ECHO "X$hardcode_shlibpath_var_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_shlibpath_var_F77='`$ECHO "X$hardcode_shlibpath_var_F77" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_shlibpath_var_FC='`$ECHO "X$hardcode_shlibpath_var_FC" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_automatic_CXX='`$ECHO "X$hardcode_automatic_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_automatic_F77='`$ECHO "X$hardcode_automatic_F77" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_automatic_FC='`$ECHO "X$hardcode_automatic_FC" | $Xsed -e "$delay_single_quote_subst"`'
+inherit_rpath_CXX='`$ECHO "X$inherit_rpath_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+inherit_rpath_F77='`$ECHO "X$inherit_rpath_F77" | $Xsed -e "$delay_single_quote_subst"`'
+inherit_rpath_FC='`$ECHO "X$inherit_rpath_FC" | $Xsed -e "$delay_single_quote_subst"`'
+link_all_deplibs_CXX='`$ECHO "X$link_all_deplibs_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+link_all_deplibs_F77='`$ECHO "X$link_all_deplibs_F77" | $Xsed -e "$delay_single_quote_subst"`'
+link_all_deplibs_FC='`$ECHO "X$link_all_deplibs_FC" | $Xsed -e "$delay_single_quote_subst"`'
+fix_srcfile_path_CXX='`$ECHO "X$fix_srcfile_path_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+fix_srcfile_path_F77='`$ECHO "X$fix_srcfile_path_F77" | $Xsed -e "$delay_single_quote_subst"`'
+fix_srcfile_path_FC='`$ECHO "X$fix_srcfile_path_FC" | $Xsed -e "$delay_single_quote_subst"`'
+always_export_symbols_CXX='`$ECHO "X$always_export_symbols_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+always_export_symbols_F77='`$ECHO "X$always_export_symbols_F77" | $Xsed -e "$delay_single_quote_subst"`'
+always_export_symbols_FC='`$ECHO "X$always_export_symbols_FC" | $Xsed -e "$delay_single_quote_subst"`'
+export_symbols_cmds_CXX='`$ECHO "X$export_symbols_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+export_symbols_cmds_F77='`$ECHO "X$export_symbols_cmds_F77" | $Xsed -e "$delay_single_quote_subst"`'
+export_symbols_cmds_FC='`$ECHO "X$export_symbols_cmds_FC" | $Xsed -e "$delay_single_quote_subst"`'
+exclude_expsyms_CXX='`$ECHO "X$exclude_expsyms_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+exclude_expsyms_F77='`$ECHO "X$exclude_expsyms_F77" | $Xsed -e "$delay_single_quote_subst"`'
+exclude_expsyms_FC='`$ECHO "X$exclude_expsyms_FC" | $Xsed -e "$delay_single_quote_subst"`'
+include_expsyms_CXX='`$ECHO "X$include_expsyms_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+include_expsyms_F77='`$ECHO "X$include_expsyms_F77" | $Xsed -e "$delay_single_quote_subst"`'
+include_expsyms_FC='`$ECHO "X$include_expsyms_FC" | $Xsed -e "$delay_single_quote_subst"`'
+prelink_cmds_CXX='`$ECHO "X$prelink_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+prelink_cmds_F77='`$ECHO "X$prelink_cmds_F77" | $Xsed -e "$delay_single_quote_subst"`'
+prelink_cmds_FC='`$ECHO "X$prelink_cmds_FC" | $Xsed -e "$delay_single_quote_subst"`'
+file_list_spec_CXX='`$ECHO "X$file_list_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+file_list_spec_F77='`$ECHO "X$file_list_spec_F77" | $Xsed -e "$delay_single_quote_subst"`'
+file_list_spec_FC='`$ECHO "X$file_list_spec_FC" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_action_CXX='`$ECHO "X$hardcode_action_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_action_F77='`$ECHO "X$hardcode_action_F77" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_action_FC='`$ECHO "X$hardcode_action_FC" | $Xsed -e "$delay_single_quote_subst"`'
+compiler_lib_search_dirs_CXX='`$ECHO "X$compiler_lib_search_dirs_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+compiler_lib_search_dirs_F77='`$ECHO "X$compiler_lib_search_dirs_F77" | $Xsed -e "$delay_single_quote_subst"`'
+compiler_lib_search_dirs_FC='`$ECHO "X$compiler_lib_search_dirs_FC" | $Xsed -e "$delay_single_quote_subst"`'
+predep_objects_CXX='`$ECHO "X$predep_objects_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+predep_objects_F77='`$ECHO "X$predep_objects_F77" | $Xsed -e "$delay_single_quote_subst"`'
+predep_objects_FC='`$ECHO "X$predep_objects_FC" | $Xsed -e "$delay_single_quote_subst"`'
+postdep_objects_CXX='`$ECHO "X$postdep_objects_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+postdep_objects_F77='`$ECHO "X$postdep_objects_F77" | $Xsed -e "$delay_single_quote_subst"`'
+postdep_objects_FC='`$ECHO "X$postdep_objects_FC" | $Xsed -e "$delay_single_quote_subst"`'
+predeps_CXX='`$ECHO "X$predeps_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+predeps_F77='`$ECHO "X$predeps_F77" | $Xsed -e "$delay_single_quote_subst"`'
+predeps_FC='`$ECHO "X$predeps_FC" | $Xsed -e "$delay_single_quote_subst"`'
+postdeps_CXX='`$ECHO "X$postdeps_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+postdeps_F77='`$ECHO "X$postdeps_F77" | $Xsed -e "$delay_single_quote_subst"`'
+postdeps_FC='`$ECHO "X$postdeps_FC" | $Xsed -e "$delay_single_quote_subst"`'
+compiler_lib_search_path_CXX='`$ECHO "X$compiler_lib_search_path_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+compiler_lib_search_path_F77='`$ECHO "X$compiler_lib_search_path_F77" | $Xsed -e "$delay_single_quote_subst"`'
+compiler_lib_search_path_FC='`$ECHO "X$compiler_lib_search_path_FC" | $Xsed -e "$delay_single_quote_subst"`'
+
+LTCC='$LTCC'
+LTCFLAGS='$LTCFLAGS'
+compiler='$compiler_DEFAULT'
+
+# Quote evaled strings.
+for var in SED \
+GREP \
+EGREP \
+FGREP \
+LD \
+NM \
+LN_S \
+lt_SP2NL \
+lt_NL2SP \
+reload_flag \
+OBJDUMP \
+deplibs_check_method \
+file_magic_cmd \
+AR \
+AR_FLAGS \
+STRIP \
+RANLIB \
+CC \
+CFLAGS \
+compiler \
+lt_cv_sys_global_symbol_pipe \
+lt_cv_sys_global_symbol_to_cdecl \
+lt_cv_sys_global_symbol_to_c_name_address \
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
+SHELL \
+ECHO \
+lt_prog_compiler_no_builtin_flag \
+lt_prog_compiler_wl \
+lt_prog_compiler_pic \
+lt_prog_compiler_static \
+lt_cv_prog_compiler_c_o \
+need_locks \
+DSYMUTIL \
+NMEDIT \
+LIPO \
+OTOOL \
+OTOOL64 \
+shrext_cmds \
+export_dynamic_flag_spec \
+whole_archive_flag_spec \
+compiler_needs_object \
+with_gnu_ld \
+allow_undefined_flag \
+no_undefined_flag \
+hardcode_libdir_flag_spec \
+hardcode_libdir_flag_spec_ld \
+hardcode_libdir_separator \
+fix_srcfile_path \
+exclude_expsyms \
+include_expsyms \
+file_list_spec \
+variables_saved_for_relink \
+libname_spec \
+library_names_spec \
+soname_spec \
+finish_eval \
+old_striplib \
+striplib \
+compiler_lib_search_dirs \
+predep_objects \
+postdep_objects \
+predeps \
+postdeps \
+compiler_lib_search_path \
+LD_CXX \
+LD_F77 \
+LD_FC \
+compiler_CXX \
+compiler_F77 \
+compiler_FC \
+lt_prog_compiler_no_builtin_flag_CXX \
+lt_prog_compiler_no_builtin_flag_F77 \
+lt_prog_compiler_no_builtin_flag_FC \
+lt_prog_compiler_wl_CXX \
+lt_prog_compiler_wl_F77 \
+lt_prog_compiler_wl_FC \
+lt_prog_compiler_pic_CXX \
+lt_prog_compiler_pic_F77 \
+lt_prog_compiler_pic_FC \
+lt_prog_compiler_static_CXX \
+lt_prog_compiler_static_F77 \
+lt_prog_compiler_static_FC \
+lt_cv_prog_compiler_c_o_CXX \
+lt_cv_prog_compiler_c_o_F77 \
+lt_cv_prog_compiler_c_o_FC \
+export_dynamic_flag_spec_CXX \
+export_dynamic_flag_spec_F77 \
+export_dynamic_flag_spec_FC \
+whole_archive_flag_spec_CXX \
+whole_archive_flag_spec_F77 \
+whole_archive_flag_spec_FC \
+compiler_needs_object_CXX \
+compiler_needs_object_F77 \
+compiler_needs_object_FC \
+with_gnu_ld_CXX \
+with_gnu_ld_F77 \
+with_gnu_ld_FC \
+allow_undefined_flag_CXX \
+allow_undefined_flag_F77 \
+allow_undefined_flag_FC \
+no_undefined_flag_CXX \
+no_undefined_flag_F77 \
+no_undefined_flag_FC \
+hardcode_libdir_flag_spec_CXX \
+hardcode_libdir_flag_spec_F77 \
+hardcode_libdir_flag_spec_FC \
+hardcode_libdir_flag_spec_ld_CXX \
+hardcode_libdir_flag_spec_ld_F77 \
+hardcode_libdir_flag_spec_ld_FC \
+hardcode_libdir_separator_CXX \
+hardcode_libdir_separator_F77 \
+hardcode_libdir_separator_FC \
+fix_srcfile_path_CXX \
+fix_srcfile_path_F77 \
+fix_srcfile_path_FC \
+exclude_expsyms_CXX \
+exclude_expsyms_F77 \
+exclude_expsyms_FC \
+include_expsyms_CXX \
+include_expsyms_F77 \
+include_expsyms_FC \
+file_list_spec_CXX \
+file_list_spec_F77 \
+file_list_spec_FC \
+compiler_lib_search_dirs_CXX \
+compiler_lib_search_dirs_F77 \
+compiler_lib_search_dirs_FC \
+predep_objects_CXX \
+predep_objects_F77 \
+predep_objects_FC \
+postdep_objects_CXX \
+postdep_objects_F77 \
+postdep_objects_FC \
+predeps_CXX \
+predeps_F77 \
+predeps_FC \
+postdeps_CXX \
+postdeps_F77 \
+postdeps_FC \
+compiler_lib_search_path_CXX \
+compiler_lib_search_path_F77 \
+compiler_lib_search_path_FC; do
+ case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
+ *[\\\\\\\`\\"\\\$]*)
+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
+ ;;
+ *)
+ eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+ ;;
+ esac
+done
+
+# Double-quote double-evaled strings.
+for var in reload_cmds \
+old_postinstall_cmds \
+old_postuninstall_cmds \
+old_archive_cmds \
+extract_expsyms_cmds \
+old_archive_from_new_cmds \
+old_archive_from_expsyms_cmds \
+archive_cmds \
+archive_expsym_cmds \
+module_cmds \
+module_expsym_cmds \
+export_symbols_cmds \
+prelink_cmds \
+postinstall_cmds \
+postuninstall_cmds \
+finish_cmds \
+sys_lib_search_path_spec \
+sys_lib_dlsearch_path_spec \
+old_archive_cmds_CXX \
+old_archive_cmds_F77 \
+old_archive_cmds_FC \
+old_archive_from_new_cmds_CXX \
+old_archive_from_new_cmds_F77 \
+old_archive_from_new_cmds_FC \
+old_archive_from_expsyms_cmds_CXX \
+old_archive_from_expsyms_cmds_F77 \
+old_archive_from_expsyms_cmds_FC \
+archive_cmds_CXX \
+archive_cmds_F77 \
+archive_cmds_FC \
+archive_expsym_cmds_CXX \
+archive_expsym_cmds_F77 \
+archive_expsym_cmds_FC \
+module_cmds_CXX \
+module_cmds_F77 \
+module_cmds_FC \
+module_expsym_cmds_CXX \
+module_expsym_cmds_F77 \
+module_expsym_cmds_FC \
+export_symbols_cmds_CXX \
+export_symbols_cmds_F77 \
+export_symbols_cmds_FC \
+prelink_cmds_CXX \
+prelink_cmds_F77 \
+prelink_cmds_FC; do
+ case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
+ *[\\\\\\\`\\"\\\$]*)
+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
+ ;;
+ *)
+ eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+ ;;
+ esac
+done
+
+# Fix-up fallback echo if it was mangled by the above quoting rules.
+case \$lt_ECHO in
+*'\\\$0 --fallback-echo"') lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\$0 --fallback-echo"\$/\$0 --fallback-echo"/'\`
+ ;;
esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
+ac_aux_dir='$ac_aux_dir'
+xsi_shell='$xsi_shell'
+lt_shell_append='$lt_shell_append'
-else
- notfound="zlib.h"
+# See if we are running on zsh, and set the options which allow our
+# commands through without removal of \ escapes INIT.
+if test -n "\${ZSH_VERSION+set}" ; then
+ setopt NO_GLOB_SUBST
fi
-done
+
+ PACKAGE='$PACKAGE'
+ VERSION='$VERSION'
+ TIMESTAMP='$TIMESTAMP'
+ RM='$RM'
+ ofile='$ofile'
+
-{ echo "$as_me:$LINENO: checking for compress2 in -lz" >&5
-echo $ECHO_N "checking for compress2 in -lz... $ECHO_C" >&6; }
-if test "${ac_cv_lib_z_compress2+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lz $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char compress2 ();
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-# ifdef __cplusplus
- extern "C"
-# endif
- int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
-return compress2 ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- ac_cv_lib_z_compress2=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
- ac_cv_lib_z_compress2=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_z_compress2" >&5
-echo "${ECHO_T}$ac_cv_lib_z_compress2" >&6; }
-if test $ac_cv_lib_z_compress2 = yes; then
- cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBZ 1
-_ACEOF
- LIBS="-lz $LIBS"
-else
- notfound="$notfound libz.a"
-fi
- fi
- fi
- #
- # If libz was not found, the failure of hdf5 must be something else.
- #
- if test -n "$notfound"; then
- CPPFLAGS="$saved_CPPFLAGS"
- LDFLAGS="$saved_LDFLAGS"
- HDF5_DRV=""
- if test -n "$hdf5_explicit"; then
- { { echo "$as_me:$LINENO: error:
-You have made an explicit request for hdf5 with the --with-hdf option
-and $0 is unable to find hdf5 and its supporting libs, if any.
-Please see INSTALL_FAQ for possible causes." >&5
-echo "$as_me: error:
-You have made an explicit request for hdf5 with the --with-hdf option
-and $0 is unable to find hdf5 and its supporting libs, if any.
-Please see INSTALL_FAQ for possible causes." >&2;}
- { (exit 1); exit 1; }; }
- else
- { echo "$as_me:$LINENO: WARNING: hdf5 driver disabled" >&5
-echo "$as_me: WARNING: hdf5 driver disabled" >&2;}
- fi
- else
- # we unset these to defeat autoconf's cache
- unset ac_cv_header_hdf5_h
- unset ac_cv_lib_hdf5_H5open
- #
- # Now, retest for hdf5 with zlib
- #
- if test -n "$hdf5_inc"; then
- CPPFLAGS="-I$hdf5_inc $CPPFLAGS"
- fi
- if test -n "$hdf5_lib"; then
- if test -n "$szlib_lib"; then
- LDFLAGS="-L$hdf5_lib -L$szlib_lib $LDFLAGS"
- else
- LDFLAGS="-L$hdf5_lib $LDFLAGS"
- fi
- fi
- notfound=""
-for ac_header in hdf5.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-else
- # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <$ac_header>
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
- ac_header_compiler=no
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+
+# Handling of arguments.
+for ac_config_target in $ac_config_targets
+do
+ case $ac_config_target in
+ "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h:config/config.h.in" ;;
+ "tests/atconfig") CONFIG_COMMANDS="$CONFIG_COMMANDS tests/atconfig" ;;
+ "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
+ "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
+ "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+ "SiloWindows/Makefile") CONFIG_FILES="$CONFIG_FILES SiloWindows/Makefile" ;;
+ "svn_bin/Makefile") CONFIG_FILES="$CONFIG_FILES svn_bin/Makefile" ;;
+ "config/Makefile") CONFIG_FILES="$CONFIG_FILES config/Makefile" ;;
+ "config-site/Makefile") CONFIG_FILES="$CONFIG_FILES config-site/Makefile" ;;
+ "docs/Makefile") CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;;
+ "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
+ "src/score/Makefile") CONFIG_FILES="$CONFIG_FILES src/score/Makefile" ;;
+ "src/pdb/Makefile") CONFIG_FILES="$CONFIG_FILES src/pdb/Makefile" ;;
+ "src/silo/Makefile") CONFIG_FILES="$CONFIG_FILES src/silo/Makefile" ;;
+ "src/silo/silo.h") CONFIG_FILES="$CONFIG_FILES src/silo/silo.h" ;;
+ "src/debug/Makefile") CONFIG_FILES="$CONFIG_FILES src/debug/Makefile" ;;
+ "src/netcdf/Makefile") CONFIG_FILES="$CONFIG_FILES src/netcdf/Makefile" ;;
+ "src/pdb_drv/Makefile") CONFIG_FILES="$CONFIG_FILES src/pdb_drv/Makefile" ;;
+ "src/pdbp_drv/Makefile") CONFIG_FILES="$CONFIG_FILES src/pdbp_drv/Makefile" ;;
+ "src/hdf5_drv/Makefile") CONFIG_FILES="$CONFIG_FILES src/hdf5_drv/Makefile" ;;
+ "src/taurus/Makefile") CONFIG_FILES="$CONFIG_FILES src/taurus/Makefile" ;;
+ "src/unknown/Makefile") CONFIG_FILES="$CONFIG_FILES src/unknown/Makefile" ;;
+ "src/filters/Makefile") CONFIG_FILES="$CONFIG_FILES src/filters/Makefile" ;;
+ "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
+ "tools/Makefile") CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;;
+ "tools/browser/Makefile") CONFIG_FILES="$CONFIG_FILES tools/browser/Makefile" ;;
+ "tools/python/Makefile") CONFIG_FILES="$CONFIG_FILES tools/python/Makefile" ;;
+ "tools/silex/Makefile") CONFIG_FILES="$CONFIG_FILES tools/silex/Makefile" ;;
+ "tools/silock/Makefile") CONFIG_FILES="$CONFIG_FILES tools/silock/Makefile" ;;
+ "src/hzip/Makefile") CONFIG_FILES="$CONFIG_FILES src/hzip/Makefile" ;;
+ "src/fpzip/Makefile") CONFIG_FILES="$CONFIG_FILES src/fpzip/Makefile" ;;
+ "src/libsiloh5.settings") CONFIG_FILES="$CONFIG_FILES src/libsiloh5.settings" ;;
+ "src/libsilo.settings") CONFIG_FILES="$CONFIG_FILES src/libsilo.settings" ;;
+
+ *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
+$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+ { (exit 1); exit 1; }; };;
+ esac
+done
+
+
+# If the user did not use the arguments to specify the items to instantiate,
+# then the envvar interface is used. Set only those that are not.
+# We use the long form for the default assignment because of an extremely
+# bizarre bug on SunOS 4.1.3.
+if $ac_need_defaults; then
+ test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
+ test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
+ test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+# Have a temporary directory for convenience. Make it in the build tree
+# simply because there is no reason against having it here, and in addition,
+# creating and moving files from /tmp can sometimes cause problems.
+# Hook for its removal unless debugging.
+# Note that there is a small window in which the directory will not be cleaned:
+# after its creation but before its name has been assigned to `$tmp'.
+$debug ||
+{
+ tmp=
+ trap 'exit_status=$?
+ { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
+' 0
+ trap '{ (exit 1); exit 1; }' 1 2 13 15
+}
+# Create a (secure) tmp directory for tmp files.
-# Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+{
+ tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
+ test -n "$tmp" && test -d "$tmp"
+} ||
+{
+ tmp=./conf$$-$RANDOM
+ (umask 077 && mkdir "$tmp")
+} ||
+{
+ $as_echo "$as_me: cannot create a temporary directory in ." >&2
+ { (exit 1); exit 1; }
+}
- ac_header_preproc=no
-fi
+# Set up the scripts for CONFIG_FILES section.
+# No need to generate them if there are no CONFIG_FILES.
+# This happens for instance with `./config.status config.h'.
+if test -n "$CONFIG_FILES"; then
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
- ( cat <<\_ASBOX
-## ----------------------------------------- ##
-## Report this to visit-users at email.ornl.gov ##
-## ----------------------------------------- ##
-_ASBOX
- ) | sed "s/^/$as_me: WARNING: /" >&2
- ;;
-esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ac_cr='
'
+ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
+if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
+ ac_cs_awk_cr='\\r'
else
- eval "$as_ac_Header=\$ac_header_preproc"
+ ac_cs_awk_cr=$ac_cr
fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+echo 'BEGIN {' >"$tmp/subs1.awk" &&
_ACEOF
-else
- notfound="hdf5.h"
-fi
-
-done
- tmp_LIBS="$LIBS"
+{
+ echo "cat >conf$$subs.awk <<_ACEOF" &&
+ echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
+ echo "_ACEOF"
+} >conf$$subs.sh ||
+ { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+ { (exit 1); exit 1; }; }
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
+ac_delim='%!_!# '
+for ac_last_try in false false false false false :; do
+ . ./conf$$subs.sh ||
+ { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+ { (exit 1); exit 1; }; }
-{ echo "$as_me:$LINENO: checking for H5open in -lhdf5" >&5
-echo $ECHO_N "checking for H5open in -lhdf5... $ECHO_C" >&6; }
-if test "${ac_cv_lib_hdf5_H5open+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lhdf5 $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
+ ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
+ if test $ac_delim_n = $ac_delim_num; then
+ break
+ elif $ac_last_try; then
+ { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+ { (exit 1); exit 1; }; }
+ else
+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+ fi
+done
+rm -f conf$$subs.sh
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
+_ACEOF
+sed -n '
+h
+s/^/S["/; s/!.*/"]=/
+p
+g
+s/^[^!]*!//
+:repl
+t repl
+s/'"$ac_delim"'$//
+t delim
+:nl
+h
+s/\(.\{148\}\).*/\1/
+t more1
+s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
+p
+n
+b repl
+:more1
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t nl
+:delim
+h
+s/\(.\{148\}\).*/\1/
+t more2
+s/["\\]/\\&/g; s/^/"/; s/$/"/
+p
+b
+:more2
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t delim
+' <conf$$subs.awk | sed '
+/^[^""]/{
+ N
+ s/\n//
+}
+' >>$CONFIG_STATUS || ac_write_fail=1
+rm -f conf$$subs.awk
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+_ACAWK
+cat >>"\$tmp/subs1.awk" <<_ACAWK &&
+ for (key in S) S_is_set[key] = 1
+ FS = ""
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char H5open ();
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-# ifdef __cplusplus
- extern "C"
-# endif
- int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
+}
{
-return H5open ();
- ;
- return 0;
+ line = $ 0
+ nfields = split(line, field, "@")
+ substed = 0
+ len = length(field[1])
+ for (i = 2; i < nfields; i++) {
+ key = field[i]
+ keylen = length(key)
+ if (S_is_set[key]) {
+ value = S[key]
+ line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
+ len += length(value) + length(field[++i])
+ substed = 1
+ } else
+ len += 1 + keylen
+ }
+
+ print line
}
+
+_ACAWK
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- ac_cv_lib_hdf5_H5open=yes
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
+ sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+ cat
+fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
+ || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
+$as_echo "$as_me: error: could not setup config files machinery" >&2;}
+ { (exit 1); exit 1; }; }
+_ACEOF
- ac_cv_lib_hdf5_H5open=no
+# VPATH may cause trouble with some makes, so we remove $(srcdir),
+# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
+# trailing colons and then remove the whole line if VPATH becomes empty
+# (actually we leave an empty line to preserve line numbers).
+if test "x$srcdir" = x.; then
+ ac_vpsub='/^[ ]*VPATH[ ]*=/{
+s/:*\$(srcdir):*/:/
+s/:*\${srcdir}:*/:/
+s/:*@srcdir@:*/:/
+s/^\([^=]*=[ ]*\):*/\1/
+s/:*$//
+s/^[^=]*=[ ]*$//
+}'
fi
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_hdf5_H5open" >&5
-echo "${ECHO_T}$ac_cv_lib_hdf5_H5open" >&6; }
-if test $ac_cv_lib_hdf5_H5open = yes; then
- cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBHDF5 1
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+fi # test -n "$CONFIG_FILES"
+
+# Set up the scripts for CONFIG_HEADERS section.
+# No need to generate them if there are no CONFIG_HEADERS.
+# This happens for instance with `./config.status Makefile'.
+if test -n "$CONFIG_HEADERS"; then
+cat >"$tmp/defines.awk" <<\_ACAWK ||
+BEGIN {
+_ACEOF
+
+# Transform confdefs.h into an awk script `defines.awk', embedded as
+# here-document in config.status, that substitutes the proper values into
+# config.h.in to produce config.h.
+
+# Create a delimiter string that does not exist in confdefs.h, to ease
+# handling of long lines.
+ac_delim='%!_!# '
+for ac_last_try in false false :; do
+ ac_t=`sed -n "/$ac_delim/p" confdefs.h`
+ if test -z "$ac_t"; then
+ break
+ elif $ac_last_try; then
+ { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;}
+ { (exit 1); exit 1; }; }
+ else
+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+ fi
+done
+
+# For the awk script, D is an array of macro values keyed by name,
+# likewise P contains macro parameters if any. Preserve backslash
+# newline sequences.
+
+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
+sed -n '
+s/.\{148\}/&'"$ac_delim"'/g
+t rset
+:rset
+s/^[ ]*#[ ]*define[ ][ ]*/ /
+t def
+d
+:def
+s/\\$//
+t bsnl
+s/["\\]/\\&/g
+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\
+D["\1"]=" \3"/p
+s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2"/p
+d
+:bsnl
+s/["\\]/\\&/g
+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\
+D["\1"]=" \3\\\\\\n"\\/p
+t cont
+s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
+t cont
+d
+:cont
+n
+s/.\{148\}/&'"$ac_delim"'/g
+t clear
+:clear
+s/\\$//
+t bsnlc
+s/["\\]/\\&/g; s/^/"/; s/$/"/p
+d
+:bsnlc
+s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
+b cont
+' <confdefs.h | sed '
+s/'"$ac_delim"'/"\\\
+"/g' >>$CONFIG_STATUS || ac_write_fail=1
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ for (key in D) D_is_set[key] = 1
+ FS = ""
+}
+/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
+ line = \$ 0
+ split(line, arg, " ")
+ if (arg[1] == "#") {
+ defundef = arg[2]
+ mac1 = arg[3]
+ } else {
+ defundef = substr(arg[1], 2)
+ mac1 = arg[2]
+ }
+ split(mac1, mac2, "(") #)
+ macro = mac2[1]
+ prefix = substr(line, 1, index(line, defundef) - 1)
+ if (D_is_set[macro]) {
+ # Preserve the white space surrounding the "#".
+ print prefix "define", macro P[macro] D[macro]
+ next
+ } else {
+ # Replace #undef with comments. This is necessary, for example,
+ # in the case of _POSIX_SOURCE, which is predefined and required
+ # on some systems where configure will not decide to define it.
+ if (defundef == "undef") {
+ print "/*", prefix defundef, macro, "*/"
+ next
+ }
+ }
+}
+{ print }
+_ACAWK
_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+ { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5
+$as_echo "$as_me: error: could not setup config headers machinery" >&2;}
+ { (exit 1); exit 1; }; }
+fi # test -n "$CONFIG_HEADERS"
+
+
+eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS"
+shift
+for ac_tag
+do
+ case $ac_tag in
+ :[FHLC]) ac_mode=$ac_tag; continue;;
+ esac
+ case $ac_mode$ac_tag in
+ :[FHL]*:*);;
+ :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5
+$as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
+ { (exit 1); exit 1; }; };;
+ :[FH]-) ac_tag=-:-;;
+ :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
+ esac
+ ac_save_IFS=$IFS
+ IFS=:
+ set x $ac_tag
+ IFS=$ac_save_IFS
+ shift
+ ac_file=$1
+ shift
+
+ case $ac_mode in
+ :L) ac_source=$1;;
+ :[FH])
+ ac_file_inputs=
+ for ac_f
+ do
+ case $ac_f in
+ -) ac_f="$tmp/stdin";;
+ *) # Look for the file first in the build tree, then in the source tree
+ # (if the path is not absolute). The absolute path cannot be DOS-style,
+ # because $ac_f cannot contain `:'.
+ test -f "$ac_f" ||
+ case $ac_f in
+ [\\/$]*) false;;
+ *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
+ esac ||
+ { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
+$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
+ { (exit 1); exit 1; }; };;
+ esac
+ case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+ ac_file_inputs="$ac_file_inputs '$ac_f'"
+ done
+
+ # Let's still pretend it is `configure' which instantiates (i.e., don't
+ # use $as_me), people would be surprised to read:
+ # /* config.h. Generated by config.status. */
+ configure_input='Generated from '`
+ $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+ `' by configure.'
+ if test x"$ac_file" != x-; then
+ configure_input="$ac_file. $configure_input"
+ { $as_echo "$as_me:$LINENO: creating $ac_file" >&5
+$as_echo "$as_me: creating $ac_file" >&6;}
+ fi
+ # Neutralize special characters interpreted by sed in replacement strings.
+ case $configure_input in #(
+ *\&* | *\|* | *\\* )
+ ac_sed_conf_input=`$as_echo "$configure_input" |
+ sed 's/[\\\\&|]/\\\\&/g'`;; #(
+ *) ac_sed_conf_input=$configure_input;;
+ esac
+
+ case $ac_tag in
+ *:-:* | *:-) cat >"$tmp/stdin" \
+ || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+ { (exit 1); exit 1; }; } ;;
+ esac
+ ;;
+ esac
+
+ ac_dir=`$as_dirname -- "$ac_file" ||
+$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$ac_file" : 'X\(//\)[^/]' \| \
+ X"$ac_file" : 'X\(//\)$' \| \
+ X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$ac_file" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)[^/].*/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
+ { as_dir="$ac_dir"
+ case $as_dir in #(
+ -*) as_dir=./$as_dir;;
+ esac
+ test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
+ as_dirs=
+ while :; do
+ case $as_dir in #(
+ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+ *) as_qdir=$as_dir;;
+ esac
+ as_dirs="'$as_qdir' $as_dirs"
+ as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$as_dir" : 'X\(//\)[^/]' \| \
+ X"$as_dir" : 'X\(//\)$' \| \
+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)[^/].*/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
+ test -d "$as_dir" && break
+ done
+ test -z "$as_dirs" || eval "mkdir $as_dirs"
+ } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
+ { (exit 1); exit 1; }; }; }
+ ac_builddir=.
- LIBS="-lhdf5 $LIBS"
+case "$ac_dir" in
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+*)
+ ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+ # A ".." for each directory in $ac_dir_suffix.
+ ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+ case $ac_top_builddir_sub in
+ "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+ esac ;;
+esac
+ac_abs_top_builddir=$ac_pwd
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
+# for backward compatibility:
+ac_top_builddir=$ac_top_build_prefix
-else
- notfound="$notfound libhdf5.a"
-fi
+case $srcdir in
+ .) # We are building in place.
+ ac_srcdir=.
+ ac_top_srcdir=$ac_top_builddir_sub
+ ac_abs_top_srcdir=$ac_pwd ;;
+ [\\/]* | ?:[\\/]* ) # Absolute name.
+ ac_srcdir=$srcdir$ac_dir_suffix;
+ ac_top_srcdir=$srcdir
+ ac_abs_top_srcdir=$srcdir ;;
+ *) # Relative name.
+ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+ ac_top_srcdir=$ac_top_build_prefix$srcdir
+ ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+esac
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
- if test "$notfound" = ""; then
- if test -n "$szlib_lib"; then
-### LIBS="$hdf5_lib/libhdf5.a $tmp_LIBS"
- LIBS="-lhdf5 -lsz $tmp_LIBS"
- else
- LIBS="-lhdf5 $tmp_LIBS"
- fi
- fi
- if test -n "$notfound"; then
- CPPFLAGS="$saved_CPPFLAGS"
- LDFLAGS="$saved_LDFLAGS"
- HDF5_DRV=""
- if test -n "$hdf5_explicit"; then
- { { echo "$as_me:$LINENO: error:
-You have made an explicit request for hdf5 with the --with-hdf option
-and $0 is unable to find hdf5 and its supporting libs, if any.
-Please see INSTALL_FAQ for possible causes." >&5
-echo "$as_me: error:
-You have made an explicit request for hdf5 with the --with-hdf option
-and $0 is unable to find hdf5 and its supporting libs, if any.
-Please see INSTALL_FAQ for possible causes." >&2;}
- { (exit 1); exit 1; }; }
- else
- { echo "$as_me:$LINENO: WARNING: hdf5 driver disabled" >&5
-echo "$as_me: WARNING: hdf5 driver disabled" >&2;}
- fi
- fi
- fi # if test -n "$notfound" (for second hdf5 test)
- fi # if test -n "$notfound" (for zlib)
- fi # if test "no" = "$withval"
-fi # if test -n "$HDF5_DRV"
-# Check to see if the results of the above tests found the HDF5 libraries
-if test -n "$HDF5_DRV"; then
- # Short-term hack to deal with bogus code above (too complex)
- # putting -lsz AHEAD of -lhdf5 in libs
- if test "$HAVE_SZLIB" = "yes"; then
- LIBS="$LIBS -lsz"
- fi
+ case $ac_mode in
+ :F)
+ #
+ # CONFIG_FILE
+ #
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_HDF5_DRIVER 1
+ case $INSTALL in
+ [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
+ *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
+ esac
+ ac_MKDIR_P=$MKDIR_P
+ case $MKDIR_P in
+ [\\/$]* | ?:[\\/]* ) ;;
+ */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
+ esac
_ACEOF
-else
- LIBS="$saved_LIBS"
-fi
-
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# If the template does not know about datarootdir, expand it.
+# FIXME: This hack should be removed a few years after 2.60.
+ac_datarootdir_hack=; ac_datarootdir_seen=
-# Check whether --with-pdb-proper was given.
-if test "${with_pdb_proper+set}" = set; then
- withval=$with_pdb_proper; if test $withval != yes; then
- PDBP_DRV="pdbp_drv"
+ac_sed_dataroot='
+/datarootdir/ {
+ p
+ q
+}
+/@datadir@/p
+/@docdir@/p
+/@infodir@/p
+/@localedir@/p
+/@mandir@/p
+'
+case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
+*datarootdir*) ac_datarootdir_seen=yes;;
+*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ ac_datarootdir_hack='
+ s&@datadir@&$datadir&g
+ s&@docdir@&$docdir&g
+ s&@infodir@&$infodir&g
+ s&@localedir@&$localedir&g
+ s&@mandir@&$mandir&g
+ s&\\\${datarootdir}&$datarootdir&g' ;;
+esac
+_ACEOF
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_PDBP_DRIVER 1
+# Neutralize VPATH when `$srcdir' = `.'.
+# Shell code in configure.ac might set extrasub.
+# FIXME: do we really want to maintain this feature?
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_sed_extra="$ac_vpsub
+$extrasub
_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+:t
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+s|@configure_input@|$ac_sed_conf_input|;t t
+s&@top_builddir@&$ac_top_builddir_sub&;t t
+s&@top_build_prefix@&$ac_top_build_prefix&;t t
+s&@srcdir@&$ac_srcdir&;t t
+s&@abs_srcdir@&$ac_abs_srcdir&;t t
+s&@top_srcdir@&$ac_top_srcdir&;t t
+s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
+s&@builddir@&$ac_builddir&;t t
+s&@abs_builddir@&$ac_abs_builddir&;t t
+s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
+s&@INSTALL@&$ac_INSTALL&;t t
+s&@MKDIR_P@&$ac_MKDIR_P&;t t
+$ac_datarootdir_hack
+"
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
+ || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+ { (exit 1); exit 1; }; }
+test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
+ { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
+ { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined. Please make sure it is defined." >&5
+$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined. Please make sure it is defined." >&2;}
- CPPFLAGS="-I$withval/include $CPPFLAGS"
- LDFLAGS="-L$withval/lib $LDFLAGS"
- LIBS="-lpdb -lpml -lscore $LIBS"
+ rm -f "$tmp/stdin"
+ case $ac_file in
+ -) cat "$tmp/out" && rm -f "$tmp/out";;
+ *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
+ esac \
+ || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+ :H)
+ #
+ # CONFIG_HEADER
+ #
+ if test x"$ac_file" != x-; then
+ {
+ $as_echo "/* $configure_input */" \
+ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
+ } >"$tmp/config.h" \
+ || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+ { (exit 1); exit 1; }; }
+ if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
+ { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5
+$as_echo "$as_me: $ac_file is unchanged" >&6;}
else
- { { echo "$as_me:$LINENO: error: You must specify a directory for PDB proper" >&5
-echo "$as_me: error: You must specify a directory for PDB proper" >&2;}
+ rm -f "$ac_file"
+ mv "$tmp/config.h" "$ac_file" \
+ || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
{ (exit 1); exit 1; }; }
fi
+ else
+ $as_echo "/* $configure_input */" \
+ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
+ || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5
+$as_echo "$as_me: error: could not create -" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+# Compute "$ac_file"'s index in $config_headers.
+_am_arg="$ac_file"
+_am_stamp_count=1
+for _am_header in $config_headers :; do
+ case $_am_header in
+ $_am_arg | $_am_arg:* )
+ break ;;
+ * )
+ _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+ esac
+done
+echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
+$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$_am_arg" : 'X\(//\)[^/]' \| \
+ X"$_am_arg" : 'X\(//\)$' \| \
+ X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$_am_arg" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)[^/].*/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`/stamp-h$_am_stamp_count
+ ;;
-fi
-
-
-READLINE_LIBS=""
-if test "X$detect_readline" = Xyes; then
-# use contributed GNU m4 macro library provided see:
-# autoconf-archive-2006-06-04/htmldoc/vl_lib_readline.html
- saved_LIBS="$LIBS"
-
- { echo "$as_me:$LINENO: checking for a readline compatible library" >&5
-echo $ECHO_N "checking for a readline compatible library... $ECHO_C" >&6; }
-if test "${vl_cv_lib_readline+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
+ :C) { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5
+$as_echo "$as_me: executing $ac_file commands" >&6;}
+ ;;
+ esac
- ORIG_LIBS="$LIBS"
- for readline_lib in readline edit editline; do
- for termcap_lib in "" termcap curses ncurses; do
- if test -z "$termcap_lib"; then
- TRY_LIB="-l$readline_lib"
- else
- TRY_LIB="-l$readline_lib -l$termcap_lib"
- fi
- LIBS="$ORIG_LIBS $TRY_LIB"
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char readline ();
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-# ifdef __cplusplus
- extern "C"
-# endif
- int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
-return readline ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- vl_cv_lib_readline="$TRY_LIB"
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+ case $ac_file$ac_mode in
+ "tests/atconfig":C) cat >tests/atconfig <<ATEOF
+# Configurable variable values for building test suites.
+# Generated by $0.
+# Copyright (C) 2000, 2001, 2003, 2004 Free Software Foundation, Inc.
+# The test suite will define top_srcdir=$at_top_srcdir/../.. etc.
+at_testdir='tests'
+abs_builddir='$ac_abs_builddir'
+at_srcdir='$ac_srcdir'
+abs_srcdir='$ac_abs_srcdir'
+at_top_srcdir='$ac_top_srcdir'
+abs_top_srcdir='$ac_abs_top_srcdir'
+at_top_build_prefix='$ac_top_build_prefix'
+abs_top_builddir='$ac_abs_top_builddir'
-fi
+# Backward compatibility with Autotest <= 2.59b:
+at_top_builddir=\$at_top_build_prefix
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- if test -n "$vl_cv_lib_readline"; then
- break
- fi
- done
- if test -n "$vl_cv_lib_readline"; then
- break
- fi
+AUTOTEST_PATH='tests'
+
+SHELL=\${CONFIG_SHELL-'$SHELL'}
+ATEOF
+ ;;
+ "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
+ # Autoconf 2.62 quotes --file arguments for eval, but not when files
+ # are listed without --file. Let's play safe and only enable the eval
+ # if we detect the quoting.
+ case $CONFIG_FILES in
+ *\'*) eval set x "$CONFIG_FILES" ;;
+ *) set x $CONFIG_FILES ;;
+ esac
+ shift
+ for mf
+ do
+ # Strip MF so we end up with the name of the file.
+ mf=`echo "$mf" | sed -e 's/:.*$//'`
+ # Check whether this is an Automake generated Makefile or not.
+ # We used to match only the files named `Makefile.in', but
+ # some people rename them; so instead we look at the file content.
+ # Grep'ing the first line is not enough: some people post-process
+ # each Makefile.in and add a new line on top of each file to say so.
+ # Grep'ing the whole file is not good either: AIX grep has a line
+ # limit of 2048, but all sed's we know have understand at least 4000.
+ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+ dirpart=`$as_dirname -- "$mf" ||
+$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$mf" : 'X\(//\)[^/]' \| \
+ X"$mf" : 'X\(//\)$' \| \
+ X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$mf" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)[^/].*/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
+ else
+ continue
+ fi
+ # Extract the definition of DEPDIR, am__include, and am__quote
+ # from the Makefile without running `make'.
+ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+ test -z "$DEPDIR" && continue
+ am__include=`sed -n 's/^am__include = //p' < "$mf"`
+ test -z "am__include" && continue
+ am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+ # When using ansi2knr, U may be empty or an underscore; expand it
+ U=`sed -n 's/^U = //p' < "$mf"`
+ # Find all dependency output files, they are included files with
+ # $(DEPDIR) in their names. We invoke sed twice because it is the
+ # simplest approach to changing $(DEPDIR) to its actual value in the
+ # expansion.
+ for file in `sed -n "
+ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+ # Make sure the directory exists.
+ test -f "$dirpart/$file" && continue
+ fdir=`$as_dirname -- "$file" ||
+$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$file" : 'X\(//\)[^/]' \| \
+ X"$file" : 'X\(//\)$' \| \
+ X"$file" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$file" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)[^/].*/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
+ { as_dir=$dirpart/$fdir
+ case $as_dir in #(
+ -*) as_dir=./$as_dir;;
+ esac
+ test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
+ as_dirs=
+ while :; do
+ case $as_dir in #(
+ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+ *) as_qdir=$as_dir;;
+ esac
+ as_dirs="'$as_qdir' $as_dirs"
+ as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$as_dir" : 'X\(//\)[^/]' \| \
+ X"$as_dir" : 'X\(//\)$' \| \
+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)[^/].*/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
+ test -d "$as_dir" && break
done
- if test -z "$vl_cv_lib_readline"; then
- vl_cv_lib_readline="no"
- LIBS="$ORIG_LIBS"
+ test -z "$as_dirs" || eval "mkdir $as_dirs"
+ } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
+ { (exit 1); exit 1; }; }; }
+ # echo "creating $dirpart/$file"
+ echo '# dummy' > "$dirpart/$file"
+ done
+ done
+}
+ ;;
+ "libtool":C)
+
+ # See if we are running on zsh, and set the options which allow our
+ # commands through without removal of \ escapes.
+ if test -n "${ZSH_VERSION+set}" ; then
+ setopt NO_GLOB_SUBST
fi
-fi
-{ echo "$as_me:$LINENO: result: $vl_cv_lib_readline" >&5
-echo "${ECHO_T}$vl_cv_lib_readline" >&6; }
+ cfgfile="${ofile}T"
+ trap "$RM \"$cfgfile\"; exit 1" 1 2 15
+ $RM "$cfgfile"
- if test "$vl_cv_lib_readline" != "no"; then
+ cat <<_LT_EOF >> "$cfgfile"
+#! $SHELL
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LIBREADLINE 1
-_ACEOF
+# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
+# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+# NOTE: Changes made to this file will be lost: look at ltmain.sh.
+#
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
+# 2006, 2007, 2008 Free Software Foundation, Inc.
+# Written by Gordon Matzigkeit, 1996
+#
+# This file is part of GNU Libtool.
+#
+# GNU Libtool is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
+#
+# As a special exception to the GNU General Public License,
+# if you distribute this file as part of a program or library that
+# is built using GNU Libtool, you may include this file under the
+# same distribution terms that you use for the rest of that program.
+#
+# GNU Libtool is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Libtool; see the file COPYING. If not, a copy
+# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
+# obtained by writing to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# The names of the tagged configurations supported by this script.
+available_tags="CXX F77 FC "
-for ac_header in readline.h readline/readline.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-else
- # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+# ### BEGIN LIBTOOL CONFIG
- ac_header_compiler=no
-fi
+# Whether or not to build shared libraries.
+build_libtool_libs=$enable_shared
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+# Which release of libtool.m4 was used?
+macro_version=$macro_version
+macro_revision=$macro_revision
-# Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+# Whether or not to build static libraries.
+build_old_libs=$enable_static
- ac_header_preproc=no
-fi
+# What type of objects to build.
+pic_mode=$pic_mode
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+# Whether or not to optimize for fast installation.
+fast_install=$enable_fast_install
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
- ( cat <<\_ASBOX
-## ----------------------------------------- ##
-## Report this to visit-users at email.ornl.gov ##
-## ----------------------------------------- ##
-_ASBOX
- ) | sed "s/^/$as_me: WARNING: /" >&2
- ;;
-esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+# The host system.
+host_alias=$host_alias
+host=$host
+host_os=$host_os
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
+# The build system.
+build_alias=$build_alias
+build=$build
+build_os=$build_os
-fi
+# A sed program that does not truncate output.
+SED=$lt_SED
-done
+# Sed that helps us avoid accidentally triggering echo(1) options like -n.
+Xsed="\$SED -e 1s/^X//"
- { echo "$as_me:$LINENO: checking whether readline supports history" >&5
-echo $ECHO_N "checking whether readline supports history... $ECHO_C" >&6; }
-if test "${vl_cv_lib_readline_history+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
+# A grep program that handles long lines.
+GREP=$lt_GREP
- vl_cv_lib_readline_history="no"
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
+# An ERE matcher.
+EGREP=$lt_EGREP
+
+# A literal string matcher.
+FGREP=$lt_FGREP
+
+# A BSD- or MS-compatible name lister.
+NM=$lt_NM
+
+# Whether we need soft or hard links.
+LN_S=$lt_LN_S
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char add_history ();
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-# ifdef __cplusplus
- extern "C"
-# endif
- int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
-return add_history ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- vl_cv_lib_readline_history="yes"
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+# What is the maximum length of a command?
+max_cmd_len=$max_cmd_len
+# Object file suffix (normally "o").
+objext=$ac_objext
-fi
+# Executable file suffix (normally "").
+exeext=$exeext
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+# whether the shell understands "unset".
+lt_unset=$lt_unset
-fi
-{ echo "$as_me:$LINENO: result: $vl_cv_lib_readline_history" >&5
-echo "${ECHO_T}$vl_cv_lib_readline_history" >&6; }
- if test "$vl_cv_lib_readline_history" = "yes"; then
+# turn spaces into newlines.
+SP2NL=$lt_lt_SP2NL
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_READLINE_HISTORY 1
-_ACEOF
+# turn newlines into spaces.
+NL2SP=$lt_lt_NL2SP
+# How to create reloadable object files.
+reload_flag=$lt_reload_flag
+reload_cmds=$lt_reload_cmds
+# An object symbol dumper.
+OBJDUMP=$lt_OBJDUMP
-for ac_header in history.h readline/history.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-else
- # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+# Method to check whether dependent libraries are shared objects.
+deplibs_check_method=$lt_deplibs_check_method
- ac_header_compiler=no
-fi
+# Command to use when deplibs_check_method == "file_magic".
+file_magic_cmd=$lt_file_magic_cmd
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+# The archiver.
+AR=$lt_AR
+AR_FLAGS=$lt_AR_FLAGS
-# Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+# A symbol stripping program.
+STRIP=$lt_STRIP
- ac_header_preproc=no
-fi
+# Commands used to install an old-style archive.
+RANLIB=$lt_RANLIB
+old_postinstall_cmds=$lt_old_postinstall_cmds
+old_postuninstall_cmds=$lt_old_postuninstall_cmds
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+# A C compiler.
+LTCC=$lt_CC
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
- ( cat <<\_ASBOX
-## ----------------------------------------- ##
-## Report this to visit-users at email.ornl.gov ##
-## ----------------------------------------- ##
-_ASBOX
- ) | sed "s/^/$as_me: WARNING: /" >&2
- ;;
-esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+# LTCC compiler flags.
+LTCFLAGS=$lt_CFLAGS
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
+# Take the output of nm and produce a listing of raw symbols and C names.
+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
-fi
+# Transform the output of nm in a proper C declaration.
+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-done
+# Transform the output of nm in a C name address pair.
+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
- fi
- fi
+# Transform the output of nm in a C name address pair when lib prefix is needed.
+global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
- # Put only the stuff NOT already in $LIBS into READLINE_LIBS
- saved_LIBS_grep=$(echo $saved_LIBS | tr -s ' ' | sed 's% %\\|%g')
- READLINE_LIBS=$(echo $LIBS | tr -s ' ' | tr ' ' '\n' | grep -v -e $saved_LIBS_grep | tr '\n' ' ')
- LIBS="$saved_LIBS"
-else
- { echo "$as_me:$LINENO: checking for readline" >&5
-echo $ECHO_N "checking for readline... $ECHO_C" >&6; }
- { echo "$as_me:$LINENO: result: disabled" >&5
-echo "${ECHO_T}disabled" >&6; }
-fi
+# The name of the directory that contains temporary libtool files.
+objdir=$objdir
+# Shell to use when invoking shell scripts.
+SHELL=$lt_SHELL
+# An echo program that does not interpret backslashes.
+ECHO=$lt_ECHO
-# Check whether --with-qt was given.
-if test "${with_qt+set}" = set; then
- withval=$with_qt; if test $withval != yes; then
- QTDIR=$withval
- fi
+# Used to examine libraries when file_magic_cmd begins with "file".
+MAGIC_CMD=$MAGIC_CMD
-fi
+# Must we lock files when doing compilation?
+need_locks=$lt_need_locks
+# Tool to manipulate archived DWARF debug symbol files on Mac OS X.
+DSYMUTIL=$lt_DSYMUTIL
-# Check whether --with-qt-bin was given.
-if test "${with_qt_bin+set}" = set; then
- withval=$with_qt_bin; if test $withval != yes; then
- QT_BIN=$withval
- fi
+# Tool to change global to local symbols on Mac OS X.
+NMEDIT=$lt_NMEDIT
-fi
+# Tool to manipulate fat objects and archives on Mac OS X.
+LIPO=$lt_LIPO
+# ldd/readelf like tool for Mach-O binaries on Mac OS X.
+OTOOL=$lt_OTOOL
-# Check whether --with-qt-include was given.
-if test "${with_qt_include+set}" = set; then
- withval=$with_qt_include; if test $withval != yes; then
- QT_INCLUDE=$withval
- fi
+# ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4.
+OTOOL64=$lt_OTOOL64
-fi
+# Old archive suffix (normally "a").
+libext=$libext
+# Shared library suffix (normally ".so").
+shrext_cmds=$lt_shrext_cmds
-# Check whether --with-qt-lib was given.
-if test "${with_qt_lib+set}" = set; then
- withval=$with_qt_lib; if test $withval != yes; then
- QT_LIB=$withval
- fi
+# The commands to extract the exported symbol list from a shared archive.
+extract_expsyms_cmds=$lt_extract_expsyms_cmds
-fi
+# Variables whose values should be saved in libtool wrapper scripts and
+# restored at link time.
+variables_saved_for_relink=$lt_variables_saved_for_relink
+# Do we need the "lib" prefix for modules?
+need_lib_prefix=$need_lib_prefix
-if test -n "$SILEX"; then
+# Do we need a version for libraries?
+need_version=$need_version
- if test -z "$QT_BIN" || test -z "$QT_INCLUDE" || test -z "$QT_LIB"; then
- if test -z "QTDIR"; then
- { echo "$as_me:$LINENO: WARNING: The QT_BIN, QT_INCLUDE and QT_LIB environment variables must be set in order to find Qt. silex is being disabled" >&5
-echo "$as_me: WARNING: The QT_BIN, QT_INCLUDE and QT_LIB environment variables must be set in order to find Qt. silex is being disabled" >&2;}
- SILEX=""
- else
- QT_BIN="$QTDIR/bin"
- QT_INCLUDE="$QTDIR/include"
- QT_LIB="$QTDIR/lib"
- fi
- fi
- { echo "$as_me:$LINENO: checking for supported Qt version" >&5
-echo $ECHO_N "checking for supported Qt version... $ECHO_C" >&6; }
- QtVersion=""
- QtVersion2=""
- consumeCount=-1
- toks=`$QT_BIN/qmake --version`
- for tok in $toks; do
- if test "$tok" == "Qt"; then
- consumeCount=2
- fi
- if test $consumeCount == 0; then
- QtVersion2=$tok
- break
- else
- consumeCount=$((consumeCount-1))
- fi
- done
+# Library versioning type.
+version_type=$version_type
- ## Check for supported versions of Qt.
- for ver in 4.4.0 4.4.1 4.4.2 4.4.3 4.4.4 4.4.5 \
- 4.5.0 4.5.1 4.5.2 4.5.3 4.5.4 4.5.5 \
- 4.6.0 4.6.1 4.6.2 4.6.3 4.6.4 4.6.5 ; do
- if test "$QtVersion2" == "$ver"; then
- QtVersion=$ver
- break
- fi
- done
+# Shared library runtime path variable.
+runpath_var=$runpath_var
- if test -z "$QtVersion"; then
- { echo "$as_me:$LINENO: WARNING: Sorry, but you need Qt version 4.4.0 or higher to compile Silo's silex tool. silex is being disabled" >&5
-echo "$as_me: WARNING: Sorry, but you need Qt version 4.4.0 or higher to compile Silo's silex tool. silex is being disabled" >&2;}
- SILEX=""
- else
- { echo "$as_me:$LINENO: result: Qt $QtVersion in $QT_INCLUDE" >&5
-echo "${ECHO_T}Qt $QtVersion in $QT_INCLUDE" >&6; }
- fi
+# Shared library path variable.
+shlibpath_var=$shlibpath_var
- # Set the Qt bin,include,lib directories
+# Is shlibpath searched before the hard-coded library search path?
+shlibpath_overrides_runpath=$shlibpath_overrides_runpath
+
+# Format of library name prefix.
+libname_spec=$lt_libname_spec
+# List of archive names. First name is the real one, the rest are links.
+# The last name is the one that the linker finds with -lNAME
+library_names_spec=$lt_library_names_spec
+# The coded name of the library, if different from the real name.
+soname_spec=$lt_soname_spec
+# Command to use after installation of a shared archive.
+postinstall_cmds=$lt_postinstall_cmds
- # Set platform-specific options
- if test "$UNAME" = "Darwin"; then
- QT_LDFLAGS="-F$""(QT_LIB) -L$""(QT_LIB)"
+# Command to use after uninstallation of a shared archive.
+postuninstall_cmds=$lt_postuninstall_cmds
- QT_CORE=QtCore.framework
- QT_CORE_LIB="-framework QtCore"
+# Commands used to finish a libtool library installation in a directory.
+finish_cmds=$lt_finish_cmds
- QT_GUI=QtGui.framework
- QT_GUI_LIB="-framework QtGui"
+# As "finish_cmds", except a single script fragment to be evaled but
+# not shown.
+finish_eval=$lt_finish_eval
- else
- QT_LDFLAGS="-L$""(QT_LIB)"
+# Whether we should hardcode library paths into libraries.
+hardcode_into_libs=$hardcode_into_libs
- QT_CORE=libQtCore.so
- QT_CORE_LIB=-lQtCore
+# Compile-time system search path for libraries.
+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
- QT_GUI=libQtGui.so
- QT_GUI_LIB=-lQtGui
+# Run-time system search path for libraries.
+sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
- fi
+# Whether dlopen is supported.
+dlopen_support=$enable_dlopen
+
+# Whether dlopen of programs is supported.
+dlopen_self=$enable_dlopen_self
+
+# Whether dlopen of statically linked programs is supported.
+dlopen_self_static=$enable_dlopen_self_static
+# Commands to strip libraries.
+old_striplib=$lt_old_striplib
+striplib=$lt_striplib
- # Qt libraries
- QT_LIBS="$""(QT_CORE_LIB) $""(QT_GUI_LIB)"
+# The linker used to build libraries.
+LD=$lt_LD
+# Commands used to build an old-style archive.
+old_archive_cmds=$lt_old_archive_cmds
+# A language specific compiler.
+CC=$lt_compiler
+# Is the compiler the GNU compiler?
+with_gcc=$GCC
+# Compiler flag to turn off builtin functions.
+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
- # Include path
- QT_CXXFLAGS="-I$""(QT_INCLUDE) -I$""(QT_INCLUDE)/Qt -I$""(QT_INCLUDE)/QtCore -I$""(QT_INCLUDE)/QtGui"
+# How to pass a linker flag through the compiler.
+wl=$lt_lt_prog_compiler_wl
+# Additional compiler flags for building library objects.
+pic_flag=$lt_lt_prog_compiler_pic
- # Path to moc
- QT_MOC="$""(QT_BIN)/moc"
+# Compiler flag to prevent dynamic linking.
+link_static_flag=$lt_lt_prog_compiler_static
+# Does compiler simultaneously support -c and -o options?
+compiler_c_o=$lt_lt_cv_prog_compiler_c_o
-fi
-if test -n "$PYTHONMODULE"; then
+# Whether or not to add -lc for building shared libraries.
+build_libtool_need_lc=$archive_cmds_need_lc
+# Whether or not to disallow shared libs when runtime libs are static.
+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes
+# Compiler flag to allow reflexive dlopens.
+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec
+# Compiler flag to generate shared objects directly from archives.
+whole_archive_flag_spec=$lt_whole_archive_flag_spec
- if test -n "$PYTHON"; then
- # If the user set $PYTHON, use it and don't search something else.
- { echo "$as_me:$LINENO: checking whether $PYTHON version >= 2.1" >&5
-echo $ECHO_N "checking whether $PYTHON version >= 2.1... $ECHO_C" >&6; }
- prog="import sys, string
-# split strings by '.' and convert to numeric. Append some zeros
-# because we need at least 4 digits for the hex conversion.
-minver = map(int, string.split('2.1', '.')) + [0, 0, 0]
-minverhex = 0
-for i in xrange(0, 4): minverhex = (minverhex << 8) + minver[i]
-sys.exit(sys.hexversion < minverhex)"
- if { echo "$as_me:$LINENO: $PYTHON -c "$prog"" >&5
- ($PYTHON -c "$prog") >&5 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-else
- { { echo "$as_me:$LINENO: error: too old" >&5
-echo "$as_me: error: too old" >&2;}
- { (exit 1); exit 1; }; }
-fi
+# Whether the compiler copes with passing no objects directly.
+compiler_needs_object=$lt_compiler_needs_object
- am_display_PYTHON=$PYTHON
- else
- # Otherwise, try each interpreter until we find one that satisfies
- # VERSION.
- { echo "$as_me:$LINENO: checking for a Python interpreter with version >= 2.1" >&5
-echo $ECHO_N "checking for a Python interpreter with version >= 2.1... $ECHO_C" >&6; }
-if test "${am_cv_pathless_PYTHON+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
+# Create an old-style archive from a shared archive.
+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds
- for am_cv_pathless_PYTHON in python python2 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 none; do
- test "$am_cv_pathless_PYTHON" = none && break
- prog="import sys, string
-# split strings by '.' and convert to numeric. Append some zeros
-# because we need at least 4 digits for the hex conversion.
-minver = map(int, string.split('2.1', '.')) + [0, 0, 0]
-minverhex = 0
-for i in xrange(0, 4): minverhex = (minverhex << 8) + minver[i]
-sys.exit(sys.hexversion < minverhex)"
- if { echo "$as_me:$LINENO: $am_cv_pathless_PYTHON -c "$prog"" >&5
- ($am_cv_pathless_PYTHON -c "$prog") >&5 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- break
-fi
+# Create a temporary old-style archive to link instead of a shared archive.
+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
- done
-fi
-{ echo "$as_me:$LINENO: result: $am_cv_pathless_PYTHON" >&5
-echo "${ECHO_T}$am_cv_pathless_PYTHON" >&6; }
- # Set $PYTHON to the absolute path of $am_cv_pathless_PYTHON.
- if test "$am_cv_pathless_PYTHON" = none; then
- PYTHON=:
- else
- # Extract the first word of "$am_cv_pathless_PYTHON", so it can be a program name with args.
-set dummy $am_cv_pathless_PYTHON; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_path_PYTHON+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- case $PYTHON in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_PYTHON="$PYTHON" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
+# Commands used to build a shared archive.
+archive_cmds=$lt_archive_cmds
+archive_expsym_cmds=$lt_archive_expsym_cmds
- ;;
-esac
-fi
-PYTHON=$ac_cv_path_PYTHON
-if test -n "$PYTHON"; then
- { echo "$as_me:$LINENO: result: $PYTHON" >&5
-echo "${ECHO_T}$PYTHON" >&6; }
-else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
+# Commands used to build a loadable module if different from building
+# a shared archive.
+module_cmds=$lt_module_cmds
+module_expsym_cmds=$lt_module_expsym_cmds
+# Whether we are building with GNU ld or not.
+with_gnu_ld=$lt_with_gnu_ld
- fi
- am_display_PYTHON=$am_cv_pathless_PYTHON
- fi
+# Flag that allows shared libraries with undefined symbols to be built.
+allow_undefined_flag=$lt_allow_undefined_flag
+# Flag that enforces no undefined symbols.
+no_undefined_flag=$lt_no_undefined_flag
- if test "$PYTHON" = :; then
- :
- else
+# Flag to hardcode \$libdir into a binary during linking.
+# This must work even if \$libdir does not exist
+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
+# If ld is used when linking, flag to hardcode \$libdir into a binary
+# during linking. This must work even if \$libdir does not exist.
+hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld
- { echo "$as_me:$LINENO: checking for $am_display_PYTHON version" >&5
-echo $ECHO_N "checking for $am_display_PYTHON version... $ECHO_C" >&6; }
-if test "${am_cv_python_version+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- am_cv_python_version=`$PYTHON -c "import sys; print sys.version[:3]"`
-fi
-{ echo "$as_me:$LINENO: result: $am_cv_python_version" >&5
-echo "${ECHO_T}$am_cv_python_version" >&6; }
- PYTHON_VERSION=$am_cv_python_version
+# Whether we need a single "-rpath" flag with a separated argument.
+hardcode_libdir_separator=$lt_hardcode_libdir_separator
+# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
+# DIR into the resulting binary.
+hardcode_direct=$hardcode_direct
+# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
+# DIR into the resulting binary and the resulting library dependency is
+# "absolute",i.e impossible to change by setting \${shlibpath_var} if the
+# library is relocated.
+hardcode_direct_absolute=$hardcode_direct_absolute
- PYTHON_PREFIX='${prefix}'
+# Set to "yes" if using the -LDIR flag during linking hardcodes DIR
+# into the resulting binary.
+hardcode_minus_L=$hardcode_minus_L
- PYTHON_EXEC_PREFIX='${exec_prefix}'
+# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
+# into the resulting binary.
+hardcode_shlibpath_var=$hardcode_shlibpath_var
+# Set to "yes" if building a shared library automatically hardcodes DIR
+# into the library and all subsequent libraries and executables linked
+# against it.
+hardcode_automatic=$hardcode_automatic
+# Set to yes if linker adds runtime paths of dependent libraries
+# to runtime path list.
+inherit_rpath=$inherit_rpath
- { echo "$as_me:$LINENO: checking for $am_display_PYTHON platform" >&5
-echo $ECHO_N "checking for $am_display_PYTHON platform... $ECHO_C" >&6; }
-if test "${am_cv_python_platform+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- am_cv_python_platform=`$PYTHON -c "import sys; print sys.platform"`
-fi
-{ echo "$as_me:$LINENO: result: $am_cv_python_platform" >&5
-echo "${ECHO_T}$am_cv_python_platform" >&6; }
- PYTHON_PLATFORM=$am_cv_python_platform
+# Whether libtool must link a program against all its dependency libraries.
+link_all_deplibs=$link_all_deplibs
+# Fix the shell variable \$srcfile for the compiler.
+fix_srcfile_path=$lt_fix_srcfile_path
+# Set to "yes" if exported symbols are required.
+always_export_symbols=$always_export_symbols
+# The commands to list exported symbols.
+export_symbols_cmds=$lt_export_symbols_cmds
- { echo "$as_me:$LINENO: checking for $am_display_PYTHON script directory" >&5
-echo $ECHO_N "checking for $am_display_PYTHON script directory... $ECHO_C" >&6; }
-if test "${am_cv_python_pythondir+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0,prefix='$PYTHON_PREFIX')" 2>/dev/null ||
- echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
-fi
-{ echo "$as_me:$LINENO: result: $am_cv_python_pythondir" >&5
-echo "${ECHO_T}$am_cv_python_pythondir" >&6; }
- pythondir=$am_cv_python_pythondir
+# Symbols that should not be listed in the preloaded symbols.
+exclude_expsyms=$lt_exclude_expsyms
+# Symbols that must always be exported.
+include_expsyms=$lt_include_expsyms
+# Commands necessary for linking programs (against libraries) with templates.
+prelink_cmds=$lt_prelink_cmds
- pkgpythondir=\${pythondir}/$PACKAGE
+# Specify filename containing input files.
+file_list_spec=$lt_file_list_spec
+# How to hardcode a shared library path into an executable.
+hardcode_action=$hardcode_action
- { echo "$as_me:$LINENO: checking for $am_display_PYTHON extension module directory" >&5
-echo $ECHO_N "checking for $am_display_PYTHON extension module directory... $ECHO_C" >&6; }
-if test "${am_cv_python_pyexecdir+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0,prefix='$PYTHON_EXEC_PREFIX')" 2>/dev/null ||
- echo "${PYTHON_EXEC_PREFIX}/lib/python${PYTHON_VERSION}/site-packages"`
-fi
-{ echo "$as_me:$LINENO: result: $am_cv_python_pyexecdir" >&5
-echo "${ECHO_T}$am_cv_python_pyexecdir" >&6; }
- pyexecdir=$am_cv_python_pyexecdir
+# The directories searched by this compiler when creating a shared library.
+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs
+# Dependencies to place before and after the objects being linked to
+# create a shared library.
+predep_objects=$lt_predep_objects
+postdep_objects=$lt_postdep_objects
+predeps=$lt_predeps
+postdeps=$lt_postdeps
+# The library search path used internally by the compiler when linking
+# a shared library.
+compiler_lib_search_path=$lt_compiler_lib_search_path
- pkgpyexecdir=\${pyexecdir}/$PACKAGE
+# ### END LIBTOOL CONFIG
+_LT_EOF
+ case $host_os in
+ aix3*)
+ cat <<\_LT_EOF >> "$cfgfile"
+# AIX sometimes has problems with the GCC collect2 program. For some
+# reason, if we set the COLLECT_NAMES environment variable, the problems
+# vanish in a puff of smoke.
+if test "X${COLLECT_NAMES+set}" != Xset; then
+ COLLECT_NAMES=
+ export COLLECT_NAMES
+fi
+_LT_EOF
+ ;;
+ esac
- fi
+ltmain="$ac_aux_dir/ltmain.sh"
-# Check for Python include path
-#
- { echo "$as_me:$LINENO: checking for Python include path" >&5
-echo $ECHO_N "checking for Python include path... $ECHO_C" >&6; }
- if test -z "$PYTHON_CPPFLAGS"; then
- python_path=`$PYTHON -c "import distutils.sysconfig; \
- print distutils.sysconfig.get_python_inc();"`
- if test -n "${python_path}"; then
- python_path="-I$python_path"
- fi
- PYTHON_CPPFLAGS=$python_path
- fi
- { echo "$as_me:$LINENO: result: $PYTHON_CPPFLAGS" >&5
-echo "${ECHO_T}$PYTHON_CPPFLAGS" >&6; }
-fi
+ # We use sed instead of cat because bash on DJGPP gets confused if
+ # if finds mixed CR/LF and LF-only lines. Since sed operates in
+ # text mode, it properly converts lines to CR/LF. This bash problem
+ # is reportedly fixed, but why not run on old versions too?
+ sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
+ || (rm -f "$cfgfile"; exit 1)
-# skip for now
-#ACX_MPI
+ case $xsi_shell in
+ yes)
+ cat << \_LT_EOF >> "$cfgfile"
-# Create a bundle target for Darwin
-BUNDLE_TARGET=""
-case $host_os in
- darwin*)
- BUNDLE_TARGET="silo.app"
- ;;
-esac
+# func_dirname file append nondir_replacement
+# Compute the dirname of FILE. If nonempty, add APPEND to the result,
+# otherwise set result to NONDIR_REPLACEMENT.
+func_dirname ()
+{
+ case ${1} in
+ */*) func_dirname_result="${1%/*}${2}" ;;
+ * ) func_dirname_result="${3}" ;;
+ esac
+}
+# func_basename file
+func_basename ()
+{
+ func_basename_result="${1##*/}"
+}
-cat >confcache <<\_ACEOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs, see configure's option --config-cache.
-# It is not useful on other systems. If it contains results you don't
-# want to keep, you may remove or edit it.
-#
-# config.status only pays attention to the cache file if you give it
-# the --recheck option to rerun configure.
-#
-# `ac_cv_env_foo' variables (set or unset) will be overridden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
-# following values.
+# func_dirname_and_basename file append nondir_replacement
+# perform func_basename and func_dirname in a single function
+# call:
+# dirname: Compute the dirname of FILE. If nonempty,
+# add APPEND to the result, otherwise set result
+# to NONDIR_REPLACEMENT.
+# value returned in "$func_dirname_result"
+# basename: Compute filename of FILE.
+# value retuned in "$func_basename_result"
+# Implementation must be kept synchronized with func_dirname
+# and func_basename. For efficiency, we do not delegate to
+# those functions but instead duplicate the functionality here.
+func_dirname_and_basename ()
+{
+ case ${1} in
+ */*) func_dirname_result="${1%/*}${2}" ;;
+ * ) func_dirname_result="${3}" ;;
+ esac
+ func_basename_result="${1##*/}"
+}
-_ACEOF
+# func_stripname prefix suffix name
+# strip PREFIX and SUFFIX off of NAME.
+# PREFIX and SUFFIX must not contain globbing or regex special
+# characters, hashes, percent signs, but SUFFIX may contain a leading
+# dot (in which case that matches only a dot).
+func_stripname ()
+{
+ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
+ # positional parameters, so assign one to ordinary parameter first.
+ func_stripname_result=${3}
+ func_stripname_result=${func_stripname_result#"${1}"}
+ func_stripname_result=${func_stripname_result%"${2}"}
+}
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, we kill variables containing newlines.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(
- for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
- eval ac_val=\$$ac_var
- case $ac_val in #(
- *${as_nl}*)
- case $ac_var in #(
- *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
- esac
- case $ac_var in #(
- _ | IFS | as_nl) ;; #(
- *) $as_unset $ac_var ;;
- esac ;;
- esac
- done
+# func_opt_split
+func_opt_split ()
+{
+ func_opt_split_opt=${1%%=*}
+ func_opt_split_arg=${1#*=}
+}
- (set) 2>&1 |
- case $as_nl`(ac_space=' '; set) 2>&1` in #(
- *${as_nl}ac_space=\ *)
- # `set' does not quote correctly, so add quotes (double-quote
- # substitution turns \\\\ into \\, and sed turns \\ into \).
- sed -n \
- "s/'/'\\\\''/g;
- s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
- ;; #(
- *)
- # `set' quotes correctly as required by POSIX, so do not add quotes.
- sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
- ;;
- esac |
- sort
-) |
- sed '
- /^ac_cv_env_/b end
- t clear
- :clear
- s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
- t end
- s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
- :end' >>confcache
-if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
- if test -w "$cache_file"; then
- test "x$cache_file" != "x/dev/null" &&
- { echo "$as_me:$LINENO: updating cache $cache_file" >&5
-echo "$as_me: updating cache $cache_file" >&6;}
- cat confcache >$cache_file
+# func_lo2o object
+func_lo2o ()
+{
+ case ${1} in
+ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
+ *) func_lo2o_result=${1} ;;
+ esac
+}
+
+# func_xform libobj-or-source
+func_xform ()
+{
+ func_xform_result=${1%.*}.lo
+}
+
+# func_arith arithmetic-term...
+func_arith ()
+{
+ func_arith_result=$(( $* ))
+}
+
+# func_len string
+# STRING may not start with a hyphen.
+func_len ()
+{
+ func_len_result=${#1}
+}
+
+_LT_EOF
+ ;;
+ *) # Bourne compatible functions.
+ cat << \_LT_EOF >> "$cfgfile"
+
+# func_dirname file append nondir_replacement
+# Compute the dirname of FILE. If nonempty, add APPEND to the result,
+# otherwise set result to NONDIR_REPLACEMENT.
+func_dirname ()
+{
+ # Extract subdirectory from the argument.
+ func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
+ if test "X$func_dirname_result" = "X${1}"; then
+ func_dirname_result="${3}"
else
- { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
-echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+ func_dirname_result="$func_dirname_result${2}"
fi
-fi
-rm -f confcache
+}
- if test -n "$NETCDF"; then
- NETCDF_NEEDED_TRUE=
- NETCDF_NEEDED_FALSE='#'
-else
- NETCDF_NEEDED_TRUE='#'
- NETCDF_NEEDED_FALSE=
-fi
+# func_basename file
+func_basename ()
+{
+ func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
+}
- if test -n "$PDB_DRV"; then
- PDB_DRV_NEEDED_TRUE=
- PDB_DRV_NEEDED_FALSE='#'
-else
- PDB_DRV_NEEDED_TRUE='#'
- PDB_DRV_NEEDED_FALSE=
-fi
- if test -n "$PDBP_DRV"; then
- PDBP_DRV_NEEDED_TRUE=
- PDBP_DRV_NEEDED_FALSE='#'
-else
- PDBP_DRV_NEEDED_TRUE='#'
- PDBP_DRV_NEEDED_FALSE=
-fi
+# func_stripname prefix suffix name
+# strip PREFIX and SUFFIX off of NAME.
+# PREFIX and SUFFIX must not contain globbing or regex special
+# characters, hashes, percent signs, but SUFFIX may contain a leading
+# dot (in which case that matches only a dot).
+# func_strip_suffix prefix name
+func_stripname ()
+{
+ case ${2} in
+ .*) func_stripname_result=`$ECHO "X${3}" \
+ | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;;
+ *) func_stripname_result=`$ECHO "X${3}" \
+ | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;
+ esac
+}
- if test -n "$TAURUS"; then
- TAURUS_NEEDED_TRUE=
- TAURUS_NEEDED_FALSE='#'
-else
- TAURUS_NEEDED_TRUE='#'
- TAURUS_NEEDED_FALSE=
-fi
+# sed scripts:
+my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
+my_sed_long_arg='1s/^-[^=]*=//'
- if test -n "$HDF5_DRV"; then
- HDF5_DRV_NEEDED_TRUE=
- HDF5_DRV_NEEDED_FALSE='#'
-else
- HDF5_DRV_NEEDED_TRUE='#'
- HDF5_DRV_NEEDED_FALSE=
-fi
+# func_opt_split
+func_opt_split ()
+{
+ func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`
+ func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`
+}
- if test -n "$BROWSER"; then
- BROWSER_NEEDED_TRUE=
- BROWSER_NEEDED_FALSE='#'
-else
- BROWSER_NEEDED_TRUE='#'
- BROWSER_NEEDED_FALSE=
-fi
+# func_lo2o object
+func_lo2o ()
+{
+ func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
+}
- if test -n "$PYTHONMODULE"; then
- PYTHON_NEEDED_TRUE=
- PYTHON_NEEDED_FALSE='#'
-else
- PYTHON_NEEDED_TRUE='#'
- PYTHON_NEEDED_FALSE=
-fi
+# func_xform libobj-or-source
+func_xform ()
+{
+ func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[^.]*$/.lo/'`
+}
- if test -n "$FORTRAN"; then
- FORTRAN_NEEDED_TRUE=
- FORTRAN_NEEDED_FALSE='#'
-else
- FORTRAN_NEEDED_TRUE='#'
- FORTRAN_NEEDED_FALSE=
-fi
+# func_arith arithmetic-term...
+func_arith ()
+{
+ func_arith_result=`expr "$@"`
+}
- if test -n "$SILEX"; then
- SILEX_NEEDED_TRUE=
- SILEX_NEEDED_FALSE='#'
-else
- SILEX_NEEDED_TRUE='#'
- SILEX_NEEDED_FALSE=
-fi
+# func_len string
+# STRING may not start with a hyphen.
+func_len ()
+{
+ func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
+}
- if test -n "$HZIP"; then
- HZIP_NEEDED_TRUE=
- HZIP_NEEDED_FALSE='#'
-else
- HZIP_NEEDED_TRUE='#'
- HZIP_NEEDED_FALSE=
-fi
+_LT_EOF
+esac
- if test -n "$FPZIP"; then
- FPZIP_NEEDED_TRUE=
- FPZIP_NEEDED_FALSE='#'
-else
- FPZIP_NEEDED_TRUE='#'
- FPZIP_NEEDED_FALSE=
-fi
+case $lt_shell_append in
+ yes)
+ cat << \_LT_EOF >> "$cfgfile"
- if test -n "$ZLIB"; then
- ZLIB_AVAILABLE_TRUE=
- ZLIB_AVAILABLE_FALSE='#'
-else
- ZLIB_AVAILABLE_TRUE='#'
- ZLIB_AVAILABLE_FALSE=
-fi
+# func_append var value
+# Append VALUE to the end of shell variable VAR.
+func_append ()
+{
+ eval "$1+=\$2"
+}
+_LT_EOF
+ ;;
+ *)
+ cat << \_LT_EOF >> "$cfgfile"
- if test "$enable_shared" = "no" -a \( -n "$FPZIP" -o -n "$HZIP" \); then
- CXX_LINK_NEEDED_TRUE=
- CXX_LINK_NEEDED_FALSE='#'
-else
- CXX_LINK_NEEDED_TRUE='#'
- CXX_LINK_NEEDED_FALSE=
-fi
+# func_append var value
+# Append VALUE to the end of shell variable VAR.
+func_append ()
+{
+ eval "$1=\$$1\$2"
+}
-ac_config_files="$ac_config_files Makefile SiloWindows/Makefile svn_bin/Makefile config/Makefile config-site/Makefile docs/Makefile src/Makefile src/score/Makefile src/pdb/Makefile src/silo/Makefile src/silo/silo.h src/debug/Makefile src/netcdf/Makefile src/pdb_drv/Makefile src/pdbp_drv/Makefile src/hdf5_drv/Makefile src/taurus/Makefile src/unknown/Makefile src/filters/Makefile tests/Makefile tools/Makefile tools/browser/Makefile tools/python/Makefile tools/silex/Makefile tools/silock/Makefile"
+_LT_EOF
+ ;;
+ esac
-if test -n "$HZIP"; then
- ac_config_files="$ac_config_files src/hzip/Makefile"
-fi
-if test -n "$FPZIP"; then
- ac_config_files="$ac_config_files src/fpzip/Makefile"
+ sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
+ || (rm -f "$cfgfile"; exit 1)
-fi
-if test -n "$HDF5_DRV"; then
- ac_config_files="$ac_config_files src/libsiloh5.settings"
+ mv -f "$cfgfile" "$ofile" ||
+ (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
+ chmod +x "$ofile"
-else
- ac_config_files="$ac_config_files src/libsilo.settings"
-fi
-CC_FULLPATH=""
-if test -n "$CC"; then
- CC_FULLPATH=`which $CC`
-fi
-CXX_FULLPATH=""
-if test -n "$CXX"; then
- CXX_FULLPATH=`which $CXX`
-fi
-FC_FULLPATH=""
-if test -n "$FC"; then
- FC_FULLPATH=`which $FC`
-fi
+ cat <<_LT_EOF >> "$ofile"
+# ### BEGIN LIBTOOL TAG CONFIG: CXX
+# The linker used to build libraries.
+LD=$lt_LD_CXX
-cat >confcache <<\_ACEOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs, see configure's option --config-cache.
-# It is not useful on other systems. If it contains results you don't
-# want to keep, you may remove or edit it.
-#
-# config.status only pays attention to the cache file if you give it
-# the --recheck option to rerun configure.
-#
-# `ac_cv_env_foo' variables (set or unset) will be overridden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
-# following values.
+# Commands used to build an old-style archive.
+old_archive_cmds=$lt_old_archive_cmds_CXX
-_ACEOF
+# A language specific compiler.
+CC=$lt_compiler_CXX
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, we kill variables containing newlines.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(
- for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
- eval ac_val=\$$ac_var
- case $ac_val in #(
- *${as_nl}*)
- case $ac_var in #(
- *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
- esac
- case $ac_var in #(
- _ | IFS | as_nl) ;; #(
- *) $as_unset $ac_var ;;
- esac ;;
- esac
- done
+# Is the compiler the GNU compiler?
+with_gcc=$GCC_CXX
- (set) 2>&1 |
- case $as_nl`(ac_space=' '; set) 2>&1` in #(
- *${as_nl}ac_space=\ *)
- # `set' does not quote correctly, so add quotes (double-quote
- # substitution turns \\\\ into \\, and sed turns \\ into \).
- sed -n \
- "s/'/'\\\\''/g;
- s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
- ;; #(
- *)
- # `set' quotes correctly as required by POSIX, so do not add quotes.
- sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
- ;;
- esac |
- sort
-) |
- sed '
- /^ac_cv_env_/b end
- t clear
- :clear
- s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
- t end
- s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
- :end' >>confcache
-if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
- if test -w "$cache_file"; then
- test "x$cache_file" != "x/dev/null" &&
- { echo "$as_me:$LINENO: updating cache $cache_file" >&5
-echo "$as_me: updating cache $cache_file" >&6;}
- cat confcache >$cache_file
- else
- { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
-echo "$as_me: not updating unwritable cache $cache_file" >&6;}
- fi
-fi
-rm -f confcache
+# Compiler flag to turn off builtin functions.
+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
+
+# How to pass a linker flag through the compiler.
+wl=$lt_lt_prog_compiler_wl_CXX
+
+# Additional compiler flags for building library objects.
+pic_flag=$lt_lt_prog_compiler_pic_CXX
+
+# Compiler flag to prevent dynamic linking.
+link_static_flag=$lt_lt_prog_compiler_static_CXX
+
+# Does compiler simultaneously support -c and -o options?
+compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
+
+# Whether or not to add -lc for building shared libraries.
+build_libtool_need_lc=$archive_cmds_need_lc_CXX
+
+# Whether or not to disallow shared libs when runtime libs are static.
+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX
+
+# Compiler flag to allow reflexive dlopens.
+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX
+
+# Compiler flag to generate shared objects directly from archives.
+whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+# Whether the compiler copes with passing no objects directly.
+compiler_needs_object=$lt_compiler_needs_object_CXX
-DEFS=-DHAVE_CONFIG_H
+# Create an old-style archive from a shared archive.
+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX
-ac_libobjs=
-ac_ltlibobjs=
-for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
- # 1. Remove the extension, and $U if already installed.
- ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
- ac_i=`echo "$ac_i" | sed "$ac_script"`
- # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
- # will be set to the directory where LIBOBJS objects are built.
- ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
- ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
-done
-LIBOBJS=$ac_libobjs
+# Create a temporary old-style archive to link instead of a shared archive.
+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX
-LTLIBOBJS=$ac_ltlibobjs
+# Commands used to build a shared archive.
+archive_cmds=$lt_archive_cmds_CXX
+archive_expsym_cmds=$lt_archive_expsym_cmds_CXX
+# Commands used to build a loadable module if different from building
+# a shared archive.
+module_cmds=$lt_module_cmds_CXX
+module_expsym_cmds=$lt_module_expsym_cmds_CXX
-if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
-fi
-if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"AMDEP\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
-fi
-if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
-fi
-if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
-fi
-if test -z "${NETCDF_NEEDED_TRUE}" && test -z "${NETCDF_NEEDED_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"NETCDF_NEEDED\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"NETCDF_NEEDED\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
-fi
-if test -z "${PDB_DRV_NEEDED_TRUE}" && test -z "${PDB_DRV_NEEDED_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"PDB_DRV_NEEDED\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"PDB_DRV_NEEDED\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
-fi
-if test -z "${PDBP_DRV_NEEDED_TRUE}" && test -z "${PDBP_DRV_NEEDED_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"PDBP_DRV_NEEDED\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"PDBP_DRV_NEEDED\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
-fi
-if test -z "${TAURUS_NEEDED_TRUE}" && test -z "${TAURUS_NEEDED_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"TAURUS_NEEDED\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"TAURUS_NEEDED\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
-fi
-if test -z "${HDF5_DRV_NEEDED_TRUE}" && test -z "${HDF5_DRV_NEEDED_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"HDF5_DRV_NEEDED\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"HDF5_DRV_NEEDED\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
-fi
-if test -z "${BROWSER_NEEDED_TRUE}" && test -z "${BROWSER_NEEDED_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"BROWSER_NEEDED\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"BROWSER_NEEDED\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
-fi
-if test -z "${PYTHON_NEEDED_TRUE}" && test -z "${PYTHON_NEEDED_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"PYTHON_NEEDED\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"PYTHON_NEEDED\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
-fi
-if test -z "${FORTRAN_NEEDED_TRUE}" && test -z "${FORTRAN_NEEDED_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"FORTRAN_NEEDED\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"FORTRAN_NEEDED\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
-fi
-if test -z "${SILEX_NEEDED_TRUE}" && test -z "${SILEX_NEEDED_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"SILEX_NEEDED\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"SILEX_NEEDED\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
-fi
-if test -z "${HZIP_NEEDED_TRUE}" && test -z "${HZIP_NEEDED_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"HZIP_NEEDED\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"HZIP_NEEDED\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
-fi
-if test -z "${FPZIP_NEEDED_TRUE}" && test -z "${FPZIP_NEEDED_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"FPZIP_NEEDED\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"FPZIP_NEEDED\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
-fi
-if test -z "${ZLIB_AVAILABLE_TRUE}" && test -z "${ZLIB_AVAILABLE_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"ZLIB_AVAILABLE\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"ZLIB_AVAILABLE\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
-fi
-if test -z "${CXX_LINK_NEEDED_TRUE}" && test -z "${CXX_LINK_NEEDED_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"CXX_LINK_NEEDED\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"CXX_LINK_NEEDED\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
-fi
+# Whether we are building with GNU ld or not.
+with_gnu_ld=$lt_with_gnu_ld_CXX
-: ${CONFIG_STATUS=./config.status}
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF
-#! $SHELL
-# Generated by $as_me.
-# Run this file to recreate the current configuration.
-# Compiler output produced by configure, useful for debugging
-# configure, is in config.log if it exists.
+# Flag that allows shared libraries with undefined symbols to be built.
+allow_undefined_flag=$lt_allow_undefined_flag_CXX
-debug=false
-ac_cs_recheck=false
-ac_cs_silent=false
-SHELL=\${CONFIG_SHELL-$SHELL}
-_ACEOF
+# Flag that enforces no undefined symbols.
+no_undefined_flag=$lt_no_undefined_flag_CXX
-cat >>$CONFIG_STATUS <<\_ACEOF
-## --------------------- ##
-## M4sh Initialization. ##
-## --------------------- ##
+# Flag to hardcode \$libdir into a binary during linking.
+# This must work even if \$libdir does not exist
+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX
-# Be more Bourne compatible
-DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
- emulate sh
- NULLCMD=:
- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
- # is contrary to our usage. Disable this feature.
- alias -g '${1+"$@"}'='"$@"'
- setopt NO_GLOB_SUBST
-else
- case `(set -o) 2>/dev/null` in
- *posix*) set -o posix ;;
-esac
+# If ld is used when linking, flag to hardcode \$libdir into a binary
+# during linking. This must work even if \$libdir does not exist.
+hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX
-fi
+# Whether we need a single "-rpath" flag with a separated argument.
+hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX
+# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
+# DIR into the resulting binary.
+hardcode_direct=$hardcode_direct_CXX
+# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
+# DIR into the resulting binary and the resulting library dependency is
+# "absolute",i.e impossible to change by setting \${shlibpath_var} if the
+# library is relocated.
+hardcode_direct_absolute=$hardcode_direct_absolute_CXX
+# Set to "yes" if using the -LDIR flag during linking hardcodes DIR
+# into the resulting binary.
+hardcode_minus_L=$hardcode_minus_L_CXX
-# PATH needs CR
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
+# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
+# into the resulting binary.
+hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
- echo "#! /bin/sh" >conf$$.sh
- echo "exit 0" >>conf$$.sh
- chmod +x conf$$.sh
- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
- PATH_SEPARATOR=';'
- else
- PATH_SEPARATOR=:
- fi
- rm -f conf$$.sh
-fi
+# Set to "yes" if building a shared library automatically hardcodes DIR
+# into the library and all subsequent libraries and executables linked
+# against it.
+hardcode_automatic=$hardcode_automatic_CXX
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
- as_unset=unset
-else
- as_unset=false
-fi
+# Set to yes if linker adds runtime paths of dependent libraries
+# to runtime path list.
+inherit_rpath=$inherit_rpath_CXX
+# Whether libtool must link a program against all its dependency libraries.
+link_all_deplibs=$link_all_deplibs_CXX
-# IFS
-# We need space, tab and new line, in precisely that order. Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-as_nl='
-'
-IFS=" "" $as_nl"
+# Fix the shell variable \$srcfile for the compiler.
+fix_srcfile_path=$lt_fix_srcfile_path_CXX
-# Find who we are. Look in the path if we contain no directory separator.
-case $0 in
- *[\\/]* ) as_myself=$0 ;;
- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-IFS=$as_save_IFS
+# Set to "yes" if exported symbols are required.
+always_export_symbols=$always_export_symbols_CXX
- ;;
-esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
-# in which case we are not to be found in the path.
-if test "x$as_myself" = x; then
- as_myself=$0
-fi
-if test ! -f "$as_myself"; then
- echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
- { (exit 1); exit 1; }
-fi
+# The commands to list exported symbols.
+export_symbols_cmds=$lt_export_symbols_cmds_CXX
-# Work around bugs in pre-3.0 UWIN ksh.
-for as_var in ENV MAIL MAILPATH
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
+# Symbols that should not be listed in the preloaded symbols.
+exclude_expsyms=$lt_exclude_expsyms_CXX
-# NLS nuisances.
-for as_var in \
- LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
- LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
- LC_TELEPHONE LC_TIME
-do
- if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
- eval $as_var=C; export $as_var
- else
- ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
- fi
-done
+# Symbols that must always be exported.
+include_expsyms=$lt_include_expsyms_CXX
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1 &&
- test "X`expr 00001 : '.*\(...\)'`" = X001; then
- as_expr=expr
-else
- as_expr=false
-fi
+# Commands necessary for linking programs (against libraries) with templates.
+prelink_cmds=$lt_prelink_cmds_CXX
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
- as_basename=basename
-else
- as_basename=false
-fi
+# Specify filename containing input files.
+file_list_spec=$lt_file_list_spec_CXX
+# How to hardcode a shared library path into an executable.
+hardcode_action=$hardcode_action_CXX
-# Name of the executable.
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
- X"$0" : 'X\(//\)$' \| \
- X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X/"$0" |
- sed '/^.*\/\([^/][^/]*\)\/*$/{
- s//\1/
- q
- }
- /^X\/\(\/\/\)$/{
- s//\1/
- q
- }
- /^X\/\(\/\).*/{
- s//\1/
- q
- }
- s/.*/./; q'`
+# The directories searched by this compiler when creating a shared library.
+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_CXX
-# CDPATH.
-$as_unset CDPATH
+# Dependencies to place before and after the objects being linked to
+# create a shared library.
+predep_objects=$lt_predep_objects_CXX
+postdep_objects=$lt_postdep_objects_CXX
+predeps=$lt_predeps_CXX
+postdeps=$lt_postdeps_CXX
+# The library search path used internally by the compiler when linking
+# a shared library.
+compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
+# ### END LIBTOOL TAG CONFIG: CXX
+_LT_EOF
- as_lineno_1=$LINENO
- as_lineno_2=$LINENO
- test "x$as_lineno_1" != "x$as_lineno_2" &&
- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
- # uniformly replaced by the line number. The first 'sed' inserts a
- # line-number line after each line using $LINENO; the second 'sed'
- # does the real work. The second script uses 'N' to pair each
- # line-number line with the line containing $LINENO, and appends
- # trailing '-' during substitution so that $LINENO is not a special
- # case at line end.
- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
- # scripts with optimization help from Paolo Bonzini. Blame Lee
- # E. McMahon (1931-1989) for sed's syntax. :-)
- sed -n '
- p
- /[$]LINENO/=
- ' <$as_myself |
- sed '
- s/[$]LINENO.*/&-/
- t lineno
- b
- :lineno
- N
- :loop
- s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
- t loop
- s/-\n.*//
- ' >$as_me.lineno &&
- chmod +x "$as_me.lineno" ||
- { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
- { (exit 1); exit 1; }; }
+ cat <<_LT_EOF >> "$ofile"
- # Don't try to exec as it changes $[0], causing all sort of problems
- # (the dirname of $[0] is not the place where we might find the
- # original and so on. Autoconf is especially sensitive to this).
- . "./$as_me.lineno"
- # Exit status is that of the last command.
- exit
-}
+# ### BEGIN LIBTOOL TAG CONFIG: F77
+# The linker used to build libraries.
+LD=$lt_LD_F77
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
- as_dirname=dirname
-else
- as_dirname=false
-fi
+# Commands used to build an old-style archive.
+old_archive_cmds=$lt_old_archive_cmds_F77
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in
--n*)
- case `echo 'x\c'` in
- *c*) ECHO_T=' ';; # ECHO_T is single tab character.
- *) ECHO_C='\c';;
- esac;;
-*)
- ECHO_N='-n';;
-esac
+# A language specific compiler.
+CC=$lt_compiler_F77
-if expr a : '\(a\)' >/dev/null 2>&1 &&
- test "X`expr 00001 : '.*\(...\)'`" = X001; then
- as_expr=expr
-else
- as_expr=false
-fi
+# Is the compiler the GNU compiler?
+with_gcc=$GCC_F77
-rm -f conf$$ conf$$.exe conf$$.file
-if test -d conf$$.dir; then
- rm -f conf$$.dir/conf$$.file
-else
- rm -f conf$$.dir
- mkdir conf$$.dir
-fi
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
- as_ln_s='ln -s'
- # ... but there are two gotchas:
- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
- # In both cases, we have to default to `cp -p'.
- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
- as_ln_s='cp -p'
-elif ln conf$$.file conf$$ 2>/dev/null; then
- as_ln_s=ln
-else
- as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-rmdir conf$$.dir 2>/dev/null
+# Compiler flag to turn off builtin functions.
+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_F77
-if mkdir -p . 2>/dev/null; then
- as_mkdir_p=:
-else
- test -d ./-p && rmdir ./-p
- as_mkdir_p=false
-fi
+# How to pass a linker flag through the compiler.
+wl=$lt_lt_prog_compiler_wl_F77
-if test -x / >/dev/null 2>&1; then
- as_test_x='test -x'
-else
- if ls -dL / >/dev/null 2>&1; then
- as_ls_L_option=L
- else
- as_ls_L_option=
- fi
- as_test_x='
- eval sh -c '\''
- if test -d "$1"; then
- test -d "$1/.";
- else
- case $1 in
- -*)set "./$1";;
- esac;
- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
- ???[sx]*):;;*)false;;esac;fi
- '\'' sh
- '
-fi
-as_executable_p=$as_test_x
+# Additional compiler flags for building library objects.
+pic_flag=$lt_lt_prog_compiler_pic_F77
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+# Compiler flag to prevent dynamic linking.
+link_static_flag=$lt_lt_prog_compiler_static_F77
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+# Does compiler simultaneously support -c and -o options?
+compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77
+# Whether or not to add -lc for building shared libraries.
+build_libtool_need_lc=$archive_cmds_need_lc_F77
-exec 6>&1
+# Whether or not to disallow shared libs when runtime libs are static.
+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_F77
-# Save the log message, to keep $[0] and so on meaningful, and to
-# report actual input values of CONFIG_FILES etc. instead of their
-# values after options handling.
-ac_log="
-This file was extended by silo $as_me 4.8, which was
-generated by GNU Autoconf 2.61. Invocation command line was
+# Compiler flag to allow reflexive dlopens.
+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_F77
- CONFIG_FILES = $CONFIG_FILES
- CONFIG_HEADERS = $CONFIG_HEADERS
- CONFIG_LINKS = $CONFIG_LINKS
- CONFIG_COMMANDS = $CONFIG_COMMANDS
- $ $0 $@
+# Compiler flag to generate shared objects directly from archives.
+whole_archive_flag_spec=$lt_whole_archive_flag_spec_F77
-on `(hostname || uname -n) 2>/dev/null | sed 1q`
-"
+# Whether the compiler copes with passing no objects directly.
+compiler_needs_object=$lt_compiler_needs_object_F77
-_ACEOF
+# Create an old-style archive from a shared archive.
+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_F77
-cat >>$CONFIG_STATUS <<_ACEOF
-# Files that config.status was made for.
-config_files="$ac_config_files"
-config_headers="$ac_config_headers"
-config_commands="$ac_config_commands"
+# Create a temporary old-style archive to link instead of a shared archive.
+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_F77
-_ACEOF
+# Commands used to build a shared archive.
+archive_cmds=$lt_archive_cmds_F77
+archive_expsym_cmds=$lt_archive_expsym_cmds_F77
-cat >>$CONFIG_STATUS <<\_ACEOF
-ac_cs_usage="\
-\`$as_me' instantiates files from templates according to the
-current configuration.
+# Commands used to build a loadable module if different from building
+# a shared archive.
+module_cmds=$lt_module_cmds_F77
+module_expsym_cmds=$lt_module_expsym_cmds_F77
-Usage: $0 [OPTIONS] [FILE]...
+# Whether we are building with GNU ld or not.
+with_gnu_ld=$lt_with_gnu_ld_F77
- -h, --help print this help, then exit
- -V, --version print version number and configuration settings, then exit
- -q, --quiet do not print progress messages
- -d, --debug don't remove temporary files
- --recheck update $as_me by reconfiguring in the same conditions
- --file=FILE[:TEMPLATE]
- instantiate the configuration file FILE
- --header=FILE[:TEMPLATE]
- instantiate the configuration header FILE
+# Flag that allows shared libraries with undefined symbols to be built.
+allow_undefined_flag=$lt_allow_undefined_flag_F77
-Configuration files:
-$config_files
+# Flag that enforces no undefined symbols.
+no_undefined_flag=$lt_no_undefined_flag_F77
-Configuration headers:
-$config_headers
+# Flag to hardcode \$libdir into a binary during linking.
+# This must work even if \$libdir does not exist
+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_F77
-Configuration commands:
-$config_commands
+# If ld is used when linking, flag to hardcode \$libdir into a binary
+# during linking. This must work even if \$libdir does not exist.
+hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_F77
-Report bugs to <bug-autoconf at gnu.org>."
+# Whether we need a single "-rpath" flag with a separated argument.
+hardcode_libdir_separator=$lt_hardcode_libdir_separator_F77
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-ac_cs_version="\\
-silo config.status 4.8
-configured by $0, generated by GNU Autoconf 2.61,
- with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
+# DIR into the resulting binary.
+hardcode_direct=$hardcode_direct_F77
-Copyright (C) 2006 Free Software Foundation, Inc.
-This config.status script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it."
+# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
+# DIR into the resulting binary and the resulting library dependency is
+# "absolute",i.e impossible to change by setting \${shlibpath_var} if the
+# library is relocated.
+hardcode_direct_absolute=$hardcode_direct_absolute_F77
-ac_pwd='$ac_pwd'
-srcdir='$srcdir'
-INSTALL='$INSTALL'
-MKDIR_P='$MKDIR_P'
-_ACEOF
+# Set to "yes" if using the -LDIR flag during linking hardcodes DIR
+# into the resulting binary.
+hardcode_minus_L=$hardcode_minus_L_F77
-cat >>$CONFIG_STATUS <<\_ACEOF
-# If no file are specified by the user, then we need to provide default
-# value. By we need to know if files were specified by the user.
-ac_need_defaults=:
-while test $# != 0
-do
- case $1 in
- --*=*)
- ac_option=`expr "X$1" : 'X\([^=]*\)='`
- ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
- ac_shift=:
- ;;
- *)
- ac_option=$1
- ac_optarg=$2
- ac_shift=shift
- ;;
- esac
+# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
+# into the resulting binary.
+hardcode_shlibpath_var=$hardcode_shlibpath_var_F77
- case $ac_option in
- # Handling of the options.
- -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
- ac_cs_recheck=: ;;
- --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
- echo "$ac_cs_version"; exit ;;
- --debug | --debu | --deb | --de | --d | -d )
- debug=: ;;
- --file | --fil | --fi | --f )
- $ac_shift
- CONFIG_FILES="$CONFIG_FILES $ac_optarg"
- ac_need_defaults=false;;
- --header | --heade | --head | --hea )
- $ac_shift
- CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
- ac_need_defaults=false;;
- --he | --h)
- # Conflict between --help and --header
- { echo "$as_me: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&2
- { (exit 1); exit 1; }; };;
- --help | --hel | -h )
- echo "$ac_cs_usage"; exit ;;
- -q | -quiet | --quiet | --quie | --qui | --qu | --q \
- | -silent | --silent | --silen | --sile | --sil | --si | --s)
- ac_cs_silent=: ;;
+# Set to "yes" if building a shared library automatically hardcodes DIR
+# into the library and all subsequent libraries and executables linked
+# against it.
+hardcode_automatic=$hardcode_automatic_F77
- # This is an error.
- -*) { echo "$as_me: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&2
- { (exit 1); exit 1; }; } ;;
+# Set to yes if linker adds runtime paths of dependent libraries
+# to runtime path list.
+inherit_rpath=$inherit_rpath_F77
- *) ac_config_targets="$ac_config_targets $1"
- ac_need_defaults=false ;;
+# Whether libtool must link a program against all its dependency libraries.
+link_all_deplibs=$link_all_deplibs_F77
- esac
- shift
-done
+# Fix the shell variable \$srcfile for the compiler.
+fix_srcfile_path=$lt_fix_srcfile_path_F77
-ac_configure_extra_args=
+# Set to "yes" if exported symbols are required.
+always_export_symbols=$always_export_symbols_F77
-if $ac_cs_silent; then
- exec 6>/dev/null
- ac_configure_extra_args="$ac_configure_extra_args --silent"
-fi
+# The commands to list exported symbols.
+export_symbols_cmds=$lt_export_symbols_cmds_F77
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-if \$ac_cs_recheck; then
- echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
- CONFIG_SHELL=$SHELL
- export CONFIG_SHELL
- exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-fi
+# Symbols that should not be listed in the preloaded symbols.
+exclude_expsyms=$lt_exclude_expsyms_F77
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-exec 5>>config.log
-{
- echo
- sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-## Running $as_me. ##
-_ASBOX
- echo "$ac_log"
-} >&5
+# Symbols that must always be exported.
+include_expsyms=$lt_include_expsyms_F77
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-#
-# INIT-COMMANDS
-#
-AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
+# Commands necessary for linking programs (against libraries) with templates.
+prelink_cmds=$lt_prelink_cmds_F77
-_ACEOF
+# Specify filename containing input files.
+file_list_spec=$lt_file_list_spec_F77
-cat >>$CONFIG_STATUS <<\_ACEOF
+# How to hardcode a shared library path into an executable.
+hardcode_action=$hardcode_action_F77
-# Handling of arguments.
-for ac_config_target in $ac_config_targets
-do
- case $ac_config_target in
- "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h:config/config.h.in" ;;
- "tests/atconfig") CONFIG_COMMANDS="$CONFIG_COMMANDS tests/atconfig" ;;
- "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
- "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
- "SiloWindows/Makefile") CONFIG_FILES="$CONFIG_FILES SiloWindows/Makefile" ;;
- "svn_bin/Makefile") CONFIG_FILES="$CONFIG_FILES svn_bin/Makefile" ;;
- "config/Makefile") CONFIG_FILES="$CONFIG_FILES config/Makefile" ;;
- "config-site/Makefile") CONFIG_FILES="$CONFIG_FILES config-site/Makefile" ;;
- "docs/Makefile") CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;;
- "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
- "src/score/Makefile") CONFIG_FILES="$CONFIG_FILES src/score/Makefile" ;;
- "src/pdb/Makefile") CONFIG_FILES="$CONFIG_FILES src/pdb/Makefile" ;;
- "src/silo/Makefile") CONFIG_FILES="$CONFIG_FILES src/silo/Makefile" ;;
- "src/silo/silo.h") CONFIG_FILES="$CONFIG_FILES src/silo/silo.h" ;;
- "src/debug/Makefile") CONFIG_FILES="$CONFIG_FILES src/debug/Makefile" ;;
- "src/netcdf/Makefile") CONFIG_FILES="$CONFIG_FILES src/netcdf/Makefile" ;;
- "src/pdb_drv/Makefile") CONFIG_FILES="$CONFIG_FILES src/pdb_drv/Makefile" ;;
- "src/pdbp_drv/Makefile") CONFIG_FILES="$CONFIG_FILES src/pdbp_drv/Makefile" ;;
- "src/hdf5_drv/Makefile") CONFIG_FILES="$CONFIG_FILES src/hdf5_drv/Makefile" ;;
- "src/taurus/Makefile") CONFIG_FILES="$CONFIG_FILES src/taurus/Makefile" ;;
- "src/unknown/Makefile") CONFIG_FILES="$CONFIG_FILES src/unknown/Makefile" ;;
- "src/filters/Makefile") CONFIG_FILES="$CONFIG_FILES src/filters/Makefile" ;;
- "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
- "tools/Makefile") CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;;
- "tools/browser/Makefile") CONFIG_FILES="$CONFIG_FILES tools/browser/Makefile" ;;
- "tools/python/Makefile") CONFIG_FILES="$CONFIG_FILES tools/python/Makefile" ;;
- "tools/silex/Makefile") CONFIG_FILES="$CONFIG_FILES tools/silex/Makefile" ;;
- "tools/silock/Makefile") CONFIG_FILES="$CONFIG_FILES tools/silock/Makefile" ;;
- "src/hzip/Makefile") CONFIG_FILES="$CONFIG_FILES src/hzip/Makefile" ;;
- "src/fpzip/Makefile") CONFIG_FILES="$CONFIG_FILES src/fpzip/Makefile" ;;
- "src/libsiloh5.settings") CONFIG_FILES="$CONFIG_FILES src/libsiloh5.settings" ;;
- "src/libsilo.settings") CONFIG_FILES="$CONFIG_FILES src/libsilo.settings" ;;
+# The directories searched by this compiler when creating a shared library.
+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_F77
- *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
- { (exit 1); exit 1; }; };;
- esac
-done
+# Dependencies to place before and after the objects being linked to
+# create a shared library.
+predep_objects=$lt_predep_objects_F77
+postdep_objects=$lt_postdep_objects_F77
+predeps=$lt_predeps_F77
+postdeps=$lt_postdeps_F77
+# The library search path used internally by the compiler when linking
+# a shared library.
+compiler_lib_search_path=$lt_compiler_lib_search_path_F77
-# If the user did not use the arguments to specify the items to instantiate,
-# then the envvar interface is used. Set only those that are not.
-# We use the long form for the default assignment because of an extremely
-# bizarre bug on SunOS 4.1.3.
-if $ac_need_defaults; then
- test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
- test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
- test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
-fi
+# ### END LIBTOOL TAG CONFIG: F77
+_LT_EOF
-# Have a temporary directory for convenience. Make it in the build tree
-# simply because there is no reason against having it here, and in addition,
-# creating and moving files from /tmp can sometimes cause problems.
-# Hook for its removal unless debugging.
-# Note that there is a small window in which the directory will not be cleaned:
-# after its creation but before its name has been assigned to `$tmp'.
-$debug ||
-{
- tmp=
- trap 'exit_status=$?
- { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
-' 0
- trap '{ (exit 1); exit 1; }' 1 2 13 15
-}
-# Create a (secure) tmp directory for tmp files.
-{
- tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
- test -n "$tmp" && test -d "$tmp"
-} ||
-{
- tmp=./conf$$-$RANDOM
- (umask 077 && mkdir "$tmp")
-} ||
-{
- echo "$me: cannot create a temporary directory in ." >&2
- { (exit 1); exit 1; }
-}
+ cat <<_LT_EOF >> "$ofile"
-#
-# Set up the sed scripts for CONFIG_FILES section.
-#
+# ### BEGIN LIBTOOL TAG CONFIG: FC
-# No need to generate the scripts if there are no CONFIG_FILES.
-# This happens for instance when ./config.status config.h
-if test -n "$CONFIG_FILES"; then
+# The linker used to build libraries.
+LD=$lt_LD_FC
-_ACEOF
+# Commands used to build an old-style archive.
+old_archive_cmds=$lt_old_archive_cmds_FC
+# A language specific compiler.
+CC=$lt_compiler_FC
+# Is the compiler the GNU compiler?
+with_gcc=$GCC_FC
-ac_delim='%!_!# '
-for ac_last_try in false false false false false :; do
- cat >conf$$subs.sed <<_ACEOF
-SHELL!$SHELL$ac_delim
-PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
-PACKAGE_NAME!$PACKAGE_NAME$ac_delim
-PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
-PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
-PACKAGE_STRING!$PACKAGE_STRING$ac_delim
-PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
-exec_prefix!$exec_prefix$ac_delim
-prefix!$prefix$ac_delim
-program_transform_name!$program_transform_name$ac_delim
-bindir!$bindir$ac_delim
-sbindir!$sbindir$ac_delim
-libexecdir!$libexecdir$ac_delim
-datarootdir!$datarootdir$ac_delim
-datadir!$datadir$ac_delim
-sysconfdir!$sysconfdir$ac_delim
-sharedstatedir!$sharedstatedir$ac_delim
-localstatedir!$localstatedir$ac_delim
-includedir!$includedir$ac_delim
-oldincludedir!$oldincludedir$ac_delim
-docdir!$docdir$ac_delim
-infodir!$infodir$ac_delim
-htmldir!$htmldir$ac_delim
-dvidir!$dvidir$ac_delim
-pdfdir!$pdfdir$ac_delim
-psdir!$psdir$ac_delim
-libdir!$libdir$ac_delim
-localedir!$localedir$ac_delim
-mandir!$mandir$ac_delim
-DEFS!$DEFS$ac_delim
-ECHO_C!$ECHO_C$ac_delim
-ECHO_N!$ECHO_N$ac_delim
-ECHO_T!$ECHO_T$ac_delim
-LIBS!$LIBS$ac_delim
-build_alias!$build_alias$ac_delim
-host_alias!$host_alias$ac_delim
-target_alias!$target_alias$ac_delim
-INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
-INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
-INSTALL_DATA!$INSTALL_DATA$ac_delim
-am__isrc!$am__isrc$ac_delim
-CYGPATH_W!$CYGPATH_W$ac_delim
-PACKAGE!$PACKAGE$ac_delim
-VERSION!$VERSION$ac_delim
-ACLOCAL!$ACLOCAL$ac_delim
-AUTOCONF!$AUTOCONF$ac_delim
-AUTOMAKE!$AUTOMAKE$ac_delim
-AUTOHEADER!$AUTOHEADER$ac_delim
-MAKEINFO!$MAKEINFO$ac_delim
-install_sh!$install_sh$ac_delim
-STRIP!$STRIP$ac_delim
-INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim
-mkdir_p!$mkdir_p$ac_delim
-AWK!$AWK$ac_delim
-SET_MAKE!$SET_MAKE$ac_delim
-am__leading_dot!$am__leading_dot$ac_delim
-AMTAR!$AMTAR$ac_delim
-am__tar!$am__tar$ac_delim
-am__untar!$am__untar$ac_delim
-MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim
-MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim
-MAINT!$MAINT$ac_delim
-PYTHONMODULE!$PYTHONMODULE$ac_delim
-build!$build$ac_delim
-build_cpu!$build_cpu$ac_delim
-build_vendor!$build_vendor$ac_delim
-build_os!$build_os$ac_delim
-host!$host$ac_delim
-host_cpu!$host_cpu$ac_delim
-host_vendor!$host_vendor$ac_delim
-host_os!$host_os$ac_delim
-SILO_VERS_MAJ!$SILO_VERS_MAJ$ac_delim
-SILO_VERS_MIN!$SILO_VERS_MIN$ac_delim
-SILO_VERS_PAT!$SILO_VERS_PAT$ac_delim
-SILO_VERS_PRE!$SILO_VERS_PRE$ac_delim
-SILO_VERS_TAG!$SILO_VERS_TAG$ac_delim
-CONFIG_CMD!$CONFIG_CMD$ac_delim
-CONFIG_DATE!$CONFIG_DATE$ac_delim
-CONFIG_USER!$CONFIG_USER$ac_delim
-FORTRAN!$FORTRAN$ac_delim
-CXX!$CXX$ac_delim
-CXXFLAGS!$CXXFLAGS$ac_delim
-LDFLAGS!$LDFLAGS$ac_delim
-CPPFLAGS!$CPPFLAGS$ac_delim
-ac_ct_CXX!$ac_ct_CXX$ac_delim
-EXEEXT!$EXEEXT$ac_delim
-OBJEXT!$OBJEXT$ac_delim
-DEPDIR!$DEPDIR$ac_delim
-am__include!$am__include$ac_delim
-am__quote!$am__quote$ac_delim
-AMDEP_TRUE!$AMDEP_TRUE$ac_delim
-AMDEP_FALSE!$AMDEP_FALSE$ac_delim
-AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim
-CXXDEPMODE!$CXXDEPMODE$ac_delim
-am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim
-am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim
-CC!$CC$ac_delim
-_ACEOF
-
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
- break
- elif $ac_last_try; then
- { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
- { (exit 1); exit 1; }; }
- else
- ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
- fi
-done
+# Compiler flag to turn off builtin functions.
+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_FC
-ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-if test -n "$ac_eof"; then
- ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
- ac_eof=`expr $ac_eof + 1`
-fi
+# How to pass a linker flag through the compiler.
+wl=$lt_lt_prog_compiler_wl_FC
-cat >>$CONFIG_STATUS <<_ACEOF
-cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-_ACEOF
-sed '
-s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-s/^/s,@/; s/!/@,|#_!!_#|/
-:n
-t n
-s/'"$ac_delim"'$/,g/; t
-s/$/\\/; p
-N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-' >>$CONFIG_STATUS <conf$$subs.sed
-rm -f conf$$subs.sed
-cat >>$CONFIG_STATUS <<_ACEOF
-CEOF$ac_eof
-_ACEOF
+# Additional compiler flags for building library objects.
+pic_flag=$lt_lt_prog_compiler_pic_FC
+# Compiler flag to prevent dynamic linking.
+link_static_flag=$lt_lt_prog_compiler_static_FC
-ac_delim='%!_!# '
-for ac_last_try in false false false false false :; do
- cat >conf$$subs.sed <<_ACEOF
-CFLAGS!$CFLAGS$ac_delim
-ac_ct_CC!$ac_ct_CC$ac_delim
-CCDEPMODE!$CCDEPMODE$ac_delim
-am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim
-am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
-CPP!$CPP$ac_delim
-FC!$FC$ac_delim
-FCFLAGS!$FCFLAGS$ac_delim
-ac_ct_FC!$ac_ct_FC$ac_delim
-FCLIBS!$FCLIBS$ac_delim
-SED!$SED$ac_delim
-GREP!$GREP$ac_delim
-EGREP!$EGREP$ac_delim
-LN_S!$LN_S$ac_delim
-ECHO!$ECHO$ac_delim
-AR!$AR$ac_delim
-RANLIB!$RANLIB$ac_delim
-CXXCPP!$CXXCPP$ac_delim
-F77!$F77$ac_delim
-FFLAGS!$FFLAGS$ac_delim
-ac_ct_F77!$ac_ct_F77$ac_delim
-LIBTOOL!$LIBTOOL$ac_delim
-SILO_DTYPPTR!$SILO_DTYPPTR$ac_delim
-SILO_DTYPPTR1!$SILO_DTYPPTR1$ac_delim
-SILO_DTYPPTR2!$SILO_DTYPPTR2$ac_delim
-NETCDF!$NETCDF$ac_delim
-PDB_DRV!$PDB_DRV$ac_delim
-TAURUS!$TAURUS$ac_delim
-HDF5_DRV!$HDF5_DRV$ac_delim
-BROWSER!$BROWSER$ac_delim
-SILEX!$SILEX$ac_delim
-HZIP!$HZIP$ac_delim
-ZLIB!$ZLIB$ac_delim
-FPZIP!$FPZIP$ac_delim
-PRTDIAG!$PRTDIAG$ac_delim
-PDBP_DRV!$PDBP_DRV$ac_delim
-READLINE_LIBS!$READLINE_LIBS$ac_delim
-QT_BIN!$QT_BIN$ac_delim
-QT_INCLUDE!$QT_INCLUDE$ac_delim
-QT_LIB!$QT_LIB$ac_delim
-QT_LDFLAGS!$QT_LDFLAGS$ac_delim
-QT_LIBS!$QT_LIBS$ac_delim
-QT_CORE!$QT_CORE$ac_delim
-QT_CORE_LIB!$QT_CORE_LIB$ac_delim
-QT_GUI!$QT_GUI$ac_delim
-QT_GUI_LIB!$QT_GUI_LIB$ac_delim
-QT_CXXFLAGS!$QT_CXXFLAGS$ac_delim
-QT_MOC!$QT_MOC$ac_delim
-PYTHON!$PYTHON$ac_delim
-PYTHON_VERSION!$PYTHON_VERSION$ac_delim
-PYTHON_PREFIX!$PYTHON_PREFIX$ac_delim
-PYTHON_EXEC_PREFIX!$PYTHON_EXEC_PREFIX$ac_delim
-PYTHON_PLATFORM!$PYTHON_PLATFORM$ac_delim
-pythondir!$pythondir$ac_delim
-pkgpythondir!$pkgpythondir$ac_delim
-pyexecdir!$pyexecdir$ac_delim
-pkgpyexecdir!$pkgpyexecdir$ac_delim
-PYTHON_CPPFLAGS!$PYTHON_CPPFLAGS$ac_delim
-BUNDLE_TARGET!$BUNDLE_TARGET$ac_delim
-NETCDF_NEEDED_TRUE!$NETCDF_NEEDED_TRUE$ac_delim
-NETCDF_NEEDED_FALSE!$NETCDF_NEEDED_FALSE$ac_delim
-PDB_DRV_NEEDED_TRUE!$PDB_DRV_NEEDED_TRUE$ac_delim
-PDB_DRV_NEEDED_FALSE!$PDB_DRV_NEEDED_FALSE$ac_delim
-PDBP_DRV_NEEDED_TRUE!$PDBP_DRV_NEEDED_TRUE$ac_delim
-PDBP_DRV_NEEDED_FALSE!$PDBP_DRV_NEEDED_FALSE$ac_delim
-TAURUS_NEEDED_TRUE!$TAURUS_NEEDED_TRUE$ac_delim
-TAURUS_NEEDED_FALSE!$TAURUS_NEEDED_FALSE$ac_delim
-HDF5_DRV_NEEDED_TRUE!$HDF5_DRV_NEEDED_TRUE$ac_delim
-HDF5_DRV_NEEDED_FALSE!$HDF5_DRV_NEEDED_FALSE$ac_delim
-BROWSER_NEEDED_TRUE!$BROWSER_NEEDED_TRUE$ac_delim
-BROWSER_NEEDED_FALSE!$BROWSER_NEEDED_FALSE$ac_delim
-PYTHON_NEEDED_TRUE!$PYTHON_NEEDED_TRUE$ac_delim
-PYTHON_NEEDED_FALSE!$PYTHON_NEEDED_FALSE$ac_delim
-FORTRAN_NEEDED_TRUE!$FORTRAN_NEEDED_TRUE$ac_delim
-FORTRAN_NEEDED_FALSE!$FORTRAN_NEEDED_FALSE$ac_delim
-SILEX_NEEDED_TRUE!$SILEX_NEEDED_TRUE$ac_delim
-SILEX_NEEDED_FALSE!$SILEX_NEEDED_FALSE$ac_delim
-HZIP_NEEDED_TRUE!$HZIP_NEEDED_TRUE$ac_delim
-HZIP_NEEDED_FALSE!$HZIP_NEEDED_FALSE$ac_delim
-FPZIP_NEEDED_TRUE!$FPZIP_NEEDED_TRUE$ac_delim
-FPZIP_NEEDED_FALSE!$FPZIP_NEEDED_FALSE$ac_delim
-ZLIB_AVAILABLE_TRUE!$ZLIB_AVAILABLE_TRUE$ac_delim
-ZLIB_AVAILABLE_FALSE!$ZLIB_AVAILABLE_FALSE$ac_delim
-CXX_LINK_NEEDED_TRUE!$CXX_LINK_NEEDED_TRUE$ac_delim
-CXX_LINK_NEEDED_FALSE!$CXX_LINK_NEEDED_FALSE$ac_delim
-CC_FULLPATH!$CC_FULLPATH$ac_delim
-CXX_FULLPATH!$CXX_FULLPATH$ac_delim
-FC_FULLPATH!$FC_FULLPATH$ac_delim
-LIBOBJS!$LIBOBJS$ac_delim
-LTLIBOBJS!$LTLIBOBJS$ac_delim
-_ACEOF
-
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 90; then
- break
- elif $ac_last_try; then
- { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
- { (exit 1); exit 1; }; }
- else
- ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
- fi
-done
+# Does compiler simultaneously support -c and -o options?
+compiler_c_o=$lt_lt_cv_prog_compiler_c_o_FC
-ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-if test -n "$ac_eof"; then
- ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
- ac_eof=`expr $ac_eof + 1`
-fi
+# Whether or not to add -lc for building shared libraries.
+build_libtool_need_lc=$archive_cmds_need_lc_FC
-cat >>$CONFIG_STATUS <<_ACEOF
-cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
-_ACEOF
-sed '
-s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-s/^/s,@/; s/!/@,|#_!!_#|/
-:n
-t n
-s/'"$ac_delim"'$/,g/; t
-s/$/\\/; p
-N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-' >>$CONFIG_STATUS <conf$$subs.sed
-rm -f conf$$subs.sed
-cat >>$CONFIG_STATUS <<_ACEOF
-:end
-s/|#_!!_#|//g
-CEOF$ac_eof
-_ACEOF
+# Whether or not to disallow shared libs when runtime libs are static.
+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_FC
+
+# Compiler flag to allow reflexive dlopens.
+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_FC
+# Compiler flag to generate shared objects directly from archives.
+whole_archive_flag_spec=$lt_whole_archive_flag_spec_FC
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
-# trailing colons and then remove the whole line if VPATH becomes empty
-# (actually we leave an empty line to preserve line numbers).
-if test "x$srcdir" = x.; then
- ac_vpsub='/^[ ]*VPATH[ ]*=/{
-s/:*\$(srcdir):*/:/
-s/:*\${srcdir}:*/:/
-s/:*@srcdir@:*/:/
-s/^\([^=]*=[ ]*\):*/\1/
-s/:*$//
-s/^[^=]*=[ ]*$//
-}'
-fi
+# Whether the compiler copes with passing no objects directly.
+compiler_needs_object=$lt_compiler_needs_object_FC
-cat >>$CONFIG_STATUS <<\_ACEOF
-fi # test -n "$CONFIG_FILES"
+# Create an old-style archive from a shared archive.
+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_FC
+# Create a temporary old-style archive to link instead of a shared archive.
+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_FC
-for ac_tag in :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS
-do
- case $ac_tag in
- :[FHLC]) ac_mode=$ac_tag; continue;;
- esac
- case $ac_mode$ac_tag in
- :[FHL]*:*);;
- :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
-echo "$as_me: error: Invalid tag $ac_tag." >&2;}
- { (exit 1); exit 1; }; };;
- :[FH]-) ac_tag=-:-;;
- :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
- esac
- ac_save_IFS=$IFS
- IFS=:
- set x $ac_tag
- IFS=$ac_save_IFS
- shift
- ac_file=$1
- shift
+# Commands used to build a shared archive.
+archive_cmds=$lt_archive_cmds_FC
+archive_expsym_cmds=$lt_archive_expsym_cmds_FC
- case $ac_mode in
- :L) ac_source=$1;;
- :[FH])
- ac_file_inputs=
- for ac_f
- do
- case $ac_f in
- -) ac_f="$tmp/stdin";;
- *) # Look for the file first in the build tree, then in the source tree
- # (if the path is not absolute). The absolute path cannot be DOS-style,
- # because $ac_f cannot contain `:'.
- test -f "$ac_f" ||
- case $ac_f in
- [\\/$]*) false;;
- *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
- esac ||
- { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
-echo "$as_me: error: cannot find input file: $ac_f" >&2;}
- { (exit 1); exit 1; }; };;
- esac
- ac_file_inputs="$ac_file_inputs $ac_f"
- done
+# Commands used to build a loadable module if different from building
+# a shared archive.
+module_cmds=$lt_module_cmds_FC
+module_expsym_cmds=$lt_module_expsym_cmds_FC
- # Let's still pretend it is `configure' which instantiates (i.e., don't
- # use $as_me), people would be surprised to read:
- # /* config.h. Generated by config.status. */
- configure_input="Generated from "`IFS=:
- echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
- if test x"$ac_file" != x-; then
- configure_input="$ac_file. $configure_input"
- { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
- fi
+# Whether we are building with GNU ld or not.
+with_gnu_ld=$lt_with_gnu_ld_FC
- case $ac_tag in
- *:-:* | *:-) cat >"$tmp/stdin";;
- esac
- ;;
- esac
+# Flag that allows shared libraries with undefined symbols to be built.
+allow_undefined_flag=$lt_allow_undefined_flag_FC
- ac_dir=`$as_dirname -- "$ac_file" ||
-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$ac_file" : 'X\(//\)[^/]' \| \
- X"$ac_file" : 'X\(//\)$' \| \
- X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$ac_file" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
- s//\1/
- q
- }
- /^X\(\/\/\)[^/].*/{
- s//\1/
- q
- }
- /^X\(\/\/\)$/{
- s//\1/
- q
- }
- /^X\(\/\).*/{
- s//\1/
- q
- }
- s/.*/./; q'`
- { as_dir="$ac_dir"
- case $as_dir in #(
- -*) as_dir=./$as_dir;;
- esac
- test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
- as_dirs=
- while :; do
- case $as_dir in #(
- *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
- *) as_qdir=$as_dir;;
- esac
- as_dirs="'$as_qdir' $as_dirs"
- as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$as_dir" : 'X\(//\)[^/]' \| \
- X"$as_dir" : 'X\(//\)$' \| \
- X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$as_dir" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
- s//\1/
- q
- }
- /^X\(\/\/\)[^/].*/{
- s//\1/
- q
- }
- /^X\(\/\/\)$/{
- s//\1/
- q
- }
- /^X\(\/\).*/{
- s//\1/
- q
- }
- s/.*/./; q'`
- test -d "$as_dir" && break
- done
- test -z "$as_dirs" || eval "mkdir $as_dirs"
- } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-echo "$as_me: error: cannot create directory $as_dir" >&2;}
- { (exit 1); exit 1; }; }; }
- ac_builddir=.
+# Flag that enforces no undefined symbols.
+no_undefined_flag=$lt_no_undefined_flag_FC
+
+# Flag to hardcode \$libdir into a binary during linking.
+# This must work even if \$libdir does not exist
+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_FC
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
- # A ".." for each directory in $ac_dir_suffix.
- ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
- case $ac_top_builddir_sub in
- "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
- *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
- esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
+# If ld is used when linking, flag to hardcode \$libdir into a binary
+# during linking. This must work even if \$libdir does not exist.
+hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_FC
-case $srcdir in
- .) # We are building in place.
- ac_srcdir=.
- ac_top_srcdir=$ac_top_builddir_sub
- ac_abs_top_srcdir=$ac_pwd ;;
- [\\/]* | ?:[\\/]* ) # Absolute name.
- ac_srcdir=$srcdir$ac_dir_suffix;
- ac_top_srcdir=$srcdir
- ac_abs_top_srcdir=$srcdir ;;
- *) # Relative name.
- ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
- ac_top_srcdir=$ac_top_build_prefix$srcdir
- ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+# Whether we need a single "-rpath" flag with a separated argument.
+hardcode_libdir_separator=$lt_hardcode_libdir_separator_FC
+# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
+# DIR into the resulting binary.
+hardcode_direct=$hardcode_direct_FC
- case $ac_mode in
- :F)
- #
- # CONFIG_FILE
- #
+# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
+# DIR into the resulting binary and the resulting library dependency is
+# "absolute",i.e impossible to change by setting \${shlibpath_var} if the
+# library is relocated.
+hardcode_direct_absolute=$hardcode_direct_absolute_FC
- case $INSTALL in
- [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
- *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
- esac
- ac_MKDIR_P=$MKDIR_P
- case $MKDIR_P in
- [\\/$]* | ?:[\\/]* ) ;;
- */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
- esac
-_ACEOF
+# Set to "yes" if using the -LDIR flag during linking hardcodes DIR
+# into the resulting binary.
+hardcode_minus_L=$hardcode_minus_L_FC
-cat >>$CONFIG_STATUS <<\_ACEOF
-# If the template does not know about datarootdir, expand it.
-# FIXME: This hack should be removed a few years after 2.60.
-ac_datarootdir_hack=; ac_datarootdir_seen=
+# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
+# into the resulting binary.
+hardcode_shlibpath_var=$hardcode_shlibpath_var_FC
-case `sed -n '/datarootdir/ {
- p
- q
-}
-/@datadir@/p
-/@docdir@/p
-/@infodir@/p
-/@localedir@/p
-/@mandir@/p
-' $ac_file_inputs` in
-*datarootdir*) ac_datarootdir_seen=yes;;
-*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
- { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
- ac_datarootdir_hack='
- s&@datadir@&$datadir&g
- s&@docdir@&$docdir&g
- s&@infodir@&$infodir&g
- s&@localedir@&$localedir&g
- s&@mandir@&$mandir&g
- s&\\\${datarootdir}&$datarootdir&g' ;;
-esac
-_ACEOF
+# Set to "yes" if building a shared library automatically hardcodes DIR
+# into the library and all subsequent libraries and executables linked
+# against it.
+hardcode_automatic=$hardcode_automatic_FC
-# Neutralize VPATH when `$srcdir' = `.'.
-# Shell code in configure.ac might set extrasub.
-# FIXME: do we really want to maintain this feature?
-cat >>$CONFIG_STATUS <<_ACEOF
- sed "$ac_vpsub
-$extrasub
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-:t
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s&@configure_input@&$configure_input&;t t
-s&@top_builddir@&$ac_top_builddir_sub&;t t
-s&@srcdir@&$ac_srcdir&;t t
-s&@abs_srcdir@&$ac_abs_srcdir&;t t
-s&@top_srcdir@&$ac_top_srcdir&;t t
-s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
-s&@builddir@&$ac_builddir&;t t
-s&@abs_builddir@&$ac_abs_builddir&;t t
-s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
-s&@INSTALL@&$ac_INSTALL&;t t
-s&@MKDIR_P@&$ac_MKDIR_P&;t t
-$ac_datarootdir_hack
-" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out
+# Set to yes if linker adds runtime paths of dependent libraries
+# to runtime path list.
+inherit_rpath=$inherit_rpath_FC
-test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
- { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
- { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
- { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined. Please make sure it is defined." >&5
-echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined. Please make sure it is defined." >&2;}
+# Whether libtool must link a program against all its dependency libraries.
+link_all_deplibs=$link_all_deplibs_FC
- rm -f "$tmp/stdin"
- case $ac_file in
- -) cat "$tmp/out"; rm -f "$tmp/out";;
- *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
- esac
- ;;
- :H)
- #
- # CONFIG_HEADER
- #
-_ACEOF
+# Fix the shell variable \$srcfile for the compiler.
+fix_srcfile_path=$lt_fix_srcfile_path_FC
-# Transform confdefs.h into a sed script `conftest.defines', that
-# substitutes the proper values into config.h.in to produce config.h.
-rm -f conftest.defines conftest.tail
-# First, append a space to every undef/define line, to ease matching.
-echo 's/$/ /' >conftest.defines
-# Then, protect against being on the right side of a sed subst, or in
-# an unquoted here document, in config.status. If some macros were
-# called several times there might be several #defines for the same
-# symbol, which is useless. But do not sort them, since the last
-# AC_DEFINE must be honored.
-ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
-# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where
-# NAME is the cpp macro being defined, VALUE is the value it is being given.
-# PARAMS is the parameter list in the macro definition--in most cases, it's
-# just an empty string.
-ac_dA='s,^\\([ #]*\\)[^ ]*\\([ ]*'
-ac_dB='\\)[ (].*,\\1define\\2'
-ac_dC=' '
-ac_dD=' ,'
-
-uniq confdefs.h |
- sed -n '
- t rset
- :rset
- s/^[ ]*#[ ]*define[ ][ ]*//
- t ok
- d
- :ok
- s/[\\&,]/\\&/g
- s/^\('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p
- s/^\('"$ac_word_re"'\)[ ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p
- ' >>conftest.defines
-
-# Remove the space that was appended to ease matching.
-# Then replace #undef with comments. This is necessary, for
-# example, in the case of _POSIX_SOURCE, which is predefined and required
-# on some systems where configure will not decide to define it.
-# (The regexp can be short, since the line contains either #define or #undef.)
-echo 's/ $//
-s,^[ #]*u.*,/* & */,' >>conftest.defines
-
-# Break up conftest.defines:
-ac_max_sed_lines=50
-
-# First sed command is: sed -f defines.sed $ac_file_inputs >"$tmp/out1"
-# Second one is: sed -f defines.sed "$tmp/out1" >"$tmp/out2"
-# Third one will be: sed -f defines.sed "$tmp/out2" >"$tmp/out1"
-# et cetera.
-ac_in='$ac_file_inputs'
-ac_out='"$tmp/out1"'
-ac_nxt='"$tmp/out2"'
-
-while :
-do
- # Write a here document:
- cat >>$CONFIG_STATUS <<_ACEOF
- # First, check the format of the line:
- cat >"\$tmp/defines.sed" <<\\CEOF
-/^[ ]*#[ ]*undef[ ][ ]*$ac_word_re[ ]*\$/b def
-/^[ ]*#[ ]*define[ ][ ]*$ac_word_re[( ]/b def
-b
-:def
-_ACEOF
- sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS
- echo 'CEOF
- sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS
- ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in
- sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail
- grep . conftest.tail >/dev/null || break
- rm -f conftest.defines
- mv conftest.tail conftest.defines
-done
-rm -f conftest.defines conftest.tail
+# Set to "yes" if exported symbols are required.
+always_export_symbols=$always_export_symbols_FC
-echo "ac_result=$ac_in" >>$CONFIG_STATUS
-cat >>$CONFIG_STATUS <<\_ACEOF
- if test x"$ac_file" != x-; then
- echo "/* $configure_input */" >"$tmp/config.h"
- cat "$ac_result" >>"$tmp/config.h"
- if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then
- { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
-echo "$as_me: $ac_file is unchanged" >&6;}
- else
- rm -f $ac_file
- mv "$tmp/config.h" $ac_file
- fi
- else
- echo "/* $configure_input */"
- cat "$ac_result"
- fi
- rm -f "$tmp/out12"
-# Compute $ac_file's index in $config_headers.
-_am_stamp_count=1
-for _am_header in $config_headers :; do
- case $_am_header in
- $ac_file | $ac_file:* )
- break ;;
- * )
- _am_stamp_count=`expr $_am_stamp_count + 1` ;;
- esac
-done
-echo "timestamp for $ac_file" >`$as_dirname -- $ac_file ||
-$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X$ac_file : 'X\(//\)[^/]' \| \
- X$ac_file : 'X\(//\)$' \| \
- X$ac_file : 'X\(/\)' \| . 2>/dev/null ||
-echo X$ac_file |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
- s//\1/
- q
- }
- /^X\(\/\/\)[^/].*/{
- s//\1/
- q
- }
- /^X\(\/\/\)$/{
- s//\1/
- q
- }
- /^X\(\/\).*/{
- s//\1/
- q
- }
- s/.*/./; q'`/stamp-h$_am_stamp_count
- ;;
+# The commands to list exported symbols.
+export_symbols_cmds=$lt_export_symbols_cmds_FC
- :C) { echo "$as_me:$LINENO: executing $ac_file commands" >&5
-echo "$as_me: executing $ac_file commands" >&6;}
- ;;
- esac
+# Symbols that should not be listed in the preloaded symbols.
+exclude_expsyms=$lt_exclude_expsyms_FC
+# Symbols that must always be exported.
+include_expsyms=$lt_include_expsyms_FC
- case $ac_file$ac_mode in
- "tests/atconfig":C) cat >tests/atconfig <<ATEOF
-# Configurable variable values for building test suites.
-# Generated by $0.
-# Copyright (C) 2000, 2001, 2003, 2004 Free Software Foundation, Inc.
+# Commands necessary for linking programs (against libraries) with templates.
+prelink_cmds=$lt_prelink_cmds_FC
-# The test suite will define top_srcdir=$at_top_srcdir/../.. etc.
-at_testdir='tests'
-abs_builddir='$ac_abs_builddir'
-at_srcdir='$ac_srcdir'
-abs_srcdir='$ac_abs_srcdir'
-at_top_srcdir='$ac_top_srcdir'
-abs_top_srcdir='$ac_abs_top_srcdir'
-at_top_build_prefix='$ac_top_build_prefix'
-abs_top_builddir='$ac_abs_top_builddir'
+# Specify filename containing input files.
+file_list_spec=$lt_file_list_spec_FC
-# Backward compatibility with Autotest <= 2.59b:
-at_top_builddir=\$at_top_build_prefix
+# How to hardcode a shared library path into an executable.
+hardcode_action=$hardcode_action_FC
-AUTOTEST_PATH='tests'
+# The directories searched by this compiler when creating a shared library.
+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_FC
+
+# Dependencies to place before and after the objects being linked to
+# create a shared library.
+predep_objects=$lt_predep_objects_FC
+postdep_objects=$lt_postdep_objects_FC
+predeps=$lt_predeps_FC
+postdeps=$lt_postdeps_FC
+
+# The library search path used internally by the compiler when linking
+# a shared library.
+compiler_lib_search_path=$lt_compiler_lib_search_path_FC
+
+# ### END LIBTOOL TAG CONFIG: FC
+_LT_EOF
-SHELL=\${CONFIG_SHELL-'$SHELL'}
-ATEOF
- ;;
- "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
- # Strip MF so we end up with the name of the file.
- mf=`echo "$mf" | sed -e 's/:.*$//'`
- # Check whether this is an Automake generated Makefile or not.
- # We used to match only the files named `Makefile.in', but
- # some people rename them; so instead we look at the file content.
- # Grep'ing the first line is not enough: some people post-process
- # each Makefile.in and add a new line on top of each file to say so.
- # Grep'ing the whole file is not good either: AIX grep has a line
- # limit of 2048, but all sed's we know have understand at least 4000.
- if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
- dirpart=`$as_dirname -- "$mf" ||
-$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$mf" : 'X\(//\)[^/]' \| \
- X"$mf" : 'X\(//\)$' \| \
- X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$mf" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
- s//\1/
- q
- }
- /^X\(\/\/\)[^/].*/{
- s//\1/
- q
- }
- /^X\(\/\/\)$/{
- s//\1/
- q
- }
- /^X\(\/\).*/{
- s//\1/
- q
- }
- s/.*/./; q'`
- else
- continue
- fi
- # Extract the definition of DEPDIR, am__include, and am__quote
- # from the Makefile without running `make'.
- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
- test -z "$DEPDIR" && continue
- am__include=`sed -n 's/^am__include = //p' < "$mf"`
- test -z "am__include" && continue
- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
- # When using ansi2knr, U may be empty or an underscore; expand it
- U=`sed -n 's/^U = //p' < "$mf"`
- # Find all dependency output files, they are included files with
- # $(DEPDIR) in their names. We invoke sed twice because it is the
- # simplest approach to changing $(DEPDIR) to its actual value in the
- # expansion.
- for file in `sed -n "
- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
- # Make sure the directory exists.
- test -f "$dirpart/$file" && continue
- fdir=`$as_dirname -- "$file" ||
-$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$file" : 'X\(//\)[^/]' \| \
- X"$file" : 'X\(//\)$' \| \
- X"$file" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$file" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
- s//\1/
- q
- }
- /^X\(\/\/\)[^/].*/{
- s//\1/
- q
- }
- /^X\(\/\/\)$/{
- s//\1/
- q
- }
- /^X\(\/\).*/{
- s//\1/
- q
- }
- s/.*/./; q'`
- { as_dir=$dirpart/$fdir
- case $as_dir in #(
- -*) as_dir=./$as_dir;;
- esac
- test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
- as_dirs=
- while :; do
- case $as_dir in #(
- *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
- *) as_qdir=$as_dir;;
- esac
- as_dirs="'$as_qdir' $as_dirs"
- as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$as_dir" : 'X\(//\)[^/]' \| \
- X"$as_dir" : 'X\(//\)$' \| \
- X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$as_dir" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
- s//\1/
- q
- }
- /^X\(\/\/\)[^/].*/{
- s//\1/
- q
- }
- /^X\(\/\/\)$/{
- s//\1/
- q
- }
- /^X\(\/\).*/{
- s//\1/
- q
- }
- s/.*/./; q'`
- test -d "$as_dir" && break
- done
- test -z "$as_dirs" || eval "mkdir $as_dirs"
- } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-echo "$as_me: error: cannot create directory $as_dir" >&2;}
- { (exit 1); exit 1; }; }; }
- # echo "creating $dirpart/$file"
- echo '# dummy' > "$dirpart/$file"
- done
-done
;;
esac
@@ -29103,6 +33778,11 @@ _ACEOF
chmod +x $CONFIG_STATUS
ac_clean_files=$ac_clean_files_save
+test $ac_write_fail = 0 ||
+ { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
+ { (exit 1); exit 1; }; }
+
# configure is writing to config.log, and then calls config.status.
# config.status does its own redirection, appending to config.log.
@@ -29124,6 +33804,10 @@ if test "$no_create" != yes; then
# would make configure fail if this is the last instruction.
$ac_cs_success || { (exit 1); exit 1; }
fi
+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
+ { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+fi
echo;echo
if test -n "$HDF5_DRV"; then
diff --git a/configure.ac b/configure.ac
index 94e2a8a..09ba901 100644
--- a/configure.ac
+++ b/configure.ac
@@ -578,6 +578,7 @@ AC_PROG_CC
AC_PROG_CPP
if test -n "$FORTRAN"; then
AC_PROG_FC
+ AC_PROG_F77
AC_FC_LIBRARY_LDFLAGS
AC_FC_WRAPPERS
fi
@@ -614,6 +615,21 @@ AC_SUBST(SILO_DTYPPTR)
AC_SUBST(SILO_DTYPPTR1)
AC_SUBST(SILO_DTYPPTR2)
+dnl Switch to disable score lite memory header optimizations
+AC_ARG_ENABLE(normal-sclite-mem-headers,
+ AC_HELP_STRING([--enable-normal-sclite-mem-headers],
+ [compile with normal score lite memory headers @<:@default=no@:>@]),
+ if test "$enableval" = "yes" ; then
+ AC_DEFINE(NORMAL_SCLITE_HEADERS,1,[SCORE lite memory header optimizations])
+ fi,
+ AC_DEFINE(NORMAL_SCLITE_HEADERS,0,[SCORE lite memory header optimizations]))
+
+dnl Switch to have 'make install' install score/pdb lite header files
+AC_ARG_ENABLE(install-lite-headers,
+ AC_HELP_STRING([--enable-install-lite-headers],
+ [Install SCORE/PDB lite header files @<:@default=no@:>@]),
+ INSTLITE="$enableval")
+
dnl we don't need to check for netcdf driver. It is always there.
NETCDF="netcdf"
AC_DEFINE(HAVE_NETCDF_DRIVER,1,[Support for NetCDF])
@@ -885,6 +901,11 @@ dnl save the cache
dnl
AC_CACHE_SAVE
+dnl Check for Qt library
+if test -n "$SILEX"; then
+ AX_HAVE_QT
+fi dnl if test -n "$SILEX"; then
+
dnl the hdf5 library checks (to follow) will require the -lm if its required
AC_CHECK_LIBM
LIBS="$LIBS $LIBM"
@@ -1253,126 +1274,6 @@ else
fi
AC_SUBST(READLINE_LIBS)
-AC_ARG_WITH(qt,
- AC_HELP_STRING([--with-qt],[specify top-level Qt directory @<:@default=yes@:>@]),
- if test $withval != yes; then
- QTDIR=$withval
- fi
- )
-AC_ARG_WITH(qt-bin,
- AC_HELP_STRING([--with-qt-bin],[specify Qt bin directory]),
- if test $withval != yes; then
- QT_BIN=$withval
- fi
- )
-AC_ARG_WITH(qt-include,
- AC_HELP_STRING([--with-qt-include],[specify Qt include directory]),
- if test $withval != yes; then
- QT_INCLUDE=$withval
- fi
- )
-AC_ARG_WITH(qt-lib,
- AC_HELP_STRING([--with-qt-lib],[specify Qt lib directory]),
- if test $withval != yes; then
- QT_LIB=$withval
- fi
- )
-
-dnl
-dnl If silex is enabled, look for a supported version of Qt.
-dnl This QT logic is taken from VisIt's configure.in.
-dnl
-if test -n "$SILEX"; then
-
- if test -z "$QT_BIN" || test -z "$QT_INCLUDE" || test -z "$QT_LIB"; then
- if test -z "QTDIR"; then
- AC_MSG_WARN([The QT_BIN, QT_INCLUDE and QT_LIB environment variables must be set in order to find Qt. silex is being disabled])
- SILEX=""
- else
- QT_BIN="$QTDIR/bin"
- QT_INCLUDE="$QTDIR/include"
- QT_LIB="$QTDIR/lib"
- fi
- fi
- AC_MSG_CHECKING(for supported Qt version)
- QtVersion=""
- QtVersion2=""
- consumeCount=-1
- toks=`$QT_BIN/qmake --version`
- for tok in $toks; do
- if test "$tok" == "Qt"; then
- consumeCount=2
- fi
- if test $consumeCount == 0; then
- QtVersion2=$tok
- break
- else
- consumeCount=$((consumeCount-1))
- fi
- done
-
- ## Check for supported versions of Qt.
- for ver in 4.4.0 4.4.1 4.4.2 4.4.3 4.4.4 4.4.5 \
- 4.5.0 4.5.1 4.5.2 4.5.3 4.5.4 4.5.5 \
- 4.6.0 4.6.1 4.6.2 4.6.3 4.6.4 4.6.5 ; do
- if test "$QtVersion2" == "$ver"; then
- QtVersion=$ver
- break
- fi
- done
-
- if test -z "$QtVersion"; then
- AC_MSG_WARN([ Sorry, but you need Qt version 4.4.0 or higher to compile Silo's silex tool. silex is being disabled])
- SILEX=""
- else
- AC_MSG_RESULT(Qt $QtVersion in $QT_INCLUDE)
- fi
-
- # Set the Qt bin,include,lib directories
- AC_SUBST(QT_BIN)
- AC_SUBST(QT_INCLUDE)
- AC_SUBST(QT_LIB)
-
- # Set platform-specific options
- if test "$UNAME" = "Darwin"; then
- QT_LDFLAGS="-F$""(QT_LIB) -L$""(QT_LIB)"
-
- QT_CORE=QtCore.framework
- QT_CORE_LIB="-framework QtCore"
-
- QT_GUI=QtGui.framework
- QT_GUI_LIB="-framework QtGui"
-
- else
- QT_LDFLAGS="-L$""(QT_LIB)"
-
- QT_CORE=libQtCore.so
- QT_CORE_LIB=-lQtCore
-
- QT_GUI=libQtGui.so
- QT_GUI_LIB=-lQtGui
-
- fi
- AC_SUBST(QT_LDFLAGS)
-
- # Qt libraries
- QT_LIBS="$""(QT_CORE_LIB) $""(QT_GUI_LIB)"
- AC_SUBST(QT_LIBS)
- AC_SUBST(QT_CORE)
- AC_SUBST(QT_CORE_LIB)
- AC_SUBST(QT_GUI)
- AC_SUBST(QT_GUI_LIB)
-
- # Include path
- QT_CXXFLAGS="-I$""(QT_INCLUDE) -I$""(QT_INCLUDE)/Qt -I$""(QT_INCLUDE)/QtCore -I$""(QT_INCLUDE)/QtGui"
- AC_SUBST(QT_CXXFLAGS)
-
- # Path to moc
- QT_MOC="$""(QT_BIN)/moc"
- AC_SUBST(QT_MOC)
-
-fi dnl if test -n "$SILEX"; then
-
dnl
dnl Check for a python installation using the Automake
dnl provided macro, which will generate the following
@@ -1412,6 +1313,7 @@ AC_SUBST(BUNDLE_TARGET)
AC_CACHE_SAVE
dnl
+AM_CONDITIONAL(INSTALL_LITE_HEADERS, test "$INSTLITE" = "yes")
AM_CONDITIONAL(NETCDF_NEEDED, test -n "$NETCDF")
AM_CONDITIONAL(PDB_DRV_NEEDED, test -n "$PDB_DRV")
AM_CONDITIONAL(PDBP_DRV_NEEDED, test -n "$PDBP_DRV")
diff --git a/docs/Makefile.in b/docs/Makefile.in
index c8c58ee..49f19f6 100644
--- a/docs/Makefile.in
+++ b/docs/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -68,8 +69,9 @@
#
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -87,12 +89,21 @@ host_triplet = @host@
subdir = docs
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/config/ax_check_compiler_flags.m4 \
+ $(top_srcdir)/config/ax_have_qt.m4 \
+ $(top_srcdir)/config/libtool.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
+ $(top_srcdir)/config/vl_lib_readline.m4 \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -122,7 +133,8 @@ CXX_FULLPATH = @CXX_FULLPATH@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -134,6 +146,7 @@ FCFLAGS = @FCFLAGS@
FCLIBS = @FCLIBS@
FC_FULLPATH = @FC_FULLPATH@
FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FORTRAN = @FORTRAN@
FPZIP = @FPZIP@
GREP = @GREP@
@@ -144,17 +157,25 @@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
LDFLAGS = @LDFLAGS@
+LIBM = @LIBM@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
NETCDF = @NETCDF@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -164,7 +185,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PDBP_DRV = @PDBP_DRV@
PDB_DRV = @PDB_DRV@
-PRTDIAG = @PRTDIAG@
PYTHON = @PYTHON@
PYTHONMODULE = @PYTHONMODULE@
PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@
@@ -172,17 +192,13 @@ PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
PYTHON_PLATFORM = @PYTHON_PLATFORM@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
-QT_BIN = @QT_BIN@
-QT_CORE = @QT_CORE@
-QT_CORE_LIB = @QT_CORE_LIB@
QT_CXXFLAGS = @QT_CXXFLAGS@
-QT_GUI = @QT_GUI@
-QT_GUI_LIB = @QT_GUI_LIB@
-QT_INCLUDE = @QT_INCLUDE@
-QT_LDFLAGS = @QT_LDFLAGS@
-QT_LIB = @QT_LIB@
+QT_DIR = @QT_DIR@
QT_LIBS = @QT_LIBS@
+QT_LRELEASE = @QT_LRELEASE@
+QT_LUPDATE = @QT_LUPDATE@
QT_MOC = @QT_MOC@
+QT_UIC = @QT_UIC@
RANLIB = @RANLIB@
READLINE_LIBS = @READLINE_LIBS@
SED = @SED@
@@ -200,6 +216,11 @@ SILO_VERS_TAG = @SILO_VERS_TAG@
STRIP = @STRIP@
TAURUS = @TAURUS@
VERSION = @VERSION@
+XMKMF = @XMKMF@
+X_CFLAGS = @X_CFLAGS@
+X_EXTRA_LIBS = @X_EXTRA_LIBS@
+X_LIBS = @X_LIBS@
+X_PRE_LIBS = @X_PRE_LIBS@
ZLIB = @ZLIB@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
@@ -207,6 +228,7 @@ abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_F77 = @ac_ct_F77@
ac_ct_FC = @ac_ct_FC@
am__include = @am__include@
@@ -239,6 +261,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -255,6 +278,7 @@ sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
EXTRA_DIST = \
@@ -275,14 +299,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
- && exit 0; \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign docs/Makefile'; \
- cd $(top_srcdir) && \
- $(AUTOMAKE) --foreign docs/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign docs/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --foreign docs/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -300,6 +324,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
mostlyclean-libtool:
-rm -f *.lo
@@ -329,13 +354,17 @@ distdir: $(DISTFILES)
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
if test -d $$d/$$file; then \
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
@@ -363,6 +392,7 @@ clean-generic:
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -381,6 +411,8 @@ dvi-am:
html: html-am
+html-am:
+
info: info-am
info-am:
@@ -389,18 +421,28 @@ install-data-am:
install-dvi: install-dvi-am
+install-dvi-am:
+
install-exec-am:
install-html: install-html-am
+install-html-am:
+
install-info: install-info-am
+install-info-am:
+
install-man:
install-pdf: install-pdf-am
+install-pdf-am:
+
install-ps: install-ps-am
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-am
@@ -434,6 +476,7 @@ uninstall-am:
maintainer-clean-generic mostlyclean mostlyclean-generic \
mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/src/Makefile.in b/src/Makefile.in
index dfcbb04..d9ca3aa 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -69,8 +70,9 @@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -103,20 +105,43 @@ subdir = src
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(srcdir)/libsilo.settings.in $(srcdir)/libsiloh5.settings.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/config/ax_check_compiler_flags.m4 \
+ $(top_srcdir)/config/ax_have_qt.m4 \
+ $(top_srcdir)/config/libtool.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
+ $(top_srcdir)/config/vl_lib_readline.m4 \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES = libsiloh5.settings libsilo.settings
+CONFIG_CLEAN_VPATH_FILES =
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
*) f=$$p;; \
esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == $(am__install_max)) \
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+ END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
am__installdirs = "$(DESTDIR)$(libdir)"
-libLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(lib_LTLIBRARIES)
@HDF5_DRV_NEEDED_FALSE at libsilo_la_DEPENDENCIES = \
@HDF5_DRV_NEEDED_FALSE@ score/libsilo_score.la \
@@ -144,9 +169,10 @@ libsiloh5_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(libsiloh5_la_LDFLAGS) $(LDFLAGS) -o $@
@HDF5_DRV_NEEDED_TRUE at am_libsiloh5_la_rpath = -rpath $(libdir)
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/config/depcomp
am__depfiles_maybe = depfiles
+am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -168,9 +194,37 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
ps-recursive uninstall-recursive
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+ distdir
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+ dir0=`pwd`; \
+ sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+ sed_rest='s,^[^/]*/*,,'; \
+ sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+ sed_butlast='s,/*[^/]*$$,,'; \
+ while test -n "$$dir1"; do \
+ first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+ if test "$$first" != "."; then \
+ if test "$$first" = ".."; then \
+ dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+ dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+ else \
+ first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+ if test "$$first2" = "$$first"; then \
+ dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+ else \
+ dir2="../$$dir2"; \
+ fi; \
+ dir0="$$dir0"/"$$first"; \
+ fi; \
+ fi; \
+ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+ done; \
+ reldir="$$dir2"
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
AR = @AR@
@@ -197,7 +251,8 @@ CXX_FULLPATH = @CXX_FULLPATH@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -209,6 +264,7 @@ FCFLAGS = @FCFLAGS@
FCLIBS = @FCLIBS@
FC_FULLPATH = @FC_FULLPATH@
FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FORTRAN = @FORTRAN@
FPZIP = @FPZIP@
GREP = @GREP@
@@ -219,17 +275,25 @@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
LDFLAGS = @LDFLAGS@
+LIBM = @LIBM@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
NETCDF = @NETCDF@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -239,7 +303,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PDBP_DRV = @PDBP_DRV@
PDB_DRV = @PDB_DRV@
-PRTDIAG = @PRTDIAG@
PYTHON = @PYTHON@
PYTHONMODULE = @PYTHONMODULE@
PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@
@@ -247,17 +310,13 @@ PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
PYTHON_PLATFORM = @PYTHON_PLATFORM@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
-QT_BIN = @QT_BIN@
-QT_CORE = @QT_CORE@
-QT_CORE_LIB = @QT_CORE_LIB@
QT_CXXFLAGS = @QT_CXXFLAGS@
-QT_GUI = @QT_GUI@
-QT_GUI_LIB = @QT_GUI_LIB@
-QT_INCLUDE = @QT_INCLUDE@
-QT_LDFLAGS = @QT_LDFLAGS@
-QT_LIB = @QT_LIB@
+QT_DIR = @QT_DIR@
QT_LIBS = @QT_LIBS@
+QT_LRELEASE = @QT_LRELEASE@
+QT_LUPDATE = @QT_LUPDATE@
QT_MOC = @QT_MOC@
+QT_UIC = @QT_UIC@
RANLIB = @RANLIB@
READLINE_LIBS = @READLINE_LIBS@
SED = @SED@
@@ -275,6 +334,11 @@ SILO_VERS_TAG = @SILO_VERS_TAG@
STRIP = @STRIP@
TAURUS = @TAURUS@
VERSION = @VERSION@
+XMKMF = @XMKMF@
+X_CFLAGS = @X_CFLAGS@
+X_EXTRA_LIBS = @X_EXTRA_LIBS@
+X_LIBS = @X_LIBS@
+X_PRE_LIBS = @X_PRE_LIBS@
ZLIB = @ZLIB@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
@@ -282,6 +346,7 @@ abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_F77 = @ac_ct_F77@
ac_ct_FC = @ac_ct_FC@
am__include = @am__include@
@@ -314,6 +379,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -330,6 +396,7 @@ sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
DRIVER_DIRS = $(am__append_1) $(am__append_3) $(am__append_5) \
@@ -381,14 +448,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
- && exit 0; \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \
- cd $(top_srcdir) && \
- $(AUTOMAKE) --foreign src/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --foreign src/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -406,6 +473,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
libsiloh5.settings: $(top_builddir)/config.status $(srcdir)/libsiloh5.settings.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
libsilo.settings: $(top_builddir)/config.status $(srcdir)/libsilo.settings.in
@@ -413,20 +481,24 @@ libsilo.settings: $(top_builddir)/config.status $(srcdir)/libsilo.settings.in
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+ list2=; for p in $$list; do \
if test -f $$p; then \
- f=$(am__strip_dir) \
- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+ list2="$$list2 $$p"; \
else :; fi; \
- done
+ done; \
+ test -z "$$list2" || { \
+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
+ }
uninstall-libLTLIBRARIES:
@$(NORMAL_UNINSTALL)
- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- p=$(am__strip_dir) \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+ @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+ for p in $$list; do \
+ $(am__strip_dir) \
+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \
+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \
done
clean-libLTLIBRARIES:
@@ -453,21 +525,21 @@ distclean-compile:
.c.o:
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c $<
.c.obj:
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
.c.lo:
@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
@@ -485,7 +557,7 @@ clean-libtool:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -502,7 +574,7 @@ $(RECURSIVE_TARGETS):
else \
local_target="$$target"; \
fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
|| eval $$failcom; \
done; \
if test "$$dot_seen" = "no"; then \
@@ -510,7 +582,7 @@ $(RECURSIVE_TARGETS):
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -536,16 +608,16 @@ $(RECURSIVE_CLEAN_TARGETS):
else \
local_target="$$target"; \
fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
|| eval $$failcom; \
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
done
ctags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -553,14 +625,14 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
+ set x; \
here=`pwd`; \
if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
include_option=--etags-include; \
@@ -572,39 +644,43 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
list='$(SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test ! -f $$subdir/TAGS || \
- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
fi
ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
+ $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && cd $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) $$here
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -625,29 +701,44 @@ distdir: $(DISTFILES)
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
if test -d $$d/$$file; then \
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test -d "$(distdir)/$$subdir" \
|| $(MKDIR_P) "$(distdir)/$$subdir" \
|| exit 1; \
- distdir=`$(am__cd) $(distdir) && pwd`; \
- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- (cd $$subdir && \
+ fi; \
+ done
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+ $(am__relativize); \
+ new_distdir=$$reldir; \
+ dir1=$$subdir; dir2="$(top_distdir)"; \
+ $(am__relativize); \
+ new_top_distdir=$$reldir; \
+ echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+ echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+ ($(am__cd) $$subdir && \
$(MAKE) $(AM_MAKEFLAGS) \
- top_distdir="$$top_distdir" \
- distdir="$$distdir/$$subdir" \
+ top_distdir="$$new_top_distdir" \
+ distdir="$$new_distdir" \
am__remove_distdir=: \
am__skip_length_check=: \
+ am__skip_mode_fix=: \
distdir) \
|| exit 1; \
fi; \
@@ -682,6 +773,7 @@ clean-generic:
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -704,6 +796,8 @@ dvi-am:
html: html-recursive
+html-am:
+
info: info-recursive
info-am:
@@ -712,18 +806,28 @@ install-data-am: install-data-local
install-dvi: install-dvi-recursive
+install-dvi-am:
+
install-exec-am: install-libLTLIBRARIES
install-html: install-html-recursive
+install-html-am:
+
install-info: install-info-recursive
+install-info-am:
+
install-man:
install-pdf: install-pdf-recursive
+install-pdf-am:
+
install-ps: install-ps-recursive
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-recursive
@@ -746,8 +850,9 @@ ps-am:
uninstall-am: uninstall-libLTLIBRARIES uninstall-local
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
- install-strip
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check \
+ ctags-recursive install install-am install-strip \
+ tags-recursive
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
all all-am check check-am clean clean-generic \
@@ -792,6 +897,7 @@ uninstall-local:
clean-local:
-rm -f $(MAKESETTINGS)
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/src/debug/Makefile.in b/src/debug/Makefile.in
index 4d6a83c..b8d6322 100644
--- a/src/debug/Makefile.in
+++ b/src/debug/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -70,8 +71,9 @@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -90,20 +92,30 @@ subdir = src/debug
DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/config/ax_check_compiler_flags.m4 \
+ $(top_srcdir)/config/ax_have_qt.m4 \
+ $(top_srcdir)/config/libtool.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
+ $(top_srcdir)/config/vl_lib_readline.m4 \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
LTLIBRARIES = $(noinst_LTLIBRARIES)
libsilo_debug_la_LIBADD =
am__objects_1 = silo_debug.lo
am_libsilo_debug_la_OBJECTS = $(am__objects_1)
libsilo_debug_la_OBJECTS = $(am_libsilo_debug_la_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/config/depcomp
am__depfiles_maybe = depfiles
+am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -145,7 +157,8 @@ CXX_FULLPATH = @CXX_FULLPATH@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -157,6 +170,7 @@ FCFLAGS = @FCFLAGS@
FCLIBS = @FCLIBS@
FC_FULLPATH = @FC_FULLPATH@
FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FORTRAN = @FORTRAN@
FPZIP = @FPZIP@
GREP = @GREP@
@@ -167,17 +181,25 @@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
LDFLAGS = @LDFLAGS@
+LIBM = @LIBM@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
NETCDF = @NETCDF@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -187,7 +209,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PDBP_DRV = @PDBP_DRV@
PDB_DRV = @PDB_DRV@
-PRTDIAG = @PRTDIAG@
PYTHON = @PYTHON@
PYTHONMODULE = @PYTHONMODULE@
PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@
@@ -195,17 +216,13 @@ PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
PYTHON_PLATFORM = @PYTHON_PLATFORM@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
-QT_BIN = @QT_BIN@
-QT_CORE = @QT_CORE@
-QT_CORE_LIB = @QT_CORE_LIB@
QT_CXXFLAGS = @QT_CXXFLAGS@
-QT_GUI = @QT_GUI@
-QT_GUI_LIB = @QT_GUI_LIB@
-QT_INCLUDE = @QT_INCLUDE@
-QT_LDFLAGS = @QT_LDFLAGS@
-QT_LIB = @QT_LIB@
+QT_DIR = @QT_DIR@
QT_LIBS = @QT_LIBS@
+QT_LRELEASE = @QT_LRELEASE@
+QT_LUPDATE = @QT_LUPDATE@
QT_MOC = @QT_MOC@
+QT_UIC = @QT_UIC@
RANLIB = @RANLIB@
READLINE_LIBS = @READLINE_LIBS@
SED = @SED@
@@ -223,6 +240,11 @@ SILO_VERS_TAG = @SILO_VERS_TAG@
STRIP = @STRIP@
TAURUS = @TAURUS@
VERSION = @VERSION@
+XMKMF = @XMKMF@
+X_CFLAGS = @X_CFLAGS@
+X_EXTRA_LIBS = @X_EXTRA_LIBS@
+X_LIBS = @X_LIBS@
+X_PRE_LIBS = @X_PRE_LIBS@
ZLIB = @ZLIB@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
@@ -230,6 +252,7 @@ abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_F77 = @ac_ct_F77@
ac_ct_FC = @ac_ct_FC@
am__include = @am__include@
@@ -262,6 +285,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -278,6 +302,7 @@ sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
noinst_LTLIBRARIES = libsilo_debug.la
@@ -297,14 +322,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
- && exit 0; \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/debug/Makefile'; \
- cd $(top_srcdir) && \
- $(AUTOMAKE) --foreign src/debug/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/debug/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --foreign src/debug/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -322,6 +347,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
clean-noinstLTLIBRARIES:
-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
@@ -344,21 +370,21 @@ distclean-compile:
.c.o:
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c $<
.c.obj:
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
.c.lo:
@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
@@ -374,45 +400,49 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
+ set x; \
here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
fi
ctags: CTAGS
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
+ $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && cd $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) $$here
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -433,13 +463,17 @@ distdir: $(DISTFILES)
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
if test -d $$d/$$file; then \
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
@@ -467,6 +501,7 @@ clean-generic:
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -488,6 +523,8 @@ dvi-am:
html: html-am
+html-am:
+
info: info-am
info-am:
@@ -496,18 +533,28 @@ install-data-am:
install-dvi: install-dvi-am
+install-dvi-am:
+
install-exec-am:
install-html: install-html-am
+install-html-am:
+
install-info: install-info-am
+install-info-am:
+
install-man:
install-pdf: install-pdf-am
+install-pdf-am:
+
install-ps: install-ps-am
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-am
@@ -545,6 +592,7 @@ uninstall-am:
mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
pdf pdf-am ps ps-am tags uninstall uninstall-am
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/src/filters/Makefile.am b/src/filters/Makefile.am
index e327d22..2ff1be7 100644
--- a/src/filters/Makefile.am
+++ b/src/filters/Makefile.am
@@ -61,5 +61,7 @@ AM_CPPFLAGS = -I$(builddir)/../silo -I$(srcdir)/../silo
noinst_HEADERS = \
filter.h
FILES = \
+ f_ale3d.h \
+ f_sample.h \
f_ale3d.c \
f_sample.c
diff --git a/src/filters/Makefile.in b/src/filters/Makefile.in
index 65aa064..fcd6544 100644
--- a/src/filters/Makefile.in
+++ b/src/filters/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -70,8 +71,9 @@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -90,20 +92,30 @@ subdir = src/filters
DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/config/ax_check_compiler_flags.m4 \
+ $(top_srcdir)/config/ax_have_qt.m4 \
+ $(top_srcdir)/config/libtool.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
+ $(top_srcdir)/config/vl_lib_readline.m4 \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
LTLIBRARIES = $(noinst_LTLIBRARIES)
libsilo_filters_la_LIBADD =
am__objects_1 = f_ale3d.lo f_sample.lo
am_libsilo_filters_la_OBJECTS = $(am__objects_1)
libsilo_filters_la_OBJECTS = $(am_libsilo_filters_la_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/config/depcomp
am__depfiles_maybe = depfiles
+am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -145,7 +157,8 @@ CXX_FULLPATH = @CXX_FULLPATH@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -157,6 +170,7 @@ FCFLAGS = @FCFLAGS@
FCLIBS = @FCLIBS@
FC_FULLPATH = @FC_FULLPATH@
FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FORTRAN = @FORTRAN@
FPZIP = @FPZIP@
GREP = @GREP@
@@ -167,17 +181,25 @@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
LDFLAGS = @LDFLAGS@
+LIBM = @LIBM@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
NETCDF = @NETCDF@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -187,7 +209,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PDBP_DRV = @PDBP_DRV@
PDB_DRV = @PDB_DRV@
-PRTDIAG = @PRTDIAG@
PYTHON = @PYTHON@
PYTHONMODULE = @PYTHONMODULE@
PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@
@@ -195,17 +216,13 @@ PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
PYTHON_PLATFORM = @PYTHON_PLATFORM@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
-QT_BIN = @QT_BIN@
-QT_CORE = @QT_CORE@
-QT_CORE_LIB = @QT_CORE_LIB@
QT_CXXFLAGS = @QT_CXXFLAGS@
-QT_GUI = @QT_GUI@
-QT_GUI_LIB = @QT_GUI_LIB@
-QT_INCLUDE = @QT_INCLUDE@
-QT_LDFLAGS = @QT_LDFLAGS@
-QT_LIB = @QT_LIB@
+QT_DIR = @QT_DIR@
QT_LIBS = @QT_LIBS@
+QT_LRELEASE = @QT_LRELEASE@
+QT_LUPDATE = @QT_LUPDATE@
QT_MOC = @QT_MOC@
+QT_UIC = @QT_UIC@
RANLIB = @RANLIB@
READLINE_LIBS = @READLINE_LIBS@
SED = @SED@
@@ -223,6 +240,11 @@ SILO_VERS_TAG = @SILO_VERS_TAG@
STRIP = @STRIP@
TAURUS = @TAURUS@
VERSION = @VERSION@
+XMKMF = @XMKMF@
+X_CFLAGS = @X_CFLAGS@
+X_EXTRA_LIBS = @X_EXTRA_LIBS@
+X_LIBS = @X_LIBS@
+X_PRE_LIBS = @X_PRE_LIBS@
ZLIB = @ZLIB@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
@@ -230,6 +252,7 @@ abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_F77 = @ac_ct_F77@
ac_ct_FC = @ac_ct_FC@
am__include = @am__include@
@@ -262,6 +285,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -278,6 +302,7 @@ sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
noinst_LTLIBRARIES = libsilo_filters.la
@@ -287,6 +312,8 @@ noinst_HEADERS = \
filter.h
FILES = \
+ f_ale3d.h \
+ f_sample.h \
f_ale3d.c \
f_sample.c
@@ -298,14 +325,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
- && exit 0; \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/filters/Makefile'; \
- cd $(top_srcdir) && \
- $(AUTOMAKE) --foreign src/filters/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/filters/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --foreign src/filters/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -323,6 +350,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
clean-noinstLTLIBRARIES:
-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
@@ -346,21 +374,21 @@ distclean-compile:
.c.o:
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c $<
.c.obj:
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
.c.lo:
@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
@@ -376,45 +404,49 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
+ set x; \
here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
fi
ctags: CTAGS
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
+ $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && cd $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) $$here
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -435,13 +467,17 @@ distdir: $(DISTFILES)
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
if test -d $$d/$$file; then \
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
@@ -469,6 +505,7 @@ clean-generic:
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -490,6 +527,8 @@ dvi-am:
html: html-am
+html-am:
+
info: info-am
info-am:
@@ -498,18 +537,28 @@ install-data-am:
install-dvi: install-dvi-am
+install-dvi-am:
+
install-exec-am:
install-html: install-html-am
+install-html-am:
+
install-info: install-info-am
+install-info-am:
+
install-man:
install-pdf: install-pdf-am
+install-pdf-am:
+
install-ps: install-ps-am
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-am
@@ -547,6 +596,7 @@ uninstall-am:
mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
pdf pdf-am ps ps-am tags uninstall uninstall-am
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/src/filters/f_ale3d.c b/src/filters/f_ale3d.c
index 368aae0..ddf3fde 100644
--- a/src/filters/f_ale3d.c
+++ b/src/filters/f_ale3d.c
@@ -59,6 +59,7 @@ be used for advertising or product endorsement purposes.
#include <math.h>
#include "silo_private.h"
#include "filter.h"
+#include "f_ale3d.h"
#if 0
#define MAXBUF 100000
@@ -908,8 +909,7 @@ v_exists ( DBtoc *toc, char *name)
*-------------------------------------------------------------------------
*/
static int
-f_ale3d_Uninstall(dbfile)
- DBfile *dbfile;
+f_ale3d_Uninstall(DBfile *dbfile)
{
int id;
char *me = "f_ale3d_Uninstall";
@@ -944,9 +944,7 @@ f_ale3d_Uninstall(dbfile)
*-------------------------------------------------------------------------
*/
static int
-f_ale3d_Filters(dbfile, stream)
- DBfile *dbfile;
- FILE *stream;
+f_ale3d_Filters(DBfile *dbfile, FILE *stream)
{
int id;
char *me = "f_ale3d_Filters";
@@ -975,8 +973,7 @@ f_ale3d_Filters(dbfile, stream)
*-------------------------------------------------------------------------
*/
static int
-f_ale3d_Close(dbfile)
- DBfile *dbfile;
+f_ale3d_Close(DBfile *dbfile)
{
int retval;
char *me = "f_ale3d_close";
@@ -1015,8 +1012,7 @@ f_ale3d_Close(dbfile)
*-------------------------------------------------------------------------
*/
static int
-f_ale3d_NewToc(dbfile)
- DBfile *dbfile;
+f_ale3d_NewToc(DBfile *dbfile)
{
int id, nvars, i, j;
char *me = "f_ale3d_NewToc";
@@ -1172,9 +1168,7 @@ f_ale3d_NewToc(dbfile)
*-------------------------------------------------------------------------
*/
static int
-f_ale3d_SetDir(dbfile, path)
- DBfile *dbfile;
- char *path;
+f_ale3d_SetDir(DBfile *dbfile, char *path)
{
int dirid;
char *me = "f_ale3d_SetDir";
@@ -1316,9 +1310,7 @@ f_ale3d_SetDir(dbfile, path)
*-------------------------------------------------------------------------
*/
static int
-f_ale3d_SetDirID(dbfile, dirid)
- DBfile *dbfile;
- int dirid;
+f_ale3d_SetDirID(DBfile *dbfile, int dirid)
{
char *me = "f_ale3d_SetDirID";
@@ -1369,9 +1361,7 @@ f_ale3d_SetDirID(dbfile, dirid)
*-------------------------------------------------------------------------
*/
static int
-f_ale3d_GetDir(dbfile, path)
- DBfile *dbfile;
- char *path; /*output */
+f_ale3d_GetDir(DBfile *dbfile, char *path /*output */)
{
char *me = "f_ale3d_GetDir";
@@ -1914,9 +1904,7 @@ calc_shell_other(float *result, float **data, int length, int extra)
*-------------------------------------------------------------------------
*/
static DBucdvar *
-f_ale3d_GetUcdvar(dbfile, name)
- DBfile *dbfile;
- char *name;
+f_ale3d_GetUcdvar(DBfile *dbfile, char *name)
{
static int sequence = 0;
int id, inter, ndeps, i, j, size, offset, slice_size, stride;
@@ -2138,9 +2126,7 @@ f_ale3d_GetUcdvar(dbfile, name)
*-------------------------------------------------------------------------
*/
static int
-f_ale3d_InqMeshType(dbfile, name)
- DBfile *dbfile;
- char *name;
+f_ale3d_InqMeshType(DBfile *dbfile, char *name)
{
int id, inter;
char *me = "f_ale3d_InqMeshType";
@@ -2194,10 +2180,7 @@ f_ale3d_InqMeshType(dbfile, name)
*-------------------------------------------------------------------------
*/
static int
-f_ale3d_InqMeshName(dbfile, name, meshname)
- DBfile *dbfile;
- char *name;
- char *meshname; /*OUTPUT */
+f_ale3d_InqMeshName(DBfile *dbfile, char *name, char *meshname /*OUTPUT */)
{
int id, inter;
char *me = "f_ale3d_InqMeshName";
@@ -2254,9 +2237,7 @@ f_ale3d_InqMeshName(dbfile, name, meshname)
*-------------------------------------------------------------------------
*/
int
-f_ale3d_Open(dbfile, filter_name)
- DBfile *dbfile;
- char *filter_name;
+f_ale3d_Open(DBfile *dbfile, char *filter_name)
{
int id;
char *me = "f_ale3d_open";
diff --git a/src/filters/f_ale3d.h b/src/filters/f_ale3d.h
new file mode 100644
index 0000000..a93613b
--- /dev/null
+++ b/src/filters/f_ale3d.h
@@ -0,0 +1,59 @@
+/*
+Copyright (c) 1994 - 2010, Lawrence Livermore National Security, LLC.
+LLNL-CODE-425250.
+All rights reserved.
+
+This file is part of Silo. For details, see silo.llnl.gov.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the disclaimer below.
+ * Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the disclaimer (as noted
+ below) in the documentation and/or other materials provided with
+ the distribution.
+ * Neither the name of the LLNS/LLNL nor the names of its
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL LAWRENCE
+LIVERMORE NATIONAL SECURITY, LLC, THE U.S. DEPARTMENT OF ENERGY OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+This work was produced at Lawrence Livermore National Laboratory under
+Contract No. DE-AC52-07NA27344 with the DOE.
+
+Neither the United States Government nor Lawrence Livermore National
+Security, LLC nor any of their employees, makes any warranty, express
+or implied, or assumes any liability or responsibility for the
+accuracy, completeness, or usefulness of any information, apparatus,
+product, or process disclosed, or represents that its use would not
+infringe privately-owned rights.
+
+Any reference herein to any specific commercial products, process, or
+services by trade name, trademark, manufacturer or otherwise does not
+necessarily constitute or imply its endorsement, recommendation, or
+favoring by the United States Government or Lawrence Livermore
+National Security, LLC. The views and opinions of authors expressed
+herein do not necessarily state or reflect those of the United States
+Government or Lawrence Livermore National Security, LLC, and shall not
+be used for advertising or product endorsement purposes.
+*/
+
+#ifndef F_ALE3D_H
+#define F_ALE3D_H
+#include <silo.h>
+SILO_API extern int f_ale3d_Open(DBfile *, char *);
+#endif
diff --git a/src/filters/f_sample.c b/src/filters/f_sample.c
index beb2eb0..2a12bb7 100644
--- a/src/filters/f_sample.c
+++ b/src/filters/f_sample.c
@@ -99,6 +99,7 @@ be used for advertising or product endorsement purposes.
#include "silo_private.h" /*low-level SILO programming support */
#include "filter.h" /*filter programming support */
+#include "f_sample.h"
static char *f_debug_name[DB_NFILES]; /*saved filter names */
static DBfile_pub f_debug_cb[DB_NFILES]; /*only callback fields used */
@@ -123,9 +124,7 @@ static DBfile_pub f_debug_cb[DB_NFILES]; /*only callback fields used */
*-------------------------------------------------------------------------
*/
static int
-f_debug_Filters(dbfile, stream)
- DBfile *dbfile;
- FILE *stream;
+f_debug_Filters(DBfile *dbfile, FILE *stream)
{
int id;
char *me = "f_debug_Filters";
@@ -153,8 +152,7 @@ f_debug_Filters(dbfile, stream)
*-------------------------------------------------------------------------
*/
static int
-f_debug_Uninstall(dbfile)
- DBfile *dbfile;
+f_debug_Uninstall(DBfile *dbfile)
{
int id;
char *me = "f_debug_Uninstall";
@@ -196,8 +194,7 @@ f_debug_Uninstall(dbfile)
*-------------------------------------------------------------------------
*/
static int
-f_debug_Close(dbfile)
- DBfile *dbfile;
+f_debug_Close(DBfile *dbfile)
{
int retval;
char *me = "f_debug_Close";
@@ -255,9 +252,7 @@ f_debug_Close(dbfile)
*-------------------------------------------------------------------------
*/
static int
-f_debug_SetDir(dbfile, path)
- DBfile *dbfile;
- char *path;
+f_debug_SetDir(DBfile *dbfile, char *path)
{
int id, retval;
char *me = "f_debug_SetDir";
@@ -292,9 +287,7 @@ f_debug_SetDir(dbfile, path)
*-------------------------------------------------------------------------
*/
static int
-f_debug_SetDirID(dbfile, dirid)
- DBfile *dbfile;
- int dirid;
+f_debug_SetDirID(DBfile *dbfile, int dirid)
{
int id, retval;
char *me = "f_debug_SetDirID";
@@ -328,9 +321,7 @@ f_debug_SetDirID(dbfile, dirid)
*-------------------------------------------------------------------------
*/
static int
-f_debug_GetDir(dbfile, path)
- DBfile *dbfile;
- char *path; /*output */
+f_debug_GetDir(DBfile *dbfile, char *path /*output */)
{
int id, retval;
char *me = "f_debug_GetDirID";
@@ -364,8 +355,7 @@ f_debug_GetDir(dbfile, path)
*-------------------------------------------------------------------------
*/
static int
-f_debug_NewToc(dbfile)
- DBfile *dbfile;
+f_debug_NewToc(DBfile *dbfile)
{
int id, retval;
char *me = "f_debug_NewToc";
@@ -404,9 +394,7 @@ f_debug_NewToc(dbfile)
*-------------------------------------------------------------------------
*/
static DBucdvar *
-f_debug_GetUcdvar(dbfile, name)
- DBfile *dbfile;
- char *name;
+f_debug_GetUcdvar(DBfile *dbfile, char *name)
{
int id;
char *me = "f_debug_GetUcdvar";
@@ -443,9 +431,7 @@ f_debug_GetUcdvar(dbfile, name)
*-------------------------------------------------------------------------
*/
static int
-f_debug_InqMeshType(dbfile, name)
- DBfile *dbfile;
- char *name;
+f_debug_InqMeshType(DBfile *dbfile, char *name)
{
int id, retval;
char *me = "f_debug_InqMeshType";
@@ -484,10 +470,7 @@ f_debug_InqMeshType(dbfile, name)
*-------------------------------------------------------------------------
*/
static int
-f_debug_InqMeshName(dbfile, name, meshname)
- DBfile *dbfile;
- char *name;
- char *meshname; /*OUTPUT */
+f_debug_InqMeshName(DBfile *dbfile, char *name, char *meshname /*OUTPUT */)
{
int id, retval;
char *me = "f_debug_InqMeshName";
@@ -545,9 +528,7 @@ f_debug_InqMeshName(dbfile, name, meshname)
*-------------------------------------------------------------------------
*/
int
-f_debug_Open(dbfile, filter_name)
- DBfile *dbfile;
- char *filter_name;
+f_debug_Open(DBfile *dbfile, char *filter_name)
{
int id;
char *me = "f_debug_Open";
diff --git a/src/filters/f_sample.h b/src/filters/f_sample.h
new file mode 100644
index 0000000..0614606
--- /dev/null
+++ b/src/filters/f_sample.h
@@ -0,0 +1,59 @@
+/*
+Copyright (c) 1994 - 2010, Lawrence Livermore National Security, LLC.
+LLNL-CODE-425250.
+All rights reserved.
+
+This file is part of Silo. For details, see silo.llnl.gov.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the disclaimer below.
+ * Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the disclaimer (as noted
+ below) in the documentation and/or other materials provided with
+ the distribution.
+ * Neither the name of the LLNS/LLNL nor the names of its
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL LAWRENCE
+LIVERMORE NATIONAL SECURITY, LLC, THE U.S. DEPARTMENT OF ENERGY OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+This work was produced at Lawrence Livermore National Laboratory under
+Contract No. DE-AC52-07NA27344 with the DOE.
+
+Neither the United States Government nor Lawrence Livermore National
+Security, LLC nor any of their employees, makes any warranty, express
+or implied, or assumes any liability or responsibility for the
+accuracy, completeness, or usefulness of any information, apparatus,
+product, or process disclosed, or represents that its use would not
+infringe privately-owned rights.
+
+Any reference herein to any specific commercial products, process, or
+services by trade name, trademark, manufacturer or otherwise does not
+necessarily constitute or imply its endorsement, recommendation, or
+favoring by the United States Government or Lawrence Livermore
+National Security, LLC. The views and opinions of authors expressed
+herein do not necessarily state or reflect those of the United States
+Government or Lawrence Livermore National Security, LLC, and shall not
+be used for advertising or product endorsement purposes.
+*/
+
+#ifndef F_SAMPLE_H
+#define F_SAMPLE_H
+#include <silo.h>
+SILO_API extern int f_debug_Open(DBfile *, char *);
+#endif
diff --git a/src/hdf5_drv/H5FDsilo.c b/src/hdf5_drv/H5FDsilo.c
index c44c883..c42f3ab 100644
--- a/src/hdf5_drv/H5FDsilo.c
+++ b/src/hdf5_drv/H5FDsilo.c
@@ -955,8 +955,6 @@ static herr_t file_read_block(H5FD_silo_t *file, int blidx)
herr_t ret_value = 0;
haddr_t addr;
- HDassert(b->buf);
-
H5Eclear2(H5E_DEFAULT);
addr = b->id * file->block_size;
@@ -1044,6 +1042,7 @@ static int alloc_block_by_id(H5FD_silo_t *file, hsize_t id)
b = &(file->block_list[blidx]);
b->buf = malloc(file->block_size);
+ HDassert(b->buf);
b->id = id;
b->age = file->op_counter++;
b->minmoff = file->block_size;
@@ -1164,11 +1163,9 @@ H5Pset_fapl_silo(hid_t fapl_id)
static const char *func = "H5FDset_fapl_silo";
herr_t ret_value = 0;
hsize_t default_block_size = H5FD_SILO_DEFAULT_BLOCK_SIZE;
- H5AC_cache_config_t mdc_config;
int default_block_count = H5FD_SILO_DEFAULT_BLOCK_COUNT;
int default_log_stats = H5FD_SILO_DEFAULT_LOG_STATS;
int default_use_direct = H5FD_SILO_DEFAULT_USE_DIRECT;
- hid_t default_fapl;
H5Eclear2(H5E_DEFAULT);
@@ -1398,9 +1395,6 @@ H5FD_silo_open( const char *name, unsigned flags, hid_t fapl_id,
static const char *func = "H5FD_silo_open"; /* Function Name for error reporting */
int silo_block_count = H5FD_SILO_DEFAULT_BLOCK_COUNT;
hsize_t silo_block_size = H5FD_SILO_DEFAULT_BLOCK_SIZE;
- hsize_t meta_block_size;
- hsize_t small_data_block_size;
- size_t sieve_buf_size;
int silo_log_stats = H5FD_SILO_DEFAULT_LOG_STATS;
int silo_use_direct = H5FD_SILO_DEFAULT_USE_DIRECT;
H5FD_t *ret_value = 0;
@@ -1453,16 +1447,26 @@ H5FD_silo_open( const char *name, unsigned flags, hid_t fapl_id,
H5E_PUSH_HELPER(func, H5E_ERR_CLS, H5E_IO, H5E_CANTOPENFILE, "HDopen failed", NULL, errno)
if (HDfstat(fd, &sb)<0)
+ {
+ close(fd);
H5E_PUSH_HELPER(func, H5E_ERR_CLS, H5E_FILE, H5E_BADFILE, "HDfstat failed", NULL, errno)
+ }
if (flags & H5F_ACC_RDWR)
write_access = 1;
/* Build the return value */
if(NULL == (file = (H5FD_silo_t *)calloc((size_t)1, sizeof(H5FD_silo_t))))
+ {
+ close(fd);
H5E_PUSH_HELPER(func, H5E_ERR_CLS, H5E_RESOURCE, H5E_NOSPACE, "calloc failed", NULL, errno)
+ }
if(NULL == (file->block_list = (silo_vfd_block_t *)calloc((size_t)silo_block_count, sizeof(silo_vfd_block_t))))
+ {
+ close(fd);
+ free(file);
H5E_PUSH_HELPER(func, H5E_ERR_CLS, H5E_RESOURCE, H5E_NOSPACE, "calloc failed", NULL, errno)
+ }
file->fd = fd;
file->file_eof = (haddr_t)sb.st_size;
@@ -1477,7 +1481,12 @@ H5FD_silo_open( const char *name, unsigned flags, hid_t fapl_id,
{
const char *ext = "-h5-vfd-log";
if (NULL == (file->log_name = (char*) malloc(strlen(name)+strlen(ext)+1)))
+ {
+ close(file->fd);
+ free(file->block_list);
+ free(file);
H5E_PUSH_HELPER(func, H5E_ERR_CLS, H5E_RESOURCE, H5E_NOSPACE, "malloc failed", NULL, errno)
+ }
sprintf(file->log_name, "%s%s", name, ext);
}
@@ -1597,7 +1606,7 @@ H5FD_silo_close(H5FD_t *_file)
fprintf(logf, "number of times a block was read = %llu\n", file->stats.total_block_reads);
fprintf(logf, "number of times a block was read more than once = %llu\n", file->stats.total_block_re_reads);
fprintf(logf, "\n");
- fprintf(logf, "number of hot blocks %llu\n", file->stats.num_hot_blocks);
+ fprintf(logf, "number of hot blocks %d\n", file->stats.num_hot_blocks);
fprintf(logf, "hot blocks...\n");
for (i = 0; i < file->stats.num_hot_blocks; i++)
{
diff --git a/src/hdf5_drv/Makefile.am b/src/hdf5_drv/Makefile.am
index 79d1db4..8f07450 100644
--- a/src/hdf5_drv/Makefile.am
+++ b/src/hdf5_drv/Makefile.am
@@ -53,7 +53,8 @@
## Procss this file with automake to create Makefile.in
noinst_LTLIBRARIES = libsilo_hdf5_drv.la
-libsilo_hdf5_drv_la_SOURCES = $(FILES)
+libsilo_hdf5_drv_la_SOURCES = silo_hdf5.c H5FDsilo.c
+#libsilo_H5FDsilo_la_SOURCES = H5FDsilo.c
AM_CPPFLAGS = -I$(builddir)/../silo -I$(srcdir)/../silo
if HZIP_NEEDED
@@ -67,6 +68,3 @@ endif
noinst_HEADERS = \
silo_hdf5_private.h \
H5FDsilo.h
-FILES = \
- silo_hdf5.c \
- H5FDsilo.c
diff --git a/src/hdf5_drv/Makefile.in b/src/hdf5_drv/Makefile.in
index 6e6dbc1..dc09c76 100644
--- a/src/hdf5_drv/Makefile.in
+++ b/src/hdf5_drv/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -70,8 +71,9 @@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -92,20 +94,29 @@ subdir = src/hdf5_drv
DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/config/ax_check_compiler_flags.m4 \
+ $(top_srcdir)/config/ax_have_qt.m4 \
+ $(top_srcdir)/config/libtool.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
+ $(top_srcdir)/config/vl_lib_readline.m4 \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
LTLIBRARIES = $(noinst_LTLIBRARIES)
libsilo_hdf5_drv_la_LIBADD =
-am__objects_1 = silo_hdf5.lo H5FDsilo.lo
-am_libsilo_hdf5_drv_la_OBJECTS = $(am__objects_1)
+am_libsilo_hdf5_drv_la_OBJECTS = silo_hdf5.lo H5FDsilo.lo
libsilo_hdf5_drv_la_OBJECTS = $(am_libsilo_hdf5_drv_la_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/config/depcomp
am__depfiles_maybe = depfiles
+am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -147,7 +158,8 @@ CXX_FULLPATH = @CXX_FULLPATH@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -159,6 +171,7 @@ FCFLAGS = @FCFLAGS@
FCLIBS = @FCLIBS@
FC_FULLPATH = @FC_FULLPATH@
FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FORTRAN = @FORTRAN@
FPZIP = @FPZIP@
GREP = @GREP@
@@ -169,17 +182,25 @@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
LDFLAGS = @LDFLAGS@
+LIBM = @LIBM@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
NETCDF = @NETCDF@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -189,7 +210,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PDBP_DRV = @PDBP_DRV@
PDB_DRV = @PDB_DRV@
-PRTDIAG = @PRTDIAG@
PYTHON = @PYTHON@
PYTHONMODULE = @PYTHONMODULE@
PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@
@@ -197,17 +217,13 @@ PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
PYTHON_PLATFORM = @PYTHON_PLATFORM@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
-QT_BIN = @QT_BIN@
-QT_CORE = @QT_CORE@
-QT_CORE_LIB = @QT_CORE_LIB@
QT_CXXFLAGS = @QT_CXXFLAGS@
-QT_GUI = @QT_GUI@
-QT_GUI_LIB = @QT_GUI_LIB@
-QT_INCLUDE = @QT_INCLUDE@
-QT_LDFLAGS = @QT_LDFLAGS@
-QT_LIB = @QT_LIB@
+QT_DIR = @QT_DIR@
QT_LIBS = @QT_LIBS@
+QT_LRELEASE = @QT_LRELEASE@
+QT_LUPDATE = @QT_LUPDATE@
QT_MOC = @QT_MOC@
+QT_UIC = @QT_UIC@
RANLIB = @RANLIB@
READLINE_LIBS = @READLINE_LIBS@
SED = @SED@
@@ -225,6 +241,11 @@ SILO_VERS_TAG = @SILO_VERS_TAG@
STRIP = @STRIP@
TAURUS = @TAURUS@
VERSION = @VERSION@
+XMKMF = @XMKMF@
+X_CFLAGS = @X_CFLAGS@
+X_EXTRA_LIBS = @X_EXTRA_LIBS@
+X_LIBS = @X_LIBS@
+X_PRE_LIBS = @X_PRE_LIBS@
ZLIB = @ZLIB@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
@@ -232,6 +253,7 @@ abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_F77 = @ac_ct_F77@
ac_ct_FC = @ac_ct_FC@
am__include = @am__include@
@@ -264,6 +286,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -280,20 +303,18 @@ sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
noinst_LTLIBRARIES = libsilo_hdf5_drv.la
-libsilo_hdf5_drv_la_SOURCES = $(FILES)
+libsilo_hdf5_drv_la_SOURCES = silo_hdf5.c H5FDsilo.c
+#libsilo_H5FDsilo_la_SOURCES = H5FDsilo.c
AM_CPPFLAGS = -I$(builddir)/../silo -I$(srcdir)/../silo \
$(am__append_1) $(am__append_2)
noinst_HEADERS = \
silo_hdf5_private.h \
H5FDsilo.h
-FILES = \
- silo_hdf5.c \
- H5FDsilo.c
-
all: all-am
.SUFFIXES:
@@ -302,14 +323,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
- && exit 0; \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/hdf5_drv/Makefile'; \
- cd $(top_srcdir) && \
- $(AUTOMAKE) --foreign src/hdf5_drv/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/hdf5_drv/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --foreign src/hdf5_drv/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -327,6 +348,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
clean-noinstLTLIBRARIES:
-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
@@ -350,21 +372,21 @@ distclean-compile:
.c.o:
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c $<
.c.obj:
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
.c.lo:
@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
@@ -380,45 +402,49 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
+ set x; \
here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
fi
ctags: CTAGS
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
+ $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && cd $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) $$here
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -439,13 +465,17 @@ distdir: $(DISTFILES)
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
if test -d $$d/$$file; then \
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
@@ -473,6 +503,7 @@ clean-generic:
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -494,6 +525,8 @@ dvi-am:
html: html-am
+html-am:
+
info: info-am
info-am:
@@ -502,18 +535,28 @@ install-data-am:
install-dvi: install-dvi-am
+install-dvi-am:
+
install-exec-am:
install-html: install-html-am
+install-html-am:
+
install-info: install-info-am
+install-info-am:
+
install-man:
install-pdf: install-pdf-am
+install-pdf-am:
+
install-ps: install-ps-am
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-am
@@ -551,6 +594,7 @@ uninstall-am:
mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
pdf pdf-am ps ps-am tags uninstall uninstall-am
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/src/hdf5_drv/silo_hdf5.c b/src/hdf5_drv/silo_hdf5.c
index f9fca3d..9e35dbf 100644
--- a/src/hdf5_drv/silo_hdf5.c
+++ b/src/hdf5_drv/silo_hdf5.c
@@ -210,7 +210,7 @@ static const unsigned SILO_HZIP_PERMUTATION[4] = {0,0,((unsigned) (0x00002130)),
#define TRUE 1
#define LINKGRP "/.silo/" /*name of link group */
-#define MAX_VARS 8 /*max vars per DB*var object */
+#define MAX_VARS 16 /*max vars per DB*var object */
#define OPTDUP(S) ((S)&&*(S)?strdup(S):NULL)
#define BASEDUP(S) ((S)&&*(S)?db_FullName2BaseName(S):NULL)
#define ALIGN(ADDR,N) (((ADDR)+(N)-1)&~((N)-1))
@@ -238,14 +238,14 @@ PRIVATE int hdf2silo_type(hid_t type);
associated action. For HDF5 driver, we handle the slash swap
on the 'names' member of multi-block objects only and we
never skip first semicolon. */
-static const int handleSlashSwap = 1;
-static const int skipFirstSemicolon = 0;
+static int const handleSlashSwap = 1;
+static int const skipFirstSemicolon = 0;
/* Use `float' for all memory floating point values? */
static int force_single_g;
/* used to control behavior of GetZonelist */
-static const char *calledFromGetUcdmesh = 0;
+static char const *calledFromGetUcdmesh = 0;
/* Struct used when building the CWD name */
typedef struct silo_hdf5_comp_t {
@@ -560,6 +560,7 @@ typedef struct DBmultimesh_mt {
int block_type;
char empty_list[256];
int empty_cnt;
+ int repr_block_idx;
} DBmultimesh_mt;
static hid_t DBmultimesh_mt5;
@@ -603,6 +604,7 @@ typedef struct DBmultivar_mt {
int block_type;
char empty_list[256];
int empty_cnt;
+ int repr_block_idx;
} DBmultivar_mt;
static hid_t DBmultivar_mt5;
@@ -629,6 +631,7 @@ typedef struct DBmultimat_mt {
char block_ns_name[256];
char empty_list[256];
int empty_cnt;
+ int repr_block_idx;
} DBmultimat_mt;
static hid_t DBmultimat_mt5;
@@ -651,6 +654,7 @@ typedef struct DBmultimatspecies_mt {
char block_ns_name[256];
char empty_list[256];
int empty_cnt;
+ int repr_block_idx;
} DBmultimatspecies_mt;
static hid_t DBmultimatspecies_mt5;
@@ -861,6 +865,17 @@ static hid_t P_ckrdprops = -1;
if (_f) _ft = H5Tcreate(H5T_COMPOUND, 3*sizeof _m); \
/* MEMBER DEFINITIONS HERE... */
+#define MEMBER_DUMMY(TYPE,NAME) { \
+ _tmp_m = T_##TYPE; /*possible function call*/ \
+ if (_tmp_m>=0) { \
+ db_hdf5_put_cmemb(_mt, #NAME, 0, 0, NULL, _tmp_m); \
+ if (_f && (_tmp_f=_f->T_##TYPE)>=0) { \
+ db_hdf5_put_cmemb(_ft, #NAME, _f_off, 0, NULL, _tmp_f); \
+ _f_off += H5Tget_size(_tmp_f); \
+ } \
+ } \
+}
+
#define MEMBER_S(TYPE,NAME) { \
_tmp_m = T_##TYPE; /*possible function call*/ \
if (_tmp_m>=0) { \
@@ -880,10 +895,12 @@ static hid_t P_ckrdprops = -1;
_size = 3; \
_m_ary = H5Tarray_create(_tmp_m, 1, &_size, NULL); \
db_hdf5_put_cmemb(_mt, #NAME, OFFSET(_m, NAME), 0, NULL, _m_ary); \
+ H5Tclose(_m_ary); \
if (_f && (_tmp_f=_f->T_##TYPE)>=0) { \
hid_t _f_ary = H5Tarray_create(_tmp_f, 1, &_size, NULL); \
db_hdf5_put_cmemb(_ft, #NAME, _f_off, 0, NULL, _f_ary); \
_f_off += 3*H5Tget_size(_f_ary); \
+ H5Tclose(_f_ary); \
} \
} \
}
@@ -922,6 +939,7 @@ static hid_t P_ckrdprops = -1;
if (0==_i) _f=(DBFILE); \
else if (1==_i) break; \
} \
+ if (!_f_off) MEMBER_DUMMY(int,dummy); \
H5Tpack(_ft); \
db_hdf5_hdrwr(DBFILE, (char*)NAME, _mt, _ft, MEM, DBTYPE); \
H5Tclose(_mt); \
@@ -938,7 +956,7 @@ static hid_t P_ckrdprops = -1;
/*ARGSUSED*/
INTERNAL void
-suppress_set_but_not_used_warning(const void *ptr)
+suppress_set_but_not_used_warning(void const *ptr)
{}
#ifdef HAVE_FPZIP
@@ -963,14 +981,15 @@ static db_hdf5_fpzip_params_t db_hdf5_fpzip_params;
static herr_t
db_hdf5_fpzip_can_apply(hid_t dcpl_id, hid_t type_id, hid_t space_id)
{
- return 1;
-#if 0
- /* This code should work but HDF5 doesn't like being told '0'
- * for certain cases. So, let it pass and handle it in the
- * actual filter operation by skipping non-float data there. */
+#if HDF5_VERSION_GE(1,8,8)
if (H5Tget_class(type_id) != H5T_FLOAT)
return 0;
return 1;
+#else
+ /* Older versions of HDF5 don't like being told '0' for certain cases.
+ * So, let it pass and handle it in the actual filter operation by
+ * skipping non-float data there. */
+ return 1;
#endif
}
@@ -1089,7 +1108,7 @@ static H5Z_class_t db_hdf5_fpzip_class;
#ifndef HAVE_HZIP
/*ARGSUSED*/
static void
-FreeNodelists(DBfile_hdf5 *dbfile, const char *meshname) {}
+FreeNodelists(DBfile_hdf5 *dbfile, char const *meshname) {}
#else
/* The following section of code is used to mange caching of nodelists
@@ -1113,7 +1132,7 @@ static zlInfo_t keptNodelistInfos[MAX_NODELIST_INFOS];
uses it. The preference is to use the name of the zonelist itself.
*/
static const DBzonelist*
-LookupNodelist(DBfile_hdf5 *dbfile, const char *zlname, const char *meshname)
+LookupNodelist(DBfile_hdf5 *dbfile, char const *zlname, char const *meshname)
{
int i;
char fullmname[256];
@@ -1150,10 +1169,10 @@ LookupNodelist(DBfile_hdf5 *dbfile, const char *zlname, const char *meshname)
have one. So, we call LookupNodelist as a first step.
*/
static void
-RegisterNodelist(DBfile_hdf5 *dbfile, const char *zlname, const char *meshname,
- int ntopodims, int nzones, int origin, const int *nodelist)
+RegisterNodelist(DBfile_hdf5 *dbfile, char const *zlname, char const *meshname,
+ int ntopodims, int nzones, int origin, int const *nodelist)
{
- DBzonelist *zl = DBAllocZonelist();
+ DBzonelist *zl;
int i;
int lnodelist = (1<<ntopodims) * nzones;
int snodelist = lnodelist * sizeof(int);
@@ -1167,6 +1186,8 @@ RegisterNodelist(DBfile_hdf5 *dbfile, const char *zlname, const char *meshname,
if (meshname)
db_hdf5_fullname(dbfile, (char*) meshname, fullmname);
+ zl = DBAllocZonelist();
+ if (!zl) return;
zl->ndims = ntopodims;
zl->nzones = nzones;
zl->nshapes = 1;
@@ -1198,7 +1219,7 @@ RegisterNodelist(DBfile_hdf5 *dbfile, const char *zlname, const char *meshname,
}
static void
-AddMeshnameToNodelist(DBfile_hdf5 *dbfile, const char *zlname, const char *meshname)
+AddMeshnameToNodelist(DBfile_hdf5 *dbfile, char const *zlname, char const *meshname)
{
int i;
char fullmname[256];
@@ -1222,14 +1243,18 @@ AddMeshnameToNodelist(DBfile_hdf5 *dbfile, const char *zlname, const char *meshn
}
static void
-FreeNodelists(DBfile_hdf5 *dbfile, const char *meshname)
+FreeNodelists(DBfile_hdf5 *dbfile, char const *meshname)
{
int i;
- if (dbfile) /* clear all for a given file */
+ if (meshname && dbfile) /* clear all for a given mesh */
{
+ char fullmname[256];
+ db_hdf5_fullname(dbfile, (char*) meshname, fullmname);
+
for (i = 0; i < MAX_NODELIST_INFOS; i++)
{
- if (keptNodelistInfos[i].zl && (keptNodelistInfos[i].db5file == dbfile))
+ if (keptNodelistInfos[i].zl && keptNodelistInfos[i].meshname &&
+ (strcmp(fullmname, keptNodelistInfos[i].meshname) == 0))
{
FREE(keptNodelistInfos[i].meshname);
FREE(keptNodelistInfos[i].zlname);
@@ -1238,15 +1263,11 @@ FreeNodelists(DBfile_hdf5 *dbfile, const char *meshname)
}
}
}
- else if (meshname) /* clear all for a given mesh */
+ else if (dbfile) /* clear all for a given file */
{
- char fullmname[256];
- db_hdf5_fullname(dbfile, (char*) meshname, fullmname);
-
for (i = 0; i < MAX_NODELIST_INFOS; i++)
{
- if (keptNodelistInfos[i].zl && keptNodelistInfos[i].meshname &&
- (strcmp(fullmname, keptNodelistInfos[i].meshname) == 0))
+ if (keptNodelistInfos[i].zl && (keptNodelistInfos[i].db5file == dbfile))
{
FREE(keptNodelistInfos[i].meshname);
FREE(keptNodelistInfos[i].zlname);
@@ -1324,12 +1345,12 @@ static int sizeof_hztype(HZtype hztype)
typedef struct db_hdf5_hzip_params_t {
/* these items set DBSetCompression call */
unsigned codec;
- const void *params;
+ void const *params;
/* these items set by hdf5 driver as needed. */
int iszl;
- const char *zlname;
- const char *meshname;
+ char const *zlname;
+ char const *meshname;
DBfile_hdf5 *dbfile;
int zlorigin;
int isquad;
@@ -1346,7 +1367,7 @@ static void
db_hdf5_hzip_clear_params()
{
unsigned tmpcodec = db_hdf5_hzip_params.codec;
- const void *tmpparams = db_hdf5_hzip_params.params;
+ void const *tmpparams = db_hdf5_hzip_params.params;
memset(&db_hdf5_hzip_params, 0, sizeof(db_hdf5_hzip_params));
db_hdf5_hzip_params.codec = tmpcodec;
db_hdf5_hzip_params.params = tmpparams;
@@ -1355,7 +1376,6 @@ db_hdf5_hzip_clear_params()
static herr_t
db_hdf5_hzip_can_apply(hid_t dcpl_id, hid_t type_id, hid_t space_id)
{
- /* see not above regarding fpzip */
return 1;
}
@@ -1395,30 +1415,30 @@ db_hdf5_hzip_filter_op(unsigned int flags, size_t cd_nelmts,
if (stream == 0) return early_retval;
ndims = hzip_mesh_dimensions(stream);
- if (ndims < 2 || ndims > 3) return early_retval;
hzip_mesh_close(stream);
+ if (ndims < 2 || ndims > 3) return early_retval;
/* Ok, no re-open the stream with correct permutation */
stream = hzip_mesh_open_mem(*buf, nbytes, SILO_HZIP_PERMUTATION[ndims]);
if (stream == 0) return early_retval;
ndims = hzip_mesh_dimensions(stream);
- if (ndims < 2 || ndims > 3) return early_retval;
+ if (ndims < 2 || ndims > 3) {hzip_mesh_close(stream); return early_retval;}
nzones = hzip_mesh_cells(stream);
- if (nzones < 0) return early_retval;
+ if (nzones < 0) {hzip_mesh_close(stream); return early_retval;}
new_buf_size = (1<<ndims) * nzones * sizeof(int);
nodelist = (int *) malloc(new_buf_size);
- if (nodelist == 0) return early_retval;
+ if (nodelist == 0) {hzip_mesh_close(stream); return early_retval;}
nread = hzip_mesh_read(stream, nodelist, nzones);
+ hzip_mesh_close(stream);
if (nread != nzones)
{
free(nodelist);
return early_retval;
}
- hzip_mesh_close(stream);
RegisterNodelist(db_hdf5_hzip_params.dbfile, db_hdf5_hzip_params.zlname,
db_hdf5_hzip_params.meshname, ndims, nzones,
@@ -1445,8 +1465,8 @@ db_hdf5_hzip_filter_op(unsigned int flags, size_t cd_nelmts,
if (stream == 0) return early_retval;
ndims = hzip_node_dimensions(stream);
- if (ndims < 2 || ndims > 3) return early_retval;
hzip_node_close(stream);
+ if (ndims < 2 || ndims > 3) return early_retval;
if (db_hdf5_hzip_params.isquad)
{
@@ -1478,19 +1498,20 @@ db_hdf5_hzip_filter_op(unsigned int flags, size_t cd_nelmts,
if (stream == 0) return early_retval;
ndims = hzip_node_dimensions(stream);
- if (ndims < 2 || ndims > 3) return early_retval;
+ if (ndims < 2 || ndims > 3) {hzip_node_close(stream); return early_retval;}
nnodes = hzip_node_count(stream);
- if (nnodes < 0) return early_retval;
+ if (nnodes < 0) {hzip_node_close(stream); return early_retval;}
hztype = hzip_node_type(stream);
- if (hztype < 0) return early_retval;
+ if (hztype < 0) {hzip_node_close(stream); return early_retval;}
new_buf_size = nnodes * sizeof_hztype(hztype);
var = malloc(new_buf_size);
- if (var == 0) return early_retval;
+ if (var == 0) {hzip_node_close(stream); return early_retval;}
nread = hzip_node_read(stream, var, nodelist, nzones);
+ hzip_node_close(stream);
if (nread != nnodes)
{
if (db_hdf5_hzip_params.isquad)
@@ -1498,7 +1519,6 @@ db_hdf5_hzip_filter_op(unsigned int flags, size_t cd_nelmts,
free(var);
return early_retval;
}
- hzip_node_close(stream);
if (db_hdf5_hzip_params.isquad)
free(nodelist);
@@ -1636,8 +1656,8 @@ db_hdf5_hzip_filter_op(unsigned int flags, size_t cd_nelmts,
static H5Z_class_t db_hdf5_hzip_class;
#endif
-INTERNAL const char *
-friendly_name(const char *base_name, const char *fmtstr, const void *val)
+INTERNAL char const *
+friendly_name(char const *base_name, char const *fmtstr, void const *val)
{
static char retval[1024];
static char totfmtstr[1024];
@@ -1663,8 +1683,8 @@ friendly_name(const char *base_name, const char *fmtstr, const void *val)
typechar = i+1 < flen ? fmtstr[i+1] : '\0';
switch (typechar)
{
- case 'd': sprintf(retval, totfmtstr, *((const int*) val)); break;
- case 's': sprintf(retval, totfmtstr, *((const char*) val)); break;
+ case 'd': sprintf(retval, totfmtstr, *((int const*) val)); break;
+ case 's': sprintf(retval, totfmtstr, *((char const*) val)); break;
case 'f': sprintf(retval, totfmtstr, *((const float*) val)); break;
default: return totfmtstr;
}
@@ -1786,8 +1806,8 @@ db_hdf5_get_cmemb(hid_t compound_type, int membno, int *ndims/*out*/,
*-------------------------------------------------------------------------
*/
PRIVATE int
-db_hdf5_put_cmemb(hid_t compound_type, const char *name, size_t offset,
- int ndims, const int *dim, hid_t type)
+db_hdf5_put_cmemb(hid_t compound_type, char const *name, size_t offset,
+ int ndims, int const *dim, hid_t type)
{
int retval;
@@ -1799,6 +1819,7 @@ db_hdf5_put_cmemb(hid_t compound_type, const char *name, size_t offset,
type = H5Tarray_create(type, ndims, bigdims, NULL);
}
retval = H5Tinsert(compound_type, name, offset, type);
+ if (ndims) H5Tclose(type);
#else
retval = H5Tinsert_array(compound_type, name, offset, ndims, dim, NULL,
type);
@@ -1824,15 +1845,17 @@ db_hdf5_put_cmemb(hid_t compound_type, const char *name, size_t offset,
*
*-------------------------------------------------------------------------
*/
+static int T_str_stype_set = 0;
PRIVATE hid_t
T_str(char *s)
{
static hid_t stype = -1;
if (!s || !*s) return -1;
- if (stype>=0) H5Tclose(stype);
+ if (T_str_stype_set && stype>=0) H5Tclose(stype);
stype = H5Tcopy(H5T_C_S1);
H5Tset_size(stype, strlen(s)+1);
+ T_str_stype_set = 1;
return stype;
}
@@ -1885,7 +1908,7 @@ silo_walk_cb(int n, H5E_error_t *err_desc, void *client_data)
*-------------------------------------------------------------------------
*/
PRIVATE void
-hdf5_to_silo_error(const char *vname, const char *fname)
+hdf5_to_silo_error(char const *vname, char const *fname)
{
int silo_error_code = E_NOERROR;
@@ -1927,9 +1950,13 @@ hdf5_to_silo_error(const char *vname, const char *fname)
PRIVATE void
db_hdf5_init(void)
{
- static int ncalls;
+#if !(HDF5_VERSION_GE(1,8,4) && !HDF5_VERSION_GE(1,8,5))
+ static int ncalls;
if (ncalls++) return; /*already initialized*/
+#else
+ H5open();
+#endif
/* Turn off error messages from the hdf5 library */
if (SILO_Globals._db_err_level_drvr == DB_ALL)
@@ -2303,6 +2330,7 @@ db_hdf5_init(void)
MEMBER_S(int, block_type);
MEMBER_S(str256, empty_list);
MEMBER_S(int, empty_cnt);
+ MEMBER_S(int, repr_block_idx);
} DEFINE;
STRUCT(DBmultimeshadj) {
@@ -2344,6 +2372,7 @@ db_hdf5_init(void)
MEMBER_S(int, block_type);
MEMBER_S(str256, empty_list);
MEMBER_S(int, empty_cnt);
+ MEMBER_S(int, repr_block_idx);
} DEFINE;
STRUCT(DBmultimat) {
@@ -2369,6 +2398,7 @@ db_hdf5_init(void)
MEMBER_S(str256, block_ns_name);
MEMBER_S(str256, empty_list);
MEMBER_S(int, empty_cnt);
+ MEMBER_S(int, repr_block_idx);
} DEFINE;
STRUCT(DBmultimatspecies) {
@@ -2390,6 +2420,7 @@ db_hdf5_init(void)
MEMBER_S(str256, block_ns_name);
MEMBER_S(str256, empty_list);
MEMBER_S(int, empty_cnt);
+ MEMBER_S(int, repr_block_idx);
} DEFINE;
STRUCT(DBmatspecies) {
@@ -3162,7 +3193,8 @@ db_hdf5_set_compression(int flags)
level = (int) strtol(chararray, &check, 10);
if ((chararray != check) && (level >= 0) && (level <=9))
{
- if (H5Pset_deflate(P_ckcrprops, level) < 0)
+ if (H5Pset_shuffle(P_ckcrprops)<0 ||
+ H5Pset_deflate(P_ckcrprops, level)<0)
{
db_perror("H5Pset_deflate", E_CALLFAIL, me);
return (-1);
@@ -3176,7 +3208,8 @@ db_hdf5_set_compression(int flags)
}
else
{
- if (H5Pset_deflate(P_ckcrprops, 1) < 0)
+ if (H5Pset_shuffle(P_ckcrprops)<0 ||
+ H5Pset_deflate(P_ckcrprops, 1)<0)
{
db_perror("H5Pset_deflate", E_CALLFAIL, me);
return (-1);
@@ -3210,8 +3243,8 @@ db_hdf5_set_compression(int flags)
if (strstr(SILO_Globals.compressionParams,
"MASK=EC") != NULL)
{
- if (H5Pset_szip(P_ckcrprops,
- H5_SZIP_EC_OPTION_MASK,block)<0)
+ if (H5Pset_shuffle(P_ckcrprops)<0 ||
+ H5Pset_szip(P_ckcrprops, H5_SZIP_EC_OPTION_MASK,block)<0)
{
db_perror("H5Pset_szip", E_CALLFAIL, me);
return (-1);
@@ -3220,8 +3253,8 @@ db_hdf5_set_compression(int flags)
else if(strstr(SILO_Globals.compressionParams,
"MASK=NN")!=NULL)
{
- if (H5Pset_szip(P_ckcrprops,
- H5_SZIP_NN_OPTION_MASK,block)<0)
+ if (H5Pset_shuffle(P_ckcrprops)<0 ||
+ H5Pset_szip(P_ckcrprops, H5_SZIP_NN_OPTION_MASK,block)<0)
{
db_perror("H5Pset_szip", E_CALLFAIL, me);
return (-1);
@@ -3229,8 +3262,8 @@ db_hdf5_set_compression(int flags)
}
else
{
- if (H5Pset_szip(P_ckcrprops,
- H5_SZIP_NN_OPTION_MASK, block)<0)
+ if (H5Pset_shuffle(P_ckcrprops)<0 ||
+ H5Pset_szip(P_ckcrprops, H5_SZIP_NN_OPTION_MASK, block)<0)
{
db_perror("H5Pset_szip", E_CALLFAIL, me);
return (-1);
@@ -3245,7 +3278,8 @@ db_hdf5_set_compression(int flags)
}
else
{
- if (H5Pset_szip(P_ckcrprops, H5_SZIP_NN_OPTION_MASK, 4) < 0)
+ if (H5Pset_shuffle(P_ckcrprops)<0 ||
+ H5Pset_szip(P_ckcrprops, H5_SZIP_NN_OPTION_MASK, 4)<0)
{
db_perror("H5Pset_szip", E_CALLFAIL, me);
return (-1);
@@ -3308,7 +3342,8 @@ db_hdf5_set_compression(int flags)
}
if (H5Pset_filter(P_ckcrprops, DB_HDF5_HZIP_ID,
- SILO_Globals.compressionErrmode ? 0 : H5Z_FLAG_OPTIONAL, 0, 0)<0)
+ SILO_Globals.compressionErrmode == COMPRESSION_ERRMODE_FALLBACK ?
+ H5Z_FLAG_OPTIONAL : H5Z_FLAG_MANDATORY, 0, 0)<0)
{
db_perror("hzip filter setup", E_CALLFAIL, me);
return (-1);
@@ -3339,7 +3374,8 @@ db_hdf5_set_compression(int flags)
}
if (H5Pset_filter(P_ckcrprops, DB_HDF5_FPZIP_ID,
- SILO_Globals.compressionErrmode ? 0 : H5Z_FLAG_OPTIONAL, 0, 0)<0)
+ SILO_Globals.compressionErrmode == COMPRESSION_ERRMODE_FALLBACK ?
+ H5Z_FLAG_OPTIONAL : H5Z_FLAG_MANDATORY, 0, 0)<0)
{
db_perror("H5Pset_filter", E_CALLFAIL, me);
return (-1);
@@ -3431,14 +3467,14 @@ db_hdf5_set_properties(int rank, hsize_t size[])
*-------------------------------------------------------------------------
*/
PRIVATE int
-db_hdf5_get_comp_var(hid_t fileid, const char *name, hsize_t *nelmts,
+db_hdf5_get_comp_var(hid_t fileid, char const *name, hsize_t *nelmts,
size_t *elsize, hid_t *datatype, void **buf)
{
- hid_t typeid = -1, stypeid = -1, attr = -1, comptype, memtype;
+ hid_t typeid = -1, stypeid = -1, attr = -1, comptype = -1, memtype = -1;
int membno = -1;
int retval = 0;
- hsize_t numvals;
- size_t valsize;
+ hsize_t numvals = 0;
+ size_t valsize = 0;
/* loop trying different typename, member name combinations */
char *tmpname = STRDUP(name);
@@ -3499,7 +3535,6 @@ db_hdf5_get_comp_var(hid_t fileid, const char *name, hsize_t *nelmts,
numvals = 0;
break;
}
- valsize = H5Tget_size(comptype);
/* note, a comptype of T_str256 means either that the component
contains the name of a dataset (indirect) case which we will
@@ -3510,9 +3545,15 @@ db_hdf5_get_comp_var(hid_t fileid, const char *name, hsize_t *nelmts,
if ((numvals && buf) || comptype == T_str256)
{
char tmp[256];
+ int buf_was_allocated = 0;
+
+ valsize = H5Tget_size(comptype);
if (comptype != T_str256 && *buf == 0)
+ {
*buf = malloc(*nelmts * *elsize);
+ buf_was_allocated = 1;
+ }
/* create a component type with just one member,
the one we're interested in */
@@ -3539,7 +3580,14 @@ db_hdf5_get_comp_var(hid_t fileid, const char *name, hsize_t *nelmts,
if (buf)
{
if (*buf == 0)
+ {
*buf = malloc(numvals*H5Tget_size(mtype));
+ buf_was_allocated = 1;
+ }
+ else if (buf_was_allocated)
+ {
+ *buf = realloc(*buf, numvals*H5Tget_size(mtype));
+ }
P_rdprops = H5P_DEFAULT;
if (!SILO_Globals.enableChecksums)
@@ -3547,6 +3595,11 @@ db_hdf5_get_comp_var(hid_t fileid, const char *name, hsize_t *nelmts,
if (H5Dread(d, mtype, H5S_ALL, H5S_ALL, P_rdprops, *buf)<0) {
hdf5_to_silo_error(name, "db_hdf5_get_comp_var");
+ if (buf_was_allocated)
+ {
+ free(*buf);
+ *buf = 0;
+ }
retval = 0;
}
}
@@ -3560,7 +3613,14 @@ db_hdf5_get_comp_var(hid_t fileid, const char *name, hsize_t *nelmts,
{
int n = strlen(tmp)+1;
if (*buf == 0)
+ {
*buf = malloc(n);
+ buf_was_allocated = 1;
+ }
+ else if (buf_was_allocated)
+ {
+ *buf = realloc(*buf, n);
+ }
strncpy(*buf, tmp, n);
valsize = n;
}
@@ -3611,7 +3671,7 @@ db_hdf5_get_comp_var(hid_t fileid, const char *name, hsize_t *nelmts,
*-------------------------------------------------------------------------
*/
PRIVATE herr_t
-load_toc(hid_t grp, const char *name, void *_toc)
+load_toc(hid_t grp, char const *name, void *_toc)
{
DBtoc *toc = (DBtoc*)_toc;
H5G_stat_t sb;
@@ -3728,7 +3788,7 @@ load_toc(hid_t grp, const char *name, void *_toc)
break;
case DB_ARRAY:
names = &(toc->array_names);
- nvals = &(toc->narrays);
+ nvals = &(toc->narray);
break;
case DB_DIR:
names = &(toc->dir_names);
@@ -3740,15 +3800,15 @@ load_toc(hid_t grp, const char *name, void *_toc)
break;
case DB_MRGTREE:
names = &(toc->mrgtree_names);
- nvals = &(toc->nmrgtrees);
+ nvals = &(toc->nmrgtree);
break;
case DB_GROUPELMAP:
names = &(toc->groupelmap_names);
- nvals = &(toc->ngroupelmaps);
+ nvals = &(toc->ngroupelmap);
break;
case DB_MRGVAR:
names = &(toc->mrgvar_names);
- nvals = &(toc->nmrgvars);
+ nvals = &(toc->nmrgvar);
break;
case DB_USERDEF: /*fall through*/
case DB_FACELIST: /*fall through*/
@@ -3791,7 +3851,7 @@ load_toc(hid_t grp, const char *name, void *_toc)
*-------------------------------------------------------------------------
*/
PRIVATE herr_t
-find_objno(hid_t grp, const char *name, void *_comp)
+find_objno(hid_t grp, char const *name, void *_comp)
{
silo_hdf5_comp_t *comp = (silo_hdf5_comp_t*)_comp;
H5G_stat_t sb;
@@ -3918,7 +3978,13 @@ db_hdf5_compname(DBfile_hdf5 *dbfile, char name[8]/*out*/)
db_perror("nlinks attribute", E_CALLFAIL, me);
UNWIND();
}
+
nlinks++;
+ if (nlinks > 999999) {
+ db_perror("exceeded maximum number of nlinks", E_CALLFAIL, me);
+ UNWIND();
+ }
+
if (H5Awrite(attr, H5T_NATIVE_INT, &nlinks)<0) {
db_perror("nlinks attribute", E_CALLFAIL, me);
UNWIND();
@@ -3982,8 +4048,8 @@ db_hdf5_compname(DBfile_hdf5 *dbfile, char name[8]/*out*/)
*-------------------------------------------------------------------------
*/
PRIVATE int
-db_hdf5_compwrz(DBfile_hdf5 *dbfile, int dtype, int rank, int _size[],
- void *buf, char *name/*in,out*/, const char *fname,
+db_hdf5_compwrz(DBfile_hdf5 *dbfile, int dtype, int rank, int const _size[],
+ void const *buf, char *name/*in,out*/, char const *fname,
int compressionFlags)
{
static char *me = "db_hdf5_compwr";
@@ -4072,7 +4138,7 @@ db_hdf5_compwrz(DBfile_hdf5 *dbfile, int dtype, int rank, int _size[],
}
if (buf && H5Dwrite(dset, mtype, space, space, H5P_DEFAULT, buf)<0) {
- db_perror(name, E_CALLFAIL, me);
+ hdf5_to_silo_error(name, "db_hdf5_compwrz");
UNWIND();
}
@@ -4120,8 +4186,8 @@ db_hdf5_compwrz(DBfile_hdf5 *dbfile, int dtype, int rank, int _size[],
*-------------------------------------------------------------------------
*/
PRIVATE int
-db_hdf5_compwr(DBfile_hdf5 *dbfile, int dtype, int rank, int _size[],
- void *buf, char *name/*in,out*/, const char *fname)
+db_hdf5_compwr(DBfile_hdf5 *dbfile, int dtype, int rank, int const _size[],
+ void const *buf, char *name/*in,out*/, char const *fname)
{
return db_hdf5_compwrz(dbfile, dtype, rank, _size, buf, name, fname, 0);
}
@@ -4143,7 +4209,7 @@ db_hdf5_compckz(DBfile_hdf5 *dbfile, char *name)
{
int retval = 0;
int i;
- hid_t d, plist;
+ hid_t d = -1, plist = -1;
static char *me = "db_hdf5_compzkz";
PROTECT {
@@ -4171,14 +4237,12 @@ db_hdf5_compckz(DBfile_hdf5 *dbfile, char *name)
break;
}
}
- }
- H5Dclose(d);
- H5Pclose(plist);
- } CLEANUP {
- H5E_BEGIN_TRY {
H5Dclose(d);
H5Pclose(plist);
- } H5E_END_TRY;
+ }
+ } CLEANUP {
+ if (d != -1) H5Dclose(d);
+ if (plist != -1) H5Pclose(plist);
} END_PROTECT;
return retval;
@@ -4338,23 +4402,28 @@ db_hdf5_comprd(DBfile_hdf5 *dbfile, char *name, int ignore_force_single)
*/
PRIVATE char *
db_hdf5_resolvename(DBfile *_dbfile,
- const char *parent_objname,
- const char *child_objname)
+ char const *parent_objname,
+ char const *child_objname)
{
static char cwgname[4096];
static char result[4096];
- char *parent_objdirname;
- char *parent_fullname;
- char *child_fullname;
+ char *parent_objdirname = 0;
+ char *parent_fullname = 0;
+ char *child_fullname = 0;
db_hdf5_GetDir(_dbfile, cwgname);
parent_objdirname = db_dirname(parent_objname);
- parent_fullname = db_join_path(cwgname, parent_objdirname);
- child_fullname = db_join_path(parent_fullname, child_objname);
- strcpy(result, child_fullname);
- free(parent_objdirname);
- free(parent_fullname);
- free(child_fullname);
+ if (parent_objdirname)
+ parent_fullname = db_join_path(cwgname, parent_objdirname);
+ if (parent_fullname)
+ child_fullname = db_join_path(parent_fullname, child_objname);
+ if (child_fullname)
+ strcpy(result, child_fullname);
+ else
+ result[0] = '\0';
+ if (parent_objdirname) free(parent_objdirname);
+ if (parent_fullname) free(parent_fullname);
+ if (child_fullname) free(child_fullname);
return result;
}
@@ -4552,6 +4621,9 @@ db_hdf5_process_file_options(opts_set_id)
else
h5status |= H5Pset_fclose_degree(retval, H5F_CLOSE_STRONG);
+ /* Disable chunk caching */
+ H5Pset_cache(retval, 0, 0, 0, 0);
+
/* Handle cases where we are running on Windows. If a client
request anything other than the default driver, we issue
a warning message and continue only on windows (default) vfd. */
@@ -4624,7 +4696,7 @@ db_hdf5_process_file_options(opts_set_id)
case DB_FILE_OPTS_H5_DEFAULT_DIRECT:
{
#ifdef H5_HAVE_DIRECT
- const int fourkb = (1<<12);
+ int const fourkb = (1<<12);
h5status |= H5Pset_fapl_direct(retval, fourkb, fourkb, fourkb*256);
h5status |= H5Pset_alignment(retval, fourkb/2, fourkb);
#else
@@ -4674,7 +4746,7 @@ db_hdf5_process_file_options(opts_set_id)
default:
{
int _opts_set_id = opts_set_id - NUM_DEFAULT_FILE_OPTIONS_SETS;
- const DBoptlist *opts;
+ DBoptlist const *opts;
void *p; int vfd = DB_H5VFD_DEFAULT;
if (_opts_set_id >= MAX_FILE_OPTIONS_SETS ||
@@ -5116,6 +5188,12 @@ db_hdf5_finish_open(DBfile_hdf5 *dbfile)
*
* Mark C. Miller, Mon Jun 28 20:19:35 PDT 2010
* Added logic to handle HDF5 header/lib version numbers separately.
+ *
+ * Mark C. Miller, Thu Aug 30 17:44:56 PDT 2012
+ * Added new, internal, db_hdf5_WriteCKZ method to enable caller to
+ * indicate if filters should be turned off. This is useful for disabling
+ * compression or checksuming for tiny metadata datasets such as hdf5
+ * library info.
*-------------------------------------------------------------------------
*/
PRIVATE DBfile*
@@ -5124,8 +5202,9 @@ db_hdf5_finish_create(DBfile_hdf5 *dbfile, int target, char *finfo)
static char *me = "db_hdf5_finish_create";
hid_t attr=-1;
int size;
- char hdf5VString[32];
+ char hdf5VString[64];
unsigned majno, minno, relno;
+ const int nofilters = 1;
/* Open root group as CWG */
if ((dbfile->cwg=H5Gopen(dbfile->fid, "/"))<0) {
@@ -5157,8 +5236,7 @@ db_hdf5_finish_create(DBfile_hdf5 *dbfile, int target, char *finfo)
if (finfo) {
/* Write file info as a variable in the file */
size = strlen(finfo)+1;
- if (db_hdf5_Write((DBfile*)dbfile, "_fileinfo", finfo, &size, 1,
- DB_CHAR)<0) {
+ if (db_hdf5_WriteCKZ((DBfile*)dbfile, "_fileinfo", (void*)finfo, &size, 1, DB_CHAR, nofilters)<0) {
db_perror("fileinfo", E_CALLFAIL, me);
return silo_db_close((DBfile*) dbfile);
}
@@ -5174,7 +5252,7 @@ db_hdf5_finish_create(DBfile_hdf5 *dbfile, int target, char *finfo)
sprintf(hdf5VString, "hdf5-%d.%d.%d%s%s", H5_VERS_MAJOR, H5_VERS_MINOR, H5_VERS_RELEASE,
strlen(H5_VERS_SUBRELEASE) ? "-" : "", H5_VERS_SUBRELEASE);
size = strlen(hdf5VString)+1;
- if (db_hdf5_Write((DBfile*)dbfile, "_hdf5incinfo", hdf5VString, &size, 1, DB_CHAR)<0) {
+ if (db_hdf5_WriteCKZ((DBfile*)dbfile, "_hdf5incinfo", hdf5VString, &size, 1, DB_CHAR, nofilters)<0) {
db_perror("_hdf5incinfo", E_CALLFAIL, me);
return silo_db_close((DBfile*) dbfile);
}
@@ -5182,7 +5260,7 @@ db_hdf5_finish_create(DBfile_hdf5 *dbfile, int target, char *finfo)
sprintf(hdf5VString, "hdf5-%d.%d.%d", majno, minno, relno);
size = strlen(hdf5VString)+1;
- if (db_hdf5_Write((DBfile*)dbfile, "_hdf5libinfo", hdf5VString, &size, 1, DB_CHAR)<0) {
+ if (db_hdf5_WriteCKZ((DBfile*)dbfile, "_hdf5libinfo", hdf5VString, &size, 1, DB_CHAR, nofilters)<0) {
db_perror("_hdf5libinfo", E_CALLFAIL, me);
return silo_db_close((DBfile*) dbfile);
}
@@ -5238,24 +5316,29 @@ db_hdf5_initiate_close(DBfile *_dbfile)
#if HDF5_VERSION_GE(1,6,0)
if (SILO_Globals._db_err_level_drvr == DB_ALL)
{
- int noo = H5Fget_obj_count(dbfile->fid, H5F_OBJ_LOCAL | H5F_OBJ_ALL);
- if (noo > 1) /* HDF5 bug, always get 1 for "/" group */
+ const unsigned int obj_flags = H5F_OBJ_LOCAL | H5F_OBJ_DATASET |
+ H5F_OBJ_GROUP | H5F_OBJ_DATATYPE | H5F_OBJ_ATTR;
+
+ int noo = H5Fget_obj_count(dbfile->fid, obj_flags);
+ if (noo > 0)
{
int n;
char msg[4096];
hid_t *ooids = (hid_t *) malloc(noo * sizeof(hid_t));
sprintf(msg, "Internal Silo error: %d objects left open in file: ", noo);
#if HDF5_VERSION_GE(1,6,5)
- H5Fget_obj_ids(dbfile->fid, H5F_OBJ_LOCAL | H5F_OBJ_ALL, noo, ooids);
+ H5Fget_obj_ids(dbfile->fid, obj_flags, noo, ooids);
#else
- H5Fget_obj_ids(dbfile->fid, H5F_OBJ_ALL, noo, ooids);
+ H5Fget_obj_ids(dbfile->fid, obj_flags, noo, ooids);
#endif
n = strlen(msg);
for (i = 0; i < noo && n < sizeof(msg); i++)
{
- char name[256], tmp[260];
+ char name[256], tmp[256];
H5Iget_name(ooids[i], name, sizeof(name));
- sprintf(tmp, "\"%s\", ", name);
+ sprintf(tmp, "\"%.235s\" (id=%d), ", name, ooids[i]);
+ if ((strlen(msg) + strlen(tmp) + 1) >= sizeof(msg))
+ break;
strcat(msg, tmp);
n += strlen(tmp);
}
@@ -5266,6 +5349,9 @@ db_hdf5_initiate_close(DBfile *_dbfile)
}
#endif
+ // Tell HDF5 to garbage collect (whatever it can)
+ H5garbage_collect();
+
return 0;
}
@@ -5493,6 +5579,15 @@ db_hdf5_Close(DBfile *_dbfile)
} END_PROTECT;
}
+ /* work-around leaks in HDF5, version 1.8.4 only */
+#if HDF5_VERSION_GE(1,8,4) && !HDF5_VERSION_GE(1,8,5)
+ if (db_num_registered_files() == 0)
+ {
+ T_str_stype_set = 0;
+ H5close();
+ }
+#endif
+
return retval;
}
@@ -5627,9 +5722,11 @@ db_hdf5_SetDir(DBfile *_dbfile, char *name)
H5Gclose(dbfile->cwg);
dbfile->cwg = newdir;
+
if (dbfile->cwg_name) {
+ char *new_cwg_name = db_absoluteOf_path(dbfile->cwg_name, name);
free(dbfile->cwg_name);
- dbfile->cwg_name = !strcmp(name,"/.silo")?strdup("/.silo"):NULL;
+ dbfile->cwg_name = new_cwg_name;
}
} CLEANUP {
H5E_BEGIN_TRY {
@@ -5667,20 +5764,28 @@ SILO_CALLBACK int
db_hdf5_GetDir(DBfile *_dbfile, char *name/*out*/)
{
DBfile_hdf5 *dbfile = (DBfile_hdf5*)_dbfile;
- static char *me = "db_hdf5_SetDir";
+ static char *me = "db_hdf5_GetDir";
hid_t cwg = -1, parent = -1;
H5G_stat_t cur_sb, par_sb;
int i, ncomps=0;
silo_hdf5_comp_t comp[100];
- /* Return quickly if name is cached */
+ /* Return quickly if name is cached. But, confirm the name first. */
if (dbfile->cwg_name) {
- strcpy(name, dbfile->cwg_name);
- return 0;
+ H5G_stat_t sb;
+ herr_t status;
+ H5E_BEGIN_TRY {
+ status = H5Gget_objinfo(dbfile->cwg, dbfile->cwg_name, TRUE, &sb);
+ } H5E_END_TRY;
+ if (status>=0)
+ {
+ strcpy(name, dbfile->cwg_name);
+ return 0;
+ }
}
+ memset(comp, 0, sizeof comp);
PROTECT {
- memset(comp, 0, sizeof comp);
cwg = H5Gopen(dbfile->cwg, ".");
if (H5Gget_objinfo(cwg, ".", TRUE, &cur_sb)<0) {
db_perror("stat(\".\")", E_CALLFAIL, me);
@@ -5776,7 +5881,7 @@ typedef struct copy_dir_data_t {
} copy_dir_data_t;
static herr_t
-copy_dir(hid_t grp, const char *name, void *op_data)
+copy_dir(hid_t grp, char const *name, void *op_data)
{
static char *me = "copy_dir";
#if HDF5_VERSION_GE(1,8,0)
@@ -5950,8 +6055,8 @@ copy_dir(hid_t grp, const char *name, void *op_data)
*-------------------------------------------------------------------------
*/
SILO_CALLBACK int
-db_hdf5_CpDir(DBfile *_dbfile, const char *srcDir,
- DBfile *dstFile, const char *dstDir)
+db_hdf5_CpDir(DBfile *_dbfile, char const *srcDir,
+ DBfile *dstFile, char const *dstDir)
{
DBfile_hdf5 *dbfile = (DBfile_hdf5*)_dbfile;
DBfile_hdf5 *dstfile = (DBfile_hdf5*)dstFile;
@@ -6159,7 +6264,9 @@ db_hdf5_GetComponentStuff(DBfile *_dbfile, char *objname, char *compname,
if (memb_name && !strncmp(memb_name, compname, complen))
{
mnof = mno;
+ errno = 0;
mnofidx = strtol(&compname[complen], 0, 0) - 1;
+ if (errno != 0) mnofidx = -1;
if (mnofname) free(mnofname);
mnofname = STRDUP(memb_name);
}
@@ -6326,11 +6433,13 @@ db_hdf5_GetComponentNames(DBfile *_dbfile, char *objname, char ***comp_names,
*comp_names = obj->comp_names;
} else {
free(obj->comp_names);
+ obj->comp_names = 0;
}
if (file_names) {
*file_names = obj->pdb_names;
} else {
free(obj->pdb_names);
+ obj->pdb_names = 0;
}
n = obj->ncomponents;
obj->ncomponents = 0;
@@ -6365,7 +6474,7 @@ db_hdf5_GetComponentNames(DBfile *_dbfile, char *objname, char ***comp_names,
*/
SILO_CALLBACK int
db_hdf5_WriteObject(DBfile *_dbfile, /*File to write into */
- DBobject *obj, /*Object description to write out */
+ DBobject const *obj,/*Object description to write out */
int flags) /*1=>free associated memory */
{
DBfile_hdf5 *dbfile=(DBfile_hdf5*)_dbfile;
@@ -6569,9 +6678,9 @@ db_hdf5_WriteObject(DBfile *_dbfile, /*File to write into */
*-------------------------------------------------------------------------
*/
SILO_CALLBACK int
-db_hdf5_WriteComponent(DBfile *_dbfile, DBobject *obj, char *compname,
- char *prefix, char *dataname, const void *data,
- int rank, long _size[])
+db_hdf5_WriteComponent(DBfile *_dbfile, DBobject *obj, char const *compname,
+ char const *prefix, char const *dataname, void const *data,
+ int rank, long const *_size)
{
DBfile_hdf5 *dbfile = (DBfile_hdf5*)_dbfile;
int size[32], i;
@@ -6579,7 +6688,7 @@ db_hdf5_WriteComponent(DBfile *_dbfile, DBobject *obj, char *compname,
int datatype = db_GetDatatypeID(dataname);
for (i=0; i<rank; i++) size[i] = _size[i];
- db_hdf5_compwr(dbfile, datatype, rank, size, (void*)data, varname,
+ db_hdf5_compwr(dbfile, datatype, rank, size, data, varname,
friendly_name(obj->name, varname, 0));
DBAddVarComponent(obj, compname, varname);
return 0;
@@ -7140,6 +7249,14 @@ SILO_CALLBACK int
db_hdf5_Write(DBfile *_dbfile, char *vname, void *var,
int *dims, int ndims, int datatype)
{
+ const int nofilters = 0;
+ return db_hdf5_WriteCKZ(_dbfile, vname, var, dims, ndims, datatype, nofilters);
+}
+
+INTERNAL int
+db_hdf5_WriteCKZ(DBfile *_dbfile, char *vname, void *var,
+ int *dims, int ndims, int datatype, int nofilters)
+{
DBfile_hdf5 *dbfile = (DBfile_hdf5*)_dbfile;
static char *me = "db_hdf5_Write";
hid_t mtype=-1, ftype=-1, space=-1, dset=-1, dset_type=-1;
@@ -7176,6 +7293,7 @@ db_hdf5_Write(DBfile *_dbfile, char *vname, void *var,
UNWIND();
}
}
+//#warning WHAT IF EXISTING DATASET WAS COMPRESSED
} else {
/* Create memory and file data space (both identical) */
for (i=0; i<ndims; i++) ds_size[i] = dims[i];
@@ -7184,16 +7302,26 @@ db_hdf5_Write(DBfile *_dbfile, char *vname, void *var,
UNWIND();
}
- if (db_hdf5_set_properties(ndims, ds_size) < 0 ) {
- db_perror("db_hdf5_set_properties", E_CALLFAIL, me);
- UNWIND();
- }
+ if (nofilters == 0)
+ {
+ if (db_hdf5_set_properties(ndims, ds_size) < 0 ) {
+ db_perror("db_hdf5_set_properties", E_CALLFAIL, me);
+ UNWIND();
+ }
- /* Create dataset if it doesn't already exist */
- if ((dset=H5Dcreate(dbfile->cwg, vname, ftype, space,
- P_crprops))<0) {
- db_perror(vname, E_CALLFAIL, me);
- UNWIND();
+ /* Create dataset if it doesn't already exist */
+ if ((dset=H5Dcreate(dbfile->cwg, vname, ftype, space, P_crprops))<0) {
+ db_perror(vname, E_CALLFAIL, me);
+ UNWIND();
+ }
+ }
+ else
+ {
+ /* Create dataset if it doesn't already exist */
+ if ((dset=H5Dcreate(dbfile->cwg, vname, ftype, space, H5P_DEFAULT))<0) {
+ db_perror(vname, E_CALLFAIL, me);
+ UNWIND();
+ }
}
}
@@ -7583,43 +7711,19 @@ db_hdf5_PutCurve(DBfile *_dbfile, char *name, void *xvals, void *yvals,
UNWIND();
}
- if (_cu._reference && (xvals || yvals)) {
- db_perror("xvals and yvals can not be defined with DBOPT_REFERENCE",
- E_BADARGS, me);
- UNWIND();
- }
-
/* Write X and Y arrays if supplied */
- if (_cu._varname[0]) {
- if (db_hdf5_fullname(dbfile, _cu._varname[0],
- m.xvarname/*out*/)<0) {
- db_perror(_cu._varname[0], E_CALLFAIL, me);
- UNWIND();
- }
- }
if (xvals) {
db_hdf5_compwr(dbfile, dtype, 1, &npts, xvals, m.xvarname/*out*/,
friendly_name(name, "_xvals", 0));
- } else if (!_cu._varname[0] && !_cu._reference) {
- db_perror("one of xvals or xvarname must be specified",
- E_BADARGS, me);
- UNWIND();
+ } else if (_cu._varname[0]) {
+ db_hdf5_fullname(dbfile, _cu._varname[0], m.xvarname/*out*/);
}
- if (_cu._varname[1]) {
- if (db_hdf5_fullname(dbfile, _cu._varname[1],
- m.yvarname/*out*/)<0) {
- db_perror(_cu._varname[1], E_CALLFAIL, me);
- UNWIND();
- }
- }
if (yvals) {
db_hdf5_compwr(dbfile, dtype, 1, &npts, yvals, m.yvarname/*out*/,
friendly_name(name, "_yvals", 0));
- } else if (!_cu._varname[1] && !_cu._reference) {
- db_perror("one of yvals or yvarname must be specified",
- E_BADARGS, me);
- UNWIND();
+ } else if (_cu._varname[1]) {
+ db_hdf5_fullname(dbfile, _cu._varname[1], m.yvarname/*out*/);
}
/* Build the curve header in memory */
@@ -7717,9 +7821,12 @@ db_hdf5_GetCurve(DBfile *_dbfile, char *name)
if (NULL==(cu=DBAllocCurve())) return NULL;
cu->npts = m.npts;
cu->guihide = m.guihide;
- if ((cu->datatype = db_hdf5_GetVarType(_dbfile,
+ cu->datatype = DB_FLOAT;
+ if (strlen(m.xvarname)) {
+ if ((cu->datatype = db_hdf5_GetVarType(_dbfile,
db_hdf5_resolvename(_dbfile, name, m.xvarname))) < 0)
- cu->datatype = DB_FLOAT;
+ cu->datatype = DB_FLOAT;
+ }
if (force_single_g) cu->datatype = DB_FLOAT;
cu->title = OPTDUP(m.label);
cu->xvarname = OPTDUP(m.xvarname);
@@ -7781,10 +7888,10 @@ db_hdf5_GetCurve(DBfile *_dbfile, char *name)
*/
/*ARGSUSED*/
SILO_CALLBACK int
-db_hdf5_PutCsgmesh(DBfile *_dbfile, const char *name, int ndims,
- int nbounds, const int *typeflags, const int *bndids,
- const void *coeffs, int lcoeffs, int datatype,
- const double *extents, const char *zonel_name,
+db_hdf5_PutCsgmesh(DBfile *_dbfile, char const *name, int ndims,
+ int nbounds, int const *typeflags, int const *bndids,
+ void const *coeffs, int lcoeffs, int datatype,
+ double const *extents, char const *zonel_name,
DBoptlist *optlist)
{
DBfile_hdf5 *dbfile = (DBfile_hdf5*)_dbfile;
@@ -7807,12 +7914,15 @@ db_hdf5_PutCsgmesh(DBfile *_dbfile, const char *name, int ndims,
db_hdf5_handle_ctdt(dbfile, _csgm._time_set, _csgm._time,
_csgm._dtime_set, _csgm._dtime, _csgm._cycle);
- m.min_extents[0] = extents[0];
- m.min_extents[1] = extents[1];
- m.min_extents[2] = extents[2];
- m.max_extents[0] = extents[3];
- m.max_extents[1] = extents[4];
- m.max_extents[2] = extents[5];
+ if (extents)
+ {
+ m.min_extents[0] = extents[0];
+ m.min_extents[1] = extents[1];
+ m.min_extents[2] = extents[2];
+ m.max_extents[0] = extents[3];
+ m.max_extents[1] = extents[4];
+ m.max_extents[2] = extents[5];
+ }
db_hdf5_compwr(dbfile,DB_INT,1,&nbounds,(void*)typeflags,m.typeflags/*out*/,
friendly_name(name, "_typeflags", 0));
@@ -7839,7 +7949,8 @@ db_hdf5_PutCsgmesh(DBfile *_dbfile, const char *name, int ndims,
m.lcoeffs = lcoeffs;
m.tv_connectivity = _csgm._tv_connectivity;
m.disjoint_mode = _csgm._disjoint_mode;
- strcpy(m.zonel_name, zonel_name);
+ if (zonel_name)
+ strcpy(m.zonel_name, zonel_name);
strcpy(m.mrgtree_name, OPT(_csgm._mrgtree_name));
/* Build csgmesh header in file */
@@ -7896,7 +8007,7 @@ db_hdf5_PutCsgmesh(DBfile *_dbfile, const char *name, int ndims,
*-------------------------------------------------------------------------
*/
SILO_CALLBACK DBcsgmesh *
-db_hdf5_GetCsgmesh(DBfile *_dbfile, const char *name)
+db_hdf5_GetCsgmesh(DBfile *_dbfile, char const *name)
{
DBfile_hdf5 *dbfile = (DBfile_hdf5*)_dbfile;
static char *me = "db_hdf5_GetCsgmesh";
@@ -7967,7 +8078,7 @@ db_hdf5_GetCsgmesh(DBfile *_dbfile, const char *name)
{
char *tmpbndnames = db_hdf5_comprd(dbfile, m.bndnames, 1);
if (tmpbndnames)
- csgm->bndnames = DBStringListToStringArray(tmpbndnames, m.nbounds,
+ csgm->bndnames = DBStringListToStringArray(tmpbndnames, &m.nbounds,
!handleSlashSwap, !skipFirstSemicolon);
FREE(tmpbndnames);
}
@@ -8013,7 +8124,7 @@ db_hdf5_GetCsgmesh(DBfile *_dbfile, const char *name)
*/
/*ARGSUSED*/
SILO_CALLBACK int
-db_hdf5_PutCsgvar(DBfile *_dbfile, const char *vname, const char *meshname,
+db_hdf5_PutCsgvar(DBfile *_dbfile, char const *vname, char const *meshname,
int nvars, char *varnames[], void *vars[],
int nvals, int datatype, int centering, DBoptlist *optlist)
@@ -8119,7 +8230,7 @@ db_hdf5_PutCsgvar(DBfile *_dbfile, const char *vname, const char *meshname,
*-------------------------------------------------------------------------
*/
SILO_CALLBACK DBcsgvar *
-db_hdf5_GetCsgvar(DBfile *_dbfile, const char *name)
+db_hdf5_GetCsgvar(DBfile *_dbfile, char const *name)
{
DBfile_hdf5 *dbfile = (DBfile_hdf5*)_dbfile;
static char *me = "db_hdf5_GetCsgvar";
@@ -8182,7 +8293,7 @@ db_hdf5_GetCsgvar(DBfile *_dbfile, const char *name)
UNWIND();
}
- if (SILO_Globals.dataReadMask & DBCSGVData)
+ if (SILO_Globals.dataReadMask & DBCSGVData && m.nvals)
{
csgv->vals = calloc(m.nvals, sizeof(void*));
for (i=0; i<m.nvals; i++) {
@@ -8191,7 +8302,7 @@ db_hdf5_GetCsgvar(DBfile *_dbfile, const char *name)
}
s = db_hdf5_comprd(dbfile, m.region_pnames, 1);
- if (s) csgv->region_pnames = DBStringListToStringArray(s, -1,
+ if (s) csgv->region_pnames = DBStringListToStringArray(s, 0,
!handleSlashSwap, !skipFirstSemicolon);
FREE(s);
@@ -8227,11 +8338,11 @@ db_hdf5_GetCsgvar(DBfile *_dbfile, const char *name)
*-------------------------------------------------------------------------
*/
SILO_CALLBACK int
-db_hdf5_PutCSGZonelist(DBfile *_dbfile, const char *name, int nregs,
- const int *typeflags,
- const int *leftids, const int *rightids,
- const void *xforms, int lxforms, int datatype,
- int nzones, const int *zonelist, DBoptlist *optlist)
+db_hdf5_PutCSGZonelist(DBfile *_dbfile, char const *name, int nregs,
+ int const *typeflags,
+ int const *leftids, int const *rightids,
+ void const *xforms, int lxforms, int datatype,
+ int nzones, int const *zonelist, DBoptlist *optlist)
{
DBfile_hdf5 *dbfile = (DBfile_hdf5*)_dbfile;
@@ -8281,12 +8392,14 @@ db_hdf5_PutCSGZonelist(DBfile *_dbfile, const char *name, int nregs,
m.nregs = nregs;
m.lxform = lxforms;
m.nzones = nzones;
+ if (nregs == 0 && nzones == 0) m.origin = 1;
/* Write header to file */
STRUCT(DBcsgzonelist) {
if (m.nregs) MEMBER_S(int, nregs);
if (m.lxform) MEMBER_S(int, lxform);
if (m.nzones) MEMBER_S(int, nzones);
+ if (m.origin) MEMBER_S(int, origin);
MEMBER_S(str(m.typeflags), typeflags);
MEMBER_S(str(m.leftids), leftids);
MEMBER_S(str(m.rightids), rightids);
@@ -8327,7 +8440,7 @@ db_hdf5_PutCSGZonelist(DBfile *_dbfile, const char *name, int nregs,
*-------------------------------------------------------------------------
*/
SILO_CALLBACK DBcsgzonelist *
-db_hdf5_GetCSGZonelist(DBfile *_dbfile, const char *name)
+db_hdf5_GetCSGZonelist(DBfile *_dbfile, char const *name)
{
DBfile_hdf5 *dbfile = (DBfile_hdf5*)_dbfile;
static char *me = "db_hdf5_GetCSGZonelist";
@@ -8385,7 +8498,7 @@ db_hdf5_GetCSGZonelist(DBfile *_dbfile, const char *name)
{
char *tmpnames = db_hdf5_comprd(dbfile, m.regnames, 1);
if (tmpnames)
- zl->regnames = DBStringListToStringArray(tmpnames, m.nregs,
+ zl->regnames = DBStringListToStringArray(tmpnames, &m.nregs,
!handleSlashSwap, !skipFirstSemicolon);
FREE(tmpnames);
}
@@ -8394,7 +8507,7 @@ db_hdf5_GetCSGZonelist(DBfile *_dbfile, const char *name)
{
char *tmpnames = db_hdf5_comprd(dbfile, m.zonenames, 1);
if (tmpnames)
- zl->zonenames = DBStringListToStringArray(tmpnames, m.nzones,
+ zl->zonenames = DBStringListToStringArray(tmpnames, &m.nzones,
!handleSlashSwap, !skipFirstSemicolon);
FREE(tmpnames);
}
@@ -8430,8 +8543,8 @@ db_hdf5_GetCSGZonelist(DBfile *_dbfile, const char *name)
*-------------------------------------------------------------------------
*/
SILO_CALLBACK int
-db_hdf5_PutDefvars(DBfile *_dbfile, const char *name, int ndefs,
- char *names[], const int *types,
+db_hdf5_PutDefvars(DBfile *_dbfile, char const *name, int ndefs,
+ char *names[], int const *types,
char *defns[], DBoptlist *opts[])
{
DBfile_hdf5 *dbfile = (DBfile_hdf5*)_dbfile;
@@ -8498,7 +8611,7 @@ db_hdf5_PutDefvars(DBfile *_dbfile, const char *name, int ndefs,
} OUTPUT(dbfile, DB_DEFVARS, name, &m);
} CLEANUP {
- /*void*/;
+ if (guihide) free(guihide);
} END_PROTECT;
return 0;
}
@@ -8528,7 +8641,7 @@ db_hdf5_PutDefvars(DBfile *_dbfile, const char *name, int ndefs,
*-------------------------------------------------------------------------
*/
SILO_CALLBACK DBdefvars*
-db_hdf5_GetDefvars(DBfile *_dbfile, const char *name)
+db_hdf5_GetDefvars(DBfile *_dbfile, char const *name)
{
DBfile_hdf5 *dbfile = (DBfile_hdf5*)_dbfile;
static char *me = "db_hdf5_GetDefvars";
@@ -8569,14 +8682,14 @@ db_hdf5_GetDefvars(DBfile *_dbfile, const char *name)
defv->ndefs = m.ndefs;
s = db_hdf5_comprd(dbfile, m.names, 1);
- if (s) defv->names = DBStringListToStringArray(s, defv->ndefs,
+ if (s) defv->names = DBStringListToStringArray(s, &(defv->ndefs),
!handleSlashSwap, !skipFirstSemicolon);
FREE(s);
defv->types = db_hdf5_comprd(dbfile, m.types, 1);
s = db_hdf5_comprd(dbfile, m.defns, 1);
- if (s) defv->defns = DBStringListToStringArray(s, defv->ndefs,
+ if (s) defv->defns = DBStringListToStringArray(s, &(defv->ndefs),
!handleSlashSwap, !skipFirstSemicolon);
FREE(s);
@@ -8702,7 +8815,7 @@ db_hdf5_PutQuadmesh(DBfile *_dbfile, char *name, char *coordnames[],
* Number of zones and nodes. We have to do this because
* _DBQMCalcExtents uses this global information.
*/
- for (_qm._nzones=_qm._nnodes=1, i=0; i<ndims; i++) {
+ for (_qm._nzones=_qm._nnodes=(ndims?1:0), i=0; i<ndims; i++) {
_qm._nzones *= (dims[i]-1);
_qm._nnodes *= dims[i];
_qm._dims[i] = dims[i];
@@ -8817,7 +8930,7 @@ db_hdf5_PutQuadmesh(DBfile *_dbfile, char *name, char *coordnames[],
*-------------------------------------------------------------------------
*/
static void
-PrepareForQuadmeshDecompression(DBfile_hdf5 *dbfile, const char *meshname,
+PrepareForQuadmeshDecompression(DBfile_hdf5 *dbfile, char const *meshname,
const DBquadmesh *qm)
{
#ifdef HAVE_HZIP
@@ -9060,7 +9173,7 @@ db_hdf5_PutQuadvar(DBfile *_dbfile, char *name, char *meshname, int nvars,
db_ProcessOptlist(DB_QUADMESH, optlist); /*yes, QUADMESH*/
_qm._meshname = STRDUP(meshname);
_qm._nzones = _qm._nnodes = 1; /*initial value only*/
- for (nels=1, i=0; i<ndims; i++) {
+ for (nels=(ndims?1:0), i=0; i<ndims; i++) {
nels *= dims[i];
_qm._nzones *= (dims[i]-1);
_qm._nnodes *= dims[i];
@@ -9211,7 +9324,7 @@ db_hdf5_PutQuadvar(DBfile *_dbfile, char *name, char *meshname, int nvars,
*-------------------------------------------------------------------------
*/
static void
-PrepareForQuadvarDecompression(DBfile_hdf5 *dbfile, const char *varname,
+PrepareForQuadvarDecompression(DBfile_hdf5 *dbfile, char const *varname,
const DBquadvar *qv)
{
#ifdef HAVE_HZIP
@@ -9335,7 +9448,7 @@ db_hdf5_GetQuadvar(DBfile *_dbfile, char *name)
db_perror(name, E_CALLFAIL, me);
UNWIND();
}
- if (SILO_Globals.dataReadMask & DBQVData)
+ if (SILO_Globals.dataReadMask & DBQVData && m.nvals)
{
qv->vals = calloc(m.nvals, sizeof(void*));
if (m.mixlen) qv->mixvals = calloc(m.nvals, sizeof(void*));
@@ -9348,7 +9461,7 @@ db_hdf5_GetQuadvar(DBfile *_dbfile, char *name)
}
s = db_hdf5_comprd(dbfile, m.region_pnames, 1);
- if (s) qv->region_pnames = DBStringListToStringArray(s, -1,
+ if (s) qv->region_pnames = DBStringListToStringArray(s, 0,
!handleSlashSwap, !skipFirstSemicolon);
FREE(s);
@@ -9379,7 +9492,7 @@ db_hdf5_GetQuadvar(DBfile *_dbfile, char *name)
*-------------------------------------------------------------------------
*/
static int PrepareForUcdmeshCompression(DBfile_hdf5 *dbfile,
- const char *meshname, const char *zlname)
+ char const *meshname, char const *zlname)
{
if (SILO_Globals.compressionParams == 0) return 0;
@@ -9723,8 +9836,8 @@ db_hdf5_PutUcdsubmesh(DBfile *_dbfile, char *name, char *parentmesh,
*-------------------------------------------------------------------------
*/
static void
-PrepareForUcdmeshDecompression(DBfile_hdf5 *dbfile, const char *meshname,
- const char *zlname)
+PrepareForUcdmeshDecompression(DBfile_hdf5 *dbfile, char const *meshname,
+ char const *zlname)
{
#ifdef HAVE_HZIP
db_hdf5_hzip_clear_params();
@@ -9878,11 +9991,14 @@ db_hdf5_GetUcdmesh(DBfile *_dbfile, char *name)
/* zones. This will make dealing with ghost zones easier */
/* for applications. */
/*----------------------------------------------------------*/
- if (((um->zones->min_index != 0) ||
- (um->zones->max_index != um->zones->nzones - 1)) &&
- SILO_Globals.dataReadMask & DBZonelistInfo)
+ if (um->zones)
{
- db_SplitShapelist (um);
+ if (((um->zones->min_index != 0) ||
+ (um->zones->max_index != um->zones->nzones - 1)) &&
+ SILO_Globals.dataReadMask & DBZonelistInfo)
+ {
+ db_SplitShapelist (um);
+ }
}
}
@@ -9936,8 +10052,8 @@ db_hdf5_GetUcdmesh(DBfile *_dbfile, char *name)
*-------------------------------------------------------------------------
*/
static int
-PrepareForUcdvarCompression(DBfile_hdf5 *dbfile, const char *varname,
- const char *meshname, int datatype, int centering)
+PrepareForUcdvarCompression(DBfile_hdf5 *dbfile, char const *varname,
+ char const *meshname, int datatype, int centering)
{
if (SILO_Globals.compressionParams == 0) return 0;
@@ -10041,6 +10157,7 @@ db_hdf5_PutUcdvar(DBfile *_dbfile, char *name, char *meshname, int nvars,
for (i=0; i<nvars; i++) {
db_hdf5_compwrz(dbfile, datatype, 1, &nels, vars[i],
m.value[i]/*out*/, friendly_name(varnames[i], "_data", 0), compressionFlags);
+//#warning WHY NOT COMPRESS MIX DATA TOO
if (mixvars && mixvars[i] && mixlen>0) {
db_hdf5_compwr(dbfile, datatype, 1, &mixlen, mixvars[i],
m.mixed_value[i]/*out*/, friendly_name(varnames[i], "_mix", 0));
@@ -10128,8 +10245,8 @@ db_hdf5_PutUcdvar(DBfile *_dbfile, char *name, char *meshname, int nvars,
*-------------------------------------------------------------------------
*/
static void
-PrepareForUcdvarDecompression(DBfile *_dbfile, const char *varname,
- const char *meshname, char valnames[MAX_VARS][256], int nvals)
+PrepareForUcdvarDecompression(DBfile *_dbfile, char const *varname,
+ char const *meshname, char valnames[MAX_VARS][256], int nvals)
{
#ifdef HAVE_HZIP
@@ -10156,11 +10273,14 @@ PrepareForUcdvarDecompression(DBfile *_dbfile, const char *varname,
So, as a precaution, we register the zonelist here, too.
And, since we know the meshname here also, that will get
added to the registered zonelist if it already exists. */
- RegisterNodelist((DBfile_hdf5*)_dbfile, 0, meshname,
- um->zones->ndims, um->zones->nzones, um->zones->origin,
- um->zones->nodelist);
- DBSetDataReadMask(currentMask);
- DBFreeUcdmesh(um);
+ if (um && um->zones)
+ {
+ RegisterNodelist((DBfile_hdf5*)_dbfile, 0, meshname,
+ um->zones->ndims, um->zones->nzones, um->zones->origin,
+ um->zones->nodelist);
+ DBSetDataReadMask(currentMask);
+ DBFreeUcdmesh(um);
+ }
}
}
@@ -10266,14 +10386,14 @@ db_hdf5_GetUcdvar(DBfile *_dbfile, char *name)
uv->extensive = m.extensive;
/* If var is compressed, we need to do some work to decompress it */
- PrepareForUcdvarDecompression(_dbfile, name, uv->meshname, m.value, m.nvals);
+ PrepareForUcdvarDecompression(_dbfile, name, uv->meshname?uv->meshname:"", m.value, m.nvals);
/* Read the raw data */
if (m.nvals>MAX_VARS) {
db_perror(name, E_CALLFAIL, me);
UNWIND();
}
- if (SILO_Globals.dataReadMask & DBUVData)
+ if (SILO_Globals.dataReadMask & DBUVData && m.nvals)
{
uv->vals = calloc(m.nvals, sizeof(void*));
if (m.mixlen) uv->mixvals = calloc(m.nvals, sizeof(void*));
@@ -10286,7 +10406,7 @@ db_hdf5_GetUcdvar(DBfile *_dbfile, char *name)
}
s = db_hdf5_comprd(dbfile, m.region_pnames, 1);
- if (s) uv->region_pnames = DBStringListToStringArray(s, -1,
+ if (s) uv->region_pnames = DBStringListToStringArray(s, 0,
!handleSlashSwap, !skipFirstSemicolon);
FREE(s);
@@ -10492,17 +10612,17 @@ db_hdf5_GetFacelist(DBfile *_dbfile, char *name)
*-------------------------------------------------------------------------
*/
static int
-PrepareForZonelistCompression(DBfile_hdf5 *dbfile, const char *name,
- int origin, int nshapes, const int *shapetype, const int *shapecnt,
- const int *nodelist)
+PrepareForZonelistCompression(DBfile_hdf5 *dbfile, char const *name,
+ int origin, int nshapes, int const *shapetype, int const *shapecnt,
+ int const *nodelist)
{
- int i;
- int ntopo = 0;
- int zncnt = shapecnt[0];
+ int i;
+ int ntopo = 0, zncnt = 0;
if (nshapes == 0) return 0;
if (SILO_Globals.compressionParams == 0) return 0;
+ zncnt = shapecnt[0];
#ifdef HAVE_HZIP
/* hzip supports only quad/hex meshes */
@@ -10787,8 +10907,8 @@ db_hdf5_PutPHZonelist(DBfile *_dbfile, char *name,
*-------------------------------------------------------------------------
*/
static void
-PrepareForZonelistDecompression(DBfile_hdf5* dbfile, const char *zlname,
- const char *meshname, int origin)
+PrepareForZonelistDecompression(DBfile_hdf5* dbfile, char const *zlname,
+ char const *meshname, int origin)
{
#ifdef HAVE_HZIP
db_hdf5_hzip_clear_params();
@@ -11227,14 +11347,14 @@ db_hdf5_GetMaterial(DBfile *_dbfile, char *name)
if (SILO_Globals.dataReadMask & DBMatMatnames)
{
s = db_hdf5_comprd(dbfile, m.matnames, 1);
- if (s) ma->matnames = DBStringListToStringArray(s, ma->nmat,
+ if (s) ma->matnames = DBStringListToStringArray(s, &(ma->nmat),
!handleSlashSwap, !skipFirstSemicolon);
FREE(s);
}
if (SILO_Globals.dataReadMask & DBMatMatcolors)
{
s = db_hdf5_comprd(dbfile, m.matcolors, 1);
- if (s) ma->matcolors = DBStringListToStringArray(s, ma->nmat,
+ if (s) ma->matcolors = DBStringListToStringArray(s, &(ma->nmat),
!handleSlashSwap, !skipFirstSemicolon);
FREE(s);
}
@@ -11461,16 +11581,16 @@ db_hdf5_GetMatspecies(DBfile *_dbfile, char *name)
ms->species_mf = db_hdf5_comprd(dbfile, m.species_mf, 0);
ms->speclist = db_hdf5_comprd(dbfile, m.speclist, 1);
ms->mix_speclist = db_hdf5_comprd(dbfile, m.mix_speclist, 1);
- if (SILO_Globals.dataReadMask & DBMatMatnames)
+ if (ms->nmatspec && SILO_Globals.dataReadMask & DBMatMatnames)
{
for (i=0; i < ms->nmat; i++)
nstrs += ms->nmatspec[i];
s = db_hdf5_comprd(dbfile, m.specnames, 1);
- if (s) ms->specnames = DBStringListToStringArray(s, nstrs,
+ if (s) ms->specnames = DBStringListToStringArray(s, &nstrs,
!handleSlashSwap, !skipFirstSemicolon);
FREE(s);
}
- if (SILO_Globals.dataReadMask & DBMatMatcolors)
+ if (ms->nmatspec && SILO_Globals.dataReadMask & DBMatMatcolors)
{
if (nstrs == 0)
{
@@ -11478,7 +11598,7 @@ db_hdf5_GetMatspecies(DBfile *_dbfile, char *name)
nstrs += ms->nmatspec[i];
}
s = db_hdf5_comprd(dbfile, m.speccolors, 1);
- if (s) ms->speccolors = DBStringListToStringArray(s, nstrs,
+ if (s) ms->speccolors = DBStringListToStringArray(s, &nstrs,
!handleSlashSwap, !skipFirstSemicolon);
FREE(s);
}
@@ -11537,8 +11657,9 @@ db_hdf5_GetMatspecies(DBfile *_dbfile, char *name)
*-------------------------------------------------------------------------
*/
SILO_CALLBACK int
-db_hdf5_PutMultimesh(DBfile *_dbfile, char *name, int nmesh,
- char *meshnames[], int meshtypes[], DBoptlist *optlist)
+db_hdf5_PutMultimesh(DBfile *_dbfile, char const *name, int nmesh,
+ char const *const *meshnames, int const *meshtypes,
+ DBoptlist const *optlist)
{
DBfile_hdf5 *dbfile = (DBfile_hdf5*)_dbfile;
DBmultimesh_mt m;
@@ -11638,6 +11759,7 @@ db_hdf5_PutMultimesh(DBfile *_dbfile, char *name, int nmesh,
strcpy(m.mrgtree_name, OPT(_mm._mrgtree_name));
m.block_type = _mm._block_type;
m.empty_cnt = _mm._empty_cnt;
+ m.repr_block_idx = _mm._repr_block_idx;
/* Write meta data to file */
STRUCT(DBmultimesh) {
@@ -11667,6 +11789,7 @@ db_hdf5_PutMultimesh(DBfile *_dbfile, char *name, int nmesh,
if (m.block_type) MEMBER_S(int, block_type);
MEMBER_S(str(m.empty_list), empty_list);
if (m.empty_cnt) MEMBER_S(int, empty_cnt);
+ if (m.repr_block_idx) MEMBER_S(int, repr_block_idx);
} OUTPUT(dbfile, DB_MULTIMESH, name, &m);
/* Free resources */
@@ -11770,6 +11893,7 @@ db_hdf5_GetMultimesh(DBfile *_dbfile, char *name)
for multimeshes in 4.7 and so is handled correctly for
them in all cases. */
mm->topo_dim = m.topo_dim - 1;
+ mm->repr_block_idx = m.repr_block_idx - 1;
/* Read the raw data */
if (mm->extentssize>0)
@@ -11778,12 +11902,12 @@ db_hdf5_GetMultimesh(DBfile *_dbfile, char *name)
mm->has_external_zones = db_hdf5_comprd(dbfile, m.has_external_zones, 1);
mm->meshtypes = db_hdf5_comprd(dbfile, m.meshtypes, 1);
s = db_hdf5_comprd(dbfile, m.meshnames, 1);
- if (s) mm->meshnames = DBStringListToStringArray(s, m.nblocks,
+ if (s) mm->meshnames = DBStringListToStringArray(s, &m.nblocks,
handleSlashSwap, !skipFirstSemicolon);
FREE(s);
mm->groupings = db_hdf5_comprd(dbfile, m.groupings, 1);
t = db_hdf5_comprd(dbfile, m.groupnames, 1);
- if (t) mm->groupnames = DBStringListToStringArray(t, mm->lgroupings,
+ if (t) mm->groupnames = DBStringListToStringArray(t, &(mm->lgroupings),
!handleSlashSwap, !skipFirstSemicolon);
FREE(t);
mm->file_ns = db_hdf5_comprd(dbfile, m.file_ns_name, 1);
@@ -11838,11 +11962,11 @@ db_hdf5_GetMultimesh(DBfile *_dbfile, char *name)
*-------------------------------------------------------------------------
*/
SILO_CALLBACK int
-db_hdf5_PutMultimeshadj(DBfile *_dbfile, const char *name, int nmesh,
- const int *meshtypes, const int *nneighbors,
- const int *neighbors, const int *back,
- const int *lnodelists, int *nodelists[],
- const int *lzonelists, int *zonelists[],
+db_hdf5_PutMultimeshadj(DBfile *_dbfile, char const *name, int nmesh,
+ int const *meshtypes, int const *nneighbors,
+ int const *neighbors, int const *back,
+ int const *lnodelists, int *nodelists[],
+ int const *lzonelists, int *zonelists[],
DBoptlist *optlist)
{
DBfile_hdf5 *dbfile = (DBfile_hdf5*)_dbfile;
@@ -11915,7 +12039,7 @@ db_hdf5_PutMultimeshadj(DBfile *_dbfile, const char *name, int nmesh,
db_hdf5_compwr(dbfile, DB_INT, 1, &nmesh, (void*)meshtypes,
m.meshtypes/*out*/, friendly_name(name, "_meshtypes",0));
db_hdf5_compwr(dbfile, DB_INT, 1, &nmesh, (void*)nneighbors,
- m.nneighbors/*out*/, friendly_name(name,"_nneighbots",0));
+ m.nneighbors/*out*/, friendly_name(name,"_nneighbors",0));
db_hdf5_compwr(dbfile, DB_INT, 1, &lneighbors, (void*)neighbors,
m.neighbors/*out*/, friendly_name(name,"_neighbors",0));
if (back)
@@ -11939,7 +12063,7 @@ db_hdf5_PutMultimeshadj(DBfile *_dbfile, const char *name, int nmesh,
object that can vary from call to call. Reserve space for
the entire nodelists and/or zonelists arrays */
- if (nodelists) {
+ if (lnodelists && nodelists) {
/* compute total length of nodelists array */
len = 0;
@@ -11951,11 +12075,12 @@ db_hdf5_PutMultimeshadj(DBfile *_dbfile, const char *name, int nmesh,
/* negative rank means to reserve space */
if (db_hdf5_compwr(dbfile, DB_INT, -1, &len, NULL,
m.nodelists/*out*/, friendly_name(name,"_nodelists",0))<0) {
- return db_perror ("db_hdf5_compwr", E_CALLFAIL, me) ;
+ db_perror ("db_hdf5_compwr", E_CALLFAIL, me) ;
+ UNWIND();
}
}
- if (zonelists) {
+ if (lzonelists && zonelists) {
/* compute total length of nodelists array */
len = 0;
@@ -11967,7 +12092,8 @@ db_hdf5_PutMultimeshadj(DBfile *_dbfile, const char *name, int nmesh,
/* negative rank means to reserve space */
if (db_hdf5_compwr(dbfile, DB_INT, -1, &len, NULL,
m.zonelists/*out*/, friendly_name(name, "_zonelists",0))<0) {
- return db_perror ("db_hdf5_compwr", E_CALLFAIL, me) ;
+ db_perror ("db_hdf5_compwr", E_CALLFAIL, me) ;
+ UNWIND();
}
}
@@ -12017,9 +12143,9 @@ db_hdf5_PutMultimeshadj(DBfile *_dbfile, const char *name, int nmesh,
{
hsize_t ds_size[H5S_MAX_RANK];
- if (nodelists)
+ if (nodelists && lnodelists)
{
- if (nodelists[i])
+ if (nodelists[i] && lnodelists[i])
{
int offset = noff;
int length = lnodelists[i];
@@ -12051,9 +12177,9 @@ db_hdf5_PutMultimeshadj(DBfile *_dbfile, const char *name, int nmesh,
noff += lnodelists[i];
}
- if (zonelists)
+ if (zonelists && lzonelists)
{
- if (zonelists[i])
+ if (zonelists[i] && lzonelists[i])
{
int offset = zoff;
int length = lzonelists[i];
@@ -12111,8 +12237,8 @@ db_hdf5_PutMultimeshadj(DBfile *_dbfile, const char *name, int nmesh,
*-------------------------------------------------------------------------
*/
SILO_CALLBACK DBmultimeshadj *
-db_hdf5_GetMultimeshadj(DBfile *_dbfile, const char *name, int nmesh,
- const int *block_map)
+db_hdf5_GetMultimeshadj(DBfile *_dbfile, char const *name, int nmesh,
+ int const *block_map)
{
DBfile_hdf5 *dbfile = (DBfile_hdf5*)_dbfile;
static char *me = "db_hdf5_GetMultimesh";
@@ -12166,13 +12292,14 @@ db_hdf5_GetMultimeshadj(DBfile *_dbfile, const char *name, int nmesh,
offsetmap = ALLOC_N(int, mmadj->nblocks);
lneighbors = 0;
- for (i = 0; i < mmadj->nblocks; i++)
+ for (i = 0; (i < mmadj->nblocks) && mmadj->nneighbors; i++)
{
offsetmap[i] = lneighbors;
lneighbors += mmadj->nneighbors[i];
}
- if (mmadj->lnodelists && (SILO_Globals.dataReadMask & DBMMADJNodelists))
+ if (offsetmap && mmadj->lnodelists && mmadj->nneighbors &&
+ (SILO_Globals.dataReadMask & DBMMADJNodelists))
{
mmadj->nodelists = ALLOC_N(int *, lneighbors);
offsetmapn = ALLOC_N(int, mmadj->nblocks);
@@ -12186,7 +12313,8 @@ db_hdf5_GetMultimeshadj(DBfile *_dbfile, const char *name, int nmesh,
mmadj->totlnodelists = m.totlnodelists;
}
- if (mmadj->lzonelists && (SILO_Globals.dataReadMask & DBMMADJZonelists))
+ if (offsetmap && mmadj->lzonelists && mmadj->nneighbors &&
+ (SILO_Globals.dataReadMask & DBMMADJZonelists))
{
mmadj->zonelists = ALLOC_N(int *, lneighbors);
offsetmapz = ALLOC_N(int, mmadj->nblocks);
@@ -12233,7 +12361,8 @@ db_hdf5_GetMultimeshadj(DBfile *_dbfile, const char *name, int nmesh,
hsize_t ds_size[H5S_MAX_RANK];
int blockno = block_map ? block_map[i] : i;
- if (mmadj->lnodelists && (SILO_Globals.dataReadMask & DBMMADJNodelists))
+ if (offsetmapn && mmadj->lnodelists && mmadj->nodelists &&
+ mmadj->nneighbors && (SILO_Globals.dataReadMask & DBMMADJNodelists))
{
tmpoff = offsetmapn[blockno];
for (j = 0; j < mmadj->nneighbors[blockno]; j++)
@@ -12280,7 +12409,8 @@ db_hdf5_GetMultimeshadj(DBfile *_dbfile, const char *name, int nmesh,
}
}
- if (mmadj->lzonelists && (SILO_Globals.dataReadMask & DBMMADJZonelists))
+ if (offsetmap && offsetmapz && mmadj->lzonelists && mmadj->zonelists &&
+ mmadj->nneighbors && (SILO_Globals.dataReadMask & DBMMADJZonelists))
{
tmpoff = offsetmapz[blockno];
for (j = 0; j < mmadj->nneighbors[blockno]; j++)
@@ -12484,6 +12614,7 @@ db_hdf5_PutMultivar(DBfile *_dbfile, char *name, int nvars, char *varnames[],
m.extensive = _mm._extensive;
m.block_type = _mm._block_type;
m.empty_cnt = _mm._empty_cnt;
+ m.repr_block_idx = _mm._repr_block_idx;
/* Write meta data to file */
STRUCT(DBmultivar) {
@@ -12509,6 +12640,7 @@ db_hdf5_PutMultivar(DBfile *_dbfile, char *name, int nvars, char *varnames[],
if (m.block_type) MEMBER_S(int, block_type);
MEMBER_S(str(m.empty_list), empty_list);
if (m.empty_cnt) MEMBER_S(int, empty_cnt);
+ if (m.repr_block_idx) MEMBER_S(int, repr_block_idx);
} OUTPUT(dbfile, DB_MULTIVAR, name, &m);
/* Free resources */
@@ -12617,12 +12749,12 @@ db_hdf5_GetMultivar(DBfile *_dbfile, char *name)
/* Read the raw data variable names */
s = db_hdf5_comprd(dbfile, m.varnames, 1);
- if (s) mv->varnames = DBStringListToStringArray(s, m.nvars,
+ if (s) mv->varnames = DBStringListToStringArray(s, &m.nvars,
handleSlashSwap, !skipFirstSemicolon);
FREE(s);
s = db_hdf5_comprd(dbfile, m.region_pnames, 1);
- if (s) mv->region_pnames = DBStringListToStringArray(s, -1,
+ if (s) mv->region_pnames = DBStringListToStringArray(s, 0,
!handleSlashSwap, !skipFirstSemicolon);
FREE(s);
@@ -12631,6 +12763,7 @@ db_hdf5_GetMultivar(DBfile *_dbfile, char *name)
mv->block_type = m.block_type;
mv->empty_list = db_hdf5_comprd(dbfile, m.empty_list, 1);
mv->empty_cnt = m.empty_cnt;
+ mv->repr_block_idx = m.repr_block_idx - 1;
H5Tclose(o);
@@ -12784,6 +12917,7 @@ db_hdf5_PutMultimat(DBfile *_dbfile, char *name, int nmats, char *matnames[],
m.guihide = _mm._guihide;
strcpy(m.mmesh_name, OPT(_mm._mmesh_name));
m.empty_cnt = _mm._empty_cnt;
+ m.repr_block_idx = _mm._repr_block_idx;
/* Write meta data to file */
STRUCT(DBmultimat) {
@@ -12809,6 +12943,7 @@ db_hdf5_PutMultimat(DBfile *_dbfile, char *name, int nmats, char *matnames[],
MEMBER_S(str(m.block_ns_name), block_ns_name);
MEMBER_S(str(m.empty_list), empty_list);
if (m.empty_cnt) MEMBER_S(int, empty_cnt);
+ if (m.repr_block_idx) MEMBER_S(int, repr_block_idx);
} OUTPUT(dbfile, DB_MULTIMAT, name, &m);
/* Free resources */
@@ -12905,7 +13040,7 @@ db_hdf5_GetMultimat(DBfile *_dbfile, char *name)
mm->matlists = db_hdf5_comprd(dbfile, m.matlists, 1);
mm->matnos = db_hdf5_comprd(dbfile, m.matnos, 1);
s = db_hdf5_comprd(dbfile, m.matnames, 1);
- if (s) mm->matnames = DBStringListToStringArray(s, m.nmats,
+ if (s) mm->matnames = DBStringListToStringArray(s, &m.nmats,
handleSlashSwap, !skipFirstSemicolon);
FREE(s);
@@ -12914,10 +13049,10 @@ db_hdf5_GetMultimat(DBfile *_dbfile, char *name)
char *tmpmat_colors = db_hdf5_comprd(dbfile, m.mat_colors, 1);
if (tmpmaterial_names)
mm->material_names = DBStringListToStringArray(tmpmaterial_names,
- m.nmatnos, !handleSlashSwap, !skipFirstSemicolon);
+ &m.nmatnos, !handleSlashSwap, !skipFirstSemicolon);
if (tmpmat_colors)
mm->matcolors = DBStringListToStringArray(tmpmat_colors,
- m.nmatnos, !handleSlashSwap, !skipFirstSemicolon);
+ &m.nmatnos, !handleSlashSwap, !skipFirstSemicolon);
FREE(tmpmaterial_names);
FREE(tmpmat_colors);
}
@@ -12926,6 +13061,7 @@ db_hdf5_GetMultimat(DBfile *_dbfile, char *name)
mm->block_ns = db_hdf5_comprd(dbfile, m.block_ns_name, 1);
mm->empty_list = db_hdf5_comprd(dbfile, m.empty_list, 1);
mm->empty_cnt = m.empty_cnt;
+ mm->repr_block_idx = m.repr_block_idx - 1;
H5Tclose(o);
@@ -13075,6 +13211,7 @@ db_hdf5_PutMultimatspecies(DBfile *_dbfile, char *name, int nspec,
m.guihide = _mm._guihide;
strcpy(m.matname, OPT(_mm._matname));
m.empty_cnt = _mm._empty_cnt;
+ m.repr_block_idx = _mm._repr_block_idx;
/* Write meta data to file */
STRUCT(DBmultimatspecies) {
@@ -13096,6 +13233,7 @@ db_hdf5_PutMultimatspecies(DBfile *_dbfile, char *name, int nspec,
MEMBER_S(str(m.block_ns_name), block_ns_name);
MEMBER_S(str(m.empty_list), empty_list);
if (m.empty_cnt) MEMBER_S(int, empty_cnt);
+ if (m.repr_block_idx) MEMBER_S(int, repr_block_idx);
} OUTPUT(dbfile, DB_MULTIMATSPECIES, name, &m);
/* Free resources */
@@ -13186,7 +13324,7 @@ db_hdf5_GetMultimatspecies(DBfile *_dbfile, char *name)
/* Read the raw data */
s = db_hdf5_comprd(dbfile, m.specnames, 1);
- if (s) mm->specnames = DBStringListToStringArray(s, m.nspec,
+ if (s) mm->specnames = DBStringListToStringArray(s, &m.nspec,
handleSlashSwap, !skipFirstSemicolon);
FREE(s);
@@ -13198,7 +13336,7 @@ db_hdf5_GetMultimatspecies(DBfile *_dbfile, char *name)
{
for (i = 0; i < mm->nmat; i++)
nstrs += mm->nmatspec[i];
- mm->species_names = DBStringListToStringArray(tmpspecies_names, nstrs,
+ mm->species_names = DBStringListToStringArray(tmpspecies_names, &nstrs,
!handleSlashSwap, !skipFirstSemicolon);
}
if (tmpspeccolors)
@@ -13208,7 +13346,7 @@ db_hdf5_GetMultimatspecies(DBfile *_dbfile, char *name)
for (i = 0; i < mm->nmat; i++)
nstrs += mm->nmatspec[i];
}
- mm->speccolors = DBStringListToStringArray(tmpspeccolors, nstrs,
+ mm->speccolors = DBStringListToStringArray(tmpspeccolors, &nstrs,
!handleSlashSwap, !skipFirstSemicolon);
}
FREE(tmpspecies_names);
@@ -13219,6 +13357,7 @@ db_hdf5_GetMultimatspecies(DBfile *_dbfile, char *name)
mm->block_ns = db_hdf5_comprd(dbfile, m.block_ns_name, 1);
mm->empty_list = db_hdf5_comprd(dbfile, m.empty_list, 1);
mm->empty_cnt = m.empty_cnt;
+ mm->repr_block_idx = m.repr_block_idx;
H5Tclose(o);
@@ -13690,7 +13829,7 @@ db_hdf5_GetPointvar(DBfile *_dbfile, char *name)
pv->nels = m.nels;
pv->nvals = m.nvals;
pv->nspace = m.nspace;
- pv->ndims = 1;
+ pv->ndims = m.nvals;
pv->origin = m.origin;
pv->time = m.time;
pv->dtime = m.dtime;
@@ -13702,7 +13841,7 @@ db_hdf5_GetPointvar(DBfile *_dbfile, char *name)
pv->extensive = m.extensive;
/* Read raw data */
- if (SILO_Globals.dataReadMask & DBPVData)
+ if (SILO_Globals.dataReadMask & DBPVData && m.nvals)
{
pv->vals = calloc(m.nvals, sizeof(void*));
for (i=0; i<m.nvals; i++) {
@@ -13711,7 +13850,7 @@ db_hdf5_GetPointvar(DBfile *_dbfile, char *name)
}
s = db_hdf5_comprd(dbfile, m.region_pnames, 1);
- if (s) pv->region_pnames = DBStringListToStringArray(s, -1,
+ if (s) pv->region_pnames = DBStringListToStringArray(s, 0,
!handleSlashSwap, !skipFirstSemicolon);
FREE(s);
@@ -14002,6 +14141,7 @@ db_hdf5_InqMeshName(DBfile *_dbfile, char *name, char *meshname/*out*/)
char s[1024];
hid_t o=-1, attr=-1, type=-1, str_type=-1;
+ s[0] = '\0';
PROTECT {
/* Describe memory */
if ((str_type=H5Tcopy(H5T_C_S1))<0 ||
@@ -14025,7 +14165,6 @@ db_hdf5_InqMeshName(DBfile *_dbfile, char *name, char *meshname/*out*/)
* there is no "meshid" field in the attribute, in which case we
* haven't opened a mesh variable and we should fail.
*/
- s[0] = '\0';
if (H5Aread(attr, type, s)<0) {
db_perror(name, E_CALLFAIL, me);
UNWIND();
@@ -14062,7 +14201,7 @@ db_hdf5_InqMeshName(DBfile *_dbfile, char *name, char *meshname/*out*/)
*-------------------------------------------------------------------------
*/
SILO_CALLBACK int
-db_hdf5_PutMrgtree(DBfile *_dbfile, const char *name, const char *mesh_name,
+db_hdf5_PutMrgtree(DBfile *_dbfile, char const *name, char const *mesh_name,
DBmrgtree *tree, DBoptlist *opts)
{
DBfile_hdf5 *dbfile = (DBfile_hdf5*)_dbfile;
@@ -14290,7 +14429,7 @@ db_hdf5_PutMrgtree(DBfile *_dbfile, const char *name, const char *mesh_name,
*-------------------------------------------------------------------------
*/
SILO_CALLBACK DBmrgtree *
-db_hdf5_GetMrgtree(DBfile *_dbfile, const char *name)
+db_hdf5_GetMrgtree(DBfile *_dbfile, char const *name)
{
DBfile_hdf5 *dbfile = (DBfile_hdf5*)_dbfile;
static char *me = "db_hdf5_GetMrgtree";
@@ -14348,7 +14487,7 @@ db_hdf5_GetMrgtree(DBfile *_dbfile, const char *name)
/* Read the nodal scalar data */
intArray = db_hdf5_comprd(dbfile, m.n_scalars, 1);
- for (i = 0; i < num_nodes; i++)
+ for (i = 0; (i < num_nodes) && intArray; i++)
{
ltree[i]->narray = intArray[i*6+0];
ltree[i]->type_info_bits = intArray[i*6+1];
@@ -14361,9 +14500,9 @@ db_hdf5_GetMrgtree(DBfile *_dbfile, const char *name)
/* read the node 'name' member */
s = db_hdf5_comprd(dbfile, m.n_name, 1);
- strArray = DBStringListToStringArray(s, num_nodes,
+ strArray = DBStringListToStringArray(s, &num_nodes,
!handleSlashSwap, !skipFirstSemicolon);
- for (i = 0; i < num_nodes; i++)
+ for (i = 0; (i < num_nodes) && strArray; i++)
ltree[i]->name = strArray[i];
FREE(s);
FREE(strArray); /* free only top-level array of pointers */
@@ -14372,7 +14511,7 @@ db_hdf5_GetMrgtree(DBfile *_dbfile, const char *name)
s = db_hdf5_comprd(dbfile, m.n_names, 1);
if (s)
{
- strArray = DBStringListToStringArray(s, -1,
+ strArray = DBStringListToStringArray(s, 0,
!handleSlashSwap, !skipFirstSemicolon);
n = 0;
for (i = 0; i < num_nodes; i++)
@@ -14399,7 +14538,7 @@ db_hdf5_GetMrgtree(DBfile *_dbfile, const char *name)
/* read the maps_name data */
s = db_hdf5_comprd(dbfile, m.n_maps_name, 1);
- strArray = DBStringListToStringArray(s, num_nodes,
+ strArray = DBStringListToStringArray(s, &num_nodes,
!handleSlashSwap, !skipFirstSemicolon);
for (i = 0; i < num_nodes; i++)
ltree[i]->maps_name = strArray[i];
@@ -14409,7 +14548,7 @@ db_hdf5_GetMrgtree(DBfile *_dbfile, const char *name)
/* read the map segment id data */
intArray = db_hdf5_comprd(dbfile, m.n_seg_ids, 1);
n = 0;
- for (i = 0; i < num_nodes; i++)
+ for (i = 0; (i < num_nodes) && intArray; i++)
{
int ns = ltree[i]->nsegs*(ltree[i]->narray?ltree[i]->narray:1);
if (ns > 0)
@@ -14424,7 +14563,7 @@ db_hdf5_GetMrgtree(DBfile *_dbfile, const char *name)
/* read the map segment len data */
intArray = db_hdf5_comprd(dbfile, m.n_seg_lens, 1);
n = 0;
- for (i = 0; i < num_nodes; i++)
+ for (i = 0; (i < num_nodes) && intArray; i++)
{
int ns = ltree[i]->nsegs*(ltree[i]->narray?ltree[i]->narray:1);
if (ns > 0)
@@ -14439,7 +14578,7 @@ db_hdf5_GetMrgtree(DBfile *_dbfile, const char *name)
/* read the map segment type data */
intArray = db_hdf5_comprd(dbfile, m.n_seg_types, 1);
n = 0;
- for (i = 0; i < num_nodes; i++)
+ for (i = 0; (i < num_nodes) && intArray; i++)
{
int ns = ltree[i]->nsegs*(ltree[i]->narray?ltree[i]->narray:1);
if (ns > 0)
@@ -14454,7 +14593,7 @@ db_hdf5_GetMrgtree(DBfile *_dbfile, const char *name)
/* read the child ids */
intArray = db_hdf5_comprd(dbfile, m.n_children, 1);
n = 0;
- for (i = 0; i < num_nodes; i++)
+ for (i = 0; (i < num_nodes) && intArray; i++)
{
int nc = ltree[i]->num_children;
if (nc > 0)
@@ -14467,12 +14606,12 @@ db_hdf5_GetMrgtree(DBfile *_dbfile, const char *name)
FREE(intArray);
s = db_hdf5_comprd(dbfile, m.mrgvar_onames, 1);
- if (s) tree->mrgvar_onames = DBStringListToStringArray(s, -1,
+ if (s) tree->mrgvar_onames = DBStringListToStringArray(s, 0,
!handleSlashSwap, !skipFirstSemicolon);
FREE(s);
s = db_hdf5_comprd(dbfile, m.mrgvar_rnames, 1);
- if (s) tree->mrgvar_rnames = DBStringListToStringArray(s, -1,
+ if (s) tree->mrgvar_rnames = DBStringListToStringArray(s, 0,
!handleSlashSwap, !skipFirstSemicolon);
FREE(s);
@@ -14506,7 +14645,7 @@ db_hdf5_GetMrgtree(DBfile *_dbfile, const char *name)
*-------------------------------------------------------------------------
*/
SILO_CALLBACK int
-db_hdf5_PutGroupelmap(DBfile *_dbfile, const char *name,
+db_hdf5_PutGroupelmap(DBfile *_dbfile, char const *name,
int num_segments, int *groupel_types, int *segment_lengths,
int *segment_ids, int **segment_data, void **segment_fracs,
int fracs_data_type, DBoptlist *opts)
@@ -14626,7 +14765,7 @@ db_hdf5_PutGroupelmap(DBfile *_dbfile, const char *name,
*-------------------------------------------------------------------------
*/
SILO_CALLBACK DBgroupelmap *
-db_hdf5_GetGroupelmap(DBfile *_dbfile, const char *name)
+db_hdf5_GetGroupelmap(DBfile *_dbfile, char const *name)
{
DBfile_hdf5 *dbfile = (DBfile_hdf5*)_dbfile;
static char *me = "db_hdf5_GetGroupelmap";
@@ -14681,7 +14820,7 @@ db_hdf5_GetGroupelmap(DBfile *_dbfile, const char *name)
gm->segment_data = (int **) malloc(m.num_segments * sizeof(int*));
intArray = db_hdf5_comprd(dbfile, m.segment_data, 1);
n = 0;
- for (i = 0; i < m.num_segments; i++)
+ for (i = 0; (i < m.num_segments) && intArray && gm->segment_lengths; i++)
{
int sl = gm->segment_lengths[i];
gm->segment_data[i] = 0;
@@ -14700,7 +14839,7 @@ db_hdf5_GetGroupelmap(DBfile *_dbfile, const char *name)
gm->segment_fracs = malloc(m.num_segments * sizeof(void*));
fracsArray = db_hdf5_comprd(dbfile, m.segment_fracs, 1);
n = 0;
- for (i = 0; i < m.num_segments; i++)
+ for (i = 0; (i < m.num_segments) && fracsArray; i++)
{
int len = intArray[i];
@@ -14758,8 +14897,8 @@ db_hdf5_GetGroupelmap(DBfile *_dbfile, const char *name)
*-------------------------------------------------------------------------
*/
SILO_CALLBACK int
-db_hdf5_PutMrgvar(DBfile *_dbfile, const char *name,
- const char *mrgt_name,
+db_hdf5_PutMrgvar(DBfile *_dbfile, char const *name,
+ char const *mrgt_name,
int ncomps, char **compnames,
int nregns, char **reg_pnames,
int datatype, void **data, DBoptlist *optlist)
@@ -14783,7 +14922,7 @@ db_hdf5_PutMrgvar(DBfile *_dbfile, const char *name,
}
for (i=0; i<ncomps; i++) {
char tmpname[256];
- const char *p = tmpname;
+ char const *p = tmpname;
if (compnames)
sprintf(tmpname, "%s_%s", name, compnames[i]);
else
@@ -14849,7 +14988,7 @@ db_hdf5_PutMrgvar(DBfile *_dbfile, const char *name,
*-------------------------------------------------------------------------
*/
SILO_CALLBACK DBmrgvar *
-db_hdf5_GetMrgvar(DBfile *_dbfile, const char *name)
+db_hdf5_GetMrgvar(DBfile *_dbfile, char const *name)
{
DBfile_hdf5 *dbfile = (DBfile_hdf5*)_dbfile;
static char *me = "db_hdf5_GetMrgvar";
@@ -14906,12 +15045,12 @@ db_hdf5_GetMrgvar(DBfile *_dbfile, const char *name)
}
s = db_hdf5_comprd(dbfile, m.compnames, 1);
- if (s) mrgv->compnames = DBStringListToStringArray(s, m.ncomps,
+ if (s) mrgv->compnames = DBStringListToStringArray(s, &m.ncomps,
!handleSlashSwap, !skipFirstSemicolon);
FREE(s);
s = db_hdf5_comprd(dbfile, m.reg_pnames, 1);
- if (s) mrgv->reg_pnames = DBStringListToStringArray(s, -1,
+ if (s) mrgv->reg_pnames = DBStringListToStringArray(s, 0,
!handleSlashSwap, !skipFirstSemicolon);
FREE(s);
@@ -14929,7 +15068,7 @@ db_hdf5_GetMrgvar(DBfile *_dbfile, const char *name)
}
SILO_CALLBACK int
-db_hdf5_FreeCompressionResources(DBfile *_dbfile, const char *meshname)
+db_hdf5_FreeCompressionResources(DBfile *_dbfile, char const *meshname)
{
FreeNodelists((DBfile_hdf5*)_dbfile, meshname);
return 0;
@@ -14955,7 +15094,7 @@ typedef struct _index_offset_pair_t {
} index_offset_pair_t;
/* Support function for db_hdf5_SortObjectsByOffset */
-static int compare_index_offset_pair(const void *a1, const void *a2)
+static int compare_index_offset_pair(void const *a1, void const *a2)
{
index_offset_pair_t *p1 = (index_offset_pair_t*) a1;
index_offset_pair_t *p2 = (index_offset_pair_t*) a2;
@@ -14968,7 +15107,7 @@ static int compare_index_offset_pair(const void *a1, const void *a2)
SILO_CALLBACK int
db_hdf5_SortObjectsByOffset(DBfile *_dbfile, int nobjs,
- const char *const *const names, int *ordering)
+ char const *const *const names, int *ordering)
{
static char *me = "db_hdf5_SortObjectsByOffset";
#if HDF5_VERSION_GE(1,8,0)
diff --git a/src/hdf5_drv/silo_hdf5_private.h b/src/hdf5_drv/silo_hdf5_private.h
index d165149..cd62cef 100644
--- a/src/hdf5_drv/silo_hdf5_private.h
+++ b/src/hdf5_drv/silo_hdf5_private.h
@@ -104,8 +104,8 @@ SILO_CALLBACK int db_hdf5_Filters(DBfile *_dbfile, FILE *stream);
SILO_CALLBACK int db_hdf5_MkDir(DBfile *_dbfile, char *name);
SILO_CALLBACK int db_hdf5_SetDir(DBfile *_dbfile, char *name);
SILO_CALLBACK int db_hdf5_GetDir(DBfile *_dbfile, char *name/*out*/);
-SILO_CALLBACK int db_hdf5_CpDir(DBfile *_dbfile, const char *srcDir,
- DBfile *dstFile, const char *dstDir);
+SILO_CALLBACK int db_hdf5_CpDir(DBfile *_dbfile, char const *srcDir,
+ DBfile *dstFile, char const *dstDir);
SILO_CALLBACK int db_hdf5_NewToc(DBfile *_dbfile);
/* Variable inquiries */
@@ -129,11 +129,11 @@ SILO_CALLBACK int db_hdf5_WriteSlice (DBfile*, char*, void*, int, int[], int[],
SILO_CALLBACK DBobject *db_hdf5_GetObject(DBfile *_dbfile, char *name);
SILO_CALLBACK int db_hdf5_GetComponentNames(DBfile *_dbfile, char *objname,
char ***comp_names, char ***file_names);
-SILO_CALLBACK int db_hdf5_WriteObject(DBfile *_dbfile, DBobject *obj, int flags);
+SILO_CALLBACK int db_hdf5_WriteObject(DBfile *_dbfile, DBobject const *obj, int flags);
SILO_CALLBACK int db_hdf5_WriteComponent(DBfile *_dbfile, DBobject *obj,
- char *compname, char *prefix,
- char *datatype, const void *data, int rank,
- long _size[]);
+ char const *compname, char const *prefix,
+ char const *datatype, void const *data, int rank,
+ long const _size[]);
SILO_CALLBACK int db_hdf5_GetComponentType(DBfile *_dbfile, char *objname,
char *compname);
SILO_CALLBACK void *db_hdf5_GetComponent(DBfile *_dbfile, char *objname,
@@ -151,29 +151,29 @@ SILO_CALLBACK int db_hdf5_PutCurve(DBfile *_dbfile, char *name, void *xvals,
SILO_CALLBACK DBcurve *db_hdf5_GetCurve(DBfile *_dbfile, char *name);
/* Csgmeshes */
-SILO_CALLBACK int db_hdf5_PutCsgmesh(DBfile *_dbfile, const char *name, int ndims,
- int nbounds, const int *typeflags,
- const int *bndids/*optional*/,
- const void *coeffs, int lcoeffs, int datatype,
- const double *extents, const char *zonel_name,
+SILO_CALLBACK int db_hdf5_PutCsgmesh(DBfile *_dbfile, char const *name, int ndims,
+ int nbounds, int const *typeflags,
+ int const *bndids/*optional*/,
+ void const *coeffs, int lcoeffs, int datatype,
+ double const *extents, char const *zonel_name,
DBoptlist *optlist);
-SILO_CALLBACK DBcsgmesh *db_hdf5_GetCsgmesh(DBfile *_dbfile, const char *name);
-SILO_CALLBACK int db_hdf5_PutCsgvar(DBfile *_dbfile, const char *vname, const char *meshname,
+SILO_CALLBACK DBcsgmesh *db_hdf5_GetCsgmesh(DBfile *_dbfile, char const *name);
+SILO_CALLBACK int db_hdf5_PutCsgvar(DBfile *_dbfile, char const *vname, char const *meshname,
int nvars, char *varnames[], void *vars[],
int nvals, int datatype, int centering, DBoptlist *optlist);
-SILO_CALLBACK DBcsgvar *db_hdf5_GetCsgvar(DBfile *_dbfile, const char *name);
-SILO_CALLBACK int db_hdf5_PutCSGZonelist(DBfile *_dbfile, const char *name, int nregs,
- const int *typeflags,
- const int *leftids, const int *rightids,
- const void *xforms, int lxforms, int datatype,
- int nzones, const int *zonelist, DBoptlist *optlist);
-SILO_CALLBACK DBcsgzonelist *db_hdf5_GetCSGZonelist(DBfile *_dbfile, const char *name);
+SILO_CALLBACK DBcsgvar *db_hdf5_GetCsgvar(DBfile *_dbfile, char const *name);
+SILO_CALLBACK int db_hdf5_PutCSGZonelist(DBfile *_dbfile, char const *name, int nregs,
+ int const *typeflags,
+ int const *leftids, int const *rightids,
+ void const *xforms, int lxforms, int datatype,
+ int nzones, int const *zonelist, DBoptlist *optlist);
+SILO_CALLBACK DBcsgzonelist *db_hdf5_GetCSGZonelist(DBfile *_dbfile, char const *name);
/* Defvars */
-SILO_CALLBACK int db_hdf5_PutDefvars(DBfile *dbfile, const char *name, int ndefs,
- char *names[], const int *types,
+SILO_CALLBACK int db_hdf5_PutDefvars(DBfile *dbfile, char const *name, int ndefs,
+ char *names[], int const *types,
char *defns[], DBoptlist *opts[]);
-SILO_CALLBACK DBdefvars *db_hdf5_GetDefvars(DBfile *_dbfile, const char *name);
+SILO_CALLBACK DBdefvars *db_hdf5_GetDefvars(DBfile *_dbfile, char const *name);
/* Quadmeshes */
SILO_CALLBACK int db_hdf5_PutQuadmesh(DBfile *_dbfile, char *name,
@@ -257,18 +257,18 @@ SILO_CALLBACK int db_hdf5_PutPointvar(DBfile *_dbfile, char *name, char *meshnam
SILO_CALLBACK DBmeshvar *db_hdf5_GetPointvar(DBfile *_dbfile, char *name);
/* Multiblock meshes */
-SILO_CALLBACK int db_hdf5_PutMultimesh(DBfile *_dbfile, char *name, int nmesh,
- char *meshnames[], int meshtypes[],
- DBoptlist *optlist);
-SILO_CALLBACK int db_hdf5_PutMultimeshadj(DBfile *_dbfile, const char *name, int nmesh,
- const int *meshtypes, const int *nneighbors,
- const int *neighbors, const int *back,
- const int *lnodelists, int *nodelists[],
- const int *lzonelists, int *zonelists[],
+SILO_CALLBACK int db_hdf5_PutMultimesh(DBfile *_dbfile, char const *name, int nmesh,
+ char const *const *meshnames, int const *meshtypes,
+ DBoptlist const *optlist);
+SILO_CALLBACK int db_hdf5_PutMultimeshadj(DBfile *_dbfile, char const *name, int nmesh,
+ int const *meshtypes, int const *nneighbors,
+ int const *neighbors, int const *back,
+ int const *lnodelists, int *nodelists[],
+ int const *lzonelists, int *zonelists[],
DBoptlist *optlist);
SILO_CALLBACK DBmultimesh *db_hdf5_GetMultimesh(DBfile *_dbfile, char *name);
-SILO_CALLBACK DBmultimeshadj *db_hdf5_GetMultimeshadj(DBfile *_dbfile, const char *name, int nmesh,
- const int *block_map);
+SILO_CALLBACK DBmultimeshadj *db_hdf5_GetMultimeshadj(DBfile *_dbfile, char const *name, int nmesh,
+ int const *block_map);
SILO_CALLBACK int db_hdf5_PutMultivar(DBfile *_dbfile, char *name, int nvars,
char *varnames[], int vartypes[],
DBoptlist *optlist);
@@ -290,30 +290,30 @@ SILO_CALLBACK DBcompoundarray *db_hdf5_GetCompoundarray(DBfile *_dbfile,
char *name);
/* Mrgtree objects */
-SILO_CALLBACK int db_hdf5_PutMrgtree(DBfile *_dbfile, const char *name, const char *mesh_name,
+SILO_CALLBACK int db_hdf5_PutMrgtree(DBfile *_dbfile, char const *name, char const *mesh_name,
DBmrgtree *tree, DBoptlist *optlist);
-SILO_CALLBACK DBmrgtree *db_hdf5_GetMrgtree(DBfile *_dbfile, const char *name);
+SILO_CALLBACK DBmrgtree *db_hdf5_GetMrgtree(DBfile *_dbfile, char const *name);
/* groupel maps */
-SILO_CALLBACK int db_hdf5_PutGroupelmap(DBfile *_dbfile, const char *map_name,
+SILO_CALLBACK int db_hdf5_PutGroupelmap(DBfile *_dbfile, char const *map_name,
int num_segments, int *groupel_types, int *segment_lengths,
int *segment_ids, int **segment_data, void **segment_fracs,
int fracs_data_type, DBoptlist *opts);
-SILO_CALLBACK DBgroupelmap *db_hdf5_GetGroupelmap(DBfile *dbfile, const char *name);
+SILO_CALLBACK DBgroupelmap *db_hdf5_GetGroupelmap(DBfile *dbfile, char const *name);
/* mrgvars */
-SILO_CALLBACK int db_hdf5_PutMrgvar(DBfile *dbfile, const char *name,
- const char *mrgt_name,
+SILO_CALLBACK int db_hdf5_PutMrgvar(DBfile *dbfile, char const *name,
+ char const *mrgt_name,
int ncomps, char **compnames,
int nregns, char **reg_pnames,
int datatype, void **data, DBoptlist *opts);
-SILO_CALLBACK DBmrgvar *db_hdf5_GetMrgvar(DBfile *dbfile, const char *name);
+SILO_CALLBACK DBmrgvar *db_hdf5_GetMrgvar(DBfile *dbfile, char const *name);
SILO_CALLBACK int db_hdf5_FreeCompressionResources(DBfile *_dbfile,
- const char *meshname);
+ char const *meshname);
SILO_CALLBACK int db_hdf5_SortObjectsByOffset(DBfile *_dbfile, int nobjs,
- const char *const *const names, int *ordering);
+ char const *const *const names, int *ordering);
#endif /* !SILO_NO_CALLBACKS */
diff --git a/src/netcdf/Makefile.in b/src/netcdf/Makefile.in
index 1fb6f73..cefa03d 100644
--- a/src/netcdf/Makefile.in
+++ b/src/netcdf/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -70,8 +71,9 @@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -90,20 +92,30 @@ subdir = src/netcdf
DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/config/ax_check_compiler_flags.m4 \
+ $(top_srcdir)/config/ax_have_qt.m4 \
+ $(top_srcdir)/config/libtool.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
+ $(top_srcdir)/config/vl_lib_readline.m4 \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
LTLIBRARIES = $(noinst_LTLIBRARIES)
libsilo_netcdf_la_LIBADD =
am__objects_1 = api.lo ent.lo netcdf.lo obj.lo silo_netcdf.lo table.lo
am_libsilo_netcdf_la_OBJECTS = $(am__objects_1)
libsilo_netcdf_la_OBJECTS = $(am_libsilo_netcdf_la_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/config/depcomp
am__depfiles_maybe = depfiles
+am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -145,7 +157,8 @@ CXX_FULLPATH = @CXX_FULLPATH@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -157,6 +170,7 @@ FCFLAGS = @FCFLAGS@
FCLIBS = @FCLIBS@
FC_FULLPATH = @FC_FULLPATH@
FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FORTRAN = @FORTRAN@
FPZIP = @FPZIP@
GREP = @GREP@
@@ -167,17 +181,25 @@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
LDFLAGS = @LDFLAGS@
+LIBM = @LIBM@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
NETCDF = @NETCDF@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -187,7 +209,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PDBP_DRV = @PDBP_DRV@
PDB_DRV = @PDB_DRV@
-PRTDIAG = @PRTDIAG@
PYTHON = @PYTHON@
PYTHONMODULE = @PYTHONMODULE@
PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@
@@ -195,17 +216,13 @@ PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
PYTHON_PLATFORM = @PYTHON_PLATFORM@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
-QT_BIN = @QT_BIN@
-QT_CORE = @QT_CORE@
-QT_CORE_LIB = @QT_CORE_LIB@
QT_CXXFLAGS = @QT_CXXFLAGS@
-QT_GUI = @QT_GUI@
-QT_GUI_LIB = @QT_GUI_LIB@
-QT_INCLUDE = @QT_INCLUDE@
-QT_LDFLAGS = @QT_LDFLAGS@
-QT_LIB = @QT_LIB@
+QT_DIR = @QT_DIR@
QT_LIBS = @QT_LIBS@
+QT_LRELEASE = @QT_LRELEASE@
+QT_LUPDATE = @QT_LUPDATE@
QT_MOC = @QT_MOC@
+QT_UIC = @QT_UIC@
RANLIB = @RANLIB@
READLINE_LIBS = @READLINE_LIBS@
SED = @SED@
@@ -223,6 +240,11 @@ SILO_VERS_TAG = @SILO_VERS_TAG@
STRIP = @STRIP@
TAURUS = @TAURUS@
VERSION = @VERSION@
+XMKMF = @XMKMF@
+X_CFLAGS = @X_CFLAGS@
+X_EXTRA_LIBS = @X_EXTRA_LIBS@
+X_LIBS = @X_LIBS@
+X_PRE_LIBS = @X_PRE_LIBS@
ZLIB = @ZLIB@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
@@ -230,6 +252,7 @@ abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_F77 = @ac_ct_F77@
ac_ct_FC = @ac_ct_FC@
am__include = @am__include@
@@ -262,6 +285,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -278,6 +302,7 @@ sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
noinst_LTLIBRARIES = libsilo_netcdf.la
@@ -303,14 +328,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
- && exit 0; \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/netcdf/Makefile'; \
- cd $(top_srcdir) && \
- $(AUTOMAKE) --foreign src/netcdf/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/netcdf/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --foreign src/netcdf/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -328,6 +353,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
clean-noinstLTLIBRARIES:
-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
@@ -355,21 +381,21 @@ distclean-compile:
.c.o:
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c $<
.c.obj:
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
.c.lo:
@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
@@ -385,45 +411,49 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
+ set x; \
here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
fi
ctags: CTAGS
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
+ $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && cd $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) $$here
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -444,13 +474,17 @@ distdir: $(DISTFILES)
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
if test -d $$d/$$file; then \
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
@@ -478,6 +512,7 @@ clean-generic:
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -499,6 +534,8 @@ dvi-am:
html: html-am
+html-am:
+
info: info-am
info-am:
@@ -507,18 +544,28 @@ install-data-am:
install-dvi: install-dvi-am
+install-dvi-am:
+
install-exec-am:
install-html: install-html-am
+install-html-am:
+
install-info: install-info-am
+install-info-am:
+
install-man:
install-pdf: install-pdf-am
+install-pdf-am:
+
install-ps: install-ps-am
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-am
@@ -556,6 +603,7 @@ uninstall-am:
mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
pdf pdf-am ps ps-am tags uninstall uninstall-am
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/src/netcdf/silo_netcdf.c b/src/netcdf/silo_netcdf.c
index 56ac1d2..6db8347 100644
--- a/src/netcdf/silo_netcdf.c
+++ b/src/netcdf/silo_netcdf.c
@@ -439,7 +439,7 @@ db_cdf_NewToc(DBfile *_dbfile)
toc->nmatspecies++;
break;
case DB_ARRAY:
- toc->narrays++;
+ toc->narray++;
break;
default:
toc->nobj++;
@@ -500,8 +500,8 @@ db_cdf_NewToc(DBfile *_dbfile)
toc->matspecies_names = ALLOC_N(char *, toc->nmatspecies);
}
- if (toc->narrays > 0) {
- toc->array_names = ALLOC_N(char *, toc->narrays);
+ if (toc->narray > 0) {
+ toc->array_names = ALLOC_N(char *, toc->narray);
}
if (toc->nobj > 0) {
diff --git a/src/pdb/Makefile.am b/src/pdb/Makefile.am
index f13bd9f..f7b267e 100644
--- a/src/pdb/Makefile.am
+++ b/src/pdb/Makefile.am
@@ -55,15 +55,17 @@
noinst_LTLIBRARIES = libsilo_pdb.la
libsilo_pdb_la_SOURCES = $(FILES)
-AM_CPPFLAGS = -I$(srcdir)/../score
+AM_CPPFLAGS = -I$(top_srcdir)/src/score -I$(top_srcdir)/src/silo
-EXTRA_DIST = \
- detect.c
+EXTRA_DIST = detect.c
+
+noinst_HEADERS = pdb.h
+nodist_noinst_HEADERS = pdform.h
+
+if INSTALL_LITE_HEADERS
+nodist_include_HEADERS = lite_pdb.h
+endif
-noinst_HEADERS = \
- pdb.h
-nodist_noinst_HEADERS = \
- pdform.h
FILES = \
pdb.c \
pdbdir.c \
@@ -77,7 +79,7 @@ FILES = \
pdrdwr.c
BUILT_SOURCES = detect pdform.h
-CLEANFILES = detect pdform.h
+CLEANFILES = detect pdform.h lite_pdb.h
pdform.h: detect
@echo "/*" > $@
- at echo " * Generated by $(USER)@`hostname` on `date`" >>$@
@@ -87,3 +89,6 @@ pdform.h: detect
detect: detect.o
$(CC) $(CFLAGS) -o $@ detect.o
+
+lite_pdb.h: pdb.h
+ if test ! -e $@; then $(top_srcdir)/config/mklite $< $@; fi
diff --git a/src/pdb/Makefile.in b/src/pdb/Makefile.in
index 32a6f15..5efc63f 100644
--- a/src/pdb/Makefile.in
+++ b/src/pdb/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -70,8 +71,9 @@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -90,21 +92,31 @@ subdir = src/pdb
DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/config/ax_check_compiler_flags.m4 \
+ $(top_srcdir)/config/ax_have_qt.m4 \
+ $(top_srcdir)/config/libtool.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
+ $(top_srcdir)/config/vl_lib_readline.m4 \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
LTLIBRARIES = $(noinst_LTLIBRARIES)
libsilo_pdb_la_LIBADD =
am__objects_1 = pdb.lo pdbdir.lo pdbio.lo pdbmm.lo pdbx.lo pdconv.lo \
pdlow.lo pdmemb.lo pdpath.lo pdrdwr.lo
am_libsilo_pdb_la_OBJECTS = $(am__objects_1)
libsilo_pdb_la_OBJECTS = $(am_libsilo_pdb_la_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/config/depcomp
am__depfiles_maybe = depfiles
+am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -116,7 +128,30 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
$(LDFLAGS) -o $@
SOURCES = $(libsilo_pdb_la_SOURCES)
DIST_SOURCES = $(libsilo_pdb_la_SOURCES)
-HEADERS = $(nodist_noinst_HEADERS) $(noinst_HEADERS)
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == $(am__install_max)) \
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+ END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__installdirs = "$(DESTDIR)$(includedir)"
+HEADERS = $(nodist_include_HEADERS) $(nodist_noinst_HEADERS) \
+ $(noinst_HEADERS)
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -146,7 +181,8 @@ CXX_FULLPATH = @CXX_FULLPATH@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -158,6 +194,7 @@ FCFLAGS = @FCFLAGS@
FCLIBS = @FCLIBS@
FC_FULLPATH = @FC_FULLPATH@
FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FORTRAN = @FORTRAN@
FPZIP = @FPZIP@
GREP = @GREP@
@@ -168,17 +205,25 @@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
LDFLAGS = @LDFLAGS@
+LIBM = @LIBM@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
NETCDF = @NETCDF@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -188,7 +233,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PDBP_DRV = @PDBP_DRV@
PDB_DRV = @PDB_DRV@
-PRTDIAG = @PRTDIAG@
PYTHON = @PYTHON@
PYTHONMODULE = @PYTHONMODULE@
PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@
@@ -196,17 +240,13 @@ PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
PYTHON_PLATFORM = @PYTHON_PLATFORM@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
-QT_BIN = @QT_BIN@
-QT_CORE = @QT_CORE@
-QT_CORE_LIB = @QT_CORE_LIB@
QT_CXXFLAGS = @QT_CXXFLAGS@
-QT_GUI = @QT_GUI@
-QT_GUI_LIB = @QT_GUI_LIB@
-QT_INCLUDE = @QT_INCLUDE@
-QT_LDFLAGS = @QT_LDFLAGS@
-QT_LIB = @QT_LIB@
+QT_DIR = @QT_DIR@
QT_LIBS = @QT_LIBS@
+QT_LRELEASE = @QT_LRELEASE@
+QT_LUPDATE = @QT_LUPDATE@
QT_MOC = @QT_MOC@
+QT_UIC = @QT_UIC@
RANLIB = @RANLIB@
READLINE_LIBS = @READLINE_LIBS@
SED = @SED@
@@ -224,6 +264,11 @@ SILO_VERS_TAG = @SILO_VERS_TAG@
STRIP = @STRIP@
TAURUS = @TAURUS@
VERSION = @VERSION@
+XMKMF = @XMKMF@
+X_CFLAGS = @X_CFLAGS@
+X_EXTRA_LIBS = @X_EXTRA_LIBS@
+X_LIBS = @X_LIBS@
+X_PRE_LIBS = @X_PRE_LIBS@
ZLIB = @ZLIB@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
@@ -231,6 +276,7 @@ abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_F77 = @ac_ct_F77@
ac_ct_FC = @ac_ct_FC@
am__include = @am__include@
@@ -263,6 +309,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -279,20 +326,16 @@ sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
noinst_LTLIBRARIES = libsilo_pdb.la
libsilo_pdb_la_SOURCES = $(FILES)
-AM_CPPFLAGS = -I$(srcdir)/../score
-EXTRA_DIST = \
- detect.c
-
-noinst_HEADERS = \
- pdb.h
-
-nodist_noinst_HEADERS = \
- pdform.h
-
+AM_CPPFLAGS = -I$(top_srcdir)/src/score -I$(top_srcdir)/src/silo
+EXTRA_DIST = detect.c
+noinst_HEADERS = pdb.h
+nodist_noinst_HEADERS = pdform.h
+ at INSTALL_LITE_HEADERS_TRUE@nodist_include_HEADERS = lite_pdb.h
FILES = \
pdb.c \
pdbdir.c \
@@ -306,7 +349,7 @@ FILES = \
pdrdwr.c
BUILT_SOURCES = detect pdform.h
-CLEANFILES = detect pdform.h
+CLEANFILES = detect pdform.h lite_pdb.h
all: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) all-am
@@ -316,14 +359,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
- && exit 0; \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/pdb/Makefile'; \
- cd $(top_srcdir) && \
- $(AUTOMAKE) --foreign src/pdb/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/pdb/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --foreign src/pdb/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -341,6 +384,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
clean-noinstLTLIBRARIES:
-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
@@ -372,21 +416,21 @@ distclean-compile:
.c.o:
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c $<
.c.obj:
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
.c.lo:
@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
@@ -396,51 +440,75 @@ mostlyclean-libtool:
clean-libtool:
-rm -rf .libs _libs
+install-nodist_includeHEADERS: $(nodist_include_HEADERS)
+ @$(NORMAL_INSTALL)
+ test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
+ @list='$(nodist_include_HEADERS)'; test -n "$(includedir)" || list=; \
+ for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(includedir)'"; \
+ $(INSTALL_HEADER) $$files "$(DESTDIR)$(includedir)" || exit $$?; \
+ done
+
+uninstall-nodist_includeHEADERS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(nodist_include_HEADERS)'; test -n "$(includedir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ test -n "$$files" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(includedir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(includedir)" && rm -f $$files
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
+ set x; \
here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
fi
ctags: CTAGS
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
+ $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && cd $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) $$here
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -461,13 +529,17 @@ distdir: $(DISTFILES)
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
if test -d $$d/$$file; then \
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
@@ -476,6 +548,9 @@ check: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) check-am
all-am: Makefile $(LTLIBRARIES) $(HEADERS)
installdirs:
+ for dir in "$(DESTDIR)$(includedir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
install: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) install-am
install-exec: install-exec-am
@@ -498,6 +573,7 @@ clean-generic:
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -520,26 +596,38 @@ dvi-am:
html: html-am
+html-am:
+
info: info-am
info-am:
-install-data-am:
+install-data-am: install-nodist_includeHEADERS
install-dvi: install-dvi-am
+install-dvi-am:
+
install-exec-am:
install-html: install-html-am
+install-html-am:
+
install-info: install-info-am
+install-info-am:
+
install-man:
install-pdf: install-pdf-am
+install-pdf-am:
+
install-ps: install-ps-am
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-am
@@ -560,9 +648,9 @@ ps: ps-am
ps-am:
-uninstall-am:
+uninstall-am: uninstall-nodist_includeHEADERS
-.MAKE: install-am install-strip
+.MAKE: all check install install-am install-strip
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
clean-libtool clean-noinstLTLIBRARIES ctags distclean \
@@ -571,11 +659,12 @@ uninstall-am:
install install-am install-data install-data-am install-dvi \
install-dvi-am install-exec install-exec-am install-html \
install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-ps install-ps-am \
- install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
- pdf pdf-am ps ps-am tags uninstall uninstall-am
+ install-nodist_includeHEADERS install-pdf install-pdf-am \
+ install-ps install-ps-am install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ tags uninstall uninstall-am uninstall-nodist_includeHEADERS
pdform.h: detect
@echo "/*" > $@
@@ -586,6 +675,10 @@ pdform.h: detect
detect: detect.o
$(CC) $(CFLAGS) -o $@ detect.o
+
+lite_pdb.h: pdb.h
+ if test ! -e $@; then $(top_srcdir)/config/mklite $< $@; fi
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/src/pdb/detect.c b/src/pdb/detect.c
index ae43eb8..6024f10 100644
--- a/src/pdb/detect.c
+++ b/src/pdb/detect.c
@@ -249,6 +249,7 @@ ff[0] = szf*8;
dval = 0.0;
ddv = 1.0;
first = -1;
+last = 2;
for (j = 1; j < szd; j++)
{bodb.d[0] = dval;
diff --git a/src/pdb/pdb.c b/src/pdb/pdb.c
index 3037913..7199552 100644
--- a/src/pdb/pdb.c
+++ b/src/pdb/pdb.c
@@ -76,6 +76,8 @@ be used for advertising or product endorsement purposes.
#if HAVE_UNISTD_H
#include <unistd.h>
#endif
+#else
+#include <silo_win32_compatibility.h>
#endif
#include <assert.h>
#include "pdb.h"
@@ -101,12 +103,13 @@ char lite_PD_err[MAXLINE];
int lite_PD_buffer_size = -1;
ReaderFuncType lite_pdb_rd_hook = NULL;
WriterFuncType lite_pdb_wr_hook = NULL;
+char *lite_PD_DEF_CREATM = "w";
#ifdef PDB_WRITE
static int _append_flag = FALSE ;
data_standard *lite_REQ_STANDARD = NULL;
data_alignment *lite_REQ_ALIGNMENT = NULL;
-static syment * _PD_write (PDBfile*,char*,char*,char*,byte*,dimdes*,int);
+static syment * _PD_write (PDBfile*,char*,char*,char*,lite_SC_byte*,dimdes*,int);
#endif /* PDB_WRITE */
@@ -266,6 +269,13 @@ lite_PD_error(char *s, int n) {
* Added write capability back into the function, but it is protected
* with #ifdef PDB_WRITE.
*
+ * Mark C. Miller, Fri Apr 13 22:37:56 PDT 2012
+ * Changed mode string checks to strchr to accomodate wider variety
+ * of mode characters for new hash table size and open modes.
+ *
+ * Mark C. Miller, Thu Jun 14 13:25:02 PDT 2012
+ * Remove call to io_close in ABORT case. The file pointer may not
+ * have been properly initialized.
*-------------------------------------------------------------------------
*/
PDBfile *
@@ -280,14 +290,14 @@ lite_PD_open (char *name, char *mode) {
/*
* If opened in write mode use PD_CREATE instead.
*/
- if (*mode == 'w') return lite_PD_create (name);
+ if (strchr(mode,'w')) return lite_PD_create (name);
#else
- assert (!strcmp(mode,"r")) ;
+ assert (!strchr(mode,'r')) ;
#endif
switch (setjmp(_lite_PD_open_err)) {
case ABORT:
- io_close(fp);
+ if (fp) io_close(fp);
return(NULL);
case ERR_FREE:
return(file);
@@ -304,7 +314,7 @@ lite_PD_open (char *name, char *mode) {
#ifdef PDB_WRITE
fp = io_open(str, BINARY_MODE_RPLUS);
if (fp == NULL) {
- if (*mode == 'r') {
+ if (strchr(mode,'r')) {
#endif
fp = io_open(str, BINARY_MODE_R);
if (fp == NULL) {
@@ -312,7 +322,7 @@ lite_PD_open (char *name, char *mode) {
PD_OPEN);
}
#ifdef PDB_WRITE
- } else if (*mode == 'a') {
+ } else if (strchr(mode,'a')) {
return lite_PD_create (name);
} else {
lite_PD_error("CAN'T OPEN FILE - PD_OPEN", PD_OPEN);
@@ -326,13 +336,13 @@ lite_PD_open (char *name, char *mode) {
}
}
- file = _lite_PD_mk_pdb(str);
+ file = _lite_PD_mk_pdb(str, mode);
if (file == NULL) {
lite_PD_error("CAN'T ALLOCATE PDBFILE - PD_OPEN", PD_OPEN);
}
file->stream = fp;
#ifdef PDB_WRITE
- if (*mode == 'a') file->mode = PD_APPEND;
+ if (strchr(mode,'a')) file->mode = PD_APPEND;
else file->mode = PD_OPEN;
#else
file->mode = PD_OPEN ;
@@ -553,7 +563,7 @@ lite_PD_open (char *name, char *mode) {
*-------------------------------------------------------------------------
*/
int
-lite_PD_read (PDBfile *file, char *name, byte *vr) {
+lite_PD_read (PDBfile *file, char *name, lite_SC_byte *vr) {
return lite_PD_read_as (file, name, NULL, vr);
}
@@ -582,7 +592,7 @@ lite_PD_read (PDBfile *file, char *name, byte *vr) {
*-------------------------------------------------------------------------
*/
int
-lite_PD_read_alt (PDBfile *file, char *name, byte *vr, long *ind) {
+lite_PD_read_alt (PDBfile *file, char *name, lite_SC_byte *vr, long *ind) {
return lite_PD_read_as_alt (file, name, NULL, vr, ind) ;
}
@@ -610,7 +620,7 @@ lite_PD_read_alt (PDBfile *file, char *name, byte *vr, long *ind) {
*-------------------------------------------------------------------------
*/
int
-lite_PD_read_as (PDBfile *file, char *name, char *type, byte *vr) {
+lite_PD_read_as (PDBfile *file, char *name, char *type, lite_SC_byte *vr) {
int err;
syment *ep;
@@ -631,7 +641,8 @@ lite_PD_read_as (PDBfile *file, char *name, char *type, byte *vr) {
*/
ep = _lite_PD_effective_ep(file, name, TRUE, fullpath);
if (ep == NULL) {
- sprintf(msg, "UNREADABLE OR MISSING ENTRY \"%s\" - PD_READ_AS",fullpath);
+ if (snprintf(msg, sizeof(msg), "UNREADABLE OR MISSING ENTRY \"%s\" - PD_READ_AS",fullpath) >= sizeof(msg))
+ msg[sizeof(msg)-1] = '\0';
lite_PD_error(msg, PD_READ);
}
@@ -671,7 +682,7 @@ lite_PD_read_as (PDBfile *file, char *name, char *type, byte *vr) {
*-------------------------------------------------------------------------
*/
int
-lite_PD_read_as_alt (PDBfile *file, char *name, char *type, byte *vr,
+lite_PD_read_as_alt (PDBfile *file, char *name, char *type, lite_SC_byte *vr,
long *ind) {
char fullpath[MAXLINE];
@@ -780,7 +791,7 @@ lite_PD_typedef (PDBfile *file, char *oname, char *tname) {
*/
#ifdef PDB_WRITE
int
-lite_PD_write (PDBfile *file, char *name, char *type, byte *vr) {
+lite_PD_write (PDBfile *file, char *name, char *type, lite_SC_byte *vr) {
return lite_PD_write_as (file, name, type, type, vr) ;
}
@@ -808,7 +819,7 @@ lite_PD_write (PDBfile *file, char *name, char *type, byte *vr) {
#ifdef PDB_WRITE
int
lite_PD_write_as (PDBfile *file, char *name, char *intype, char *outtype,
- byte *vr) {
+ lite_SC_byte *vr) {
syment *ep;
dimdes *dims;
@@ -852,7 +863,7 @@ lite_PD_write_as (PDBfile *file, char *name, char *intype, char *outtype,
*/
#ifdef PDB_WRITE
int
-lite_PD_write_alt (PDBfile *file, char *name, char *type, byte *vr, int nd,
+lite_PD_write_alt (PDBfile *file, char *name, char *type, lite_SC_byte *vr, int nd,
long *ind) {
return lite_PD_write_as_alt (file, name, type, type, vr, nd, ind) ;
@@ -891,7 +902,7 @@ lite_PD_write_alt (PDBfile *file, char *name, char *type, byte *vr, int nd,
#ifdef PDB_WRITE
int
lite_PD_write_as_alt (PDBfile *file, char *name, char *intype, char *outtype,
- byte *vr, int nd, long *ind) {
+ lite_SC_byte *vr, int nd, long *ind) {
int i;
long start, stop, step, leng;
char expr[MAXLINE], index[MAXLINE], hname[MAXLINE];
@@ -967,7 +978,7 @@ lite_PD_write_as_alt (PDBfile *file, char *name, char *intype, char *outtype,
#ifdef PDB_WRITE
static syment *
_PD_write (PDBfile *file, char *name, char *intype, char *outtype,
- byte *vr, dimdes *dims, int appnd) {
+ lite_SC_byte *vr, dimdes *dims, int appnd) {
int reset;
syment *ep;
@@ -1027,9 +1038,6 @@ _PD_write (PDBfile *file, char *name, char *intype, char *outtype,
*/
addr = PD_entry_address(ep);
_lite_PD_rl_dimensions(dims);
-#if 0
- number = PD_entry_number(ep);
-#endif
lname = fullpath;
reset = FALSE;
} else {
@@ -1111,6 +1119,12 @@ _PD_write (PDBfile *file, char *name, char *intype, char *outtype,
*
* Modifications:
*
+ * Mark C. Miller, Fri Apr 13 22:39:29 PDT 2012
+ * Pass default creation mode options to PD_mk_pdb().
+ *
+ * Mark C. Miller, Thu Jun 14 13:25:02 PDT 2012
+ * Remove call to io_close in ABORT case. The file pointer may not
+ * have been properly initialized.
*-------------------------------------------------------------------------
*/
#ifdef PDB_WRITE
@@ -1125,7 +1139,7 @@ lite_PD_create (char *name) {
switch (setjmp(_lite_PD_create_err)) {
case ABORT:
- io_close(fp);
+ if (fp) io_close(fp);
return(NULL);
case ERR_FREE:
return(file);
@@ -1137,7 +1151,8 @@ lite_PD_create (char *name) {
/*
* Open the file.
*/
- strcpy(str, name);
+ strncpy(str, name, sizeof(str));
+ str[sizeof(str)-1] = '\0';
fp = io_open(str, BINARY_MODE_WPLUS);
if (!fp) lite_PD_error("CAN'T CREATE FILE - PD_CREATE", PD_CREATE);
@@ -1150,7 +1165,7 @@ lite_PD_create (char *name) {
/*
* Make the PDBfile.
*/
- file = _lite_PD_mk_pdb(str);
+ file = _lite_PD_mk_pdb(str, lite_PD_DEF_CREATM);
if (file == NULL) {
lite_PD_error("CAN'T ALLOCATE PDBFILE - PD_CREATE", PD_OPEN);
}
@@ -1603,14 +1618,14 @@ lite_PD_defent_alt (PDBfile *file, char *name, char *outtype,
prev = next;
}
- return _lite_PD_defent (file, name, outtype, number, dims);
+ return lite_PD_defent (file, name, outtype, number, dims);
}
#endif /* PDB_WRITE */
/*-------------------------------------------------------------------------
- * Function: _lite_PD_defent
+ * Function: lite_PD_defent
*
* Purpose: Define an entry in the PDB file symbol table and
* stake out the disk space but write nothing.
@@ -1629,7 +1644,7 @@ lite_PD_defent_alt (PDBfile *file, char *name, char *outtype,
*/
#ifdef PDB_WRITE
syment *
-_lite_PD_defent (PDBfile *file, char *name, char *outtype, long number,
+lite_PD_defent (PDBfile *file, char *name, char *outtype, long number,
dimdes *dims) {
long addr, bytespitem;
@@ -1737,9 +1752,25 @@ long lite_PD_get_file_length(PDBfile *file) {
*-------------------------------------------------------------------------
*/
#ifdef PDB_WRITE
+int lite_PD_append(PDBfile *file, char *name, void *vr) {
+ _append_flag = TRUE;
+ return(lite_PD_write_as(file, name, NULL, NULL, vr));
+}
+
int lite_PD_append_alt(PDBfile *file, char *name, void *vr, int nd, long *ind) {
- _append_flag = TRUE;
- return(lite_PD_write_as_alt(file, name, NULL, NULL, vr, nd, ind));
+ _append_flag = TRUE;
+ return(lite_PD_write_as_alt(file, name, NULL, NULL, vr, nd, ind));
+}
+
+int lite_PD_append_as(PDBfile *file, char *name, char *intype, void *vr) {
+ _append_flag = TRUE;
+ return(lite_PD_write_as(file, name, intype, NULL, vr));
+}
+
+int lite_PD_append_as_alt(PDBfile *file, char *name, char *intype,
+ void *vr, int nd, long *ind) {
+ _append_flag = TRUE;
+ return(lite_PD_write_as_alt(file, name, intype, NULL, vr, nd, ind));
}
#endif /* PDB_WRITE */
diff --git a/src/pdb/pdb.h b/src/pdb/pdb.h
index ce26c69..e938a4a 100644
--- a/src/pdb/pdb.h
+++ b/src/pdb/pdb.h
@@ -59,6 +59,10 @@ be used for advertising or product endorsement purposes.
*
*/
+#ifdef PCK_PDB
+#error CANNOT INCLUDE PDB PROPER AND PDB LITE HEADERS IN SAME COMPILATION MODULE
+#endif
+
#ifndef _PDB_H
#define _PDB_H
@@ -66,6 +70,12 @@ be used for advertising or product endorsement purposes.
#include <stdio.h>
#include "score.h" /* For type definitions */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* INSERT FUNCTION NAME MAPPING MACROS HERE */
+
/* The MAXLINE macro is defined in score.h and taken from stdio.h's */
/* FILENAME_MAX. HP's is only 14, so correct that here. */
@@ -265,6 +275,7 @@ struct s_PDBfile {
long headaddr;
long symtaddr;
long chrtaddr;
+ int ignore_apersand_ptr_ia_syms;
};
typedef struct s_PDBfile PDBfile;
@@ -397,7 +408,7 @@ typedef struct s_dimind dimind;
struct s_attribute {
char *name;
char *type;
- byte **data;
+ lite_SC_byte **data;
long size;
long indx;
};
@@ -449,6 +460,7 @@ extern jmp_buf _lite_PD_trace_err ;
extern char lite_PD_err[] ;
extern int lite_PD_buffer_size ;
extern int lite_FORMAT_FIELDS ;
+extern char* lite_PD_DEF_CREATM;
extern data_standard lite_IEEEA_STD ;
extern data_standard lite_IEEEB_STD ;
extern data_standard lite_INTELA_STD ;
@@ -464,85 +476,86 @@ extern data_alignment lite_RS6000_ALIGNMENT ;
extern data_alignment lite_MIPS_ALIGNMENT ;
extern data_alignment lite_DEF_ALIGNMENT ;
extern data_alignment *lite_INT_ALIGNMENT ;
-extern ReaderFuncType lite_pdb_rd_hook;
-extern WriterFuncType lite_pdb_wr_hook;
+extern ReaderFuncType lite_pdb_rd_hook ; /* NOT_LITE_API */
+extern WriterFuncType lite_pdb_wr_hook ; /* NOT_LITE_API */
/*--------------------------------------------------------------------------*/
/* PDBLIB FUNCTIONS */
/*--------------------------------------------------------------------------*/
-SILO_API extern int lite_PD_cd (PDBfile*,char*);
-SILO_API extern int lite_PD_close (PDBfile*);
-SILO_API extern int lite_PD_convert (char**,char**,char*,char*,long,
- data_standard*,data_standard*,
- data_standard*,long*,long*,HASHTAB*,
- HASHTAB*,int,int);
-SILO_API extern dimdes *lite_PD_copy_dims (dimdes*);
-SILO_API extern memdes *lite_PD_copy_members (memdes*);
-SILO_API extern syment *lite_PD_copy_syment (syment*);
-SILO_API extern defstr *lite_PD_defncv (PDBfile*,char*,long,int);
-SILO_API extern char * lite_PD_dereference (char*);
-SILO_API extern void lite_PD_error (char*,int);
-SILO_API extern byte * lite_PD_get_attribute (PDBfile*,char*,char*);
-SILO_API extern long lite_PD_hyper_number (PDBfile*,char*,syment*);
-SILO_API extern syment *lite_PD_inquire_entry (PDBfile*,char*,int,char*);
-SILO_API extern char ** lite_PD_ls (PDBfile*,char*,char*,int*);
-SILO_API extern PDBfile *lite_PD_open (char*,char*);
-SILO_API extern char * lite_PD_pwd (PDBfile*);
-SILO_API extern int lite_PD_read (PDBfile*,char*,byte*);
-SILO_API extern int lite_PD_read_alt (PDBfile*,char*,byte*,long*);
-SILO_API extern int lite_PD_read_as (PDBfile*,char*,char*,byte*);
-SILO_API extern int lite_PD_read_as_alt (PDBfile*,char*,char*,byte*,long*);
-SILO_API extern defstr *lite_PD_typedef (PDBfile*,char*,char*);
+LITE_API extern int lite_PD_cd (PDBfile*,char*);
+LITE_API extern int lite_PD_close (PDBfile*);
+LITE_API extern int lite_PD_convert (char**,char**,char*,char*,long, data_standard*,data_standard*, data_standard*,long*,long*,HASHTAB*, HASHTAB*,int,int);
+LITE_API extern dimdes *lite_PD_copy_dims (dimdes*);
+LITE_API extern memdes *lite_PD_copy_members (memdes*);
+LITE_API extern syment *lite_PD_copy_syment (syment*);
+LITE_API extern defstr *lite_PD_defncv (PDBfile*,char*,long,int);
+LITE_API extern char * lite_PD_dereference (char*);
+LITE_API extern void lite_PD_error (char*,int);
+LITE_API extern lite_SC_byte * lite_PD_get_attribute (PDBfile*,char*,char*);
+LITE_API extern long lite_PD_hyper_number (PDBfile*,char*,syment*);
+LITE_API extern syment *lite_PD_inquire_entry (PDBfile*,char*,int,char*);
+LITE_API extern char ** lite_PD_ls (PDBfile*,char*,char*,int*);
+LITE_API extern PDBfile *lite_PD_open (char*,char*);
+LITE_API extern char * lite_PD_pwd (PDBfile*);
+LITE_API extern int lite_PD_read (PDBfile*,char*,lite_SC_byte*);
+LITE_API extern int lite_PD_read_alt (PDBfile*,char*,lite_SC_byte*,long*);
+LITE_API extern int lite_PD_read_as (PDBfile*,char*,char*,lite_SC_byte*);
+LITE_API extern int lite_PD_read_as_alt (PDBfile*,char*,char*,lite_SC_byte*,long*);
+LITE_API extern defstr *lite_PD_typedef (PDBfile*,char*,char*);
+/* added 26Feb08 as per request from Burl Hall */
+LITE_API extern int lite_PD_entry_number (syment*); /* NOT_LITE_API */
+LITE_API extern long lite_PD_get_file_length (PDBfile *file);
+
extern int _lite_PD_align (long,char*,HASHTAB*,int*);
extern void _lite_PD_check_casts (HASHTAB*,char**,long);
extern void _lite_PD_clr_table (HASHTAB*,FreeFuncType);
extern long _lite_PD_comp_num (dimdes*);
extern int _lite_PD_compare_std (data_standard*,data_standard*,
data_alignment*,data_alignment*);
-extern int _lite_PD_convert (char**,char**,long,int,defstr*,
+LITE_API extern int _lite_PD_convert (char**,char**,long,int,defstr*,
defstr*,data_standard*,long*,long*);
-extern void _lite_PD_convert_ascii (char*,char*,long,int,int);
-extern data_alignment * _lite_PD_copy_alignment (data_alignment*);
-extern data_standard * _lite_PD_copy_standard (data_standard*);
-extern void _lite_PD_d_install (char*,defstr*,HASHTAB*);
-extern defstr * _lite_PD_defstr_inst (char*,memdes*,int,int*,long*,
+LITE_API extern void _lite_PD_convert_ascii (char*,char*,long,int,int);
+LITE_API extern data_alignment * _lite_PD_copy_alignment (data_alignment*);
+LITE_API extern data_standard * _lite_PD_copy_standard (data_standard*);
+LITE_API extern void _lite_PD_d_install (char*,defstr*,HASHTAB*);
+LITE_API extern defstr * _lite_PD_defstr_inst (char*,memdes*,int,int*,long*,
HASHTAB*,HASHTAB*,
data_alignment*,
data_alignment*,int);
-extern void _lite_PD_e_install (char*,syment*,HASHTAB*);
-extern syment * _lite_PD_effective_ep (PDBfile*,char*,int,char*);
-extern dimdes * _lite_PD_ex_dims (char*,int,int);
-extern long _lite_PD_extract_field (char*,int,int,int,int*);
-extern void _lite_PD_fconvert (char**,char**,long,int,long*,int*,
+LITE_API extern void _lite_PD_e_install (char*,syment*,HASHTAB*);
+LITE_API extern syment * _lite_PD_effective_ep (PDBfile*,char*,int,char*);
+LITE_API extern dimdes * _lite_PD_ex_dims (char*,int,int);
+LITE_API extern long _lite_PD_extract_field (char*,int,int,int,int*);
+LITE_API extern void _lite_PD_fconvert (char**,char**,long,int,long*,int*,
long*,int*,int,int,int);
-extern char * _lite_PD_fixname (PDBfile*,char*);
-extern long _lite_PD_hyper_number (PDBfile*,char*,long,dimdes*,
+LITE_API extern char * _lite_PD_fixname (PDBfile*,char*);
+LITE_API extern long _lite_PD_hyper_number (PDBfile*,char*,long,dimdes*,
long*);
-extern int _lite_PD_hyper_read (PDBfile*,char*,char*,syment*,
- byte*);
-extern void _lite_PD_iconvert (char**,char**,long,long,int,long,
+LITE_API extern int _lite_PD_hyper_read (PDBfile*,char*,char*,syment*,
+ lite_SC_byte*);
+LITE_API extern void _lite_PD_iconvert (char**,char**,long,long,int,long,
int,int);
-extern int _lite_PD_indexed_read_as (PDBfile*,char*,char*,byte*,
+extern int _lite_PD_indexed_read_as (PDBfile*,char*,char*,lite_SC_byte*,
int,long*,syment*);
-extern int _lite_PD_indirection (char*);
-extern void _lite_PD_init_chrt (PDBfile*);
-extern void _lite_PD_init_dimind (dimind*,long,long,char*);
-extern long _lite_PD_lookup_size (char*,HASHTAB*);
-extern defstr * _lite_PD_lookup_type (char*,HASHTAB*);
-extern char * _lite_PD_member_base_type (char*);
-extern long _lite_PD_member_items (char*);
-extern long _lite_PD_member_location (char*,HASHTAB*,defstr*,
+LITE_API extern int _lite_PD_indirection (char*);
+LITE_API extern void _lite_PD_init_chrt (PDBfile*);
+LITE_API extern void _lite_PD_init_dimind (dimind*,long,long,char*);
+LITE_API extern long _lite_PD_lookup_size (char*,HASHTAB*);
+LITE_API extern defstr * _lite_PD_lookup_type (char*,HASHTAB*);
+LITE_API extern char * _lite_PD_member_base_type (char*);
+LITE_API extern long _lite_PD_member_items (char*);
+LITE_API extern long _lite_PD_member_location (char*,HASHTAB*,defstr*,
memdes**);
-extern char * _lite_PD_member_name (char*);
-extern char * _lite_PD_member_type (char*);
-extern data_alignment * _lite_PD_mk_alignment (char*);
-extern defstr * _lite_PD_mk_defstr (char*,memdes*,long,int,int,int,
+LITE_API extern char * _lite_PD_member_name (char*);
+LITE_API extern char * _lite_PD_member_type (char*);
+LITE_API extern data_alignment * _lite_PD_mk_alignment (char*);
+LITE_API extern defstr * _lite_PD_mk_defstr (char*,memdes*,long,int,int,int,
int*,long*);
extern memdes * _lite_PD_mk_descriptor (char*,int);
extern dimdes * _lite_PD_mk_dimensions (long,long);
-extern PDBfile * _lite_PD_mk_pdb (char*);
+extern PDBfile * _lite_PD_mk_pdb (char*, const char*);
extern data_standard * _lite_PD_mk_standard (void);
extern syment * _lite_PD_mk_syment (char*,long,long,symindir*,dimdes*);
extern int _lite_PD_null_pointer (char*,int);
@@ -555,7 +568,7 @@ extern int _lite_PD_rd_extras (PDBfile*);
extern int _lite_PD_rd_format (PDBfile*);
extern int _lite_PD_rd_itag (PDBfile*,PD_itag*);
extern void _lite_PD_rd_prim_extras (PDBfile*,int,int,char*);
-extern long _lite_PD_rd_syment (PDBfile*,syment*,char*,byte*);
+extern long _lite_PD_rd_syment (PDBfile*,syment*,char*,lite_SC_byte*);
extern int _lite_PD_rd_symt (PDBfile*);
extern char * _lite_PD_rfgets (char*,int,FILE*);
extern void _lite_PD_rl_alignment (data_alignment*);
@@ -569,53 +582,55 @@ extern void _lite_PD_rl_syment_d (syment*);
extern void _lite_PD_setup_chart (HASHTAB*,data_standard*,
data_standard*,data_alignment*,
data_alignment*,int);
-extern long _lite_PD_skip_over (PDBfile*,long,int);
-extern long _lite_PD_str_size (memdes*,HASHTAB*);
-extern int _lite_PD_unp_bits (char*,char*,int,int,int,int,long,
+LITE_API extern long _lite_PD_skip_over (PDBfile*,long,int);
+LITE_API extern long _lite_PD_str_size (memdes*,HASHTAB*);
+LITE_API extern int _lite_PD_unp_bits (char*,char*,int,int,int,int,long,
long);
-/* added 26Feb08 as per request from Burl Hall */
-SILO_API extern int lite_PD_entry_number(syment*);
-SILO_API extern long lite_PD_get_file_length(PDBfile *file);
-
-extern char *lite_PD_SYMENT_S;
-extern char *lite_PD_DEFSTR_S;
+LITE_API extern char *lite_PD_SYMENT_S;
+LITE_API extern char *lite_PD_DEFSTR_S;
#ifdef PDB_WRITE
-SILO_API extern int lite_PD_mkdir (PDBfile*,char*);
-SILO_API extern int lite_PD_write (PDBfile*,char*,char*,byte*);
-SILO_API extern int lite_PD_write_as (PDBfile*,char*,char*,char*,byte*);
-SILO_API extern int lite_PD_write_alt (PDBfile*,char*,char*,byte*,int,
- long*);
-SILO_API extern int lite_PD_write_as_alt (PDBfile*,char*,char*,char*,byte*,
- int,long*);
-SILO_API extern PDBfile *lite_PD_create (char*);
+LITE_API extern int lite_PD_mkdir (PDBfile*,char*);
+LITE_API extern int lite_PD_write (PDBfile*,char*,char*,lite_SC_byte*);
+LITE_API extern int lite_PD_write_as (PDBfile*,char*,char*,char*,lite_SC_byte*);
+LITE_API extern int lite_PD_write_alt (PDBfile*,char*,char*,lite_SC_byte*,int, long*);
+LITE_API extern int lite_PD_write_as_alt (PDBfile*,char*,char*,char*,lite_SC_byte*, int,long*);
+LITE_API extern PDBfile *lite_PD_create (char*);
+LITE_API extern defstr *lite_PD_defstr (PDBfile*,char*,...);
+LITE_API extern int lite_PD_cast (PDBfile*,char*,char*,char*);
+LITE_API extern int lite_PD_target (data_standard*,data_alignment*);
+LITE_API extern int lite_PD_flush (PDBfile*);
+LITE_API extern syment *lite_PD_defent (PDBfile*,char*,char*,long,dimdes*);
+LITE_API extern syment *lite_PD_defent_alt (PDBfile*,char*,char*,int,long*);
+/* added 26Feb08 as per request from Burl Hall */
+LITE_API extern void lite_PD_set_major_order (PDBfile*,int); /* NOT_LITE_API */
+LITE_API extern int lite_PD_append_alt (PDBfile*,char*,void*,int,long*);
+/* added 08May12 to compile pdbtst.c */
+LITE_API extern int lite_PD_append(PDBfile *file, char *name, void *vr);
+LITE_API extern int lite_PD_append_as(PDBfile *file, char *name, char *intype, void *vr);
+LITE_API extern int lite_PD_append_as_alt(PDBfile *file, char *name, char *intype, void *vr, int nd, long *ind);
+
extern int _lite_PD_adj_dimensions (PDBfile*,char*,syment*);
extern int _lite_PD_add_block (PDBfile*,syment*,dimdes*);
-extern int _lite_PD_hyper_write (PDBfile*,char*,syment*,byte*,
- char*);
+extern int _lite_PD_hyper_write (PDBfile*,char*,syment*,lite_SC_byte*, char*);
extern void _lite_PD_convert_attrtab (PDBfile*);
extern int _lite_PD_wr_format (PDBfile*);
-SILO_API extern defstr *lite_PD_defstr (PDBfile*,char*,...);
-SILO_API extern int lite_PD_cast (PDBfile*,char*,char*,char*);
extern int _lite_PD_extend_file (PDBfile*,long);
extern long _lite_PD_wr_syment (PDBfile*,char*,long,char*,char*);
-extern long _lite_PD_number_refd (byte*,char*,HASHTAB*);
+extern long _lite_PD_number_refd (lite_SC_byte*,char*,HASHTAB*);
extern int _lite_PD_wr_itag (PDBfile*,long,char*,long,int);
extern void _lite_PD_eod (PDBfile*);
-SILO_API extern int lite_PD_target (data_standard*,data_alignment*);
-SILO_API extern int lite_PD_flush (PDBfile*);
extern long _lite_PD_wr_chrt (PDBfile*);
extern long _lite_PD_wr_symt (PDBfile*);
extern int _lite_PD_wr_extras (PDBfile*);
extern int _lite_PD_rev_chrt (PDBfile*);
extern void _lite_PD_wr_prim_extras (FILE*,HASHTAB*,int,int);
-SILO_API extern syment *lite_PD_defent_alt (PDBfile*,char*,char*,int,long*);
-extern syment *_lite_PD_defent (PDBfile*,char*,char*,long,dimdes*);
-/* added 26Feb08 as per request from Burl Hall */
-SILO_API extern int lite_PD_append_alt(PDBfile*,char*,void*,int,long*);
-SILO_API extern void lite_PD_set_major_order(PDBfile*,int);
#endif /* PDB_WRITE */
+#ifdef __cplusplus
+}
+#endif
+
#endif /* !_PDB_H */
diff --git a/src/pdb/pdbdir.c b/src/pdb/pdbdir.c
index 0a6f419..f6f05f7 100644
--- a/src/pdb/pdbdir.c
+++ b/src/pdb/pdbdir.c
@@ -339,8 +339,10 @@ lite_PD_pwd(PDBfile *file) {
(strcmp(file->current_prefix, "/") == 0)) {
strcpy(cwd, "/");
} else {
+ int cwdlen;
strcpy(cwd, file->current_prefix);
- cwd[strlen(cwd) - 1] = '\0';
+ cwdlen = strlen(cwd);
+ cwd[cwdlen?cwdlen-1:0] = '\0';
}
return(cwd);
}
@@ -400,8 +402,9 @@ _lite_PD_fixname (PDBfile *file, char *inname) {
*/
if (strcmp("/", outname) != 0) {
char *s;
- if (outname[strlen(outname) - 1] == '/') {
- outname[strlen(outname) - 1] = '\0';
+ int onlen = strlen(outname);
+ if (outname[onlen?onlen-1:0] == '/') {
+ outname[onlen?onlen-1:0] = '\0';
}
s = strrchr(outname, '/');
if (s != NULL) s[0] = '\0';
@@ -410,8 +413,8 @@ _lite_PD_fixname (PDBfile *file, char *inname) {
/*
* Append to end of current path.
*/
- if ((strlen(outname) == 0) ||
- (outname[strlen(outname) - 1] != '/'))
+ int onlen = strlen(outname);
+ if ((onlen == 0) || (outname[onlen-1] != '/'))
strcat(outname, "/");
strcat(outname, node);
}
@@ -420,7 +423,8 @@ _lite_PD_fixname (PDBfile *file, char *inname) {
if ((strlen(inname) > 0) &&
(inname[strlen(inname) - 1] == '/') &&
- (outname[strlen(outname) - 1] != '/'))
+ ((strlen(outname) == 0) ||
+ (outname[strlen(outname) - 1] != '/')))
strcat(outname, "/");
}
@@ -506,7 +510,8 @@ lite_PD_mkdir (PDBfile *file, char *dirname) {
if (s != NULL) {
s[1] = '\0';
if (lite_PD_inquire_entry(file, head, FALSE, NULL) == NULL) {
- head[strlen(head) - 1] = '\0';
+ int hlen = strlen(head);
+ head[hlen?hlen-1:0] = '\0';
sprintf(lite_PD_err, "ERROR: DIRECTORY %s DOES NOT EXIST - "
"PD_MKDIR\n", head);
return(FALSE);
diff --git a/src/pdb/pdbmm.c b/src/pdb/pdbmm.c
index 125dfe3..dcb487a 100644
--- a/src/pdb/pdbmm.c
+++ b/src/pdb/pdbmm.c
@@ -82,12 +82,16 @@ be used for advertising or product endorsement purposes.
* Remove unnecessary calls to lite_SC_mark, since reference count now
* set when allocated.
*
+ * Mark C. Miller, Fri Apr 13 22:35:57 PDT 2012
+ * Added options arg and S,M,L,XL hash table size options. Added
+ * ignore_apersand_ia_ptr_syms option.
*-------------------------------------------------------------------------
*/
PDBfile *
-_lite_PD_mk_pdb (char *name) {
+_lite_PD_mk_pdb (char *name, const char *options) {
PDBfile *file;
+ int symtsz = HSZMEDIUM;
file = FMAKE(PDBfile, "_PD_MK_PDB:file");
if (file == NULL) return(NULL);
@@ -96,7 +100,13 @@ _lite_PD_mk_pdb (char *name) {
file->name = lite_SC_strsavef(name, "char*:_PD_MK_PDB:name");
file->type = NULL;
- file->symtab = lite_SC_make_hash_table(HSZLARGE, NODOC);
+ if (strchr(options, 's')) symtsz = HSZSMALL;
+ else if (strchr(options, 'm')) symtsz = HSZMEDIUM;
+ else if (strchr(options, 'l')) symtsz = HSZLARGE;
+ else if (strchr(options, 'x')) symtsz = HSZXLARGE;
+ else symtsz = HSZMEDIUM;
+
+ file->symtab = lite_SC_make_hash_table(symtsz, NODOC);
file->chart = lite_SC_make_hash_table(1, NODOC);
file->host_chart = lite_SC_make_hash_table(1, NODOC);
file->attrtab = NULL;
@@ -122,6 +132,9 @@ _lite_PD_mk_pdb (char *name) {
file->chrtaddr = 0L;
file->headaddr = 0L;
+ file->ignore_apersand_ptr_ia_syms = 0;
+ if (strchr(options, 'i')) file->ignore_apersand_ptr_ia_syms = 1;
+
return(file);
}
diff --git a/src/pdb/pdbx.c b/src/pdb/pdbx.c
index 36c9d91..81e4a21 100644
--- a/src/pdb/pdbx.c
+++ b/src/pdb/pdbx.c
@@ -78,9 +78,9 @@ be used for advertising or product endorsement purposes.
*
*-------------------------------------------------------------------------
*/
-byte *
+lite_SC_byte *
lite_PD_get_attribute (PDBfile *file, char *vr, char *at) {
- byte *vl, **data;
+ lite_SC_byte *vl, **data;
attribute *attr;
attribute_value *avl;
char fullname[MAXLINE];
@@ -147,7 +147,7 @@ _lite_PD_convert_attrtab (PDBfile *file) {
struct ohashel {
char *name;
char *type;
- byte *def;
+ lite_SC_byte *def;
struct ohashel *next;
} *onp, *nxt, **otb;
diff --git a/src/pdb/pdconv.c b/src/pdb/pdconv.c
index 316b375..0f6d520 100644
--- a/src/pdb/pdconv.c
+++ b/src/pdb/pdconv.c
@@ -281,7 +281,7 @@ lite_PD_convert (char **out, char **in, char *intype, char *outtype,
data_standard *hstd, long *pin_offs, long *pout_offs,
HASHTAB *in_chart, HASHTAB *out_chart, int boffs, int error) {
- int ret, tmp;
+ int ret = FALSE, tmp;
long i, mitems, in_incr, out_incr;
char *mtype;
defstr *idp, *odp, *midp, *modp;
diff --git a/src/pdb/pdlow.c b/src/pdb/pdlow.c
index 4ddb022..783dbd7 100644
--- a/src/pdb/pdlow.c
+++ b/src/pdb/pdlow.c
@@ -178,7 +178,6 @@ static int _PD_consistent_dims (PDBfile*,syment*,dimdes*);
static int _PD_put_string (int,char*,...);
#endif /* PDB_WRITE */
-
/*-------------------------------------------------------------------------
* Function: _lite_PD_rd_format
*
@@ -304,7 +303,6 @@ _lite_PD_rd_format (PDBfile *file) {
return(TRUE);
}
-
/*-------------------------------------------------------------------------
* Function: _lite_PD_compare_std
*
@@ -395,7 +393,6 @@ _lite_PD_compare_std (data_standard *a, data_standard *b,
return(eq);
}
-
/*-------------------------------------------------------------------------
* Function: _lite_PD_rd_symt
*
@@ -414,6 +411,9 @@ _lite_PD_compare_std (data_standard *a, data_standard *b,
* Remove unnecessary calls to lite_SC_mark, since reference count now
* set when allocated.
*
+ * Mark C. Miller, Fri Apr 13 22:40:59 PDT 2012
+ * Ignore symbols of the form "/&ptrs/ia_######" when controlling
+ * flag is set.
*-------------------------------------------------------------------------
*/
int
@@ -468,13 +468,14 @@ _lite_PD_rd_symt (PDBfile *file) {
prev = next;
}
+ if (file->ignore_apersand_ptr_ia_syms &&
+ strstr(name, "/&ptrs/ia_")) continue;
ep = _lite_PD_mk_syment(type, numb, addr, NULL, dims);
_lite_PD_e_install(name, ep, tab);
}
return(TRUE);
}
-
/*-------------------------------------------------------------------------
* Function: _lite_PD_rd_chrt
*
@@ -564,7 +565,6 @@ _lite_PD_rd_chrt (PDBfile *file) {
return(TRUE);
}
-
/*-------------------------------------------------------------------------
* Function: _lite_PD_check_casts
*
@@ -602,7 +602,6 @@ _lite_PD_check_casts (HASHTAB *chrt, char **lst, long n) {
}
}
-
/*-------------------------------------------------------------------------
* Function: _lite_PD_rd_extras
*
@@ -627,7 +626,7 @@ int
_lite_PD_rd_extras (PDBfile *file) {
char *token;
- data_alignment *pa;
+ data_alignment *pa = 0;
_PD_n_casts = 0L;
@@ -664,7 +663,8 @@ _lite_PD_rd_extras (PDBfile *file) {
data_standard *ps = file->std;
ps->longlong_bytes = token[0];
ps->longlong_order = token[1];
- pa->longlong_alignment = token[2];
+ if (pa) pa->longlong_alignment = token[2];
+ else return(FALSE);
}
} else if (strcmp(token, "Casts") == 0) {
@@ -792,7 +792,6 @@ _lite_PD_rd_extras (PDBfile *file) {
/* PRIMITIVE TYPE I/O ROUTINES */
/*--------------------------------------------------------------------------*/
-
/*-------------------------------------------------------------------------
* Function: _lite_PD_rd_prim_extras
*
@@ -855,7 +854,6 @@ _lite_PD_rd_prim_extras (PDBfile *file, int dc, int rec, char *bf) {
/* SUPPORT ROUTINES */
/*--------------------------------------------------------------------------*/
-
/*-------------------------------------------------------------------------
* Function: _lite_PD_e_install
*
@@ -887,7 +885,6 @@ _lite_PD_e_install (char *name, syment *entr, HASHTAB *tab) {
lite_SC_install(name, entr, lite_PD_SYMENT_S, tab);
}
-
/*-------------------------------------------------------------------------
* Function: _lite_PD_d_install
*
@@ -929,7 +926,6 @@ _lite_PD_d_install (char *name, defstr *def, HASHTAB *tab) {
lite_SC_install(name, def, lite_PD_DEFSTR_S, tab);
}
-
/*-------------------------------------------------------------------------
* Function: _lite_PD_defstr
*
@@ -959,7 +955,6 @@ _lite_PD_defstr (HASHTAB *chart, char *name, int align, long sz, int flg,
return(dp);
}
-
/*-------------------------------------------------------------------------
* Function: _lite_PD_defstr_inst
*
@@ -1059,7 +1054,6 @@ _lite_PD_defstr_inst (char *name, memdes *desc, int flg, int *ordr,
return(flag ? dp : Sdp);
}
-
/*-------------------------------------------------------------------------
* Function: _lite_PD_rfgets
*
@@ -1082,7 +1076,6 @@ _lite_PD_rfgets(char *s, int n, FILE *fp) {
return _PD_get_tok(s, n, fp, '\n') ;
}
-
/*-------------------------------------------------------------------------
* Function: _PD_get_tok
*
@@ -1174,7 +1167,6 @@ _PD_get_tok (char *s, int n, FILE *fp, int ch) {
return(s);
}
-
/*-------------------------------------------------------------------------
* Function: _PD_get_token
*
@@ -1261,7 +1253,6 @@ _PD_get_token (char *bf, char *s, int n, int ch) {
return(s);
}
-
/*-------------------------------------------------------------------------
* Function: _lite_PD_init_chrt
*
@@ -1331,7 +1322,6 @@ _lite_PD_init_chrt (PDBfile *file) {
return;
}
-
/*-------------------------------------------------------------------------
* Function: _lite_PD_setup_chart
*
@@ -1451,7 +1441,6 @@ _lite_PD_setup_chart (HASHTAB *chart, data_standard *fstd, data_standard *hstd,
}
-
/*-------------------------------------------------------------------------
* Function: _lite_PD_add_block
*
@@ -1498,13 +1487,15 @@ _lite_PD_add_block (PDBfile *file, syment *ep, dimdes *dims) {
* We are through with the dimensions
* their information has been moved into the entry dimensions
*/
+/*#warning REMOVED AS PER pdbtst.c FAILING*/
+#if 0
_lite_PD_rl_dimensions(dims);
+#endif
return(_lite_PD_extend_file(file, sp[n].number*bytespitem));
}
#endif /* PDB_WRITE */
-
/*-------------------------------------------------------------------------
* Function: _lite_PD_wr_format
*
@@ -1624,7 +1615,6 @@ _lite_PD_wr_format (PDBfile *file) {
}
#endif /* PDB_WRITE */
-
/*-------------------------------------------------------------------------
* Function: _PD_consistent_dims
*
@@ -1677,6 +1667,9 @@ _PD_consistent_dims (PDBfile *file, syment *ep, dimdes *ndims) {
nd = ndims;
od = odims;
}
+ else {
+ return(FALSE);
+ }
if (nd->index_min == file->default_offset) {
od->index_max += nd->index_max - nd->index_min + 1;
@@ -1694,7 +1687,6 @@ _PD_consistent_dims (PDBfile *file, syment *ep, dimdes *ndims) {
}
#endif /* PDB_WRITE */
-
/*-------------------------------------------------------------------------
* Function: _lite_PD_extend_file
*
@@ -1743,7 +1735,6 @@ _lite_PD_extend_file (PDBfile *file, long nb) {
}
#endif /* PDB_WRITE */
-
/*-------------------------------------------------------------------------
* Function: _lite_PD_eod
*
@@ -1776,7 +1767,6 @@ _lite_PD_eod (PDBfile *file) {
}
#endif /* PDB_WRITE */
-
/*-------------------------------------------------------------------------
* Function: _lite_PD_wr_chrt
*
@@ -1850,7 +1840,6 @@ _lite_PD_wr_chrt (PDBfile *file) {
}
#endif /* PDB_WRITE */
-
/*-------------------------------------------------------------------------
* Function: _lite_PD_wr_symt
*
@@ -1939,7 +1928,6 @@ _lite_PD_wr_symt (PDBfile *file) {
}
#endif /* PDB_WRITE */
-
/*-------------------------------------------------------------------------
* Function: _lite_PD_wr_extras
*
@@ -2137,7 +2125,6 @@ _lite_PD_wr_extras (PDBfile *file) {
}
#endif /* PDB_WRITE */
-
/*-------------------------------------------------------------------------
* Function: _lite_PD_rev_chrt
*
@@ -2164,7 +2151,6 @@ _lite_PD_rev_chrt (PDBfile *file) {
}
#endif /* PDB_WRITE */
-
/*-------------------------------------------------------------------------
* Function: _PD_put_string
*
@@ -2223,7 +2209,6 @@ _PD_put_string (int reset, char *fmt, ...) {
}
#endif /* PDB_WRITE */
-
/*-------------------------------------------------------------------------
* Function: _lite_PD_wr_prim_extras
*
diff --git a/src/pdb/pdmemb.c b/src/pdb/pdmemb.c
index f83e834..22cd090 100644
--- a/src/pdb/pdmemb.c
+++ b/src/pdb/pdmemb.c
@@ -59,6 +59,9 @@ be used for advertising or product endorsement purposes.
*
*/
#include "pdb.h"
+#if defined(_WIN32)
+#include <silo_win32_compatibility.h>
+#endif
/*--------------------------------------------------------------------------*/
/* ACCESSOR FUNCTIONS */
@@ -549,7 +552,8 @@ lite_PD_inquire_entry(PDBfile *file, char *name, int flag, char *fullname) {
ep = (syment *) lite_SC_def_lookup(s + 1, file->symtab);
} else if (strrchr(s, '/') == NULL) {
char t[MAXLINE];
- sprintf(t, "/%s", s);
+ if (snprintf(t, sizeof(t), "/%s", s)>=sizeof(t))
+ t[sizeof(t)-1] = '\0';
ep = (syment *) lite_SC_def_lookup(t, file->symtab);
}
}
@@ -686,7 +690,7 @@ _lite_PD_adj_dimensions (PDBfile *file, char *name, syment *ep) {
}
sprintf(expr, "%s%ld:%ld:%ld,", expr, imin, imax, istep);
- dims = dims->next;
+ if (dims) dims = dims->next;
}
if (expr[0] != '\0') {
diff --git a/src/pdb/pdpath.c b/src/pdb/pdpath.c
index ab34bd1..9f464c2 100644
--- a/src/pdb/pdpath.c
+++ b/src/pdb/pdpath.c
@@ -63,6 +63,8 @@ be used for advertising or product endorsement purposes.
#if HAVE_UNISTD_H
#include <unistd.h>
#endif
+#else
+#include <silo_win32_compatibility.h>
#endif
#include "pdb.h"
@@ -606,9 +608,11 @@ _PD_do_member (char *name, int deref_flag) {
*/
if (deref_flag) {
_PD_do_deref();
- sprintf(t, "%s->%s", FRAME(path), name);
+ if (snprintf(t, sizeof(t), "%s->%s", FRAME(path), name)>=sizeof(t))
+ t[sizeof(t)-1] = '\0';
} else {
- sprintf(t, "%s.%s", FRAME(path), name);
+ if (snprintf(t, sizeof(t), "%s.%s", FRAME(path), name)>=sizeof(t))
+ t[sizeof(t)-1] = '\0';
}
strcpy(FRAME(path), t);
@@ -740,7 +744,8 @@ _PD_do_index (char *expr) {
/*
* Update the path.
*/
- sprintf(t, "%s[%s]", FRAME(path), expr);
+ if (snprintf(t, sizeof(t), "%s[%s]", FRAME(path), expr)>=sizeof(t))
+ t[sizeof(t)-1] = '\0';
strcpy(FRAME(path), t);
dims = CURRENT(dims);
@@ -835,7 +840,8 @@ _PD_do_cast (char *type) {
/*
* Update the path.
*/
- sprintf(t, "(%s) %s", type, FRAME(path));
+ if (snprintf(t, sizeof(t), "(%s) %s", type, FRAME(path))>=sizeof(t))
+ t[sizeof(t)-1] = '\0';
strcpy(FRAME(path), t);
da = CURRENT(ad.diskaddr);
diff --git a/src/pdb/pdrdwr.c b/src/pdb/pdrdwr.c
index e77f080..76c1cbd 100644
--- a/src/pdb/pdrdwr.c
+++ b/src/pdb/pdrdwr.c
@@ -133,7 +133,7 @@ static int _PD_read_hyper_space (PDBfile*,syment*,char*,char*,
long,long) ;
static char * _PD_wr_hyper_index (PDBfile*,char*,dimind*,char*,
char*,long,symblock*,int,int);
-static void _PD_wr_leaf_members (PDBfile*,char*,char*,long,byte*);
+static void _PD_wr_leaf_members (PDBfile*,char*,char*,long,lite_SC_byte*);
static int _PD_wr_ind_itags (PDBfile*,long,char*);
static char * _PD_write_hyper_space (PDBfile*,char*,char*,char*,
symblock*,int,int,long,
@@ -160,7 +160,7 @@ static char * _PD_write_hyper_space (PDBfile*,char*,char*,char*,
*-------------------------------------------------------------------------
*/
int
-_lite_PD_indexed_read_as (PDBfile *file, char *fullpath, char *type, byte *vr,
+_lite_PD_indexed_read_as (PDBfile *file, char *fullpath, char *type, lite_SC_byte *vr,
int nd, long *ind, syment *ep) {
int i, err;
@@ -241,10 +241,10 @@ _lite_PD_indexed_read_as (PDBfile *file, char *fullpath, char *type, byte *vr,
*/
int
_lite_PD_hyper_read (PDBfile *file, char *name, char *outtype,
- syment *ep, byte *vr) {
+ syment *ep, lite_SC_byte *vr) {
long hbyt, fbyt;
- int nd, c, nrd, i;
+ int nd, c, nrd, i, slen;
char s[MAXLINE], *expr;
dimdes *dims;
dimind *pi;
@@ -260,7 +260,8 @@ _lite_PD_hyper_read (PDBfile *file, char *name, char *outtype,
dims = PD_entry_dimensions(ep);
strcpy(s, name);
- c = s[strlen(s)-1];
+ slen = strlen(s);
+ c = slen > 0 ? s[slen-1] : 0;
if (((c != ')') && (c != ']')) || (dims == NULL)) {
return(_lite_PD_rd_syment(file, ep, outtype, vr));
}
@@ -339,7 +340,7 @@ _lite_PD_hyper_read (PDBfile *file, char *name, char *outtype,
*-------------------------------------------------------------------------
*/
long
-_lite_PD_rd_syment (PDBfile *file, syment *ep, char *outtype, byte *vr) {
+_lite_PD_rd_syment (PDBfile *file, syment *ep, char *outtype, lite_SC_byte *vr) {
FILE *fp;
int dst, vif, size, boffs, readonly;
@@ -1340,11 +1341,11 @@ _PD_compute_hyper_strides (PDBfile *file, char *ind, dimdes *dims, int *pnd) {
*/
#ifdef PDB_WRITE
int
-_lite_PD_hyper_write (PDBfile *file, char *name, syment *ep, byte *vr,
+_lite_PD_hyper_write (PDBfile *file, char *name, syment *ep, lite_SC_byte *vr,
char *intype) {
long hbyt, fbyt;
- int nd, c;
+ int nd, c, slen;
char s[MAXLINE], *expr;
dimdes *dims;
dimind *pi;
@@ -1352,7 +1353,8 @@ _lite_PD_hyper_write (PDBfile *file, char *name, syment *ep, byte *vr,
memset(s, 0, sizeof(s));
dims = PD_entry_dimensions(ep);
strcpy(s, name);
- c = s[strlen(s)-1];
+ slen = strlen(s);
+ c = slen > 0 ? s[slen-1] : 0;
if (((c != ')') && (c != ']')) || (dims == NULL)) {
return(_lite_PD_wr_syment(file, vr, PD_entry_number(ep),
intype, PD_entry_type(ep)));
@@ -1435,11 +1437,13 @@ _lite_PD_wr_syment (PDBfile *file, char *vr, long nitems,
char bf[MAXLINE], *litype, *lotype, *svr, *ttype;
FILE *fp;
+ size = 0;
call_ptr = 0L;
lval_ptr = 0L;
str_ptr = 0L;
litype = NULL;
lotype = NULL;
+ svr = NULL;
SAVE_S(litype, intype);
SAVE_S(lotype, outtype);
@@ -1486,6 +1490,8 @@ _lite_PD_wr_syment (PDBfile *file, char *vr, long nitems,
case LEAF_INDIR :
if (desc == NULL) {
i++;
+ if (svr == NULL)
+ lite_PD_error("SVR UMR - _PD_WR_SYMENT", PD_WRITE) ;
svr += size;
GO(LEAF_ITEM);
}
@@ -1693,7 +1699,7 @@ _PD_wr_hyper_index (PDBfile *file, char *out, dimind *pi,
#ifdef PDB_WRITE
static void
_PD_wr_leaf_members (PDBfile *file, char *intype, char *outtype,
- long nitems, byte *vr) {
+ long nitems, lite_SC_byte *vr) {
long bytepitem, in_offs, out_offs;
int ret;
@@ -1763,7 +1769,7 @@ _PD_wr_leaf_members (PDBfile *file, char *intype, char *outtype,
*/
#ifdef PDB_WRITE
long
-_lite_PD_number_refd (byte *vr, char *type, HASHTAB *tab) {
+_lite_PD_number_refd (lite_SC_byte *vr, char *type, HASHTAB *tab) {
long bytepitem, nitems;
diff --git a/src/pdb_drv/Makefile.in b/src/pdb_drv/Makefile.in
index 4ebed45..631baad 100644
--- a/src/pdb_drv/Makefile.in
+++ b/src/pdb_drv/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -17,8 +18,9 @@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -37,20 +39,30 @@ subdir = src/pdb_drv
DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/config/ax_check_compiler_flags.m4 \
+ $(top_srcdir)/config/ax_have_qt.m4 \
+ $(top_srcdir)/config/libtool.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
+ $(top_srcdir)/config/vl_lib_readline.m4 \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
LTLIBRARIES = $(noinst_LTLIBRARIES)
libsilo_pdb_drv_la_LIBADD =
am__objects_1 = silo_pdb.lo
am_libsilo_pdb_drv_la_OBJECTS = $(am__objects_1)
libsilo_pdb_drv_la_OBJECTS = $(am_libsilo_pdb_drv_la_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/config/depcomp
am__depfiles_maybe = depfiles
+am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -92,7 +104,8 @@ CXX_FULLPATH = @CXX_FULLPATH@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -104,6 +117,7 @@ FCFLAGS = @FCFLAGS@
FCLIBS = @FCLIBS@
FC_FULLPATH = @FC_FULLPATH@
FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FORTRAN = @FORTRAN@
FPZIP = @FPZIP@
GREP = @GREP@
@@ -114,17 +128,25 @@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
LDFLAGS = @LDFLAGS@
+LIBM = @LIBM@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
NETCDF = @NETCDF@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -134,7 +156,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PDBP_DRV = @PDBP_DRV@
PDB_DRV = @PDB_DRV@
-PRTDIAG = @PRTDIAG@
PYTHON = @PYTHON@
PYTHONMODULE = @PYTHONMODULE@
PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@
@@ -142,17 +163,13 @@ PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
PYTHON_PLATFORM = @PYTHON_PLATFORM@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
-QT_BIN = @QT_BIN@
-QT_CORE = @QT_CORE@
-QT_CORE_LIB = @QT_CORE_LIB@
QT_CXXFLAGS = @QT_CXXFLAGS@
-QT_GUI = @QT_GUI@
-QT_GUI_LIB = @QT_GUI_LIB@
-QT_INCLUDE = @QT_INCLUDE@
-QT_LDFLAGS = @QT_LDFLAGS@
-QT_LIB = @QT_LIB@
+QT_DIR = @QT_DIR@
QT_LIBS = @QT_LIBS@
+QT_LRELEASE = @QT_LRELEASE@
+QT_LUPDATE = @QT_LUPDATE@
QT_MOC = @QT_MOC@
+QT_UIC = @QT_UIC@
RANLIB = @RANLIB@
READLINE_LIBS = @READLINE_LIBS@
SED = @SED@
@@ -170,6 +187,11 @@ SILO_VERS_TAG = @SILO_VERS_TAG@
STRIP = @STRIP@
TAURUS = @TAURUS@
VERSION = @VERSION@
+XMKMF = @XMKMF@
+X_CFLAGS = @X_CFLAGS@
+X_EXTRA_LIBS = @X_EXTRA_LIBS@
+X_LIBS = @X_LIBS@
+X_PRE_LIBS = @X_PRE_LIBS@
ZLIB = @ZLIB@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
@@ -177,6 +199,7 @@ abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_F77 = @ac_ct_F77@
ac_ct_FC = @ac_ct_FC@
am__include = @am__include@
@@ -209,6 +232,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -225,6 +249,7 @@ sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
@@ -295,14 +320,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
- && exit 0; \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/pdb_drv/Makefile'; \
- cd $(top_srcdir) && \
- $(AUTOMAKE) --foreign src/pdb_drv/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/pdb_drv/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --foreign src/pdb_drv/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -320,6 +345,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
clean-noinstLTLIBRARIES:
-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
@@ -342,21 +368,21 @@ distclean-compile:
.c.o:
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c $<
.c.obj:
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
.c.lo:
@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
@@ -372,45 +398,49 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
+ set x; \
here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
fi
ctags: CTAGS
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
+ $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && cd $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) $$here
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -431,13 +461,17 @@ distdir: $(DISTFILES)
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
if test -d $$d/$$file; then \
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
@@ -465,6 +499,7 @@ clean-generic:
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -486,6 +521,8 @@ dvi-am:
html: html-am
+html-am:
+
info: info-am
info-am:
@@ -494,18 +531,28 @@ install-data-am:
install-dvi: install-dvi-am
+install-dvi-am:
+
install-exec-am:
install-html: install-html-am
+install-html-am:
+
install-info: install-info-am
+install-info-am:
+
install-man:
install-pdf: install-pdf-am
+install-pdf-am:
+
install-ps: install-ps-am
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-am
@@ -543,6 +590,7 @@ uninstall-am:
mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
pdf pdf-am ps ps-am tags uninstall uninstall-am
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/src/pdb_drv/silo_pdb.c b/src/pdb_drv/silo_pdb.c
index c3d3f29..9607038 100644
--- a/src/pdb_drv/silo_pdb.c
+++ b/src/pdb_drv/silo_pdb.c
@@ -315,8 +315,8 @@ PJ_write (PDBfile *file, char *name, char *type, void *var) {
*/
#ifdef PDB_WRITE
INTERNAL int
-PJ_write_alt (PDBfile *file, char *name, char *type, void *var, int nd,
- long *ind) {
+PJ_write_alt (PDBfile *file, char const *name, char const *type,
+ void const *var, int nd, long const *ind) {
char *newname = pj_fixname(file, name);
@@ -343,7 +343,7 @@ PJ_write_alt (PDBfile *file, char *name, char *type, void *var, int nd,
*/
#ifdef PDB_WRITE
INTERNAL int
-PJ_write_len (PDBfile *file, char *name, char *type, const void *var, int nd,
+PJ_write_len (PDBfile *file, char *name, char *type, void const *var, int nd,
long *len) {
long ind[15], i;
@@ -371,7 +371,6 @@ PJ_write_len (PDBfile *file, char *name, char *type, const void *var, int nd,
* Global private variables.
*-------------------------------------------------------------------------
*/
-static PJcomplist *_tcl;
static int _pj_force_single = FALSE;
/*======================================================================
@@ -560,10 +559,13 @@ PJ_NoCache ( void )
* Made the function return the type of the object, if requested.
* Beefed up the error message if the object isn't found.
*
+ * Mark C. Miller, Wed Sep 12 09:08:32 PDT 2012
+ * Replaced returned 'ret_type' argument with input expected_dbtype
+ * argument and cause it to fail if type that is read doesn't
+ * match the expected_dbtype.
*--------------------------------------------------------------------*/
INTERNAL int
-PJ_GetObject(PDBfile *file_in, char *objname_in, PJcomplist *tobj,
- char **ret_type)
+PJ_GetObject(PDBfile *file_in, char *objname_in, PJcomplist *tobj, int expected_dbtype)
{
int i, j, error;
char *varname=NULL, *filename=NULL;
@@ -623,13 +625,39 @@ PJ_GetObject(PDBfile *file_in, char *objname_in, PJcomplist *tobj,
if (error || cached_group == NULL)
{
char err_str[256];
+ sprintf(err_str,"PJ_get_group: Probably no such object \"%s\".",objname);
FREE(varname);
FREE(filename);
- sprintf(err_str,"PJ_get_group: Probably no such object \"%s\".",objname);
db_perror(err_str, E_CALLFAIL, me);
return -1;
}
+ /* Check object type before we do any allocations */
+ if (expected_dbtype > 0)
+ {
+ int matched = 1;
+ if (expected_dbtype == DB_QUADMESH)
+ {
+ if ((strcmp(cached_group->type, DBGetObjtypeName(DB_QUAD_RECT)) != 0) &&
+ (strcmp(cached_group->type, DBGetObjtypeName(DB_QUAD_CURV)) != 0))
+ matched = 0;
+ }
+ else if (strcmp(cached_group->type, DBGetObjtypeName(expected_dbtype)) != 0)
+ {
+ matched = 0;
+ }
+ if (!matched)
+ {
+ char error[256];
+ sprintf(error,"Requested %s object \"%s\" is not a %s.",
+ cached_group->type, objname_in, DBGetObjtypeName(expected_dbtype));
+ FREE(varname);
+ FREE(filename);
+ db_perror(error, E_NOTFOUND, me);
+ return -1;
+ }
+ }
+
/* We've gotten a new group, remember which one it is. */
cached_obj_name = STRDUP(objname);
cached_file_name = STRDUP(file->name);
@@ -638,10 +666,30 @@ PJ_GetObject(PDBfile *file_in, char *objname_in, PJcomplist *tobj,
use_PJgroup_cache = 1;
}
- /* If we are asked to, return the object type */
- if (ret_type)
+ /* Check object type */
+ if (expected_dbtype > 0)
{
- *ret_type = safe_strdup(cached_group->type);
+ int matched = 1;
+ if (expected_dbtype == DB_QUADMESH)
+ {
+ if ((strcmp(cached_group->type, DBGetObjtypeName(DB_QUAD_RECT)) != 0) &&
+ (strcmp(cached_group->type, DBGetObjtypeName(DB_QUAD_CURV)) != 0))
+ matched = 0;
+ }
+ else if (strcmp(cached_group->type, DBGetObjtypeName(expected_dbtype)) != 0)
+ {
+ matched = 0;
+ }
+ if (!matched)
+ {
+ char error[256];
+ FREE(varname);
+ FREE(filename);
+ sprintf(error,"Requested %s object \"%s\" is not a %s.",
+ cached_group->type, objname_in, DBGetObjtypeName(expected_dbtype));
+ db_perror(error, E_NOTFOUND, me);
+ return -1;
+ }
}
/* Walk through the object, putting the data into the appropriate memory
@@ -749,12 +797,13 @@ PJ_GetComponent (PDBfile *file, char *objname, char *compname) {
char *result = NULL;
PJcomplist tmp_obj;
char *me = "PJ_GetComponent";
+ PJcomplist *_tcl;
/* Read just the requested component of the given object */
INIT_OBJ(&tmp_obj);
DEFALL_OBJ(compname, &result, DB_NOTYPE);
- if (PJ_GetObject(file, objname, &tmp_obj, NULL) < 0) {
+ if (PJ_GetObject(file, objname, &tmp_obj, 0) < 0) {
db_perror("PJ_GetObject", E_CALLFAIL, me);
return NULL;
}
@@ -785,6 +834,7 @@ PJ_GetComponentType (PDBfile *file, char *objname, char *compname)
{
int retval = DB_NOTYPE;
char *me = "PJ_GetComponentType";
+ PJcomplist *_tcl;
/* If there is no cached group, or we are interested in a
* different object, get the one we want. */
@@ -798,7 +848,7 @@ PJ_GetComponentType (PDBfile *file, char *objname, char *compname)
INIT_OBJ(&tmp_obj);
DEFALL_OBJ(compname, &result, DB_NOTYPE);
- if (PJ_GetObject(file, objname, &tmp_obj, NULL) < 0) {
+ if (PJ_GetObject(file, objname, &tmp_obj, 0) < 0) {
db_perror("PJ_GetObject", E_CALLFAIL, me);
return DB_NOTYPE;
}
@@ -901,6 +951,9 @@ PJ_GetComponentType (PDBfile *file, char *objname, char *compname)
*
* Mark C. Miller, Mon Jan 11 16:02:16 PST 2010
* Made long long support UNconditionally compiled.
+ *
+ * Mark C. MIller Mon Dec 10 09:54:05 PST 2012
+ * Fix possible ABR when tname is size zero.
*--------------------------------------------------------------------*/
INTERNAL int
PJ_ReadVariable(PDBfile *file,
@@ -940,6 +993,8 @@ PJ_ReadVariable(PDBfile *file,
*-------------------------------------------------*/
if (name[0] == '\'') {
+ int tnmlen;
+
/*
* No forcing of literals. Since literals return an
* an actual data type of -1, they will never get forced
@@ -956,7 +1011,9 @@ PJ_ReadVariable(PDBfile *file,
*-------------------------------------------------*/
strcpy(tname, &name[1]);
- tname[strlen(tname) - 1] = '\0';
+ tnmlen = strlen(tname);
+ tnmlen = tnmlen>0?tnmlen:1;
+ tname[tnmlen - 1] = '\0';
if (name[1] == '<')
lit = &tname[3];
@@ -1682,20 +1739,6 @@ static char *_ptvalstr[10] =
"6_data", "7_data", "8_data",
"9_data"};
-#define CHECK_TYPE(typestring,type,name) \
- if (strcmp(typestring, DBGetObjtypeName(type)) != 0) \
- { \
- char error[256]; \
- sprintf(error,"Requested %s object \"%s\" is not a %s.",\
- typestring, name, DBGetObjtypeName(type)); \
- FREE(typestring); \
- db_perror(error, E_INTERNAL, me); \
- } else { \
- FREE(typestring); \
- }
-
-static PJcomplist *_tcl;
-
/* Symbolic constants used in calls to db_StringListToStringArray
to indicate behavior. A '!' in front means to not perform the
associated action. For PDB driver, we handle the slash swap
@@ -1705,8 +1748,8 @@ static PJcomplist *_tcl;
coming into existence. This is to ensure diffs on files
before and after this change don't vary due to leading
semicolon. */
-static const int handleSlashSwap = 1;
-static const int skipFirstSemicolon = 1;
+static int const handleSlashSwap = 1;
+static int const skipFirstSemicolon = 1;
/*----------------------------------------------------------------------
* Routine db_pdb_GetVarDatatype
@@ -2271,6 +2314,11 @@ PJ_ls (PDBfile *file, /* PDB file pointer */
char **score_out, **malloc_out;
score_out = lite_PD_ls(file, path, type, num);
+ if (*num == 0)
+ {
+ lite_SC_free(score_out);
+ return 0;
+ }
malloc_out = ALLOC_N(char *, *num + 1);
memcpy(malloc_out, score_out, *num * sizeof(char *));
@@ -2307,7 +2355,7 @@ PJ_get_fullpath(
{
int ierr;
char *subpath;
- char tmpstr[256];
+ char tmpstr[1024];
if (file == NULL || cwd == NULL || path == NULL || name == NULL)
return (FALSE);
@@ -2657,7 +2705,7 @@ db_pdb_NewToc (DBfile *_dbfile)
int ivar, iqmesh, iqvar, iumesh, iuvar, icurve, idir, iarray,
imat, imatspecies, imultimesh, imultivar, imultimat, imultimatspecies,
ipmesh, iptvar, iobj, icsgmesh, icsgvar, idefvars, imultimeshadj,
- imrgtrees, igroupelmaps, imrgvars;
+ imrgtree, igroupelmap, imrgvar;
DBtoc *toc;
char *ctype;
@@ -2706,6 +2754,10 @@ db_pdb_NewToc (DBfile *_dbfile)
* Group (object)
*----------------------------------------*/
}
+ else if (STR_BEGINSWITH(ep->type, "GroupDataShadow")) {
+ toc->nobj++;
+ continue;
+ }
else if (STR_BEGINSWITH(ep->type, "Group")) {
/*
@@ -2716,6 +2768,8 @@ db_pdb_NewToc (DBfile *_dbfile)
if (!PJ_read(file, name, &ctype)) {
sprintf(name, "%s->type", list[i]);
if (!PJ_read(file, name, &ctype)) {
+ FREE(types);
+ FREE(list);
return db_perror("PJ_read", E_CALLFAIL, me);
}
}
@@ -2778,16 +2832,16 @@ db_pdb_NewToc (DBfile *_dbfile)
toc->nmatspecies++;
break;
case DB_ARRAY:
- toc->narrays++;
+ toc->narray++;
break;
case DB_MRGTREE:
- toc->nmrgtrees++;
+ toc->nmrgtree++;
break;
case DB_GROUPELMAP:
- toc->ngroupelmaps++;
+ toc->ngroupelmap++;
break;
case DB_MRGVAR:
- toc->nmrgvars++;
+ toc->nmrgvar++;
break;
default:
toc->nobj++;
@@ -2887,20 +2941,20 @@ db_pdb_NewToc (DBfile *_dbfile)
toc->matspecies_names = ALLOC_N(char *, toc->nmatspecies);
}
- if (toc->narrays > 0) {
- toc->array_names = ALLOC_N(char *, toc->narrays);
+ if (toc->narray > 0) {
+ toc->array_names = ALLOC_N(char *, toc->narray);
}
- if (toc->nmrgtrees > 0) {
- toc->mrgtree_names = ALLOC_N(char *, toc->nmrgtrees);
+ if (toc->nmrgtree > 0) {
+ toc->mrgtree_names = ALLOC_N(char *, toc->nmrgtree);
}
- if (toc->ngroupelmaps > 0) {
- toc->groupelmap_names = ALLOC_N(char *, toc->ngroupelmaps);
+ if (toc->ngroupelmap > 0) {
+ toc->groupelmap_names = ALLOC_N(char *, toc->ngroupelmap);
}
- if (toc->nmrgvars > 0) {
- toc->mrgvar_names = ALLOC_N(char *, toc->nmrgvars);
+ if (toc->nmrgvar > 0) {
+ toc->mrgvar_names = ALLOC_N(char *, toc->nmrgvar);
}
/*----------------------------------------------------------------------
* Now loop over all the items in the directory and store the
@@ -2909,7 +2963,7 @@ db_pdb_NewToc (DBfile *_dbfile)
icurve = ivar = iqmesh = iqvar = iumesh = iuvar = idir = iarray = 0;
imultimesh = imultivar = imultimat = imat = imatspecies = ipmesh = 0;
iptvar = iobj = imultimatspecies = icsgmesh = icsgvar = idefvars = 0;
- imultimeshadj = imrgtrees = igroupelmaps = imrgvars = 0 ;
+ imultimeshadj = imrgtree = igroupelmap = imrgvar = 0 ;
for (i = 0; i < num; i++) {
@@ -3029,18 +3083,18 @@ db_pdb_NewToc (DBfile *_dbfile)
break;
case DB_MRGTREE:
- toc->mrgtree_names[imrgtrees] = STRDUP(list[i]);
- imrgtrees++;
+ toc->mrgtree_names[imrgtree] = STRDUP(list[i]);
+ imrgtree++;
break;
case DB_GROUPELMAP:
- toc->groupelmap_names[igroupelmaps] = STRDUP(list[i]);
- igroupelmaps++;
+ toc->groupelmap_names[igroupelmap] = STRDUP(list[i]);
+ igroupelmap++;
break;
case DB_MRGVAR:
- toc->mrgvar_names[imrgvars] = STRDUP(list[i]);
- imrgvars++;
+ toc->mrgvar_names[imrgvar] = STRDUP(list[i]);
+ imrgvar++;
break;
default:
@@ -3051,7 +3105,7 @@ db_pdb_NewToc (DBfile *_dbfile)
}
FREE(list);
- if (types) FREE(types);
+ FREE(types);
return 0;
}
@@ -3274,13 +3328,13 @@ db_pdb_GetMaterial(DBfile *_dbfile, /*DB file pointer */
DBfile_pdb *dbfile = (DBfile_pdb *) _dbfile;
static char *me = "db_pdb_GetMaterial";
PJcomplist tmp_obj;
- char *type = NULL;
char *tmpnames = NULL;
char *tmpcolors = NULL;
DBmaterial tmpmm;
- memset(&tmpmm, 0, sizeof(DBmaterial));
+ PJcomplist *_tcl;
/* Comp. Name Comp. Address Data Type */
+ memset(&tmpmm, 0, sizeof(DBmaterial));
INIT_OBJ(&tmp_obj);
DEFINE_OBJ("ndims", &tmpmm.ndims, DB_INT);
@@ -3311,7 +3365,7 @@ db_pdb_GetMaterial(DBfile *_dbfile, /*DB file pointer */
DEFALL_OBJ("mix_vf", &tmpmm.mix_vf, DB_FLOAT);
}
- if (PJ_GetObject(dbfile->pdb, name, &tmp_obj, &type) < 0)
+ if (PJ_GetObject(dbfile->pdb, name, &tmp_obj, DB_MATERIAL) < 0)
return NULL;
if (NULL == (mm = DBAllocMaterial()))
@@ -3321,7 +3375,6 @@ db_pdb_GetMaterial(DBfile *_dbfile, /*DB file pointer */
}
*mm = tmpmm;
- CHECK_TYPE(type,DB_MATERIAL,name);
_DBQQCalcStride(mm->stride, mm->dims, mm->ndims, mm->major_order);
/* If we have material names, restore it to an array of names. In the
@@ -3356,7 +3409,7 @@ db_pdb_GetMaterial(DBfile *_dbfile, /*DB file pointer */
}
if ((tmpcolors != NULL) && (mm->nmat > 0))
{
- mm->matcolors = DBStringListToStringArray(tmpcolors, mm->nmat,
+ mm->matcolors = DBStringListToStringArray(tmpcolors, &(mm->nmat),
!handleSlashSwap, !skipFirstSemicolon);
FREE(tmpcolors);
}
@@ -3413,7 +3466,6 @@ SILO_CALLBACK DBmatspecies *
db_pdb_GetMatspecies (DBfile *_dbfile, /*DB file pointer */
char *objname) /*Name of matspecies obj to return */
{
- char *type = NULL;
DBmatspecies *mm;
DBfile_pdb *dbfile = (DBfile_pdb *) _dbfile;
static char *me = "db_pdb_GetMatspecies";
@@ -3423,11 +3475,12 @@ db_pdb_GetMatspecies (DBfile *_dbfile, /*DB file pointer */
PJcomplist tmp_obj;
DBmatspecies tmpmm;
int i, nstrs = 0;
- memset(&tmpmm, 0, sizeof(DBmatspecies));
+ PJcomplist *_tcl;
/*------------------------------------------------------------*/
/* Comp. Name Comp. Address Data Type */
/*------------------------------------------------------------*/
+ memset(&tmpmm, 0, sizeof(DBmatspecies));
INIT_OBJ(&tmp_obj);
DEFALL_OBJ("matname", &tmpmm.matname, DB_CHAR);
@@ -3447,7 +3500,7 @@ db_pdb_GetMatspecies (DBfile *_dbfile, /*DB file pointer */
if (SILO_Globals.dataReadMask & DBMatMatcolors)
DEFALL_OBJ("speccolors", &tmpcolors, DB_CHAR);
- if (PJ_GetObject(dbfile->pdb, objname, &tmp_obj, &type) < 0)
+ if (PJ_GetObject(dbfile->pdb, objname, &tmp_obj, DB_MATSPECIES) < 0)
return NULL;
if (NULL == (mm = DBAllocMatspecies())) {
@@ -3456,8 +3509,6 @@ db_pdb_GetMatspecies (DBfile *_dbfile, /*DB file pointer */
}
*mm = tmpmm;
- CHECK_TYPE(type, DB_MATSPECIES, objname);
-
/* Now read in species_mf per its datatype. */
INIT_OBJ(&tmp_obj);
@@ -3474,7 +3525,7 @@ db_pdb_GetMatspecies (DBfile *_dbfile, /*DB file pointer */
mm->datatype = DB_FLOAT;
DEFALL_OBJ("species_mf", &mm->species_mf, mm->datatype);
- PJ_GetObject(dbfile->pdb, objname, &tmp_obj, NULL);
+ PJ_GetObject(dbfile->pdb, objname, &tmp_obj, 0);
_DBQQCalcStride(mm->stride, mm->dims, mm->ndims, mm->major_order);
@@ -3486,14 +3537,14 @@ db_pdb_GetMatspecies (DBfile *_dbfile, /*DB file pointer */
if (tmpnames != NULL)
{
if (nstrs > 0)
- mm->specnames = DBStringListToStringArray(tmpnames, nstrs,
+ mm->specnames = DBStringListToStringArray(tmpnames, &nstrs,
!handleSlashSwap, !skipFirstSemicolon);
FREE(tmpnames);
}
if (tmpcolors != NULL)
{
if (nstrs > 0)
- mm->speccolors = DBStringListToStringArray(tmpcolors, nstrs,
+ mm->speccolors = DBStringListToStringArray(tmpcolors, &nstrs,
!handleSlashSwap, !skipFirstSemicolon);
FREE(tmpcolors);
}
@@ -3528,7 +3579,6 @@ db_pdb_GetMatspecies (DBfile *_dbfile, /*DB file pointer */
SILO_CALLBACK DBcompoundarray *
db_pdb_GetCompoundarray (DBfile *_dbfile, char *array_name)
{
- char *type = NULL;
int i;
DBfile_pdb *dbfile = (DBfile_pdb *) _dbfile;
DBcompoundarray *ca = NULL;
@@ -3536,24 +3586,24 @@ db_pdb_GetCompoundarray (DBfile *_dbfile, char *array_name)
static char *me = "db_pdb_GetCompoundarray";
PJcomplist tmp_obj;
DBcompoundarray tmpca;
- memset(&tmpca, 0, sizeof(DBcompoundarray));
+ PJcomplist *_tcl;
/*------------------------------------------------------------*/
/* Comp. Name Comp. Address Data Type */
/*------------------------------------------------------------*/
+ memset(&tmpca, 0, sizeof(DBcompoundarray));
INIT_OBJ(&tmp_obj);
DEFINE_OBJ("nelems", &tmpca.nelems, DB_INT);
DEFINE_OBJ("nvalues", &tmpca.nvalues, DB_INT);
DEFINE_OBJ("datatype", &tmpca.datatype, DB_INT);
DEFALL_OBJ("elemnames", &name_vector, DB_CHAR);
DEFALL_OBJ("elemlengths", &tmpca.elemlengths, DB_INT);
- if (PJ_GetObject(dbfile->pdb, array_name, &tmp_obj, &type) < 0)
+ if (PJ_GetObject(dbfile->pdb, array_name, &tmp_obj, DB_ARRAY) < 0)
return NULL;
if (NULL == (ca = DBAllocCompoundarray()))
return NULL;
*ca = tmpca;
- CHECK_TYPE(type, DB_ARRAY, array_name);
if (ca->nelems <= 0 || ca->nvalues <= 0 || ca->datatype < 0 ||
!name_vector) {
DBFreeCompoundarray(ca);
@@ -3588,7 +3638,7 @@ db_pdb_GetCompoundarray (DBfile *_dbfile, char *array_name)
}
DEFALL_OBJ("values", &ca->values, ca->datatype);
- PJ_GetObject(dbfile->pdb, array_name, &tmp_obj, NULL);
+ PJ_GetObject(dbfile->pdb, array_name, &tmp_obj, 0);
ca->id = 0;
ca->name = STRDUP(array_name);
@@ -3628,14 +3678,14 @@ db_pdb_GetCompoundarray (DBfile *_dbfile, char *array_name)
SILO_CALLBACK DBcurve *
db_pdb_GetCurve (DBfile *_dbfile, char *name)
{
- char *type = NULL;
DBfile_pdb *dbfile = (DBfile_pdb *) _dbfile ;
DBcurve *cu ;
static char *me = "db_pdb_GetCurve" ;
PJcomplist tmp_obj ;
DBcurve tmpcu;
- memset(&tmpcu, 0, sizeof(DBcurve));
+ PJcomplist *_tcl;
+ memset(&tmpcu, 0, sizeof(DBcurve));
INIT_OBJ (&tmp_obj) ;
DEFINE_OBJ ("npts", &tmpcu.npts, DB_INT) ;
DEFINE_OBJ ("datatype", &tmpcu.datatype, DB_INT) ;
@@ -3648,18 +3698,19 @@ db_pdb_GetCurve (DBfile *_dbfile, char *name)
DEFALL_OBJ ("yunits", &tmpcu.yunits, DB_CHAR) ;
DEFALL_OBJ ("reference",&tmpcu.reference,DB_CHAR) ;
DEFINE_OBJ ("guihide", &tmpcu.guihide, DB_INT) ;
- if (PJ_GetObject (dbfile->pdb, name, &tmp_obj, &type)<0)
+ if (PJ_GetObject (dbfile->pdb, name, &tmp_obj, DB_CURVE)<0)
return NULL ;
if (NULL == (cu = DBAllocCurve ())) return NULL ;
*cu = tmpcu;
- CHECK_TYPE(type, DB_CURVE, name);
+#if 0
if (cu->npts<=0)
{
DBFreeCurve (cu) ;
db_perror (name, E_NOTFOUND, me) ;
return NULL ;
}
+#endif
if (DB_DOUBLE == cu->datatype && PJ_InqForceSingle())
cu->datatype = DB_FLOAT ;
@@ -3679,7 +3730,7 @@ db_pdb_GetCurve (DBfile *_dbfile, char *name)
INIT_OBJ (&tmp_obj) ;
DEFALL_OBJ ("xvals", &cu->x, cu->datatype) ;
DEFALL_OBJ ("yvals", &cu->y, cu->datatype) ;
- PJ_GetObject (dbfile->pdb, name, &tmp_obj, NULL) ;
+ PJ_GetObject (dbfile->pdb, name, &tmp_obj, 0) ;
}
}
@@ -3762,11 +3813,13 @@ db_pdb_GetComponentType (DBfile *_dbfile, char *objname, char *compname)
* Added logic to control behavior of slash character swapping for
* windows/linux and skipping of first semicolon in calls to
* db_StringListToStringArray.
+ *
+ * Mark C. Miller, Thu Jan 6 17:01:28 PST 2011
+ * Fix name of guihide array (removed the extra 's').
*--------------------------------------------------------------------*/
SILO_CALLBACK DBdefvars *
-db_pdb_GetDefvars(DBfile *_dbfile, const char *objname)
+db_pdb_GetDefvars(DBfile *_dbfile, char const *objname)
{
- char *typestring = NULL;
DBdefvars *defv = NULL;
int ncomps, type;
char *tmpnames, *tmpdefns, tmp[256];
@@ -3781,33 +3834,32 @@ db_pdb_GetDefvars(DBfile *_dbfile, const char *objname)
if (type == DB_DEFVARS)
{
DBdefvars tmpdefv;
- memset(&tmpdefv, 0, sizeof(DBdefvars));
+ PJcomplist *_tcl;
+ memset(&tmpdefv, 0, sizeof(DBdefvars));
INIT_OBJ(&tmp_obj);
DEFINE_OBJ("ndefs", &tmpdefv.ndefs, DB_INT);
DEFALL_OBJ("types", &tmpdefv.types, DB_INT);
- DEFALL_OBJ("guihides", &tmpdefv.guihides, DB_INT);
+ DEFALL_OBJ("guihide", &tmpdefv.guihides, DB_INT);
DEFALL_OBJ("names", &tmpnames, DB_CHAR);
DEFALL_OBJ("defns", &tmpdefns, DB_CHAR);
- if (PJ_GetObject(dbfile->pdb, (char *) objname, &tmp_obj, &typestring) < 0)
+ if (PJ_GetObject(dbfile->pdb, (char *) objname, &tmp_obj, DB_DEFVARS) < 0)
return NULL;
if ((defv = DBAllocDefvars(0)) == NULL)
return NULL;
*defv = tmpdefv;
- CHECK_TYPE(typestring, DB_DEFVARS, objname);
-
if ((tmpnames != NULL) && (defv->ndefs > 0))
{
- defv->names = DBStringListToStringArray(tmpnames, defv->ndefs,
+ defv->names = DBStringListToStringArray(tmpnames, &(defv->ndefs),
!handleSlashSwap, !skipFirstSemicolon);
FREE(tmpnames);
}
if ((tmpdefns != NULL) && (defv->ndefs > 0))
{
- defv->defns = DBStringListToStringArray(tmpdefns, defv->ndefs,
+ defv->defns = DBStringListToStringArray(tmpdefns, &(defv->ndefs),
!handleSlashSwap, !skipFirstSemicolon);
FREE(tmpdefns);
}
@@ -3959,7 +4011,6 @@ pdb_getvarinfo (PDBfile *pdbfile,
SILO_CALLBACK DBmultimesh *
db_pdb_GetMultimesh (DBfile *_dbfile, char *objname)
{
- char *typestring = NULL;
DBmultimesh *mm = NULL;
int ncomps, type;
char *tmpnames=0, tmp[256];
@@ -3967,6 +4018,7 @@ db_pdb_GetMultimesh (DBfile *_dbfile, char *objname)
DBfile_pdb *dbfile = (DBfile_pdb *) _dbfile;
PJcomplist tmp_obj;
static char *me = "db_pdb_GetMultimesh";
+ PJcomplist *_tcl;
db_pdb_getobjinfo(dbfile->pdb, objname, tmp, &ncomps);
type = DBGetObjtypeTag(tmp);
@@ -4003,23 +4055,23 @@ db_pdb_GetMultimesh (DBfile *_dbfile, char *objname)
DEFINE_OBJ("block_type", &tmpmm.block_type, DB_INT);
DEFALL_OBJ("empty_list", &tmpmm.empty_list, DB_INT);
DEFINE_OBJ("empty_cnt", &tmpmm.empty_cnt, DB_INT);
+ DEFINE_OBJ("repr_block_idx", &tmpmm.repr_block_idx, DB_INT);
- if (PJ_GetObject(dbfile->pdb, objname, &tmp_obj, &typestring) < 0)
+ if (PJ_GetObject(dbfile->pdb, objname, &tmp_obj, DB_MULTIMESH) < 0)
return NULL;
if ((mm = DBAllocMultimesh(0)) == NULL)
return NULL;
*mm = tmpmm;
- CHECK_TYPE(typestring, DB_MULTIMESH, objname);
-
/* The value we store to the file for 'topo_dim' member is
designed such that zero indicates a value that was NOT
specified in the file. Since zero is a valid topological
dimension, when we store topo_dim to a file, we always
add 1. So, we have to subtract it here. This was implemented
for multimeshes in 4.7 and so is handled correctly for
- them in all cases. */
+ them in all cases. Likewise for repr_block_idx. */
mm->topo_dim = mm->topo_dim - 1;
+ mm->repr_block_idx = mm->repr_block_idx-1;
/*----------------------------------------
* Internally, the meshnames and groupings
@@ -4029,12 +4081,12 @@ db_pdb_GetMultimesh (DBfile *_dbfile, char *objname)
*----------------------------------------*/
if ((tmpnames != NULL) && (mm->nblocks > 0)) {
- mm->meshnames = DBStringListToStringArray(tmpnames, mm->nblocks,
+ mm->meshnames = DBStringListToStringArray(tmpnames, &(mm->nblocks),
handleSlashSwap, skipFirstSemicolon);
FREE(tmpnames);
}
if ((tmpgnames != NULL) && (mm->lgroupings > 0)) {
- mm->groupnames = DBStringListToStringArray(tmpgnames, mm->lgroupings,
+ mm->groupnames = DBStringListToStringArray(tmpgnames, &(mm->lgroupings),
!handleSlashSwap, !skipFirstSemicolon);
FREE(tmpgnames);
}
@@ -4052,10 +4104,9 @@ db_pdb_GetMultimesh (DBfile *_dbfile, char *objname)
* the given database.
*--------------------------------------------------------------------*/
SILO_CALLBACK DBmultimeshadj *
-db_pdb_GetMultimeshadj (DBfile *_dbfile, const char *objname, int nmesh,
- const int *block_map)
+db_pdb_GetMultimeshadj (DBfile *_dbfile, char const *objname, int nmesh,
+ int const *block_map)
{
- char *typestring = NULL;
DBmultimeshadj *mmadj = NULL;
int ncomps, type;
int i, j, tmpnmesh;
@@ -4065,6 +4116,7 @@ db_pdb_GetMultimeshadj (DBfile *_dbfile, const char *objname, int nmesh,
static char *me = "db_pdb_GetMultimeshadj";
char tmpn[256];
int *offsetmap, *offsetmapn=0, *offsetmapz=0, lneighbors, tmpoff;
+ PJcomplist *_tcl;
db_pdb_getobjinfo(dbfile->pdb, (char*)objname, tmp, &ncomps);
type = DBGetObjtypeTag(tmp);
@@ -4088,14 +4140,12 @@ db_pdb_GetMultimeshadj (DBfile *_dbfile, const char *objname, int nmesh,
DEFALL_OBJ("lnodelists", &tmpmmadj.lnodelists, DB_INT);
DEFALL_OBJ("lzonelists", &tmpmmadj.lzonelists, DB_INT);
- if (PJ_GetObject(dbfile->pdb, (char*)objname, &tmp_obj, &typestring) < 0)
+ if (PJ_GetObject(dbfile->pdb, (char*)objname, &tmp_obj, DB_MULTIMESHADJ) < 0)
return NULL;
if ((mmadj = DBAllocMultimeshadj(0)) == NULL)
return NULL;
*mmadj = tmpmmadj;
- CHECK_TYPE(typestring, DB_MULTIMESHADJ, objname);
-
offsetmap = ALLOC_N(int, mmadj->nblocks);
lneighbors = 0;
for (i = 0; i < mmadj->nblocks; i++)
@@ -4252,7 +4302,6 @@ db_pdb_GetMultimeshadj (DBfile *_dbfile, const char *objname, int nmesh,
SILO_CALLBACK DBmultivar *
db_pdb_GetMultivar (DBfile *_dbfile, char *objname)
{
- char *typestring = NULL;
DBmultivar *mv = NULL;
int ncomps, type;
char *tmpnames=0, tmp[256];
@@ -4260,6 +4309,7 @@ db_pdb_GetMultivar (DBfile *_dbfile, char *objname)
PJcomplist tmp_obj;
static char *me = "db_pdb_GetMultivar";
char *rpnames = NULL;
+ PJcomplist *_tcl;
db_pdb_getobjinfo(dbfile->pdb, objname, tmp, &ncomps);
type = DBGetObjtypeTag(tmp);
@@ -4290,13 +4340,16 @@ db_pdb_GetMultivar (DBfile *_dbfile, char *objname)
DEFINE_OBJ("block_type", &tmpmv.block_type, DB_INT);
DEFALL_OBJ("empty_list", &tmpmv.empty_list, DB_INT);
DEFINE_OBJ("empty_cnt", &tmpmv.empty_cnt, DB_INT);
+ DEFINE_OBJ("repr_block_idx", &tmpmv.repr_block_idx, DB_INT);
- if (PJ_GetObject(dbfile->pdb, objname, &tmp_obj, &typestring) < 0)
+ if (PJ_GetObject(dbfile->pdb, objname, &tmp_obj, DB_MULTIVAR) < 0)
return NULL;
if ((mv = DBAllocMultivar(0)) == NULL)
return NULL;
*mv = tmpmv;
- CHECK_TYPE(typestring, DB_MULTIVAR, objname);
+
+ /* -1 to support zero value indicating NOT SET */
+ mv->repr_block_idx = mv->repr_block_idx - 1;
/*----------------------------------------
* Internally, the varnames are stored
@@ -4306,14 +4359,14 @@ db_pdb_GetMultivar (DBfile *_dbfile, char *objname)
*----------------------------------------*/
if (tmpnames != NULL && mv->nvars > 0) {
- mv->varnames = DBStringListToStringArray(tmpnames, mv->nvars,
+ mv->varnames = DBStringListToStringArray(tmpnames, &(mv->nvars),
handleSlashSwap, skipFirstSemicolon);
FREE(tmpnames);
}
if (rpnames != NULL)
{
- mv->region_pnames = DBStringListToStringArray(rpnames, -1,
+ mv->region_pnames = DBStringListToStringArray(rpnames, 0,
!handleSlashSwap, !skipFirstSemicolon);
FREE(rpnames);
}
@@ -4383,7 +4436,6 @@ db_pdb_GetMultivar (DBfile *_dbfile, char *objname)
SILO_CALLBACK DBmultimat *
db_pdb_GetMultimat (DBfile *_dbfile, char *objname)
{
- char *typestring = NULL;
DBmultimat *mt = NULL;
int ncomps, type;
char *tmpnames=NULL, *s=NULL, *name=NULL, tmp[256];
@@ -4391,6 +4443,7 @@ db_pdb_GetMultimat (DBfile *_dbfile, char *objname)
DBfile_pdb *dbfile = (DBfile_pdb *) _dbfile;
PJcomplist tmp_obj;
static char *me = "db_pdb_GetMultimat";
+ PJcomplist *_tcl;
db_pdb_getobjinfo(dbfile->pdb, objname, tmp, &ncomps);
type = DBGetObjtypeTag(tmp);
@@ -4421,13 +4474,16 @@ db_pdb_GetMultimat (DBfile *_dbfile, char *objname)
DEFALL_OBJ("block_ns", &tmpmt.block_ns, DB_CHAR);
DEFALL_OBJ("empty_list", &tmpmt.empty_list, DB_INT);
DEFINE_OBJ("empty_cnt", &tmpmt.empty_cnt, DB_INT);
+ DEFINE_OBJ("repr_block_idx", &tmpmt.repr_block_idx, DB_INT);
- if (PJ_GetObject(dbfile->pdb, objname, &tmp_obj, &typestring) < 0)
+ if (PJ_GetObject(dbfile->pdb, objname, &tmp_obj, DB_MULTIMAT) < 0)
return NULL;
if ((mt = DBAllocMultimat(0)) == NULL)
return NULL;
*mt = tmpmt;
- CHECK_TYPE(typestring, DB_MULTIMAT, objname);
+
+ /* -1 to support zero value indicating NOT SET */
+ mt->repr_block_idx = mt->repr_block_idx - 1;
/*----------------------------------------
* Internally, the material names are stored
@@ -4438,7 +4494,7 @@ db_pdb_GetMultimat (DBfile *_dbfile, char *objname)
if (tmpnames != NULL && mt->nmats > 0)
{
- mt->matnames = DBStringListToStringArray(tmpnames, mt->nmats,
+ mt->matnames = DBStringListToStringArray(tmpnames, &(mt->nmats),
handleSlashSwap, skipFirstSemicolon);
FREE(tmpnames);
}
@@ -4446,13 +4502,13 @@ db_pdb_GetMultimat (DBfile *_dbfile, char *objname)
if (tmpmaterial_names && mt->nmatnos > 0)
{
mt->material_names = DBStringListToStringArray(tmpmaterial_names,
- mt->nmatnos, !handleSlashSwap, !skipFirstSemicolon);
+ &(mt->nmatnos), !handleSlashSwap, !skipFirstSemicolon);
FREE(tmpmaterial_names);
}
if (tmpmatcolors && mt->nmatnos > 0)
{
mt->matcolors = DBStringListToStringArray(tmpmatcolors,
- mt->nmatnos, !handleSlashSwap, !skipFirstSemicolon);
+ &(mt->nmatnos), !handleSlashSwap, !skipFirstSemicolon);
FREE(tmpmatcolors);
}
}
@@ -4503,7 +4559,6 @@ db_pdb_GetMultimat (DBfile *_dbfile, char *objname)
SILO_CALLBACK DBmultimatspecies *
db_pdb_GetMultimatspecies (DBfile *_dbfile, char *objname)
{
- char *typestring = NULL;
DBmultimatspecies *mms = NULL;
int ncomps, type;
int i, nstrs = 0;
@@ -4512,6 +4567,7 @@ db_pdb_GetMultimatspecies (DBfile *_dbfile, char *objname)
DBfile_pdb *dbfile = (DBfile_pdb *) _dbfile;
PJcomplist tmp_obj;
static char *me = "db_pdb_GetMultimatspecies";
+ PJcomplist *_tcl;
db_pdb_getobjinfo(dbfile->pdb, objname, tmp, &ncomps);
type = DBGetObjtypeTag(tmp);
@@ -4539,13 +4595,16 @@ db_pdb_GetMultimatspecies (DBfile *_dbfile, char *objname)
DEFALL_OBJ("block_ns", &tmpmms.block_ns, DB_CHAR);
DEFALL_OBJ("empty_list", &tmpmms.empty_list, DB_INT);
DEFINE_OBJ("empty_cnt", &tmpmms.empty_cnt, DB_INT);
+ DEFINE_OBJ("repr_block_idx", &tmpmms.repr_block_idx, DB_INT);
- if (PJ_GetObject(dbfile->pdb, objname, &tmp_obj, &typestring) < 0)
+ if (PJ_GetObject(dbfile->pdb, objname, &tmp_obj, DB_MULTIMATSPECIES) < 0)
return NULL;
if ((mms = DBAllocMultimatspecies(0)) == NULL)
return NULL;
*mms = tmpmms;
- CHECK_TYPE(typestring, DB_MULTIMATSPECIES, objname);
+
+ /* -1 to support zero value indicating NOT SET */
+ mms->repr_block_idx = mms->repr_block_idx - 1;
/*----------------------------------------
* Internally, the material species names
@@ -4556,7 +4615,7 @@ db_pdb_GetMultimatspecies (DBfile *_dbfile, char *objname)
if (tmpnames != NULL && mms->nspec > 0)
{
- mms->specnames = DBStringListToStringArray(tmpnames, mms->nspec,
+ mms->specnames = DBStringListToStringArray(tmpnames, &(mms->nspec),
handleSlashSwap, skipFirstSemicolon);
FREE(tmpnames);
}
@@ -4566,7 +4625,7 @@ db_pdb_GetMultimatspecies (DBfile *_dbfile, char *objname)
for (i = 0; i < mms->nmat; i++)
nstrs += mms->nmatspec[i];
if (nstrs > 0)
- mms->species_names = DBStringListToStringArray(tmpspecnames, nstrs,
+ mms->species_names = DBStringListToStringArray(tmpspecnames, &nstrs,
!handleSlashSwap, !skipFirstSemicolon);
FREE(tmpspecnames);
}
@@ -4578,7 +4637,7 @@ db_pdb_GetMultimatspecies (DBfile *_dbfile, char *objname)
nstrs += mms->nmatspec[i];
}
if (nstrs > 0)
- mms->speccolors = DBStringListToStringArray(tmpcolors, nstrs,
+ mms->speccolors = DBStringListToStringArray(tmpcolors, &nstrs,
!handleSlashSwap, !skipFirstSemicolon);
FREE(tmpcolors);
}
@@ -4631,18 +4690,17 @@ db_pdb_GetMultimatspecies (DBfile *_dbfile, char *objname)
SILO_CALLBACK DBpointmesh *
db_pdb_GetPointmesh (DBfile *_dbfile, char *objname)
{
- char *type = NULL;
DBpointmesh *pm = NULL;
DBfile_pdb *dbfile = (DBfile_pdb *) _dbfile;
PJcomplist tmp_obj;
static char *me = "db_pdb_GetPointmesh";
DBpointmesh tmppm;
- memset(&tmppm, 0, sizeof(DBpointmesh));
-
+ PJcomplist *_tcl;
/*------------------------------------------------------------*/
/* Comp. Name Comp. Address Data Type */
/*------------------------------------------------------------*/
+ memset(&tmppm, 0, sizeof(DBpointmesh));
INIT_OBJ(&tmp_obj);
DEFINE_OBJ("block_no", &tmppm.block_no, DB_INT);
@@ -4676,12 +4734,11 @@ db_pdb_GetPointmesh (DBfile *_dbfile, char *objname)
DEFALL_OBJ("units1", &tmppm.units[1], DB_CHAR);
DEFALL_OBJ("units2", &tmppm.units[2], DB_CHAR);
- if (PJ_GetObject(dbfile->pdb, objname, &tmp_obj, &type) < 0)
+ if (PJ_GetObject(dbfile->pdb, objname, &tmp_obj, DB_POINTMESH) < 0)
return NULL;
if ((pm = DBAllocPointmesh()) == NULL)
return NULL;
*pm = tmppm;
- CHECK_TYPE(type, DB_POINTMESH, objname);
/*
* Read the remainder of the object: loop over all values
@@ -4692,7 +4749,7 @@ db_pdb_GetPointmesh (DBfile *_dbfile, char *objname)
INIT_OBJ(&tmp_obj);
DEFALL_OBJ("gnodeno", &tmppm.gnodeno, pm->gnznodtype);
pm->gnodeno = 0;
- if (PJ_GetObject(dbfile->pdb, objname, &tmp_obj, NULL)>=0)
+ if (PJ_GetObject(dbfile->pdb, objname, &tmp_obj, 0)>=0)
pm->gnodeno = tmppm.gnodeno;
}
@@ -4769,7 +4826,6 @@ db_pdb_GetPointmesh (DBfile *_dbfile, char *objname)
SILO_CALLBACK DBmeshvar *
db_pdb_GetPointvar (DBfile *_dbfile, char *objname)
{
- char *type = NULL;
DBmeshvar *mv = NULL;
int i;
DBfile_pdb *dbfile = (DBfile_pdb *) _dbfile;
@@ -4778,12 +4834,12 @@ db_pdb_GetPointvar (DBfile *_dbfile, char *objname)
static char *me = "db_pdb_GetPointvar";
char *rpnames = NULL;
DBmeshvar tmpmv;
- memset(&tmpmv, 0, sizeof(DBmeshvar));
-
+ PJcomplist *_tcl;
/*------------------------------------------------------------*/
/* Comp. Name Comp. Address Data Type */
/*------------------------------------------------------------*/
+ memset(&tmpmv, 0, sizeof(DBmeshvar));
INIT_OBJ(&tmp_obj);
DEFINE_OBJ("cycle", &tmpmv.cycle, DB_INT);
@@ -4803,12 +4859,11 @@ db_pdb_GetPointvar (DBfile *_dbfile, char *objname)
DEFINE_OBJ("conserved", &tmpmv.conserved, DB_INT);
DEFINE_OBJ("extensive", &tmpmv.extensive, DB_INT);
- if (PJ_GetObject(dbfile->pdb, objname, &tmp_obj, &type) < 0)
+ if (PJ_GetObject(dbfile->pdb, objname, &tmp_obj, DB_POINTVAR) < 0)
return NULL;
if ((mv = DBAllocMeshvar()) == NULL)
return NULL;
*mv = tmpmv;
- CHECK_TYPE(type, DB_POINTVAR, objname);
/*
* Read the remainder of the object: loop over all values
@@ -4850,12 +4905,12 @@ db_pdb_GetPointvar (DBfile *_dbfile, char *objname)
}
}
- PJ_GetObject(dbfile->pdb, objname, &tmp_obj, NULL);
+ PJ_GetObject(dbfile->pdb, objname, &tmp_obj, 0);
}
if (rpnames != NULL)
{
- mv->region_pnames = DBStringListToStringArray(rpnames, -1,
+ mv->region_pnames = DBStringListToStringArray(rpnames, 0,
!handleSlashSwap, !skipFirstSemicolon);
FREE(rpnames);
}
@@ -4911,14 +4966,14 @@ db_pdb_GetPointvar (DBfile *_dbfile, char *objname)
SILO_CALLBACK DBquadmesh *
db_pdb_GetQuadmesh (DBfile *_dbfile, char *objname)
{
- char *type = NULL;
DBquadmesh *qm = NULL;
PJcomplist tmp_obj;
DBfile_pdb *dbfile = (DBfile_pdb *) _dbfile;
static char *me = "db_pdb_GetQuadmesh";
DBquadmesh tmpqm;
- memset(&tmpqm, 0, sizeof(DBquadmesh));
+ PJcomplist *_tcl;
+ memset(&tmpqm, 0, sizeof(DBquadmesh));
tmpqm.base_index[0] = -99999;
/*------------------------------------------------------------*
@@ -4966,24 +5021,11 @@ db_pdb_GetQuadmesh (DBfile *_dbfile, char *objname)
/* The type passed here to PJ_GetObject is NULL because quadmeshes can have
* one of two types: DB_COLLINEAR or DB_NONCOLLINEAR. */
- if (PJ_GetObject(dbfile->pdb, objname, &tmp_obj, &type) < 0)
+ if (PJ_GetObject(dbfile->pdb, objname, &tmp_obj, DB_QUADMESH) < 0)
return NULL;
if ((qm = DBAllocQuadmesh()) == NULL)
return NULL;
*qm = tmpqm;
- if ((strcmp(type, DBGetObjtypeName(DB_QUAD_RECT)) != 0)
- &&
- (strcmp(type, DBGetObjtypeName(DB_QUAD_CURV)) != 0)
- )
- {
- char error[256];
- sprintf(error,"Requested %s object \"%s\" is not a quadmesh.",
- type, objname);
- FREE(type);
- db_perror(error, E_INTERNAL, me);
- } else {
- FREE(type);
- }
/*
* If base_index was not set with the PJ_GetObject call, then
@@ -5068,7 +5110,6 @@ db_pdb_GetQuadmesh (DBfile *_dbfile, char *objname)
SILO_CALLBACK DBquadvar *
db_pdb_GetQuadvar (DBfile *_dbfile, char *objname)
{
- char *type = NULL;
DBquadvar *qv = NULL;
int i;
DBfile_pdb *dbfile = (DBfile_pdb *) _dbfile;
@@ -5077,12 +5118,12 @@ db_pdb_GetQuadvar (DBfile *_dbfile, char *objname)
static char *me = "db_pdb_GetQuadvar";
char *rpnames = NULL;
DBquadvar tmpqv;
- memset(&tmpqv, 0, sizeof(DBquadvar));
-
+ PJcomplist *_tcl;
/*------------------------------------------------------------*/
/* Comp. Name Comp. Address Data Type */
/*------------------------------------------------------------*/
+ memset(&tmpqv, 0, sizeof(DBquadvar));
INIT_OBJ(&tmp_obj);
/* Scalars */
@@ -5115,12 +5156,11 @@ db_pdb_GetQuadvar (DBfile *_dbfile, char *objname)
DEFALL_OBJ("label", &tmpqv.label, DB_CHAR);
DEFALL_OBJ("units", &tmpqv.units, DB_CHAR);
- if (PJ_GetObject(dbfile->pdb, objname, &tmp_obj, &type) < 0)
+ if (PJ_GetObject(dbfile->pdb, objname, &tmp_obj, DB_QUADVAR) < 0)
return NULL;
if ((qv = DBAllocQuadvar()) == NULL)
return NULL;
*qv = tmpqv;
- CHECK_TYPE(type, DB_QUADVAR, objname);
/*
* Read the remainder of the object: loop over all values
@@ -5156,12 +5196,12 @@ db_pdb_GetQuadvar (DBfile *_dbfile, char *objname)
}
}
- PJ_GetObject(dbfile->pdb, objname, &tmp_obj, NULL);
+ PJ_GetObject(dbfile->pdb, objname, &tmp_obj, 0);
}
if (rpnames != NULL)
{
- qv->region_pnames = DBStringListToStringArray(rpnames, -1,
+ qv->region_pnames = DBStringListToStringArray(rpnames, 0,
!handleSlashSwap, !skipFirstSemicolon);
FREE(rpnames);
}
@@ -5239,7 +5279,6 @@ db_pdb_GetQuadvar (DBfile *_dbfile, char *objname)
SILO_CALLBACK DBucdmesh *
db_pdb_GetUcdmesh (DBfile *_dbfile, char *meshname)
{
- char *type = NULL;
DBfile_pdb *dbfile = (DBfile_pdb *) _dbfile;
DBucdmesh *um = NULL;
char *flname = NULL, *zlname = NULL, *elname = NULL,
@@ -5248,12 +5287,12 @@ db_pdb_GetUcdmesh (DBfile *_dbfile, char *meshname)
int lo_offset, hi_offset;
static char *me = "db_pdb_GetUcdmesh";
DBucdmesh tmpum;
- memset(&tmpum, 0, sizeof(DBucdmesh));
-
+ PJcomplist *_tcl;
/*------------------------------------------------------------*/
/* Comp. Name Comp. Address Data Type */
/*------------------------------------------------------------*/
+ memset(&tmpum, 0, sizeof(DBucdmesh));
INIT_OBJ(&tmp_obj);
DEFINE_OBJ("block_no", &tmpum.block_no, DB_INT);
@@ -5298,12 +5337,11 @@ db_pdb_GetUcdmesh (DBfile *_dbfile, char *meshname)
DEFINE_OBJ("tv_connectivity", &tmpum.tv_connectivity, DB_INT);
DEFINE_OBJ("disjoint_mode", &tmpum.disjoint_mode, DB_INT);
- if (PJ_GetObject(dbfile->pdb, meshname, &tmp_obj, &type) < 0)
+ if (PJ_GetObject(dbfile->pdb, meshname, &tmp_obj, DB_UCDMESH) < 0)
return NULL;
if ((um = DBAllocUcdmesh()) == NULL)
return NULL;
*um = tmpum;
- CHECK_TYPE(type, DB_UCDMESH, meshname);
if (PJ_InqForceSingle() == TRUE)
um->datatype = DB_FLOAT;
@@ -5328,7 +5366,7 @@ db_pdb_GetUcdmesh (DBfile *_dbfile, char *meshname)
INIT_OBJ(&tmp_obj);
DEFALL_OBJ("gnodeno", &tmpum.gnodeno, um->gnznodtype);
um->gnodeno = 0;
- if (PJ_GetObject(dbfile->pdb, meshname, &tmp_obj, NULL)>=0)
+ if (PJ_GetObject(dbfile->pdb, meshname, &tmp_obj, 0)>=0)
um->gnodeno = tmpum.gnodeno;
}
@@ -5360,7 +5398,7 @@ db_pdb_GetUcdmesh (DBfile *_dbfile, char *meshname)
DEFALL_OBJ("types", &tmpfaces.types, DB_INT);
DEFALL_OBJ("zoneno", &tmpfaces.zoneno, DB_INT);
- if (PJ_GetObject(dbfile->pdb, flname, &tmp_obj, NULL) < 0)
+ if (PJ_GetObject(dbfile->pdb, flname, &tmp_obj, 0) < 0)
{
DBFreeUcdmesh(um);
return NULL;
@@ -5405,7 +5443,7 @@ db_pdb_GetUcdmesh (DBfile *_dbfile, char *meshname)
DEFINE_OBJ("lo_offset", &lo_offset, DB_INT);
DEFINE_OBJ("hi_offset", &hi_offset, DB_INT);
- if (PJ_GetObject(dbfile->pdb, zlname, &tmp_obj, &type) < 0)
+ if (PJ_GetObject(dbfile->pdb, zlname, &tmp_obj, DB_ZONELIST) < 0)
{
DBFreeUcdmesh(um);
return NULL;
@@ -5417,8 +5455,6 @@ db_pdb_GetUcdmesh (DBfile *_dbfile, char *meshname)
}
*(um->zones) = tmpzones;
- CHECK_TYPE(type, DB_ZONELIST, zlname);
-
um->zones->min_index = lo_offset;
um->zones->max_index = um->zones->nzones - hi_offset - 1;
@@ -5440,7 +5476,7 @@ db_pdb_GetUcdmesh (DBfile *_dbfile, char *meshname)
INIT_OBJ(&tmp_obj);
DEFALL_OBJ("gzoneno", &tmpzones.gzoneno, um->zones->gnznodtype);
um->zones->gzoneno = 0;
- if (PJ_GetObject(dbfile->pdb, zlname, &tmp_obj, NULL)>=0)
+ if (PJ_GetObject(dbfile->pdb, zlname, &tmp_obj, 0)>=0)
um->zones->gzoneno = tmpzones.gzoneno;
}
@@ -5463,7 +5499,7 @@ db_pdb_GetUcdmesh (DBfile *_dbfile, char *meshname)
DEFALL_OBJ("edge_beg", &tmpedges.edge_beg, DB_INT);
DEFALL_OBJ("edge_end", &tmpedges.edge_end, DB_INT);
- if (PJ_GetObject(dbfile->pdb, elname, &tmp_obj, NULL) < 0)
+ if (PJ_GetObject(dbfile->pdb, elname, &tmp_obj, 0) < 0)
{
DBFreeUcdmesh(um);
return NULL;
@@ -5551,7 +5587,6 @@ db_pdb_GetUcdmesh (DBfile *_dbfile, char *meshname)
SILO_CALLBACK DBucdvar *
db_pdb_GetUcdvar (DBfile *_dbfile, char *objname)
{
- char *type = NULL;
DBucdvar *uv = NULL;
int i;
DBfile_pdb *dbfile = (DBfile_pdb *) _dbfile;
@@ -5560,12 +5595,12 @@ db_pdb_GetUcdvar (DBfile *_dbfile, char *objname)
static char *me = "db_pdb_GetUcdvar";
char *rpnames = NULL;
DBucdvar tmpuv;
- memset(&tmpuv, 0, sizeof(DBucdvar));
-
+ PJcomplist *_tcl;
/*------------------------------------------------------------*/
/* Comp. Name Comp. Address Data Type */
/*------------------------------------------------------------*/
+ memset(&tmpuv, 0, sizeof(DBucdvar));
INIT_OBJ(&tmp_obj);
DEFINE_OBJ("cycle", &tmpuv.cycle, DB_INT);
@@ -5589,12 +5624,11 @@ db_pdb_GetUcdvar (DBfile *_dbfile, char *objname)
DEFINE_OBJ("conserved", &tmpuv.conserved, DB_INT);
DEFINE_OBJ("extensive", &tmpuv.extensive, DB_INT);
- if (PJ_GetObject(dbfile->pdb, objname, &tmp_obj, &type) < 0)
+ if (PJ_GetObject(dbfile->pdb, objname, &tmp_obj, DB_UCDVAR) < 0)
return NULL;
if ((uv = DBAllocUcdvar()) == NULL)
return NULL;
*uv = tmpuv;
- CHECK_TYPE(type, DB_UCDVAR, objname);
/*
* Read the remainder of the object: loop over all values
@@ -5629,12 +5663,12 @@ db_pdb_GetUcdvar (DBfile *_dbfile, char *objname)
}
}
- PJ_GetObject(dbfile->pdb, objname, &tmp_obj, NULL);
+ PJ_GetObject(dbfile->pdb, objname, &tmp_obj, 0);
}
if (rpnames != NULL)
{
- uv->region_pnames = DBStringListToStringArray(rpnames, -1,
+ uv->region_pnames = DBStringListToStringArray(rpnames, 0,
!handleSlashSwap, !skipFirstSemicolon);
FREE(rpnames);
}
@@ -5665,20 +5699,20 @@ db_pdb_GetUcdvar (DBfile *_dbfile, char *objname)
* db_StringListToStringArray.
*--------------------------------------------------------------------*/
SILO_CALLBACK DBcsgmesh *
-db_pdb_GetCsgmesh (DBfile *_dbfile, const char *meshname)
+db_pdb_GetCsgmesh (DBfile *_dbfile, char const *meshname)
{
- char *type = NULL;
DBfile_pdb *dbfile = (DBfile_pdb *) _dbfile;
DBcsgmesh *csgm = NULL;
char *zlname = NULL, *tmpbndnames = NULL;
PJcomplist tmp_obj;
static char *me = "db_pdb_GetCsgmesh";
DBcsgmesh tmpcsgm;
- memset(&tmpcsgm, 0, sizeof(DBcsgmesh));
+ PJcomplist *_tcl;
/*------------------------------------------------------------*/
/* Comp. Name Comp. Address Data Type */
/*------------------------------------------------------------*/
+ memset(&tmpcsgm, 0, sizeof(DBcsgmesh));
INIT_OBJ(&tmp_obj);
DEFINE_OBJ("block_no", &tmpcsgm.block_no, DB_INT);
@@ -5715,9 +5749,8 @@ db_pdb_GetCsgmesh (DBfile *_dbfile, const char *meshname)
if (SILO_Globals.dataReadMask & DBCSGMBoundaryNames)
DEFALL_OBJ("bndnames", &tmpbndnames, DB_CHAR);
- if (PJ_GetObject(dbfile->pdb, (char*) meshname, &tmp_obj, &type) < 0)
+ if (PJ_GetObject(dbfile->pdb, (char*) meshname, &tmp_obj, DB_CSGMESH) < 0)
return NULL;
- CHECK_TYPE(type, DB_CSGMESH, meshname);
/* now that we know the object's data type, we can correctly
read the coeffs */
@@ -5729,12 +5762,12 @@ db_pdb_GetCsgmesh (DBfile *_dbfile, const char *meshname)
}
DEFALL_OBJ("coeffs", &tmpcsgm.coeffs, tmpcsgm.datatype);
- PJ_GetObject(dbfile->pdb, (char*) meshname, &tmp_obj, NULL);
+ PJ_GetObject(dbfile->pdb, (char*) meshname, &tmp_obj, 0);
}
if ((tmpbndnames != NULL) && (tmpcsgm.nbounds > 0))
{
- tmpcsgm.bndnames = DBStringListToStringArray(tmpbndnames, tmpcsgm.nbounds,
+ tmpcsgm.bndnames = DBStringListToStringArray(tmpbndnames, &tmpcsgm.nbounds,
!handleSlashSwap, !skipFirstSemicolon);
FREE(tmpbndnames);
}
@@ -5774,9 +5807,8 @@ db_pdb_GetCsgmesh (DBfile *_dbfile, const char *meshname)
* db_StringListToStringArray.
*--------------------------------------------------------------------*/
SILO_CALLBACK DBcsgvar *
-db_pdb_GetCsgvar (DBfile *_dbfile, const char *objname)
+db_pdb_GetCsgvar (DBfile *_dbfile, char const *objname)
{
- char *type = NULL;
DBcsgvar *csgv = NULL;
int i;
DBfile_pdb *dbfile = (DBfile_pdb *) _dbfile;
@@ -5785,8 +5817,9 @@ db_pdb_GetCsgvar (DBfile *_dbfile, const char *objname)
static char *me = "db_pdb_GetCsgvar";
char *rpnames = NULL;
DBcsgvar tmpcsgv;
- memset(&tmpcsgv, 0, sizeof(DBcsgvar));
+ PJcomplist *_tcl;
+ memset(&tmpcsgv, 0, sizeof(DBcsgvar));
INIT_OBJ(&tmp_obj);
DEFINE_OBJ("cycle", &tmpcsgv.cycle, DB_INT);
@@ -5803,9 +5836,8 @@ db_pdb_GetCsgvar (DBfile *_dbfile, const char *objname)
DEFINE_OBJ("guihide", &tmpcsgv.guihide, DB_INT);
DEFALL_OBJ("region_pnames", &rpnames, DB_CHAR);
- if (PJ_GetObject(dbfile->pdb, (char*) objname, &tmp_obj, &type) < 0)
+ if (PJ_GetObject(dbfile->pdb, (char*) objname, &tmp_obj, DB_CSGVAR) < 0)
return NULL;
- CHECK_TYPE(type, DB_CSGVAR, objname);
/*
* Read the remainder of the object: loop over all values
@@ -5832,20 +5864,20 @@ db_pdb_GetCsgvar (DBfile *_dbfile, const char *objname)
DEFALL_OBJ(_valstr[i], &tmpcsgv.vals[i], tmpcsgv.datatype);
}
- PJ_GetObject(dbfile->pdb, (char*) objname, &tmp_obj, NULL);
+ PJ_GetObject(dbfile->pdb, (char*) objname, &tmp_obj, 0);
}
if (rpnames != NULL)
{
- csgv->region_pnames = DBStringListToStringArray(rpnames, -1,
+ csgv->region_pnames = DBStringListToStringArray(rpnames, 0,
!handleSlashSwap, !skipFirstSemicolon);
FREE(rpnames);
}
- tmpcsgv.name = STRDUP(objname);
-
if ((csgv = DBAllocCsgvar()) == NULL)
return NULL;
+
+ tmpcsgv.name = STRDUP(objname);
*csgv = tmpcsgv;
return (csgv);
@@ -5879,18 +5911,17 @@ db_pdb_GetCsgvar (DBfile *_dbfile, const char *objname)
SILO_CALLBACK DBfacelist *
db_pdb_GetFacelist(DBfile *_dbfile, char *objname)
{
- char *type = NULL;
DBfacelist *fl=NULL;
PJcomplist tmp_obj;
DBfile_pdb *dbfile = (DBfile_pdb*)_dbfile;
static char *me = "db_pdb_GetFacelist";
- DBfacelist tmpfl;
- memset(&tmpfl, 0, sizeof(DBfacelist));
-
+ DBfacelist tmpfl;
+ PJcomplist *_tcl;
/*------------------------------------------------------------*/
/* Comp. Name Comp. Address Data Type */
/*------------------------------------------------------------*/
+ memset(&tmpfl, 0, sizeof(DBfacelist));
INIT_OBJ(&tmp_obj);
DEFINE_OBJ("ndims", &tmpfl.ndims, DB_INT);
@@ -5911,12 +5942,11 @@ db_pdb_GetFacelist(DBfile *_dbfile, char *objname)
DEFALL_OBJ("zoneno", &tmpfl.zoneno, DB_INT);
}
- if (PJ_GetObject(dbfile->pdb, objname, &tmp_obj, &type) < 0)
+ if (PJ_GetObject(dbfile->pdb, objname, &tmp_obj, DB_FACELIST) < 0)
return NULL;
if ((fl = DBAllocFacelist()) == NULL)
return NULL;
*fl = tmpfl;
- CHECK_TYPE(type, DB_FACELIST, objname);
return fl;
}
@@ -5960,18 +5990,17 @@ db_pdb_GetFacelist(DBfile *_dbfile, char *objname)
SILO_CALLBACK DBzonelist *
db_pdb_GetZonelist(DBfile *_dbfile, char *objname)
{
- char *type = NULL;
DBzonelist *zl = NULL;
PJcomplist tmp_obj;
DBfile_pdb *dbfile = (DBfile_pdb*)_dbfile;
- static char *me = "db_pdb_GetZonelist";
- DBzonelist tmpzl;
- memset(&tmpzl, 0, sizeof(DBzonelist));
-
+ static char *me = "db_pdb_GetZonelist";
+ DBzonelist tmpzl;
+ PJcomplist *_tcl;
/*------------------------------------------------------------*/
/* Comp. Name Comp. Address Data Type */
/*------------------------------------------------------------*/
+ memset(&tmpzl, 0, sizeof(DBzonelist));
INIT_OBJ(&tmp_obj);
DEFINE_OBJ("ndims", &tmpzl.ndims, DB_INT);
@@ -5992,12 +6021,11 @@ db_pdb_GetZonelist(DBfile *_dbfile, char *objname)
DEFALL_OBJ("zoneno", &tmpzl.zoneno, DB_INT);
}
- if (PJ_GetObject(dbfile->pdb, objname, &tmp_obj, &type) < 0)
+ if (PJ_GetObject(dbfile->pdb, objname, &tmp_obj, DB_ZONELIST) < 0)
return NULL;
if ((zl = DBAllocZonelist()) == NULL)
return NULL;
*zl = tmpzl;
- CHECK_TYPE(type, DB_ZONELIST, objname);
/* optional global zone numbers */
zl->gnznodtype = zl->gnznodtype?zl->gnznodtype:DB_INT;
@@ -6005,7 +6033,7 @@ db_pdb_GetZonelist(DBfile *_dbfile, char *objname)
INIT_OBJ(&tmp_obj);
DEFALL_OBJ("gzoneno", &tmpzl.gzoneno, zl->gnznodtype);
zl->gzoneno = 0;
- if (PJ_GetObject(dbfile->pdb, objname, &tmp_obj, NULL)>=0)
+ if (PJ_GetObject(dbfile->pdb, objname, &tmp_obj, 0)>=0)
zl->gzoneno = tmpzl.gzoneno;
}
@@ -6050,18 +6078,17 @@ db_pdb_GetZonelist(DBfile *_dbfile, char *objname)
SILO_CALLBACK DBphzonelist *
db_pdb_GetPHZonelist(DBfile *_dbfile, char *objname)
{
- char *type = NULL;
DBphzonelist *phzl = NULL;
PJcomplist tmp_obj;
DBfile_pdb *dbfile = (DBfile_pdb*)_dbfile;
- static char *me = "db_pdb_GetPHZonelist";
- DBphzonelist tmpphzl;
- memset(&tmpphzl, 0, sizeof(DBphzonelist));
-
+ static char *me = "db_pdb_GetPHZonelist";
+ DBphzonelist tmpphzl;
+ PJcomplist *_tcl;
/*------------------------------------------------------------*/
/* Comp. Name Comp. Address Data Type */
/*------------------------------------------------------------*/
+ memset(&tmpphzl, 0, sizeof(DBphzonelist));
INIT_OBJ(&tmp_obj);
DEFINE_OBJ("nfaces", &tmpphzl.nfaces, DB_INT);
@@ -6083,12 +6110,11 @@ db_pdb_GetPHZonelist(DBfile *_dbfile, char *objname)
DEFALL_OBJ("zoneno", &tmpphzl.zoneno, DB_INT);
}
- if (PJ_GetObject(dbfile->pdb, objname, &tmp_obj, &type) < 0)
+ if (PJ_GetObject(dbfile->pdb, objname, &tmp_obj, DB_PHZONELIST) < 0)
return NULL;
if ((phzl = DBAllocPHZonelist()) == NULL)
return NULL;
*phzl = tmpphzl;
- CHECK_TYPE(type, DB_PHZONELIST, objname);
/* optional global zone numbers */
phzl->gnznodtype = phzl->gnznodtype?phzl->gnznodtype:DB_INT;
@@ -6096,7 +6122,7 @@ db_pdb_GetPHZonelist(DBfile *_dbfile, char *objname)
INIT_OBJ(&tmp_obj);
DEFALL_OBJ("gzoneno", &tmpphzl.gzoneno, phzl->gnznodtype);
phzl->gzoneno = 0;
- if (PJ_GetObject(dbfile->pdb, objname, &tmp_obj, NULL)>=0)
+ if (PJ_GetObject(dbfile->pdb, objname, &tmp_obj, 0)>=0)
phzl->gzoneno = tmpphzl.gzoneno;
}
@@ -6123,20 +6149,20 @@ db_pdb_GetPHZonelist(DBfile *_dbfile, char *objname)
* db_StringListToStringArray.
*-------------------------------------------------------------------------*/
SILO_CALLBACK DBcsgzonelist *
-db_pdb_GetCSGZonelist(DBfile *_dbfile, const char *objname)
+db_pdb_GetCSGZonelist(DBfile *_dbfile, char const *objname)
{
- char *type = NULL;
char *tmprnames = 0, *tmpznames = 0;
DBcsgzonelist *zl = NULL;
PJcomplist tmp_obj;
DBfile_pdb *dbfile = (DBfile_pdb*)_dbfile;
- static char *me = "db_pdb_GetCSGZonelist";
- DBcsgzonelist tmpzl;
- memset(&tmpzl, 0, sizeof(DBcsgzonelist));
+ static char *me = "db_pdb_GetCSGZonelist";
+ DBcsgzonelist tmpzl;
+ PJcomplist *_tcl;
/*------------------------------------------------------------*/
/* Comp. Name Comp. Address Data Type */
/*------------------------------------------------------------*/
+ memset(&tmpzl, 0, sizeof(DBcsgzonelist));
INIT_OBJ(&tmp_obj);
DEFINE_OBJ("nregs", &tmpzl.nregs, DB_INT);
@@ -6159,9 +6185,8 @@ db_pdb_GetCSGZonelist(DBfile *_dbfile, const char *objname)
if (SILO_Globals.dataReadMask & DBCSGZonelistZoneNames)
DEFALL_OBJ("zonenames", &tmpznames, DB_CHAR);
- if (PJ_GetObject(dbfile->pdb, (char*) objname, &tmp_obj, &type) < 0)
+ if (PJ_GetObject(dbfile->pdb, (char*) objname, &tmp_obj, DB_CSGZONELIST) < 0)
return NULL;
- CHECK_TYPE(type, DB_CSGZONELIST, objname);
/* now that we know the object's data type, we can correctly
read the xforms */
@@ -6173,19 +6198,19 @@ db_pdb_GetCSGZonelist(DBfile *_dbfile, const char *objname)
}
DEFALL_OBJ("xform", &tmpzl.xform, tmpzl.datatype);
- PJ_GetObject(dbfile->pdb, (char*) objname, &tmp_obj, NULL);
+ PJ_GetObject(dbfile->pdb, (char*) objname, &tmp_obj, 0);
}
if ((tmprnames != NULL) && (tmpzl.nregs > 0))
{
- tmpzl.regnames = DBStringListToStringArray(tmprnames, tmpzl.nregs,
+ tmpzl.regnames = DBStringListToStringArray(tmprnames, &tmpzl.nregs,
!handleSlashSwap, !skipFirstSemicolon);
FREE(tmprnames);
}
if ((tmpznames != NULL) && (tmpzl.nzones > 0))
{
- tmpzl.zonenames = DBStringListToStringArray(tmpznames, tmpzl.nzones,
+ tmpzl.zonenames = DBStringListToStringArray(tmpznames, &tmpzl.nzones,
!handleSlashSwap, !skipFirstSemicolon);
FREE(tmpznames);
}
@@ -6719,9 +6744,8 @@ db_pdb_GetComponentNames (DBfile *_dbfile, char *objname,
* db_StringListToStringArray.
*--------------------------------------------------------------------*/
SILO_CALLBACK DBmrgtree *
-db_pdb_GetMrgtree(DBfile *_dbfile, const char *mrgtree_name)
+db_pdb_GetMrgtree(DBfile *_dbfile, char const *mrgtree_name)
{
- char *type = NULL;
DBfile_pdb *dbfile = (DBfile_pdb *) _dbfile;
DBmrgtree *tree = NULL;
PJcomplist tmp_obj;
@@ -6732,11 +6756,12 @@ db_pdb_GetMrgtree(DBfile *_dbfile, const char *mrgtree_name)
int *intArray = 0;
char *s, **strArray = 0;
char *mrgv_onames = 0, *mrgv_rnames = 0;
- memset(&tmptree, 0, sizeof(DBmrgtree));
+ PJcomplist *_tcl;
/*------------------------------------------------------------*/
/* Comp. Name Comp. Address Data Type */
/*------------------------------------------------------------*/
+ memset(&tmptree, 0, sizeof(DBmrgtree));
INIT_OBJ(&tmp_obj);
/* read header and scalars data only first */
@@ -6749,10 +6774,8 @@ db_pdb_GetMrgtree(DBfile *_dbfile, const char *mrgtree_name)
DEFALL_OBJ("mrgvar_onames", &mrgv_onames, DB_CHAR);
DEFALL_OBJ("mrgvar_rnames", &mrgv_rnames, DB_CHAR);
- if (PJ_GetObject(dbfile->pdb, (char*)mrgtree_name, &tmp_obj, &type) < 0)
+ if (PJ_GetObject(dbfile->pdb, (char*)mrgtree_name, &tmp_obj, DB_MRGTREE) < 0)
return NULL;
- CHECK_TYPE(type, DB_MRGTREE, mrgtree_name);
- FREE(type);
tree = (DBmrgtree *) calloc(1,sizeof(DBmrgtree));
memset(tree, 0, sizeof(DBmrgtree));
@@ -6761,6 +6784,8 @@ db_pdb_GetMrgtree(DBfile *_dbfile, const char *mrgtree_name)
tree->cwr = 0;
num_nodes = tree->num_nodes;
+ if (num_nodes <= 0) return (tree);
+
/* allocate all the nodes of the tree and a linear list of pointers
to them */
ltree = (DBmrgtnode **) malloc(num_nodes * sizeof(DBmrgtnode*));
@@ -6782,21 +6807,24 @@ db_pdb_GetMrgtree(DBfile *_dbfile, const char *mrgtree_name)
/* read the node 'name' member */
INIT_OBJ(&tmp_obj);
DEFALL_OBJ("name", &s, DB_CHAR);
- PJ_GetObject(dbfile->pdb, (char*)mrgtree_name, &tmp_obj, NULL);
- strArray = DBStringListToStringArray(s, num_nodes,
- !handleSlashSwap, !skipFirstSemicolon);
- for (i = 0; i < num_nodes; i++)
- ltree[i]->name = strArray[i];
- FREE(s);
- FREE(strArray); /* free only top-level array of pointers */
+ PJ_GetObject(dbfile->pdb, (char*)mrgtree_name, &tmp_obj, 0);
+ if (s)
+ {
+ strArray = DBStringListToStringArray(s, &num_nodes,
+ !handleSlashSwap, !skipFirstSemicolon);
+ for (i = 0; i < num_nodes; i++)
+ ltree[i]->name = strArray[i];
+ FREE(s);
+ FREE(strArray); /* free only top-level array of pointers */
+ }
/* read the node 'names' member */
INIT_OBJ(&tmp_obj);
DEFALL_OBJ("names", &s, DB_CHAR);
- PJ_GetObject(dbfile->pdb, (char*)mrgtree_name, &tmp_obj, NULL);
+ PJ_GetObject(dbfile->pdb, (char*)mrgtree_name, &tmp_obj, 0);
if (s)
{
- strArray = DBStringListToStringArray(s, -1, !handleSlashSwap,
+ strArray = DBStringListToStringArray(s, 0, !handleSlashSwap,
!skipFirstSemicolon);
n = 0;
for (i = 0; i < num_nodes; i++)
@@ -6817,25 +6845,28 @@ db_pdb_GetMrgtree(DBfile *_dbfile, const char *mrgtree_name)
n++;
}
}
+ FREE(s);
+ FREE(strArray); /* free only top-level array of pointers */
}
- FREE(s);
- FREE(strArray); /* free only top-level array of pointers */
/* read the maps_name data */
INIT_OBJ(&tmp_obj);
DEFALL_OBJ("maps_name", &s, DB_CHAR);
- PJ_GetObject(dbfile->pdb, (char*)mrgtree_name, &tmp_obj, NULL);
- strArray = DBStringListToStringArray(s, num_nodes, !handleSlashSwap,
- !skipFirstSemicolon);
- for (i = 0; i < num_nodes; i++)
- ltree[i]->maps_name = strArray[i];
- FREE(s);
- FREE(strArray); /* free only top-level array of pointers */
+ PJ_GetObject(dbfile->pdb, (char*)mrgtree_name, &tmp_obj, 0);
+ if (s)
+ {
+ strArray = DBStringListToStringArray(s, &num_nodes, !handleSlashSwap,
+ !skipFirstSemicolon);
+ for (i = 0; i < num_nodes; i++)
+ ltree[i]->maps_name = strArray[i];
+ FREE(s);
+ FREE(strArray); /* free only top-level array of pointers */
+ }
/* read the map segment id data */
INIT_OBJ(&tmp_obj);
DEFALL_OBJ("seg_ids", &intArray, DB_INT);
- PJ_GetObject(dbfile->pdb, (char*)mrgtree_name, &tmp_obj, NULL);
+ PJ_GetObject(dbfile->pdb, (char*)mrgtree_name, &tmp_obj, 0);
n = 0;
for (i = 0; i < num_nodes; i++)
{
@@ -6852,7 +6883,7 @@ db_pdb_GetMrgtree(DBfile *_dbfile, const char *mrgtree_name)
/* read the map segment len data */
INIT_OBJ(&tmp_obj);
DEFALL_OBJ("seg_lens", &intArray, DB_INT);
- PJ_GetObject(dbfile->pdb, (char*)mrgtree_name, &tmp_obj, NULL);
+ PJ_GetObject(dbfile->pdb, (char*)mrgtree_name, &tmp_obj, 0);
n = 0;
for (i = 0; i < num_nodes; i++)
{
@@ -6869,7 +6900,7 @@ db_pdb_GetMrgtree(DBfile *_dbfile, const char *mrgtree_name)
/* read the map segment type data */
INIT_OBJ(&tmp_obj);
DEFALL_OBJ("seg_types", &intArray, DB_INT);
- PJ_GetObject(dbfile->pdb, (char*)mrgtree_name, &tmp_obj, NULL);
+ PJ_GetObject(dbfile->pdb, (char*)mrgtree_name, &tmp_obj, 0);
n = 0;
for (i = 0; i < num_nodes; i++)
{
@@ -6886,7 +6917,7 @@ db_pdb_GetMrgtree(DBfile *_dbfile, const char *mrgtree_name)
/* read the child ids */
INIT_OBJ(&tmp_obj);
DEFALL_OBJ("children", &intArray, DB_INT);
- PJ_GetObject(dbfile->pdb, (char*)mrgtree_name, &tmp_obj, NULL);
+ PJ_GetObject(dbfile->pdb, (char*)mrgtree_name, &tmp_obj, 0);
n = 0;
for (i = 0; i < num_nodes; i++)
{
@@ -6902,13 +6933,13 @@ db_pdb_GetMrgtree(DBfile *_dbfile, const char *mrgtree_name)
if (mrgv_onames)
{
- tree->mrgvar_onames = DBStringListToStringArray(mrgv_onames, -1,
+ tree->mrgvar_onames = DBStringListToStringArray(mrgv_onames, 0,
!handleSlashSwap, !skipFirstSemicolon);
FREE(mrgv_onames);
}
if (mrgv_rnames)
{
- tree->mrgvar_rnames = DBStringListToStringArray(mrgv_rnames, -1,
+ tree->mrgvar_rnames = DBStringListToStringArray(mrgv_rnames, 0,
!handleSlashSwap, !skipFirstSemicolon);
FREE(mrgv_rnames);
}
@@ -6935,21 +6966,20 @@ db_pdb_GetMrgtree(DBfile *_dbfile, const char *mrgtree_name)
*
*--------------------------------------------------------------------*/
SILO_CALLBACK DBgroupelmap*
-db_pdb_GetGroupelmap(DBfile *_dbfile, const char *name)
+db_pdb_GetGroupelmap(DBfile *_dbfile, char const *name)
{
int i, j, n;
DBgroupelmap *gm = NULL;
DBfile_pdb *dbfile = (DBfile_pdb *) _dbfile;
static char *me = "db_pdb_GetGroupelmap";
PJcomplist tmp_obj;
- char *type = NULL;
int *segData = NULL;
int *fracLengths = NULL;
void *fracsArray = NULL;
-
DBgroupelmap tmpgm;
- memset(&tmpgm, 0, sizeof(DBgroupelmap));
+ PJcomplist *_tcl;
+ memset(&tmpgm, 0, sizeof(DBgroupelmap));
INIT_OBJ(&tmp_obj);
DEFINE_OBJ("num_segments", &tmpgm.num_segments, DB_INT);
DEFINE_OBJ("fracs_data_type", &tmpgm.fracs_data_type, DB_INT);
@@ -6960,10 +6990,8 @@ db_pdb_GetGroupelmap(DBfile *_dbfile, const char *name)
DEFALL_OBJ("frac_lengths", &fracLengths, DB_INT);
DEFALL_OBJ("segment_fracs", &fracsArray, DB_FLOAT);
- if (PJ_GetObject(dbfile->pdb, (char*)name, &tmp_obj, &type) < 0)
+ if (PJ_GetObject(dbfile->pdb, (char*)name, &tmp_obj, DB_GROUPELMAP) < 0)
return NULL;
- CHECK_TYPE(type,DB_GROUPELMAP,name);
- FREE(type);
gm = (DBgroupelmap*) calloc(1,sizeof(DBgroupelmap));
*gm = tmpgm;
@@ -7047,24 +7075,23 @@ db_pdb_GetGroupelmap(DBfile *_dbfile, const char *name)
* semicolon in calls to db_StringListToStringArray.
*--------------------------------------------------------------------*/
SILO_CALLBACK DBmrgvar *
-db_pdb_GetMrgvar(DBfile *_dbfile, const char *objname)
+db_pdb_GetMrgvar(DBfile *_dbfile, char const *objname)
{
- char *type = NULL;
DBmrgvar *mrgv = NULL;
int i;
DBfile_pdb *dbfile = (DBfile_pdb *) _dbfile;
PJcomplist tmp_obj;
char tmp[256];
- static char *me = "db_pdb_GetMrgvar";
+ static char *me = "db_pdb_GetMrgvar";
char *rpnames = NULL;
char *cnames = NULL;
- DBmrgvar tmpmrgv;
- memset(&tmpmrgv, 0, sizeof(DBmrgvar));
-
+ DBmrgvar tmpmrgv;
+ PJcomplist *_tcl;
/*------------------------------------------------------------*/
/* Comp. Name Comp. Address Data Type */
/*------------------------------------------------------------*/
+ memset(&tmpmrgv, 0, sizeof(DBmrgvar));
INIT_OBJ(&tmp_obj);
DEFINE_OBJ("ncomps", &tmpmrgv.ncomps, DB_INT);
@@ -7074,11 +7101,10 @@ db_pdb_GetMrgvar(DBfile *_dbfile, const char *objname)
DEFALL_OBJ("compnames", &cnames, DB_CHAR);
DEFALL_OBJ("reg_pnames", &rpnames, DB_CHAR);
- if (PJ_GetObject(dbfile->pdb, (char*)objname, &tmp_obj, &type) < 0)
+ if (PJ_GetObject(dbfile->pdb, (char*)objname, &tmp_obj, DB_MRGVAR) < 0)
return NULL;
mrgv = (DBmrgvar *) calloc(1, sizeof(DBmrgvar));
*mrgv = tmpmrgv;
- CHECK_TYPE(type, DB_MRGVAR, objname);
INIT_OBJ(&tmp_obj);
@@ -7100,18 +7126,18 @@ db_pdb_GetMrgvar(DBfile *_dbfile, const char *objname)
DEFALL_OBJ(_valstr[i], &mrgv->data[i], DB_FLOAT);
}
- PJ_GetObject(dbfile->pdb, (char*)objname, &tmp_obj, NULL);
+ PJ_GetObject(dbfile->pdb, (char*)objname, &tmp_obj, 0);
if (cnames != NULL)
{
- mrgv->compnames = DBStringListToStringArray(cnames, mrgv->ncomps,
+ mrgv->compnames = DBStringListToStringArray(cnames, &(mrgv->ncomps),
!handleSlashSwap, !skipFirstSemicolon);
FREE(cnames);
}
if (rpnames != NULL)
{
- mrgv->reg_pnames = DBStringListToStringArray(rpnames, -1,
+ mrgv->reg_pnames = DBStringListToStringArray(rpnames, 0,
!handleSlashSwap, !skipFirstSemicolon);
FREE(rpnames);
}
@@ -7132,7 +7158,7 @@ db_pdb_GetMrgvar(DBfile *_dbfile, const char *objname)
* Programmer: Mark C. Miller, Tue Dec 2 09:59:20 PST 2008
*--------------------------------------------------------------------*/
SILO_CALLBACK int
-db_pdb_FreeCompressionResources(DBfile *_dbfile, const char *meshname)
+db_pdb_FreeCompressionResources(DBfile *_dbfile, char const *meshname)
{
return 0;
}
@@ -7168,7 +7194,7 @@ db_pdb_FreeCompressionResources(DBfile *_dbfile, const char *meshname)
#ifdef PDB_WRITE
SILO_CALLBACK int
db_pdb_WriteObject(DBfile *_file, /*File to write into */
- DBobject *obj, /*Object description to write out */
+ DBobject const *obj,/*Object description to write out */
int flags) /*Sentinel: 1=free associated memory */
{
PJgroup *group;
@@ -7209,9 +7235,9 @@ db_pdb_WriteObject(DBfile *_file, /*File to write into */
*--------------------------------------------------------------------*/
#ifdef PDB_WRITE
SILO_CALLBACK int
-db_pdb_WriteComponent (DBfile *_file, DBobject *obj, char *compname,
- char *prefix, char *datatype, const void *var,
- int nd, long count[])
+db_pdb_WriteComponent (DBfile *_file, DBobject *obj, char const *compname,
+ char const *prefix, char const *datatype, void const *var,
+ int nd, long const *count)
{
PDBfile *file;
char tmp[256];
@@ -7248,8 +7274,8 @@ db_pdb_WriteComponent (DBfile *_file, DBobject *obj, char *compname,
*-------------------------------------------------------------------------*/
#ifdef PDB_WRITE
SILO_CALLBACK int
-db_pdb_Write (DBfile *_dbfile, char *vname, void *var,
- int *dims, int ndims, int datatype)
+db_pdb_Write (DBfile *_dbfile, char const *vname, void const *var,
+ int const *dims, int ndims, int datatype)
{
DBfile_pdb *dbfile = (DBfile_pdb *) _dbfile;
char *idata;
@@ -7588,36 +7614,18 @@ db_pdb_PutCurve (DBfile *_dbfile, char *name, void *xvals, void *yvals,
* Y values array must be the null pointer!
*/
dtype_s = db_GetDatatypeString (dtype) ;
- if (_cu._reference && (xvals || yvals)) {
- return db_perror ("vals argument can not be used with reference option",
- E_BADARGS, me) ;
- }
if (_cu._varname[0]) {
- if (xvals) {
- return db_perror ("xvals argument specified with xvarname option",
- E_BADARGS, me) ;
- } else if (!_cu._varname[0]) {
- DBAddVarComponent (obj, "xvals", _cu._varname[0]) ;
- }
+ DBAddVarComponent (obj, "xvals", _cu._varname[0]) ;
} else {
- if (!xvals && !_cu._reference) {
- return db_perror ("xvals", E_BADARGS, me) ;
- } else if (xvals && !_cu._reference) {
+ if (xvals && !_cu._reference) {
DBWriteComponent (_dbfile, obj, "xvals", name, dtype_s,
xvals, 1, &lnpts);
}
}
if (_cu._varname[1]) {
- if (yvals) {
- return db_perror ("yvals argument specified with yvarname option",
- E_BADARGS, me) ;
- } else if (!_cu._varname[1]) {
- DBAddVarComponent (obj, "yvals", _cu._varname[1]) ;
- }
+ DBAddVarComponent (obj, "yvals", _cu._varname[1]) ;
} else {
- if (!yvals && !_cu._reference) {
- return db_perror ("yvals", E_BADARGS, me) ;
- } else if (yvals && !_cu._reference) {
+ if (yvals && !_cu._reference) {
DBWriteComponent (_dbfile, obj, "yvals", name, dtype_s,
yvals, 1, &lnpts);
}
@@ -7660,8 +7668,8 @@ db_pdb_PutCurve (DBfile *_dbfile, char *name, void *xvals, void *yvals,
*--------------------------------------------------------------------*/
#ifdef PDB_WRITE
SILO_CALLBACK int
-db_pdb_PutDefvars (DBfile *dbfile, const char *name, int ndefs,
- char *names[], const int types[],
+db_pdb_PutDefvars (DBfile *dbfile, char const *name, int ndefs,
+ char *names[], int const types[],
char *defns[], DBoptlist *optlists[]) {
int i, len;
@@ -8167,9 +8175,9 @@ db_pdb_PutMatspecies (DBfile *dbfile, char *name, char *matname,
*--------------------------------------------------------------------*/
#ifdef PDB_WRITE
SILO_CALLBACK int
-db_pdb_PutMultimesh (DBfile *dbfile, char *name, int nmesh,
- char *meshnames[], int meshtypes[],
- DBoptlist *optlist) {
+db_pdb_PutMultimesh (DBfile *dbfile, char DB_CONSTARR1 name, int nmesh,
+ char DB_CONSTARR2 meshnames, int DB_CONSTARR1 meshtypes,
+ DBoptlist const *optlist) {
int i, len;
long count[3];
@@ -8185,7 +8193,7 @@ db_pdb_PutMultimesh (DBfile *dbfile, char *name, int nmesh,
/*-------------------------------------------------------------
* Build object description from literals and var-id's
*-------------------------------------------------------------*/
- obj = DBMakeObject(name, DB_MULTIMESH, 30);
+ obj = DBMakeObject(name, DB_MULTIMESH, 31);
DBAddIntComponent(obj, "nblocks", nmesh);
DBAddIntComponent(obj, "ngroups", _mm._ngroups);
DBAddIntComponent(obj, "blockorigin", _mm._blockorigin);
@@ -8327,6 +8335,8 @@ db_pdb_PutMultimesh (DBfile *dbfile, char *name, int nmesh,
DBWriteComponent(dbfile, obj, "empty_list", name, "integer",
_mm._empty_list, 1, count);
}
+ if (_mm._repr_block_idx > 0)
+ DBAddIntComponent(obj, "repr_block_idx", _mm._repr_block_idx);
/*-------------------------------------------------------------
* Write multi-mesh object to SILO file.
@@ -8357,12 +8367,12 @@ db_pdb_PutMultimesh (DBfile *dbfile, char *name, int nmesh,
*--------------------------------------------------------------------*/
#ifdef PDB_WRITE
SILO_CALLBACK int
-db_pdb_PutMultimeshadj (DBfile *_dbfile, const char *name, int nmesh,
- const int *meshtypes, const int *nneighbors,
- const int *neighbors, const int *back,
- const int *lnodelists, int *nodelists[],
- const int *lzonelists, int *zonelists[],
- DBoptlist *optlist) {
+db_pdb_PutMultimeshadj (DBfile *_dbfile, char DB_CONSTARR1 name, int nmesh,
+ int DB_CONSTARR1 meshtypes, int DB_CONSTARR1 nneighbors,
+ int DB_CONSTARR1 neighbors, int DB_CONSTARR1 back,
+ int DB_CONSTARR1 lnodelists, int DB_CONSTARR2 nodelists,
+ int DB_CONSTARR1 lzonelists, int DB_CONSTARR2 zonelists,
+ DBoptlist const *optlist) {
long count[2];
@@ -8676,7 +8686,7 @@ db_pdb_PutMultivar (DBfile *dbfile, char *name, int nvars,
/*-------------------------------------------------------------
* Build object description from literals and var-id's
*-------------------------------------------------------------*/
- obj = DBMakeObject(name, DB_MULTIVAR, 30);
+ obj = DBMakeObject(name, DB_MULTIVAR, 31);
DBAddIntComponent(obj, "nvars", nvars);
DBAddIntComponent(obj, "ngroups", _mm._ngroups);
DBAddIntComponent(obj, "blockorigin", _mm._blockorigin);
@@ -8786,6 +8796,8 @@ db_pdb_PutMultivar (DBfile *dbfile, char *name, int nvars,
DBWriteComponent(dbfile, obj, "empty_list", name, "integer",
_mm._empty_list, 1, count);
}
+ if (_mm._repr_block_idx)
+ DBAddIntComponent(obj, "repr_block_idx", _mm._repr_block_idx);
/*-------------------------------------------------------------
* Write multi-var object to SILO file.
@@ -8868,7 +8880,7 @@ db_pdb_PutMultimat (DBfile *dbfile, char *name, int nmats,
/*-------------------------------------------------------------
* Build object description from literals and var-id's
*-------------------------------------------------------------*/
- obj = DBMakeObject(name, DB_MULTIMAT, 30);
+ obj = DBMakeObject(name, DB_MULTIMAT, 31);
DBAddIntComponent(obj, "nmats", nmats);
DBAddIntComponent(obj, "ngroups", _mm._ngroups);
DBAddIntComponent(obj, "blockorigin", _mm._blockorigin);
@@ -8953,15 +8965,15 @@ db_pdb_PutMultimat (DBfile *dbfile, char *name, int nmats,
* Add the DBOPT_MATCOUNTS and DBOPT_MATLISTS options if present.
*-------------------------------------------------------------*/
if (_mm._matcounts != NULL && _mm._matlists != NULL) {
-
- count[0] = nmats;
- DBWriteComponent(dbfile, obj, "matcounts", name, "integer", _mm._matcounts,
- 1, count);
- count[0] = 0;
+ long tot = 0;
for (i = 0; i < nmats; i++)
- count[0] += _mm._matcounts[i];
- DBWriteComponent(dbfile, obj, "matlists", name, "integer", _mm._matlists,
- 1, count);
+ tot += _mm._matcounts[i];
+
+ if (tot) {
+ count[0] = nmats;
+ DBWriteComponent(dbfile, obj, "matcounts", name, "integer", _mm._matcounts, 1, count);
+ DBWriteComponent(dbfile, obj, "matlists", name, "integer", _mm._matlists, 1, &tot);
+ }
}
/*-------------------------------------------------------------
@@ -9009,6 +9021,8 @@ db_pdb_PutMultimat (DBfile *dbfile, char *name, int nmats,
DBWriteComponent(dbfile, obj, "empty_list", name, "integer",
_mm._empty_list, 1, count);
}
+ if (_mm._repr_block_idx)
+ DBAddIntComponent(obj, "repr_block_idx", _mm._repr_block_idx);
/*-------------------------------------------------------------
* Write multi-material object to SILO file.
@@ -9078,7 +9092,7 @@ db_pdb_PutMultimatspecies (DBfile *dbfile, char *name, int nspec,
/*-------------------------------------------------------------
* Build object description from literals and var-id's
*-------------------------------------------------------------*/
- obj = DBMakeObject(name, DB_MULTIMATSPECIES, 30);
+ obj = DBMakeObject(name, DB_MULTIMATSPECIES, 31);
DBAddIntComponent(obj, "nspec", nspec);
DBAddIntComponent(obj, "ngroups", _mm._ngroups);
DBAddIntComponent(obj, "blockorigin", _mm._blockorigin);
@@ -9199,6 +9213,8 @@ db_pdb_PutMultimatspecies (DBfile *dbfile, char *name, int nspec,
DBWriteComponent(dbfile, obj, "empty_list", name, "integer",
_mm._empty_list, 1, count);
}
+ if (_mm._repr_block_idx)
+ DBAddIntComponent(obj, "repr_block_idx", _mm._repr_block_idx);
/*-------------------------------------------------------------
* Write multi-species object to SILO file.
@@ -9302,51 +9318,52 @@ db_pdb_PutPointmesh (DBfile *dbfile, char *name, int ndims, DB_DTPTR2 _coords,
* them out to output file.
*-------------------------------------------------------------*/
count[0] = ndims;
- switch (datatype) {
-
- case DB_FLOAT:
- switch (ndims) {
- case 3:
- _DBarrminmax(coords[2], nels, &fmin_extents[2], &fmax_extents[2]);
- case 2:
- _DBarrminmax(coords[1], nels, &fmin_extents[1], &fmax_extents[1]);
- case 1:
- _DBarrminmax(coords[0], nels, &fmin_extents[0], &fmax_extents[0]);
+ if (ndims) {
+ switch (datatype) {
+ case DB_FLOAT:
+ switch (ndims) {
+ case 3:
+ _DBarrminmax(coords[2], nels, &fmin_extents[2], &fmax_extents[2]);
+ case 2:
+ _DBarrminmax(coords[1], nels, &fmin_extents[1], &fmax_extents[1]);
+ case 1:
+ _DBarrminmax(coords[0], nels, &fmin_extents[0], &fmax_extents[0]);
+ break;
+ default:
+ return db_perror("ndims", E_BADARGS, me);
+ }
+
+ DBWriteComponent(dbfile, obj, "min_extents", name, "float",
+ fmin_extents, 1, count);
+ DBWriteComponent(dbfile, obj, "max_extents", name, "float",
+ fmax_extents, 1, count);
+
break;
- default:
- return db_perror("ndims", E_BADARGS, me);
- }
+ case DB_DOUBLE:
+ switch (ndims) {
+ case 3:
+ _DBdarrminmax((double *)coords[2], nels,
+ &dmin_extents[2], &dmax_extents[2]);
+ case 2:
+ _DBdarrminmax((double *)coords[1], nels,
+ &dmin_extents[1], &dmax_extents[1]);
+ case 1:
+ _DBdarrminmax((double *)coords[0], nels,
+ &dmin_extents[0], &dmax_extents[0]);
+ break;
+ default:
+ return db_perror("ndims", E_BADARGS, me);
+ }
- DBWriteComponent(dbfile, obj, "min_extents", name, "float",
- fmin_extents, 1, count);
- DBWriteComponent(dbfile, obj, "max_extents", name, "float",
- fmax_extents, 1, count);
+ DBWriteComponent(dbfile, obj, "min_extents", name, "double",
+ dmin_extents, 1, count);
+ DBWriteComponent(dbfile, obj, "max_extents", name, "double",
+ dmax_extents, 1, count);
- break;
- case DB_DOUBLE:
- switch (ndims) {
- case 3:
- _DBdarrminmax((double *)coords[2], nels,
- &dmin_extents[2], &dmax_extents[2]);
- case 2:
- _DBdarrminmax((double *)coords[1], nels,
- &dmin_extents[1], &dmax_extents[1]);
- case 1:
- _DBdarrminmax((double *)coords[0], nels,
- &dmin_extents[0], &dmax_extents[0]);
break;
default:
- return db_perror("ndims", E_BADARGS, me);
+ return db_perror("type not supported", E_NOTIMP, me);
}
-
- DBWriteComponent(dbfile, obj, "min_extents", name, "double",
- dmin_extents, 1, count);
- DBWriteComponent(dbfile, obj, "max_extents", name, "double",
- dmax_extents, 1, count);
-
- break;
- default:
- return db_perror("type not supported", E_NOTIMP, me);
}
if (_pm._gnodeno)
@@ -9475,11 +9492,7 @@ db_pdb_PutPointvar (DBfile *dbfile, char *name, char *meshname, int nvars,
/*-------------------------------------------------------------
* Initialize global data, and process options.
*-------------------------------------------------------------*/
-#if 1 /*Which one is correct? (1st one is the original) */
db_InitPoint(dbfile, optlist, _pm._ndims, nels);
-#else
- db_InitPoint(dbfile, optlist, ndims, nels);
-#endif
obj = DBMakeObject(name, DB_POINTVAR, 24);
@@ -9517,7 +9530,7 @@ db_pdb_PutPointvar (DBfile *dbfile, char *name, char *meshname, int nvars,
DBAddIntComponent(obj, "nvals", nvars);
DBAddIntComponent(obj, "nels", nels);
- DBAddIntComponent(obj, "ndims", 1);
+ DBAddIntComponent(obj, "ndims", _pm._ndims);
DBAddIntComponent(obj, "datatype", datatype);
DBAddIntComponent(obj, "nspace", _pm._nspace);
DBAddIntComponent(obj, "origin", _pm._origin);
@@ -9828,7 +9841,7 @@ db_pdb_PutQuadvar (DBfile *_dbfile, char *name, char *meshname, int nvars,
* Write variable arrays.
* Set index variables and counters.
*-----------------------------------------------------------*/
- nels = 1;
+ nels = ndims?1:0;
for (i = 0; i < ndims; i++) {
count[i] = dims[i];
nels *= dims[i];
@@ -9865,8 +9878,11 @@ db_pdb_PutQuadvar (DBfile *_dbfile, char *name, char *meshname, int nvars,
*/
db_mkname (dbfile->pdb, name, "dims", tmp2) ;
mcount[0] = ndims ;
- PJ_write_len (dbfile->pdb, tmp2, "integer", dims, 1, mcount) ;
- DBAddVarComponent (obj, "dims", tmp2) ;
+ if (mcount[0])
+ {
+ PJ_write_len (dbfile->pdb, tmp2, "integer", dims, 1, mcount) ;
+ DBAddVarComponent (obj, "dims", tmp2) ;
+ }
/*
* Max indices
@@ -9874,8 +9890,11 @@ db_pdb_PutQuadvar (DBfile *_dbfile, char *name, char *meshname, int nvars,
for (i=0; i<ndims; i++) maxindex[i] = dims[i] - _qm._hi_offset[i] - 1 ;
db_mkname (dbfile->pdb, name, "maxindex", tmp2) ;
mcount[0] = ndims ;
- PJ_write_len (dbfile->pdb, tmp2, "integer", maxindex, 1, mcount) ;
- DBAddVarComponent (obj, "max_index", tmp2) ;
+ if (mcount[0])
+ {
+ PJ_write_len (dbfile->pdb, tmp2, "integer", maxindex, 1, mcount) ;
+ DBAddVarComponent (obj, "max_index", tmp2) ;
+ }
/*-------------------------------------------------------------
* We first will write the given variables to SILO, then
@@ -9893,7 +9912,7 @@ db_pdb_PutQuadvar (DBfile *_dbfile, char *name, char *meshname, int nvars,
(ndims > 2 && centering == DB_FACECENT))
{
int j, tmpndims = ndims+1;
- long tmpcnt[4];
+ long tmpcnt[4] = {0,0,0,0};
for (j = ndims; j > 0; j--)
tmpcnt[j] = count[j-1];
tmpcnt[0] = ndims;
@@ -9902,8 +9921,10 @@ db_pdb_PutQuadvar (DBfile *_dbfile, char *name, char *meshname, int nvars,
}
else
{
- PJ_write_len(dbfile->pdb, tmp2, datatype_str, vars[i],
- ndims, count);
+ int k; long n=1;
+ for (k = 0; k < ndims; n *= count[k++]);
+ if (n)
+ PJ_write_len(dbfile->pdb, tmp2, datatype_str, vars[i], ndims, count);
}
sprintf(tmp1, "value%d", i);
@@ -10008,11 +10029,11 @@ db_pdb_PutQuadvar (DBfile *_dbfile, char *name, char *meshname, int nvars,
#ifdef PDB_WRITE
/* ARGSUSED */
SILO_CALLBACK int
-db_pdb_PutCsgmesh (DBfile *dbfile, const char *name, int ndims,
+db_pdb_PutCsgmesh (DBfile *dbfile, char const *name, int ndims,
int nbounds,
- const int *typeflags, const int *bndids,
- const void *coeffs, int lcoeffs, int datatype,
- const double *extents, const char *zlname,
+ int const *typeflags, int const *bndids,
+ void const *coeffs, int lcoeffs, int datatype,
+ double const *extents, char const *zlname,
DBoptlist *optlist) {
long count[3];
@@ -10044,18 +10065,21 @@ db_pdb_PutCsgmesh (DBfile *dbfile, const char *name, int ndims,
coeffs, 1, count);
FREE(datatype_str);
- min_extents[0] = extents[0];
- min_extents[1] = extents[1];
- min_extents[2] = extents[2];
- max_extents[0] = extents[3];
- max_extents[1] = extents[4];
- max_extents[2] = extents[5];
-
- count[0] = ndims;
- DBWriteComponent(dbfile, obj, "min_extents", name, "double",
- min_extents, 1, count);
- DBWriteComponent(dbfile, obj, "max_extents", name, "double",
- max_extents, 1, count);
+ if (extents)
+ {
+ min_extents[0] = extents[0];
+ min_extents[1] = extents[1];
+ min_extents[2] = extents[2];
+ max_extents[0] = extents[3];
+ max_extents[1] = extents[4];
+ max_extents[2] = extents[5];
+
+ count[0] = ndims;
+ DBWriteComponent(dbfile, obj, "min_extents", name, "double",
+ min_extents, 1, count);
+ DBWriteComponent(dbfile, obj, "max_extents", name, "double",
+ max_extents, 1, count);
+ }
/*-------------------------------------------------------------
* Build a output object definition for a ucd mesh. The minimum
@@ -10144,7 +10168,7 @@ db_pdb_PutCsgmesh (DBfile *dbfile, const char *name, int ndims,
*--------------------------------------------------------------------*/
#ifdef PDB_WRITE
SILO_CALLBACK int
-db_pdb_PutCsgvar (DBfile *_dbfile, const char *name, const char *meshname,
+db_pdb_PutCsgvar (DBfile *_dbfile, char const *name, char const *meshname,
int nvars, char *varnames[], void *vars[],
int nels, int datatype, int centering,
DBoptlist *optlist) {
@@ -10285,11 +10309,11 @@ db_pdb_PutCsgvar (DBfile *_dbfile, const char *name, const char *meshname,
*--------------------------------------------------------------------*/
#ifdef PDB_WRITE
SILO_CALLBACK int
-db_pdb_PutCSGZonelist (DBfile *dbfile, const char *name, int nregs,
- const int *typeflags,
- const int *leftids, const int *rightids,
- const void *xforms, int lxforms, int datatype,
- int nzones, const int *zonelist, DBoptlist *optlist) {
+db_pdb_PutCSGZonelist (DBfile *dbfile, char const *name, int nregs,
+ int const *typeflags,
+ int const *leftids, int const *rightids,
+ void const *xforms, int lxforms, int datatype,
+ int nzones, int const *zonelist, DBoptlist *optlist) {
long count[1];
DBobject *obj;
@@ -11207,8 +11231,8 @@ db_pdb_PutPHZonelist (DBfile *dbfile, char *name,
#ifdef PDB_WRITE
/* ARGSUSED */
SILO_CALLBACK int
-db_pdb_PutMrgtree(DBfile *dbfile, const char *name,
- const char *mesh_name, DBmrgtree *tree, DBoptlist *optlist)
+db_pdb_PutMrgtree(DBfile *dbfile, char const *name,
+ char const *mesh_name, DBmrgtree *tree, DBoptlist *optlist)
{
int i, j, n, len, pass, num_nodes = tree->num_nodes;
int tot_segs, tot_children;
@@ -11299,8 +11323,8 @@ db_pdb_PutMrgtree(DBfile *dbfile, const char *name,
count = len;
DBWriteComponent(dbfile, obj, "names", name, "char", s, 1, &count);
FREE(s);
- FREE(strArray);
}
+ FREE(strArray);
/* linearize and output map name data */
strArray = (char **) malloc(num_nodes * sizeof(char*));
@@ -11319,32 +11343,35 @@ db_pdb_PutMrgtree(DBfile *dbfile, const char *name,
tot_segs += ltree[i]->nsegs * (ltree[i]->narray?ltree[i]->narray:1);
count = tot_segs;
- /* linearize and output map segment id data */
- intArray = (int *) malloc(tot_segs * sizeof(int));
- n = 0;
- for (i = 0; i < num_nodes; i++)
- for (j = 0; j < ltree[i]->nsegs * (ltree[i]->narray?ltree[i]->narray:1); j++)
- intArray[n++] = ltree[i]->seg_ids[j];
- DBWriteComponent(dbfile, obj, "seg_ids", name, "integer", intArray, 1, &count);
- FREE(intArray);
+ if (tot_segs > 0)
+ {
+ /* linearize and output map segment id data */
+ intArray = (int *) malloc(tot_segs * sizeof(int));
+ n = 0;
+ for (i = 0; i < num_nodes; i++)
+ for (j = 0; j < ltree[i]->nsegs * (ltree[i]->narray?ltree[i]->narray:1); j++)
+ intArray[n++] = ltree[i]->seg_ids[j];
+ DBWriteComponent(dbfile, obj, "seg_ids", name, "integer", intArray, 1, &count);
+ FREE(intArray);
- /* linearize and output seg len type data */
- intArray = (int *) malloc(tot_segs * sizeof(int));
- n = 0;
- for (i = 0; i < num_nodes; i++)
- for (j = 0; j < ltree[i]->nsegs * (ltree[i]->narray?ltree[i]->narray:1); j++)
- intArray[n++] = ltree[i]->seg_lens[j];
- DBWriteComponent(dbfile, obj, "seg_lens", name, "integer", intArray, 1, &count);
- FREE(intArray);
+ /* linearize and output seg len type data */
+ intArray = (int *) malloc(tot_segs * sizeof(int));
+ n = 0;
+ for (i = 0; i < num_nodes; i++)
+ for (j = 0; j < ltree[i]->nsegs * (ltree[i]->narray?ltree[i]->narray:1); j++)
+ intArray[n++] = ltree[i]->seg_lens[j];
+ DBWriteComponent(dbfile, obj, "seg_lens", name, "integer", intArray, 1, &count);
+ FREE(intArray);
- /* linearize and output seg type data */
- intArray = (int *) malloc(tot_segs * sizeof(int));
- n = 0;
- for (i = 0; i < num_nodes; i++)
- for (j = 0; j < ltree[i]->nsegs * (ltree[i]->narray?ltree[i]->narray:1); j++)
- intArray[n++] = ltree[i]->seg_types[j];
- DBWriteComponent(dbfile, obj, "seg_types", name, "integer", intArray, 1, &count);
- FREE(intArray);
+ /* linearize and output seg type data */
+ intArray = (int *) malloc(tot_segs * sizeof(int));
+ n = 0;
+ for (i = 0; i < num_nodes; i++)
+ for (j = 0; j < ltree[i]->nsegs * (ltree[i]->narray?ltree[i]->narray:1); j++)
+ intArray[n++] = ltree[i]->seg_types[j];
+ DBWriteComponent(dbfile, obj, "seg_types", name, "integer", intArray, 1, &count);
+ FREE(intArray);
+ }
/* form integer array for children data */
tot_children = 0;
@@ -11414,7 +11441,7 @@ db_pdb_PutMrgtree(DBfile *dbfile, const char *name,
#ifdef PDB_WRITE
/* ARGSUSED */
SILO_CALLBACK int
-db_pdb_PutGroupelmap(DBfile *dbfile, const char *name,
+db_pdb_PutGroupelmap(DBfile *dbfile, char const *name,
int num_segments, int *groupel_types, int *segment_lengths,
int *segment_ids, int **segment_data, void **segment_fracs,
int fracs_data_type, DBoptlist *opts)
@@ -11533,7 +11560,7 @@ db_pdb_PutGroupelmap(DBfile *dbfile, const char *name,
*--------------------------------------------------------------------*/
#ifdef PDB_WRITE
SILO_CALLBACK int
-db_pdb_PutMrgvar(DBfile *_dbfile, const char *name, const char *mrgt_name,
+db_pdb_PutMrgvar(DBfile *_dbfile, char const *name, char const *mrgt_name,
int ncomps, char **compnames,
int nregns, char **reg_pnames,
int datatype, void **data, DBoptlist *optlist)
@@ -11620,7 +11647,7 @@ typedef struct _index_offset_pair_t {
} index_offset_pair_t;
/* Support function for db_hdf5_SortObjectsByOffset */
-static int compare_index_offset_pair(const void *a1, const void *a2)
+static int compare_index_offset_pair(void const *a1, void const *a2)
{
index_offset_pair_t *p1 = (index_offset_pair_t*) a1;
index_offset_pair_t *p2 = (index_offset_pair_t*) a2;
@@ -11631,7 +11658,7 @@ static int compare_index_offset_pair(const void *a1, const void *a2)
SILO_CALLBACK int
db_pdb_SortObjectsByOffset(DBfile *_dbfile, int nobjs,
- const char *const *const names, int *ordering)
+ char const *const *const names, int *ordering)
{
DBfile_pdb *dbfile = (DBfile_pdb *) _dbfile;
static char *me = "db_pdb_SortObjectsByOffset";
@@ -11843,7 +11870,7 @@ db_InitQuad (DBfile *_dbfile, char *meshname, DBoptlist *optlist,
/*--------------------------------------------------
* Define number of zones and nodes.
*--------------------------------------------------*/
- nzones = nnodes = 1;
+ nzones = nnodes = ndims?1:0;
for (i = 0; i < ndims; i++) {
nzones *= (dims[i] - 1);
@@ -11879,6 +11906,7 @@ db_InitQuad (DBfile *_dbfile, char *meshname, DBoptlist *optlist,
*--------------------------------------------------*/
_qm._nzones = nzones;
_qm._nnodes = nnodes;
+ FREE(_qm._meshname);
_qm._meshname = STRDUP(meshname);
for (i = 0; i < ndims; i++) {
@@ -11901,7 +11929,7 @@ db_InitQuad (DBfile *_dbfile, char *meshname, DBoptlist *optlist,
count[0] = ndims;
/* File name contained within meshname */
p = strchr(meshname, ':');
- if (p == NULL) {
+ if (p == NULL && count[0]) {
PJ_write_len(dbfile->pdb, _qm._nm_dims, "integer", dims, 1, count);
PJ_write_len(dbfile->pdb, _qm._nm_zones, "integer", _qm._zones,
1, count);
@@ -12015,7 +12043,7 @@ db_InitUcd (DBfile *_dbfile, char *meshname, DBoptlist *optlist,
* so we'll use that meshes discriptions.
*-----------------------------------------------------*/
p = strchr(meshname, ':');
- if (p == NULL) {
+ if (p == NULL && count[0]) {
a[0] = a[1] = a[2] = 0.5;
PJ_write_len(dbfile->pdb, _um._nm_alignz, "float", a, 1, count);
@@ -12312,7 +12340,7 @@ db_mkname (PDBfile *pdb, char *name, char *suffix, char *out)
*--------------------------------------------------------------------*/
#ifdef PDB_WRITE
PRIVATE int
-db_InitMulti (DBfile *_dbfile, DBoptlist *optlist) {
+db_InitMulti (DBfile *_dbfile, DBoptlist const *const optlist) {
DBfile_pdb *dbfile = (DBfile_pdb *) _dbfile;
long count[3];
diff --git a/src/pdb_drv/silo_pdb_private.h b/src/pdb_drv/silo_pdb_private.h
index def68c6..6f93fd9 100644
--- a/src/pdb_drv/silo_pdb_private.h
+++ b/src/pdb_drv/silo_pdb_private.h
@@ -113,12 +113,12 @@ SILO_CALLBACK int db_pdb_GetDir (DBfile *, char *);
SILO_CALLBACK DBobject *db_pdb_GetObject (DBfile*, char*);
SILO_CALLBACK DBcompoundarray *db_pdb_GetCompoundarray (DBfile *, char *);
SILO_CALLBACK DBcurve *db_pdb_GetCurve (DBfile *, char *);
-SILO_CALLBACK DBdefvars *db_pdb_GetDefvars (DBfile *, const char *);
+SILO_CALLBACK DBdefvars *db_pdb_GetDefvars (DBfile *, char const *);
SILO_CALLBACK DBmaterial *db_pdb_GetMaterial (DBfile *, char *);
SILO_CALLBACK DBmatspecies *db_pdb_GetMatspecies (DBfile *, char *);
SILO_CALLBACK DBmultimesh *db_pdb_GetMultimesh (DBfile *, char *);
-SILO_CALLBACK DBmultimeshadj *db_pdb_GetMultimeshadj (DBfile *, const char *,
- int, const int *);
+SILO_CALLBACK DBmultimeshadj *db_pdb_GetMultimeshadj (DBfile *, char const *,
+ int, int const *);
SILO_CALLBACK DBmultivar *db_pdb_GetMultivar (DBfile *, char *);
SILO_CALLBACK DBmultimat *db_pdb_GetMultimat (DBfile *, char *);
SILO_CALLBACK DBmultimatspecies *db_pdb_GetMultimatspecies (DBfile *, char *);
@@ -128,15 +128,15 @@ SILO_CALLBACK DBquadmesh *db_pdb_GetQuadmesh (DBfile *, char *);
SILO_CALLBACK DBquadvar *db_pdb_GetQuadvar (DBfile *, char *);
SILO_CALLBACK DBucdmesh *db_pdb_GetUcdmesh (DBfile *, char *);
SILO_CALLBACK DBucdvar *db_pdb_GetUcdvar (DBfile *, char *);
-SILO_CALLBACK DBcsgmesh *db_pdb_GetCsgmesh (DBfile *, const char *);
-SILO_CALLBACK DBcsgvar *db_pdb_GetCsgvar (DBfile *, const char *);
+SILO_CALLBACK DBcsgmesh *db_pdb_GetCsgmesh (DBfile *, char const *);
+SILO_CALLBACK DBcsgvar *db_pdb_GetCsgvar (DBfile *, char const *);
SILO_CALLBACK DBfacelist *db_pdb_GetFacelist(DBfile*, char*);
SILO_CALLBACK DBzonelist *db_pdb_GetZonelist(DBfile*, char*);
SILO_CALLBACK DBphzonelist *db_pdb_GetPHZonelist(DBfile*, char*);
-SILO_CALLBACK DBcsgzonelist *db_pdb_GetCSGZonelist(DBfile*, const char*);
-SILO_CALLBACK DBmrgtree *db_pdb_GetMrgtree(DBfile *_dbfile, const char *name);
-SILO_CALLBACK DBmrgvar *db_pdb_GetMrgvar(DBfile *dbfile, const char *name);
-SILO_CALLBACK DBgroupelmap *db_pdb_GetGroupelmap(DBfile *dbfile, const char *name);
+SILO_CALLBACK DBcsgzonelist *db_pdb_GetCSGZonelist(DBfile*, char const*);
+SILO_CALLBACK DBmrgtree *db_pdb_GetMrgtree(DBfile *_dbfile, char const *name);
+SILO_CALLBACK DBmrgvar *db_pdb_GetMrgvar(DBfile *dbfile, char const *name);
+SILO_CALLBACK DBgroupelmap *db_pdb_GetGroupelmap(DBfile *dbfile, char const *name);
SILO_CALLBACK void *db_pdb_GetVar (DBfile *, char *);
SILO_CALLBACK int db_pdb_GetVarByteLength (DBfile *, char *);
SILO_CALLBACK int db_pdb_GetVarLength (DBfile *, char *);
@@ -154,22 +154,22 @@ SILO_CALLBACK int db_pdb_Filters (DBfile *, FILE *);
SILO_CALLBACK int db_pdb_NewToc (DBfile *);
SILO_CALLBACK int db_pdb_GetComponentNames (DBfile *, char *, char ***, char ***);
-SILO_CALLBACK int db_pdb_FreeCompressionResources(DBfile *_dbfile, const char *meshname);
+SILO_CALLBACK int db_pdb_FreeCompressionResources(DBfile *_dbfile, char const *meshname);
PRIVATE int db_pdb_getobjinfo (PDBfile *, char *, char *, int *);
PRIVATE int db_pdb_getvarinfo (PDBfile *, char *, char *, int *, int *, int);
#ifdef PDB_WRITE
-SILO_CALLBACK int db_pdb_WriteObject (DBfile *, DBobject *, int);
-SILO_CALLBACK int db_pdb_WriteComponent (DBfile *, DBobject *, char *,
- char *, char *, const void *, int, long *);
+SILO_CALLBACK int db_pdb_WriteObject (DBfile *, DBobject const *, int);
+SILO_CALLBACK int db_pdb_WriteComponent (DBfile *, DBobject *, char const *,
+ char const *, char const *, void const *, int, long const *);
SILO_CALLBACK int db_pdb_MkDir (DBfile *, char *);
SILO_CALLBACK int db_pdb_PutCompoundarray (DBfile *, char *, char **, int *,
int, void *, int, int, DBoptlist *);
SILO_CALLBACK int db_pdb_PutCurve (DBfile *, char *, void *, void *, int, int,
DBoptlist *);
-SILO_CALLBACK int db_pdb_PutDefvars(DBfile *, const char *, int, char **,
- const int *, char **, DBoptlist **);
+SILO_CALLBACK int db_pdb_PutDefvars(DBfile *, char const *, int, char **,
+ int const *, char **, DBoptlist **);
SILO_CALLBACK int db_pdb_PutFacelist (DBfile *, char *, int, int, int *, int,
int, int *, int *, int *, int, int *,
int *, int);
@@ -179,12 +179,12 @@ SILO_CALLBACK int db_pdb_PutMaterial (DBfile *, char *, char *, int, int *,
SILO_CALLBACK int db_pdb_PutMatspecies (struct DBfile *, char *, char *, int,
int *, int *, int *, int, int, DB_DTPTR1,
int *, int, int, DBoptlist *);
-SILO_CALLBACK int db_pdb_PutMultimesh (DBfile *, char *, int, char **, int *,
- DBoptlist *);
-SILO_CALLBACK int db_pdb_PutMultimeshadj (DBfile *, const char *, int, const int *,
- const int *, const int *, const int *, const int *,
- int **, const int *, int **,
- DBoptlist *optlist);
+SILO_CALLBACK int db_pdb_PutMultimesh (DBfile *, char DB_CONSTARR1, int, char DB_CONSTARR2, int DB_CONSTARR1,
+ DBoptlist const *);
+SILO_CALLBACK int db_pdb_PutMultimeshadj (DBfile *, char DB_CONSTARR1, int, int DB_CONSTARR1,
+ int DB_CONSTARR1, int DB_CONSTARR1, int DB_CONSTARR1, int DB_CONSTARR1,
+ int DB_CONSTARR2, int DB_CONSTARR1, int DB_CONSTARR2,
+ DBoptlist const *optlist);
SILO_CALLBACK int db_pdb_PutMultivar (DBfile *, char *, int, char **, int *,
DBoptlist *);
SILO_CALLBACK int db_pdb_PutMultimat (DBfile *, char *, int, char **,
@@ -209,11 +209,11 @@ SILO_CALLBACK int db_pdb_PutUcdsubmesh (DBfile *, char *, char *,
SILO_CALLBACK int db_pdb_PutUcdvar (DBfile *, char *, char *, int, char **,
DB_DTPTR2, int, DB_DTPTR2, int, int, int,
DBoptlist *);
-SILO_CALLBACK int db_pdb_PutCsgmesh (DBfile *, const char *, int, int,
- const int *, const int *,
- const void *, int, int, const double *,
- const char *, DBoptlist *);
-SILO_CALLBACK int db_pdb_PutCsgvar (DBfile *, const char *, const char *, int,
+SILO_CALLBACK int db_pdb_PutCsgmesh (DBfile *, char const *, int, int,
+ int const *, int const *,
+ void const *, int, int, double const *,
+ char const *, DBoptlist *);
+SILO_CALLBACK int db_pdb_PutCsgvar (DBfile *, char const *, char const *, int,
char **varnames, void **vars,
int, int, int, DBoptlist *);
SILO_CALLBACK int db_pdb_PutZonelist (DBfile *, char *, int, int, int *, int,
@@ -225,30 +225,30 @@ SILO_CALLBACK int db_pdb_PutPHZonelist(DBfile *, char *,
int, int *, int, int *, char *,
int, int *, int, int *,
int, int, int, DBoptlist *);
-SILO_CALLBACK int db_pdb_PutCSGZonelist (DBfile *, const char *, int,
- const int *, const int *, const int *,
- const void *, int, int,
- int, const int *, DBoptlist *);
-SILO_CALLBACK int db_pdb_PutMrgtree(DBfile *_dbfile, const char *name,
- const char *mesh_name, DBmrgtree *tree,
+SILO_CALLBACK int db_pdb_PutCSGZonelist (DBfile *, char const *, int,
+ int const *, int const *, int const *,
+ void const *, int, int,
+ int, int const *, DBoptlist *);
+SILO_CALLBACK int db_pdb_PutMrgtree(DBfile *_dbfile, char const *name,
+ char const *mesh_name, DBmrgtree *tree,
DBoptlist *optlist);
-SILO_CALLBACK int db_pdb_PutGroupelmap(DBfile *_dbfile, const char *map_name,
+SILO_CALLBACK int db_pdb_PutGroupelmap(DBfile *_dbfile, char const *map_name,
int num_segments, int *groupel_types,
int *segment_lengths, int *segment_ids,
int **segment_data, void **segment_fracs,
int fracs_data_type, DBoptlist *opts);
-SILO_CALLBACK int db_pdb_PutMrgvar(DBfile *dbfile, const char *name,
- const char *mrgt_name,
+SILO_CALLBACK int db_pdb_PutMrgvar(DBfile *dbfile, char const *name,
+ char const *mrgt_name,
int ncomps, char **compnames,
int nregns, char **reg_pnames,
int datatype, void **data, DBoptlist *opts);
-SILO_CALLBACK int db_pdb_Write (DBfile *, char *, void *, int *, int, int);
+SILO_CALLBACK int db_pdb_Write (DBfile *, char const *, void const *, int const *, int, int);
SILO_CALLBACK int db_pdb_WriteSlice (DBfile*, char*, void*, int, int[], int[],
int[], int[], int);
SILO_CALLBACK int db_pdb_SortObjectsByOffset(DBfile *_dbfile, int nobjs,
- const char *const *const names, int *ordering);
+ char const *const *const names, int *ordering);
PRIVATE int db_InitCsg (DBfile *, char *, DBoptlist *);
PRIVATE int db_InitPoint (DBfile *, DBoptlist *, int, int);
@@ -262,7 +262,7 @@ PRIVATE int db_ResetGlobalData_phzonelist (void);
PRIVATE int db_InitPHZonelist (DBfile *, DBoptlist *);
PRIVATE void db_build_shared_names_ucdmesh (DBfile *, char *);
PRIVATE void db_mkname (PDBfile*, char*, char*, char*);
-PRIVATE int db_InitMulti (DBfile*, DBoptlist*);
+PRIVATE int db_InitMulti (DBfile*, DBoptlist const *const);
PRIVATE void db_InitDefvars (DBoptlist*);
#endif /* PDB_WRITE */
#endif /* !SILO_NO_CALLBACKS */
@@ -297,7 +297,7 @@ PRIVATE syment *PJ_inquire_entry (PDBfile *, char *);
PRIVATE int pdb_getvarinfo (PDBfile *, char *, char *, int *, int *, int);
PRIVATE int PJ_ForceSingle (int);
-PRIVATE int PJ_GetObject (PDBfile *, char *, PJcomplist *, char **ret_type);
+PRIVATE int PJ_GetObject (PDBfile *, char *, PJcomplist *, int expected_dbtype);
PRIVATE int PJ_ClearCache(void);
PRIVATE int PJ_InqForceSingle (void);
PRIVATE void PJ_NoCache ( void );
@@ -313,8 +313,8 @@ PRIVATE int PJ_print_group (PJgroup *, FILE *);
#ifdef PDB_WRITE
PRIVATE int PJ_put_group (PDBfile*,PJgroup*, int);
PRIVATE int PJ_write (PDBfile*,char*,char*,void*) ;
-PRIVATE int PJ_write_len (PDBfile*,char*,char*,const void*,int,long*);
-PRIVATE int PJ_write_alt (PDBfile*,char*,char*,void*,int,long*);
+PRIVATE int PJ_write_len (PDBfile*,char*,char*,void const *,int,long*);
+PRIVATE int PJ_write_alt (PDBfile*,char const *,char const *,void const *,int,long const *);
#endif /* PDB_WRITE */
#endif /* !SILO_PDB_PRIVATE_H */
diff --git a/src/pdbp_drv/Makefile.in b/src/pdbp_drv/Makefile.in
index b096f57..f7e7c21 100644
--- a/src/pdbp_drv/Makefile.in
+++ b/src/pdbp_drv/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -69,8 +70,9 @@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -88,20 +90,30 @@ host_triplet = @host@
subdir = src/pdbp_drv
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/config/ax_check_compiler_flags.m4 \
+ $(top_srcdir)/config/ax_have_qt.m4 \
+ $(top_srcdir)/config/libtool.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
+ $(top_srcdir)/config/vl_lib_readline.m4 \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
LTLIBRARIES = $(noinst_LTLIBRARIES)
libsilo_pdbp_drv_la_LIBADD =
am__objects_1 = silo_pdbp.lo
am_libsilo_pdbp_drv_la_OBJECTS = $(am__objects_1)
libsilo_pdbp_drv_la_OBJECTS = $(am_libsilo_pdbp_drv_la_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/config/depcomp
am__depfiles_maybe = depfiles
+am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -142,7 +154,8 @@ CXX_FULLPATH = @CXX_FULLPATH@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -154,6 +167,7 @@ FCFLAGS = @FCFLAGS@
FCLIBS = @FCLIBS@
FC_FULLPATH = @FC_FULLPATH@
FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FORTRAN = @FORTRAN@
FPZIP = @FPZIP@
GREP = @GREP@
@@ -164,17 +178,25 @@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
LDFLAGS = @LDFLAGS@
+LIBM = @LIBM@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
NETCDF = @NETCDF@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -184,7 +206,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PDBP_DRV = @PDBP_DRV@
PDB_DRV = @PDB_DRV@
-PRTDIAG = @PRTDIAG@
PYTHON = @PYTHON@
PYTHONMODULE = @PYTHONMODULE@
PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@
@@ -192,17 +213,13 @@ PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
PYTHON_PLATFORM = @PYTHON_PLATFORM@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
-QT_BIN = @QT_BIN@
-QT_CORE = @QT_CORE@
-QT_CORE_LIB = @QT_CORE_LIB@
QT_CXXFLAGS = @QT_CXXFLAGS@
-QT_GUI = @QT_GUI@
-QT_GUI_LIB = @QT_GUI_LIB@
-QT_INCLUDE = @QT_INCLUDE@
-QT_LDFLAGS = @QT_LDFLAGS@
-QT_LIB = @QT_LIB@
+QT_DIR = @QT_DIR@
QT_LIBS = @QT_LIBS@
+QT_LRELEASE = @QT_LRELEASE@
+QT_LUPDATE = @QT_LUPDATE@
QT_MOC = @QT_MOC@
+QT_UIC = @QT_UIC@
RANLIB = @RANLIB@
READLINE_LIBS = @READLINE_LIBS@
SED = @SED@
@@ -220,6 +237,11 @@ SILO_VERS_TAG = @SILO_VERS_TAG@
STRIP = @STRIP@
TAURUS = @TAURUS@
VERSION = @VERSION@
+XMKMF = @XMKMF@
+X_CFLAGS = @X_CFLAGS@
+X_EXTRA_LIBS = @X_EXTRA_LIBS@
+X_LIBS = @X_LIBS@
+X_PRE_LIBS = @X_PRE_LIBS@
ZLIB = @ZLIB@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
@@ -227,6 +249,7 @@ abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_F77 = @ac_ct_F77@
ac_ct_FC = @ac_ct_FC@
am__include = @am__include@
@@ -259,6 +282,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -275,6 +299,7 @@ sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
noinst_LTLIBRARIES = libsilo_pdbp_drv.la
@@ -291,14 +316,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
- && exit 0; \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/pdbp_drv/Makefile'; \
- cd $(top_srcdir) && \
- $(AUTOMAKE) --foreign src/pdbp_drv/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/pdbp_drv/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --foreign src/pdbp_drv/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -316,6 +341,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
clean-noinstLTLIBRARIES:
-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
@@ -338,21 +364,21 @@ distclean-compile:
.c.o:
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c $<
.c.obj:
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
.c.lo:
@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
@@ -368,45 +394,49 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
+ set x; \
here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
fi
ctags: CTAGS
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
+ $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && cd $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) $$here
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -427,13 +457,17 @@ distdir: $(DISTFILES)
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
if test -d $$d/$$file; then \
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
@@ -461,6 +495,7 @@ clean-generic:
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -482,6 +517,8 @@ dvi-am:
html: html-am
+html-am:
+
info: info-am
info-am:
@@ -490,18 +527,28 @@ install-data-am:
install-dvi: install-dvi-am
+install-dvi-am:
+
install-exec-am:
install-html: install-html-am
+install-html-am:
+
install-info: install-info-am
+install-info-am:
+
install-man:
install-pdf: install-pdf-am
+install-pdf-am:
+
install-ps: install-ps-am
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-am
@@ -539,6 +586,7 @@ uninstall-am:
mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
pdf pdf-am ps ps-am tags uninstall uninstall-am
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/src/score/Makefile.am b/src/score/Makefile.am
index 067744b..521d26d 100644
--- a/src/score/Makefile.am
+++ b/src/score/Makefile.am
@@ -56,11 +56,21 @@
noinst_LTLIBRARIES = libsilo_score.la
libsilo_score_la_SOURCES = $(FILES)
-noinst_HEADERS = \
- score.h
+if INSTALL_LITE_HEADERS
+nodist_include_HEADERS = lite_score.h
+endif
+
+noinst_HEADERS = score.h
+
+CLEANFILES = lite_score.h
+
+
FILES = \
memmove.c \
scctla.c \
scctl.c \
schash.c \
scstr.c
+
+lite_score.h: score.h
+ if test ! -e $@; then $(top_srcdir)/config/mklite $< $@; fi
diff --git a/src/score/Makefile.in b/src/score/Makefile.in
index c08d343..a1aaf66 100644
--- a/src/score/Makefile.in
+++ b/src/score/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -70,8 +71,9 @@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -90,20 +92,30 @@ subdir = src/score
DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/config/ax_check_compiler_flags.m4 \
+ $(top_srcdir)/config/ax_have_qt.m4 \
+ $(top_srcdir)/config/libtool.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
+ $(top_srcdir)/config/vl_lib_readline.m4 \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
LTLIBRARIES = $(noinst_LTLIBRARIES)
libsilo_score_la_LIBADD =
am__objects_1 = memmove.lo scctla.lo scctl.lo schash.lo scstr.lo
am_libsilo_score_la_OBJECTS = $(am__objects_1)
libsilo_score_la_OBJECTS = $(am_libsilo_score_la_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/config/depcomp
am__depfiles_maybe = depfiles
+am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -115,7 +127,29 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
$(LDFLAGS) -o $@
SOURCES = $(libsilo_score_la_SOURCES)
DIST_SOURCES = $(libsilo_score_la_SOURCES)
-HEADERS = $(noinst_HEADERS)
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == $(am__install_max)) \
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+ END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__installdirs = "$(DESTDIR)$(includedir)"
+HEADERS = $(nodist_include_HEADERS) $(noinst_HEADERS)
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -145,7 +179,8 @@ CXX_FULLPATH = @CXX_FULLPATH@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -157,6 +192,7 @@ FCFLAGS = @FCFLAGS@
FCLIBS = @FCLIBS@
FC_FULLPATH = @FC_FULLPATH@
FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FORTRAN = @FORTRAN@
FPZIP = @FPZIP@
GREP = @GREP@
@@ -167,17 +203,25 @@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
LDFLAGS = @LDFLAGS@
+LIBM = @LIBM@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
NETCDF = @NETCDF@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -187,7 +231,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PDBP_DRV = @PDBP_DRV@
PDB_DRV = @PDB_DRV@
-PRTDIAG = @PRTDIAG@
PYTHON = @PYTHON@
PYTHONMODULE = @PYTHONMODULE@
PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@
@@ -195,17 +238,13 @@ PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
PYTHON_PLATFORM = @PYTHON_PLATFORM@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
-QT_BIN = @QT_BIN@
-QT_CORE = @QT_CORE@
-QT_CORE_LIB = @QT_CORE_LIB@
QT_CXXFLAGS = @QT_CXXFLAGS@
-QT_GUI = @QT_GUI@
-QT_GUI_LIB = @QT_GUI_LIB@
-QT_INCLUDE = @QT_INCLUDE@
-QT_LDFLAGS = @QT_LDFLAGS@
-QT_LIB = @QT_LIB@
+QT_DIR = @QT_DIR@
QT_LIBS = @QT_LIBS@
+QT_LRELEASE = @QT_LRELEASE@
+QT_LUPDATE = @QT_LUPDATE@
QT_MOC = @QT_MOC@
+QT_UIC = @QT_UIC@
RANLIB = @RANLIB@
READLINE_LIBS = @READLINE_LIBS@
SED = @SED@
@@ -223,6 +262,11 @@ SILO_VERS_TAG = @SILO_VERS_TAG@
STRIP = @STRIP@
TAURUS = @TAURUS@
VERSION = @VERSION@
+XMKMF = @XMKMF@
+X_CFLAGS = @X_CFLAGS@
+X_EXTRA_LIBS = @X_EXTRA_LIBS@
+X_LIBS = @X_LIBS@
+X_PRE_LIBS = @X_PRE_LIBS@
ZLIB = @ZLIB@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
@@ -230,6 +274,7 @@ abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_F77 = @ac_ct_F77@
ac_ct_FC = @ac_ct_FC@
am__include = @am__include@
@@ -262,6 +307,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -278,13 +324,14 @@ sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
noinst_LTLIBRARIES = libsilo_score.la
libsilo_score_la_SOURCES = $(FILES)
-noinst_HEADERS = \
- score.h
-
+ at INSTALL_LITE_HEADERS_TRUE@nodist_include_HEADERS = lite_score.h
+noinst_HEADERS = score.h
+CLEANFILES = lite_score.h
FILES = \
memmove.c \
scctla.c \
@@ -300,14 +347,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
- && exit 0; \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/score/Makefile'; \
- cd $(top_srcdir) && \
- $(AUTOMAKE) --foreign src/score/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/score/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --foreign src/score/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -325,6 +372,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
clean-noinstLTLIBRARIES:
-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
@@ -351,21 +399,21 @@ distclean-compile:
.c.o:
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c $<
.c.obj:
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
.c.lo:
@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
@@ -375,51 +423,75 @@ mostlyclean-libtool:
clean-libtool:
-rm -rf .libs _libs
+install-nodist_includeHEADERS: $(nodist_include_HEADERS)
+ @$(NORMAL_INSTALL)
+ test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
+ @list='$(nodist_include_HEADERS)'; test -n "$(includedir)" || list=; \
+ for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(includedir)'"; \
+ $(INSTALL_HEADER) $$files "$(DESTDIR)$(includedir)" || exit $$?; \
+ done
+
+uninstall-nodist_includeHEADERS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(nodist_include_HEADERS)'; test -n "$(includedir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ test -n "$$files" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(includedir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(includedir)" && rm -f $$files
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
+ set x; \
here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
fi
ctags: CTAGS
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
+ $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && cd $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) $$here
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -440,13 +512,17 @@ distdir: $(DISTFILES)
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
if test -d $$d/$$file; then \
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
@@ -454,6 +530,9 @@ check-am: all-am
check: check-am
all-am: Makefile $(LTLIBRARIES) $(HEADERS)
installdirs:
+ for dir in "$(DESTDIR)$(includedir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@ -471,9 +550,11 @@ install-strip:
mostlyclean-generic:
clean-generic:
+ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -495,26 +576,38 @@ dvi-am:
html: html-am
+html-am:
+
info: info-am
info-am:
-install-data-am:
+install-data-am: install-nodist_includeHEADERS
install-dvi: install-dvi-am
+install-dvi-am:
+
install-exec-am:
install-html: install-html-am
+install-html-am:
+
install-info: install-info-am
+install-info-am:
+
install-man:
install-pdf: install-pdf-am
+install-pdf-am:
+
install-ps: install-ps-am
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-am
@@ -535,7 +628,7 @@ ps: ps-am
ps-am:
-uninstall-am:
+uninstall-am: uninstall-nodist_includeHEADERS
.MAKE: install-am install-strip
@@ -546,11 +639,16 @@ uninstall-am:
install install-am install-data install-data-am install-dvi \
install-dvi-am install-exec install-exec-am install-html \
install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-ps install-ps-am \
- install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
- pdf pdf-am ps ps-am tags uninstall uninstall-am
+ install-nodist_includeHEADERS install-pdf install-pdf-am \
+ install-ps install-ps-am install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ tags uninstall uninstall-am uninstall-nodist_includeHEADERS
+
+
+lite_score.h: score.h
+ if test ! -e $@; then $(top_srcdir)/config/mklite $< $@; fi
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/src/score/scctla.c b/src/score/scctla.c
index 74195b1..e17c295 100644
--- a/src/score/scctla.c
+++ b/src/score/scctla.c
@@ -90,7 +90,9 @@ typedef struct s_mem_descriptor mem_descriptor;
* These machines might get away with not defining this: meiko, solaris,
* sun, sun-gnu.
*/
-#undef NEED_MEM_TRACE
+#if NORMAL_SCLITE_HEADERS
+#define NEED_MEM_TRACE
+#endif
#ifdef NEED_MEM_TRACE
/*
@@ -169,26 +171,20 @@ static mem_header *_SC_latest_block ;
* this solves all alignment problems (especially for RISC chips)
*/
struct s_mem_descriptor {
- char *name;
- long id;
short ref_count;
- short type;
- long length;
+ int length;
};
union u_mem_header {
mem_descriptor block;
- double align[2];
+ double align[1];
};
#define ASSIGN_BLOCK(space, nb, name) { \
mem_descriptor *desc; \
desc = &space->block; \
- desc->id = SC_MEM_ID; \
desc->ref_count = 1; \
- desc->type = 0; \
desc->length = nb; \
- desc->name = name; \
}
#define SAVE_LINKS(desc) /*void*/
@@ -203,7 +199,7 @@ union u_mem_header {
#endif /* NEED_MEM_TRACE */
#define SCORE_BLOCK_P(desc) \
- ((desc)->id == SC_MEM_ID)
+ (1 == 1)
#define BLOCK_LENGTH(desc) \
(desc)->length
@@ -242,8 +238,8 @@ static unsigned long Sz_max = ( 1L << NBITS) - 1; /* maximum value */
static unsigned long Sz = sizeof(mem_header); /* size in bytes of header */
static char tokbuffer[MAXLINE]; /* used by firsttok and lasttok */
static int _SC_zero_space = TRUE;
-static byte * _SC_prim_alloc (size_t) ;
-static void _SC_prim_free (byte*,unsigned long) ;
+static lite_SC_byte * _SC_prim_alloc (size_t) ;
+static void _SC_prim_free (lite_SC_byte*,unsigned long) ;
/*-------------------------------------------------------------------------
@@ -267,7 +263,7 @@ static void _SC_prim_free (byte*,unsigned long) ;
*
*-------------------------------------------------------------------------
*/
-byte *
+lite_SC_byte *
lite_SC_alloc (long nitems, long bytepitem, char *name) {
long nb;
@@ -298,7 +294,7 @@ lite_SC_alloc (long nitems, long bytepitem, char *name) {
if (_SC_zero_space) memset(space, 0, nb);
}
- return((byte *) space);
+ return((lite_SC_byte *) space);
}
@@ -325,8 +321,8 @@ lite_SC_alloc (long nitems, long bytepitem, char *name) {
*
*-------------------------------------------------------------------------
*/
-byte *
-lite_SC_realloc (byte *p, long nitems, long bytepitem) {
+lite_SC_byte *
+lite_SC_realloc (lite_SC_byte *p, long nitems, long bytepitem) {
long nb, ob, db;
unsigned long nbp, obp;
@@ -373,7 +369,7 @@ lite_SC_realloc (byte *p, long nitems, long bytepitem) {
if ((db > 0) && (_SC_zero_space)) memset(((char *) space + ob), 0, db);
}
- return((byte *) space);
+ return((lite_SC_byte *) space);
}
@@ -395,7 +391,7 @@ lite_SC_realloc (byte *p, long nitems, long bytepitem) {
*-------------------------------------------------------------------------
*/
int
-lite_SC_free (byte *p) {
+lite_SC_free (lite_SC_byte *p) {
mem_header *space;
mem_descriptor *desc;
@@ -421,14 +417,16 @@ lite_SC_free (byte *p) {
if (_SC_zero_space) {
memset(space, 0, nbp);
} else {
+#ifdef NEED_MEM_TRACE
desc->name = NULL;
desc->id = 0L;
- desc->ref_count = 0;
desc->type = 0;
+#endif
+ desc->ref_count = 0;
desc->length = 0L;
}
- _SC_prim_free((byte *) space, nbp);
+ _SC_prim_free((lite_SC_byte *) space, nbp);
_SC_n_mem_blocks--;
return(TRUE);
}
@@ -452,7 +450,7 @@ lite_SC_free (byte *p) {
*-------------------------------------------------------------------------
*/
long
-lite_SC_arrlen (byte *p) {
+lite_SC_arrlen (lite_SC_byte *p) {
mem_header *space;
mem_descriptor *desc;
@@ -487,7 +485,7 @@ lite_SC_arrlen (byte *p) {
*-------------------------------------------------------------------------
*/
int
-lite_SC_mark (byte *p, int n) {
+lite_SC_mark (lite_SC_byte *p, int n) {
mem_header *space;
mem_descriptor *desc;
@@ -522,7 +520,7 @@ lite_SC_mark (byte *p, int n) {
*-------------------------------------------------------------------------
*/
int
-lite_SC_ref_count (byte *p) {
+lite_SC_ref_count (lite_SC_byte *p) {
mem_header *space;
mem_descriptor *desc;
@@ -557,10 +555,10 @@ lite_SC_ref_count (byte *p) {
*
*-------------------------------------------------------------------------
*/
-static byte *
+static lite_SC_byte *
_SC_prim_alloc (size_t nbp) {
- byte *p;
+ lite_SC_byte *p;
#ifdef CACHE_SMALL_MEM_REQ
char *pn;
mem_descriptor *md, *ths;
@@ -606,14 +604,21 @@ _SC_prim_alloc (size_t nbp) {
nu--;
for (i = 0; i < nu; i++, pn += us) {
ths = (mem_descriptor *) pn;
+#ifdef NEED_MEM_TRACE
ths->name = (char *) (pn + us);
+#endif
}
ths = (mem_descriptor *) pn;
+#ifdef NEED_MEM_TRACE
ths->name = NULL;
+#endif
}
+#ifdef NEED_MEM_TRACE
+#error HOW TO UPDATE FREE LIST IF THIS CODE IS ENABLED
_SC_free_list[unsz] = (mem_descriptor *) (md->name);
- p = (byte *) md;
+#endif
+ p = (lite_SC_byte *) md;
} else {
p = _SC_ALLOC((size_t) nbp);
}
@@ -645,7 +650,7 @@ _SC_prim_alloc (size_t nbp) {
*/
/* ARGSUSED */
static void
-_SC_prim_free (byte *p, unsigned long nbp) {
+_SC_prim_free (lite_SC_byte *p, unsigned long nbp) {
#ifdef CACHE_SMALL_MEM_REQ
mem_descriptor *lst, *ths;
@@ -660,7 +665,9 @@ _SC_prim_free (byte *p, unsigned long nbp) {
if (unsz < UNIT_SIZE_MAX) {
ths = (mem_descriptor *) p;
lst = _SC_free_list[unsz];
+#ifdef NEED_MEM_TRACE
ths->name = (char *) lst;
+#endif
_SC_free_list[unsz] = ths;
} else {
_SC_FREE(p);
diff --git a/src/score/schash.c b/src/score/schash.c
index 65808f6..8343fe2 100644
--- a/src/score/schash.c
+++ b/src/score/schash.c
@@ -64,6 +64,75 @@ be used for advertising or product endorsement purposes.
*/
#include "score.h"
+/*-------------------------------------------------------------------------
+ Function: bjhash
+
+ Purpose: Hash a variable length stream of bytes into a 32-bit value.
+
+ Programmer: By Bob Jenkins, 1996. bob_jenkins at burtleburtle.net.
+
+ You may use this code any way you wish, private, educational, or
+ commercial. It's free. However, do NOT use for cryptographic purposes.
+
+ See http://burtleburtle.net/bob/hash/evahash.html
+ *-------------------------------------------------------------------------*/
+
+#define bjhash_mix(a,b,c) \
+{ \
+ a -= b; a -= c; a ^= (c>>13); \
+ b -= c; b -= a; b ^= (a<<8); \
+ c -= a; c -= b; c ^= (b>>13); \
+ a -= b; a -= c; a ^= (c>>12); \
+ b -= c; b -= a; b ^= (a<<16); \
+ c -= a; c -= b; c ^= (b>>5); \
+ a -= b; a -= c; a ^= (c>>3); \
+ b -= c; b -= a; b ^= (a<<10); \
+ c -= a; c -= b; c ^= (b>>15); \
+}
+
+#define K(I,L) (((unsigned int)((unsigned char)k[I]))<<L)
+static unsigned int bjhash(register const char *k,
+ register unsigned int length, register unsigned int initval)
+{
+ register unsigned int a,b,c,len;
+
+ len = length;
+ a = b = 0x9e3779b9;
+ c = initval;
+
+ while (len >= 12)
+ {
+ a += (K(0,0) + K(1,8) + K(2,16) + K(3,24));
+ b += (K(4,0) + K(5,8) + K(6,16) + K(7,24));
+ c += (K(8,0) + K(9,8) + K(10,16) + K(11,24));
+ bjhash_mix(a,b,c);
+ k += 12; len -= 12;
+ }
+
+ c += length;
+
+ switch(len)
+ {
+ case 11: c+=K(10,24);
+ case 10: c+=K(9,16);
+ case 9 : c+=K(8,8);
+ case 8 : b+=K(7,24);
+ case 7 : b+=K(6,16);
+ case 6 : b+=K(5,8);
+ case 5 : b+=K(4,0);
+ case 4 : a+=K(3,24);
+ case 3 : a+=K(2,16);
+ case 2 : a+=K(1,8);
+ case 1 : a+=K(0,0);
+ }
+
+ bjhash_mix(a,b,c);
+
+ return c;
+}
+#undef K
+#undef bjhash_mix
+
/*-------------------------------------------------------------------------
* Function: lite_SC_hash
@@ -79,18 +148,17 @@ be used for advertising or product endorsement purposes.
*
* Modifications:
*
+ * Mark C. Miller, Fri Apr 13 22:43:19 PDT 2012
+ * Use "BJ Hash"
*-------------------------------------------------------------------------
*/
int
lite_SC_hash (char *s, int size) {
- int hashval;
-
- for (hashval = 0; *s != '\0'; ) {
- hashval = (hashval << 1) ^ (*s++);
- }
-
- return(abs(hashval) % size);
+ int len = strlen(s);
+ unsigned int hashval = bjhash(s, len, 0xDeadBeef);
+ if (hashval > INT_MAX) hashval -= INT_MAX;
+ return hashval % size;
}
@@ -144,7 +212,7 @@ lite_SC_lookup (char *s, HASHTAB *tab) {
*
*-------------------------------------------------------------------------
*/
-byte *
+lite_SC_byte *
lite_SC_def_lookup (char *s, HASHTAB *tab) {
hashel *np;
@@ -174,7 +242,7 @@ lite_SC_def_lookup (char *s, HASHTAB *tab) {
*-------------------------------------------------------------------------
*/
hashel *
-lite_SC_install (char *name, byte *obj, char *type, HASHTAB *tab) {
+lite_SC_install (char *name, lite_SC_byte *obj, char *type, HASHTAB *tab) {
return _lite_SC_install (name, obj, type, tab);
}
@@ -208,7 +276,7 @@ lite_SC_install (char *name, byte *obj, char *type, HASHTAB *tab) {
*-------------------------------------------------------------------------
*/
hashel *
-_lite_SC_install (char *name, byte *obj, char *type, HASHTAB *tab) {
+_lite_SC_install (char *name, lite_SC_byte *obj, char *type, HASHTAB *tab) {
hashel *np, **tb;
int hashval, sz;
diff --git a/src/score/score.h b/src/score/score.h
index 6b835bd..f691a14 100644
--- a/src/score/score.h
+++ b/src/score/score.h
@@ -51,7 +51,7 @@ herein do not necessarily state or reflect those of the United States
Government or Lawrence Livermore National Security, LLC, and shall not
be used for advertising or product endorsement purposes.
*/
-#include "config.h" /* For HAVE_MEMMOVE test. */
+
/*
* SCORE.H - include file for PACT standard core package
*
@@ -60,6 +60,10 @@ be used for advertising or product endorsement purposes.
*
*/
+#ifdef PCK_SCORE
+#error CANNOT INCLUDE SCORE PROPER AND SCORE LITE HEADERS IN SAME COMPILATION MODULE
+#endif
+
#ifndef _SCORE_H
#define _SCORE_H
@@ -71,34 +75,45 @@ be used for advertising or product endorsement purposes.
#include <limits.h> /*needed for SHRT_MAX*/
#include <stdio.h>
#if HAVE_STDLIB_H
-#include <stdlib.h>
+# include <stdlib.h>
#endif
#if HAVE_STRING_H
-#include <string.h>
+# include <string.h>
#endif
#if HAVE_SYS_TYPES_H
-#include <sys/types.h>
+# include <sys/types.h>
#endif
-/* Macros used for exporting symbols on Win32 systems. */
-#ifndef SILO_API
-#ifdef _WIN32
-#ifndef HAVE_MEMMOVE
-#define HAVE_MEMMOVE
-#endif
-/* Make Silo a DLL by default. */
-#ifdef SILO_STATIC_LIBRARY
-#define SILO_API
-#else
-#ifdef SILO_EXPORTS
-#define SILO_API __declspec(dllexport)
-#else
-#define SILO_API __declspec(dllimport)
-#endif
+/*
+ * LITE exports for WIN32
+ */
+#ifndef LITE_API
+ #ifdef _WIN32
+ #ifdef LITE_STATIC_LIBRARY
+ #define LITE_API
+ #else
+ #ifdef LITE_EXPORTS
+ #define LITE_API __declspec(dllexport)
+ #else
+ #define LITE_API __declspec(dllimport)
+ #endif
+ #endif
+ #else
+ #define LITE_API
+ #endif
#endif
-#else
-#define SILO_API
+
+#ifdef __cplusplus
+extern "C" {
#endif
+
+/* INSERT FUNCTION NAME MAPPING MACROS HERE */
+
+/* Macros used for exporting symbols on Win32 systems. */
+#ifdef _WIN32
+# ifndef HAVE_MEMMOVE
+# define HAVE_MEMMOVE
+# endif
#endif
/*--------------------------------------------------------------------------*/
@@ -118,7 +133,11 @@ be used for advertising or product endorsement purposes.
#define BINARY_MODE_WPLUS "w+b"
#define LRG_TXT_BUFFER 4096
#define NODOC 0
-#define HSZLARGE 521
+/* Possible hash table sizes. Should be primes */
+#define HSZSMALL 521
+#define HSZMEDIUM 5231
+#define HSZLARGE 52121
+#define HSZXLARGE 521021
#define SC_BITS_BYTE 8
#define SC_CHAR_I 1
@@ -218,7 +237,7 @@ be used for advertising or product endorsement purposes.
/* REMAKE_N - reallocate a block of type x and return a pointer to it */
#define REMAKE_N(p, x, n) \
- (p = (x *) lite_SC_realloc((byte *) p, (long) (n), (long) sizeof(x)))
+ (p = (x *) lite_SC_realloc((lite_SC_byte *) p, (long) (n), (long) sizeof(x)))
/*--------------------------------------------------------------------------*/
/*--------------------------------------------------------------------------*/
@@ -237,7 +256,7 @@ be used for advertising or product endorsement purposes.
/*--------------------------------------------------------------------------*/
-typedef void byte ;
+typedef void lite_SC_byte ;
typedef void (*FreeFuncType)(void *) ;
typedef void *((*MallocFuncType)(size_t));
typedef void *((*ReallocFuncType)(void *,size_t));
@@ -254,9 +273,9 @@ typedef double (*PFDouble)() ;
*/
typedef struct s_pcons {
char *car_type;
- byte *car;
+ lite_SC_byte *car;
char *cdr_type;
- byte *cdr;
+ lite_SC_byte *cdr;
} pcons;
/*
@@ -272,7 +291,7 @@ typedef struct s_pcons {
typedef struct s_hashel {
char *name;
char *type;
- byte *def;
+ lite_SC_byte *def;
struct s_hashel *next; /* next entry in chain */
} hashel ;
@@ -294,7 +313,7 @@ typedef union u_SC_address {
typedef FILE * (*PFfopen)(char*,char*);
typedef long (*PFftell)(void*);
-typedef size_t (*PFfread)(byte*,size_t,size_t,void*);
+typedef size_t (*PFfread)(lite_SC_byte*,size_t,size_t,void*);
typedef size_t (*PFfwrite)(void*,size_t,size_t,void*);
typedef int (*PFsetvbuf)(void*,char*,int,size_t);
typedef int (*PFfclose)(void*);
@@ -307,23 +326,23 @@ typedef int (*PFfflush)(void*);
/* VARIABLE DECLARATIONS */
/*--------------------------------------------------------------------------*/
-extern int lite_SC_c_sp_alloc;
-extern int lite_SC_c_sp_free;
-extern int lite_SC_c_sp_diff;
-extern int lite_SC_c_sp_max;
-extern int * lite_LAST;
-extern char * lite_SC_CHAR_S ;
+LITE_API extern int lite_SC_c_sp_alloc;
+LITE_API extern int lite_SC_c_sp_free;
+LITE_API extern int lite_SC_c_sp_diff;
+LITE_API extern int lite_SC_c_sp_max;
+LITE_API extern int * lite_LAST;
+LITE_API extern char * lite_SC_CHAR_S ;
/* IO hooks */
-extern PFfclose lite_io_close_hook;
-extern PFfflush lite_io_flush_hook;
-extern PFfopen lite_io_open_hook;
-extern PFfprintf lite_io_printf_hook;
-extern PFfread lite_io_read_hook;
-extern PFfseek lite_io_seek_hook;
-extern PFsetvbuf lite_io_setvbuf_hook;
-extern PFftell lite_io_tell_hook;
-extern PFfwrite lite_io_write_hook;
+extern PFfclose lite_io_close_hook; /* NOT_LITE_API */
+extern PFfflush lite_io_flush_hook; /* NOT_LITE_API */
+extern PFfopen lite_io_open_hook; /* NOT_LITE_API */
+extern PFfprintf lite_io_printf_hook; /* NOT_LITE_API */
+extern PFfread lite_io_read_hook; /* NOT_LITE_API */
+extern PFfseek lite_io_seek_hook; /* NOT_LITE_API */
+extern PFsetvbuf lite_io_setvbuf_hook; /* NOT_LITE_API */
+extern PFftell lite_io_tell_hook; /* NOT_LITE_API */
+extern PFfwrite lite_io_write_hook; /* NOT_LITE_API */
@@ -331,37 +350,41 @@ extern PFfwrite lite_io_write_hook;
/* FUNCTION DECLARATIONS */
/*--------------------------------------------------------------------------*/
-SILO_API extern byte * lite_SC_alloc (long,long,char*);
-SILO_API extern long lite_SC_arrlen (byte*);
-SILO_API extern char * lite_SC_date (void);
-SILO_API extern byte * lite_SC_def_lookup (char*,HASHTAB*);
-SILO_API extern char ** lite_SC_dump_hash (HASHTAB*,char*,int);
-SILO_API extern char * lite_SC_firsttok (char*,char*);
-SILO_API extern int lite_SC_free (byte*);
-SILO_API extern int lite_SC_hash (char*,int);
-SILO_API extern void lite_SC_hash_clr (HASHTAB*);
-SILO_API extern char ** lite_SC_hash_dump (HASHTAB*,char*);
-SILO_API extern int lite_SC_hash_rem (char*,HASHTAB*);
-SILO_API extern hashel *lite_SC_install (char*,byte*,char*,HASHTAB*);
-SILO_API extern char * lite_SC_lasttok (char*,char*);
-SILO_API extern hashel *lite_SC_lookup (char*,HASHTAB*);
-SILO_API extern HASHTAB *lite_SC_make_hash_table (int,int);
-SILO_API extern int lite_SC_mark (byte*,int);
-SILO_API extern byte * lite_SC_realloc (byte*,long,long);
-SILO_API extern int lite_SC_ref_count (byte*);
-SILO_API extern int lite_SC_regx_match (char*,char*);
-SILO_API extern void lite_SC_rl_hash_table (HASHTAB*);
-SILO_API extern int lite_SC_stoi (char*);
-SILO_API extern long lite_SC_stol (char*);
-SILO_API extern void lite_SC_string_sort (char**,int);
-SILO_API extern char * lite_SC_strrev (char*);
-SILO_API extern char * lite_SC_strsavef (char*,char*);
-extern hashel * _lite_SC_install (char*,byte*,char*,HASHTAB*);
+LITE_API extern lite_SC_byte * lite_SC_alloc (long,long,char*);
+LITE_API extern long lite_SC_arrlen (lite_SC_byte*);
+LITE_API extern char * lite_SC_date (void);
+LITE_API extern lite_SC_byte * lite_SC_def_lookup (char*,HASHTAB*);
+LITE_API extern char ** lite_SC_dump_hash (HASHTAB*,char*,int);
+LITE_API extern char * lite_SC_firsttok (char*,char*);
+LITE_API extern int lite_SC_free (lite_SC_byte*);
+LITE_API extern int lite_SC_hash (char*,int);
+LITE_API extern void lite_SC_hash_clr (HASHTAB*);
+LITE_API extern char ** lite_SC_hash_dump (HASHTAB*,char*);
+LITE_API extern int lite_SC_hash_rem (char*,HASHTAB*);
+LITE_API extern hashel *lite_SC_install (char*,lite_SC_byte*,char*,HASHTAB*);
+LITE_API extern char * lite_SC_lasttok (char*,char*);
+LITE_API extern hashel *lite_SC_lookup (char*,HASHTAB*);
+LITE_API extern HASHTAB *lite_SC_make_hash_table (int,int);
+LITE_API extern int lite_SC_mark (lite_SC_byte*,int);
+LITE_API extern lite_SC_byte * lite_SC_realloc (lite_SC_byte*,long,long);
+LITE_API extern int lite_SC_ref_count (lite_SC_byte*);
+LITE_API extern int lite_SC_regx_match (char*,char*);
+LITE_API extern void lite_SC_rl_hash_table (HASHTAB*);
+LITE_API extern int lite_SC_stoi (char*);
+LITE_API extern long lite_SC_stol (char*);
+LITE_API extern void lite_SC_string_sort (char**,int);
+LITE_API extern char * lite_SC_strrev (char*);
+LITE_API extern char * lite_SC_strsavef (char*,char*);
+extern hashel * _lite_SC_install (char*,lite_SC_byte*,char*,HASHTAB*);
extern char * _lite_SC_pr_tok (char*,char*);
extern long int _lite_SC_strtol (char*,char**,int);
#ifndef HAVE_MEMMOVE
-extern void * memmove (void*,const void*,size_t) ;
+LITE_API extern void * memmove (void*,const void*,size_t) ;
+#endif
+
+#ifdef __cplusplus
+}
#endif
#endif /* !_SCORE_H */
diff --git a/src/silo/Makefile.am b/src/silo/Makefile.am
index 5cbaca4..fd615c2 100644
--- a/src/silo/Makefile.am
+++ b/src/silo/Makefile.am
@@ -52,6 +52,8 @@
#
## Procss this file with automake to create Makefile.in
+AM_CPPFLAGS = -I$(top_srcdir)/src
+
noinst_LTLIBRARIES = libsilo_silo.la
libsilo_silo_la_SOURCES = $(FILES)
diff --git a/src/silo/Makefile.in b/src/silo/Makefile.in
index 92edbdf..7b7820c 100644
--- a/src/silo/Makefile.in
+++ b/src/silo/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -70,8 +71,9 @@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -93,12 +95,21 @@ DIST_COMMON = $(am__noinst_HEADERS_DIST) $(include_HEADERS) \
$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(srcdir)/silo.h.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/config/ax_check_compiler_flags.m4 \
+ $(top_srcdir)/config/ax_have_qt.m4 \
+ $(top_srcdir)/config/libtool.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
+ $(top_srcdir)/config/vl_lib_readline.m4 \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES = silo.h
+CONFIG_CLEAN_VPATH_FILES =
LTLIBRARIES = $(noinst_LTLIBRARIES)
libsilo_silo_la_LIBADD =
am__libsilo_silo_la_SOURCES_DIST = alloc.c extface.c silo.c silo_ns.c \
@@ -109,9 +120,10 @@ am__objects_3 = alloc.lo extface.lo silo.lo silo_ns.lo \
$(am__objects_2)
am_libsilo_silo_la_OBJECTS = $(am__objects_3)
libsilo_silo_la_OBJECTS = $(am_libsilo_silo_la_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/config/depcomp
am__depfiles_maybe = depfiles
+am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -128,10 +140,23 @@ am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
*) f=$$p;; \
esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == $(am__install_max)) \
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+ END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
am__installdirs = "$(DESTDIR)$(includedir)" "$(DESTDIR)$(includedir)"
-includeHEADERS_INSTALL = $(INSTALL_HEADER)
-nodist_includeHEADERS_INSTALL = $(INSTALL_HEADER)
am__noinst_HEADERS_DIST = silo_drivers.h silo_private.h \
silo_win32_compatibility.h silo_f.h
HEADERS = $(include_HEADERS) $(nodist_include_HEADERS) \
@@ -165,7 +190,8 @@ CXX_FULLPATH = @CXX_FULLPATH@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -177,6 +203,7 @@ FCFLAGS = @FCFLAGS@
FCLIBS = @FCLIBS@
FC_FULLPATH = @FC_FULLPATH@
FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FORTRAN = @FORTRAN@
FPZIP = @FPZIP@
GREP = @GREP@
@@ -187,17 +214,25 @@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
LDFLAGS = @LDFLAGS@
+LIBM = @LIBM@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
NETCDF = @NETCDF@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -207,7 +242,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PDBP_DRV = @PDBP_DRV@
PDB_DRV = @PDB_DRV@
-PRTDIAG = @PRTDIAG@
PYTHON = @PYTHON@
PYTHONMODULE = @PYTHONMODULE@
PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@
@@ -215,17 +249,13 @@ PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
PYTHON_PLATFORM = @PYTHON_PLATFORM@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
-QT_BIN = @QT_BIN@
-QT_CORE = @QT_CORE@
-QT_CORE_LIB = @QT_CORE_LIB@
QT_CXXFLAGS = @QT_CXXFLAGS@
-QT_GUI = @QT_GUI@
-QT_GUI_LIB = @QT_GUI_LIB@
-QT_INCLUDE = @QT_INCLUDE@
-QT_LDFLAGS = @QT_LDFLAGS@
-QT_LIB = @QT_LIB@
+QT_DIR = @QT_DIR@
QT_LIBS = @QT_LIBS@
+QT_LRELEASE = @QT_LRELEASE@
+QT_LUPDATE = @QT_LUPDATE@
QT_MOC = @QT_MOC@
+QT_UIC = @QT_UIC@
RANLIB = @RANLIB@
READLINE_LIBS = @READLINE_LIBS@
SED = @SED@
@@ -243,6 +273,11 @@ SILO_VERS_TAG = @SILO_VERS_TAG@
STRIP = @STRIP@
TAURUS = @TAURUS@
VERSION = @VERSION@
+XMKMF = @XMKMF@
+X_CFLAGS = @X_CFLAGS@
+X_EXTRA_LIBS = @X_EXTRA_LIBS@
+X_LIBS = @X_LIBS@
+X_PRE_LIBS = @X_PRE_LIBS@
ZLIB = @ZLIB@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
@@ -250,6 +285,7 @@ abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_F77 = @ac_ct_F77@
ac_ct_FC = @ac_ct_FC@
am__include = @am__include@
@@ -282,6 +318,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -298,8 +335,10 @@ sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
+AM_CPPFLAGS = -I$(top_srcdir)/src
noinst_LTLIBRARIES = libsilo_silo.la
libsilo_silo_la_SOURCES = $(FILES)
EXTRAFILES = $(am__append_1)
@@ -341,14 +380,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
- && exit 0; \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/silo/Makefile'; \
- cd $(top_srcdir) && \
- $(AUTOMAKE) --foreign src/silo/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/silo/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --foreign src/silo/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -366,6 +405,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
silo.h: $(top_builddir)/config.status $(srcdir)/silo.h.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
@@ -394,21 +434,21 @@ distclean-compile:
.c.o:
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c $<
.c.obj:
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
.c.lo:
@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
@@ -421,82 +461,92 @@ clean-libtool:
install-includeHEADERS: $(include_HEADERS)
@$(NORMAL_INSTALL)
test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
- @list='$(include_HEADERS)'; for p in $$list; do \
+ @list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \
+ for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
- echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
- $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(includedir)'"; \
+ $(INSTALL_HEADER) $$files "$(DESTDIR)$(includedir)" || exit $$?; \
done
uninstall-includeHEADERS:
@$(NORMAL_UNINSTALL)
- @list='$(include_HEADERS)'; for p in $$list; do \
- f=$(am__strip_dir) \
- echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
- rm -f "$(DESTDIR)$(includedir)/$$f"; \
- done
+ @list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ test -n "$$files" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(includedir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(includedir)" && rm -f $$files
install-nodist_includeHEADERS: $(nodist_include_HEADERS)
@$(NORMAL_INSTALL)
test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
- @list='$(nodist_include_HEADERS)'; for p in $$list; do \
+ @list='$(nodist_include_HEADERS)'; test -n "$(includedir)" || list=; \
+ for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
- echo " $(nodist_includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
- $(nodist_includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(includedir)'"; \
+ $(INSTALL_HEADER) $$files "$(DESTDIR)$(includedir)" || exit $$?; \
done
uninstall-nodist_includeHEADERS:
@$(NORMAL_UNINSTALL)
- @list='$(nodist_include_HEADERS)'; for p in $$list; do \
- f=$(am__strip_dir) \
- echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
- rm -f "$(DESTDIR)$(includedir)/$$f"; \
- done
+ @list='$(nodist_include_HEADERS)'; test -n "$(includedir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ test -n "$$files" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(includedir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(includedir)" && rm -f $$files
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
+ set x; \
here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
fi
ctags: CTAGS
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
+ $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && cd $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) $$here
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -517,13 +567,17 @@ distdir: $(DISTFILES)
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
if test -d $$d/$$file; then \
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
@@ -556,6 +610,7 @@ clean-generic:
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
maintainer-clean-generic:
@@ -579,6 +634,8 @@ dvi-am:
html: html-am
+html-am:
+
info: info-am
info-am:
@@ -587,18 +644,28 @@ install-data-am: install-includeHEADERS install-nodist_includeHEADERS
install-dvi: install-dvi-am
+install-dvi-am:
+
install-exec-am:
install-html: install-html-am
+install-html-am:
+
install-info: install-info-am
+install-info-am:
+
install-man:
install-pdf: install-pdf-am
+install-pdf-am:
+
install-ps: install-ps-am
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-am
@@ -621,7 +688,7 @@ ps-am:
uninstall-am: uninstall-includeHEADERS uninstall-nodist_includeHEADERS
-.MAKE: install-am install-strip
+.MAKE: all check install install-am install-strip
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
clean-libtool clean-noinstLTLIBRARIES ctags distclean \
@@ -644,6 +711,7 @@ uninstall-am: uninstall-includeHEADERS uninstall-nodist_includeHEADERS
silo.inc: silo.h.in silo_f.h
if test ! -e $@; then \
cat ./silo.h $(srcdir)/silo_f.h | $(top_srcdir)/config/mkinc > $@; fi
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/src/silo/alloc.c b/src/silo/alloc.c
index 2d7bf3f..760d694 100644
--- a/src/silo/alloc.c
+++ b/src/silo/alloc.c
@@ -474,11 +474,18 @@ DBFreeMultimesh(DBmultimesh *msh)
}
if (msh->groupings)
FREE(msh->groupings);
+
+ FREE(msh->extents);
+ FREE(msh->zonecounts);
+ FREE(msh->has_external_zones);
FREE(msh->meshids);
FREE(msh->meshnames);
FREE(msh->meshtypes);
FREE(msh->dirids);
FREE(msh->mrgtree_name);
+ FREE(msh->file_ns);
+ FREE(msh->block_ns);
+ FREE(msh->empty_list);
FREE(msh);
}
@@ -507,10 +514,13 @@ DBFreeMultimeshadj(DBmultimeshadj *mshadj)
if (mshadj->nodelists) {
for (i = 0; i < lneighbors; i++)
FREE(mshadj->nodelists[i]);
+ FREE(mshadj->nodelists);
}
+
if (mshadj->zonelists) {
for (i = 0; i < lneighbors; i++)
FREE(mshadj->zonelists[i]);
+ FREE(mshadj->zonelists);
}
FREE(mshadj->meshtypes);
@@ -557,9 +567,20 @@ DBFreeMultivar (DBmultivar *mv)
}
}
+ if (mv->region_pnames)
+ {
+ for (i = 0; mv->region_pnames[i]; i++)
+ free(mv->region_pnames[i]);
+ free(mv->region_pnames);
+ }
+
FREE(mv->varnames);
FREE(mv->vartypes);
FREE(mv->mmesh_name);
+ FREE(mv->extents);
+ FREE(mv->file_ns);
+ FREE(mv->block_ns);
+ FREE(mv->empty_list);
FREE(mv);
}
@@ -620,6 +641,9 @@ DBFreeMultimat (DBmultimat *mat)
FREE(mat->matlists);
FREE(mat->matnos);
FREE(mat->mmesh_name);
+ FREE(mat->file_ns);
+ FREE(mat->block_ns);
+ FREE(mat->empty_list);
FREE(mat);
}
@@ -684,6 +708,9 @@ DBFreeMultimatspecies (DBmultimatspecies *spec)
FREE(spec->specnames);
FREE(spec->nmatspec);
+ FREE(spec->file_ns);
+ FREE(spec->block_ns);
+ FREE(spec->empty_list);
FREE(spec);
}
@@ -761,6 +788,19 @@ DBFreeCsgmesh(DBcsgmesh *msh)
FREE(msh);
}
+PUBLIC int
+DBIsEmptyCsgmesh(DBcsgmesh const *msh)
+{
+ if (!msh) return 0;
+ if (msh->nbounds!=0) return 0;
+ if (msh->typeflags!=0) return 0;
+ if (msh->bndids!=0) return 0;
+ if (msh->coeffs!=0) return 0;
+ if (msh->lcoeffs!=0) return 0;
+ if (msh->coeffidx!=0) return 0;
+ return 1;
+}
+
/*----------------------------------------------------------------------
* Function DBAllocQuadmesh
*
@@ -825,6 +865,21 @@ DBFreeQuadmesh(DBquadmesh *msh)
FREE(msh);
}
+PUBLIC int
+DBIsEmptyQuadmesh(DBquadmesh const *msh)
+{
+ if (!msh) return 0;
+ if (msh->nnodes!=0) return 0;
+ if (msh->coords[0]!=0) return 0;
+ if (msh->coords[1]!=0) return 0;
+ if (msh->coords[2]!=0) return 0;
+ if (msh->ndims!=0) return 0;
+ if (msh->dims[0]!=0) return 0;
+ if (msh->dims[1]!=0) return 0;
+ if (msh->dims[2]!=0) return 0;
+ return 1;
+}
+
/*----------------------------------------------------------------------
* Function DBAllocPointmesh
*
@@ -891,6 +946,18 @@ DBFreePointmesh(DBpointmesh *msh)
FREE(msh);
}
+PUBLIC int
+DBIsEmptyPointmesh(DBpointmesh const *msh)
+{
+ if (!msh) return 0;
+ if (msh->nels!=0) return 0;
+ if (msh->ndims!=0) return 0;
+ if (msh->coords[0]!=0) return 0;
+ if (msh->coords[1]!=0) return 0;
+ if (msh->coords[2]!=0) return 0;
+ return 1;
+}
+
/*----------------------------------------------------------------------
* Function DBAllocMeshvar
*
@@ -956,6 +1023,38 @@ DBFreeMeshvar(DBmeshvar *var)
FREE(var);
}
+PUBLIC int
+DBIsEmptyMeshvar(DBmeshvar const *var)
+{
+ if (!var) return 0;
+ if (var->nels!=0) return 0;
+ if (var->nvals!=0) return 0;
+ if (var->vals!=0) return 0;
+ /*if (var->ndims!=0) return 0; long standing bug/assumption in Silo */
+ if (var->dims[0]!=0) return 0;
+ if (var->dims[1]!=0) return 0;
+ if (var->dims[2]!=0) return 0;
+ return 1;
+}
+
+PUBLIC DBpointvar *
+DBAllocPointvar()
+{
+ return DBAllocMeshvar();
+}
+
+PUBLIC void
+DBFreePointvar(DBpointvar *var)
+{
+ DBFreeMeshvar(var);
+}
+
+PUBLIC int
+DBIsEmptyPointvar(DBpointvar const *pv)
+{
+ return DBIsEmptyMeshvar(pv);
+}
+
/*----------------------------------------------------------------------
* Function DBAllocUcdmesh
*
@@ -1036,6 +1135,22 @@ DBFreeUcdmesh(DBucdmesh *msh)
FREE(msh);
}
+PUBLIC int
+DBIsEmptyUcdmesh(DBucdmesh const *msh)
+{
+ if (!msh) return 0;
+ if (msh->ndims!=0) return 0;
+ if (msh->topo_dim!=-1) return 0; /* unique case; -1 means 'unset' */
+ if (msh->nnodes!=0) return 0;
+ if (msh->coords[0]!=0) return 0;
+ if (msh->coords[1]!=0) return 0;
+ if (msh->coords[2]!=0) return 0;
+ if (msh->faces!=0) return 0;
+ if (msh->zones!=0) return 0;
+ if (msh->edges!=0) return 0;
+ return 1;
+}
+
/*----------------------------------------------------------------------
* Function DBAllocCsgvar
*
@@ -1095,6 +1210,16 @@ DBFreeCsgvar(DBcsgvar *var)
FREE(var);
}
+PUBLIC int
+DBIsEmptyCsgvar(DBcsgvar const *var)
+{
+ if (!var) return 0;
+ if (var->nels!=0) return 0;
+ if (var->nvals!=0) return 0;
+ if (var->vals!=0) return 0;
+ return 1;
+}
+
/*----------------------------------------------------------------------
* Function DBAllocQuadvar
*
@@ -1181,6 +1306,20 @@ DBFreeQuadvar(DBquadvar *var)
FREE(var);
}
+PUBLIC int
+DBIsEmptyQuadvar(DBquadvar const *var)
+{
+ if (!var) return 0;
+ if (var->nels!=0) return 0;
+ if (var->nvals!=0) return 0;
+ if (var->vals!=0) return 0;
+ if (var->ndims!=0) return 0;
+ if (var->dims[0]!=0) return 0;
+ if (var->dims[1]!=0) return 0;
+ if (var->dims[2]!=0) return 0;
+ return 1;
+}
+
/*----------------------------------------------------------------------
* Function DBAllocUcdvar
*
@@ -1267,6 +1406,17 @@ DBFreeUcdvar(DBucdvar *var)
FREE(var);
}
+PUBLIC int
+DBIsEmptyUcdvar(DBucdvar const *var)
+{
+ if (!var) return 0;
+ if (var->nels!=0) return 0;
+ if (var->nvals!=0) return 0;
+ if (var->ndims!=0) return 0;
+ if (var->vals!=0) return 0;
+ return 1;
+}
+
/*----------------------------------------------------------------------
* Function DBAllocZonelist
*
@@ -1296,6 +1446,21 @@ DBAllocZonelist(void)
return (zl);
}
+PUBLIC int
+DBIsEmptyZonelist(DBzonelist const *zl)
+{
+ if (!zl) return 0;
+ if (zl->ndims!=0) return 0;
+ if (zl->nzones!=0) return 0;
+ if (zl->nshapes!=0) return 0;
+ if (zl->lnodelist!=0) return 0;
+ if (zl->nodelist!=0) return 0;
+ if (zl->shapecnt!=0) return 0;
+ if (zl->shapesize!=0) return 0;
+ if (zl->shapetype!=0) return 0;
+ return 1;
+}
+
/*----------------------------------------------------------------------
* Function DBAllocPHZonelist
*
@@ -1321,6 +1486,17 @@ DBAllocPHZonelist(void)
return (phzl);
}
+PUBLIC int
+DBIsEmptyPHZonelist(DBphzonelist const *zl)
+{
+ if (!zl) return 0;
+ if (zl->nfaces!=0) return 0;
+ if (zl->nodecnt!=0) return 0;
+ if (zl->lnodelist!=0) return 0;
+ if (zl->nodelist!=0) return 0;
+ return 1;
+}
+
/*----------------------------------------------------------------------
* Function DBAllocCSGZonelist
*
@@ -1346,6 +1522,19 @@ DBAllocCSGZonelist(void)
return (csgzl);
}
+PUBLIC int
+DBIsEmptyCSGZonelist(DBcsgzonelist const *zl)
+{
+ if (!zl) return 0;
+ if (zl->nregs!=0) return 0;
+ if (zl->typeflags!=0) return 0;
+ if (zl->leftids!=0) return 0;
+ if (zl->rightids!=0) return 0;
+ if (zl->nzones!=0) return 0;
+ if (zl->zonelist!=0) return 0;
+ return 1;
+}
+
/*----------------------------------------------------------------------
* Function DBFreeZonelist
*
@@ -1513,6 +1702,20 @@ DBAllocFacelist(void)
return (fl);
}
+PUBLIC int
+DBIsEmptyFacelist(DBfacelist const *fl)
+{
+ if (!fl) return 0;
+ if (fl->ndims!=0) return 0;
+ if (fl->nfaces!=0) return 0;
+ if (fl->lnodelist!=0) return 0;
+ if (fl->nodelist!=0) return 0;
+ if (fl->nshapes!=0) return 0;
+ if (fl->shapecnt!=0) return 0;
+ if (fl->shapesize!=0) return 0;
+ return 1;
+}
+
/*----------------------------------------------------------------------
* Function DBFreeFacelist
*
@@ -1605,6 +1808,21 @@ DBFreeMaterial(DBmaterial *mats)
FREE(mats);
}
+PUBLIC int
+DBIsEmptyMaterial(DBmaterial const *mats)
+{
+ if (!mats) return 0;
+ if (mats->nmat!=0) return 0;
+ if (mats->matnos!=0) return 0;
+ if (mats->ndims!=0) return 0;
+ if (mats->dims[0]!=0) return 0;
+ if (mats->dims[1]!=0) return 0;
+ if (mats->dims[2]!=0) return 0;
+ if (mats->matlist!=0) return 0;
+ if (mats->mixlen!=0) return 0;
+ return 1;
+}
+
/*----------------------------------------------------------------------
* Function DBAllocMatspecies
*
@@ -1683,6 +1901,24 @@ DBFreeMatspecies(DBmatspecies *species)
FREE(species);
}
+PUBLIC int
+DBIsEmptyMatspecies(DBmatspecies const *species)
+{
+ if (!species) return 0;
+ if (species->nmat!=0) return 0;
+ if (species->nmatspec!=0) return 0;
+ if (species->ndims!=0) return 0;
+ if (species->dims[0]!=0) return 0;
+ if (species->dims[1]!=0) return 0;
+ if (species->dims[2]!=0) return 0;
+ if (species->nspecies_mf!=0) return 0;
+ if (species->species_mf!=0) return 0;
+ if (species->speclist!=0) return 0;
+ if (species->mixlen!=0) return 0;
+ if (species->mix_speclist!=0) return 0;
+ return 1;
+}
+
/*-------------------------------------------------------------------------
* Function: DBAllocCompoundarray
*
@@ -1775,6 +2011,16 @@ DBAllocCurve (void)
return cu ;
}
+PUBLIC int
+DBIsEmptyCurve(DBcurve const *crv)
+{
+ if (!crv) return 0;
+ if (crv->npts!=0) return 0;
+ if (crv->x!=0) return 0;
+ if (crv->y!=0) return 0;
+ return 1;
+}
+
/*-------------------------------------------------------------------------
* Function: DBFreeCurve
*
@@ -1870,9 +2116,33 @@ DBFreeMrgvar(DBmrgvar *mrgv)
PUBLIC void
DBFreeNamescheme(DBnamescheme *ns)
{
- int i;
+ int i,k;
- /* Always free up the old name scheme and clear it out */
+ if (ns->arralloc)
+ {
+ for (i = 0, k = 0; i < ns->narrefs; i++)
+ {
+ while (ns->fmt[k] != '\0' && ns->fmt[k] != '$' && ns->fmt[k] != '#') k++;
+ if (ns->fmt[k] == '#')
+ {
+ FREE(ns->arrvals[i]);
+ }
+ else
+ {
+ int j;
+ for (j = 0; j < ns->arrsizes[i]; j++)
+ {
+ FREE(((char **)(ns->arrvals[i]))[j]);
+ }
+ FREE(ns->arrvals[i]);
+ }
+ }
+ }
+ FREE(ns->arrvals);
+ for (i = 0; i < ns->narrefs; i++)
+ FREE(ns->arrnames[i]);
+ FREE(ns->arrnames);
+ FREE(ns->arrsizes);
FREE(ns->fmt);
FREE(ns->fmtptrs);
for (i = 0; i < DB_MAX_EXPSTRS; i++)
@@ -1880,13 +2150,6 @@ DBFreeNamescheme(DBnamescheme *ns)
for (i = 0; i < ns->ncspecs; i++)
FREE(ns->exprstrs[i]);
FREE(ns->exprstrs);
- for (i = 0; i < ns->narrefs; i++)
- {
- FREE(ns->arrnames[i]);
- /*FREE(ns->arrvals[i]); user allocates these */
- }
- FREE(ns->arrnames);
- FREE(ns->arrvals);
FREE(ns);
}
@@ -1940,12 +2203,18 @@ DBAllocGroupelmap(int num_segs, DBdatatype frac_type)
case DB_LONG:
gm->segment_fracs = (void**) ALLOC_N(long*, num_segs);
break;
+ case DB_LONG_LONG:
+ gm->segment_fracs = (void**) ALLOC_N(long long*, num_segs);
+ break;
case DB_FLOAT:
gm->segment_fracs = (void**) ALLOC_N(float*, num_segs);
break;
case DB_DOUBLE:
gm->segment_fracs = (void**) ALLOC_N(double*, num_segs);
break;
+ default:
+ gm->segment_fracs = 0;
+ break;
}
if (!gm->groupel_types || ! gm->segment_lengths ||
diff --git a/src/silo/pmpio.h b/src/silo/pmpio.h
index 9fe0d2c..c5cf84d 100644
--- a/src/silo/pmpio.h
+++ b/src/silo/pmpio.h
@@ -222,8 +222,8 @@ typedef struct _PMPIO_baton_t
} PMPIO_baton_t;
-#define PMPIO_BATON_OK 0xBabeFace
-#define PMPIO_BATON_ERR 0xDeadBeef
+#define PMPIO_BATON_OK 0
+#define PMPIO_BATON_ERR 1
/*-----------------------------------------------------------------------------
* Audience: Public
diff --git a/src/silo/silo.c b/src/silo/silo.c
index 057f586..39ae500 100644
--- a/src/silo/silo.c
+++ b/src/silo/silo.c
@@ -75,7 +75,6 @@ be used for advertising or product endorsement purposes.
#include "config.h" /* For a possible redefinition of setjmp/longjmp.
Also for SDX driver detection. */
#include <stdio.h>
-#include <assert.h>
#include <float.h>
#include <math.h>
#if HAVE_STDLIB_H
@@ -132,10 +131,8 @@ int SILO_VERS_TAG = 0;
/* No lines of the form 'int Silo_version_Maj_Min_Pat = 0;' below
here indicates that this version is not backwards compatible with
any previous versions.*/
-int Silo_version_4_8_pre2;
-int Silo_version_4_8_pre3;
-int Silo_version_4_8_pre4;
-int Silo_version_4_8_pre5;
+int Silo_version_4_9 = 0;
+int Silo_version_4_9_0 = 0;
/* Symbols for error handling */
PUBLIC int DBDebugAPI = 0; /*file desc for API debug messages */
@@ -183,7 +180,8 @@ PUBLIC char *_db_err_list[] =
"--with-hdf5=<INC,LIB> option and re-compile and\n"
"re-install Silo. If you do not have an installation\n"
"of HDF5 already on your sytem, you will also need\n"
- "to obtain HDF5 from www.hdfgroup.org and install it." /* 33 */
+ "to obtain HDF5 from www.hdfgroup.org and install it.", /* 33 */
+ "Empty objects not permitted. See DBSetAllowEmptyObjects()." /* 34 */
};
PRIVATE unsigned char _db_fstatus[DB_NFILES]; /*file status */
@@ -259,6 +257,7 @@ struct _mrgt _mrgt;
SILO_Globals_t SILO_Globals = {
DBAll, /* dataReadMask */
TRUE, /* allowOverwrites */
+ FALSE, /* allowEmptyObjects */
FALSE, /* enableChecksums */
FALSE, /* enableFriendlyHDF5Names */
FALSE, /* enableGrabDriver */
@@ -318,7 +317,7 @@ db_FullyDeprecatedConvention(const char *name)
* If s is "" then we use the previous value of s.
*-------------------------------------------------------------------------*/
INTERNAL int
-db_perror(const char *s, int errorno, char *fname)
+db_perror(char const *s, int errorno, char const *fname)
{
int call_abort = 0;
static char old_s[256];
@@ -328,7 +327,8 @@ db_perror(const char *s, int errorno, char *fname)
* can read them later.
*/
db_errno = errorno;
- strncpy(db_errfunc, fname, sizeof(db_errfunc) - 1);
+ if (fname)
+ strncpy(db_errfunc, fname, sizeof(db_errfunc) - 1);
db_errfunc[sizeof(db_errfunc) - 1] = '\0';
/*
@@ -370,17 +370,23 @@ db_perror(const char *s, int errorno, char *fname)
* the indicated error handling routine.
*/
if (SILO_Globals._db_err_func) {
- int len;
- char better_s[1024];
- better_s[0]='\0';
+ int flen = 0, elen = 0, slen = 0;
+ char *better_s;
+
+ elen = strlen(db_strerror(errorno));
+ if (fname && *fname) flen = strlen(fname) + 2;
+ if (s && *s) slen = strlen(s) + 2;
+ better_s = (char *) malloc(elen + flen + slen + 1);
+
if (fname && *fname)
- snprintf(better_s, sizeof(better_s), "%s: ", fname);
- len = strlen(better_s);
- snprintf(better_s+len, sizeof(better_s)-len, "%s", db_strerror(errorno));
- len = strlen(better_s);
+ sprintf(better_s, "%s: ", fname);
+ sprintf(better_s + flen, "%s", db_strerror(errorno));
if (s && *s)
- snprintf(better_s+len, sizeof(better_s)-len, ": %s", s);
+ sprintf(better_s + flen + elen, ": %s", s);
+
SILO_Globals._db_err_func((char*)better_s);
+
+ free(better_s);
}
else {
if (fname && *fname)
@@ -813,16 +819,16 @@ db_AllocToc(void)
toc->ndir = 0;
toc->array_names = NULL;
- toc->narrays = 0;
+ toc->narray = 0;
toc->mrgtree_names = NULL;
- toc->nmrgtrees = 0;
+ toc->nmrgtree = 0;
toc->groupelmap_names = NULL;
- toc->ngroupelmaps = 0;
+ toc->ngroupelmap = 0;
toc->mrgvar_names = NULL;
- toc->nmrgvars = 0;
+ toc->nmrgvar = 0;
return(toc);
}
@@ -1039,36 +1045,36 @@ db_FreeToc(DBfile *dbfile)
}
}
- if (toc->narrays > 0) {
+ if (toc->narray > 0) {
if (toc->array_names) {
- for (i = 0; i < toc->narrays; i++) {
+ for (i = 0; i < toc->narray; i++) {
FREE(toc->array_names[i]);
}
FREE(toc->array_names);
}
}
- if (toc->nmrgtrees > 0) {
+ if (toc->nmrgtree > 0) {
if (toc->mrgtree_names) {
- for (i = 0; i < toc->nmrgtrees; i++) {
+ for (i = 0; i < toc->nmrgtree; i++) {
FREE(toc->mrgtree_names[i]);
}
FREE(toc->mrgtree_names);
}
}
- if (toc->ngroupelmaps > 0) {
+ if (toc->ngroupelmap > 0) {
if (toc->groupelmap_names) {
- for (i = 0; i < toc->ngroupelmaps; i++) {
+ for (i = 0; i < toc->ngroupelmap; i++) {
FREE(toc->groupelmap_names[i]);
}
FREE(toc->groupelmap_names);
}
}
- if (toc->nmrgvars > 0) {
+ if (toc->nmrgvar > 0) {
if (toc->mrgvar_names) {
- for (i = 0; i < toc->nmrgvars; i++) {
+ for (i = 0; i < toc->nmrgvar; i++) {
FREE(toc->mrgvar_names[i]);
}
FREE(toc->mrgvar_names);
@@ -1249,8 +1255,8 @@ db_GetDatatypeID(char *dataname)
* Jeremy Meredith, Sept 18 1998
* Added multi-block material species.
*--------------------------------------------------------------------*/
-INTERNAL int
-DBGetObjtypeTag(char *typename)
+PUBLIC int
+DBGetObjtypeTag(char const *typename)
{
int tag;
char *me = "DBGetObjtypeTag";
@@ -1258,6 +1264,9 @@ DBGetObjtypeTag(char *typename)
if (!typename || !*typename)
return db_perror("type name", E_BADARGS, me);
+ if (typename[0] == 'D' && typename[1] == 'B')
+ typename += 2;
+
if (STR_EQUAL(typename, "multiblockmesh") ||
STR_EQUAL(typename, "multimesh"))
tag = DB_MULTIMESH;
@@ -1500,12 +1509,14 @@ db_ListDir2(DBfile *_dbfile, char *args[], int nargs, int build_list,
char opts[256], cwd[256], orig_dir[256], *paths[64];
DBtoc *toc = NULL;
int left_margin, col_margin, line_width;
- char *me = "db_pdb_ListDir2";
+ char *me = "db_ListDir2";
/*----------------------------------------
* Parse input options and pathnames.
*----------------------------------------*/
+ if (!list || !nlist) return -1;
+
npaths = 0;
nopts = 0;
@@ -1620,6 +1631,8 @@ db_ListDir2(DBfile *_dbfile, char *args[], int nargs, int build_list,
DBSetDir(_dbfile, paths[k]);
toc = DBGetToc(_dbfile);
+ if (!toc)
+ return db_perror("unable to get toc", E_INTERNAL, me);
if (ls_curve && toc->ncurve > 0) {
if (build_list) {
@@ -1690,9 +1703,9 @@ db_ListDir2(DBfile *_dbfile, char *args[], int nargs, int build_list,
}
}
- if (ls_array && toc->narrays > 0) {
+ if (ls_array && toc->narray > 0) {
if (build_list) {
- for (i = 0; i < toc->narrays; i++) {
+ for (i = 0; i < toc->narray; i++) {
list[*nlist] = ALLOC_N(char,
strlen (toc->array_names[i]) + 1);
@@ -1700,8 +1713,8 @@ db_ListDir2(DBfile *_dbfile, char *args[], int nargs, int build_list,
}
}
else {
- printf("%7d compound arrays:\n", toc->narrays);
- _DBstrprint(stdout, toc->array_names, toc->narrays,
+ printf("%7d compound arrays:\n", toc->narray);
+ _DBstrprint(stdout, toc->array_names, toc->narray,
'c', left_margin, col_margin, line_width);
printf("\n");
}
@@ -1946,7 +1959,7 @@ db_ListDir2(DBfile *_dbfile, char *args[], int nargs, int build_list,
* Modifications:
*-------------------------------------------------------------------------*/
INTERNAL context_t *
-context_switch(DBfile *dbfile, char *name, char **base)
+context_switch(DBfile *dbfile, char const *name, char const **base)
{
char *me = "context_switch";
char s[256], *b;
@@ -2215,7 +2228,7 @@ db_unregister_file(DBfile *dbfile)
{
int j;
_db_regstatus[i].f = 0;
- for (j = i; (_db_regstatus[j+1].f != 0) && (j < DB_NFILES-1); j++)
+ for (j = i; (j < DB_NFILES-1) && (_db_regstatus[j+1].f != 0); j++)
{
_db_regstatus[j].f = _db_regstatus[j+1].f;
_db_regstatus[j].n = _db_regstatus[j+1].n;
@@ -2260,6 +2273,30 @@ db_isregistered_file(DBfile *dbfile, const db_silo_stat_t *filestate)
return -1;
}
+INTERNAL int
+db_num_registered_files()
+{
+ int i;
+ int cnt = 0;
+ for (i = 0; i < DB_NFILES; i++)
+ {
+ if (_db_regstatus[i].f) cnt++;
+ }
+ return cnt;
+}
+
+/*-------------------------------------------------------------------------
+ * Function: db_silo_stat_one_file
+ *
+ * Purpose: Better stat method for silo taking into account stat/stat64
+ * as well as windows-specific notion of an 'inode'.
+ *
+ * Programmer: Mark C. Miller
+ *
+ * Modifications:
+ * Adjusted the windows-specific logic to obtain fileindex information so
+ * that if that work fails, it still returns stat retval and errno of stat.
+ *-------------------------------------------------------------------------*/
PRIVATE int
db_silo_stat_one_file(const char *name, db_silo_stat_t *statbuf)
{
@@ -2277,6 +2314,7 @@ db_silo_stat_one_file(const char *name, db_silo_stat_t *statbuf)
if (retval == 0)
{
/* this logic was copied by and large from HDF5 sec2 VFD */
+ int errnotmp = errno;
int fd = open(name, O_RDONLY);
if (fd != -1)
{
@@ -2285,15 +2323,8 @@ db_silo_stat_one_file(const char *name, db_silo_stat_t *statbuf)
statbuf->fileindexhi = fileinfo.nFileIndexHigh;
statbuf->fileindexlo = fileinfo.nFileIndexLow;
close(fd);
- errno = 0;
- retval = 0;
- }
- else
- {
- retval = -1;
- if (errno == 0)
- errno = ENOENT;
}
+ errno = errnotmp;
}
#endif /* #ifdef _WIN32 */
@@ -2474,14 +2505,14 @@ db_filter_install ( DBfile *dbfile )
* database variable.
*/
if (i >= DB_NFILTERS) {
+ int q = 0;
len = strlen(not_found);
- if (not_found[0] && len + 1 < sizeof(not_found)) {
- strcpy(not_found + len, ";");
+ if (len && len + 1 < sizeof(not_found)) {
+ strcat(not_found, ";");
len++;
}
- strncpy(not_found + len, filter_name,
- MAX(0, (int)sizeof(not_found) - len - 1));
- len += MAX(0, (int)sizeof(not_found) - len - 1);
+ while (len + 1 < sizeof(not_found))
+ not_found[len++] = filter_name[q++];
not_found[len] = '\0';
continue;
}
@@ -2695,6 +2726,30 @@ DBGetAllowOverwrites()
}
/*----------------------------------------------------------------------
+ * Routine: DBSetAllowEmptyObjects
+ *
+ * Purpose: Set and return the allow empty objects flags
+ *
+ * Programmer: Mark C. Miller, January 9, 2013
+ *
+ * Description: This routine sets the flag that controls whether
+ * empty objects are allowed. By default, they are not.
+ *--------------------------------------------------------------------*/
+PUBLIC int
+DBSetAllowEmptyObjects(int allow)
+{
+ int oldAllow = SILO_Globals.allowEmptyObjects;
+ SILO_Globals.allowEmptyObjects = allow;
+ return oldAllow;
+}
+
+PUBLIC int
+DBGetAllowEmptyObjects()
+{
+ return SILO_Globals.allowEmptyObjects;
+}
+
+/*----------------------------------------------------------------------
* Routine: DBSetEnableChecksums
*
* Purpose: Set and return the enable checksums flags
@@ -2824,6 +2879,8 @@ db_guess_has_friendly_HDF5_names_r(DBfile *f)
toc = DBGetToc(f);
+ if (!toc) return 0;
+
CHECK_FOR_FRIENDLY(multimesh, "meshnames");
CHECK_FOR_FRIENDLY(multivar, "varnames");
CHECK_FOR_FRIENDLY(multimat, "matnames");
@@ -3075,11 +3132,15 @@ DBGetDriverType(const DBfile *file)
*
* Mark C. Miller, Mon Nov 19 10:45:05 PST 2007
* Removed conditional compilation on HDF5 driver
+ *
+ * Mark C. Miller, Mon Oct 25 16:12:49 PDT 2010
+ * Initialize buf to ensure it will be null terminated no matter
+ * what happens during open/read.
*--------------------------------------------------------------------*/
PUBLIC int
DBGetDriverTypeFromPath(const char *path)
{
- char buf[8];
+ char buf[9] = {'\0','\0','\0','\0','\0','\0','\0','\0','\0'};
int fd;
int nbytes;
int flags = O_RDONLY;
@@ -3089,10 +3150,12 @@ DBGetDriverTypeFromPath(const char *path)
}
if ((nbytes = read(fd, (char *)buf, 8)) == -1) {
printf("cannot read `%s'\n", path);
+ close(fd);
return -1;
}
if (nbytes <= 5) {
printf("cannot read `%s' buffer too small\n", path);
+ close(fd);
return -1;
}
(void) close(fd);
@@ -3572,9 +3635,13 @@ DBAddStrComponent(DBobject *object, const char *compname, const char *ss)
API_ERROR("object ncomponents", E_BADARGS);
}
if (!ss)
- API_ERROR("string literal component", E_BADARGS);
-
- sprintf(tmp, "'<s>%s'", ss);
+ {
+ if (!SILO_Globals.allowEmptyObjects)
+ API_ERROR("string literal component", E_BADARGS);
+ sprintf(tmp, "'<s>null'", ss);
+ }
+ else
+ sprintf(tmp, "'<s>%s'", ss);
if (NULL == (object->comp_names[object->ncomponents] =
STRDUP(compname)) ||
@@ -3827,7 +3894,7 @@ DBVersionGE(int Maj, int Min, int Pat)
* Programmer: Mark C. Miller, Mon Jan 12 20:59:30 PST 2009
*-------------------------------------------------------------------------*/
PUBLIC char *
-DBFileVersion(DBfile *dbfile)
+DBFileVersion(const DBfile *dbfile)
{
static char version[256];
if (dbfile->pub.file_lib_version)
@@ -3851,7 +3918,7 @@ DBFileVersion(DBfile *dbfile)
* Programmer: Mark C. Miller, Mon Jan 12 20:59:30 PST 2009
*-------------------------------------------------------------------------*/
PUBLIC int
-DBFileVersionGE(DBfile *dbfile, int Maj, int Min, int Pat)
+DBFileVersionGE(const DBfile *dbfile, int Maj, int Min, int Pat)
{
int retval = -1;
int fileMaj = -1, fileMin = -1, filePat = -1;
@@ -3875,7 +3942,8 @@ DBFileVersionGE(DBfile *dbfile, int Maj, int Min, int Pat)
errno = 0;
token = strtok(version, ".");
- val = strtol(token, 0, 10);
+ if (token)
+ val = strtol(token, 0, 10);
if (token != 0 && val != 0 && errno == 0)
{
fileMaj = val;
@@ -4189,11 +4257,16 @@ DBOpenReal(const char *name, int type, int mode)
* Mark C. Miller, Fri Feb 12 08:22:41 PST 2010
* Replaced stat/stat64 calls with db_silo_stat. Replaced conditional
* compilation logic for SIZEOF_OFF64_T with db_silo_stat_struct.
+ *
+ * Mark C. Miller, Thu Aug 30 17:41:24 PDT 2012
+ * Added logic to temporarily disable any compression settings prior
+ * to writing silo library info and then re-enabling it.
*-------------------------------------------------------------------------*/
PUBLIC DBfile *
DBCreateReal(const char *name, int mode, int target, const char *info, int type)
{
char ascii[16];
+ char *tmpcs = 0;
DBfile *dbfile;
int fileid, i, n;
int origtype = type;
@@ -4269,9 +4342,24 @@ DBCreateReal(const char *name, int mode, int target, const char *info, int type)
db_filter_install(dbfile);
/* write silo library version information to the file */
+ /* Temporarily turn off any compression settings and then re-enable */
+ if (DBGetCompression())
+ {
+
+ n = strlen(DBGetCompression());
+ tmpcs = ALLOC_N(char,n+1);
+ strncpy(tmpcs, DBGetCompression(), n);
+ tmpcs[n] = '\0';
+ DBSetCompression(0);
+ }
n = strlen(SILO_VSTRING)+1;
DBWrite(dbfile, SILO_VSTRING_NAME, SILO_VSTRING, &n, 1, DB_CHAR);
dbfile->pub.file_lib_version = STRDUP(SILO_VSTRING);
+ if (tmpcs)
+ {
+ DBSetCompression(tmpcs);
+ FREE(tmpcs);
+ }
API_RETURN(dbfile);
}
@@ -4369,8 +4457,8 @@ db_inq_file_has_silo_objects_r(DBfile *f)
toc->nmultimat + toc->nmultimatspecies + toc->nqmesh +
toc->nqvar + toc->nucdmesh + toc->nucdvar + toc->nptmesh +
toc->nptvar + toc->nmat + toc->nmatspecies +
- toc->nobj + toc->nmrgtrees + toc->ngroupelmaps +
- toc->nmrgvars + toc->narrays;
+ toc->nobj + toc->nmrgtree + toc->ngroupelmap +
+ toc->nmrgvar + toc->narray;
/* Recurse on directories. */
for (i = 0; i < ndir && retval == 0; i++)
@@ -4596,7 +4684,7 @@ DBInqVarExists(DBfile *dbfile, const char *varname)
if (dbfile->pub.exist == NULL)
API_ERROR(dbfile->pub.name, E_NOTIMP);
- retval = (dbfile->pub.exist) (dbfile, (char *)varname);
+ retval = (dbfile->pub.exist) (dbfile, varname);
API_RETURN(retval);
}
API_END_NOPOP; /* BEWARE: If API_RETURN above is removed use API_END */
@@ -4967,7 +5055,7 @@ DBGetToc(DBfile *dbfile)
* Changed to API_BEGIN2 to help detect attempted ops on closed files.
*-------------------------------------------------------------------------*/
PUBLIC DBObjectType
-DBInqVarType(DBfile *dbfile, const char *varname)
+DBInqVarType(DBfile *dbfile, char const *varname)
{
DBObjectType retval;
@@ -4981,7 +5069,7 @@ DBInqVarType(DBfile *dbfile, const char *varname)
if (!dbfile->pub.inqvartype)
API_ERROR(dbfile->pub.name, E_NOTIMP);
- retval = (dbfile->pub.inqvartype) (dbfile, (char *)varname);
+ retval = (dbfile->pub.inqvartype) (dbfile, varname);
API_RETURN(retval);
}
API_END_NOPOP; /*BEWARE: If API_RETURN above is removed use API_END */
@@ -5121,7 +5209,7 @@ DBGetAtt(DBfile *dbfile, const char *varname, const char *attname)
* Changed to API_BEGIN2 to help detect attempted ops on closed files.
*--------------------------------------------------------------------*/
PUBLIC void *
-DBGetComponent(DBfile *dbfile, const char *objname, const char *compname)
+DBGetComponent(DBfile *dbfile, char const *objname, char const *compname)
{
void *retval = NULL;
@@ -5137,8 +5225,7 @@ DBGetComponent(DBfile *dbfile, const char *objname, const char *compname)
if (!dbfile->pub.g_comp)
API_ERROR(dbfile->pub.name, E_NOTIMP);
- retval = (dbfile->pub.g_comp) (dbfile, (char *)objname,
- (char *)compname);
+ retval = (dbfile->pub.g_comp) (dbfile, objname, compname);
API_RETURN(retval);
}
API_END_NOPOP; /*BEWARE: If API_RETURN above is removed use API_END */
@@ -5168,7 +5255,7 @@ DBGetComponent(DBfile *dbfile, const char *objname, const char *compname)
*--------------------------------------------------------------------*/
PUBLIC int
-DBGetComponentType(DBfile *dbfile, const char *objname, const char *compname)
+DBGetComponentType(DBfile *dbfile, char const *objname, char const *compname)
{
int retval = DB_NOTYPE;
@@ -5184,8 +5271,7 @@ DBGetComponentType(DBfile *dbfile, const char *objname, const char *compname)
if (!dbfile->pub.g_comptyp)
API_ERROR(dbfile->pub.name, E_NOTIMP);
- retval = (dbfile->pub.g_comptyp) (dbfile, (char *)objname,
- (char *)compname);
+ retval = (dbfile->pub.g_comptyp) (dbfile, objname, compname);
API_RETURN(retval);
}
API_END_NOPOP; /*BEWARE: If API_RETURN above is removed use API_END */
@@ -5550,7 +5636,7 @@ DBCpDir(DBfile *dbfile, const char *srcDir,
* Changed to API_BEGIN2 to help detect attempted ops on closed files.
*-------------------------------------------------------------------------*/
PUBLIC int
-DBChangeObject (DBfile *dbfile, DBobject *obj)
+DBChangeObject (DBfile *dbfile, DBobject const *obj)
{
int retval;
@@ -5602,7 +5688,7 @@ DBChangeObject (DBfile *dbfile, DBobject *obj)
* Changed to API_BEGIN2 to help detect attempted ops on closed files.
*-------------------------------------------------------------------------*/
PUBLIC int
-DBWriteObject(DBfile *dbfile, DBobject *obj, int freemem)
+DBWriteObject(DBfile *dbfile, DBobject const *obj, int freemem)
{
int retval;
@@ -5649,7 +5735,7 @@ DBWriteObject(DBfile *dbfile, DBobject *obj, int freemem)
* Changed to API_BEGIN2 to help detect attempted ops on closed files.
*-------------------------------------------------------------------------*/
PUBLIC DBobject *
-DBGetObject (DBfile *dbfile, const char *objname)
+DBGetObject (DBfile *dbfile, char const *objname)
{
DBobject *retval = NULL;
@@ -5663,7 +5749,7 @@ DBGetObject (DBfile *dbfile, const char *objname)
API_ERROR("object name", E_BADARGS);
if (!dbfile->pub.g_obj)
API_ERROR(dbfile->pub.name, E_NOTIMP);
- retval = (dbfile->pub.g_obj) (dbfile, (char *)objname);
+ retval = (dbfile->pub.g_obj) (dbfile, (char const *)objname);
API_RETURN(retval);
}
API_END_NOPOP; /* BEWARE: If API_RETURN above is
@@ -5706,9 +5792,9 @@ DBGetObject (DBfile *dbfile, const char *objname)
* Changed to API_BEGIN2 to help detect attempted ops on closed files.
*-------------------------------------------------------------------------*/
PUBLIC int
-DBWriteComponent(DBfile *dbfile, DBobject *obj, const char *comp_name,
- const char *prefix, const char *datatype, const void *var, int nd,
- long *count)
+DBWriteComponent(DBfile *dbfile, DBobject *obj, char const *comp_name,
+ char const *prefix, char const *datatype, void const *var, int nd,
+ long const *count)
{
int retval;
int nvals, i;
@@ -5720,6 +5806,14 @@ DBWriteComponent(DBfile *dbfile, DBobject *obj, const char *comp_name,
API_ERROR("DBWriteComponent", E_GRABBED) ;
if (!obj)
API_ERROR("object pointer", E_BADARGS);
+ if (SILO_Globals.allowEmptyObjects)
+ {
+ if (!var) API_RETURN(0);
+ if (!count) API_RETURN(0);
+ for(nvals=1,i=0;i<nd;i++)
+ nvals *= count[i];
+ if (!nvals) API_RETURN(0);
+ }
if (!comp_name || !*comp_name)
API_ERROR("component name", E_BADARGS);
if (db_VariableNameValid((char *)comp_name) == 0)
@@ -5751,9 +5845,8 @@ DBWriteComponent(DBfile *dbfile, DBobject *obj, const char *comp_name,
if (!dbfile->pub.w_comp)
API_ERROR(dbfile->pub.name, E_NOTIMP);
- retval = (dbfile->pub.w_comp) (dbfile, obj, (char *)comp_name,
- (char *)prefix, (char *)datatype, var,
- nd, count);
+ retval = (dbfile->pub.w_comp) (dbfile, obj, comp_name, prefix,
+ datatype, var, nd, count);
db_FreeToc(dbfile);
API_RETURN(retval);
}
@@ -5792,8 +5885,8 @@ DBWriteComponent(DBfile *dbfile, DBobject *obj, const char *comp_name,
* Allow special variable names in the magic /.silo dir for HDF5 files.
*-------------------------------------------------------------------------*/
PUBLIC int
-DBWrite(DBfile *dbfile, const char *vname, void *var, int *dims, int ndims,
- int datatype)
+DBWrite(DBfile *dbfile, char const *vname, void const *var, int const *dims,
+ int ndims, int datatype)
{
int retval;
int nvals, i;
@@ -5825,7 +5918,7 @@ DBWrite(DBfile *dbfile, const char *vname, void *var, int *dims, int ndims,
if (!dbfile->pub.write)
API_ERROR(dbfile->pub.name, E_NOTIMP);
- retval = (dbfile->pub.write) (dbfile, (char *)vname, var, dims,
+ retval = (dbfile->pub.write) (dbfile, vname, var, dims,
ndims, datatype);
db_FreeToc(dbfile);
API_RETURN(retval);
@@ -6697,7 +6790,12 @@ DBAnnotateUcdmesh(DBucdmesh *m)
if ((z=m->zones) != NULL)
if (z->shapetype == NULL)
{
- int N;
+ int N, dims;
+
+ if (m->topo_dim == 0 || m->topo_dim == 1 || m->topo_dim == 2)
+ dims = m->topo_dim;
+ else
+ dims = z->ndims;
N = z->nshapes;
if ((z->shapetype=(int *)malloc(N*sizeof(int))) != NULL)
@@ -6708,7 +6806,7 @@ DBAnnotateUcdmesh(DBucdmesh *m)
{
int i;
- switch (z->ndims)
+ switch (dims)
{
case 1: for (i=0; i<N; ++i)
z->shapetype[i] = DB_ZONETYPE_BEAM;
@@ -7541,13 +7639,48 @@ DBPutCurve (DBfile *dbfile, const char *name, void *xvals, void *yvals,
API_ERROR("curve name", E_INVALIDNAME);
if (!SILO_Globals.allowOverwrites && DBInqVarExists(dbfile, name))
API_ERROR("overwrite not allowed", E_NOOVERWRITE);
- if (npts <= 0)
+ if (npts < 0)
API_ERROR("number of values", E_BADARGS);
+ if (npts)
+ {
+ if (DBGetOption(opts, DBOPT_REFERENCE))
+ {
+ if (yvals || xvals)
+ API_ERROR("xvals & yvals must be null when using DBOPT_REFERENCE", E_BADARGS);
+ }
+ else
+ {
+ if (!xvals && !DBGetOption(opts, DBOPT_XVARNAME))
+ API_ERROR("xvals==0 || DBOPT_XVARNAME", E_BADARGS);
+ if (xvals && DBGetOption(opts, DBOPT_XVARNAME))
+ API_ERROR("xvals!=0 && DBOPT_XVARNAME", E_BADARGS);
+ if (!yvals && !DBGetOption(opts, DBOPT_YVARNAME))
+ API_ERROR("yvals==0 || DBOPT_YVARNAME", E_BADARGS);
+ if (yvals && DBGetOption(opts, DBOPT_YVARNAME))
+ API_ERROR("yvals!=0 && DBOPT_YVARNAME", E_BADARGS);
+ }
+ }
+ else if (!SILO_Globals.allowEmptyObjects &&
+ !DBGetOption(opts, DBOPT_REFERENCE))
+ {
+ /* this is an empty object but we don't know if it was intentional */
+ API_ERROR("npts==0", E_EMPTYOBJECT);
+ }
+ else
+ {
+ /* this is an intentionally empty object */
+ npts = 0;
+ xvals = 0;
+ yvals = 0;
+ datatype = DB_FLOAT;
+ }
+
if (NULL == dbfile->pub.p_cu)
API_ERROR(dbfile->pub.name, E_NOTIMP);
retval = (dbfile->pub.p_cu) (dbfile, (char *)name, xvals, yvals,
datatype, npts, opts);
+
db_FreeToc(dbfile);
API_RETURN(retval);
}
@@ -7659,18 +7792,43 @@ DBPutFacelist(DBfile *dbfile, const char *name, int nfaces, int ndims,
API_ERROR("ndims", E_BADARGS);
if (lnodelist < 0)
API_ERROR("lnodelist", E_BADARGS);
- if (!nodelist && lnodelist)
- API_ERROR("nodelist", E_BADARGS);
- if (origin != 0 && origin != 1)
- API_ERROR("origin", E_BADARGS);
if (nshapes < 0)
API_ERROR("nshapes", E_BADARGS);
- if (!shapesize && nshapes)
- API_ERROR("shapesize", E_BADARGS);
- if (!shapecnt && nshapes)
- API_ERROR("shapecnt", E_BADARGS);
if (ntypes < 0)
API_ERROR("ntypes", E_BADARGS);
+ if (nfaces && ndims && lnodelist && nshapes)
+ {
+ if (!nodelist)
+ API_ERROR("nodelist", E_BADARGS);
+ if (!shapesize)
+ API_ERROR("shapesize", E_BADARGS);
+ if (!shapecnt)
+ API_ERROR("shapecnt", E_BADARGS);
+ }
+ else if (!SILO_Globals.allowEmptyObjects)
+ {
+ /* this is an empty object but we don't know if it was intentional */
+ API_ERROR("nfaces==0 || ndims==0 || lnodelist==0 || nshapes==0", E_EMPTYOBJECT);
+ }
+ else
+ {
+ /* this is an intentionally empty object */
+ nfaces = 0;
+ ndims = 0;
+ nodelist = 0;
+ lnodelist = 0;
+ origin = 0; /* HDF5 driver needs something non-zero */
+ zoneno = 0;
+ shapesize = 0;
+ shapecnt = 0;
+ nshapes = 0;
+ types = 0;
+ typelist = 0;
+ ntypes = 0;
+ }
+ if (origin != 0 && origin != 1)
+ API_ERROR("origin", E_BADARGS);
+
if (!dbfile->pub.p_fl)
API_ERROR(dbfile->pub.name, E_NOTIMP);
@@ -7736,32 +7894,50 @@ DBPutMaterial(DBfile *dbfile, const char *name, const char *meshname, int nmat,
API_ERROR("material name", E_INVALIDNAME);
if (!SILO_Globals.allowOverwrites && DBInqVarExists(dbfile, name))
API_ERROR("overwrite not allowed", E_NOOVERWRITE);
- if (!meshname || !*meshname)
- API_ERROR("mesh name", E_BADARGS);
- if (db_VariableNameValid((char *)meshname) == 0)
- API_ERROR("mesh name", E_INVALIDNAME);
if (nmat < 0)
- API_ERROR("nmat", E_BADARGS);
- if (!matnos && nmat)
- API_ERROR("matnos", E_BADARGS);
- if (ndims <= 0)
- API_ERROR("ndims", E_BADARGS);
- if (!dims)
- API_ERROR("dims", E_BADARGS);
- if (!matlist)
- API_ERROR("matlist", E_BADARGS);
+ API_ERROR("nmat<0", E_BADARGS);
+ if (ndims < 0)
+ API_ERROR("ndims<0", E_BADARGS);
+ if (nmat && ndims)
+ {
+ int i;
+ for (i = 0; i < ndims && dims; i++)
+ if (dims[i] == 0) dims = 0;
+ if (!matnos) API_ERROR("matnos==0", E_BADARGS);
+ if (!dims) API_ERROR("dims==0 || dims[i]==0", E_BADARGS);
+ if (!matlist) API_ERROR("matlist==0", E_BADARGS);
+ if (!meshname || !*meshname) API_ERROR("mesh name", E_BADARGS);
+ if (!db_VariableNameValid((char *)meshname)) API_ERROR("meshname", E_INVALIDNAME);
+ }
+ else if (!SILO_Globals.allowEmptyObjects)
+ {
+ API_ERROR("nmat==0 || ndims==0", E_EMPTYOBJECT);
+ }
+ else
+ {
+ /* this is an intentionally empty object */
+ nmat = 0;
+ matnos = 0;
+ matlist = 0;
+ dims = 0;
+ ndims = 0;
+ mix_next = 0;
+ mix_mat = 0;
+ mix_zone = 0;
+ mixlen = 0;
+ datatype = DB_FLOAT;
+ }
if (mixlen < 0)
- API_ERROR("mixlen", E_BADARGS);
+ API_ERROR("mixlen<0", E_BADARGS);
if (!mix_next && mixlen)
- API_ERROR("mix_next", E_BADARGS);
+ API_ERROR("mix_next==0", E_BADARGS);
if (!mix_mat && mixlen)
- API_ERROR("mix_mat", E_BADARGS);
+ API_ERROR("mix_mat==0", E_BADARGS);
if (!mix_vf && mixlen)
- API_ERROR("mix_vf", E_BADARGS);
+ API_ERROR("mix_vf==0", E_BADARGS);
if (!dbfile->pub.p_ma)
API_ERROR(dbfile->pub.name, E_NOTIMP);
-
retval = (dbfile->pub.p_ma) (dbfile, (char *)name, (char *)meshname,
nmat, matnos, matlist, dims, ndims,
mix_next, mix_mat, mix_zone, mix_vf,
@@ -7840,27 +8016,45 @@ DBPutMatspecies(DBfile *dbfile, const char *name, const char *matname,
if (db_VariableNameValid((char *)matname) == 0)
API_ERROR("material name", E_INVALIDNAME);
if (nmat < 0)
- API_ERROR("nmat", E_BADARGS);
- if (!nmatspec)
- API_ERROR("nmatspec", E_BADARGS);
- if (!speclist)
- API_ERROR("speclist", E_BADARGS);
- if (ndims <= 0 || ndims > 3)
- API_ERROR("ndims", E_BADARGS);
- if (!dims)
- API_ERROR("dims", E_BADARGS);
+ API_ERROR("nmat<0", E_BADARGS);
+ if (ndims < 0)
+ API_ERROR("ndims<0", E_BADARGS);
if (nspecies_mf < 0)
- API_ERROR("nspecies_mf", E_BADARGS);
- if (!species_mf && nspecies_mf)
- API_ERROR("species_mf", E_BADARGS);
+ API_ERROR("nspecies_mf<0", E_BADARGS);
+ if (nmat && ndims && nspecies_mf)
+ {
+ int i;
+ for (i = 0; i < ndims && dims; i++)
+ if (!dims[i]) dims = 0;
+ if (!nmatspec) API_ERROR("nmatspec==0", E_BADARGS);
+ if (!speclist) API_ERROR("speclist==0", E_BADARGS);
+ if (!dims) API_ERROR("dims==0 || dims[i]==0", E_BADARGS);
+ if (!species_mf) API_ERROR("species_mf==0", E_BADARGS);
+ }
+ else if (!SILO_Globals.allowEmptyObjects)
+ {
+ API_ERROR("nmat==0 || ndims==0 || nspecies_mf==0", E_EMPTYOBJECT);
+ }
+ else
+ {
+ /* this is an intentionally empty object */
+ nmat = 0;
+ nmatspec = 0;
+ speclist = 0;
+ dims = 0;
+ ndims = 0;
+ nspecies_mf = 0;
+ species_mf = 0;
+ mix_speclist = 0;
+ mixlen = 0;
+ datatype = DB_FLOAT;
+ }
if (mixlen < 0)
API_ERROR("mixlen", E_BADARGS);
if (!mix_speclist && mixlen)
API_ERROR("mix_speclist", E_BADARGS);
if (!dbfile->pub.p_ms)
API_ERROR(dbfile->pub.name, E_NOTIMP);
-
-
retval = (dbfile->pub.p_ms) (dbfile, (char *)name, (char *)matname,
nmat, nmatspec, speclist, dims, ndims,
nspecies_mf, species_mf, mix_speclist,
@@ -7903,8 +8097,8 @@ DBPutMatspecies(DBfile *dbfile, const char *name, const char *matname,
* adjusting sanity checks for args as some can be null now.
*-------------------------------------------------------------------------*/
PUBLIC int
-DBPutMultimesh(DBfile *dbfile, const char *name, int nmesh,
- char **meshnames, int meshtypes[], DBoptlist *optlist)
+DBPutMultimesh(DBfile *dbfile, char DB_CONSTARR1 name, int nmesh,
+ char DB_CONSTARR2 meshnames, int DB_CONSTARR1 meshtypes, DBoptlist const *optlist)
{
int retval;
@@ -7922,8 +8116,8 @@ DBPutMultimesh(DBfile *dbfile, const char *name, int nmesh,
if (nmesh < 0)
API_ERROR("nmesh", E_BADARGS);
if (!meshnames && nmesh && (!optlist ||
- !DBGetOption(optlist, DBOPT_MB_FILE_NS) ||
- !DBGetOption(optlist, DBOPT_MB_BLOCK_NS)))
+ (!DBGetOption(optlist, DBOPT_MB_FILE_NS) &&
+ !DBGetOption(optlist, DBOPT_MB_BLOCK_NS))))
API_ERROR("mesh names", E_BADARGS);
if (!meshtypes && nmesh && (!optlist ||
!DBGetOption(optlist, DBOPT_MB_BLOCK_TYPE)))
@@ -7957,12 +8151,12 @@ DBPutMultimesh(DBfile *dbfile, const char *name, int nmesh,
*
*-------------------------------------------------------------------------*/
PUBLIC int
-DBPutMultimeshadj(DBfile *dbfile, const char *name, int nmesh,
- const int *meshtypes, const int *nneighbors,
- const int *neighbors, const int *back,
- const int *lnodelists, int *nodelists[],
- const int *lzonelists, int *zonelists[],
- DBoptlist *optlist)
+DBPutMultimeshadj(DBfile *dbfile, char DB_CONSTARR1 name, int nmesh,
+ int DB_CONSTARR1 meshtypes, int DB_CONSTARR1 nneighbors,
+ int DB_CONSTARR1 neighbors, int DB_CONSTARR1 back,
+ int DB_CONSTARR1 lnodelists, int DB_CONSTARR2 nodelists,
+ int DB_CONSTARR1 lzonelists, int DB_CONSTARR2 zonelists,
+ DBoptlist const *optlist)
{
int retval;
@@ -8049,8 +8243,8 @@ DBPutMultivar(DBfile *dbfile, const char *name, int nvar,
if (nvar < 0)
API_ERROR("nvar", E_BADARGS);
if (!varnames && nvar && (!optlist ||
- !DBGetOption(optlist, DBOPT_MB_FILE_NS) ||
- !DBGetOption(optlist, DBOPT_MB_BLOCK_NS)))
+ (!DBGetOption(optlist, DBOPT_MB_FILE_NS) &&
+ !DBGetOption(optlist, DBOPT_MB_BLOCK_NS))))
API_ERROR("varnames", E_BADARGS);
if (!vartypes && nvar && (!optlist ||
!DBGetOption(optlist, DBOPT_MB_BLOCK_TYPE)))
@@ -8112,8 +8306,8 @@ DBPutMultimat(DBfile *dbfile, const char *name, int nmats,
if (nmats < 0)
API_ERROR("nmats", E_BADARGS);
if (!matnames && nmats && (!optlist ||
- !DBGetOption(optlist, DBOPT_MB_FILE_NS) ||
- !DBGetOption(optlist, DBOPT_MB_BLOCK_NS)))
+ (!DBGetOption(optlist, DBOPT_MB_FILE_NS) &&
+ !DBGetOption(optlist, DBOPT_MB_BLOCK_NS))))
API_ERROR("material-names", E_BADARGS);
if (!dbfile->pub.p_mt)
API_ERROR(dbfile->pub.name, E_NOTIMP);
@@ -8172,8 +8366,8 @@ DBPutMultimatspecies(DBfile *dbfile, const char *name, int nspec,
if (nspec < 0)
API_ERROR("nspec", E_BADARGS);
if (!specnames && nspec && (!optlist ||
- !DBGetOption(optlist, DBOPT_MB_FILE_NS) ||
- !DBGetOption(optlist, DBOPT_MB_BLOCK_NS)))
+ (!DBGetOption(optlist, DBOPT_MB_FILE_NS) &&
+ !DBGetOption(optlist, DBOPT_MB_BLOCK_NS))))
API_ERROR("species-names", E_BADARGS);
if (!dbfile->pub.p_mms)
API_ERROR(dbfile->pub.name, E_NOTIMP);
@@ -8229,12 +8423,29 @@ DBPutPointmesh(DBfile *dbfile, const char *name, int ndims, DB_DTPTR2 coords,
API_ERROR("pointmesh name", E_INVALIDNAME);
if (!SILO_Globals.allowOverwrites && DBInqVarExists(dbfile, name))
API_ERROR("overwrite not allowed", E_NOOVERWRITE);
- if (ndims <= 0 || ndims > 3)
- API_ERROR("ndims", E_BADARGS);
- if (!coords && ndims)
- API_ERROR("coords", E_BADARGS);
- if (nels <= 0)
- API_ERROR("nels", E_BADARGS);
+ if (nels < 0)
+ API_ERROR("nels<0", E_BADARGS);
+ if (nels > 0)
+ {
+ int i;
+ void **coords2 = (void**) coords;
+ if (ndims < 1 || ndims > 3)
+ API_ERROR("ndims < 1 || ndims > 3", E_BADARGS);
+ for (i = 0; i < ndims && coords; i++)
+ if (coords2[i] == 0) coords = 0;
+ if (!coords)
+ API_ERROR("coords==0 || coords[i]==0 for some i", E_BADARGS);
+ }
+ else if (!SILO_Globals.allowEmptyObjects)
+ {
+ API_ERROR("nels==0", E_EMPTYOBJECT);
+ }
+ else
+ {
+ ndims = 0;
+ coords = 0;
+ datatype = DB_FLOAT;
+ }
if (!dbfile->pub.p_pm)
API_ERROR(dbfile->pub.name, E_NOTIMP);
@@ -8293,16 +8504,32 @@ DBPutPointvar(DBfile *dbfile, const char *vname, const char *mname, int nvars,
API_ERROR("pointmesh name", E_BADARGS);
if (db_VariableNameValid((char *)mname) == 0)
API_ERROR("pointmesh name", E_INVALIDNAME);
- if (nvars <= 0)
- API_ERROR("nvars", E_BADARGS);
- if (!vars && nvars)
- API_ERROR("vars", E_BADARGS);
- if (nels <= 0)
- API_ERROR("nels", E_BADARGS);
+ if (nvars < 0)
+ API_ERROR("nvars<0", E_BADARGS);
+ if (nels < 0)
+ API_ERROR("nels<0", E_BADARGS);
+ if (nels)
+ {
+ int i;
+ void **vars2 = (void**) vars;
+ if (!nvars) API_ERROR("nvars==0", E_BADARGS);
+ for (i = 0; i < nvars && vars; i++)
+ if (!vars2[i]) vars = 0;
+ if (!vars) API_ERROR("vars==0 || vars[i]==0", E_BADARGS);
+ }
+ else if (!SILO_Globals.allowEmptyObjects)
+ {
+ API_ERROR("nels==0", E_EMPTYOBJECT);
+ }
+ else
+ {
+ nvars = 0;
+ vars = 0;
+ datatype = DB_FLOAT;
+ }
if (!dbfile->pub.p_pv)
API_ERROR(dbfile->pub.name, E_NOTIMP);
-
retval = (dbfile->pub.p_pv) (dbfile, (char *)vname, (char *)mname,
nvars, vars, nels, datatype, optlist);
db_FreeToc(dbfile);
@@ -8340,7 +8567,7 @@ DBPutPointvar1(DBfile *dbfile, const char *vname, const char *mname,
API_BEGIN2("DBPutPointvar1", int, -1, vname)
{
vars[0] = var;
- retval = DBPutPointvar(dbfile, (char *)vname, (char *)mname, 1, vars,
+ retval = DBPutPointvar(dbfile, (char *)vname, (char *)mname, var?1:0, vars,
nels, datatype, optlist);
db_FreeToc(dbfile);
API_RETURN(retval);
@@ -8399,10 +8626,35 @@ DBPutQuadmesh(DBfile *dbfile, const char *name, char *coordnames[],
API_ERROR("quadmesh name", E_INVALIDNAME);
if (!SILO_Globals.allowOverwrites && DBInqVarExists(dbfile, name))
API_ERROR("overwrite not allowed", E_NOOVERWRITE);
- if (ndims <= 0)
+ if (ndims < 0)
API_ERROR("ndims", E_BADARGS);
- if (!dims && ndims)
- API_ERROR("dims", E_BADARGS);
+ if (ndims)
+ {
+ int i;
+ void **coords2 = (void**) coords;
+ for (i = 0; i < ndims && coords; i++)
+ if (!coords2[i]) coords = 0;
+ for (i = 0; i < ndims && dims; i++)
+ if (!dims[i]) dims = 0;
+ if (!coords)
+ API_ERROR("coords==0 || coords[i]==0", E_BADARGS);
+ if (!dims)
+ API_ERROR("dims==0 || dims[i]==0", E_BADARGS);
+ }
+ else if (!SILO_Globals.allowEmptyObjects)
+ {
+ /* this is an empty object but we don't think it was intentional */
+ API_ERROR("ndims==0", E_EMPTYOBJECT);
+ }
+ else
+ {
+ /* this is an intentionally empty object */
+ coordnames = 0;
+ coords = 0;
+ dims = 0;
+ datatype = DB_FLOAT;
+ coordtype = DB_COLLINEAR;
+ }
if ((datatype != DB_FLOAT) && (datatype != DB_DOUBLE))
API_ERROR("datatype must be DB_FLOAT or DB_DOUBLE", E_BADARGS);
if ((coordtype != DB_COLLINEAR) && (coordtype != DB_NONCOLLINEAR))
@@ -8475,16 +8727,47 @@ DBPutQuadvar(DBfile *dbfile, const char *vname, const char *mname, int nvars,
API_ERROR("quadmesh name", E_BADARGS);
if (db_VariableNameValid((char *)mname) == 0)
API_ERROR("quadmesh name", E_INVALIDNAME);
- if (nvars < 1)
- API_ERROR("nvars", E_BADARGS);
- if (!varnames && nvars)
- API_ERROR("varname", E_BADARGS);
- if (!vars && nvars)
- API_ERROR("vars", E_BADARGS);
- if (ndims <= 0)
+ if (ndims < 0)
API_ERROR("ndims", E_BADARGS);
- if (!dims && ndims)
- API_ERROR("dims", E_BADARGS);
+ if (ndims)
+ {
+ int i;
+ void **vars2 = (void**) vars;
+ for (i = 0; i < ndims && dims; i++)
+ if (!dims[i]) dims = 0;
+ if (!dims)
+ API_ERROR("dims==0 || dims[i]==0", E_BADARGS);
+ if (nvars < 1)
+ API_ERROR("nvars<1", E_BADARGS);
+ for (i = 0; i < nvars && vars; i++)
+ if (!vars2[i]) vars = 0;
+ vars2 = mixvars;
+ for (i = 0; i < nvars && mixvars; i++)
+ if (!vars2[i]) mixvars = 0;
+ for (i = 0; i < nvars && varnames; i++)
+ if (!varnames[i] && !*varnames[i]) varnames = 0;
+ if (!vars)
+ API_ERROR("vars==0 || vars[i]==0", E_BADARGS);
+ if (!varnames)
+ API_ERROR("varnames==0 || varnames[i]==0||\"\"", E_BADARGS);
+ }
+ else if (!SILO_Globals.allowEmptyObjects)
+ {
+ /* this is an empty object but we don't think it was intentional */
+ API_ERROR("ndims==0", E_EMPTYOBJECT);
+ }
+ else
+ {
+ /* this is an intentionally empty object*/
+ nvars = 0;
+ vars = 0;
+ varnames = 0;
+ dims = 0;
+ mixvars = 0;
+ mixlen = 0;
+ datatype = DB_FLOAT;
+ centering = DB_NODECENT;
+ }
if (mixlen < 0)
API_ERROR("mixlen", E_BADARGS);
if (!mixvars && mixlen)
@@ -8540,7 +8823,7 @@ DBPutQuadvar1(DBfile *dbfile, const char *vname, const char *mname, DB_DTPTR1 va
vars[0] = var;
mixvars[0] = mixvar;
- retval = DBPutQuadvar(dbfile, (char *)vname, (char *)mname, 1,
+ retval = DBPutQuadvar(dbfile, (char *)vname, (char *)mname, var?1:0,
varnames, vars, dims, ndims, mixvars, mixlen,
datatype, centering, optlist);
db_FreeToc(dbfile);
@@ -8585,6 +8868,7 @@ DBPutUcdmesh(DBfile *dbfile, const char *name, int ndims,
int datatype, DBoptlist *optlist)
{
int retval;
+ char *zl_name;
API_BEGIN2("DBPutUcdmesh", int, -1, name) {
if (!dbfile)
@@ -8597,18 +8881,66 @@ DBPutUcdmesh(DBfile *dbfile, const char *name, int ndims,
API_ERROR("UCDmesh name", E_INVALIDNAME);
if (!SILO_Globals.allowOverwrites && DBInqVarExists(dbfile, name))
API_ERROR("overwrite not allowed", E_NOOVERWRITE);
- if (ndims <= 0)
+ if (ndims < 0)
API_ERROR("ndims", E_BADARGS);
- if (!coords && ndims)
- API_ERROR("coords", E_BADARGS);
if (nnodes < 0)
API_ERROR("nnodes", E_BADARGS);
if (nzones < 0)
API_ERROR("nzones", E_BADARGS);
+ if (ndims && nnodes && nzones)
+ {
+ int i;
+ void **coords2 = (void**) coords;
+ for (i = 0; i < ndims && coords; i++)
+ if (coords2[i] == 0) coords = 0;;
+ if (!coords)
+ API_ERROR("coords==0 || coords[i]==0", E_BADARGS);
+ if (zl_name = DBGetOption(optlist, DBOPT_PHZONELIST))
+ {
+ if (!zl_name || !*zl_name)
+ API_ERROR("zonelist name specified with DBOPT_PHZONELIST is null or \"\"", E_BADARGS);
+ if (db_VariableNameValid((char *)zl_name) == 0)
+ API_ERROR("zonelist name specified with DBOPT_PHZONELIST", E_INVALIDNAME);
+ }
+ else if (zonel_name)
+ {
+ if (!*zonel_name)
+ API_ERROR("zonel_name==\"\"", E_BADARGS);
+ if (db_VariableNameValid((char *)zonel_name) == 0)
+ API_ERROR("zonel_name", E_INVALIDNAME);
+ }
+ else if (facel_name)
+ {
+ if (!*facel_name)
+ API_ERROR("facel_name==\"\"", E_BADARGS);
+ if (db_VariableNameValid((char *)facel_name) == 0)
+ API_ERROR("facel_name", E_INVALIDNAME);
+ }
+ else
+ {
+ API_ERROR("no zonelist or facelist specified", E_BADARGS);
+ }
+ }
+ else if (!SILO_Globals.allowEmptyObjects)
+ {
+ /* this is an empty object but we don't know if it was intentional */
+ API_ERROR("ndims==0 || nnodes==0 || nzones==0", E_EMPTYOBJECT);
+ }
+ else
+ {
+ /* this is an intentionally empty object */
+ ndims = 0;
+ nnodes = 0;
+ nzones = 0;
+ coordnames = 0;
+ coords = 0;
+ zonel_name = 0;
+ facel_name = 0;
+ datatype = DB_FLOAT;
+ }
if (!dbfile->pub.p_um)
API_ERROR(dbfile->pub.name, E_NOTIMP);
-
retval = (dbfile->pub.p_um) (dbfile, (char *)name, ndims, coordnames,
coords, nnodes, nzones,
(char *)zonel_name, (char *)facel_name,
@@ -8736,16 +9068,50 @@ DBPutUcdvar(DBfile *dbfile, const char *vname, const char *mname, int nvars,
API_ERROR("UCDmesh name", E_BADARGS);
if (db_VariableNameValid((char *)mname) == 0)
API_ERROR("UCDmesh name", E_INVALIDNAME);
- if (nvars < 1)
- API_ERROR("nvars", E_BADARGS);
- if (!varnames && nvars)
- API_ERROR("varnames", E_BADARGS);
- if (!vars && nvars)
- API_ERROR("vars", E_BADARGS);
- if (nels <= 0)
- API_ERROR("nels", E_BADARGS);
+ if (nvars < 0)
+ API_ERROR("nvars<0", E_BADARGS);
+ if (nels < 0)
+ API_ERROR("nels<0", E_BADARGS);
if (mixlen < 0)
API_ERROR("mixlen", E_BADARGS);
+ if (nvars && nels)
+ {
+ int i;
+ void **vars2 = (void**) vars;
+ for (i = 0; i < nvars && vars; i++)
+ if (vars2[i] == 0) vars = 0;
+ for (i = 0; i < nvars && varnames; i++)
+ if (!varnames[i] && !*varnames[i]) varnames = 0;
+ if (mixvars)
+ {
+ vars2 = mixvars;
+ for (i = 0; i < nvars && mixvars; i++)
+ if (vars2[i] == 0) mixvars = 0;
+ }
+ if (!vars)
+ API_ERROR("vars==0 || vars[i]==0", E_BADARGS);
+ if (!varnames)
+ API_ERROR("varnames==0 || varnames[i]==0", E_BADARGS);
+ if (mixlen && !mixvars)
+ API_ERROR("mixvars==0 || mixvars[i]==0", E_BADARGS);
+ }
+ else if (!SILO_Globals.allowEmptyObjects)
+ {
+ /* this is an empty object but we don't know if it was intentional */
+ API_ERROR("nels==0 || nvars==0", E_EMPTYOBJECT);
+ }
+ else
+ {
+ /* this is an intentionally empty object */
+ nvars = 0;
+ nels = 0;
+ varnames = 0;
+ vars = 0;
+ mixvars = 0;
+ mixlen = 0;
+ datatype = DB_FLOAT;
+ centering = DB_NODECENT;
+ }
if (centering != DB_NODECENT && centering != DB_ZONECENT &&
centering != DB_FACECENT && centering != DB_BNDCENT &&
centering != DB_EDGECENT && centering != DB_BLOCKCENT)
@@ -8753,7 +9119,6 @@ DBPutUcdvar(DBfile *dbfile, const char *vname, const char *mname, int nvars,
if (!dbfile->pub.p_uv)
API_ERROR(dbfile->pub.name, E_NOTIMP);
-
retval = (dbfile->pub.p_uv) (dbfile, (char *)vname, (char *)mname,
nvars, varnames, vars, nels, mixvars,
mixlen, datatype, centering, optlist);
@@ -8796,7 +9161,7 @@ DBPutUcdvar1(DBfile *dbfile, const char *vname, const char *mname, DB_DTPTR1 var
varnames[0] = (char *)vname;
vars[0] = var;
mixvars[0] = mixvar;
- retval = DBPutUcdvar(dbfile, (char *)vname, (char *)mname, 1, varnames,
+ retval = DBPutUcdvar(dbfile, (char *)vname, (char *)mname, var?1:0, varnames,
vars, nels, mixvars, mixlen, datatype, centering,
optlist);
db_FreeToc(dbfile);
@@ -8929,28 +9294,49 @@ DBPutZonelist2(DBfile *dbfile, const char *name, int nzones, int ndims,
API_ERROR("nzones", E_BADARGS);
if (ndims < 0)
API_ERROR("ndims", E_BADARGS);
- if (lnodelist <= 0)
+ if (lnodelist < 0)
API_ERROR("lnodelist", E_BADARGS);
- if (!nodelist && lnodelist)
- API_ERROR("nodelist", E_BADARGS);
+ if (nshapes < 0)
+ API_ERROR("nshapes", E_BADARGS);
+ if (nzones && ndims && lnodelist && nshapes)
+ {
+ if (!nodelist)
+ API_ERROR("nodelist", E_BADARGS);
+ if (!shapetype)
+ API_ERROR("shape type", E_BADARGS);
+ if (!shapesize)
+ API_ERROR("shape size", E_BADARGS);
+ if (!shapecnt)
+ API_ERROR("shape count", E_BADARGS);
+ }
+ else if (!SILO_Globals.allowEmptyObjects)
+ {
+ /* this is an empty object but we don't know if it was intentional */
+ API_ERROR("nzones==0 || ndims==0 || lnodelist==0 || nshapes==0", E_EMPTYOBJECT);
+ }
+ else
+ {
+ /* this is an intentionally empty object */
+ nzones = 0;
+ ndims = 0;
+ nodelist = 0;
+ lnodelist = 0;
+ origin = 0; /* something has to be non-zero for HDF5 driver to be 'ok' */
+ lo_offset = 0;
+ hi_offset = 0;
+ shapetype = 0;
+ shapesize = 0;
+ shapecnt = 0;
+ nshapes = 0;
+ }
if (0 != origin && 1 != origin)
API_ERROR("origin", E_BADARGS);
if (lo_offset < 0)
API_ERROR("lo_offset", E_BADARGS);
if (hi_offset < 0)
API_ERROR("hi_offset", E_BADARGS);
- if (nshapes < 0)
- API_ERROR("nshapes", E_BADARGS);
- if (!shapetype && nshapes)
- API_ERROR("shape type", E_BADARGS);
- if (!shapesize && nshapes)
- API_ERROR("shape size", E_BADARGS);
- if (!shapecnt && nshapes)
- API_ERROR("shape count", E_BADARGS);
if (!dbfile->pub.p_zl2)
API_ERROR(dbfile->pub.name, E_NOTIMP);
-
-
retval = (dbfile->pub.p_zl2) (dbfile, (char *)name, nzones, ndims,
nodelist, lnodelist, origin, lo_offset,
hi_offset, shapetype, shapesize,
@@ -8998,17 +9384,38 @@ DBPutPHZonelist(DBfile *dbfile, const char *name,
API_ERROR("zonelist name", E_INVALIDNAME);
if (!SILO_Globals.allowOverwrites && DBInqVarExists(dbfile, name))
API_ERROR("overwrite not allowed", E_NOOVERWRITE);
-
- if (nfaces <= 0)
+ if (nfaces < 0)
API_ERROR("nfaces", E_BADARGS);
if (!nodecnt && nfaces)
API_ERROR("nodecnt", E_BADARGS);
- if (lnodelist <= 0)
+ if (lnodelist < 0)
API_ERROR("lnodelist", E_BADARGS);
- if (!nodelist && lnodelist)
- API_ERROR("nodelist", E_BADARGS);
-
-
+ if (nfaces && lnodelist)
+ {
+ if (!nodelist)
+ API_ERROR("nodelist", E_BADARGS);
+ }
+ else if (!SILO_Globals.allowEmptyObjects)
+ {
+ /* this is an empty object but we don't know if it was intentional */
+ API_ERROR("nfaces==0 || lodelist==0", E_EMPTYOBJECT);
+ }
+ else
+ {
+ /* this is an intentionally empty object */
+ nfaces = 0;
+ nodecnt = 0;
+ lnodelist = 0;
+ nodelist = 0;
+ extface = 0;
+ nzones = 0;
+ facecnt = 0;
+ lfacelist = 0;
+ facelist = 0;
+ origin = 0; /* HDF5 driver needs something non-zero */
+ lo_offset = 0;
+ hi_offset = 0;
+ }
if (0 != origin && 1 != origin)
API_ERROR("origin", E_BADARGS);
if (nzones>0 && ((lo_offset < 0) || (lo_offset >= nzones)))
@@ -9066,22 +9473,40 @@ DBPutCsgmesh(DBfile *dbfile, const char *name, int ndims,
API_ERROR("CSGmesh name", E_INVALIDNAME);
if (!SILO_Globals.allowOverwrites && DBInqVarExists(dbfile, name))
API_ERROR("overwrite not allowed", E_NOOVERWRITE);
- if (!(ndims == 2 || ndims == 3))
- API_ERROR("ndims must be either 2 or 3", E_BADARGS);
if (nbounds < 0)
- API_ERROR("nbounds", E_BADARGS);
- if (!typeflags)
- API_ERROR("type flags", E_BADARGS);
- if (!coeffs)
- API_ERROR("coefficients", E_BADARGS);
- if (lcoeffs <= 0)
- API_ERROR("lcoeffs", E_BADARGS);
- if (!extents)
- API_ERROR("extents", E_BADARGS);
- if (!zonel_name || !*zonel_name)
- API_ERROR("zonelist name", E_BADARGS);
- if (db_VariableNameValid((char *)zonel_name) == 0)
- API_ERROR("zonelist name", E_INVALIDNAME);
+ API_ERROR("nbounds<0", E_BADARGS);
+ if (ndims < 0)
+ API_ERROR("ndims<0", E_BADARGS);
+ if (lcoeffs < 0)
+ API_ERROR("lcoeffs<0", E_BADARGS);
+ if (ndims && nbounds && lcoeffs)
+ {
+ if (!(ndims == 2 || ndims == 3))
+ API_ERROR("ndims must be either 2 or 3", E_BADARGS);
+ if (!typeflags) API_ERROR("typeflags==0", E_BADARGS);
+ if (!coeffs) API_ERROR("coeffs==0", E_BADARGS);
+ if (!extents) API_ERROR("extents==0", E_BADARGS);
+ if (!zonel_name || !*zonel_name) API_ERROR("zonel_name", E_BADARGS);
+ if (db_VariableNameValid((char *)zonel_name) == 0)
+ API_ERROR("zonelist name", E_INVALIDNAME);
+ }
+ else if (!SILO_Globals.allowEmptyObjects)
+ {
+ API_ERROR("nbounds==0 || ndims==0 || lcoeffs==0", E_EMPTYOBJECT);
+ }
+ else
+ {
+ /* this is an intentionally empty object */
+ ndims = 0;
+ nbounds = 0;
+ typeflags = 0;
+ bndids = 0;
+ coeffs = 0;
+ lcoeffs = 0;
+ datatype = DB_FLOAT;
+ extents = 0;
+ zonel_name = 0;
+ }
if (!dbfile->pub.p_csgm)
API_ERROR(dbfile->pub.name, E_NOTIMP);
@@ -9169,20 +9594,42 @@ DBPutCSGZonelist(DBfile *dbfile, const char *name, int nregs,
API_ERROR("zonelist name", E_INVALIDNAME);
if (!SILO_Globals.allowOverwrites && DBInqVarExists(dbfile, name))
API_ERROR("overwrite not allowed", E_NOOVERWRITE);
- if (nregs <= 0)
+ if (nregs < 0)
API_ERROR("nregs", E_BADARGS);
- if (!typeflags)
- API_ERROR("typeflags", E_BADARGS);
- if (!leftids)
- API_ERROR("leftids", E_BADARGS);
- if (!rightids)
- API_ERROR("rightids", E_BADARGS);
- if ((xforms && lxforms <= 0) || (!xforms && lxforms > 0))
- API_ERROR("xforms and lxforms", E_BADARGS);
- if (nzones <= 0)
+ if (nzones < 0)
API_ERROR("nzones", E_BADARGS);
- if (!zonelist)
- API_ERROR("zonelist", E_BADARGS);
+ if (nregs && nzones)
+ {
+ if (!typeflags)
+ API_ERROR("typeflags", E_BADARGS);
+ if (!leftids)
+ API_ERROR("leftids", E_BADARGS);
+ if (!rightids)
+ API_ERROR("rightids", E_BADARGS);
+ if (!zonelist)
+ API_ERROR("zonelist", E_BADARGS);
+ if ((xforms && lxforms <= 0) || (!xforms && lxforms > 0))
+ API_ERROR("xforms and lxforms", E_BADARGS);
+ }
+ else if (!SILO_Globals.allowEmptyObjects)
+ {
+ /* this is an empty object but we don't know if it was intentional */
+ API_ERROR("ndims==0 || nnodes==0 || nzones==0", E_EMPTYOBJECT);
+ }
+ else
+ {
+ /* this is an intentionally empty object */
+ nregs = 0;
+ typeflags = 0;
+ leftids = 0;
+ rightids = 0;
+ xforms = 0;
+ lxforms = 0;
+ datatype = DB_FLOAT;
+ nzones = 0;
+ zonelist = 0;
+ }
+
if (!dbfile->pub.p_csgzl)
API_ERROR(dbfile->pub.name, E_NOTIMP);
@@ -9269,20 +9716,39 @@ DBPutCsgvar(DBfile *dbfile, const char *vname, const char *meshname,
API_ERROR("CSGmesh name", E_BADARGS);
if (db_VariableNameValid((char *)meshname) == 0)
API_ERROR("CSGmesh name", E_INVALIDNAME);
- if (nvars < 1 || nvars > 9)
- API_ERROR("nvars", E_BADARGS);
- if (!varnames && nvars)
- API_ERROR("varnames", E_BADARGS);
- if (!vars && nvars)
- API_ERROR("vars", E_BADARGS);
- if (nvals <= 0)
- API_ERROR("nvals", E_BADARGS);
+ if (nvars < 0)
+ API_ERROR("nvars<0", E_BADARGS);
+ if (nvals < 0)
+ API_ERROR("nvals<0", E_BADARGS);
+ if (nvars && nvals)
+ {
+ int i;
+ for (i = 0; i < nvars && vars; i++)
+ if (!vars[i]) vars = 0;
+ for (i = 0; i < nvars && varnames; i++)
+ if (!varnames[i] && !*varnames[i]) varnames = 0;
+ if (!vars) API_ERROR("vars==0 || vars[i]==0", E_BADARGS);
+ if (!varnames) API_ERROR("varnames==0 || varnames[i]==0", E_BADARGS);
+ }
+ else if (!SILO_Globals.allowEmptyObjects)
+ {
+ API_ERROR("nvals==0 || nvars==0", E_EMPTYOBJECT);
+ }
+ else
+ {
+ /* this is an intentionally empty object */
+ nvars = 0;
+ varnames = 0;
+ vars = 0;
+ nvals = 0;
+ datatype = DB_FLOAT;
+ centering = DB_ZONECENT;
+ }
if (!(centering == DB_ZONECENT || centering == DB_BNDCENT))
API_ERROR("centering", E_BADARGS);
if (!dbfile->pub.p_csgv)
API_ERROR(dbfile->pub.name, E_NOTIMP);
-
retval = (dbfile->pub.p_csgv) (dbfile, vname, meshname,
nvars, varnames, vars, nvals,
datatype, centering, optlist);
@@ -9393,7 +9859,7 @@ _DBstrprint(FILE *fp, char *strs[], int nstrs, int order, int left_margin,
maxwidth = strlen(sorted_strs[0]);
for (i = 1; i < nstrs; i++) {
- maxwidth = MAX(maxwidth, strlen(sorted_strs[i]));
+ maxwidth = MAX(maxwidth, (int)strlen(sorted_strs[i]));
}
/*----------------------------------------
@@ -10183,7 +10649,7 @@ UM_CalcExtents(DB_DTPTR2 coord_arrays, int datatype, int ndims, int nnodes,
* Added support for nameschemes options on multi-block objects.
*-------------------------------------------------------------------------*/
INTERNAL int
-db_ProcessOptlist(int objtype, DBoptlist *optlist)
+db_ProcessOptlist(int objtype, const DBoptlist *const optlist)
{
int i, j, *ip = NULL, unused = 0;
char *me = "db_ProcessOptlist";
@@ -11009,6 +11475,11 @@ db_ProcessOptlist(int objtype, DBoptlist *optlist)
_mm._empty_cnt = DEREF(int, optlist->values[i]);
break;
+ case DBOPT_MB_REPR_BLOCK_IDX:
+ /* +1 to support zero value indicating NOT SET */
+ _mm._repr_block_idx = DEREF(int,optlist->values[i])+1;
+ break;
+
default:
unused++;
break;
@@ -11654,11 +12125,13 @@ db_ResetGlobalData_Ucdzonelist (void) {
* Mark C. Miller, Mon Jan 12 16:28:18 PST 2009
* Removed explicit setting of members already correctly handled
* by memset to zero.
+ *
+ * Mark C. Miller, Thu Aug 30 17:55:43 PDT 2012
+ * Removed setting nmatnos to -1.
*--------------------------------------------------------------------*/
INTERNAL int
db_ResetGlobalData_MultiMesh (void) {
memset(&_mm, 0, sizeof(_mm));
- _mm._nmatnos = -1;
_mm._nmat = -1;
_mm._blockorigin = 1;
_mm._grouporigin = 1;
@@ -11814,22 +12287,26 @@ DBStringArrayToStringList(char **strArray, int n,
* Made logic for handling slash swap more sane. Now, swapping is
* performed AFTER the list of strings has been broken out into
* separate arrays.
+ *
+ * Mark C. Miller, Fri Oct 12 22:57:23 PDT 2012
+ * Changed interface to return value for number of strings as well
+ * as accept an input value or nothing at all.
*--------------------------------------------------------------------*/
PUBLIC char **
-DBStringListToStringArray(char *strList, int n, int handleSlashSwap,
- int skipFirstSemicolon)
+DBStringListToStringArray(char *strList, int *_n, int handleSlashSwap,
+ int skipSemicolonAtIndexZero)
{
- int i, l, add1 = 0, strLen;
+ int i, l, n, add1 = 0, strLen;
char **retval;
int *colonAt = 0;
int needToSlashSwap = 0;
/* if n is unspecified (<0), compute it by counting semicolons */
- if (n < 0)
+ if (_n == 0 || *_n < 0)
{
add1 = 1;
n = 1;
- i = (skipFirstSemicolon&&strList[0]==';')?1:0;
+ i = (skipSemicolonAtIndexZero&&strList[0]==';')?1:0;
while (strList[i] != '\0')
{
if (strList[i] == ';')
@@ -11838,11 +12315,15 @@ DBStringListToStringArray(char *strList, int n, int handleSlashSwap,
}
strLen = i;
}
+ else
+ {
+ n = *_n;
+ }
retval = (char**) calloc(n+add1, sizeof(char*));
if (handleSlashSwap)
colonAt = (int *) calloc(n, sizeof(int));
- for (i=0, l=(skipFirstSemicolon&&strList[0]==';')?1:0; i<n; i++)
+ for (i=0, l=(skipSemicolonAtIndexZero&&strList[0]==';')?1:0; i<n; i++)
{
if (strList[l] == ';')
{
@@ -11903,6 +12384,9 @@ DBStringListToStringArray(char *strList, int n, int handleSlashSwap,
free(colonAt);
}
+ /* Return value of n computed if requested */
+ if (_n && *_n < 0) *_n = n;
+
return retval;
}
@@ -11947,86 +12431,6 @@ DBSortObjectsByOffset(DBfile *dbfile, int nobjs,
/*----------------------------------------------------------------------
* Purpose
*
- * Flatten an array of variable lenght arrays of ints into a single
- * array of ints.
- *
- * Programmer
- *
- * Mark C. Miller, Wed Oct 10 11:49:36 PDT 2007
- *
- *--------------------------------------------------------------------*/
-INTERNAL void
-db_IntArrayToIntList(int **intArrays, int nArrays,
-const int *const lenArrays, int **intList, int *m)
-{
- int i,j,n;
- int *list = 0;
-
- if (nArrays <= 0 || intArrays == 0 || lenArrays == 0 ||
- intList == 0 || m == 0)
- {
- *intList = 0;
- *m = 0;
- return;
- }
-
- for (i=n=0; i < nArrays; i++)
- n += lenArrays[i];
-
- if (n == 0)
- {
- *intList = 0;
- *m = 0;
- return;
- }
-
- list = (int *) malloc(n * sizeof(int));
-
- for (i=n=0; i < nArrays; i++)
- {
- for (j = 0; j < lenArrays[i]; j++)
- list[n++] = intArrays[i][j];
- }
-
- *intList = list;
- *m = n;
-}
-
-/*----------------------------------------------------------------------
- * Purpose
- *
- * Unflatten a a single array of ints and lengths into a an array
- * of arrays of the specified lengths.
- *
- * Programmer
- *
- * Mark C. Miller, Wed Oct 10 11:49:36 PDT 2007
- *
- *--------------------------------------------------------------------*/
-INTERNAL int**
-db_IntListToIntArray(const int *const intList, int nArrays,
- const int *const lenArrays)
-{
- int i,j,n;
- int **retval = 0;
-
- if (nArrays <= 0 || intList == 0 || lenArrays == 0)
- return 0;
-
- retval = (int**) malloc(nArrays * sizeof(int*));
- for (i=n=0; i < nArrays; i++)
- {
- retval[i] = (int *) malloc(lenArrays[i] * sizeof(int));
- for (j = 0; j < lenArrays[i]; j++)
- retval[i][j] = intList[n++];
- }
-
- return retval;
-}
-
-/*----------------------------------------------------------------------
- * Purpose
- *
* Break an extend driver id into type and subtype
*
* Programmer
@@ -12121,11 +12525,17 @@ char *db_absoluteOf_path (const char *cwg,
const char *pathname)
{ char *result;
- if (0 < strlen(pathname))
+ if (pathname && strlen(pathname))
{ if (db_isAbsolute_path(pathname))
- result = STRDUP(pathname);
- else
+ result = db_normalize_path(pathname);
+ else if (cwg && strlen(cwg))
result = db_join_path(cwg,pathname);
+ else
+ result = safe_strdup("");
+ }
+ else
+ {
+ result = safe_strdup("");
}
return result;
}
@@ -12155,7 +12565,7 @@ char *db_basename ( const char *pathname )
result = 0;
{ if (0 < strlen(pathname))
- { if (pathname && (strcmp(pathname,"/") == 0))
+ { if (strcmp(pathname,"/") == 0)
result = STRDUP("/");
else
{ int i;
@@ -12236,7 +12646,7 @@ char *db_dirname ( const char *pathname )
result = 0;
{ if (0 < strlen(pathname))
- { if (pathname && (strcmp(pathname,"/") == 0))
+ { if (strcmp(pathname,"/") == 0)
result = STRDUP("");
else
{ int i;
@@ -12678,6 +13088,9 @@ done: ;
| pathname components. Note that this function is intended for
| internal use only.
|
+| Modifications:
+| Mark C. Miller, Wed Jul 11 17:01:09 PDT 2012
+| Initialize tmp buffer to the empty string with tmp[0] = '\0'
+-----------------------------------------------------------------------------*/
char *db_unsplit_path ( const db_Pathname *p )
@@ -12690,6 +13103,7 @@ char *db_unsplit_path ( const db_Pathname *p )
int slashed;
static char tmp[4096];
+ tmp[0] = '\0';
first = TRUE;
slashed = FALSE;
c = p->firstComponent;
diff --git a/src/silo/silo.h.in b/src/silo/silo.h.in
index 59f3a05..34a1d9a 100644
--- a/src/silo/silo.h.in
+++ b/src/silo/silo.h.in
@@ -70,8 +70,25 @@ be used for advertising or product endorsement purposes.
#ifndef SILO_H
#define SILO_H
-#ifdef __cplusplus
-extern "C" {
+#include <stdio.h> /* for FILE* datatype for filters */
+
+/*
+ * SILO exports for WIN32
+ */
+#ifndef SILO_API
+ #ifdef _WIN32
+ #ifdef SILO_STATIC_LIBRARY
+ #define SILO_API
+ #else
+ #ifdef SILO_EXPORTS
+ #define SILO_API __declspec(dllexport)
+ #else
+ #define SILO_API __declspec(dllimport)
+ #endif
+ #endif
+ #else
+ #define SILO_API
+ #endif
#endif
/* Set the base type for datatype'd pointers (that is pointers whose
@@ -119,7 +136,17 @@ extern "C" {
#define DB_DTPTR2 void* /* NO_FORTRAN_DEFINE */
#endif
-#include <stdio.h>
+/* Macros to get multiply subscripted array constness correct
+ with C++ and C compilers */
+#if defined(__cplusplus) || defined(USE_CONST_DB_CONSTARR)
+#define DB_CONSTARR1 const * /* NO_FORTRAN_DEFINE */
+#define DB_CONSTARR2 const * const * /* NO_FORTRAN_DEFINE */
+#define DB_CONSTARR3 const * const * const * /* NO_FORTRAN_DEFINE */
+#else
+#define DB_CONSTARR1 * /* NO_FORTRAN_DEFINE */
+#define DB_CONSTARR2 ** /* NO_FORTRAN_DEFINE */
+#define DB_CONSTARR3 *** /* NO_FORTRAN_DEFINE */
+#endif
#ifndef FALSE
#define FALSE 0
@@ -280,24 +307,6 @@ extern "C" {
#define DBMMADJZonelists 0x04000000
#define DBPMGlobNodeNo 0x08000000
-/* Macros used for exporting symbols on Win32 systems. */
-#ifndef SILO_API
-#ifdef _WIN32
-/* Make Silo a DLL by default. */
-#ifdef SILO_STATIC_LIBRARY
-#define SILO_API
-#else
-#ifdef SILO_EXPORTS
-#define SILO_API __declspec(dllexport)
-#else
-#define SILO_API __declspec(dllimport)
-#endif
-#endif
-#else
-#define SILO_API
-#endif
-#endif
-
/* Definitions for COORD_TYPE */
/* Placed before DBObjectType enum because the
DB_QUAD_CURV and DB_QUAD_RECT symbols are
@@ -308,6 +317,10 @@ extern "C" {
#define DB_QUAD_RECT DB_COLLINEAR
#define DB_QUAD_CURV DB_NONCOLLINEAR
+#ifdef __cplusplus
+extern "C" {
+#endif
+
/* Objects that can be stored in a data file */
typedef enum {
DB_INVALID_OBJECT= -1, /*causes enum to be signed, do not remove,
@@ -454,6 +467,7 @@ typedef enum {
#define DBOPT_MB_BLOCK_TYPE 333
#define DBOPT_MB_EMPTY_LIST 334
#define DBOPT_MB_EMPTY_COUNT 335
+#define DBOPT_MB_REPR_BLOCK_IDX 336
#define DBOPT_LAST 499
/* Options relating to virtual file drivers */
@@ -532,8 +546,9 @@ typedef enum {
#define E_DRVRCANTOPEN 29 /*Driver cannot open the file. */
#define E_BADOPTCLASS 30 /*Optlist contains options for wrong class */
#define E_NOTENABLEDINBUILD 31 /*feature not enabled in this build */
-#define E_MAXFILEOPTSETS 32 /*Too many file options sets */
+#define E_MAXFILEOPTSETS 32 /*Too many file options sets */
#define E_NOHDF5 33 /*HDF5 driver not available */
+#define E_EMPTYOBJECT 34 /*Empty object not currently permitted*/
#define E_NERRORS 50
/* Definitions for MAJOR_ORDER */
@@ -735,16 +750,16 @@ typedef struct DBtoc_ {
int ndir;
char **array_names;
- int narrays;
+ int narray;
char **mrgtree_names;
- int nmrgtrees;
+ int nmrgtree;
char **groupelmap_names;
- int ngroupelmaps;
+ int ngroupelmap;
char **mrgvar_names;
- int nmrgvars;
+ int nmrgvar;
} DBtoc;
@@ -844,6 +859,7 @@ typedef struct DBmultimesh_ {
int block_type; /* constant block type for all blocks (in lieu of meshtypes) */
int *empty_list; /* list of empty block #'s (option for namescheme) */
int empty_cnt; /* size of empty list */
+ int repr_block_idx; /* index of a 'representative' block */
} DBmultimesh;
/*----------------------------------------------------------------------------
@@ -898,6 +914,7 @@ typedef struct DBmultivar_ {
int block_type; /* constant block type for all blocks (in lieu of meshtypes) */
int *empty_list; /* list of empty block #'s (option for namescheme) */
int empty_cnt; /* size of empty list */
+ int repr_block_idx; /* index of a 'representative' block */
} DBmultivar;
/*-------------------------------------------------------------------------
@@ -925,6 +942,7 @@ typedef struct DBmultimat_ {
char *block_ns; /* namescheme for block objects (in lieu of meshnames) */
int *empty_list; /* list of empty block #'s (option for namescheme) */
int empty_cnt; /* size of empty list */
+ int repr_block_idx; /* index of a 'representative' block */
} DBmultimat;
/*-------------------------------------------------------------------------
@@ -947,6 +965,7 @@ typedef struct DBmultimatspecies_ {
char *block_ns; /* namescheme for block objects (in lieu of meshnames) */
int *empty_list; /* list of empty block #'s (option for namescheme) */
int empty_cnt; /* size of empty list */
+ int repr_block_idx; /* index of a 'representative' block */
} DBmultimatspecies;
/*----------------------------------------------------------------------
@@ -1283,6 +1302,7 @@ typedef struct DBmeshvar_ {
int extensive; /* indicates if the variable reprsents an extensiv
physical property (as opposed to intensive) */
} DBmeshvar;
+typedef DBmeshvar DBpointvar; /* better named alias for pointvar */
typedef struct DBmaterial_ {
/*----------- Material Information -----------*/
@@ -1548,15 +1568,17 @@ typedef struct _DBgroupelmap {
typedef struct _DBnamescheme
{
char *fmt; /* orig. format string */
- const char **fmtptrs; /* ptrs into first (printf) part of fmt for each conversion spec. */
+ char const **fmtptrs; /* ptrs into first (printf) part of fmt for each conversion spec. */
int fmtlen; /* len of first part of fmt */
int ncspecs; /* # of conversion specs in first part of fmt */
char delim; /* delimiter char used for parts of fmt */
int nembed; /* number of last embedded string encountered */
char *embedstrs[DB_MAX_EXPSTRS]; /* ptrs to copies of embedded strings */
+ int arralloc; /* flag indicating if Silo allocated the arrays or not */
int narrefs; /* number of array refs in conversion specs */
char **arrnames; /* array names used by array refs */
- const int **arrvals; /* pointer to actual array data assoc. with each name */
+ void **arrvals; /* pointer to actual array data assoc. with each name */
+ int *arrsizes; /* size of each array (only needed for deallocating external arrays of strings) */
char **exprstrs; /* expressions to be evaluated for each conv. spec. */
} DBnamescheme;
@@ -1581,20 +1603,24 @@ typedef struct DBfile_pub {
/* Public Methods */
int (*close)(struct DBfile *);
- int (*exist)(struct DBfile *, char *);
+ int (*exist)(struct DBfile *, char const *);
int (*pause)(struct DBfile *);
int (*cont)(struct DBfile *);
int (*newtoc)(struct DBfile *);
- DBObjectType (*inqvartype)(struct DBfile *, char*);
+ DBObjectType (*inqvartype)(struct DBfile *, char const *);
int (*uninstall)(struct DBfile *);
- DBobject *(*g_obj)(struct DBfile *, char *);
- int (*c_obj)(struct DBfile *, DBobject *, int);
- int (*w_obj)(struct DBfile *, DBobject *, int);
- void *(*g_comp)(struct DBfile *, char *, char *);
- int (*g_comptyp)(struct DBfile *, char *, char *);
- int (*w_comp)(struct DBfile *, DBobject *, char *, char *,
- char *, const void *, int, long *);
- int (*write) (struct DBfile *, char *, void *, int *, int, int);
+ DBobject *(*g_obj)(struct DBfile *, char const *);
+ int (*c_obj)(struct DBfile *, DBobject const *, int);
+ int (*w_obj)(struct DBfile *, DBobject const *, int);
+ void *(*g_comp)(struct DBfile *, char const *, char const *);
+ int (*g_comptyp)(struct DBfile *, char const *, char const *);
+ int (*w_comp)(struct DBfile *, DBobject *, char const *, char const *,
+ char const *, void const *, int, long const *);
+ int (*write) (struct DBfile *, char const *, void const *, int const *, int, int);
+
+
+
+
int (*writeslice)(struct DBfile *, char *, void *, int,
int[], int[], int[], int[], int);
void *(*g_attr)(struct DBfile *, char *, char *);
@@ -1611,7 +1637,7 @@ typedef struct DBfile_pub {
int (*g_compnames)(struct DBfile *, char *, char ***, char ***);
DBcompoundarray *(*g_ca)(struct DBfile *, char *);
DBcurve *(*g_cu)(struct DBfile *, char *);
- DBdefvars *(*g_defv)(struct DBfile *, const char *);
+ DBdefvars *(*g_defv)(struct DBfile *, char const *);
DBmaterial *(*g_ma)(struct DBfile *, char *);
DBmatspecies *(*g_ms)(struct DBfile *, char *);
DBmultimesh *(*g_mm)(struct DBfile *, char *);
@@ -1637,8 +1663,8 @@ typedef struct DBfile_pub {
void *, int, int, DBoptlist *);
int (*p_cu)(struct DBfile *, char *, void *, void *, int, int,
DBoptlist *);
- int (*p_defv)(struct DBfile *, const char *, int,
- char **, const int *, char **,
+ int (*p_defv)(struct DBfile *, char const *, int,
+ char **, int const *, char **,
DBoptlist **);
int (*p_fl)(struct DBfile *, char *, int, int, int *, int, int,
int *, int *, int *, int, int *, int *, int);
@@ -1648,8 +1674,8 @@ typedef struct DBfile_pub {
int (*p_ms)(struct DBfile *, char *, char *, int, int *, int *,
int *, int, int, DB_DTPTR1, int *, int, int,
DBoptlist *);
- int (*p_mm)(struct DBfile *, char *, int, char **, int *,
- DBoptlist *);
+ int (*p_mm)(struct DBfile *, char const*, int, char const *const *, int const *,
+ DBoptlist const *);
int (*p_mv)(struct DBfile *, char *, int, char **, int *,
DBoptlist *);
int (*p_mt)(struct DBfile *, char *, int, char **, DBoptlist *);
@@ -1685,45 +1711,45 @@ typedef struct DBfile_pub {
int, int *, int, int *,
int, int, int,
DBoptlist *);
- int (*p_csgzl)(struct DBfile *, const char *, int, const int *,
- const int *, const int *, const void *, int, int,
- int, const int *, DBoptlist *);
- DBcsgzonelist *(*g_csgzl)(struct DBfile *, const char *);
- int (*p_csgm)(struct DBfile *, const char *, int, int,
- const int *, const int *,
- const void *, int, int, const double *,
- const char *, DBoptlist *);
- DBcsgmesh *(*g_csgm)(struct DBfile *, const char *);
- int (*p_csgv)(struct DBfile *, const char *, const char *, int,
+ int (*p_csgzl)(struct DBfile *, char const *, int, int const *,
+ int const *, int const *, void const *, int, int,
+ int, int const *, DBoptlist *);
+ DBcsgzonelist *(*g_csgzl)(struct DBfile *, char const *);
+ int (*p_csgm)(struct DBfile *, char const *, int, int,
+ int const *, int const *,
+ void const *, int, int, double const *,
+ char const *, DBoptlist *);
+ DBcsgmesh *(*g_csgm)(struct DBfile *, char const *);
+ int (*p_csgv)(struct DBfile *, char const *, char const *, int,
char **, void **, int, int, int,
DBoptlist *);
- DBcsgvar *(*g_csgv)(struct DBfile *, const char *);
- DBmultimeshadj *(*g_mmadj)(struct DBfile *, const char *, int, const int *);
- int (*p_mmadj)(struct DBfile *, const char *, int, const int *,
- const int *, const int *, const int *, const int *,
- int **, const int *, int **,
- DBoptlist *optlist);
- int (*p_mrgt)(struct DBfile *dbfile, const char *name, const char *mesh_name,
+ DBcsgvar *(*g_csgv)(struct DBfile *, char const *);
+ DBmultimeshadj *(*g_mmadj)(struct DBfile *, char const *, int, int const *);
+ int (*p_mmadj)(struct DBfile *, char const *, int, int const *,
+ int const *, int const *, int const *, int const *,
+ int DB_CONSTARR2, int const *, int DB_CONSTARR2,
+ DBoptlist const *optlist);
+ int (*p_mrgt)(struct DBfile *dbfile, char const *name, char const *mesh_name,
DBmrgtree *tree, DBoptlist *opts);
- DBmrgtree *(*g_mrgt)(struct DBfile *, const char *name);
- int (*p_grplm)(struct DBfile *dbfile, const char *map_name,
+ DBmrgtree *(*g_mrgt)(struct DBfile *, char const *name);
+ int (*p_grplm)(struct DBfile *dbfile, char const *map_name,
int num_segments, int *groupel_types,
int *segment_lengths, int *segment_ids,
int **segment_data, void **segment_fracs,
int fracs_data_type, DBoptlist *opts);
- DBgroupelmap *(*g_grplm)(struct DBfile *dbfile, const char *name);
- int (*p_mrgv)(struct DBfile *dbfile, const char *name,
- const char *mrgt_name,
+ DBgroupelmap *(*g_grplm)(struct DBfile *dbfile, char const *name);
+ int (*p_mrgv)(struct DBfile *dbfile, char const *name,
+ char const *mrgt_name,
int ncomps, char **compnames,
int nregns, char **reg_pnames,
int datatype, void **data, DBoptlist *opts);
- DBmrgvar *(*g_mrgv)(struct DBfile *dbfile, const char *name);
- int (*free_z)(struct DBfile *, const char *);
- int (*cpdir)(struct DBfile *, const char *,
- struct DBfile *, const char *);
+ DBmrgvar *(*g_mrgv)(struct DBfile *dbfile, char const *name);
+ int (*free_z)(struct DBfile *, char const *);
+ int (*cpdir)(struct DBfile *, char const *,
+ struct DBfile *, char const *);
int (*sort_obo)(struct DBfile *dbfile, int nobjs,
- const char *const *const obj_names, int *ranks);
+ char const *const *obj_names, int *ranks);
} DBfile_pub;
typedef struct DBfile {
@@ -1746,9 +1772,9 @@ typedef void (*DBErrFunc_t)(char*);
* then the function is a "first-call" function and should have this
* macro/function pair. */
-SILO_API extern DBfile *DBOpenReal(const char *, int, int);
-SILO_API extern DBfile *DBCreateReal(const char *, int, int, const char *, int);
-SILO_API extern int DBInqFileReal(const char *);
+SILO_API extern DBfile *DBOpenReal(char const *, int, int);
+SILO_API extern DBfile *DBCreateReal(char const *, int, int, char const *, int);
+SILO_API extern int DBInqFileReal(char const *);
#define SILO_VSTRING_NAME "_silolibinfo"
#define SILO_VSTRING PACKAGE_VERSION
@@ -1805,6 +1831,7 @@ SILO_API extern void DBFreeCsgvar(DBcsgvar *);
SILO_API extern void DBFreeQuadvar(DBquadvar *);
SILO_API extern void DBFreeUcdmesh(DBucdmesh *);
SILO_API extern void DBFreeMeshvar(DBmeshvar *);
+SILO_API extern void DBFreePointvar(DBpointvar *);
SILO_API extern void DBFreePointmesh(DBpointmesh *);
SILO_API extern void DBFreeQuadmesh(DBquadmesh *);
SILO_API extern void DBFreeCsgmesh(DBcsgmesh *);
@@ -1818,33 +1845,52 @@ SILO_API extern void DBFreeCompoundarray(DBcompoundarray *);
SILO_API extern void DBFreeCurve(DBcurve *);
SILO_API extern void DBFreeNamescheme(DBnamescheme *);
+SILO_API extern int DBIsEmptyCurve(DBcurve const *curve);
+SILO_API extern int DBIsEmptyPointmesh(DBpointmesh const *msh);
+SILO_API extern int DBIsEmptyPointvar(DBpointvar const *var);
+SILO_API extern int DBIsEmptyMeshvar(DBmeshvar const *var);
+SILO_API extern int DBIsEmptyQuadmesh(DBquadmesh const *msh);
+SILO_API extern int DBIsEmptyQuadvar(DBquadvar const *var);
+SILO_API extern int DBIsEmptyUcdmesh(DBucdmesh const *msh);
+SILO_API extern int DBIsEmptyFacelist(DBfacelist const *fl);
+SILO_API extern int DBIsEmptyZonelist(DBzonelist const *zl);
+SILO_API extern int DBIsEmptyPHZonelist(DBphzonelist const *zl);
+SILO_API extern int DBIsEmptyUcdvar(DBucdvar const *var);
+SILO_API extern int DBIsEmptyCsgmesh(DBcsgmesh const *msh);
+SILO_API extern int DBIsEmptyCSGZonelist(DBcsgzonelist const *zl);
+SILO_API extern int DBIsEmptyCsgvar(DBcsgvar const *var);
+SILO_API extern int DBIsEmptyMaterial(DBmaterial const *mat);
+SILO_API extern int DBIsEmptyMatspecies(DBmatspecies const *spec);
+
SILO_API extern long DBSetDataReadMask(long);
SILO_API extern long DBGetDataReadMask(void);
SILO_API extern int DBSetAllowOverwrites(int allow);
SILO_API extern int DBGetAllowOverwrites(void);
+SILO_API extern int DBSetAllowEmptyObjects(int allow);
+SILO_API extern int DBGetAllowEmptyObjects(void);
SILO_API extern int DBSetEnableChecksums(int enable);
SILO_API extern int DBGetEnableChecksums(void);
-SILO_API extern void DBSetCompression(const char *);
+SILO_API extern void DBSetCompression(char const *);
SILO_API extern char *DBGetCompression(void);
SILO_API extern int DBSetFriendlyHDF5Names(int enable);
SILO_API extern int DBGetFriendlyHDF5Names(void);
SILO_API extern int DBGuessHasFriendlyHDF5Names(DBfile *f);
SILO_API extern int DBSetDeprecateWarnings(int max);
SILO_API extern int DBGetDeprecateWarnings();
-SILO_API extern int *DBSetUnknownDriverPriorities(const int *);
+SILO_API extern int *DBSetUnknownDriverPriorities(int const *);
SILO_API extern int *DBGetUnknownDriverPriorities();
-SILO_API extern int DBRegisterFileOptionsSet(const DBoptlist *opts);
+SILO_API extern int DBRegisterFileOptionsSet(DBoptlist const *opts);
SILO_API extern int DBUnregisterFileOptionsSet(int opts_set_id);
SILO_API extern void DBUnregisterAllFileOptionsSets();
SILO_API extern void *DBGrabDriver(DBfile *);
-SILO_API extern int DBUngrabDriver(DBfile *, const void *);
-SILO_API extern int DBGetDriverType(const DBfile *);
-SILO_API extern int DBGetDriverTypeFromPath(const char *);
-SILO_API extern char *DBJoinPath(const char *, const char *);
+SILO_API extern int DBUngrabDriver(DBfile *, void const *);
+SILO_API extern int DBGetDriverType(DBfile const *);
+SILO_API extern int DBGetDriverTypeFromPath(char const *);
+SILO_API extern char *DBJoinPath(char const *, char const *);
SILO_API extern char *DBVersion(void);
SILO_API extern int DBVersionGE(int Maj, int Min, int Pat);
-SILO_API extern char *DBFileVersion(DBfile *dbfile);
-SILO_API extern int DBFileVersionGE(DBfile *dbfile, int Maj, int Min, int Pat);
+SILO_API extern char *DBFileVersion(DBfile const *dbfile);
+SILO_API extern int DBFileVersionGE(DBfile const *dbfile, int Maj, int Min, int Pat);
SILO_API extern void DBShowErrors(int, DBErrFunc_t);
SILO_API extern char *DBErrString(void);
SILO_API extern char *DBErrFunc(void);
@@ -1855,158 +1901,159 @@ SILO_API extern int DBErrlvl(void);
SILO_API extern int DBClose(DBfile *);
SILO_API extern int DBPause(DBfile *);
SILO_API extern int DBContinue(DBfile *);
-SILO_API extern int DBInqVarExists(DBfile *, const char *);
+SILO_API extern int DBInqVarExists(DBfile *, char const *);
SILO_API extern int DBForceSingle(int);
SILO_API extern int DBUninstall(DBfile *);
SILO_API extern DBoptlist *DBMakeOptlist(int);
SILO_API extern int DBClearOptlist(DBoptlist *);
SILO_API extern int DBFreeOptlist(DBoptlist *);
SILO_API extern int DBAddOption(DBoptlist *, int, void *);
-SILO_API extern void *DBGetOption(const DBoptlist *, int);
+SILO_API extern void *DBGetOption(DBoptlist const *, int);
SILO_API extern int DBClearOption(DBoptlist *, int);
SILO_API extern DBtoc *DBGetToc(DBfile *);
SILO_API extern int DBNewToc(DBfile *);
SILO_API extern int DBSortObjectsByOffset(DBfile *, int nobjs,
- const char *const *const obj_names, int *ranks);
+ char const *const *obj_names, int *ranks);
SILO_API extern int DBFilters(DBfile *, FILE *);
-SILO_API extern int DBFilterRegistration(const char *, int (*init) (DBfile *, char *),
+SILO_API extern int DBFilterRegistration(char const *, int (*init) (DBfile *, char *),
int (*open) (DBfile *, char *));
-SILO_API extern void *DBGetAtt(DBfile *, const char *, const char *);
-SILO_API extern DBobject *DBGetObject(DBfile *, const char *);
-SILO_API extern int DBChangeObject(DBfile *, DBobject *);
-SILO_API extern int DBWriteObject(DBfile *, DBobject *, int);
-SILO_API extern void *DBGetComponent(DBfile *, const char *, const char *);
-SILO_API extern int DBGetComponentType(DBfile *, const char *, const char *);
-SILO_API extern int DBWriteComponent(DBfile *, DBobject *, const char *, const char *, const char *,
- const void *, int, long *);
-SILO_API extern int DBWrite(DBfile *, const char *, void *, int *, int, int);
-SILO_API extern int DBWriteSlice(DBfile *, const char *, void *, int, int[], int[],
+SILO_API extern void *DBGetAtt(DBfile *, char const *, char const *);
+SILO_API extern DBobject *DBGetObject(DBfile *, char const *);
+SILO_API extern int DBChangeObject(DBfile *, DBobject const *);
+SILO_API extern int DBWriteObject(DBfile *, DBobject const *, int);
+SILO_API extern void *DBGetComponent(DBfile *, char const *, char const *);
+SILO_API extern int DBGetComponentType(DBfile *, char const *, char const *);
+SILO_API extern int DBWriteComponent(DBfile *, DBobject *, char const *, char const *, char const *,
+ void const *, int, long const *);
+SILO_API extern int DBWrite(DBfile *, char const *, void const *, int const *, int, int);
+SILO_API extern int DBWriteSlice(DBfile *, char const *, void *, int, int[], int[],
int[], int[], int);
SILO_API extern DBfacelist *DBCalcExternalFacelist(int *, int, int, int *, int *, int,
int *, int);
SILO_API extern DBfacelist *DBCalcExternalFacelist2(int *, int, int, int, int, int *,
int *, int *, int, int *, int);
SILO_API extern int DBGetDir(DBfile *, char *);
-SILO_API extern int DBSetDir(DBfile *, const char *);
+SILO_API extern int DBSetDir(DBfile *, char const *);
SILO_API extern int DBSetDirID(DBfile *, int);
SILO_API extern int DBListDir(DBfile *, char **, int);
-SILO_API extern int DBMkDir(DBfile *, const char *);
-SILO_API extern int DBCpDir(DBfile *dbfile, const char *srcDir,
- DBfile *dstFile, const char *dstDir);
+SILO_API extern int DBMkDir(DBfile *, char const *);
+SILO_API extern int DBCpDir(DBfile *dbfile, char const *srcDir,
+ DBfile *dstFile, char const *dstDir);
#define DBMkdir DBMkDir
-SILO_API extern int DBReadAtt(DBfile *, const char *, const char *, void *);
-SILO_API extern int DBRead(DBfile *, const char *, void *);
-SILO_API extern int DBReadVar(DBfile *, const char *, void *);
-SILO_API extern int DBReadVar1(DBfile *, const char *, int, void *);
-SILO_API extern int DBReadVarSlice(DBfile *, const char *, int *, int *, int *, int,
+SILO_API extern int DBReadAtt(DBfile *, char const *, char const *, void *);
+SILO_API extern int DBRead(DBfile *, char const *, void *);
+SILO_API extern int DBReadVar(DBfile *, char const *, void *);
+SILO_API extern int DBReadVar1(DBfile *, char const *, int, void *);
+SILO_API extern int DBReadVarSlice(DBfile *, char const *, int *, int *, int *, int,
void *);
-SILO_API extern DBobject *DBMakeObject(const char *, int, int);
+SILO_API extern int DBGetObjtypeTag (char const *);
+SILO_API extern DBobject *DBMakeObject(char const *, int, int);
SILO_API extern int DBFreeObject(DBobject *);
SILO_API extern int DBClearObject(DBobject *);
-SILO_API extern int DBAddVarComponent(DBobject *, const char *, const char *);
-SILO_API extern int DBAddIntComponent(DBobject *, const char *, int);
-SILO_API extern int DBAddFltComponent(DBobject *, const char *, double);
-SILO_API extern int DBAddDblComponent(DBobject *, const char *, double);
-SILO_API extern int DBAddStrComponent(DBobject *, const char *, const char *);
-SILO_API extern int DBGetComponentNames(DBfile *, const char *, char ***, char ***);
-
-SILO_API extern DBcompoundarray *DBGetCompoundarray(DBfile *, const char *);
-SILO_API extern DBcurve *DBGetCurve(DBfile *, const char *);
-SILO_API extern DBdefvars *DBGetDefvars(DBfile *, const char *);
-SILO_API extern DBmaterial *DBGetMaterial(DBfile *, const char *);
-SILO_API extern DBmatspecies *DBGetMatspecies(DBfile *, const char *);
-SILO_API extern DBmultimesh *DBGetMultimesh(DBfile *, const char *);
-SILO_API extern DBmultimeshadj *DBGetMultimeshadj(DBfile *, const char *,
+SILO_API extern int DBAddVarComponent(DBobject *, char const *, char const *);
+SILO_API extern int DBAddIntComponent(DBobject *, char const *, int);
+SILO_API extern int DBAddFltComponent(DBobject *, char const *, double);
+SILO_API extern int DBAddDblComponent(DBobject *, char const *, double);
+SILO_API extern int DBAddStrComponent(DBobject *, char const *, char const *);
+SILO_API extern int DBGetComponentNames(DBfile *, char const *, char ***, char ***);
+
+SILO_API extern DBcompoundarray *DBGetCompoundarray(DBfile *, char const *);
+SILO_API extern DBcurve *DBGetCurve(DBfile *, char const *);
+SILO_API extern DBdefvars *DBGetDefvars(DBfile *, char const *);
+SILO_API extern DBmaterial *DBGetMaterial(DBfile *, char const *);
+SILO_API extern DBmatspecies *DBGetMatspecies(DBfile *, char const *);
+SILO_API extern DBmultimesh *DBGetMultimesh(DBfile *, char const *);
+SILO_API extern DBmultimeshadj *DBGetMultimeshadj(DBfile *, char const *,
int, const int *);
-SILO_API extern DBmultivar *DBGetMultivar(DBfile *, const char *);
-SILO_API extern DBmultimat *DBGetMultimat(DBfile *, const char *);
-SILO_API extern DBmultimatspecies *DBGetMultimatspecies(DBfile *, const char *);
-SILO_API extern DBpointmesh *DBGetPointmesh(DBfile *, const char *);
-SILO_API extern DBmeshvar *DBGetPointvar(DBfile *, const char *);
-SILO_API extern DBquadmesh *DBGetQuadmesh(DBfile *, const char *);
-SILO_API extern DBquadvar *DBGetQuadvar(DBfile *, const char *);
-SILO_API extern int DBGetQuadvar1(DBfile *, const char *, DB_DTPTR1, int *, int *,
+SILO_API extern DBmultivar *DBGetMultivar(DBfile *, char const *);
+SILO_API extern DBmultimat *DBGetMultimat(DBfile *, char const *);
+SILO_API extern DBmultimatspecies *DBGetMultimatspecies(DBfile *, char const *);
+SILO_API extern DBpointmesh *DBGetPointmesh(DBfile *, char const *);
+SILO_API extern DBmeshvar *DBGetPointvar(DBfile *, char const *);
+SILO_API extern DBquadmesh *DBGetQuadmesh(DBfile *, char const *);
+SILO_API extern DBquadvar *DBGetQuadvar(DBfile *, char const *);
+SILO_API extern int DBGetQuadvar1(DBfile *, char const *, DB_DTPTR1, int *, int *,
DB_DTPTR1, int *, int *, int *);
SILO_API extern int DBAnnotateUcdmesh(DBucdmesh *);
-SILO_API extern DBucdmesh *DBGetUcdmesh(DBfile *, const char *);
-SILO_API extern DBucdvar *DBGetUcdvar(DBfile *, const char *);
-SILO_API extern DBcsgmesh *DBGetCsgmesh(DBfile *, const char *);
-SILO_API extern DBcsgvar *DBGetCsgvar(DBfile *, const char *);
-SILO_API extern DBcsgzonelist *DBGetCSGZonelist(DBfile *, const char *);
-SILO_API extern DBfacelist *DBGetFacelist(DBfile *, const char *);
-SILO_API extern DBzonelist *DBGetZonelist(DBfile *, const char *);
-SILO_API extern DBphzonelist *DBGetPHZonelist(DBfile *, const char *);
-SILO_API extern void *DBGetVar(DBfile *, const char *);
-SILO_API extern int DBGetVarByteLength(DBfile *, const char *);
-SILO_API extern int DBGetVarLength(DBfile *, const char *);
-SILO_API extern int DBGetVarDims(DBfile *, const char *, int, int *);
-SILO_API extern int DBGetVarType(DBfile *, const char *);
+SILO_API extern DBucdmesh *DBGetUcdmesh(DBfile *, char const *);
+SILO_API extern DBucdvar *DBGetUcdvar(DBfile *, char const *);
+SILO_API extern DBcsgmesh *DBGetCsgmesh(DBfile *, char const *);
+SILO_API extern DBcsgvar *DBGetCsgvar(DBfile *, char const *);
+SILO_API extern DBcsgzonelist *DBGetCSGZonelist(DBfile *, char const *);
+SILO_API extern DBfacelist *DBGetFacelist(DBfile *, char const *);
+SILO_API extern DBzonelist *DBGetZonelist(DBfile *, char const *);
+SILO_API extern DBphzonelist *DBGetPHZonelist(DBfile *, char const *);
+SILO_API extern void *DBGetVar(DBfile *, char const *);
+SILO_API extern int DBGetVarByteLength(DBfile *, char const *);
+SILO_API extern int DBGetVarLength(DBfile *, char const *);
+SILO_API extern int DBGetVarDims(DBfile *, char const *, int, int *);
+SILO_API extern int DBGetVarType(DBfile *, char const *);
SILO_API extern int DBInqFileHasObjects(DBfile *);
-SILO_API extern int DBInqMeshname(DBfile *, const char *, const char *);
-SILO_API extern int DBInqMeshtype(DBfile *, const char *);
-SILO_API extern int DBInqCompoundarray(DBfile *, const char *, char ***,
+SILO_API extern int DBInqMeshname(DBfile *, char const *, char const *);
+SILO_API extern int DBInqMeshtype(DBfile *, char const *);
+SILO_API extern int DBInqCompoundarray(DBfile *, char const *, char ***,
int **, int *, int *, int *);
-SILO_API extern DBObjectType DBInqVarType(DBfile *, const char *);
+SILO_API extern DBObjectType DBInqVarType(DBfile *, char const *);
-SILO_API extern int DBPutCompoundarray(DBfile *, const char *, char **, int *, int,
+SILO_API extern int DBPutCompoundarray(DBfile *, char const *, char **, int *, int,
void *, int, int, DBoptlist *);
-SILO_API extern int DBPutCurve(DBfile *, const char *, void *, void *, int, int,
+SILO_API extern int DBPutCurve(DBfile *, char const *, void *, void *, int, int,
DBoptlist *);
-SILO_API extern int DBPutDefvars (DBfile *, const char *, int, char **,
- const int *, char **, DBoptlist **);
-SILO_API extern int DBPutFacelist(DBfile *, const char *, int, int, int *, int, int,
+SILO_API extern int DBPutDefvars (DBfile *, char const *, int, char **,
+ int const *, char **, DBoptlist **);
+SILO_API extern int DBPutFacelist(DBfile *, char const *, int, int, int *, int, int,
int *, int *, int *, int, int *, int *, int);
-SILO_API extern int DBPutMaterial(DBfile *, const char *, const char *, int, int *, int *,
+SILO_API extern int DBPutMaterial(DBfile *, char const *, char const *, int, int *, int *,
int *, int, int *, int *, int *, DB_DTPTR1, int,
int, DBoptlist *);
-SILO_API extern int DBPutMatspecies(struct DBfile *, const char *, const char *, int, int *,
+SILO_API extern int DBPutMatspecies(struct DBfile *, char const *, char const *, int, int *,
int *, int *, int, int, DB_DTPTR1, int *, int, int,
DBoptlist *);
-SILO_API extern int DBPutMultimesh(DBfile *, const char *, int, char **, int *,
- DBoptlist *);
-SILO_API extern int DBPutMultimeshadj(DBfile *, const char *, int, const int *,
- const int *, const int *, const int *, const int *,
- int **, const int *, int **, DBoptlist *optlist);
-SILO_API extern int DBPutMultivar(DBfile *, const char *, int, char **, int *,
+SILO_API extern int DBPutMultimesh(DBfile *, char DB_CONSTARR1, int, char DB_CONSTARR2, int DB_CONSTARR1,
+ DBoptlist const *);
+SILO_API extern int DBPutMultimeshadj(DBfile *, char DB_CONSTARR1, int, int DB_CONSTARR1,
+ int DB_CONSTARR1, int DB_CONSTARR1, int DB_CONSTARR1, int DB_CONSTARR1,
+ int DB_CONSTARR2, int DB_CONSTARR1, int DB_CONSTARR2, DBoptlist const *optlist);
+SILO_API extern int DBPutMultivar(DBfile *, char const *, int, char **, int *,
DBoptlist *);
-SILO_API extern int DBPutMultimat(DBfile *, const char *, int, char **, DBoptlist *);
-SILO_API extern int DBPutMultimatspecies(DBfile *, const char *, int, char **,
+SILO_API extern int DBPutMultimat(DBfile *, char const *, int, char **, DBoptlist *);
+SILO_API extern int DBPutMultimatspecies(DBfile *, char const *, int, char **,
DBoptlist *);
-SILO_API extern int DBPutPointmesh(DBfile *, const char *, int, DB_DTPTR2, int, int,
+SILO_API extern int DBPutPointmesh(DBfile *, char const *, int, DB_DTPTR2, int, int,
DBoptlist *);
-SILO_API extern int DBPutPointvar(DBfile *, const char *, const char *, int, DB_DTPTR2, int,
+SILO_API extern int DBPutPointvar(DBfile *, char const *, char const *, int, DB_DTPTR2, int,
int, DBoptlist *);
-SILO_API extern int DBPutPointvar1(DBfile *, const char *, const char *, DB_DTPTR1, int, int,
+SILO_API extern int DBPutPointvar1(DBfile *, char const *, char const *, DB_DTPTR1, int, int,
DBoptlist *);
-SILO_API extern int DBPutQuadmesh(DBfile *, const char *, char **, DB_DTPTR2, int *, int,
+SILO_API extern int DBPutQuadmesh(DBfile *, char const *, char **, DB_DTPTR2, int *, int,
int, int, DBoptlist *);
-SILO_API extern int DBPutQuadvar(DBfile *, const char *, const char *, int, char **, DB_DTPTR2,
+SILO_API extern int DBPutQuadvar(DBfile *, char const *, char const *, int, char **, DB_DTPTR2,
int *, int, DB_DTPTR2, int, int, int, DBoptlist *);
-SILO_API extern int DBPutQuadvar1(DBfile *, const char *, const char *, DB_DTPTR1, int *, int,
+SILO_API extern int DBPutQuadvar1(DBfile *, char const *, char const *, DB_DTPTR1, int *, int,
DB_DTPTR1, int, int, int, DBoptlist *);
-SILO_API extern int DBPutUcdmesh(DBfile *, const char *, int, char **, DB_DTPTR2, int,
- int, const char *, const char *, int, DBoptlist *);
-SILO_API extern int DBPutUcdsubmesh(DBfile *, const char *, const char *, int,
- const char *, const char *, DBoptlist *);
-SILO_API extern int DBPutUcdvar(DBfile *, const char *, const char *, int, char **, DB_DTPTR2,
+SILO_API extern int DBPutUcdmesh(DBfile *, char const *, int, char **, DB_DTPTR2, int,
+ int, char const *, char const *, int, DBoptlist *);
+SILO_API extern int DBPutUcdsubmesh(DBfile *, char const *, char const *, int,
+ char const *, char const *, DBoptlist *);
+SILO_API extern int DBPutUcdvar(DBfile *, char const *, char const *, int, char **, DB_DTPTR2,
int, DB_DTPTR2, int, int, int, DBoptlist *);
-SILO_API extern int DBPutUcdvar1(DBfile *, const char *, const char *, DB_DTPTR1, int, DB_DTPTR1,
+SILO_API extern int DBPutUcdvar1(DBfile *, char const *, char const *, DB_DTPTR1, int, DB_DTPTR1,
int, int, int, DBoptlist *);
-SILO_API extern int DBPutZonelist(DBfile *, const char *, int, int, int *, int, int,
+SILO_API extern int DBPutZonelist(DBfile *, char const *, int, int, int *, int, int,
int *, int *, int);
-SILO_API extern int DBPutZonelist2(DBfile *, const char *, int, int, int *, int, int,
+SILO_API extern int DBPutZonelist2(DBfile *, char const *, int, int, int *, int, int,
int, int, int *, int *, int *, int, DBoptlist*);
-SILO_API extern int DBPutPHZonelist(DBfile *, const char *, int, int *, int, int *, const char *,
+SILO_API extern int DBPutPHZonelist(DBfile *, char const *, int, int *, int, int *, char const *,
int, int *, int, int *,
int, int, int, DBoptlist *);
-SILO_API extern int DBPutCsgmesh(DBfile *, const char *, int, int, const int *, const int *,
- const void *, int, int, const double *, const char *,
+SILO_API extern int DBPutCsgmesh(DBfile *, char const *, int, int, int const *, int const *,
+ void const *, int, int, double const *, char const *,
DBoptlist *);
-SILO_API extern int DBPutCSGZonelist(DBfile *, const char *, int, const int *,
- const int *, const int *, const void *, int, int,
- int, const int *, DBoptlist *);
-SILO_API extern int DBPutCsgvar(DBfile *, const char *, const char *, int, char **,
+SILO_API extern int DBPutCSGZonelist(DBfile *, char const *, int, int const *,
+ int const *, int const *, void const *, int, int,
+ int, int const *, DBoptlist *);
+SILO_API extern int DBPutCsgvar(DBfile *, char const *, char const *, int, char **,
void **, int, int, int, DBoptlist *);
SILO_API extern void DBFreeMrgtree(DBmrgtree *tree);
@@ -2017,54 +2064,54 @@ SILO_API extern void DBWalkMrgtree(DBmrgtree *tree, DBmrgwalkcb cb, void *wdata,
SILO_API extern DBmrgtree *DBMakeMrgtree(int source_mesh_type, int mrgtree_info,
int max_root_descendents, DBoptlist *opts);
-SILO_API extern int DBAddRegion(DBmrgtree *tree, const char *region_name,
+SILO_API extern int DBAddRegion(DBmrgtree *tree, char const *region_name,
int type_info_bits, int max_descendents,
- const char *maps_name, int nsegs, int *seg_ids,
+ char const *maps_name, int nsegs, int *seg_ids,
int *seg_sizes, int *seg_types, DBoptlist *opts);
SILO_API extern int DBAddRegionArray(DBmrgtree *tree, int nregn,
char **regn_names, int type_info_bits,
- const char *maps_name, int nsegs, int *seg_ids,
+ char const *maps_name, int nsegs, int *seg_ids,
int *seg_sizes, int *seg_types, DBoptlist *opts);
-SILO_API extern int DBSetCwr(DBmrgtree *tree, const char *path);
-SILO_API extern const char *DBGetCwr(DBmrgtree *tree);
+SILO_API extern int DBSetCwr(DBmrgtree *tree, char const *path);
+SILO_API extern char const *DBGetCwr(DBmrgtree *tree);
-SILO_API extern int DBPutMrgtree(DBfile *dbfile, const char *mrg_tree_name,
- const char *mesh_name, DBmrgtree *tree, DBoptlist *opts);
-SILO_API extern DBmrgtree *DBGetMrgtree(DBfile *dbfile, const char *mrg_tree_name);
+SILO_API extern int DBPutMrgtree(DBfile *dbfile, char const *mrg_tree_name,
+ char const *mesh_name, DBmrgtree *tree, DBoptlist *opts);
+SILO_API extern DBmrgtree *DBGetMrgtree(DBfile *dbfile, char const *mrg_tree_name);
-SILO_API extern int DBPutMrgvar(DBfile *dbfile, const char *name,
- const char *mrgt_name,
+SILO_API extern int DBPutMrgvar(DBfile *dbfile, char const *name,
+ char const *mrgt_name,
int ncomps, char **compnames,
int nregns, char **reg_pnames,
int datatype, void **data, DBoptlist *opts);
-SILO_API extern DBmrgvar *DBGetMrgvar(DBfile *dbfile, const char *name);
+SILO_API extern DBmrgvar *DBGetMrgvar(DBfile *dbfile, char const *name);
SILO_API extern void DBFreeMrgvar(DBmrgvar *mrgv);
-SILO_API extern int DBPutGroupelmap(DBfile *dbfile, const char *map_name,
+SILO_API extern int DBPutGroupelmap(DBfile *dbfile, char const *map_name,
int num_segments, int *groupel_types, int *segment_lengths,
int *segment_ids, int **segment_data, void **segment_fracs,
int fracs_data_type, DBoptlist *opts);
-SILO_API extern DBgroupelmap *DBGetGroupelmap(DBfile *dbfile, const char *name);
+SILO_API extern DBgroupelmap *DBGetGroupelmap(DBfile *dbfile, char const *name);
SILO_API extern void DBFreeGroupelmap(DBgroupelmap *map);
SILO_API extern void * DBFortranAccessPointer(int value);
SILO_API extern int DBFortranAllocPointer(void *pointer);
SILO_API extern void DBFortranRemovePointer(int value);
-SILO_API extern int DBVariableNameValid(const char *s);
-SILO_API extern char *safe_strdup(const char *s);
+SILO_API extern int DBVariableNameValid(char const *s);
+SILO_API extern char *safe_strdup(char const *s);
-SILO_API extern int DBFreeCompressionResources(DBfile *dbfile, const char *meshname);
+SILO_API extern int DBFreeCompressionResources(DBfile *dbfile, char const *meshname);
-SILO_API extern DBnamescheme *DBMakeNamescheme(const char *fmt, ...);
-SILO_API const char *DBGetName(DBnamescheme *ns, int natnum);
+SILO_API extern DBnamescheme *DBMakeNamescheme(char const *fmt, ...);
+SILO_API char const *DBGetName(DBnamescheme *ns, int natnum);
SILO_API extern void DBStringArrayToStringList(char **strArray, int n,
char **strList, int *m);
-SILO_API char ** DBStringListToStringArray(char *strList, int n, int handleSlashSwap,
- int skipFirstSemicolon);
+SILO_API char ** DBStringListToStringArray(char *strList, int *n, int handleSlashSwap,
+ int skipSemicolonAtIndexZero);
/*-------------------------------------------------------------------------
* Public global variables.
@@ -2075,8 +2122,8 @@ SILO_API extern int db_errno; /*error number of last error */
SILO_API extern char db_errfunc[]; /*name of erring function */
#ifndef DB_MAIN
-SILO_API extern DBfile *(*DBOpenCB[])(const char *, int, int);
-SILO_API extern DBfile *(*DBCreateCB[])(const char *, int, int, int, const char *);
+SILO_API extern DBfile *(*DBOpenCB[])(char const *, int, int);
+SILO_API extern DBfile *(*DBCreateCB[])(char const *, int, int, int, char const *);
SILO_API extern int (*DBFSingleCB[])(int);
#endif
diff --git a/src/silo/silo.inc b/src/silo/silo.inc
index 51a16ab..72fd3c2 100644
--- a/src/silo/silo.inc
+++ b/src/silo/silo.inc
@@ -2,7 +2,7 @@
!
! SILO include file for Fortan applications.
!
-! Programmer: miller86 Wed Sep 15 10:10:08 PDT 2010
+! Programmer: miller86 Wed Sep 21 09:25:31 PDT 2011
!
! WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
! This file is generated automatically from C header files in the
@@ -18,15 +18,16 @@
!...Functions.
- external dbaddcaopt, dbaddccmp, dbaddcopt, dbadddopt, dbaddicmp
- external dbaddiopt, dbaddrcmp, dbaddregion, dbaddregiona
- external dbaddropt, dbcalcfl, dbclose, dbcreate, dberrno, dbfgetca
- external dbfreemrgtree, dbfreeobject, dbfreeoptlist, dbget2dstrlen
- external dbgetca, dbgetcksums, dbgetcompress, dbgetcurve
- external dbgetdepwarn, dbgethdfnms, dbgetovrwrt, dbgetqv1, dbinqca
- external dbinqfile, dbinqlen, dbmkdir, dbmkmrgtree, dbmkobject
- external dbmkoptlist, dbmkptr, dbopen, dbpmrgv, dbputca, dbputcsgm
- external dbputcsgv, dbputcsgzl, dbputcurve, dbputdefvars, dbputfl
+ external dbaddcaopt, dbaddccmp, dbaddcopt, dbadddopt, dbaddiaopt
+ external dbaddicmp, dbaddiopt, dbaddrcmp, dbaddregion
+ external dbaddregiona, dbaddropt, dbcalcfl, dbclose, dbcreate
+ external dberrno, dbfgetca, dbfreemrgtree, dbfreeobject
+ external dbfreeoptlist, dbget2dstrlen, dbgetca, dbgetcksums
+ external dbgetcompress, dbgetcurve, dbgetdepwarn, dbgethdfnms
+ external dbgetovrwrt, dbgetqv1, dbinqca, dbinqfile, dbinqlen
+ external dbmkdir, dbmkmrgtree, dbmkobject, dbmkoptlist, dbmkptr
+ external dbopen, dbpmrgv, dbputca, dbputcsgm, dbputcsgv
+ external dbputcsgzl, dbputcurve, dbputdefvars, dbputfl
external dbputgrplmap, dbputmat, dbputmmat, dbputmmesh
external dbputmrgtree, dbputmsp, dbputmvar, dbputpm, dbputpv1
external dbputqm, dbputqv, dbputqv1, dbputum, dbputuv1, dbputzl
@@ -36,15 +37,16 @@
external dbsetovrwrt, dbshowerrors, dbunregafopts, dbunregfopts
external dbwrite, dbwriteslice, dbwrtfl
- integer dbaddcaopt, dbaddccmp, dbaddcopt, dbadddopt, dbaddicmp
- integer dbaddiopt, dbaddrcmp, dbaddregion, dbaddregiona
- integer dbaddropt, dbcalcfl, dbclose, dbcreate, dberrno, dbfgetca
- integer dbfreemrgtree, dbfreeobject, dbfreeoptlist, dbget2dstrlen
- integer dbgetca, dbgetcksums, dbgetcompress, dbgetcurve
- integer dbgetdepwarn, dbgethdfnms, dbgetovrwrt, dbgetqv1, dbinqca
- integer dbinqfile, dbinqlen, dbmkdir, dbmkmrgtree, dbmkobject
- integer dbmkoptlist, dbmkptr, dbopen, dbpmrgv, dbputca, dbputcsgm
- integer dbputcsgv, dbputcsgzl, dbputcurve, dbputdefvars, dbputfl
+ integer dbaddcaopt, dbaddccmp, dbaddcopt, dbadddopt, dbaddiaopt
+ integer dbaddicmp, dbaddiopt, dbaddrcmp, dbaddregion
+ integer dbaddregiona, dbaddropt, dbcalcfl, dbclose, dbcreate
+ integer dberrno, dbfgetca, dbfreemrgtree, dbfreeobject
+ integer dbfreeoptlist, dbget2dstrlen, dbgetca, dbgetcksums
+ integer dbgetcompress, dbgetcurve, dbgetdepwarn, dbgethdfnms
+ integer dbgetovrwrt, dbgetqv1, dbinqca, dbinqfile, dbinqlen
+ integer dbmkdir, dbmkmrgtree, dbmkobject, dbmkoptlist, dbmkptr
+ integer dbopen, dbpmrgv, dbputca, dbputcsgm, dbputcsgv
+ integer dbputcsgzl, dbputcurve, dbputdefvars, dbputfl
integer dbputgrplmap, dbputmat, dbputmmat, dbputmmesh
integer dbputmrgtree, dbputmsp, dbputmvar, dbputpm, dbputpv1
integer dbputqm, dbputqv, dbputqv1, dbputum, dbputuv1, dbputzl
@@ -164,332 +166,319 @@
integer SILO_VERS_PAT, SILO_VERS_PRE
character*12 DB_F77NULLSTRING
- parameter (SILO_VERS_MAJ = 4 )
- parameter (SILO_VERS_MIN = 8 )
- parameter (SILO_VERS_PAT = 0 )
- parameter (SILO_VERS_PRE = 0 )
- parameter (DB_NETCDF = 0 )
- parameter (DB_PDB = 2 )
- parameter (DB_TAURUS = 3 )
- parameter (DB_UNKNOWN = 5 )
- parameter (DB_DEBUG = 6 )
- parameter (DB_HDF5X = 7 )
- parameter (DB_PDBP = 1 )
- parameter (DB_HDF5_SEC2_OBSOLETE = 256 )
- parameter (DB_HDF5_STDIO_OBSOLETE = 512 )
- parameter (DB_HDF5_CORE_OBSOLETE = 768 )
- parameter (DB_HDF5_MPIO_OBSOLETE = 1024 )
- parameter (DB_HDF5_MPIOP_OBSOLETE = 1280 )
- parameter (DB_H5VFD_DEFAULT = 0 )
- parameter (DB_H5VFD_SEC2 = 1 )
- parameter (DB_H5VFD_STDIO = 2 )
- parameter (DB_H5VFD_CORE = 3 )
- parameter (DB_H5VFD_LOG = 4 )
- parameter (DB_H5VFD_SPLIT = 5 )
- parameter (DB_H5VFD_DIRECT = 6 )
- parameter (DB_H5VFD_FAMILY = 7 )
- parameter (DB_H5VFD_MPIO = 8 )
- parameter (DB_H5VFD_MPIP = 9 )
- parameter (DB_H5VFD_SILO = 10 )
- parameter (DB_FILE_OPTS_H5_DEFAULT_DEFAULT = DB_H5VFD_DEFAULT)
- parameter (DB_FILE_OPTS_H5_DEFAULT_SEC2 = DB_H5VFD_SEC2 )
- parameter (DB_FILE_OPTS_H5_DEFAULT_STDIO = DB_H5VFD_STDIO )
- parameter (DB_FILE_OPTS_H5_DEFAULT_CORE = DB_H5VFD_CORE )
- parameter (DB_FILE_OPTS_H5_DEFAULT_LOG = DB_H5VFD_LOG )
- parameter (DB_FILE_OPTS_H5_DEFAULT_SPLIT = DB_H5VFD_SPLIT )
- parameter (DB_FILE_OPTS_H5_DEFAULT_DIRECT = DB_H5VFD_DIRECT)
- parameter (DB_FILE_OPTS_H5_DEFAULT_FAMILY = DB_H5VFD_FAMILY)
- parameter (DB_FILE_OPTS_H5_DEFAULT_MPIO = DB_H5VFD_MPIO )
- parameter (DB_FILE_OPTS_H5_DEFAULT_MPIP = DB_H5VFD_MPIP )
- parameter (DB_FILE_OPTS_H5_DEFAULT_SILO = DB_H5VFD_SILO )
- parameter (DB_FILE_OPTS_LAST = DB_FILE_OPTS_H5_DEF
- cAULT_SILO)
- parameter (DB_HDF5 = DB_HDF5X+DB_FILE_OP
- cTS_H5_DEFAULT_DEFAULT*2048)
- parameter (DB_HDF5_SEC2 = DB_HDF5X+DB_FILE_OP
- cTS_H5_DEFAULT_SEC2*2048)
- parameter (DB_HDF5_STDIO = DB_HDF5X+DB_FILE_OP
- cTS_H5_DEFAULT_STDIO*2048)
- parameter (DB_HDF5_CORE = DB_HDF5X+DB_FILE_OP
- cTS_H5_DEFAULT_CORE*2048)
- parameter (DB_HDF5_LOG = DB_HDF5X+DB_FILE_OP
- cTS_H5_DEFAULT_LOG*2048)
- parameter (DB_HDF5_SPLIT = DB_HDF5X+DB_FILE_OP
- cTS_H5_DEFAULT_SPLIT*2048)
- parameter (DB_HDF5_DIRECT = DB_HDF5X+DB_FILE_OP
- cTS_H5_DEFAULT_DIRECT*2048)
- parameter (DB_HDF5_FAMILY = DB_HDF5X+DB_FILE_OP
- cTS_H5_DEFAULT_FAMILY*2048)
- parameter (DB_HDF5_MPIO = DB_HDF5X+DB_FILE_OP
- cTS_H5_DEFAULT_MPIO*2048)
- parameter (DB_HDF5_MPIOP = DB_HDF5X+DB_FILE_OP
- cTS_H5_DEFAULT_MPIP*2048)
- parameter (DB_HDF5_MPIP = DB_HDF5X+DB_FILE_OP
- cTS_H5_DEFAULT_MPIP*2048)
- parameter (DB_HDF5_SILO = DB_HDF5X+DB_FILE_OP
- cTS_H5_DEFAULT_SILO*2048)
- parameter (DB_NFILES = 256 )
- parameter (DB_NFILTERS = 32 )
- parameter (DB_COLLINEAR = 130 )
- parameter (DB_NONCOLLINEAR = 131 )
- parameter (DB_QUAD_RECT = DB_COLLINEAR )
- parameter (DB_QUAD_CURV = DB_NONCOLLINEAR)
- parameter (DB_INVALID_OBJECT = -1 )
- parameter (DB_QUADRECT = DB_QUAD_RECT )
- parameter (DB_QUADCURV = DB_QUAD_CURV )
- parameter (DB_QUADMESH = 500 )
- parameter (DB_QUADVAR = 501 )
- parameter (DB_UCDMESH = 510 )
- parameter (DB_UCDVAR = 511 )
- parameter (DB_MULTIMESH = 520 )
- parameter (DB_MULTIVAR = 521 )
- parameter (DB_MULTIMAT = 522 )
- parameter (DB_MULTIMATSPECIES = 523 )
- parameter (DB_MULTIBLOCKMESH = DB_MULTIMESH )
- parameter (DB_MULTIBLOCKVAR = DB_MULTIVAR )
- parameter (DB_MULTIMESHADJ = 524 )
- parameter (DB_MATERIAL = 530 )
- parameter (DB_MATSPECIES = 531 )
- parameter (DB_FACELIST = 550 )
- parameter (DB_ZONELIST = 551 )
- parameter (DB_EDGELIST = 552 )
- parameter (DB_PHZONELIST = 553 )
- parameter (DB_CSGZONELIST = 554 )
- parameter (DB_CSGMESH = 555 )
- parameter (DB_CSGVAR = 556 )
- parameter (DB_CURVE = 560 )
- parameter (DB_DEFVARS = 565 )
- parameter (DB_POINTMESH = 570 )
- parameter (DB_POINTVAR = 571 )
- parameter (DB_ARRAY = 580 )
- parameter (DB_DIR = 600 )
- parameter (DB_VARIABLE = 610 )
- parameter (DB_MRGTREE = 611 )
- parameter (DB_GROUPELMAP = 612 )
- parameter (DB_MRGVAR = 613 )
- parameter (DB_USERDEF = 700 )
- parameter (DB_INT = 16 )
- parameter (DB_SHORT = 17 )
- parameter (DB_LONG = 18 )
- parameter (DB_FLOAT = 19 )
- parameter (DB_DOUBLE = 20 )
- parameter (DB_CHAR = 21 )
- parameter (DB_LONG_LONG = 22 )
- parameter (DB_NOTYPE = 25 )
- parameter (DB_CLOBBER = 0 )
- parameter (DB_NOCLOBBER = 1 )
- parameter (DB_READ = 1 )
- parameter (DB_APPEND = 2 )
- parameter (DB_LOCAL = 0 )
- parameter (DB_SUN3 = 10 )
- parameter (DB_SUN4 = 11 )
- parameter (DB_SGI = 12 )
- parameter (DB_RS6000 = 13 )
- parameter (DB_CRAY = 14 )
- parameter (DB_INTEL = 15 )
- parameter (DBOPT_FIRST = 260 )
- parameter (DBOPT_ALIGN = 260 )
- parameter (DBOPT_COORDSYS = 262 )
- parameter (DBOPT_CYCLE = 263 )
- parameter (DBOPT_FACETYPE = 264 )
- parameter (DBOPT_HI_OFFSET = 265 )
- parameter (DBOPT_LO_OFFSET = 266 )
- parameter (DBOPT_LABEL = 267 )
- parameter (DBOPT_XLABEL = 268 )
- parameter (DBOPT_YLABEL = 269 )
- parameter (DBOPT_ZLABEL = 270 )
- parameter (DBOPT_MAJORORDER = 271 )
- parameter (DBOPT_NSPACE = 272 )
- parameter (DBOPT_ORIGIN = 273 )
- parameter (DBOPT_PLANAR = 274 )
- parameter (DBOPT_TIME = 275 )
- parameter (DBOPT_UNITS = 276 )
- parameter (DBOPT_XUNITS = 277 )
- parameter (DBOPT_YUNITS = 278 )
- parameter (DBOPT_ZUNITS = 279 )
- parameter (DBOPT_DTIME = 280 )
- parameter (DBOPT_USESPECMF = 281 )
- parameter (DBOPT_XVARNAME = 282 )
- parameter (DBOPT_YVARNAME = 283 )
- parameter (DBOPT_ZVARNAME = 284 )
- parameter (DBOPT_ASCII_LABEL = 285 )
- parameter (DBOPT_MATNOS = 286 )
- parameter (DBOPT_NMATNOS = 287 )
- parameter (DBOPT_MATNAME = 288 )
- parameter (DBOPT_NMAT = 289 )
- parameter (DBOPT_NMATSPEC = 290 )
- parameter (DBOPT_BASEINDEX = 291 )
- parameter (DBOPT_ZONENUM = 292 )
- parameter (DBOPT_NODENUM = 293 )
- parameter (DBOPT_BLOCKORIGIN = 294 )
- parameter (DBOPT_GROUPNUM = 295 )
- parameter (DBOPT_GROUPORIGIN = 296 )
- parameter (DBOPT_NGROUPS = 297 )
- parameter (DBOPT_MATNAMES = 298 )
- parameter (DBOPT_EXTENTS_SIZE = 299 )
- parameter (DBOPT_EXTENTS = 300 )
- parameter (DBOPT_MATCOUNTS = 301 )
- parameter (DBOPT_MATLISTS = 302 )
- parameter (DBOPT_MIXLENS = 303 )
- parameter (DBOPT_ZONECOUNTS = 304 )
- parameter (DBOPT_HAS_EXTERNAL_ZONES = 305 )
- parameter (DBOPT_PHZONELIST = 306 )
- parameter (DBOPT_MATCOLORS = 307 )
- parameter (DBOPT_BNDNAMES = 308 )
- parameter (DBOPT_REGNAMES = 309 )
- parameter (DBOPT_ZONENAMES = 310 )
- parameter (DBOPT_HIDE_FROM_GUI = 311 )
- parameter (DBOPT_TOPO_DIM = 312 )
- parameter (DBOPT_REFERENCE = 313 )
- parameter (DBOPT_GROUPINGS_SIZE = 314 )
- parameter (DBOPT_GROUPINGS = 315 )
- parameter (DBOPT_GROUPINGNAMES = 316 )
- parameter (DBOPT_ALLOWMAT0 = 317 )
- parameter (DBOPT_MRGTREE_NAME = 318 )
- parameter (DBOPT_REGION_PNAMES = 319 )
- parameter (DBOPT_TENSOR_RANK = 320 )
- parameter (DBOPT_MMESH_NAME = 321 )
- parameter (DBOPT_TV_CONNECTIVITY = 322 )
- parameter (DBOPT_DISJOINT_MODE = 323 )
- parameter (DBOPT_MRGV_ONAMES = 324 )
- parameter (DBOPT_MRGV_RNAMES = 325 )
- parameter (DBOPT_SPECNAMES = 326 )
- parameter (DBOPT_SPECCOLORS = 327 )
- parameter (DBOPT_LLONGNZNUM = 328 )
- parameter (DBOPT_CONSERVED = 329 )
- parameter (DBOPT_EXTENSIVE = 330 )
- parameter (DBOPT_MB_FILE_NS = 331 )
- parameter (DBOPT_MB_BLOCK_NS = 332 )
- parameter (DBOPT_MB_BLOCK_TYPE = 333 )
- parameter (DBOPT_MB_EMPTY_LIST = 334 )
- parameter (DBOPT_MB_EMPTY_COUNT = 335 )
- parameter (DBOPT_LAST = 499 )
- parameter (DBOPT_H5_FIRST = 500 )
- parameter (DBOPT_H5_VFD = 500 )
- parameter (DBOPT_H5_RAW_FILE_OPTS = 501 )
- parameter (DBOPT_H5_RAW_EXTENSION = 502 )
- parameter (DBOPT_H5_META_FILE_OPTS = 503 )
- parameter (DBOPT_H5_META_EXTENSION = 504 )
- parameter (DBOPT_H5_CORE_ALLOC_INC = 505 )
- parameter (DBOPT_H5_CORE_NO_BACK_STORE = 506 )
- parameter (DBOPT_H5_META_BLOCK_SIZE = 507 )
- parameter (DBOPT_H5_SMALL_RAW_SIZE = 508 )
- parameter (DBOPT_H5_ALIGN_MIN = 509 )
- parameter (DBOPT_H5_ALIGN_VAL = 510 )
- parameter (DBOPT_H5_DIRECT_MEM_ALIGN = 511 )
- parameter (DBOPT_H5_DIRECT_BLOCK_SIZE = 512 )
- parameter (DBOPT_H5_DIRECT_BUF_SIZE = 513 )
- parameter (DBOPT_H5_LOG_NAME = 514 )
- parameter (DBOPT_H5_LOG_BUF_SIZE = 515 )
- parameter (DBOPT_H5_MPIO_COMM = 516 )
- parameter (DBOPT_H5_MPIO_INFO = 517 )
- parameter (DBOPT_H5_MPIP_NO_GPFS_HINTS = 518 )
- parameter (DBOPT_H5_SIEVE_BUF_SIZE = 519 )
- parameter (DBOPT_H5_CACHE_NELMTS = 520 )
- parameter (DBOPT_H5_CACHE_NBYTES = 521 )
- parameter (DBOPT_H5_CACHE_POLICY = 522 )
- parameter (DBOPT_H5_FAM_SIZE = 523 )
- parameter (DBOPT_H5_FAM_FILE_OPTS = 524 )
- parameter (DBOPT_H5_USER_DRIVER_ID = 525 )
- parameter (DBOPT_H5_USER_DRIVER_INFO = 526 )
- parameter (DBOPT_H5_SILO_BLOCK_SIZE = 527 )
- parameter (DBOPT_H5_SILO_BLOCK_COUNT = 528 )
- parameter (DBOPT_H5_SILO_LOG_STATS = 529 )
- parameter (DBOPT_H5_SILO_USE_DIRECT = 530 )
- parameter (DBOPT_H5_LAST = 599 )
- parameter (DB_TOP = 0 )
- parameter (DB_NONE = 1 )
- parameter (DB_ALL = 2 )
- parameter (DB_ABORT = 3 )
- parameter (DB_SUSPEND = 4 )
- parameter (DB_RESUME = 5 )
- parameter (DB_ALL_AND_DRVR = 6 )
- parameter (DB_ROWMAJOR = 0 )
- parameter (DB_COLMAJOR = 1 )
- parameter (DB_NOTCENT = 0 )
- parameter (DB_NODECENT = 110 )
- parameter (DB_ZONECENT = 111 )
- parameter (DB_FACECENT = 112 )
- parameter (DB_BNDCENT = 113 )
- parameter (DB_EDGECENT = 114 )
- parameter (DB_BLOCKCENT = 115 )
- parameter (DB_CARTESIAN = 120 )
- parameter (DB_CYLINDRICAL = 121 )
- parameter (DB_SPHERICAL = 122 )
- parameter (DB_NUMERICAL = 123 )
- parameter (DB_OTHER = 124 )
- parameter (DB_RECTILINEAR = 100 )
- parameter (DB_CURVILINEAR = 101 )
- parameter (DB_AREA = 140 )
- parameter (DB_VOLUME = 141 )
- parameter (DB_ON = 1000 )
- parameter (DB_OFF = -1000 )
- parameter (DB_ABUTTING = 142 )
- parameter (DB_FLOATING = 143 )
- parameter (DB_VARTYPE_SCALAR = 200 )
- parameter (DB_VARTYPE_VECTOR = 201 )
- parameter (DB_VARTYPE_TENSOR = 202 )
- parameter (DB_VARTYPE_SYMTENSOR = 203 )
- parameter (DB_VARTYPE_ARRAY = 204 )
- parameter (DB_VARTYPE_MATERIAL = 205 )
- parameter (DB_VARTYPE_SPECIES = 206 )
- parameter (DB_VARTYPE_LABEL = 207 )
- parameter (DBCSG_QUADRIC_G = 16777216 )
- parameter (DBCSG_SPHERE_PR = 33619968 )
- parameter (DBCSG_ELLIPSOID_PRRR = 33685504 )
- parameter (DBCSG_PLANE_G = 50331648 )
- parameter (DBCSG_PLANE_X = 50397184 )
- parameter (DBCSG_PLANE_Y = 50462720 )
- parameter (DBCSG_PLANE_Z = 50528256 )
- parameter (DBCSG_PLANE_PN = 50593792 )
- parameter (DBCSG_PLANE_PPP = 50659328 )
- parameter (DBCSG_CYLINDER_PNLR = 67108864 )
- parameter (DBCSG_CYLINDER_PPR = 67174400 )
- parameter (DBCSG_BOX_XYZXYZ = 83886080 )
- parameter (DBCSG_CONE_PNLA = 100663296 )
- parameter (DBCSG_CONE_PPA = 100728832 )
- parameter (DBCSG_POLYHEDRON_KF = 117440512 )
- parameter (DBCSG_HEX_6F = 117506048 )
- parameter (DBCSG_TET_4F = 117571584 )
- parameter (DBCSG_PYRAMID_5F = 117637120 )
- parameter (DBCSG_PRISM_5F = 117702656 )
- parameter (DBCSG_QUADRATIC_G = 134217728 )
- parameter (DBCSG_CIRCLE_PR = 150994944 )
- parameter (DBCSG_ELLIPSE_PRR = 151060480 )
- parameter (DBCSG_LINE_G = 167772160 )
- parameter (DBCSG_LINE_X = 167837696 )
- parameter (DBCSG_LINE_Y = 167903232 )
- parameter (DBCSG_LINE_PN = 167968768 )
- parameter (DBCSG_LINE_PP = 168034304 )
- parameter (DBCSG_BOX_XYXY = 184549376 )
- parameter (DBCSG_ANGLE_PNLA = 201326592 )
- parameter (DBCSG_ANGLE_PPA = 201392128 )
- parameter (DBCSG_POLYGON_KP = 218103808 )
- parameter (DBCSG_TRI_3P = 218169344 )
- parameter (DBCSG_QUAD_4P = 218234880 )
- parameter (DBCSG_INNER = 2130706432 )
- parameter (DBCSG_OUTER = 2130771968 )
- parameter (DBCSG_ON = 2130837504 )
- parameter (DBCSG_UNION = 2130903040 )
- parameter (DBCSG_INTERSECT = 2130968576 )
- parameter (DBCSG_DIFF = 2131034112 )
- parameter (DBCSG_COMPLIMENT = 2131099648 )
- parameter (DBCSG_XFORM = 2131165184 )
- parameter (DBCSG_SWEEP = 2131230720 )
- parameter (DB_PREORDER = 1 )
- parameter (DB_POSTORDER = 2 )
- parameter (DB_FROMCWR = 4 )
- parameter (DB_F77NULL = (-99) )
- parameter (DB_ZONETYPE_BEAM = 10 )
- parameter (DB_ZONETYPE_POLYGON = 20 )
- parameter (DB_ZONETYPE_TRIANGLE = 23 )
- parameter (DB_ZONETYPE_QUAD = 24 )
- parameter (DB_ZONETYPE_POLYHEDRON = 30 )
- parameter (DB_ZONETYPE_TET = 34 )
- parameter (DB_ZONETYPE_PYRAMID = 35 )
- parameter (DB_ZONETYPE_PRISM = 36 )
- parameter (DB_ZONETYPE_HEX = 38 )
- parameter (DB_F77NULLSTRING = "NULLSTRING" )
+ parameter(SILO_VERS_MAJ=4)
+ parameter(SILO_VERS_MIN=8)
+ parameter(SILO_VERS_PAT=0)
+ parameter(SILO_VERS_PRE=0)
+ parameter(DB_NETCDF=0)
+ parameter(DB_PDB=2)
+ parameter(DB_TAURUS=3)
+ parameter(DB_UNKNOWN=5)
+ parameter(DB_DEBUG=6)
+ parameter(DB_HDF5X=7)
+ parameter(DB_PDBP=1)
+ parameter(DB_HDF5_SEC2_OBSOLETE=256)
+ parameter(DB_HDF5_STDIO_OBSOLETE=512)
+ parameter(DB_HDF5_CORE_OBSOLETE=768)
+ parameter(DB_HDF5_MPIO_OBSOLETE=1024)
+ parameter(DB_HDF5_MPIOP_OBSOLETE=1280)
+ parameter(DB_H5VFD_DEFAULT=0)
+ parameter(DB_H5VFD_SEC2=1)
+ parameter(DB_H5VFD_STDIO=2)
+ parameter(DB_H5VFD_CORE=3)
+ parameter(DB_H5VFD_LOG=4)
+ parameter(DB_H5VFD_SPLIT=5)
+ parameter(DB_H5VFD_DIRECT=6)
+ parameter(DB_H5VFD_FAMILY=7)
+ parameter(DB_H5VFD_MPIO=8)
+ parameter(DB_H5VFD_MPIP=9)
+ parameter(DB_H5VFD_SILO=10)
+ parameter(DB_FILE_OPTS_H5_DEFAULT_DEFAULT=0)
+ parameter(DB_FILE_OPTS_H5_DEFAULT_SEC2=1)
+ parameter(DB_FILE_OPTS_H5_DEFAULT_STDIO=2)
+ parameter(DB_FILE_OPTS_H5_DEFAULT_CORE=3)
+ parameter(DB_FILE_OPTS_H5_DEFAULT_LOG=4)
+ parameter(DB_FILE_OPTS_H5_DEFAULT_SPLIT=5)
+ parameter(DB_FILE_OPTS_H5_DEFAULT_DIRECT=6)
+ parameter(DB_FILE_OPTS_H5_DEFAULT_FAMILY=7)
+ parameter(DB_FILE_OPTS_H5_DEFAULT_MPIO=8)
+ parameter(DB_FILE_OPTS_H5_DEFAULT_MPIP=9)
+ parameter(DB_FILE_OPTS_H5_DEFAULT_SILO=10)
+ parameter(DB_FILE_OPTS_LAST=10)
+ parameter(DB_HDF5=7)
+ parameter(DB_HDF5_SEC2=2055)
+ parameter(DB_HDF5_STDIO=4103)
+ parameter(DB_HDF5_CORE=6151)
+ parameter(DB_HDF5_LOG=8199)
+ parameter(DB_HDF5_SPLIT=10247)
+ parameter(DB_HDF5_DIRECT=12295)
+ parameter(DB_HDF5_FAMILY=14343)
+ parameter(DB_HDF5_MPIO=16391)
+ parameter(DB_HDF5_MPIOP=18439)
+ parameter(DB_HDF5_MPIP=18439)
+ parameter(DB_HDF5_SILO=20487)
+ parameter(DB_NFILES=256)
+ parameter(DB_NFILTERS=32)
+ parameter(DB_COLLINEAR=130)
+ parameter(DB_NONCOLLINEAR=131)
+ parameter(DB_QUAD_RECT=130)
+ parameter(DB_QUAD_CURV=131)
+ parameter(DB_INVALID_OBJECT=-1)
+ parameter(DB_QUADRECT=130)
+ parameter(DB_QUADCURV=131)
+ parameter(DB_QUADMESH=500)
+ parameter(DB_QUADVAR=501)
+ parameter(DB_UCDMESH=510)
+ parameter(DB_UCDVAR=511)
+ parameter(DB_MULTIMESH=520)
+ parameter(DB_MULTIVAR=521)
+ parameter(DB_MULTIMAT=522)
+ parameter(DB_MULTIMATSPECIES=523)
+ parameter(DB_MULTIBLOCKMESH=520)
+ parameter(DB_MULTIBLOCKVAR=521)
+ parameter(DB_MULTIMESHADJ=524)
+ parameter(DB_MATERIAL=530)
+ parameter(DB_MATSPECIES=531)
+ parameter(DB_FACELIST=550)
+ parameter(DB_ZONELIST=551)
+ parameter(DB_EDGELIST=552)
+ parameter(DB_PHZONELIST=553)
+ parameter(DB_CSGZONELIST=554)
+ parameter(DB_CSGMESH=555)
+ parameter(DB_CSGVAR=556)
+ parameter(DB_CURVE=560)
+ parameter(DB_DEFVARS=565)
+ parameter(DB_POINTMESH=570)
+ parameter(DB_POINTVAR=571)
+ parameter(DB_ARRAY=580)
+ parameter(DB_DIR=600)
+ parameter(DB_VARIABLE=610)
+ parameter(DB_MRGTREE=611)
+ parameter(DB_GROUPELMAP=612)
+ parameter(DB_MRGVAR=613)
+ parameter(DB_USERDEF=700)
+ parameter(DB_INT=16)
+ parameter(DB_SHORT=17)
+ parameter(DB_LONG=18)
+ parameter(DB_FLOAT=19)
+ parameter(DB_DOUBLE=20)
+ parameter(DB_CHAR=21)
+ parameter(DB_LONG_LONG=22)
+ parameter(DB_NOTYPE=25)
+ parameter(DB_CLOBBER=0)
+ parameter(DB_NOCLOBBER=1)
+ parameter(DB_READ=1)
+ parameter(DB_APPEND=2)
+ parameter(DB_LOCAL=0)
+ parameter(DB_SUN3=10)
+ parameter(DB_SUN4=11)
+ parameter(DB_SGI=12)
+ parameter(DB_RS6000=13)
+ parameter(DB_CRAY=14)
+ parameter(DB_INTEL=15)
+ parameter(DBOPT_FIRST=260)
+ parameter(DBOPT_ALIGN=260)
+ parameter(DBOPT_COORDSYS=262)
+ parameter(DBOPT_CYCLE=263)
+ parameter(DBOPT_FACETYPE=264)
+ parameter(DBOPT_HI_OFFSET=265)
+ parameter(DBOPT_LO_OFFSET=266)
+ parameter(DBOPT_LABEL=267)
+ parameter(DBOPT_XLABEL=268)
+ parameter(DBOPT_YLABEL=269)
+ parameter(DBOPT_ZLABEL=270)
+ parameter(DBOPT_MAJORORDER=271)
+ parameter(DBOPT_NSPACE=272)
+ parameter(DBOPT_ORIGIN=273)
+ parameter(DBOPT_PLANAR=274)
+ parameter(DBOPT_TIME=275)
+ parameter(DBOPT_UNITS=276)
+ parameter(DBOPT_XUNITS=277)
+ parameter(DBOPT_YUNITS=278)
+ parameter(DBOPT_ZUNITS=279)
+ parameter(DBOPT_DTIME=280)
+ parameter(DBOPT_USESPECMF=281)
+ parameter(DBOPT_XVARNAME=282)
+ parameter(DBOPT_YVARNAME=283)
+ parameter(DBOPT_ZVARNAME=284)
+ parameter(DBOPT_ASCII_LABEL=285)
+ parameter(DBOPT_MATNOS=286)
+ parameter(DBOPT_NMATNOS=287)
+ parameter(DBOPT_MATNAME=288)
+ parameter(DBOPT_NMAT=289)
+ parameter(DBOPT_NMATSPEC=290)
+ parameter(DBOPT_BASEINDEX=291)
+ parameter(DBOPT_ZONENUM=292)
+ parameter(DBOPT_NODENUM=293)
+ parameter(DBOPT_BLOCKORIGIN=294)
+ parameter(DBOPT_GROUPNUM=295)
+ parameter(DBOPT_GROUPORIGIN=296)
+ parameter(DBOPT_NGROUPS=297)
+ parameter(DBOPT_MATNAMES=298)
+ parameter(DBOPT_EXTENTS_SIZE=299)
+ parameter(DBOPT_EXTENTS=300)
+ parameter(DBOPT_MATCOUNTS=301)
+ parameter(DBOPT_MATLISTS=302)
+ parameter(DBOPT_MIXLENS=303)
+ parameter(DBOPT_ZONECOUNTS=304)
+ parameter(DBOPT_HAS_EXTERNAL_ZONES=305)
+ parameter(DBOPT_PHZONELIST=306)
+ parameter(DBOPT_MATCOLORS=307)
+ parameter(DBOPT_BNDNAMES=308)
+ parameter(DBOPT_REGNAMES=309)
+ parameter(DBOPT_ZONENAMES=310)
+ parameter(DBOPT_HIDE_FROM_GUI=311)
+ parameter(DBOPT_TOPO_DIM=312)
+ parameter(DBOPT_REFERENCE=313)
+ parameter(DBOPT_GROUPINGS_SIZE=314)
+ parameter(DBOPT_GROUPINGS=315)
+ parameter(DBOPT_GROUPINGNAMES=316)
+ parameter(DBOPT_ALLOWMAT0=317)
+ parameter(DBOPT_MRGTREE_NAME=318)
+ parameter(DBOPT_REGION_PNAMES=319)
+ parameter(DBOPT_TENSOR_RANK=320)
+ parameter(DBOPT_MMESH_NAME=321)
+ parameter(DBOPT_TV_CONNECTIVITY=322)
+ parameter(DBOPT_DISJOINT_MODE=323)
+ parameter(DBOPT_MRGV_ONAMES=324)
+ parameter(DBOPT_MRGV_RNAMES=325)
+ parameter(DBOPT_SPECNAMES=326)
+ parameter(DBOPT_SPECCOLORS=327)
+ parameter(DBOPT_LLONGNZNUM=328)
+ parameter(DBOPT_CONSERVED=329)
+ parameter(DBOPT_EXTENSIVE=330)
+ parameter(DBOPT_MB_FILE_NS=331)
+ parameter(DBOPT_MB_BLOCK_NS=332)
+ parameter(DBOPT_MB_BLOCK_TYPE=333)
+ parameter(DBOPT_MB_EMPTY_LIST=334)
+ parameter(DBOPT_MB_EMPTY_COUNT=335)
+ parameter(DBOPT_LAST=499)
+ parameter(DBOPT_H5_FIRST=500)
+ parameter(DBOPT_H5_VFD=500)
+ parameter(DBOPT_H5_RAW_FILE_OPTS=501)
+ parameter(DBOPT_H5_RAW_EXTENSION=502)
+ parameter(DBOPT_H5_META_FILE_OPTS=503)
+ parameter(DBOPT_H5_META_EXTENSION=504)
+ parameter(DBOPT_H5_CORE_ALLOC_INC=505)
+ parameter(DBOPT_H5_CORE_NO_BACK_STORE=506)
+ parameter(DBOPT_H5_META_BLOCK_SIZE=507)
+ parameter(DBOPT_H5_SMALL_RAW_SIZE=508)
+ parameter(DBOPT_H5_ALIGN_MIN=509)
+ parameter(DBOPT_H5_ALIGN_VAL=510)
+ parameter(DBOPT_H5_DIRECT_MEM_ALIGN=511)
+ parameter(DBOPT_H5_DIRECT_BLOCK_SIZE=512)
+ parameter(DBOPT_H5_DIRECT_BUF_SIZE=513)
+ parameter(DBOPT_H5_LOG_NAME=514)
+ parameter(DBOPT_H5_LOG_BUF_SIZE=515)
+ parameter(DBOPT_H5_MPIO_COMM=516)
+ parameter(DBOPT_H5_MPIO_INFO=517)
+ parameter(DBOPT_H5_MPIP_NO_GPFS_HINTS=518)
+ parameter(DBOPT_H5_SIEVE_BUF_SIZE=519)
+ parameter(DBOPT_H5_CACHE_NELMTS=520)
+ parameter(DBOPT_H5_CACHE_NBYTES=521)
+ parameter(DBOPT_H5_CACHE_POLICY=522)
+ parameter(DBOPT_H5_FAM_SIZE=523)
+ parameter(DBOPT_H5_FAM_FILE_OPTS=524)
+ parameter(DBOPT_H5_USER_DRIVER_ID=525)
+ parameter(DBOPT_H5_USER_DRIVER_INFO=526)
+ parameter(DBOPT_H5_SILO_BLOCK_SIZE=527)
+ parameter(DBOPT_H5_SILO_BLOCK_COUNT=528)
+ parameter(DBOPT_H5_SILO_LOG_STATS=529)
+ parameter(DBOPT_H5_SILO_USE_DIRECT=530)
+ parameter(DBOPT_H5_LAST=599)
+ parameter(DB_TOP=0)
+ parameter(DB_NONE=1)
+ parameter(DB_ALL=2)
+ parameter(DB_ABORT=3)
+ parameter(DB_SUSPEND=4)
+ parameter(DB_RESUME=5)
+ parameter(DB_ALL_AND_DRVR=6)
+ parameter(DB_ROWMAJOR=0)
+ parameter(DB_COLMAJOR=1)
+ parameter(DB_NOTCENT=0)
+ parameter(DB_NODECENT=110)
+ parameter(DB_ZONECENT=111)
+ parameter(DB_FACECENT=112)
+ parameter(DB_BNDCENT=113)
+ parameter(DB_EDGECENT=114)
+ parameter(DB_BLOCKCENT=115)
+ parameter(DB_CARTESIAN=120)
+ parameter(DB_CYLINDRICAL=121)
+ parameter(DB_SPHERICAL=122)
+ parameter(DB_NUMERICAL=123)
+ parameter(DB_OTHER=124)
+ parameter(DB_RECTILINEAR=100)
+ parameter(DB_CURVILINEAR=101)
+ parameter(DB_AREA=140)
+ parameter(DB_VOLUME=141)
+ parameter(DB_ON=1000)
+ parameter(DB_OFF=-1000)
+ parameter(DB_ABUTTING=142)
+ parameter(DB_FLOATING=143)
+ parameter(DB_VARTYPE_SCALAR=200)
+ parameter(DB_VARTYPE_VECTOR=201)
+ parameter(DB_VARTYPE_TENSOR=202)
+ parameter(DB_VARTYPE_SYMTENSOR=203)
+ parameter(DB_VARTYPE_ARRAY=204)
+ parameter(DB_VARTYPE_MATERIAL=205)
+ parameter(DB_VARTYPE_SPECIES=206)
+ parameter(DB_VARTYPE_LABEL=207)
+ parameter(DBCSG_QUADRIC_G=16777216)
+ parameter(DBCSG_SPHERE_PR=33619968)
+ parameter(DBCSG_ELLIPSOID_PRRR=33685504)
+ parameter(DBCSG_PLANE_G=50331648)
+ parameter(DBCSG_PLANE_X=50397184)
+ parameter(DBCSG_PLANE_Y=50462720)
+ parameter(DBCSG_PLANE_Z=50528256)
+ parameter(DBCSG_PLANE_PN=50593792)
+ parameter(DBCSG_PLANE_PPP=50659328)
+ parameter(DBCSG_CYLINDER_PNLR=67108864)
+ parameter(DBCSG_CYLINDER_PPR=67174400)
+ parameter(DBCSG_BOX_XYZXYZ=83886080)
+ parameter(DBCSG_CONE_PNLA=100663296)
+ parameter(DBCSG_CONE_PPA=100728832)
+ parameter(DBCSG_POLYHEDRON_KF=117440512)
+ parameter(DBCSG_HEX_6F=117506048)
+ parameter(DBCSG_TET_4F=117571584)
+ parameter(DBCSG_PYRAMID_5F=117637120)
+ parameter(DBCSG_PRISM_5F=117702656)
+ parameter(DBCSG_QUADRATIC_G=134217728)
+ parameter(DBCSG_CIRCLE_PR=150994944)
+ parameter(DBCSG_ELLIPSE_PRR=151060480)
+ parameter(DBCSG_LINE_G=167772160)
+ parameter(DBCSG_LINE_X=167837696)
+ parameter(DBCSG_LINE_Y=167903232)
+ parameter(DBCSG_LINE_PN=167968768)
+ parameter(DBCSG_LINE_PP=168034304)
+ parameter(DBCSG_BOX_XYXY=184549376)
+ parameter(DBCSG_ANGLE_PNLA=201326592)
+ parameter(DBCSG_ANGLE_PPA=201392128)
+ parameter(DBCSG_POLYGON_KP=218103808)
+ parameter(DBCSG_TRI_3P=218169344)
+ parameter(DBCSG_QUAD_4P=218234880)
+ parameter(DBCSG_INNER=2130706432)
+ parameter(DBCSG_OUTER=2130771968)
+ parameter(DBCSG_ON=2130837504)
+ parameter(DBCSG_UNION=2130903040)
+ parameter(DBCSG_INTERSECT=2130968576)
+ parameter(DBCSG_DIFF=2131034112)
+ parameter(DBCSG_COMPLIMENT=2131099648)
+ parameter(DBCSG_XFORM=2131165184)
+ parameter(DBCSG_SWEEP=2131230720)
+ parameter(DB_PREORDER=1)
+ parameter(DB_POSTORDER=2)
+ parameter(DB_FROMCWR=4)
+ parameter(DB_F77NULL=(-99))
+ parameter(DB_ZONETYPE_BEAM=10)
+ parameter(DB_ZONETYPE_POLYGON=20)
+ parameter(DB_ZONETYPE_TRIANGLE=23)
+ parameter(DB_ZONETYPE_QUAD=24)
+ parameter(DB_ZONETYPE_POLYHEDRON=30)
+ parameter(DB_ZONETYPE_TET=34)
+ parameter(DB_ZONETYPE_PYRAMID=35)
+ parameter(DB_ZONETYPE_PRISM=36)
+ parameter(DB_ZONETYPE_HEX=38)
+ parameter(DB_F77NULLSTRING="NULLSTRING")
! End.
diff --git a/src/silo/silo_f.c b/src/silo/silo_f.c
index d6910ad..f5b7181 100644
--- a/src/silo/silo_f.c
+++ b/src/silo/silo_f.c
@@ -530,6 +530,46 @@ DBADDCAOPT_FC (int *optlist_id, int *option,
return(0);
}
+/*-------------------------------------------------------------------------
+ * Routine DBADDIAOPT_FC
+ *
+ * Purpose
+ * Add an integer array option to the given option list.
+ *
+ * Programmer
+ * Neil Hodge
+ * Tue Sep 13 11:16:43 PDT 2011
+ *
+ * Returns
+ * Returns 0 on success, -1 on failure.
+ *-------------------------------------------------------------------------*/
+SILO_API FORTRAN
+DBADDIAOPT_FC (int *optlist_id, int *option,
+ int *nval, int *ivalues)
+{
+ int *ival = NULL;
+ DBoptlist *optlist = NULL;
+
+ API_BEGIN("dbaddiaopt", int, -1) {
+ optlist = (DBoptlist *) DBFortranAccessPointer(*optlist_id);
+ if (!optlist)
+ API_ERROR("optlist_id", E_BADARGS);
+
+ if (*nval <= 0)
+ API_ERROR("nval", E_BADARGS);
+ ival = ALLOC_N(int, *nval);
+
+ ival = ivalues;
+
+ optlist->options[optlist->numopts] = *option;
+ optlist->values[optlist->numopts] = ival;
+ optlist->numopts++;
+ }
+ API_END;
+
+ return(0);
+}
+
/*----------------------------------------------------------------------
* Routine DBMKOPTLIST_FC
*
@@ -1413,7 +1453,8 @@ DBPUTMMESH_FC (int *dbid, FCD_DB name, int *lname, int *nmesh, FCD_DB meshnames,
int *lmeshnames, int *meshtypes, int *optlist_id, int *status)
{
DBfile *dbfile = NULL;
- char **meshnms = NULL, *nm = NULL;
+ char const * *meshnms = NULL;
+ char *nm = NULL;
char *realmeshnames = NULL;
int i, indx;
DBoptlist *optlist = NULL;
@@ -1454,12 +1495,12 @@ DBPUTMMESH_FC (int *dbid, FCD_DB name, int *lname, int *nmesh, FCD_DB meshnames,
if (*nmesh <= 0)
API_ERROR("nmesh", E_BADARGS);
- meshnms = ALLOC_N(char *, *nmesh);
+ meshnms = ALLOC_N(char const *, *nmesh);
for (indx = 0, i = 0; i < *nmesh; i++) {
if (lmeshnames[i] < 0)
API_ERROR("lmeshnames", E_BADARGS);
- meshnms[i] = SW_strndup(&realmeshnames[indx], lmeshnames[i]);
+ meshnms[i] = (char const *) SW_strndup(&realmeshnames[indx], lmeshnames[i]);
if (fortran2DStrLen > 0)
indx += fortran2DStrLen;
else
@@ -4314,6 +4355,8 @@ DBGETCKSUMS_FC ()
* Kathleen Bonnell, Wed Sep 2 15:31:26 PDT 2009
* Added SILO_API so symbols are correctly exported on windows.
*
+ * Mark C. Miller, Mon Dec 6 17:36:57 PST 2010
+ * Patched as per Olivier Cessenat suggestion.
*--------------------------------------------------------------------*/
SILO_API FORTRAN
DBSETCOMPRESS_FC (FCD_DB cvalue, int *lcvalue)
@@ -4322,17 +4365,11 @@ DBSETCOMPRESS_FC (FCD_DB cvalue, int *lcvalue)
DBoptlist *optlist = NULL;
API_BEGIN("dbsetcompression", int, -1) {
- if (*lcvalue <= 0)
- API_ERROR("lcvalue", E_BADARGS);
-
- /*------------------------------
- * Duplicate all ascii strings.
- *-----------------------------*/
- if (strcmp(cvalue, DB_F77NULLSTRING) == 0)
- API_ERROR("cvalue", E_BADARGS);
- cval = SW_strndup(cvalue, *lcvalue);
+ if (strcmp(cvalue, DB_F77NULLSTRING) < 0 && *lcvalue > 0)
+ cval = SW_strndup(cvalue, *lcvalue);
DBSetCompression(cval);
+ FREE(cval);
}
API_END;
@@ -4639,6 +4676,8 @@ DBFREEMRGTREE_FC (int *tree_id)
* Kathleen Bonnell, Wed Sep 2 15:31:26 PDT 2009
* Added SILO_API so symbols are correctly exported on windows.
*
+ * Neil Hodge, Tue Sep 13 11:17:41 PDT 2011
+ * Allow null maps_name.
*--------------------------------------------------------------------*/
SILO_API FORTRAN
DBADDREGION_FC (int *tree_id, FCD_DB region_name, int *lregion_name,
@@ -4653,7 +4692,7 @@ DBADDREGION_FC (int *tree_id, FCD_DB region_name, int *lregion_name,
API_BEGIN("dbaddregion", int, -1) {
if (*lregion_name<=0)
API_ERROR ("lregion_name", E_BADARGS) ;
- if (*lmaps_name<=0)
+ if (*lmaps_name<0)
API_ERROR ("lmaps_name", E_BADARGS) ;
tree = (DBmrgtree*) DBFortranAccessPointer(*tree_id);
@@ -4952,6 +4991,8 @@ DBPUTMRGTREE_FC (int *dbid, FCD_DB mrg_tree_name, int *lmrg_tree_name,
* Kathleen Bonnell, Wed Sep 2 15:31:26 PDT 2009
* Added SILO_API so symbols are correctly exported on windows.
*
+ * Neil Hodge, Tue Sep 13 11:18:30 PDT 2011
+ * Test derefernced segement_frac_ids for non-null
*--------------------------------------------------------------------*/
SILO_API FORTRAN
DBPUTGRPLMAP_FC (int *dbid, FCD_DB map_name, int *lmap_name,
@@ -4991,7 +5032,7 @@ DBPUTGRPLMAP_FC (int *dbid, FCD_DB map_name, int *lmap_name,
segment_data[i] = DBFortranAccessPointer(segment_data_ids[i]);
/* convert array of segment fracs ids to their pointers */
- if (segment_fracs_ids)
+ if (*segment_fracs_ids)
{
segment_fracs = (void**) malloc(*num_segments * sizeof(void*));
for (i = 0; i < *num_segments; i++)
@@ -5071,7 +5112,8 @@ DBPUTCSGM_FC (int *dbid, FCD_DB name, int *lname, int *ndims, int *nbounds,
#endif
*status = DBPutCsgmesh(dbfile, nm, *ndims, *nbounds, typeflags,
- bndids, coeffs, *lcoeffs, *datatype, extents, zl_nm, optlist);
+ *bndids == DB_F77NULL?0:bndids, coeffs, *lcoeffs, *datatype,
+ extents, zl_nm, optlist);
FREE(nm);
FREE(zl_nm);
@@ -5215,8 +5257,8 @@ DBPUTCSGZL_FC (int *dbid, FCD_DB name, int *lname, int *nregs,
#endif
*status = DBPutCSGZonelist(dbfile, nm, *nregs, typeflags, leftids,
- rightids, xforms, *lxforms, *datatype, *nzones, zonelist,
- optlist);
+ rightids, *lxforms>0?xforms:0, *lxforms>0?*lxforms:0, *datatype,
+ *nzones, zonelist, optlist);
FREE(nm);
diff --git a/src/silo/silo_f.h b/src/silo/silo_f.h
index 3697fce..e5e9ef9 100644
--- a/src/silo/silo_f.h
+++ b/src/silo/silo_f.h
@@ -74,6 +74,7 @@ be used for advertising or product endorsement purposes.
#define DBADDDOPT_FC FC_FUNC (dbadddopt,DBADDDOPT)
#define DBADDCOPT_FC FC_FUNC (dbaddcopt,DBADDCOPT)
#define DBADDCAOPT_FC FC_FUNC (dbaddcaopt,DBADDCAOPT)
+#define DBADDIAOPT_FC FC_FUNC (dbaddiaopt,DBADDIAOPT)
#define DBMKOPTLIST_FC FC_FUNC (dbmkoptlist,DBMKOPTLIST)
#define DBFREEOPTLIST_FC FC_FUNC (dbfreeoptlist,DBFREEOPTLIST)
#define DBPUTMAT_FC FC_FUNC (dbputmat,DBPUTMAT)
diff --git a/src/silo/silo_ns.c b/src/silo/silo_ns.c
index 38db9d0..3da3524 100644
--- a/src/silo/silo_ns.c
+++ b/src/silo/silo_ns.c
@@ -189,6 +189,8 @@ BuildExprTree(const char **porig)
tree->left = subtree;
else if (tree->right == 0)
tree->right = subtree;
+ else
+ free(subtree); /* should never hit this case */
break;
}
@@ -255,7 +257,7 @@ BuildExprTree(const char **porig)
}
/* very simple circular cache for a handful of embedded strings */
-static int SaveString(DBnamescheme *ns, const char *sval)
+static int SaveInternalString(DBnamescheme *ns, const char *sval)
{
int modn = ns->nembed++ % DB_MAX_EXPSTRS;
FREE(ns->embedstrs[modn]);
@@ -263,6 +265,25 @@ static int SaveString(DBnamescheme *ns, const char *sval)
return modn;
}
+/* very simple circular cache for strings returned from DBGetName */
+#define DB_MAX_RETSTRS 32
+static char * retstrbuf[DB_MAX_RETSTRS];
+static char * SaveReturnedString(char const * retstr)
+{
+ static unsigned int n = 0;
+ int modn = n++ % DB_MAX_RETSTRS;
+ if (retstr == 0)
+ {
+ for (n = 0; n < DB_MAX_RETSTRS; n++)
+ FREE(retstrbuf[n]);
+ n = 0;
+ return 0;
+ }
+ FREE(retstrbuf[modn]);
+ retstrbuf[modn] = STRDUP(retstr);
+ return retstrbuf[modn];
+}
+
static int
EvalExprTree(DBnamescheme *ns, DBexprnode *tree, int n)
{
@@ -276,9 +297,9 @@ EvalExprTree(DBnamescheme *ns, DBexprnode *tree, int n)
if (strcmp(tree->sval, ns->arrnames[i]) == 0)
{
if (tree->type == '$')
- return SaveString(ns, ((char**)ns->arrvals[i])[q]);
+ return SaveInternalString(ns, ((char**)ns->arrvals[i])[q]);
else
- return ns->arrvals[i][q];
+ return ((int*)ns->arrvals[i])[q];
}
}
}
@@ -289,7 +310,7 @@ EvalExprTree(DBnamescheme *ns, DBexprnode *tree, int n)
else if (tree->type == 'n')
return n;
else if (tree->type == 's')
- return SaveString(ns, tree->sval);
+ return SaveInternalString(ns, tree->sval);
}
else if (tree->left != 0 && tree->right != 0)
{
@@ -321,8 +342,10 @@ PUBLIC DBnamescheme *
DBMakeNamescheme(const char *fmt, ...)
{
va_list ap;
- int i, j, k, n, pass, ncspecs, done;
+ int i, j, k, n, pass, ncspecs, done, saved_narrefs;
DBnamescheme *rv = 0;
+ DBfile *dbfile = 0;
+ char const *relpath = 0;
/* We have nothing to do for a null or empty format string */
if (fmt == 0 || *fmt == '\0')
@@ -393,13 +416,29 @@ DBMakeNamescheme(const char *fmt, ...)
rv->exprstrs = (char **) calloc(rv->ncspecs, sizeof(char*));
if (rv->narrefs > 0)
{
+ void *dummy;
+
rv->arrnames = (char **) calloc(rv->narrefs, sizeof(char*));
- rv->arrvals = (const int **) calloc(rv->narrefs, sizeof(int*));
+ rv->arrvals = (void **) calloc(rv->narrefs, sizeof(void*));
+ rv->arrsizes = (int *) calloc(rv->narrefs, sizeof(int));
+
+ /* If we have non-zero ext. array references, then we may have the case of
+ '0, DBfile*'. So, check for that now */
+ va_start(ap, fmt);
+ dummy = va_arg(ap, void *);
+ if (dummy == 0)
+ {
+ dbfile = va_arg(ap, DBfile *);
+ relpath = va_arg(ap, char const *);
+ rv->arralloc = 1;
+ }
+ va_end(ap);
}
/* Ok, now go through rest of fmt string a second time and grab each
expression that goes with each conversion spec. Also, handle array refs */
i = n+1;
+ saved_narrefs = rv->narrefs;
rv->narrefs = 0;
ncspecs = 0;
va_start(ap, fmt);
@@ -408,8 +447,21 @@ DBMakeNamescheme(const char *fmt, ...)
{
if (fmt[i] == '$' || fmt[i] == '#')
{
- for (j = 1; fmt[i+j] != '['; j++)
+ for (j = 1; fmt[i+j] != '[' &&
+ fmt[i+j] != '#' &&
+ fmt[i+j] != '$' &&
+ fmt[i+j] != '%' &&
+ fmt[i+j] != '*' &&
+ fmt[i+j] != '+' &&
+ fmt[i+j] != '\0' ; j++)
;
+ if (fmt[i+j] != '[')
+ {
+ DBFreeNamescheme(rv);
+ rv = 0;
+ done = 1;
+ continue;
+ }
for (k = 0; k < rv->narrefs; k++)
{
if (strncmp(&fmt[i+1],rv->arrnames[k],j-1) == 0)
@@ -418,8 +470,46 @@ DBMakeNamescheme(const char *fmt, ...)
if (k == rv->narrefs)
{
rv->arrnames[k] = STRNDUP(&fmt[i+1], j-1);
- rv->arrvals[k] = va_arg(ap, const int *);
- rv->narrefs++;
+ if (!dbfile)
+ {
+ rv->arrvals[k] = va_arg(ap, void *);
+#if 0
+ if (rv->arrvals[k] < (void*) 0x0000FFFF)
+ {
+ DBFreeNamescheme(rv);
+ rv = 0;
+ done = 1;
+ continue;
+ }
+#endif
+ }
+ else
+ {
+ char *arrnm = relpath?db_absoluteOf_path(relpath, rv->arrnames[k]):rv->arrnames[k];
+ if (DBInqVarExists(dbfile, arrnm))
+ rv->arrvals[k] = DBGetVar(dbfile, arrnm);
+ if (rv->arrvals[k] != 0)
+ {
+ /* Handle ext. array refs to arrays of strings */
+ if (DBGetVarType(dbfile, arrnm) == DB_CHAR)
+ {
+ char **tmp = NULL;
+ rv->arrsizes[k] = -1; /* initialize to 'unknown size' */
+ tmp = DBStringListToStringArray((char*)rv->arrvals[k], &(rv->arrsizes[k]), 0, 0);
+ FREE(rv->arrvals[k]);
+ rv->arrvals[k] = tmp;
+ }
+ }
+ else
+ {
+ DBFreeNamescheme(rv);
+ rv = 0;
+ done = 1;
+ continue;
+ }
+ if (relpath) free(arrnm);
+ }
+ if (rv && !done) rv->narrefs++; /* rv could have been set to null, above */
}
}
else if (fmt[i] == rv->delim || fmt[i] == '\0')
@@ -435,6 +525,12 @@ DBMakeNamescheme(const char *fmt, ...)
}
va_end(ap);
+ if (rv && rv->narrefs != saved_narrefs)
+ {
+ DBFreeNamescheme(rv);
+ rv = 0;
+ }
+
return rv;
}
@@ -445,6 +541,10 @@ DBGetName(DBnamescheme *ns, int natnum)
static char retval[1024];
int i;
+ /* a hackish way to cleanup the saved returned string buffer */
+ if (ns == 0 && natnum == 0) return SaveReturnedString(0);
+ if (ns == 0) return SaveReturnedString("");
+
retval[0] = '\0';
strncat(retval, ns->fmt, ns->fmtptrs[0] - ns->fmt);
for (i = 0; i < ns->ncspecs; i++)
@@ -467,12 +567,12 @@ DBGetName(DBnamescheme *ns, int natnum)
theVal = EvalExprTree(ns, exprtree, natnum);
FreeTree(exprtree);
strncpy(tmpfmt, ns->fmtptrs[i], ns->fmtptrs[i+1] - ns->fmtptrs[i]);
- if (strcmp(tmpfmt, "%s") == 0)
+ if (strncmp(tmpfmt, "%s", 2) == 0 && 0 <= theVal && theVal < DB_MAX_EXPSTRS)
sprintf(tmp, tmpfmt, ns->embedstrs[theVal]);
else
sprintf(tmp, tmpfmt, theVal);
strcat(retval, tmp);
FREE(tmpExpr);
}
- return retval;
+ return SaveReturnedString(retval);
}
diff --git a/src/silo/silo_private.h b/src/silo/silo_private.h
index 6a060c1..0659680 100644
--- a/src/silo/silo_private.h
+++ b/src/silo/silo_private.h
@@ -76,6 +76,9 @@ be used for advertising or product endorsement purposes.
#include <unistd.h> /*for access() F_OK, R_OK */
#endif
#endif
+/* define USE_CONST_DB_CONSTARR so that when we compile Silo
+ we are sure to get the CONST versions of DB_CONSTARR symbols */
+#define USE_CONST_DB_CONSTARR
#include "silo.h"
/*
@@ -310,8 +313,8 @@ typedef struct context_t {
} \
jstat = 1 ; \
if (NM && jdbfile && !jdbfile->pub.pathok) { \
- char *jr ; \
- jold = context_switch (jdbfile,(char *)NM,&jr) ;\
+ char const *jr ; \
+ jold = context_switch (jdbfile,(char const *)NM,&jr) ;\
if (!jold) longjmp (SILO_Globals.Jstk->jbuf, -1) ;\
NM = jr ; \
} \
@@ -715,6 +718,7 @@ struct _mm {
int _block_type;
int *_empty_list;
int _empty_cnt;
+ int _repr_block_idx;
};
/*
@@ -793,6 +797,7 @@ typedef struct filter_t {
typedef struct SILO_Globals_t {
long dataReadMask;
int allowOverwrites;
+ int allowEmptyObjects;
int enableChecksums;
int enableFriendlyHDF5Names;
int enableGrabDriver;
@@ -827,18 +832,18 @@ typedef struct db_PathnameTag db_Pathname;
/*
* Private functions.
*/
-INTERNAL context_t *context_switch (DBfile *, char *, char **);
+INTERNAL context_t *context_switch (DBfile *, char const *, char const **);
INTERNAL int context_restore (DBfile *, context_t *);
INTERNAL DBfile *silo_db_close (DBfile *);
+INTERNAL int db_num_registered_files();
INTERNAL DBtoc *db_AllocToc (void);
INTERNAL int db_FreeToc (DBfile *);
INTERNAL int db_GetMachDataSize (int);
-INTERNAL int DBGetObjtypeTag (char *);
INTERNAL char *DBGetObjtypeName (int);
INTERNAL char *db_strndup (const char *, int);
INTERNAL char *db_GetDatatypeString (int);
INTERNAL int db_GetDatatypeID (char *);
-INTERNAL int db_perror (const char *, int, char *);
+INTERNAL int db_perror (char const *, int, char const *);
INTERNAL void _DBQQCalcStride (int *, int *, int, int);
INTERNAL void _DBQMSetStride (DBquadmesh *);
INTERNAL int _DBstrprint (FILE *, char **, int, int, int, int, int);
@@ -859,7 +864,7 @@ INTERNAL int _DBSubsetMinMax2 (DB_DTPTR1, int, float *, float *, int,
int, int, int, int);
INTERNAL int _DBSubsetMinMax3 (float *, int, float *, float *, int, int,
int, int, int, int, int, int);
-INTERNAL int db_ProcessOptlist (int, DBoptlist *);
+INTERNAL int db_ProcessOptlist (int, const DBoptlist *const);
INTERNAL int db_VariableNameValid(char *);
INTERNAL int db_SplitShapelist (DBucdmesh *um);
INTERNAL int db_ResetGlobalData_Csgmesh ();
@@ -876,9 +881,6 @@ INTERNAL void db_StringArrayToStringList(char**, int, char **, int*);
INTERNAL char ** db_StringListToStringArray(char *, int, int, int);
INTERNAL void db_DriverTypeAndFileOptionsSetId(int driver, int *type,
int *opts_set_id);
-INTERNAL void db_IntArrayToIntList(int**, int, const int *const, int**, int *);
-INTERNAL int ** db_IntListToIntArray(const int *const, int, const int *const);
-
INTERNAL char *db_absoluteOf_path ( const char *cwg, const char *pathname );
INTERNAL char *db_basename ( const char *pathname );
INTERNAL char *db_dirname ( const char *pathname );
diff --git a/src/silo/silo_win32_compatibility.h b/src/silo/silo_win32_compatibility.h
index 7d65b95..28bf300 100644
--- a/src/silo/silo_win32_compatibility.h
+++ b/src/silo/silo_win32_compatibility.h
@@ -6,20 +6,25 @@
#include <sys\types.h>
#include <sys\stat.h>
-#define snprintf _snprintf
-#define write _write
-#define read _read
-
-#define stat _stat
-#define access _access
+#define access _access
+#define isatty _isatty
+#define pclose _pclose
+#define popen _popen
+#define read _read
+#define snprintf _snprintf
+#define stat _stat
+#define write _write
#ifndef S_IWUSR
-#ifdef S_IWRITE
-#define S_IWUSR S_IWRITE
-#else
-#define S_IWUSR _S_IWRITE
+ #ifdef S_IWRITE
+ #define S_IWUSR S_IWRITE
+ #else
+ #define S_IWUSR _S_IWRITE
+ #endif
#endif
+#ifndef S_ISREG
+ #define S_ISREG(x) (((x) & S_IFMT) == S_IFREG)
#endif
@@ -36,5 +41,13 @@
#define R_OK 4
#endif
+
+/* It may require some experimentation to get these defines correct */
+#define WTERMSIG(x) ((x) & 0xff)
+#define WEXITSTATUS(x) (((x) >> 8) & 0xff)
+#define WIFSIGNALED(x) (WTERMSIG(x) != 0)
+#define WIFEXITED(x) (WTERMSIG(x) == 0)
+
+
#endif
#endif
diff --git a/src/taurus/Makefile.in b/src/taurus/Makefile.in
index 5d0ed7f..4604c24 100644
--- a/src/taurus/Makefile.in
+++ b/src/taurus/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -70,8 +71,9 @@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -90,20 +92,30 @@ subdir = src/taurus
DIST_COMMON = README $(noinst_HEADERS) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/config/ax_check_compiler_flags.m4 \
+ $(top_srcdir)/config/ax_have_qt.m4 \
+ $(top_srcdir)/config/libtool.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
+ $(top_srcdir)/config/vl_lib_readline.m4 \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
LTLIBRARIES = $(noinst_LTLIBRARIES)
libsilo_taurus_la_LIBADD =
am__objects_1 = silo_taurus.lo taurus.lo
am_libsilo_taurus_la_OBJECTS = $(am__objects_1)
libsilo_taurus_la_OBJECTS = $(am_libsilo_taurus_la_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/config/depcomp
am__depfiles_maybe = depfiles
+am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -145,7 +157,8 @@ CXX_FULLPATH = @CXX_FULLPATH@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -157,6 +170,7 @@ FCFLAGS = @FCFLAGS@
FCLIBS = @FCLIBS@
FC_FULLPATH = @FC_FULLPATH@
FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FORTRAN = @FORTRAN@
FPZIP = @FPZIP@
GREP = @GREP@
@@ -167,17 +181,25 @@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
LDFLAGS = @LDFLAGS@
+LIBM = @LIBM@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
NETCDF = @NETCDF@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -187,7 +209,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PDBP_DRV = @PDBP_DRV@
PDB_DRV = @PDB_DRV@
-PRTDIAG = @PRTDIAG@
PYTHON = @PYTHON@
PYTHONMODULE = @PYTHONMODULE@
PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@
@@ -195,17 +216,13 @@ PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
PYTHON_PLATFORM = @PYTHON_PLATFORM@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
-QT_BIN = @QT_BIN@
-QT_CORE = @QT_CORE@
-QT_CORE_LIB = @QT_CORE_LIB@
QT_CXXFLAGS = @QT_CXXFLAGS@
-QT_GUI = @QT_GUI@
-QT_GUI_LIB = @QT_GUI_LIB@
-QT_INCLUDE = @QT_INCLUDE@
-QT_LDFLAGS = @QT_LDFLAGS@
-QT_LIB = @QT_LIB@
+QT_DIR = @QT_DIR@
QT_LIBS = @QT_LIBS@
+QT_LRELEASE = @QT_LRELEASE@
+QT_LUPDATE = @QT_LUPDATE@
QT_MOC = @QT_MOC@
+QT_UIC = @QT_UIC@
RANLIB = @RANLIB@
READLINE_LIBS = @READLINE_LIBS@
SED = @SED@
@@ -223,6 +240,11 @@ SILO_VERS_TAG = @SILO_VERS_TAG@
STRIP = @STRIP@
TAURUS = @TAURUS@
VERSION = @VERSION@
+XMKMF = @XMKMF@
+X_CFLAGS = @X_CFLAGS@
+X_EXTRA_LIBS = @X_EXTRA_LIBS@
+X_LIBS = @X_LIBS@
+X_PRE_LIBS = @X_PRE_LIBS@
ZLIB = @ZLIB@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
@@ -230,6 +252,7 @@ abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_F77 = @ac_ct_F77@
ac_ct_FC = @ac_ct_FC@
am__include = @am__include@
@@ -262,6 +285,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -278,6 +302,7 @@ sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
noinst_LTLIBRARIES = libsilo_taurus.la
@@ -302,14 +327,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
- && exit 0; \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/taurus/Makefile'; \
- cd $(top_srcdir) && \
- $(AUTOMAKE) --foreign src/taurus/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/taurus/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --foreign src/taurus/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -327,6 +352,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
clean-noinstLTLIBRARIES:
-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
@@ -350,21 +376,21 @@ distclean-compile:
.c.o:
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c $<
.c.obj:
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
.c.lo:
@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
@@ -380,45 +406,49 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
+ set x; \
here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
fi
ctags: CTAGS
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
+ $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && cd $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) $$here
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -439,13 +469,17 @@ distdir: $(DISTFILES)
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
if test -d $$d/$$file; then \
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
@@ -473,6 +507,7 @@ clean-generic:
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -494,6 +529,8 @@ dvi-am:
html: html-am
+html-am:
+
info: info-am
info-am:
@@ -502,18 +539,28 @@ install-data-am:
install-dvi: install-dvi-am
+install-dvi-am:
+
install-exec-am:
install-html: install-html-am
+install-html-am:
+
install-info: install-info-am
+install-info-am:
+
install-man:
install-pdf: install-pdf-am
+install-pdf-am:
+
install-ps: install-ps-am
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-am
@@ -551,6 +598,7 @@ uninstall-am:
mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
pdf pdf-am ps ps-am tags uninstall uninstall-am
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/src/unknown/Makefile.in b/src/unknown/Makefile.in
index 00b97d0..17821e3 100644
--- a/src/unknown/Makefile.in
+++ b/src/unknown/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -70,8 +71,9 @@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -90,20 +92,30 @@ subdir = src/unknown
DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/config/ax_check_compiler_flags.m4 \
+ $(top_srcdir)/config/ax_have_qt.m4 \
+ $(top_srcdir)/config/libtool.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
+ $(top_srcdir)/config/vl_lib_readline.m4 \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
LTLIBRARIES = $(noinst_LTLIBRARIES)
libsilo_unknown_la_LIBADD =
am__objects_1 = silo_unknown.lo
am_libsilo_unknown_la_OBJECTS = $(am__objects_1)
libsilo_unknown_la_OBJECTS = $(am_libsilo_unknown_la_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/config/depcomp
am__depfiles_maybe = depfiles
+am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -145,7 +157,8 @@ CXX_FULLPATH = @CXX_FULLPATH@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -157,6 +170,7 @@ FCFLAGS = @FCFLAGS@
FCLIBS = @FCLIBS@
FC_FULLPATH = @FC_FULLPATH@
FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FORTRAN = @FORTRAN@
FPZIP = @FPZIP@
GREP = @GREP@
@@ -167,17 +181,25 @@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
LDFLAGS = @LDFLAGS@
+LIBM = @LIBM@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
NETCDF = @NETCDF@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -187,7 +209,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PDBP_DRV = @PDBP_DRV@
PDB_DRV = @PDB_DRV@
-PRTDIAG = @PRTDIAG@
PYTHON = @PYTHON@
PYTHONMODULE = @PYTHONMODULE@
PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@
@@ -195,17 +216,13 @@ PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
PYTHON_PLATFORM = @PYTHON_PLATFORM@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
-QT_BIN = @QT_BIN@
-QT_CORE = @QT_CORE@
-QT_CORE_LIB = @QT_CORE_LIB@
QT_CXXFLAGS = @QT_CXXFLAGS@
-QT_GUI = @QT_GUI@
-QT_GUI_LIB = @QT_GUI_LIB@
-QT_INCLUDE = @QT_INCLUDE@
-QT_LDFLAGS = @QT_LDFLAGS@
-QT_LIB = @QT_LIB@
+QT_DIR = @QT_DIR@
QT_LIBS = @QT_LIBS@
+QT_LRELEASE = @QT_LRELEASE@
+QT_LUPDATE = @QT_LUPDATE@
QT_MOC = @QT_MOC@
+QT_UIC = @QT_UIC@
RANLIB = @RANLIB@
READLINE_LIBS = @READLINE_LIBS@
SED = @SED@
@@ -223,6 +240,11 @@ SILO_VERS_TAG = @SILO_VERS_TAG@
STRIP = @STRIP@
TAURUS = @TAURUS@
VERSION = @VERSION@
+XMKMF = @XMKMF@
+X_CFLAGS = @X_CFLAGS@
+X_EXTRA_LIBS = @X_EXTRA_LIBS@
+X_LIBS = @X_LIBS@
+X_PRE_LIBS = @X_PRE_LIBS@
ZLIB = @ZLIB@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
@@ -230,6 +252,7 @@ abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_F77 = @ac_ct_F77@
ac_ct_FC = @ac_ct_FC@
am__include = @am__include@
@@ -262,6 +285,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -278,6 +302,7 @@ sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
noinst_LTLIBRARIES = libsilo_unknown.la
@@ -297,14 +322,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
- && exit 0; \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/unknown/Makefile'; \
- cd $(top_srcdir) && \
- $(AUTOMAKE) --foreign src/unknown/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/unknown/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --foreign src/unknown/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -322,6 +347,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
clean-noinstLTLIBRARIES:
-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
@@ -344,21 +370,21 @@ distclean-compile:
.c.o:
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c $<
.c.obj:
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
.c.lo:
@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
@@ -374,45 +400,49 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
+ set x; \
here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
fi
ctags: CTAGS
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
+ $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && cd $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) $$here
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -433,13 +463,17 @@ distdir: $(DISTFILES)
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
if test -d $$d/$$file; then \
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
@@ -467,6 +501,7 @@ clean-generic:
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -488,6 +523,8 @@ dvi-am:
html: html-am
+html-am:
+
info: info-am
info-am:
@@ -496,18 +533,28 @@ install-data-am:
install-dvi: install-dvi-am
+install-dvi-am:
+
install-exec-am:
install-html: install-html-am
+install-html-am:
+
install-info: install-info-am
+install-info-am:
+
install-man:
install-pdf: install-pdf-am
+install-pdf-am:
+
install-ps: install-ps-am
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-am
@@ -545,6 +592,7 @@ uninstall-am:
mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
pdf pdf-am ps ps-am tags uninstall uninstall-am
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/svn_bin/Makefile.in b/svn_bin/Makefile.in
index 17a3df7..91d5ed6 100644
--- a/svn_bin/Makefile.in
+++ b/svn_bin/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -68,8 +69,9 @@
#
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -87,12 +89,21 @@ host_triplet = @host@
subdir = svn_bin
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/config/ax_check_compiler_flags.m4 \
+ $(top_srcdir)/config/ax_have_qt.m4 \
+ $(top_srcdir)/config/libtool.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
+ $(top_srcdir)/config/vl_lib_readline.m4 \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -122,7 +133,8 @@ CXX_FULLPATH = @CXX_FULLPATH@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -134,6 +146,7 @@ FCFLAGS = @FCFLAGS@
FCLIBS = @FCLIBS@
FC_FULLPATH = @FC_FULLPATH@
FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FORTRAN = @FORTRAN@
FPZIP = @FPZIP@
GREP = @GREP@
@@ -144,17 +157,25 @@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
LDFLAGS = @LDFLAGS@
+LIBM = @LIBM@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
NETCDF = @NETCDF@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -164,7 +185,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PDBP_DRV = @PDBP_DRV@
PDB_DRV = @PDB_DRV@
-PRTDIAG = @PRTDIAG@
PYTHON = @PYTHON@
PYTHONMODULE = @PYTHONMODULE@
PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@
@@ -172,17 +192,13 @@ PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
PYTHON_PLATFORM = @PYTHON_PLATFORM@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
-QT_BIN = @QT_BIN@
-QT_CORE = @QT_CORE@
-QT_CORE_LIB = @QT_CORE_LIB@
QT_CXXFLAGS = @QT_CXXFLAGS@
-QT_GUI = @QT_GUI@
-QT_GUI_LIB = @QT_GUI_LIB@
-QT_INCLUDE = @QT_INCLUDE@
-QT_LDFLAGS = @QT_LDFLAGS@
-QT_LIB = @QT_LIB@
+QT_DIR = @QT_DIR@
QT_LIBS = @QT_LIBS@
+QT_LRELEASE = @QT_LRELEASE@
+QT_LUPDATE = @QT_LUPDATE@
QT_MOC = @QT_MOC@
+QT_UIC = @QT_UIC@
RANLIB = @RANLIB@
READLINE_LIBS = @READLINE_LIBS@
SED = @SED@
@@ -200,6 +216,11 @@ SILO_VERS_TAG = @SILO_VERS_TAG@
STRIP = @STRIP@
TAURUS = @TAURUS@
VERSION = @VERSION@
+XMKMF = @XMKMF@
+X_CFLAGS = @X_CFLAGS@
+X_EXTRA_LIBS = @X_EXTRA_LIBS@
+X_LIBS = @X_LIBS@
+X_PRE_LIBS = @X_PRE_LIBS@
ZLIB = @ZLIB@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
@@ -207,6 +228,7 @@ abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_F77 = @ac_ct_F77@
ac_ct_FC = @ac_ct_FC@
am__include = @am__include@
@@ -239,6 +261,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -255,6 +278,7 @@ sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
EXTRA_DIST = \
@@ -273,14 +297,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
- && exit 0; \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign svn_bin/Makefile'; \
- cd $(top_srcdir) && \
- $(AUTOMAKE) --foreign svn_bin/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign svn_bin/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --foreign svn_bin/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -298,6 +322,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
mostlyclean-libtool:
-rm -f *.lo
@@ -327,13 +352,17 @@ distdir: $(DISTFILES)
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
if test -d $$d/$$file; then \
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
@@ -361,6 +390,7 @@ clean-generic:
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -379,6 +409,8 @@ dvi-am:
html: html-am
+html-am:
+
info: info-am
info-am:
@@ -387,18 +419,28 @@ install-data-am:
install-dvi: install-dvi-am
+install-dvi-am:
+
install-exec-am:
install-html: install-html-am
+install-html-am:
+
install-info: install-info-am
+install-info-am:
+
install-man:
install-pdf: install-pdf-am
+install-pdf-am:
+
install-ps: install-ps-am
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-am
@@ -432,6 +474,7 @@ uninstall-am:
maintainer-clean-generic mostlyclean mostlyclean-generic \
mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 44e102d..317401e 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -79,9 +79,11 @@ EXTRA_DIST= \
ioperf_hdf5.c \
ioperf_pdb.c \
ioperf_silo.c \
+ rocket.h \
Make_ioperf \
ioperf_tests \
std.c \
+ zeros.dat \
$(check_SCRIPTS) \
$(check_DATA)
@@ -97,6 +99,7 @@ check_SCRIPTS= \
test_error.py \
test_read.py \
test_write.py \
+ testonehex \
testsilock \
testdtypes
@@ -122,29 +125,60 @@ AM_CPPFLAGS = \
-I$(builddir)/../src/silo \
-I$(srcdir)/../src/silo \
-I$(includedir)
-quad_CPPFLAGS = $(AM_CPPFLAGS)
-TestReadMask_CPPFLAGS = $(AM_CPPFLAGS)
+#quad_CPPFLAGS = $(AM_CPPFLAGS)
+PDBTESTS =
+if INSTALL_LITE_HEADERS
+testpdb_CPPFLAGS = -DPDB_LITE $(AM_CPPFLAGS)
+pdbtst_CPPFLAGS = -DPDB_LITE $(AM_CPPFLAGS)
+PDBTESTS += testpdb pdbtst
+endif
+#TestReadMask_CPPFLAGS = $(AM_CPPFLAGS)
AM_FFLAGS = $(AM_CPPFLAGS)
-HDF5PROGS=compression grab
-FCPROGS= arrayf77 curvef77 matf77 pointf77 quadf77 ucdf77 testallf77
+HDF5PROGS=compression grab mk_nasf_h5
+FCPROGS= arrayf77 curvef77 matf77 pointf77 quadf77 ucdf77 testallf77 \
+ csgmesh
PROGS=array dir extface multi_test partial_io point quad simple ucd \
ucdsamp3 testall obj onehex oneprism onepyramid onetet subhex \
- TestReadMask twohex multispec sami specmix spec cpz1plt spec \
+ TestReadMask twohex multispec sami specmix spec \
cpz1plt group_test listtypes alltypes wave multi_file polyzl csg \
rocket mmadjacency largefile version namescheme efcentering \
- mk_nasf_pdb ioperf arbpoly2d readstuff
+ mk_nasf_pdb ioperf arbpoly2d readstuff mat3d_3across merge_block \
+ empty majorder $(PDBTESTS)
+
+dir_SOURCES = dir.c testlib.c
+quad_SOURCES = quad.c testlib.c
+rocket_SOURCES = rocket.cxx
+rocket_LDFLAGS = -ldl
+rocket_CXXFLAGS = -rdynamic
+EXTRA_rocket_DEPENDENCIES = rocket_silo.la
+
+# plugins for rocket and for ioperf
+HDF5CKLTLIBS = ioperf_hdf5.la
+check_LTLIBRARIES = \
+ rocket_silo.la \
+ ioperf_silo.la \
+ ioperf_pdb.la \
+ ioperf_sec2.la \
+ ioperf_stdio.la
+
+rocket_silo_la_SOURCES = rocket_silo.cxx
+# the '-rpath /nowhere' is some trick to force libtool to produce a shared lib
+rocket_silo_la_LDFLAGS = -module -avoid-version -rpath /nowhere
+
+EXTRA_ioperf_DEPENDENCIES = ioperf_silo.la ioperf_hdf5.la ioperf_pdb.la ioperf_sec2.la ioperf_stdio.la
+ioperf_LDFLAGS = -ldl
+ioperf_CXXFALGS = -rdynamic
+# the '-rpath /nowhere' is some trick to force libtool to produce a shared lib
+ioperf_silo_la_LDFLAGS = -module -avoid-version -rpath /nowhere
+ioperf_hdf5_la_LDFLAGS = -module -avoid-version -rpath /nowhere
+ioperf_pdb_la_LDFLAGS = -module -avoid-version -rpath /nowhere
+ioperf_sec2_la_LDFLAGS = -module -avoid-version -rpath /nowhere
+ioperf_stdio_la_LDFLAGS = -module -avoid-version -rpath /nowhere
-dir_SOURCES = \
- dir.c \
- testlib.c
-quad_SOURCES = \
- quad.c \
- testlib.c
-rocket_SOURCES = \
- rocket.cpp
check_PROGRAMS = \
+ arbpoly \
arbpoly2d \
array \
extface \
@@ -168,7 +202,6 @@ check_PROGRAMS = \
twohex \
multispec \
specmix \
- testpdb \
sami \
spec \
cpz1plt \
@@ -189,8 +222,11 @@ check_PROGRAMS = \
efcentering \
mk_nasf_pdb \
ioperf \
- readstuff
-
+ readstuff \
+ testfs \
+ empty \
+ majorder \
+ $(PDBTESTS)
# Deal with need to use c++ linker whenever we've got C++
# sources compiled with the silo library and the fact that
@@ -199,6 +235,7 @@ check_PROGRAMS = \
# c++ code compiled into Silo. I got this hack from
# automake manaual.
if CXX_LINK_NEEDED
+ nodist_EXTRA_arbpoly_SOURCES = dummy.cxx
nodist_EXTRA_arbpoly2d_SOURCES = dummy.cxx
nodist_EXTRA_array_SOURCES = dummy.cxx
nodist_EXTRA_extface_SOURCES = dummy.cxx
@@ -223,6 +260,7 @@ if CXX_LINK_NEEDED
nodist_EXTRA_multispec_SOURCES = dummy.cxx
nodist_EXTRA_specmix_SOURCES = dummy.cxx
nodist_EXTRA_testpdb_SOURCES = dummy.cxx
+ nodist_EXTRA_pdbtst_SOURCES = dummy.cxx
nodist_EXTRA_sami_SOURCES = dummy.cxx
nodist_EXTRA_spec_SOURCES = dummy.cxx
nodist_EXTRA_cpz1plt_SOURCES = dummy.cxx
@@ -233,7 +271,8 @@ if CXX_LINK_NEEDED
nodist_EXTRA_multi_file_SOURCES = dummy.cxx
nodist_EXTRA_polyzl_SOURCES = dummy.cxx
nodist_EXTRA_csg_SOURCES = dummy.cxx
- nodist_EXTRA_rocket_SOURCES = dummy.cxx
+# nodist_EXTRA_rocket_SOURCES = dummy.cxx
+# nodist_EXTRA_rocket_silo_SOURCES = dummy.cxx
nodist_EXTRA_mmadjacency_SOURCES = dummy.cxx
nodist_EXTRA_largefile_SOURCES = dummy.cxx
nodist_EXTRA_dir_SOURCES = dummy.cxx
@@ -247,23 +286,29 @@ if CXX_LINK_NEEDED
nodist_EXTRA_quadf77_SOURCES = dummy.cxx
nodist_EXTRA_ucdf77_SOURCES = dummy.cxx
nodist_EXTRA_testallf77_SOURCES = dummy.cxx
+ nodist_EXTRA_csgmesh_SOURCES = dummy.cxx
nodist_EXTRA_compression_SOURCES = dummy.cxx
nodist_EXTRA_grab_SOURCES = dummy.cxx
nodist_EXTRA_efcentering_SOURCES = dummy.cxx
nodist_EXTRA_mk_nasf_pdb_SOURCES = dummy.cxx
nodist_EXTRA_ioperf_SOURCES = dummy.cxx
nodist_EXTRA_readstuff_SOURCES = dummy.cxx
+ nodist_EXTRA_testfs_SOURCES = dummy.cxx
+ nodist_EXTRA_empty_SOURCES = dummy.cxx
+ nodist_EXTRA_majorder_SOURCES = dummy.cxx
endif
-ioperf_LDADD = -ldl
if HDF5_DRV_NEEDED
PROGS += $(HDF5PROGS)
check_PROGRAMS += $(HDF5PROGS)
+ check_LTLIBRARIES += $(HDF5CKLTLIBS)
compression_SOURCES = compression.c
compression_LDADD = $(LDADD)
grab_SOURCES = grab.c
grab_LDADD = $(LDADD)
+ mk_nasf_h5_SOURCES = mk_nasf_h5.c
+ mk_nasf_h5_LDADD = $(LDADD)
endif
if FORTRAN_NEEDED
@@ -283,6 +328,8 @@ if FORTRAN_NEEDED
ucdf77_LDADD = $(LDADD) $(FCLIBS)
testallf77_SOURCES = testallf77.f
testallf77_LDADD = $(LDADD) $(FCLIBS)
+ csgmesh_SOURCES = csgmesh.f
+ csgmesh_LDADD = $(LDADD) $(FCLIBS)
endif
all-local:
diff --git a/tests/Makefile.in b/tests/Makefile.in
index ee18680..26ef13a 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -77,8 +78,9 @@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -93,44 +95,96 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
-check_PROGRAMS = arbpoly2d$(EXEEXT) array$(EXEEXT) extface$(EXEEXT) \
- multi_test$(EXEEXT) partial_io$(EXEEXT) point$(EXEEXT) \
- group_test$(EXEEXT) listtypes$(EXEEXT) simple$(EXEEXT) \
- ucd$(EXEEXT) ucdsamp3$(EXEEXT) testall$(EXEEXT) \
- alltypes$(EXEEXT) obj$(EXEEXT) onehex$(EXEEXT) \
- oneprism$(EXEEXT) onepyramid$(EXEEXT) onetet$(EXEEXT) \
- TestReadMask$(EXEEXT) subhex$(EXEEXT) twohex$(EXEEXT) \
- multispec$(EXEEXT) specmix$(EXEEXT) testpdb$(EXEEXT) \
+ at INSTALL_LITE_HEADERS_TRUE@am__append_1 = testpdb pdbtst
+check_PROGRAMS = arbpoly$(EXEEXT) arbpoly2d$(EXEEXT) array$(EXEEXT) \
+ extface$(EXEEXT) multi_test$(EXEEXT) partial_io$(EXEEXT) \
+ point$(EXEEXT) group_test$(EXEEXT) listtypes$(EXEEXT) \
+ simple$(EXEEXT) ucd$(EXEEXT) ucdsamp3$(EXEEXT) \
+ testall$(EXEEXT) alltypes$(EXEEXT) obj$(EXEEXT) \
+ onehex$(EXEEXT) oneprism$(EXEEXT) onepyramid$(EXEEXT) \
+ onetet$(EXEEXT) TestReadMask$(EXEEXT) subhex$(EXEEXT) \
+ twohex$(EXEEXT) multispec$(EXEEXT) specmix$(EXEEXT) \
sami$(EXEEXT) spec$(EXEEXT) cpz1plt$(EXEEXT) \
merge_block$(EXEEXT) mat3d_3across$(EXEEXT) ucd1d$(EXEEXT) \
wave$(EXEEXT) multi_file$(EXEEXT) polyzl$(EXEEXT) csg$(EXEEXT) \
rocket$(EXEEXT) mmadjacency$(EXEEXT) largefile$(EXEEXT) \
dir$(EXEEXT) quad$(EXEEXT) version$(EXEEXT) \
namescheme$(EXEEXT) efcentering$(EXEEXT) mk_nasf_pdb$(EXEEXT) \
- ioperf$(EXEEXT) readstuff$(EXEEXT) $(am__EXEEXT_2) \
- $(am__EXEEXT_4)
- at HDF5_DRV_NEEDED_TRUE@am__append_1 = $(HDF5PROGS)
+ ioperf$(EXEEXT) readstuff$(EXEEXT) testfs$(EXEEXT) \
+ empty$(EXEEXT) majorder$(EXEEXT) $(am__EXEEXT_2) \
+ $(am__EXEEXT_4) $(am__EXEEXT_6)
@HDF5_DRV_NEEDED_TRUE at am__append_2 = $(HDF5PROGS)
- at FORTRAN_NEEDED_TRUE@am__append_3 = $(FCPROGS)
- at FORTRAN_NEEDED_TRUE@am__append_4 = $(FCPROGS)
+ at HDF5_DRV_NEEDED_TRUE@am__append_3 = $(HDF5PROGS)
+ at HDF5_DRV_NEEDED_TRUE@am__append_4 = $(HDF5CKLTLIBS)
+ at FORTRAN_NEEDED_TRUE@am__append_5 = $(FCPROGS)
+ at FORTRAN_NEEDED_TRUE@am__append_6 = $(FCPROGS)
subdir = tests
DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/config/ax_check_compiler_flags.m4 \
+ $(top_srcdir)/config/ax_have_qt.m4 \
+ $(top_srcdir)/config/libtool.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
+ $(top_srcdir)/config/vl_lib_readline.m4 \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
-am__EXEEXT_1 = compression$(EXEEXT) grab$(EXEEXT)
- at HDF5_DRV_NEEDED_TRUE@am__EXEEXT_2 = $(am__EXEEXT_1)
-am__EXEEXT_3 = arrayf77$(EXEEXT) curvef77$(EXEEXT) matf77$(EXEEXT) \
+CONFIG_CLEAN_VPATH_FILES =
+ioperf_hdf5_la_LIBADD =
+ioperf_hdf5_la_SOURCES = ioperf_hdf5.c
+ioperf_hdf5_la_OBJECTS = ioperf_hdf5.lo
+ioperf_hdf5_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(ioperf_hdf5_la_LDFLAGS) $(LDFLAGS) -o $@
+ at HDF5_DRV_NEEDED_TRUE@am_ioperf_hdf5_la_rpath =
+ioperf_pdb_la_LIBADD =
+ioperf_pdb_la_SOURCES = ioperf_pdb.c
+ioperf_pdb_la_OBJECTS = ioperf_pdb.lo
+ioperf_pdb_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(ioperf_pdb_la_LDFLAGS) $(LDFLAGS) -o $@
+ioperf_sec2_la_LIBADD =
+ioperf_sec2_la_SOURCES = ioperf_sec2.c
+ioperf_sec2_la_OBJECTS = ioperf_sec2.lo
+ioperf_sec2_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(ioperf_sec2_la_LDFLAGS) $(LDFLAGS) -o $@
+ioperf_silo_la_LIBADD =
+ioperf_silo_la_SOURCES = ioperf_silo.c
+ioperf_silo_la_OBJECTS = ioperf_silo.lo
+ioperf_silo_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(ioperf_silo_la_LDFLAGS) $(LDFLAGS) -o $@
+ioperf_stdio_la_LIBADD =
+ioperf_stdio_la_SOURCES = ioperf_stdio.c
+ioperf_stdio_la_OBJECTS = ioperf_stdio.lo
+ioperf_stdio_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(ioperf_stdio_la_LDFLAGS) $(LDFLAGS) -o $@
+rocket_silo_la_LIBADD =
+am_rocket_silo_la_OBJECTS = rocket_silo.lo
+rocket_silo_la_OBJECTS = $(am_rocket_silo_la_OBJECTS)
+rocket_silo_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ $(CXXFLAGS) $(rocket_silo_la_LDFLAGS) $(LDFLAGS) -o $@
+ at INSTALL_LITE_HEADERS_TRUE@am__EXEEXT_1 = testpdb$(EXEEXT) \
+ at INSTALL_LITE_HEADERS_TRUE@ pdbtst$(EXEEXT)
+am__EXEEXT_2 = $(am__EXEEXT_1)
+am__EXEEXT_3 = compression$(EXEEXT) grab$(EXEEXT) mk_nasf_h5$(EXEEXT)
+ at HDF5_DRV_NEEDED_TRUE@am__EXEEXT_4 = $(am__EXEEXT_3)
+am__EXEEXT_5 = arrayf77$(EXEEXT) curvef77$(EXEEXT) matf77$(EXEEXT) \
pointf77$(EXEEXT) quadf77$(EXEEXT) ucdf77$(EXEEXT) \
- testallf77$(EXEEXT)
- at FORTRAN_NEEDED_TRUE@am__EXEEXT_4 = $(am__EXEEXT_3)
+ testallf77$(EXEEXT) csgmesh$(EXEEXT)
+ at FORTRAN_NEEDED_TRUE@am__EXEEXT_6 = $(am__EXEEXT_5)
TestReadMask_SOURCES = TestReadMask.c
-TestReadMask_OBJECTS = TestReadMask-TestReadMask.$(OBJEXT)
+TestReadMask_OBJECTS = TestReadMask.$(OBJEXT)
TestReadMask_LDADD = $(LDADD)
@HDF5_DRV_NEEDED_FALSE at TestReadMask_DEPENDENCIES = ../src/libsilo.la
@HDF5_DRV_NEEDED_TRUE at TestReadMask_DEPENDENCIES = ../src/libsiloh5.la
@@ -139,6 +193,11 @@ alltypes_OBJECTS = alltypes.$(OBJEXT)
alltypes_LDADD = $(LDADD)
@HDF5_DRV_NEEDED_FALSE at alltypes_DEPENDENCIES = ../src/libsilo.la
@HDF5_DRV_NEEDED_TRUE at alltypes_DEPENDENCIES = ../src/libsiloh5.la
+arbpoly_SOURCES = arbpoly.c
+arbpoly_OBJECTS = arbpoly.$(OBJEXT)
+arbpoly_LDADD = $(LDADD)
+ at HDF5_DRV_NEEDED_FALSE@arbpoly_DEPENDENCIES = ../src/libsilo.la
+ at HDF5_DRV_NEEDED_TRUE@arbpoly_DEPENDENCIES = ../src/libsiloh5.la
arbpoly2d_SOURCES = arbpoly2d.c
arbpoly2d_OBJECTS = arbpoly2d.$(OBJEXT)
arbpoly2d_LDADD = $(LDADD)
@@ -169,6 +228,11 @@ csg_OBJECTS = csg.$(OBJEXT)
csg_LDADD = $(LDADD)
@HDF5_DRV_NEEDED_FALSE at csg_DEPENDENCIES = ../src/libsilo.la
@HDF5_DRV_NEEDED_TRUE at csg_DEPENDENCIES = ../src/libsiloh5.la
+am__csgmesh_SOURCES_DIST = csgmesh.f
+ at FORTRAN_NEEDED_TRUE@am_csgmesh_OBJECTS = csgmesh.$(OBJEXT)
+csgmesh_OBJECTS = $(am_csgmesh_OBJECTS)
+ at FORTRAN_NEEDED_TRUE@csgmesh_DEPENDENCIES = $(LDADD) \
+ at FORTRAN_NEEDED_TRUE@ $(am__DEPENDENCIES_1)
am__curvef77_SOURCES_DIST = curvef77.f
@FORTRAN_NEEDED_TRUE at am_curvef77_OBJECTS = curvef77.$(OBJEXT)
curvef77_OBJECTS = $(am_curvef77_OBJECTS)
@@ -184,6 +248,11 @@ efcentering_OBJECTS = efcentering.$(OBJEXT)
efcentering_LDADD = $(LDADD)
@HDF5_DRV_NEEDED_FALSE at efcentering_DEPENDENCIES = ../src/libsilo.la
@HDF5_DRV_NEEDED_TRUE at efcentering_DEPENDENCIES = ../src/libsiloh5.la
+empty_SOURCES = empty.c
+empty_OBJECTS = empty.$(OBJEXT)
+empty_LDADD = $(LDADD)
+ at HDF5_DRV_NEEDED_FALSE@empty_DEPENDENCIES = ../src/libsilo.la
+ at HDF5_DRV_NEEDED_TRUE@empty_DEPENDENCIES = ../src/libsiloh5.la
extface_SOURCES = extface.c
extface_OBJECTS = extface.$(OBJEXT)
extface_LDADD = $(LDADD)
@@ -200,7 +269,12 @@ group_test_LDADD = $(LDADD)
@HDF5_DRV_NEEDED_TRUE at group_test_DEPENDENCIES = ../src/libsiloh5.la
ioperf_SOURCES = ioperf.c
ioperf_OBJECTS = ioperf.$(OBJEXT)
-ioperf_DEPENDENCIES =
+ioperf_LDADD = $(LDADD)
+ at HDF5_DRV_NEEDED_FALSE@ioperf_DEPENDENCIES = ../src/libsilo.la
+ at HDF5_DRV_NEEDED_TRUE@ioperf_DEPENDENCIES = ../src/libsiloh5.la
+ioperf_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
+ $(ioperf_LDFLAGS) $(LDFLAGS) -o $@
largefile_SOURCES = largefile.c
largefile_OBJECTS = largefile.$(OBJEXT)
largefile_LDADD = $(LDADD)
@@ -211,6 +285,11 @@ listtypes_OBJECTS = listtypes.$(OBJEXT)
listtypes_LDADD = $(LDADD)
@HDF5_DRV_NEEDED_FALSE at listtypes_DEPENDENCIES = ../src/libsilo.la
@HDF5_DRV_NEEDED_TRUE at listtypes_DEPENDENCIES = ../src/libsiloh5.la
+majorder_SOURCES = majorder.c
+majorder_OBJECTS = majorder.$(OBJEXT)
+majorder_LDADD = $(LDADD)
+ at HDF5_DRV_NEEDED_FALSE@majorder_DEPENDENCIES = ../src/libsilo.la
+ at HDF5_DRV_NEEDED_TRUE@majorder_DEPENDENCIES = ../src/libsiloh5.la
mat3d_3across_SOURCES = mat3d_3across.c
mat3d_3across_OBJECTS = mat3d_3across.$(OBJEXT)
mat3d_3across_LDADD = $(LDADD)
@@ -227,6 +306,10 @@ merge_block_OBJECTS = merge_block.$(OBJEXT)
merge_block_LDADD = $(LDADD)
@HDF5_DRV_NEEDED_FALSE at merge_block_DEPENDENCIES = ../src/libsilo.la
@HDF5_DRV_NEEDED_TRUE at merge_block_DEPENDENCIES = ../src/libsiloh5.la
+am__mk_nasf_h5_SOURCES_DIST = mk_nasf_h5.c
+ at HDF5_DRV_NEEDED_TRUE@am_mk_nasf_h5_OBJECTS = mk_nasf_h5.$(OBJEXT)
+mk_nasf_h5_OBJECTS = $(am_mk_nasf_h5_OBJECTS)
+ at HDF5_DRV_NEEDED_TRUE@mk_nasf_h5_DEPENDENCIES = $(LDADD)
mk_nasf_pdb_SOURCES = mk_nasf_pdb.c
mk_nasf_pdb_OBJECTS = mk_nasf_pdb.$(OBJEXT)
mk_nasf_pdb_LDADD = $(LDADD)
@@ -287,6 +370,11 @@ partial_io_OBJECTS = partial_io.$(OBJEXT)
partial_io_LDADD = $(LDADD)
@HDF5_DRV_NEEDED_FALSE at partial_io_DEPENDENCIES = ../src/libsilo.la
@HDF5_DRV_NEEDED_TRUE at partial_io_DEPENDENCIES = ../src/libsiloh5.la
+pdbtst_SOURCES = pdbtst.c
+pdbtst_OBJECTS = pdbtst-pdbtst.$(OBJEXT)
+pdbtst_LDADD = $(LDADD)
+ at HDF5_DRV_NEEDED_FALSE@pdbtst_DEPENDENCIES = ../src/libsilo.la
+ at HDF5_DRV_NEEDED_TRUE@pdbtst_DEPENDENCIES = ../src/libsiloh5.la
point_SOURCES = point.c
point_OBJECTS = point.$(OBJEXT)
point_LDADD = $(LDADD)
@@ -302,7 +390,7 @@ polyzl_OBJECTS = polyzl.$(OBJEXT)
polyzl_LDADD = $(LDADD)
@HDF5_DRV_NEEDED_FALSE at polyzl_DEPENDENCIES = ../src/libsilo.la
@HDF5_DRV_NEEDED_TRUE at polyzl_DEPENDENCIES = ../src/libsiloh5.la
-am_quad_OBJECTS = quad-quad.$(OBJEXT) quad-testlib.$(OBJEXT)
+am_quad_OBJECTS = quad.$(OBJEXT) testlib.$(OBJEXT)
quad_OBJECTS = $(am_quad_OBJECTS)
quad_LDADD = $(LDADD)
@HDF5_DRV_NEEDED_FALSE at quad_DEPENDENCIES = ../src/libsilo.la
@@ -317,11 +405,14 @@ readstuff_OBJECTS = readstuff.$(OBJEXT)
readstuff_LDADD = $(LDADD)
@HDF5_DRV_NEEDED_FALSE at readstuff_DEPENDENCIES = ../src/libsilo.la
@HDF5_DRV_NEEDED_TRUE at readstuff_DEPENDENCIES = ../src/libsiloh5.la
-am_rocket_OBJECTS = rocket.$(OBJEXT)
+am_rocket_OBJECTS = rocket-rocket.$(OBJEXT)
rocket_OBJECTS = $(am_rocket_OBJECTS)
rocket_LDADD = $(LDADD)
@HDF5_DRV_NEEDED_FALSE at rocket_DEPENDENCIES = ../src/libsilo.la
@HDF5_DRV_NEEDED_TRUE at rocket_DEPENDENCIES = ../src/libsiloh5.la
+rocket_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ --mode=link $(CXXLD) $(rocket_CXXFLAGS) $(CXXFLAGS) \
+ $(rocket_LDFLAGS) $(LDFLAGS) -o $@
sami_SOURCES = sami.c
sami_OBJECTS = sami.$(OBJEXT)
sami_LDADD = $(LDADD)
@@ -357,8 +448,13 @@ am__testallf77_SOURCES_DIST = testallf77.f
testallf77_OBJECTS = $(am_testallf77_OBJECTS)
@FORTRAN_NEEDED_TRUE at testallf77_DEPENDENCIES = $(LDADD) \
@FORTRAN_NEEDED_TRUE@ $(am__DEPENDENCIES_1)
+testfs_SOURCES = testfs.c
+testfs_OBJECTS = testfs.$(OBJEXT)
+testfs_LDADD = $(LDADD)
+ at HDF5_DRV_NEEDED_FALSE@testfs_DEPENDENCIES = ../src/libsilo.la
+ at HDF5_DRV_NEEDED_TRUE@testfs_DEPENDENCIES = ../src/libsiloh5.la
testpdb_SOURCES = testpdb.c
-testpdb_OBJECTS = testpdb.$(OBJEXT)
+testpdb_OBJECTS = testpdb-testpdb.$(OBJEXT)
testpdb_LDADD = $(LDADD)
@HDF5_DRV_NEEDED_FALSE at testpdb_DEPENDENCIES = ../src/libsilo.la
@HDF5_DRV_NEEDED_TRUE at testpdb_DEPENDENCIES = ../src/libsiloh5.la
@@ -397,9 +493,10 @@ wave_OBJECTS = wave.$(OBJEXT)
wave_LDADD = $(LDADD)
@HDF5_DRV_NEEDED_FALSE at wave_DEPENDENCIES = ../src/libsilo.la
@HDF5_DRV_NEEDED_TRUE at wave_DEPENDENCIES = ../src/libsiloh5.la
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/config/depcomp
am__depfiles_maybe = depfiles
+am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -425,29 +522,35 @@ F77LD = $(F77)
F77LINK = $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--mode=link $(F77LD) $(AM_FFLAGS) $(FFLAGS) $(AM_LDFLAGS) \
$(LDFLAGS) -o $@
-SOURCES = $(nodist_EXTRA_TestReadMask_SOURCES) TestReadMask.c \
+SOURCES = ioperf_hdf5.c ioperf_pdb.c ioperf_sec2.c ioperf_silo.c \
+ ioperf_stdio.c $(rocket_silo_la_SOURCES) \
+ $(nodist_EXTRA_TestReadMask_SOURCES) TestReadMask.c \
$(nodist_EXTRA_alltypes_SOURCES) alltypes.c \
+ $(nodist_EXTRA_arbpoly_SOURCES) arbpoly.c \
$(nodist_EXTRA_arbpoly2d_SOURCES) arbpoly2d.c \
$(nodist_EXTRA_array_SOURCES) array.c $(arrayf77_SOURCES) \
$(nodist_EXTRA_arrayf77_SOURCES) $(compression_SOURCES) \
$(nodist_EXTRA_compression_SOURCES) \
$(nodist_EXTRA_cpz1plt_SOURCES) cpz1plt.c \
- $(nodist_EXTRA_csg_SOURCES) csg.c $(curvef77_SOURCES) \
+ $(nodist_EXTRA_csg_SOURCES) csg.c $(csgmesh_SOURCES) \
+ $(nodist_EXTRA_csgmesh_SOURCES) $(curvef77_SOURCES) \
$(nodist_EXTRA_curvef77_SOURCES) $(dir_SOURCES) \
$(nodist_EXTRA_dir_SOURCES) \
$(nodist_EXTRA_efcentering_SOURCES) efcentering.c \
+ $(nodist_EXTRA_empty_SOURCES) empty.c \
$(nodist_EXTRA_extface_SOURCES) extface.c $(grab_SOURCES) \
$(nodist_EXTRA_grab_SOURCES) \
$(nodist_EXTRA_group_test_SOURCES) group_test.c \
$(nodist_EXTRA_ioperf_SOURCES) ioperf.c \
$(nodist_EXTRA_largefile_SOURCES) largefile.c \
$(nodist_EXTRA_listtypes_SOURCES) listtypes.c \
+ $(nodist_EXTRA_majorder_SOURCES) majorder.c \
$(nodist_EXTRA_mat3d_3across_SOURCES) mat3d_3across.c \
$(matf77_SOURCES) $(nodist_EXTRA_matf77_SOURCES) \
$(nodist_EXTRA_merge_block_SOURCES) merge_block.c \
- $(nodist_EXTRA_mk_nasf_pdb_SOURCES) mk_nasf_pdb.c \
- $(nodist_EXTRA_mmadjacency_SOURCES) mmadjacency.c \
- $(nodist_EXTRA_multi_file_SOURCES) multi_file.c \
+ $(mk_nasf_h5_SOURCES) $(nodist_EXTRA_mk_nasf_pdb_SOURCES) \
+ mk_nasf_pdb.c $(nodist_EXTRA_mmadjacency_SOURCES) \
+ mmadjacency.c $(nodist_EXTRA_multi_file_SOURCES) multi_file.c \
$(nodist_EXTRA_multi_test_SOURCES) multi_test.c \
$(nodist_EXTRA_multispec_SOURCES) multispec.c \
$(nodist_EXTRA_namescheme_SOURCES) namescheme.c \
@@ -457,20 +560,21 @@ SOURCES = $(nodist_EXTRA_TestReadMask_SOURCES) TestReadMask.c \
$(nodist_EXTRA_onepyramid_SOURCES) onepyramid.c \
$(nodist_EXTRA_onetet_SOURCES) onetet.c \
$(nodist_EXTRA_partial_io_SOURCES) partial_io.c \
+ $(nodist_EXTRA_pdbtst_SOURCES) pdbtst.c \
$(nodist_EXTRA_point_SOURCES) point.c $(pointf77_SOURCES) \
$(nodist_EXTRA_pointf77_SOURCES) \
$(nodist_EXTRA_polyzl_SOURCES) polyzl.c $(quad_SOURCES) \
$(nodist_EXTRA_quad_SOURCES) $(quadf77_SOURCES) \
$(nodist_EXTRA_quadf77_SOURCES) \
$(nodist_EXTRA_readstuff_SOURCES) readstuff.c \
- $(rocket_SOURCES) $(nodist_EXTRA_rocket_SOURCES) \
- $(nodist_EXTRA_sami_SOURCES) sami.c \
+ $(rocket_SOURCES) $(nodist_EXTRA_sami_SOURCES) sami.c \
$(nodist_EXTRA_simple_SOURCES) simple.c \
$(nodist_EXTRA_spec_SOURCES) spec.c \
$(nodist_EXTRA_specmix_SOURCES) specmix.c \
$(nodist_EXTRA_subhex_SOURCES) subhex.c \
$(nodist_EXTRA_testall_SOURCES) testall.c \
$(testallf77_SOURCES) $(nodist_EXTRA_testallf77_SOURCES) \
+ $(nodist_EXTRA_testfs_SOURCES) testfs.c \
$(nodist_EXTRA_testpdb_SOURCES) testpdb.c \
$(nodist_EXTRA_twohex_SOURCES) twohex.c \
$(nodist_EXTRA_ucd_SOURCES) ucd.c \
@@ -479,28 +583,46 @@ SOURCES = $(nodist_EXTRA_TestReadMask_SOURCES) TestReadMask.c \
$(nodist_EXTRA_ucdsamp3_SOURCES) ucdsamp3.c \
$(nodist_EXTRA_version_SOURCES) version.c \
$(nodist_EXTRA_wave_SOURCES) wave.c
-DIST_SOURCES = TestReadMask.c alltypes.c arbpoly2d.c array.c \
+DIST_SOURCES = ioperf_hdf5.c ioperf_pdb.c ioperf_sec2.c ioperf_silo.c \
+ ioperf_stdio.c $(rocket_silo_la_SOURCES) TestReadMask.c \
+ alltypes.c arbpoly.c arbpoly2d.c array.c \
$(am__arrayf77_SOURCES_DIST) $(am__compression_SOURCES_DIST) \
- cpz1plt.c csg.c $(am__curvef77_SOURCES_DIST) $(dir_SOURCES) \
- efcentering.c extface.c $(am__grab_SOURCES_DIST) group_test.c \
- ioperf.c largefile.c listtypes.c mat3d_3across.c \
- $(am__matf77_SOURCES_DIST) merge_block.c mk_nasf_pdb.c \
- mmadjacency.c multi_file.c multi_test.c multispec.c \
- namescheme.c obj.c onehex.c oneprism.c onepyramid.c onetet.c \
- partial_io.c point.c $(am__pointf77_SOURCES_DIST) polyzl.c \
+ cpz1plt.c csg.c $(am__csgmesh_SOURCES_DIST) \
+ $(am__curvef77_SOURCES_DIST) $(dir_SOURCES) efcentering.c \
+ empty.c extface.c $(am__grab_SOURCES_DIST) group_test.c \
+ ioperf.c largefile.c listtypes.c majorder.c mat3d_3across.c \
+ $(am__matf77_SOURCES_DIST) merge_block.c \
+ $(am__mk_nasf_h5_SOURCES_DIST) mk_nasf_pdb.c mmadjacency.c \
+ multi_file.c multi_test.c multispec.c namescheme.c obj.c \
+ onehex.c oneprism.c onepyramid.c onetet.c partial_io.c \
+ pdbtst.c point.c $(am__pointf77_SOURCES_DIST) polyzl.c \
$(quad_SOURCES) $(am__quadf77_SOURCES_DIST) readstuff.c \
$(rocket_SOURCES) sami.c simple.c spec.c specmix.c subhex.c \
- testall.c $(am__testallf77_SOURCES_DIST) testpdb.c twohex.c \
- ucd.c ucd1d.c $(am__ucdf77_SOURCES_DIST) ucdsamp3.c version.c \
- wave.c
+ testall.c $(am__testallf77_SOURCES_DIST) testfs.c testpdb.c \
+ twohex.c ucd.c ucd1d.c $(am__ucdf77_SOURCES_DIST) ucdsamp3.c \
+ version.c wave.c
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
*) f=$$p;; \
esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == $(am__install_max)) \
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+ END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
am__installdirs = "$(DESTDIR)$(includedir)"
-includeHEADERS_INSTALL = $(INSTALL_HEADER)
HEADERS = $(include_HEADERS)
ETAGS = etags
CTAGS = ctags
@@ -531,7 +653,8 @@ CXX_FULLPATH = @CXX_FULLPATH@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -543,6 +666,7 @@ FCFLAGS = @FCFLAGS@
FCLIBS = @FCLIBS@
FC_FULLPATH = @FC_FULLPATH@
FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FORTRAN = @FORTRAN@
FPZIP = @FPZIP@
GREP = @GREP@
@@ -553,17 +677,25 @@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
LDFLAGS = @LDFLAGS@
+LIBM = @LIBM@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
NETCDF = @NETCDF@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -573,7 +705,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PDBP_DRV = @PDBP_DRV@
PDB_DRV = @PDB_DRV@
-PRTDIAG = @PRTDIAG@
PYTHON = @PYTHON@
PYTHONMODULE = @PYTHONMODULE@
PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@
@@ -581,17 +712,13 @@ PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
PYTHON_PLATFORM = @PYTHON_PLATFORM@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
-QT_BIN = @QT_BIN@
-QT_CORE = @QT_CORE@
-QT_CORE_LIB = @QT_CORE_LIB@
QT_CXXFLAGS = @QT_CXXFLAGS@
-QT_GUI = @QT_GUI@
-QT_GUI_LIB = @QT_GUI_LIB@
-QT_INCLUDE = @QT_INCLUDE@
-QT_LDFLAGS = @QT_LDFLAGS@
-QT_LIB = @QT_LIB@
+QT_DIR = @QT_DIR@
QT_LIBS = @QT_LIBS@
+QT_LRELEASE = @QT_LRELEASE@
+QT_LUPDATE = @QT_LUPDATE@
QT_MOC = @QT_MOC@
+QT_UIC = @QT_UIC@
RANLIB = @RANLIB@
READLINE_LIBS = @READLINE_LIBS@
SED = @SED@
@@ -609,6 +736,11 @@ SILO_VERS_TAG = @SILO_VERS_TAG@
STRIP = @STRIP@
TAURUS = @TAURUS@
VERSION = @VERSION@
+XMKMF = @XMKMF@
+X_CFLAGS = @X_CFLAGS@
+X_EXTRA_LIBS = @X_EXTRA_LIBS@
+X_LIBS = @X_LIBS@
+X_PRE_LIBS = @X_PRE_LIBS@
ZLIB = @ZLIB@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
@@ -616,6 +748,7 @@ abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_F77 = @ac_ct_F77@
ac_ct_FC = @ac_ct_FC@
am__include = @am__include@
@@ -648,6 +781,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -664,6 +798,7 @@ sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
EXTRA_DIST = \
@@ -685,9 +820,11 @@ EXTRA_DIST = \
ioperf_hdf5.c \
ioperf_pdb.c \
ioperf_silo.c \
+ rocket.h \
Make_ioperf \
ioperf_tests \
std.c \
+ zeros.dat \
$(check_SCRIPTS) \
$(check_DATA)
@@ -704,6 +841,7 @@ check_SCRIPTS = \
test_error.py \
test_read.py \
test_write.py \
+ testonehex \
testsilock \
testdtypes
@@ -726,29 +864,47 @@ AM_CPPFLAGS = \
-I$(srcdir)/../src/silo \
-I$(includedir)
-quad_CPPFLAGS = $(AM_CPPFLAGS)
-TestReadMask_CPPFLAGS = $(AM_CPPFLAGS)
+#quad_CPPFLAGS = $(AM_CPPFLAGS)
+PDBTESTS = $(am__append_1)
+ at INSTALL_LITE_HEADERS_TRUE@testpdb_CPPFLAGS = -DPDB_LITE $(AM_CPPFLAGS)
+ at INSTALL_LITE_HEADERS_TRUE@pdbtst_CPPFLAGS = -DPDB_LITE $(AM_CPPFLAGS)
+#TestReadMask_CPPFLAGS = $(AM_CPPFLAGS)
AM_FFLAGS = $(AM_CPPFLAGS)
-HDF5PROGS = compression grab
-FCPROGS = arrayf77 curvef77 matf77 pointf77 quadf77 ucdf77 testallf77
+HDF5PROGS = compression grab mk_nasf_h5
+FCPROGS = arrayf77 curvef77 matf77 pointf77 quadf77 ucdf77 testallf77 \
+ csgmesh
+
PROGS = array dir extface multi_test partial_io point quad simple ucd \
ucdsamp3 testall obj onehex oneprism onepyramid onetet subhex \
- TestReadMask twohex multispec sami specmix spec cpz1plt spec \
- cpz1plt group_test listtypes alltypes wave multi_file polyzl \
- csg rocket mmadjacency largefile version namescheme \
- efcentering mk_nasf_pdb ioperf arbpoly2d readstuff \
- $(am__append_1) $(am__append_3)
-dir_SOURCES = \
- dir.c \
- testlib.c
-
-quad_SOURCES = \
- quad.c \
- testlib.c
-
-rocket_SOURCES = \
- rocket.cpp
-
+ TestReadMask twohex multispec sami specmix spec cpz1plt \
+ group_test listtypes alltypes wave multi_file polyzl csg \
+ rocket mmadjacency largefile version namescheme efcentering \
+ mk_nasf_pdb ioperf arbpoly2d readstuff mat3d_3across \
+ merge_block empty majorder $(PDBTESTS) $(am__append_2) \
+ $(am__append_5)
+dir_SOURCES = dir.c testlib.c
+quad_SOURCES = quad.c testlib.c
+rocket_SOURCES = rocket.cxx
+rocket_LDFLAGS = -ldl
+rocket_CXXFLAGS = -rdynamic
+EXTRA_rocket_DEPENDENCIES = rocket_silo.la
+
+# plugins for rocket and for ioperf
+HDF5CKLTLIBS = ioperf_hdf5.la
+check_LTLIBRARIES = rocket_silo.la ioperf_silo.la ioperf_pdb.la \
+ ioperf_sec2.la ioperf_stdio.la $(am__append_4)
+rocket_silo_la_SOURCES = rocket_silo.cxx
+# the '-rpath /nowhere' is some trick to force libtool to produce a shared lib
+rocket_silo_la_LDFLAGS = -module -avoid-version -rpath /nowhere
+EXTRA_ioperf_DEPENDENCIES = ioperf_silo.la ioperf_hdf5.la ioperf_pdb.la ioperf_sec2.la ioperf_stdio.la
+ioperf_LDFLAGS = -ldl
+ioperf_CXXFALGS = -rdynamic
+# the '-rpath /nowhere' is some trick to force libtool to produce a shared lib
+ioperf_silo_la_LDFLAGS = -module -avoid-version -rpath /nowhere
+ioperf_hdf5_la_LDFLAGS = -module -avoid-version -rpath /nowhere
+ioperf_pdb_la_LDFLAGS = -module -avoid-version -rpath /nowhere
+ioperf_sec2_la_LDFLAGS = -module -avoid-version -rpath /nowhere
+ioperf_stdio_la_LDFLAGS = -module -avoid-version -rpath /nowhere
# Deal with need to use c++ linker whenever we've got C++
# sources compiled with the silo library and the fact that
@@ -756,6 +912,7 @@ rocket_SOURCES = \
# This is a hack to force c++ linkage when we have
# c++ code compiled into Silo. I got this hack from
# automake manaual.
+ at CXX_LINK_NEEDED_TRUE@nodist_EXTRA_arbpoly_SOURCES = dummy.cxx
@CXX_LINK_NEEDED_TRUE at nodist_EXTRA_arbpoly2d_SOURCES = dummy.cxx
@CXX_LINK_NEEDED_TRUE at nodist_EXTRA_array_SOURCES = dummy.cxx
@CXX_LINK_NEEDED_TRUE at nodist_EXTRA_extface_SOURCES = dummy.cxx
@@ -780,6 +937,7 @@ rocket_SOURCES = \
@CXX_LINK_NEEDED_TRUE at nodist_EXTRA_multispec_SOURCES = dummy.cxx
@CXX_LINK_NEEDED_TRUE at nodist_EXTRA_specmix_SOURCES = dummy.cxx
@CXX_LINK_NEEDED_TRUE at nodist_EXTRA_testpdb_SOURCES = dummy.cxx
+ at CXX_LINK_NEEDED_TRUE@nodist_EXTRA_pdbtst_SOURCES = dummy.cxx
@CXX_LINK_NEEDED_TRUE at nodist_EXTRA_sami_SOURCES = dummy.cxx
@CXX_LINK_NEEDED_TRUE at nodist_EXTRA_spec_SOURCES = dummy.cxx
@CXX_LINK_NEEDED_TRUE at nodist_EXTRA_cpz1plt_SOURCES = dummy.cxx
@@ -790,7 +948,8 @@ rocket_SOURCES = \
@CXX_LINK_NEEDED_TRUE at nodist_EXTRA_multi_file_SOURCES = dummy.cxx
@CXX_LINK_NEEDED_TRUE at nodist_EXTRA_polyzl_SOURCES = dummy.cxx
@CXX_LINK_NEEDED_TRUE at nodist_EXTRA_csg_SOURCES = dummy.cxx
- at CXX_LINK_NEEDED_TRUE@nodist_EXTRA_rocket_SOURCES = dummy.cxx
+# nodist_EXTRA_rocket_SOURCES = dummy.cxx
+# nodist_EXTRA_rocket_silo_SOURCES = dummy.cxx
@CXX_LINK_NEEDED_TRUE at nodist_EXTRA_mmadjacency_SOURCES = dummy.cxx
@CXX_LINK_NEEDED_TRUE at nodist_EXTRA_largefile_SOURCES = dummy.cxx
@CXX_LINK_NEEDED_TRUE at nodist_EXTRA_dir_SOURCES = dummy.cxx
@@ -804,17 +963,22 @@ rocket_SOURCES = \
@CXX_LINK_NEEDED_TRUE at nodist_EXTRA_quadf77_SOURCES = dummy.cxx
@CXX_LINK_NEEDED_TRUE at nodist_EXTRA_ucdf77_SOURCES = dummy.cxx
@CXX_LINK_NEEDED_TRUE at nodist_EXTRA_testallf77_SOURCES = dummy.cxx
+ at CXX_LINK_NEEDED_TRUE@nodist_EXTRA_csgmesh_SOURCES = dummy.cxx
@CXX_LINK_NEEDED_TRUE at nodist_EXTRA_compression_SOURCES = dummy.cxx
@CXX_LINK_NEEDED_TRUE at nodist_EXTRA_grab_SOURCES = dummy.cxx
@CXX_LINK_NEEDED_TRUE at nodist_EXTRA_efcentering_SOURCES = dummy.cxx
@CXX_LINK_NEEDED_TRUE at nodist_EXTRA_mk_nasf_pdb_SOURCES = dummy.cxx
@CXX_LINK_NEEDED_TRUE at nodist_EXTRA_ioperf_SOURCES = dummy.cxx
@CXX_LINK_NEEDED_TRUE at nodist_EXTRA_readstuff_SOURCES = dummy.cxx
-ioperf_LDADD = -ldl
+ at CXX_LINK_NEEDED_TRUE@nodist_EXTRA_testfs_SOURCES = dummy.cxx
+ at CXX_LINK_NEEDED_TRUE@nodist_EXTRA_empty_SOURCES = dummy.cxx
+ at CXX_LINK_NEEDED_TRUE@nodist_EXTRA_majorder_SOURCES = dummy.cxx
@HDF5_DRV_NEEDED_TRUE at compression_SOURCES = compression.c
@HDF5_DRV_NEEDED_TRUE at compression_LDADD = $(LDADD)
@HDF5_DRV_NEEDED_TRUE at grab_SOURCES = grab.c
@HDF5_DRV_NEEDED_TRUE at grab_LDADD = $(LDADD)
+ at HDF5_DRV_NEEDED_TRUE@mk_nasf_h5_SOURCES = mk_nasf_h5.c
+ at HDF5_DRV_NEEDED_TRUE@mk_nasf_h5_LDADD = $(LDADD)
@FORTRAN_NEEDED_TRUE at arrayf77_SOURCES = arrayf77.f
@FORTRAN_NEEDED_TRUE at arrayf77_LDADD = $(LDADD) $(FCLIBS)
@FORTRAN_NEEDED_TRUE at curvef77_SOURCES = curvef77.f
@@ -829,22 +993,24 @@ ioperf_LDADD = -ldl
@FORTRAN_NEEDED_TRUE at ucdf77_LDADD = $(LDADD) $(FCLIBS)
@FORTRAN_NEEDED_TRUE at testallf77_SOURCES = testallf77.f
@FORTRAN_NEEDED_TRUE at testallf77_LDADD = $(LDADD) $(FCLIBS)
+ at FORTRAN_NEEDED_TRUE@csgmesh_SOURCES = csgmesh.f
+ at FORTRAN_NEEDED_TRUE@csgmesh_LDADD = $(LDADD) $(FCLIBS)
all: all-am
.SUFFIXES:
-.SUFFIXES: .c .cpp .cxx .f .lo .o .obj
+.SUFFIXES: .c .cxx .f .lo .o .obj
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
- && exit 0; \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tests/Makefile'; \
- cd $(top_srcdir) && \
- $(AUTOMAKE) --foreign tests/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tests/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --foreign tests/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -862,19 +1028,46 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+clean-checkLTLIBRARIES:
+ -test -z "$(check_LTLIBRARIES)" || rm -f $(check_LTLIBRARIES)
+ @list='$(check_LTLIBRARIES)'; for p in $$list; do \
+ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+ test "$$dir" != "$$p" || dir=.; \
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+ioperf_hdf5.la: $(ioperf_hdf5_la_OBJECTS) $(ioperf_hdf5_la_DEPENDENCIES)
+ $(ioperf_hdf5_la_LINK) $(am_ioperf_hdf5_la_rpath) $(ioperf_hdf5_la_OBJECTS) $(ioperf_hdf5_la_LIBADD) $(LIBS)
+ioperf_pdb.la: $(ioperf_pdb_la_OBJECTS) $(ioperf_pdb_la_DEPENDENCIES)
+ $(ioperf_pdb_la_LINK) $(ioperf_pdb_la_OBJECTS) $(ioperf_pdb_la_LIBADD) $(LIBS)
+ioperf_sec2.la: $(ioperf_sec2_la_OBJECTS) $(ioperf_sec2_la_DEPENDENCIES)
+ $(ioperf_sec2_la_LINK) $(ioperf_sec2_la_OBJECTS) $(ioperf_sec2_la_LIBADD) $(LIBS)
+ioperf_silo.la: $(ioperf_silo_la_OBJECTS) $(ioperf_silo_la_DEPENDENCIES)
+ $(ioperf_silo_la_LINK) $(ioperf_silo_la_OBJECTS) $(ioperf_silo_la_LIBADD) $(LIBS)
+ioperf_stdio.la: $(ioperf_stdio_la_OBJECTS) $(ioperf_stdio_la_DEPENDENCIES)
+ $(ioperf_stdio_la_LINK) $(ioperf_stdio_la_OBJECTS) $(ioperf_stdio_la_LIBADD) $(LIBS)
+rocket_silo.la: $(rocket_silo_la_OBJECTS) $(rocket_silo_la_DEPENDENCIES)
+ $(rocket_silo_la_LINK) $(rocket_silo_la_OBJECTS) $(rocket_silo_la_LIBADD) $(LIBS)
clean-checkPROGRAMS:
- @list='$(check_PROGRAMS)'; for p in $$list; do \
- f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
- echo " rm -f $$p $$f"; \
- rm -f $$p $$f ; \
- done
+ @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \
+ echo " rm -f" $$list; \
+ rm -f $$list || exit $$?; \
+ test -n "$(EXEEXT)" || exit 0; \
+ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+ echo " rm -f" $$list; \
+ rm -f $$list
TestReadMask$(EXEEXT): $(TestReadMask_OBJECTS) $(TestReadMask_DEPENDENCIES)
@rm -f TestReadMask$(EXEEXT)
$(CXXLINK) $(TestReadMask_OBJECTS) $(TestReadMask_LDADD) $(LIBS)
alltypes$(EXEEXT): $(alltypes_OBJECTS) $(alltypes_DEPENDENCIES)
@rm -f alltypes$(EXEEXT)
$(CXXLINK) $(alltypes_OBJECTS) $(alltypes_LDADD) $(LIBS)
+arbpoly$(EXEEXT): $(arbpoly_OBJECTS) $(arbpoly_DEPENDENCIES)
+ @rm -f arbpoly$(EXEEXT)
+ $(CXXLINK) $(arbpoly_OBJECTS) $(arbpoly_LDADD) $(LIBS)
arbpoly2d$(EXEEXT): $(arbpoly2d_OBJECTS) $(arbpoly2d_DEPENDENCIES)
@rm -f arbpoly2d$(EXEEXT)
$(CXXLINK) $(arbpoly2d_OBJECTS) $(arbpoly2d_LDADD) $(LIBS)
@@ -893,6 +1086,9 @@ cpz1plt$(EXEEXT): $(cpz1plt_OBJECTS) $(cpz1plt_DEPENDENCIES)
csg$(EXEEXT): $(csg_OBJECTS) $(csg_DEPENDENCIES)
@rm -f csg$(EXEEXT)
$(CXXLINK) $(csg_OBJECTS) $(csg_LDADD) $(LIBS)
+csgmesh$(EXEEXT): $(csgmesh_OBJECTS) $(csgmesh_DEPENDENCIES)
+ @rm -f csgmesh$(EXEEXT)
+ $(CXXLINK) $(csgmesh_OBJECTS) $(csgmesh_LDADD) $(LIBS)
curvef77$(EXEEXT): $(curvef77_OBJECTS) $(curvef77_DEPENDENCIES)
@rm -f curvef77$(EXEEXT)
$(CXXLINK) $(curvef77_OBJECTS) $(curvef77_LDADD) $(LIBS)
@@ -902,6 +1098,9 @@ dir$(EXEEXT): $(dir_OBJECTS) $(dir_DEPENDENCIES)
efcentering$(EXEEXT): $(efcentering_OBJECTS) $(efcentering_DEPENDENCIES)
@rm -f efcentering$(EXEEXT)
$(CXXLINK) $(efcentering_OBJECTS) $(efcentering_LDADD) $(LIBS)
+empty$(EXEEXT): $(empty_OBJECTS) $(empty_DEPENDENCIES)
+ @rm -f empty$(EXEEXT)
+ $(CXXLINK) $(empty_OBJECTS) $(empty_LDADD) $(LIBS)
extface$(EXEEXT): $(extface_OBJECTS) $(extface_DEPENDENCIES)
@rm -f extface$(EXEEXT)
$(CXXLINK) $(extface_OBJECTS) $(extface_LDADD) $(LIBS)
@@ -913,13 +1112,16 @@ group_test$(EXEEXT): $(group_test_OBJECTS) $(group_test_DEPENDENCIES)
$(CXXLINK) $(group_test_OBJECTS) $(group_test_LDADD) $(LIBS)
ioperf$(EXEEXT): $(ioperf_OBJECTS) $(ioperf_DEPENDENCIES)
@rm -f ioperf$(EXEEXT)
- $(CXXLINK) $(ioperf_OBJECTS) $(ioperf_LDADD) $(LIBS)
+ $(ioperf_LINK) $(ioperf_OBJECTS) $(ioperf_LDADD) $(LIBS)
largefile$(EXEEXT): $(largefile_OBJECTS) $(largefile_DEPENDENCIES)
@rm -f largefile$(EXEEXT)
$(CXXLINK) $(largefile_OBJECTS) $(largefile_LDADD) $(LIBS)
listtypes$(EXEEXT): $(listtypes_OBJECTS) $(listtypes_DEPENDENCIES)
@rm -f listtypes$(EXEEXT)
$(CXXLINK) $(listtypes_OBJECTS) $(listtypes_LDADD) $(LIBS)
+majorder$(EXEEXT): $(majorder_OBJECTS) $(majorder_DEPENDENCIES)
+ @rm -f majorder$(EXEEXT)
+ $(CXXLINK) $(majorder_OBJECTS) $(majorder_LDADD) $(LIBS)
mat3d_3across$(EXEEXT): $(mat3d_3across_OBJECTS) $(mat3d_3across_DEPENDENCIES)
@rm -f mat3d_3across$(EXEEXT)
$(CXXLINK) $(mat3d_3across_OBJECTS) $(mat3d_3across_LDADD) $(LIBS)
@@ -929,6 +1131,9 @@ matf77$(EXEEXT): $(matf77_OBJECTS) $(matf77_DEPENDENCIES)
merge_block$(EXEEXT): $(merge_block_OBJECTS) $(merge_block_DEPENDENCIES)
@rm -f merge_block$(EXEEXT)
$(CXXLINK) $(merge_block_OBJECTS) $(merge_block_LDADD) $(LIBS)
+mk_nasf_h5$(EXEEXT): $(mk_nasf_h5_OBJECTS) $(mk_nasf_h5_DEPENDENCIES)
+ @rm -f mk_nasf_h5$(EXEEXT)
+ $(LINK) $(mk_nasf_h5_OBJECTS) $(mk_nasf_h5_LDADD) $(LIBS)
mk_nasf_pdb$(EXEEXT): $(mk_nasf_pdb_OBJECTS) $(mk_nasf_pdb_DEPENDENCIES)
@rm -f mk_nasf_pdb$(EXEEXT)
$(CXXLINK) $(mk_nasf_pdb_OBJECTS) $(mk_nasf_pdb_LDADD) $(LIBS)
@@ -965,6 +1170,9 @@ onetet$(EXEEXT): $(onetet_OBJECTS) $(onetet_DEPENDENCIES)
partial_io$(EXEEXT): $(partial_io_OBJECTS) $(partial_io_DEPENDENCIES)
@rm -f partial_io$(EXEEXT)
$(CXXLINK) $(partial_io_OBJECTS) $(partial_io_LDADD) $(LIBS)
+pdbtst$(EXEEXT): $(pdbtst_OBJECTS) $(pdbtst_DEPENDENCIES)
+ @rm -f pdbtst$(EXEEXT)
+ $(CXXLINK) $(pdbtst_OBJECTS) $(pdbtst_LDADD) $(LIBS)
point$(EXEEXT): $(point_OBJECTS) $(point_DEPENDENCIES)
@rm -f point$(EXEEXT)
$(CXXLINK) $(point_OBJECTS) $(point_LDADD) $(LIBS)
@@ -985,7 +1193,7 @@ readstuff$(EXEEXT): $(readstuff_OBJECTS) $(readstuff_DEPENDENCIES)
$(CXXLINK) $(readstuff_OBJECTS) $(readstuff_LDADD) $(LIBS)
rocket$(EXEEXT): $(rocket_OBJECTS) $(rocket_DEPENDENCIES)
@rm -f rocket$(EXEEXT)
- $(CXXLINK) $(rocket_OBJECTS) $(rocket_LDADD) $(LIBS)
+ $(rocket_LINK) $(rocket_OBJECTS) $(rocket_LDADD) $(LIBS)
sami$(EXEEXT): $(sami_OBJECTS) $(sami_DEPENDENCIES)
@rm -f sami$(EXEEXT)
$(CXXLINK) $(sami_OBJECTS) $(sami_LDADD) $(LIBS)
@@ -1007,6 +1215,9 @@ testall$(EXEEXT): $(testall_OBJECTS) $(testall_DEPENDENCIES)
testallf77$(EXEEXT): $(testallf77_OBJECTS) $(testallf77_DEPENDENCIES)
@rm -f testallf77$(EXEEXT)
$(CXXLINK) $(testallf77_OBJECTS) $(testallf77_LDADD) $(LIBS)
+testfs$(EXEEXT): $(testfs_OBJECTS) $(testfs_DEPENDENCIES)
+ @rm -f testfs$(EXEEXT)
+ $(CXXLINK) $(testfs_OBJECTS) $(testfs_LDADD) $(LIBS)
testpdb$(EXEEXT): $(testpdb_OBJECTS) $(testpdb_DEPENDENCIES)
@rm -f testpdb$(EXEEXT)
$(CXXLINK) $(testpdb_OBJECTS) $(testpdb_LDADD) $(LIBS)
@@ -1038,9 +1249,9 @@ mostlyclean-compile:
distclean-compile:
-rm -f *.tab.c
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/TestReadMask-TestReadMask.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/TestReadMask-dummy.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/TestReadMask.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/alltypes.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/arbpoly.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/arbpoly2d.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/array.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/compression.Po at am__quote@
@@ -1049,14 +1260,22 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/dir.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/dummy.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/efcentering.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/empty.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/extface.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/grab.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/group_test.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ioperf.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ioperf_hdf5.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ioperf_pdb.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ioperf_sec2.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ioperf_silo.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ioperf_stdio.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/largefile.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/listtypes.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/majorder.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mat3d_3across.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/merge_block.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mk_nasf_h5.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mk_nasf_pdb.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mmadjacency.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/multi_file.Po at am__quote@
@@ -1069,21 +1288,24 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/onepyramid.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/onetet.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/partial_io.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pdbtst-dummy.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pdbtst-pdbtst.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/point.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/polyzl.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/quad-dummy.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/quad-quad.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/quad-testlib.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/quad.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/readstuff.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/rocket.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/rocket-rocket.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/rocket_silo.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/sami.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/simple.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/spec.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/specmix.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/subhex.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/testall.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/testfs.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/testlib.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/testpdb.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/testpdb-dummy.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/testpdb-testpdb.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/twohex.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ucd.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ucd1d.Po at am__quote@
@@ -1093,136 +1315,115 @@ distclean-compile:
.c.o:
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c $<
.c.obj:
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
.c.lo:
@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
-TestReadMask-TestReadMask.o: TestReadMask.c
- at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(TestReadMask_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT TestReadMask-TestReadMask.o -MD -MP -MF $(DEPDIR)/TestReadMask-TestReadMask.Tpo -c -o TestReadMask-TestReadMask.o `test -f 'TestReadMask.c' || echo '$(srcdir)/'`TestReadMask.c
- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/TestReadMask-TestReadMask.Tpo $(DEPDIR)/TestReadMask-TestReadMask.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='TestReadMask.c' object='TestReadMask-TestReadMask.o' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(TestReadMask_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o TestReadMask-TestReadMask.o `test -f 'TestReadMask.c' || echo '$(srcdir)/'`TestReadMask.c
-
-TestReadMask-TestReadMask.obj: TestReadMask.c
- at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(TestReadMask_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT TestReadMask-TestReadMask.obj -MD -MP -MF $(DEPDIR)/TestReadMask-TestReadMask.Tpo -c -o TestReadMask-TestReadMask.obj `if test -f 'TestReadMask.c'; then $(CYGPATH_W) 'TestReadMask.c'; else $(CYGPATH_W) '$(srcdir)/TestReadMask.c'; fi`
- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/TestReadMask-TestReadMask.Tpo $(DEPDIR)/TestReadMask-TestReadMask.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='TestReadMask.c' object='TestReadMask-TestReadMask.obj' libtool=no @AMDEPBACKSLASH@
+pdbtst-pdbtst.o: pdbtst.c
+ at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pdbtst_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pdbtst-pdbtst.o -MD -MP -MF $(DEPDIR)/pdbtst-pdbtst.Tpo -c -o pdbtst-pdbtst.o `test -f 'pdbtst.c' || echo '$(srcdir)/'`pdbtst.c
+ at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/pdbtst-pdbtst.Tpo $(DEPDIR)/pdbtst-pdbtst.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='pdbtst.c' object='pdbtst-pdbtst.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(TestReadMask_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o TestReadMask-TestReadMask.obj `if test -f 'TestReadMask.c'; then $(CYGPATH_W) 'TestReadMask.c'; else $(CYGPATH_W) '$(srcdir)/TestReadMask.c'; fi`
+ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pdbtst_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pdbtst-pdbtst.o `test -f 'pdbtst.c' || echo '$(srcdir)/'`pdbtst.c
-quad-quad.o: quad.c
- at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(quad_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT quad-quad.o -MD -MP -MF $(DEPDIR)/quad-quad.Tpo -c -o quad-quad.o `test -f 'quad.c' || echo '$(srcdir)/'`quad.c
- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/quad-quad.Tpo $(DEPDIR)/quad-quad.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='quad.c' object='quad-quad.o' libtool=no @AMDEPBACKSLASH@
+pdbtst-pdbtst.obj: pdbtst.c
+ at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pdbtst_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pdbtst-pdbtst.obj -MD -MP -MF $(DEPDIR)/pdbtst-pdbtst.Tpo -c -o pdbtst-pdbtst.obj `if test -f 'pdbtst.c'; then $(CYGPATH_W) 'pdbtst.c'; else $(CYGPATH_W) '$(srcdir)/pdbtst.c'; fi`
+ at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/pdbtst-pdbtst.Tpo $(DEPDIR)/pdbtst-pdbtst.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='pdbtst.c' object='pdbtst-pdbtst.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(quad_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o quad-quad.o `test -f 'quad.c' || echo '$(srcdir)/'`quad.c
+ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pdbtst_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pdbtst-pdbtst.obj `if test -f 'pdbtst.c'; then $(CYGPATH_W) 'pdbtst.c'; else $(CYGPATH_W) '$(srcdir)/pdbtst.c'; fi`
-quad-quad.obj: quad.c
- at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(quad_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT quad-quad.obj -MD -MP -MF $(DEPDIR)/quad-quad.Tpo -c -o quad-quad.obj `if test -f 'quad.c'; then $(CYGPATH_W) 'quad.c'; else $(CYGPATH_W) '$(srcdir)/quad.c'; fi`
- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/quad-quad.Tpo $(DEPDIR)/quad-quad.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='quad.c' object='quad-quad.obj' libtool=no @AMDEPBACKSLASH@
+testpdb-testpdb.o: testpdb.c
+ at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testpdb_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT testpdb-testpdb.o -MD -MP -MF $(DEPDIR)/testpdb-testpdb.Tpo -c -o testpdb-testpdb.o `test -f 'testpdb.c' || echo '$(srcdir)/'`testpdb.c
+ at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/testpdb-testpdb.Tpo $(DEPDIR)/testpdb-testpdb.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='testpdb.c' object='testpdb-testpdb.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(quad_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o quad-quad.obj `if test -f 'quad.c'; then $(CYGPATH_W) 'quad.c'; else $(CYGPATH_W) '$(srcdir)/quad.c'; fi`
+ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testpdb_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o testpdb-testpdb.o `test -f 'testpdb.c' || echo '$(srcdir)/'`testpdb.c
-quad-testlib.o: testlib.c
- at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(quad_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT quad-testlib.o -MD -MP -MF $(DEPDIR)/quad-testlib.Tpo -c -o quad-testlib.o `test -f 'testlib.c' || echo '$(srcdir)/'`testlib.c
- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/quad-testlib.Tpo $(DEPDIR)/quad-testlib.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='testlib.c' object='quad-testlib.o' libtool=no @AMDEPBACKSLASH@
+testpdb-testpdb.obj: testpdb.c
+ at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testpdb_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT testpdb-testpdb.obj -MD -MP -MF $(DEPDIR)/testpdb-testpdb.Tpo -c -o testpdb-testpdb.obj `if test -f 'testpdb.c'; then $(CYGPATH_W) 'testpdb.c'; else $(CYGPATH_W) '$(srcdir)/testpdb.c'; fi`
+ at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/testpdb-testpdb.Tpo $(DEPDIR)/testpdb-testpdb.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='testpdb.c' object='testpdb-testpdb.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(quad_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o quad-testlib.o `test -f 'testlib.c' || echo '$(srcdir)/'`testlib.c
+ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testpdb_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o testpdb-testpdb.obj `if test -f 'testpdb.c'; then $(CYGPATH_W) 'testpdb.c'; else $(CYGPATH_W) '$(srcdir)/testpdb.c'; fi`
-quad-testlib.obj: testlib.c
- at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(quad_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT quad-testlib.obj -MD -MP -MF $(DEPDIR)/quad-testlib.Tpo -c -o quad-testlib.obj `if test -f 'testlib.c'; then $(CYGPATH_W) 'testlib.c'; else $(CYGPATH_W) '$(srcdir)/testlib.c'; fi`
- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/quad-testlib.Tpo $(DEPDIR)/quad-testlib.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='testlib.c' object='quad-testlib.obj' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(quad_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o quad-testlib.obj `if test -f 'testlib.c'; then $(CYGPATH_W) 'testlib.c'; else $(CYGPATH_W) '$(srcdir)/testlib.c'; fi`
-
-.cpp.o:
+.cxx.o:
@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-.cpp.obj:
+.cxx.obj:
@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-.cpp.lo:
+.cxx.lo:
@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-TestReadMask-dummy.o: dummy.cxx
- at am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(TestReadMask_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT TestReadMask-dummy.o -MD -MP -MF $(DEPDIR)/TestReadMask-dummy.Tpo -c -o TestReadMask-dummy.o `test -f 'dummy.cxx' || echo '$(srcdir)/'`dummy.cxx
- at am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/TestReadMask-dummy.Tpo $(DEPDIR)/TestReadMask-dummy.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='dummy.cxx' object='TestReadMask-dummy.o' libtool=no @AMDEPBACKSLASH@
+pdbtst-dummy.o: dummy.cxx
+ at am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pdbtst_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT pdbtst-dummy.o -MD -MP -MF $(DEPDIR)/pdbtst-dummy.Tpo -c -o pdbtst-dummy.o `test -f 'dummy.cxx' || echo '$(srcdir)/'`dummy.cxx
+ at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/pdbtst-dummy.Tpo $(DEPDIR)/pdbtst-dummy.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='dummy.cxx' object='pdbtst-dummy.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(TestReadMask_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o TestReadMask-dummy.o `test -f 'dummy.cxx' || echo '$(srcdir)/'`dummy.cxx
+ at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pdbtst_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o pdbtst-dummy.o `test -f 'dummy.cxx' || echo '$(srcdir)/'`dummy.cxx
-TestReadMask-dummy.obj: dummy.cxx
- at am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(TestReadMask_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT TestReadMask-dummy.obj -MD -MP -MF $(DEPDIR)/TestReadMask-dummy.Tpo -c -o TestReadMask-dummy.obj `if test -f 'dummy.cxx'; then $(CYGPATH_W) 'dummy.cxx'; else $(CYGPATH_W) '$(srcdir)/dummy.cxx'; fi`
- at am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/TestReadMask-dummy.Tpo $(DEPDIR)/TestReadMask-dummy.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='dummy.cxx' object='TestReadMask-dummy.obj' libtool=no @AMDEPBACKSLASH@
+pdbtst-dummy.obj: dummy.cxx
+ at am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pdbtst_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT pdbtst-dummy.obj -MD -MP -MF $(DEPDIR)/pdbtst-dummy.Tpo -c -o pdbtst-dummy.obj `if test -f 'dummy.cxx'; then $(CYGPATH_W) 'dummy.cxx'; else $(CYGPATH_W) '$(srcdir)/dummy.cxx'; fi`
+ at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/pdbtst-dummy.Tpo $(DEPDIR)/pdbtst-dummy.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='dummy.cxx' object='pdbtst-dummy.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(TestReadMask_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o TestReadMask-dummy.obj `if test -f 'dummy.cxx'; then $(CYGPATH_W) 'dummy.cxx'; else $(CYGPATH_W) '$(srcdir)/dummy.cxx'; fi`
+ at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pdbtst_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o pdbtst-dummy.obj `if test -f 'dummy.cxx'; then $(CYGPATH_W) 'dummy.cxx'; else $(CYGPATH_W) '$(srcdir)/dummy.cxx'; fi`
-quad-dummy.o: dummy.cxx
- at am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(quad_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT quad-dummy.o -MD -MP -MF $(DEPDIR)/quad-dummy.Tpo -c -o quad-dummy.o `test -f 'dummy.cxx' || echo '$(srcdir)/'`dummy.cxx
- at am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/quad-dummy.Tpo $(DEPDIR)/quad-dummy.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='dummy.cxx' object='quad-dummy.o' libtool=no @AMDEPBACKSLASH@
+rocket-rocket.o: rocket.cxx
+ at am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rocket_CXXFLAGS) $(CXXFLAGS) -MT rocket-rocket.o -MD -MP -MF $(DEPDIR)/rocket-rocket.Tpo -c -o rocket-rocket.o `test -f 'rocket.cxx' || echo '$(srcdir)/'`rocket.cxx
+ at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/rocket-rocket.Tpo $(DEPDIR)/rocket-rocket.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='rocket.cxx' object='rocket-rocket.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(quad_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o quad-dummy.o `test -f 'dummy.cxx' || echo '$(srcdir)/'`dummy.cxx
+ at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rocket_CXXFLAGS) $(CXXFLAGS) -c -o rocket-rocket.o `test -f 'rocket.cxx' || echo '$(srcdir)/'`rocket.cxx
-quad-dummy.obj: dummy.cxx
- at am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(quad_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT quad-dummy.obj -MD -MP -MF $(DEPDIR)/quad-dummy.Tpo -c -o quad-dummy.obj `if test -f 'dummy.cxx'; then $(CYGPATH_W) 'dummy.cxx'; else $(CYGPATH_W) '$(srcdir)/dummy.cxx'; fi`
- at am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/quad-dummy.Tpo $(DEPDIR)/quad-dummy.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='dummy.cxx' object='quad-dummy.obj' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(quad_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o quad-dummy.obj `if test -f 'dummy.cxx'; then $(CYGPATH_W) 'dummy.cxx'; else $(CYGPATH_W) '$(srcdir)/dummy.cxx'; fi`
-
-.cxx.o:
- at am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+rocket-rocket.obj: rocket.cxx
+ at am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rocket_CXXFLAGS) $(CXXFLAGS) -MT rocket-rocket.obj -MD -MP -MF $(DEPDIR)/rocket-rocket.Tpo -c -o rocket-rocket.obj `if test -f 'rocket.cxx'; then $(CYGPATH_W) 'rocket.cxx'; else $(CYGPATH_W) '$(srcdir)/rocket.cxx'; fi`
+ at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/rocket-rocket.Tpo $(DEPDIR)/rocket-rocket.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='rocket.cxx' object='rocket-rocket.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+ at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rocket_CXXFLAGS) $(CXXFLAGS) -c -o rocket-rocket.obj `if test -f 'rocket.cxx'; then $(CYGPATH_W) 'rocket.cxx'; else $(CYGPATH_W) '$(srcdir)/rocket.cxx'; fi`
-.cxx.obj:
- at am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+testpdb-dummy.o: dummy.cxx
+ at am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testpdb_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT testpdb-dummy.o -MD -MP -MF $(DEPDIR)/testpdb-dummy.Tpo -c -o testpdb-dummy.o `test -f 'dummy.cxx' || echo '$(srcdir)/'`dummy.cxx
+ at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/testpdb-dummy.Tpo $(DEPDIR)/testpdb-dummy.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='dummy.cxx' object='testpdb-dummy.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testpdb_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o testpdb-dummy.o `test -f 'dummy.cxx' || echo '$(srcdir)/'`dummy.cxx
-.cxx.lo:
- at am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+testpdb-dummy.obj: dummy.cxx
+ at am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testpdb_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT testpdb-dummy.obj -MD -MP -MF $(DEPDIR)/testpdb-dummy.Tpo -c -o testpdb-dummy.obj `if test -f 'dummy.cxx'; then $(CYGPATH_W) 'dummy.cxx'; else $(CYGPATH_W) '$(srcdir)/dummy.cxx'; fi`
+ at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/testpdb-dummy.Tpo $(DEPDIR)/testpdb-dummy.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='dummy.cxx' object='testpdb-dummy.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+ at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(testpdb_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o testpdb-dummy.obj `if test -f 'dummy.cxx'; then $(CYGPATH_W) 'dummy.cxx'; else $(CYGPATH_W) '$(srcdir)/dummy.cxx'; fi`
.f.o:
$(F77COMPILE) -c -o $@ $<
@@ -1241,65 +1442,72 @@ clean-libtool:
install-includeHEADERS: $(include_HEADERS)
@$(NORMAL_INSTALL)
test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
- @list='$(include_HEADERS)'; for p in $$list; do \
+ @list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \
+ for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
- echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
- $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(includedir)'"; \
+ $(INSTALL_HEADER) $$files "$(DESTDIR)$(includedir)" || exit $$?; \
done
uninstall-includeHEADERS:
@$(NORMAL_UNINSTALL)
- @list='$(include_HEADERS)'; for p in $$list; do \
- f=$(am__strip_dir) \
- echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
- rm -f "$(DESTDIR)$(includedir)/$$f"; \
- done
+ @list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ test -n "$$files" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(includedir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(includedir)" && rm -f $$files
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
+ set x; \
here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
fi
ctags: CTAGS
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
+ $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && cd $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) $$here
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -1320,19 +1528,23 @@ distdir: $(DISTFILES)
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
if test -d $$d/$$file; then \
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
check-am: all-am
- $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) $(check_SCRIPTS) \
- $(check_DATA)
+ $(MAKE) $(AM_MAKEFLAGS) $(check_LTLIBRARIES) $(check_PROGRAMS) \
+ $(check_SCRIPTS) $(check_DATA)
$(MAKE) $(AM_MAKEFLAGS) check-local
check: check-am
all-am: Makefile $(HEADERS) all-local
@@ -1360,6 +1572,7 @@ clean-generic:
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
maintainer-clean-generic:
@@ -1367,8 +1580,8 @@ maintainer-clean-generic:
@echo "it deletes files that may require special tools to rebuild."
clean: clean-am
-clean-am: clean-checkPROGRAMS clean-generic clean-libtool clean-local \
- mostlyclean-am
+clean-am: clean-checkLTLIBRARIES clean-checkPROGRAMS clean-generic \
+ clean-libtool clean-local mostlyclean-am
distclean: distclean-am
-rm -rf ./$(DEPDIR)
@@ -1382,6 +1595,8 @@ dvi-am:
html: html-am
+html-am:
+
info: info-am
info-am:
@@ -1390,18 +1605,28 @@ install-data-am: install-includeHEADERS
install-dvi: install-dvi-am
+install-dvi-am:
+
install-exec-am:
install-html: install-html-am
+install-html-am:
+
install-info: install-info-am
+install-info-am:
+
install-man:
install-pdf: install-pdf-am
+install-pdf-am:
+
install-ps: install-ps-am
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-am
@@ -1424,11 +1649,11 @@ ps-am:
uninstall-am: uninstall-includeHEADERS
-.MAKE: install-am install-strip
+.MAKE: check-am install-am install-strip
.PHONY: CTAGS GTAGS all all-am all-local check check-am check-local \
- clean clean-checkPROGRAMS clean-generic clean-libtool \
- clean-local ctags distclean distclean-compile \
+ clean clean-checkLTLIBRARIES clean-checkPROGRAMS clean-generic \
+ clean-libtool clean-local ctags distclean distclean-compile \
distclean-generic distclean-libtool distclean-tags distdir dvi \
dvi-am html html-am info info-am install install-am \
install-data install-data-am install-dvi install-dvi-am \
@@ -1533,6 +1758,7 @@ copy_cksd:
fi ;\
done
touch $@
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/tests/TestReadMask.c b/tests/TestReadMask.c
index a611ad0..95d33e3 100644
--- a/tests/TestReadMask.c
+++ b/tests/TestReadMask.c
@@ -55,6 +55,7 @@ product endorsement purposes.
#include <sys/time.h>
#else
#include <string.h>
+#include <time.h>
#endif
#include <sys/timeb.h>
#include <std.c>
diff --git a/tests/add_amr_mrgtree.c b/tests/add_amr_mrgtree.c
index 0dbf0da..0f475c2 100644
--- a/tests/add_amr_mrgtree.c
+++ b/tests/add_amr_mrgtree.c
@@ -119,6 +119,20 @@ typedef struct amrConfig_t
int currentPatch;
} amrConfig_t;
+static void freeAmrConf(amrConfig_t *amrconf)
+{
+ int i;
+ free(amrconf->meshName);
+ for (i = 0; i < amrconf->numLevels; i++)
+ free(amrconf->levels[i]);
+ free(amrconf->levels);
+ for (i = 0; i < amrconf->numPatches; i++)
+ free(amrconf->patches[i].children);
+ free(amrconf->numPatchesOnLevel);
+ free(amrconf->ratios);
+ free(amrconf->patches);
+}
+
#ifdef XML_LARGE_SIZE
#if defined(XML_USE_MSC_EXTENSIONS) && _MSC_VER < 1400
#define XML_FMT_INT_MOD "I64"
@@ -331,7 +345,7 @@ chardata(void *userData, const XML_Char *s, int len)
if (len == 0)
return;
- s1 = malloc(len+1);
+ s1 = (char*) malloc(len+1);
strncpy(s1, s, len);
s1[len] = '\0';
@@ -405,6 +419,7 @@ int ProcessXMLAMRConfigFile(const char *xmlFileName, amrConfig_t *amrconfig)
break;
}
XML_ParserFree(p);
+ fclose(acf);
return 0;
}
@@ -459,7 +474,7 @@ main(int argc, char *argv[])
}
}
- DBShowErrors(show_all_errors?DB_ALL_AND_DRVR:DB_ABORT, NULL);
+ DBShowErrors(show_all_errors?DB_ALL_AND_DRVR:DB_ALL, NULL);
/* by default, we make a copy of the specified file */
@@ -487,19 +502,22 @@ main(int argc, char *argv[])
mm = DBGetMultimesh(dbfile, amrconf.meshName);
sprintf(tmpName, "%s_wmrgtree", amrconf.meshName);
optList = DBMakeOptlist(10);
- DBAddOption(optList, DBOPT_MRGTREE_NAME, "mrgTree");
+ char *foo = "mrgTree";
+ DBAddOption(optList, DBOPT_MRGTREE_NAME, foo);
DBPutMultimesh(dbfile, tmpName, mm->nblocks, mm->meshnames, mm->meshtypes, optList);
DBClearOptlist(optList);
+ DBFreeMultimesh(mm);
#if !defined(_WIN32)
#warning HACK FOR SINGLE VARIABLE
#endif
{
- DBmultivar *mv = DBGetMultivar(dbfile, "foo");
+ DBmultivar *mv = DBGetMultivar(dbfile, "Density");
DBoptlist *optList2 = DBMakeOptlist(10);
DBAddOption(optList2, DBOPT_MMESH_NAME, tmpName);
DBPutMultivar(dbfile, "foo_wmrgtree", mv->nvars, mv->varnames, mv->vartypes, optList2);
DBFreeOptlist(optList2);
+ DBFreeMultivar(mv);
}
/* write this multi-mesh object back to the file, with a different name
@@ -559,6 +577,8 @@ main(int argc, char *argv[])
levelRegnNames[0] = "@level%d at n";
DBAddRegionArray(mrgTree, amrconf.numLevels, levelRegnNames, 0, lvlMapsName, 1,
segIds, amrconf.numPatchesOnLevel, segTypes, 0);
+ free(segTypes);
+ free(segIds);
}
DBSetCwr(mrgTree, "..");
@@ -580,6 +600,9 @@ main(int argc, char *argv[])
patchRegnNames[0] = "@patch%d at n";
DBAddRegionArray(mrgTree, amrconf.numPatches, patchRegnNames, 0, chldMapsName, 1,
segIds, segLens, segTypes, 0);
+ free(segTypes);
+ free(segIds);
+ free(segLens);
}
{
@@ -596,6 +619,10 @@ main(int argc, char *argv[])
DBAddOption(optList, DBOPT_MRGV_ONAMES, mrgv_onames);
DBPutMrgtree(dbfile, "mrgTree", "amr_mesh", mrgTree, optList);
DBFreeMrgtree(mrgTree);
+ free(mrgv_onames[0]);
+ free(mrgv_onames[1]);
+ free(mrgv_onames[2]);
+ free(mrgv_onames[3]);
}
/* Output level refinement ratios as an mrg variable on the array of regions
@@ -674,6 +701,10 @@ main(int argc, char *argv[])
}
DBClose(dbfile);
+ DBFreeOptlist(optList);
+ freeAmrConf(&amrconf);
+ free(amrconfigFileName);
+ free(siloFileName);
return (0);
}
diff --git a/tests/alltypes.c b/tests/alltypes.c
index e67f7a8..2753fd3 100644
--- a/tests/alltypes.c
+++ b/tests/alltypes.c
@@ -277,6 +277,8 @@ main(int argc, char *argv[])
DBClose(dbfile);
+ DBFreeFacelist(facelist);
+
CleanupDriverStuff();
return 0;
}
diff --git a/tests/arbpoly.c b/tests/arbpoly.c
new file mode 100644
index 0000000..e71287b
--- /dev/null
+++ b/tests/arbpoly.c
@@ -0,0 +1,703 @@
+/*
+Copyright (c) 1994 - 2010, Lawrence Livermore National Security, LLC.
+LLNL-CODE-425250.
+All rights reserved.
+
+This file is part of Silo. For details, see silo.llnl.gov.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the disclaimer below.
+ * Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the disclaimer (as noted
+ below) in the documentation and/or other materials provided with
+ the distribution.
+ * Neither the name of the LLNS/LLNL nor the names of its
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL LAWRENCE
+LIVERMORE NATIONAL SECURITY, LLC, THE U.S. DEPARTMENT OF ENERGY OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+This work was produced at Lawrence Livermore National Laboratory under
+Contract No. DE-AC52-07NA27344 with the DOE. Neither the United
+States Government nor Lawrence Livermore National Security, LLC nor
+any of their employees, makes any warranty, express or implied, or
+assumes any liability or responsibility for the accuracy,
+completeness, or usefulness of any information, apparatus, product, or
+process disclosed, or represents that its use would not infringe
+privately-owned rights. Any reference herein to any specific
+commercial products, process, or services by trade name, trademark,
+manufacturer or otherwise does not necessarily constitute or imply its
+endorsement, recommendation, or favoring by the United States
+Government or Lawrence Livermore National Security, LLC. The views and
+opinions of authors expressed herein do not necessarily state or
+reflect those of the United States Government or Lawrence Livermore
+National Security, LLC, and shall not be used for advertising or
+product endorsement purposes.
+*/
+#include <silo.h>
+#include <stdio.h>
+#include <math.h>
+#include <string.h>
+#include <std.c>
+
+#define LEN(A) (sizeof(A)/sizeof(A[0]))
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+int
+main(int argc, char *argv[])
+{
+ int i;
+ DBfile *dbfile = NULL;
+ char *coordnames[3];
+ float *coords[3];
+ int driver=DB_PDB;
+ char *filename = "arbpoly-zoohybrid.silo";
+ DBoptlist *ol;
+
+ for (i=1; i<argc; i++) {
+ if (!strncmp(argv[i], "DB_PDB",6)) {
+ driver = StringToDriver(argv[i]);
+ } else if (!strncmp(argv[i], "DB_HDF5", 7)) {
+ driver = StringToDriver(argv[i]);
+ } else if (argv[i][0] != '\0') {
+ fprintf(stderr, "%s: ignored argument `%s'\n", argv[0], argv[i]);
+ }
+ }
+
+ DBShowErrors(DB_ABORT, NULL);
+ printf("Creating test file \"%s\".\n", filename);
+ dbfile = DBCreate(filename, DB_CLOBBER, DB_LOCAL, "arbitrary shape tests", driver);
+
+ coordnames[0] = "xcoords";
+ coordnames[1] = "ycoords";
+ coordnames[2] = "zcoords";
+
+ /* 2D tests */
+ {
+ /* create a 2d ucd mesh in 5 segments of 2 quads, 2 6-vertex polygons,
+ 2 tris, 1 quad and a final segment of 4 arbitrary polygons (tris,
+ a 6-vertex polygon and a quad) */
+ float x[] = {0,1,2,3,4,5,6,7,8,9,
+ 0,1,2,3,4,5,6,7,8,9,
+ 2.5,3.5,7.5,2.5,3.5,7.5};
+ float y[] = {0,0,0,0,0,0,0,0,0,0,
+ 1,1,1,1,1,1,1,1,1,1,
+ -1,-1,-1,2,2,2};
+ float z[] = {0,0,0,0,0,0,0,0,0,0,
+ 1,1,1,1,1,1,1,1,1,1,
+ -1,-1,-1,2,2,2};
+ int shapesize[] = {4, 0, 3, 4, 6};
+ /* the Silo docs include a 3D example where the shapesize entry
+ for a DBPutZonelist2 call is the # of slots in the nodelist
+ taken up by the given segment of arbitrary shapes. However,
+ that convention appears to be supported in VisIt only for 3D
+ int shapesize2[] = {4, 20, 3, 4, 6};*/
+ int shapesize2[] = {4, 0, 3, 4, 6};
+ int shapecnt[] = {2, 4, 2, 1, 2};
+ int shapetype[] = {DB_ZONETYPE_QUAD,
+ DB_ZONETYPE_POLYGON,
+ DB_ZONETYPE_TRIANGLE,
+ DB_ZONETYPE_QUAD,
+ DB_ZONETYPE_POLYGON};
+ int nl[] = {0,1,11,10,
+ 1,2,12,11,
+
+ 3, 6,17,16,
+ 3, 7,17,6,
+ 6, 22,8,18,25,17,7,
+ 4, 8,9,19,18,
+
+ 4,15,14,
+ 5,15,4,
+
+ 5,6,16,15,
+
+ 20,3,13,23,12,2,
+ 21,4,14,24,13,3};
+
+ int ndcnts_phzl1[] = {4,4,3,3,6,4,3,3,4,6,6};
+ int nl_phzl1[] = {0,1,11,10,
+ 1,2,12,11,
+
+ 6,17,16,
+ 7,17,6,
+ 22,8,18,25,17,7,
+ 8,9,19,18,
+
+ 4,15,14,
+ 5,15,4,
+
+ 5,6,16,15,
+
+ 20,3,13,23,12,2,
+ 21,4,14,24,13,3};
+
+ int ndcnts_phzl2[] = {2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+ 2,2,2,2,2,2};
+ /* 0 1 2 3 4 5 6 7 8 9 10 11 */
+ int nl_phzl2[] = {0,1, 1,2, 2,20, 20,3, 3,21, 21,4, 4,5, 5,6, 6,7, 7,22, 22,8, 8,9,
+
+ /* 12 13 14 15 16 17 18 19 20 21 */
+ 0,10, 1,11, 2,12, 3,13, 4,14, 5,15, 6,16, 7,17, 8,18, 9,19,
+
+ /* 22 23 24 25 26 27 28 29 30 31 32 33 */
+ 10,11, 11,12, 12,23, 23,13, 13,24, 24,14, 14,15, 15,16, 16,17, 17,25, 25,18, 18,19,
+
+ /* 34 35 */
+ 4,15, 6,17};
+ int edgcnts_phzl2[] = {4,4, 3,3,6,4, 3,3, 4, 6,6};
+ int el_phzl2[] = {0,13,22,12,
+ 1,14,23,13,
+
+ 18,35,30,
+ 8,19,35,
+ 9,10,20,32,31,19,
+ 11,21,33,20,
+
+ 34,28,16,
+ 6,17,34,
+
+ 7,18,29,17,
+
+ 2,3,15,25,24,14,
+ 4,5,16,27,26,15};
+
+ float nvar[] = {0,1,2,3,4,3,2,1,0,-1,
+ 0,1,2,3,4,3,2,1,0,-1,
+ 2.5,3.5,1.5,2.5,3.5,1.5};
+
+ float zvar[] = {0,1,1,0,-1,-2,3,4,2,2,3};
+ int pass;
+
+ coords[0] = x;
+ coords[1] = y;
+ coords[2] = z;
+
+ for (pass = 2; pass <= 3; pass++)
+ {
+ if (pass == 2)
+ {
+ DBMkDir(dbfile, "2D");
+ DBSetDir(dbfile, "2D");
+ }
+ else
+ {
+ DBMkDir(dbfile, "2Dz");
+ DBSetDir(dbfile, "2Dz");
+ }
+
+ /* Typical 2D mesh with obsolete zonelist method */
+ DBPutUcdmesh(dbfile, "mesh1_zl1", pass, coordnames, coords, LEN(x), 11, "zl1",
+ NULL, DB_FLOAT, NULL);
+ DBSetDeprecateWarnings(0);
+ DBPutZonelist(dbfile, "zl1", 11, 2, nl, LEN(nl), 0, shapesize,
+ shapecnt, 5);
+ DBSetDeprecateWarnings(3);
+ DBPutUcdvar1(dbfile, "n11", "mesh1_zl1", nvar, LEN(x), NULL, 0, DB_FLOAT,
+ DB_NODECENT, NULL);
+ DBPutUcdvar1(dbfile, "z11", "mesh1_zl1", zvar, LEN(zvar), NULL, 0, DB_FLOAT,
+ DB_ZONECENT, NULL);
+
+ /* Same as above except using DBPutZonelist2 (newer method) */
+ DBPutUcdmesh(dbfile, "mesh1_zl2", pass, coordnames, coords, LEN(x), 11, "zl2",
+ NULL, DB_FLOAT, NULL);
+ DBPutZonelist2(dbfile, "zl2", 11, 2, nl, LEN(nl), 0, 0, 0, shapetype,
+ shapesize2, shapecnt, 5, 0);
+ DBPutUcdvar1(dbfile, "n12", "mesh1_zl2", nvar, LEN(x), NULL, 0, DB_FLOAT,
+ DB_NODECENT, NULL);
+ DBPutUcdvar1(dbfile, "z12", "mesh1_zl2", zvar, LEN(zvar), NULL, 0, DB_FLOAT,
+ DB_ZONECENT, NULL);
+
+ /* Same as above except with some ghost zones */
+ DBPutUcdmesh(dbfile, "mesh1g_zl2", pass, coordnames, coords, LEN(x), 11, "zlg2",
+ NULL, DB_FLOAT, NULL);
+ DBPutZonelist2(dbfile, "zlg2", 11, 2, nl, LEN(nl), 0, 3, 3, shapetype,
+ shapesize2, shapecnt, 5, 0);
+ DBPutUcdvar1(dbfile, "n12g", "mesh1g_zl2", nvar, LEN(x), NULL, 0, DB_FLOAT,
+ DB_NODECENT, NULL);
+ DBPutUcdvar1(dbfile, "z12g", "mesh1g_zl2", zvar, LEN(zvar), NULL, 0, DB_FLOAT,
+ DB_ZONECENT, NULL);
+
+ /* same using ph-zonelist of faces only */
+ ol = DBMakeOptlist(3);
+ DBAddOption(ol, DBOPT_PHZONELIST, "phzl");
+ DBPutUcdmesh(dbfile, "mesh1_phzl", pass, coordnames, coords, LEN(x), 11, 0,
+ NULL, DB_FLOAT, ol);
+ DBFreeOptlist(ol);
+ DBPutPHZonelist(dbfile, "phzl", 11, ndcnts_phzl1, LEN(nl_phzl1), nl_phzl1, 0,0,0,0,0,0,0,10,0);
+ DBPutUcdvar1(dbfile, "n1phzl", "mesh1_phzl", nvar, LEN(x), NULL, 0, DB_FLOAT,
+ DB_NODECENT, NULL);
+ DBPutUcdvar1(dbfile, "z1phzl", "mesh1_phzl", zvar, LEN(zvar), NULL, 0, DB_FLOAT,
+ DB_ZONECENT, NULL);
+
+ /* same using ph-zonelist with explicit edge list */
+ ol = DBMakeOptlist(3);
+ DBAddOption(ol, DBOPT_PHZONELIST, "phzl2");
+ DBPutUcdmesh(dbfile, "mesh1_phzl2", pass, coordnames, coords, LEN(x), 11, 0,
+ NULL, DB_FLOAT, ol);
+ DBFreeOptlist(ol);
+ DBPutPHZonelist(dbfile, "phzl2", LEN(nl_phzl2)/2, ndcnts_phzl2, LEN(nl_phzl2), nl_phzl2, 0,
+ 11, edgcnts_phzl2, LEN(el_phzl2), el_phzl2, 0, 0, 10, 0);
+ DBPutUcdvar1(dbfile, "n1phzl2", "mesh1_phzl2", nvar, LEN(x), NULL, 0, DB_FLOAT,
+ DB_NODECENT, NULL);
+ DBPutUcdvar1(dbfile, "z1phzl2", "mesh1_phzl2", zvar, LEN(zvar), NULL, 0, DB_FLOAT,
+ DB_ZONECENT, NULL);
+
+ DBSetDir(dbfile, "..");
+ }
+ }
+
+ /* 3D Tests */
+ {
+ /* coordinate data */
+ float icdata[] = {
+ 0, 0, 0, 0,
+ 1, 1, 0, 0,
+ 2, 2, 0, 0,
+ 3, 0, 0, 1,
+ 4, 1, 0, 1,
+ 5, 2, 0, 1,
+
+ 6, 0, 1, 0,
+ 7, 1, 1, 0,
+ 8, 2, 1, 0,
+ 9, 0, 1, 1,
+ 10, 1, 1, 1,
+ 11, 2, 1, 1,
+
+ 12, 0, 2, 0,
+ 13, 1, 2, 0,
+ 14, 2, 2, 0,
+ 15, 0, 2, 1,
+ 16, 1, 2, 1,
+ 17, 2, 2, 1,
+
+ 18, 1, 3, 1,
+
+ 19, 2.75,0,1,
+ 20, 3,0,0.75,
+ 21, 3,0.25,1,
+
+ 22, 3, 1, 1,
+ 23, 3, 1, 0,
+
+ 24, 2.75,2,1,
+ 25, 3,1.75,1,
+ 26, 3,1.75,0.75,
+
+ 27, 3, 0, 0
+ };
+
+ /* node counts for ph zl */
+ int nodecnts[] = {
+ /* 0 (hex w/6 new faces) */ 4,4,4,4,4,4,
+ /* 1 (hex w/5 new faces) */ 4,4,4,4,4,
+ /* 2 (pyramid w/4 new faces) */ 3,3,3,3,
+ /* 3 (pyramid w/4 new faces) */ 4,3,3,3,
+ /* 4 (wedge w/3 new faces) */ 4,4,3,
+ /* 5 (pyramid w/3 new faces) */ 4,3,3,
+ /* 6 (wedge w/3 new faces) */ 4,4,3,
+ /* 7 (tet w/3 new faces) */ 3,3,3,
+ /* 8 (tet w/2 new faces) */ 3,3,
+ /* 9 (arb w/6 new faces) */ 5,5,5,4,4,3,
+ /* 10 (arb w/4 new faces) */ 5,5,4,3
+ };
+
+ /* nodelist for all the faces in ph zl */
+ int nodelist[] = {
+
+ /* 6 new faces from zone 0 (hex) */
+ 0, 3, 9, 6,
+ 0, 1, 4, 3,
+ 0, 6, 7, 1,
+ 3, 4,10, 9,
+ 4, 1, 7,10,
+ 6, 9,10,7,
+
+ /* 5 new faces from zone 1 (hex) */
+ 7,10,11, 8,
+ 8,11, 5, 2,
+ 1, 7, 8, 2,
+ 5,11,10, 4,
+ 1, 2, 5, 4,
+
+ /* 4 new faces from zone 2 (pyramid) */
+ 7,16,10,
+ 10,16, 9,
+ 9,16, 6,
+ 6,16, 7,
+
+ /* 4 new faces from zone 3 (pyramid) */
+ 15,12, 6, 9,
+ 9,16,15,
+ 15,16,12,
+ 6,12,16,
+
+ /* 3 new faces from zone 4 (wedge) */
+ 10,11,17,16,
+ 7,16,17, 8,
+ 8,17,11,
+
+ /* 3 new faces from zone 5 (pyramid) */
+ 6,12,13, 7,
+ 7,13,16,
+ 12,16,13,
+
+ /* 3 new faces from zone 6 (wedge) */
+ 16,17,14,13,
+ 7,13,14, 8,
+ 8,14,17,
+
+ /* 3 new faces from zone 7 (tet) */
+ 15,16,18,
+ 15,18,12,
+ 12,18,16,
+
+ /* 2 new faces from zone 8 (tet) */
+ 16,13,18,
+ 12,18,13,
+
+ /* 6 new faces from zone 9 (arb) */
+ 19, 21, 22, 11, 5,
+ 20, 27, 23, 22, 21,
+ 27, 20, 19, 5, 2,
+ 2, 8, 23, 27,
+ 8, 11, 22, 23,
+ 20, 21, 19,
+
+ /* 4 new faces from zone 10 (arb) */
+ 22, 25, 24, 17, 11,
+ 8, 17, 24, 26, 23,
+ 22, 23, 26, 25,
+ 24, 25, 26
+
+ };
+
+ /* order-randomized nodelist for all the faces */
+ int nodelist2[] = {
+
+ /* 6 new faces from zone 0 (hex) */
+ 9, 6, 0, 3,
+ 0, 1, 4, 3,
+ 0, 6, 7, 1,
+ 3, 4,10, 9,
+ 1, 7,10, 4,
+ 6, 9,10,7,
+
+ /* 5 new faces from zone 1 (hex) */
+ 7,10,11, 8,
+ 8,11, 5, 2,
+ 1, 7, 8, 2,
+ 5,11,10, 4,
+ 1, 2, 5, 4,
+
+ /* 4 new faces from zone 2 (pyramid) */
+ 7,16,10,
+ 9,10,16,
+ 9,16, 6,
+ 16, 7, 6,
+
+ /* 4 new faces from zone 3 (pyramid) */
+ 6, 9,15,12,
+ 9,16,15,
+ 15,16,12,
+ 6,12,16,
+
+ /* 3 new faces from zone 4 (wedge) */
+ 16,10,11,17,
+ 17, 8, 7,16,
+ 11, 8,17,
+
+ /* 3 new faces from zone 5 (pyramid) */
+ 6,12,13, 7,
+ 7,13,16,
+ 12,16,13,
+
+ /* 3 new faces from zone 6 (wedge) */
+ 16,17,14,13,
+ 7,13,14, 8,
+ 8,14,17,
+
+ /* 3 new faces from zone 7 (tet) */
+ 15,16,18,
+ 15,18,12,
+ 12,18,16,
+
+ /* 2 new faces from zone 8 (tet) */
+ 13,18,16,
+ 12,18,13,
+
+ /* 6 new faces from zone 9 (arb) */
+ 19, 21, 22, 11, 5,
+ 23, 22, 21, 20, 27,
+ 27, 20, 19, 5, 2,
+ 2, 8, 23, 27,
+ 22, 23, 8, 11,
+ 20, 21, 19,
+
+ /* 4 new faces from zone 10 (arb) */
+ 22, 25, 24, 17, 11,
+ 23, 8, 17, 24, 26,
+ 22, 23, 26, 25,
+ 24, 25, 26
+ };
+
+ int facecnts[] = {
+ /* zone 0 (hex) */ 6,
+ /* zone 1 (hex) */ 6,
+ /* zone 2 (pyramid) */ 5,
+ /* zone 3 (pyramid) */ 5,
+ /* zone 4 (wedge) */ 5,
+ /* zone 5 (pyramid) */ 5,
+ /* zone 6 (wedge) */ 5,
+ /* zone 7 (tet) */ 4,
+ /* zone 8 (tet) */ 4,
+ /* zone 9 (arb) */ 7,
+ /* zone 10 (arb) */ 6
+ };
+
+ int facelist[] = {
+ /* zone 0 (hex) */
+ 0, 1, 2, 3, 4, 5,
+
+ /* zone 1 (hex) */
+ -5, 10, 8, 9, 7, 6,
+
+ /* zone 2 (pyramid) */
+ -6, 12, 13, 14, 11,
+
+ /* zone 3 (pyramid) */
+ 15, 16, 17, 18, -14,
+
+ /* zone 4 (wedge) */
+ 21, 19, 20, -7, -12,
+
+ /* zone 5 (pyramid) */
+ -15, 23, 22, -19, 24,
+
+ /* zone 6 (wedge) */
+ -24, -21, 25, 26, 27,
+
+ /* zone 7 (tet) */
+ 28, 29, 30, -18,
+
+ /* zone 8 (tet) */
+ 31, 32, -31, -25,
+
+ /* zone 9 (arb) */
+ -8, 33, 34, 35, 36, 37, 38,
+
+ /* zone 10 (arb) */
+ -22, -38, 39, 40, 41, 42
+
+ };
+
+ /* order-randomized facelist */
+ int facelist2[] = {
+ /* zone 0 (hex) */
+ 3, 0, 4, 1, 2, 5,
+
+ /* zone 1 (hex) */
+ 6, 8, 10, 7, 9, -5,
+
+ /* zone 2 (pyramid) */
+ -6, 12, 13, 14, 11,
+
+ /* zone 3 (pyramid) */
+ 15, 16, 17, 18, -14,
+
+ /* zone 4 (wedge) */
+ -7, 19, -12, 20, 21,
+
+ /* zone 5 (pyramid) */
+ 23, -19, 24, 22, -15,
+
+ /* zone 6 (wedge) */
+ -24, -21, 25, 26, 27,
+
+ /* zone 7 (tet) */
+ 28, 29, 30, -18,
+
+ /* zone 8 (tet) */
+ 31, 32, -31, -25,
+
+ /* zone 9 (arb) */
+ 38, 36, 34, -8, 35, 37, 33,
+
+ /* zone 10 (arb) */
+ 40, 42, -38, 39, 41, -22
+ };
+ float nvar[] = { 1, 1, 1,
+ 1.1, 1.1, 1.1,
+ 3.5, 3.5, 3.5,
+ 3.6, 3.6, 3.6,
+ 9.0, 9.0, 9.0,
+ 9.1, 9.1, 9.1,
+ 27,
+ 1.1, 1.05,
+ 1.5,
+ 3.6, 3.5,
+ 9.1, 8.5, 8.45};
+ /* 0 1 2 3 4 5 6 7 8 9 10 */
+ float zvar[] = {4, 5, 5, 5.5, 6, 6.5, 6, 6, 5, 5.5, 5.7};
+ float zvar2[] = {4, 5, 5, 5.5, 5, 5.7, 5.5, 6, 6.5, 6, 6};
+
+ float *x, *y, *z;
+ int nzones, nnodes, lnodelist, nfaces, lfacelist;
+
+ /* build coordinate arrays from icdata */
+ nnodes = LEN(icdata) / 4;
+ x = (float *) malloc (nnodes * sizeof(float));
+ y = (float *) malloc (nnodes * sizeof(float));
+ z = (float *) malloc (nnodes * sizeof(float));
+ for (i = 0; i < nnodes; i++)
+ {
+ x[i] = (float) icdata[4*i+1];
+ y[i] = (float) icdata[4*i+2];
+ z[i] = (float) icdata[4*i+3];
+ }
+
+ /* build faces */
+ nfaces = LEN(nodecnts);
+ lnodelist = LEN(nodelist);
+
+ nzones = LEN(facecnts);
+ lfacelist = LEN(facelist);
+
+ coords[0] = x;
+ coords[1] = y;
+ coords[2] = z;
+
+ DBMkDir(dbfile, "3D");
+ DBSetDir(dbfile, "3D");
+
+ /* Use DBPutzonelist and DBPutZonelist2 */
+ DBPutUcdmesh(dbfile, "mesh1", 3, coordnames, coords, nnodes, nzones, "zl1", 0, DB_FLOAT, 0);
+ DBPutUcdvar1(dbfile, "n1", "mesh1", nvar, nnodes, NULL, 0, DB_FLOAT, DB_NODECENT, NULL);
+ DBPutUcdvar1(dbfile, "z1", "mesh1", zvar, nzones, NULL, 0, DB_FLOAT, DB_ZONECENT, NULL);
+ DBPutUcdmesh(dbfile, "mesh2", 3, coordnames, coords, nnodes, nzones, "zl2", 0, DB_FLOAT, 0);
+ DBPutUcdvar1(dbfile, "n2", "mesh2", nvar, nnodes, NULL, 0, DB_FLOAT, DB_NODECENT, NULL);
+ DBPutUcdvar1(dbfile, "z2", "mesh2", zvar, nzones, NULL, 0, DB_FLOAT, DB_ZONECENT, NULL);
+ DBPutUcdmesh(dbfile, "mesh2g", 3, coordnames, coords, nnodes, nzones, "zl2g", 0, DB_FLOAT, 0);
+ DBPutUcdvar1(dbfile, "n2g", "mesh2g", nvar, nnodes, NULL, 0, DB_FLOAT, DB_NODECENT, NULL);
+ DBPutUcdvar1(dbfile, "z2g", "mesh2g", zvar, nzones, NULL, 0, DB_FLOAT, DB_ZONECENT, NULL);
+ {
+ /* Note: these are intentionally not the same order as for phzl */
+ int nl[] = {
+ /* first two hexes */
+ 0,3,4,1,6,9,10,7,
+ 1,4,5,2,7,10,11,8,
+
+ /* 2 wedges */
+ 7,8,11,10,16,17,
+ 13,14,8,7,16,17,
+
+ /* 2 tets */
+ 15,12,16,18,
+ 12,13,16,18,
+
+ /* 2 arbitrary */
+ 7, /* 38 slots */
+ 3, 20,21,19,
+ 5, 19,5,2,27,20,
+ 5, 27,23,22,21,20,
+ 5, 19,21,22,11,5,
+ 4, 2,5,11,8,
+ 4, 8,11,22,23,
+ 4, 2,8,23,27,
+
+ 6, /* 31 slots */
+ 4, 23,26,25,22,
+ 5, 22,25,24,17,11,
+ 3, 8,11,17,
+ 4, 8,23,22,11,
+ 3, 26,24,25,
+ 5, 8,17,24,26,23,
+
+ /* 3 pyramids */
+ 6,9,10,7,16,
+ 6,12,15,9,16,
+ 7,13,12,6,16};
+
+ int shapecnt[] = {2, 2, 2, 2, 3};
+ int shapesize[] = {8, 6, 4, 69, 5};
+ int shapetype[] = {
+ DB_ZONETYPE_HEX,
+ DB_ZONETYPE_PRISM,
+ DB_ZONETYPE_TET,
+ DB_ZONETYPE_POLYHEDRON,
+ DB_ZONETYPE_PYRAMID};
+
+ DBSetDeprecateWarnings(0);
+ DBPutZonelist(dbfile, "zl1", nzones, 3, nl, LEN(nl), 0, shapesize,
+ shapecnt, 5);
+ DBSetDeprecateWarnings(3);
+ DBPutZonelist2(dbfile, "zl2", nzones, 3, nl, LEN(nl), 0, 0, 0, shapetype,
+ shapesize, shapecnt, 5, 0);
+ DBPutZonelist2(dbfile, "zl2g", nzones, 3, nl, LEN(nl), 0, 1, 1, shapetype,
+ shapesize, shapecnt, 5, 0);
+ }
+
+ ol = DBMakeOptlist(3);
+ DBAddOption(ol, DBOPT_PHZONELIST, "phzl");
+ DBPutUcdmesh(dbfile, "mesh3", 3, coordnames, coords, nnodes, nzones, 0, 0, DB_FLOAT, ol);
+ DBFreeOptlist(ol);
+ DBPutUcdvar1(dbfile, "n3", "mesh3", nvar, nnodes, NULL, 0, DB_FLOAT, DB_NODECENT, NULL);
+ DBPutUcdvar1(dbfile, "z3", "mesh3", zvar2, nzones, NULL, 0, DB_FLOAT, DB_ZONECENT, NULL);
+
+ DBPutPHZonelist(dbfile, "phzl",
+ nfaces, nodecnts, lnodelist, nodelist, 0,
+ nzones, facecnts, lfacelist, facelist, 0,
+ 0, nzones-1, 0);
+
+ ol = DBMakeOptlist(3);
+ DBAddOption(ol, DBOPT_PHZONELIST, "phzl_r");
+ DBPutUcdmesh(dbfile, "mesh3r", 3, coordnames, coords, nnodes, nzones, 0, 0, DB_FLOAT, ol);
+ DBFreeOptlist(ol);
+ DBPutUcdvar1(dbfile, "n3r", "mesh3r", nvar, nnodes, NULL, 0, DB_FLOAT, DB_NODECENT, NULL);
+ DBPutUcdvar1(dbfile, "z3r", "mesh3r", zvar2, nzones, NULL, 0, DB_FLOAT, DB_ZONECENT, NULL);
+
+ DBPutPHZonelist(dbfile, "phzl_r",
+ nfaces, nodecnts, lnodelist, nodelist2, 0,
+ nzones, facecnts, lfacelist, facelist2, 0,
+ 1, 9, 0);
+
+ DBSetDir(dbfile, "..");
+ }
+
+ DBClose(dbfile);
+
+ CleanupDriverStuff();
+
+ return (0);
+}
diff --git a/tests/arrayf77.f b/tests/arrayf77.f
index e019707..87f89fa 100644
--- a/tests/arrayf77.f
+++ b/tests/arrayf77.f
@@ -63,7 +63,8 @@ c-------------------------------------------------------------------------
implicit none
include "silo.inc"
- integer dbid, err
+ integer dbid, err, driver, nargs
+ character*256 cloption
character*32 elemnames(3)
integer elemlengths(3), array_id, i
@@ -78,12 +79,19 @@ c-------------------------------------------------------------------------
data elemnames/"x","y","z"/
data elemlengths/4,6,8/
+ driver = DB_PDB
+ nargs = iargc()
+ call getarg(1, cloption)
+ if (cloption .eq. "DB_HDF5") then
+ driver = DB_HDF5
+ end if
+
err = dbshowerrors(DB_ABORT)
c...Create file named "robb.pdb". Database ID is returned in 'dbid'.
- err = dbcreate("arrayf77.pdb", 12, 0, DB_LOCAL, "file info",
- $ 9, DB_PDB, dbid)
+ err = dbcreate("arrayf77.silo", 13, 0, DB_LOCAL, "file info",
+ $ 9, driver, dbid)
do i=1, 18
@@ -100,7 +108,7 @@ CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC
C Now try to read from the file...
CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC
- err = dbopen ("arrayf77.pdb", 12, DB_PDB, DB_READ, dbid)
+ err = dbopen ("arrayf77.silo", 13, DB_UNKNOWN, DB_READ, dbid)
err = dbgetca (dbid, "carray", 6, 32, g_enames, g_elengths,
$ g_nelems, g_values, g_nvalues, g_datatype)
diff --git a/tests/checksums b/tests/checksums
index 77011f7..ab2aabf 100755
--- a/tests/checksums
+++ b/tests/checksums
@@ -93,29 +93,18 @@ $topDir/multi_test DB_HDF5 1>/dev/null 2>&1
# We do this using octal dump (od) and looking for some numbers
# we expect in a silo object (domain_23/fl)
#
-offset=`od -A d4 -t d4 h5_check_files/multi_ucd3d.h5 | grep '167 179 323 311' | cut -d' ' -f1`
+offset=`od -A d4 -t d4 h5_check_files/multi_ucd3d.h5 | tr '\t' ' ' | tr -s ' ' | grep '167 179 323 311' | cut -d' ' -f1`
offset=`echo $offset | cut -d' ' -f1`
size=`ls -l h5_check_files/multi_ucd3d.h5 | tr -s ' ' | cut -d' ' -f5`
#
-# Make a file of 4 integer zeros
-#
-rm -f zeros
-i=0
-/bin/echo -n -e '\000' > zeros
-while test $i -lt 15; do
- /bin/echo -n -e '\000' >> zeros
- i=`expr $i + 1`
-done
-
-#
# Corrupt a checksumed file by splicing together the first
-# part of the original file with the 4 integer zeros (above)
+# part of the original file with the 4 integer zeros (zeros.dat)
# and the last part of the file (minus the part we've zeroed)
#
rm -f multi_ucd3d_corrupt.h5
head -c $offset h5_check_files/multi_ucd3d.h5 > multi_ucd3d_corrupt.h5
-cat zeros >> multi_ucd3d_corrupt.h5
+cat $topDir/zeros.dat >> multi_ucd3d_corrupt.h5
leftover=`expr $size - $offset - 16`
tail -c $leftover h5_check_files/multi_ucd3d.h5 >> multi_ucd3d_corrupt.h5
@@ -143,7 +132,6 @@ fi
# Cleanup
#
rm -rf h5_check_files
-rm -f zeros
rm -f multi_ucd3d_corrupt.h5
exit $result
diff --git a/tests/compression.c b/tests/compression.c
index da721c9..6f7a3ac 100644
--- a/tests/compression.c
+++ b/tests/compression.c
@@ -112,7 +112,7 @@ main(int argc, char *argv[])
struct stat buffer;
off_t fsize;
int has_loss = 0;
- int show_all_errors = FALSE;
+ int show_errors = DB_TOP;
/* Parse command-line */
for (i=1; i<argc; i++) {
@@ -165,7 +165,7 @@ main(int argc, char *argv[])
printf(" DB_HDF5 - enable HDF5 driver, the default\n");
return (0);
} else if (!strcmp(argv[i], "show-all-errors")) {
- show_all_errors = 1;
+ show_errors = DB_ALL_AND_DRVR;
} else if (argv[i][0] != '\0') {
fprintf(stderr, "%s: ignored argument `%s'\n", argv[0], argv[i]);
}
@@ -177,7 +177,7 @@ main(int argc, char *argv[])
dval = (double*) malloc(ONE_MEG);
drval = (double*) malloc(ONE_MEG);
- if (show_all_errors) DBShowErrors(DB_ALL_AND_DRVR, 0);
+ DBShowErrors(show_errors, 0);
if (!readonly)
{
diff --git a/tests/csg.c b/tests/csg.c
index e92e177..13f8345 100644
--- a/tests/csg.c
+++ b/tests/csg.c
@@ -157,6 +157,7 @@ build_csg(DBfile *dbfile, char *name)
DBPutCSGZonelist(dbfile, "csgzl", nregs, typeflags, leftids, rightids,
NULL, 0, DB_INT, nzones, zonelist, optlist);
+ DBFreeOptlist(optlist);
}
/* output a csg variable */
@@ -172,7 +173,7 @@ build_csg(DBfile *dbfile, char *name)
DBPutCsgvar(dbfile, "var1", "csgmesh", 1, pname, pv, 2, DB_DOUBLE,
DB_ZONECENT, 0);
- DBGetCsgvar(dbfile, "var1");
+ DBFreeCsgvar(DBGetCsgvar(dbfile, "var1"));
}
/* test DBInqMeshname */
@@ -195,5 +196,6 @@ build_csg(DBfile *dbfile, char *name)
const char *child = "/facelist";
char *result = DBJoinPath(parent, child);
printf("Got \"%s\" for result\n", result);
+ free(result);
}
}
diff --git a/tests/arrayf77.f b/tests/csgmesh.f
similarity index 56%
copy from tests/arrayf77.f
copy to tests/csgmesh.f
index e019707..db8cc9c 100644
--- a/tests/arrayf77.f
+++ b/tests/csgmesh.f
@@ -53,96 +53,95 @@
************************************************************************
c-------------------------------------------------------------------------
-c Purpose
+c Fortran test program for simple CSG mesh contributed by
c
-c Demonstrate use of SILO for creating compound array objects.
+c Author: Robert Salko, rks171 at gmail.com, Penn State University
+c Mon Nov 5 16:10:14 PST 2012
c
+c Modifications
+c Mark C. Miller, Mon Nov 5 16:11:04 PST 2012
+c Adjusted for intergration with Silo's test suite
c-------------------------------------------------------------------------
-
- program main
-
+ program csgmesh
+
implicit none
- include "silo.inc"
- integer dbid, err
-
- character*32 elemnames(3)
- integer elemlengths(3), array_id, i
- real values(18)
-
- character*32 g_enames(10)
- integer g_elengths(10), g_nelems, g_nvalues, g_datatype,
- $ g_maxwidth
-
- real g_values(100)
-
- data elemnames/"x","y","z"/
- data elemlengths/4,6,8/
-
- err = dbshowerrors(DB_ABORT)
-
-c...Create file named "robb.pdb". Database ID is returned in 'dbid'.
-
- err = dbcreate("arrayf77.pdb", 12, 0, DB_LOCAL, "file info",
- $ 9, DB_PDB, dbid)
-
-
- do i=1, 18
- values(i) = i/100.0
- enddo
-
- err = dbputca (dbid, "carray", 6, elemnames, 32,
- $ elemlengths, 3, values, DB_FLOAT, DB_F77NULL, array_id)
-
- err = dbclose (dbid)
-
-
-CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC
-C Now try to read from the file...
-CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC
-
- err = dbopen ("arrayf77.pdb", 12, DB_PDB, DB_READ, dbid)
-
- err = dbgetca (dbid, "carray", 6, 32, g_enames, g_elengths,
- $ g_nelems, g_values, g_nvalues, g_datatype)
-
- write (*,*) "reading via dbgetca"
- write (*,*) "number of elements..........", g_nelems
- write (*,*) "number of values............", g_nvalues
- write (*,*) "data type...................", g_datatype
- do i=1, g_nelems
- write (*,*) "simple array ", i, " name is ", g_enames(i)
- enddo
- do i=1, g_nvalues
- write (*,*) "value ", i, " is ", g_values(i)
- enddo
-
-
- g_nvalues = 0
- do i=1,100
- g_values(i) = 0
- enddo
- err = dbfgetca (dbid, "carray", 6, g_values, g_nvalues)
-
- write (*,*) "reading via dbfgetca"
- write (*,*) "number of values............", g_nvalues
- do i=1, g_nvalues
- write (*,*) "value ", i, " is ", g_values(i)
- enddo
-
-
- g_nelems = 0
- g_nvalues = 0
- g_datatype = 0
- err = dbinqca (dbid, "carray", 6, g_maxwidth, g_nelems, g_nvalues,
- $ g_datatype)
-
- write (*,*) "reading via dbinqca"
- write (*,*) "number of elements..........", g_nelems
- write (*,*) "number of values............", g_nvalues
- write (*,*) "data type...................", g_datatype
- write (*,*) "longest name................", g_maxwidth
-
- err = dbclose (dbid)
-
- stop
- end
+
+ include 'silo.inc'
+
+ integer :: er
+ integer :: ID
+ integer :: lcoeffs
+ integer :: lgridname
+ integer :: lnamefile
+ integer :: ndim
+ integer :: nbounds
+ integer :: nregs
+ integer :: nzones
+ integer :: stat
+ integer :: nargs
+ integer :: driver
+
+ integer, dimension(2) :: typflags
+ integer, dimension(3) :: oper
+ integer, dimension(3) :: leftids
+ integer, dimension(3) :: rightids
+ integer, dimension(1) :: zonelist
+
+ character (len=12) :: namefile
+ character (len=8 ) :: gridname
+ character (len=256) :: cloption
+
+ real, dimension(12) :: coeffs=(/0.0,0.0,0.0,5.0,
+ & -10.0, 0.0, 0.0, 1.0, 0.0, 0.0, 20.0, 4.5/)
+ real*8, dimension(6) :: extents=(/-5.0,-5.0,-5.0,5.0,5.0,5.0/)
+
+ driver = DB_PDB
+ nargs = iargc()
+ call getarg(1, cloption)
+ if (cloption .eq. "DB_HDF5") then
+ driver = DB_HDF5
+ end if
+ lcoeffs = 12
+ namefile = 'csgmesh.silo'
+ lnamefile = 12
+ nbounds = 2
+ ndim = 3
+ gridname = 'CSG_mesh'
+ lgridname = 8
+
+
+ typflags(1) = DBCSG_SPHERE_PR
+ typflags(2) = DBCSG_CYLINDER_PNLR
+
+ !Report all errors
+ er=dbshowerrors(db_all)
+
+ !Create the silo file
+ er=dbcreate(namefile,lnamefile,DB_CLOBBER,DB_LOCAL,DB_F77NULL,0,
+ & driver,ID)
+
+ !Create the CSG Mesh
+ er=dbputcsgm(ID,gridname,lgridname,ndim,nbounds,typflags,
+ & DB_F77NULL,coeffs,lcoeffs,DB_FLOAT,extents,
+ & 'csgz1',5,DB_F77NULL,stat)
+
+ !Create the CSG Zone list
+ nregs = 3
+ nzones = 1
+ zonelist(1) = 2
+ leftids(1) = 0
+ leftids(2) = 1
+ leftids(3) = 0
+ rightids(1) = -1
+ rightids(2) = -1
+ rightids(3) = 1
+ oper(1) = DBCSG_INNER
+ oper(2) = DBCSG_INNER
+ oper(3) = DBCSG_UNION
+
+ er=dbputcsgzl(ID,'csgz1',5,nregs,oper,leftids,
+ & rightids,DB_F77NULL,0,DB_FLOAT,nzones,zonelist,
+ & DB_F77NULL,stat)
+
+ er=dbclose(ID);
+ end program csgmesh
diff --git a/tests/curvef77.f b/tests/curvef77.f
index e2a0d00..03eae03 100644
--- a/tests/curvef77.f
+++ b/tests/curvef77.f
@@ -63,7 +63,16 @@ c-------------------------------------------------------------------------
implicit none
include "silo.inc"
integer dbid, curveid, err, i, curve_id, dtype, npts
+ integer driver, nargs
real x(20), y1(20), y2(20), xin(20), yin1(20), yin2(20)
+ character*256 cloption
+
+ driver = DB_PDB
+ nargs = iargc()
+ call getarg(1, cloption)
+ if (cloption .eq. "DB_HDF5") then
+ driver = DB_HDF5
+ end if
c Create the curve x and y values...
@@ -75,8 +84,8 @@ c Create the curve x and y values...
c Write curve data to a PDB file...
- err = dbcreate ("curvef77.pdb", 12, 0, DB_LOCAL,
- $ "Curve Data", 10, DB_PDB, dbid)
+ err = dbcreate ("curvef77.silo", 13, 0, DB_LOCAL,
+ $ "Curve Data", 10, driver, dbid)
err = dbputcurve (dbid, "sincurve", 8, x, y1, DB_FLOAT,
$ 20, DB_F77NULL, curve_id)
@@ -88,7 +97,7 @@ c Write curve data to a PDB file...
c Read the pdb file...
- err = dbopen ("curvef77.pdb", 12, DB_PDB, DB_READ, dbid)
+ err = dbopen ("curvef77.silo", 13, driver, DB_READ, dbid)
err = dbgetcurve (dbid, "sincurve", 8, 20, xin, yin1,
$ dtype, npts)
err = dbgetcurve (dbid, "coscurve", 8, 20, xin, yin2,
diff --git a/tests/dir.c b/tests/dir.c
index b8838e9..75263ef 100644
--- a/tests/dir.c
+++ b/tests/dir.c
@@ -88,7 +88,7 @@ main(int argc, char *argv[])
{
int meshid, diridq, diridu, diridt;
- int meshtypes[3], mmid, nmesh;
+ int meshtypes[3], /*mmid,*/ nmesh;
char *meshnames[3], original_dir[128];
DBfile *dbfile, *dbfile2, *dbfile3, *dbfile4, *dbfile5;
char *filename = "dir.pdb";
diff --git a/tests/empty.c b/tests/empty.c
new file mode 100644
index 0000000..b4c276a
--- /dev/null
+++ b/tests/empty.c
@@ -0,0 +1,295 @@
+/*
+Copyright (c) 1994 - 2010, Lawrence Livermore National Security, LLC.
+LLNL-CODE-425250.
+All rights reserved.
+
+This file is part of Silo. For details, see silo.llnl.gov.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the disclaimer below.
+ * Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the disclaimer (as noted
+ below) in the documentation and/or other materials provided with
+ the distribution.
+ * Neither the name of the LLNS/LLNL nor the names of its
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL LAWRENCE
+LIVERMORE NATIONAL SECURITY, LLC, THE U.S. DEPARTMENT OF ENERGY OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+This work was produced at Lawrence Livermore National Laboratory under
+Contract No. DE-AC52-07NA27344 with the DOE. Neither the United
+States Government nor Lawrence Livermore National Security, LLC nor
+any of their employees, makes any warranty, express or implied, or
+assumes any liability or responsibility for the accuracy,
+completeness, or usefulness of any information, apparatus, product, or
+process disclosed, or represents that its use would not infringe
+privately-owned rights. Any reference herein to any specific
+commercial products, process, or services by trade name, trademark,
+manufacturer or otherwise does not necessarily constitute or imply its
+endorsement, recommendation, or favoring by the United States
+Government or Lawrence Livermore National Security, LLC. The views and
+opinions of authors expressed herein do not necessarily state or
+reflect those of the United States Government or Lawrence Livermore
+National Security, LLC, and shall not be used for advertising or
+product endorsement purposes.
+*/
+#include <assert.h>
+#include <float.h>
+#include <math.h>
+#include <stdio.h>
+#include <string.h>
+
+#include <silo.h>
+
+#include <std.c>
+
+#define ASSERT(FUNCCALL,RETPRED0,RETPRED1) \
+{ int retval = FUNCCALL; \
+ if (pass == 0) \
+ { \
+ if(!(RETPRED0)){fprintf(stderr,"On empty object rejection pass, assertion \"%s\" at line %d failed\n",#RETPRED0,__LINE__);abort();} \
+ } \
+ else \
+ { \
+ if(!(RETPRED1)){fprintf(stderr,"On empty object allow pass, assertion \"%s\" at line %d failed\n",#RETPRED1,__LINE__);abort();} \
+ } \
+}
+
+int
+main(int argc, char *argv[])
+{
+ DBfile *dbfile = NULL;
+ int driver = DB_PDB;
+ char *filename = "empty.silo";
+ int show_all_errors = FALSE;
+ int i, pass;
+ char *cnames[3] = {"x","y","z"};
+ void const *coords[3] = {(void*)1,(void*)2,(void*)3}; /* really funky dummy pointers */
+ void const *vars[3] = {(void*)1,(void*)2,(void*)3}; /* really funky dummy pointers */
+ void *var = (void*)1;
+ int iarr[3] = {1,1,1}; /* dummy int array */
+ double exts[4] = {0,0,0,0};
+
+ /* Parse command-line */
+ for (i=1; i<argc; i++) {
+ if (!strncmp(argv[i], "DB_", 3)) {
+ driver = StringToDriver(argv[i]);
+ } else if (!strcmp(argv[i], "show-all-errors")) {
+ show_all_errors = 1;
+ } else if (argv[i][0] != '\0') {
+ fprintf(stderr, "%s: ignored argument `%s'\n", argv[0], argv[i]);
+ }
+ }
+
+ DBShowErrors(show_all_errors?DB_ALL_AND_DRVR:DB_NONE, NULL);
+ printf("Creating test file \"%s\".\n", filename);
+ dbfile = DBCreate(filename, DB_CLOBBER, DB_LOCAL, "test empty silo objects", driver);
+
+ /* first pass confirms we catch bad arguments; second pass confirms we permit empty objects */
+ for (pass = 0; pass < 2; pass++)
+ {
+ int dt = DB_FLOAT;
+ int ct = DB_ZONECENT;
+ if (pass) DBSetAllowEmptyObjects(1);
+
+ /* Because references to the following objects will not ever appear in a
+ multi-xxx object, we do not currently test for support of empties...
+ DBPutUcdsubmesh, DBPutMrgtree, DBPutMrgvar, DBPutGroupelmap
+ */
+
+ /* empty curve objects */
+ ASSERT(DBPutCurve(dbfile,"empty_curve",coords[0],coords[0],0,0,0),retval<0,retval==0);
+
+ /* empty point meshes and vars */
+ ASSERT(DBPutPointmesh(dbfile,"empty_pointmesh",1,coords,0,0,0),retval<0,retval==0);
+ ASSERT(DBPutPointvar(dbfile,"pv","empty_pointmesh",1,vars,0,0,0),retval<0,retval==0);
+ ASSERT(DBPutPointvar1(dbfile,"pv1","empty_pointmesh",var,0,0,0),retval<0,retval==0);
+
+ /* empty quad meshes and vars */
+ ASSERT(DBPutQuadmesh(dbfile,"empty_quadmesh",cnames,coords,iarr,0,0,0,0),retval<0,retval==0);
+ ASSERT(DBPutQuadvar(dbfile,"qv","empty_quadmesh",0,cnames,vars,iarr,0,0,0,0,0,0),retval<0,retval==0);
+ ASSERT(DBPutQuadvar1(dbfile,"qv1","empty_quadmesh",0,0,0,0,0,dt,ct,0),retval<0,retval==0);
+
+ /* empty ucd meshes, facelists, zonelists and vars */
+ ASSERT(DBPutUcdmesh(dbfile,"empty_ucdmesh1",0,cnames,coords,8,1,"foo","bar",0,0),retval<0,retval==0);
+ ASSERT(DBPutUcdmesh(dbfile,"empty_ucdmesh2",1,cnames,coords,0,1,"foo","bar",0,0),retval<0,retval==0);
+ ASSERT(DBPutUcdmesh(dbfile,"empty_ucdmesh3",1,cnames,coords,8,0,"foo","bar",0,0),retval<0,retval==0);
+ ASSERT(DBPutFacelist(dbfile,"empty_facelista",0,1,iarr,1,1,iarr,iarr,iarr,1,iarr,iarr,1),retval<0,retval==0);
+ ASSERT(DBPutFacelist(dbfile,"empty_facelistb",1,0,iarr,1,1,iarr,iarr,iarr,1,iarr,iarr,1),retval<0,retval==0);
+ ASSERT(DBPutFacelist(dbfile,"empty_facelistc",1,1,iarr,0,1,iarr,iarr,iarr,1,iarr,iarr,1),retval<0,retval==0);
+ ASSERT(DBPutFacelist(dbfile,"empty_facelistd",1,1,iarr,1,1,iarr,iarr,iarr,0,iarr,iarr,1),retval<0,retval==0);
+ ASSERT(DBPutZonelist2(dbfile,"empty_zonelist2a",0,1,iarr,1,0,0,0,iarr,iarr,iarr,1,0),retval<0,retval==0);
+ ASSERT(DBPutZonelist2(dbfile,"empty_zonelist2b",1,0,iarr,1,0,0,0,iarr,iarr,iarr,1,0),retval<0,retval==0);
+ ASSERT(DBPutZonelist2(dbfile,"empty_zonelist2c",1,1,iarr,0,0,0,0,iarr,iarr,iarr,1,0),retval<0,retval==0);
+ ASSERT(DBPutZonelist2(dbfile,"empty_zonelist2d",1,1,iarr,1,0,0,0,iarr,iarr,iarr,0,0),retval<0,retval==0);
+ ASSERT(DBPutPHZonelist(dbfile,"empty_phzonelista",0,iarr,1,iarr,cnames[0],1,iarr,1,iarr,0,0,0,0),retval<0,retval==0);
+ ASSERT(DBPutPHZonelist(dbfile,"empty_phzonelistb",1,iarr,0,iarr,cnames[0],1,iarr,1,iarr,0,0,0,0),retval<0,retval==0);
+ ASSERT(DBPutUcdvar(dbfile,"uva","empty_ucdmesh1",0,cnames,vars,1,vars,1,0,0,0),retval<0,retval==0);
+ ASSERT(DBPutUcdvar(dbfile,"uvb","empty_ucdmesh1",1,cnames,vars,0,vars,1,0,0,0),retval<0,retval==0);
+ ASSERT(DBPutUcdvar1(dbfile,"uv1","empty_ucdmesh1",var,0,vars,1,0,0,0),retval<0,retval==0);
+
+ /* csg meshes and vars */
+ ASSERT(DBPutCsgmesh(dbfile,"empty_csgmesh1",0,1,iarr,iarr,var,1,0,exts,"foo",0),retval<0,retval==0);
+ ASSERT(DBPutCsgmesh(dbfile,"empty_csgmesh2",1,0,iarr,iarr,var,1,0,exts,"foo",0),retval<0,retval==0);
+ ASSERT(DBPutCsgmesh(dbfile,"empty_csgmesh3",1,1,iarr,iarr,var,0,0,exts,"foo",0),retval<0,retval==0);
+ ASSERT(DBPutCSGZonelist(dbfile,"empty_csgzonelista",0,iarr,iarr,iarr,0,0,0,1,iarr,0),retval<0,retval==0);
+ ASSERT(DBPutCSGZonelist(dbfile,"empty_csgzonelistb",1,iarr,iarr,iarr,0,0,0,0,iarr,0),retval<0,retval==0);
+ ASSERT(DBPutCsgvar(dbfile,"csgva","empty_csgmesh1",0,cnames,vars,1,0,0,0),retval<0,retval==0);
+ ASSERT(DBPutCsgvar(dbfile,"csgvb","empty_csgmesh1",1,cnames,vars,0,0,0,0),retval<0,retval==0);
+
+ /* empty materials and species */
+ ASSERT(DBPutMaterial(dbfile,"empty_mata","foo",0,iarr,iarr,iarr,1,iarr,iarr,iarr,iarr,1,0,0),retval<0,retval==0);
+ ASSERT(DBPutMaterial(dbfile,"empty_matb","foo",1,iarr,iarr,iarr,0,iarr,iarr,iarr,iarr,1,0,0),retval<0,retval==0);
+ ASSERT(DBPutMatspecies(dbfile,"empty_speca","empty_mata",0,iarr,iarr,iarr,1,1,var,iarr,1,0,0),retval<0,retval==0);
+ ASSERT(DBPutMatspecies(dbfile,"empty_specb","empty_mata",1,iarr,iarr,iarr,0,1,var,iarr,1,0,0),retval<0,retval==0);
+ ASSERT(DBPutMatspecies(dbfile,"empty_specc","empty_mata",1,iarr,iarr,iarr,1,0,var,iarr,1,0,0),retval<0,retval==0);
+ }
+
+ DBClose(dbfile);
+ dbfile = 0;
+
+ /* Ok, now try to read each empty object to make sure we get what we expect and nothing fails */
+ dbfile = DBOpen(filename, DB_UNKNOWN, DB_READ);
+
+ /* test read back of empty curves */
+ { DBcurve *curve = DBGetCurve(dbfile, "empty_curve");
+ assert(DBIsEmptyCurve(curve));
+ DBFreeCurve(curve);
+ }
+
+ /* test read back of empty point meshes and vars */
+ { DBpointmesh *pointmesh = DBGetPointmesh(dbfile, "empty_pointmesh");
+ assert(DBIsEmptyPointmesh(pointmesh));
+ DBFreePointmesh(pointmesh);
+ }
+ { int i=0; char *vnames[] = {"pv", "pv1", 0};
+ while (vnames[i])
+ {
+ DBpointvar *pointvar = DBGetPointvar(dbfile, vnames[i++]);
+ DBIsEmptyPointvar(pointvar);
+ DBFreePointvar(pointvar);
+ }
+ }
+
+ /* test read back of empty quad meshes and vars */
+ { DBquadmesh *quadmesh = DBGetQuadmesh(dbfile, "empty_quadmesh");
+ assert(DBIsEmptyQuadmesh(quadmesh));
+ DBFreeQuadmesh(quadmesh);
+ }
+ { int i=0; char *vnames[] = {"qv", "qv1", 0};
+ while (vnames[i])
+ {
+ DBquadvar *quadvar = DBGetQuadvar(dbfile, vnames[i++]);
+ assert(DBIsEmptyQuadvar(quadvar));
+ DBFreeQuadvar(quadvar);
+ }
+ }
+
+ /* test read back of empty ucd meshes, zonelists and vars */
+ { int i=0; char *mnames[] = {"empty_ucdmesh1", "empty_ucdmesh2", "empty_ucdmesh3", 0};
+ while (mnames[i])
+ {
+ DBucdmesh *ucdmesh = DBGetUcdmesh(dbfile, mnames[i++]);
+ assert(DBIsEmptyUcdmesh(ucdmesh));
+ DBFreeUcdmesh(ucdmesh);
+ }
+ }
+ { int i=0; char *flnames[] = {"empty_facelista", "empty_facelistb",
+ "empty_facelistc", "empty_facelistd", 0};
+ while (flnames[i])
+ {
+ DBfacelist *fl = DBGetFacelist(dbfile, flnames[i++]);
+ assert(DBIsEmptyFacelist(fl));
+ DBFreeFacelist(fl);
+ }
+ }
+ { int i=0; char *zlnames[] = {"empty_zonelist2a", "empty_zonelist2b",
+ "empty_zonelist2c", "empty_zonelist2d", 0};
+ while (zlnames[i])
+ {
+ DBzonelist *zl = DBGetZonelist(dbfile, zlnames[i++]);
+ assert(DBIsEmptyZonelist(zl));
+ DBFreeZonelist(zl);
+ }
+ }
+ { int i=0; char *zlnames[] = {"empty_phzonelista", "empty_phzonelistb", 0};
+ while (zlnames[i])
+ {
+ DBphzonelist *zl = DBGetPHZonelist(dbfile, zlnames[i++]);
+ assert(DBIsEmptyPHZonelist(zl));
+ DBFreePHZonelist(zl);
+ }
+ }
+ { int i=0; char *vnames[] = {"uva", "uvb", "uv1", 0};
+ while (vnames[i])
+ {
+ DBucdvar *ucdvar = DBGetUcdvar(dbfile, vnames[i++]);
+ assert(DBIsEmptyUcdvar(ucdvar));
+ DBFreeUcdvar(ucdvar);
+ }
+ }
+
+ /* test read back of empty csg meshes and vars */
+ { int i=0; char *mnames[] = {"empty_csgmesh1", "empty_csgmesh2", "empty_csgmesh3", 0};
+ while (mnames[i])
+ {
+ DBcsgmesh *csgmesh = DBGetCsgmesh(dbfile, mnames[i++]);
+ assert(DBIsEmptyCsgmesh(csgmesh));
+ DBFreeCsgmesh(csgmesh);
+ }
+ }
+ { int i=0; char *zlnames[] = {"empty_csgzonelista", "empty_csgzonelistb", 0};
+ while (zlnames[i])
+ {
+ DBcsgzonelist *zl = DBGetCSGZonelist(dbfile, zlnames[i++]);
+ assert(DBIsEmptyCSGZonelist(zl));
+ DBFreeCSGZonelist(zl);
+ }
+ }
+ { int i=0; char *vnames[] = {"csgva", "csgvb", 0};
+ while (vnames[i])
+ {
+ DBcsgvar *csgvar = DBGetCsgvar(dbfile, vnames[i++]);
+ assert(DBIsEmptyCsgvar(csgvar));
+ DBFreeCsgvar(csgvar);
+ }
+ }
+
+ /* test read back of empty materials and matspecies */
+ { int i=0; char *vnames[] = {"empty_mata", "empty_matb", 0};
+ while (vnames[i])
+ {
+ DBmaterial *mat = DBGetMaterial(dbfile, vnames[i++]);
+ assert(DBIsEmptyMaterial(mat));
+ DBFreeMaterial(mat);
+ }
+ }
+ { int i=0; char *vnames[] = {"empty_speca", "empty_specb", "empty_specc", 0};
+ while (vnames[i])
+ {
+ DBmatspecies *spec = DBGetMatspecies(dbfile, vnames[i++]);
+ assert(DBIsEmptyMatspecies(spec));
+ DBFreeMatspecies(spec);
+ }
+ }
+
+ CleanupDriverStuff();
+
+ return 0;
+}
diff --git a/tests/extface.c b/tests/extface.c
index a1095d2..17b7516 100644
--- a/tests/extface.c
+++ b/tests/extface.c
@@ -1888,13 +1888,17 @@ main(int argc, char *argv[])
matlist[k++] = mat;
}
- i = 30;
- DBWrite(dbfile, "_meshtvinfo", "mesh mesh1;pseudocolor u",
- &i, 1, DB_CHAR);
- i = 50;
- DBWrite(dbfile, "_meshtv_defvars",
- "vel vector {u,v,w};speed scalar sqrt(u*u+v*v+w*w)",
- &i, 1, DB_CHAR);
+ {
+ char var[] = "mesh mesh1;pseudocolor u";
+ i = sizeof(var);
+ DBWrite(dbfile, "_meshtvinfo", var, &i, 1, DB_CHAR);
+ }
+
+ {
+ char var[] = "vel vector {u,v,w};speed scalar sqrt(u*u+v*v+w*w)";
+ i = sizeof(var);
+ DBWrite(dbfile, "_meshtv_defvars", var, &i, 1, DB_CHAR);
+ }
/*
* Create a zonelist that describes a mesh that looks like a
diff --git a/tests/ioperf.c b/tests/ioperf.c
index 6d983c1..68043ef 100644
--- a/tests/ioperf.c
+++ b/tests/ioperf.c
@@ -344,26 +344,21 @@ static iointerface_t* GetIOInterface(int argi, int argc, char *argv[], const opt
/* Fall back to dynamic approach */
if (!retval)
{
- char libfilename[256];
- sprintf(libfilename, "./ioperf_%s.so", ifacename);
- dlhandle = dlopen(libfilename, RTLD_LAZY);
- if (dlhandle)
+ int d, foundIt = 0;
+ char *dirs[] = {".", "../..", ".libs", "../../.libs"};
+ for (d = 0; d < sizeof(dirs)/sizeof(dirs[0]) && !foundIt; d++)
{
+ char libfilename[256];
+ sprintf(libfilename, "%s/ioperf_%s.so", dirs[d], ifacename);
+ dlhandle = dlopen(libfilename, RTLD_LAZY);
+ if (!dlhandle) continue;
+
CreateInterfaceFunc createFunc = (CreateInterfaceFunc) dlsym(dlhandle, "CreateInterface");
- if (!createFunc)
- {
- fprintf(stderr,"Encountered dlsym error \"%s\"\n", dlerror());
- exit(1);
- }
+ if (!createFunc) continue;
/* we allow the io-interface plugin to process command line args too */
+ printf("Using plugin file \"%s\n\n", libfilename);
retval = createFunc(argi, argc, argv, testfilename, opts);
-
- }
- else
- {
- fprintf(stderr,"Encountered dlopen error \"%s\"\n", dlerror());
- exit(1);
}
}
#endif
diff --git a/tests/ioperf_hdf5.c b/tests/ioperf_hdf5.c
index d3c6c91..ac2a6e8 100644
--- a/tests/ioperf_hdf5.c
+++ b/tests/ioperf_hdf5.c
@@ -157,6 +157,7 @@ static int Close_hdf5()
if (dspc != -1)
H5Sclose(dspc);
if (H5Fclose(fid) < 0) return 0;
+ H5garbage_collect();
return 1;
}
@@ -238,7 +239,7 @@ iointerface_t *CreateInterface_hdf5(int argi, int argc, char *argv[], const char
#else
iointerface_t *CreateInterface(int argi, int argc, char *argv[], const char *_filename, const options_t *opts)
{
- return CreateInterfaceReal(argi argc, argv, _filename, opts);
+ return CreateInterfaceReal(argi, argc, argv, _filename, opts);
}
#endif
diff --git a/tests/ioperf_pdb.c b/tests/ioperf_pdb.c
index dff094d..89d01e5 100644
--- a/tests/ioperf_pdb.c
+++ b/tests/ioperf_pdb.c
@@ -51,7 +51,7 @@ product endorsement purposes.
*/
#include <stdlib.h>
#include <string.h>
-#include <lite_pdb.h>
+#include <pdb.h> /* below we are using lite_ functions */
#include <ioperf.h>
/*
diff --git a/tests/listtypes.c b/tests/listtypes.c
index b34bc57..2bdda18 100644
--- a/tests/listtypes.c
+++ b/tests/listtypes.c
@@ -185,9 +185,9 @@ main(int argc, char *argv[])
* Mark C. Miller, Wed Sep 23 11:55:48 PDT 2009
* Added misc. variables.
********************************************************************/
-#define PRINT_OBJS(theFile, theToc, theClass, Indent, S) \
- nobjs += theToc->n ## theClass ## S; \
- for (i = 0; i < theToc->n ## theClass ## S; i++) \
+#define PRINT_OBJS(theFile, theToc, theClass, Indent) \
+ nobjs += theToc->n ## theClass; \
+ for (i = 0; i < theToc->n ## theClass; i++) \
PrintObjectComponentsType(theFile, theToc->theClass ## _names[i], Indent);
int ProcessCurrentDirectory(DBfile *dbfile, DBtoc *dbtoc, int depth)
@@ -240,29 +240,29 @@ int ProcessCurrentDirectory(DBfile *dbfile, DBtoc *dbtoc, int depth)
/* Print the objects in the top directory. */
nobjs = ndirs;
- PRINT_OBJS(dbfile, dbtoc, obj, indent, /*void*/);
- PRINT_OBJS(dbfile, dbtoc, defvars, indent, /*void*/);
- PRINT_OBJS(dbfile, dbtoc, array, indent, s);
- PRINT_OBJS(dbfile, dbtoc, var, indent, /*void*/);
- PRINT_OBJS(dbfile, dbtoc, curve, indent, /*void*/);
- PRINT_OBJS(dbfile, dbtoc, ptmesh, indent, /*void*/);
- PRINT_OBJS(dbfile, dbtoc, ptvar, indent, /*void*/);
- PRINT_OBJS(dbfile, dbtoc, qmesh, indent, /*void*/);
- PRINT_OBJS(dbfile, dbtoc, qvar, indent, /*void*/);
- PRINT_OBJS(dbfile, dbtoc, ucdmesh, indent, /*void*/);
- PRINT_OBJS(dbfile, dbtoc, ucdvar, indent, /*void*/);
- PRINT_OBJS(dbfile, dbtoc, csgmesh, indent, /*void*/);
- PRINT_OBJS(dbfile, dbtoc, csgvar, indent, /*void*/);
- PRINT_OBJS(dbfile, dbtoc, mat, indent, /*void*/);
- PRINT_OBJS(dbfile, dbtoc, matspecies, indent, /*void*/);
- PRINT_OBJS(dbfile, dbtoc, multimesh, indent, /*void*/);
- PRINT_OBJS(dbfile, dbtoc, multimeshadj, indent, /*void*/);
- PRINT_OBJS(dbfile, dbtoc, multivar, indent, /*void*/);
- PRINT_OBJS(dbfile, dbtoc, multimat, indent, /*void*/);
- PRINT_OBJS(dbfile, dbtoc, multimatspecies, indent, /*void*/);
- PRINT_OBJS(dbfile, dbtoc, mrgtree, indent, s);
- PRINT_OBJS(dbfile, dbtoc, mrgvar, indent, s);
- PRINT_OBJS(dbfile, dbtoc, groupelmap, indent, s);
+ PRINT_OBJS(dbfile, dbtoc, obj, indent);
+ PRINT_OBJS(dbfile, dbtoc, defvars, indent);
+ PRINT_OBJS(dbfile, dbtoc, array, indent);
+ PRINT_OBJS(dbfile, dbtoc, var, indent);
+ PRINT_OBJS(dbfile, dbtoc, curve, indent);
+ PRINT_OBJS(dbfile, dbtoc, ptmesh, indent);
+ PRINT_OBJS(dbfile, dbtoc, ptvar, indent);
+ PRINT_OBJS(dbfile, dbtoc, qmesh, indent);
+ PRINT_OBJS(dbfile, dbtoc, qvar, indent);
+ PRINT_OBJS(dbfile, dbtoc, ucdmesh, indent);
+ PRINT_OBJS(dbfile, dbtoc, ucdvar, indent);
+ PRINT_OBJS(dbfile, dbtoc, csgmesh, indent);
+ PRINT_OBJS(dbfile, dbtoc, csgvar, indent);
+ PRINT_OBJS(dbfile, dbtoc, mat, indent);
+ PRINT_OBJS(dbfile, dbtoc, matspecies, indent);
+ PRINT_OBJS(dbfile, dbtoc, multimesh, indent);
+ PRINT_OBJS(dbfile, dbtoc, multimeshadj, indent);
+ PRINT_OBJS(dbfile, dbtoc, multivar, indent);
+ PRINT_OBJS(dbfile, dbtoc, multimat, indent);
+ PRINT_OBJS(dbfile, dbtoc, multimatspecies, indent);
+ PRINT_OBJS(dbfile, dbtoc, mrgtree, indent);
+ PRINT_OBJS(dbfile, dbtoc, mrgvar, indent);
+ PRINT_OBJS(dbfile, dbtoc, groupelmap, indent);
return nobjs;
}
diff --git a/tests/ioperf_pdb.c b/tests/majorder.c
similarity index 58%
copy from tests/ioperf_pdb.c
copy to tests/majorder.c
index dff094d..622aaac 100644
--- a/tests/ioperf_pdb.c
+++ b/tests/majorder.c
@@ -49,72 +49,73 @@ reflect those of the United States Government or Lawrence Livermore
National Security, LLC, and shall not be used for advertising or
product endorsement purposes.
*/
-#include <stdlib.h>
+#include <assert.h>
+#include <float.h>
+#include <math.h>
+#include <stdio.h>
#include <string.h>
-#include <lite_pdb.h>
-#include <ioperf.h>
+
+#include <silo.h>
+
+#include <std.c>
/*
- * Implement ioperf's I/O interface using PDB functions
+ * 2 rows and 3 columns of variable data...
+ *
+ * 1 2 3
+ * 4 5 6
*/
-static options_t options;
-static char *filename;
-static PDBfile *pdbfile;
-
-static int Open_pdb(ioflags_t iopflags)
-{
- pdbfile = lite_PD_create(filename);
- if (!pdbfile) return 0;
- return 1;
-}
+int row_maj_v_data[] = {1,2,3,4,5,6};
+int col_maj_v_data[] = {1,4,2,5,3,6};
-static int Write_pdb(void *buf, size_t nbytes)
-{
- int status;
- char dsname[256];
- static int n = 0;
- sprintf(dsname, "data_%07d(%d)", n++, nbytes/sizeof(double));
- status = lite_PD_write(pdbfile, dsname, "double", buf);
- if (status) return nbytes;
- return 0;
-}
+float row_maj_x_data[] = {-5, 5, 10, 10, -5, 0, 5, 5, -5, -1, 0, 0};
+float row_maj_y_data[] = {10, 10, 5, -5, 5, 5, 0, -5, 0, 0, -1, -5};
-static int Read_pdb(void *buf, size_t nbytes)
-{
- return 0;
-}
+float col_maj_x_data[] = {-5, -5, -5, 5, 0, -1, 10, 5, 0, 10, 5, 0};
+float col_maj_y_data[] = {10, 5, 0, 10, 5, 0, 5, 0, -1, -5, -5, -5};
-static int Close_pdb()
+int
+main(int argc, char *argv[])
{
- return lite_PD_close(pdbfile);
-}
+ DBfile *dbfile = NULL;
+ int i;
+ int driver = DB_PDB;
+ char *filename = "majorder.silo";
+ void *coords[2];
+ int ndims = 2;
+ int dims[2] = {3,2};
+ int dims1[2] = {4,3};
+ int colmajor = DB_COLMAJOR;
+ DBoptlist *optlist;
+
+ /* Parse command-line */
+ for (i=1; i<argc; i++) {
+ if (!strncmp(argv[i], "DB_", 3)) {
+ driver = StringToDriver(argv[i]);
+ } else if (argv[i][0] != '\0') {
+ fprintf(stderr, "%s: ignored argument `%s'\n", argv[0], argv[i]);
+ }
+ }
+
+ dbfile = DBCreate(filename, DB_CLOBBER, DB_LOCAL, "test major order on quad meshes and vars", driver);
+
+ coords[0] = row_maj_x_data;
+ coords[1] = row_maj_y_data;
+ DBPutQuadmesh(dbfile, "row_major_mesh", 0, coords, dims1, ndims, DB_FLOAT, DB_NONCOLLINEAR, 0);
+ DBPutQuadvar1(dbfile, "row_major_var", "row_major_mesh", row_maj_v_data, dims, ndims, 0, 0, DB_INT, DB_ZONECENT, 0);
+
+ optlist = DBMakeOptlist(1);
+ DBAddOption(optlist, DBOPT_MAJORORDER, &colmajor);
+ coords[0] = col_maj_x_data;
+ coords[1] = col_maj_y_data;
+ DBPutQuadmesh(dbfile, "col_major_mesh", 0, coords, dims1, ndims, DB_FLOAT, DB_NONCOLLINEAR, optlist);
+ DBPutQuadvar1(dbfile, "col_major_var", "col_major_mesh", col_maj_v_data, dims, ndims, 0, 0, DB_INT, DB_ZONECENT, optlist);
+ DBFreeOptlist(optlist);
+
+ DBClose(dbfile);
+
+ CleanupDriverStuff();
-static iointerface_t *CreateInterfaceReal(int argi, int argc, char *argv[], const char *_filename, const options_t *opts)
-{
- iointerface_t *retval;
-
- options = *opts;
- filename = strdup(_filename);
-
- retval = (iointerface_t*) calloc(sizeof(iointerface_t),1);
- retval->Open = Open_pdb;
- retval->Write = Write_pdb;
- retval->Read = Read_pdb;
- retval->Close = Close_pdb;
-
- return retval;
-}
-
-#ifdef STATIC_PLUGINS
-iointerface_t *CreateInterface_pdb(int argi, int argc, char *argv[], const char *_filename, const options_t *opts)
-{
- return CreateInterfaceReal(argi, argc, argv, _filename, opts);
-}
-#else
-iointerface_t *CreateInterface(int argi, int argc, char *argv[], const char *_filename, const options_t *opts)
-{
- return CreateInterfaceReal(argi, argc, argv, _filename, opts);
+ return 0;
}
-#endif
-
diff --git a/tests/mat3d_3across.c b/tests/mat3d_3across.c
index ec78039..4ceed25 100644
--- a/tests/mat3d_3across.c
+++ b/tests/mat3d_3across.c
@@ -174,6 +174,10 @@ int main(int argc, char **argv) {
mix_next, mix_mat, mix_zone, mix_vf, mixlen, DB_FLOAT, NULL);
DBClose(db);
+
+ free(coordnames[0]);
+ free(coordnames[1]);
+ free(coordnames[2]);
CleanupDriverStuff();
return 0;
diff --git a/tests/matf77.f b/tests/matf77.f
index b446877..a28e057 100644
--- a/tests/matf77.f
+++ b/tests/matf77.f
@@ -57,16 +57,25 @@
c...This program tests the use of the UCD Fortran jacket routines, plus
c...the underlying UCD C routines.
+ include 'silo.inc'
+ integer driver, nargs
+ character*256 cloption
+ driver = DB_PDB
+ nargs = iargc()
+ call getarg(1, cloption)
+ if (cloption .eq. "DB_HDF5") then
+ driver = DB_HDF5
+ end if
- call writeit ("mat.pdb")
- print *,'Created mat.pdb'
+ call writeit ("mat.silo", driver)
+ print *,'Created mat.silo'
stop
end
- subroutine writeit (fname)
+ subroutine writeit (fname, drvr)
c----------------------------------------------------------------------
c----------------------------------------------------------------------
c----------------------------------------------------------------------
@@ -155,7 +164,7 @@ c...Create option list for use with functions that want it.
err = dbcreate(fname, len(fname), 0, DB_LOCAL,
- . "foo-info", 8, DB_PDB, dbid)
+ . "foo-info", 8, drvr, dbid)
if (err .ne. 0) then
print *,'Error from dbcreate'
stop
diff --git a/tests/ioperf_pdb.c b/tests/mk_nasf_h5.c
similarity index 64%
copy from tests/ioperf_pdb.c
copy to tests/mk_nasf_h5.c
index dff094d..a51a81a 100644
--- a/tests/ioperf_pdb.c
+++ b/tests/mk_nasf_h5.c
@@ -49,72 +49,15 @@ reflect those of the United States Government or Lawrence Livermore
National Security, LLC, and shall not be used for advertising or
product endorsement purposes.
*/
-#include <stdlib.h>
-#include <string.h>
-#include <lite_pdb.h>
-#include <ioperf.h>
+#define H5_USE_16_API
+#include <hdf5.h>
-/*
- * Implement ioperf's I/O interface using PDB functions
- */
-
-static options_t options;
-static char *filename;
-static PDBfile *pdbfile;
-
-static int Open_pdb(ioflags_t iopflags)
+int main()
{
- pdbfile = lite_PD_create(filename);
- if (!pdbfile) return 0;
- return 1;
-}
-
-static int Write_pdb(void *buf, size_t nbytes)
-{
- int status;
- char dsname[256];
- static int n = 0;
- sprintf(dsname, "data_%07d(%d)", n++, nbytes/sizeof(double));
- status = lite_PD_write(pdbfile, dsname, "double", buf);
- if (status) return nbytes;
+ hid_t f = H5Fcreate("not_a_silo_file.h5",H5F_ACC_TRUNC,H5P_DEFAULT,H5P_DEFAULT);
+ hid_t g1 = H5Gcreate(f, "dir1", 0);
+ hid_t g2 = H5Gcreate(g1, "dir2", 0);
+ H5Fclose(f);
+ H5close();
return 0;
}
-
-static int Read_pdb(void *buf, size_t nbytes)
-{
- return 0;
-}
-
-static int Close_pdb()
-{
- return lite_PD_close(pdbfile);
-}
-
-static iointerface_t *CreateInterfaceReal(int argi, int argc, char *argv[], const char *_filename, const options_t *opts)
-{
- iointerface_t *retval;
-
- options = *opts;
- filename = strdup(_filename);
-
- retval = (iointerface_t*) calloc(sizeof(iointerface_t),1);
- retval->Open = Open_pdb;
- retval->Write = Write_pdb;
- retval->Read = Read_pdb;
- retval->Close = Close_pdb;
-
- return retval;
-}
-
-#ifdef STATIC_PLUGINS
-iointerface_t *CreateInterface_pdb(int argi, int argc, char *argv[], const char *_filename, const options_t *opts)
-{
- return CreateInterfaceReal(argi, argc, argv, _filename, opts);
-}
-#else
-iointerface_t *CreateInterface(int argi, int argc, char *argv[], const char *_filename, const options_t *opts)
-{
- return CreateInterfaceReal(argi, argc, argv, _filename, opts);
-}
-#endif
-
diff --git a/tests/mmadjacency.c b/tests/mmadjacency.c
index 2d837df..156b07d 100644
--- a/tests/mmadjacency.c
+++ b/tests/mmadjacency.c
@@ -157,6 +157,8 @@ main(int argc, char *argv[])
DBClose(dbfile);
+ DBFreeMultimeshadj(foo);
+
CleanupDriverStuff();
return 0;
}
diff --git a/tests/multi_file.c b/tests/multi_file.c
index 79abd9d..19721aa 100644
--- a/tests/multi_file.c
+++ b/tests/multi_file.c
@@ -63,6 +63,8 @@ product endorsement purposes.
#ifdef WIN32
# include <direct.h>
+#else
+# include <unistd.h>
#endif
#include <silo.h>
@@ -81,6 +83,7 @@ product endorsement purposes.
int multidir = 0;
int use_ns = 0;
+int empties = 0;
void fill_bkgr(int *, int, int, int, int);
void fill_mat(float *, float *, float *, int *, int, int, int,
@@ -127,24 +130,19 @@ main(int argc, char *argv[])
file_ext = "h5";
}
else if (!strcmp(argv[i], "multidir"))
- {
multidir = 1;
- }
else if (!strcmp(argv[i], "use-ns"))
- {
use_ns = 1;
- }
+ else if (!strcmp(argv[i], "empties"))
+ empties = 1;
else if (!strcmp(argv[i], "show-all-errors"))
- {
show_all_errors = 1;
- }
else if (argv[i][0] != '\0')
- {
fprintf(stderr, "%s: ignored argument `%s'\n", argv[0], argv[i]);
- }
}
if (show_all_errors) DBShowErrors(DB_ALL_AND_DRVR, 0);
+ if (empties) DBSetAllowEmptyObjects(1);
/*
* Create the multi-block ucd 3d mesh.
@@ -350,6 +348,7 @@ build_multi(char *basename, int driver, char *file_ext,
DBfile *dbfile=NULL;
int nblocks = nblocks_x * nblocks_y * nblocks_z;
+ int repr_block_idx;
/*
* Initialize the names and create the directories for the blocks.
@@ -447,6 +446,8 @@ build_multi(char *basename, int driver, char *file_ext,
DBAddOption(optlist, DBOPT_MB_BLOCK_NS, block_ns);
DBAddOption(optlist, DBOPT_MB_BLOCK_TYPE, &block_type);
}
+ repr_block_idx = 9;
+ DBAddOption(optlist, DBOPT_MB_REPR_BLOCK_IDX, &repr_block_idx);
/*
* Create the multi-block mesh, variables and material.
@@ -560,8 +561,9 @@ build_block_ucd3d(char *basename, int driver, char *file_ext,
float h, dh;
float dist;
- int block;
+ int block, eb;
int delta_x, delta_y, delta_z;
+ int empty_blocks[] = {0,1,2,3,4,5,6,7,8,16,47,122,241};
nx = 120;
ny = 160;
@@ -751,7 +753,7 @@ build_block_ucd3d(char *basename, int driver, char *file_ext,
* Create the blocks for the multi-block object.
*/
- for (block = 0; block < nblocks_x * nblocks_y * nblocks_z; block++)
+ for (block = 0, eb = 0; block < nblocks_x * nblocks_y * nblocks_z; block++)
{
char dirname[80];
int filenum;
@@ -1034,51 +1036,78 @@ build_block_ucd3d(char *basename, int driver, char *file_ext,
DBAddOption(optlist, DBOPT_ZUNITS, "cm");
DBAddOption(optlist, DBOPT_HI_OFFSET, &hi_off);
- if (nfaces > 0)
- DBPutFacelist(dbfile, "fl1", nfaces, 3, facelist, lfacelist, 0,
- zoneno, &fshapesize, &fshapecnt, 1, NULL, NULL, 0);
+ if (empties && block == empty_blocks[eb])
+ {
+ eb++;
- DBPutZonelist2(dbfile, "zl1", nzones, 3, zonelist, lzonelist, 0,
- 0, hi_off, &zshapetype, &zshapesize, &zshapecnt, 1, 0);
+ DBPutUcdmesh(dbfile, meshname, 0,0,0,0,0,0,0,DB_FLOAT,optlist);
- /*
- * Output the rest of the mesh and variables.
- */
- if (nfaces > 0)
- DBPutUcdmesh(dbfile, meshname, 3, coordnames, coords,
- nnodes, nzones, "zl1", "fl1", DB_FLOAT, optlist);
+ vars[0] = d2;
+ varnames[0] = var1name;
+ DBPutUcdvar(dbfile, var1name, meshname, 0,0,0,0,0,0,DB_FLOAT,DB_NODECENT,optlist);
+
+ vars[0] = p2;
+ varnames[0] = var2name;
+ DBPutUcdvar(dbfile, var2name, meshname, 0,0,0,0,0,0,DB_FLOAT,DB_NODECENT,optlist);
+
+ vars[0] = u2;
+ varnames[0] = var3name;
+ DBPutUcdvar(dbfile, var3name, meshname, 0,0,0,0,0,0,DB_FLOAT,DB_NODECENT,optlist);
+
+ vars[0] = v2;
+ varnames[0] = var4name;
+ DBPutUcdvar(dbfile, var4name, meshname, 0,0,0,0,0,0,DB_FLOAT,DB_NODECENT,optlist);
+
+ vars[0] = w2;
+ varnames[0] = var5name;
+ DBPutUcdvar(dbfile, var5name, meshname, 0,0,0,0,0,0,DB_FLOAT,DB_NODECENT,optlist);
+
+ DBPutMaterial(dbfile, matname, meshname,0,0,0,0,0,0,0,0,0,0,DB_FLOAT,optlist);
+ }
else
+ {
+ if (nfaces > 0)
+ DBPutFacelist(dbfile, "fl1", nfaces, 3, facelist, lfacelist, 0,
+ zoneno, &fshapesize, &fshapecnt, 1, NULL, NULL, 0);
+
+ DBPutZonelist2(dbfile, "zl1", nzones, 3, zonelist, lzonelist, 0,
+ 0, hi_off, &zshapetype, &zshapesize, &zshapecnt, 1, 0);
+
+ /*
+ * Output the rest of the mesh and variables.
+ */
DBPutUcdmesh(dbfile, meshname, 3, coordnames, coords,
- nnodes, nzones, "zl1", NULL, DB_FLOAT, optlist);
-
- vars[0] = d2;
- varnames[0] = var1name;
- DBPutUcdvar(dbfile, var1name, meshname, 1, varnames, vars,
- nnodes, NULL, 0, DB_FLOAT, DB_NODECENT, optlist);
-
- vars[0] = p2;
- varnames[0] = var2name;
- DBPutUcdvar(dbfile, var2name, meshname, 1, varnames, vars,
- nnodes, NULL, 0, DB_FLOAT, DB_NODECENT, optlist);
-
- vars[0] = u2;
- varnames[0] = var3name;
- DBPutUcdvar(dbfile, var3name, meshname, 1, varnames, vars,
- nnodes, NULL, 0, DB_FLOAT, DB_NODECENT, optlist);
-
- vars[0] = v2;
- varnames[0] = var4name;
- DBPutUcdvar(dbfile, var4name, meshname, 1, varnames, vars,
- nnodes, NULL, 0, DB_FLOAT, DB_NODECENT, optlist);
-
- vars[0] = w2;
- varnames[0] = var5name;
- DBPutUcdvar(dbfile, var5name, meshname, 1, varnames, vars,
- nnodes, NULL, 0, DB_FLOAT, DB_NODECENT, optlist);
-
- DBPutMaterial(dbfile, matname, meshname, nmats, matnos,
- matlist2, &nzones, 1, mix_next, mix_mat, mix_zone,
- mix_vf, mixlen, DB_FLOAT, optlist);
+ nnodes, nzones, "zl1", nfaces>0?"fl1":0, DB_FLOAT, optlist);
+
+ vars[0] = d2;
+ varnames[0] = var1name;
+ DBPutUcdvar(dbfile, var1name, meshname, 1, varnames, vars,
+ nnodes, NULL, 0, DB_FLOAT, DB_NODECENT, optlist);
+
+ vars[0] = p2;
+ varnames[0] = var2name;
+ DBPutUcdvar(dbfile, var2name, meshname, 1, varnames, vars,
+ nnodes, NULL, 0, DB_FLOAT, DB_NODECENT, optlist);
+
+ vars[0] = u2;
+ varnames[0] = var3name;
+ DBPutUcdvar(dbfile, var3name, meshname, 1, varnames, vars,
+ nnodes, NULL, 0, DB_FLOAT, DB_NODECENT, optlist);
+
+ vars[0] = v2;
+ varnames[0] = var4name;
+ DBPutUcdvar(dbfile, var4name, meshname, 1, varnames, vars,
+ nnodes, NULL, 0, DB_FLOAT, DB_NODECENT, optlist);
+
+ vars[0] = w2;
+ varnames[0] = var5name;
+ DBPutUcdvar(dbfile, var5name, meshname, 1, varnames, vars,
+ nnodes, NULL, 0, DB_FLOAT, DB_NODECENT, optlist);
+
+ DBPutMaterial(dbfile, matname, meshname, nmats, matnos,
+ matlist2, &nzones, 1, mix_next, mix_mat, mix_zone,
+ mix_vf, mixlen, DB_FLOAT, optlist);
+ }
DBFreeOptlist(optlist);
diff --git a/tests/multi_test.c b/tests/multi_test.c
index 22540bc..d61ce3a 100644
--- a/tests/multi_test.c
+++ b/tests/multi_test.c
@@ -1,38 +1,61 @@
-/*---------------------------------------------------------------------------
- * multi_testall.c -- Multi-Block Test File Generator.
- *
- * Programmed by Katherine Price, August 4, 1995
- *
- * This test file creates multi-block objects, that are based on the same
- * data sets as the objects created by testall.c.
- *
- * multi_rect2d.* - 12 blocks (3 x 4)
- * multi_curv2d.* - 5 blocks (5 x 1)
- * multi_point2d.* - 5 blocks (5 x 1)
- * multi_rect3d.* - 36 blocks (3 x 4 x 3)
- * multi_curv3d.* - 36 blocks (3 x 4 x 3)
- * multi_ucd3d.* - 20 blocks (1 x 1 x 20)
- *
- * Note: The multi_curv3d.* file has not been tested.
- *
- * Modifications:
- * Sean Ahern, Thu Jun 13 11:52:47 PDT 1996
- * Got rid of the ^Ls in the file.
- *
- * Sean Ahern, Tue Dec 7 16:07:04 PST 1999
- * Changed functions to ANSI style. Reformatted code through indent.
- *
- * Lisa J. Roberts, Fri Apr 7 10:30:59 PDT 2000
- * Added string.h to get rid of compiler warnings.
- *
- *-------------------------------------------------------------------------*/
-
+/*
+Copyright (c) 1994 - 2010, Lawrence Livermore National Security, LLC.
+LLNL-CODE-425250.
+All rights reserved.
+
+This file is part of Silo. For details, see silo.llnl.gov.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the disclaimer below.
+ * Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the disclaimer (as noted
+ below) in the documentation and/or other materials provided with
+ the distribution.
+ * Neither the name of the LLNS/LLNL nor the names of its
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL LAWRENCE
+LIVERMORE NATIONAL SECURITY, LLC, THE U.S. DEPARTMENT OF ENERGY OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+This work was produced at Lawrence Livermore National Laboratory under
+Contract No. DE-AC52-07NA27344 with the DOE. Neither the United
+States Government nor Lawrence Livermore National Security, LLC nor
+any of their employees, makes any warranty, express or implied, or
+assumes any liability or responsibility for the accuracy,
+completeness, or usefulness of any information, apparatus, product, or
+process disclosed, or represents that its use would not infringe
+privately-owned rights. Any reference herein to any specific
+commercial products, process, or services by trade name, trademark,
+manufacturer or otherwise does not necessarily constitute or imply its
+endorsement, recommendation, or favoring by the United States
+Government or Lawrence Livermore National Security, LLC. The views and
+opinions of authors expressed herein do not necessarily state or
+reflect those of the United States Government or Lawrence Livermore
+National Security, LLC, and shall not be used for advertising or
+product endorsement purposes.
+*/
#include <math.h>
#include <stdarg.h>
#include <stdlib.h>
#include <string.h>
#include "silo.h"
+#include "std.c"
#define NX 30
#define NY 40
@@ -75,7 +98,401 @@
if (HASEXT) \
DBAddOption(optlist, DBOPT_HAS_EXTERNAL_ZONES, HASEXT)
+#define ASSERT(PRED) if(!(PRED)){fprintf(stderr,"Assertion \"%s\" at line %d failed\n",#PRED,__LINE__);abort();}
+
+static int check_struct(char *struct1, char *struct2, size_t struct_size, ...)
+{
+ char saved_byte_bucket1[4096], saved_byte_bucket2[4096];
+ int pass;
+
+ for (pass = 1; pass <= 2; pass++)
+ {
+ va_list ap;
+ int nsaved = 0;
+
+ va_start(ap, struct_size);
+ while (1)
+ {
+ char *addr_in_struct1 = va_arg(ap, char*);
+ int size, offset;
+
+ if (!addr_in_struct1) break;
+ size = va_arg(ap, int);
+ offset = addr_in_struct1 - struct1;
+
+ /* on 1rst pass, clear and copy bytes from structs to buckets */
+ if (pass == 1)
+ {
+ memcpy(&saved_byte_bucket1[nsaved], struct1+offset, size);
+ memcpy(&saved_byte_bucket2[nsaved], struct2+offset, size);
+ memset(struct1+offset, 0, size);
+ memset(struct2+offset, 0, size);
+ }
+ else /* on 2nd pass, just restored saved bytes */
+ {
+ memcpy(struct1+offset, &saved_byte_bucket1[nsaved], size);
+ memcpy(struct2+offset, &saved_byte_bucket2[nsaved], size);
+ }
+ nsaved += size;
+ }
+ va_end(ap);
+
+ if (pass == 1)
+ {
+ ASSERT(memcmp(struct1, struct2, struct_size) == 0);
+ }
+ }
+ return 0;
+}
+#define CHECK_ARRAY(P1, P2, N, ATYPE) \
+{ \
+ if (P1 == 0 && P2 == 0) \
+ ; /* do-nothing */ \
+ else \
+ { \
+ ASSERT(P1 != 0 && P2 != 0); \
+ switch (ATYPE) \
+ { \
+ case DB_CHAR: \
+ { \
+ int jj; char *p1 = (char*) P1, *p2 = (char*) P2; \
+ for (jj = 0; jj < N; jj++) ASSERT(p1[jj]==p2[jj]); \
+ break; \
+ } \
+ case DB_SHORT: \
+ { \
+ int jj; short *p1 = (short*) P1, *p2 = (short*) P2; \
+ for (jj = 0; jj < N; jj++) ASSERT(p1[jj]==p2[jj]); \
+ break; \
+ } \
+ case DB_INT: \
+ { \
+ int jj; int *p1 = (int*) P1, *p2 = (int*) P2; \
+ for (jj = 0; jj < N; jj++) ASSERT(p1[jj]==p2[jj]); \
+ break; \
+ } \
+ case DB_LONG: \
+ { \
+ int jj; long *p1 = (long*) P1, *p2 = (long*) P2; \
+ for (jj = 0; jj < N; jj++) ASSERT(p1[jj]==p2[jj]); \
+ break; \
+ } \
+ case DB_LONG_LONG: \
+ { \
+ int jj; long long *p1 = (long long*) P1, *p2 = (long long*) P2; \
+ for (jj = 0; jj < N; jj++) ASSERT(p1[jj]==p2[jj]); \
+ break; \
+ } \
+ case DB_FLOAT: \
+ { \
+ int jj; float *p1 = (float*) P1, *p2 = (float*) P2; \
+ for (jj = 0; jj < N; jj++) ASSERT(p1[jj]==p2[jj]); \
+ break; \
+ } \
+ case DB_DOUBLE: \
+ { \
+ int jj; double *p1 = (double*) P1, *p2 = (double*) P2; \
+ for (jj = 0; jj < N; jj++) ASSERT(p1[jj]==p2[jj]); \
+ break; \
+ } \
+ default: ASSERT(1==0); \
+ } \
+ } \
+}
+
+#define TESTFL(F,NM,NFS,NDS,FL,LFL,ORG,ZNO,SHSZ,SHCNT,NSH,TYPES,TL,NTYPES)\
+{ \
+ if (handle_read) \
+ { \
+ if (testbadread) \
+ { \
+ void *m; \
+ m = (void*) DBGetZonelist(F,NM); \
+ ASSERT(m==0); \
+ m = (void*) DBGetPointmesh(F,NM); \
+ ASSERT(m==0); \
+ m = (void*) DBGetCsgmesh(F,NM); \
+ ASSERT(m==0); \
+ } \
+ if (testread) \
+ { \
+ int i; \
+ DBfacelist *fl = DBGetFacelist(F, NM); \
+ ASSERT(fl); \
+ CHECK_ARRAY(FL, fl->nodelist, LFL, DB_INT); \
+ if (ZNO) \
+ CHECK_ARRAY(ZNO, fl->zoneno, NFS, DB_INT); \
+ CHECK_ARRAY(SHSZ, fl->shapesize, NSH, DB_INT); \
+ CHECK_ARRAY(SHCNT, fl->shapecnt, NSH, DB_INT); \
+ if (NTYPES > 0) \
+ { \
+ CHECK_ARRAY(TYPES, fl->types, NTYPES, DB_INT); \
+ CHECK_ARRAY(TL, fl->typelist, NTYPES, DB_INT); \
+ } \
+ DBFreeFacelist(fl); \
+ } \
+ } \
+ else \
+ { \
+ ASSERT(DBPutFacelist(F,NM,NFS,NDS,FL,LFL,ORG,ZNO,SHSZ,SHCNT,NSH,TYPES,TL,NTYPES)==0); \
+ } \
+}
+
+#define TESTZL(F,NM,NZS,NDS,ZL,LZL,ORG,LO,HI,SHTYP,SHSZ,SHCNT,NSH,OL)\
+{ \
+ if (handle_read) \
+ { \
+ if (testbadread) \
+ { \
+ void *m; \
+ m = (void*) DBGetFacelist(F,NM); \
+ ASSERT(m==0); \
+ m = (void*) DBGetPointmesh(F,NM); \
+ ASSERT(m==0); \
+ m = (void*) DBGetCsgmesh(F,NM); \
+ ASSERT(m==0); \
+ } \
+ if (testread) \
+ { \
+ int i; \
+ DBzonelist *zl = DBGetZonelist(F, NM); \
+ ASSERT(zl); \
+ ASSERT(LZL == zl->lnodelist); \
+ CHECK_ARRAY(ZL, zl->nodelist, LZL, DB_INT); \
+ ASSERT(NSH == zl->nshapes); \
+ CHECK_ARRAY(SHSZ, zl->shapesize, NSH, DB_INT); \
+ CHECK_ARRAY(SHCNT, zl->shapecnt, NSH, DB_INT); \
+ CHECK_ARRAY(SHTYP, zl->shapetype, NSH, DB_INT); \
+ DBFreeZonelist(zl); \
+ } \
+ } \
+ else \
+ { \
+ ASSERT(DBPutZonelist2(F,NM,NZS,NDS,ZL,LZL,ORG,LO,HI,SHTYP,SHSZ,SHCNT,NSH,OL)==0); \
+ } \
+}
+
+#define TESTUMESH(F,MN,NDS,CNMS,CS,NNS,NZS,ZLNM,FLNM,DTYPE,OL) \
+{ \
+ if (handle_read) \
+ { \
+ if (testbadread) \
+ { \
+ void *m; \
+ m = (void*) DBGetQuadmesh(F,MN); \
+ ASSERT(m==0); \
+ m = (void*) DBGetPointmesh(F,MN); \
+ ASSERT(m==0); \
+ m = (void*) DBGetCsgmesh(F,MN); \
+ ASSERT(m==0); \
+ } \
+ if (testread) \
+ { \
+ DBucdmesh *um = DBGetUcdmesh(F, MN); \
+ ASSERT(um); \
+ CHECK_ARRAY(CS[0], um->coords[0], NNS, DTYPE); \
+ CHECK_ARRAY(CS[1], um->coords[1], NNS, DTYPE); \
+ if (NDS > 2) \
+ CHECK_ARRAY(CS[2], um->coords[2], NNS, DTYPE); \
+ DBFreeUcdmesh(um); \
+ } \
+ } \
+ else \
+ { \
+ ASSERT(DBPutUcdmesh(F,MN,NDS,CNMS,CS,NNS,NZS,ZLNM,FLNM,DTYPE,OL)==0); \
+ } \
+}
+
+#define TESTQMESH(F,MN,CNMS,CS,DS,NDS,DTYPE,CTYPE,OL) \
+{ \
+ if (handle_read) \
+ { \
+ if (testbadread) \
+ { \
+ void *m; \
+ m = (void*) DBGetUcdmesh(F,MN); \
+ ASSERT(m==0); \
+ m = (void*) DBGetPointmesh(F,MN); \
+ ASSERT(m==0); \
+ m = (void*) DBGetCsgmesh(F,MN); \
+ ASSERT(m==0); \
+ } \
+ if (testread) \
+ { \
+ int sz = DS[0]*DS[1]*(NDS==3?DS[2]:1); \
+ DBquadmesh *qm = DBGetQuadmesh(F, MN); \
+ ASSERT(qm); \
+ ASSERT(qm->ndims == NDS); \
+ ASSERT(qm->datatype == DTYPE); \
+ CHECK_ARRAY(CS[0], qm->coords[0], (CTYPE==DB_COLLINEAR?DS[0]:sz), DTYPE); \
+ CHECK_ARRAY(CS[1], qm->coords[1], (CTYPE==DB_COLLINEAR?DS[1]:sz), DTYPE); \
+ CHECK_ARRAY(CS[2], qm->coords[2], (CTYPE==DB_COLLINEAR?DS[2]:sz), DTYPE); \
+ DBFreeQuadmesh(qm); \
+ } \
+ } \
+ else \
+ { \
+ ASSERT(DBPutQuadmesh(F,MN,CNMS,CS,DS,NDS,DTYPE,CTYPE,OL)==0); \
+ } \
+}
+
+#define TESTPMESH(F,MN,NDS,CS,NPTS,DTYPE,OL) \
+{ \
+ if (handle_read) \
+ { \
+ if (testbadread) \
+ { \
+ void *m; \
+ m = (void*) DBGetUcdmesh(F,MN); \
+ ASSERT(m==0); \
+ m = (void*) DBGetQuadmesh(F,MN); \
+ ASSERT(m==0); \
+ m = (void*) DBGetCsgmesh(F,MN); \
+ ASSERT(m==0); \
+ } \
+ if (testread) \
+ { \
+ DBpointmesh *pm = DBGetPointmesh(F, MN); \
+ ASSERT(pm); \
+ ASSERT(pm->nels == NPTS); \
+ ASSERT(pm->ndims == NDS); \
+ ASSERT(pm->datatype == DTYPE); \
+ CHECK_ARRAY(CS[0], pm->coords[0], NPTS, DTYPE); \
+ CHECK_ARRAY(CS[1], pm->coords[1], NPTS, DTYPE); \
+ CHECK_ARRAY(CS[2], pm->coords[2], NPTS, DTYPE); \
+ DBFreePointmesh(pm); \
+ } \
+ } \
+ else \
+ { \
+ ASSERT(DBPutPointmesh(F,MN,NDS,CS,NPTS,DTYPE,OL)==0); \
+ } \
+}
+
+#define TESTUVAR(F,VN,MN,NV,VNMS,VP,NVALS,MXVALS,MXLEN,DTYPE,CENT,OL) \
+{ \
+ if (handle_read) \
+ { \
+ if (testbadread) \
+ { \
+ void *m; \
+ m = (void*) DBGetQuadvar(F,VN); \
+ ASSERT(m==0); \
+ m = (void*) DBGetPointvar(F,VN); \
+ ASSERT(m==0); \
+ m = (void*) DBGetCsgvar(F,VN); \
+ ASSERT(m==0); \
+ } \
+ if (testread) \
+ { \
+ int i; \
+ DBucdvar *uv = DBGetUcdvar(F, VN); \
+ ASSERT(uv); \
+ for (i = 0; i < NV; i++) \
+ CHECK_ARRAY(VP[i], uv->vals[i], NVALS, DTYPE); \
+ DBFreeUcdvar(uv); \
+ } \
+ } \
+ else \
+ { \
+ ASSERT(DBPutUcdvar(F,VN,MN,NV,VNMS,VP,NVALS,MXVALS,MXLEN,DTYPE,CENT,OL)==0); \
+ } \
+}
+
+#define TESTQVAR(F,VN,MN,VP,DS,NDS,VTYPE,CENT,OL) \
+{ \
+ int sz = DS[0]*(NDS>=2?DS[1]:1)*(NDS==3?DS[2]:1); \
+ if (handle_read) \
+ { \
+ if (testbadread) \
+ { \
+ void *m; \
+ m = (void*) DBGetUcdvar(F,VN); \
+ ASSERT(m==0); \
+ m = (void*) DBGetPointvar(F,VN); \
+ ASSERT(m==0); \
+ m = (void*) DBGetCsgvar(F,VN); \
+ ASSERT(m==0); \
+ } \
+ if (testread) \
+ { \
+ DBquadvar *qv = DBGetQuadvar(F, VN); \
+ ASSERT(qv); \
+ CHECK_ARRAY(VP, qv->vals[0], sz, VTYPE); \
+ DBFreeQuadvar(qv); \
+ } \
+ } \
+ else \
+ { \
+ put_extents(VP,sz,varextents[vidx[VN[0]-'a']],block); \
+ ASSERT(DBPutQuadvar1(F,VN,MN,VP,DS,NDS,NULL,0,VTYPE,CENT,OL)==0); \
+ } \
+}
+
+#define TESTPVAR(F,VN,MN,NV,VP,NPTS,DTYPE,OL) \
+{ \
+ if (handle_read) \
+ { \
+ if (testbadread) \
+ { \
+ void *m; \
+ m = (void*) DBGetUcdvar(F,VN); \
+ ASSERT(m==0); \
+ m = (void*) DBGetCurve(F,VN); \
+ ASSERT(m==0); \
+ m = (void*) DBGetCsgvar(F,VN); \
+ ASSERT(m==0); \
+ } \
+ if (testread) \
+ { \
+ int i; \
+ DBpointvar *pv = DBGetPointvar(F, VN); \
+ ASSERT(pv); \
+ ASSERT(pv->nvals == NV); \
+ ASSERT(pv->nels == NPTS); \
+ for (i = 0; i < NV; i++) \
+ CHECK_ARRAY(VP[i], pv->vals[i], NPTS, DTYPE); \
+ DBFreePointvar(pv); \
+ } \
+ } \
+ else \
+ { \
+ ASSERT(DBPutPointvar(F,VN,MN,NV,VP,NPTS,DTYPE,OL)==0); \
+ } \
+}
+
+#define TESTMAT(F,MATNM,MN,NMATS,MATNOS,MATLIST,DS,NDS,MIX_NEXT,MIX_MAT,MIX_ZONE,MIX_VF,MIXLEN,DTYPE,OL) \
+{ \
+ int sz = DS[0]*(NDS>=2?DS[1]:1)*(NDS==3?DS[2]:1); \
+ if (handle_read) \
+ { \
+ if (testread) \
+ { \
+ DBmaterial *mat = DBGetMaterial(F, MATNM); \
+ ASSERT(mat); \
+ CHECK_ARRAY(MATLIST, mat->matlist, sz, DB_INT); \
+ ASSERT(MIXLEN == mat->mixlen); \
+ if (MIXLEN > 0) \
+ { \
+ CHECK_ARRAY(MIX_NEXT, mat->mix_next, MIXLEN, DB_INT); \
+ CHECK_ARRAY(MIX_MAT, mat->mix_mat, MIXLEN, DB_INT); \
+ CHECK_ARRAY(MIX_ZONE, mat->mix_zone, MIXLEN, DB_INT); \
+ CHECK_ARRAY(MIX_VF, mat->mix_vf, MIXLEN, DTYPE); \
+ } \
+ DBFreeMaterial(mat); \
+ } \
+ } \
+ else \
+ { \
+ matcounts[block] = count_mats(sz,MATLIST,matlists[block]); \
+ mixlens[block] = MIXLEN; \
+ ASSERT(DBPutMaterial(F,MATNM,MN,NMATS,MATNOS,MATLIST,DS,NDS, \
+ MIX_NEXT,MIX_MAT,MIX_ZONE,MIX_VF,MIXLEN,DTYPE,OL)==0);\
+ } \
+}
+
+static int vidx['z'-'a'+1];
double varextents[MAXNUMVARS][2*MAXBLOCKS];
int mixlens[MAXBLOCKS];
int zonecounts[MAXBLOCKS];
@@ -84,18 +501,17 @@ int matcounts[MAXBLOCKS];
int matlists[MAXBLOCKS][MAXMATNO+1];
int driver = DB_PDB;
int check_early_close = FALSE;
+int testread = FALSE;
+int testbadread = FALSE;
-int build_multi(DBfile *, int, int, int, int, int, int, int);
+int build_multi(DBfile *, int, int, int, int, int, int, int, int);
-void build_block_rect2d(DBfile *, char[MAXBLOCKS][STRLEN], int, int);
-void build_block_curv2d(DBfile *, char[MAXBLOCKS][STRLEN], int, int);
-void build_block_point2d(DBfile *, char[MAXBLOCKS][STRLEN], int, int);
-void build_block_rect3d(DBfile *, char[MAXBLOCKS][STRLEN], int, int,
- int);
-void build_block_curv3d(DBfile *, char[MAXBLOCKS][STRLEN], int, int,
- int);
-void build_block_ucd3d(DBfile *, char[MAXBLOCKS][STRLEN], int, int,
- int);
+void build_block_rect2d(DBfile *, char[MAXBLOCKS][STRLEN], int, int, int);
+void build_block_curv2d(DBfile *, char[MAXBLOCKS][STRLEN], int, int, int);
+void build_block_point2d(DBfile *, char[MAXBLOCKS][STRLEN], int, int, int);
+void build_block_rect3d(DBfile *, char[MAXBLOCKS][STRLEN], int, int, int, int);
+void build_block_curv3d(DBfile *, char[MAXBLOCKS][STRLEN], int, int, int, int);
+void build_block_ucd3d(DBfile *, char[MAXBLOCKS][STRLEN], int, int, int, int);
static void put_extents(float *arr, int len, double *ext_arr, int block);
static void fill_rect3d_bkgr(int matlist[], int nx, int ny, int nz,
@@ -343,6 +759,9 @@ fill_rect3d_mat(float x[], float y[], float z[], int matlist[], int nx,
*
* Mark C. Miller, Wed Dec 2 12:12:49 PST 2009
* Fixed declaration of 'inc'
+ *
+ * Mark C. Miller, Tue Sep 11 17:36:56 PDT 2012
+ * Added ability to test read operations too, but only for first case.
*------------------------------------------------------------------------*/
int
main(int argc, char *argv[])
@@ -352,25 +771,29 @@ main(int argc, char *argv[])
int i;
int dochecks = FALSE;
int hdfriendly = FALSE;
- int inc = 512 << 11;
+
+ /* set up variable name to varextents index map */
+ vidx['d'-'a'] = 3;
+ vidx['p'-'a'] = 4;
+ vidx['u'-'a'] = 5;
+ vidx['v'-'a'] = 6;
+ vidx['w'-'a'] = 7;
+ vidx['x'-'a'] = 0;
+ vidx['y'-'a'] = 1;
+ vidx['z'-'a'] = 2;
/* Parse command-line */
for (i=1; i<argc; i++) {
- if (!strcmp(argv[i], "DB_PDB")) {
- driver = DB_PDB;
+ if (!strncmp(argv[i], "DB_PDB", 6)) {
+ driver = StringToDriver(argv[i]);
file_ext = ".pdb";
- } else if (!strcmp(argv[i], "DB_HDF5")) {
- driver = DB_HDF5;
- file_ext = ".h5";
- } else if (!strcmp(argv[i], "DB_HDF5_SEC2")) {
- driver = DB_HDF5_SEC2;
- file_ext = ".h5";
- } else if (!strcmp(argv[i], "DB_HDF5_STDIO")) {
- driver = DB_HDF5_STDIO;
- file_ext = ".h5";
- } else if (!strcmp(argv[i], "DB_HDF5_CORE")) {
- driver = inc | DB_HDF5_CORE;
+ } else if (!strncmp(argv[i], "DB_HDF5", 7)) {
+ driver = StringToDriver(argv[i]);
file_ext = ".h5";
+ } else if (!strcmp(argv[i], "gzip1")) {
+ DBSetCompression("METHOD=GZIP LEVEL=1");
+ } else if (!strcmp(argv[i], "gzip9")) {
+ DBSetCompression("METHOD=GZIP LEVEL=9");
} else if (!strcmp(argv[i], "hzip")) {
DBSetCompression("ERRMODE=FALLBACK METHOD=HZIP");
} else if (!strcmp(argv[i], "fpzip")) {
@@ -385,125 +808,208 @@ main(int argc, char *argv[])
hdfriendly = TRUE;
} else if (!strcmp(argv[i], "hdf-friendly-hard")) {
hdfriendly = 2;
+ } else if (!strcmp(argv[i], "testread")) {
+ testread = 1;
+ } else if (!strcmp(argv[i], "testbadread")) {
+ testbadread = 1;
} else {
fprintf(stderr, "%s: ignored argument `%s'\n", argv[0], argv[i]);
}
}
- DBShowErrors(DB_TOP, NULL);
+ DBShowErrors(DB_ALL_AND_DRVR, NULL);
+ if (testread || testbadread) DBShowErrors(DB_NONE, NULL);
DBSetEnableChecksums(dochecks);
- if (driver == DB_HDF5 || driver == DB_HDF5_SEC2 ||
- driver == DB_HDF5_STDIO || driver == (inc|DB_HDF5_CORE))
- DBSetFriendlyHDF5Names(hdfriendly);
+ DBSetFriendlyHDF5Names(hdfriendly);
/*
* Create the multi-block rectilinear 2d mesh.
*/
sprintf(filename, "multi_rect2d%s", file_ext);
fprintf(stdout, "creating %s\n", filename);
- if ((dbfile = DBCreate(filename, DB_CLOBBER, DB_LOCAL,
- "multi-block rectilinear 2d test file", driver))
- == NULL)
- {
- fprintf(stderr, "Could not create '%s'.\n", filename);
- } else if (build_multi(dbfile, DB_QUADMESH, DB_QUADVAR, 2, 3, 4, 1,
- DB_COLLINEAR) == -1)
+ if ((dbfile = DBCreate(filename, DB_CLOBBER, DB_LOCAL, "multi-block rectilinear 2d test file", driver)))
{
- fprintf(stderr, "Error in creating '%s'.\n", filename);
- DBClose(dbfile);
- } else
+ if (build_multi(dbfile, DB_QUADMESH, DB_QUADVAR, 2, 3, 4, 1, DB_COLLINEAR, 0) == -1)
+ fprintf(stderr, "Error building contents for '%s'.\n", filename);
DBClose(dbfile);
+ dbfile = 0;
+ if (testread || testbadread)
+ {
+ fprintf(stdout, "reading %s\n", filename);
+ if (dbfile = DBOpen(filename, DB_UNKNOWN, DB_READ))
+ {
+ if (build_multi(dbfile, DB_QUADMESH, DB_QUADVAR, 2, 3, 4, 1, DB_COLLINEAR, 1) == -1)
+ fprintf(stderr, "Error reading contents of '%s'.\n", filename);
+ DBClose(dbfile);
+ }
+ else
+ {
+ fprintf(stderr, "Unable to open \"%s\" for reading\n", filename);
+ }
+ }
+ }
+ else
+ {
+ fprintf(stderr, "Error in creating file '%s'.\n", filename);
+ }
/*
* Create the multi-block curvilinear 2d mesh.
*/
sprintf(filename, "multi_curv2d%s", file_ext);
fprintf(stdout, "creating %s\n", filename);
- if ((dbfile = DBCreate(filename, DB_CLOBBER, DB_LOCAL,
- "multi-block curvilinear 2d test file", driver))
- == NULL)
+ if ((dbfile = DBCreate(filename, DB_CLOBBER, DB_LOCAL, "multi-block curvilinear 2d test file", driver)))
{
- fprintf(stderr, "Could not create '%s'.\n", filename);
- } else if (build_multi(dbfile, DB_QUADMESH, DB_QUADVAR, 2, 5, 1, 1,
- DB_NONCOLLINEAR) == -1)
+ if (build_multi(dbfile, DB_QUADMESH, DB_QUADVAR, 2, 5, 1, 1, DB_NONCOLLINEAR, 0) == -1)
+ fprintf(stderr, "Could not create '%s'.\n", filename);
+ DBClose(dbfile);
+ dbfile = 0;
+ if (testread || testbadread)
+ {
+ fprintf(stdout, "reading %s\n", filename);
+ if (dbfile = DBOpen(filename, DB_UNKNOWN, DB_READ))
+ {
+ if (build_multi(dbfile, DB_QUADMESH, DB_QUADVAR, 2, 5, 1, 1, DB_NONCOLLINEAR, 1) == -1)
+ fprintf(stderr, "Error reading contents of '%s'.\n", filename);
+ DBClose(dbfile);
+ }
+ else
+ {
+ fprintf(stderr, "Unable to open \"%s\" for reading\n", filename);
+ }
+ }
+ }
+ else
{
fprintf(stderr, "Error in creating '%s'.\n", filename);
- DBClose(dbfile);
- } else
- DBClose(dbfile);
+ }
/*
* Create the multi-block point 2d mesh.
*/
sprintf(filename, "multi_point2d%s", file_ext);
fprintf(stdout, "creating %s\n", filename);
- if ((dbfile = DBCreate(filename, DB_CLOBBER, DB_LOCAL,
- "multi-block point 2d test file", driver))
- == NULL)
+ if ((dbfile = DBCreate(filename, DB_CLOBBER, DB_LOCAL, "multi-block point 2d test file", driver)))
{
- fprintf(stderr, "Could not create '%s'.\n", filename);
- } else if (build_multi(dbfile, DB_POINTMESH, DB_POINTVAR, 2, 5, 1, 1,
- 0) == -1)
+ if (build_multi(dbfile, DB_POINTMESH, DB_POINTVAR, 2, 5, 1, 1, 0, 0) == -1)
+ fprintf(stderr, "Could not create '%s'.\n", filename);
+ DBClose(dbfile);
+ dbfile = 0;
+ if (testread || testbadread)
+ {
+ fprintf(stdout, "reading %s\n", filename);
+ if (dbfile = DBOpen(filename, DB_UNKNOWN, DB_READ))
+ {
+ if (build_multi(dbfile, DB_POINTMESH, DB_POINTVAR, 2, 5, 1, 1, 0, 1) == -1)
+ fprintf(stderr, "Error reading contents of '%s'.\n", filename);
+ DBClose(dbfile);
+ }
+ else
+ {
+ fprintf(stderr, "Unable to open \"%s\" for reading\n", filename);
+ }
+ }
+ }
+ else
{
fprintf(stderr, "Error in creating '%s'.\n", filename);
- DBClose(dbfile);
- } else
- DBClose(dbfile);
+ }
/*
* Create the multi-block rectilinear 3d mesh.
*/
sprintf(filename, "multi_rect3d%s", file_ext);
fprintf(stdout, "creating %s\n", filename);
- if ((dbfile = DBCreate(filename, DB_CLOBBER, DB_LOCAL,
- "multi-block rectilinear 3d test file", driver))
- == NULL)
+ if ((dbfile = DBCreate(filename, DB_CLOBBER, DB_LOCAL, "multi-block rectilinear 3d test file", driver)))
{
- fprintf(stderr, "Could not create '%s'.\n", filename);
- } else if (build_multi(dbfile, DB_QUADMESH, DB_QUADVAR, 3, 3, 4, 3,
- DB_COLLINEAR) == -1)
+ if (build_multi(dbfile, DB_QUADMESH, DB_QUADVAR, 3, 3, 4, 3, DB_COLLINEAR, 0) == -1)
+ fprintf(stderr, "Could not create '%s'.\n", filename);
+ DBClose(dbfile);
+ dbfile = 0;
+ if (testread || testbadread)
+ {
+ fprintf(stdout, "reading %s\n", filename);
+ if (dbfile = DBOpen(filename, DB_UNKNOWN, DB_READ))
+ {
+ if (build_multi(dbfile, DB_QUADMESH, DB_QUADVAR, 3, 3, 4, 3, DB_COLLINEAR, 1) == -1)
+ fprintf(stderr, "Error reading contents of '%s'.\n", filename);
+ DBClose(dbfile);
+ }
+ else
+ {
+ fprintf(stderr, "Unable to open \"%s\" for reading\n", filename);
+ }
+ }
+ }
+ else
{
fprintf(stderr, "Error in creating '%s'.\n", filename);
- DBClose(dbfile);
- } else
- DBClose(dbfile);
+ }
/*
* Create the multi-block curvilinear 3d mesh.
*/
sprintf(filename, "multi_curv3d%s", file_ext);
fprintf(stdout, "creating %s\n", filename);
- if ((dbfile = DBCreate(filename, DB_CLOBBER, DB_LOCAL,
- "multi-block curvilinear 3d test file", driver))
- == NULL)
+ if ((dbfile = DBCreate(filename, DB_CLOBBER, DB_LOCAL, "multi-block curvilinear 3d test file", driver)))
{
- fprintf(stderr, "Could not create '%s'.\n", filename);
- } else if (build_multi(dbfile, DB_QUADMESH, DB_QUADVAR, 3, 3, 4, 3,
- DB_NONCOLLINEAR) == -1)
+ if (build_multi(dbfile, DB_QUADMESH, DB_QUADVAR, 3, 3, 4, 3, DB_NONCOLLINEAR, 0) == -1)
+ fprintf(stderr, "Could not create '%s'.\n", filename);
+ DBClose(dbfile);
+ dbfile = 0;
+ if (testread || testbadread)
+ {
+ fprintf(stdout, "reading %s\n", filename);
+ if (dbfile = DBOpen(filename, DB_UNKNOWN, DB_READ))
+ {
+ if (build_multi(dbfile, DB_QUADMESH, DB_QUADVAR, 3, 3, 4, 3, DB_NONCOLLINEAR, 1) == -1)
+ fprintf(stderr, "Error reading contents of '%s'.\n", filename);
+ DBClose(dbfile);
+ }
+ else
+ {
+ fprintf(stderr, "Unable to open \"%s\" for reading\n", filename);
+ }
+ }
+ }
+ else
{
fprintf(stderr, "Error in creating '%s'.\n", filename);
- DBClose(dbfile);
- } else
- DBClose(dbfile);
+ }
+
/*
* Create the multi-block ucd 3d mesh.
*/
sprintf(filename, "multi_ucd3d%s", file_ext);
fprintf(stdout, "creating %s\n", filename);
- if ((dbfile = DBCreate(filename, DB_CLOBBER, DB_LOCAL,
- "multi-block ucd 3d test file", driver))
- == NULL)
+ if ((dbfile = DBCreate(filename, DB_CLOBBER, DB_LOCAL, "multi-block ucd 3d test file", driver)))
{
- fprintf(stderr, "Could not create '%s'.\n", filename);
- } else if (build_multi(dbfile, DB_UCDMESH, DB_UCDVAR, 3, 3, 4, 3,
- 0) == -1)
+ if (build_multi(dbfile, DB_UCDMESH, DB_UCDVAR, 3, 3, 4, 3, 0, 0) == -1)
+ fprintf(stderr, "Could not create '%s'.\n", filename);
+ DBClose(dbfile);
+ dbfile = 0;
+ if (testread || testbadread)
+ {
+ fprintf(stdout, "reading %s\n", filename);
+ if (dbfile = DBOpen(filename, DB_UNKNOWN, DB_READ))
+ {
+ if (build_multi(dbfile, DB_UCDMESH, DB_UCDVAR, 3, 3, 4, 3, 0, 1) == -1)
+ fprintf(stderr, "Error reading contents of '%s'.\n", filename);
+ DBClose(dbfile);
+ }
+ else
+ {
+ fprintf(stderr, "Unable to open \"%s\" for reading\n", filename);
+ }
+ }
+ }
+ else
{
fprintf(stderr, "Error in creating '%s'.\n", filename);
- DBClose(dbfile);
- } else
- DBClose(dbfile);
+ }
+ CleanupDriverStuff();
return (0);
} /* main */
@@ -547,10 +1053,14 @@ main(int argc, char *argv[])
*
* Mark C. Miller, Mon Aug 7 17:03:51 PDT 2006
* Added additional material object with material names and colors
+ *
+ * Mark C. Miller, Tue Sep 11 17:36:24 PDT 2012
+ * Added ability to test read operations too but only for first case
+ * though.
*------------------------------------------------------------------------*/
int
build_multi(DBfile *dbfile, int meshtype, int vartype, int dim, int nblocks_x,
- int nblocks_y, int nblocks_z, int coord_type)
+ int nblocks_y, int nblocks_z, int coord_type, int handle_read)
{
int i,j,k;
int cycle;
@@ -559,7 +1069,7 @@ build_multi(DBfile *dbfile, int meshtype, int vartype, int dim, int nblocks_x,
int nmatnos;
int matnos[3];
char names[MAXBLOCKS][STRLEN];
- char *meshnames[MAXBLOCKS];
+ char const *meshnames[MAXBLOCKS];
int meshtypes[MAXBLOCKS];
char names1[MAXBLOCKS][STRLEN];
char names2[MAXBLOCKS][STRLEN];
@@ -587,33 +1097,6 @@ build_multi(DBfile *dbfile, int meshtype, int vartype, int dim, int nblocks_x,
double *tmpExtents;
/*
- * Initialize a simple grouping
- */
- int ngroupings;
- int groupings[9];
- char **groupingnames = NULL;
- ngroupings = 9; /* number of elements in the grouping arrays */
- groupings[0] = 5; /* number of elements in this group */
- groupings[1] = 0;
- groupings[2] = 1;
- groupings[3] = 2;
- groupings[4] = 3;
- groupings[5] = 4;
- groupings[6] = 2; /* number of elements in next group */
- groupings[7] = 5;
- groupings[8] = 6;
- groupingnames = (char**)malloc(sizeof(char*)*ngroupings);
- groupingnames[0] = safe_strdup("First Grouping");
- groupingnames[1] = safe_strdup("Zero");
- groupingnames[2] = safe_strdup("One");
- groupingnames[3] = safe_strdup("Two");
- groupingnames[4] = safe_strdup("Three");
- groupingnames[5] = safe_strdup("Four");
- groupingnames[6] = safe_strdup("Second Grouping");
- groupingnames[7] = safe_strdup("Five");
- groupingnames[8] = safe_strdup("Six");
-
- /*
* Initialize the names and create the directories for the blocks.
*/
@@ -643,7 +1126,7 @@ build_multi(DBfile *dbfile, int meshtype, int vartype, int dim, int nblocks_x,
sprintf(dirnames[i], "/block%d", i);
- if (DBMkDir(dbfile, dirnames[i]) == -1)
+ if (!handle_read && DBMkDir(dbfile, dirnames[i]) == -1)
{
fprintf(stderr, "Could not make directory \"%s\"\n", dirnames[i]);
return (-1);
@@ -662,30 +1145,27 @@ build_multi(DBfile *dbfile, int meshtype, int vartype, int dim, int nblocks_x,
if (coord_type == DB_COLLINEAR)
{
if (dim == 2)
- build_block_rect2d(dbfile, dirnames, nblocks_x, nblocks_y);
+ build_block_rect2d(dbfile, dirnames, nblocks_x, nblocks_y, handle_read);
else if (dim == 3)
- build_block_rect3d(dbfile, dirnames, nblocks_x, nblocks_y,
- nblocks_z);
+ build_block_rect3d(dbfile, dirnames, nblocks_x, nblocks_y, nblocks_z, handle_read);
} else if (coord_type == DB_NONCOLLINEAR)
{
if (dim == 2)
- build_block_curv2d(dbfile, dirnames, nblocks_x, nblocks_y);
+ build_block_curv2d(dbfile, dirnames, nblocks_x, nblocks_y, handle_read);
else if (dim == 3)
- build_block_curv3d(dbfile, dirnames, nblocks_x, nblocks_y,
- nblocks_z);
+ build_block_curv3d(dbfile, dirnames, nblocks_x, nblocks_y, nblocks_z, handle_read);
}
break;
case DB_UCDMESH:
if (dim == 3)
- build_block_ucd3d(dbfile, dirnames, nblocks_x, nblocks_y,
- nblocks_z);
+ build_block_ucd3d(dbfile, dirnames, nblocks_x, nblocks_y, nblocks_z, handle_read);
break;
case DB_POINTMESH:
if (dim == 2)
- build_block_point2d(dbfile, dirnames, nblocks_x, nblocks_y);
+ build_block_point2d(dbfile, dirnames, nblocks_x, nblocks_y, handle_read);
break;
@@ -694,6 +1174,8 @@ build_multi(DBfile *dbfile, int meshtype, int vartype, int dim, int nblocks_x,
return (-1);
} /* switch */
+ if (handle_read) return 0;
+
cycle = 48;
time = 4.8;
dtime = 4.8;
@@ -723,10 +1205,6 @@ build_multi(DBfile *dbfile, int meshtype, int vartype, int dim, int nblocks_x,
return (-1);
} /* if */
- for (i = 0; i < ngroupings; i++)
- FREE(groupingnames[i]);
- FREE(groupingnames);
-
/* test hidding a multimesh */
DBAddOption(optlist, DBOPT_HIDE_FROM_GUI, &one);
DBPutMultimesh(dbfile, "mesh1_hidden", nblocks, meshnames, meshtypes, optlist);
@@ -874,7 +1352,7 @@ build_multi(DBfile *dbfile, int meshtype, int vartype, int dim, int nblocks_x,
*-------------------------------------------------------------------------*/
void
build_block_rect2d(DBfile *dbfile, char dirnames[MAXBLOCKS][STRLEN],
- int nblocks_x, int nblocks_y)
+ int nblocks_x, int nblocks_y, int handle_read)
{
int cycle;
float time;
@@ -948,6 +1426,7 @@ build_block_rect2d(DBfile *dbfile, char dirnames[MAXBLOCKS][STRLEN],
coordnames[1] = "ycoords";
coords[0] = x;
coords[1] = y;
+ coords[2] = 0;
ndims = 2;
dims[0] = NX + 1;
dims[1] = NY + 1;
@@ -1146,6 +1625,7 @@ build_block_rect2d(DBfile *dbfile, char dirnames[MAXBLOCKS][STRLEN],
coords[0] = x2;
coords[1] = y2;
+ coords[2] = 0;
dims[0] = delta_x + 1;
dims[1] = delta_y + 1;
zdims[0] = delta_x;
@@ -1233,30 +1713,16 @@ build_block_rect2d(DBfile *dbfile, char dirnames[MAXBLOCKS][STRLEN],
(varextents[1][2*block+1] >= 1.0))
has_external_zones[block] = 1;
zonecounts[block] = (dims[0]-1)*(dims[1]-1);
- DBPutQuadmesh(dbfile, meshname, coordnames, coords, dims, ndims,
- DB_FLOAT, DB_COLLINEAR, optlist);
-
- put_extents(d2,(dims[0]-1)*(dims[1]-1),varextents[3],block);
- DBPutQuadvar1(dbfile, var1name, meshname, d2, zdims, ndims,
- NULL, 0, DB_FLOAT, DB_ZONECENT, optlist);
- put_extents(p2,(dims[0]-1)*(dims[1]-1),varextents[4],block);
- DBPutQuadvar1(dbfile, var2name, meshname, p2, zdims, ndims,
- NULL, 0, DB_FLOAT, DB_ZONECENT, optlist);
+ TESTQMESH(dbfile, meshname, coordnames, coords, dims, ndims, DB_FLOAT, DB_COLLINEAR, optlist);
- put_extents(u2,dims[0]*dims[1],varextents[5],block);
- DBPutQuadvar1(dbfile, var3name, meshname, u2, dims, ndims,
- NULL, 0, DB_FLOAT, DB_NODECENT, optlist);
+ TESTQVAR(dbfile, var1name, meshname, d2, zdims, ndims, DB_FLOAT, DB_ZONECENT, optlist);
+ TESTQVAR(dbfile, var2name, meshname, p2, zdims, ndims, DB_FLOAT, DB_ZONECENT, optlist);
+ TESTQVAR(dbfile, var3name, meshname, u2, dims, ndims, DB_FLOAT, DB_NODECENT, optlist);
+ TESTQVAR(dbfile, var4name, meshname, v2, dims, ndims, DB_FLOAT, DB_NODECENT, optlist);
- put_extents(v2,dims[0]*dims[1],varextents[6],block);
- DBPutQuadvar1(dbfile, var4name, meshname, v2, dims, ndims,
- NULL, 0, DB_FLOAT, DB_NODECENT, optlist);
-
- matcounts[block] = count_mats(dims2[0]*dims2[1],matlist2,matlists[block]);
- mixlens[block] = mixlen2;
- DBPutMaterial(dbfile, matname, meshname, nmats, matnos,
- matlist2, dims2, ndims, mix_next2, mix_mat2,
- mix_zone2, mix_vf2, mixlen2, DB_FLOAT, optlist);
+ TESTMAT(dbfile, matname, meshname, nmats, matnos, matlist2, dims2, ndims,
+ mix_next2, mix_mat2, mix_zone2, mix_vf2, mixlen2, DB_FLOAT, optlist);
DBFreeOptlist(optlist);
@@ -1324,7 +1790,7 @@ build_block_rect2d(DBfile *dbfile, char dirnames[MAXBLOCKS][STRLEN],
*/
void
build_block_curv2d(DBfile *dbfile, char dirnames[MAXBLOCKS][STRLEN],
- int nblocks_x, int nblocks_y)
+ int nblocks_x, int nblocks_y, int handle_read)
{
int cycle;
float time;
@@ -1393,6 +1859,7 @@ build_block_curv2d(DBfile *dbfile, char dirnames[MAXBLOCKS][STRLEN],
coordnames[2] = "zcoords";
coords[0] = x;
coords[1] = y;
+ coords[2] = 0;
ndims = 2;
dims[0] = NX + 1;
dims[1] = NY + 1;
@@ -1491,6 +1958,7 @@ build_block_curv2d(DBfile *dbfile, char dirnames[MAXBLOCKS][STRLEN],
coords[0] = x2;
coords[1] = y2;
+ coords[2] = 0;
dims[0] = delta_x + 1;
dims[1] = delta_y + 1;
zdims[0] = delta_x;
@@ -1554,30 +2022,16 @@ build_block_curv2d(DBfile *dbfile, char dirnames[MAXBLOCKS][STRLEN],
put_extents(y2,dims[0]*dims[1],varextents[1],block);
has_external_zones[block] = 1;
zonecounts[block] = (dims[0]-1)*(dims[1]-1);
- DBPutQuadmesh(dbfile, meshname, coordnames, coords, dims, ndims,
- DB_FLOAT, DB_NONCOLLINEAR, optlist);
-
- put_extents(d2,(dims[0]-1)*(dims[1]-1),varextents[3],block);
- DBPutQuadvar1(dbfile, var1name, meshname, d2, zdims, ndims,
- NULL, 0, DB_FLOAT, DB_ZONECENT, optlist);
- put_extents(p2,(dims[0]-1)*(dims[1]-1),varextents[4],block);
- DBPutQuadvar1(dbfile, var2name, meshname, p2, zdims, ndims,
- NULL, 0, DB_FLOAT, DB_ZONECENT, optlist);
+ TESTQMESH(dbfile, meshname, coordnames, coords, dims, ndims, DB_FLOAT, DB_NONCOLLINEAR, optlist);
- put_extents(u2,dims[0]*dims[1],varextents[5],block);
- DBPutQuadvar1(dbfile, var3name, meshname, u2, dims, ndims,
- NULL, 0, DB_FLOAT, DB_NODECENT, optlist);
+ TESTQVAR(dbfile, var1name, meshname, d2, zdims, ndims, DB_FLOAT, DB_ZONECENT, optlist);
+ TESTQVAR(dbfile, var2name, meshname, p2, zdims, ndims, DB_FLOAT, DB_ZONECENT, optlist);
+ TESTQVAR(dbfile, var3name, meshname, u2, dims, ndims, DB_FLOAT, DB_NODECENT, optlist);
+ TESTQVAR(dbfile, var4name, meshname, v2, dims, ndims, DB_FLOAT, DB_NODECENT, optlist);
- put_extents(v2,dims[0]*dims[1],varextents[6],block);
- DBPutQuadvar1(dbfile, var4name, meshname, v2, dims, ndims,
- NULL, 0, DB_FLOAT, DB_NODECENT, optlist);
-
- matcounts[block] = count_mats(dims2[0]*dims2[1],matlist2,matlists[block]);
- mixlens[block] = mixlen;
- DBPutMaterial(dbfile, matname, meshname, nmats, matnos,
- matlist2, dims2, ndims, mix_next, mix_mat, mix_zone,
- mix_vf, mixlen, DB_FLOAT, optlist);
+ TESTMAT(dbfile, matname, meshname, nmats, matnos, matlist2, dims2, ndims,
+ 0, 0, 0, 0, mixlen, DB_FLOAT, optlist);
DBFreeOptlist(optlist);
@@ -1635,7 +2089,7 @@ build_block_curv2d(DBfile *dbfile, char dirnames[MAXBLOCKS][STRLEN],
*/
void
build_block_point2d(DBfile *dbfile, char dirnames[MAXBLOCKS][STRLEN],
- int nblocks_x, int nblocks_y)
+ int nblocks_x, int nblocks_y, int handle_read)
{
int cycle;
float time;
@@ -1686,6 +2140,7 @@ build_block_point2d(DBfile *dbfile, char dirnames[MAXBLOCKS][STRLEN],
meshname = "mesh1";
coords[0] = x;
coords[1] = y;
+ coords[2] = 0;
dtheta = (180. / NX) * (3.1415926 / 180.);
dr = 3. / NY;
theta = 0;
@@ -1742,6 +2197,7 @@ build_block_point2d(DBfile *dbfile, char dirnames[MAXBLOCKS][STRLEN],
coords[0] = x2;
coords[1] = y2;
+ coords[2] = 0;
/*
* Create the blocks for the multi-block object.
@@ -1794,27 +2250,23 @@ build_block_point2d(DBfile *dbfile, char dirnames[MAXBLOCKS][STRLEN],
put_extents(x2,npts,varextents[0],block);
put_extents(y2,npts,varextents[1],block);
zonecounts[block] = 0;
- DBPutPointmesh(dbfile, meshname, 2, coords, npts, DB_FLOAT, optlist);
+ TESTPMESH(dbfile, meshname, 2, coords, npts, DB_FLOAT, optlist);
put_extents(d2,npts,varextents[3],block);
vars[0] = d2;
- DBPutPointvar(dbfile, var1name, meshname, 1, vars, npts, DB_FLOAT,
- optlist);
+ TESTPVAR(dbfile, var1name, meshname, 1, vars, npts, DB_FLOAT, optlist);
put_extents(p2,npts,varextents[4],block);
vars[0] = p2;
- DBPutPointvar(dbfile, var2name, meshname, 1, vars, npts, DB_FLOAT,
- optlist);
+ TESTPVAR(dbfile, var2name, meshname, 1, vars, npts, DB_FLOAT, optlist);
put_extents(u2,npts,varextents[5],block);
vars[0] = u2;
- DBPutPointvar(dbfile, var3name, meshname, 1, vars, npts, DB_FLOAT,
- optlist);
+ TESTPVAR(dbfile, var3name, meshname, 1, vars, npts, DB_FLOAT, optlist);
put_extents(v2,npts,varextents[6],block);
vars[0] = v2;
- DBPutPointvar(dbfile, var4name, meshname, 1, vars, npts, DB_FLOAT,
- optlist);
+ TESTPVAR(dbfile, var4name, meshname, 1, vars, npts, DB_FLOAT, optlist);
DBFreeOptlist(optlist);
@@ -1882,7 +2334,7 @@ build_block_point2d(DBfile *dbfile, char dirnames[MAXBLOCKS][STRLEN],
*/
void
build_block_rect3d(DBfile *dbfile, char dirnames[MAXBLOCKS][STRLEN],
- int nblocks_x, int nblocks_y, int nblocks_z)
+ int nblocks_x, int nblocks_y, int nblocks_z, int handle_read)
{
int cycle;
float time;
@@ -2180,38 +2632,21 @@ build_block_rect3d(DBfile *dbfile, char dirnames[MAXBLOCKS][STRLEN],
has_external_zones[block] = 1;
zonecounts[block] = (dims[0]-1)*(dims[1]-1)*(dims[2]-1);
- DBPutQuadmesh(dbfile, meshname, coordnames, coords, dims, ndims,
- DB_FLOAT, DB_COLLINEAR, optlist);
+ TESTQMESH(dbfile, meshname, coordnames, coords, dims, ndims, DB_FLOAT, DB_COLLINEAR, optlist);
- put_extents(d2,(dims[0]-1)*(dims[1]-1)*(dims[2]-1),varextents[3],block);
DBAddOption(optlist, DBOPT_CONSERVED, &one);
DBAddOption(optlist, DBOPT_EXTENSIVE, &one);
- DBPutQuadvar1(dbfile, var1name, meshname, d2, zdims, ndims,
- NULL, 0, DB_FLOAT, DB_ZONECENT, optlist);
+ TESTQVAR(dbfile, var1name, meshname, d2, zdims, ndims, DB_FLOAT, DB_ZONECENT, optlist);
DBClearOption(optlist, DBOPT_CONSERVED);
DBClearOption(optlist, DBOPT_EXTENSIVE);
- put_extents(p2,(dims[0]-1)*(dims[1]-1)*(dims[2]-1),varextents[4],block);
- DBPutQuadvar1(dbfile, var2name, meshname, p2, zdims, ndims,
- NULL, 0, DB_FLOAT, DB_ZONECENT, optlist);
-
- put_extents(u2,dims[0]*dims[1]*dims[2],varextents[5],block);
- DBPutQuadvar1(dbfile, var3name, meshname, u2, dims, ndims,
- NULL, 0, DB_FLOAT, DB_NODECENT, optlist);
-
- put_extents(v2,dims[0]*dims[1]*dims[2],varextents[6],block);
- DBPutQuadvar1(dbfile, var4name, meshname, v2, dims, ndims,
- NULL, 0, DB_FLOAT, DB_NODECENT, optlist);
-
- put_extents(w2,dims[0]*dims[1]*dims[2],varextents[7],block);
- DBPutQuadvar1(dbfile, var5name, meshname, w2, dims, ndims,
- NULL, 0, DB_FLOAT, DB_NODECENT, optlist);
+ TESTQVAR(dbfile, var2name, meshname, p2, zdims, ndims, DB_FLOAT, DB_ZONECENT, optlist);
+ TESTQVAR(dbfile, var3name, meshname, u2, dims, ndims, DB_FLOAT, DB_NODECENT, optlist);
+ TESTQVAR(dbfile, var4name, meshname, v2, dims, ndims, DB_FLOAT, DB_NODECENT, optlist);
+ TESTQVAR(dbfile, var5name, meshname, w2, dims, ndims, DB_FLOAT, DB_NODECENT, optlist);
- matcounts[block] = count_mats(dims2[0]*dims2[1]*dims2[2],matlist2,matlists[block]);
- mixlens[block] = mixlen2;
- DBPutMaterial(dbfile, matname, meshname, nmats, matnos,
- matlist2, dims2, ndims, mix_next2, mix_mat2, mix_zone2,
- mix_vf2, mixlen2, DB_FLOAT, optlist);
+ TESTMAT(dbfile, matname, meshname, nmats, matnos, matlist2, dims2, ndims,
+ mix_next2, mix_mat2, mix_zone2, mix_vf2, mixlen2, DB_FLOAT, optlist);
DBFreeOptlist(optlist);
@@ -2290,7 +2725,7 @@ build_block_rect3d(DBfile *dbfile, char dirnames[MAXBLOCKS][STRLEN],
*/
void
build_block_ucd3d(DBfile *dbfile, char dirnames[MAXBLOCKS][STRLEN],
- int nblocks_x, int nblocks_y, int nblocks_z)
+ int nblocks_x, int nblocks_y, int nblocks_z, int handle_read)
{
int cycle;
@@ -2677,10 +3112,12 @@ build_block_ucd3d(DBfile *dbfile, char dirnames[MAXBLOCKS][STRLEN],
DBAddOption(optlist, DBOPT_HI_OFFSET, &hi_off);
if (nfaces > 0)
- DBPutFacelist(dbfile, "fl1", nfaces, 3, facelist, lfacelist, 0,
+ {
+ TESTFL(dbfile, "fl1", nfaces, 3, facelist, lfacelist, 0,
zoneno, &fshapesize, &fshapecnt, 1, NULL, NULL, 0);
+ }
- DBPutZonelist2(dbfile, "zl1", nzones, 3, zonelist, lzonelist, 0,
+ TESTZL(dbfile, "zl1", nzones, 3, zonelist, lzonelist, 0,
0, hi_off, &zshapetype, &zshapesize, &zshapecnt, 1, 0);
/*
@@ -2692,47 +3129,54 @@ build_block_ucd3d(DBfile *dbfile, char dirnames[MAXBLOCKS][STRLEN],
has_external_zones[block] = nfaces ? 1 : 0;
zonecounts[block] = nzones;
if (nfaces > 0)
- DBPutUcdmesh(dbfile, meshname, 3, coordnames, coords,
- nnodes, nzones, "zl1", "fl1", DB_FLOAT, optlist);
+ {
+ TESTUMESH(dbfile, meshname, 3, coordnames, coords,
+ nnodes, nzones, "zl1", "fl1", DB_FLOAT, optlist);
+ }
else
- DBPutUcdmesh(dbfile, meshname, 3, coordnames, coords,
- nnodes, nzones, "zl1", NULL, DB_FLOAT, optlist);
+ {
+ TESTUMESH(dbfile, meshname, 3, coordnames, coords,
+ nnodes, nzones, "zl1", 0, DB_FLOAT, optlist);
+ }
put_extents(d2,nzones,varextents[3],block);
vars[0] = d2;
varnames[0] = var1name;
- DBPutUcdvar(dbfile, var1name, meshname, 1, varnames, vars,
+ TESTUVAR(dbfile, var1name, meshname, 1, varnames, vars,
nzones, NULL, 0, DB_FLOAT, DB_ZONECENT, optlist);
put_extents(p2,nzones,varextents[4],block);
vars[0] = p2;
varnames[0] = var2name;
- DBPutUcdvar(dbfile, var2name, meshname, 1, varnames, vars,
+ TESTUVAR(dbfile, var2name, meshname, 1, varnames, vars,
nzones, NULL, 0, DB_FLOAT, DB_ZONECENT, optlist);
put_extents(u2,nnodes,varextents[5],block);
vars[0] = u2;
varnames[0] = var3name;
- DBPutUcdvar(dbfile, var3name, meshname, 1, varnames, vars,
+ TESTUVAR(dbfile, var3name, meshname, 1, varnames, vars,
nnodes, NULL, 0, DB_FLOAT, DB_NODECENT, optlist);
put_extents(v2,nnodes,varextents[6],block);
vars[0] = v2;
varnames[0] = var4name;
- DBPutUcdvar(dbfile, var4name, meshname, 1, varnames, vars,
+ TESTUVAR(dbfile, var4name, meshname, 1, varnames, vars,
nnodes, NULL, 0, DB_FLOAT, DB_NODECENT, optlist);
put_extents(w2,nnodes,varextents[7],block);
vars[0] = w2;
varnames[0] = var5name;
- DBPutUcdvar(dbfile, var5name, meshname, 1, varnames, vars,
+ TESTUVAR(dbfile, var5name, meshname, 1, varnames, vars,
nnodes, NULL, 0, DB_FLOAT, DB_NODECENT, optlist);
matcounts[block] = count_mats(nzones,matlist2,matlists[block]);
mixlens[block] = mixlen;
- DBPutMaterial(dbfile, matname, meshname, nmats, matnos,
- matlist2, &nzones, 1, mix_next, mix_mat, mix_zone,
- mix_vf, mixlen, DB_FLOAT, optlist);
+ {
+ int dims[1];
+ dims[0] = nzones;
+ TESTMAT(dbfile, matname, meshname, nmats, matnos, matlist2, dims,
+ 1, mix_next, mix_mat, mix_zone, mix_vf, mixlen, DB_FLOAT, optlist);
+ }
DBFreeOptlist(optlist);
@@ -2808,7 +3252,7 @@ build_block_ucd3d(DBfile *dbfile, char dirnames[MAXBLOCKS][STRLEN],
*/
void
build_block_curv3d(DBfile *dbfile, char dirnames[MAXBLOCKS][STRLEN],
- int nblocks_x, int nblocks_y, int nblocks_z)
+ int nblocks_x, int nblocks_y, int nblocks_z, int handle_read)
{
int cycle;
float time;
@@ -3108,35 +3552,16 @@ build_block_curv3d(DBfile *dbfile, char dirnames[MAXBLOCKS][STRLEN],
put_extents(z2,dims[0]*dims[1]*dims[2],varextents[2],block);
has_external_zones[block] = 1;
zonecounts[block] = (dims[0]-1)*(dims[1]-1)*(dims[2]-1);
- DBPutQuadmesh(dbfile, meshname, coordnames, coords,
- dims, ndims, DB_FLOAT, DB_NONCOLLINEAR,
- optlist);
-
- put_extents(d2,(dims[0]-1)*(dims[1]-1)*(dims[2]-1),varextents[3],block);
- DBPutQuadvar1(dbfile, var1name, meshname, d2, zdims, ndims,
- NULL, 0, DB_FLOAT, DB_ZONECENT, optlist);
+ TESTQMESH(dbfile, meshname, coordnames, coords, dims, ndims, DB_FLOAT, DB_NONCOLLINEAR, optlist);
- put_extents(p2,(dims[0]-1)*(dims[1]-1)*(dims[2]-1),varextents[4],block);
- DBPutQuadvar1(dbfile, var2name, meshname, p2, zdims, ndims,
- NULL, 0, DB_FLOAT, DB_ZONECENT, optlist);
+ TESTQVAR(dbfile, var1name, meshname, d2, zdims, ndims, DB_FLOAT, DB_ZONECENT, optlist);
+ TESTQVAR(dbfile, var2name, meshname, p2, zdims, ndims, DB_FLOAT, DB_ZONECENT, optlist);
+ TESTQVAR(dbfile, var3name, meshname, u2, dims, ndims, DB_FLOAT, DB_NODECENT, optlist);
+ TESTQVAR(dbfile, var4name, meshname, v2, dims, ndims, DB_FLOAT, DB_NODECENT, optlist);
+ TESTQVAR(dbfile, var5name, meshname, w2, dims, ndims, DB_FLOAT, DB_NODECENT, optlist);
- put_extents(u2,dims[0]*dims[1]*dims[2],varextents[5],block);
- DBPutQuadvar1(dbfile, var3name, meshname, u2, dims, ndims,
- NULL, 0, DB_FLOAT, DB_NODECENT, optlist);
-
- put_extents(v2,dims[0]*dims[1]*dims[2],varextents[6],block);
- DBPutQuadvar1(dbfile, var4name, meshname, v2, dims, ndims,
- NULL, 0, DB_FLOAT, DB_NODECENT, optlist);
-
- put_extents(w2,dims[0]*dims[1]*dims[2],varextents[7],block);
- DBPutQuadvar1(dbfile, var5name, meshname, w2, dims, ndims,
- NULL, 0, DB_FLOAT, DB_NODECENT, optlist);
-
- matcounts[block] = count_mats((dims[0]-1)*(dims[1]-1)*(dims[2]-1),matlist2,matlists[block]);
- mixlens[block] = mixlen;
- DBPutMaterial(dbfile, matname, meshname, nmats, matnos,
- matlist2, dims2, ndims, mix_next, mix_mat, mix_zone,
- mix_vf, mixlen, DB_FLOAT, optlist);
+ TESTMAT(dbfile, matname, meshname, nmats, matnos, matlist2, dims2, ndims,
+ mix_next, mix_mat, mix_zone, mix_vf, mixlen, DB_FLOAT, optlist);
DBFreeOptlist(optlist);
diff --git a/tests/namescheme.c b/tests/namescheme.c
index da343d4..165fd1b 100644
--- a/tests/namescheme.c
+++ b/tests/namescheme.c
@@ -62,22 +62,47 @@ be used for advertising or product endorsement purposes.
*/
#include <silo.h>
+#include <std.c>
#include <string.h>
-int main()
+int main(int argc, char **argv)
{
int i;
int P[100], U[4];
char *N[3];
char blockName[1024];
+ int driver = DB_PDB;
+ int show_all_errors = 0;
+ DBnamescheme *ns, *ns2;
+ char teststr[256];
+
+ for (i=1; i<argc; i++) {
+ if (!strncmp(argv[i], "DB_PDB", 6)) {
+ driver = StringToDriver(argv[i]);
+ } else if (!strncmp(argv[i], "DB_HDF5", 7)) {
+ driver = StringToDriver(argv[i]);
+ } else if (!strcmp(argv[i], "show-all-errors")) {
+ show_all_errors = 1;
+ } else if (argv[i][0] != '\0') {
+ fprintf(stderr, "%s: ignored argument `%s'\n", argv[0], argv[i]);
+ }
+ }
+
+ DBShowErrors(show_all_errors?DB_ALL_AND_DRVR:DB_ABORT, NULL);
/* Test a somewhat complex expression */
- DBnamescheme *ns2;
- DBnamescheme *ns = DBMakeNamescheme("@foo_%+03d at 3-((n % 3)*(4+1)+1/2)+1");
+ ns = DBMakeNamescheme("@foo_%+03d at 3-((n % 3)*(4+1)+1/2)+1");
if (strcmp(DBGetName(ns, 25), "foo_+01") != 0)
return 1;
DBFreeNamescheme(ns);
+ /* test returned string is different for successive calls (Dan Laney bug) */
+ ns = DBMakeNamescheme("@/foo/bar/proc-%d at n");
+ sprintf(teststr, "%s %s", DBGetName(ns,0), DBGetName(ns,123));
+ if (strcmp(teststr, "/foo/bar/proc-0 /foo/bar/proc-123") != 0)
+ return 1;
+ DBFreeNamescheme(ns);
+
/* Test ?:: operator */
ns = DBMakeNamescheme("@foo_%d@(n-5)?14:77:");
if (strcmp(DBGetName(ns, 6), "foo_14") != 0)
@@ -123,7 +148,7 @@ int main()
N[0] = "red";
N[1] = "green";
N[2] = "blue";
- ns = DBMakeNamescheme("Hfoo_%sH$N[n%3]", N);
+ ns = DBMakeNamescheme("Hfoo_%sH$Noodle[n%3]", N);
if (strcmp(DBGetName(ns, 17), "foo_blue") != 0)
return 1;
if (strcmp(DBGetName(ns, 6), "foo_red") != 0)
@@ -153,5 +178,176 @@ int main()
DBFreeNamescheme(ns);
DBFreeNamescheme(ns2);
+ /* Test DBnamescheme construction from arrays in a Silo file */
+ {
+ DBfile *dbfile;
+ int dims[3];
+ int strListLen;
+
+ /* uses same namescheme as above but am placing arrays in different dir
+ relative to where I will place the namesheme */
+ char *ns1 = "@foo_%03dx%03d@#../arr_dir/Place[n]@#../arr_dir/Upper[n%4]";
+ char *ns1r;
+ /* Use absolute path to external array; 'H' is delim char */
+ char *ns2 = "Hfoo_%sH$/arr_dir/Noodle[n%3]";
+ char *ns2r;
+ char *strList;
+ /* use paths relative to the MB mesh object in which the nameschems
+ are embedded */
+ char *ns3 = "|/meshes/mesh1/dom_%s_%d|$../ns_arrays/Noodle[n]|n*2+1";
+ char *ns3r;
+
+ dbfile = DBCreate("namescheme.silo", DB_CLOBBER, DB_LOCAL,
+ "Test namescheme constructor with external arrays in file", driver);
+
+ /* Put the external arrays in arr_dir */
+ DBMkDir(dbfile, "arr_dir");
+ DBSetDir(dbfile, "arr_dir");
+ dims[0] = 100;
+ DBWrite(dbfile, "Place", P, dims, 1, DB_INT);
+ dims[0] = 4;
+ DBWrite(dbfile, "Upper", U, dims, 1, DB_INT);
+ DBStringArrayToStringList(N, 3, &strList, &strListLen);
+ dims[0] = strListLen;
+ DBWrite(dbfile, "Noodle", strList, dims, 1, DB_CHAR);
+ DBSetDir(dbfile, "..");
+
+ DBMkDir(dbfile, "dir_1");
+ DBSetDir(dbfile, "dir_1");
+ dims[0] = strlen(ns1)+1;
+ DBWrite(dbfile, "ns1", ns1, dims, 1, DB_CHAR);
+ DBSetDir(dbfile, "..");
+ DBMkDir(dbfile, "dir_2");
+ DBMkDir(dbfile, "dir_2/dir_3");
+ DBSetDir(dbfile, "/dir_2/dir_3");
+ dims[0] = strlen(ns2)+1;
+ DBWrite(dbfile, "ns2", ns2, dims, 1, DB_CHAR);
+
+ DBSetDir(dbfile, "/");
+ DBMkDir(dbfile, "meshes");
+ DBSetDir(dbfile, "meshes");
+ DBMkDir(dbfile, "ns_arrays");
+ dims[0] = strListLen;
+ DBWrite(dbfile, "ns_arrays/Noodle", strList, dims, 1, DB_CHAR);
+
+ DBMkDir(dbfile, "mesh1");
+ DBSetDir(dbfile, "mesh1");
+ DBMkDir(dbfile, "dom_red_1");
+ DBMkDir(dbfile, "dom_green_3");
+ DBMkDir(dbfile, "dom_blue_5");
+ DBSetDir(dbfile, "dom_red_1");
+ {
+ int ndims = 2;
+ int dims[] = {4,2};
+ float xcoords[] = {0, 1, 2, 3};
+ float ycoords[] = {0, 1};
+ float *coords[2] = {xcoords, ycoords};
+ DBPutQuadmesh(dbfile, "qmesh", 0, coords, dims, ndims, DB_FLOAT, DB_COLLINEAR, 0);
+ }
+ DBSetDir(dbfile, "../dom_green_3");
+ {
+ int ndims = 2;
+ int dims[] = {4,2};
+ float xcoords[] = {0, 1, 2, 3};
+ float ycoords[] = {1, 2};
+ float *coords[2] = {xcoords, ycoords};
+ DBPutQuadmesh(dbfile, "qmesh", 0, coords, dims, ndims, DB_FLOAT, DB_COLLINEAR, 0);
+ }
+ DBSetDir(dbfile, "../dom_blue_5");
+ {
+ int ndims = 2;
+ int dims[] = {4,2};
+ float xcoords[] = {0, 1, 2, 3};
+ float ycoords[] = {2, 3};
+ float *coords[2] = {xcoords, ycoords};
+ DBPutQuadmesh(dbfile, "qmesh", 0, coords, dims, ndims, DB_FLOAT, DB_COLLINEAR, 0);
+ }
+ DBSetDir(dbfile, "..");
+ {
+ int btype = DB_QUADMESH;
+ DBoptlist *optlist = DBMakeOptlist(2);
+ DBAddOption(optlist, DBOPT_MB_BLOCK_NS, ns3);
+ DBAddOption(optlist, DBOPT_MB_BLOCK_TYPE, &btype);
+ DBPutMultimesh(dbfile, "mmesh", 3, 0, 0, optlist);
+ DBFreeOptlist(optlist);
+ }
+ free(strList);
+ DBClose(dbfile);
+
+ dbfile = DBOpen("namescheme.silo", DB_UNKNOWN, DB_READ);
+ DBSetDir(dbfile, "dir_1");
+ ns1r = DBGetVar(dbfile, "ns1");
+
+ /* Use the '0, DBfile*, 0' form of args to constructor */
+ ns = DBMakeNamescheme(ns1r, 0, dbfile, 0);
+
+ /* Ok, lets test the constructed namescheme */
+ if (strcmp(DBGetName(ns, 17), "foo_085x001") != 0)
+ return 1;
+ if (strcmp(DBGetName(ns, 18), "foo_090x004") != 0)
+ return 1;
+ if (strcmp(DBGetName(ns, 19), "foo_095x009") != 0)
+ return 1;
+ if (strcmp(DBGetName(ns, 20), "foo_100x000") != 0)
+ return 1;
+ if (strcmp(DBGetName(ns, 21), "foo_105x001") != 0)
+ return 1;
+ DBFreeNamescheme(ns);
+ free(ns1r);
+
+ DBSetDir(dbfile, "/dir_2/dir_3");
+ ns2r = DBGetVar(dbfile, "ns2");
+
+ /* Use the '0, DBfile*, 0' form of args to constructor */
+ ns = DBMakeNamescheme(ns2r, 0, dbfile, 0);
+
+ if (strcmp(DBGetName(ns, 17), "foo_blue") != 0)
+ return 1;
+ if (strcmp(DBGetName(ns, 6), "foo_red") != 0)
+ return 1;
+ DBFreeNamescheme(ns);
+ free(ns2r);
+
+ /* Test invalid namescheme construction */
+ ns = DBMakeNamescheme("@foo/bar/gorfo_%d@#n");
+ if (ns) return 1;
+ ns = DBMakeNamescheme("@foo/bar/gorfo_%d@#n", 0, dbfile, 0);
+ if (ns) return 1;
+
+ /* Test construction via retrieval from MB object */
+ DBSetDir(dbfile, "/meshes/mesh1");
+ {
+ DBmultimesh *mm = DBGetMultimesh(dbfile, "mmesh");
+ ns = DBMakeNamescheme(mm->block_ns, 0, dbfile, "/meshes/mesh1");
+ if (strcmp(DBGetName(ns, 0), "/meshes/mesh1/dom_red_1") != 0)
+ return 1;
+ if (strcmp(DBGetName(ns, 1), "/meshes/mesh1/dom_green_3") != 0)
+ return 1;
+ if (strcmp(DBGetName(ns, 2), "/meshes/mesh1/dom_blue_5") != 0)
+ return 1;
+ DBFreeNamescheme(ns);
+ DBFreeMultimesh(mm);
+ }
+
+ DBClose(dbfile);
+ }
+
+ /* test namescheme with constant componets */
+ {
+ ns = DBMakeNamescheme("@foo/bar/gorfo_0@");
+ if (strcmp(DBGetName(ns, 0), "foo/bar/gorfo_0") != 0)
+ return 1;
+ if (strcmp(DBGetName(ns, 1), "foo/bar/gorfo_0") != 0)
+ return 1;
+ if (strcmp(DBGetName(ns, 122), "foo/bar/gorfo_0") != 0)
+ return 1;
+ DBFreeNamescheme(ns);
+ }
+
+ /* hackish way to cleanup the circular cache used internally */
+ DBGetName(0,0);
+
+ CleanupDriverStuff();
+
return 0;
}
diff --git a/tests/onehex.c b/tests/onehex.c
index 86b52a0..58357a2 100644
--- a/tests/onehex.c
+++ b/tests/onehex.c
@@ -55,6 +55,8 @@ product endorsement purposes.
#include <string.h>
#include <float.h>
+#define ASSERT(PRED) if(!(PRED)){fprintf(stderr,"Assertion \"%s\" at line %d failed\n",#PRED,__LINE__);abort();}
+
#define IND(i,j) i-1][j-1
#define matrix_assign(matrix,a11,a12,a13,a14,a21,a22,a23,a24,a31,a32,a33,a34,a41,a42,a43,a44) \
@@ -113,9 +115,9 @@ main(int argc, char *argv[])
{
DBfile *dbfile = NULL;
char *coordnames[3];
- float *coords[3];
+ double *coords[3];
int nodelist[8];
- float x[8], y[8], z[8];
+ double x[8], y[8], z[8];
int shapesize[1];
int shapecnt[1];
DBfacelist *facelist = NULL;
@@ -124,7 +126,7 @@ main(int argc, char *argv[])
char mesh_command[256];
float rot1[4][4], rot2[4][4], final[4][4];
float angle;
- float var[8];
+ double var[8];
int driver = DB_PDB;
int setinf = 0;
int setnan = 0;
@@ -213,7 +215,12 @@ main(int argc, char *argv[])
DBSetDir(dbfile, "dir1");
}
else
- dbfile = DBCreate(filename, DB_CLOBBER, DB_LOCAL, "3D ucd hex", driver);
+ dbfile = DBCreate(filename, DB_CLOBBER, DB_LOCAL,
+ "This is a test to see how well this string displays in Qt widget in Silex\n"
+ "This is a test to see how well this string displays in Qt widget in Silex\n"
+ "This is a test to see how well this string displays in Qt widget in Silex\n"
+ "This is a test to see how well this string displays in Qt widget in Silex\n",
+ driver);
/* Ok, now we can safely free the file options sets optlists */
if (core_opts)
@@ -274,7 +281,7 @@ main(int argc, char *argv[])
}
DBPutUcdmesh(dbfile, "hex", 3, coordnames, coords, 8, 1, "zonelist",
- "facelist", DB_FLOAT, NULL);
+ "facelist", DB_DOUBLE, NULL);
matnos[0] = 1;
matlist[0] = 1;
@@ -285,15 +292,18 @@ main(int argc, char *argv[])
if (setinf)
{
- double d = 2.0;
- var[7] = FLT_MAX*d;
+ double d = 1.0;
+ var[7] = d/(d-1.0);
}
if (setnan)
{
- double d = -1.0;
- var[0] = sqrt(d);
+#ifndef _WIN32
+ var[0] = nan("");
+ if (var[0] == 0.0)
+#endif
+ var[0] = sqrt((double)-1.0);
}
- DBPutUcdvar1(dbfile, "v", "hex", var, 8, NULL, 0, DB_FLOAT, DB_NODECENT,
+ DBPutUcdvar1(dbfile, "v", "hex", var, 8, NULL, 0, DB_DOUBLE, DB_NODECENT,
NULL);
nodelist[0] = 0;
diff --git a/tests/oneprism.c b/tests/oneprism.c
index c50cc25..af62b6e 100644
--- a/tests/oneprism.c
+++ b/tests/oneprism.c
@@ -232,6 +232,8 @@ main(int argc, char *argv[])
DBClose(dbfile);
+ DBFreeFacelist(facelist);
+
CleanupDriverStuff();
return (0);
}
diff --git a/tests/onepyramid.c b/tests/onepyramid.c
index 8745aed..1dedd43 100644
--- a/tests/onepyramid.c
+++ b/tests/onepyramid.c
@@ -220,6 +220,8 @@ main(int argc, char *argv[])
DBClose(dbfile);
+ DBFreeFacelist(facelist);
+
CleanupDriverStuff();
return (0);
}
diff --git a/tests/onetet.c b/tests/onetet.c
index 0aea943..85870b4 100644
--- a/tests/onetet.c
+++ b/tests/onetet.c
@@ -218,6 +218,8 @@ main(int argc, char *argv[])
DBClose(dbfile);
+ DBFreeFacelist(facelist);
+
CleanupDriverStuff();
return (0);
}
diff --git a/tests/package.m4 b/tests/package.m4
index 42c40bd..58930a5 100644
--- a/tests/package.m4
+++ b/tests/package.m4
@@ -1,6 +1,6 @@
# Signature of the current package.
m4_define([AT_PACKAGE_NAME], [silo])
m4_define([AT_PACKAGE_TARNAME], [silo])
-m4_define([AT_PACKAGE_VERSION], [4.8])
-m4_define([AT_PACKAGE_STRING], [silo 4.8])
+m4_define([AT_PACKAGE_VERSION], [4.9.1])
+m4_define([AT_PACKAGE_STRING], [silo 4.9.1])
m4_define([AT_PACKAGE_BUGREPORT], [visit-users at email.ornl.gov])
diff --git a/tests/pdbtst.c b/tests/pdbtst.c
new file mode 100644
index 0000000..18c2458
--- /dev/null
+++ b/tests/pdbtst.c
@@ -0,0 +1,4203 @@
+/*
+Copyright (c) 2010, Lawrence Livermore National Security, LLC.
+Produced at the Lawrence Livermore National Laboratory
+Written by Stewart Brown (brown50 at llnl.gov).
+CODE-422942.
+All rights reserved.
+
+This file was adapted for PDB Lite from the 11_09_21 version of
+PACT by Mark Miller (miller86 at llnl.gov). For details on PACT, see
+pact.llnl.gov
+
+This file is part of Silo. For details, see silo.llnl.gov.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the disclaimer below.
+ * Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the disclaimer (as noted
+ below) in the documentation and/or other materials provided with
+ the distribution.
+ * Neither the name of the LLNS/LLNL nor the names of its
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL LAWRENCE
+LIVERMORE NATIONAL SECURITY, LLC, THE U.S. DEPARTMENT OF ENERGY OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+This work was produced at Lawrence Livermore National Laboratory under
+Contract No. DE-AC52-07NA27344 with the DOE. Neither the United
+States Government nor Lawrence Livermore National Security, LLC nor
+any of their employees, makes any warranty, express or implied, or
+assumes any liability or responsibility for the accuracy,
+completeness, or usefulness of any information, apparatus, product, or
+process disclosed, or represents that its use would not infringe
+privately-owned rights. Any reference herein to any specific
+commercial products, process, or services by trade name, trademark,
+manufacturer or otherwise does not necessarily constitute or imply its
+endorsement, recommendation, or favoring by the United States
+Government or Lawrence Livermore National Security, LLC. The views and
+opinions of authors expressed herein do not necessarily state or
+reflect those of the United States Government or Lawrence Livermore
+National Security, LLC, and shall not be used for advertising or
+product endorsement purposes.
+*/
+
+/*
+Mark C. Miller, Wed Dec 19 20:06:37 PST 2012
+This file was taken from the 11_09_21 version of PACT and adpated to
+be used as a test of PDB Lite, part of the Silo library. To the
+extent possible, the adaption here was to retain the original code
+and intentions of tests as much as possible and use the CPP to re-map
+any methods from the original code to their equivalents in PDB Lite.
+In cases where there were no equivalents, a few different strategies
+were employed...
+ * Existing functionality was disabled; this works fine for cosmetic
+ things such as memory utilization and performance tracking as
+ similar data can be obtained from tools like valgrind.
+ * Customized alternative methods were coded here in this file.
+ * The logic of the original test was altered slightly.
+ * Some tests were completely disabled.
+There is no "lite_" pre-pending any symbol names here becasue part of
+the intention of this test is to test the exported lite_pdb.h and
+lite_score.h header files. Those files included CPP macros to remap
+PDB Proper symbol names to their PDB Lite equivalents.
+
+In some tests, we leak memory for certain data ('ca' in test 2 and
+'tab4_r' in test 4.
+
+Note that in PDB Lite, by default, we compile it with a reduced SCORE
+memory header to save memory useage for some libraries. Nonetheless,
+this test will passes with these reduced SCORE headers. If you are
+running into problems with this test, you can always re-configure to
+--enable-normal-sclite-mem-headers and see if that fixes the problems.
+*/
+#ifdef PDB_LITE
+
+#include <lite_pdb.h>
+
+#include <assert.h>
+#include <dirent.h>
+#include <math.h>
+#include <signal.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/stat.h>
+#include <sys/time.h>
+#include <sys/types.h>
+#include <unistd.h>
+
+/* Constant and macro definitions taken from PDB proper */
+#define SC_HA_NAME_KEY "by-name"
+#define N_PRIMITIVE_FP 2 /* float and double but not long double */
+#define PD_MD5_FILE 1
+#define TOLERANCE 1.0e-10
+#define SMALL 1.0e-100
+#define ABS fabs
+#define min(a, b) ((a) < (b) ? (a) : (b))
+
+/* Typename differences between PDB proper and PDB Lite */
+#define hasharr HASHTAB
+#define hasharrstr "hashtab"
+#define haelem hashel
+#define haelemstr "hashel"
+
+/* Methods mapped to PDB Lite / SCORE Lite (or system) equivalents */
+#define SC_hasharr_dump(A,B,C,D) SC_dump_hash(A,B,D)
+#define SC_hasharr_get_n(A) (A->nelements)
+#define SC_hasharr_def_lookup(A,B) SC_def_lookup(B,A)
+#define SC_make_hasharr(A, B, C, D) SC_make_hash_table(A,B)
+#define SC_hasharr_install(A, B, C, D, E, F) SC_install(B, C, D, A)
+#define SC_free_hasharr(A, B, C) SC_rl_hash_table(A)
+#define PD_target_n_platforms() NSTD
+#define _PD_lookup_size _lite_PD_lookup_size
+#define SC_ASSERT assert
+#define SC_signal signal
+#define SC_VA_START(A) va_list ap; va_start(ap, A);
+#define SC_VSNPRINTF(A,B,C) vsnprintf(A,B,C,ap);
+#define SC_VA_END va_end(ap);
+#define SC_sleep sleep
+#define STDOUT stdout
+#define CSTRSAVE(A) SC_strsavef(A,foo_str())
+#define CFREE SFREE
+#define REMOVE unlink
+#define POW pow
+#ifdef PRINT
+#undef PRINT
+#define PRINT fprintf
+#endif
+#define CMAKE(A) FMAKE(A,foo_str())
+#define CMAKE_N(A,B) FMAKE_N(A,B,foo_str())
+
+/* Methods mapped to customized equivalents coded here in this file */
+#define SC_free_strings free_strings
+#define SC_wall_clock_time wall_clock_time
+#define PD_fp_toler fp_toler
+#define PD_def_hash_types(A,B) def_hash_types(A)
+#define PD_target_platform target_platform
+#define PD_target_platform_n target_platform_n
+#define PD_target_platform_name target_platform_name
+
+/* Methods completely disabled here */
+#define SC_bf_set_hooks() /*void*/
+#define SC_zero_space_n(A,B) /*void*/
+#define SC_mem_stats(A,B,C,D) /*void*/
+#define SC_mem_monitor(A,B,C,D) /*void*/0
+#define PD_init_threads(A,B) /*void*/
+#define PD_read_as_dwim(A,B,C,D,E) /*void*/1
+#define PD_activate_cksum(A,B) /*void*/
+#define PD_verify(A) /*void*/0
+#define PD_verify_writes(A) /*void*/
+#define PD_set_io_hooks(A) /*void*/
+#define PD_open_vif(A) /*void*/
+#define PD_set_fmt_version(A) /*void*/
+#define PD_set_track_pointers(A,B) /*void*/
+#define PD_set_buffer_size(A) /*void*/
+#define SC_hasharr_rekey(A,B) /*void*/
+
+static int last = 0;
+
+/* ensures the tag names used in SCORE allocations are unique */
+static char *foo_str()
+{
+ static char retval[32];
+ static int i = 0;
+ sprintf(retval, "foo%d", i++);
+ return retval;
+}
+
+static void free_strings(char **strs)
+{
+ int i = 0;
+ if (!strs) return;
+ SFREE(strs);
+}
+
+static double wall_clock_time()
+{
+ struct timeval tv;
+ gettimeofday(&tv, 0);
+ return (double) tv.tv_sec + (double) tv.tv_usec / 1e+6;
+}
+
+static int target_platform_n(int i) {return 1;};
+
+static char *target_platform_name(int i)
+{
+ switch (i)
+ {
+ case 1: return "IEEE_32_64";
+ case 2: return "INTEL_X86";
+ case 3: return "CRAY_64";
+ case 4: return "VAX_11";
+ case 6: return "IEEE_32_96";
+ default: return "default";
+ }
+}
+
+static int target_platform(const char *tgt)
+{
+ if (!strcmp(tgt, "IEEE_32_64"))
+ return PD_target(&lite_IEEEA_STD, &lite_M68000_ALIGNMENT);
+ else if (!strcmp(tgt, "IEEE_32_96"))
+ return PD_target(&lite_IEEEB_STD, &lite_M68000_ALIGNMENT);
+ else if (!strcmp(tgt, "INTEL_X86"))
+ return PD_target(&lite_INTELA_STD, &lite_INTELA_ALIGNMENT);
+ else if (!strcmp(tgt, "CRAY_64"))
+ return PD_target(&lite_CRAY_STD, &lite_UNICOS_ALIGNMENT);
+ else if (!strcmp(tgt, "VAX_11"))
+ return PD_target(&lite_VAX_STD, &lite_DEF_ALIGNMENT);
+ else
+ return PD_target(&lite_DEF_STD, &lite_DEF_ALIGNMENT);
+}
+
+static void fp_toler(PDBfile *file, long double *fptol)
+ {int i, fpmn[N_PRIMITIVE_FP];
+ data_standard *fstd, *hstd;
+ long *fformat, *hformat;
+
+ fstd = file->std;
+ hstd = file->host_std;
+
+ for (i = 0; i < N_PRIMITIVE_FP; i++)
+ {
+ switch (i)
+ {
+ case 0:
+ fformat = fstd->float_format;
+ hformat = hstd->float_format;
+ break;
+ case 1:
+ fformat = fstd->double_format;
+ hformat = hstd->double_format;
+ break;
+ }
+
+ {fpmn[i] = min(fformat[2], hformat[2]);
+ fptol[i] = powl(2.0, -((long double) fpmn[i]));};
+ }
+
+ return;}
+
+/* taken directly from PDB in PACT December, 2012 */
+static int PM_value_compare(double x1, double x2, double tol)
+ {int rv;
+ double dx;
+
+ if (tol < 0.0)
+ tol = TOLERANCE;
+
+ dx = (x1 - x2)/(ABS(x1) + ABS(x2) + SMALL);
+ if (dx < -tol)
+ rv = -1;
+ else if (tol < dx)
+ rv = 1;
+ else
+ rv = 0;
+
+ return(rv);}
+
+static int def_hash_types(PDBfile *file)
+{
+ PD_defstr(file, haelemstr,
+ "char *name",
+ "char *type",
+ "char *def",
+ "hashel *next",
+ LAST);
+
+ PD_defstr(file, hasharrstr,
+ "int size",
+ "int nelements",
+ "int docp",
+ "hashel **table",
+ LAST);
+}
+
+
+#else
+
+#include <pdb.h>
+#define hasharrstr "hasharr"
+#define haelemstr "hashel"
+
+#endif
+
+#define DATDIR "pdbtst-data"
+#define DATFILE "nat"
+
+#define N_DOUBLE 3
+#define N_INT 5
+#define N_CHAR 10
+#define N_FLOAT 4
+
+#define FLOAT_EQUAL(d1, d2) (PM_value_compare(d1, d2, fptol[0]) == 0)
+#define DOUBLE_EQUAL(d1, d2) (PM_value_compare(d1, d2, fptol[1]) == 0)
+
+struct s_l_frame
+ {float x_min;
+ float x_max;
+ float y_min;
+ float y_max;};
+
+typedef struct s_l_frame l_frame;
+
+struct s_plot
+ {float x_axis[N_CHAR];
+ float y_axis[N_CHAR];
+ int npts;
+ char *label;
+ l_frame view;};
+
+typedef struct s_plot plot;
+
+struct s_lev2
+ {char **s;
+ int type;};
+
+typedef struct s_lev2 lev2;
+
+struct s_lev1
+ {int *a;
+ double *b;
+ lev2 *c;};
+
+typedef struct s_lev1 lev1;
+
+struct s_st3
+ {char a;
+ short b;
+ char c[2];
+ int d;
+ char e[3];
+ float f;
+ char g[4];
+ double h;
+ char i[5];
+ char *j;
+ char k[6];};
+
+typedef struct s_st3 st3;
+
+struct s_st4
+ {short a;
+ char b;};
+
+typedef struct s_st4 st4;
+
+struct s_st61
+ {int n;
+ double a[10];};
+
+typedef struct s_st61 st61;
+
+struct s_st62
+ {int n;
+ double *a;};
+
+typedef struct s_st62 st62;
+
+typedef int (*PFTest)(char *base, char *tgt, int n);
+
+extern long _PD_lookup_size(char *s, hasharr *tab);
+
+static st61
+ *d61_w = NULL;
+
+static st62
+ *d62_w = NULL;
+
+static st62
+ d71_w,
+ d71_w_save,
+ d72_w,
+ d71_r,
+ d72_r;
+
+static st4
+ *vr4_w,
+ *vr4_r;
+
+static st3
+ vr1_w,
+ vr1_r;
+
+static lev1
+ tar5_t[4],
+ tar5_r[4],
+ *tar_r,
+ *tar_w;
+
+static hasharr
+ *tab4_r,
+ *tab4_w;
+
+static char
+ *CHAR_S,
+ *SHORT_S,
+ *INT_S,
+ *LONG_S,
+ *FLOAT_S,
+ *DOUBLE_S,
+ *HASHEL_S,
+ cs_w,
+ cs_r,
+ ca_w[N_CHAR],
+ ca_r[N_CHAR],
+ *cap_w[N_DOUBLE],
+ *cap_r[N_DOUBLE];
+
+static short
+ ss_w,
+ ss_r,
+ sa_w[N_INT],
+ sa_r[N_INT];
+
+static int
+ debug_mode = FALSE,
+ native_only = FALSE,
+ read_only = FALSE,
+ is_w,
+ is_r,
+ ia_w[N_INT],
+ ia_r[N_INT],
+ do_r,
+ do_w,
+ p_w[N_INT],
+ p_r[N_INT],
+ len;
+
+static float
+ d61_a[10],
+ d62_a[10],
+ d62_s[8],
+ fs_w,
+ fs_r,
+ fs_app_w,
+ fs_app_r,
+ fs_p1_r,
+ fs_p2_r,
+ fs_p3_r,
+ fa1_r[N_FLOAT],
+ fa2_w[N_FLOAT][N_DOUBLE],
+ fa2_r[N_FLOAT][N_DOUBLE],
+ fa2_app_w[N_FLOAT][N_DOUBLE],
+ fa2_app_r[N_FLOAT][N_DOUBLE];
+
+static double
+ ds_w,
+ ds_r,
+ da_w[N_FLOAT],
+ da_r[N_FLOAT],
+ *d8_w,
+ *d8a_r,
+ *d8b_r,
+ *d8c_r,
+ *d8d_r;
+
+#ifdef HAVE_ANSI_FLOAT16
+
+static long double
+ qs_w,
+ qs_r,
+ qa_w[N_FLOAT],
+ qa_r[N_FLOAT];
+
+#endif
+
+static plot
+ graph_w,
+ graph_r;
+
+static l_frame
+ view_w,
+ view_r;
+
+/* variables for partial and member reads in test #2 */
+
+static int
+ *ap1,
+ *ap2,
+ aa[4];
+
+static double
+ *bp1,
+ *bp2,
+ ba[4];
+
+static lev2
+ *cp1,
+ *cp2,
+ ca[4];
+
+static char
+ **sp1,
+ **sp2,
+ **sp3,
+ **sp4,
+ *tp1,
+ *tp2,
+ *tp3,
+ *tp4,
+ *tp5,
+ *tp6,
+ *tp7,
+ *tp8,
+ ta[8];
+
+/*--------------------------------------------------------------------------*/
+
+/* GENERAL PURPOSE ROUTINES */
+
+/*--------------------------------------------------------------------------*/
+
+/* TEST_TARGET - set up the target for the data file */
+
+static void test_target(char *tgt, char *base, int n,
+ char *fname, char *datfile)
+ {int rv;
+
+ if (tgt != NULL)
+ {rv = PD_target_platform(tgt);
+ SC_ASSERT(rv == TRUE);
+
+ sprintf(fname, "%s-%s.rs%d", base, tgt, n);
+ sprintf(datfile, "%s-%s.db%d", base, tgt, n);}
+
+ else
+ {sprintf(fname, "%s-nat.rs%d", base, n);
+ sprintf(datfile, "%s-nat.db%d", base, n);};
+
+ return;}
+
+/*--------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------*/
+
+/* DUMP_TEST_SYMBOL_TABLE - dump the symbol table */
+
+static void dump_test_symbol_table(FILE *fp, hasharr *tab, int n)
+ {int i, ne;
+ char **names;
+
+ PRINT(fp, "\nTest %d Symbol table:\n", n);
+
+ ne = SC_hasharr_get_n(tab);
+ names = SC_hasharr_dump(tab, NULL, NULL, FALSE);
+ for (i = 0; i < ne; i++)
+ PRINT(fp, "%s\n", names[i]);
+ SC_free_strings(names);
+
+ PRINT(fp, "\n");
+
+ return;}
+
+/*--------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------*/
+
+/* ERROR - get out on an error */
+
+static void error(int n, FILE *fp, char *fmt, ...)
+ {char t[MAXLINE];
+
+ SC_VA_START(fmt);
+ SC_VSNPRINTF(t, MAXLINE, fmt);
+ SC_VA_END;
+
+ io_printf(fp, "%s", t);
+
+ exit(1);
+
+ return;}
+
+/*--------------------------------------------------------------------------*/
+
+/* TEST #0 ROUTINES */
+
+/*--------------------------------------------------------------------------*/
+
+/* PRINT_TEST_0_DATA - print it out to STDOUT */
+
+static void print_test_0_data(PDBfile *strm, FILE *fp)
+ {int nbp;
+
+/* print scalars */
+ nbp = _PD_lookup_size("char", strm->chart);
+ PRINT(fp, "size(char) = %d\n", nbp);
+
+ nbp = _PD_lookup_size("short", strm->chart);
+ PRINT(fp, "size(short) = %d\n", nbp);
+
+ nbp = _PD_lookup_size("int", strm->chart);
+ PRINT(fp, "size(int) = %d\n", nbp);
+
+ nbp = _PD_lookup_size("long", strm->chart);
+ PRINT(fp, "size(long) = %d\n", nbp);
+
+ nbp = _PD_lookup_size("long_long", strm->chart);
+ PRINT(fp, "size(long_long) = %d\n", nbp);
+
+ nbp = _PD_lookup_size("float", strm->chart);
+ PRINT(fp, "size(float) = %d\n", nbp);
+
+ nbp = _PD_lookup_size("double", strm->chart);
+ PRINT(fp, "size(double) = %d\n", nbp);
+
+#ifdef HAVE_ANSI_FLOAT16
+ nbp = _PD_lookup_size("long_double", strm->chart);
+ PRINT(fp, "size(long double) = %d\n", nbp);
+#endif
+
+ nbp = _PD_lookup_size("*", strm->chart);
+ PRINT(fp, "size(char *) = %d\n", nbp);
+
+ PRINT(fp, "\n");
+
+/* whole struct test */
+ nbp = _PD_lookup_size("l_frame", strm->chart);
+ PRINT(fp, "size(l_frame) = %d\n", nbp);
+
+ nbp = _PD_lookup_size("plot", strm->chart);
+ PRINT(fp, "size(plot) = %d\n", nbp);
+
+ PRINT(fp, "\n");
+
+ return;}
+
+/*--------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------*/
+
+/* COMPARE_TEST_0_DATA - compare the test data */
+
+static int compare_test_0_data(PDBfile *strm, FILE *fp)
+ {int nbp, nbc, err, err_tot;
+
+ err = TRUE;
+ err_tot = TRUE;
+
+/* compare primitive types */
+ nbp = _PD_lookup_size("char", strm->host_chart);
+ nbc = sizeof(char);
+ err &= (nbp == nbc);
+
+ nbp = _PD_lookup_size("short", strm->host_chart);
+ nbc = sizeof(short);
+ err &= (nbp == nbc);
+
+ nbp = _PD_lookup_size("int", strm->host_chart);
+ nbc = sizeof(int);
+ err &= (nbp == nbc);
+
+ nbp = _PD_lookup_size("long", strm->host_chart);
+ nbc = sizeof(long);
+ err &= (nbp == nbc);
+
+ nbp = _PD_lookup_size("long_long", strm->host_chart);
+ nbc = sizeof(int64_t);
+ err &= (nbp == nbc);
+
+ nbp = _PD_lookup_size("float", strm->host_chart);
+ nbc = sizeof(float);
+ err &= (nbp == nbc);
+
+ nbp = _PD_lookup_size("double", strm->host_chart);
+ nbc = sizeof(double);
+ err &= (nbp == nbc);
+
+#ifdef HAVE_ANSI_FLOAT16
+ nbp = _PD_lookup_size("long_double", strm->host_chart);
+ nbc = sizeof(long double);
+ err &= (nbp == nbc);
+#endif
+
+ nbp = _PD_lookup_size("*", strm->host_chart);
+ nbc = sizeof(char *);
+ err &= (nbp == nbc);
+
+ if (err)
+ PRINT(fp, "Primitive types compare\n");
+ else
+ PRINT(fp, "Primitive types differ\n");
+ err_tot &= err;
+
+/* compare structures */
+ nbp = _PD_lookup_size("l_frame", strm->host_chart);
+ nbc = sizeof(l_frame);
+ err &= (nbp == nbc);
+
+ nbp = _PD_lookup_size("plot", strm->host_chart);
+ nbc = sizeof(plot);
+ err &= (nbp == nbc);
+
+ if (err)
+ PRINT(fp, "Structs compare\n");
+ else
+ PRINT(fp, "Structs differ\n");
+ err_tot &= err;
+
+ return(err_tot);}
+
+/*--------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------*/
+
+/* TEST_0 - test PDB calculation of type and struct sizes */
+
+static int test_0(char *base, char *tgt, int n)
+ {int err;
+ char datfile[MAXLINE], fname[MAXLINE];
+ PDBfile *strm;
+ FILE *fp;
+
+/* target the file as asked */
+ test_target(tgt, base, n, fname, datfile);
+
+ fp = io_open(fname, "w");
+
+/* create the named file */
+ strm = PD_create(datfile);
+ if (strm == NULL)
+ error(1, fp, "Test couldn't create file %s\r\n", datfile);
+
+ PRINT(fp, "File %s created\n", datfile);
+
+/* make a few defstructs */
+ PD_defstr(strm, "l_frame",
+ "float x_min",
+ "float x_max",
+ "float y_min",
+ "float y_max",
+ LAST);
+
+ PD_defstr(strm, "plot",
+ "float x_axis(10)",
+ "float y_axis(10)",
+ "integer npts",
+ "char * label",
+ "l_frame view",
+ LAST);
+
+/* compare the original data with that read in */
+ err = compare_test_0_data(strm, fp);
+
+/* print it out to STDOUT */
+ print_test_0_data(strm, fp);
+
+/* close the file */
+ if (PD_close(strm) == FALSE)
+ error(1, fp, "Test couldn't close file %s\r\n", datfile);
+
+ PRINT(fp, "File %s closed\n", datfile);
+
+ io_close(fp);
+
+ return(err);}
+
+/*--------------------------------------------------------------------------*/
+
+/* TEST #1 ROUTINES */
+
+/*--------------------------------------------------------------------------*/
+
+/* PREP_TEST_1_DATA - prepare the test data */
+
+static void prep_test_1_data(void)
+ {int i, k;
+
+/* set scalars */
+ cs_r = 0;
+ ss_r = 0;
+ is_r = 0;
+ fs_r = 0.0;
+ fs_p1_r = 0.0;
+ fs_p2_r = 0.0;
+ fs_p3_r = 0.0;
+ ds_r = 0.0;
+
+ cs_w = 'Q';
+ ss_w = -514;
+ is_w = 10;
+ fs_w = 3.14159;
+ fs_app_w = -3.14159;
+ ds_w = exp(1.0);
+
+/* set char array */
+ for (i = 0; i < N_CHAR; i++)
+ {ca_w[i] = '\0';
+ ca_r[i] = '\0';};
+
+/* set short array */
+ for (i = 0; i < N_INT; i++)
+ {sa_w[i] = 2 - i;
+ sa_r[i] = 0;};
+
+/* set int array */
+ for (i = 0; i < N_INT; i++)
+ {ia_w[i] = i - 2;
+ ia_r[i] = 0;};
+
+/* set float array */
+ for (i = 0; i < N_FLOAT; i++)
+ for (k = 0; k < N_DOUBLE; k++)
+ {fa2_w[i][k] = POW((double) (i+1), (double) (k+1));
+ fa2_app_w[i][k] = POW((double) (k+1), (double) (i+1));
+ fa2_r[i][k] = 0.0;
+ fa2_app_r[i][k] = 0.0;};
+
+/* set double array */
+ for (i = 0; i < N_FLOAT; i++)
+ {da_w[i] = POW(ds_w, (double) (i+1));
+ da_r[i] = 0.0;};
+
+/* set strings */
+ strcpy(ca_w, "Hi there!");
+ len = strlen(ca_w) + 1;
+
+ cap_w[0] = CSTRSAVE("lev1");
+ cap_w[1] = CSTRSAVE("lev2");
+ cap_w[2] = CSTRSAVE("tar fu blat");
+ cap_r[0] = NULL;
+ cap_r[1] = NULL;
+ cap_r[2] = NULL;
+
+/* set structures */
+ for (i = 0; i < N_CHAR; i++)
+ {graph_w.x_axis[i] = ((float) i)/10.0;
+ graph_w.y_axis[i] = 0.5 - graph_w.x_axis[i];
+ graph_r.x_axis[i] = -1000.0;
+ graph_r.y_axis[i] = -1000.0;};
+
+ view_w.x_min = 0.1;
+ view_w.x_max = 1.0;
+ view_w.y_min = -0.5;
+ view_w.y_max = 0.5;
+
+ view_r.x_min = -1.e-10;
+ view_r.x_max = -1.e-10;
+ view_r.y_min = -1.e-10;
+ view_r.y_max = -1.e-10;
+
+ graph_w.npts = N_CHAR;
+ graph_w.label = CSTRSAVE("test graph");
+ graph_w.view = view_w;
+
+ graph_r.npts = 0;
+ graph_r.label = NULL;
+
+ graph_r.view.x_min = -1.e-10;
+ graph_r.view.x_max = -1.e-10;
+ graph_r.view.y_min = -1.e-10;
+ graph_r.view.y_max = -1.e-10;
+
+ return;}
+
+/*--------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------*/
+
+/* CLEANUP_TEST_1 - free all known test data memory */
+
+static void cleanup_test_1(void)
+ {
+
+ CFREE(cap_w[0]);
+ CFREE(cap_w[1]);
+ CFREE(cap_w[2]);
+
+ CFREE(cap_r[0]);
+ CFREE(cap_r[1]);
+ CFREE(cap_r[2]);
+
+ CFREE(graph_w.label);
+ CFREE(graph_r.label);
+
+ return;}
+
+/*--------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------*/
+
+/* WRITE_TEST_1_DATA - write out the data into the PDB file */
+
+static void write_test_1_data(PDBfile *strm)
+ {long ind[6];
+
+/* write scalars into the file */
+ if (PD_write(strm, "cs", "char", &cs_w) == 0)
+ error(1, STDOUT, "CS WRITE FAILED - WRITE_TEST_1_DATA\n");
+ if (PD_write(strm, "ss", "short", &ss_w) == 0)
+ error(1, STDOUT, "SS WRITE FAILED - WRITE_TEST_1_DATA\n");
+ if (PD_write(strm, "is", "integer", &is_w) == 0)
+ error(1, STDOUT, "IS WRITE FAILED - WRITE_TEST_1_DATA\n");
+ if (PD_write(strm, "fs", "float", &fs_w) == 0)
+ error(1, STDOUT, "FS WRITE FAILED - WRITE_TEST_1_DATA\n");
+ if (PD_write(strm, "ds", "double", &ds_w) == 0)
+ error(1, STDOUT, "DS WRITE FAILED - WRITE_TEST_1_DATA\n");
+
+/* write primitive arrays into the file */
+ ind[0] = 0L;
+ ind[1] = len - 1;
+ ind[2] = 1L;
+ if (PD_write_alt(strm, "ca", "char", ca_w, 1, ind) == 0)
+ error(1, STDOUT, "CA WRITE FAILED - WRITE_TEST_1_DATA\n");
+ if (PD_write(strm, "sa(5)", "short", sa_w) == 0)
+ error(1, STDOUT, "SA WRITE FAILED - WRITE_TEST_1_DATA\n");
+ if (PD_write(strm, "ia(5)", "integer", ia_w) == 0)
+ error(1, STDOUT, "IA WRITE FAILED - WRITE_TEST_1_DATA\n");
+
+ ind[0] = 0L;
+ ind[1] = N_FLOAT - 1;
+ ind[2] = 1L;
+ ind[3] = 0L;
+ ind[4] = N_DOUBLE - 1;
+ ind[5] = 1L;
+ if (PD_write_alt(strm, "fa2", "float", fa2_w, 2, ind) == 0)
+ error(1, STDOUT, "FA2 WRITE FAILED - WRITE_TEST_1_DATA\n");
+
+ ind[0] = 0L;
+ ind[1] = N_FLOAT - 1;
+ ind[2] = 1L;
+ if (PD_write_alt(strm, "da", "double", da_w, 1, ind) == 0)
+ error(1, STDOUT, "DA WRITE FAILED - WRITE_TEST_1_DATA\n");
+
+ ind[0] = 0L;
+ ind[1] = N_DOUBLE - 1;
+ ind[2] = 1L;
+ if (PD_write_alt(strm, "cap", "char *", cap_w, 1, ind) == 0)
+ error(1, STDOUT, "CAP WRITE FAILED - WRITE_TEST_1_DATA\n");
+
+/* write structures into the file */
+ if (PD_write(strm, "view", "l_frame", &view_w) == 0)
+ error(1, STDOUT, "VIEW WRITE FAILED - WRITE_TEST_1_DATA\n");
+
+ if (PD_write(strm, "graph", "plot", &graph_w) == 0)
+ error(1, STDOUT, "GRAPH WRITE FAILED - WRITE_TEST_1_DATA\n");
+
+ return;}
+
+/*--------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------*/
+
+/* APPEND_TEST_1_DATA - append some test data to the file */
+
+static void append_test_1_data(PDBfile *strm)
+ {long ind[6];
+
+ if (PD_write(strm, "fs_app", "float", &fs_app_w) == 0)
+ error(1, STDOUT, "FS_APP WRITE FAILED - APPEND_TEST_1_DATA\n");
+
+ ind[0] = 0L;
+ ind[1] = N_FLOAT - 1;
+ ind[2] = 1L;
+ ind[3] = 0L;
+ ind[4] = N_DOUBLE - 1;
+ ind[5] = 1L;
+ if (PD_write_alt(strm, "fa2_app", "float", fa2_app_w, 2, ind) == 0)
+ error(1, STDOUT, "FA2_APP WRITE FAILED - APPEND_TEST_1_DATA\n");
+
+ return;}
+
+/*--------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------*/
+
+/* READ_TEST_1_DATA - read the test data from the file */
+
+static int read_test_1_data(PDBfile *strm)
+ {int err;
+ long ind[6];
+
+/* read the scalar data from the file */
+ err = PD_read(strm, "cs", &cs_r);
+ err = PD_read(strm, "ss", &ss_r);
+ err = PD_read(strm, "is", &is_r);
+ err = PD_read(strm, "fs", &fs_r);
+ err = PD_read(strm, "ds", &ds_r);
+
+/* read the primitive arrays from the file */
+ err = PD_read(strm, "ca", ca_r);
+ err = PD_read(strm, "sa", sa_r);
+ err = PD_read(strm, "ia", ia_r);
+ err = PD_read(strm, "fa2", fa2_r);
+ err = PD_read(strm, "da", da_r);
+ err = PD_read(strm, "cap", cap_r);
+
+/* read the entire structures from the file */
+ err = PD_read(strm, "view", &view_r);
+ err = PD_read(strm, "graph", &graph_r);
+
+/* read the appended data from the file */
+ err = PD_read(strm, "fs_app", &fs_app_r);
+ err = PD_read(strm, "fa2_app", fa2_app_r);
+
+/* partial array read */
+ ind[0] = 1;
+ ind[1] = 2;
+ ind[2] = 1;
+ ind[3] = 0;
+ ind[4] = 1;
+ ind[5] = 1;
+ err = PD_read_alt(strm, "fa2", fa1_r, ind);
+
+/* struct member test */
+ ind[0] = 8;
+ ind[1] = 8;
+ ind[2] = 1;
+ err = PD_read_alt(strm, "graph.x_axis", &fs_p1_r, ind);
+ err = PD_read( strm, "graph.view.x_max", &fs_p2_r);
+ err = PD_read( strm, "view.y_max", &fs_p3_r);
+
+ return(err);}
+
+/*--------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------*/
+
+/* PRINT_TEST_1_DATA - print it out to STDOUT */
+
+static void print_test_1_data(FILE *fp)
+ {int i, k;
+
+/* print scalars */
+ PRINT(fp, "short scalar: ss = %d\n", ss_r);
+ PRINT(fp, "integer scalar: is = %d\n", is_r);
+ PRINT(fp, "float scalar: fs = %14.6e\n", fs_r);
+ PRINT(fp, "double scalar: ds = %14.6e\n", ds_r);
+
+ PRINT(fp, "\n");
+
+/* print char array */
+ PRINT(fp, "static char array:\n ca = %s\n", ca_r);
+
+/* print short array */
+ PRINT(fp, "short array:\n");
+ for (i = 0; i < N_INT; i++)
+ PRINT(fp, " sa[%d] = %d\n", i, sa_r[i]);
+
+/* print int array */
+ PRINT(fp, "integer array:\n");
+ for (i = 0; i < N_INT; i++)
+ PRINT(fp, " ia[%d] = %d\n", i, ia_r[i]);
+
+/* print float array */
+ PRINT(fp, "float array:\n");
+ for (i = 0; i < N_FLOAT; i++)
+ for (k = 0; k < N_DOUBLE; k++)
+ PRINT(fp, " fa2[%d][%d] = %14.6e\n", i, k, fa2_r[i][k]);
+
+/* print double array */
+ PRINT(fp, "double array:\n");
+ for (i = 0; i < N_FLOAT; i++)
+ PRINT(fp, " da[%d] = %14.6e\n", i, da_r[i]);
+
+/* print character pointer array */
+ PRINT(fp, "string array:\n");
+ for (i = 0; i < N_DOUBLE; i++)
+ PRINT(fp, " cap[%d] = %s\n", i, cap_r[i]);
+
+ PRINT(fp, "\n");
+
+/* print appended scalars */
+ PRINT(fp, "appended float scalar: fs_app = %14.6e\n", fs_app_r);
+
+/* print float array */
+ PRINT(fp, "appended float array:\n");
+ for (i = 0; i < N_FLOAT; i++)
+ for (k = 0; k < N_DOUBLE; k++)
+ PRINT(fp, " fa2_app[%d][%d] = %14.6e\n",
+ i, k, fa2_app_r[i][k]);
+
+ PRINT(fp, "\n");
+
+/* whole struct test */
+ PRINT(fp, "struct view:\n");
+ PRINT(fp, " x-min = %14.6e\n", view_r.x_min);
+ PRINT(fp, " x-max = %14.6e\n", view_r.x_max);
+ PRINT(fp, " y-min = %14.6e\n", view_r.y_min);
+ PRINT(fp, " y-max = %14.6e\n", view_r.y_max);
+
+ PRINT(fp, "\n");
+
+ PRINT(fp, "struct graph:\n");
+ PRINT(fp, " #pts = %d\n", graph_r.npts);
+ PRINT(fp, " x-min = %14.6e\n", graph_r.view.x_min);
+ PRINT(fp, " x-max = %14.6e\n", graph_r.view.x_max);
+ PRINT(fp, " y-min = %14.6e\n", graph_r.view.y_min);
+ PRINT(fp, " y-max = %14.6e\n", graph_r.view.y_max);
+
+ PRINT(fp, " x values y values\n");
+ for (i = 0; i < N_CHAR; i++)
+ PRINT(fp, " %14.6e %14.6e\n",
+ graph_r.x_axis[i], graph_r.y_axis[i]);
+
+ PRINT(fp, "\n");
+
+/* partial read single elements */
+ PRINT(fp, "\npartial read scalars:\n");
+ PRINT(fp, " graph.x_axis[8] = %14.6e\n", fs_p1_r);
+ PRINT(fp, " graph.view.x_max = %14.6e\n", fs_p2_r);
+ PRINT(fp, " view.y_max = %14.6e\n", fs_p3_r);
+
+ PRINT(fp, "\n");
+
+/* partial read arrays */
+ PRINT(fp, "partial read float array:\n");
+ for (i = 0; i < N_FLOAT; i++)
+ PRINT(fp, " fa2_p[%d] = %14.6e\n", i, fa1_r[i]);
+
+ PRINT(fp, "\n");
+
+ return;}
+
+/*--------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------*/
+
+/* COMPARE_TEST_1_DATA - compare the test data */
+
+static int compare_test_1_data(PDBfile *strm, FILE *fp)
+ {int i, k, err, err_tot;
+ long double fptol[N_PRIMITIVE_FP];
+
+ PD_fp_toler(strm, fptol);
+
+ err_tot = TRUE;
+
+/* compare scalars */
+ err = TRUE;
+ err &= (cs_r == cs_w);
+ err &= (ss_r == ss_w);
+ err &= (is_r == is_w);
+ err &= FLOAT_EQUAL(fs_r, fs_w);
+ err &= FLOAT_EQUAL(fs_app_r, fs_app_w);
+ err &= DOUBLE_EQUAL(ds_r, ds_w);
+
+ if (err)
+ PRINT(fp, "Scalars compare\n");
+ else
+ PRINT(fp, "Scalars differ\n");
+ err_tot &= err;
+
+/* compare char array */
+ err = TRUE;
+ for (i = 0; i < N_CHAR; i++)
+ err &= (ca_r[i] == ca_w[i]);
+
+/* compare short array */
+ for (i = 0; i < N_INT; i++)
+ err &= (sa_r[i] == sa_w[i]);
+
+/* compare int array */
+ for (i = 0; i < N_INT; i++)
+ err &= (ia_r[i] == ia_w[i]);
+
+/* compare float array */
+ for (i = 0; i < N_FLOAT; i++)
+ for (k = 0; k < N_DOUBLE; k++)
+ {err &= FLOAT_EQUAL(fa2_r[i][k], fa2_w[i][k]);
+ err &= FLOAT_EQUAL(fa2_app_r[i][k], fa2_app_w[i][k]);}
+
+/* compare double array */
+ for (i = 0; i < N_FLOAT; i++)
+ err &= DOUBLE_EQUAL(da_r[i], da_w[i]);
+
+ if (err)
+ PRINT(fp, "Arrays compare\n");
+ else
+ PRINT(fp, "Arrays differ\n");
+ err_tot &= err;
+
+/* compare strings */
+ err = TRUE;
+ for (i = 0; i < N_DOUBLE; i++)
+ err &= (strcmp(cap_r[i], cap_w[i]) == 0);
+
+ if (err)
+ PRINT(fp, "Strings compare\n");
+ else
+ PRINT(fp, "Strings differ\n");
+ err_tot &= err;
+
+/* compare structures */
+ err = TRUE;
+ for (i = 0; i < N_CHAR; i++)
+ {err &= FLOAT_EQUAL(graph_r.x_axis[i], graph_w.x_axis[i]);
+ err &= FLOAT_EQUAL(graph_r.y_axis[i], graph_w.y_axis[i]);};
+
+ err &= FLOAT_EQUAL(view_r.x_min, view_w.x_min);
+ err &= FLOAT_EQUAL(view_r.x_max, view_w.x_max);
+ err &= FLOAT_EQUAL(view_r.y_min, view_w.y_min);
+ err &= FLOAT_EQUAL(view_r.y_max, view_w.y_max);
+
+ err &= (graph_r.npts == graph_w.npts);
+ err &= (strcmp(graph_r.label, graph_w.label) == 0);
+
+ err &= FLOAT_EQUAL(graph_r.view.x_min, graph_w.view.x_min);
+ err &= FLOAT_EQUAL(graph_r.view.x_max, graph_w.view.x_max);
+ err &= FLOAT_EQUAL(graph_r.view.y_min, graph_w.view.y_min);
+ err &= FLOAT_EQUAL(graph_r.view.y_max, graph_w.view.y_max);
+
+ if (err)
+ PRINT(fp, "Structs compare\n");
+ else
+ PRINT(fp, "Structs differ\n");
+ err_tot &= err;
+
+/* compare partial read results */
+ err = TRUE;
+ err &= FLOAT_EQUAL(fs_p1_r, graph_w.x_axis[8]);
+ err &= FLOAT_EQUAL(fs_p2_r, graph_w.view.x_max);
+ err &= FLOAT_EQUAL(fs_p3_r, view_w.y_max);
+
+ if (err)
+ PRINT(fp, "Partial reads compare\n");
+ else
+ PRINT(fp, "Partial reads differ\n");
+ err_tot &= err;
+
+ return(err_tot);}
+
+/*--------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------*/
+
+/* TEST_1 - test the fundamental PDBLib functions
+ * -
+ * - read and write scalars of all primitive types
+ * - read and write structures with no indirections
+ * - append data to a file and read it back
+ * - read structure members
+ * - read parts of arrays
+ * -
+ * - tests can be targeted
+ */
+
+static int test_1(char *base, char *tgt, int n)
+ {int err;
+ char datfile[MAXLINE], fname[MAXLINE];
+ PDBfile *strm;
+ FILE *fp;
+
+/* target the file as asked */
+ test_target(tgt, base, n, fname, datfile);
+
+ fp = io_open(fname, "w");
+
+ prep_test_1_data();
+
+ if (read_only == FALSE)
+
+/* create the named file */
+ {strm = PD_create(datfile);
+ if (strm == NULL)
+ error(1, fp, "Test couldn't create file %s\r\n", datfile);
+ PRINT(fp, "File %s created\n", datfile);
+
+/* make a few defstructs */
+ PD_defstr(strm, "l_frame",
+ " float x_min",
+ "float x_max",
+ "float y_min",
+ "float y_max",
+ LAST);
+ PD_defstr(strm, "plot",
+ "float x_axis(10)",
+ "float y_axis(10)",
+ "integer npts",
+ "char * label",
+ "l_frame view",
+ LAST);
+
+/* write the test data */
+ write_test_1_data(strm);
+
+/* close the file */
+ if (PD_close(strm) == FALSE)
+ error(1, fp, "Test couldn't close file %s\r\n", datfile);
+ PRINT(fp, "File %s closed\n", datfile);
+
+/* reopen the file to append */
+ strm = PD_open(datfile, "a");
+ if (strm == NULL)
+ error(1, fp, "Test couldn't open file %s to append\r\n", datfile);
+ PRINT(fp, "File %s opened to append\n", datfile);
+
+ append_test_1_data(strm);
+
+/* close the file after append */
+ if (PD_close(strm) == FALSE)
+ error(1, fp, "Test couldn't close file %s after append\r\n",
+ datfile);
+ PRINT(fp, "File %s closed after append\n", datfile);};
+
+/* reopen the file */
+ strm = PD_open(datfile, "r");
+ if (strm == NULL)
+ error(1, fp, "Test couldn't open file %s\r\n", datfile);
+ PRINT(fp, "File %s opened\n", datfile);
+
+/* dump the symbol table */
+ dump_test_symbol_table(fp, strm->symtab, 1);
+
+/* read the data from the file */
+ read_test_1_data(strm);
+
+/* compare the original data with that read in */
+ err = compare_test_1_data(strm, fp);
+
+/* close the file */
+ if (PD_close(strm) == FALSE)
+ error(1, fp, "Test couldn't close file %s\r\n", datfile);
+ PRINT(fp, "File %s closed\n", datfile);
+
+/* print it out to STDOUT */
+ print_test_1_data(fp);
+
+/* free known test data memory */
+ cleanup_test_1();
+
+ io_close(fp);
+ if (err)
+ REMOVE(fname);
+
+ return(err);}
+
+/*--------------------------------------------------------------------------*/
+
+/* TEST #2 ROUTINES */
+
+/*--------------------------------------------------------------------------*/
+
+/* PREP_TEST_2_DATA - prepare the test data */
+
+static void prep_test_2_data(void)
+ {int i, *p1, *p2;
+ double *p3, *p4;
+
+/* do_w = -1; */
+
+ for (i = 0; i < N_INT; i++)
+ {p_w[i] = i;
+ p_r[i] = 0;};
+
+ tar_w = CMAKE_N(lev1, 2);
+
+ p1 = tar_w[0].a = CMAKE_N(int, N_INT);
+ p2 = tar_w[1].a = CMAKE_N(int, N_INT);
+ for (i = 0; i < N_INT; i++)
+ {p1[i] = i;
+ p2[i] = i + 10;};
+
+ p3 = tar_w[0].b = CMAKE_N(double, N_DOUBLE);
+ p4 = tar_w[1].b = CMAKE_N(double, N_DOUBLE);
+ for (i = 0; i < N_DOUBLE; i++)
+ {p3[i] = exp((double) i);
+ p4[i] = log(1.0 + (double) i);};
+
+ tar_w[0].c = CMAKE_N(lev2, 2);
+ tar_w[1].c = CMAKE_N(lev2, 2);
+
+ tar_w[0].c[0].s = CMAKE_N(char *, 2);
+ tar_w[0].c[0].s[0] = CSTRSAVE("Hello");
+ tar_w[0].c[0].s[1] = CSTRSAVE(" ");
+ tar_w[0].c[1].s = CMAKE_N(char *, 2);
+ tar_w[0].c[1].s[0] = CSTRSAVE("world");
+ tar_w[0].c[1].s[1] = CSTRSAVE("!");
+
+ tar_w[1].c[0].s = CMAKE_N(char *, 2);
+ tar_w[1].c[0].s[0] = CSTRSAVE("Foo");
+ tar_w[1].c[0].s[1] = CSTRSAVE(" ");
+ tar_w[1].c[1].s = CMAKE_N(char *, 2);
+ tar_w[1].c[1].s[0] = CSTRSAVE("Bar");
+ tar_w[1].c[1].s[1] = CSTRSAVE("!!!");
+
+ tar_w[0].c[0].type = 1;
+ tar_w[0].c[1].type = 2;
+ tar_w[1].c[0].type = 3;
+ tar_w[1].c[1].type = 4;
+
+ tar_r = NULL;
+
+ ap1 = NULL;
+ ap2 = NULL;
+ for (i = 0; i < 4; i++)
+ aa[i] = 0;
+
+ bp1 = NULL;
+ bp2 = NULL;
+ for (i = 0; i < 4; i++)
+ ba[i] = 0.0;
+
+ cp1 = NULL;
+ cp2 = NULL;
+ for (i = 0; i < 4; i++)
+ {ca[i].s = NULL;
+ ca[i].type = 0;};
+
+ sp1 = NULL;
+ sp2 = NULL;
+ sp3 = NULL;
+ sp4 = NULL;
+
+ tp1 = NULL;
+ tp2 = NULL;
+ tp3 = NULL;
+ tp4 = NULL;
+ tp5 = NULL;
+ tp6 = NULL;
+ tp7 = NULL;
+ tp8 = NULL;
+ for (i = 0; i < 4; i++)
+ ta[i] = 0;
+
+ return;}
+
+/*--------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------*/
+
+/* CLEANUP_TEST_2 - free all know test data memory */
+
+static void cleanup_test_2(void)
+ {int i;
+
+ if (tar_w != NULL)
+ {CFREE(tar_w[0].c[0].s[0]);
+ CFREE(tar_w[0].c[0].s[1]);
+ CFREE(tar_w[0].c[1].s[0]);
+ CFREE(tar_w[0].c[1].s[1]);
+
+ CFREE(tar_w[1].c[0].s[0]);
+ CFREE(tar_w[1].c[0].s[1]);
+ CFREE(tar_w[1].c[1].s[0]);
+ CFREE(tar_w[1].c[1].s[1]);
+
+ CFREE(tar_w[0].c[0].s);
+ CFREE(tar_w[0].c[1].s);
+ CFREE(tar_w[1].c[0].s);
+ CFREE(tar_w[1].c[1].s);
+
+ CFREE(tar_w[0].c);
+ CFREE(tar_w[1].c);
+
+ CFREE(tar_w[0].a);
+ CFREE(tar_w[1].a);
+
+ CFREE(tar_w[0].b);
+ CFREE(tar_w[1].b);
+
+ CFREE(tar_w);};
+
+ if (tar_r != NULL)
+ {CFREE(tar_r[0].c[0].s[0]);
+ CFREE(tar_r[0].c[0].s[1]);
+ CFREE(tar_r[0].c[1].s[0]);
+ CFREE(tar_r[0].c[1].s[1]);
+
+ CFREE(tar_r[1].c[0].s[0]);
+ CFREE(tar_r[1].c[0].s[1]);
+ CFREE(tar_r[1].c[1].s[0]);
+ CFREE(tar_r[1].c[1].s[1]);
+
+ CFREE(tar_r[0].c[0].s);
+ CFREE(tar_r[0].c[1].s);
+ CFREE(tar_r[1].c[0].s);
+ CFREE(tar_r[1].c[1].s);
+
+ CFREE(tar_r[0].c);
+ CFREE(tar_r[1].c);
+
+ CFREE(tar_r[0].a);
+ CFREE(tar_r[1].a);
+
+ CFREE(tar_r[0].b);
+ CFREE(tar_r[1].b);
+
+ CFREE(tar_r);};
+
+ CFREE(ap1);
+ CFREE(ap2);
+
+ CFREE(bp1);
+ CFREE(bp2);
+
+ if (cp1 != NULL)
+ {if (cp1[0].s != NULL)
+ {CFREE(cp1[0].s[0]);
+ CFREE(cp1[0].s[1]);
+ CFREE(cp1[0].s);};
+
+ if (cp1[1].s != NULL)
+ {CFREE(cp1[1].s[0]);
+ CFREE(cp1[1].s[1]);
+ CFREE(cp1[1].s);};
+
+ CFREE(cp1);};
+
+ if (cp2 != NULL)
+ {if (cp2[0].s != NULL)
+ {CFREE(cp2[0].s[0]);
+ CFREE(cp2[0].s[1]);
+ CFREE(cp2[0].s);};
+
+ if (cp2[1].s != NULL)
+ {CFREE(cp2[1].s[0]);
+ CFREE(cp2[1].s[1]);
+ CFREE(cp2[1].s);};
+
+ CFREE(cp2);};
+
+#ifndef PDB_LITE /* we'll leak these with PDB Lite */
+ for (i = 0; i < 4; i++)
+ {CFREE(ca[i].s[0]);
+ CFREE(ca[i].s[1]);
+ CFREE(ca[i].s);};
+#endif
+
+ if (sp1 != NULL)
+ {CFREE(sp1[0]);
+ CFREE(sp1[1]);
+ CFREE(sp1);};
+
+ if (sp2 != NULL)
+ {CFREE(sp2[0]);
+ CFREE(sp2[1]);
+ CFREE(sp2);};
+
+ if (sp3 != NULL)
+ {CFREE(sp3[0]);
+ CFREE(sp3[1]);
+ CFREE(sp3);};
+
+ if (sp4 != NULL)
+ {CFREE(sp4[0]);
+ CFREE(sp4[1]);
+ CFREE(sp4);};
+
+ CFREE(tp1);
+ CFREE(tp2);
+ CFREE(tp3);
+ CFREE(tp4);
+ CFREE(tp5);
+ CFREE(tp6);
+ CFREE(tp7);
+ CFREE(tp8);
+
+ return;}
+
+/*--------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------*/
+
+/* WRITE_TEST_2_DATA - write out the data into the PDB file */
+
+static void write_test_2_data(PDBfile *strm)
+ {long ind[3];
+
+ ind[0] = 1L;
+ ind[1] = N_INT;
+ ind[2] = 1L;
+ if (PD_write_alt(strm, "p", "integer", p_w, 1, ind) == 0)
+ error(1, STDOUT, "P WRITE FAILED - WRITE_TEST_2_DATA\n");
+
+ if (PD_write(strm, "tar", "lev1 *", &tar_w) == 0)
+ error(1, STDOUT, "TAR WRITE FAILED - WRITE_TEST_2_DATA\n");
+
+ return;}
+
+/*--------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------*/
+
+/* READ_TEST_2_DATA - read the test data from the file */
+
+static int read_test_2_data(PDBfile *strm)
+ {int err;
+
+ do_r = strm->default_offset;
+
+ err = PD_read(strm, "tar", &tar_r);
+ err = PD_read(strm, "p", p_r);
+
+ err = PD_read(strm, "tar(0).a", &ap1);
+ err = PD_read(strm, "tar(1).a", &ap2);
+
+ err = PD_read(strm, "tar(0).a(0)", &aa[0]);
+ err = PD_read(strm, "tar(0).a(1)", &aa[1]);
+ err = PD_read(strm, "tar(1).a(0)", &aa[2]);
+ err = PD_read(strm, "tar(1).a(1)", &aa[3]);
+
+ err = PD_read(strm, "tar(0).b", &bp1);
+ err = PD_read(strm, "tar(1).b", &bp2);
+
+ err = PD_read(strm, "tar(0).b(0)", &ba[0]);
+ err = PD_read(strm, "tar(0).b(1)", &ba[1]);
+ err = PD_read(strm, "tar(1).b(0)", &ba[2]);
+ err = PD_read(strm, "tar(1).b(1)", &ba[3]);
+
+ err = PD_read(strm, "tar(0).c", &cp1);
+ err = PD_read(strm, "tar(1).c", &cp2);
+
+ err = PD_read(strm, "tar(0).c(0)", &ca[0]);
+ err = PD_read(strm, "tar(0).c(1)", &ca[1]);
+ err = PD_read(strm, "tar(1).c(0)", &ca[2]);
+ err = PD_read(strm, "tar(1).c(1)", &ca[3]);
+
+ err = PD_read(strm, "tar(0).c(0).s", &sp1);
+ err = PD_read(strm, "tar(0).c(1).s", &sp2);
+ err = PD_read(strm, "tar(1).c(0).s", &sp3);
+ err = PD_read(strm, "tar(1).c(1).s", &sp4);
+
+ err = PD_read(strm, "tar(0).c(0).s(0)", &tp1);
+ err = PD_read(strm, "tar(0).c(0).s(1)", &tp2);
+ err = PD_read(strm, "tar(0).c(1).s(0)", &tp3);
+ err = PD_read(strm, "tar(0).c(1).s(1)", &tp4);
+
+ err = PD_read(strm, "tar(1).c(0).s(0)", &tp5);
+ err = PD_read(strm, "tar(1).c(0).s(1)", &tp6);
+ err = PD_read(strm, "tar(1).c(1).s(0)", &tp7);
+ err = PD_read(strm, "tar(1).c(1).s(1)", &tp8);
+
+ err = PD_read(strm, "tar(0).c(0).s(0)(2)", &ta[0]);
+ err = PD_read(strm, "tar(0).c(0).s(1)(1)", &ta[1]);
+ err = PD_read(strm, "tar(0).c(1).s(0)(3)", &ta[2]);
+ err = PD_read(strm, "tar(0).c(1).s(1)(2)", &ta[3]);
+
+ err = PD_read(strm, "tar(1).c(0).s(0)(2)", &ta[4]);
+ err = PD_read(strm, "tar(1).c(0).s(1)(1)", &ta[5]);
+ err = PD_read(strm, "tar(1).c(1).s(0)(3)", &ta[6]);
+ err = PD_read(strm, "tar(1).c(1).s(1)(2)", &ta[7]);
+
+ return(err);}
+
+/*--------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------*/
+
+/* PRINT_TEST_2_DATA - print it out to the file */
+
+static void print_test_2_data(FILE *fp)
+ {int i;
+ int *p1, *p2;
+ double *p3, *p4;
+
+ PRINT(fp, "\n");
+
+ p1 = tar_r[0].a;
+ p2 = tar_r[1].a;
+ PRINT(fp, "TAR struct member A:\n");
+ PRINT(fp, " TAR[0].A TAR[1].A\n");
+ for (i = 0; i < N_INT; i++)
+ PRINT(fp, " %d %d\n", p1[i], p2[i]);
+ PRINT(fp, "\n");
+
+ p3 = tar_r[0].b;
+ p4 = tar_r[1].b;
+ PRINT(fp, "TAR struct member B:\n");
+ PRINT(fp, " TAR[0].B TAR[1].B\n");
+ for (i = 0; i < N_DOUBLE; i++)
+ PRINT(fp, " %f %f\n", p3[i], p4[i]);
+ PRINT(fp, "\n");
+
+
+ PRINT(fp, "TAR struct member C:\n");
+ PRINT(fp, " TAR[0].C[0] TAR[0].C[1]\n");
+ PRINT(fp, " S[0] S[1] S[0] S[1]\n");
+ PRINT(fp, " %s %s %s %s\n",
+ tar_r[0].c[0].s[0], tar_r[0].c[0].s[1],
+ tar_r[0].c[1].s[0], tar_r[0].c[1].s[1]);
+ PRINT(fp, "\n TYPE\n");
+ PRINT(fp, " %d %d\n",
+ tar_r[0].c[0].type, tar_r[0].c[1].type);
+
+
+ PRINT(fp, "\n TAR[1].C[0] TAR[1].C[1]\n");
+ PRINT(fp, " S[0] S[1] S[0] S[1]\n");
+ PRINT(fp, " %s %s %s %s\n",
+ tar_r[1].c[0].s[0], tar_r[1].c[0].s[1],
+ tar_r[1].c[1].s[0], tar_r[1].c[1].s[1]);
+
+ PRINT(fp, " TYPE\n");
+ PRINT(fp, " %d %d\n",
+ tar_r[1].c[0].type, tar_r[1].c[1].type);
+
+ PRINT(fp, "\n");
+
+/* print the offset */
+ PRINT(fp, "file array index offset: %d\n\n", do_r);
+
+ PRINT(fp, "\n");
+
+/* read the an array which has offsets */
+ PRINT(fp, "array p: \n");
+ for (i = 0; i < N_INT; i++)
+ PRINT(fp, " %d\n", p_r[i]);
+
+ PRINT(fp, "\n");
+
+/* print the partial and member read stuff */
+ if (ap1 != NULL)
+ {PRINT(fp, "member read TAR[0].A TAR[1].A\n");
+ for (i = 0; i < N_INT; i++)
+ PRINT(fp, " %d %d\n", ap1[i], ap2[i]);
+ PRINT(fp, "\n");};
+
+ if (bp1 != NULL)
+ {PRINT(fp, "member read TAR[0].B TAR[1].B\n");
+ for (i = 0; i < N_DOUBLE; i++)
+ PRINT(fp, " %f %f\n", bp1[i], bp2[i]);
+ PRINT(fp, "\n");};
+
+ if (cp1 != NULL)
+ {PRINT(fp, "member read TAR[0].C:\n");
+ PRINT(fp, " TAR[0].C[0] TAR[0].C[1]\n");
+ PRINT(fp, " S[0] S[1] S[0] S[1]\n");
+ PRINT(fp, " %s %s %s %s\n",
+ cp1[0].s[0], cp1[0].s[1],
+ cp1[1].s[0], cp1[1].s[1]);
+ PRINT(fp, "\n TYPE\n");
+ PRINT(fp, " %d %d\n",
+ cp1[0].type, cp1[1].type);
+
+ PRINT(fp, "\nmember read TAR[1].C:\n");
+ PRINT(fp, " TAR[1].C[0] TAR[1].C[1]\n");
+ PRINT(fp, " S[0] S[1] S[0] S[1]\n");
+ PRINT(fp, " %s %s %s %s\n",
+ cp2[0].s[0], cp2[0].s[1],
+ cp2[1].s[0], cp2[1].s[1]);
+ PRINT(fp, "\n TYPE\n");
+ PRINT(fp, " %d %d\n",
+ cp2[0].type, cp2[1].type);};
+
+/*
+ PRINT(fp, "member read TAR[0].C[0]:\n");
+ PRINT(fp, " S[0] S[1]\n");
+ PRINT(fp, " %s %s\n", ca[0].s[0], ca[0].s[1]);
+
+ PRINT(fp, "member read TAR[0].C[1]:\n");
+ PRINT(fp, " S[0] S[1]\n");
+ PRINT(fp, " %s %s\n", ca[1].s[0], ca[1].s[1]);
+
+ PRINT(fp, "member read TAR[1].C[1]:\n");
+ PRINT(fp, " S[0] S[1]\n");
+ PRINT(fp, " %s %s\n", ca[2].s[0], ca[2].s[1]);
+
+ PRINT(fp, "member read TAR[1].C[1]:\n");
+ PRINT(fp, " S[0] S[1]\n");
+ PRINT(fp, " %s %s\n", ca[3].s[0], ca[3].s[1]);
+*/
+/* TAR.C.S read */
+
+ if (sp1 != NULL)
+ {PRINT(fp, "\nmember read TAR[0].C[0].S:\n");
+ PRINT(fp, " S[0] S[1]\n");
+ PRINT(fp, " %s %s\n", sp1[0], sp1[1]);
+
+ PRINT(fp, "\nmember read TAR[0].C[1].S:\n");
+ PRINT(fp, " S[0] S[1]\n");
+ PRINT(fp, " %s %s\n", sp2[0], sp2[1]);
+
+ PRINT(fp, "\nmember read TAR[1].C[0].S:\n");
+ PRINT(fp, " S[0] S[1]\n");
+ PRINT(fp, " %s %s\n", sp3[0], sp3[1]);
+
+ PRINT(fp, "\nmember read TAR[1].C[1].S:\n");
+ PRINT(fp, " S[0] S[1]\n");
+ PRINT(fp, " %s %s\n", sp4[0], sp4[1]);};
+
+/* TAR.C.S[i] read */
+
+ if (tp1 != NULL)
+ {PRINT(fp, "\nmember read TAR[0].C[0].S[0]:\n");
+ PRINT(fp, " S[0] S[1]\n");
+ PRINT(fp, " %s %s\n", tp1, tp1);
+
+ PRINT(fp, "\nmember read TAR[0].C[1].S[1]:\n");
+ PRINT(fp, " S[0] S[1]\n");
+ PRINT(fp, " %s %s\n", tp2, tp2);
+
+ PRINT(fp, "\nmember read TAR[0].C[1].S[0]:\n");
+ PRINT(fp, " S[0] S[1]\n");
+ PRINT(fp, " %s %s\n", tp3, tp3);
+
+ PRINT(fp, "\nmember read TAR[0].C[1].S[1]:\n");
+ PRINT(fp, " S[0] S[1]\n");
+ PRINT(fp, " %s %s\n", tp4, tp4);
+
+ PRINT(fp, "\nmember read TAR[1].C[0].S[0]:\n");
+ PRINT(fp, " S[0] S[1]\n");
+ PRINT(fp, " %s %s\n", tp5, tp5);
+
+ PRINT(fp, "\nmember read TAR[1].C[0].S[1]:\n");
+ PRINT(fp, " S[0] S[1]\n");
+ PRINT(fp, " %s %s\n", tp6, tp6);
+
+ PRINT(fp, "\nmember read TAR[1].C[1].S[0]:\n");
+ PRINT(fp, " S[0] S[1]\n");
+ PRINT(fp, " %s %s\n", tp7, tp7);
+
+ PRINT(fp, "\nmember read TAR[1].C[1].S[1]:\n");
+ PRINT(fp, " S[0] S[1]\n");
+ PRINT(fp, " %s %s\n", tp8, tp8);
+
+/* TAR.C.S[i][j] read */
+
+ PRINT(fp, "\nmember read from TAR[0]:\n");
+ PRINT(fp, "C[0].S[0][2] C[0].S[1][1] C[1].S[0][3] C[1].S[1][2]\n");
+ PRINT(fp, " %c %c %c %c\n",
+ ta[0], ta[1], ta[2], ta[3]);};
+
+ return;}
+
+/*--------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------*/
+
+/* COMPARE_TEST_2_DATA - compare the test data */
+
+static int compare_test_2_data(PDBfile *strm, FILE *fp)
+ {int i, err, err_tot;
+ int *p1w, *p2w, *p1r, *p2r;
+ double *p3w, *p4w, *p3r, *p4r;
+ long double fptol[N_PRIMITIVE_FP];
+
+ PD_fp_toler(strm, fptol);
+
+ err_tot = TRUE;
+
+/* compare offset and array */
+ err = TRUE;
+ err &= (do_r == do_w);
+
+ for (i = 0; i < N_INT; i++)
+ err &= (p_w[i] == p_r[i]);
+
+ if (err)
+ PRINT(fp, "Offset compare\n");
+ else
+ PRINT(fp, "Offset differ\n");
+ err_tot &= err;
+
+ err = TRUE;
+ p1w = tar_w[0].a;
+ p2w = tar_w[1].a;
+ p1r = tar_r[0].a;
+ p2r = tar_r[1].a;
+ for (i = 0; i < N_INT; i++)
+ {err &= (p1w[i] == p1r[i]);
+ err &= (p2w[i] == p2r[i]);};
+
+ p3w = tar_w[0].b;
+ p4w = tar_w[1].b;
+ p3r = tar_r[0].b;
+ p4r = tar_r[1].b;
+ for (i = 0; i < N_DOUBLE; i++)
+ {err &= DOUBLE_EQUAL(p3w[i], p3r[i]);
+ err &= DOUBLE_EQUAL(p4w[i], p4r[i]);};
+
+ err &= (strcmp(tar_w[0].c[0].s[0], tar_r[0].c[0].s[0]) == 0);
+ err &= (strcmp(tar_w[0].c[0].s[1], tar_r[0].c[0].s[1]) == 0);
+ err &= (strcmp(tar_w[0].c[1].s[0], tar_r[0].c[1].s[0]) == 0);
+ err &= (strcmp(tar_w[0].c[1].s[1], tar_r[0].c[1].s[1]) == 0);
+
+ err &= (strcmp(tar_w[1].c[0].s[0], tar_r[1].c[0].s[0]) == 0);
+ err &= (strcmp(tar_w[1].c[0].s[1], tar_r[1].c[0].s[1]) == 0);
+ err &= (strcmp(tar_w[1].c[1].s[0], tar_r[1].c[1].s[0]) == 0);
+ err &= (strcmp(tar_w[1].c[1].s[1], tar_r[1].c[1].s[1]) == 0);
+
+ err &= (tar_w[0].c[0].type == tar_r[0].c[0].type);
+ err &= (tar_w[0].c[1].type == tar_r[0].c[1].type);
+ err &= (tar_w[1].c[0].type == tar_r[1].c[0].type);
+ err &= (tar_w[1].c[1].type == tar_r[1].c[1].type);
+
+ if (err)
+ PRINT(fp, "Indirects compare\n");
+ else
+ PRINT(fp, "Indirects differ\n");
+ err_tot &= err;
+
+ PRINT(fp, "\n");
+
+ if (err)
+ PRINT(fp, "Offset compare\n");
+ else
+ PRINT(fp, "Offset differ\n");
+ err_tot &= err;
+
+ err = TRUE;
+
+ if (ap1 != NULL)
+ {p1w = tar_w[0].a;
+ p2w = tar_w[1].a;
+ for (i = 0; i < N_INT; i++)
+ {err &= (p1w[i] == ap1[i]);
+ err &= (p2w[i] == ap2[i]);};};
+
+ if (bp1 != NULL)
+ {p3w = tar_w[0].b;
+ p4w = tar_w[1].b;
+ for (i = 0; i < N_DOUBLE; i++)
+ {err &= DOUBLE_EQUAL(p3w[i], bp1[i]);
+ err &= DOUBLE_EQUAL(p4w[i], bp2[i]);};};
+
+ if (cp1 != NULL)
+ {err &= (strcmp(tar_w[0].c[0].s[0], cp1[0].s[0]) == 0);
+ err &= (strcmp(tar_w[0].c[0].s[1], cp1[0].s[1]) == 0);
+ err &= (strcmp(tar_w[0].c[1].s[0], cp1[1].s[0]) == 0);
+ err &= (strcmp(tar_w[0].c[1].s[1], cp1[1].s[1]) == 0);
+
+ err &= (strcmp(tar_w[1].c[0].s[0], cp2[0].s[0]) == 0);
+ err &= (strcmp(tar_w[1].c[0].s[1], cp2[0].s[1]) == 0);
+ err &= (strcmp(tar_w[1].c[1].s[0], cp2[1].s[0]) == 0);
+ err &= (strcmp(tar_w[1].c[1].s[1], cp2[1].s[1]) == 0);
+
+ err &= (tar_w[0].c[0].type == cp1[0].type);
+ err &= (tar_w[0].c[1].type == cp1[1].type);
+ err &= (tar_w[1].c[0].type == cp2[0].type);
+ err &= (tar_w[1].c[1].type == cp2[1].type);};
+/*
+ err &= (strcmp(tar_w[0].c[0].s[0], ca[0].s[0]) == 0);
+ err &= (strcmp(tar_w[0].c[0].s[1], ca[0].s[1]) == 0);
+ err &= (strcmp(tar_w[0].c[1].s[0], ca[1].s[0]) == 0);
+ err &= (strcmp(tar_w[0].c[1].s[1], ca[1].s[1]) == 0);
+
+ err &= (strcmp(tar_w[1].c[0].s[0], ca[2].s[0]) == 0);
+ err &= (strcmp(tar_w[1].c[0].s[1], ca[2].s[1]) == 0);
+ err &= (strcmp(tar_w[1].c[1].s[0], ca[3].s[0]) == 0);
+ err &= (strcmp(tar_w[1].c[1].s[1], ca[3].s[1]) == 0);
+*/
+ if (sp1 != NULL)
+ {err &= (strcmp(tar_w[0].c[0].s[0], sp1[0]) == 0);
+ err &= (strcmp(tar_w[0].c[0].s[1], sp1[1]) == 0);
+ err &= (strcmp(tar_w[0].c[1].s[0], sp2[0]) == 0);
+ err &= (strcmp(tar_w[0].c[1].s[1], sp2[1]) == 0);
+
+ err &= (strcmp(tar_w[1].c[0].s[0], sp3[0]) == 0);
+ err &= (strcmp(tar_w[1].c[0].s[1], sp3[1]) == 0);
+ err &= (strcmp(tar_w[1].c[1].s[0], sp4[0]) == 0);
+ err &= (strcmp(tar_w[1].c[1].s[1], sp4[1]) == 0);};
+
+ if (tp1 != NULL)
+ {err &= (strcmp(tar_w[0].c[0].s[0], tp1) == 0);
+ err &= (strcmp(tar_w[0].c[0].s[1], tp2) == 0);
+ err &= (strcmp(tar_w[0].c[1].s[0], tp3) == 0);
+ err &= (strcmp(tar_w[0].c[1].s[1], tp4) == 0);
+
+ err &= (strcmp(tar_w[1].c[0].s[0], tp5) == 0);
+ err &= (strcmp(tar_w[1].c[0].s[1], tp6) == 0);
+ err &= (strcmp(tar_w[1].c[1].s[0], tp7) == 0);
+ err &= (strcmp(tar_w[1].c[1].s[1], tp8) == 0);
+
+ err &= (tar_w[0].c[0].s[0][2] == ta[0]);
+ err &= (tar_w[0].c[0].s[1][1] == ta[1]);
+ err &= (tar_w[0].c[1].s[0][3] == ta[2]);
+ err &= (tar_w[0].c[1].s[1][2] == ta[3]);};
+
+ if (err)
+ PRINT(fp, "Indirects compare\n");
+ else
+ PRINT(fp, "Indirects differ\n");
+ err_tot &= err;
+
+ PRINT(fp, "\n");
+
+ return(err_tot);}
+
+/*--------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------*/
+
+/* TEST_2 - test the PDBLib functions handling indirections
+ * -
+ * - read and write structures with pointers
+ * - set default array base indexes
+ * - read structure members
+ * - read parts of arrays
+ * -
+ * - tests can be targeted
+ */
+
+static int test_2(char *base, char *tgt, int n)
+ {int err;
+ char datfile[MAXLINE], fname[MAXLINE];
+ PDBfile *strm;
+ FILE *fp;
+
+/* target the file is asked */
+ test_target(tgt, base, n, fname, datfile);
+
+ fp = io_open(fname, "w");
+
+ prep_test_2_data();
+
+ if (read_only == FALSE)
+
+/* create the named file */
+ {strm = PD_create(datfile);
+ if (strm == NULL)
+ error(2, fp, "Test couldn't create file %s\r\n", datfile);
+ PRINT(fp, "File %s created\n", datfile);
+
+/* set the default offset */
+ strm->default_offset = do_w;
+
+/* make a few defstructs */
+ PD_defstr(strm, "lev2",
+ "char **s",
+ "integer type",
+ LAST);
+
+ PD_defstr(strm, "lev1",
+ "integer *a",
+ "double *b",
+ "lev2 *c",
+ LAST);
+
+/* write the test data */
+ write_test_2_data(strm);
+
+/* close the file */
+ if (PD_close(strm) == FALSE)
+ error(2, fp, "Test couldn't close file %s\r\n", datfile);
+ PRINT(fp, "File %s closed\n", datfile);};
+
+/* reopen the file */
+ strm = PD_open(datfile, "r");
+ if (strm == NULL)
+ error(2, fp, "Test couldn't open file %s\r\n", datfile);
+ PRINT(fp, "File %s opened\n", datfile);
+
+/* dump the symbol table */
+ dump_test_symbol_table(fp, strm->symtab, 2);
+
+/* read the structs */
+ read_test_2_data(strm);
+
+/* compare the original data with that read in */
+ err = compare_test_2_data(strm, fp);
+
+/* print out the results */
+ print_test_2_data(fp);
+
+/* close the file */
+ if (PD_close(strm) == FALSE)
+ error(2, fp, "Test couldn't close file %s\r\n", datfile);
+ PRINT(fp, "File %s closed\n", datfile);
+
+/* cleanup test data memory */
+ cleanup_test_2();
+
+ io_close(fp);
+ if (err)
+ REMOVE(fname);
+
+ return(err);}
+
+/*--------------------------------------------------------------------------*/
+
+/* TEST #3 ROUTINES */
+
+/*--------------------------------------------------------------------------*/
+
+/* PREP_TEST_3_DATA - prepare the test data */
+
+static void prep_test_3_data(void)
+ {
+
+ vr1_w.a = 'A';
+ vr1_w.b = -10;
+ vr1_w.c[0] = 'B';
+ vr1_w.c[1] = 'a';
+ vr1_w.d = 32589;
+ vr1_w.e[0] = 'C';
+ vr1_w.e[1] = 'a';
+ vr1_w.e[2] = 'b';
+ vr1_w.f = 1.523e-19;
+ vr1_w.g[0] = 'D';
+ vr1_w.g[1] = 'a';
+ vr1_w.g[2] = 'b';
+ vr1_w.g[3] = 'c';
+ vr1_w.h = 4.2782918323832554e30;
+ vr1_w.i[0] = 'E';
+ vr1_w.i[1] = 'a';
+ vr1_w.i[2] = 'b';
+ vr1_w.i[3] = 'c';
+ vr1_w.i[4] = 'd';
+ vr1_w.j = CSTRSAVE("whoa there big fella!");
+ vr1_w.k[0] = 'F';
+ vr1_w.k[1] = 'a';
+ vr1_w.k[2] = 'b';
+ vr1_w.k[3] = 'c';
+ vr1_w.k[4] = 'd';
+ vr1_w.k[5] = 'e';
+
+ vr1_r.a = '\0';
+ vr1_r.b = 0;
+ vr1_r.c[0] = '\0';
+ vr1_r.c[1] = '\0';
+ vr1_r.d = 0;
+ vr1_r.e[0] = '\0';
+ vr1_r.e[1] = '\0';
+ vr1_r.e[2] = '\0';
+ vr1_r.f = 0.0;
+ vr1_r.g[0] = '\0';
+ vr1_r.g[1] = '\0';
+ vr1_r.g[2] = '\0';
+ vr1_r.g[3] = '\0';
+ vr1_r.h = 0.0;
+ vr1_r.i[0] = '\0';
+ vr1_r.i[1] = '\0';
+ vr1_r.i[2] = '\0';
+ vr1_r.i[3] = '\0';
+ vr1_r.i[4] = '\0';
+ vr1_r.j = NULL;
+ vr1_r.k[0] = '\0';
+ vr1_r.k[1] = '\0';
+ vr1_r.k[2] = '\0';
+ vr1_r.k[3] = '\0';
+ vr1_r.k[4] = '\0';
+ vr1_r.k[5] = '\0';
+
+ return;}
+
+/*--------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------*/
+
+/* CLEANUP_TEST_3 - free all known test data memory */
+
+static void cleanup_test_3(void)
+ {
+
+ CFREE(vr1_w.j);
+ CFREE(vr1_r.j);
+
+ return;}
+
+/*--------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------*/
+
+/* WRITE_TEST_3_DATA - write out the data into the PDB file */
+
+static void write_test_3_data(PDBfile *strm)
+ {
+
+ if (PD_write(strm, "vr1", "st3", &vr1_w) == 0)
+ error(1, STDOUT, "VR1 WRITE FAILED - WRITE_TEST_3_DATA\n");
+
+ return;}
+
+/*--------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------*/
+
+/* READ_TEST_3_DATA - read the test data from the file */
+
+static int read_test_3_data(PDBfile *strm)
+ {int err;
+
+ err = PD_read(strm, "vr1", &vr1_r);
+
+ return(err);}
+
+/*--------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------*/
+
+/* PRINT_TEST_3_DATA - print it out to the file */
+
+static void print_test_3_data(FILE *fp)
+ {
+
+ PRINT(fp, "struct vr1:\n");
+ PRINT(fp, " vr1.a = %c\n", vr1_r.a);
+ PRINT(fp, " vr1.b = %d\n", vr1_r.b);
+ PRINT(fp, " vr1.c[0] = %c\n", vr1_r.c[0]);
+ PRINT(fp, " vr1.c[1] = %c\n", vr1_r.c[1]);
+ PRINT(fp, " vr1.d = %d\n", vr1_r.d);
+ PRINT(fp, " vr1.e[0] = %c\n", vr1_r.e[0]);
+ PRINT(fp, " vr1.e[1] = %c\n", vr1_r.e[1]);
+ PRINT(fp, " vr1.e[2] = %c\n", vr1_r.e[2]);
+ PRINT(fp, " vr1.f = %14.7e\n", vr1_r.f);
+ PRINT(fp, " vr1.g[0] = %c\n", vr1_r.g[0]);
+ PRINT(fp, " vr1.g[1] = %c\n", vr1_r.g[1]);
+ PRINT(fp, " vr1.g[2] = %c\n", vr1_r.g[2]);
+ PRINT(fp, " vr1.g[3] = %c\n", vr1_r.g[3]);
+ PRINT(fp, " vr1.h = %20.13e\n", vr1_r.h);
+ PRINT(fp, " vr1.i[0] = %c\n", vr1_r.i[0]);
+ PRINT(fp, " vr1.i[1] = %c\n", vr1_r.i[1]);
+ PRINT(fp, " vr1.i[2] = %c\n", vr1_r.i[2]);
+ PRINT(fp, " vr1.i[3] = %c\n", vr1_r.i[3]);
+ PRINT(fp, " vr1.i[4] = %c\n", vr1_r.i[4]);
+ PRINT(fp, " vr1.j = %s\n", vr1_r.j);
+ PRINT(fp, " vr1.k[0] = %c\n", vr1_r.k[0]);
+ PRINT(fp, " vr1.k[1] = %c\n", vr1_r.k[1]);
+ PRINT(fp, " vr1.k[2] = %c\n", vr1_r.k[2]);
+ PRINT(fp, " vr1.k[3] = %c\n", vr1_r.k[3]);
+ PRINT(fp, " vr1.k[4] = %c\n", vr1_r.k[4]);
+ PRINT(fp, " vr1.k[5] = %c\n", vr1_r.k[5]);
+
+ PRINT(fp, "\n");
+
+ return;}
+
+/*--------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------*/
+
+/* COMPARE_TEST_3_DATA - compare the test data */
+
+static int compare_test_3_data(PDBfile *strm, FILE *fp)
+ {int err, err_tot;
+ long double fptol[N_PRIMITIVE_FP];
+
+ PD_fp_toler(strm, fptol);
+
+ err_tot = TRUE;
+
+/* compare offset and array */
+ err = TRUE;
+ err &= (vr1_w.a == vr1_r.a);
+ err &= (vr1_w.b == vr1_r.b);
+ err &= (vr1_w.c[0] == vr1_r.c[0]);
+ err &= (vr1_w.c[1] == vr1_r.c[1]);
+ err &= (vr1_w.d == vr1_r.d);
+ err &= (vr1_w.e[0] == vr1_r.e[0]);
+ err &= (vr1_w.e[1] == vr1_r.e[1]);
+ err &= (vr1_w.e[2] == vr1_r.e[2]);
+ err &= FLOAT_EQUAL(vr1_w.f, vr1_r.f);
+ err &= (vr1_w.g[0] == vr1_r.g[0]);
+ err &= (vr1_w.g[1] == vr1_r.g[1]);
+ err &= (vr1_w.g[2] == vr1_r.g[2]);
+ err &= (vr1_w.g[3] == vr1_r.g[3]);
+ err &= DOUBLE_EQUAL(vr1_w.h, vr1_r.h);
+ err &= (vr1_w.i[0] == vr1_r.i[0]);
+ err &= (vr1_w.i[1] == vr1_r.i[1]);
+ err &= (vr1_w.i[2] == vr1_r.i[2]);
+ err &= (vr1_w.i[3] == vr1_r.i[3]);
+ err &= (vr1_w.i[4] == vr1_r.i[4]);
+ err &= (strcmp(vr1_w.j, vr1_r.j) == 0);
+ err &= (vr1_w.k[0] == vr1_r.k[0]);
+ err &= (vr1_w.k[1] == vr1_r.k[1]);
+ err &= (vr1_w.k[2] == vr1_r.k[2]);
+ err &= (vr1_w.k[3] == vr1_r.k[3]);
+ err &= (vr1_w.k[4] == vr1_r.k[4]);
+ err &= (vr1_w.k[5] == vr1_r.k[5]);
+
+ if (err)
+ PRINT(fp, "Alignments compare\n");
+ else
+ PRINT(fp, "Alignments differ\n");
+ err_tot &= err;
+
+ PRINT(fp, "\n");
+
+ return(err_tot);}
+
+/*--------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------*/
+
+/* TEST_3 - test the PDBLib functions handling indirections
+ * - read and write structures with alignment difficulties
+ * - tests can be targeted
+ */
+
+static int test_3(char *base, char *tgt, int n)
+ {int err;
+ char datfile[MAXLINE], fname[MAXLINE];
+ PDBfile *strm;
+ FILE *fp;
+
+/* target the file is asked */
+ test_target(tgt, base, n, fname, datfile);
+
+ fp = io_open(fname, "w");
+
+ prep_test_3_data();
+
+ if (read_only == FALSE)
+
+/* create the named file */
+ {if ((strm = PD_create(datfile)) == NULL)
+ error(2, fp, "Test couldn't create file %s\r\n", datfile);
+ PRINT(fp, "File %s created\n", datfile);
+
+/* make a few defstructs */
+ PD_defstr(strm, "st3",
+ "char a",
+ "short b",
+ "char c[2]",
+ "integer d",
+ "char e[3]",
+ "float f",
+ "char g[4]",
+ "double h",
+ "char i[5]",
+ "char *j",
+ "char k[6]",
+ LAST);
+
+/* write the test data */
+ write_test_3_data(strm);
+
+/* close the file */
+ if (PD_close(strm) == FALSE)
+ error(2, fp, "Test couldn't close file %s\r\n", datfile);
+ PRINT(fp, "File %s closed\n", datfile);
+
+#ifdef LINUX
+/* GOTCHA: Without this delay, the test fails about half the time,
+ * iff the files are being accessed across the network.
+ */
+ SC_sleep(10);
+#endif
+ };
+
+/* reopen the file */
+ if ((strm = PD_open(datfile, "r")) == NULL)
+ error(2, fp, "Test couldn't open file %s\r\n", datfile);
+ PRINT(fp, "File %s opened\n", datfile);
+
+/* dump the symbol table */
+ dump_test_symbol_table(fp, strm->symtab, 3);
+
+/* read the structs */
+ read_test_3_data(strm);
+
+/* compare the original data with that read in */
+ err = compare_test_3_data(strm, fp);
+
+/* close the file */
+ if (PD_close(strm) == FALSE)
+ error(2, fp, "Test couldn't close file %s\r\n", datfile);
+ PRINT(fp, "File %s closed\n", datfile);
+
+/* print out the results */
+ print_test_3_data(fp);
+
+/* clean up test data memory */
+ cleanup_test_3();
+
+ io_close(fp);
+ if (err)
+ REMOVE(fname);
+
+ return(err);}
+
+/*--------------------------------------------------------------------------*/
+
+/* TEST #4 ROUTINES */
+
+/*--------------------------------------------------------------------------*/
+
+/* PREP_TEST_4_DATA - prepare the test data */
+
+static void prep_test_4_data(void)
+ {int *pi;
+ short *ps;
+ long *pl;
+ float *pf;
+ double *pd;
+ char *pc;
+ haelem *hp;
+
+ tab4_w = SC_make_hasharr(3, NODOC, SC_HA_NAME_KEY, 0);
+
+ CHAR_S = CSTRSAVE("char *");
+ SHORT_S = CSTRSAVE("short *");
+ INT_S = CSTRSAVE("integer *");
+ LONG_S = CSTRSAVE("long *");
+ FLOAT_S = CSTRSAVE("float *");
+ DOUBLE_S = CSTRSAVE("double *");
+ HASHEL_S = CSTRSAVE(haelemstr " *");
+
+ pc = CMAKE(char);
+ *pc = 'A';
+ SC_hasharr_install(tab4_w, "pc", pc, CHAR_S, TRUE, TRUE);
+
+ ps = CMAKE(short);
+ *ps = -1024;
+ SC_hasharr_install(tab4_w, "ps", ps, SHORT_S, TRUE, TRUE);
+
+ pi = CMAKE(int);
+ *pi = 16384;
+ SC_hasharr_install(tab4_w, "pi", pi, INT_S, TRUE, TRUE);
+
+ pl = CMAKE(long);
+ *pl = -1048576;
+ SC_hasharr_install(tab4_w, "pl", pl, LONG_S, TRUE, TRUE);
+
+ pf = CMAKE(float);
+ *pf = 3.141596;
+ SC_hasharr_install(tab4_w, "pf", pf, FLOAT_S, TRUE, TRUE);
+
+ pd = CMAKE(double);
+ *pd = -1.0e-30;
+ hp = SC_hasharr_install(tab4_w, "pd", pd, DOUBLE_S, TRUE, TRUE);
+
+ SC_hasharr_install(tab4_w, "ph", hp, HASHEL_S, TRUE, TRUE);
+
+ tab4_r = NULL;
+
+ vr4_w = CMAKE_N(st4, 3);
+
+ vr4_w[0].a = 2048;
+ vr4_w[0].b = 'G';
+ vr4_w[1].a = -2048;
+ vr4_w[1].b = 'H';
+ vr4_w[2].a = 4096;
+ vr4_w[2].b = 'I';
+
+ vr4_r = NULL;
+
+ return;}
+
+/*--------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------*/
+
+/* CLEANUP_HA_TEST_4 - free the haelem types which were read in not constant */
+
+static int cleanup_ha_test_4(haelem *hp, void *a)
+ {
+
+ CFREE(hp->type);
+
+ return(TRUE);}
+
+/*--------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------*/
+
+/* CLEANUP_TEST_4 - free all known test data memory */
+
+static void cleanup_test_4(void)
+ {
+ /* PDB Lite's hash table isn't smart enough to deal with interdependencies
+ of 'pd' and 'hp'. So, break that linkage now by null'ing hp's reference
+ to the hashel for 'pd' */
+#ifdef PDB_LITE
+ haelem *hp = SC_lookup("ph", tab4_w);
+ hp->def = 0;
+#endif
+ SC_free_hasharr(tab4_w, NULL, NULL);
+
+ if (tab4_r != NULL)
+ SC_free_hasharr(tab4_r, cleanup_ha_test_4, NULL);
+
+ CFREE(CHAR_S);
+ CFREE(SHORT_S);
+ CFREE(INT_S);
+ CFREE(LONG_S);
+ CFREE(FLOAT_S);
+ CFREE(DOUBLE_S);
+ CFREE(HASHEL_S);
+
+ CFREE(vr4_w);
+ CFREE(vr4_r);
+
+ return;}
+
+/*--------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------*/
+
+/* WRITE_TEST_4_DATA - write out the data into the PDB file */
+
+static void write_test_4_data(PDBfile *strm)
+ {
+
+ if (PD_write(strm, "tab4", hasharrstr " *", &tab4_w) == 0)
+ error(1, STDOUT, "TAB4 WRITE FAILED - WRITE_TEST_4_DATA\n");
+
+ if (PD_write(strm, "vr4", "st4 *", &vr4_w) == 0)
+ error(1, STDOUT, "VR4 WRITE FAILED - WRITE_TEST_4_DATA\n");
+
+ return;}
+
+/*--------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------*/
+
+/* READ_TEST_4_DATA - read the test data from the file */
+
+static int read_test_4_data(PDBfile *strm)
+ {int err;
+
+ err = PD_read(strm, "tab4", &tab4_r);
+ SC_hasharr_rekey(tab4_r, SC_HA_NAME_KEY);
+
+ err = PD_read(strm, "vr4", &vr4_r);
+
+ return(err);}
+
+/*--------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------*/
+
+/* PRINT_TEST_4_DATA - print it out to the file */
+
+static void print_test_4_data(FILE *fp)
+ {int i, ne, *pi;
+ long *pl;
+ short *ps;
+ float *pf;
+ double *pd;
+ char *pc, **names;
+ haelem *ph;
+
+ ne = SC_hasharr_get_n(tab4_r);
+ names = SC_hasharr_dump(tab4_r, NULL, NULL, FALSE);
+ for (i = 0; i < ne; i++)
+ PRINT(fp, "%s\n", names[i]);
+ SC_free_strings(names);
+
+ PRINT(fp, "\n");
+
+ pc = (char *) SC_hasharr_def_lookup(tab4_r, "pc");
+ ps = (short *) SC_hasharr_def_lookup(tab4_r, "ps");
+ pi = (int *) SC_hasharr_def_lookup(tab4_r, "pi");
+ pl = (long *) SC_hasharr_def_lookup(tab4_r, "pl");
+ pf = (float *) SC_hasharr_def_lookup(tab4_r, "pf");
+ pd = (double *) SC_hasharr_def_lookup(tab4_r, "pd");
+ ph = (haelem *) SC_hasharr_def_lookup(tab4_r, "ph");
+
+ PRINT(fp, "Table values:\n");
+ PRINT(fp, " pc = %c %s\n", *pc, CHAR_S);
+ PRINT(fp, " ps = %d %s\n", *ps, SHORT_S);
+ PRINT(fp, " pi = %d %s\n", *pi, INT_S);
+ PRINT(fp, " pl = %ld %s\n", *pl, LONG_S);
+ PRINT(fp, " pf = %f %s\n", *pf, FLOAT_S);
+ PRINT(fp, " pd = %e %s\n", *pd, DOUBLE_S);
+
+ PRINT(fp, "\n ph : %s %s\n\n", ph->name, ph->type);
+
+ PRINT(fp, "VR4[0]:\n");
+ PRINT(fp, "VR4[0].A = %d\n", vr4_r[0].a);
+ PRINT(fp, "VR4[0].B = %c\n", vr4_r[0].b);
+ PRINT(fp, "VR4[1].A = %d\n", vr4_r[1].a);
+ PRINT(fp, "VR4[1].B = %c\n", vr4_r[1].b);
+ PRINT(fp, "VR4[2].A = %d\n", vr4_r[2].a);
+ PRINT(fp, "VR4[2].B = %c\n", vr4_r[2].b);
+
+ return;}
+
+/*--------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------*/
+
+/* COMPARE_TEST_4_DATA - compare the test data */
+
+static int compare_test_4_data(PDBfile *strm, FILE *fp)
+ {int err, err_tot;
+ long double fptol[N_PRIMITIVE_FP];
+ char *pc_w, *pc_r;
+ short *ps_w, *ps_r;
+ int *pi_w, *pi_r;
+ long *pl_w, *pl_r;
+ float *pf_w, *pf_r;
+ double *pd_w, *pd_r;
+ haelem *ph_w, *ph_r;
+
+ PD_fp_toler(strm, fptol);
+
+ err_tot = TRUE;
+
+ pc_r = (char *) SC_hasharr_def_lookup(tab4_r, "pc");
+ ps_r = (short *) SC_hasharr_def_lookup(tab4_r, "ps");
+ pi_r = (int *) SC_hasharr_def_lookup(tab4_r, "pi");
+ pl_r = (long *) SC_hasharr_def_lookup(tab4_r, "pl");
+ pf_r = (float *) SC_hasharr_def_lookup(tab4_r, "pf");
+ pd_r = (double *) SC_hasharr_def_lookup(tab4_r, "pd");
+ ph_r = (haelem *) SC_hasharr_def_lookup(tab4_r, "ph");
+
+ pc_w = (char *) SC_hasharr_def_lookup(tab4_w, "pc");
+ ps_w = (short *) SC_hasharr_def_lookup(tab4_w, "ps");
+ pi_w = (int *) SC_hasharr_def_lookup(tab4_w, "pi");
+ pl_w = (long *) SC_hasharr_def_lookup(tab4_w, "pl");
+ pf_w = (float *) SC_hasharr_def_lookup(tab4_w, "pf");
+ pd_w = (double *) SC_hasharr_def_lookup(tab4_w, "pd");
+ ph_w = (haelem *) SC_hasharr_def_lookup(tab4_w, "ph");
+
+/* compare offset and array */
+ err = TRUE;
+ err &= (*pc_r == *pc_w);
+ err &= (*ps_r == *ps_w);
+ err &= (*pi_r == *pi_w);
+ err &= (*pl_r == *pl_w);
+ err &= FLOAT_EQUAL(*pf_r, *pf_w);
+ err &= DOUBLE_EQUAL(*pd_r, *pd_w);
+
+ if (err)
+ PRINT(fp, "Hash tables compare\n");
+ else
+ PRINT(fp, "Hash tables differ\n");
+ err_tot &= err;
+
+/* compare haelem info */
+ err = TRUE;
+ err &= (strcmp(ph_r->name, ph_w->name) == 0);
+ err &= (strcmp(ph_r->type, ph_w->type) == 0);
+ if (err)
+ PRINT(fp, "Hashels compare\n");
+ else
+ PRINT(fp, "Hashels differ\n");
+ err_tot &= err;
+
+/* check the new alignments */
+ err = TRUE;
+ err &= (vr4_w[0].a == vr4_r[0].a);
+ err &= (vr4_w[0].b == vr4_r[0].b);
+ err &= (vr4_w[1].a == vr4_r[1].a);
+ err &= (vr4_w[1].b == vr4_r[1].b);
+ err &= (vr4_w[2].a == vr4_r[2].a);
+ err &= (vr4_w[2].b == vr4_r[2].b);
+
+ if (err)
+ PRINT(fp, "Alignments compare\n");
+ else
+ PRINT(fp, "Alignments differ\n");
+ err_tot &= err;
+
+ PRINT(fp, "\n");
+
+ return(err_tot);}
+
+/*--------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------*/
+
+/* TEST_4 - test the PDBLib functions handling indirections
+ * - read and write structures with alignment difficulties
+ * - tests can be targeted
+ */
+
+static int test_4(char *base, char *tgt, int n)
+ {int err;
+ char datfile[MAXLINE], fname[MAXLINE];
+ PDBfile *strm;
+ FILE *fp;
+
+/* target the file as asked */
+ test_target(tgt, base, n, fname, datfile);
+
+ fp = io_open(fname, "w");
+
+ prep_test_4_data();
+
+ if (read_only == FALSE)
+
+/* create the named file */
+ {strm = PD_create(datfile);
+ if (strm == NULL)
+ error(2, fp, "Test couldn't create file %s\r\n", datfile);
+ PRINT(fp, "File %s created\n", datfile);
+
+ strm->previous_file = CSTRSAVE(base);
+
+/* make a few defstructs */
+ PD_def_hash_types(strm, 3);
+
+ PD_defstr(strm, "st4",
+ "short a",
+ "char b",
+ LAST);
+
+/* write the test data */
+ write_test_4_data(strm);
+
+/* close the file */
+ if (PD_close(strm) == FALSE)
+ error(2, fp, "Test couldn't close file %s\r\n", datfile);
+ PRINT(fp, "File %s closed\n", datfile);};
+
+/* reopen the file */
+ strm = PD_open(datfile, "r");
+ if (strm == NULL)
+ error(2, fp, "Test couldn't open file %s\r\n", datfile);
+ PRINT(fp, "File %s opened\n", datfile);
+
+/* dump the symbol table */
+ dump_test_symbol_table(fp, strm->symtab, 4);
+
+/* read the structs */
+ read_test_4_data(strm);
+
+/* compare the original data with that read in */
+ err = compare_test_4_data(strm, fp);
+
+/* print out the results */
+ print_test_4_data(fp);
+
+/* close the file */
+ if (PD_close(strm) == FALSE)
+ error(2, fp, "Test couldn't close file %s\r\n", datfile);
+ PRINT(fp, "File %s closed\n", datfile);
+
+/* clean up test data memory */
+ cleanup_test_4();
+
+ io_close(fp);
+ if (err)
+ REMOVE(fname);
+
+ return(err);}
+
+/*--------------------------------------------------------------------------*/
+
+/* TEST #5 ROUTINES */
+
+/*--------------------------------------------------------------------------*/
+
+/* PREP_TEST_5_DATA - prepare the test data */
+
+static void prep_test_5_data(void)
+ {int i, *p1, *p2;
+ double *p3, *p4;
+
+ for (i = 0; i < N_INT; i++)
+ {p_w[i] = i;
+ p_r[i] = 0;};
+
+ tar_w = CMAKE_N(lev1, 2);
+
+ p1 = tar_w[0].a = CMAKE_N(int, N_INT);
+ p2 = tar_w[1].a = CMAKE_N(int, N_INT);
+ for (i = 0; i < N_INT; i++)
+ {p1[i] = i;
+ p2[i] = i + 10;};
+
+ p3 = tar_w[0].b = CMAKE_N(double, N_DOUBLE);
+ p4 = tar_w[1].b = CMAKE_N(double, N_DOUBLE);
+ for (i = 0; i < N_DOUBLE; i++)
+ {p3[i] = exp((double) i);
+ p4[i] = log(1.0 + (double) i);};
+
+ tar_w[0].c = NULL;
+ tar_w[1].c = NULL;
+
+ memset(tar5_t, 0, 4*sizeof(lev1));
+ memset(tar5_r, 0, 4*sizeof(lev1));
+
+ return;}
+
+/*--------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------*/
+
+/* CLEANUP_TEST_5 - free all known test data memory */
+
+static void cleanup_test_5(void)
+ {int l;
+
+ if (tar_w != NULL)
+ {CFREE(tar_w[0].a);
+ CFREE(tar_w[1].a);
+
+ CFREE(tar_w[0].b);
+ CFREE(tar_w[1].b);
+
+ CFREE(tar_w);};
+
+ for (l = 0; l < 4; l++)
+ {CFREE(tar5_t[l].a);
+ CFREE(tar5_t[l].b);
+
+ CFREE(tar5_r[l].a);
+ CFREE(tar5_r[l].b);};
+
+ return;}
+
+/*--------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------*/
+
+/* WRITE_TEST_5_DATA - write out the data into the PDB file */
+
+static void write_test_5_data(PDBfile *strm)
+ {
+
+ if (PD_write(strm, "tar(2)", "lev1", tar_w) == 0)
+ error(1, STDOUT, "TAR WRITE FAILED - WRITE_TEST_5_DATA\n");
+
+ if (PD_append(strm, "tar(2:3)", tar_w) == 0)
+ error(1, STDOUT, "TAR APPEND FAILED - WRITE_TEST_5_DATA\n");
+
+ return;}
+
+/*--------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------*/
+
+/* READ_TEST_5_DATA - read the test data from the file */
+
+static int read_test_5_data(PDBfile *strm)
+ {int err; long ind[3];
+
+ err = (PD_read(strm, "tar", tar5_t) != 4);
+
+#ifdef PDB_LITE
+ err = (PD_read(strm, "tar", tar5_r) != 4);
+ err = (PD_read(strm, "tar(0)", tar5_r+0) != 1);
+ err = (PD_read(strm, "tar(1)", tar5_r+1) != 1);
+#else
+ err = (PD_read(strm, "tar(0)", tar5_r+0) != 1);
+ err = (PD_read(strm, "tar(1)", tar5_r+1) != 1);
+ err = (PD_read(strm, "tar(2)", tar5_r+2) != 1);
+ err = (PD_read(strm, "tar(3)", tar5_r+3) != 1);
+#endif
+
+ return(err);}
+
+/*--------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------*/
+
+/* PRINT_TEST_5_DATA - print it out to the file */
+
+static void print_test_5_data(FILE *fp)
+ {int i;
+ int *p0, *p1, *p2, *p3;
+ double *p4, *p5, *p6, *p7;
+
+ PRINT(fp, "\n");
+
+ p0 = tar5_t[0].a;
+ p1 = tar5_t[1].a;
+ p2 = tar5_t[2].a;
+ p3 = tar5_t[3].a;
+ PRINT(fp, "TAR struct member A:\n");
+ PRINT(fp, " TAR[0].A TAR[1].A TAR[2].A TAR[3].A\n");
+ for (i = 0; i < N_INT; i++)
+ PRINT(fp, " %d %d %d %d\n",
+ p0[i], p1[i], p2[i], p3[i]);
+ PRINT(fp, "\n");
+
+ p4 = tar5_t[0].b;
+ p5 = tar5_t[1].b;
+ p6 = tar5_t[2].b;
+ p7 = tar5_t[3].b;
+ PRINT(fp, "TAR struct member B:\n");
+ PRINT(fp, " TAR[0].B TAR[1].B TAR[2].B TAR[3].B\n");
+ for (i = 0; i < N_DOUBLE; i++)
+ PRINT(fp, " %f %f %f %f\n",
+ p4[i], p5[i], p6[i], p7[i]);
+ PRINT(fp, "\n");
+
+ return;}
+
+/*--------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------*/
+
+/* COMPARE_TEST_5_DATA - compare the test data */
+
+static int compare_test_5_data(PDBfile *strm, FILE *fp)
+ {int i, l, *p1w, *p2w, *p1r, *p2r;
+ int err, err_tot;
+ double *p3w, *p4w, *p3r, *p4r;
+ long double fptol[N_PRIMITIVE_FP];
+
+ PD_fp_toler(strm, fptol);
+
+ err_tot = TRUE;
+
+ err = TRUE;
+ p1w = tar_w[0].a;
+ p2w = tar_w[1].a;
+ p3w = tar_w[0].b;
+ p4w = tar_w[1].b;
+
+ for (l = 0; l < 2; l++)
+ {p1r = tar5_t[2*l].a;
+ p2r = tar5_t[2*l+1].a;
+ for (i = 0; i < N_INT; i++)
+ {err &= (p1w[i] == p1r[i]);
+ err &= (p2w[i] == p2r[i]);};
+
+ p3r = tar5_t[2*l].b;
+ p4r = tar5_t[2*l+1].b;
+ for (i = 0; i < N_DOUBLE; i++)
+ {err &= DOUBLE_EQUAL(p3w[i], p3r[i]);
+ err &= DOUBLE_EQUAL(p4w[i], p4r[i]);};};
+
+ for (l = 0; l < 2; l++)
+ {p1r = tar5_r[2*l].a;
+ p2r = tar5_r[2*l+1].a;
+ for (i = 0; i < N_INT; i++)
+ {err &= (p1w[i] == p1r[i]);
+ err &= (p2w[i] == p2r[i]);};
+
+ p3r = tar5_r[2*l].b;
+ p4r = tar5_r[2*l+1].b;
+ for (i = 0; i < N_DOUBLE; i++)
+ {err &= DOUBLE_EQUAL(p3w[i], p3r[i]);
+ err &= DOUBLE_EQUAL(p4w[i], p4r[i]);};};
+
+ PRINT(fp, "\n");
+
+ return(err_tot);}
+
+/*--------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------*/
+
+/* TEST_5 - test the PDBLib functions handling indirections and appends
+ * - read and write structures with alignment difficulties
+ * - tests can be targeted
+ */
+
+static int test_5(char *base, char *tgt, int n)
+ {int err;
+ char datfile[MAXLINE], fname[MAXLINE];
+ PDBfile *strm;
+ FILE *fp;
+
+/* target the file as asked */
+ test_target(tgt, base, n, fname, datfile);
+
+ fp = io_open(fname, "w");
+
+ prep_test_5_data();
+
+ if (read_only == FALSE)
+
+/* create the named file */
+ {strm = PD_create(datfile);
+ if (strm == NULL)
+ error(2, fp, "Test couldn't create file %s\r\n", datfile);
+ PRINT(fp, "File %s created\n", datfile);
+
+ strm->previous_file = CSTRSAVE(base);
+
+/* make a few defstructs */
+ PD_defstr(strm, "lev1",
+ "integer *a",
+ "double *b",
+ "char *c",
+ LAST);
+
+/* write the test data */
+ write_test_5_data(strm);
+
+/* close the file */
+ if (PD_close(strm) == FALSE)
+ error(2, fp, "Test couldn't close file %s\r\n", datfile);
+ PRINT(fp, "File %s closed\n", datfile);};
+
+/* reopen the file */
+ strm = PD_open(datfile, "r");
+ if (strm == NULL)
+ error(2, fp, "Test couldn't open file %s\r\n", datfile);
+ PRINT(fp, "File %s opened\n", datfile);
+
+/* read the structs */
+ read_test_5_data(strm);
+
+/* compare the original data with that read in */
+ err = compare_test_5_data(strm, fp);
+
+/* print out the results */
+ print_test_5_data(fp);
+
+/* close the file */
+ if (PD_close(strm) == FALSE)
+ error(2, fp, "Test couldn't close file %s\r\n", datfile);
+ PRINT(fp, "File %s closed\n", datfile);
+
+/* clean up test data memory */
+ cleanup_test_5();
+
+ io_close(fp);
+ if (err)
+ REMOVE(fname);
+
+ return(err);}
+
+/*--------------------------------------------------------------------------*/
+
+/* TEST #6 ROUTINES */
+
+/*--------------------------------------------------------------------------*/
+
+/* PREP_TEST_6_DATA - prepare the test data */
+
+static void prep_test_6_data(void)
+ {int i, n;
+ double *p1, *p2;
+
+ n = 10;
+
+ d61_w = CMAKE(st61);
+ d61_w->n = n;
+
+ d62_w = CMAKE(st62);
+ d62_w->n = n;
+ d62_w->a = CMAKE_N(double, n);
+
+ p1 = d61_w->a;
+ p2 = d62_w->a;
+ for (i = 0; i < n; i++)
+ {p1[i] = 0.1*((double) i);
+ p2[i] = -0.1*((double) i);};
+
+ return;}
+
+/*--------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------*/
+
+/* CLEANUP_TEST_6 - free all known test data memory */
+
+static void cleanup_test_6(void)
+ {
+
+ if (d61_w != NULL)
+ CFREE(d61_w);
+
+ if (d62_w != NULL)
+ {CFREE(d62_w->a);
+ CFREE(d62_w);};
+
+ return;}
+
+/*--------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------*/
+
+/* WRITE_TEST_6_DATA - write out the data into the PDB file */
+
+static void write_test_6_data(PDBfile *strm)
+ {
+
+ if (PD_write(strm, "d61", "st61", d61_w) == 0)
+ error(1, STDOUT, "D61 WRITE FAILED - WRITE_TEST_6_DATA\n");
+
+ if (PD_write(strm, "d62", "st62", d62_w) == 0)
+ error(1, STDOUT, "D62 WRITE FAILED - WRITE_TEST_6_DATA\n");
+
+ return;}
+
+/*--------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------*/
+
+/* READ_TEST_6_DATA - read the test data from the file */
+
+static int read_test_6_data(PDBfile *strm)
+ {int err;
+
+ err = PD_read_as_dwim(strm, "d61.a", "float", 10, d61_a);
+ err = PD_read_as_dwim(strm, "d62.a", "float", 10, d62_a);
+ err = PD_read_as_dwim(strm, "d62.a", "float", 8, d62_s);
+
+ return(err);}
+
+/*--------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------*/
+
+/* PRINT_TEST_6_DATA - print it out to the file */
+
+static void print_test_6_data(FILE *fp)
+ {int i, n;
+
+ n = d61_w->n;
+
+ PRINT(fp, "\n");
+
+ PRINT(fp, "D61 struct member A:\n");
+ for (i = 0; i < n; i++)
+ PRINT(fp, "%3d %5.2f\n", i, d61_a[i]);
+ PRINT(fp, "\n");
+
+ PRINT(fp, "D62 struct member A:\n");
+ for (i = 0; i < n; i++)
+ PRINT(fp, "%3d %5.2f\n", i, d62_a[i]);
+ PRINT(fp, "\n");
+
+ return;}
+
+/*--------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------*/
+
+/* COMPARE_TEST_6_DATA - compare the test data */
+
+static int compare_test_6_data(PDBfile *strm, FILE *fp)
+ {int i, n;
+ int err, err_tot;
+ float fc1, fc2;
+ double *p1w, *p2w;
+ long double fptol[N_PRIMITIVE_FP];
+
+ PD_fp_toler(strm, fptol);
+
+ err_tot = TRUE;
+
+ err = TRUE;
+ p1w = d61_w->a;
+ p2w = d62_w->a;
+
+ n = d61_w->n;
+
+ for (i = 0; i < n; i++)
+ {fc1 = p1w[i];
+ fc2 = p2w[i];
+ err &= FLOAT_EQUAL(fc1, d61_a[i]);
+ err &= FLOAT_EQUAL(fc2, d62_a[i]);};
+
+ err_tot &= err;
+
+ n -= 2;
+ for (i = 0; i < n; i++)
+ {fc2 = p2w[i];
+ err &= FLOAT_EQUAL(fc2, d62_s[i]);};
+
+ err_tot &= err;
+
+ PRINT(fp, "\n");
+
+ return(err_tot);}
+
+/*--------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------*/
+
+/* TEST_6 - test the PDBLib function PD_read_as_dwim */
+
+static int test_6(char *base, char *tgt, int n)
+ {int err;
+ char datfile[MAXLINE], fname[MAXLINE];
+ PDBfile *strm;
+ FILE *fp;
+
+/* target the file as asked */
+ test_target(tgt, base, n, fname, datfile);
+
+ fp = io_open(fname, "w");
+
+ prep_test_6_data();
+
+ if (read_only == FALSE)
+
+/* create the named file */
+ {strm = PD_create(datfile);
+ if (strm == NULL)
+ error(2, fp, "Test couldn't create file %s\r\n", datfile);
+ PRINT(fp, "File %s created\n", datfile);
+
+/* make a few defstructs */
+ PD_defstr(strm, "st61",
+ "int n",
+ "double a[10]",
+ LAST);
+
+ PD_defstr(strm, "st62",
+ "int n",
+ "double *a",
+ LAST);
+
+/* write the test data */
+ write_test_6_data(strm);
+
+/* close the file */
+ if (PD_close(strm) == FALSE)
+ error(2, fp, "Test couldn't close file %s\r\n", datfile);
+ PRINT(fp, "File %s closed\n", datfile);};
+
+/* reopen the file */
+ strm = PD_open(datfile, "r");
+ if (strm == NULL)
+ error(2, fp, "Test couldn't open file %s\r\n", datfile);
+ PRINT(fp, "File %s opened\n", datfile);
+
+/* read the structs */
+ read_test_6_data(strm);
+
+/* compare the original data with that read in */
+ err = compare_test_6_data(strm, fp);
+
+/* print out the results */
+ print_test_6_data(fp);
+
+/* close the file */
+ if (PD_close(strm) == FALSE)
+ error(2, fp, "Test couldn't close file %s\r\n", datfile);
+ PRINT(fp, "File %s closed\n", datfile);
+
+/* clean up test data memory */
+ cleanup_test_6();
+
+ io_close(fp);
+ if (err)
+ REMOVE(fname);
+
+ return(err);}
+
+/*--------------------------------------------------------------------------*/
+
+/* TEST #7 ROUTINES */
+
+/*--------------------------------------------------------------------------*/
+
+/* PREP_TEST_7_DATA - prepare the test data */
+
+static void prep_test_7_data(void)
+ {int i, n;
+
+ n = 10;
+
+ d71_w.a = CMAKE_N(double, n);
+ d71_w_save.a = CMAKE_N(double, n);
+ d72_w.a = CMAKE_N(double, n);
+
+ d71_w.n = n;
+ d71_w_save.n = n;
+ d72_w.n = n;
+
+ for (i = 0; i < n; i++)
+ {d71_w.a[i] = d71_w_save.a[i] = (double)i;
+ d72_w.a[i] = (double)i * 10.0;}
+
+ return;}
+
+/*--------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------*/
+
+/* CLEANUP_TEST_7 - free all known test data memory */
+
+static void cleanup_test_7(void)
+ {
+
+ CFREE(d71_w.a);
+ CFREE(d71_w_save.a);
+ CFREE(d72_w.a);
+ CFREE(d71_r.a);
+ CFREE(d72_r.a);
+
+ return;}
+
+/*--------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------*/
+
+/* WRITE_TEST_7_DATA - write out the data into the PDB file */
+
+static void write_test_7_data(PDBfile *strm)
+ {int i;
+
+ if (PD_write(strm, "d71", "st62", &d71_w) == 0)
+ error(1, STDOUT, "D71 WRITE FAILED - WRITE_TEST_7_DATA\n");
+
+/* reuse an area of memory to test PD_TRACK_POINTERS */
+ for (i = 0; i < d71_w.n; i++)
+ d71_w.a[i] = (double) i * 10.0;
+
+ if (PD_write(strm, "d72", "st62", &d71_w) == 0)
+ error(1, STDOUT, "D72 WRITE FAILED - WRITE_TEST_7_DATA\n");
+
+ return;}
+
+/*--------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------*/
+
+/* READ_TEST_7_DATA - read the test data from the file */
+
+static int read_test_7_data(PDBfile *strm)
+ {int err;
+
+ err = PD_read(strm, "d71", &d71_r);
+ err = PD_read(strm, "d72", &d72_r);
+
+ return(err);}
+
+/*--------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------*/
+
+/* PRINT_TEST_7_DATA - print it out to the file */
+
+static void print_test_7_data(FILE *fp)
+ {int i, n;
+
+ n = d71_w.n;
+
+ PRINT(fp, "\n");
+
+ PRINT(fp, "D71 struct member A:\n");
+ for (i = 0; i < n; i++)
+ PRINT(fp, "%3d %5.2f\n", i, d71_r.a[i]);
+ PRINT(fp, "\n");
+
+ PRINT(fp, "D72 struct member A:\n");
+ for (i = 0; i < n; i++)
+ PRINT(fp, "%3d %5.2f\n", i, d72_r.a[i]);
+ PRINT(fp, "\n");
+
+ return;}
+
+/*--------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------*/
+
+/* COMPARE_TEST_7_DATA - compare the test data */
+
+static int compare_test_7_data(PDBfile *strm, FILE *fp)
+ {int i, n;
+ int err, err_tot;
+ float fc1, fc2;
+ double *p1w, *p2w;
+ long double fptol[N_PRIMITIVE_FP];
+
+ PD_fp_toler(strm, fptol);
+
+ err_tot = TRUE;
+
+ err = TRUE;
+ p1w = d71_w_save.a;
+ p2w = d72_w.a;
+
+ n = d71_w.n;
+
+ for (i = 0; i < n; i++)
+ {fc1 = p1w[i];
+ fc2 = p2w[i];
+ err &= FLOAT_EQUAL(fc1, d71_r.a[i]);
+ err &= FLOAT_EQUAL(fc2, d72_r.a[i]);};
+
+ err_tot &= err;
+
+ PRINT(fp, "\n");
+
+ return(err_tot);}
+
+/*--------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------*/
+
+/* TEST_7 - test the PDBLib pointer tracking */
+
+static int test_7(char *base, char *tgt, int n)
+ {int err;
+ char datfile[MAXLINE], fname[MAXLINE];
+ PDBfile *strm;
+ FILE *fp;
+
+/* target the file as asked */
+ test_target(tgt, base, n, fname, datfile);
+
+ fp = io_open(fname, "w");
+
+ prep_test_7_data();
+
+ if (read_only == FALSE)
+
+/* create the named file */
+ {strm = PD_create(datfile);
+ if (strm == NULL)
+ error(2, fp, "Test couldn't create file %s\r\n", datfile);
+ PRINT(fp, "File %s created\n", datfile);
+
+/* make a few defstructs */
+ PD_defstr(strm, "st62",
+ "int n",
+ "double *a",
+ LAST);
+
+/* turn off pointer tracking */
+ PD_set_track_pointers(strm, FALSE);
+
+/* write the test data */
+ write_test_7_data(strm);
+
+/* close the file */
+ if (PD_close(strm) == FALSE)
+ error(2, fp, "Test couldn't close file %s\r\n", datfile);
+ PRINT(fp, "File %s closed\n", datfile);};
+
+/* reopen the file */
+ strm = PD_open(datfile, "r");
+ if (strm == NULL)
+ error(2, fp, "Test couldn't open file %s\r\n", datfile);
+ PRINT(fp, "File %s opened\n", datfile);
+
+/* read the structs */
+ read_test_7_data(strm);
+
+/* compare the original data with that read in */
+ err = compare_test_7_data(strm, fp);
+
+/* print out the results */
+ print_test_7_data(fp);
+
+/* close the file */
+ if (PD_close(strm) == FALSE)
+ error(2, fp, "Test couldn't close file %s\r\n", datfile);
+ PRINT(fp, "File %s closed\n", datfile);
+
+/* clean up test data memory */
+ cleanup_test_7();
+
+ io_close(fp);
+ if (err)
+ REMOVE(fname);
+
+ return(err);}
+
+/*--------------------------------------------------------------------------*/
+
+/* TEST #8 ROUTINES */
+
+/*--------------------------------------------------------------------------*/
+
+/* PREP_TEST_8_DATA - prepare the test data */
+
+static void prep_test_8_data(void)
+ {int i, j, n, m;
+
+ n = 10;
+ m = 2*n;
+
+ d8_w = CMAKE_N(double, n);
+ d8a_r = CMAKE_N(double, m);
+ d8b_r = CMAKE_N(double, m);
+ d8c_r = CMAKE_N(double, m);
+ d8d_r = CMAKE_N(double, m);
+
+ for (i = 0; i < n; i++)
+ {j = i + 1;
+ d8_w[i] = (double) (j * j);};
+
+ for (i = 0; i < m; i++)
+ {d8a_r[i] = 0.0;
+ d8b_r[i] = 0.0;
+ d8c_r[i] = 0.0;
+ d8d_r[i] = 0.0;};
+
+ return;}
+
+/*--------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------*/
+
+/* CLEANUP_TEST_8 - free all known test data memory */
+
+static void cleanup_test_8(void)
+ {
+
+ CFREE(d8_w);
+ CFREE(d8a_r);
+ CFREE(d8b_r);
+ CFREE(d8c_r);
+ CFREE(d8d_r);
+
+ return;}
+
+/*--------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------*/
+
+/* WRITE_TEST_8_DATA - write out the data into the PDB file */
+
+static void write_test_8_data(PDBfile *strm)
+ {long ind[4];
+
+ if (PD_write(strm, "d8a[10]", "double", d8_w) == 0)
+ error(1, STDOUT, "D8A WRITE FAILED - WRITE_TEST_8_DATA\n");
+
+#ifdef PDB_LITE
+ ind[0] = 1L;
+ ind[1] = 10L;
+ if (PD_defent_alt(strm, "d8b", "double", 1, ind) == 0)
+#else
+ if (PD_defent(strm, "d8b[1,10]", "double") == 0)
+#endif
+ error(1, STDOUT, "D8B DEFENT FAILED - WRITE_TEST_8_DATA\n");
+
+ if (PD_write(strm, "d8b[0,0:9]", "double", d8_w) == 0)
+ error(1, STDOUT, "D8B WRITE FAILED - WRITE_TEST_8_DATA\n");
+
+#ifdef PDB_LITE
+ ind[0] = 0L;
+ ind[1] = 10L;
+ if (PD_defent_alt(strm, "d8c", "double", 1, ind) == 0)
+#else
+ if (PD_defent(strm, "d8c[0,10]", "double") == 0)
+#endif
+ error(1, STDOUT, "D8C DEFENT FAILED - WRITE_TEST_8_DATA\n");
+
+ ind[0] = 1L;
+ ind[1] = 0L;
+ ind[2] = 0L;
+ ind[3] = 9L;
+ if (PD_defent_alt(strm, "d8d", "double", 2, ind) == 0)
+ error(1, STDOUT, "D8D DEFENT FAILED - WRITE_TEST_8_DATA\n");
+
+ return;}
+
+/*--------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------*/
+
+/* APPEND_TEST_8_DATA - append to the data in the PDB file */
+
+static void append_test_8_data(PDBfile *strm)
+ {
+
+ if (PD_append(strm, "d8a[10:19]", d8_w) == 0)
+ error(1, STDOUT, "D8A APPEND FAILED - WRITE_TEST_8_DATA\n");
+
+#ifndef PDB_LITE
+ if (PD_append(strm, "d8b[1:1,0:9]", d8_w) == 0)
+ error(1, STDOUT, "D8B APPEND FAILED - WRITE_TEST_8_DATA\n");
+#endif
+
+ if (PD_append(strm, "d8c[0:0,0:9]", d8_w) == 0)
+ error(1, STDOUT, "D8C APPEND FAILED - WRITE_TEST_8_DATA\n");
+
+ if (PD_append(strm, "d8d[0:0,0:9]", d8_w) == 0)
+ error(1, STDOUT, "D8D APPEND FAILED - WRITE_TEST_8_DATA\n");
+
+ return;}
+
+/*--------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------*/
+
+/* READ_TEST_8_DATA - read the test data from the file */
+
+static int read_test_8_data(PDBfile *strm)
+ {int err;
+
+ err = PD_read(strm, "d8a", d8a_r);
+ err = PD_read(strm, "d8b", d8b_r);
+ err = PD_read(strm, "d8c", d8c_r);
+ err = PD_read(strm, "d8d", d8d_r);
+
+ return(err);}
+
+/*--------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------*/
+
+/* PRINT_TEST_8_DATA - print it out to the file */
+
+static void print_test_8_data(FILE *fp)
+ {int i, n;
+
+ n = 20;
+
+ PRINT(fp, "\n");
+
+ PRINT(fp, "D8A:\n");
+ for (i = 0; i < n; i++)
+ PRINT(fp, "%3d %11.4e %11.4e %11.4e\n",
+ i, d8a_r[i], d8b_r[i], d8c_r[i]);
+ PRINT(fp, "\n");
+
+ return;}
+
+/*--------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------*/
+
+/* COMPARE_TEST_8_DATA - compare the test data */
+
+static int compare_test_8_data(PDBfile *strm, FILE *fp)
+ {int i, n;
+ int err, err_tot;
+ double wc, arc, brc, crc, drc;
+ long double fptol[N_PRIMITIVE_FP];
+
+ PD_fp_toler(strm, fptol);
+
+ err_tot = TRUE;
+ err = TRUE;
+ n = 10;
+
+ for (i = 0; i < n; i++)
+ {wc = d8_w[i];
+ arc = d8a_r[i];
+ brc = d8b_r[i];
+ crc = d8c_r[i];
+ drc = d8d_r[i];
+
+ err &= DOUBLE_EQUAL(wc, arc);
+ err &= DOUBLE_EQUAL(wc, brc);
+ err &= DOUBLE_EQUAL(wc, crc);
+ err &= DOUBLE_EQUAL(wc, drc);};
+
+ for (i = 0; i < n; i++)
+ {wc = d8_w[i];
+ arc = d8a_r[n+i];
+ brc = d8b_r[n+i];
+
+ err &= DOUBLE_EQUAL(wc, arc);
+ err &= DOUBLE_EQUAL(wc, brc);};
+
+ err_tot &= err;
+
+ PRINT(fp, "\n");
+
+ return(err_tot);}
+
+/*--------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------*/
+
+/* TEST_8 - test the PDBLib defent and append logic */
+
+static int test_8(char *base, char *tgt, int n)
+ {int err;
+ char datfile[MAXLINE], fname[MAXLINE];
+ PDBfile *strm;
+ FILE *fp;
+
+/* target the file as asked */
+ test_target(tgt, base, n, fname, datfile);
+
+ fp = io_open(fname, "w");
+
+ prep_test_8_data();
+
+ if (read_only == FALSE)
+
+/* create the named file */
+ {strm = PD_create(datfile);
+ if (strm == NULL)
+ error(2, fp, "Test couldn't create file %s\r\n", datfile);
+ PRINT(fp, "File %s created\n", datfile);
+
+/* write the test data */
+ write_test_8_data(strm);
+
+/* append the test data */
+ append_test_8_data(strm);
+
+/* close the file */
+ if (PD_close(strm) == FALSE)
+ error(2, fp, "Test couldn't close file %s\r\n", datfile);
+ PRINT(fp, "File %s closed\n", datfile);};
+
+/* reopen the file */
+ strm = PD_open(datfile, "r");
+ if (strm == NULL)
+ error(2, fp, "Test couldn't open file %s\r\n", datfile);
+ PRINT(fp, "File %s opened\n", datfile);
+
+/* read the structs */
+ read_test_8_data(strm);
+
+/* compare the original data with that read in */
+ err = compare_test_8_data(strm, fp);
+
+/* print out the results */
+ print_test_8_data(fp);
+
+/* close the file */
+ if (PD_close(strm) == FALSE)
+ error(2, fp, "Test couldn't close file %s\r\n", datfile);
+ PRINT(fp, "File %s closed\n", datfile);
+
+/* clean up test data memory */
+ cleanup_test_8();
+
+ io_close(fp);
+ if (err)
+ REMOVE(fname);
+
+ return(err);}
+
+/*--------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------*/
+
+/* TEST_9 - test the PDBLib checksum logic */
+
+static int test_9(char *base, char *tgt, int n)
+ {int err, status, var;
+ char datfile[MAXLINE], fname[MAXLINE];
+ PDBfile *file;
+ FILE *fp;
+
+ err = TRUE;
+ var = 42;
+
+/* target the file as asked */
+ test_target(tgt, base, n, fname, datfile);
+
+ fp = io_open(fname, "w");
+
+ if (tgt != NULL)
+ snprintf(datfile, MAXLINE, "%s-%s.db9a", base, tgt);
+ else
+ snprintf(datfile, MAXLINE, "%s-nat.db9a", base);
+
+ if (read_only == FALSE)
+
+/* create the named file */
+ {file = PD_create(datfile);
+ if (file == NULL)
+ error(2, fp, "Test couldn't create file %s\r\n", datfile);
+ PRINT(fp, "File %s created\n", datfile);
+
+/* turn on the checksum logic */
+ PD_activate_cksum(file, PD_MD5_FILE);
+ PD_write(file, "test", "int", &var);
+ PD_close(file);};
+
+/* reopen the file and see if the checksum is valid */
+ file = PD_open(datfile, "a");
+ if (file == NULL)
+ error(2, fp, "Test couldn't open file %s\r\n", datfile);
+ PRINT(fp, "File %s reopened\n", datfile);
+
+ PD_activate_cksum(file, PD_MD5_FILE);
+
+/* make sure the checksum checks out */
+ status = PD_verify(file);
+
+ if (status != TRUE)
+ err = FALSE;
+ else
+ PRINT(fp, "File %s verified\n", datfile);
+
+ PD_close(file);
+
+ if (tgt != NULL)
+ snprintf(datfile, MAXLINE, "%s-%s.db9b", base, tgt);
+ else
+ snprintf(datfile, MAXLINE, "%s-nat.db9b", base);
+
+ if (read_only == FALSE)
+
+/* do it again, except this time, don't activate the checksum
+ * create the named file
+ */
+ {file = PD_create(datfile);
+ if (file == NULL)
+ error(2, fp, "Test couldn't create file %s\r\n", datfile);
+ PRINT(fp, "File %s created\n", datfile);
+
+/* leave the checksum logic off */
+ PD_write(file, "test", "int", &var);
+ PD_close(file);};
+
+/* reopen the file and see if the checksum is valid */
+ file = PD_open(datfile, "a");
+ if (file == NULL)
+ error(2, fp, "Test couldn't open file %s\r\n", datfile);
+ PRINT(fp, "File %s reopened\n", datfile);
+
+ PD_activate_cksum(file, PD_MD5_FILE);
+
+/* make sure it returns -1 meaning integrity cannot be determined */
+ status = PD_verify(file);
+
+ if (status != -1)
+ err = FALSE;
+ else
+ PRINT(fp, "File %s cannot be verified (as expected)\n", datfile);
+
+ PD_close(file);
+
+ io_close(fp);
+ if (err)
+ REMOVE(fname);
+
+ return(err);}
+
+/*--------------------------------------------------------------------------*/
+
+/* TEST #10 ROUTINES */
+
+#ifdef HAVE_ANSI_FLOAT16
+
+#define QUAD_EQUAL(q1, q2) (PM_qvalue_compare(q1, q2, fptol[2]) == 0)
+
+/*--------------------------------------------------------------------------*/
+
+/* PREP_TEST_10_DATA - prepare the test data */
+
+static void prep_test_10_data(void)
+ {int i;
+
+/* set scalars */
+ qs_r = 0.0L;
+ qs_w = expl(1.0);
+ qs_w = 2.0L;
+
+/* set long double array */
+ for (i = 0; i < N_FLOAT; i++)
+ {qa_w[i] = POWL(qs_w, (long double) (i+1));
+ qa_r[i] = 0.0L;};
+
+ return;}
+
+/*--------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------*/
+
+/* WRITE_TEST_10_DATA - write out the data into the PDB file */
+
+static void write_test_10_data(PDBfile *strm)
+ {long ind[6];
+
+/* write scalars into the file */
+ if (PD_write(strm, "qs", "long_double", &qs_w) == 0)
+ error(1, STDOUT, "QS WRITE FAILED - WRITE_TEST_10_DATA\n");
+
+/* write primitive arrays into the file */
+ ind[0] = 0L;
+ ind[1] = N_FLOAT - 1;
+ ind[2] = 1L;
+ if (PD_write_alt(strm, "qa", "long_double", qa_w, 1, ind) == 0)
+ error(1, STDOUT, "DA WRITE FAILED - WRITE_TEST_10_DATA\n");
+
+ return;}
+
+/*--------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------*/
+
+/* READ_TEST_10_DATA - read the test data from the file */
+
+static int read_test_10_data(PDBfile *strm)
+ {int err;
+
+/* read the scalar data from the file */
+ err = PD_read(strm, "qs", &qs_r);
+
+/* read the primitive arrays from the file */
+ err = PD_read(strm, "qa", qa_r);
+
+ return(err);}
+
+/*--------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------*/
+
+/* PRINT_TEST_10_DATA - print it out to STDOUT */
+
+static void print_test_10_data(FILE *fp)
+ {int i;
+
+ PRINT(fp, "long double scalar: qs = %14.6Le\n", qs_r);
+
+/* print long double array */
+ PRINT(fp, "long double array:\n");
+ for (i = 0; i < N_FLOAT; i++)
+ PRINT(fp, " qa[%d] = %14.6Le\n", i, qa_r[i]);
+
+ PRINT(fp, "\n");
+
+ return;}
+
+/*--------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------*/
+
+/* COMPARE_TEST_10_DATA - compare the test data */
+
+static int compare_test_10_data(PDBfile *strm, FILE *fp)
+ {int i, err, err_tot;
+ long double fptol[N_PRIMITIVE_FP];
+
+ PD_fp_toler(strm, fptol);
+
+ err_tot = TRUE;
+
+/* compare scalars */
+ err = TRUE;
+
+ err &= QUAD_EQUAL(qs_r, qs_w);
+
+ if (err)
+ PRINT(fp, "Scalars compare\n");
+ else
+ PRINT(fp, "Scalars differ\n");
+ err_tot &= err;
+
+/* compare long double array */
+ for (i = 0; i < N_FLOAT; i++)
+ err &= QUAD_EQUAL(qa_r[i], qa_w[i]);
+
+ if (err)
+ PRINT(fp, "Arrays compare\n");
+ else
+ PRINT(fp, "Arrays differ\n");
+ err_tot &= err;
+
+ return(err_tot);}
+
+/*--------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------*/
+
+/* TEST_10 - test the long double support in PDBLib
+ * -
+ * - read and write scalars and arrays of long doubles
+ * -
+ * - tests can be targeted
+ */
+
+static int test_10(char *base, char *tgt, int n)
+ {int err;
+ char datfile[MAXLINE], fname[MAXLINE];
+ PDBfile *strm;
+ FILE *fp;
+
+/* target the file as asked */
+ test_target(tgt, base, 100+n, fname, datfile);
+
+ fp = io_open(fname, "w");
+
+ prep_test_10_data();
+
+ if (read_only == FALSE)
+
+/* create the named file */
+ {strm = PD_create(datfile);
+ if (strm == NULL)
+ error(1, fp, "Test couldn't create file %s\r\n", datfile);
+ PRINT(fp, "File %s created\n", datfile);
+
+/* write the test data */
+ write_test_10_data(strm);
+
+/* close the file */
+ if (PD_close(strm) == FALSE)
+ error(1, fp, "Test couldn't close file %s\r\n", datfile);
+ PRINT(fp, "File %s closed\n", datfile);};
+
+/* reopen the file */
+ strm = PD_open(datfile, "r");
+ if (strm == NULL)
+ error(1, fp, "Test couldn't open file %s\r\n", datfile);
+ PRINT(fp, "File %s opened\n", datfile);
+
+/* dump the symbol table */
+ dump_test_symbol_table(fp, strm->symtab, 1);
+
+/* read the data from the file */
+ read_test_10_data(strm);
+
+/* compare the original data with that read in */
+ err = compare_test_10_data(strm, fp);
+
+/* close the file */
+ if (PD_close(strm) == FALSE)
+ error(1, fp, "Test couldn't close file %s\r\n", datfile);
+ PRINT(fp, "File %s closed\n", datfile);
+
+/* print it out to STDOUT */
+ print_test_10_data(fp);
+
+ io_close(fp);
+ if (err)
+ REMOVE(fname);
+
+ return(err);}
+
+/*--------------------------------------------------------------------------*/
+
+#else
+
+/*--------------------------------------------------------------------------*/
+
+/* TEST_10 - stub for when there is no long double support */
+
+static int test_10(char *base, char *tgt, int n)
+ {
+
+ return(TRUE);}
+
+/*--------------------------------------------------------------------------*/
+
+#endif
+
+/* DRIVER ROUTINES */
+
+/*--------------------------------------------------------------------------*/
+
+/* RUN_TEST - run a particular test through all targeting modes
+ * - return the number of tests that fail
+ */
+
+static int run_test(PFTest test, int n, char *host, int native)
+ {int i, m, rv, cs, fail;
+ int64_t bytaa=0, bytfa=0, bytab=0, bytfb=0;
+ char msg[MAXLINE];
+ char *nm;
+ double time;
+ static int dbg = 0;
+
+ if (debug_mode)
+ dbg = 2;
+
+/* NOTE: under the debugger set dbg to 1 or 2 for additional
+ * memory leak monitoring
+ */
+ cs = SC_mem_monitor(-1, dbg, "B", msg);
+
+ SC_mem_stats(&bytab, &bytfb, NULL, NULL);
+
+ time = SC_wall_clock_time();
+
+ fail = 0;
+
+ if (native == FALSE)
+ {m = PD_target_n_platforms();
+ for (i = 0; i < m; i++)
+ {rv = PD_target_platform_n(i);
+ SC_ASSERT(rv == TRUE);
+
+ nm = PD_target_platform_name(i);
+ if ((*test)(host, nm, n) == FALSE)
+ {PRINT(STDOUT, "Test #%d %s failed\n", n, nm);
+ fail++;};};};
+
+/* native test */
+ if ((*test)(host, NULL, n) == FALSE)
+ {PRINT(STDOUT, "Test #%d native failed\n", n);
+ fail++;};
+
+ SC_mem_stats(&bytaa, &bytfa, NULL, NULL);
+
+ bytaa -= bytab;
+ bytfa -= bytfb;
+ time = SC_wall_clock_time() - time;
+
+ cs = SC_mem_monitor(cs, dbg, "B", msg);
+
+ PRINT(STDOUT,
+ "\t\t %3d %8d %8d %7d %.2g\n",
+ n, bytaa, bytfa, bytaa - bytfa, time);
+
+ return(fail);}
+
+/*--------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------*/
+
+/* PRINT_HELP - print a help message */
+
+static void print_help(void)
+ {
+
+ PRINT(STDOUT, "\nPDBTST - run basic PDB test suite\n\n");
+ PRINT(STDOUT, "Usage: pdbtst [-b #] [-c] [-d] [-h] [-n] [-r] [-v #] [-0] [-1] [-2] [-3] [-4] [-5] [-6] [-7] [-8] [-9] [-10]\n");
+ PRINT(STDOUT, "\n");
+ PRINT(STDOUT, " b - set buffer size (default no buffering)\n");
+ PRINT(STDOUT, " c - verify low level writes\n");
+ PRINT(STDOUT, " d - turn on debug mode to display memory maps\n");
+ PRINT(STDOUT, " h - print this help message and exit\n");
+ PRINT(STDOUT, " n - run native mode test only\n");
+ PRINT(STDOUT, " r - read only (assuming files from other run exist)\n");
+ PRINT(STDOUT, " v - use format version # (default is 2)\n");
+ PRINT(STDOUT, " 0 - do NOT run test #0\n");
+ PRINT(STDOUT, " 1 - do NOT run test #1\n");
+ PRINT(STDOUT, " 2 - do NOT run test #2\n");
+ PRINT(STDOUT, " 3 - do NOT run test #3\n");
+ PRINT(STDOUT, " 4 - do NOT run test #4\n");
+ PRINT(STDOUT, " 5 - do NOT run test #5\n");
+ PRINT(STDOUT, " 6 - do NOT run test #6\n");
+ PRINT(STDOUT, " 7 - do NOT run test #7\n");
+ PRINT(STDOUT, " 8 - do NOT run test #8\n");
+ PRINT(STDOUT, " 9 - do NOT run test #9\n");
+ PRINT(STDOUT, " 10 - do NOT run test #10\n");
+ PRINT(STDOUT, "\n");
+
+ return;}
+
+/*--------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------*/
+
+/* MAIN - test the PDB Library system */
+
+int main(int c, char **v)
+ {int i, err;
+ int test_zero, test_one, test_two, test_three;
+ int test_four, test_five, test_six, test_seven;
+ int test_eight, test_nine, test_ten;
+ int use_mapped_files, check_writes;
+ int64_t bfsz;
+
+ setvbuf(STDOUT, 0, _IONBF, 0);
+
+ if (chdir(DATDIR) == 0)
+ {
+ DIR *ddir;
+ struct dirent *dent;
+
+ ddir = opendir(".");
+ while (dent = readdir(ddir))
+ {
+ if (dent->d_name[0] == '.') continue;
+ SC_ASSERT(REMOVE(dent->d_name)==0);
+ }
+ closedir(ddir);
+ SC_ASSERT(chdir("..")==0);
+ SC_ASSERT(rmdir(DATDIR)==0);
+ }
+ SC_ASSERT(mkdir(DATDIR,S_IRWXU|S_IRWXG|S_IROTH|S_IXOTH)==0);
+ SC_ASSERT(chdir(DATDIR)==0);
+
+ PD_init_threads(0, NULL);
+
+ SC_bf_set_hooks();
+ SC_zero_space_n(1, -2);
+
+ bfsz = -1;
+ bfsz = 100000;
+ check_writes = FALSE;
+ debug_mode = FALSE;
+ native_only = FALSE;
+ read_only = FALSE;
+ use_mapped_files = FALSE;
+ test_zero = TRUE;
+ test_one = TRUE;
+ test_two = TRUE;
+ test_three = TRUE;
+ test_four = TRUE;
+ test_five = TRUE;
+ test_six = TRUE;
+ test_seven = TRUE;
+ test_eight = TRUE;
+ test_nine = TRUE;
+ test_ten = TRUE;
+#ifdef PDB_LITE
+ test_six = FALSE; /* PDB Lite has no read_as_dwim method */
+ test_eight = FALSE; /* PDB Lite can't handle the append modes */
+ test_nine = FALSE; /* PDB Lite doesn't have checksums */
+#endif
+ for (i = 1; i < c; i++)
+ {if (v[i][0] == '-')
+ {switch (v[i][1])
+ {case 'b' :
+ bfsz = SC_stoi(v[++i]);
+ break;
+ case 'c' :
+ check_writes = TRUE;
+ break;
+ case 'd' :
+ debug_mode = TRUE;
+ break;
+ case 'h' :
+ print_help();
+ return(1);
+ case 'm' :
+ use_mapped_files = TRUE;
+ break;
+ case 'n' :
+ native_only = TRUE;
+ break;
+ case 'r' :
+ read_only = TRUE;
+ break;
+ case 'v' :
+ PD_set_fmt_version(SC_stoi(v[++i]));
+ break;
+ case '0' :
+ test_zero = FALSE;
+ break;
+ case '1' :
+ if (v[i][2] == '0')
+ test_ten = FALSE;
+ else
+ test_one = FALSE;
+ break;
+ case '2' :
+ test_two = FALSE;
+ break;
+ case '3' :
+ test_three = FALSE;
+ break;
+ case '4' :
+ test_four = FALSE;
+ break;
+ case '5' :
+ test_five = FALSE;
+ break;
+ case '6' :
+ test_six = FALSE;
+ break;
+ case '7' :
+ test_seven = FALSE;
+ break;
+ case '8' :
+ test_eight = FALSE;
+ break;
+ case '9' :
+ test_nine = FALSE;
+ break;};}
+ else
+ break;};
+
+ PD_set_io_hooks(use_mapped_files);
+ PD_verify_writes(check_writes);
+
+ PD_set_buffer_size(bfsz);
+
+ SC_signal(SIGINT, SIG_DFL);
+
+/* force allocation of permanent memory outside of memory monitors */
+ PD_open_vif("foo");
+
+ PRINT(STDOUT, "\n");
+ PRINT(STDOUT, "\t\t Memory Time\n");
+ PRINT(STDOUT, "\t\t (bytes) (secs)\n");
+ PRINT(STDOUT, "\t\t Test Allocated Freed Diff\n");
+
+ err = 0;
+
+ if (test_zero)
+ err += run_test(test_0, 0, DATFILE, TRUE);
+ if (test_one)
+ err += run_test(test_1, 1, DATFILE, native_only);
+ if (test_two)
+ err += run_test(test_2, 2, DATFILE, native_only);
+ if (test_three)
+ err += run_test(test_3, 3, DATFILE, native_only);
+ if (test_four)
+ err += run_test(test_4, 4, DATFILE, native_only);
+ if (test_five)
+ err += run_test(test_5, 5, DATFILE, native_only);
+ if (test_six)
+ err += run_test(test_6, 6, DATFILE, native_only);
+ if (test_seven)
+ err += run_test(test_7, 7, DATFILE, native_only);
+ if (test_eight)
+ err += run_test(test_8, 8, DATFILE, native_only);
+ if (test_nine)
+ err += run_test(test_9, 9, DATFILE, native_only);
+ if (test_ten)
+ err += run_test(test_10, 10, DATFILE, native_only);
+
+ PRINT(STDOUT, "\n");
+
+ return(err);}
+
+/*--------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------*/
diff --git a/tests/point.c b/tests/point.c
index 43e2a79..50dee94 100644
--- a/tests/point.c
+++ b/tests/point.c
@@ -390,6 +390,7 @@ build_point(DBfile *dbfile, char *name, int N, int dims)
build_defvars(dbfile, dims);
DBFreeOptlist(optlist);
+ DBFreeOptlist(optlist1);
FREE(x);
FREE(y);
FREE(z);
@@ -399,6 +400,7 @@ build_point(DBfile *dbfile, char *name, int N, int dims)
FREE(d);
FREE(t);
FREE(itype);
+ FREE(litype);
}
static void
diff --git a/tests/pointf77.f b/tests/pointf77.f
index 02362c1..9f2da00 100644
--- a/tests/pointf77.f
+++ b/tests/pointf77.f
@@ -97,12 +97,20 @@ c ..Don't forget to include this file!
include "silo.inc"
integer dirid, dbid, meshid, varid, silo_id, optlistid
- integer varid1
+ integer varid1, driver, nargs
real x(5), y(5), z(5), foo(5)
real d(5), ttime
integer itype(5), tcycle
real ftype(5)
double precision dttime
+ character*256 cloption
+
+ driver = DB_PDB
+ nargs = iargc()
+ call getarg(1, cloption)
+ if (cloption .eq. "DB_HDF5") then
+ driver = DB_HDF5
+ end if
c...Generate some data to write out.
@@ -124,12 +132,12 @@ c...Generate some data to write out.
dttime = 0.123
c...Create the file (using the SILO interface)
- ierr = dbcreate ("pointf77.pdb", 12, DB_CLOBBER, DB_LOCAL,
- . "file info goes here", 19, DB_PDB, dbid)
+ ierr = dbcreate ("pointf77.silo", 13, DB_CLOBBER, DB_LOCAL,
+ . "file info goes here", 19, driver, dbid)
if (ierr .ne. 0) then
print *, 'dbcreate had error'
else
- print *, 'created file pointf77.pdb'
+ print *, 'created file pointf77.silo'
endif
c...Create an option list containing time and cyle info.
diff --git a/tests/polyzl.c b/tests/polyzl.c
index c72088b..f82ff98 100644
--- a/tests/polyzl.c
+++ b/tests/polyzl.c
@@ -155,6 +155,8 @@ main(int argc, char *argv[])
DBClose(dbfile);
+ DBFreeOptlist(optlist);
+
CleanupDriverStuff();
return 0;
diff --git a/tests/quadf77.f b/tests/quadf77.f
index b775f96..dbcb65d 100644
--- a/tests/quadf77.f
+++ b/tests/quadf77.f
@@ -78,14 +78,22 @@ c...............................................................................
include "silo.inc"
integer buildquad
- integer dbid, meshid, err
+ integer dbid, meshid, err, driver, nargs
integer iarr(20)
real*8 darr(20)
character*8 cname
+ character*256 cloption
-c...Create PDB flavor file.
- err = dbcreate("quadf77.pdb", 11, DB_CLOBBER, DB_LOCAL,
- . "file info", 9, DB_PDB, dbid)
+ driver = DB_PDB
+ nargs = iargc()
+ call getarg(1, cloption)
+ if (cloption .eq. "DB_HDF5") then
+ driver = DB_HDF5
+ end if
+
+c...Create file.
+ err = dbcreate("quadf77.silo", 12, DB_CLOBBER, DB_LOCAL,
+ . "file info", 9, driver, dbid)
meshid = buildquad (dbid, "quad", 4)
meshid = buildquad (dbid, "quad2", 5)
@@ -94,13 +102,13 @@ c...Create PDB flavor file.
err = dbclose(dbid)
- print *,'Created file: quadf77.pdb'
+ print *,'Created file: quadf77.silo'
-c...Read PDB stuff.
- err = dbopen ("quadf77.pdb", 11, DB_PDB, DB_READ, dbid)
+c...Read stuff.
+ err = dbopen ("quadf77.silo", 12, driver, DB_READ, dbid)
err = dbrdvar (dbid, "hcom2", 5, iarr)
if (err .ne. 0) print *, 'Error reading hcom2'
diff --git a/tests/rocket.cpp b/tests/rocket.cpp
deleted file mode 100644
index 1b4e3a9..0000000
--- a/tests/rocket.cpp
+++ /dev/null
@@ -1,1750 +0,0 @@
-/*
-Copyright (c) 1994 - 2010, Lawrence Livermore National Security, LLC.
-LLNL-CODE-425250.
-All rights reserved.
-
-This file is part of Silo. For details, see silo.llnl.gov.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
- * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the disclaimer below.
- * Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the disclaimer (as noted
- below) in the documentation and/or other materials provided with
- the distribution.
- * Neither the name of the LLNS/LLNL nor the names of its
- contributors may be used to endorse or promote products derived
- from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL LAWRENCE
-LIVERMORE NATIONAL SECURITY, LLC, THE U.S. DEPARTMENT OF ENERGY OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-This work was produced at Lawrence Livermore National Laboratory under
-Contract No. DE-AC52-07NA27344 with the DOE.
-
-Neither the United States Government nor Lawrence Livermore National
-Security, LLC nor any of their employees, makes any warranty, express
-or implied, or assumes any liability or responsibility for the
-accuracy, completeness, or usefulness of any information, apparatus,
-product, or process disclosed, or represents that its use would not
-infringe privately-owned rights.
-
-Any reference herein to any specific commercial products, process, or
-services by trade name, trademark, manufacturer or otherwise does not
-necessarily constitute or imply its endorsement, recommendation, or
-favoring by the United States Government or Lawrence Livermore
-National Security, LLC. The views and opinions of authors expressed
-herein do not necessarily state or reflect those of the United States
-Government or Lawrence Livermore National Security, LLC, and shall not
-be used for advertising or product endorsement purposes.
-*/
-#ifdef __sgi /* IRIX C++ bug */
-#include <math.h>
-#else
-#include <cmath>
-#endif
-#include <cstdio>
-#include <cstdlib>
-#include <map>
-#include <vector>
-#include <string>
-#include <cstring>
-#include <iostream>
-
-#include <silo.h>
-#include <std.c>
-
-#ifdef HAVE_IMESH
-#include <iBase.h>
-#include <iMesh.h>
-#endif
-
-using std::map;
-using std::vector;
-using std::string;
-using std::cerr;
-using std::endl;
-
-#ifndef M_PI
-#define M_PI 3.14159265358979323846
-#endif
-
-//
-// The following static arrays of data describe a single, 2D, 'layer'
-// of the rocket body. They are used in the build_body() functions to
-// build several layers of the 3D rocket body.
-//
-static const float cX = (float) sqrt(2.0);
-
- // 0 1 2 3 4 5 6 7 8
-static float layerXVals[] = {0.0, -1.0, -1.0, 0.0, 1.0, 1.0, 1.0, 0.0, -1.0,
- // 9 10 11 12 13 14 15 16
- -2.0, -cX, 0.0, cX, 2.0, cX, 0.0, -cX};
-
- // 0 1 2 3 4 5 6 7 8
-static float layerYVals[] = {0.0, 0.0, 1.0, 1.0, 1.0, 0.0, -1.0, -1.0, -1.0,
- // 9 10 11 12 13 14 15 16
- 0.0, cX, 2.0, cX, 0.0, -cX, -2.0, -cX};
-
-const static int layerNNodes = sizeof(layerXVals) / sizeof(layerXVals[0]);
-
- // 0 1 2 3
-static int layerNodelist[] = {0,3,2,1, 0,5,4,3, 7,6,5,0, 8,7,0,1,
- // 4 5 6 7
- 1,2,10,9, 2,3,11,10, 3,4,12,11, 4,5,13,12,
- // 8 9 10 11
- 5,6,14,13, 6,7,15,14, 7,8,16,15, 8,1,9,16};
-
-const static int layerNZones = sizeof(layerNodelist) / (4*sizeof(layerNodelist[0]));
-
-//
-// Material names and numbers
-//
-static int matnos[] = {1,2,3,4,5};
-static char *matNames[] = {"High Explosive", "Solid Propellant",
- "Liquid Propellant", "Electronics", "Body"};
-static map<string, int> matMap;
-
-// global zone ids for which lighting time is a variable
-int ltZones[] = {0,1,2,3};
-
-// global node ids of hold-down points
-static int holdDownNodes[] = {0,2,4,6,8,10,12,14,16};
-
-// boundary conditions on hold-down points (zero accel)
-static float xddHoldDownNodes[] = {0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0};
-static float yddHoldDownNodes[] = {0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0};
-static float zddHoldDownNodes[] = {0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0};
-
-// global node ids of high dynamic pressure points
-static int maxQNodes[] = {43,44,45,46,47,48,49,50,145,146,147,148,149,150,151,152,
- 162,167,168,169,170};
-
-// global node ids of edge endpts for umbilical hookups
-static int umbilicalEdges[] = {66,83, 83,100, 100,117, 117,134};
-static int umbilicalEdgesSizes[] = {2};
-static int umbilicalEdgesShapetypes[] = {DB_ZONETYPE_BEAM};
-static int umbilicalEdgesCounts[] = {4};
-
-// boundary condition on umbilical edges (only z-accel allowed)
-static float xddUmbilicalEdges[] = {0.0,0.0,0.0,0.0};
-static float yddUmbilicalEdges[] = {0.0,0.0,0.0,0.0};
-
-// global node ids of faces in contact with launch tube
-static int launchContactFacesTemplate[4] = {10,27,28,11};
-static int launchContactFaces[32*4];
-static int launchContactFacesSizes[] = {4};
-static int launchContactFacesShapetypes[] = {DB_ZONETYPE_QUAD};
-static int launchContactFacesCounts[] = {32};
-
-// global node ids of control surfaces
-static int controlSurfaceFaces[] = {
- 9,26,167,165, 27,10,163,167, 146,145,154,155,
- 11,28,168,164, 29,12,164,168, 148,147,156,157,
- 13,30,169,165, 150,149,158,159, 31,14,165,169,
- 15,32,170,166, 33,15,166,170, 152,151,160,161,
-
- 26,43,167, 43,44,167, 44,27,167, 155,154,162,
- 28,45,168, 45,46,168, 46,29,168, 157,156,162,
- 30,47,169, 47,48,169, 48,31,169, 159,158,162,
- 32,49,170, 49,50,170, 50,33,170, 161,160,162};
-static int controlSurfaceSizes[] = {4,3};
-static int controlSurfaceShapetypes[] = {DB_ZONETYPE_QUAD, DB_ZONETYPE_TRIANGLE};
-static int controlSurfaceCounts[] = {12,16};
-
-//
-// Bit fields used in enumerating different subsets in the
-// rocket 'assembly'
-//
-#define BOOSTER 0x00000001
-#define NOSE 0x00000002
-#define STAGE1 0x00000004
-#define STAGE2 0x00000008
-#define MIRVS 0x00000010
-#define BUS 0x00000020
-#define STAGE3 0x00000040
-#define FINS 0x00000080
-#define MIRV(I) (0x00000100 << I) // 0 <= I <= 3
-#define FIN(I) (0x00001000 << I) // 0 <= I <= 3
-
-static int assnos[] = {BOOSTER, NOSE, STAGE1, STAGE2, MIRVS, BUS, STAGE3, FINS,
- MIRV(0), MIRV(1), MIRV(2), MIRV(3),
- FIN(0), FIN(1), FIN(2), FIN(3)};
-static char *assNames[] = {"booster","nose","stage_1","stage_2","mirvs","bus","stage_3","fins",
- "mirv_1","mirv_2","mirv_3","mirv_4",
- "fin_1","fin_2","fin_3","fin_4"};
-
-typedef struct _field_t {
- string name;
- int type;
- int cent;
- int ncomps;
- vector<string> compnames;
- vector<void*> data;
-} field_t;
-
-//
-// Global variables used in many of the methods. '_g' in the
-// name indicates a global variable.
-//
-static vector<float> xvals_g, yvals_g, zvals_g;
-static vector<int> nodelist_g;
-static vector<int> matlist_g;
-static vector<int> procid_g;
-static vector<float> nodalv_g;
-static vector<int> bitmap_g;
-static vector<field_t> fields_g;
-
-static int nzones_g = 9 * 12 + 4 + 4 + 4;
-static int zshapetype_g[] = {DB_ZONETYPE_HEX, // main body + inner nose' first layer
- DB_ZONETYPE_PRISM, // outer nose first layer
- DB_ZONETYPE_PYRAMID, // upper layer of nose,
- DB_ZONETYPE_PRISM, // lower parts of each fin
- DB_ZONETYPE_PYRAMID}; // upper parts of each fin
-static int zshapesize_g[] = {8, 6, 5, 6, 5};
-static int zshapecnt_g[] = {8*12+4, 8, 4, 4, 4};
-
-static DBmrgtree *topTree;
-
-#define SET_CLASS_DOMAINS 1
-#define SET_CLASS_MATERIALS 2
-#define SET_CLASS_ASSEMBLY 3
-#define SET_CLASS_NODESETS 4
-#define SET_CLASS_EDGESETS 5
-#define SET_CLASS_FACESETS 6
-
-#ifdef HAVE_IMESH
-#define CheckITAPSError2(IMI, ERR, FN, THELINE, THEFILE) \
- if (ERR != 0) \
- { \
- char msg[1024]; \
- char desc[256]; \
- for (int i = 0; i < sizeof(desc); i++) desc[i] = '\0'; \
- int dummyError = ERR; \
- iMesh_getDescription(IMI, desc, &dummyError, sizeof(desc)); \
- snprintf(msg, sizeof(msg), "Encountered ITAPS error (%d) after call to \"%s\"" \
- " at line %d in file \"%s\"\nThe description is...\n" \
- " \"%s\"\n", ERR, #FN, THELINE, THEFILE, desc); \
- cerr << msg << endl; \
- } \
- else \
- { \
- cerr << "Made it past call to \"" << #FN << "\" at line " \
- << THELINE << " in file " << THEFILE << endl; \
- }
-
-#define CheckITAPSError(FN) CheckITAPSError2(mesh->theMesh, mesh->error, FN, __LINE__, __FILE__)
-#endif
-
-typedef struct siloimesh_struct_t {
- DBfile *dbfile;
-#ifdef HAVE_IMESH
- iMesh_Instance theMesh;
- iBase_EntitySetHandle rootSet;
- iBase_EntitySetHandle cwdSet;
- iBase_EntityHandle *verts;
- iBase_EntityHandle *zones;
- int error;
-#endif
-} siloimesh_struct_t;
-typedef siloimesh_struct_t* siloimesh_t;
-
-//
-// Implement the part of the Silo API we need here but for both Silo
-// and iMesh.
-//
-static void
-SetDir(siloimesh_t mesh, const char *dirname)
-{
- // Check if dir already exists
- if (DBInqVarExists(mesh->dbfile, dirname) == 0)
- DBMkDir(mesh->dbfile, dirname);
-
- // Set the dir
- DBSetDir(mesh->dbfile, dirname);
-
-#if !defined(_WIN32)
-#warning NEED TO IMPLEMENT .. SETTING
-#endif
-
-#ifdef HAVE_IMESH
- // Obtain the SET_NAME tag handle (create if doesn't already exist)
- iBase_TagHandle snTag, scTag;
- iMesh_getTagHandle(mesh->theMesh, "SET_NAME", &snTag, &(mesh->error), 9);
- CheckITAPSError(getTagHandle);
- if (mesh->error != iBase_SUCCESS)
- iMesh_createTag(mesh->theMesh, "SET_NAME", 64, iBase_BYTES,
- &snTag, &(mesh->error), 9);
- iMesh_getTagHandle(mesh->theMesh, "SET_CLASS", &scTag, &(mesh->error), 10);
- CheckITAPSError(getTagHandle);
- if (mesh->error != iBase_SUCCESS)
- iMesh_createTag(mesh->theMesh, "SET_CLASS", 1, iBase_INTEGER,
- &scTag, &(mesh->error), 10);
-
- // Check if ent set already exists
- bool alreadyHaveSet = false;
- iBase_EntitySetHandle theSet;
- iBase_EntitySetHandle *subsets;
- int subsets_alloc = 0, subsets_size = 0;
- iMesh_getEntSets(mesh->theMesh, mesh->cwdSet, 1,
- &subsets, &subsets_alloc, &subsets_size, &(mesh->error));
- CheckITAPSError(getEntSets);
- if (mesh->error == iBase_SUCCESS && subsets_size>0)
- {
- // Loop over all ent sets looking for one whose
- // SET_NAME tag value is same as dirname
- for (int i = 0; i < subsets_size; i++)
- {
- char *sn;
- int sn_alloc = 0, sn_size = 0;
- iMesh_getEntSetData(mesh->theMesh, subsets[i], snTag,
- &sn, &sn_alloc, &sn_size, &(mesh->error));
- CheckITAPSError(getEntSetData);
- if (mesh->error == iBase_SUCCESS &&
- !strncmp(sn, dirname, sn_size))
- {
- alreadyHaveSet = true;
- theSet = subsets[i];
- break;
- }
- }
- }
-
- // If set didn't exist, create it and set its SET_NAME tag
- if (!alreadyHaveSet)
- {
- int setClass = SET_CLASS_DOMAINS;
- char tmp[64];
- memset(tmp, '\0', sizeof(tmp));
- strcpy(tmp, dirname);
- iMesh_createEntSet(mesh->theMesh, 0, &theSet, &(mesh->error));
- CheckITAPSError(createEntSet);
- iMesh_setEntSetData(mesh->theMesh, theSet, snTag,
- tmp, sizeof(tmp), &(mesh->error));
- CheckITAPSError(setEntSetData);
- iMesh_setEntSetIntData(mesh->theMesh, theSet, scTag,
- setClass, &(mesh->error));
- CheckITAPSError(createEntSet);
- }
-
- // Set the cwd set
- mesh->cwdSet = theSet;
-#endif
-}
-
-static void
-PutMesh(siloimesh_t mesh, const char *name, int ndims,
- char *coordnames[], float **coords, int nnodes,
- int nzones, const char *zonel_name, const char *facel_name,
- int datatype, DBoptlist *optlist)
-{
- DBPutUcdmesh(mesh->dbfile, name, ndims, coordnames, coords, nnodes, nzones,
- zonel_name, facel_name, datatype, optlist);
-
-#ifdef HAVE_IMESH
- // Convert coordinate array to an interleaved array that iMesh
- // can understand. Note iBase_INTERLEAVED is probably more
- // portable than iBase_BLOCKED.
- double *imcoords = new double[nnodes*3];
- for (int k = 0; k < nnodes; k++)
- {
- imcoords[3*k+0] = coords[0][k];
- imcoords[3*k+1] = coords[1][k];
- imcoords[3*k+2] = coords[2][k];
- }
- iBase_EntityHandle *vertHdls = new iBase_EntityHandle[nnodes];
- int vertHdls_alloc = nnodes, vertHdls_size = 0;
-
- // Create vertex entities. Note, don't really know in which entity set
- // these wind up getting created. I assume its the root set.
- iMesh_createVtxArr(mesh->theMesh, nnodes, iBase_INTERLEAVED, imcoords, nnodes*3,
- &vertHdls, &vertHdls_alloc, &vertHdls_size, &(mesh->error));
- CheckITAPSError(createVtxArr);
- delete [] imcoords;
-
-#if 0
- // Stick these vertex entities in the cwd set
- iMesh_addEntArrToSet(mesh->theMesh, vertHdls, nnodes, mesh->cwdSet, &(mesh->error));
- CheckITAPSError(addEntArrToSet);
-
- // Remove these entites from the root set
- // Apparently, when the entities are first created, they do not exist in
- // any set in the mesh object. What would happen if you save then? Note
- // that when I save the mesh, even though
- iMesh_rmvEntArrFromSet(mesh->theMesh, vertHdls, nnodes, mesh->rootSet, &(mesh->error));
- CheckITAPSError(rmvEntArrFromSet);
-#endif
- mesh->verts = vertHdls; // Hold on to these for later
-#endif
-}
-
-static void
-PutZonelist(siloimesh_t mesh, const char *name, int nzones, int ndims,
- int *nodelist, int lnodelist, int origin, int lo_offset,
- int hi_offset, int *shapetype, int *shapesize, int *shapecnt,
- int nshapes, DBoptlist *optlist)
-{
- if (name)
- DBPutZonelist2(mesh->dbfile, name, nzones, ndims, nodelist, lnodelist, origin,
- lo_offset, hi_offset, shapetype, shapesize, shapecnt, nshapes, optlist);
-
-#ifdef HAVE_IMESH
- int i, nlidx = 0;
- int zncnt = 0;
- iBase_EntityHandle *vertHdls = mesh->verts;
- iBase_EntityHandle *zoneHdls = new iBase_EntityHandle[nzones];
- for (i = 0; i < nshapes; i++)
- {
- int segnl = shapesize[i] * shapecnt[i];
- iBase_EntityHandle *imvertlist = new iBase_EntityHandle[segnl];
- int *status = new int[segnl];
- int status_alloc = segnl, status_size = 0;
-
- int ent_topo;
- switch (shapetype[i])
- {
- case DB_ZONETYPE_BEAM: ent_topo = iMesh_LINE_SEGMENT; break;
- case DB_ZONETYPE_POLYGON: ent_topo = iMesh_POLYGON; break;
- case DB_ZONETYPE_TRIANGLE: ent_topo = iMesh_TRIANGLE; break;
- case DB_ZONETYPE_QUAD: ent_topo = iMesh_QUADRILATERAL; break;
- case DB_ZONETYPE_POLYHEDRON: ent_topo = iMesh_POLYHEDRON; break;
- case DB_ZONETYPE_TET: ent_topo = iMesh_TETRAHEDRON; break;
- case DB_ZONETYPE_PYRAMID: ent_topo = iMesh_PYRAMID; break;
- case DB_ZONETYPE_PRISM: ent_topo = iMesh_PRISM; break;
- case DB_ZONETYPE_HEX: ent_topo = iMesh_HEXAHEDRON; break;
- }
-
- int segnlidx = 0;
- for (int j = 0; j < shapecnt[i]; j++)
- for (int k = 0; k < shapesize[i]; k++)
- imvertlist[segnlidx++] = vertHdls[nodelist[nlidx++]];
-
- iBase_EntityHandle *pzoneHdls = &zoneHdls[zncnt];
- int zoneHdls_alloc = shapecnt[i], zoneHdls_size = 0;
- iMesh_createEntArr(mesh->theMesh, ent_topo, imvertlist, segnl,
- &pzoneHdls, &zoneHdls_alloc, &zoneHdls_size,
- &status, &status_alloc, &status_size,
- &(mesh->error));
- CheckITAPSError(createEntArr);
-
- delete [] imvertlist;
- delete [] status;
- zncnt += shapecnt[i];
- }
-
- mesh->zones = zoneHdls;
-#endif
-}
-
-static void
-PutMaterial(siloimesh_t mesh, const char *name, const char *meshname, int nmat,
- int matnos[], int matlist[], int dims[], int ndims,
- int mix_next[], int mix_mat[], int mix_zone[], DB_DTPTR1 mix_vf,
- int mixlen, int datatype, DBoptlist *optlist, int set_class)
-{
- if (name)
- DBPutMaterial(mesh->dbfile, name, meshname, nmat, matnos, matlist, dims, ndims,
- mix_next, mix_mat, mix_zone, mix_vf, mixlen, datatype, optlist);
-
-#ifdef HAVE_IMESH
- // Obtain the SET_NAME tag handle
- iBase_TagHandle snTag, scTag;
- iMesh_getTagHandle(mesh->theMesh, "SET_NAME", &snTag, &(mesh->error), 9);
- CheckITAPSError(getTagHandle);
- if (mesh->error != iBase_SUCCESS)
- iMesh_createTag(mesh->theMesh, "SET_NAME", 64, iBase_BYTES,
- &snTag, &(mesh->error), 9);
- iMesh_getTagHandle(mesh->theMesh, "SET_CLASS", &scTag, &(mesh->error), 10);
- CheckITAPSError(getTagHandle);
- if (mesh->error != iBase_SUCCESS)
- iMesh_createTag(mesh->theMesh, "SET_CLASS", 1, iBase_INTEGER,
- &scTag, &(mesh->error), 10);
-
- int lmatlist = 1;
- for (int i = 0; i < ndims; i++)
- lmatlist *= dims[i];
-
- for (int m = 0; m < nmat; m++)
- {
- vector<iBase_EntityHandle> matZones;
- for (int i = 0; i < lmatlist; i++)
- if (matlist[i] == matnos[m]) matZones.push_back(mesh->zones[i]);
-
- if (matZones.size() == 0)
- continue;
-
- iBase_EntitySetHandle matSet;
- iMesh_createEntSet(mesh->theMesh, 0, &matSet, &(mesh->error));
- CheckITAPSError(createEntSet);
- iMesh_addEntArrToSet(mesh->theMesh, &matZones[0], matZones.size(), matSet, &(mesh->error));
- CheckITAPSError(addEntArrToSet);
-
- void *p = DBGetOption(optlist, DBOPT_MATNAMES);
- if (p)
- {
- char **matnames = (char **) p;
- char tmp[64];
- memset(tmp, '\0', sizeof(tmp));
- strcpy(tmp, matnames[m]);
- iMesh_setEntSetData(mesh->theMesh, matSet, snTag,
- tmp, sizeof(tmp), &(mesh->error));
- CheckITAPSError(setEntSetData);
- }
- iMesh_setEntSetIntData(mesh->theMesh, matSet, scTag,
- set_class, &(mesh->error));
- CheckITAPSError(setEntSetData);
- }
-#endif
-}
-
-#define CONV_LOOP(dtype) \
-{ \
- dtype **tmpvars = (dtype **) vars; \
- for (int i = 0; i < nels; i++) \
- { \
- for (int j = 0; j < nvars; j++) \
- { \
- tmpvals[i*nvars+j] = tmpvars[j][i]; \
- } \
- } \
- break; \
-}
-
-template <typename T>
-static void ConvertAndInterleave(DB_DTPTR2 vars, int nvars, int nels, int dt, T* tmpvals)
-{
- switch (dt)
- {
- case DB_FLOAT: CONV_LOOP(float);
- case DB_DOUBLE: CONV_LOOP(double);
- case DB_INT: CONV_LOOP(int);
- case DB_SHORT: CONV_LOOP(short);
- case DB_LONG: CONV_LOOP(long);
- case DB_LONG_LONG: CONV_LOOP(long long);
- case DB_CHAR: CONV_LOOP(char);
- }
-}
-
-static void
-PutVar(siloimesh_t mesh, const char *vname, const char *mname, int nvars,
- char *varnames[], DB_DTPTR2 vars, int nels, DB_DTPTR2 mixvars,
- int mixlen, int datatype, int centering, DBoptlist *optlist)
-{
- DBPutUcdvar(mesh->dbfile, vname, mname, nvars, varnames, vars, nels, mixvars,
- mixlen, datatype, centering, optlist);
-
-#if HAVE_IMESH
- void *p = DBGetOption(optlist, DBOPT_MATNAMES);
- int nregs = 0;
- if (p)
- {
- char **reg_names = (char **) p;
- while (reg_names[nregs]) nregs++;
- }
-
- iBase_EntityHandle *entHdls;
- int nEnts;
- if (centering == DB_NODECENT)
- {
- entHdls = mesh->verts;
- iMesh_getNumOfType(mesh->theMesh, mesh->rootSet, iBase_VERTEX, &nEnts, &(mesh->error));
- CheckITAPSError(getNumOfType);
- }
- else
- {
- entHdls = mesh->zones;
- iMesh_getNumOfType(mesh->theMesh, mesh->rootSet, iBase_REGION, &nEnts, &(mesh->error));
- CheckITAPSError(getNumOfType);
- }
- assert(p || nEnts == nels);
-
- iBase_TagHandle theTag;
- if (datatype == DB_FLOAT || datatype == DB_DOUBLE)
- {
- iMesh_createTag(mesh->theMesh, vname, nvars, iBase_DOUBLE,
- &theTag, &(mesh->error), strlen(vname)+1);
- CheckITAPSError(createTag);
-
- double *tmpvals = new double[nvars*nels];
- ConvertAndInterleave(vars, nvars, nels, datatype, tmpvals);
- iMesh_setDblArrData(mesh->theMesh, entHdls, nEnts, theTag, tmpvals, nvars*nels, &(mesh->error));
- CheckITAPSError(setDblArrData);
- delete [] tmpvals;
- }
- else if (datatype == DB_SHORT || datatype == DB_INT ||
- datatype == DB_LONG || datatype == DB_LONG_LONG)
- {
- iMesh_createTag(mesh->theMesh, vname, nvars, iBase_INTEGER,
- &theTag, &(mesh->error), strlen(vname)+1);
- CheckITAPSError(createTag);
-
- int *tmpvals = new int[nvars*nels];
- ConvertAndInterleave(vars, nvars, nels, datatype, tmpvals);
- iMesh_setIntArrData(mesh->theMesh, entHdls, nEnts, theTag, tmpvals, nvars*nels, &(mesh->error));
- CheckITAPSError(setIntArrData);
- delete [] tmpvals;
- }
- else
- {
- iMesh_createTag(mesh->theMesh, vname, nvars, iBase_BYTES,
- &theTag, &(mesh->error), strlen(vname)+1);
- CheckITAPSError(createTag);
-
- char *tmpvals = new char[nvars*nels];
- ConvertAndInterleave(vars, nvars, nels, datatype, tmpvals);
- iMesh_setArrData(mesh->theMesh, entHdls, nEnts, theTag, tmpvals, nvars*nels, &(mesh->error));
- CheckITAPSError(setArrData);
- delete [] tmpvals;
- }
-
-
-#endif
-}
-
-
-//
-// Given a single, monolithic whole mesh where each zone
-// is assigned to a given processor in the 'procid' array,
-// write a piece of it for the processor, 'proc', specified
-// here to the specified dir within the Silo file.
-//
-// colist is either a coloring of the mesh (and then color
-// indicates which color to build here) or a list of zones
-// to build here. A color value less than zero indicates the
-// latter.
-//
-void write_a_block(const vector<int> &colist, int color, siloimesh_t mesh,
- const char *const dirname)
-{
- int j, k;
-
- vector<int> tmpcnt;
- vector<int> tmpsize;
- vector<int> tmptype;
-
- //
- // Iterate over zones and for each zone in the output, over its nodes.
- // At completion of this loop, the g2lnode map will, given a global
- // node that is in the output mesh, return its local node id in that
- // mesh. The nodelist_l will be the nodelist for the zones but in
- // terms of global node numbers
- //
- //
- map<int, int> g2lnode;
- vector<int> zonelist_l;
- vector<int> nodelist_l;
- int gzoneid = 0;
- int lzoneid = 0;
- int gnodeidx = 0;
- int lnodeidx = 0;
- for (j = 0; j < sizeof(zshapesize_g)/sizeof(zshapesize_g[0]); j++)
- {
- int shapeCnt = 0;
- for (int k = 0; k < zshapecnt_g[j]; k++)
- {
-
- //
- // Decide if we should include this zone
- //
- bool useThisZone = false;
- if (color < 0)
- {
- for (unsigned int jj = 0; jj < colist.size(); jj++)
- {
- if (gzoneid == colist[jj])
- {
- useThisZone = true;
- break;
- }
- }
- }
- else
- {
- if (colist[gzoneid] == color)
- useThisZone = true;
- }
-
- //
- // If we use this zone, then get its list of nodes
- //
- if (useThisZone)
- {
- zonelist_l.push_back(gzoneid);
- if (shapeCnt == 0)
- {
- tmpsize.push_back(zshapesize_g[j]);
- tmptype.push_back(zshapetype_g[j]);
- }
- for (int kk = 0; kk < zshapesize_g[j]; kk++)
- {
- int gnodeid = nodelist_g[gnodeidx++];
- if (g2lnode.find(gnodeid) == g2lnode.end())
- g2lnode[gnodeid] = lnodeidx++;
- nodelist_l.push_back(gnodeid);
- }
- shapeCnt++;
- }
- else
- {
- gnodeidx += zshapesize_g[j];
- }
-
- gzoneid++;
- }
- if (shapeCnt)
- tmpcnt.push_back(shapeCnt);
- }
-
- int nlnodes = lnodeidx;
- int nlzones = zonelist_l.size();
-
- //
- // Initialize local field headers
- //
- vector<field_t> fields_l(fields_g.size());
- for (unsigned int i = 0; i < fields_g.size(); i++)
- {
- fields_l[i] = fields_g[i];
- int nvals = fields_l[i].cent == DB_NODECENT ? nlnodes : nlzones;
- if (fields_l[i].type == DB_INT)
- {
- for (j = 0; j < fields_l[i].ncomps; j++)
- fields_l[i].data[j] = new int[nvals];
- }
- else if (fields_l[i].type == DB_FLOAT)
- {
- for (j = 0; j < fields_l[i].ncomps; j++)
- fields_l[i].data[j] = new float[nvals];
- }
- }
-
- //
- // Build local coordinate arrays and other node-centered fields
- //
- vector<float> txvals(nlnodes), tyvals(nlnodes), tzvals(nlnodes);
- map<int, int>::const_iterator lnit;
- for (lnit = g2lnode.begin(); lnit != g2lnode.end(); lnit++)
- {
- txvals[lnit->second] = xvals_g[lnit->first];
- tyvals[lnit->second] = yvals_g[lnit->first];
- tzvals[lnit->second] = zvals_g[lnit->first];
-
- for (unsigned int i = 0; i < fields_l.size(); i++)
- {
- if (fields_l[i].cent != DB_NODECENT)
- continue;
-
- if (fields_l[i].type == DB_INT)
- {
- for (j = 0; j < fields_l[i].ncomps; j++)
- {
- int *lvals = (int *) fields_l[i].data[j];
- int *gvals = (int *) fields_g[i].data[j];
- lvals[lnit->second] = gvals[lnit->first];
- }
- }
- else if (fields_l[i].type == DB_FLOAT)
- {
- for (j = 0; j < fields_l[i].ncomps; j++)
- {
- float *lvals = (float *) fields_l[i].data[j];
- float *gvals = (float *) fields_g[i].data[j];
- lvals[lnit->second] = gvals[lnit->first];
- }
- }
- }
- }
-
- //
- // Build zone-centered fields (including materials)
- //
- for (unsigned int i = 0; i < fields_l.size(); i++)
- {
- if (fields_l[i].cent != DB_ZONECENT)
- continue;
-
- if (fields_l[i].type == DB_INT)
- {
- for (j = 0; j < fields_l[i].ncomps; j++)
- {
- int *lvals = (int *) fields_l[i].data[j];
- int *gvals = (int *) fields_g[i].data[j];
- for (k = 0; k < nlzones; k++)
- lvals[k] = gvals[zonelist_l[k]];
- }
- }
- else if (fields_l[i].type == DB_FLOAT)
- {
- for (j = 0; j < fields_l[i].ncomps; j++)
- {
- float *lvals = (float *) fields_l[i].data[j];
- float *gvals = (float *) fields_g[i].data[j];
- for (k = 0; k < nlzones; k++)
- lvals[k] = gvals[zonelist_l[k]];
- }
- }
- }
-
- vector<int> tmatlist;
- for (k = 0; k < nlzones; k++)
- tmatlist.push_back(matlist_g[zonelist_l[k]]);
-
- //
- // Convert global node numbers in nodelist_l to local
- //
- for (unsigned int i = 0; i < nodelist_l.size(); i++)
- nodelist_l[i] = g2lnode[nodelist_l[i]];
-
- // make and set the local dir
- DBMkDir(mesh->dbfile, dirname);
- DBSetDir(mesh->dbfile, dirname);
-
- DBoptlist *opts = DBMakeOptlist(2);
- char *mrgname = "mrg_tree";
- DBAddOption(opts, DBOPT_MRGTREE_NAME, mrgname);
-
- // output the mesh
- float *coords[3];
- coords[0] = &txvals[0];
- coords[1] = &tyvals[0];
- coords[2] = &tzvals[0];
- char *coordnames[3];
- coordnames[0] = "X";
- coordnames[1] = "Y";
- coordnames[2] = "Z";
- DBPutUcdmesh(mesh->dbfile, "mesh", 3, coordnames, coords, txvals.size(), nlzones,
- "zl", 0, DB_FLOAT, opts);
- DBFreeOptlist(opts);
-
- // output the zonelist
- DBPutZonelist2(mesh->dbfile, "zl", nlzones, 3, &nodelist_l[0], nodelist_l.size(),
- 0, 0, 0, &tmptype[0], &tmpsize[0], &tmpcnt[0], tmpcnt.size(), NULL);
-
- // output the materials
- opts = DBMakeOptlist(2);
- DBAddOption(opts, DBOPT_MATNAMES, matNames);
- DBPutMaterial(mesh->dbfile, "materials", "mesh", 5, matnos,
- &tmatlist[0], &nlzones, 1, 0, 0, 0, 0, 0, DB_FLOAT, opts);
- DBFreeOptlist(opts);
-
- DBSetDir(mesh->dbfile, "..");
-}
-
-//
-// Makes the bottom layer of nodes
-//
-void make_base_layer()
-{
- for (int i = 0; i < layerNNodes; i++)
- {
- xvals_g.push_back(layerXVals[i]);
- yvals_g.push_back(layerYVals[i]);
- zvals_g.push_back(0.0);
- nodalv_g.push_back(i<=8?400.0:0.0);
- }
-}
-
-//
-// Adds a layer of nodes and then connects them to
-// the previous layer making hex elements
-//
-void add_layer(int zval)
-{
- int i;
-
- for (i = 0; i < layerNNodes; i++)
- {
- xvals_g.push_back(layerXVals[i]);
- yvals_g.push_back(layerYVals[i]);
- zvals_g.push_back((float)zval);
- nodalv_g.push_back(i<=8?(zval<4?(4-zval)*100:10.0):0.0);
- }
- for (i = 0; i < layerNZones; i++)
- {
- int j;
- for (j = 0; j < 4; j++)
- nodelist_g.push_back(layerNodelist[i*4+j] + (zval-1)*layerNNodes);
- for (j = 0; j < 4; j++)
- nodelist_g.push_back(layerNodelist[i*4+j] + zval*layerNNodes);
- if (i < 4)
- {
- matlist_g.push_back(matMap["Solid Propellant"]);
- procid_g.push_back(0);
- }
- else
- {
- matlist_g.push_back(matMap["Body"]);
- procid_g.push_back(zval < 6 ? 1 : 2);
- }
- if (zval < 5)
- bitmap_g.push_back(BOOSTER|STAGE1);
- else
- bitmap_g.push_back(BOOSTER|STAGE2); // booster & stage 2
- }
-}
-
-//
-// Adds pyramid elements that taper to a single apex which is
-// the nose of the rocket.
-//
-void add_nose(int zval)
-{
- int i,j;
-
- // add central core nodes at this zval
- int layer1NoseStart = xvals_g.size();
- for (i = 0; i < 9; i++)
- {
- xvals_g.push_back(layerXVals[i]);
- yvals_g.push_back(layerYVals[i]);
- zvals_g.push_back((float)zval);
- nodalv_g.push_back(0.0);
- }
-
- // add nose end node at zval + 1
- int noseApex = xvals_g.size();
- xvals_g.push_back(0.0);
- yvals_g.push_back(0.0);
- zvals_g.push_back((float)zval+1.0);
- nodalv_g.push_back(0.0);
-
- // add central core hexes
- for (i = 0; i < 4; i++)
- {
- for (j = 0; j < 4; j++)
- nodelist_g.push_back(layerNodelist[i*4+j] + (zval-1)*layerNNodes);
- for (j = 0; j < 4; j++)
- nodelist_g.push_back(layerNodelist[i*4+j] + zval*layerNNodes);
- matlist_g.push_back(matMap["Liquid Propellant"]);
- procid_g.push_back(0);
- bitmap_g.push_back(STAGE3|NOSE);
- }
-
- // add external wedges
- int permute[] = {1, 0, 3, 2}; // wedge base is permuted from hex
- int k = layer1NoseStart + 1;
- for (i = 4; i < layerNZones; i++) // just the outher layer of hex bases
- {
- for (j = 0; j < 4; j++)
- nodelist_g.push_back(layerNodelist[i*4+permute[j]] + (zval-1)*layerNNodes);
- if (i == layerNZones - 1)
- {
- nodelist_g.push_back(layer1NoseStart+1);
- nodelist_g.push_back(k);
- }
- else
- {
- nodelist_g.push_back(k+1);
- nodelist_g.push_back(k);
- }
- matlist_g.push_back(matMap[i%2 ? "Electronics" : "Body"]);
- procid_g.push_back(2);
- k++;
- bitmap_g.push_back(STAGE3|NOSE|BUS);
- }
-
- // add top-level pyramids
- for (i = 0; i < 4; i++)
- {
- for (j = 0; j < 4; j++)
- nodelist_g.push_back(layerNodelist[i*4+permute[j]] + layer1NoseStart);
- nodelist_g.push_back(noseApex);
- matlist_g.push_back(matMap["High Explosive"]);
- procid_g.push_back(0);
- bitmap_g.push_back(NOSE|MIRVS|MIRV(i));
- }
-}
-
-//
-// Adds the fins of the rocket around the bottom two layers
-//
-void add_fins()
-{
- int i;
- float finX = 4 * cos(22.5 / 180.0 * M_PI);
- float finY = 4 * sin(22.5 / 180.0 * M_PI);
-
- // add layer 0 and 1 fin tip nodes
- int finNodesStart = xvals_g.size();
- for (i = 0; i < 2; i++)
- {
- xvals_g.push_back(-finX);
- yvals_g.push_back(finY);
- zvals_g.push_back((float)i);
- nodalv_g.push_back(0.0);
-
- xvals_g.push_back(finY);
- yvals_g.push_back(finX);
- zvals_g.push_back((float)i);
- nodalv_g.push_back(0.0);
-
- xvals_g.push_back(finX);
- yvals_g.push_back(-finY);
- zvals_g.push_back((float)i);
- nodalv_g.push_back(0.0);
-
- xvals_g.push_back(-finY);
- yvals_g.push_back(-finX);
- zvals_g.push_back((float)i);
- nodalv_g.push_back(0.0);
- }
-
- // add fin bottoms (wedges) on layer 0
- int startNodes[] = {9, 11, 13, 15};
- for (i = 0; i < 4; i++)
- {
- int n = startNodes[i];
- nodelist_g.push_back(n+1);
- nodelist_g.push_back(n+1+layerNNodes);
- nodelist_g.push_back(n+layerNNodes);
- nodelist_g.push_back(n);
- nodelist_g.push_back(finNodesStart+i);
- nodelist_g.push_back(finNodesStart+i+4);
- matlist_g.push_back(matMap["Body"]);
- procid_g.push_back(1);
- bitmap_g.push_back(BOOSTER|STAGE1|FINS|FIN(i));
- }
-
- // add fin tops (pyramids) on layer 1
- for (i = 0; i < 4; i++)
- {
- int n = startNodes[i]+layerNNodes;
- nodelist_g.push_back(n+1);
- nodelist_g.push_back(n+1+layerNNodes);
- nodelist_g.push_back(n+layerNNodes);
- nodelist_g.push_back(n);
- nodelist_g.push_back(finNodesStart+i+4);
- matlist_g.push_back(matMap["Body"]);
- procid_g.push_back(1);
- bitmap_g.push_back(BOOSTER|STAGE1|FINS|FIN(i));
- }
-}
-
-//
-// Build the rocket from the simple 2D description of a
-// single layer of nodal positions.
-//
-void build_body()
-{
- int i;
- make_base_layer();
- for (i = 1; i < 9; i++)
- add_layer(i);
- add_nose(i);
- add_fins();
-}
-
-#ifdef HAVE_IMESH
-static iBase_EntitySetHandle
-CreateSet(siloimesh_t mesh, iBase_EntitySetHandle parent, const char *name, int set_class)
-{
- // Obtain the SET_NAME tag handle (create if doesn't already exist)
- iBase_TagHandle snTag, scTag;
- iMesh_getTagHandle(mesh->theMesh, "SET_NAME", &snTag, &(mesh->error), 9);
- CheckITAPSError(getTagHandle);
- if (mesh->error != iBase_SUCCESS)
- iMesh_createTag(mesh->theMesh, "SET_NAME", 64, iBase_BYTES,
- &snTag, &(mesh->error), 9);
- iMesh_getTagHandle(mesh->theMesh, "SET_CLASS", &scTag, &(mesh->error), 10);
- CheckITAPSError(getTagHandle);
- if (mesh->error != iBase_SUCCESS)
- iMesh_createTag(mesh->theMesh, "SET_CLASS", 1, iBase_INTEGER,
- &scTag, &(mesh->error), 10);
-
- char tmp[64];
- memset(tmp, '\0', sizeof(tmp));
- strcpy(tmp, name);
- iBase_EntitySetHandle theSet;
- iMesh_createEntSet(mesh->theMesh, 0, &theSet, &(mesh->error));
- CheckITAPSError(createEntSet);
- iMesh_setEntSetData(mesh->theMesh, theSet, snTag,
- tmp, sizeof(tmp), &(mesh->error));
- CheckITAPSError(setEntSetData);
- iMesh_setEntSetIntData(mesh->theMesh, theSet, scTag,
- set_class, &(mesh->error));
- CheckITAPSError(setEntSetData);
-
- if (parent != mesh->rootSet)
- {
- iMesh_addEntSet(mesh->theMesh, theSet, parent, &(mesh->error));
- CheckITAPSError(addEntSet);
- }
-
- return theSet;
-}
-
-static void
-PutEnts(siloimesh_t mesh, iBase_EntitySetHandle theSet, int mask,
- const vector<int> &bitmap)
-{
- vector<iBase_EntityHandle> ents;
- for (int i = 0; i < (int) bitmap.size(); i++)
- if (bitmap[i]&mask) ents.push_back(mesh->zones[i]);
-
- if (ents.size() == 0)
- return;
-
- iMesh_addEntArrToSet(mesh->theMesh, &ents[0], ents.size(), theSet, &(mesh->error));
- CheckITAPSError(addEntArrToSet);
-}
-
-static void
-PutEntsByIndex(siloimesh_t mesh, iBase_EntitySetHandle theSet, int centering, int nents,
- const int *ids)
-{
- vector<iBase_EntityHandle> ents;
- if (centering == DB_NODECENT)
- for (int i = 0; i < nents; i++)
- ents.push_back(mesh->verts[ids[i]]);
- else
- for (int i = 0; i < nents; i++)
- ents.push_back(mesh->zones[ids[i]]);
-
- iMesh_addEntArrToSet(mesh->theMesh, &ents[0], ents.size(), theSet, &(mesh->error));
- CheckITAPSError(addEntArrToSet);
-}
-
-#endif
-
-void write_rocket(siloimesh_t mesh)
-{
- // output rocket as monolithic, single mesh
- char *coordnames[3];
- coordnames[0] = "X";
- coordnames[1] = "Y";
- coordnames[2] = "Z";
- float *coords[3];
- coords[0] = &xvals_g[0];
- coords[1] = &yvals_g[0];
- coords[2] = &zvals_g[0];
-
- PutMesh(mesh, "rocket", 3, coordnames, coords, xvals_g.size(), nzones_g,
- "zl", 0, DB_FLOAT, 0);
-
- PutZonelist(mesh, "zl", nzones_g, 3, &nodelist_g[0], nodelist_g.size(),
- 0, 0, 0, zshapetype_g, zshapesize_g, zshapecnt_g,
- sizeof(zshapetype_g)/sizeof(zshapetype_g[0]), NULL);
-
- DBoptlist *opts = DBMakeOptlist(2);
- DBAddOption(opts, DBOPT_MATNAMES, matNames);
- PutMaterial(mesh, "materials", "mesh", 5, matnos,
- &matlist_g[0], &nzones_g, 1, 0, 0, 0, 0, 0, DB_FLOAT, opts, SET_CLASS_MATERIALS);
- DBFreeOptlist(opts);
-
- { char *varnames[1];
- varnames[0] = "procid";
- float *vars[1];
- vars[0] = (float*) &procid_g[0];
- PutVar(mesh, "procid", "rocket", 1, varnames, vars,
- nzones_g, NULL, 0, DB_INT, DB_ZONECENT, 0);
- }
-
- { char *varnames[1];
- varnames[0] = "bitmap";
- float *vars[1];
- vars[0] = (float*) &bitmap_g[0];
- PutVar(mesh, "bitmap", "rocket", 1, varnames, vars,
- nzones_g, NULL, 0, DB_INT, DB_ZONECENT, 0);
- }
-
- { char *varnames[1];
- varnames[0] = "tempc";
- float *vars[1];
- vars[0] = (float*) &nodalv_g[0];
- PutVar(mesh, "temp", "rocket", 1, varnames, vars,
- xvals_g.size(), NULL, 0, DB_FLOAT, DB_NODECENT, 0);
- }
-
-#ifdef HAVE_IMESH
- // Ok, we're going to use PutMaterial here to do something similar
- // except that we're outputting the domain decomposition.
- {
- char *subsetnames[3] = {"domain_0","domain_1","domain_2"};
- int subsetnos[3] = {0, 1, 2};
- DBoptlist *opts = DBMakeOptlist(2);
- DBAddOption(opts, DBOPT_MATNAMES, subsetnames);
- PutMaterial(mesh, 0, "mesh", 3, subsetnos,
- &procid_g[0], &nzones_g, 1, 0, 0, 0, 0, 0, DB_FLOAT, opts, SET_CLASS_DOMAINS);
- DBFreeOptlist(opts);
- }
-
- // Ok, now output the assembly hierarchy using bitmap_g as our guide.
- iBase_EntitySetHandle assmSet = CreateSet(mesh, mesh->rootSet, "Assembly", SET_CLASS_ASSEMBLY);
- PutEnts(mesh, assmSet, 0xFFFFFFFF, bitmap_g);
- iBase_EntitySetHandle boostSet = CreateSet(mesh, assmSet, "Booster", SET_CLASS_ASSEMBLY);
- PutEnts(mesh, boostSet, BOOSTER, bitmap_g);
- iBase_EntitySetHandle s1Set = CreateSet(mesh, boostSet, "Stage1", SET_CLASS_ASSEMBLY);
- PutEnts(mesh, s1Set, STAGE1, bitmap_g);
- iBase_EntitySetHandle finsSet = CreateSet(mesh, s1Set, "Fins", SET_CLASS_ASSEMBLY);
- PutEnts(mesh, finsSet, FINS, bitmap_g);
- iBase_EntitySetHandle fin1Set = CreateSet(mesh, finsSet, "Fin1", SET_CLASS_ASSEMBLY);
- PutEnts(mesh, fin1Set, FIN(0), bitmap_g);
- iBase_EntitySetHandle fin2Set = CreateSet(mesh, finsSet, "Fin2", SET_CLASS_ASSEMBLY);
- PutEnts(mesh, fin2Set, FIN(1), bitmap_g);
- iBase_EntitySetHandle fin3Set = CreateSet(mesh, finsSet, "Fin3", SET_CLASS_ASSEMBLY);
- PutEnts(mesh, fin3Set, FIN(2), bitmap_g);
- iBase_EntitySetHandle fin4Set = CreateSet(mesh, finsSet, "Fin4", SET_CLASS_ASSEMBLY);
- PutEnts(mesh, fin4Set, FIN(3), bitmap_g);
- iBase_EntitySetHandle s2Set = CreateSet(mesh, boostSet, "Stage2", SET_CLASS_ASSEMBLY);
- PutEnts(mesh, s2Set, STAGE2, bitmap_g);
- iBase_EntitySetHandle noseSet = CreateSet(mesh, assmSet, "Nose", SET_CLASS_ASSEMBLY);
- PutEnts(mesh, noseSet, NOSE, bitmap_g);
- iBase_EntitySetHandle s3Set = CreateSet(mesh, noseSet, "Stage 3", SET_CLASS_ASSEMBLY);
- PutEnts(mesh, s3Set, STAGE3, bitmap_g);
- iBase_EntitySetHandle busSet = CreateSet(mesh, s3Set, "Bus", SET_CLASS_ASSEMBLY);
- PutEnts(mesh, busSet, BUS, bitmap_g);
- iBase_EntitySetHandle mirvsSet = CreateSet(mesh, noseSet, "Mirvs", SET_CLASS_ASSEMBLY);
- PutEnts(mesh, mirvsSet, MIRVS, bitmap_g);
- iBase_EntitySetHandle mirv1Set = CreateSet(mesh, mirvsSet, "Mirv1", SET_CLASS_ASSEMBLY);
- PutEnts(mesh, mirv1Set, MIRV(0), bitmap_g);
- iBase_EntitySetHandle mirv2Set = CreateSet(mesh, mirvsSet, "Mirv2", SET_CLASS_ASSEMBLY);
- PutEnts(mesh, mirv2Set, MIRV(1), bitmap_g);
- iBase_EntitySetHandle mirv3Set = CreateSet(mesh, mirvsSet, "Mirv3", SET_CLASS_ASSEMBLY);
- PutEnts(mesh, mirv3Set, MIRV(2), bitmap_g);
- iBase_EntitySetHandle mirv4Set = CreateSet(mesh, mirvsSet, "Mirv4", SET_CLASS_ASSEMBLY);
- PutEnts(mesh, mirv4Set, MIRV(3), bitmap_g);
-
- // Some special subsets
-
- // lighting time nodes
- iBase_EntitySetHandle ltZonesSet = CreateSet(mesh, mesh->rootSet, "ltZones", SET_CLASS_NODESETS);
- PutEntsByIndex(mesh, ltZonesSet, DB_ZONECENT, 4, ltZones);
-
- // hold down nodes
- iBase_EntitySetHandle holdDownSet = CreateSet(mesh, mesh->rootSet, "Hold Down", SET_CLASS_NODESETS);
- PutEntsByIndex(mesh, holdDownSet, DB_NODECENT, 9, holdDownNodes);
-
- // high dynamic pressure points
- iBase_EntitySetHandle highQSet = CreateSet(mesh, mesh->rootSet, "Max Q", SET_CLASS_NODESETS);
- PutEntsByIndex(mesh, highQSet, DB_NODECENT, sizeof(maxQNodes)/sizeof(maxQNodes[0]), maxQNodes);
-
- // Using PutZonelist here will corrupt 'zones' member of mesh object.
- // We don't intend to need that any further so its ok.
- // We use PutZonelist here as a utility to output groups of other
- // types of edge and face zones.
- int identity[32];
- for (int i = 0; i < 32; i++) identity[i] = i;
- PutZonelist(mesh, 0, 4, 3, umbilicalEdges, sizeof(umbilicalEdges)/sizeof(umbilicalEdges[0]),
- 0, 0, 0, umbilicalEdgesShapetypes, umbilicalEdgesSizes, umbilicalEdgesCounts,
- 1, NULL);
- iBase_EntitySetHandle umbilicalSet = CreateSet(mesh, mesh->rootSet, "Umbilicals", SET_CLASS_EDGESETS);
- PutEntsByIndex(mesh, umbilicalSet, DB_ZONECENT, 4, identity);
-
- PutZonelist(mesh, 0, 32, 3, launchContactFaces, sizeof(launchContactFaces)/sizeof(launchContactFaces[0]),
- 0, 0, 0, launchContactFacesShapetypes, launchContactFacesSizes, launchContactFacesCounts,
- 1, NULL);
- iBase_EntitySetHandle launchFaces = CreateSet(mesh, mesh->rootSet, "Launch Tube Contacts", SET_CLASS_FACESETS);
- PutEntsByIndex(mesh, launchFaces, DB_ZONECENT, 32, identity);
-
- PutZonelist(mesh, 0, 16+12, 3, controlSurfaceFaces, sizeof(controlSurfaceFaces)/sizeof(controlSurfaceFaces[0]),
- 0, 0, 0, controlSurfaceShapetypes, controlSurfaceSizes, controlSurfaceCounts,
- 2, NULL);
- iBase_EntitySetHandle controlSurfaces = CreateSet(mesh, mesh->rootSet, "Control Surfaces", SET_CLASS_FACESETS);
- PutEntsByIndex(mesh, controlSurfaces, DB_ZONECENT, 16+12, identity);
-#endif
-}
-
-void write_mrocket(siloimesh_t mesh)
-{
- //
- // Output rocket in blocks
- //
- for (int i = 0; i < 3; i++)
- {
- char tmpName[256];
- sprintf(tmpName, "domain_%d", i);
- write_a_block(procid_g, i, mesh, tmpName);
- }
-
- char *mbitmapnames[3];
- mbitmapnames[0] = "domain_0/bitmap";
- mbitmapnames[1] = "domain_1/bitmap";
- mbitmapnames[2] = "domain_2/bitmap";
- char *mmatnames[3];
- mmatnames[0] = "domain_0/materials";
- mmatnames[1] = "domain_1/materials";
- mmatnames[2] = "domain_2/materials";
- char *mmeshnames[3];
- mmeshnames[0] = "domain_0/mesh";
- mmeshnames[1] = "domain_1/mesh";
- mmeshnames[2] = "domain_2/mesh";
- int meshtypes[3] = {DB_UCDMESH, DB_UCDMESH, DB_UCDMESH};
- int vartypes[3] = {DB_UCDVAR, DB_UCDVAR, DB_UCDVAR};
-
- DBoptlist *opts = DBMakeOptlist(2);
- char *mrgname = "mrg_tree";
- DBAddOption(opts, DBOPT_MRGTREE_NAME, mrgname);
-
- DBPutMultimesh(mesh->dbfile, "mrocket", 3, mmeshnames, meshtypes, opts);
- DBPutMultimat(mesh->dbfile, "mmaterials", 3, mmatnames, 0);
- DBPutMultivar(mesh->dbfile, "mbitmap", 3, mbitmapnames, vartypes, 0);
-
- DBFreeOptlist(opts);
-}
-
-void write_top_mrgtree(siloimesh_t mesh)
-{
-
- topTree = DBMakeMrgtree(DB_MULTIMESH, 0, 5, 0);
-
- //
- // Material info at MM level
- //
-
- // groupel map indicating which materials appear in which blocks
- int b2m_lens[] = {1, 1, 1, 1, 2};
- int b2m_data[] = {0, 0, 0, 2, 1, 2};
- int *b2m_map[] = {&b2m_data[0], &b2m_data[1], &b2m_data[2], &b2m_data[3], &b2m_data[4]};
- int b2m_segids[] = {0, 1, 2, 3, 4};
- int b2m_types[] = {DB_BLOCKCENT, DB_BLOCKCENT, DB_BLOCKCENT, DB_BLOCKCENT, DB_BLOCKCENT};
- DBPutGroupelmap(mesh->dbfile, "block_to_mat", 5, b2m_types, b2m_lens, b2m_segids,
- b2m_map, 0, DB_FLOAT, 0);
-
- // material regions
- DBAddRegion(topTree, "materials", 0, 5, "block_to_mat", 0, 0, 0, 0, 0);
- DBSetCwr(topTree, "materials");
- const char *mapnames[1];
- mapnames[0] = "block_to_mat";
- for (int i = 0; i < 5; i++)
- DBAddRegion(topTree, matNames[i], 0, 0, 0, 1, &i, &b2m_lens[i], &b2m_types[i], 0);
- DBSetCwr(topTree, "..");
-
- //
- // Assembly info at MM level, no maps
- //
-
- int b2a_lens[] = {2, 2, 1, 1};
- int b2a_data[] = {1, 3, 1, 2, 1, 3};
- int *b2a_map[] = {&b2a_data[0], &b2a_data[2], &b2a_data[4], &b2a_data[5]};
- int b2a_segids[] = {0, 1, 2, 3};
- int b2a_types[] = {DB_BLOCKCENT, DB_BLOCKCENT, DB_BLOCKCENT, DB_BLOCKCENT};
- DBPutGroupelmap(mesh->dbfile, "block_to_assembly", 4, b2a_types, b2a_lens, b2a_segids,
- b2a_map, 0, DB_FLOAT, 0);
-
- //
- // The region representing the entire assembly is equal to top.
- // Although a map name is specified here, none of its segments are
- // enumerated. This has the effect of attaching the map object name at
- // this point in the MRG tree but does not actually specify a map for
- // this region. The implied map is the identity.
- //
- DBAddRegion(topTree, "assembly", 0, 2, "block_to_assembly", 0, 0, 0, 0, 0);
- DBSetCwr(topTree, "assembly");
-
- // No map is specified here so it is whatever is above it in the tree
- DBAddRegion(topTree, "booster", 0, 2, 0, 0, 0, 0, 0, 0);
- DBSetCwr(topTree, "booster");
-
- // stage_1 exists only on blocks 1,2, which is the 2nd segment (id=1) of the map
- DBAddRegion(topTree, "stage_1", 0, 2, 0, 1, &b2a_segids[1], &b2a_lens[1], &b2a_types[1], 0);
- DBSetCwr(topTree, "stage_1");
-
- // all the fins exist only on block 1, which is the 3rd segment (id=2) of the map
- DBAddRegion(topTree, "fins", 0, 4, 0, 1, &b2a_segids[2], &b2a_lens[2], &b2a_types[2], 0);
- DBSetCwr(topTree, "fins");
-
- // the map to the 'fins' region is sufficient for all fins
- DBAddRegion(topTree, "fin_1", 0, 0, 0, 0, 0, 0, 0, 0);
- DBAddRegion(topTree, "fin_2", 0, 0, 0, 0, 0, 0, 0, 0);
- DBAddRegion(topTree, "fin_3", 0, 0, 0, 0, 0, 0, 0, 0);
- DBAddRegion(topTree, "fin_4", 0, 0, 0, 0, 0, 0, 0, 0);
- DBSetCwr(topTree, ".."); // to 'fins' group
- DBSetCwr(topTree, ".."); // to booster group
-
- // stage_2 exists only on blocks 1,3, which is the 1rst (id=0) segment of the map
- DBAddRegion(topTree, "stage_2", 0, 0, 0, 1, &b2a_segids[0], &b2a_lens[0], &b2a_types[0], 0);
- DBSetCwr(topTree, ".."); // to assembly top
-
- // nose exists only on blocks 1,3, which is the 1rst (id=0) segment of the map
- DBAddRegion(topTree, "nose", 0, 2, 0, 1, &b2a_segids[0], &b2a_lens[0], &b2a_types[0], 0);
- DBSetCwr(topTree, "nose");
-
- // the bus exists only on block 3 of the mesh which is the 4th (id=3) segment
- DBAddRegion(topTree, "bus", 0, 1, 0, 1, &b2a_segids[3], &b2a_lens[3], &b2a_types[3], 0);
-
- // the mirvs exist only on block 1 of the mesh which is the 3rd (id=2) segment of the map
- DBAddRegion(topTree, "mirvs", 0, 4, 0, 1, &b2a_segids[2], &b2a_lens[2], &b2a_types[2], 0);
- DBSetCwr(topTree, "mirvs");
-
- DBAddRegion(topTree, "mirv_1", 0, 0, 0, 0, 0, 0, 0, 0);
- DBAddRegion(topTree, "mirv_2", 0, 0, 0, 0, 0, 0, 0, 0);
- DBAddRegion(topTree, "mirv_3", 0, 0, 0, 0, 0, 0, 0, 0);
- DBAddRegion(topTree, "mirv_4", 0, 0, 0, 0, 0, 0, 0, 0);
- DBSetCwr(topTree, ".."); // to mirvs group
- DBSetCwr(topTree, ".."); // to nose group
- DBSetCwr(topTree, ".."); // to top
-
- // define a simple mrgvar on this tree
- {
- int c1[] = {1, 2, 3, 4};
- int c2[] = {20, 40, 60, 80};
- void *vals[] ={(void*)c1,(void*)c2};
- char *parent_name = "/assembly/nose/mirvs";
- char *reg_names[] = {parent_name, 0, 0, 0};
- DBPutMrgvar(mesh->dbfile, "some_ints", "mrg_tree", 2, 0, 4, reg_names, DB_INT, vals, 0);
- }
-
- DBPutMrgtree(mesh->dbfile, "mrg_tree", "mrocket", topTree, 0);
-
- /* output MRG tree info for testing */
- FILE *outfile = fopen("mrg_tree_b4save.txt","w");
- DBWalkMrgtree(topTree, DBPrintMrgtree, outfile, DB_PREORDER);
- fclose(outfile);
-}
-
-static void
-CreateBlockTree(DBmrgtnode *tnode, int walk_order, void *data)
-{
- void **walk_data = (void**) data;
- DBmrgtree *tree = (DBmrgtree*) walk_data[0];
- int num_segments = *((int*) walk_data[1]);
- int *ass_map_lens = (int*) walk_data[2];
- int *ass_map_segids = (int*) walk_data[3];
- int *ass_map_types = (int*) walk_data[4];
- int **ass_map_data = (int**) walk_data[5];
- int *ass_map_assids = (int*) walk_data[6];
- int i;
-
- //printf("Working at region \"%s\"\n", tree->cwr->name);
- for (i = 0; i < num_segments; i++)
- {
- char *seg_assName = assNames[ass_map_assids[i]];
- if (strcmp(seg_assName, tnode->name) == 0)
- {
- //printf(" Adding region \"%s\"\n", seg_assName);
- while (strcmp(tree->cwr->name, tnode->parent->name) != 0)
- {
- DBSetCwr(tree, "..");
- //printf(" Backing off to \"%s\"\n", tree->cwr->name);
- }
- DBAddRegion(tree, seg_assName, 0, tnode->num_children,
- "ass_maps", 1, &i, &ass_map_lens[i], &ass_map_types[i], 0);
- if (tnode->num_children > 0)
- DBSetCwr(tree, seg_assName);
- break;
- }
- }
-}
-
-void write_block_mrgtree(siloimesh_t mesh, int proc_id)
-{
- int i,j;
- char domName[64];
-
- sprintf(domName, "/domain_%d", proc_id);
- DBSetDir(mesh->dbfile, domName);
-
- DBmrgtree *tree = DBMakeMrgtree(DB_UCDMESH, 0, 5, 0);
-
- /* get list of zones on this domain */
- vector<int> matzones[5];
- vector<int> asszones[16];
- for (unsigned int i = 0; i < procid_g.size(); i++)
- {
- if (procid_g[i] == proc_id)
- {
- for (j = 1; j < 6; j++)
- {
- if (matlist_g[i] == j)
- matzones[j-1].push_back(i);
- }
- for (j = 0; j < 16; j++)
- {
- if ((bitmap_g[i] & assnos[j]) != 0)
- asszones[j].push_back(i);
- }
- }
- }
-
- /* there are a maximum of 5 materials */
- DBAddRegion(tree, "materials", 0, 5, 0, 0, 0, 0, 0, 0);
- DBSetCwr(tree, "materials");
- int mat_map_lens[5];
- int *mat_map_data[5];
- int mat_map_segids[5];
- int mat_map_types[5] = {DB_ZONECENT, DB_ZONECENT, DB_ZONECENT, DB_ZONECENT, DB_ZONECENT};
- j = 0;
- for (i = 0; i < 5; i++)
- {
- if (matzones[i].size())
- {
- mat_map_lens[j] = matzones[i].size();
- mat_map_data[j] = &(matzones[i][0]);
- mat_map_segids[j] = j;
- DBAddRegion(tree, matNames[i], 0, 0, "mat_maps", 1, &j, &mat_map_lens[j], &mat_map_types[j], 0);
- j++;
- }
- }
- DBPutGroupelmap(mesh->dbfile, "mat_maps", j, mat_map_types, mat_map_lens, mat_map_segids,
- mat_map_data, 0, DB_FLOAT, 0);
- DBSetCwr(tree, "..");
-
- /* build groupel maps for the assembly */
- int ass_map_lens[16];
- int *ass_map_data[16];
- int ass_map_segids[16];
- int ass_map_assids[16];
- int ass_map_types[16] = {DB_ZONECENT, DB_ZONECENT, DB_ZONECENT, DB_ZONECENT, DB_ZONECENT,
- DB_ZONECENT, DB_ZONECENT, DB_ZONECENT, DB_ZONECENT, DB_ZONECENT,
- DB_ZONECENT, DB_ZONECENT, DB_ZONECENT, DB_ZONECENT, DB_ZONECENT};
- j = 0;
- for (i = 0; i < 16; i++)
- {
- if (asszones[i].size())
- {
- ass_map_lens[j] = asszones[i].size();
- ass_map_data[j] = &(asszones[i][0]);
- ass_map_segids[j] = j;
- ass_map_assids[j] = i;
- //printf("Including \"%s\"\n", assNames[i]);
- j++;
- }
- }
- DBPutGroupelmap(mesh->dbfile, "ass_maps", j, ass_map_types, ass_map_lens, ass_map_segids,
- ass_map_data, 0, DB_FLOAT, 0);
-
- //printf("Starting new walk\n");
-
- /* ok, walk the top tree and emit any portions of it that are also
- on this block */
- void *walk_data[] = {tree, &j, ass_map_lens, ass_map_segids, ass_map_types, ass_map_data,
- ass_map_assids};
- DBAddRegion(tree, "assembly", 0, 5, 0, 0, 0, 0, 0, 0);
- DBSetCwr(tree, "assembly");
- DBSetCwr(topTree, "assembly");
- DBWalkMrgtree(topTree, CreateBlockTree, walk_data, DB_PREORDER|DB_FROMCWR);
- DBSetCwr(topTree, "..");
-
- /* output the mrgtree for this block */
- DBPutMrgtree(mesh->dbfile, "mrg_tree", "mesh", tree, 0);
- DBFreeMrgtree(tree);
-
- DBSetDir(mesh->dbfile, "..");
-}
-
-
-#if 0
-void
-db_StringArrayToStringList(const char *const *const strArray, int n,
- char **strList, int *m)
-{
- int i, len;
- char *s = NULL;
-
- /* if n is unspecified, determine it by counting forward until
- we get a null pointer */
- if (n < 0)
- {
- n = 0;
- while (strArray[n] != 0)
- n++;
- }
-
- /*
- * Create a string which is a semi-colon separated list of strings
- */
- for (i=len=0; i<n; i++)
- {
- if (strArray[i])
- len += strlen(strArray[i])+1;
- else
- len += 2;
- }
- s = (char*) malloc(len+1);
- for (i=len=0; i<n; i++) {
- if (i) s[len++] = ';';
- if (strArray[i])
- {
- strcpy(s+len, strArray[i]);
- len += strlen(strArray[i]);
- }
- else
- {
- s[len++] = '\n';
- }
- }
- len++; /*count last null*/
-
- *strList = s;
- *m = len;
-}
-
-char **
-db_StringListToStringArray(char *strList, int n)
-{
- int i,l, add1 = 0;
- char **retval;
-
- /* if n is unspecified (<0), compute it by counting semicolons */
- if (n < 0)
- {
- add1 = 1;
- n = 1;
- while (strList[i] != '\0')
- {
- if (strList[i] == ';')
- n++;
- i++;
- }
- }
-
- retval = (char**) calloc(n+add1, sizeof(char*));
- for (i=0, l=0; i<n; i++) {
- if (strList[l] == ';')
- {
- retval[i] = strdup("");
- l += 1;
- }
- else if (strList[l] == '\n')
- {
- retval[i] = 0;
- l += 2;
- }
- else
- {
- int lstart = l;
- while (strList[l] != ';' && strList[l] != '\0')
- l++;
- strList[l] = '\0';
- retval[i] = strdup(&strList[lstart]);
- l++;
- }
- }
- if (add1) retval[i] = 0;
- return retval;
-}
-#endif
-
-//
-// Purpose: Build a simple, 3D mesh with a lot of interesting subsets
-// to serve as a talking point for VisIt's subsetting functionality.
-//
-// Modifications:
-// Mark C. Miller, Wed Jul 14 15:33:02 PDT 2010
-// Added show-all-errors option.
-//
-
-int
-main(int argc, char **argv)
-{
- FILE *outfile;
- DBfile *dbfile;
- siloimesh_struct_t mesh_struct;
- siloimesh_t mesh = &mesh_struct;
- int driver = DB_PDB;
- int show_all_errors = FALSE;
-
- int j, i = 1;
- while (i < argc)
- {
- if (strncmp(argv[i], "DB_HDF5", 7) == 0)
- {
- driver = StringToDriver(argv[i]);
- }
- else if (strncmp(argv[i], "DB_PDB", 6) == 0)
- {
- driver = StringToDriver(argv[i]);
- }
- else if (!strcmp(argv[i], "show-all-errors")) {
- show_all_errors = 1;
- }
- else if (argv[i][0] != '\0')
- {
- fprintf(stderr,"Uncrecognized driver name \"%s\"\n",
- argv[i]);
- exit(-1);
- }
- i++;
- }
-
- DBShowErrors(show_all_errors?DB_ALL_AND_DRVR:DB_ABORT, NULL);
-
- /* initialize some global data */
- for (i = 0; i < 5; i++)
- matMap[matNames[i]] = i+1;
-
- int launchLayer = 0;
- for (i = 0; i < 8; i++)
- {
- for (j = 0; j < 4; j++)
- {
- for (int k = 0; k < 4; k++)
- launchContactFaces[(i*4+j)*4+k] =
- launchContactFacesTemplate[k] + 2*j + launchLayer;
- }
- launchContactFaces[(i*4+3)*4+2] = launchContactFaces[(i*4+3)*4+2] - 8;
- launchContactFaces[(i*4+3)*4+3] = launchContactFaces[(i*4+3)*4+3] - 8;
-
- launchLayer += layerNNodes;
- }
-
- /* build the monolithic, single domain rocket geometry, etc */
- build_body();
-
- /* create the file */
- printf("Creating test file: \"rocket.silo\".\n");
- mesh->dbfile = DBCreate("rocket.silo", DB_CLOBBER, DB_LOCAL,
- "3D mesh with many interesting subsets", driver);
-#ifdef HAVE_IMESH
- iMesh_newMesh("", &(mesh->theMesh), &(mesh->error), 0);
- CheckITAPSError(newMesh);
- iMesh_getRootSet(mesh->theMesh, &(mesh->rootSet), &(mesh->error));
- mesh->cwdSet = mesh->rootSet;
- CheckITAPSError(getRootSet);
-#endif
-
- /* output the single domain rocket mesh, etc. */
- write_rocket(mesh);
-
- /* output multi-block representation for rocket */
- write_mrocket(mesh);
-
- /* write out the top-level mrg tree (and groupel maps) for multi-block case */
- write_top_mrgtree(mesh);
-
- /* write out mrg trees (and groupel maps) on each block */
- for (i = 0; i < 3; i++)
- write_block_mrgtree(mesh, i);
-
- DBFreeMrgtree(topTree);
-
- /* close the file */
- DBClose(mesh->dbfile);
-#ifdef HAVE_IMESH
- {
- char *imeshFilename = "rocket.h5m";
- iMesh_save(mesh->theMesh, mesh->rootSet, imeshFilename, "",
- &(mesh->error), strlen(imeshFilename), 0);
- CheckITAPSError(save);
- }
-#endif
-
- /* open the file and examine the MRG tree again */
- mesh->dbfile = DBOpen("rocket.silo", driver, DB_READ);
-
- /* read the top level mrg tree and write it to a text file */
- DBmrgtree *tree = DBGetMrgtree(mesh->dbfile, "mrg_tree");
- outfile = fopen("mrg_tree_afsave.txt","w");
- DBWalkMrgtree(tree, DBPrintMrgtree, outfile, DB_PREORDER);
- fclose(outfile);
- DBFreeMrgtree(tree);
-
- DBgroupelmap *map = DBGetGroupelmap(mesh->dbfile, "block_to_mat");
- DBFreeGroupelmap(map);
-
- DBClose(mesh->dbfile);
- return 0;
-}
diff --git a/tests/rocket.cxx b/tests/rocket.cxx
new file mode 100644
index 0000000..2a500a2
--- /dev/null
+++ b/tests/rocket.cxx
@@ -0,0 +1,848 @@
+/*
+Copyright (c) 1994 - 2010, Lawrence Livermore National Security, LLC.
+LLNL-CODE-425250.
+All rights reserved.
+
+This file is part of Silo. For details, see silo.llnl.gov.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the disclaimer below.
+ * Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the disclaimer (as noted
+ below) in the documentation and/or other materials provided with
+ the distribution.
+ * Neither the name of the LLNS/LLNL nor the names of its
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL LAWRENCE
+LIVERMORE NATIONAL SECURITY, LLC, THE U.S. DEPARTMENT OF ENERGY OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+This work was produced at Lawrence Livermore National Laboratory under
+Contract No. DE-AC52-07NA27344 with the DOE.
+
+Neither the United States Government nor Lawrence Livermore National
+Security, LLC nor any of their employees, makes any warranty, express
+or implied, or assumes any liability or responsibility for the
+accuracy, completeness, or usefulness of any information, apparatus,
+product, or process disclosed, or represents that its use would not
+infringe privately-owned rights.
+
+Any reference herein to any specific commercial products, process, or
+services by trade name, trademark, manufacturer or otherwise does not
+necessarily constitute or imply its endorsement, recommendation, or
+favoring by the United States Government or Lawrence Livermore
+National Security, LLC. The views and opinions of authors expressed
+herein do not necessarily state or reflect those of the United States
+Government or Lawrence Livermore National Security, LLC, and shall not
+be used for advertising or product endorsement purposes.
+*/
+
+#warning MAKE THIS CONDITIONAL LATER
+#define HAVE_SILO
+//#define STATIC_PLUGINS
+
+#ifdef __sgi /* IRIX C++ bug */
+#include <math.h>
+#else
+#include <cmath>
+#endif
+#include <cstdio>
+#include <cstdlib>
+#include <map>
+#include <vector>
+#include <set>
+#include <string>
+#include <cstring>
+#include <iostream>
+#include <sstream>
+
+#include <assert.h>
+#include <sys/types.h>
+#include <dirent.h>
+#ifndef STATIC_PLUGINS
+#include <dlfcn.h>
+#endif
+
+#include <rocket.h>
+
+#include <std.c>
+
+using std::cout;
+using std::cerr;
+using std::endl;
+using std::ostream;
+using std::map;
+using std::set;
+using std::string;
+using std::stringstream;
+using std::vector;
+
+#ifndef M_PI
+#define M_PI 3.14159265358979323846
+#endif
+
+//
+// The following arrays of data describe a single, 2D, 'layer'
+// of the rocket body. They are used in the build_body() functions to
+// build several layers of the 3D rocket body.
+//
+const float cX = (float) sqrt(2.0);
+float layerXVals[] =
+{
+// Internal 9 nodes (0 is the mid-line node)
+// 0 1 2 3 4 5 6 7 8
+ 0.0, -1.0, -1.0, 0.0, 1.0, 1.0, 1.0, 0.0, -1.0,
+
+// External 8 nodes
+// 9 10 11 12 13 14 15 16
+ -2.0, -cX, 0.0, cX, 2.0, cX, 0.0, -cX
+};
+const int layerNNodes = sizeof(layerXVals) / sizeof(layerXVals[0]);
+float layerYVals[] =
+{
+// Internal 9 nodes (0 is the mid-line node)
+// 0 1 2 3 4 5 6 7 8
+ 0.0, 0.0, 1.0, 1.0, 1.0, 0.0, -1.0, -1.0, -1.0,
+
+// External 8 nodes
+// 9 10 11 12 13 14 15 16
+ 0.0, cX, 2.0, cX, 0.0, -cX, -2.0, -cX
+};
+vector<float> xvals_g, yvals_g, zvals_g;
+
+int layerNodelist[] =
+{
+// Internal 4 zones
+// 0 1 2 3
+ 0,3,2,1, 0,5,4,3, 7,6,5,0, 8,7,0,1,
+
+// External 8 zones
+// 4 5 6 7
+ 1,2,10,9, 2,3,11,10, 3,4,12,11, 4,5,13,12,
+
+// 8 9 10 11
+ 5,6,14,13, 6,7,15,14, 7,8,16,15, 8,1,9,16
+};
+const int layerNZones = sizeof(layerNodelist) / (4*sizeof(layerNodelist[0]));
+vector<int> nodelist_g, nodecnts_g, nodestarts_g;
+
+//
+// Material names and numbers
+//
+int matnos[] = {1,2,3,4,5};
+char *matNames[] =
+{
+ "High Explosive",
+ "Solid Propellant",
+ "Liquid Propellant",
+ "Electronics",
+ "Body"
+};
+map<string, int> matMap;
+vector<int> matlist_g;
+
+EntityClassifier nodeClasses, zoneClasses;
+
+static int AddNode(float x, float y, float z, int level)
+{
+ xvals_g.push_back(x);
+ yvals_g.push_back(y);
+ zvals_g.push_back(z);
+ stringstream tmp;
+ tmp << level;
+ string lname = "level" + tmp.str();
+ int idx = nodeClasses.AddEntity();
+ nodeClasses.MakeEntityMemberOf(idx, lname);
+ return idx;
+}
+
+static int AddZone(string ztype, const vector<int>& nlist, int level)
+{
+ assert((ztype=="hex" && nlist.size()==8) ||
+ (ztype=="wedge" && nlist.size()==6) ||
+ (ztype=="prism" && nlist.size()==6) ||
+ (ztype=="pyramid" && nlist.size()==5) ||
+ (ztype=="tet" && nlist.size()==4));
+ nodestarts_g.push_back(nodelist_g.size());
+ nodecnts_g.push_back(nlist.size());
+ for (int i = 0; i < nlist.size(); i++)
+ {
+ assert(nlist[i] < nodeClasses.GetNumEntities());
+ nodelist_g.push_back(nlist[i]);
+ }
+ int idx = zoneClasses.AddEntity();
+ zoneClasses.MakeEntityMemberOf(idx, ztype);
+ stringstream tmp;
+ tmp << level;
+ string lname = "level" + tmp.str();
+ zoneClasses.MakeEntityMemberOf(idx, lname);
+ return idx;
+}
+
+void GetRocketBounds(
+ float& xmin, float& ymin, float& zmin,
+ float& xmax, float& ymax, float& zmax)
+{
+ xmin = xmax = xvals_g[0];
+ ymin = ymax = yvals_g[0];
+ zmin = zmax = zvals_g[0];
+ for (int i = 1; i < xvals_g.size(); i++)
+ {
+ if (xvals_g[i] < xmin) xmin = xvals_g[i];
+ if (xvals_g[i] > xmax) xmax = xvals_g[i];
+ if (yvals_g[i] < ymin) ymin = yvals_g[i];
+ if (yvals_g[i] > ymax) ymax = yvals_g[i];
+ if (zvals_g[i] < zmin) zmin = zvals_g[i];
+ if (zvals_g[i] > zmax) zmax = zvals_g[i];
+ }
+}
+
+void GetZoneBounds(int idx,
+ float& xmin, float& ymin, float& zmin,
+ float& xmax, float& ymax, float& zmax)
+{
+ assert(idx < nodestarts_g.size());
+ assert(idx < zoneClasses.GetNumEntities());
+ int i0 = nodestarts_g[idx];
+ int n0 = nodelist_g[i0];
+ assert(n0 < xvals_g.size());
+ xmin = xmax = xvals_g[n0];
+ ymin = ymax = yvals_g[n0];
+ zmin = zmax = zvals_g[n0];
+ int cnt = nodecnts_g[idx];
+ for (int i = 1; i < cnt; i++)
+ {
+ int n = nodelist_g[i0+i];
+ assert(n < xvals_g.size());
+ if (xvals_g[n] < xmin) xmin = xvals_g[n];
+ if (xvals_g[n] > xmax) xmax = xvals_g[n];
+ if (yvals_g[n] < ymin) ymin = yvals_g[n];
+ if (yvals_g[n] > ymax) ymax = yvals_g[n];
+ if (zvals_g[n] < zmin) zmin = zvals_g[n];
+ if (zvals_g[n] > zmax) zmax = zvals_g[n];
+ }
+}
+
+void GetUpDownMapsForZoneClass(const string& zcname,
+ vector<int>& upnodes, vector<int>& dnnodes,
+ vector<int>& upzones, vector<int>& dnzones)
+{
+ // Get list of zones in this class. Thats the upzones map
+ vector<string> classes;
+ classes.push_back(zcname);
+ zoneClasses.GetEntitiesInClasses(classes, upzones);
+
+ // Compute down zones map from upzones
+ dnzones.assign(zoneClasses.GetNumEntities(),-1);
+ for (int i = 0; i < upzones.size(); i++)
+ dnzones[upzones[i]] = i;
+
+ // Build set of unique nodes.
+ set<int> uniq;
+ for (int i = 0; i < upzones.size(); i++)
+ {
+ int j0 = nodestarts_g[upzones[i]];
+ int cnt = nodecnts_g[upzones[i]];
+ for (int j = 0; j < cnt; j++)
+ uniq.insert(nodelist_g[j0+j]); // set ensures uniqueness
+ }
+ for (set<int>::const_iterator it = uniq.begin(); it != uniq.end(); it++)
+ upnodes.push_back(*it);
+
+ // Compute down nodes map from upnodes
+ dnnodes.assign(nodeClasses.GetNumEntities(),-1);
+ for (int i = 0; i < upnodes.size(); i++)
+ dnnodes[upnodes[i]] = i;
+}
+
+//
+// Makes the bottom layer of nodes at z=0
+//
+static void make_base_layer()
+{
+ for (int i = 0; i < layerNNodes; i++)
+ {
+ int id = AddNode(layerXVals[i], layerYVals[i], 0.0, 0);
+ if (i==0) nodeClasses.MakeEntityMemberOf(id, "midline");
+ if (i<9) nodeClasses.MakeEntityMemberOf(id, "internal");
+ else nodeClasses.MakeEntityMemberOf(id, "external");
+ nodeClasses.MakeEntityMemberOf(id, "stage1");
+ }
+}
+
+//
+// Adds a layer of nodes and then connects them to
+// the previous layer making hex elements
+//
+static void add_layer(int stage, int zval)
+{
+ int i;
+
+ stringstream tmp;
+ tmp << stage;
+ string stage_name = "stage"+tmp.str();
+
+ for (i = 0; i < layerNNodes; i++)
+ {
+ int nid = AddNode(layerXVals[i], layerYVals[i], zval, 0);
+ if (i==0) nodeClasses.MakeEntityMemberOf(nid, "midline");
+ if (i<9) nodeClasses.MakeEntityMemberOf(nid, "internal");
+ else nodeClasses.MakeEntityMemberOf(nid, "external");
+ nodeClasses.MakeEntityMemberOf(nid, stage_name);
+ }
+ for (i = 0; i < layerNZones; i++)
+ {
+ int j;
+ vector<int> nl;
+ for (j = 0; j < 4; j++)
+ nl.push_back(layerNodelist[i*4+j] + (zval-1)*layerNNodes);
+ for (j = 0; j < 4; j++)
+ nl.push_back(layerNodelist[i*4+j] + zval*layerNNodes);
+ int zid = AddZone("hex", nl, 0);
+ if (i<4) zoneClasses.MakeEntityMemberOf(zid, "internal");
+ else zoneClasses.MakeEntityMemberOf(zid, "external");
+ zoneClasses.MakeEntityMemberOf(zid, stage_name);
+ }
+}
+
+//
+// Adds pyramid elements that taper to a single apex which is
+// the nose of the rocket.
+//
+void add_nose(int stage, int zval)
+{
+ int i,j;
+
+ stringstream tmp;
+ tmp << stage;
+ string stage_name = "stage" + tmp.str();
+
+ // add central core nodes at this zval
+ int layer1NoseStart = xvals_g.size();
+ for (i = 0; i < 9; i++)
+ {
+ int nid = AddNode(layerXVals[i], layerYVals[i], zval, 0);
+ if (i==0)
+ {
+ nodeClasses.MakeEntityMemberOf(nid, "midline");
+ nodeClasses.MakeEntityMemberOf(nid, "internal");
+ }
+ else nodeClasses.MakeEntityMemberOf(nid, "external");
+ nodeClasses.MakeEntityMemberOf(nid, stage_name);
+ }
+
+ // add nose end node at zval + 1
+ int noseApex = xvals_g.size();
+ int nid2 = AddNode(0.0, 0.0, (float)zval+1.0, 0);
+ nodeClasses.MakeEntityMemberOf(nid2, "midline");
+ nodeClasses.MakeEntityMemberOf(nid2, "external");
+ nodeClasses.MakeEntityMemberOf(nid2, stage_name);
+
+ // add central core hexes
+ for (i = 0; i < 4; i++)
+ {
+ vector<int> nl;
+ for (j = 0; j < 4; j++)
+ nl.push_back(layerNodelist[i*4+j] + (zval-1)*layerNNodes);
+ for (j = 0; j < 4; j++)
+ nl.push_back(layerNodelist[i*4+j] + zval*layerNNodes);
+ int zid = AddZone("hex", nl, 0);
+ zoneClasses.MakeEntityMemberOf(zid, "internal");
+ zoneClasses.MakeEntityMemberOf(zid, "nose");
+ zoneClasses.MakeEntityMemberOf(zid, "guidance");
+ zoneClasses.MakeEntityMemberOf(zid, stage_name);
+ }
+
+ // add external wedges
+ int permute[] = {1, 0, 3, 2}; // wedge base is permuted from hex
+ int k = layer1NoseStart + 1;
+ for (i = 4; i < layerNZones; i++) // just the outer layer of hex bases
+ {
+ vector<int> nl;
+ for (j = 0; j < 4; j++)
+ nl.push_back(layerNodelist[i*4+permute[j]] + (zval-1)*layerNNodes);
+ if (i == layerNZones - 1)
+ {
+ nl.push_back(layer1NoseStart+1);
+ nl.push_back(k);
+ }
+ else
+ {
+ nl.push_back(k+1);
+ nl.push_back(k);
+ }
+ k++;
+ int zid = AddZone("wedge", nl, 0);
+ zoneClasses.MakeEntityMemberOf(zid, "external");
+ zoneClasses.MakeEntityMemberOf(zid, "nose");
+ zoneClasses.MakeEntityMemberOf(zid, "ring");
+ zoneClasses.MakeEntityMemberOf(zid, stage_name);
+ }
+
+ // add top-level pyramids
+ for (i = 0; i < 4; i++)
+ {
+ vector<int> nl;
+ for (j = 0; j < 4; j++)
+ nl.push_back(layerNodelist[i*4+permute[j]] + layer1NoseStart);
+ nl.push_back(noseApex);
+ int zid = AddZone("pyramid", nl, 0);
+ zoneClasses.MakeEntityMemberOf(zid, "external");
+ zoneClasses.MakeEntityMemberOf(zid, "nose");
+ zoneClasses.MakeEntityMemberOf(zid, "mirvs");
+ stringstream tmp;
+ tmp << i+1;
+ zoneClasses.MakeEntityMemberOf(zid, "mirv"+tmp.str());
+ zoneClasses.MakeEntityMemberOf(zid, stage_name);
+ }
+}
+
+//
+// Adds the fins of the rocket around the bottom two layers
+//
+void add_fins()
+{
+ int i;
+ float finX = 4 * cos(22.5 / 180.0 * M_PI);
+ float finY = 4 * sin(22.5 / 180.0 * M_PI);
+
+ // add layer 0,1 and 2 fin tip nodes
+ int finNodesStart = xvals_g.size();
+ for (i = 0; i < 3; i++)
+ {
+ int nid;
+ nid = AddNode(-finX, finY, (float)i, 0);
+ nodeClasses.MakeEntityMemberOf(nid, "fin1");
+ nodeClasses.MakeEntityMemberOf(nid, "fins");
+
+ nid = AddNode(finY, finX, (float)i, 0);
+ nodeClasses.MakeEntityMemberOf(nid, "fin2");
+ nodeClasses.MakeEntityMemberOf(nid, "fins");
+
+ nid = AddNode(finX, -finY, (float)i, 0);
+ nodeClasses.MakeEntityMemberOf(nid, "fin3");
+ nodeClasses.MakeEntityMemberOf(nid, "fins");
+
+ nid = AddNode(-finY, -finX, (float)i, 0);
+ nodeClasses.MakeEntityMemberOf(nid, "fin4");
+ nodeClasses.MakeEntityMemberOf(nid, "fins");
+ }
+
+ // add fin bottoms (wedges) on layer 0 and 1
+ int startNodes[] = {9, 11, 13, 15};
+ for (i = 0; i < 8; i++)
+ {
+ int n = startNodes[i%4] + (i/4)*layerNNodes;
+ vector<int> nl;
+ nl.push_back(n+1);
+ nl.push_back(n+1+layerNNodes);
+ nl.push_back(n+layerNNodes);
+ nl.push_back(n);
+ nl.push_back(finNodesStart+i);
+ nl.push_back(finNodesStart+i+4);
+ int zid = AddZone("wedge", nl, 0);
+ zoneClasses.MakeEntityMemberOf(zid, "fins");
+ stringstream tmp;
+ tmp << i%4+1;
+ zoneClasses.MakeEntityMemberOf(zid, "fin"+tmp.str());
+ }
+
+ // add fin tops (pyramids) on layer 2
+ for (i = 0; i < 4; i++)
+ {
+ int n = startNodes[i]+2*layerNNodes;
+ vector<int> nl;
+ nl.push_back(n+1);
+ nl.push_back(n+1+layerNNodes);
+ nl.push_back(n+layerNNodes);
+ nl.push_back(n);
+ nl.push_back(finNodesStart+i+8);
+ int zid = AddZone("pyramid", nl, 0);
+ zoneClasses.MakeEntityMemberOf(zid, "fins");
+ stringstream tmp;
+ tmp << i+1;
+ zoneClasses.MakeEntityMemberOf(zid, "fin"+tmp.str());
+ }
+}
+
+//
+// Build the rocket from the simple 2D description of a
+// single layer of nodal positions.
+//
+static void build_rocket(const vector<int>& layers_per_stage)
+{
+ int j, k = 1;
+ make_base_layer();
+ for (j = 0; j < layers_per_stage.size(); j++)
+ {
+ for (int i = 0; i < layers_per_stage[j]; i++, k++)
+ add_layer(j+1, k);
+ }
+ add_nose(j+1,k);
+ add_fins();
+}
+
+//
+// Decomposes the rocket such that lower half is split lengthwise
+// into two pieces while the upper half is split crosswise into three
+// pieces for a total of 5 domains. All this function does is
+// assign zones to one of the 5 domain classes.
+//
+static void ParallelDecompose()
+{
+ float dummy, zmin, zmax;
+ GetRocketBounds(dummy, dummy, zmin, dummy, dummy, zmax);
+ float zhalf = (zmin + zmax) / 2.0;
+ float z3 = (zmax - zmin) / 2.0 / 3.0;
+
+ for (int i = 0; i < zoneClasses.GetNumEntities(); i++)
+ {
+ float xmin, xmax, ymin, ymax;
+ GetZoneBounds(i, xmin, ymin, zmin, xmax, ymax, zmax);
+ float zcenter = (zmin + zmax) / 2.0;
+ if (zcenter < zhalf)
+ {
+ float ycenter = (ymin + ymax) / 2.0;
+ if (ycenter < 0) zoneClasses.MakeEntityMemberOf(i, "domain0");
+ else zoneClasses.MakeEntityMemberOf(i, "domain1");
+ }
+ else
+ {
+ if (zcenter < (zhalf + z3)) zoneClasses.MakeEntityMemberOf(i, "domain2");
+ else if (zcenter < (zhalf + 2*z3)) zoneClasses.MakeEntityMemberOf(i, "domain3");
+ else zoneClasses.MakeEntityMemberOf(i, "domain4");
+ }
+ }
+}
+
+static void DefineNodesets()
+{
+ nodeClasses.AddClass("HighQ");
+ nodeClasses.AddClass("HoldDownPoints");
+ nodeClasses.AddClass("TowerContact");
+
+ // HighQ nodes
+ for (int i = 290; i<= 298; i++)
+ nodeClasses.MakeEntityMemberOf(i, "HighQ");
+ for (int i = 307; i<= 310; i++)
+ nodeClasses.MakeEntityMemberOf(i, "HighQ");
+
+ // Hold down nodes
+ for (int i = 1; i<= 8; i++)
+ nodeClasses.MakeEntityMemberOf(i, "HoldDownPoints");
+ for (int i = 10; i<= 16; i+=2)
+ nodeClasses.MakeEntityMemberOf(i, "HoldDownPoints");
+
+ // Tower contact nodes
+ for (int i = 9; i<= 281; i += 17)
+ nodeClasses.MakeEntityMemberOf(i, "TowerContact");
+}
+
+#define MakeFaceFromNodesEntityMemberOf(c, n0, n1, n2, n3) \
+{ \
+ nodeClasses.MakeEntityMemberOf(n0, c); \
+ nodeClasses.MakeEntityMemberOf(n1, c); \
+ nodeClasses.MakeEntityMemberOf(n2, c); \
+ if (n3 != -1) nodeClasses.MakeEntityMemberOf(n3, c); \
+}
+
+// for now, we'll do this in terms of nodes of the faces
+static void DefineFacesets()
+{
+ nodeClasses.AddClass("PeakPressure");
+ nodeClasses.AddClass("ControlSurfaces");
+
+ MakeFaceFromNodesEntityMemberOf("PeakPressure", 66, 67, 310, -1);
+ MakeFaceFromNodesEntityMemberOf("PeakPressure", 64, 65, 309, -1);
+ MakeFaceFromNodesEntityMemberOf("PeakPressure", 62, 63, 308, -1);
+ MakeFaceFromNodesEntityMemberOf("PeakPressure", 60, 61, 307, -1);
+ MakeFaceFromNodesEntityMemberOf("PeakPressure", 298, 290, 297, -1);
+ MakeFaceFromNodesEntityMemberOf("PeakPressure", 298, 297, 296, -1);
+ MakeFaceFromNodesEntityMemberOf("PeakPressure", 298, 296, 295, -1);
+ MakeFaceFromNodesEntityMemberOf("PeakPressure", 298, 295, 294, -1);
+ MakeFaceFromNodesEntityMemberOf("PeakPressure", 298, 294, 293, -1);
+ MakeFaceFromNodesEntityMemberOf("PeakPressure", 298, 293, 292, -1);
+ MakeFaceFromNodesEntityMemberOf("PeakPressure", 298, 292, 291, -1);
+ MakeFaceFromNodesEntityMemberOf("PeakPressure", 298, 291, 290, -1);
+
+ MakeFaceFromNodesEntityMemberOf("ControlSurfaces", 16, 302, 306, 33);
+ MakeFaceFromNodesEntityMemberOf("ControlSurfaces", 302, 15, 32, 306);
+ MakeFaceFromNodesEntityMemberOf("ControlSurfaces", 14, 301, 305, 31);
+ MakeFaceFromNodesEntityMemberOf("ControlSurfaces", 301, 13, 30, 305);
+ MakeFaceFromNodesEntityMemberOf("ControlSurfaces", 12, 300, 304, 29);
+ MakeFaceFromNodesEntityMemberOf("ControlSurfaces", 300, 11, 28, 304);
+ MakeFaceFromNodesEntityMemberOf("ControlSurfaces", 10, 299, 303, 27);
+ MakeFaceFromNodesEntityMemberOf("ControlSurfaces", 299, 9, 26, 303);
+}
+
+#if 0
+static void GetAvgNodalCoords(int idx,
+ int n, const int *const offsets,
+ float& xavg, float& yavg, float& zavg)
+{
+ assert(idx<nodestarts_g.size());
+ int i0 = nodestarts_g[idx];
+ int cnt = nodecnt_g[idx];
+ assert(n>0&&n<=cnt);
+ xavg = yavg = zavg = 0.0;
+ for (int i = 0; i < n; i++)
+ {
+ int nid = nodelist_g[i0+offsets[i]];
+ xavg += xvals_g[nid];
+ yavg += yvals_g[nid];
+ zavg += zvals_g[nid];
+ }
+ xavg /= cnt;
+ yavg /= cnt;
+ zavg /= cnt;
+}
+
+static void RefineHex(int idx)
+{
+ assert(idx<nodestarts_g.size());
+ int *poffs;
+
+ float x, y, z;
+
+ // Add Center node
+ for (int i = 0; i < 8; i++)
+ offs[i] = i;
+ GetAvgNodalCoords(idx, offs, x, y, z);
+ int cid = AddNode(x, y, z, 1);
+
+ // Add center face nodes
+
+
+ // Add center edge nodes
+
+ // Build hex zones.
+
+}
+
+static void RefineWedge()
+{
+}
+
+static void RefinePyramid()
+{
+}
+
+static void AMRRefine()
+{
+ for (int i = 0; i < zoneClasses.GetNumEntities(); i++)
+ {
+ string ztn = zoneClasses.ZoneType(i);
+ if (ztn == "hex")
+ }
+}
+#endif
+
+static void DefineNodeClasses()
+{
+ nodeClasses.AddClass("point");
+
+ nodeClasses.AddClass("midline");
+ nodeClasses.AddClass("internal");
+ nodeClasses.AddClass("external");
+ nodeClasses.AddClass("nose");
+ nodeClasses.AddClass("fins");
+ nodeClasses.AddClass("fin1");
+ nodeClasses.AddClass("fin2");
+ nodeClasses.AddClass("fin3");
+ nodeClasses.AddClass("fin4");
+ nodeClasses.AddClass("stage1");
+ nodeClasses.AddClass("stage2");
+ nodeClasses.AddClass("stage3");
+ nodeClasses.AddClass("stage4");
+ nodeClasses.AddClass("stage5");
+
+ nodeClasses.AddClass("level0");
+ nodeClasses.AddClass("level1");
+ nodeClasses.AddClass("level2");
+}
+
+static void DefineZoneClasses()
+{
+ zoneClasses.AddClass("hex");
+ zoneClasses.AddClass("wedge");
+ zoneClasses.AddClass("pyramid");
+ zoneClasses.AddClass("tet");
+
+ zoneClasses.AddClass("domain0");
+ zoneClasses.AddClass("domain1");
+ zoneClasses.AddClass("domain2");
+ zoneClasses.AddClass("domain3");
+ zoneClasses.AddClass("domain4");
+
+ zoneClasses.AddClass("internal");
+ zoneClasses.AddClass("external");
+
+ zoneClasses.AddClass("stage1");
+ zoneClasses.AddClass("stage2");
+ zoneClasses.AddClass("stage3");
+ zoneClasses.AddClass("stage4");
+ zoneClasses.AddClass("stage5");
+
+ zoneClasses.AddClass("nose");
+ zoneClasses.AddClass("ring");
+ zoneClasses.AddClass("fins");
+ zoneClasses.AddClass("fin1");
+ zoneClasses.AddClass("fin2");
+ zoneClasses.AddClass("fin3");
+ zoneClasses.AddClass("fin4");
+ zoneClasses.AddClass("mirvs");
+ zoneClasses.AddClass("mirv1");
+ zoneClasses.AddClass("mirv2");
+ zoneClasses.AddClass("mirv3");
+ zoneClasses.AddClass("mirv4");
+ zoneClasses.AddClass("guidance");
+
+ zoneClasses.AddClass("level0");
+ zoneClasses.AddClass("level1");
+ zoneClasses.AddClass("level2");
+}
+
+//
+// Purpose: Build a simple, 3D mesh with a lot of interesting subsets
+// to serve as a talking point for VisIt's subsetting functionality.
+//
+// Modifications:
+// Mark C. Miller, Wed Jul 14 15:33:02 PDT 2010
+// Added show-all-errors option.
+//
+
+#ifndef STATIC_PLUGINS
+typedef struct _func_and_handle_t
+{
+ FormatWriteFunc func;
+ void *dlhandle;
+} func_and_handle_t;
+
+static int
+WriteAllFormats(int argc, char **argv)
+{
+ int nerrors = 0;
+ int d, foundOne = 0;
+ map<string, func_and_handle_t> formatMap;
+
+ // Accomodate all possible places autotools may wind up building the plugins
+ char *dirs[] = {".", "../..", ".libs", "../../.libs"};
+ for (d = 0; d < sizeof(dirs)/sizeof(dirs[0]) && !foundOne; d++)
+ {
+ DIR *cwdir = opendir(dirs[d]);
+ if (!cwdir) continue;
+
+ struct dirent* dent;
+ while (dent = readdir(cwdir))
+ {
+ string dname = string(dent->d_name);
+
+ if (dname.find("rocket_") == string::npos)
+ continue;
+ if (dname.rfind(".so") == string::npos)
+ continue;
+
+ string fmtname = dname.substr(7,dname.size()-10);
+ string pname = string(dirs[d])+"/"+dname;
+
+ void *dlhandle = dlopen(pname.c_str(), RTLD_LAZY);
+ if (!dlhandle)
+ {
+ cerr << "Encountered dlopen error \"" << dlerror() << "\" for file \""
+ << pname << "\" Skipping it." << endl;
+ continue;
+ }
+
+ FormatWriteFunc writeFunc = (FormatWriteFunc) dlsym(dlhandle, "WriteFormat");
+ if (!writeFunc)
+ {
+ cerr << "Encountered dlsym error \"" << dlerror() << "\" for format \""
+ << fmtname << "\". Skipping it." << endl;
+ dlclose(dlhandle);
+ continue;
+ }
+
+ if (!foundOne)
+ cout << "Using \"" << dirs[d] << "\" as plugin dir." << endl;
+ foundOne = 1;
+ formatMap[fmtname].func = writeFunc;
+ formatMap[fmtname].dlhandle = dlhandle;
+ }
+
+ closedir(cwdir);
+ }
+
+ if (!foundOne)
+ {
+ fprintf(stderr, "Unable to find suitable plugin directory\n");
+ exit(1);
+ }
+
+ cout << "Found " << formatMap.size() << " format writers." << endl;
+
+ for (map<string, func_and_handle_t>::iterator it = formatMap.begin(); it != formatMap.end(); it++)
+ {
+ cout << "Processing format \"" << it->first << "\"..." << endl;
+ nerrors += ((it->second).func)(argc, argv);
+ dlclose((it->second).dlhandle);
+ }
+
+ return nerrors + !formatMap.size();
+}
+#endif
+
+#ifdef STATIC_PLUGINS
+
+#ifdef HAVE_SILO
+extern int WriteFormat_silo(int argc, const char *const *const argv);
+#endif
+
+#endif
+
+int
+main(int argc, char **argv)
+{
+ int nerrors = 0;
+
+ DefineNodeClasses();
+ DefineZoneClasses();
+
+ /* build the monolithic, single domain rocket geometry, etc */
+ const int layer_sizes[] = {8, 5, 3};
+ vector<int> layers_per_stage(layer_sizes, layer_sizes + sizeof(layer_sizes)/sizeof(layer_sizes[0]));
+ build_rocket(layers_per_stage);
+
+ DefineNodesets();
+ DefineFacesets();
+
+ ParallelDecompose();
+
+#ifdef STATIC_PLUGINS
+
+#ifdef HAVE_SILO
+ nerrors += WriteFormat_silo(argc, argv);
+#endif
+
+#else // STATIC_PLUGINS
+
+ nerrors += WriteAllFormats(argc, argv);
+
+#endif
+
+ return nerrors;
+}
diff --git a/tests/rocket.h b/tests/rocket.h
new file mode 100644
index 0000000..e898a0b
--- /dev/null
+++ b/tests/rocket.h
@@ -0,0 +1,232 @@
+/*
+Copyright (c) 1994 - 2010, Lawrence Livermore National Security, LLC.
+LLNL-CODE-425250.
+All rights reserved.
+
+This file is part of Silo. For details, see silo.llnl.gov.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the disclaimer below.
+ * Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the disclaimer (as noted
+ below) in the documentation and/or other materials provided with
+ the distribution.
+ * Neither the name of the LLNS/LLNL nor the names of its
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL LAWRENCE
+LIVERMORE NATIONAL SECURITY, LLC, THE U.S. DEPARTMENT OF ENERGY OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+This work was produced at Lawrence Livermore National Laboratory under
+Contract No. DE-AC52-07NA27344 with the DOE.
+
+Neither the United States Government nor Lawrence Livermore National
+Security, LLC nor any of their employees, makes any warranty, express
+or implied, or assumes any liability or responsibility for the
+accuracy, completeness, or usefulness of any information, apparatus,
+product, or process disclosed, or represents that its use would not
+infringe privately-owned rights.
+
+Any reference herein to any specific commercial products, process, or
+services by trade name, trademark, manufacturer or otherwise does not
+necessarily constitute or imply its endorsement, recommendation, or
+favoring by the United States Government or Lawrence Livermore
+National Security, LLC. The views and opinions of authors expressed
+herein do not necessarily state or reflect those of the United States
+Government or Lawrence Livermore National Security, LLC, and shall not
+be used for advertising or product endorsement purposes.
+*/
+
+#warning MAKE THIS CONDITIONAL LATER
+#define HAVE_SILO
+
+#ifdef __sgi /* IRIX C++ bug */
+#include <math.h>
+#else
+#include <cmath>
+#endif
+#include <cstdio>
+#include <cstdlib>
+#include <map>
+#include <vector>
+#include <set>
+#include <string>
+#include <cstring>
+#include <iostream>
+#include <sstream>
+
+#include <assert.h>
+#include <sys/types.h>
+#include <dirent.h>
+
+#include <silo.h>
+
+#ifndef M_PI
+#define M_PI 3.14159265358979323846
+#endif
+
+//
+// The following static arrays of data describe a single, 2D, 'layer'
+// of the rocket body. They are used in the build_body() functions to
+// build several layers of the 3D rocket body.
+//
+extern const float cX;
+extern float layerXVals[];
+extern const int layerNNodes;
+extern float layerYVals[];
+extern std::vector<float> xvals_g, yvals_g, zvals_g;
+
+extern int layerNodelist[];
+extern const int layerNZones;
+extern std::vector<int> nodelist_g, nodecnts_g, nodestarts_g;
+
+//
+// Material names and numbers
+//
+extern int matnos[];
+extern char *matNames[];
+extern std::map<std::string, int> matMap;
+extern std::vector<int> matlist_g;
+
+class EntityClassifier
+{
+ public:
+ void AddClass(const std::string& cname)
+ {
+ int nclasses = class_masks.size();
+ assert(nclasses < sizeof(unsigned long long)*8);
+ assert(class_masks.find(cname) == class_masks.end());
+ unsigned long long mask = ((unsigned long long) 1)<<(nclasses+1);
+ class_masks[cname] = mask;
+ }
+ int AddEntity()
+ {
+ entity_masks.push_back(0x0);
+ return entity_masks.size()-1;
+ }
+ void MakeEntityMemberOf(int idx, const std::string& cname)
+ {
+ assert(class_masks.find(cname) != class_masks.end());
+ assert(idx < entity_masks.size());
+ unsigned long long mask = class_masks[cname];
+ entity_masks[idx] |= mask;
+ }
+ bool IsEntityMemberOf(int idx, const std::string& cname) const
+ {
+ if (class_masks.find(cname) == class_masks.end()) return false;
+ assert(idx < entity_masks.size());
+ const unsigned long long mask = class_masks.at(cname);
+ return entity_masks[idx] & mask;
+ }
+ int GetNumEntities() const
+ {
+ return (int) entity_masks.size();
+ }
+ const std::string ZoneType(int idx) const
+ {
+ static const char* zt_classes[] = {
+ "hex", "tet", "wedge", "prism", "pyramid", "polyhedron", // 3D
+ "quad", "tri", "polygon", // 2D
+ "beam", // 1D
+ "point"}; // 0D
+ for (int i = 0; i < sizeof(zt_classes)/sizeof(zt_classes[0]); i++)
+ if (IsEntityMemberOf(idx, zt_classes[i])) return zt_classes[i];
+ return "unknown";
+ }
+ // Gets list of entities in all specified classes
+ void GetEntitiesInClasses(const std::vector<std::string>& cnames, std::vector<int>& elist) const
+ {
+ elist.clear();
+ for (int i = 0; i < entity_masks.size(); i++)
+ {
+ bool inAllClasses = true;
+ for (int j = 0; j < cnames.size() && inAllClasses; j++)
+ inAllClasses = IsEntityMemberOf(i, cnames[j]);
+ if (inAllClasses) elist.push_back(i);
+ }
+ }
+ // asserts classes define a 'partition' by initializing colors to -1
+ void GetEntitiesPartitionedByClasses(const std::vector<std::string>& classes, std::vector<int>& colors) const
+ {
+ colors.resize(GetNumEntities());
+ for (int i = 0; i < colors.size(); i++) colors[i] = -1;
+ for (int i = 0; i < classes.size(); i++)
+ {
+ for (int j = 0; j < GetNumEntities(); j++)
+ {
+ if (IsEntityMemberOf(j, classes[i]))
+ {
+ assert(colors[j] == -1);
+ colors[j] = i;
+ }
+ }
+ }
+ }
+ void PrintEntitiesInClasses(std::ostream& str) const
+ {
+ std::map<std::string, unsigned long long>::const_iterator cit;
+ for (cit = class_masks.begin(); cit != class_masks.end(); cit++)
+ {
+ std::vector<int> ents;
+ std::vector<std::string> ckclasses;
+ ckclasses.push_back(cit->first);
+ GetEntitiesInClasses(ckclasses, ents);
+ if (!ents.size()) continue;
+ str << "Entities in class \"" << cit->first << "\" [" << ents.size() << "]" << std::endl;
+ for (int i = 0; i < ents.size(); i++)
+ {
+ str << ents[i] << ((i==(ents.size()-1))?"":", ");
+ if (i && !((i*5)%80)) str << std::endl;
+ }
+ str << std::endl << std::endl;
+ }
+ }
+
+ private:
+ std::map<std::string, unsigned long long> class_masks;
+ std::vector<unsigned long long> entity_masks;
+};
+
+extern EntityClassifier nodeClasses, zoneClasses;
+
+extern void GetRocketBounds(
+ float& xmin, float& ymin, float& zmin,
+ float& xmax, float& ymax, float& zmax);
+extern void GetZoneBounds(int idx,
+ float& xmin, float& ymin, float& zmin,
+ float& xmax, float& ymax, float& zmax);
+
+extern void GetUpDownMapsForZoneClass(const std::string& zcname,
+ std::vector<int>& upnodes, std::vector<int>& dnnodes,
+ std::vector<int>& upzones, std::vector<int>& dnzones);
+
+template <typename T> inline
+void MapArray(const std::vector<int>& themap, const std::vector<T>& inarr,
+ std::vector<T>& outarr, T fill)
+{
+ assert(inarr.size());
+ outarr.assign(themap.size(), fill);
+ for (int i = 0; i < themap.size(); i++)
+ {
+ if (themap[i] == -1) continue;
+ assert(themap[i]<inarr.size());
+ outarr[i] = inarr[themap[i]];
+ }
+}
+
+typedef int (*FormatWriteFunc)(int argc, const char *const *const argv);
diff --git a/tests/rocket_silo.cxx b/tests/rocket_silo.cxx
new file mode 100644
index 0000000..3260bcd
--- /dev/null
+++ b/tests/rocket_silo.cxx
@@ -0,0 +1,494 @@
+/*
+Copyright (c) 1994 - 2010, Lawrence Livermore National Security, LLC.
+LLNL-CODE-425250.
+All rights reserved.
+
+This file is part of Silo. For details, see silo.llnl.gov.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the disclaimer below.
+ * Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the disclaimer (as noted
+ below) in the documentation and/or other materials provided with
+ the distribution.
+ * Neither the name of the LLNS/LLNL nor the names of its
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL LAWRENCE
+LIVERMORE NATIONAL SECURITY, LLC, THE U.S. DEPARTMENT OF ENERGY OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+This work was produced at Lawrence Livermore National Laboratory under
+Contract No. DE-AC52-07NA27344 with the DOE.
+
+Neither the United States Government nor Lawrence Livermore National
+Security, LLC nor any of their employees, makes any warranty, express
+or implied, or assumes any liability or responsibility for the
+accuracy, completeness, or usefulness of any information, apparatus,
+product, or process disclosed, or represents that its use would not
+infringe privately-owned rights.
+
+Any reference herein to any specific commercial products, process, or
+services by trade name, trademark, manufacturer or otherwise does not
+necessarily constitute or imply its endorsement, recommendation, or
+favoring by the United States Government or Lawrence Livermore
+National Security, LLC. The views and opinions of authors expressed
+herein do not necessarily state or reflect those of the United States
+Government or Lawrence Livermore National Security, LLC, and shall not
+be used for advertising or product endorsement purposes.
+*/
+
+#ifdef __sgi /* IRIX C++ bug */
+#include <math.h>
+#else
+#include <cmath>
+#endif
+#include <cstdio>
+#include <cstdlib>
+#include <map>
+#include <vector>
+#include <string>
+#include <cstring>
+#include <iostream>
+#include <sstream>
+
+#include <assert.h>
+#include <sys/types.h>
+#include <dirent.h>
+
+#include <silo.h>
+#include <std.c>
+
+#include <rocket.h>
+
+using std::cout;
+using std::cerr;
+using std::endl;
+using std::ostream;
+using std::map;
+using std::set;
+using std::string;
+using std::stringstream;
+using std::vector;
+
+#ifndef M_PI
+#define M_PI 3.14159265358979323846
+#endif
+
+static int SiloZoneType(const string& ztstr)
+{
+ // 3D zone types
+ if (ztstr == "hex") return DB_ZONETYPE_HEX;
+ if (ztstr == "tet") return DB_ZONETYPE_TET;
+ if (ztstr == "wedge") return DB_ZONETYPE_PRISM;
+ if (ztstr == "prism") return DB_ZONETYPE_PRISM;
+ if (ztstr == "pyramid") return DB_ZONETYPE_PYRAMID;
+ if (ztstr == "polyhedron") return DB_ZONETYPE_POLYHEDRON;
+
+ // 2D zone types
+ if (ztstr == "quad") return DB_ZONETYPE_QUAD;
+ if (ztstr == "tri") return DB_ZONETYPE_TRIANGLE;
+ if (ztstr == "polygon") return DB_ZONETYPE_POLYGON;
+
+ // 1D zone types
+ if (ztstr == "line") return DB_ZONETYPE_BEAM;
+
+ // 0D zone types
+ if (ztstr == "point") return 0; // no silo zone-type for this
+
+ return -1;
+}
+
+static int SiloZoneShapeSize(int ztype)
+{
+ // 3D zone types
+ if (ztype == DB_ZONETYPE_HEX) return 8;
+ if (ztype == DB_ZONETYPE_TET) return 4;
+ if (ztype == DB_ZONETYPE_PRISM) return 6;
+ if (ztype == DB_ZONETYPE_PYRAMID) return 5;
+ if (ztype == DB_ZONETYPE_POLYHEDRON) return -1;
+
+ // 2D zone types
+ if (ztype == DB_ZONETYPE_QUAD) return 4;
+ if (ztype == DB_ZONETYPE_TRIANGLE) return 3;
+ if (ztype == DB_ZONETYPE_POLYGON) return -1;
+
+ // 1D zone types
+ if (ztype == DB_ZONETYPE_BEAM) return 2;
+
+ return 0;
+}
+
+static void SiloZonelistStuff(const string& restrict_to_class,
+ vector<int>& shptype, vector<int>& shpsz, vector<int>& shpcnt)
+{
+ shptype.clear();
+ shpsz.clear();
+ shpcnt.clear();
+
+ int i, zid, zt;
+ int shapecnt = 0;
+ int lastzt;
+
+ int nzones;
+ vector<int> zlist;
+ if (restrict_to_class == "")
+ {
+ nzones = zoneClasses.GetNumEntities();
+ lastzt = SiloZoneType(zoneClasses.ZoneType(0));
+ }
+ else
+ {
+ vector<string> r2c;
+ r2c.push_back(restrict_to_class);
+ zoneClasses.GetEntitiesInClasses(r2c, zlist);
+ nzones = zlist.size();
+ lastzt = SiloZoneType(zoneClasses.ZoneType(zlist[0]));
+ }
+
+
+ for (i = 0; i < nzones; i++)
+ {
+ zid = (restrict_to_class == "") ? i : zlist[i];
+ zt = SiloZoneType(zoneClasses.ZoneType(zid));
+ assert(zt != DB_ZONETYPE_POLYHEDRON);
+ assert(zt != DB_ZONETYPE_POLYGON);
+ if (zt != lastzt)
+ {
+ shptype.push_back(lastzt);
+ shpsz.push_back(SiloZoneShapeSize(lastzt));
+ shpcnt.push_back(shapecnt);
+ shapecnt = 0;
+ lastzt = zt;
+ }
+ shapecnt++;
+ }
+ zid = (restrict_to_class == "") ? i-1 : zlist[i-1];
+ zt = SiloZoneType(zoneClasses.ZoneType(zid));
+ assert(zt != DB_ZONETYPE_POLYHEDRON);
+ assert(zt != DB_ZONETYPE_POLYGON);
+ shptype.push_back(zt);
+ shpsz.push_back(SiloZoneShapeSize(zt));
+ shpcnt.push_back(shapecnt);
+}
+
+static int silo_driver = -1;
+static int ProcessArgsForSilo(const int argc, const char *const *const argv)
+{
+ int show_all_errors = FALSE;
+ int j, i = 1;
+
+ silo_driver = DB_PDB;
+ while (i < argc)
+ {
+ if (strncmp(argv[i], "DB_HDF5", 7) == 0)
+ {
+ silo_driver = StringToDriver(argv[i]);
+ }
+ else if (strncmp(argv[i], "DB_PDB", 6) == 0)
+ {
+ silo_driver = StringToDriver(argv[i]);
+ }
+ else if (!strcmp(argv[i], "show-all-errors")) {
+ show_all_errors = 1;
+ }
+ i++;
+ }
+
+ DBShowErrors(show_all_errors?DB_ALL_AND_DRVR:DB_ABORT, NULL);
+ return 0;
+}
+
+static int AddRegions(DBfile *dbfile, DBmrgtree *mrgt,
+ const char *className, const char *const *const regnNames,
+ int nreg, bool addMaps = false, int remapForProci = -1)
+{
+ DBAddRegion(mrgt, className, 0, nreg, 0, 0, 0, 0, 0, 0);
+ DBSetCwr(mrgt, className);
+
+ int seg_types[1], seg_lens[1], seg_ids[1];
+ const int *seg_data[1];
+ seg_types[0] = DB_NODECENT;
+ seg_ids[0] = 0;
+
+ for (int i = 0; i < nreg; i++)
+ {
+ if (!addMaps) // no maps, so just define the region
+ {
+ DBAddRegion(mrgt, regnNames[i], 0, 0, 0, 0, 0, 0, 0, 0);
+ }
+ else // Do it as one map per region. Could do one map for all regions too.
+ {
+ vector<string> cnames;
+ cnames.push_back(regnNames[i]);
+ vector<int> map_data;
+ nodeClasses.GetEntitiesInClasses(cnames, map_data);
+
+ if (remapForProci >= 0)
+ {
+ stringstream procClassName;
+ procClassName << "domain" << remapForProci;
+ vector<int> upn, dnn, upz, dnz;
+ GetUpDownMapsForZoneClass(procClassName.str(), upn, dnn, upz, dnz);
+ vector<int> map_data2;
+ for (int j = 0; j < map_data.size(); j++)
+ {
+ int gnid = map_data[j];
+ int lnid = dnn[gnid];
+ if (lnid != -1)
+ map_data2.push_back(lnid);
+ }
+ map_data = map_data2;
+ }
+
+ if (map_data.size() == 0)
+ {
+ DBAddRegion(mrgt, regnNames[i], 0, 0, 0, 0, 0, 0, 0, 0);
+ }
+ else
+ {
+ seg_lens[0] = map_data.size();
+ seg_data[0] = &map_data[0];
+ string mapnm = string(regnNames[i]) + "_map";
+ DBAddRegion(mrgt, regnNames[i], 0, 0, mapnm.c_str(), 1, seg_ids, seg_lens, seg_types, 0);
+ DBPutGroupelmap(dbfile, mapnm.c_str(), 1, seg_types, seg_lens, seg_ids, (int**)seg_data, 0, 0, 0);
+ }
+ }
+ }
+
+ DBSetCwr(mrgt, "..");
+}
+
+static int WriteSiloSingleMesh(DBfile *dbfile, DBoptlist *ol,
+ const vector<string>& dom_classes)
+{
+ float *coords[3];
+ coords[0] = &xvals_g[0];
+ coords[1] = &yvals_g[0];
+ coords[2] = &zvals_g[0];
+ char *coordnames[3];
+ coordnames[0] = "X";
+ coordnames[1] = "Y";
+ coordnames[2] = "Z";
+ int nnodes = nodeClasses.GetNumEntities();
+ int nzones = zoneClasses.GetNumEntities();
+
+ DBAddOption(ol, DBOPT_MRGTREE_NAME, (void*) "mrgtree");
+ DBPutUcdmesh(dbfile, "mesh", 3, coordnames, coords, nnodes, nzones, "zl", 0, DB_FLOAT, ol);
+ DBClearOptlist(ol);
+
+ vector<int> shapetyp, shapesize, shapecnt;
+ SiloZonelistStuff("", shapetyp, shapesize, shapecnt);
+ DBPutZonelist2(dbfile, "zl", nzones, 3, &nodelist_g[0], (int) nodelist_g.size(), 0, 0, 0,
+ &shapetyp[0], &shapesize[0], &shapecnt[0], (int) shapetyp.size(), 0);
+
+ // Create a zone-centered variable showing domain-decomp for debug purposes
+ int ndoms = dom_classes.size();
+ vector<int> dom_map;
+ zoneClasses.GetEntitiesPartitionedByClasses(dom_classes, dom_map);
+ DBPutUcdvar1(dbfile, "proc_map", "mesh", &dom_map[0], nzones, 0, 0, DB_INT, DB_ZONECENT, 0);
+
+ // Create MRG Tree
+ DBmrgtree *mrgt = DBMakeMrgtree(DB_UCDMESH, 0x0, 4, 0);
+
+ // Add nodeset regions to MRG Tree
+ const char *ns_names[] = {"HighQ", "HoldDownPoints", "TowerContact"};
+ const int nns = sizeof(ns_names)/sizeof(ns_names[0]);
+ const bool addMaps = true;
+ AddRegions(dbfile, mrgt, "nodesets", ns_names, nns, addMaps);
+
+ // Add faceset regions to MRG Tree
+ const char *fs_names[] = {"PeakPressure", "ControlSurfaces"};
+ const int nfs = sizeof(fs_names)/sizeof(fs_names[0]);
+ AddRegions(dbfile, mrgt, "facesets", fs_names, nfs, addMaps);
+
+ // Up until now, only map data has been written to file. Now,
+ // write the MRG Tree too.
+ DBPutMrgtree(dbfile, "mrgtree", "mesh", mrgt, 0);
+ DBFreeMrgtree(mrgt);
+}
+
+static int WriteSiloMultiMesh(DBfile *dbfile, DBoptlist *ol,
+ const vector<string>& dom_classes)
+{
+ float *coords[3];
+ char *coordnames[3];
+ coordnames[0] = "X";
+ coordnames[1] = "Y";
+ coordnames[2] = "Z";
+
+ int ndoms = dom_classes.size();
+
+ for (int i = 0; i < ndoms; i++)
+ {
+ DBMkDir(dbfile, dom_classes[i].c_str());
+ DBSetDir(dbfile, dom_classes[i].c_str());
+
+ vector<int> upz, upn, dnz, dnn;
+ GetUpDownMapsForZoneClass(dom_classes[i], upn, dnn, upz, dnz);
+
+ vector<float> x, y, z;
+ MapArray(upn, xvals_g, x, (float) -1);
+ MapArray(upn, yvals_g, y, (float) -1);
+ MapArray(upn, zvals_g, z, (float) -1);
+ int nnodes2 = upn.size();
+ int nzones2 = upz.size();
+
+ // Map the Zonelist object's nodelist
+ vector<int> nl;
+ for (int j = 0; j < upz.size(); j++)
+ {
+ int gzid = upz[j];
+ int k0 = nodestarts_g[gzid];
+ int cnt = nodecnts_g[gzid];
+ for (int k = 0; k < cnt; k++)
+ {
+ int gnid = nodelist_g[k0+k];
+ int lnid = dnn[gnid];
+ assert(lnid>=0 && lnid<nnodes2);
+ nl.push_back(lnid);
+ }
+ }
+
+ coords[0] = &x[0];
+ coords[1] = &y[0];
+ coords[2] = &z[0];
+ DBAddOption(ol, DBOPT_MRGTREE_NAME, (void*) "mrgtree");
+ DBPutUcdmesh(dbfile, "mesh", 3, coordnames, coords, nnodes2, nzones2, "zl", 0, DB_FLOAT, ol);
+ DBClearOptlist(ol);
+
+ vector<int> shapetyp, shapesize, shapecnt;
+ SiloZonelistStuff(dom_classes[i], shapetyp, shapesize, shapecnt);
+ DBPutZonelist2(dbfile, "zl", nzones2, 3, &nl[0], (int) nl.size(), 0, 0, 0,
+ &shapetyp[0], &shapesize[0], &shapecnt[0], (int) shapetyp.size(), 0);
+
+ // Create MRG Tree
+ DBmrgtree *mrgt = DBMakeMrgtree(DB_UCDMESH, 0x0, 4, 0);
+
+ // Add nodeset regions to MRG Tree
+ const char *ns_names[] = {"HighQ", "HoldDownPoints", "TowerContact"};
+ const int nns = sizeof(ns_names)/sizeof(ns_names[0]);
+ const bool addMaps = true;
+ AddRegions(dbfile, mrgt, "nodesets", ns_names, nns, addMaps, i);
+
+ // Add faceset regions to MRG Tree
+ const char *fs_names[] = {"PeakPressure", "ControlSurfaces"};
+ const int nfs = sizeof(fs_names)/sizeof(fs_names[0]);
+ AddRegions(dbfile, mrgt, "facesets", fs_names, nfs, addMaps, i);
+
+ // Up until now, only map data has been written to file. Now,
+ // write the MRG Tree too.
+ DBPutMrgtree(dbfile, "mrgtree", "mesh", mrgt, 0);
+ DBFreeMrgtree(mrgt);
+
+ DBSetDir(dbfile, "..");
+ }
+
+ int mtypes[ndoms];
+ char *mnames[ndoms];
+ for (int i = 0; i < ndoms; i++)
+ {
+ mtypes[i] = DB_UCDMESH;
+ string mname = "/UseCaseB/"+dom_classes[i]+"/mesh";
+ mnames[i] = strdup(mname.c_str());
+ }
+
+ DBAddOption(ol, DBOPT_MRGTREE_NAME, (void*) "mrgtree");
+ DBPutMultimesh(dbfile, "mmesh", ndoms, mnames, mtypes, ol);
+ DBClearOptlist(ol);
+
+ // Create MRG Tree
+ DBmrgtree *mrgt = DBMakeMrgtree(DB_UCDMESH, 0x0, 4, 0);
+
+ // Add nodeset regions to MRG Tree
+ const char *ns_names[] = {"HighQ", "HoldDownPoints", "TowerContact"};
+ const int nns = sizeof(ns_names)/sizeof(ns_names[0]);
+ const bool addMaps = false;
+ AddRegions(dbfile, mrgt, "nodesets", ns_names, nns, addMaps);
+
+ // Add faceset regions to MRG Tree
+ const char *fs_names[] = {"PeakPressure", "ControlSurfaces"};
+ const int nfs = sizeof(fs_names)/sizeof(fs_names[0]);
+ AddRegions(dbfile, mrgt, "facesets", fs_names, nfs, addMaps);
+
+ // Up until now, only map data has been written to file. Now,
+ // write the MRG Tree too.
+ //DBPrintMrgtree(mrgt->root, DB_PREORDER, stdout);
+ DBPutMrgtree(dbfile, "mrgtree", "mmesh", mrgt, 0);
+ DBFreeMrgtree(mrgt);
+
+ for (int i = 0; i < ndoms; i++)
+ free(mnames[i]);
+}
+
+static int WriteFormatReal(int argc, const char *const *const argv)
+{
+ ProcessArgsForSilo(argc, argv);
+
+ if (silo_driver == -1)
+ {
+ cerr << "Silo driver not set" << endl;
+ return 1;
+ }
+
+ char *dclasses[] = {"domain0", "domain1", "domain2", "domain3", "domain4"};
+ int ndoms = sizeof(dclasses) / sizeof(dclasses[0]);
+ vector<string> dom_classes(dclasses, dclasses + ndoms);
+
+ DBfile *dbfile = DBCreate("rocket.silo", DB_CLOBBER, DB_LOCAL,
+ "3D mesh with many interesting subsets", silo_driver);
+ assert(dbfile);
+
+ DBoptlist *ol = DBMakeOptlist(10);
+
+ DBMkDir(dbfile, "UseCaseA");
+ DBSetDir(dbfile, "UseCaseA");
+
+ WriteSiloSingleMesh(dbfile, ol, dom_classes);
+
+ DBSetDir(dbfile, "..");
+ DBMkDir(dbfile, "UseCaseB");
+ DBSetDir(dbfile, "UseCaseB");
+
+ WriteSiloMultiMesh(dbfile, ol, dom_classes);
+
+ DBFreeOptlist(ol);
+
+ DBClose(dbfile);
+
+ return 0;
+}
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifdef STATIC_PLUGINS
+int WriteFormat_silo(int argc, const char *const *const argv)
+{
+ return WriteFormatReal(argc, argv);
+}
+#else
+int WriteFormat(int argc, const char *const *const argv)
+{
+ return WriteFormatReal(argc, argv);
+}
+#endif
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/tests/simple.c b/tests/simple.c
index c37c8d8..54d8c83 100644
--- a/tests/simple.c
+++ b/tests/simple.c
@@ -54,9 +54,12 @@ be used for advertising or product endorsement purposes.
#include "silo.h" /*include public silo */
-#include <stdlib.h>
#include <math.h>
+#include <stdlib.h>
#include <string.h>
+#ifndef WIN32
+#include <unistd.h>
+#endif
#include <std.c>
diff --git a/tests/specmix.c b/tests/specmix.c
index bd352a9..4355ab4 100644
--- a/tests/specmix.c
+++ b/tests/specmix.c
@@ -449,6 +449,14 @@ int main(int argc, char *argv[]) {
printf("Done!\n");
+ for (x=0;x<mesh.nx;x++)
+ free(mesh.node[x]);
+ free(mesh.node);
+
+ for (x=0;x<mesh.zx;x++)
+ free(mesh.zone[x]);
+ free(mesh.zone);
+
CleanupDriverStuff();
return 0;
}
@@ -510,7 +518,8 @@ void writemesh_curv2d(DBfile *db, int mixc, int reorder) {
DBPutQuadmesh(db, "Mesh", coordnames, coord, dims, 2,
DB_FLOAT, DB_NONCOLLINEAR, NULL);
-
+ free(coordnames[0]);
+ free(coordnames[1]);
/* do Node vars */
@@ -642,7 +651,6 @@ void writemesh_ucd2d(DBfile *db, int mixc, int reorder) {
int nl[5000];
float f1[1000],f2[1000], fm[1000];
int x,y,c;
- char *coordnames[2];
float *coord[2];
int dims[2];
char *cnvar, *czvar;
@@ -673,11 +681,6 @@ void writemesh_ucd2d(DBfile *db, int mixc, int reorder) {
}
}
- coordnames[0]=NEW(char,20);
- coordnames[1]=NEW(char,20);
- strcpy(coordnames[0],"x");
- strcpy(coordnames[1],"y");
-
coord[0]=f1;
coord[1]=f2;
@@ -979,5 +982,7 @@ writematspec(DBfile *db)
DBPutMatspecies(db, "Species", "Material", nmat, nspec, speclist, dims, 2,
mfc, specmf, mixspeclist, mixc, DB_FLOAT, optlist);
+ DBFreeOptlist(optlist);
+
return mixc;
}
diff --git a/tests/testall.c b/tests/testall.c
index e5362d8..d5ca93b 100644
--- a/tests/testall.c
+++ b/tests/testall.c
@@ -3203,6 +3203,7 @@ build_curve (DBfile *dbfile, int driver)
y[1][i] = cos (x[i]) ;
}
+ DBSetFriendlyHDF5Names(1);
opts = DBMakeOptlist (10) ;
DBAddOption (opts, DBOPT_XLABEL, "X Axis") ;
DBAddOption (opts, DBOPT_YLABEL, "Y Axis") ;
@@ -3214,18 +3215,23 @@ build_curve (DBfile *dbfile, int driver)
* the name which will be used to store the x values, but the pdb driver
* requires us to know where the values were stored.
*/
- if (DB_HDF5==(driver&0xF)) DBAddOption(opts, DBOPT_XVARNAME, "sincurve_x");
DBPutCurve (dbfile, "sincurve", x, y[0], DB_FLOAT, 20, opts);
- if (DB_HDF5!=(driver&0xF)) DBAddOption(opts, DBOPT_XVARNAME, "sincurve_x");
/*
* Write the `coscurve' curve. It shares x values with the `sincurve'
* curve.
*/
+ if (driver == DB_HDF5)
+ DBAddOption(opts, DBOPT_XVARNAME, "sincurve_xvals");
+ else
+ DBAddOption(opts, DBOPT_XVARNAME, "sincurve_x");
DBPutCurve (dbfile, "coscurve", NULL, y[1], DB_FLOAT, 20, opts) ;
+ DBClearOption(opts, DBOPT_XVARNAME);
+
DBAddOption (opts, DBOPT_REFERENCE, "sincurve") ;
DBPutCurve (dbfile, "sincurv1", NULL, NULL, DB_FLOAT, 20, opts);
DBFreeOptlist (opts) ;
+ DBSetFriendlyHDF5Names(0);
}
/*-------------------------------------------------------------------------
diff --git a/tests/testallf77.f b/tests/testallf77.f
index f0d4b25..791bc53 100644
--- a/tests/testallf77.f
+++ b/tests/testallf77.f
@@ -63,15 +63,23 @@ c---------------------------------------------------------------------
implicit none
include "silo.inc"
- integer dbid, meshid, err
+ integer dbid, meshid, err, driver, nargs
+ character*256 cloption
integer buildrect2d
integer builducd
-c...Create file named "rectf77.pdb". Database ID is returned in 'dbid'.
+c...Create file named "rectf77.silo". Database ID is returned in 'dbid'.
- err = dbcreate("rectf77.pdb", 11, 0, DB_LOCAL,
- . "file info", 9, DB_PDB, dbid)
+ driver = DB_PDB
+ nargs = iargc()
+ call getarg(1, cloption)
+ if (cloption .eq. "DB_HDF5") then
+ driver = DB_HDF5
+ end if
+
+ err = dbcreate("rectf77.silo", 12, 0, DB_LOCAL,
+ . "file info", 9, driver, dbid)
c...Write out necessary objects for MeshTV.
@@ -84,12 +92,12 @@ c...Close data file.
err = dbclose(dbid)
- print *,'Created file: rectf77.pdb'
+ print *,'Created file: rectf77.silo'
-c...Create file named "ucdf77.pdb". Database ID is returned in 'dbid'.
+c...Create file named "ucdf77.silo". Database ID is returned in 'dbid'.
- err = dbcreate("ucdf77.pdb", 10, 0, DB_LOCAL,
- . "file info", 9, DB_PDB, dbid)
+ err = dbcreate("ucdf77.silo", 11, 0, DB_LOCAL,
+ . "file info", 9, driver, dbid)
c...Write out necessary objects for MeshTV.
@@ -102,7 +110,7 @@ c...Close data file.
err = dbclose(dbid)
- print *,'Created file: ucdf77.pdb'
+ print *,'Created file: ucdf77.silo'
stop
end
diff --git a/tests/polyzl.c b/tests/testfs.c
similarity index 59%
copy from tests/polyzl.c
copy to tests/testfs.c
index c72088b..e5b4abf 100644
--- a/tests/polyzl.c
+++ b/tests/testfs.c
@@ -51,81 +51,42 @@ herein do not necessarily state or reflect those of the United States
Government or Lawrence Livermore National Security, LLC, and shall not
be used for advertising or product endorsement purposes.
*/
-
-#include "silo.h" /*include public silo */
-
-#include <math.h>
+#ifndef WIN32
+#include <unistd.h>
+#else
+#include <direct.h>
+#include <stdlib.h>
#include <string.h>
-#include <std.c>
+#endif
+#include <assert.h>
+#include <sys/stat.h>
+#include <sys/types.h>
-#define NNODES 12
-#define NZONES 2
-#define NFACES 11
+#include "silo.h"
+#include <std.c>
-
/*-------------------------------------------------------------------------
- * Function: main
- *
- * Purpose: Test writing a polyhedral zonelist
- *
- * Writes two hexes sharing a common face using a
- * polyhedral zonelist
+ * Function: main
*
- * Return: 0
+ * Purpose: Test various issues in interactions with underlying
+ * filesystem
*
- * Programmer: Mark C. Miller, July 27, 2004
+ * Return: 0
*
+ * Programmer: Mark C. Miller, Wed Aug 29 11:07:16 PDT 2012
*-------------------------------------------------------------------------
*/
-int
main(int argc, char *argv[])
{
-
- int i, driver=DB_PDB;
- char *filename="polyzl.pdb";
+ int i, driver = DB_PDB;
+ int show_all_errors = FALSE;
DBfile *dbfile;
- DBoptlist *optlist;
-
- char *xname = "xcoords";
- char *yname = "ycoords";
- char *zname = "zcoords";
-
- float x[NNODES] = {0.0, 1.0, 2.0, 0.0, 1.0, 2.0, 0.0, 1.0, 2.0, 0.0, 1.0, 2.0};
- float y[NNODES] = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0};
- float z[NNODES] = {0.0, 0.0, 0.0, 1.0, 1.0, 1.0, 0.0, 0.0, 0.0, 1.0, 1.0, 1.0};
-
- int nodecnt[NFACES] = {4,4,4,4,4,4,4,4,4,4,4};
- int lnodelist = 4 * NFACES;
- int nodelist[4*NFACES] = {0,1,7,6, 1,2,8,7, 1,0,3,4,
- 2,1,4,5, 4,3,9,10, 5,4,10,11,
- 6,7,10,9, 7,8,11,10, 0,6,9,3,
- 1,7,10,4, 2,5,11,8};
-
- int facecnt[NZONES] = {6,6};
- int lfacelist = 6 * NZONES;
- int facelist[6*NZONES] = {0,2,4,6,8,-9, 1,3,5,7,9,10};
-
- float *coords[3];
- char *coordnames[3];
- int show_all_errors = FALSE;
-
- coords[0] = x;
- coords[1] = y;
- coords[2] = z;
-
- coordnames[0] = xname;
- coordnames[1] = yname;
- coordnames[2] = zname;
-
- /* Parse command-line */
for (i=1; i<argc; i++) {
- if (!strncmp(argv[i], "DB_PDB", 6)) {
+ if (!strncmp(argv[i], "DB_PDB",6)) {
driver = StringToDriver(argv[i]);
- filename = "polyzl.pdb";
} else if (!strncmp(argv[i], "DB_HDF5", 7)) {
driver = StringToDriver(argv[i]);
- filename = "polyzl.h5";
} else if (!strcmp(argv[i], "show-all-errors")) {
show_all_errors = 1;
} else if (argv[i][0] != '\0') {
@@ -133,29 +94,15 @@ main(int argc, char *argv[])
}
}
- DBShowErrors(show_all_errors?DB_ALL_AND_DRVR:DB_TOP, NULL);
- DBForceSingle(1);
-
- /*
- * Create a file that contains a simple mesh of 2 hexes
- */
- printf("Creating file: `%s'\n", filename);
- dbfile = DBCreate(filename,0,DB_LOCAL,"Polyhedral Zonelist Test",driver);
+ DBShowErrors(show_all_errors?DB_ALL_AND_DRVR:DB_NONE, NULL);
- optlist = DBMakeOptlist(3);
- DBAddOption(optlist, DBOPT_PHZONELIST, "polyzl");
-
- DBPutUcdmesh(dbfile, "ucdmesh", 3, coordnames, coords, NNODES, NZONES,
- NULL, NULL, DB_FLOAT, optlist);
-
- DBPutPHZonelist(dbfile, "polyzl",
- NFACES, nodecnt, lnodelist, nodelist, NULL,
- NZONES, facecnt, lfacelist, facelist,
- 0, 0, NZONES-1, NULL);
-
- DBClose(dbfile);
+ /* Test opening a file in a non-existent directory */
+ {
+ char *filename = "testfs_dir/testfs.silo";
+ dbfile = DBCreate(filename, 0, DB_LOCAL, "filesytem tests", driver);
+ assert(!dbfile);
+ }
CleanupDriverStuff();
return 0;
-
}
diff --git a/tests/testlib.c b/tests/testlib.c
index ce6c2ed..0e760ad 100644
--- a/tests/testlib.c
+++ b/tests/testlib.c
@@ -187,6 +187,8 @@ build_quad(DBfile *dbfile, char *name)
matlist, zones, ndims, NULL, NULL, NULL, NULL,
mixlen, DB_FLOAT, NULL);
+ DBFreeOptlist(optlist);
+
return (meshid);
}
diff --git a/tests/testxvers b/tests/testonehex
similarity index 74%
copy from tests/testxvers
copy to tests/testonehex
index c01d0e7..b57f218 100755
--- a/tests/testxvers
+++ b/tests/testonehex
@@ -1,4 +1,4 @@
-#!/bin/sh -x
+#!/bin/sh
# Copyright (c) 1994 - 2010, Lawrence Livermore National Security, LLC.
# LLNL-CODE-425250.
@@ -51,26 +51,13 @@
# product endorsement purposes.
# -----------------------------------------------------------------------------
-# Test interversion file format compatibility of HDF5
+# Test writing silo objects via python file format compatibility of HDF5
#
# Programmer: Mark C. Miller
# Creation: July 21, 2008
#
# -----------------------------------------------------------------------------
-difffiles () {
- for df in multi_*.h5; do
- bf=`basename $df .h5`
- # do a diff on the files
- rm -f testxvers.out
- $topDir/../tools/browser/browser -q -e diff $df $topDir/xvers_data/${bf}_$1 1>testxvers.out 2>&1
- if test `wc -l testxvers.out | tr -s ' ' | cut -d' ' -f2` -gt 20; then
- return 1
- break
- fi
- done
-}
-
# Diddle the the directory because Autotest is not at all designed to handle
# tests the way this one was written
if test -n "$1"; then
@@ -85,43 +72,21 @@ fi
#
# Create data with no special features
#
-$topDir/multi_test DB_HDF5 1>/dev/null 2>&1
-
-#
-# Figure out minor version num of HDF5 used to create the current data
-#
-vmin=`$topDir/../tools/browser/browser -e _hdf5libinfo multi_ucd3d.h5 2>/dev/null | grep hdf5 | cut -d'-' -f2 | cut -d'.' -f2`
-if test $vmin -eq 6; then
- vtest=8
-elif test $vmin -eq 8; then
- vtest=6
-else
- echo "Did not find expected hdf5 minor version number"
- exit 1
-fi
-
-#
-# Uncompress and untar data files from specific versions of HDF5
-#
-which bunzip2 1>/dev/null 2>&1
-test $? -eq 0 || exit 1
-bunzip2 < $topDir/xvers_data.tar.bz2 | tar xf -
+env PYTHONPATH=$topDir/../tools/python/.libs python onehex.py 1>/dev/null 2>&1
+$topDir/onehex 1>/dev/null 2>&1
#
# Now, run browser and make sure we don't get any errors in the diff
#
result=0
-test $result -gt 0 || difffiles v1${vtest}.h5
-result=$?
-test $result -gt 0 || difffiles v1${vtest}ck.h5
-result=$?
-test $result -gt 0 || difffiles v1${vtest}fpz.h5
-result=$?
+$topDir/../tools/browser/browser -R 0.00001 -q -e diff $topDir/onehex.silo $topDir/onehexpy.silo 1>testonehex.out 2>&1
+if test `grep -v 'appears only in' testonehex.out | wc -l | tr -s ' ' | cut -d' ' -f2` -gt 5; then
+ result=1
+fi
#
# Cleanup
#
-rm -f testxvers.out
-rm -rf $topDir/xvers_data
+rm -f testonehex.out
exit $result
diff --git a/tests/testpdb.c b/tests/testpdb.c
index fb7200f..6f68480 100644
--- a/tests/testpdb.c
+++ b/tests/testpdb.c
@@ -49,8 +49,16 @@ reflect those of the United States Government or Lawrence Livermore
National Security, LLC, and shall not be used for advertising or
product endorsement purposes.
*/
+#ifdef PDB_LITE
+#include <lite_score.h>
+#include <lite_pdb.h>
+#else
#include <score.h>
#include <pdb.h>
+#endif
+
+#include <stdlib.h>
+#include <string.h>
char *safe_strdup(const char *);
@@ -127,9 +135,9 @@ ReadFile (char *filename, char *name)
float fval;
/*
- * Open the file.
+ * Open the file. Test additional open mode chars
*/
- if ((file = lite_PD_open(filename, "r")) == NULL)
+ if ((file = PD_open(filename, "rli")) == NULL)
{
printf("Error opening file.\n");
exit(-1);
@@ -139,7 +147,7 @@ ReadFile (char *filename, char *name)
* Read some variables and print their results.
*/
printf("reading group\n");
- lite_PD_read(file, name, &group);
+ PD_read(file, name, &group);
printf("group->name = %s\n", group->name);
printf("group->type = %s\n", group->type);
printf("group->ncomponents = %d\n", group->ncomponents);
@@ -158,13 +166,13 @@ ReadFile (char *filename, char *name)
printf("reading group->name\n");
sprintf(str, "%s->name", name);
- lite_PD_read(file, str, &cptr);
+ PD_read(file, str, &cptr);
printf("%s->name = %s\n", name, cptr);
SFREE(cptr);
printf("reading group->comp_names\n");
sprintf(str, "%s->comp_names", name);
- lite_PD_read(file, str, &ccptr);
+ PD_read(file, str, &ccptr);
printf("%s->comp_names[0] = %s\n", name, ccptr[0]);
for (i = 0; i < 17; i++)
SFREE(ccptr[i]);
@@ -172,28 +180,28 @@ ReadFile (char *filename, char *name)
printf("reading group->comp_names[1]\n");
sprintf(str, "%s->comp_names[1]", name);
- lite_PD_read(file, str, &cptr);
+ PD_read(file, str, &cptr);
printf("%s->comp_names[1] = %s\n", name, cptr);
SFREE(cptr);
printf("reading group->comp_names[1][2:4]\n");
sprintf(str, "%s->comp_names[1][2:4]", name);
- lite_PD_read(file, str, &carray);
+ PD_read(file, str, &carray);
carray[3] = '\0';
printf("%s->comp_names[1][2:4] = %s\n", name, carray);
printf("reading coord0\n");
- lite_PD_read(file, "coord0", farray);
+ PD_read(file, "coord0", farray);
printf("coord0[4] = %g\n", farray[4]);
printf("reading coord0(0, 3)\n");
- lite_PD_read(file, "coord0(0, 3)", &fval);
+ PD_read(file, "coord0(0, 3)", &fval);
printf("coord0(0, 3) = %g\n", fval);
/*
* Close the file.
*/
- lite_PD_close(file);
+ PD_close(file);
return;
}
@@ -218,7 +226,7 @@ CreateFile (char *filename, char *name, char *type, int num,
/*
* Create a file.
*/
- if ((file = lite_PD_create(filename)) == NULL)
+ if ((file = PD_create(filename)) == NULL)
{
printf("Error creating file.\n");
exit(-1);
@@ -230,7 +238,7 @@ CreateFile (char *filename, char *name, char *type, int num,
null_ptr = FMAKE(int, "NULL");
*null_ptr = 0;
- if (lite_PD_defstr(file, "Group",
+ if (PD_defstr(file, "Group",
"char *name",
"char *type",
"char **comp_names",
@@ -265,7 +273,7 @@ CreateFile (char *filename, char *name, char *type, int num,
/*
* Write the group.
*/
- if (lite_PD_write(file, name, "Group *", &group) == 0)
+ if (PD_write(file, name, "Group *", &group) == 0)
{
printf("Error writing group.\n");
exit(-1);
@@ -296,7 +304,7 @@ CreateFile (char *filename, char *name, char *type, int num,
ind[3] = 0;
ind[4] = 9;
ind[5] = 1;
- if (lite_PD_write_alt(file, "coord0", "float", coord0, 2, ind) == 0)
+ if (PD_write_alt(file, "coord0", "float", coord0, 2, ind) == 0)
{
printf("Error writing array.\n");
exit(-1);
@@ -307,7 +315,7 @@ CreateFile (char *filename, char *name, char *type, int num,
/*
* Close the file.
*/
- lite_PD_close(file);
+ PD_close(file);
return;
}
diff --git a/tests/testsuite b/tests/testsuite
index 860dec2..5099f0b 100755
--- a/tests/testsuite
+++ b/tests/testsuite
@@ -1,7 +1,8 @@
#! /bin/sh
+# Generated from testsuite.at by GNU Autoconf 2.63.
#
-# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software
-# Foundation, Inc.
+# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+# Free Software Foundation, Inc.
# This test suite is free software; the Free Software Foundation gives
# unlimited permission to copy, distribute and modify it.
#
@@ -19,7 +20,7 @@ DUALCASE=1; export DUALCASE # for MKS sh
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
@@ -41,17 +42,45 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS
as_cr_digits='0123456789'
as_cr_alnum=$as_cr_Letters$as_cr_digits
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
- echo "#! /bin/sh" >conf$$.sh
- echo "exit 0" >>conf$$.sh
- chmod +x conf$$.sh
- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
- PATH_SEPARATOR=';'
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+ as_echo='printf %s\n'
+ as_echo_n='printf %s'
+else
+ if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+ as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+ as_echo_n='/usr/ucb/echo -n'
else
- PATH_SEPARATOR=:
+ as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+ as_echo_n_body='eval
+ arg=$1;
+ case $arg in
+ *"$as_nl"*)
+ expr "X$arg" : "X\\(.*\\)$as_nl";
+ arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+ esac;
+ expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+ '
+ export as_echo_n_body
+ as_echo_n='sh -c $as_echo_n_body as_echo'
fi
- rm -f conf$$.sh
+ export as_echo_body
+ as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+ PATH_SEPARATOR=:
+ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+ PATH_SEPARATOR=';'
+ }
fi
# Support unset when possible.
@@ -67,8 +96,6 @@ fi
# there to prevent editors from complaining about space-tab.
# (If _AS_PATH_WALK were called with IFS unset, it would disable word
# splitting by setting IFS to empty value.)
-as_nl='
-'
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
@@ -91,7 +118,7 @@ if test "x$as_myself" = x; then
as_myself=$0
fi
if test ! -f "$as_myself"; then
- echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+ $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
{ (exit 1); exit 1; }
fi
@@ -104,17 +131,10 @@ PS2='> '
PS4='+ '
# NLS nuisances.
-for as_var in \
- LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
- LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
- LC_TELEPHONE LC_TIME
-do
- if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
- eval $as_var=C; export $as_var
- else
- ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
- fi
-done
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
# Required to use basename.
if expr a : '\(a\)' >/dev/null 2>&1 &&
@@ -136,7 +156,7 @@ as_me=`$as_basename -- "$0" ||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X/"$0" |
+$as_echo X/"$0" |
sed '/^.*\/\([^/][^/]*\)\/*$/{
s//\1/
q
@@ -162,7 +182,7 @@ else
as_have_required=no
fi
- if test $as_have_required = yes && (eval ":
+ if test $as_have_required = yes && (eval ":
(as_func_return () {
(exit \$1)
}
@@ -244,7 +264,7 @@ IFS=$as_save_IFS
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
@@ -265,7 +285,7 @@ _ASEOF
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
@@ -345,10 +365,10 @@ fi
if test "x$CONFIG_SHELL" != x; then
for as_var in BASH_ENV ENV
- do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
- done
- export CONFIG_SHELL
- exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+ do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+ done
+ export CONFIG_SHELL
+ exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
fi
@@ -417,9 +437,10 @@ fi
test \$exitcode = 0") || {
echo No shell found that supports shell functions.
- echo Please tell autoconf at gnu.org about your system,
- echo including any error possibly output before this
- echo message
+ echo Please tell bug-autoconf at gnu.org about your system,
+ echo including any error possibly output before this message.
+ echo This can help us improve future autoconf versions.
+ echo Configuration will now proceed without shell functions.
}
@@ -455,7 +476,8 @@ test \$exitcode = 0") || {
s/-\n.*//
' >$as_me.lineno &&
chmod +x "$as_me.lineno" ||
- { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+ { { $as_echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
+$as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
{ (exit 1); exit 1; }; }
# Don't try to exec as it changes $[0], causing all sort of problems
@@ -483,7 +505,6 @@ case `echo -n x` in
*)
ECHO_N='-n';;
esac
-
if expr a : '\(a\)' >/dev/null 2>&1 &&
test "X`expr 00001 : '.*\(...\)'`" = X001; then
as_expr=expr
@@ -496,19 +517,22 @@ if test -d conf$$.dir; then
rm -f conf$$.dir/conf$$.file
else
rm -f conf$$.dir
- mkdir conf$$.dir
-fi
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
- as_ln_s='ln -s'
- # ... but there are two gotchas:
- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
- # In both cases, we have to default to `cp -p'.
- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+ mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+ if ln -s conf$$.file conf$$ 2>/dev/null; then
+ as_ln_s='ln -s'
+ # ... but there are two gotchas:
+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+ # In both cases, we have to default to `cp -p'.
+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+ as_ln_s='cp -p'
+ elif ln conf$$.file conf$$ 2>/dev/null; then
+ as_ln_s=ln
+ else
as_ln_s='cp -p'
-elif ln conf$$.file conf$$ 2>/dev/null; then
- as_ln_s=ln
+ fi
else
as_ln_s='cp -p'
fi
@@ -533,10 +557,10 @@ else
as_test_x='
eval sh -c '\''
if test -d "$1"; then
- test -d "$1/.";
+ test -d "$1/.";
else
case $1 in
- -*)set "./$1";;
+ -*)set "./$1";;
esac;
case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
???[sx]*):;;*)false;;esac;fi
@@ -553,32 +577,13 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+
+
SHELL=${CONFIG_SHELL-/bin/sh}
# How were we run?
at_cli_args="$@"
-# Load the config file.
-for at_file in atconfig atlocal
-do
- test -r $at_file || continue
- . ./$at_file || { echo "$as_me: error: invalid content: $at_file" >&2
- { (exit 1); exit 1; }; }
-done
-
-# Autoconf <=2.59b set at_top_builddir instead of at_top_build_prefix:
-: ${at_top_build_prefix=$at_top_builddir}
-
-# atconfig delivers names relative to the directory the test suite is
-# in, but the groups themselves are run in testsuite-dir/group-dir.
-if test -n "$at_top_srcdir"; then
- builddir=../..
- for at_dir in srcdir top_srcdir top_build_prefix
- do
- at_val=`eval echo '${'at_$at_dir'}'`
- eval "$at_dir=\$at_val/../.."
- done
-fi
# Not all shells have the 'times' builtin; the subshell is needed to make
# sure we discard the 'times: not found' message from the shell.
@@ -589,9 +594,9 @@ at_times_p=false
at_debug_args=
# -e sets to true
at_errexit_p=false
-# Shall we be verbose?
+# Shall we be verbose? ':' means no, empty means yes.
at_verbose=:
-at_quiet=echo
+at_quiet=
# Shall we keep the debug scripts? Must be `:' when the suite is
# run by a debug script, so that the script doesn't remove itself.
@@ -602,31 +607,27 @@ at_help_p=false
at_version_p=false
# List test groups?
at_list_p=false
+# --clean
+at_clean=false
# Test groups to run
at_groups=
+# Whether a write failure occurred
+at_write_fail=0
-# The directory we are in.
+# The directory we run the suite in. Default to . if no -C option.
at_dir=`pwd`
-# The directory the whole suite works in.
-# Should be absolutely to let the user `cd' at will.
-at_suite_dir=$at_dir/$as_me.dir
-# The file containing the suite.
-at_suite_log=$at_dir/$as_me.log
-# The file containing the location of the last AT_CHECK.
-at_check_line_file=$at_suite_dir/at-check-line
-# The file containing the exit status of the last command.
-at_status_file=$at_suite_dir/at-status
-# The files containing the output of the tested commands.
-at_stdout=$at_suite_dir/at-stdout
-at_stder1=$at_suite_dir/at-stder1
-at_stderr=$at_suite_dir/at-stderr
-# The file containing dates.
-at_times_file=$at_suite_dir/at-times
+# An absolute reference to this testsuite script.
+case $as_myself in
+ [\\/]* | ?:[\\/]* ) at_myself=$as_myself ;;
+ * ) at_myself=$at_dir/$as_myself ;;
+esac
+# Whether -C is in effect.
+at_change_dir=false
# List of the tested programs.
at_tested=''
# List of the all the test groups.
-at_groups_all=' banner-1 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 banner-2 40 41 42 banner-3 43 banner-4 44 45 46 47 48 49 50 51 52 53 banner-5 54 55 56 57 58 59 60 banner-6 61 62 63 64 65'
+at_groups_all=' 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71'
# As many question marks as there are digits in the last test group number.
# Used to normalize the test group numbers so that `ls' lists them in
# numerical order.
@@ -639,7 +640,7 @@ at_help_all="1;testsuite.at:63;version;;
5;testsuite.at:95;testall -small;;
6;testsuite.at:98;TestReadMask;;
7;testsuite.at:104;array;;
-8;testsuite.at:107;multi_test;;
+8;testsuite.at:107;multi_test testread;;
9;testsuite.at:110;multi_test earlyclose;;
10;testsuite.at:113;partial_io;;
11;testsuite.at:116;simple;;
@@ -671,34 +672,64 @@ at_help_all="1;testsuite.at:63;version;;
37;testsuite.at:195;quad;;
38;testsuite.at:198;arbpoly2d;;
39;testsuite.at:201;readstuff;;
-40;testsuite.at:207;read;python;
-41;testsuite.at:212;write;python;
-42;testsuite.at:227;error handling;python;
-43;testsuite.at:234;testpdb;;
-44;testsuite.at:239;grab;;
-45;testsuite.at:242;compression gzip;compression;
-46;testsuite.at:247;compression szip;compression;
-47;testsuite.at:252;compression fpzip;compression;
-48;testsuite.at:257;compression lossy3;compression;
-49;testsuite.at:262;compression minratio1000;compression;
-50;testsuite.at:266;testhzip;compression;
-51;testsuite.at:270;checksums;;
-52;testsuite.at:273;xversion;;
-53;testsuite.at:276;largefile;large;
-54;testsuite.at:282;arrayf77;fortran;
-55;testsuite.at:286;curvef77;fortran;
-56;testsuite.at:290;matf77;fortran;
-57;testsuite.at:294;pointf77;fortran;
-58;testsuite.at:298;quadf77;fortran;
-59;testsuite.at:302;testallf77;fortran;
-60;testsuite.at:306;ucdf77;fortran;
-61;testsuite.at:312;silock;tools;
-62;testsuite.at:316;force single;conversions;
-63;testsuite.at:321;multi_file;large;
-64;testsuite.at:325;testall -medium;large;
-65;testsuite.at:329;testall -large;large;
+40;testsuite.at:205;testfs;;
+41;testsuite.at:208;empty;;
+42;testsuite.at:213;read;python;
+43;testsuite.at:218;write;python;
+44;testsuite.at:233;error handling;python;
+45;testsuite.at:238;write objects;python;
+46;testsuite.at:244;testpdb;;
+47;testsuite.at:247;pdbtst;;
+48;testsuite.at:252;grab;;
+49;testsuite.at:255;compression gzip;compression;
+50;testsuite.at:260;compression szip;compression;
+51;testsuite.at:265;compression fpzip;compression;
+52;testsuite.at:270;compression lossy3;compression;
+53;testsuite.at:275;compression minratio1000;compression;
+54;testsuite.at:279;testhzip;compression;
+55;testsuite.at:283;checksums;;
+56;testsuite.at:286;xversion;;
+57;testsuite.at:289;largefile;large;
+58;testsuite.at:295;arrayf77;fortran;
+59;testsuite.at:299;curvef77;fortran;
+60;testsuite.at:303;matf77;fortran;
+61;testsuite.at:307;pointf77;fortran;
+62;testsuite.at:311;quadf77;fortran;
+63;testsuite.at:315;testallf77;fortran;
+64;testsuite.at:319;ucdf77;fortran;
+65;testsuite.at:323;csgmesh;fortran;
+66;testsuite.at:329;silock;tools;
+67;testsuite.at:333;force single;conversions;
+68;testsuite.at:338;multi_file;large;
+69;testsuite.at:342;multi_file use-ns;large;
+70;testsuite.at:346;testall -medium;large;
+71;testsuite.at:350;testall -large;large;
"
+# at_func_validate_ranges [NAME...]
+# ---------------------------------
+# Validate and normalize the test group number contained in each
+# variable NAME. Leading zeroes are treated as decimal.
+at_func_validate_ranges ()
+{
+ for at_grp
+ do
+ eval at_value=\$$at_grp
+ if test $at_value -lt 1 || test $at_value -gt 71; then
+ $as_echo "invalid test group: $at_value" >&2
+ exit 1
+ fi
+ case $at_value in
+ 0*) # We want to treat leading 0 as decimal, like expr and test, but
+ # at_func_arith treats it as octal if it uses $(( )).
+ # With XSI shells, ${at_value#${at_value%%[1-9]*}} avoids the
+ # expr fork, but it is not worth the effort to determine if the
+ # shell supports XSI when the user can just avoid leading 0.
+ eval $at_grp='`expr $at_value + 0`' ;;
+ esac
+ done
+}
+
at_prev=
for at_option
do
@@ -729,10 +760,7 @@ do
;;
--clean | -c )
- test -d "$at_suite_dir" &&
- find "$at_suite_dir" -type d ! -perm -700 -exec chmod u+rwx \{\} \;
- rm -f -r "$at_suite_dir" "$at_suite_log"
- exit 0
+ at_clean=:
;;
--debug | -d )
@@ -745,7 +773,7 @@ do
;;
--verbose | -v )
- at_verbose=echo; at_quiet=:
+ at_verbose=; at_quiet=:
;;
--trace | -x )
@@ -753,20 +781,23 @@ do
;;
[0-9] | [0-9][0-9] | [0-9][0-9][0-9] | [0-9][0-9][0-9][0-9])
+ at_func_validate_ranges at_option
at_groups="$at_groups$at_option "
;;
# Ranges
[0-9]- | [0-9][0-9]- | [0-9][0-9][0-9]- | [0-9][0-9][0-9][0-9]-)
at_range_start=`echo $at_option |tr -d X-`
- at_range=`echo " $at_groups_all " | \
+ at_func_validate_ranges at_range_start
+ at_range=`$as_echo " $at_groups_all " | \
sed -e 's/^.* \('$at_range_start' \)/\1/'`
at_groups="$at_groups$at_range "
;;
-[0-9] | -[0-9][0-9] | -[0-9][0-9][0-9] | -[0-9][0-9][0-9][0-9])
at_range_end=`echo $at_option |tr -d X-`
- at_range=`echo " $at_groups_all " | \
+ at_func_validate_ranges at_range_end
+ at_range=`$as_echo " $at_groups_all " | \
sed -e 's/\( '$at_range_end'\) .*$/\1/'`
at_groups="$at_groups$at_range "
;;
@@ -784,12 +815,22 @@ do
at_range_end=$at_range_start
at_range_start=$at_tmp
fi
- at_range=`echo " $at_groups_all " | \
+ at_func_validate_ranges at_range_start at_range_end
+ at_range=`$as_echo " $at_groups_all " | \
sed -e 's/^.*\( '$at_range_start' \)/\1/' \
-e 's/\( '$at_range_end'\) .*$/\1/'`
at_groups="$at_groups$at_range "
;;
+ # Directory selection.
+ --directory | -C )
+ at_prev=--directory
+ ;;
+ --directory=* )
+ at_change_dir=:
+ at_dir=$at_optarg
+ ;;
+
# Keywords.
--keywords | -k )
at_prev=--keywords
@@ -811,68 +852,57 @@ do
;;
esac
# It is on purpose that we match the test group titles too.
- at_groups_selected=`echo "$at_groups_selected" |
+ at_groups_selected=`$as_echo "$at_groups_selected" |
grep -i $at_invert "^[1-9][^;]*;.*[; ]$at_keyword[ ;]"`
done
- at_groups_selected=`echo "$at_groups_selected" | sed 's/;.*//'`
# Smash the newlines.
- at_groups="$at_groups`echo $at_groups_selected` "
+ at_groups_selected=`$as_echo "$at_groups_selected" | sed 's/;.*//' |
+ tr "$as_nl" ' '
+ `
+ at_groups="$at_groups$at_groups_selected "
;;
*=*)
at_envvar=`expr "x$at_option" : 'x\([^=]*\)='`
# Reject names that are not valid shell variable names.
- expr "x$at_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
- { echo "$as_me: error: invalid variable name: $at_envvar" >&2
- { (exit 1); exit 1; }; }
- at_value=`echo "$at_optarg" | sed "s/'/'\\\\\\\\''/g"`
- eval "$at_envvar='$at_value'"
+ case $at_envvar in
+ '' | [0-9]* | *[!_$as_cr_alnum]* )
+ { { $as_echo "$as_me:$LINENO: error: invalid variable name: $at_envvar" >&5
+$as_echo "$as_me: error: invalid variable name: $at_envvar" >&2;}
+ { (exit 1); exit 1; }; } ;;
+ esac
+ at_value=`$as_echo "$at_optarg" | sed "s/'/'\\\\\\\\''/g"`
+ # Export now, but save eval for later and for debug scripts.
export $at_envvar
- # Propagate to debug scripts.
at_debug_args="$at_debug_args $at_envvar='$at_value'"
;;
- *) echo "$as_me: invalid option: $at_option" >&2
- echo "Try \`$0 --help' for more information." >&2
+ *) $as_echo "$as_me: invalid option: $at_option" >&2
+ $as_echo "Try \`$0 --help' for more information." >&2
exit 1
;;
esac
done
+# Verify our last option didn't require an argument
+if test -n "$at_prev"; then
+ { { $as_echo "$as_me:$LINENO: error: \`$at_prev' requires an argument." >&5
+$as_echo "$as_me: error: \`$at_prev' requires an argument." >&2;}
+ { (exit 1); exit 1; }; }
+fi
+
+
# Selected test groups.
if test -z "$at_groups"; then
at_groups=$at_groups_all
else
- # Sort the tests, removing duplicates:
- at_groups=`echo $at_groups | tr ' ' "$as_nl" | sort -nu`
- # and add banners. (Passing at_groups_all is tricky--see the comment
- # starting with "Passing at_groups is tricky.")
- at_groups=`echo "$at_groups$as_nl $at_groups_all" |
- awk 'BEGIN { FS = "@" } # Effectively switch off field splitting.
- /^$/ { next } # Ignore the empty line.
- !/ / { groups++; selected[$ 0] = 1; next }
- # The last line, containing at_groups_all.
- {
- n = split($ 0, a, " ")
- # If there are several tests, select their banners:
- if (groups > 1) {
- for (i = 1; i <= n; i++) {
- if (a[i] ~ /^banner-/)
- banner = a[i]
- else if (banner != "" && selected[a[i]] == 1)
- selected[banner] = 1
- }
- }
- for (i = 1; i <= n; i++)
- if (selected[a[i]] == 1)
- list = list " " a[i]
- print list
- }'`
+ # Sort the tests, removing duplicates.
+ at_groups=`$as_echo "$at_groups" | tr ' ' "$as_nl" | sort -nu`
fi
# Help message.
if $at_help_p; then
- cat <<_ATEOF
+ cat <<_ATEOF || at_write_fail=1
Usage: $0 [OPTION]... [VARIABLE=VALUE]... [TESTS]
Run all the tests, or the selected TESTS, given by numeric ranges, and
@@ -889,7 +919,7 @@ possibly amounts into
PATH=/tmp/foo-1.0/bin:/src/foo-1.0/bin:\$PATH
_ATEOF
-cat <<_ATEOF
+cat <<_ATEOF || at_write_fail=1
Operation modes:
-h, --help print the help message, then exit
@@ -897,30 +927,32 @@ Operation modes:
-c, --clean remove all the files this test suite might create and exit
-l, --list describes all the tests, or the selected TESTS
_ATEOF
-cat <<_ATEOF
+cat <<_ATEOF || at_write_fail=1
Execution tuning:
+ -C, --directory=DIR
+ change to directory DIR before starting
-k, --keywords=KEYWORDS
- select the tests matching all the comma-separated KEYWORDS
- multiple \`-k' accumulate; prefixed \`!' negates a KEYWORD
+ select the tests matching all the comma-separated KEYWORDS
+ multiple \`-k' accumulate; prefixed \`!' negates a KEYWORD
-e, --errexit abort as soon as a test fails; implies --debug
-v, --verbose force more detailed output
- default for debugging scripts
+ default for debugging scripts
-d, --debug inhibit clean up and top-level logging
- default for debugging scripts
+ default for debugging scripts
-x, --trace enable tests shell tracing
_ATEOF
-cat <<_ATEOF
+cat <<_ATEOF || at_write_fail=1
Report bugs to <visit-users at email.ornl.gov>.
_ATEOF
- exit 0
+ exit $at_write_fail
fi
# List of tests.
if $at_list_p; then
- cat <<_ATEOF
-silo 4.8 test suite: VALGRIND="$VALGRIND" STARGS="$STARGS" test groups:
+ cat <<_ATEOF || at_write_fail=1
+silo 4.9.1 test suite: VALGRIND="$VALGRIND" STARGS="$STARGS" test groups:
NUM: FILE-NAME:LINE TEST-GROUP-NAME
KEYWORDS
@@ -929,7 +961,12 @@ _ATEOF
# Passing at_groups is tricky. We cannot use it to form a literal string
# or regexp because of the limitation of AIX awk. And Solaris' awk
# doesn't grok more than 99 fields in a record, so we have to use `split'.
- echo "$at_groups$as_nl$at_help_all" |
+ # at_groups needs to be space-separated for this script to work.
+ case $at_groups in
+ *"$as_nl"* )
+ at_groups=`$as_echo "$at_groups" | tr "$as_nl" ' '` ;;
+ esac
+ $as_echo "$at_groups$as_nl$at_help_all" |
awk 'BEGIN { FS = ";" }
NR == 1 {
for (n = split($ 0, a, " "); n; n--) selected[a[n]] = 1
@@ -940,15 +977,15 @@ _ATEOF
printf " %3d: %-18s %s\n", $ 1, $ 2, $ 3
if ($ 4) printf " %s\n", $ 4
}
- }'
- exit 0
+ }' || at_write_fail=1
+ exit $at_write_fail
fi
if $at_version_p; then
- echo "$as_me (silo 4.8)"
- cat <<\_ACEOF
+ $as_echo "$as_me (silo 4.9.1)" &&
+ cat <<\_ACEOF || at_write_fail=1
-Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software
-Foundation, Inc.
+Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+Free Software Foundation, Inc.
This test suite is free software; the Free Software Foundation gives
unlimited permission to copy, distribute and modify it.
@@ -958,17 +995,135 @@ Lawrence Livermore National Laboratory
in part under Contract W-7405-Eng-48 and
in part under Contract DE-AC52-07NA27344.
_ACEOF
- exit 0
+ exit $at_write_fail
+fi
+
+# Should we print banners? at_groups is space-separated for entire test,
+# newline-separated if only a subset of the testsuite is run.
+case $at_groups in
+ *' '*' '* | *"$as_nl"*"$as_nl"* )
+ at_print_banners=: ;;
+ * ) at_print_banners=false ;;
+esac
+# Text for banner N, set to empty once printed.
+# Banner 1. testsuite.at:62
+# Category starts at test group 1.
+at_banner_text_1="Non-driver-specific"
+# Banner 2. testsuite.at:212
+# Category starts at test group 42.
+at_banner_text_2="pythonmodule"
+# Banner 3. testsuite.at:243
+# Category starts at test group 46.
+at_banner_text_3="PDB Lite"
+# Banner 4. testsuite.at:251
+# Category starts at test group 48.
+at_banner_text_4="HDF5 Driver Specific"
+# Banner 5. testsuite.at:294
+# Category starts at test group 58.
+at_banner_text_5="Fortran"
+# Banner 6. testsuite.at:328
+# Category starts at test group 66.
+at_banner_text_6="Special"
+
+# Take any -C into account.
+if $at_change_dir ; then
+ if test x- = "x$at_dir" ; then
+ at_dir=./-
+ fi
+ test x != "x$at_dir" && cd "$at_dir" \
+ || { { $as_echo "$as_me:$LINENO: error: unable to change directory" >&5
+$as_echo "$as_me: error: unable to change directory" >&2;}
+ { (exit 1); exit 1; }; }
+ at_dir=`pwd`
+fi
+
+# Load the config files for any default variable assignments.
+for at_file in atconfig atlocal
+do
+ test -r $at_file || continue
+ . ./$at_file || { { $as_echo "$as_me:$LINENO: error: invalid content: $at_file" >&5
+$as_echo "$as_me: error: invalid content: $at_file" >&2;}
+ { (exit 1); exit 1; }; }
+done
+
+# Autoconf <=2.59b set at_top_builddir instead of at_top_build_prefix:
+: ${at_top_build_prefix=$at_top_builddir}
+
+# Perform any assignments requested during argument parsing.
+eval "$at_debug_args"
+
+# atconfig delivers names relative to the directory the test suite is
+# in, but the groups themselves are run in testsuite-dir/group-dir.
+if test -n "$at_top_srcdir"; then
+ builddir=../..
+ for at_dir_var in srcdir top_srcdir top_build_prefix
+ do
+ at_val=`eval 'as_val=${'at_$at_dir_var'}
+ $as_echo "$as_val"'`
+ case $at_val in
+ [\\/$]* | ?:[\\/]* ) at_prefix= ;;
+ *) at_prefix=../../ ;;
+ esac
+ eval "$at_dir_var=\$at_prefix\$at_val"
+ done
+fi
+
+## ------------------- ##
+## Directory structure ##
+## ------------------- ##
+
+# This is the set of directories and files used by this script
+# (non-literals are capitalized):
+#
+# TESTSUITE - the testsuite
+# TESTSUITE.log - summarizes the complete testsuite run
+# TESTSUITE.dir/ - created during a run, remains after -d or failed test
+# + at-groups/ - during a run: status of all groups in run
+# | + NNN/ - during a run: meta-data about test group NNN
+# | | + check-line - location (source file and line) of current AT_CHECK
+# | | + status - exit status of current AT_CHECK
+# | | + stdout - stdout of current AT_CHECK
+# | | + stder1 - stderr, including trace
+# | | + stderr - stderr, with trace filtered out
+# | | + test-source - portion of testsuite that defines group
+# | | + times - timestamps for computing duration
+# | | + pass - created if group passed
+# | | + xpass - created if group xpassed
+# | | + fail - created if group failed
+# | | + xfail - created if group xfailed
+# | | + skip - created if group skipped
+# + at-stop - during a run: end the run if this file exists
+# + at-source-lines - during a run: cache of TESTSUITE line numbers for extraction
+# + 0..NNN/ - created for each group NNN, remains after -d or failed test
+# | + TESTSUITE.log - summarizes the group results
+# | + ... - files created during the group
+
+# The directory the whole suite works in.
+# Should be absolute to let the user `cd' at will.
+at_suite_dir=$at_dir/$as_me.dir
+# The file containing the suite.
+at_suite_log=$at_dir/$as_me.log
+# The directory containing helper files per test group.
+at_helper_dir=$at_suite_dir/at-groups
+# Stop file: if it exists, do not start new jobs.
+at_stop_file=$at_suite_dir/at-stop
+
+if $at_clean; then
+ test -d "$at_suite_dir" &&
+ find "$at_suite_dir" -type d ! -perm -700 -exec chmod u+rwx \{\} \;
+ rm -f -r "$at_suite_dir" "$at_suite_log"
+ exit $?
fi
# Don't take risks: use only absolute directories in PATH.
#
-# For stand-alone test suites, AUTOTEST_PATH is relative to `.'.
+# For stand-alone test suites (ie. atconfig was not found),
+# AUTOTEST_PATH is relative to `.'.
#
# For embedded test suites, AUTOTEST_PATH is relative to the top level
# of the package. Then expand it into build/src parts, since users
# may create executables in both places.
-AUTOTEST_PATH=`echo $AUTOTEST_PATH | sed "s&:&$PATH_SEPARATOR&g"`
+AUTOTEST_PATH=`$as_echo "$AUTOTEST_PATH" | sed "s|:|$PATH_SEPARATOR|g"`
at_path=
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $AUTOTEST_PATH $PATH
@@ -999,31 +1154,30 @@ IFS=$as_save_IFS
#
# There might be directories that don't exist, but don't redirect
# builtins' (eg., cd) stderr directly: Ultrix's sh hates that.
-PATH=
+at_new_path=
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $at_path
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- as_dir=`(cd "$as_dir" && pwd) 2>/dev/null`
-test -d "$as_dir" || continue
-case $PATH in
- $as_dir | \
- $as_dir$PATH_SEPARATOR* | \
- *$PATH_SEPARATOR$as_dir | \
- *$PATH_SEPARATOR$as_dir$PATH_SEPARATOR* ) ;;
-
- '') PATH=$as_dir ;;
- *) PATH=$PATH$PATH_SEPARATOR$as_dir ;;
+ test -d "$as_dir" || continue
+case $as_dir in
+ [\\/]* | ?:[\\/]* ) ;;
+ * ) as_dir=`(cd "$as_dir" && pwd) 2>/dev/null` ;;
+esac
+case $PATH_SEPARATOR$at_new_path$PATH_SEPARATOR in
+ *$PATH_SEPARATOR$as_dir$PATH_SEPARATOR*) ;;
+ $PATH_SEPARATOR$PATH_SEPARATOR) at_new_path=$as_dir ;;
+ *) at_new_path=$at_new_path$PATH_SEPARATOR$as_dir ;;
esac
done
IFS=$as_save_IFS
+PATH=$at_new_path
export PATH
# Setting up the FDs.
# 5 is the log file. Not to be overwritten if `-d'.
-
if $at_debug_p; then
at_suite_log=/dev/null
else
@@ -1033,22 +1187,24 @@ exec 5>>"$at_suite_log"
# Banners and logs.
sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-## silo 4.8 test suite: VALGRIND="$VALGRIND" STARGS="$STARGS". ##
+## silo 4.9.1 test suite: VALGRIND="$VALGRIND" STARGS="$STARGS". ##
_ASBOX
{
sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-## silo 4.8 test suite: VALGRIND="$VALGRIND" STARGS="$STARGS". ##
+## silo 4.9.1 test suite: VALGRIND="$VALGRIND" STARGS="$STARGS". ##
_ASBOX
echo
- echo "$as_me: command line was:"
- echo " $ $0 $at_cli_args"
+ $as_echo "$as_me: command line was:"
+ $as_echo " \$ $0 $at_cli_args"
echo
# Try to find a few ChangeLogs in case it might help determining the
# exact version. Use the relative dir: if the top dir is a symlink,
# find will not follow it (and options to follow the links are not
- # portable), which would result in no output here.
+ # portable), which would result in no output here. Prune directories
+ # matching the package tarname, since they tend to be leftovers from
+ # `make dist' or `make distcheck' and contain redundant or stale logs.
if test -n "$at_top_srcdir"; then
cat <<\_ASBOX
## ----------- ##
@@ -1056,14 +1212,16 @@ _ASBOX
## ----------- ##
_ASBOX
echo
- for at_file in `find "$at_top_srcdir" -name ChangeLog -print`
+ for at_file in `find "$at_top_srcdir" -name "silo-*" -prune -o -name ChangeLog -print`
do
- echo "$as_me: $at_file:"
+ $as_echo "$as_me: $at_file:"
sed 's/^/| /;10q' $at_file
echo
done
- {
+ fi
+
+ {
cat <<_ASUNAME
## --------- ##
## Platform. ##
@@ -1093,23 +1251,162 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- echo "PATH: $as_dir"
+ $as_echo "PATH: $as_dir"
done
IFS=$as_save_IFS
}
- echo
- fi
+ echo
# Contents of the config files.
for at_file in atconfig atlocal
do
test -r $at_file || continue
- echo "$as_me: $at_file:"
+ $as_echo "$as_me: $at_file:"
sed 's/^/| /' $at_file
echo
done
+} >&5
+
+
+## --------------- ##
+## Shell functions ##
+## --------------- ##
+
+# at_func_banner NUMBER
+# ---------------------
+# Output banner NUMBER, provided the testsuite is running multiple groups
+# and this particular banner has not yet been printed.
+at_func_banner ()
+{
+ $at_print_banners || return 0
+ eval at_banner_text=\$at_banner_text_$1
+ test "x$at_banner_text" = x && return 0
+ eval at_banner_text_$1=
+ $as_echo "$as_nl$at_banner_text$as_nl"
+} # at_func_banner
+
+# at_func_check_newline COMMAND
+# -----------------------------
+# Test if COMMAND includes a newline and, if so, print a message and return
+# exit code 1
+at_func_check_newline ()
+{
+ case "$1" in
+ *'
+'*) echo 'Not enabling shell tracing (command contains an embedded newline)'
+ return 1 ;;
+ *) return 0 ;;
+ esac
+}
+
+# at_func_filter_trace EXIT-CODE
+# ------------------------------
+# Split the contents of file "$at_stder1" into the "set -x" trace (on stderr)
+# and the other lines (on file "$at_stderr"). Return the exit code EXIT-CODE.
+at_func_filter_trace ()
+{
+ grep '^ *+' "$at_stder1" >&2
+ grep -v '^ *+' "$at_stder1" >"$at_stderr"
+ return $1
+}
+
+# at_func_log_failure FILE-LIST
+# -----------------------------
+# Copy the files in the list on stdout with a "> " prefix, and exit the shell
+# with a failure exit code.
+at_func_log_failure ()
+{
+ for file
+ do $as_echo "$file:"; sed 's/^/> /' "$file"; done
+ echo 1 > "$at_status_file"
+ exit 1
+}
+
+# at_func_check_skip EXIT-CODE
+# ----------------------------
+# Check whether EXIT-CODE is the special exit code 77, and if so exit the shell
+# with that same exit code.
+at_func_check_skip ()
+{
+ case $1 in
+ 77) echo 77 > "$at_status_file"; exit 77;;
+ esac
+}
+
+# at_func_check_status EXPECTED EXIT-CODE LINE
+# --------------------------------------------
+# Check whether EXIT-CODE is the expected exit code, and if so do nothing.
+# Otherwise, if it is 77 exit the shell with that same exit code; if it is
+# anything else print an error message and fail the test.
+at_func_check_status ()
+{
+ case $2 in
+ $1 ) ;;
+ 77) echo 77 > "$at_status_file"; exit 77;;
+ *) $as_echo "$3: exit code was $2, expected $1"
+ at_failed=:;;
+ esac
+}
+
+# at_func_diff_devnull FILE
+# -------------------------
+# Emit a diff between /dev/null and FILE. Uses "test -s" to avoid useless
+# diff invocations.
+at_func_diff_devnull ()
+{
+ test -s "$1" || return 0
+ $at_diff "$at_devnull" "$1"
+}
+
+# at_func_test NUMBER
+# -------------------
+# Parse out test NUMBER from the tail of this file.
+at_func_test ()
+{
+ eval at_sed=\$at_sed$1
+ sed "$at_sed" "$at_myself" > "$at_test_source"
+}
+
+# at_func_create_debugging_script
+# -------------------------------
+# Create the debugging script $at_group_dir/run which will reproduce the
+# current test group.
+at_func_create_debugging_script ()
+{
+ {
+ echo "#! /bin/sh" &&
+ echo 'test "${ZSH_VERSION+set}" = set && alias -g '\''${1+"$@"}'\''='\''"$@"'\''' &&
+ $as_echo "cd '$at_dir'" &&
+ $as_echo "exec \${CONFIG_SHELL-$SHELL} \"$at_myself\" -v -d $at_debug_args $at_group \${1+\"\$@\"}" &&
+ echo 'exit 1'
+ } >"$at_group_dir/run" &&
+ chmod +x "$at_group_dir/run"
+}
+
+# at_func_arith
+# -------------
+# Arithmetic evaluation, avoids expr if the shell is sane. The
+# interpretation of leading zeroes is unspecified.
+#
+# subshell and eval are needed to keep Solaris sh from bailing out:
+if ( eval 'test $(( 1 + 1 )) = 2' ) 2>/dev/null; then
+ # With "$@", bash does not split positional parameters:
+ eval 'at_func_arith ()
+ {
+ at_func_arith_result=$(( $* ))
+ }'
+else
+ at_func_arith ()
+ {
+ at_func_arith_result=`expr "$@"`
+ }
+fi
+## ---------------------- ##
+## End of shell functions ##
+## ---------------------- ##
+{
cat <<\_ASBOX
## ---------------- ##
## Tested programs. ##
@@ -1133,13 +1430,13 @@ IFS=$as_save_IFS
if test -f "$as_dir/$at_program"; then
{
- echo "$at_srcdir/testsuite.at:55: $as_dir/$at_program --version"
- "$as_dir/$at_program" --version
+ $as_echo "$at_srcdir/testsuite.at:55: $as_dir/$at_program --version"
+ "$as_dir/$at_program" --version </dev/null
echo
} >&5 2>&1
else
- { { echo "$as_me:$LINENO: error: cannot find $at_program" >&5
-echo "$as_me: error: cannot find $at_program" >&2;}
+ { { $as_echo "$as_me:$LINENO: error: cannot find $at_program" >&5
+$as_echo "$as_me: error: cannot find $at_program" >&2;}
{ (exit 1); exit 1; }; }
fi
done
@@ -1154,19 +1451,13 @@ _ASBOX
at_start_date=`date`
at_start_time=`date +%s 2>/dev/null`
-echo "$as_me: starting at: $at_start_date" >&5
-at_xpass_list=
-at_xfail_list=
-at_pass_list=
-at_fail_list=
-at_skip_list=
-at_group_count=0
+$as_echo "$as_me: starting at: $at_start_date" >&5
# Create the master directory if it doesn't already exist.
test -d "$at_suite_dir" ||
mkdir "$at_suite_dir" ||
- { { echo "$as_me:$LINENO: error: cannot create '$at_suite_dir'" >&5
-echo "$as_me: error: cannot create '$at_suite_dir'" >&2;}
+ { { $as_echo "$as_me:$LINENO: error: cannot create '$at_suite_dir'" >&5
+$as_echo "$as_me: error: cannot create '$at_suite_dir'" >&2;}
{ (exit 1); exit 1; }; }
# Can we diff with `/dev/null'? DU 5.0 refuses.
@@ -1185,37 +1476,87 @@ else
at_diff=diff
fi
+# Get the last needed group.
+for at_group in : $at_groups; do :; done
+
+# Extract the start and end lines of each test group at the tail
+# of this file
+awk '
+BEGIN { FS="" }
+/^#AT_START_/ {
+ start = NR
+}
+/^#AT_STOP_/ {
+ test = substr ($ 0, 10)
+ print "at_sed" test "=\"1," start "d;" (NR-1) "q\""
+ if (test == "'"$at_group"'") exit
+}' "$at_myself" > "$at_suite_dir/at-source-lines" &&
+. "$at_suite_dir/at-source-lines" ||
+ { { $as_echo "$as_me:$LINENO: error: cannot create test line number cache" >&5
+$as_echo "$as_me: error: cannot create test line number cache" >&2;}
+ { (exit 1); exit 1; }; }
+rm -f "$at_suite_dir/at-source-lines"
+
+# Set up helper dirs.
+rm -rf "$at_helper_dir" &&
+mkdir "$at_helper_dir" &&
+cd "$at_helper_dir" &&
+{ test -z "$at_groups" || mkdir $at_groups; } ||
+{ { $as_echo "$as_me:$LINENO: error: testsuite directory setup failed" >&5
+$as_echo "$as_me: error: testsuite directory setup failed" >&2;}
+ { (exit 1); exit 1; }; }
+
+# Functions for running a test group. We leave the actual
+# test group execution outside of a shell function in order
+# to avoid hitting zsh 4.x exit status bugs.
+
+# at_func_group_prepare
+# ---------------------
+# Prepare running a test group
+at_func_group_prepare ()
+{
+ # The directory for additional per-group helper files.
+ at_job_dir=$at_helper_dir/$at_group
+ # The file containing the location of the last AT_CHECK.
+ at_check_line_file=$at_job_dir/check-line
+ # The file containing the exit status of the last command.
+ at_status_file=$at_job_dir/status
+ # The files containing the output of the tested commands.
+ at_stdout=$at_job_dir/stdout
+ at_stder1=$at_job_dir/stder1
+ at_stderr=$at_job_dir/stderr
+ # The file containing the code for a test group.
+ at_test_source=$at_job_dir/test-source
+ # The file containing dates.
+ at_times_file=$at_job_dir/times
-for at_group in $at_groups
-do
# Be sure to come back to the top test directory.
cd "$at_suite_dir"
- case $at_group in
- banner-*)
- at_group_log=$at_suite_log
- ;;
+ # Clearly separate the test groups when verbose.
+ $at_first || $at_verbose echo
- *)
- at_group_normalized=$at_group
+ at_group_normalized=$at_group
- while :; do
+ eval 'while :; do
case $at_group_normalized in #(
- $at_format*) break;;
+ '"$at_format"'*) break;;
esac
at_group_normalized=0$at_group_normalized
- done
+ done'
- # Create a fresh directory for the next test group, and enter.
- at_group_dir=$at_suite_dir/$at_group_normalized
- at_group_log=$at_group_dir/$as_me.log
- if test -d "$at_group_dir"; then
- find "$at_group_dir" -type d ! -perm -700 -exec chmod u+rwx \{\} \;
- rm -fr "$at_group_dir"
- fi
- # Be tolerant if the above `rm' was not able to remove the directory.
- { as_dir=$at_group_dir
+ # Create a fresh directory for the next test group, and enter.
+ at_group_dir=$at_suite_dir/$at_group_normalized
+ at_group_log=$at_group_dir/$as_me.log
+ if test -d "$at_group_dir"; then
+ find "$at_group_dir" -type d ! -perm -700 -exec chmod u+rwx \{\} \;
+ rm -fr "$at_group_dir" ||
+ { $as_echo "$as_me:$LINENO: WARNING: test directory for $at_group_normalized could not be cleaned." >&5
+$as_echo "$as_me: WARNING: test directory for $at_group_normalized could not be cleaned." >&2;}
+ fi
+ # Be tolerant if the above `rm' was not able to remove the directory.
+ { as_dir="$at_group_dir"
case $as_dir in #(
-*) as_dir=./$as_dir;;
esac
@@ -1223,7 +1564,7 @@ do
as_dirs=
while :; do
case $as_dir in #(
- *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
+ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
*) as_qdir=$as_dir;;
esac
as_dirs="'$as_qdir' $as_dirs"
@@ -1232,7 +1573,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$as_dir" : 'X\(//\)[^/]' \| \
X"$as_dir" : 'X\(//\)$' \| \
X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$as_dir" |
+$as_echo X"$as_dir" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
@@ -1253,4613 +1594,3274 @@ echo X"$as_dir" |
test -d "$as_dir" && break
done
test -z "$as_dirs" || eval "mkdir $as_dirs"
- } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-echo "$as_me: error: cannot create directory $as_dir" >&2;}
+ } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
{ (exit 1); exit 1; }; }; }
- cd $at_group_dir
- ;;
- esac
echo 0 > "$at_status_file"
- # Clearly separate the test groups when verbose.
- test $at_group_count != 0 && $at_verbose
-
# In verbose mode, append to the log file *and* show on
- # the standard output; in quiet mode only write to the log
- if test $at_verbose = echo; then
+ # the standard output; in quiet mode only write to the log.
+ if test -z "$at_verbose"; then
at_tee_pipe='tee -a "$at_group_log"'
else
at_tee_pipe='cat >> "$at_group_log"'
fi
+}
- case $at_group in
-
- banner-1 ) # Banner 1. testsuite.at:62
- cat <<\_ATEOF
-
-Non-driver-specific
-
-_ATEOF
- ;;
-
- 1 ) # 1. testsuite.at:63: version
- at_setup_line='testsuite.at:63'
- at_desc="version"
- $at_quiet $ECHO_N " 1: version $ECHO_C"
- at_xfail=no
- echo "# -*- compilation -*-" >> "$at_group_log"
- (
- echo "1. testsuite.at:63: testing ..."
- $at_traceon
+# at_func_group_postprocess
+# -------------------------
+at_func_group_postprocess ()
+{
+ # Be sure to come back to the suite directory, in particular
+ # since below we might `rm' the group directory we are in currently.
+ cd "$at_suite_dir"
-cat >expout <<'_ATEOF'
-This version of Silo is greater than or equal to 4.6
-This version of Silo is NOT greater than or equal to 90.5.2
-DBVersion() returns "4.8"
-DBVersionGE(4,6,0) returns 1
-DBVersionGE(90,5,2) returns 0
-On file handle returned from DBCreate...
- DBFileVersion() returns "4.8"
- DBFileVersionGE(4,6,0) returns 1
- DBFileVersionGE(90,5,2) returns 0
-On file handle returned from DBOpen...
- DBFileVersion() returns "4.8"
- DBFileVersionGE(4,6,0) returns 1
- DBFileVersionGE(90,5,2) returns 0
-On old silo file handle returned from DBOpen...
- DBFileVersion() returns "unknown; 4.5 or older"
- DBFileVersionGE(3,0,0) returns -1
- DBFileVersionGE(4,6,0) returns 0
- DBFileVersionGE(90,5,2) returns 0
+ if test ! -f "$at_check_line_file"; then
+ sed "s/^ */$as_me: WARNING: /" <<_ATEOF
+ A failure happened in a test group before any test could be
+ run. This means that test suite is improperly designed. Please
+ report this failure to <visit-users at email.ornl.gov>.
_ATEOF
+ $as_echo "$at_setup_line" >"$at_check_line_file"
+ fi
+ $at_verbose $as_echo_n "$at_group. $at_setup_line: "
+ $as_echo_n "$at_group. $at_setup_line: " >> "$at_group_log"
+ case $at_xfail:$at_status in
+ yes:0)
+ at_msg="UNEXPECTED PASS"
+ at_res=xpass
+ at_errexit=$at_errexit_p
+ ;;
+ no:0)
+ at_msg="ok"
+ at_res=pass
+ at_errexit=false
+ ;;
+ *:77)
+ at_msg='skipped ('`cat "$at_check_line_file"`')'
+ at_res=skip
+ at_errexit=false
+ ;;
+ yes:*)
+ at_msg='expected failure ('`cat "$at_check_line_file"`')'
+ at_res=xfail
+ at_errexit=false
+ ;;
+ no:*)
+ at_msg='FAILED ('`cat "$at_check_line_file"`')'
+ at_res=fail
+ at_errexit=$at_errexit_p
+ ;;
+ esac
+ echo "$at_res" > "$at_job_dir/$at_res"
+ # Make sure there is a separator even with long titles.
+ $as_echo " $at_msg"
+ at_log_msg="$at_group. $at_desc ($at_setup_line): $at_msg"
+ case $at_status in
+ 0|77)
+ # $at_times_file is only available if the group succeeded.
+ # We're not including the group log, so the success message
+ # is written in the global log separately. But we also
+ # write to the group log in case they're using -d.
+ if test -f "$at_times_file"; then
+ at_log_msg="$at_log_msg ("`sed 1d "$at_times_file"`')'
+ rm -f "$at_times_file"
+ fi
+ $as_echo "$at_log_msg" >> "$at_group_log"
+ $as_echo "$at_log_msg" >&5
-$at_traceoff
-echo "$at_srcdir/testsuite.at:84: \$VALGRIND version \$STARGS"
-echo testsuite.at:84 >"$at_check_line_file"
+ # Cleanup the group directory, unless the user wants the files.
+ if $at_debug_p; then
+ at_func_create_debugging_script
+ else
+ if test -d "$at_group_dir"; then
+ find "$at_group_dir" -type d ! -perm -700 -exec chmod u+rwx \{\} \;
+ rm -fr "$at_group_dir"
+ fi
+ rm -f "$at_test_source"
+ fi
+ ;;
+ *)
+ # Upon failure, include the log into the testsuite's global
+ # log. The failure message is written in the group log. It
+ # is later included in the global log.
+ $as_echo "$at_log_msg" >> "$at_group_log"
+
+ # Upon failure, keep the group directory for autopsy, and create
+ # the debugging script. With -e, do not start any further tests.
+ at_func_create_debugging_script
+ if $at_errexit; then
+ echo stop > "$at_stop_file"
+ fi
+ ;;
+ esac
+}
-at_trace_this=
-if test -n "$at_traceon"; then
- case "$VALGRIND version $STARGS" in
- *'
-'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;;
- *) at_trace_this=yes ;;
- esac
-fi
-if test -n "$at_trace_this"; then
- ( $at_traceon; $VALGRIND version $STARGS ) >"$at_stdout" 2>"$at_stder1"
- at_status=$?
- grep '^ *+' "$at_stder1" >&2
- grep -v '^ *+' "$at_stder1" >"$at_stderr"
-else
- ( :; $VALGRIND version $STARGS ) >"$at_stdout" 2>"$at_stderr"
- at_status=$?
-fi
+## ------------ ##
+## Driver loop. ##
+## ------------ ##
-at_failed=false
-echo stderr:; cat "$at_stderr"
-$at_diff expout "$at_stdout" || at_failed=:
-case $at_status in
- 77) echo 77 > "$at_status_file"; exit 77;;
- 0) ;;
- *) echo "$at_srcdir/testsuite.at:84: exit code was $at_status, expected 0"
- at_failed=:;;
-esac
-if $at_failed; then
+rm -f "$at_stop_file"
+at_first=:
+for at_group in $at_groups; do
+ at_func_group_prepare
+ if cd "$at_group_dir" &&
+ at_func_test $at_group &&
+ . "$at_test_source"; then :; else
+ { $as_echo "$as_me:$LINENO: WARNING: unable to parse test group: $at_group" >&5
+$as_echo "$as_me: WARNING: unable to parse test group: $at_group" >&2;}
+ at_failed=:
+ fi
+ at_func_group_postprocess
+ test -f "$at_stop_file" && break
+ at_first=false
+done
- echo 1 > "$at_status_file"
- exit 1
-fi
+# Wrap up the test suite with summary statistics.
+cd "$at_helper_dir"
+
+# Use ?..???? when the list must remain sorted, the faster * otherwise.
+at_pass_list=`for f in */pass; do echo $f; done | sed '/\*/d; s,/pass,,'`
+at_skip_list=`for f in */skip; do echo $f; done | sed '/\*/d; s,/skip,,'`
+at_xfail_list=`for f in */xfail; do echo $f; done | sed '/\*/d; s,/xfail,,'`
+at_xpass_list=`for f in ?/xpass ??/xpass ???/xpass ????/xpass; do
+ echo $f; done | sed '/?/d; s,/xpass,,'`
+at_fail_list=`for f in ?/fail ??/fail ???/fail ????/fail; do
+ echo $f; done | sed '/?/d; s,/fail,,'`
+
+set X $at_pass_list $at_xpass_list $at_xfail_list $at_fail_list $at_skip_list
+shift; at_group_count=$#
+set X $at_xpass_list; shift; at_xpass_count=$#; at_xpass_list=$*
+set X $at_xfail_list; shift; at_xfail_count=$#
+set X $at_fail_list; shift; at_fail_count=$#; at_fail_list=$*
+set X $at_skip_list; shift; at_skip_count=$#
+
+at_func_arith $at_group_count - $at_skip_count
+at_run_count=$at_func_arith_result
+at_func_arith $at_xpass_count + $at_fail_count
+at_unexpected_count=$at_func_arith_result
+at_func_arith $at_xfail_count + $at_fail_count
+at_total_fail_count=$at_func_arith_result
-$at_traceon
+# Back to the top directory.
+cd "$at_dir"
+rm -rf "$at_helper_dir"
- $at_traceoff
- $at_times_p && times >"$at_times_file"
- ) 5>&1 2>&1 | eval $at_tee_pipe
- at_status=`cat "$at_status_file"`
+# Compute the duration of the suite.
+at_stop_date=`date`
+at_stop_time=`date +%s 2>/dev/null`
+$as_echo "$as_me: ending at: $at_stop_date" >&5
+case $at_start_time,$at_stop_time in
+ [0-9]*,[0-9]*)
+ at_func_arith $at_stop_time - $at_start_time
+ at_duration_s=$at_func_arith_result
+ at_func_arith $at_duration_s / 60
+ at_duration_m=$at_func_arith_result
+ at_func_arith $at_duration_m / 60
+ at_duration_h=$at_func_arith_result
+ at_func_arith $at_duration_s % 60
+ at_duration_s=$at_func_arith_result
+ at_func_arith $at_duration_m % 60
+ at_duration_m=$at_func_arith_result
+ at_duration="${at_duration_h}h ${at_duration_m}m ${at_duration_s}s"
+ $as_echo "$as_me: test suite duration: $at_duration" >&5
;;
+esac
- 2 ) # 2. testsuite.at:86: namescheme
- at_setup_line='testsuite.at:86'
- at_desc="namescheme"
- $at_quiet $ECHO_N " 2: namescheme $ECHO_C"
- at_xfail=no
- echo "# -*- compilation -*-" >> "$at_group_log"
- (
- echo "2. testsuite.at:86: testing ..."
- $at_traceon
-
-$at_traceoff
-echo "$at_srcdir/testsuite.at:87: \$VALGRIND namescheme"
-echo testsuite.at:87 >"$at_check_line_file"
-
-at_trace_this=
-if test -n "$at_traceon"; then
- case "$VALGRIND namescheme" in
- *'
-'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;;
- *) at_trace_this=yes ;;
- esac
-fi
+echo
+cat <<\_ASBOX
+## ------------- ##
+## Test results. ##
+## ------------- ##
+_ASBOX
+echo
+{
+ echo
+ cat <<\_ASBOX
+## ------------- ##
+## Test results. ##
+## ------------- ##
+_ASBOX
+ echo
+} >&5
-if test -n "$at_trace_this"; then
- ( $at_traceon; $VALGRIND namescheme ) >"$at_stdout" 2>"$at_stder1"
- at_status=$?
- grep '^ *+' "$at_stder1" >&2
- grep -v '^ *+' "$at_stder1" >"$at_stderr"
+if test $at_run_count = 1; then
+ at_result="1 test"
+ at_were=was
else
- ( :; $VALGRIND namescheme ) >"$at_stdout" 2>"$at_stderr"
- at_status=$?
+ at_result="$at_run_count tests"
+ at_were=were
fi
+if $at_errexit_p && test $at_unexpected_count != 0; then
+ if test $at_xpass_count = 1; then
+ at_result="$at_result $at_were run, one passed"
+ else
+ at_result="$at_result $at_were run, one failed"
+ fi
+ at_result="$at_result unexpectedly and inhibited subsequent tests."
+else
+ # Don't you just love exponential explosion of the number of cases?
+ case $at_xpass_count:$at_fail_count:$at_xfail_count in
+ # So far, so good.
+ 0:0:0) at_result="$at_result $at_were successful." ;;
+ 0:0:*) at_result="$at_result behaved as expected." ;;
-at_failed=false
-$at_diff "$at_devnull" "$at_stderr" || at_failed=:
-echo stdout:; cat "$at_stdout"
-case $at_status in
- 77) echo 77 > "$at_status_file"; exit 77;;
- 0) ;;
- *) echo "$at_srcdir/testsuite.at:87: exit code was $at_status, expected 0"
- at_failed=:;;
-esac
-if $at_failed; then
+ # Some unexpected failures
+ 0:*:0) at_result="$at_result $at_were run,
+$at_fail_count failed unexpectedly." ;;
+ # Some failures, both expected and unexpected
+ 0:*:1) at_result="$at_result $at_were run,
+$at_total_fail_count failed ($at_xfail_count expected failure)." ;;
+ 0:*:*) at_result="$at_result $at_were run,
+$at_total_fail_count failed ($at_xfail_count expected failures)." ;;
- echo 1 > "$at_status_file"
- exit 1
+ # No unexpected failures, but some xpasses
+ *:0:*) at_result="$at_result $at_were run,
+$at_xpass_count passed unexpectedly." ;;
+
+ # No expected failures, but failures and xpasses
+ *:1:0) at_result="$at_result $at_were run,
+$at_unexpected_count did not behave as expected ($at_fail_count unexpected failure)." ;;
+ *:*:0) at_result="$at_result $at_were run,
+$at_unexpected_count did not behave as expected ($at_fail_count unexpected failures)." ;;
+
+ # All of them.
+ *:*:1) at_result="$at_result $at_were run,
+$at_xpass_count passed unexpectedly,
+$at_total_fail_count failed ($at_xfail_count expected failure)." ;;
+ *:*:*) at_result="$at_result $at_were run,
+$at_xpass_count passed unexpectedly,
+$at_total_fail_count failed ($at_xfail_count expected failures)." ;;
+ esac
+
+ if test $at_skip_count = 0 && test $at_run_count -gt 1; then
+ at_result="All $at_result"
+ fi
fi
-$at_traceon
+# Now put skips in the mix.
+case $at_skip_count in
+ 0) ;;
+ 1) at_result="$at_result
+1 test was skipped." ;;
+ *) at_result="$at_result
+$at_skip_count tests were skipped." ;;
+esac
- $at_traceoff
- $at_times_p && times >"$at_times_file"
- ) 5>&1 2>&1 | eval $at_tee_pipe
- at_status=`cat "$at_status_file"`
- ;;
+if test $at_unexpected_count = 0; then
+ echo "$at_result"
+ echo "$at_result" >&5
+else
+ echo "ERROR: $at_result" >&2
+ echo "ERROR: $at_result" >&5
+ {
+ echo
+ cat <<\_ASBOX
+## ------------------------ ##
+## Summary of the failures. ##
+## ------------------------ ##
+_ASBOX
- 3 ) # 3. testsuite.at:89: point
- at_setup_line='testsuite.at:89'
- at_desc="point"
- $at_quiet $ECHO_N " 3: point $ECHO_C"
- at_xfail=no
- echo "# -*- compilation -*-" >> "$at_group_log"
- (
- echo "3. testsuite.at:89: testing ..."
- $at_traceon
-
-$at_traceoff
-echo "$at_srcdir/testsuite.at:90: \$VALGRIND point \$STARGS"
-echo testsuite.at:90 >"$at_check_line_file"
+ # Summary of failed and skipped tests.
+ if test $at_fail_count != 0; then
+ echo "Failed tests:"
+ $SHELL "$at_myself" $at_fail_list --list
+ echo
+ fi
+ if test $at_skip_count != 0; then
+ echo "Skipped tests:"
+ $SHELL "$at_myself" $at_skip_list --list
+ echo
+ fi
+ if test $at_xpass_count != 0; then
+ echo "Unexpected passes:"
+ $SHELL "$at_myself" $at_xpass_list --list
+ echo
+ fi
+ if test $at_fail_count != 0; then
+ cat <<\_ASBOX
+## ---------------------- ##
+## Detailed failed tests. ##
+## ---------------------- ##
+_ASBOX
+ echo
+ for at_group in $at_fail_list
+ do
+ at_group_normalized=$at_group
-at_trace_this=
-if test -n "$at_traceon"; then
- case "$VALGRIND point $STARGS" in
- *'
-'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;;
- *) at_trace_this=yes ;;
+ eval 'while :; do
+ case $at_group_normalized in #(
+ '"$at_format"'*) break;;
esac
-fi
+ at_group_normalized=0$at_group_normalized
+ done'
-if test -n "$at_trace_this"; then
- ( $at_traceon; $VALGRIND point $STARGS ) >"$at_stdout" 2>"$at_stder1"
- at_status=$?
- grep '^ *+' "$at_stder1" >&2
- grep -v '^ *+' "$at_stder1" >"$at_stderr"
-else
- ( :; $VALGRIND point $STARGS ) >"$at_stdout" 2>"$at_stderr"
- at_status=$?
-fi
+ cat "$at_suite_dir/$at_group_normalized/$as_me.log"
+ echo
+ done
+ echo
+ fi
+ if test -n "$at_top_srcdir"; then
+ sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
+## ${at_top_build_prefix}config.log ##
+_ASBOX
+ sed 's/^/| /' ${at_top_build_prefix}config.log
+ echo
+ fi
+ } >&5
-at_failed=false
-$at_diff "$at_devnull" "$at_stderr" || at_failed=:
-echo stdout:; cat "$at_stdout"
-case $at_status in
- 77) echo 77 > "$at_status_file"; exit 77;;
- 0) ;;
- *) echo "$at_srcdir/testsuite.at:90: exit code was $at_status, expected 0"
- at_failed=:;;
-esac
-if $at_failed; then
+ sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
+## $as_me.log was created. ##
+_ASBOX
+ echo
+ $as_echo "Please send \`${at_testdir+${at_testdir}/}$as_me.log' and all information you think might help:
- echo 1 > "$at_status_file"
- exit 1
+ To: <visit-users at email.ornl.gov>
+ Subject: [silo 4.9.1] $as_me: $at_fail_list${at_fail_list:+ failed${at_xpass_list:+, }}$at_xpass_list${at_xpass_list:+ passed unexpectedly}
+"
+ if test $at_debug_p = false; then
+ echo
+ echo 'You may investigate any problem if you feel able to do so, in which'
+ echo 'case the test suite provides a good starting point. Its output may'
+ $as_echo "be found below \`${at_testdir+${at_testdir}/}$as_me.dir'."
+ echo
+ fi
+ exit 1
fi
-$at_traceon
+exit 0
- $at_traceoff
- $at_times_p && times >"$at_times_file"
- ) 5>&1 2>&1 | eval $at_tee_pipe
- at_status=`cat "$at_status_file"`
- ;;
+## ------------- ##
+## Actual tests. ##
+## ------------- ##
+#AT_START_1
+# 1. testsuite.at:63: version
+at_setup_line='testsuite.at:63'
+at_func_banner 1
+at_desc="version"
+$at_quiet $as_echo_n " 1: $at_desc "
+at_xfail=no
+echo "# -*- compilation -*-" >> "$at_group_log"
+(
+ $as_echo "1. testsuite.at:63: testing ..."
+ $at_traceon
- 4 ) # 4. testsuite.at:92: extface
- at_setup_line='testsuite.at:92'
- at_desc="extface"
- $at_quiet $ECHO_N " 4: extface $ECHO_C"
- at_xfail=no
- echo "# -*- compilation -*-" >> "$at_group_log"
- (
- echo "4. testsuite.at:92: testing ..."
- $at_traceon
-
-$at_traceoff
-echo "$at_srcdir/testsuite.at:93: \$VALGRIND extface \$STARGS"
-echo testsuite.at:93 >"$at_check_line_file"
+cat >expout <<'_ATEOF'
+This version of Silo is greater than or equal to 4.6
+This version of Silo is NOT greater than or equal to 90.5.2
+DBVersion() returns "4.9.1"
+DBVersionGE(4,6,0) returns 1
+DBVersionGE(90,5,2) returns 0
+On file handle returned from DBCreate...
+ DBFileVersion() returns "4.9.1"
+ DBFileVersionGE(4,6,0) returns 1
+ DBFileVersionGE(90,5,2) returns 0
+On file handle returned from DBOpen...
+ DBFileVersion() returns "4.9.1"
+ DBFileVersionGE(4,6,0) returns 1
+ DBFileVersionGE(90,5,2) returns 0
+On old silo file handle returned from DBOpen...
+ DBFileVersion() returns "unknown; 4.5 or older"
+ DBFileVersionGE(3,0,0) returns -1
+ DBFileVersionGE(4,6,0) returns 0
+ DBFileVersionGE(90,5,2) returns 0
+_ATEOF
-at_trace_this=
-if test -n "$at_traceon"; then
- case "$VALGRIND extface $STARGS" in
- *'
-'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;;
- *) at_trace_this=yes ;;
- esac
-fi
+{ $at_traceoff
+$as_echo "$at_srcdir/testsuite.at:84: \$VALGRIND version \$STARGS"
+echo testsuite.at:84 >"$at_check_line_file"
-if test -n "$at_trace_this"; then
- ( $at_traceon; $VALGRIND extface $STARGS ) >"$at_stdout" 2>"$at_stder1"
- at_status=$?
- grep '^ *+' "$at_stder1" >&2
- grep -v '^ *+' "$at_stder1" >"$at_stderr"
+if test -n "$at_traceon" \
+ && at_func_check_newline "$VALGRIND version $STARGS"; then
+ ( $at_traceon; $VALGRIND version $STARGS ) >"$at_stdout" 2>"$at_stder1"
+ at_func_filter_trace $?
else
- ( :; $VALGRIND extface $STARGS ) >"$at_stdout" 2>"$at_stderr"
- at_status=$?
+ ( :; $VALGRIND version $STARGS ) >"$at_stdout" 2>"$at_stderr"
fi
-
+at_status=$?
at_failed=false
-$at_diff "$at_devnull" "$at_stderr" || at_failed=:
-echo stdout:; cat "$at_stdout"
-case $at_status in
- 77) echo 77 > "$at_status_file"; exit 77;;
- 0) ;;
- *) echo "$at_srcdir/testsuite.at:93: exit code was $at_status, expected 0"
- at_failed=:;;
-esac
-if $at_failed; then
+echo stderr:; cat "$at_stderr"
+$at_diff expout "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/testsuite.at:84"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+ $at_traceoff
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_1
+#AT_START_2
+# 2. testsuite.at:86: namescheme
+at_setup_line='testsuite.at:86'
+at_func_banner 1
+at_desc="namescheme"
+$at_quiet $as_echo_n " 2: $at_desc "
+at_xfail=no
+echo "# -*- compilation -*-" >> "$at_group_log"
+(
+ $as_echo "2. testsuite.at:86: testing ..."
+ $at_traceon
+{ $at_traceoff
+$as_echo "$at_srcdir/testsuite.at:87: \$VALGRIND namescheme"
+echo testsuite.at:87 >"$at_check_line_file"
- echo 1 > "$at_status_file"
- exit 1
+if test -n "$at_traceon" \
+ && at_func_check_newline "$VALGRIND namescheme"; then
+ ( $at_traceon; $VALGRIND namescheme ) >"$at_stdout" 2>"$at_stder1"
+ at_func_filter_trace $?
+else
+ ( :; $VALGRIND namescheme ) >"$at_stdout" 2>"$at_stderr"
fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+echo stdout:; cat "$at_stdout"
+at_func_check_status 0 $at_status "$at_srcdir/testsuite.at:87"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+ $at_traceoff
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_2
+#AT_START_3
+# 3. testsuite.at:89: point
+at_setup_line='testsuite.at:89'
+at_func_banner 1
+at_desc="point"
+$at_quiet $as_echo_n " 3: $at_desc "
+at_xfail=no
+echo "# -*- compilation -*-" >> "$at_group_log"
+(
+ $as_echo "3. testsuite.at:89: testing ..."
+ $at_traceon
-$at_traceon
-
- $at_traceoff
- $at_times_p && times >"$at_times_file"
- ) 5>&1 2>&1 | eval $at_tee_pipe
- at_status=`cat "$at_status_file"`
- ;;
-
- 5 ) # 5. testsuite.at:95: testall -small
- at_setup_line='testsuite.at:95'
- at_desc="testall -small"
- $at_quiet $ECHO_N " 5: testall -small $ECHO_C"
- at_xfail=no
- echo "# -*- compilation -*-" >> "$at_group_log"
- (
- echo "5. testsuite.at:95: testing ..."
- $at_traceon
-
-$at_traceoff
-echo "$at_srcdir/testsuite.at:96: \$VALGRIND testall -small \$STARGS"
-echo testsuite.at:96 >"$at_check_line_file"
-
-at_trace_this=
-if test -n "$at_traceon"; then
- case "$VALGRIND testall -small $STARGS" in
- *'
-'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;;
- *) at_trace_this=yes ;;
- esac
-fi
+{ $at_traceoff
+$as_echo "$at_srcdir/testsuite.at:90: \$VALGRIND point \$STARGS"
+echo testsuite.at:90 >"$at_check_line_file"
-if test -n "$at_trace_this"; then
- ( $at_traceon; $VALGRIND testall -small $STARGS ) >"$at_stdout" 2>"$at_stder1"
- at_status=$?
- grep '^ *+' "$at_stder1" >&2
- grep -v '^ *+' "$at_stder1" >"$at_stderr"
+if test -n "$at_traceon" \
+ && at_func_check_newline "$VALGRIND point $STARGS"; then
+ ( $at_traceon; $VALGRIND point $STARGS ) >"$at_stdout" 2>"$at_stder1"
+ at_func_filter_trace $?
else
- ( :; $VALGRIND testall -small $STARGS ) >"$at_stdout" 2>"$at_stderr"
- at_status=$?
+ ( :; $VALGRIND point $STARGS ) >"$at_stdout" 2>"$at_stderr"
fi
-
+at_status=$?
at_failed=false
-$at_diff "$at_devnull" "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stderr" || at_failed=:
echo stdout:; cat "$at_stdout"
-case $at_status in
- 77) echo 77 > "$at_status_file"; exit 77;;
- 0) ;;
- *) echo "$at_srcdir/testsuite.at:96: exit code was $at_status, expected 0"
- at_failed=:;;
-esac
-if $at_failed; then
+at_func_check_status 0 $at_status "$at_srcdir/testsuite.at:90"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+ $at_traceoff
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_3
+#AT_START_4
+# 4. testsuite.at:92: extface
+at_setup_line='testsuite.at:92'
+at_func_banner 1
+at_desc="extface"
+$at_quiet $as_echo_n " 4: $at_desc "
+at_xfail=no
+echo "# -*- compilation -*-" >> "$at_group_log"
+(
+ $as_echo "4. testsuite.at:92: testing ..."
+ $at_traceon
+{ $at_traceoff
+$as_echo "$at_srcdir/testsuite.at:93: \$VALGRIND extface \$STARGS"
+echo testsuite.at:93 >"$at_check_line_file"
- echo 1 > "$at_status_file"
- exit 1
+if test -n "$at_traceon" \
+ && at_func_check_newline "$VALGRIND extface $STARGS"; then
+ ( $at_traceon; $VALGRIND extface $STARGS ) >"$at_stdout" 2>"$at_stder1"
+ at_func_filter_trace $?
+else
+ ( :; $VALGRIND extface $STARGS ) >"$at_stdout" 2>"$at_stderr"
fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+echo stdout:; cat "$at_stdout"
+at_func_check_status 0 $at_status "$at_srcdir/testsuite.at:93"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+ $at_traceoff
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_4
+#AT_START_5
+# 5. testsuite.at:95: testall -small
+at_setup_line='testsuite.at:95'
+at_func_banner 1
+at_desc="testall -small"
+$at_quiet $as_echo_n " 5: $at_desc "
+at_xfail=no
+echo "# -*- compilation -*-" >> "$at_group_log"
+(
+ $as_echo "5. testsuite.at:95: testing ..."
+ $at_traceon
-$at_traceon
-
- $at_traceoff
- $at_times_p && times >"$at_times_file"
- ) 5>&1 2>&1 | eval $at_tee_pipe
- at_status=`cat "$at_status_file"`
- ;;
+{ $at_traceoff
+$as_echo "$at_srcdir/testsuite.at:96: \$VALGRIND testall -small \$STARGS"
+echo testsuite.at:96 >"$at_check_line_file"
- 6 ) # 6. testsuite.at:98: TestReadMask
- at_setup_line='testsuite.at:98'
- at_desc="TestReadMask"
- $at_quiet $ECHO_N " 6: TestReadMask $ECHO_C"
- at_xfail=no
- echo "# -*- compilation -*-" >> "$at_group_log"
- (
- echo "6. testsuite.at:98: testing ..."
- $at_traceon
+if test -n "$at_traceon" \
+ && at_func_check_newline "$VALGRIND testall -small $STARGS"; then
+ ( $at_traceon; $VALGRIND testall -small $STARGS ) >"$at_stdout" 2>"$at_stder1"
+ at_func_filter_trace $?
+else
+ ( :; $VALGRIND testall -small $STARGS ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+echo stdout:; cat "$at_stdout"
+at_func_check_status 0 $at_status "$at_srcdir/testsuite.at:96"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+ $at_traceoff
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_5
+#AT_START_6
+# 6. testsuite.at:98: TestReadMask
+at_setup_line='testsuite.at:98'
+at_func_banner 1
+at_desc="TestReadMask"
+$at_quiet $as_echo_n " 6: $at_desc "
+at_xfail=no
+echo "# -*- compilation -*-" >> "$at_group_log"
+(
+ $as_echo "6. testsuite.at:98: testing ..."
+ $at_traceon
# needs files generated by other execs
-$at_traceoff
-echo "$at_srcdir/testsuite.at:99: extface \$STARGS"
+{ $at_traceoff
+$as_echo "$at_srcdir/testsuite.at:99: extface \$STARGS"
echo testsuite.at:99 >"$at_check_line_file"
-at_trace_this=
-if test -n "$at_traceon"; then
- case "extface $STARGS" in
- *'
-'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;;
- *) at_trace_this=yes ;;
- esac
-fi
-
-if test -n "$at_trace_this"; then
- ( $at_traceon; extface $STARGS ) >"$at_stdout" 2>"$at_stder1"
- at_status=$?
- grep '^ *+' "$at_stder1" >&2
- grep -v '^ *+' "$at_stder1" >"$at_stderr"
+if test -n "$at_traceon" \
+ && at_func_check_newline "extface $STARGS"; then
+ ( $at_traceon; extface $STARGS ) >"$at_stdout" 2>"$at_stder1"
+ at_func_filter_trace $?
else
- ( :; extface $STARGS ) >"$at_stdout" 2>"$at_stderr"
- at_status=$?
+ ( :; extface $STARGS ) >"$at_stdout" 2>"$at_stderr"
fi
-
+at_status=$?
at_failed=false
-$at_diff "$at_devnull" "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stderr" || at_failed=:
echo stdout:; cat "$at_stdout"
-case $at_status in
- 77) echo 77 > "$at_status_file"; exit 77;;
- 0) ;;
- *) echo "$at_srcdir/testsuite.at:99: exit code was $at_status, expected 0"
- at_failed=:;;
-esac
-if $at_failed; then
-
-
- echo 1 > "$at_status_file"
- exit 1
-fi
+at_func_check_status 0 $at_status "$at_srcdir/testsuite.at:99"
-$at_traceon
+$at_failed && at_func_log_failure
+$at_traceon; }
# don't valgrind these intermediate parts
-$at_traceoff
-echo "$at_srcdir/testsuite.at:100: point \$STARGS"
+{ $at_traceoff
+$as_echo "$at_srcdir/testsuite.at:100: point \$STARGS"
echo testsuite.at:100 >"$at_check_line_file"
-at_trace_this=
-if test -n "$at_traceon"; then
- case "point $STARGS" in
- *'
-'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;;
- *) at_trace_this=yes ;;
- esac
-fi
-
-if test -n "$at_trace_this"; then
- ( $at_traceon; point $STARGS ) >"$at_stdout" 2>"$at_stder1"
- at_status=$?
- grep '^ *+' "$at_stder1" >&2
- grep -v '^ *+' "$at_stder1" >"$at_stderr"
+if test -n "$at_traceon" \
+ && at_func_check_newline "point $STARGS"; then
+ ( $at_traceon; point $STARGS ) >"$at_stdout" 2>"$at_stder1"
+ at_func_filter_trace $?
else
- ( :; point $STARGS ) >"$at_stdout" 2>"$at_stderr"
- at_status=$?
+ ( :; point $STARGS ) >"$at_stdout" 2>"$at_stderr"
fi
-
+at_status=$?
at_failed=false
-$at_diff "$at_devnull" "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stderr" || at_failed=:
echo stdout:; cat "$at_stdout"
-case $at_status in
- 77) echo 77 > "$at_status_file"; exit 77;;
- 0) ;;
- *) echo "$at_srcdir/testsuite.at:100: exit code was $at_status, expected 0"
- at_failed=:;;
-esac
-if $at_failed; then
-
-
- echo 1 > "$at_status_file"
- exit 1
-fi
+at_func_check_status 0 $at_status "$at_srcdir/testsuite.at:100"
-$at_traceon
+$at_failed && at_func_log_failure
+$at_traceon; }
-$at_traceoff
-echo "$at_srcdir/testsuite.at:101: testall -small \$STARGS"
+{ $at_traceoff
+$as_echo "$at_srcdir/testsuite.at:101: testall -small \$STARGS"
echo testsuite.at:101 >"$at_check_line_file"
-at_trace_this=
-if test -n "$at_traceon"; then
- case "testall -small $STARGS" in
- *'
-'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;;
- *) at_trace_this=yes ;;
- esac
-fi
-
-if test -n "$at_trace_this"; then
- ( $at_traceon; testall -small $STARGS ) >"$at_stdout" 2>"$at_stder1"
- at_status=$?
- grep '^ *+' "$at_stder1" >&2
- grep -v '^ *+' "$at_stder1" >"$at_stderr"
+if test -n "$at_traceon" \
+ && at_func_check_newline "testall -small $STARGS"; then
+ ( $at_traceon; testall -small $STARGS ) >"$at_stdout" 2>"$at_stder1"
+ at_func_filter_trace $?
else
- ( :; testall -small $STARGS ) >"$at_stdout" 2>"$at_stderr"
- at_status=$?
+ ( :; testall -small $STARGS ) >"$at_stdout" 2>"$at_stderr"
fi
-
+at_status=$?
at_failed=false
-$at_diff "$at_devnull" "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stderr" || at_failed=:
echo stdout:; cat "$at_stdout"
-case $at_status in
- 77) echo 77 > "$at_status_file"; exit 77;;
- 0) ;;
- *) echo "$at_srcdir/testsuite.at:101: exit code was $at_status, expected 0"
- at_failed=:;;
-esac
-if $at_failed; then
-
-
- echo 1 > "$at_status_file"
- exit 1
-fi
+at_func_check_status 0 $at_status "$at_srcdir/testsuite.at:101"
-$at_traceon
+$at_failed && at_func_log_failure
+$at_traceon; }
-$at_traceoff
-echo "$at_srcdir/testsuite.at:102: \$VALGRIND TestReadMask \$STARGS"
+{ $at_traceoff
+$as_echo "$at_srcdir/testsuite.at:102: \$VALGRIND TestReadMask \$STARGS"
echo testsuite.at:102 >"$at_check_line_file"
-at_trace_this=
-if test -n "$at_traceon"; then
- case "$VALGRIND TestReadMask $STARGS" in
- *'
-'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;;
- *) at_trace_this=yes ;;
- esac
-fi
-
-if test -n "$at_trace_this"; then
- ( $at_traceon; $VALGRIND TestReadMask $STARGS ) >"$at_stdout" 2>"$at_stder1"
- at_status=$?
- grep '^ *+' "$at_stder1" >&2
- grep -v '^ *+' "$at_stder1" >"$at_stderr"
+if test -n "$at_traceon" \
+ && at_func_check_newline "$VALGRIND TestReadMask $STARGS"; then
+ ( $at_traceon; $VALGRIND TestReadMask $STARGS ) >"$at_stdout" 2>"$at_stder1"
+ at_func_filter_trace $?
else
- ( :; $VALGRIND TestReadMask $STARGS ) >"$at_stdout" 2>"$at_stderr"
- at_status=$?
+ ( :; $VALGRIND TestReadMask $STARGS ) >"$at_stdout" 2>"$at_stderr"
fi
-
+at_status=$?
at_failed=false
-$at_diff "$at_devnull" "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stderr" || at_failed=:
echo stdout:; cat "$at_stdout"
-case $at_status in
- 77) echo 77 > "$at_status_file"; exit 77;;
- 0) ;;
- *) echo "$at_srcdir/testsuite.at:102: exit code was $at_status, expected 0"
- at_failed=:;;
-esac
-if $at_failed; then
-
-
- echo 1 > "$at_status_file"
- exit 1
-fi
-
-$at_traceon
-
- $at_traceoff
- $at_times_p && times >"$at_times_file"
- ) 5>&1 2>&1 | eval $at_tee_pipe
- at_status=`cat "$at_status_file"`
- ;;
+at_func_check_status 0 $at_status "$at_srcdir/testsuite.at:102"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+ $at_traceoff
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_6
+#AT_START_7
+# 7. testsuite.at:104: array
+at_setup_line='testsuite.at:104'
+at_func_banner 1
+at_desc="array"
+$at_quiet $as_echo_n " 7: $at_desc "
+at_xfail=no
+echo "# -*- compilation -*-" >> "$at_group_log"
+(
+ $as_echo "7. testsuite.at:104: testing ..."
+ $at_traceon
- 7 ) # 7. testsuite.at:104: array
- at_setup_line='testsuite.at:104'
- at_desc="array"
- $at_quiet $ECHO_N " 7: array $ECHO_C"
- at_xfail=no
- echo "# -*- compilation -*-" >> "$at_group_log"
- (
- echo "7. testsuite.at:104: testing ..."
- $at_traceon
-
-$at_traceoff
-echo "$at_srcdir/testsuite.at:105: \$VALGRIND array \$STARGS"
+{ $at_traceoff
+$as_echo "$at_srcdir/testsuite.at:105: \$VALGRIND array \$STARGS"
echo testsuite.at:105 >"$at_check_line_file"
-at_trace_this=
-if test -n "$at_traceon"; then
- case "$VALGRIND array $STARGS" in
- *'
-'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;;
- *) at_trace_this=yes ;;
- esac
-fi
-
-if test -n "$at_trace_this"; then
- ( $at_traceon; $VALGRIND array $STARGS ) >"$at_stdout" 2>"$at_stder1"
- at_status=$?
- grep '^ *+' "$at_stder1" >&2
- grep -v '^ *+' "$at_stder1" >"$at_stderr"
+if test -n "$at_traceon" \
+ && at_func_check_newline "$VALGRIND array $STARGS"; then
+ ( $at_traceon; $VALGRIND array $STARGS ) >"$at_stdout" 2>"$at_stder1"
+ at_func_filter_trace $?
else
- ( :; $VALGRIND array $STARGS ) >"$at_stdout" 2>"$at_stderr"
- at_status=$?
+ ( :; $VALGRIND array $STARGS ) >"$at_stdout" 2>"$at_stderr"
fi
-
+at_status=$?
at_failed=false
-$at_diff "$at_devnull" "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stderr" || at_failed=:
echo stdout:; cat "$at_stdout"
-case $at_status in
- 77) echo 77 > "$at_status_file"; exit 77;;
- 0) ;;
- *) echo "$at_srcdir/testsuite.at:105: exit code was $at_status, expected 0"
- at_failed=:;;
-esac
-if $at_failed; then
+at_func_check_status 0 $at_status "$at_srcdir/testsuite.at:105"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+ $at_traceoff
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_7
+#AT_START_8
+# 8. testsuite.at:107: multi_test testread
+at_setup_line='testsuite.at:107'
+at_func_banner 1
+at_desc="multi_test testread"
+$at_quiet $as_echo_n " 8: $at_desc "
+at_xfail=no
+echo "# -*- compilation -*-" >> "$at_group_log"
+(
+ $as_echo "8. testsuite.at:107: testing ..."
+ $at_traceon
+{ $at_traceoff
+$as_echo "$at_srcdir/testsuite.at:108: \$VALGRIND multi_test testread \$STARGS"
+echo testsuite.at:108 >"$at_check_line_file"
- echo 1 > "$at_status_file"
- exit 1
+if test -n "$at_traceon" \
+ && at_func_check_newline "$VALGRIND multi_test testread $STARGS"; then
+ ( $at_traceon; $VALGRIND multi_test testread $STARGS ) >"$at_stdout" 2>"$at_stder1"
+ at_func_filter_trace $?
+else
+ ( :; $VALGRIND multi_test testread $STARGS ) >"$at_stdout" 2>"$at_stderr"
fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+echo stdout:; cat "$at_stdout"
+at_func_check_status 0 $at_status "$at_srcdir/testsuite.at:108"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+ $at_traceoff
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_8
+#AT_START_9
+# 9. testsuite.at:110: multi_test earlyclose
+at_setup_line='testsuite.at:110'
+at_func_banner 1
+at_desc="multi_test earlyclose"
+$at_quiet $as_echo_n " 9: $at_desc "
+at_xfail=no
+echo "# -*- compilation -*-" >> "$at_group_log"
+(
+ $as_echo "9. testsuite.at:110: testing ..."
+ $at_traceon
-$at_traceon
-
- $at_traceoff
- $at_times_p && times >"$at_times_file"
- ) 5>&1 2>&1 | eval $at_tee_pipe
- at_status=`cat "$at_status_file"`
- ;;
-
- 8 ) # 8. testsuite.at:107: multi_test
- at_setup_line='testsuite.at:107'
- at_desc="multi_test"
- $at_quiet $ECHO_N " 8: multi_test $ECHO_C"
- at_xfail=no
- echo "# -*- compilation -*-" >> "$at_group_log"
- (
- echo "8. testsuite.at:107: testing ..."
- $at_traceon
-
-$at_traceoff
-echo "$at_srcdir/testsuite.at:108: \$VALGRIND multi_test \$STARGS"
-echo testsuite.at:108 >"$at_check_line_file"
-
-at_trace_this=
-if test -n "$at_traceon"; then
- case "$VALGRIND multi_test $STARGS" in
- *'
-'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;;
- *) at_trace_this=yes ;;
- esac
-fi
+{ $at_traceoff
+$as_echo "$at_srcdir/testsuite.at:111: \$VALGRIND multi_test earlyclose \$STARGS"
+echo testsuite.at:111 >"$at_check_line_file"
-if test -n "$at_trace_this"; then
- ( $at_traceon; $VALGRIND multi_test $STARGS ) >"$at_stdout" 2>"$at_stder1"
- at_status=$?
- grep '^ *+' "$at_stder1" >&2
- grep -v '^ *+' "$at_stder1" >"$at_stderr"
+if test -n "$at_traceon" \
+ && at_func_check_newline "$VALGRIND multi_test earlyclose $STARGS"; then
+ ( $at_traceon; $VALGRIND multi_test earlyclose $STARGS ) >"$at_stdout" 2>"$at_stder1"
+ at_func_filter_trace $?
else
- ( :; $VALGRIND multi_test $STARGS ) >"$at_stdout" 2>"$at_stderr"
- at_status=$?
+ ( :; $VALGRIND multi_test earlyclose $STARGS ) >"$at_stdout" 2>"$at_stderr"
fi
-
+at_status=$?
at_failed=false
-$at_diff "$at_devnull" "$at_stderr" || at_failed=:
+echo stderr:; cat "$at_stderr"
echo stdout:; cat "$at_stdout"
-case $at_status in
- 77) echo 77 > "$at_status_file"; exit 77;;
- 0) ;;
- *) echo "$at_srcdir/testsuite.at:108: exit code was $at_status, expected 0"
- at_failed=:;;
-esac
-if $at_failed; then
+at_func_check_status 0 $at_status "$at_srcdir/testsuite.at:111"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+ $at_traceoff
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_9
+#AT_START_10
+# 10. testsuite.at:113: partial_io
+at_setup_line='testsuite.at:113'
+at_func_banner 1
+at_desc="partial_io"
+$at_quiet $as_echo_n " 10: $at_desc "
+at_xfail=no
+echo "# -*- compilation -*-" >> "$at_group_log"
+(
+ $as_echo "10. testsuite.at:113: testing ..."
+ $at_traceon
+{ $at_traceoff
+$as_echo "$at_srcdir/testsuite.at:114: \$VALGRIND partial_io \$STARGS"
+echo testsuite.at:114 >"$at_check_line_file"
- echo 1 > "$at_status_file"
- exit 1
+if test -n "$at_traceon" \
+ && at_func_check_newline "$VALGRIND partial_io $STARGS"; then
+ ( $at_traceon; $VALGRIND partial_io $STARGS ) >"$at_stdout" 2>"$at_stder1"
+ at_func_filter_trace $?
+else
+ ( :; $VALGRIND partial_io $STARGS ) >"$at_stdout" 2>"$at_stderr"
fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+echo stdout:; cat "$at_stdout"
+at_func_check_status 0 $at_status "$at_srcdir/testsuite.at:114"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+ $at_traceoff
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_10
+#AT_START_11
+# 11. testsuite.at:116: simple
+at_setup_line='testsuite.at:116'
+at_func_banner 1
+at_desc="simple"
+$at_quiet $as_echo_n " 11: $at_desc "
+at_xfail=no
+echo "# -*- compilation -*-" >> "$at_group_log"
+(
+ $as_echo "11. testsuite.at:116: testing ..."
+ $at_traceon
-$at_traceon
+{ $at_traceoff
+$as_echo "$at_srcdir/testsuite.at:117: \$VALGRIND simple \$STARGS"
+echo testsuite.at:117 >"$at_check_line_file"
- $at_traceoff
- $at_times_p && times >"$at_times_file"
- ) 5>&1 2>&1 | eval $at_tee_pipe
- at_status=`cat "$at_status_file"`
- ;;
+if test -n "$at_traceon" \
+ && at_func_check_newline "$VALGRIND simple $STARGS"; then
+ ( $at_traceon; $VALGRIND simple $STARGS ) >"$at_stdout" 2>"$at_stder1"
+ at_func_filter_trace $?
+else
+ ( :; $VALGRIND simple $STARGS ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+echo stdout:; cat "$at_stdout"
+at_func_check_status 0 $at_status "$at_srcdir/testsuite.at:117"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+ $at_traceoff
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_11
+#AT_START_12
+# 12. testsuite.at:119: ucd
+at_setup_line='testsuite.at:119'
+at_func_banner 1
+at_desc="ucd"
+$at_quiet $as_echo_n " 12: $at_desc "
+at_xfail=no
+echo "# -*- compilation -*-" >> "$at_group_log"
+(
+ $as_echo "12. testsuite.at:119: testing ..."
+ $at_traceon
- 9 ) # 9. testsuite.at:110: multi_test earlyclose
- at_setup_line='testsuite.at:110'
- at_desc="multi_test earlyclose"
- $at_quiet $ECHO_N " 9: multi_test earlyclose $ECHO_C"
- at_xfail=no
- echo "# -*- compilation -*-" >> "$at_group_log"
- (
- echo "9. testsuite.at:110: testing ..."
- $at_traceon
-
-$at_traceoff
-echo "$at_srcdir/testsuite.at:111: \$VALGRIND multi_test earlyclose \$STARGS"
-echo testsuite.at:111 >"$at_check_line_file"
+{ $at_traceoff
+$as_echo "$at_srcdir/testsuite.at:120: \$VALGRIND ucd \$STARGS"
+echo testsuite.at:120 >"$at_check_line_file"
-at_trace_this=
-if test -n "$at_traceon"; then
- case "$VALGRIND multi_test earlyclose $STARGS" in
- *'
-'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;;
- *) at_trace_this=yes ;;
- esac
+if test -n "$at_traceon" \
+ && at_func_check_newline "$VALGRIND ucd $STARGS"; then
+ ( $at_traceon; $VALGRIND ucd $STARGS ) >"$at_stdout" 2>"$at_stder1"
+ at_func_filter_trace $?
+else
+ ( :; $VALGRIND ucd $STARGS ) >"$at_stdout" 2>"$at_stderr"
fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+echo stdout:; cat "$at_stdout"
+at_func_check_status 0 $at_status "$at_srcdir/testsuite.at:120"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+ $at_traceoff
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_12
+#AT_START_13
+# 13. testsuite.at:122: ucdsamp3
+at_setup_line='testsuite.at:122'
+at_func_banner 1
+at_desc="ucdsamp3"
+$at_quiet $as_echo_n " 13: $at_desc "
+at_xfail=no
+echo "# -*- compilation -*-" >> "$at_group_log"
+(
+ $as_echo "13. testsuite.at:122: testing ..."
+ $at_traceon
+
+{ $at_traceoff
+$as_echo "$at_srcdir/testsuite.at:123: \$VALGRIND ucdsamp3 \$STARGS"
+echo testsuite.at:123 >"$at_check_line_file"
-if test -n "$at_trace_this"; then
- ( $at_traceon; $VALGRIND multi_test earlyclose $STARGS ) >"$at_stdout" 2>"$at_stder1"
- at_status=$?
- grep '^ *+' "$at_stder1" >&2
- grep -v '^ *+' "$at_stder1" >"$at_stderr"
+if test -n "$at_traceon" \
+ && at_func_check_newline "$VALGRIND ucdsamp3 $STARGS"; then
+ ( $at_traceon; $VALGRIND ucdsamp3 $STARGS ) >"$at_stdout" 2>"$at_stder1"
+ at_func_filter_trace $?
else
- ( :; $VALGRIND multi_test earlyclose $STARGS ) >"$at_stdout" 2>"$at_stderr"
- at_status=$?
+ ( :; $VALGRIND ucdsamp3 $STARGS ) >"$at_stdout" 2>"$at_stderr"
fi
-
+at_status=$?
at_failed=false
-echo stderr:; cat "$at_stderr"
+at_func_diff_devnull "$at_stderr" || at_failed=:
echo stdout:; cat "$at_stdout"
-case $at_status in
- 77) echo 77 > "$at_status_file"; exit 77;;
- 0) ;;
- *) echo "$at_srcdir/testsuite.at:111: exit code was $at_status, expected 0"
- at_failed=:;;
-esac
-if $at_failed; then
+at_func_check_status 0 $at_status "$at_srcdir/testsuite.at:123"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+ $at_traceoff
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_13
+#AT_START_14
+# 14. testsuite.at:125: testall -small -fortran
+at_setup_line='testsuite.at:125'
+at_func_banner 1
+at_desc="testall -small -fortran"
+$at_quiet $as_echo_n " 14: $at_desc "
+at_xfail=no
+echo "# -*- compilation -*-" >> "$at_group_log"
+(
+ $as_echo "14. testsuite.at:125: testing ..."
+ $at_traceon
+{ $at_traceoff
+$as_echo "$at_srcdir/testsuite.at:126: \$VALGRIND testall -small -fortran \$STARGS"
+echo testsuite.at:126 >"$at_check_line_file"
- echo 1 > "$at_status_file"
- exit 1
+if test -n "$at_traceon" \
+ && at_func_check_newline "$VALGRIND testall -small -fortran $STARGS"; then
+ ( $at_traceon; $VALGRIND testall -small -fortran $STARGS ) >"$at_stdout" 2>"$at_stder1"
+ at_func_filter_trace $?
+else
+ ( :; $VALGRIND testall -small -fortran $STARGS ) >"$at_stdout" 2>"$at_stderr"
fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+echo stdout:; cat "$at_stdout"
+at_func_check_status 0 $at_status "$at_srcdir/testsuite.at:126"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+ $at_traceoff
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_14
+#AT_START_15
+# 15. testsuite.at:128: obj
+at_setup_line='testsuite.at:128'
+at_func_banner 1
+at_desc="obj"
+$at_quiet $as_echo_n " 15: $at_desc "
+at_xfail=no
+echo "# -*- compilation -*-" >> "$at_group_log"
+(
+ $as_echo "15. testsuite.at:128: testing ..."
+ $at_traceon
-$at_traceon
+{ $at_traceoff
+$as_echo "$at_srcdir/testsuite.at:129: \$VALGRIND obj \$STARGS"
+echo testsuite.at:129 >"$at_check_line_file"
- $at_traceoff
- $at_times_p && times >"$at_times_file"
- ) 5>&1 2>&1 | eval $at_tee_pipe
- at_status=`cat "$at_status_file"`
- ;;
+if test -n "$at_traceon" \
+ && at_func_check_newline "$VALGRIND obj $STARGS"; then
+ ( $at_traceon; $VALGRIND obj $STARGS ) >"$at_stdout" 2>"$at_stder1"
+ at_func_filter_trace $?
+else
+ ( :; $VALGRIND obj $STARGS ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+echo stdout:; cat "$at_stdout"
+at_func_check_status 0 $at_status "$at_srcdir/testsuite.at:129"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+ $at_traceoff
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_15
+#AT_START_16
+# 16. testsuite.at:131: onehex
+at_setup_line='testsuite.at:131'
+at_func_banner 1
+at_desc="onehex"
+$at_quiet $as_echo_n " 16: $at_desc "
+at_xfail=no
+echo "# -*- compilation -*-" >> "$at_group_log"
+(
+ $as_echo "16. testsuite.at:131: testing ..."
+ $at_traceon
- 10 ) # 10. testsuite.at:113: partial_io
- at_setup_line='testsuite.at:113'
- at_desc="partial_io"
- $at_quiet $ECHO_N " 10: partial_io $ECHO_C"
- at_xfail=no
- echo "# -*- compilation -*-" >> "$at_group_log"
- (
- echo "10. testsuite.at:113: testing ..."
- $at_traceon
-
-$at_traceoff
-echo "$at_srcdir/testsuite.at:114: \$VALGRIND partial_io \$STARGS"
-echo testsuite.at:114 >"$at_check_line_file"
+{ $at_traceoff
+$as_echo "$at_srcdir/testsuite.at:132: \$VALGRIND onehex \$STARGS"
+echo testsuite.at:132 >"$at_check_line_file"
-at_trace_this=
-if test -n "$at_traceon"; then
- case "$VALGRIND partial_io $STARGS" in
- *'
-'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;;
- *) at_trace_this=yes ;;
- esac
+if test -n "$at_traceon" \
+ && at_func_check_newline "$VALGRIND onehex $STARGS"; then
+ ( $at_traceon; $VALGRIND onehex $STARGS ) >"$at_stdout" 2>"$at_stder1"
+ at_func_filter_trace $?
+else
+ ( :; $VALGRIND onehex $STARGS ) >"$at_stdout" 2>"$at_stderr"
fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+echo stdout:; cat "$at_stdout"
+at_func_check_status 0 $at_status "$at_srcdir/testsuite.at:132"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+ $at_traceoff
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_16
+#AT_START_17
+# 17. testsuite.at:134: oneprism
+at_setup_line='testsuite.at:134'
+at_func_banner 1
+at_desc="oneprism"
+$at_quiet $as_echo_n " 17: $at_desc "
+at_xfail=no
+echo "# -*- compilation -*-" >> "$at_group_log"
+(
+ $as_echo "17. testsuite.at:134: testing ..."
+ $at_traceon
+
+{ $at_traceoff
+$as_echo "$at_srcdir/testsuite.at:135: \$VALGRIND oneprism \$STARGS"
+echo testsuite.at:135 >"$at_check_line_file"
-if test -n "$at_trace_this"; then
- ( $at_traceon; $VALGRIND partial_io $STARGS ) >"$at_stdout" 2>"$at_stder1"
- at_status=$?
- grep '^ *+' "$at_stder1" >&2
- grep -v '^ *+' "$at_stder1" >"$at_stderr"
+if test -n "$at_traceon" \
+ && at_func_check_newline "$VALGRIND oneprism $STARGS"; then
+ ( $at_traceon; $VALGRIND oneprism $STARGS ) >"$at_stdout" 2>"$at_stder1"
+ at_func_filter_trace $?
else
- ( :; $VALGRIND partial_io $STARGS ) >"$at_stdout" 2>"$at_stderr"
- at_status=$?
+ ( :; $VALGRIND oneprism $STARGS ) >"$at_stdout" 2>"$at_stderr"
fi
-
+at_status=$?
at_failed=false
-$at_diff "$at_devnull" "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stderr" || at_failed=:
echo stdout:; cat "$at_stdout"
-case $at_status in
- 77) echo 77 > "$at_status_file"; exit 77;;
- 0) ;;
- *) echo "$at_srcdir/testsuite.at:114: exit code was $at_status, expected 0"
- at_failed=:;;
-esac
-if $at_failed; then
+at_func_check_status 0 $at_status "$at_srcdir/testsuite.at:135"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+ $at_traceoff
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_17
+#AT_START_18
+# 18. testsuite.at:137: onepyramid
+at_setup_line='testsuite.at:137'
+at_func_banner 1
+at_desc="onepyramid"
+$at_quiet $as_echo_n " 18: $at_desc "
+at_xfail=no
+echo "# -*- compilation -*-" >> "$at_group_log"
+(
+ $as_echo "18. testsuite.at:137: testing ..."
+ $at_traceon
+{ $at_traceoff
+$as_echo "$at_srcdir/testsuite.at:138: \$VALGRIND onepyramid \$STARGS"
+echo testsuite.at:138 >"$at_check_line_file"
- echo 1 > "$at_status_file"
- exit 1
+if test -n "$at_traceon" \
+ && at_func_check_newline "$VALGRIND onepyramid $STARGS"; then
+ ( $at_traceon; $VALGRIND onepyramid $STARGS ) >"$at_stdout" 2>"$at_stder1"
+ at_func_filter_trace $?
+else
+ ( :; $VALGRIND onepyramid $STARGS ) >"$at_stdout" 2>"$at_stderr"
fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+echo stdout:; cat "$at_stdout"
+at_func_check_status 0 $at_status "$at_srcdir/testsuite.at:138"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+ $at_traceoff
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_18
+#AT_START_19
+# 19. testsuite.at:140: onetet
+at_setup_line='testsuite.at:140'
+at_func_banner 1
+at_desc="onetet"
+$at_quiet $as_echo_n " 19: $at_desc "
+at_xfail=no
+echo "# -*- compilation -*-" >> "$at_group_log"
+(
+ $as_echo "19. testsuite.at:140: testing ..."
+ $at_traceon
-$at_traceon
+{ $at_traceoff
+$as_echo "$at_srcdir/testsuite.at:141: \$VALGRIND onetet \$STARGS"
+echo testsuite.at:141 >"$at_check_line_file"
- $at_traceoff
- $at_times_p && times >"$at_times_file"
- ) 5>&1 2>&1 | eval $at_tee_pipe
- at_status=`cat "$at_status_file"`
- ;;
+if test -n "$at_traceon" \
+ && at_func_check_newline "$VALGRIND onetet $STARGS"; then
+ ( $at_traceon; $VALGRIND onetet $STARGS ) >"$at_stdout" 2>"$at_stder1"
+ at_func_filter_trace $?
+else
+ ( :; $VALGRIND onetet $STARGS ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+echo stdout:; cat "$at_stdout"
+at_func_check_status 0 $at_status "$at_srcdir/testsuite.at:141"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+ $at_traceoff
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_19
+#AT_START_20
+# 20. testsuite.at:143: subhex
+at_setup_line='testsuite.at:143'
+at_func_banner 1
+at_desc="subhex"
+$at_quiet $as_echo_n " 20: $at_desc "
+at_xfail=no
+echo "# -*- compilation -*-" >> "$at_group_log"
+(
+ $as_echo "20. testsuite.at:143: testing ..."
+ $at_traceon
- 11 ) # 11. testsuite.at:116: simple
- at_setup_line='testsuite.at:116'
- at_desc="simple"
- $at_quiet $ECHO_N " 11: simple $ECHO_C"
- at_xfail=no
- echo "# -*- compilation -*-" >> "$at_group_log"
- (
- echo "11. testsuite.at:116: testing ..."
- $at_traceon
-
-$at_traceoff
-echo "$at_srcdir/testsuite.at:117: \$VALGRIND simple \$STARGS"
-echo testsuite.at:117 >"$at_check_line_file"
+{ $at_traceoff
+$as_echo "$at_srcdir/testsuite.at:144: \$VALGRIND subhex \$STARGS"
+echo testsuite.at:144 >"$at_check_line_file"
-at_trace_this=
-if test -n "$at_traceon"; then
- case "$VALGRIND simple $STARGS" in
- *'
-'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;;
- *) at_trace_this=yes ;;
- esac
+if test -n "$at_traceon" \
+ && at_func_check_newline "$VALGRIND subhex $STARGS"; then
+ ( $at_traceon; $VALGRIND subhex $STARGS ) >"$at_stdout" 2>"$at_stder1"
+ at_func_filter_trace $?
+else
+ ( :; $VALGRIND subhex $STARGS ) >"$at_stdout" 2>"$at_stderr"
fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+echo stdout:; cat "$at_stdout"
+at_func_check_status 0 $at_status "$at_srcdir/testsuite.at:144"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+ $at_traceoff
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_20
+#AT_START_21
+# 21. testsuite.at:146: twohex
+at_setup_line='testsuite.at:146'
+at_func_banner 1
+at_desc="twohex"
+$at_quiet $as_echo_n " 21: $at_desc "
+at_xfail=no
+echo "# -*- compilation -*-" >> "$at_group_log"
+(
+ $as_echo "21. testsuite.at:146: testing ..."
+ $at_traceon
-if test -n "$at_trace_this"; then
- ( $at_traceon; $VALGRIND simple $STARGS ) >"$at_stdout" 2>"$at_stder1"
- at_status=$?
- grep '^ *+' "$at_stder1" >&2
- grep -v '^ *+' "$at_stder1" >"$at_stderr"
+{ $at_traceoff
+$as_echo "$at_srcdir/testsuite.at:147: \$VALGRIND twohex \$STARGS"
+echo testsuite.at:147 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+ && at_func_check_newline "$VALGRIND twohex $STARGS"; then
+ ( $at_traceon; $VALGRIND twohex $STARGS ) >"$at_stdout" 2>"$at_stder1"
+ at_func_filter_trace $?
else
- ( :; $VALGRIND simple $STARGS ) >"$at_stdout" 2>"$at_stderr"
- at_status=$?
+ ( :; $VALGRIND twohex $STARGS ) >"$at_stdout" 2>"$at_stderr"
fi
-
+at_status=$?
at_failed=false
-$at_diff "$at_devnull" "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stderr" || at_failed=:
echo stdout:; cat "$at_stdout"
-case $at_status in
- 77) echo 77 > "$at_status_file"; exit 77;;
- 0) ;;
- *) echo "$at_srcdir/testsuite.at:117: exit code was $at_status, expected 0"
- at_failed=:;;
-esac
-if $at_failed; then
+at_func_check_status 0 $at_status "$at_srcdir/testsuite.at:147"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+ $at_traceoff
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_21
+#AT_START_22
+# 22. testsuite.at:149: multispec
+at_setup_line='testsuite.at:149'
+at_func_banner 1
+at_desc="multispec"
+$at_quiet $as_echo_n " 22: $at_desc "
+at_xfail=no
+echo "# -*- compilation -*-" >> "$at_group_log"
+(
+ $as_echo "22. testsuite.at:149: testing ..."
+ $at_traceon
+{ $at_traceoff
+$as_echo "$at_srcdir/testsuite.at:150: \$VALGRIND multispec \$STARGS"
+echo testsuite.at:150 >"$at_check_line_file"
- echo 1 > "$at_status_file"
- exit 1
+if test -n "$at_traceon" \
+ && at_func_check_newline "$VALGRIND multispec $STARGS"; then
+ ( $at_traceon; $VALGRIND multispec $STARGS ) >"$at_stdout" 2>"$at_stder1"
+ at_func_filter_trace $?
+else
+ ( :; $VALGRIND multispec $STARGS ) >"$at_stdout" 2>"$at_stderr"
fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+echo stdout:; cat "$at_stdout"
+at_func_check_status 0 $at_status "$at_srcdir/testsuite.at:150"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+ $at_traceoff
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_22
+#AT_START_23
+# 23. testsuite.at:152: sami
+at_setup_line='testsuite.at:152'
+at_func_banner 1
+at_desc="sami"
+$at_quiet $as_echo_n " 23: $at_desc "
+at_xfail=no
+echo "# -*- compilation -*-" >> "$at_group_log"
+(
+ $as_echo "23. testsuite.at:152: testing ..."
+ $at_traceon
-$at_traceon
+{ $at_traceoff
+$as_echo "$at_srcdir/testsuite.at:153: \$VALGRIND sami \$STARGS"
+echo testsuite.at:153 >"$at_check_line_file"
- $at_traceoff
- $at_times_p && times >"$at_times_file"
- ) 5>&1 2>&1 | eval $at_tee_pipe
- at_status=`cat "$at_status_file"`
- ;;
+if test -n "$at_traceon" \
+ && at_func_check_newline "$VALGRIND sami $STARGS"; then
+ ( $at_traceon; $VALGRIND sami $STARGS ) >"$at_stdout" 2>"$at_stder1"
+ at_func_filter_trace $?
+else
+ ( :; $VALGRIND sami $STARGS ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+echo stderr:; cat "$at_stderr"
+echo stdout:; cat "$at_stdout"
+at_func_check_status 0 $at_status "$at_srcdir/testsuite.at:153"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+ $at_traceoff
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_23
+#AT_START_24
+# 24. testsuite.at:155: specmix
+at_setup_line='testsuite.at:155'
+at_func_banner 1
+at_desc="specmix"
+$at_quiet $as_echo_n " 24: $at_desc "
+at_xfail=no
+echo "# -*- compilation -*-" >> "$at_group_log"
+(
+ $as_echo "24. testsuite.at:155: testing ..."
+ $at_traceon
- 12 ) # 12. testsuite.at:119: ucd
- at_setup_line='testsuite.at:119'
- at_desc="ucd"
- $at_quiet $ECHO_N " 12: ucd $ECHO_C"
- at_xfail=no
- echo "# -*- compilation -*-" >> "$at_group_log"
- (
- echo "12. testsuite.at:119: testing ..."
- $at_traceon
-
-$at_traceoff
-echo "$at_srcdir/testsuite.at:120: \$VALGRIND ucd \$STARGS"
-echo testsuite.at:120 >"$at_check_line_file"
+{ $at_traceoff
+$as_echo "$at_srcdir/testsuite.at:156: \$VALGRIND specmix \$STARGS"
+echo testsuite.at:156 >"$at_check_line_file"
-at_trace_this=
-if test -n "$at_traceon"; then
- case "$VALGRIND ucd $STARGS" in
- *'
-'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;;
- *) at_trace_this=yes ;;
- esac
+if test -n "$at_traceon" \
+ && at_func_check_newline "$VALGRIND specmix $STARGS"; then
+ ( $at_traceon; $VALGRIND specmix $STARGS ) >"$at_stdout" 2>"$at_stder1"
+ at_func_filter_trace $?
+else
+ ( :; $VALGRIND specmix $STARGS ) >"$at_stdout" 2>"$at_stderr"
fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+echo stdout:; cat "$at_stdout"
+at_func_check_status 0 $at_status "$at_srcdir/testsuite.at:156"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+ $at_traceoff
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_24
+#AT_START_25
+# 25. testsuite.at:158: spec
+at_setup_line='testsuite.at:158'
+at_func_banner 1
+at_desc="spec"
+$at_quiet $as_echo_n " 25: $at_desc "
+at_xfail=no
+echo "# -*- compilation -*-" >> "$at_group_log"
+(
+ $as_echo "25. testsuite.at:158: testing ..."
+ $at_traceon
-if test -n "$at_trace_this"; then
- ( $at_traceon; $VALGRIND ucd $STARGS ) >"$at_stdout" 2>"$at_stder1"
- at_status=$?
- grep '^ *+' "$at_stder1" >&2
- grep -v '^ *+' "$at_stder1" >"$at_stderr"
+{ $at_traceoff
+$as_echo "$at_srcdir/testsuite.at:159: \$VALGRIND spec \$STARGS"
+echo testsuite.at:159 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+ && at_func_check_newline "$VALGRIND spec $STARGS"; then
+ ( $at_traceon; $VALGRIND spec $STARGS ) >"$at_stdout" 2>"$at_stder1"
+ at_func_filter_trace $?
else
- ( :; $VALGRIND ucd $STARGS ) >"$at_stdout" 2>"$at_stderr"
- at_status=$?
+ ( :; $VALGRIND spec $STARGS ) >"$at_stdout" 2>"$at_stderr"
fi
-
+at_status=$?
at_failed=false
-$at_diff "$at_devnull" "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stderr" || at_failed=:
echo stdout:; cat "$at_stdout"
-case $at_status in
- 77) echo 77 > "$at_status_file"; exit 77;;
- 0) ;;
- *) echo "$at_srcdir/testsuite.at:120: exit code was $at_status, expected 0"
- at_failed=:;;
-esac
-if $at_failed; then
+at_func_check_status 0 $at_status "$at_srcdir/testsuite.at:159"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+ $at_traceoff
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_25
+#AT_START_26
+# 26. testsuite.at:161: group_test
+at_setup_line='testsuite.at:161'
+at_func_banner 1
+at_desc="group_test"
+$at_quiet $as_echo_n " 26: $at_desc "
+at_xfail=no
+echo "# -*- compilation -*-" >> "$at_group_log"
+(
+ $as_echo "26. testsuite.at:161: testing ..."
+ $at_traceon
+{ $at_traceoff
+$as_echo "$at_srcdir/testsuite.at:162: \$VALGRIND group_test 0 0 0 \$STARGS"
+echo testsuite.at:162 >"$at_check_line_file"
- echo 1 > "$at_status_file"
- exit 1
+if test -n "$at_traceon" \
+ && at_func_check_newline "$VALGRIND group_test 0 0 0 $STARGS"; then
+ ( $at_traceon; $VALGRIND group_test 0 0 0 $STARGS ) >"$at_stdout" 2>"$at_stder1"
+ at_func_filter_trace $?
+else
+ ( :; $VALGRIND group_test 0 0 0 $STARGS ) >"$at_stdout" 2>"$at_stderr"
fi
+at_status=$?
+at_failed=false
+echo stderr:; cat "$at_stderr"
+echo stdout:; cat "$at_stdout"
+at_func_check_status 0 $at_status "$at_srcdir/testsuite.at:162"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+ $at_traceoff
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_26
+#AT_START_27
+# 27. testsuite.at:164: listtypes
+at_setup_line='testsuite.at:164'
+at_func_banner 1
+at_desc="listtypes"
+$at_quiet $as_echo_n " 27: $at_desc "
+at_xfail=no
+echo "# -*- compilation -*-" >> "$at_group_log"
+(
+ $as_echo "27. testsuite.at:164: testing ..."
+ $at_traceon
-$at_traceon
+{ $at_traceoff
+$as_echo "$at_srcdir/testsuite.at:165: \$VALGRIND ucd \$STARGS"
+echo testsuite.at:165 >"$at_check_line_file"
- $at_traceoff
- $at_times_p && times >"$at_times_file"
- ) 5>&1 2>&1 | eval $at_tee_pipe
- at_status=`cat "$at_status_file"`
- ;;
+if test -n "$at_traceon" \
+ && at_func_check_newline "$VALGRIND ucd $STARGS"; then
+ ( $at_traceon; $VALGRIND ucd $STARGS ) >"$at_stdout" 2>"$at_stder1"
+ at_func_filter_trace $?
+else
+ ( :; $VALGRIND ucd $STARGS ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+echo stdout:; cat "$at_stdout"
+at_func_check_status 0 $at_status "$at_srcdir/testsuite.at:165"
- 13 ) # 13. testsuite.at:122: ucdsamp3
- at_setup_line='testsuite.at:122'
- at_desc="ucdsamp3"
- $at_quiet $ECHO_N " 13: ucdsamp3 $ECHO_C"
- at_xfail=no
- echo "# -*- compilation -*-" >> "$at_group_log"
- (
- echo "13. testsuite.at:122: testing ..."
- $at_traceon
-
-$at_traceoff
-echo "$at_srcdir/testsuite.at:123: \$VALGRIND ucdsamp3 \$STARGS"
-echo testsuite.at:123 >"$at_check_line_file"
+$at_failed && at_func_log_failure
+$at_traceon; }
-at_trace_this=
-if test -n "$at_traceon"; then
- case "$VALGRIND ucdsamp3 $STARGS" in
- *'
-'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;;
- *) at_trace_this=yes ;;
- esac
-fi
+{ $at_traceoff
+$as_echo "$at_srcdir/testsuite.at:166: test -z \"\$STARGS\" && \$VALGRIND listtypes ucd.pdb || \$VALGRIND listtypes ucd.h5"
+echo testsuite.at:166 >"$at_check_line_file"
-if test -n "$at_trace_this"; then
- ( $at_traceon; $VALGRIND ucdsamp3 $STARGS ) >"$at_stdout" 2>"$at_stder1"
- at_status=$?
- grep '^ *+' "$at_stder1" >&2
- grep -v '^ *+' "$at_stder1" >"$at_stderr"
+if test -n "$at_traceon" \
+ && at_func_check_newline "test -z \"$STARGS\" && $VALGRIND listtypes ucd.pdb || $VALGRIND listtypes ucd.h5"; then
+ ( $at_traceon; test -z "$STARGS" && $VALGRIND listtypes ucd.pdb || $VALGRIND listtypes ucd.h5 ) >"$at_stdout" 2>"$at_stder1"
+ at_func_filter_trace $?
else
- ( :; $VALGRIND ucdsamp3 $STARGS ) >"$at_stdout" 2>"$at_stderr"
- at_status=$?
+ ( :; test -z "$STARGS" && $VALGRIND listtypes ucd.pdb || $VALGRIND listtypes ucd.h5 ) >"$at_stdout" 2>"$at_stderr"
fi
-
+at_status=$?
at_failed=false
-$at_diff "$at_devnull" "$at_stderr" || at_failed=:
+echo stderr:; cat "$at_stderr"
echo stdout:; cat "$at_stdout"
-case $at_status in
- 77) echo 77 > "$at_status_file"; exit 77;;
- 0) ;;
- *) echo "$at_srcdir/testsuite.at:123: exit code was $at_status, expected 0"
- at_failed=:;;
-esac
-if $at_failed; then
+at_func_check_status 0 $at_status "$at_srcdir/testsuite.at:166"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+ $at_traceoff
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_27
+#AT_START_28
+# 28. testsuite.at:168: alltypes
+at_setup_line='testsuite.at:168'
+at_func_banner 1
+at_desc="alltypes"
+$at_quiet $as_echo_n " 28: $at_desc "
+at_xfail=no
+echo "# -*- compilation -*-" >> "$at_group_log"
+(
+ $as_echo "28. testsuite.at:168: testing ..."
+ $at_traceon
+{ $at_traceoff
+$as_echo "$at_srcdir/testsuite.at:169: \$VALGRIND alltypes \$STARGS"
+echo testsuite.at:169 >"$at_check_line_file"
- echo 1 > "$at_status_file"
- exit 1
+if test -n "$at_traceon" \
+ && at_func_check_newline "$VALGRIND alltypes $STARGS"; then
+ ( $at_traceon; $VALGRIND alltypes $STARGS ) >"$at_stdout" 2>"$at_stder1"
+ at_func_filter_trace $?
+else
+ ( :; $VALGRIND alltypes $STARGS ) >"$at_stdout" 2>"$at_stderr"
fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+echo stdout:; cat "$at_stdout"
+at_func_check_status 0 $at_status "$at_srcdir/testsuite.at:169"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+ $at_traceoff
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_28
+#AT_START_29
+# 29. testsuite.at:171: wave
+at_setup_line='testsuite.at:171'
+at_func_banner 1
+at_desc="wave"
+$at_quiet $as_echo_n " 29: $at_desc "
+at_xfail=no
+echo "# -*- compilation -*-" >> "$at_group_log"
+(
+ $as_echo "29. testsuite.at:171: testing ..."
+ $at_traceon
-$at_traceon
+{ $at_traceoff
+$as_echo "$at_srcdir/testsuite.at:172: \$VALGRIND wave \$STARGS"
+echo testsuite.at:172 >"$at_check_line_file"
- $at_traceoff
- $at_times_p && times >"$at_times_file"
- ) 5>&1 2>&1 | eval $at_tee_pipe
- at_status=`cat "$at_status_file"`
- ;;
+if test -n "$at_traceon" \
+ && at_func_check_newline "$VALGRIND wave $STARGS"; then
+ ( $at_traceon; $VALGRIND wave $STARGS ) >"$at_stdout" 2>"$at_stder1"
+ at_func_filter_trace $?
+else
+ ( :; $VALGRIND wave $STARGS ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+echo stdout:; cat "$at_stdout"
+at_func_check_status 0 $at_status "$at_srcdir/testsuite.at:172"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+ $at_traceoff
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_29
+#AT_START_30
+# 30. testsuite.at:174: polyzl
+at_setup_line='testsuite.at:174'
+at_func_banner 1
+at_desc="polyzl"
+$at_quiet $as_echo_n " 30: $at_desc "
+at_xfail=no
+echo "# -*- compilation -*-" >> "$at_group_log"
+(
+ $as_echo "30. testsuite.at:174: testing ..."
+ $at_traceon
- 14 ) # 14. testsuite.at:125: testall -small -fortran
- at_setup_line='testsuite.at:125'
- at_desc="testall -small -fortran"
- $at_quiet $ECHO_N " 14: testall -small -fortran $ECHO_C"
- at_xfail=no
- echo "# -*- compilation -*-" >> "$at_group_log"
- (
- echo "14. testsuite.at:125: testing ..."
- $at_traceon
-
-$at_traceoff
-echo "$at_srcdir/testsuite.at:126: \$VALGRIND testall -small -fortran \$STARGS"
-echo testsuite.at:126 >"$at_check_line_file"
+{ $at_traceoff
+$as_echo "$at_srcdir/testsuite.at:175: \$VALGRIND polyzl \$STARGS"
+echo testsuite.at:175 >"$at_check_line_file"
-at_trace_this=
-if test -n "$at_traceon"; then
- case "$VALGRIND testall -small -fortran $STARGS" in
- *'
-'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;;
- *) at_trace_this=yes ;;
- esac
+if test -n "$at_traceon" \
+ && at_func_check_newline "$VALGRIND polyzl $STARGS"; then
+ ( $at_traceon; $VALGRIND polyzl $STARGS ) >"$at_stdout" 2>"$at_stder1"
+ at_func_filter_trace $?
+else
+ ( :; $VALGRIND polyzl $STARGS ) >"$at_stdout" 2>"$at_stderr"
fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+echo stdout:; cat "$at_stdout"
+at_func_check_status 0 $at_status "$at_srcdir/testsuite.at:175"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+ $at_traceoff
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_30
+#AT_START_31
+# 31. testsuite.at:177: csg
+at_setup_line='testsuite.at:177'
+at_func_banner 1
+at_desc="csg"
+$at_quiet $as_echo_n " 31: $at_desc "
+at_xfail=no
+echo "# -*- compilation -*-" >> "$at_group_log"
+(
+ $as_echo "31. testsuite.at:177: testing ..."
+ $at_traceon
+
+{ $at_traceoff
+$as_echo "$at_srcdir/testsuite.at:178: \$VALGRIND csg \$STARGS"
+echo testsuite.at:178 >"$at_check_line_file"
-if test -n "$at_trace_this"; then
- ( $at_traceon; $VALGRIND testall -small -fortran $STARGS ) >"$at_stdout" 2>"$at_stder1"
- at_status=$?
- grep '^ *+' "$at_stder1" >&2
- grep -v '^ *+' "$at_stder1" >"$at_stderr"
+if test -n "$at_traceon" \
+ && at_func_check_newline "$VALGRIND csg $STARGS"; then
+ ( $at_traceon; $VALGRIND csg $STARGS ) >"$at_stdout" 2>"$at_stder1"
+ at_func_filter_trace $?
else
- ( :; $VALGRIND testall -small -fortran $STARGS ) >"$at_stdout" 2>"$at_stderr"
- at_status=$?
+ ( :; $VALGRIND csg $STARGS ) >"$at_stdout" 2>"$at_stderr"
fi
-
+at_status=$?
at_failed=false
-$at_diff "$at_devnull" "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stderr" || at_failed=:
echo stdout:; cat "$at_stdout"
-case $at_status in
- 77) echo 77 > "$at_status_file"; exit 77;;
- 0) ;;
- *) echo "$at_srcdir/testsuite.at:126: exit code was $at_status, expected 0"
- at_failed=:;;
-esac
-if $at_failed; then
+at_func_check_status 0 $at_status "$at_srcdir/testsuite.at:178"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+ $at_traceoff
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_31
+#AT_START_32
+# 32. testsuite.at:180: rocket
+at_setup_line='testsuite.at:180'
+at_func_banner 1
+at_desc="rocket"
+$at_quiet $as_echo_n " 32: $at_desc "
+at_xfail=no
+echo "# -*- compilation -*-" >> "$at_group_log"
+(
+ $as_echo "32. testsuite.at:180: testing ..."
+ $at_traceon
+{ $at_traceoff
+$as_echo "$at_srcdir/testsuite.at:181: \$VALGRIND rocket \$STARGS"
+echo testsuite.at:181 >"$at_check_line_file"
- echo 1 > "$at_status_file"
- exit 1
+if test -n "$at_traceon" \
+ && at_func_check_newline "$VALGRIND rocket $STARGS"; then
+ ( $at_traceon; $VALGRIND rocket $STARGS ) >"$at_stdout" 2>"$at_stder1"
+ at_func_filter_trace $?
+else
+ ( :; $VALGRIND rocket $STARGS ) >"$at_stdout" 2>"$at_stderr"
fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+echo stdout:; cat "$at_stdout"
+at_func_check_status 0 $at_status "$at_srcdir/testsuite.at:181"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+ $at_traceoff
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_32
+#AT_START_33
+# 33. testsuite.at:183: mmadjacency
+at_setup_line='testsuite.at:183'
+at_func_banner 1
+at_desc="mmadjacency"
+$at_quiet $as_echo_n " 33: $at_desc "
+at_xfail=no
+echo "# -*- compilation -*-" >> "$at_group_log"
+(
+ $as_echo "33. testsuite.at:183: testing ..."
+ $at_traceon
-$at_traceon
+{ $at_traceoff
+$as_echo "$at_srcdir/testsuite.at:184: \$VALGRIND mmadjacency \$STARGS"
+echo testsuite.at:184 >"$at_check_line_file"
- $at_traceoff
- $at_times_p && times >"$at_times_file"
- ) 5>&1 2>&1 | eval $at_tee_pipe
- at_status=`cat "$at_status_file"`
- ;;
+if test -n "$at_traceon" \
+ && at_func_check_newline "$VALGRIND mmadjacency $STARGS"; then
+ ( $at_traceon; $VALGRIND mmadjacency $STARGS ) >"$at_stdout" 2>"$at_stder1"
+ at_func_filter_trace $?
+else
+ ( :; $VALGRIND mmadjacency $STARGS ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+echo stdout:; cat "$at_stdout"
+at_func_check_status 0 $at_status "$at_srcdir/testsuite.at:184"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+ $at_traceoff
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_33
+#AT_START_34
+# 34. testsuite.at:186: mat3d_3across
+at_setup_line='testsuite.at:186'
+at_func_banner 1
+at_desc="mat3d_3across"
+$at_quiet $as_echo_n " 34: $at_desc "
+at_xfail=no
+echo "# -*- compilation -*-" >> "$at_group_log"
+(
+ $as_echo "34. testsuite.at:186: testing ..."
+ $at_traceon
- 15 ) # 15. testsuite.at:128: obj
- at_setup_line='testsuite.at:128'
- at_desc="obj"
- $at_quiet $ECHO_N " 15: obj $ECHO_C"
- at_xfail=no
- echo "# -*- compilation -*-" >> "$at_group_log"
- (
- echo "15. testsuite.at:128: testing ..."
- $at_traceon
-
-$at_traceoff
-echo "$at_srcdir/testsuite.at:129: \$VALGRIND obj \$STARGS"
-echo testsuite.at:129 >"$at_check_line_file"
+{ $at_traceoff
+$as_echo "$at_srcdir/testsuite.at:187: \$VALGRIND mat3d_3across \$STARGS"
+echo testsuite.at:187 >"$at_check_line_file"
-at_trace_this=
-if test -n "$at_traceon"; then
- case "$VALGRIND obj $STARGS" in
- *'
-'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;;
- *) at_trace_this=yes ;;
- esac
+if test -n "$at_traceon" \
+ && at_func_check_newline "$VALGRIND mat3d_3across $STARGS"; then
+ ( $at_traceon; $VALGRIND mat3d_3across $STARGS ) >"$at_stdout" 2>"$at_stder1"
+ at_func_filter_trace $?
+else
+ ( :; $VALGRIND mat3d_3across $STARGS ) >"$at_stdout" 2>"$at_stderr"
fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/testsuite.at:187"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+ $at_traceoff
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_34
+#AT_START_35
+# 35. testsuite.at:189: ucd1d
+at_setup_line='testsuite.at:189'
+at_func_banner 1
+at_desc="ucd1d"
+$at_quiet $as_echo_n " 35: $at_desc "
+at_xfail=no
+echo "# -*- compilation -*-" >> "$at_group_log"
+(
+ $as_echo "35. testsuite.at:189: testing ..."
+ $at_traceon
-if test -n "$at_trace_this"; then
- ( $at_traceon; $VALGRIND obj $STARGS ) >"$at_stdout" 2>"$at_stder1"
- at_status=$?
- grep '^ *+' "$at_stder1" >&2
- grep -v '^ *+' "$at_stder1" >"$at_stderr"
+{ $at_traceoff
+$as_echo "$at_srcdir/testsuite.at:190: \$VALGRIND ucd1d \$STARGS"
+echo testsuite.at:190 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+ && at_func_check_newline "$VALGRIND ucd1d $STARGS"; then
+ ( $at_traceon; $VALGRIND ucd1d $STARGS ) >"$at_stdout" 2>"$at_stder1"
+ at_func_filter_trace $?
else
- ( :; $VALGRIND obj $STARGS ) >"$at_stdout" 2>"$at_stderr"
- at_status=$?
+ ( :; $VALGRIND ucd1d $STARGS ) >"$at_stdout" 2>"$at_stderr"
fi
-
+at_status=$?
at_failed=false
-$at_diff "$at_devnull" "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stderr" || at_failed=:
echo stdout:; cat "$at_stdout"
-case $at_status in
- 77) echo 77 > "$at_status_file"; exit 77;;
- 0) ;;
- *) echo "$at_srcdir/testsuite.at:129: exit code was $at_status, expected 0"
- at_failed=:;;
-esac
-if $at_failed; then
+at_func_check_status 0 $at_status "$at_srcdir/testsuite.at:190"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+ $at_traceoff
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_35
+#AT_START_36
+# 36. testsuite.at:192: dir
+at_setup_line='testsuite.at:192'
+at_func_banner 1
+at_desc="dir"
+$at_quiet $as_echo_n " 36: $at_desc "
+at_xfail=no
+echo "# -*- compilation -*-" >> "$at_group_log"
+(
+ $as_echo "36. testsuite.at:192: testing ..."
+ $at_traceon
+{ $at_traceoff
+$as_echo "$at_srcdir/testsuite.at:193: \$VALGRIND dir \$STARGS"
+echo testsuite.at:193 >"$at_check_line_file"
- echo 1 > "$at_status_file"
- exit 1
+if test -n "$at_traceon" \
+ && at_func_check_newline "$VALGRIND dir $STARGS"; then
+ ( $at_traceon; $VALGRIND dir $STARGS ) >"$at_stdout" 2>"$at_stder1"
+ at_func_filter_trace $?
+else
+ ( :; $VALGRIND dir $STARGS ) >"$at_stdout" 2>"$at_stderr"
fi
+at_status=$?
+at_failed=false
+echo stderr:; cat "$at_stderr"
+echo stdout:; cat "$at_stdout"
+at_func_check_status 0 $at_status "$at_srcdir/testsuite.at:193"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+ $at_traceoff
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_36
+#AT_START_37
+# 37. testsuite.at:195: quad
+at_setup_line='testsuite.at:195'
+at_func_banner 1
+at_desc="quad"
+$at_quiet $as_echo_n " 37: $at_desc "
+at_xfail=no
+echo "# -*- compilation -*-" >> "$at_group_log"
+(
+ $as_echo "37. testsuite.at:195: testing ..."
+ $at_traceon
-$at_traceon
+{ $at_traceoff
+$as_echo "$at_srcdir/testsuite.at:196: \$VALGRIND quad \$STARGS"
+echo testsuite.at:196 >"$at_check_line_file"
- $at_traceoff
- $at_times_p && times >"$at_times_file"
- ) 5>&1 2>&1 | eval $at_tee_pipe
- at_status=`cat "$at_status_file"`
- ;;
+if test -n "$at_traceon" \
+ && at_func_check_newline "$VALGRIND quad $STARGS"; then
+ ( $at_traceon; $VALGRIND quad $STARGS ) >"$at_stdout" 2>"$at_stder1"
+ at_func_filter_trace $?
+else
+ ( :; $VALGRIND quad $STARGS ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+echo stdout:; cat "$at_stdout"
+at_func_check_status 0 $at_status "$at_srcdir/testsuite.at:196"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+ $at_traceoff
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_37
+#AT_START_38
+# 38. testsuite.at:198: arbpoly2d
+at_setup_line='testsuite.at:198'
+at_func_banner 1
+at_desc="arbpoly2d"
+$at_quiet $as_echo_n " 38: $at_desc "
+at_xfail=no
+echo "# -*- compilation -*-" >> "$at_group_log"
+(
+ $as_echo "38. testsuite.at:198: testing ..."
+ $at_traceon
- 16 ) # 16. testsuite.at:131: onehex
- at_setup_line='testsuite.at:131'
- at_desc="onehex"
- $at_quiet $ECHO_N " 16: onehex $ECHO_C"
- at_xfail=no
- echo "# -*- compilation -*-" >> "$at_group_log"
- (
- echo "16. testsuite.at:131: testing ..."
- $at_traceon
-
-$at_traceoff
-echo "$at_srcdir/testsuite.at:132: \$VALGRIND onehex \$STARGS"
-echo testsuite.at:132 >"$at_check_line_file"
+{ $at_traceoff
+$as_echo "$at_srcdir/testsuite.at:199: \$VALGRIND arbpoly2d \$STARGS"
+echo testsuite.at:199 >"$at_check_line_file"
-at_trace_this=
-if test -n "$at_traceon"; then
- case "$VALGRIND onehex $STARGS" in
- *'
-'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;;
- *) at_trace_this=yes ;;
- esac
+if test -n "$at_traceon" \
+ && at_func_check_newline "$VALGRIND arbpoly2d $STARGS"; then
+ ( $at_traceon; $VALGRIND arbpoly2d $STARGS ) >"$at_stdout" 2>"$at_stder1"
+ at_func_filter_trace $?
+else
+ ( :; $VALGRIND arbpoly2d $STARGS ) >"$at_stdout" 2>"$at_stderr"
fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+echo stdout:; cat "$at_stdout"
+at_func_check_status 0 $at_status "$at_srcdir/testsuite.at:199"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+ $at_traceoff
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_38
+#AT_START_39
+# 39. testsuite.at:201: readstuff
+at_setup_line='testsuite.at:201'
+at_func_banner 1
+at_desc="readstuff"
+$at_quiet $as_echo_n " 39: $at_desc "
+at_xfail=no
+echo "# -*- compilation -*-" >> "$at_group_log"
+(
+ $as_echo "39. testsuite.at:201: testing ..."
+ $at_traceon
+ # needs data file from multi_test
+{ $at_traceoff
+$as_echo "$at_srcdir/testsuite.at:202: multi_test \$STARGS"
+echo testsuite.at:202 >"$at_check_line_file"
-if test -n "$at_trace_this"; then
- ( $at_traceon; $VALGRIND onehex $STARGS ) >"$at_stdout" 2>"$at_stder1"
- at_status=$?
- grep '^ *+' "$at_stder1" >&2
- grep -v '^ *+' "$at_stder1" >"$at_stderr"
+if test -n "$at_traceon" \
+ && at_func_check_newline "multi_test $STARGS"; then
+ ( $at_traceon; multi_test $STARGS ) >"$at_stdout" 2>"$at_stder1"
+ at_func_filter_trace $?
else
- ( :; $VALGRIND onehex $STARGS ) >"$at_stdout" 2>"$at_stderr"
- at_status=$?
+ ( :; multi_test $STARGS ) >"$at_stdout" 2>"$at_stderr"
fi
-
+at_status=$?
at_failed=false
-$at_diff "$at_devnull" "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stderr" || at_failed=:
echo stdout:; cat "$at_stdout"
-case $at_status in
- 77) echo 77 > "$at_status_file"; exit 77;;
- 0) ;;
- *) echo "$at_srcdir/testsuite.at:132: exit code was $at_status, expected 0"
- at_failed=:;;
-esac
-if $at_failed; then
+at_func_check_status 0 $at_status "$at_srcdir/testsuite.at:202"
+$at_failed && at_func_log_failure
+$at_traceon; }
+ # don't valgrind these intermediate parts
+{ $at_traceoff
+$as_echo "$at_srcdir/testsuite.at:203: \$VALGRIND readstuff \$STARGS"
+echo testsuite.at:203 >"$at_check_line_file"
- echo 1 > "$at_status_file"
- exit 1
+if test -n "$at_traceon" \
+ && at_func_check_newline "$VALGRIND readstuff $STARGS"; then
+ ( $at_traceon; $VALGRIND readstuff $STARGS ) >"$at_stdout" 2>"$at_stder1"
+ at_func_filter_trace $?
+else
+ ( :; $VALGRIND readstuff $STARGS ) >"$at_stdout" 2>"$at_stderr"
fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+echo stdout:; cat "$at_stdout"
+at_func_check_skip $at_status "$at_srcdir/testsuite.at:203"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+ $at_traceoff
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_39
+#AT_START_40
+# 40. testsuite.at:205: testfs
+at_setup_line='testsuite.at:205'
+at_func_banner 1
+at_desc="testfs"
+$at_quiet $as_echo_n " 40: $at_desc "
+at_xfail=no
+echo "# -*- compilation -*-" >> "$at_group_log"
+(
+ $as_echo "40. testsuite.at:205: testing ..."
+ $at_traceon
-$at_traceon
-
- $at_traceoff
- $at_times_p && times >"$at_times_file"
- ) 5>&1 2>&1 | eval $at_tee_pipe
- at_status=`cat "$at_status_file"`
- ;;
-
- 17 ) # 17. testsuite.at:134: oneprism
- at_setup_line='testsuite.at:134'
- at_desc="oneprism"
- $at_quiet $ECHO_N " 17: oneprism $ECHO_C"
- at_xfail=no
- echo "# -*- compilation -*-" >> "$at_group_log"
- (
- echo "17. testsuite.at:134: testing ..."
- $at_traceon
-
-$at_traceoff
-echo "$at_srcdir/testsuite.at:135: \$VALGRIND oneprism \$STARGS"
-echo testsuite.at:135 >"$at_check_line_file"
-
-at_trace_this=
-if test -n "$at_traceon"; then
- case "$VALGRIND oneprism $STARGS" in
- *'
-'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;;
- *) at_trace_this=yes ;;
- esac
-fi
+{ $at_traceoff
+$as_echo "$at_srcdir/testsuite.at:206: \$VALGRIND testfs \$STARGS"
+echo testsuite.at:206 >"$at_check_line_file"
-if test -n "$at_trace_this"; then
- ( $at_traceon; $VALGRIND oneprism $STARGS ) >"$at_stdout" 2>"$at_stder1"
- at_status=$?
- grep '^ *+' "$at_stder1" >&2
- grep -v '^ *+' "$at_stder1" >"$at_stderr"
+if test -n "$at_traceon" \
+ && at_func_check_newline "$VALGRIND testfs $STARGS"; then
+ ( $at_traceon; $VALGRIND testfs $STARGS ) >"$at_stdout" 2>"$at_stder1"
+ at_func_filter_trace $?
else
- ( :; $VALGRIND oneprism $STARGS ) >"$at_stdout" 2>"$at_stderr"
- at_status=$?
+ ( :; $VALGRIND testfs $STARGS ) >"$at_stdout" 2>"$at_stderr"
fi
-
+at_status=$?
at_failed=false
-$at_diff "$at_devnull" "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stderr" || at_failed=:
echo stdout:; cat "$at_stdout"
-case $at_status in
- 77) echo 77 > "$at_status_file"; exit 77;;
- 0) ;;
- *) echo "$at_srcdir/testsuite.at:135: exit code was $at_status, expected 0"
- at_failed=:;;
-esac
-if $at_failed; then
+at_func_check_status 0 $at_status "$at_srcdir/testsuite.at:206"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+ $at_traceoff
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_40
+#AT_START_41
+# 41. testsuite.at:208: empty
+at_setup_line='testsuite.at:208'
+at_func_banner 1
+at_desc="empty"
+$at_quiet $as_echo_n " 41: $at_desc "
+at_xfail=no
+echo "# -*- compilation -*-" >> "$at_group_log"
+(
+ $as_echo "41. testsuite.at:208: testing ..."
+ $at_traceon
+{ $at_traceoff
+$as_echo "$at_srcdir/testsuite.at:209: \$VALGRIND empty \$STARGS"
+echo testsuite.at:209 >"$at_check_line_file"
- echo 1 > "$at_status_file"
- exit 1
+if test -n "$at_traceon" \
+ && at_func_check_newline "$VALGRIND empty $STARGS"; then
+ ( $at_traceon; $VALGRIND empty $STARGS ) >"$at_stdout" 2>"$at_stder1"
+ at_func_filter_trace $?
+else
+ ( :; $VALGRIND empty $STARGS ) >"$at_stdout" 2>"$at_stderr"
fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+echo stdout:; cat "$at_stdout"
+at_func_check_status 0 $at_status "$at_srcdir/testsuite.at:209"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+ $at_traceoff
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_41
+#AT_START_42
+# 42. testsuite.at:213: read
+at_setup_line='testsuite.at:213'
+at_func_banner 2
+at_desc="read"
+$at_quiet $as_echo_n " 42: $at_desc "
+at_xfail=no
+echo "# -*- compilation -*-" >> "$at_group_log"
+(
+ $as_echo "42. testsuite.at:213: testing ..."
+ $at_traceon
-$at_traceon
- $at_traceoff
- $at_times_p && times >"$at_times_file"
- ) 5>&1 2>&1 | eval $at_tee_pipe
- at_status=`cat "$at_status_file"`
- ;;
+{ $at_traceoff
+$as_echo "$at_srcdir/testsuite.at:215: multi_test \$STARGS hdf-friendly"
+echo testsuite.at:215 >"$at_check_line_file"
- 18 ) # 18. testsuite.at:137: onepyramid
- at_setup_line='testsuite.at:137'
- at_desc="onepyramid"
- $at_quiet $ECHO_N " 18: onepyramid $ECHO_C"
- at_xfail=no
- echo "# -*- compilation -*-" >> "$at_group_log"
- (
- echo "18. testsuite.at:137: testing ..."
- $at_traceon
-
-$at_traceoff
-echo "$at_srcdir/testsuite.at:138: \$VALGRIND onepyramid \$STARGS"
-echo testsuite.at:138 >"$at_check_line_file"
-
-at_trace_this=
-if test -n "$at_traceon"; then
- case "$VALGRIND onepyramid $STARGS" in
- *'
-'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;;
- *) at_trace_this=yes ;;
- esac
+if test -n "$at_traceon" \
+ && at_func_check_newline "multi_test $STARGS hdf-friendly"; then
+ ( $at_traceon; multi_test $STARGS hdf-friendly ) >"$at_stdout" 2>"$at_stder1"
+ at_func_filter_trace $?
+else
+ ( :; multi_test $STARGS hdf-friendly ) >"$at_stdout" 2>"$at_stderr"
fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+echo stdout:; cat "$at_stdout"
+at_func_check_status 0 $at_status "$at_srcdir/testsuite.at:215"
-if test -n "$at_trace_this"; then
- ( $at_traceon; $VALGRIND onepyramid $STARGS ) >"$at_stdout" 2>"$at_stder1"
- at_status=$?
- grep '^ *+' "$at_stder1" >&2
- grep -v '^ *+' "$at_stder1" >"$at_stderr"
+$at_failed && at_func_log_failure
+$at_traceon; }
+ # generate data for python tests
+{ $at_traceoff
+$as_echo "$at_srcdir/testsuite.at:216: test -z \"\$PYTHON\" && exit 77 || env PYTHONPATH=../../../tools/python/.libs \$PYTHON ../../test_read.py"
+echo testsuite.at:216 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+ && at_func_check_newline "test -z \"$PYTHON\" && exit 77 || env PYTHONPATH=../../../tools/python/.libs $PYTHON ../../test_read.py"; then
+ ( $at_traceon; test -z "$PYTHON" && exit 77 || env PYTHONPATH=../../../tools/python/.libs $PYTHON ../../test_read.py ) >"$at_stdout" 2>"$at_stder1"
+ at_func_filter_trace $?
else
- ( :; $VALGRIND onepyramid $STARGS ) >"$at_stdout" 2>"$at_stderr"
- at_status=$?
+ ( :; test -z "$PYTHON" && exit 77 || env PYTHONPATH=../../../tools/python/.libs $PYTHON ../../test_read.py ) >"$at_stdout" 2>"$at_stderr"
fi
-
+at_status=$?
at_failed=false
-$at_diff "$at_devnull" "$at_stderr" || at_failed=:
+echo stderr:; cat "$at_stderr"
echo stdout:; cat "$at_stdout"
-case $at_status in
- 77) echo 77 > "$at_status_file"; exit 77;;
- 0) ;;
- *) echo "$at_srcdir/testsuite.at:138: exit code was $at_status, expected 0"
- at_failed=:;;
-esac
-if $at_failed; then
-
+at_func_check_status 0 $at_status "$at_srcdir/testsuite.at:216"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+ $at_traceoff
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_42
+#AT_START_43
+# 43. testsuite.at:218: write
+at_setup_line='testsuite.at:218'
+at_func_banner 2
+at_desc="write"
+$at_quiet $as_echo_n " 43: $at_desc "
+at_xfail=no
+echo "# -*- compilation -*-" >> "$at_group_log"
+(
+ $as_echo "43. testsuite.at:218: testing ..."
+ $at_traceon
- echo 1 > "$at_status_file"
- exit 1
-fi
-$at_traceon
+cat >expout <<'_ATEOF'
+toc=nvar = 12
+var_names = (_fileinfo, _silolibinfo, t1, t10, t11, t2, t3, t4, t5, t6, t7, t8)
+ndir = 1
+dir_names = (a)
- $at_traceoff
- $at_times_p && times >"$at_times_file"
- ) 5>&1 2>&1 | eval $at_tee_pipe
- at_status=`cat "$at_status_file"`
- ;;
+t2='hello'
+t6= (1.2, 10.199999999999999)
+a/t8='x2'
+t9=x3
+/t5= (1.2, 10.0)
+_ATEOF
- 19 ) # 19. testsuite.at:140: onetet
- at_setup_line='testsuite.at:140'
- at_desc="onetet"
- $at_quiet $ECHO_N " 19: onetet $ECHO_C"
- at_xfail=no
- echo "# -*- compilation -*-" >> "$at_group_log"
- (
- echo "19. testsuite.at:140: testing ..."
- $at_traceon
-
-$at_traceoff
-echo "$at_srcdir/testsuite.at:141: \$VALGRIND onetet \$STARGS"
-echo testsuite.at:141 >"$at_check_line_file"
+{ $at_traceoff
+$as_echo "$at_srcdir/testsuite.at:231: test -z \"\$PYTHON\" && exit 77 || env PYTHONPATH=../../../tools/python/.libs \$PYTHON ../../test_write.py"
+echo testsuite.at:231 >"$at_check_line_file"
-at_trace_this=
-if test -n "$at_traceon"; then
- case "$VALGRIND onetet $STARGS" in
- *'
-'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;;
- *) at_trace_this=yes ;;
- esac
+if test -n "$at_traceon" \
+ && at_func_check_newline "test -z \"$PYTHON\" && exit 77 || env PYTHONPATH=../../../tools/python/.libs $PYTHON ../../test_write.py"; then
+ ( $at_traceon; test -z "$PYTHON" && exit 77 || env PYTHONPATH=../../../tools/python/.libs $PYTHON ../../test_write.py ) >"$at_stdout" 2>"$at_stder1"
+ at_func_filter_trace $?
+else
+ ( :; test -z "$PYTHON" && exit 77 || env PYTHONPATH=../../../tools/python/.libs $PYTHON ../../test_write.py ) >"$at_stdout" 2>"$at_stderr"
fi
+at_status=$?
+at_failed=false
+echo stderr:; cat "$at_stderr"
+$at_diff expout "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/testsuite.at:231"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+ $at_traceoff
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_43
+#AT_START_44
+# 44. testsuite.at:233: error handling
+at_setup_line='testsuite.at:233'
+at_func_banner 2
+at_desc="error handling"
+$at_quiet $as_echo_n " 44: $at_desc "
+at_xfail=no
+echo "# -*- compilation -*-" >> "$at_group_log"
+(
+ $as_echo "44. testsuite.at:233: testing ..."
+ $at_traceon
+
-if test -n "$at_trace_this"; then
- ( $at_traceon; $VALGRIND onetet $STARGS ) >"$at_stdout" 2>"$at_stder1"
- at_status=$?
- grep '^ *+' "$at_stder1" >&2
- grep -v '^ *+' "$at_stder1" >"$at_stderr"
+{ $at_traceoff
+$as_echo "$at_srcdir/testsuite.at:235: multi_test \$STARGS hdf-friendly"
+echo testsuite.at:235 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+ && at_func_check_newline "multi_test $STARGS hdf-friendly"; then
+ ( $at_traceon; multi_test $STARGS hdf-friendly ) >"$at_stdout" 2>"$at_stder1"
+ at_func_filter_trace $?
else
- ( :; $VALGRIND onetet $STARGS ) >"$at_stdout" 2>"$at_stderr"
- at_status=$?
+ ( :; multi_test $STARGS hdf-friendly ) >"$at_stdout" 2>"$at_stderr"
fi
-
+at_status=$?
at_failed=false
-$at_diff "$at_devnull" "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stderr" || at_failed=:
echo stdout:; cat "$at_stdout"
-case $at_status in
- 77) echo 77 > "$at_status_file"; exit 77;;
- 0) ;;
- *) echo "$at_srcdir/testsuite.at:141: exit code was $at_status, expected 0"
- at_failed=:;;
-esac
-if $at_failed; then
-
+at_func_check_status 0 $at_status "$at_srcdir/testsuite.at:235"
- echo 1 > "$at_status_file"
- exit 1
+$at_failed && at_func_log_failure
+$at_traceon; }
+ # generate data for python tests
+{ $at_traceoff
+$as_echo "$at_srcdir/testsuite.at:236: test -z \"\$PYTHON\" && exit 77 || env PYTHONPATH=../../../tools/python/.libs \$PYTHON ../../test_error.py"
+echo testsuite.at:236 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+ && at_func_check_newline "test -z \"$PYTHON\" && exit 77 || env PYTHONPATH=../../../tools/python/.libs $PYTHON ../../test_error.py"; then
+ ( $at_traceon; test -z "$PYTHON" && exit 77 || env PYTHONPATH=../../../tools/python/.libs $PYTHON ../../test_error.py ) >"$at_stdout" 2>"$at_stder1"
+ at_func_filter_trace $?
+else
+ ( :; test -z "$PYTHON" && exit 77 || env PYTHONPATH=../../../tools/python/.libs $PYTHON ../../test_error.py ) >"$at_stdout" 2>"$at_stderr"
fi
+at_status=$?
+at_failed=false
+echo stderr:; cat "$at_stderr"
+echo stdout:; cat "$at_stdout"
+at_func_check_status 0 $at_status "$at_srcdir/testsuite.at:236"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+ $at_traceoff
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_44
+#AT_START_45
+# 45. testsuite.at:238: write objects
+at_setup_line='testsuite.at:238'
+at_func_banner 2
+at_desc="write objects"
+$at_quiet $as_echo_n " 45: $at_desc "
+at_xfail=no
+echo "# -*- compilation -*-" >> "$at_group_log"
+(
+ $as_echo "45. testsuite.at:238: testing ..."
+ $at_traceon
-$at_traceon
-
- $at_traceoff
- $at_times_p && times >"$at_times_file"
- ) 5>&1 2>&1 | eval $at_tee_pipe
- at_status=`cat "$at_status_file"`
- ;;
- 20 ) # 20. testsuite.at:143: subhex
- at_setup_line='testsuite.at:143'
- at_desc="subhex"
- $at_quiet $ECHO_N " 20: subhex $ECHO_C"
- at_xfail=no
- echo "# -*- compilation -*-" >> "$at_group_log"
- (
- echo "20. testsuite.at:143: testing ..."
- $at_traceon
-
-$at_traceoff
-echo "$at_srcdir/testsuite.at:144: \$VALGRIND subhex \$STARGS"
-echo testsuite.at:144 >"$at_check_line_file"
+{ $at_traceoff
+$as_echo "$at_srcdir/testsuite.at:240: test -z \"\$PYTHON\" -o -z \"\$BROWSER\" && exit 77 || \$VALGRIND testonehex \`pwd\`"
+echo testsuite.at:240 >"$at_check_line_file"
-at_trace_this=
-if test -n "$at_traceon"; then
- case "$VALGRIND subhex $STARGS" in
- *'
-'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;;
- *) at_trace_this=yes ;;
- esac
+if { echo 'Not enabling shell tracing (command contains a `...` command substitution)'
+ false; }; then
+ ( $at_traceon; test -z "$PYTHON" -o -z "$BROWSER" && exit 77 || $VALGRIND testonehex `pwd` ) >"$at_stdout" 2>"$at_stder1"
+ at_func_filter_trace $?
+else
+ ( :; test -z "$PYTHON" -o -z "$BROWSER" && exit 77 || $VALGRIND testonehex `pwd` ) >"$at_stdout" 2>"$at_stderr"
fi
+at_status=$?
+at_failed=false
+echo stderr:; cat "$at_stderr"
+echo stdout:; cat "$at_stdout"
+at_func_check_status 0 $at_status "$at_srcdir/testsuite.at:240"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+ $at_traceoff
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_45
+#AT_START_46
+# 46. testsuite.at:244: testpdb
+at_setup_line='testsuite.at:244'
+at_func_banner 3
+at_desc="testpdb"
+$at_quiet $as_echo_n " 46: $at_desc "
+at_xfail=no
+echo "# -*- compilation -*-" >> "$at_group_log"
+(
+ $as_echo "46. testsuite.at:244: testing ..."
+ $at_traceon
-if test -n "$at_trace_this"; then
- ( $at_traceon; $VALGRIND subhex $STARGS ) >"$at_stdout" 2>"$at_stder1"
- at_status=$?
- grep '^ *+' "$at_stder1" >&2
- grep -v '^ *+' "$at_stder1" >"$at_stderr"
+{ $at_traceoff
+$as_echo "$at_srcdir/testsuite.at:245: test ! \\( -e ../src/score/lite_score.h -o -e ../../../src/pdb/lite_pdb.h \\) -o \"\$STARGS\" = DB_HDF5 && exit 77 || \$VALGRIND testpdb"
+echo testsuite.at:245 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+ && at_func_check_newline "test ! \\( -e ../src/score/lite_score.h -o -e ../../../src/pdb/lite_pdb.h \\) -o \"$STARGS\" = DB_HDF5 && exit 77 || $VALGRIND testpdb"; then
+ ( $at_traceon; test ! \( -e ../src/score/lite_score.h -o -e ../../../src/pdb/lite_pdb.h \) -o "$STARGS" = DB_HDF5 && exit 77 || $VALGRIND testpdb ) >"$at_stdout" 2>"$at_stder1"
+ at_func_filter_trace $?
else
- ( :; $VALGRIND subhex $STARGS ) >"$at_stdout" 2>"$at_stderr"
- at_status=$?
+ ( :; test ! \( -e ../src/score/lite_score.h -o -e ../../../src/pdb/lite_pdb.h \) -o "$STARGS" = DB_HDF5 && exit 77 || $VALGRIND testpdb ) >"$at_stdout" 2>"$at_stderr"
fi
-
+at_status=$?
at_failed=false
-$at_diff "$at_devnull" "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stderr" || at_failed=:
echo stdout:; cat "$at_stdout"
-case $at_status in
- 77) echo 77 > "$at_status_file"; exit 77;;
- 0) ;;
- *) echo "$at_srcdir/testsuite.at:144: exit code was $at_status, expected 0"
- at_failed=:;;
-esac
-if $at_failed; then
+at_func_check_skip $at_status "$at_srcdir/testsuite.at:245"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+ $at_traceoff
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_46
+#AT_START_47
+# 47. testsuite.at:247: pdbtst
+at_setup_line='testsuite.at:247'
+at_func_banner 3
+at_desc="pdbtst"
+$at_quiet $as_echo_n " 47: $at_desc "
+at_xfail=no
+echo "# -*- compilation -*-" >> "$at_group_log"
+(
+ $as_echo "47. testsuite.at:247: testing ..."
+ $at_traceon
+{ $at_traceoff
+$as_echo "$at_srcdir/testsuite.at:248: test ! \\( -e ../src/score/lite_score.h -o -e ../../../src/pdb/lite_pdb.h \\) -o \"\$STARGS\" = DB_HDF5 && exit 77 || \$VALGRIND pdbtst"
+echo testsuite.at:248 >"$at_check_line_file"
- echo 1 > "$at_status_file"
- exit 1
+if test -n "$at_traceon" \
+ && at_func_check_newline "test ! \\( -e ../src/score/lite_score.h -o -e ../../../src/pdb/lite_pdb.h \\) -o \"$STARGS\" = DB_HDF5 && exit 77 || $VALGRIND pdbtst"; then
+ ( $at_traceon; test ! \( -e ../src/score/lite_score.h -o -e ../../../src/pdb/lite_pdb.h \) -o "$STARGS" = DB_HDF5 && exit 77 || $VALGRIND pdbtst ) >"$at_stdout" 2>"$at_stder1"
+ at_func_filter_trace $?
+else
+ ( :; test ! \( -e ../src/score/lite_score.h -o -e ../../../src/pdb/lite_pdb.h \) -o "$STARGS" = DB_HDF5 && exit 77 || $VALGRIND pdbtst ) >"$at_stdout" 2>"$at_stderr"
fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+echo stdout:; cat "$at_stdout"
+at_func_check_skip $at_status "$at_srcdir/testsuite.at:248"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+ $at_traceoff
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_47
+#AT_START_48
+# 48. testsuite.at:252: grab
+at_setup_line='testsuite.at:252'
+at_func_banner 4
+at_desc="grab"
+$at_quiet $as_echo_n " 48: $at_desc "
+at_xfail=no
+echo "# -*- compilation -*-" >> "$at_group_log"
+(
+ $as_echo "48. testsuite.at:252: testing ..."
+ $at_traceon
-$at_traceon
+{ $at_traceoff
+$as_echo "$at_srcdir/testsuite.at:253: test \"\$STARGS\" != DB_HDF5 && exit 77 || \$VALGRIND grab"
+echo testsuite.at:253 >"$at_check_line_file"
- $at_traceoff
- $at_times_p && times >"$at_times_file"
- ) 5>&1 2>&1 | eval $at_tee_pipe
- at_status=`cat "$at_status_file"`
- ;;
+if test -n "$at_traceon" \
+ && at_func_check_newline "test \"$STARGS\" != DB_HDF5 && exit 77 || $VALGRIND grab"; then
+ ( $at_traceon; test "$STARGS" != DB_HDF5 && exit 77 || $VALGRIND grab ) >"$at_stdout" 2>"$at_stder1"
+ at_func_filter_trace $?
+else
+ ( :; test "$STARGS" != DB_HDF5 && exit 77 || $VALGRIND grab ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+echo stderr:; cat "$at_stderr"
+echo stdout:; cat "$at_stdout"
+at_func_check_status 0 $at_status "$at_srcdir/testsuite.at:253"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+ $at_traceoff
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_48
+#AT_START_49
+# 49. testsuite.at:255: compression gzip
+at_setup_line='testsuite.at:255'
+at_func_banner 4
+at_desc="compression gzip"
+$at_quiet $as_echo_n " 49: $at_desc "
+at_xfail=no
+echo "# -*- compilation -*-" >> "$at_group_log"
+(
+ $as_echo "49. testsuite.at:255: testing ..."
+ $at_traceon
- 21 ) # 21. testsuite.at:146: twohex
- at_setup_line='testsuite.at:146'
- at_desc="twohex"
- $at_quiet $ECHO_N " 21: twohex $ECHO_C"
- at_xfail=no
- echo "# -*- compilation -*-" >> "$at_group_log"
- (
- echo "21. testsuite.at:146: testing ..."
- $at_traceon
-
-$at_traceoff
-echo "$at_srcdir/testsuite.at:147: \$VALGRIND twohex \$STARGS"
-echo testsuite.at:147 >"$at_check_line_file"
-at_trace_this=
-if test -n "$at_traceon"; then
- case "$VALGRIND twohex $STARGS" in
- *'
-'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;;
- *) at_trace_this=yes ;;
- esac
-fi
+{ $at_traceoff
+$as_echo "$at_srcdir/testsuite.at:257: test \"\$STARGS\" != DB_HDF5 && exit 77 || \$VALGRIND compression gzip"
+echo testsuite.at:257 >"$at_check_line_file"
-if test -n "$at_trace_this"; then
- ( $at_traceon; $VALGRIND twohex $STARGS ) >"$at_stdout" 2>"$at_stder1"
- at_status=$?
- grep '^ *+' "$at_stder1" >&2
- grep -v '^ *+' "$at_stder1" >"$at_stderr"
+if test -n "$at_traceon" \
+ && at_func_check_newline "test \"$STARGS\" != DB_HDF5 && exit 77 || $VALGRIND compression gzip"; then
+ ( $at_traceon; test "$STARGS" != DB_HDF5 && exit 77 || $VALGRIND compression gzip ) >"$at_stdout" 2>"$at_stder1"
+ at_func_filter_trace $?
else
- ( :; $VALGRIND twohex $STARGS ) >"$at_stdout" 2>"$at_stderr"
- at_status=$?
+ ( :; test "$STARGS" != DB_HDF5 && exit 77 || $VALGRIND compression gzip ) >"$at_stdout" 2>"$at_stderr"
fi
-
+at_status=$?
at_failed=false
-$at_diff "$at_devnull" "$at_stderr" || at_failed=:
+echo stderr:; cat "$at_stderr"
echo stdout:; cat "$at_stdout"
-case $at_status in
- 77) echo 77 > "$at_status_file"; exit 77;;
- 0) ;;
- *) echo "$at_srcdir/testsuite.at:147: exit code was $at_status, expected 0"
- at_failed=:;;
-esac
-if $at_failed; then
+at_func_check_status 0 $at_status "$at_srcdir/testsuite.at:257"
+$at_failed && at_func_log_failure
+$at_traceon; }
- echo 1 > "$at_status_file"
- exit 1
-fi
-
-$at_traceon
+{ $at_traceoff
+$as_echo "$at_srcdir/testsuite.at:258: test \"\$STARGS\" != DB_HDF5 && exit 77 || \$VALGRIND compression readonly"
+echo testsuite.at:258 >"$at_check_line_file"
- $at_traceoff
- $at_times_p && times >"$at_times_file"
- ) 5>&1 2>&1 | eval $at_tee_pipe
- at_status=`cat "$at_status_file"`
- ;;
+if test -n "$at_traceon" \
+ && at_func_check_newline "test \"$STARGS\" != DB_HDF5 && exit 77 || $VALGRIND compression readonly"; then
+ ( $at_traceon; test "$STARGS" != DB_HDF5 && exit 77 || $VALGRIND compression readonly ) >"$at_stdout" 2>"$at_stder1"
+ at_func_filter_trace $?
+else
+ ( :; test "$STARGS" != DB_HDF5 && exit 77 || $VALGRIND compression readonly ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+echo stderr:; cat "$at_stderr"
+echo stdout:; cat "$at_stdout"
+at_func_check_status 0 $at_status "$at_srcdir/testsuite.at:258"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+ $at_traceoff
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_49
+#AT_START_50
+# 50. testsuite.at:260: compression szip
+at_setup_line='testsuite.at:260'
+at_func_banner 4
+at_desc="compression szip"
+$at_quiet $as_echo_n " 50: $at_desc "
+at_xfail=no
+echo "# -*- compilation -*-" >> "$at_group_log"
+(
+ $as_echo "50. testsuite.at:260: testing ..."
+ $at_traceon
- 22 ) # 22. testsuite.at:149: multispec
- at_setup_line='testsuite.at:149'
- at_desc="multispec"
- $at_quiet $ECHO_N " 22: multispec $ECHO_C"
- at_xfail=no
- echo "# -*- compilation -*-" >> "$at_group_log"
- (
- echo "22. testsuite.at:149: testing ..."
- $at_traceon
-
-$at_traceoff
-echo "$at_srcdir/testsuite.at:150: \$VALGRIND multispec \$STARGS"
-echo testsuite.at:150 >"$at_check_line_file"
-at_trace_this=
-if test -n "$at_traceon"; then
- case "$VALGRIND multispec $STARGS" in
- *'
-'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;;
- *) at_trace_this=yes ;;
- esac
-fi
+{ $at_traceoff
+$as_echo "$at_srcdir/testsuite.at:262: test \"\$STARGS\" != DB_HDF5 && exit 77 || \$VALGRIND compression szip"
+echo testsuite.at:262 >"$at_check_line_file"
-if test -n "$at_trace_this"; then
- ( $at_traceon; $VALGRIND multispec $STARGS ) >"$at_stdout" 2>"$at_stder1"
- at_status=$?
- grep '^ *+' "$at_stder1" >&2
- grep -v '^ *+' "$at_stder1" >"$at_stderr"
+if test -n "$at_traceon" \
+ && at_func_check_newline "test \"$STARGS\" != DB_HDF5 && exit 77 || $VALGRIND compression szip"; then
+ ( $at_traceon; test "$STARGS" != DB_HDF5 && exit 77 || $VALGRIND compression szip ) >"$at_stdout" 2>"$at_stder1"
+ at_func_filter_trace $?
else
- ( :; $VALGRIND multispec $STARGS ) >"$at_stdout" 2>"$at_stderr"
- at_status=$?
+ ( :; test "$STARGS" != DB_HDF5 && exit 77 || $VALGRIND compression szip ) >"$at_stdout" 2>"$at_stderr"
fi
-
+at_status=$?
at_failed=false
-$at_diff "$at_devnull" "$at_stderr" || at_failed=:
+echo stderr:; cat "$at_stderr"
echo stdout:; cat "$at_stdout"
-case $at_status in
- 77) echo 77 > "$at_status_file"; exit 77;;
- 0) ;;
- *) echo "$at_srcdir/testsuite.at:150: exit code was $at_status, expected 0"
- at_failed=:;;
-esac
-if $at_failed; then
+at_func_check_status 0 $at_status "$at_srcdir/testsuite.at:262"
+$at_failed && at_func_log_failure
+$at_traceon; }
- echo 1 > "$at_status_file"
- exit 1
-fi
-
-$at_traceon
+{ $at_traceoff
+$as_echo "$at_srcdir/testsuite.at:263: test \"\$STARGS\" != DB_HDF5 && exit 77 || \$VALGRIND compression readonly"
+echo testsuite.at:263 >"$at_check_line_file"
- $at_traceoff
- $at_times_p && times >"$at_times_file"
- ) 5>&1 2>&1 | eval $at_tee_pipe
- at_status=`cat "$at_status_file"`
- ;;
+if test -n "$at_traceon" \
+ && at_func_check_newline "test \"$STARGS\" != DB_HDF5 && exit 77 || $VALGRIND compression readonly"; then
+ ( $at_traceon; test "$STARGS" != DB_HDF5 && exit 77 || $VALGRIND compression readonly ) >"$at_stdout" 2>"$at_stder1"
+ at_func_filter_trace $?
+else
+ ( :; test "$STARGS" != DB_HDF5 && exit 77 || $VALGRIND compression readonly ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+echo stderr:; cat "$at_stderr"
+echo stdout:; cat "$at_stdout"
+at_func_check_status 0 $at_status "$at_srcdir/testsuite.at:263"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+ $at_traceoff
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_50
+#AT_START_51
+# 51. testsuite.at:265: compression fpzip
+at_setup_line='testsuite.at:265'
+at_func_banner 4
+at_desc="compression fpzip"
+$at_quiet $as_echo_n " 51: $at_desc "
+at_xfail=no
+echo "# -*- compilation -*-" >> "$at_group_log"
+(
+ $as_echo "51. testsuite.at:265: testing ..."
+ $at_traceon
- 23 ) # 23. testsuite.at:152: sami
- at_setup_line='testsuite.at:152'
- at_desc="sami"
- $at_quiet $ECHO_N " 23: sami $ECHO_C"
- at_xfail=no
- echo "# -*- compilation -*-" >> "$at_group_log"
- (
- echo "23. testsuite.at:152: testing ..."
- $at_traceon
-
-$at_traceoff
-echo "$at_srcdir/testsuite.at:153: \$VALGRIND sami \$STARGS"
-echo testsuite.at:153 >"$at_check_line_file"
-at_trace_this=
-if test -n "$at_traceon"; then
- case "$VALGRIND sami $STARGS" in
- *'
-'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;;
- *) at_trace_this=yes ;;
- esac
-fi
+{ $at_traceoff
+$as_echo "$at_srcdir/testsuite.at:267: test ! \\( -e ../src/fpzip/read.o -o -e ../../../src/fpzip/read.o \\) -o \"\$STARGS\" != DB_HDF5 && exit 77 || \$VALGRIND compression fpzip"
+echo testsuite.at:267 >"$at_check_line_file"
-if test -n "$at_trace_this"; then
- ( $at_traceon; $VALGRIND sami $STARGS ) >"$at_stdout" 2>"$at_stder1"
- at_status=$?
- grep '^ *+' "$at_stder1" >&2
- grep -v '^ *+' "$at_stder1" >"$at_stderr"
+if test -n "$at_traceon" \
+ && at_func_check_newline "test ! \\( -e ../src/fpzip/read.o -o -e ../../../src/fpzip/read.o \\) -o \"$STARGS\" != DB_HDF5 && exit 77 || $VALGRIND compression fpzip"; then
+ ( $at_traceon; test ! \( -e ../src/fpzip/read.o -o -e ../../../src/fpzip/read.o \) -o "$STARGS" != DB_HDF5 && exit 77 || $VALGRIND compression fpzip ) >"$at_stdout" 2>"$at_stder1"
+ at_func_filter_trace $?
else
- ( :; $VALGRIND sami $STARGS ) >"$at_stdout" 2>"$at_stderr"
- at_status=$?
+ ( :; test ! \( -e ../src/fpzip/read.o -o -e ../../../src/fpzip/read.o \) -o "$STARGS" != DB_HDF5 && exit 77 || $VALGRIND compression fpzip ) >"$at_stdout" 2>"$at_stderr"
fi
-
+at_status=$?
at_failed=false
echo stderr:; cat "$at_stderr"
echo stdout:; cat "$at_stdout"
-case $at_status in
- 77) echo 77 > "$at_status_file"; exit 77;;
- 0) ;;
- *) echo "$at_srcdir/testsuite.at:153: exit code was $at_status, expected 0"
- at_failed=:;;
-esac
-if $at_failed; then
-
+at_func_check_status 0 $at_status "$at_srcdir/testsuite.at:267"
- echo 1 > "$at_status_file"
- exit 1
-fi
+$at_failed && at_func_log_failure
+$at_traceon; }
-$at_traceon
+{ $at_traceoff
+$as_echo "$at_srcdir/testsuite.at:268: test ! \\( -e ../src/fpzip/read.o -o -e ../../../src/fpzip/read.o \\) -o \"\$STARGS\" != DB_HDF5 && exit 77 || \$VALGRIND compression readonly"
+echo testsuite.at:268 >"$at_check_line_file"
- $at_traceoff
- $at_times_p && times >"$at_times_file"
- ) 5>&1 2>&1 | eval $at_tee_pipe
- at_status=`cat "$at_status_file"`
- ;;
+if test -n "$at_traceon" \
+ && at_func_check_newline "test ! \\( -e ../src/fpzip/read.o -o -e ../../../src/fpzip/read.o \\) -o \"$STARGS\" != DB_HDF5 && exit 77 || $VALGRIND compression readonly"; then
+ ( $at_traceon; test ! \( -e ../src/fpzip/read.o -o -e ../../../src/fpzip/read.o \) -o "$STARGS" != DB_HDF5 && exit 77 || $VALGRIND compression readonly ) >"$at_stdout" 2>"$at_stder1"
+ at_func_filter_trace $?
+else
+ ( :; test ! \( -e ../src/fpzip/read.o -o -e ../../../src/fpzip/read.o \) -o "$STARGS" != DB_HDF5 && exit 77 || $VALGRIND compression readonly ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+echo stderr:; cat "$at_stderr"
+echo stdout:; cat "$at_stdout"
+at_func_check_status 0 $at_status "$at_srcdir/testsuite.at:268"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+ $at_traceoff
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_51
+#AT_START_52
+# 52. testsuite.at:270: compression lossy3
+at_setup_line='testsuite.at:270'
+at_func_banner 4
+at_desc="compression lossy3"
+$at_quiet $as_echo_n " 52: $at_desc "
+at_xfail=no
+echo "# -*- compilation -*-" >> "$at_group_log"
+(
+ $as_echo "52. testsuite.at:270: testing ..."
+ $at_traceon
- 24 ) # 24. testsuite.at:155: specmix
- at_setup_line='testsuite.at:155'
- at_desc="specmix"
- $at_quiet $ECHO_N " 24: specmix $ECHO_C"
- at_xfail=no
- echo "# -*- compilation -*-" >> "$at_group_log"
- (
- echo "24. testsuite.at:155: testing ..."
- $at_traceon
-
-$at_traceoff
-echo "$at_srcdir/testsuite.at:156: \$VALGRIND specmix \$STARGS"
-echo testsuite.at:156 >"$at_check_line_file"
-at_trace_this=
-if test -n "$at_traceon"; then
- case "$VALGRIND specmix $STARGS" in
- *'
-'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;;
- *) at_trace_this=yes ;;
- esac
-fi
+{ $at_traceoff
+$as_echo "$at_srcdir/testsuite.at:272: test ! \\( -e ../src/fpzip/read.o -o -e ../../../src/fpzip/read.o \\) -o \"\$STARGS\" != DB_HDF5 && exit 77 || \$VALGRIND compression lossy3"
+echo testsuite.at:272 >"$at_check_line_file"
-if test -n "$at_trace_this"; then
- ( $at_traceon; $VALGRIND specmix $STARGS ) >"$at_stdout" 2>"$at_stder1"
- at_status=$?
- grep '^ *+' "$at_stder1" >&2
- grep -v '^ *+' "$at_stder1" >"$at_stderr"
+if test -n "$at_traceon" \
+ && at_func_check_newline "test ! \\( -e ../src/fpzip/read.o -o -e ../../../src/fpzip/read.o \\) -o \"$STARGS\" != DB_HDF5 && exit 77 || $VALGRIND compression lossy3"; then
+ ( $at_traceon; test ! \( -e ../src/fpzip/read.o -o -e ../../../src/fpzip/read.o \) -o "$STARGS" != DB_HDF5 && exit 77 || $VALGRIND compression lossy3 ) >"$at_stdout" 2>"$at_stder1"
+ at_func_filter_trace $?
else
- ( :; $VALGRIND specmix $STARGS ) >"$at_stdout" 2>"$at_stderr"
- at_status=$?
+ ( :; test ! \( -e ../src/fpzip/read.o -o -e ../../../src/fpzip/read.o \) -o "$STARGS" != DB_HDF5 && exit 77 || $VALGRIND compression lossy3 ) >"$at_stdout" 2>"$at_stderr"
fi
-
+at_status=$?
at_failed=false
-$at_diff "$at_devnull" "$at_stderr" || at_failed=:
+echo stderr:; cat "$at_stderr"
echo stdout:; cat "$at_stdout"
-case $at_status in
- 77) echo 77 > "$at_status_file"; exit 77;;
- 0) ;;
- *) echo "$at_srcdir/testsuite.at:156: exit code was $at_status, expected 0"
- at_failed=:;;
-esac
-if $at_failed; then
+at_func_check_status 0 $at_status "$at_srcdir/testsuite.at:272"
+$at_failed && at_func_log_failure
+$at_traceon; }
- echo 1 > "$at_status_file"
- exit 1
-fi
+{ $at_traceoff
+$as_echo "$at_srcdir/testsuite.at:273: test ! \\( -e ../src/fpzip/read.o -o -e ../../../src/fpzip/read.o \\) -o \"\$STARGS\" != DB_HDF5 && exit 77 || \$VALGRIND compression readonly"
+echo testsuite.at:273 >"$at_check_line_file"
-$at_traceon
+if test -n "$at_traceon" \
+ && at_func_check_newline "test ! \\( -e ../src/fpzip/read.o -o -e ../../../src/fpzip/read.o \\) -o \"$STARGS\" != DB_HDF5 && exit 77 || $VALGRIND compression readonly"; then
+ ( $at_traceon; test ! \( -e ../src/fpzip/read.o -o -e ../../../src/fpzip/read.o \) -o "$STARGS" != DB_HDF5 && exit 77 || $VALGRIND compression readonly ) >"$at_stdout" 2>"$at_stder1"
+ at_func_filter_trace $?
+else
+ ( :; test ! \( -e ../src/fpzip/read.o -o -e ../../../src/fpzip/read.o \) -o "$STARGS" != DB_HDF5 && exit 77 || $VALGRIND compression readonly ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+echo stderr:; cat "$at_stderr"
+echo stdout:; cat "$at_stdout"
+at_func_check_status 50 $at_status "$at_srcdir/testsuite.at:273"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+ $at_traceoff
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_52
+#AT_START_53
+# 53. testsuite.at:275: compression minratio1000
+at_setup_line='testsuite.at:275'
+at_func_banner 4
+at_desc="compression minratio1000"
+$at_quiet $as_echo_n " 53: $at_desc "
+at_xfail=no
+echo "# -*- compilation -*-" >> "$at_group_log"
+(
+ $as_echo "53. testsuite.at:275: testing ..."
+ $at_traceon
- $at_traceoff
- $at_times_p && times >"$at_times_file"
- ) 5>&1 2>&1 | eval $at_tee_pipe
- at_status=`cat "$at_status_file"`
- ;;
- 25 ) # 25. testsuite.at:158: spec
- at_setup_line='testsuite.at:158'
- at_desc="spec"
- $at_quiet $ECHO_N " 25: spec $ECHO_C"
- at_xfail=no
- echo "# -*- compilation -*-" >> "$at_group_log"
- (
- echo "25. testsuite.at:158: testing ..."
- $at_traceon
-
-$at_traceoff
-echo "$at_srcdir/testsuite.at:159: \$VALGRIND spec \$STARGS"
-echo testsuite.at:159 >"$at_check_line_file"
+{ $at_traceoff
+$as_echo "$at_srcdir/testsuite.at:277: test ! \\( -e ../src/fpzip/read.o -o -e ../../../src/fpzip/read.o \\) -o \"\$STARGS\" != DB_HDF5 && exit 77 || \$VALGRIND compression minratio1000"
+echo testsuite.at:277 >"$at_check_line_file"
-at_trace_this=
-if test -n "$at_traceon"; then
- case "$VALGRIND spec $STARGS" in
- *'
-'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;;
- *) at_trace_this=yes ;;
- esac
+if test -n "$at_traceon" \
+ && at_func_check_newline "test ! \\( -e ../src/fpzip/read.o -o -e ../../../src/fpzip/read.o \\) -o \"$STARGS\" != DB_HDF5 && exit 77 || $VALGRIND compression minratio1000"; then
+ ( $at_traceon; test ! \( -e ../src/fpzip/read.o -o -e ../../../src/fpzip/read.o \) -o "$STARGS" != DB_HDF5 && exit 77 || $VALGRIND compression minratio1000 ) >"$at_stdout" 2>"$at_stder1"
+ at_func_filter_trace $?
+else
+ ( :; test ! \( -e ../src/fpzip/read.o -o -e ../../../src/fpzip/read.o \) -o "$STARGS" != DB_HDF5 && exit 77 || $VALGRIND compression minratio1000 ) >"$at_stdout" 2>"$at_stderr"
fi
+at_status=$?
+at_failed=false
+echo stderr:; cat "$at_stderr"
+echo stdout:; cat "$at_stdout"
+at_func_check_status 1 $at_status "$at_srcdir/testsuite.at:277"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+ $at_traceoff
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_53
+#AT_START_54
+# 54. testsuite.at:279: testhzip
+at_setup_line='testsuite.at:279'
+at_func_banner 4
+at_desc="testhzip"
+$at_quiet $as_echo_n " 54: $at_desc "
+at_xfail=no
+echo "# -*- compilation -*-" >> "$at_group_log"
+(
+ $as_echo "54. testsuite.at:279: testing ..."
+ $at_traceon
+
-if test -n "$at_trace_this"; then
- ( $at_traceon; $VALGRIND spec $STARGS ) >"$at_stdout" 2>"$at_stder1"
- at_status=$?
- grep '^ *+' "$at_stder1" >&2
- grep -v '^ *+' "$at_stder1" >"$at_stderr"
+{ $at_traceoff
+$as_echo "$at_srcdir/testsuite.at:281: test ! \\( -e ../src/hzip/hzutil.o -o -e ../../../src/hzip/hzutil.o \\) -o -z \"\$BROWSER\" -o \"\$STARGS\" != DB_HDF5 && exit 77 || \$VALGRIND testhzip \`pwd\`"
+echo testsuite.at:281 >"$at_check_line_file"
+
+if { echo 'Not enabling shell tracing (command contains a `...` command substitution)'
+ false; }; then
+ ( $at_traceon; test ! \( -e ../src/hzip/hzutil.o -o -e ../../../src/hzip/hzutil.o \) -o -z "$BROWSER" -o "$STARGS" != DB_HDF5 && exit 77 || $VALGRIND testhzip `pwd` ) >"$at_stdout" 2>"$at_stder1"
+ at_func_filter_trace $?
else
- ( :; $VALGRIND spec $STARGS ) >"$at_stdout" 2>"$at_stderr"
- at_status=$?
+ ( :; test ! \( -e ../src/hzip/hzutil.o -o -e ../../../src/hzip/hzutil.o \) -o -z "$BROWSER" -o "$STARGS" != DB_HDF5 && exit 77 || $VALGRIND testhzip `pwd` ) >"$at_stdout" 2>"$at_stderr"
fi
-
+at_status=$?
at_failed=false
-$at_diff "$at_devnull" "$at_stderr" || at_failed=:
+echo stderr:; cat "$at_stderr"
echo stdout:; cat "$at_stdout"
-case $at_status in
- 77) echo 77 > "$at_status_file"; exit 77;;
- 0) ;;
- *) echo "$at_srcdir/testsuite.at:159: exit code was $at_status, expected 0"
- at_failed=:;;
-esac
-if $at_failed; then
+at_func_check_status 0 $at_status "$at_srcdir/testsuite.at:281"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+ $at_traceoff
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_54
+#AT_START_55
+# 55. testsuite.at:283: checksums
+at_setup_line='testsuite.at:283'
+at_func_banner 4
+at_desc="checksums"
+$at_quiet $as_echo_n " 55: $at_desc "
+at_xfail=no
+echo "# -*- compilation -*-" >> "$at_group_log"
+(
+ $as_echo "55. testsuite.at:283: testing ..."
+ $at_traceon
+{ $at_traceoff
+$as_echo "$at_srcdir/testsuite.at:284: test -z \"\$BROWSER\" -o \"\$STARGS\" != DB_HDF5 && exit 77 || \$VALGRIND checksums \`pwd\`"
+echo testsuite.at:284 >"$at_check_line_file"
- echo 1 > "$at_status_file"
- exit 1
+if { echo 'Not enabling shell tracing (command contains a `...` command substitution)'
+ false; }; then
+ ( $at_traceon; test -z "$BROWSER" -o "$STARGS" != DB_HDF5 && exit 77 || $VALGRIND checksums `pwd` ) >"$at_stdout" 2>"$at_stder1"
+ at_func_filter_trace $?
+else
+ ( :; test -z "$BROWSER" -o "$STARGS" != DB_HDF5 && exit 77 || $VALGRIND checksums `pwd` ) >"$at_stdout" 2>"$at_stderr"
fi
+at_status=$?
+at_failed=false
+echo stderr:; cat "$at_stderr"
+echo stdout:; cat "$at_stdout"
+at_func_check_status 0 $at_status "$at_srcdir/testsuite.at:284"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+ $at_traceoff
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_55
+#AT_START_56
+# 56. testsuite.at:286: xversion
+at_setup_line='testsuite.at:286'
+at_func_banner 4
+at_desc="xversion"
+$at_quiet $as_echo_n " 56: $at_desc "
+at_xfail=no
+echo "# -*- compilation -*-" >> "$at_group_log"
+(
+ $as_echo "56. testsuite.at:286: testing ..."
+ $at_traceon
-$at_traceon
+{ $at_traceoff
+$as_echo "$at_srcdir/testsuite.at:287: test -z \"\$BROWSER\" -o \"\$STARGS\" != DB_HDF5 && exit 77 || \$VALGRIND testxvers \`pwd\`"
+echo testsuite.at:287 >"$at_check_line_file"
- $at_traceoff
- $at_times_p && times >"$at_times_file"
- ) 5>&1 2>&1 | eval $at_tee_pipe
- at_status=`cat "$at_status_file"`
- ;;
+if { echo 'Not enabling shell tracing (command contains a `...` command substitution)'
+ false; }; then
+ ( $at_traceon; test -z "$BROWSER" -o "$STARGS" != DB_HDF5 && exit 77 || $VALGRIND testxvers `pwd` ) >"$at_stdout" 2>"$at_stder1"
+ at_func_filter_trace $?
+else
+ ( :; test -z "$BROWSER" -o "$STARGS" != DB_HDF5 && exit 77 || $VALGRIND testxvers `pwd` ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+echo stderr:; cat "$at_stderr"
+echo stdout:; cat "$at_stdout"
+at_func_check_status 0 $at_status "$at_srcdir/testsuite.at:287"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+ $at_traceoff
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_56
+#AT_START_57
+# 57. testsuite.at:289: largefile
+at_setup_line='testsuite.at:289'
+at_func_banner 4
+at_desc="largefile"
+$at_quiet $as_echo_n " 57: $at_desc "
+at_xfail=no
+echo "# -*- compilation -*-" >> "$at_group_log"
+(
+ $as_echo "57. testsuite.at:289: testing ..."
+ $at_traceon
- 26 ) # 26. testsuite.at:161: group_test
- at_setup_line='testsuite.at:161'
- at_desc="group_test"
- $at_quiet $ECHO_N " 26: group_test $ECHO_C"
- at_xfail=no
- echo "# -*- compilation -*-" >> "$at_group_log"
- (
- echo "26. testsuite.at:161: testing ..."
- $at_traceon
-
-$at_traceoff
-echo "$at_srcdir/testsuite.at:162: \$VALGRIND group_test 0 0 0 \$STARGS"
-echo testsuite.at:162 >"$at_check_line_file"
-at_trace_this=
-if test -n "$at_traceon"; then
- case "$VALGRIND group_test 0 0 0 $STARGS" in
- *'
-'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;;
- *) at_trace_this=yes ;;
- esac
-fi
+{ $at_traceoff
+$as_echo "$at_srcdir/testsuite.at:291: test \"\$STARGS\" != DB_HDF5 && exit 77 || \$VALGRIND largefile"
+echo testsuite.at:291 >"$at_check_line_file"
-if test -n "$at_trace_this"; then
- ( $at_traceon; $VALGRIND group_test 0 0 0 $STARGS ) >"$at_stdout" 2>"$at_stder1"
- at_status=$?
- grep '^ *+' "$at_stder1" >&2
- grep -v '^ *+' "$at_stder1" >"$at_stderr"
+if test -n "$at_traceon" \
+ && at_func_check_newline "test \"$STARGS\" != DB_HDF5 && exit 77 || $VALGRIND largefile"; then
+ ( $at_traceon; test "$STARGS" != DB_HDF5 && exit 77 || $VALGRIND largefile ) >"$at_stdout" 2>"$at_stder1"
+ at_func_filter_trace $?
else
- ( :; $VALGRIND group_test 0 0 0 $STARGS ) >"$at_stdout" 2>"$at_stderr"
- at_status=$?
+ ( :; test "$STARGS" != DB_HDF5 && exit 77 || $VALGRIND largefile ) >"$at_stdout" 2>"$at_stderr"
fi
-
+at_status=$?
at_failed=false
echo stderr:; cat "$at_stderr"
echo stdout:; cat "$at_stdout"
-case $at_status in
- 77) echo 77 > "$at_status_file"; exit 77;;
- 0) ;;
- *) echo "$at_srcdir/testsuite.at:162: exit code was $at_status, expected 0"
- at_failed=:;;
-esac
-if $at_failed; then
-
+at_func_check_status 0 $at_status "$at_srcdir/testsuite.at:291"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+ $at_traceoff
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_57
+#AT_START_58
+# 58. testsuite.at:295: arrayf77
+at_setup_line='testsuite.at:295'
+at_func_banner 5
+at_desc="arrayf77"
+$at_quiet $as_echo_n " 58: $at_desc "
+at_xfail=no
+echo "# -*- compilation -*-" >> "$at_group_log"
+(
+ $as_echo "58. testsuite.at:295: testing ..."
+ $at_traceon
- echo 1 > "$at_status_file"
- exit 1
-fi
-$at_traceon
+{ $at_traceoff
+$as_echo "$at_srcdir/testsuite.at:297: test ! \\( -f arrayf77 -o -f ../../arrayf77 \\) && exit 77 || \$VALGRIND arrayf77 \$STARGS"
+echo testsuite.at:297 >"$at_check_line_file"
- $at_traceoff
- $at_times_p && times >"$at_times_file"
- ) 5>&1 2>&1 | eval $at_tee_pipe
- at_status=`cat "$at_status_file"`
- ;;
+if test -n "$at_traceon" \
+ && at_func_check_newline "test ! \\( -f arrayf77 -o -f ../../arrayf77 \\) && exit 77 || $VALGRIND arrayf77 $STARGS"; then
+ ( $at_traceon; test ! \( -f arrayf77 -o -f ../../arrayf77 \) && exit 77 || $VALGRIND arrayf77 $STARGS ) >"$at_stdout" 2>"$at_stder1"
+ at_func_filter_trace $?
+else
+ ( :; test ! \( -f arrayf77 -o -f ../../arrayf77 \) && exit 77 || $VALGRIND arrayf77 $STARGS ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+echo stderr:; cat "$at_stderr"
+echo stdout:; cat "$at_stdout"
+at_func_check_status 0 $at_status "$at_srcdir/testsuite.at:297"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+ $at_traceoff
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_58
+#AT_START_59
+# 59. testsuite.at:299: curvef77
+at_setup_line='testsuite.at:299'
+at_func_banner 5
+at_desc="curvef77"
+$at_quiet $as_echo_n " 59: $at_desc "
+at_xfail=no
+echo "# -*- compilation -*-" >> "$at_group_log"
+(
+ $as_echo "59. testsuite.at:299: testing ..."
+ $at_traceon
- 27 ) # 27. testsuite.at:164: listtypes
- at_setup_line='testsuite.at:164'
- at_desc="listtypes"
- $at_quiet $ECHO_N " 27: listtypes $ECHO_C"
- at_xfail=no
- echo "# -*- compilation -*-" >> "$at_group_log"
- (
- echo "27. testsuite.at:164: testing ..."
- $at_traceon
-
-$at_traceoff
-echo "$at_srcdir/testsuite.at:165: \$VALGRIND ucd \$STARGS"
-echo testsuite.at:165 >"$at_check_line_file"
-at_trace_this=
-if test -n "$at_traceon"; then
- case "$VALGRIND ucd $STARGS" in
- *'
-'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;;
- *) at_trace_this=yes ;;
- esac
-fi
+{ $at_traceoff
+$as_echo "$at_srcdir/testsuite.at:301: test ! \\( -f curvef77 -o -f ../../curvef77 \\) && exit 77 || \$VALGRIND curvef77 \$STARGS"
+echo testsuite.at:301 >"$at_check_line_file"
-if test -n "$at_trace_this"; then
- ( $at_traceon; $VALGRIND ucd $STARGS ) >"$at_stdout" 2>"$at_stder1"
- at_status=$?
- grep '^ *+' "$at_stder1" >&2
- grep -v '^ *+' "$at_stder1" >"$at_stderr"
+if test -n "$at_traceon" \
+ && at_func_check_newline "test ! \\( -f curvef77 -o -f ../../curvef77 \\) && exit 77 || $VALGRIND curvef77 $STARGS"; then
+ ( $at_traceon; test ! \( -f curvef77 -o -f ../../curvef77 \) && exit 77 || $VALGRIND curvef77 $STARGS ) >"$at_stdout" 2>"$at_stder1"
+ at_func_filter_trace $?
else
- ( :; $VALGRIND ucd $STARGS ) >"$at_stdout" 2>"$at_stderr"
- at_status=$?
+ ( :; test ! \( -f curvef77 -o -f ../../curvef77 \) && exit 77 || $VALGRIND curvef77 $STARGS ) >"$at_stdout" 2>"$at_stderr"
fi
-
+at_status=$?
at_failed=false
-$at_diff "$at_devnull" "$at_stderr" || at_failed=:
+echo stderr:; cat "$at_stderr"
echo stdout:; cat "$at_stdout"
-case $at_status in
- 77) echo 77 > "$at_status_file"; exit 77;;
- 0) ;;
- *) echo "$at_srcdir/testsuite.at:165: exit code was $at_status, expected 0"
- at_failed=:;;
-esac
-if $at_failed; then
+at_func_check_status 0 $at_status "$at_srcdir/testsuite.at:301"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+ $at_traceoff
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_59
+#AT_START_60
+# 60. testsuite.at:303: matf77
+at_setup_line='testsuite.at:303'
+at_func_banner 5
+at_desc="matf77"
+$at_quiet $as_echo_n " 60: $at_desc "
+at_xfail=no
+echo "# -*- compilation -*-" >> "$at_group_log"
+(
+ $as_echo "60. testsuite.at:303: testing ..."
+ $at_traceon
- echo 1 > "$at_status_file"
- exit 1
-fi
+{ $at_traceoff
+$as_echo "$at_srcdir/testsuite.at:305: test ! \\( -f matf77 -o -f ../../matf77 \\) && exit 77 || \$VALGRIND matf77 \$STARGS"
+echo testsuite.at:305 >"$at_check_line_file"
-$at_traceon
+if test -n "$at_traceon" \
+ && at_func_check_newline "test ! \\( -f matf77 -o -f ../../matf77 \\) && exit 77 || $VALGRIND matf77 $STARGS"; then
+ ( $at_traceon; test ! \( -f matf77 -o -f ../../matf77 \) && exit 77 || $VALGRIND matf77 $STARGS ) >"$at_stdout" 2>"$at_stder1"
+ at_func_filter_trace $?
+else
+ ( :; test ! \( -f matf77 -o -f ../../matf77 \) && exit 77 || $VALGRIND matf77 $STARGS ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+echo stderr:; cat "$at_stderr"
+echo stdout:; cat "$at_stdout"
+at_func_check_status 0 $at_status "$at_srcdir/testsuite.at:305"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+ $at_traceoff
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_60
+#AT_START_61
+# 61. testsuite.at:307: pointf77
+at_setup_line='testsuite.at:307'
+at_func_banner 5
+at_desc="pointf77"
+$at_quiet $as_echo_n " 61: $at_desc "
+at_xfail=no
+echo "# -*- compilation -*-" >> "$at_group_log"
+(
+ $as_echo "61. testsuite.at:307: testing ..."
+ $at_traceon
-$at_traceoff
-echo "$at_srcdir/testsuite.at:166: test -z \"\$STARGS\" && \$VALGRIND listtypes ucd.pdb || \$VALGRIND listtypes ucd.h5"
-echo testsuite.at:166 >"$at_check_line_file"
-at_trace_this=
-if test -n "$at_traceon"; then
- case "test -z \"$STARGS\" && $VALGRIND listtypes ucd.pdb || $VALGRIND listtypes ucd.h5" in
- *'
-'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;;
- *) at_trace_this=yes ;;
- esac
-fi
+{ $at_traceoff
+$as_echo "$at_srcdir/testsuite.at:309: test ! \\( -f pointf77 -o -f ../../pointf77 \\) && exit 77 || \$VALGRIND pointf77 \$STARGS"
+echo testsuite.at:309 >"$at_check_line_file"
-if test -n "$at_trace_this"; then
- ( $at_traceon; test -z "$STARGS" && $VALGRIND listtypes ucd.pdb || $VALGRIND listtypes ucd.h5 ) >"$at_stdout" 2>"$at_stder1"
- at_status=$?
- grep '^ *+' "$at_stder1" >&2
- grep -v '^ *+' "$at_stder1" >"$at_stderr"
+if test -n "$at_traceon" \
+ && at_func_check_newline "test ! \\( -f pointf77 -o -f ../../pointf77 \\) && exit 77 || $VALGRIND pointf77 $STARGS"; then
+ ( $at_traceon; test ! \( -f pointf77 -o -f ../../pointf77 \) && exit 77 || $VALGRIND pointf77 $STARGS ) >"$at_stdout" 2>"$at_stder1"
+ at_func_filter_trace $?
else
- ( :; test -z "$STARGS" && $VALGRIND listtypes ucd.pdb || $VALGRIND listtypes ucd.h5 ) >"$at_stdout" 2>"$at_stderr"
- at_status=$?
+ ( :; test ! \( -f pointf77 -o -f ../../pointf77 \) && exit 77 || $VALGRIND pointf77 $STARGS ) >"$at_stdout" 2>"$at_stderr"
fi
-
+at_status=$?
at_failed=false
echo stderr:; cat "$at_stderr"
echo stdout:; cat "$at_stdout"
-case $at_status in
- 77) echo 77 > "$at_status_file"; exit 77;;
- 0) ;;
- *) echo "$at_srcdir/testsuite.at:166: exit code was $at_status, expected 0"
- at_failed=:;;
-esac
-if $at_failed; then
-
+at_func_check_status 0 $at_status "$at_srcdir/testsuite.at:309"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+ $at_traceoff
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_61
+#AT_START_62
+# 62. testsuite.at:311: quadf77
+at_setup_line='testsuite.at:311'
+at_func_banner 5
+at_desc="quadf77"
+$at_quiet $as_echo_n " 62: $at_desc "
+at_xfail=no
+echo "# -*- compilation -*-" >> "$at_group_log"
+(
+ $as_echo "62. testsuite.at:311: testing ..."
+ $at_traceon
- echo 1 > "$at_status_file"
- exit 1
-fi
-$at_traceon
+{ $at_traceoff
+$as_echo "$at_srcdir/testsuite.at:313: test ! \\( -f quadf77 -o -f ../../quadf77 \\) && exit 77 || \$VALGRIND quadf77 \$STARGS"
+echo testsuite.at:313 >"$at_check_line_file"
- $at_traceoff
- $at_times_p && times >"$at_times_file"
- ) 5>&1 2>&1 | eval $at_tee_pipe
- at_status=`cat "$at_status_file"`
- ;;
+if test -n "$at_traceon" \
+ && at_func_check_newline "test ! \\( -f quadf77 -o -f ../../quadf77 \\) && exit 77 || $VALGRIND quadf77 $STARGS"; then
+ ( $at_traceon; test ! \( -f quadf77 -o -f ../../quadf77 \) && exit 77 || $VALGRIND quadf77 $STARGS ) >"$at_stdout" 2>"$at_stder1"
+ at_func_filter_trace $?
+else
+ ( :; test ! \( -f quadf77 -o -f ../../quadf77 \) && exit 77 || $VALGRIND quadf77 $STARGS ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+echo stderr:; cat "$at_stderr"
+echo stdout:; cat "$at_stdout"
+at_func_check_status 0 $at_status "$at_srcdir/testsuite.at:313"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+ $at_traceoff
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_62
+#AT_START_63
+# 63. testsuite.at:315: testallf77
+at_setup_line='testsuite.at:315'
+at_func_banner 5
+at_desc="testallf77"
+$at_quiet $as_echo_n " 63: $at_desc "
+at_xfail=no
+echo "# -*- compilation -*-" >> "$at_group_log"
+(
+ $as_echo "63. testsuite.at:315: testing ..."
+ $at_traceon
- 28 ) # 28. testsuite.at:168: alltypes
- at_setup_line='testsuite.at:168'
- at_desc="alltypes"
- $at_quiet $ECHO_N " 28: alltypes $ECHO_C"
- at_xfail=no
- echo "# -*- compilation -*-" >> "$at_group_log"
- (
- echo "28. testsuite.at:168: testing ..."
- $at_traceon
-
-$at_traceoff
-echo "$at_srcdir/testsuite.at:169: \$VALGRIND alltypes \$STARGS"
-echo testsuite.at:169 >"$at_check_line_file"
-at_trace_this=
-if test -n "$at_traceon"; then
- case "$VALGRIND alltypes $STARGS" in
- *'
-'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;;
- *) at_trace_this=yes ;;
- esac
-fi
+{ $at_traceoff
+$as_echo "$at_srcdir/testsuite.at:317: test ! \\( -f testallf77 -o -f ../../testallf77 \\) && exit 77 || \$VALGRIND testallf77 \$STARGS"
+echo testsuite.at:317 >"$at_check_line_file"
-if test -n "$at_trace_this"; then
- ( $at_traceon; $VALGRIND alltypes $STARGS ) >"$at_stdout" 2>"$at_stder1"
- at_status=$?
- grep '^ *+' "$at_stder1" >&2
- grep -v '^ *+' "$at_stder1" >"$at_stderr"
+if test -n "$at_traceon" \
+ && at_func_check_newline "test ! \\( -f testallf77 -o -f ../../testallf77 \\) && exit 77 || $VALGRIND testallf77 $STARGS"; then
+ ( $at_traceon; test ! \( -f testallf77 -o -f ../../testallf77 \) && exit 77 || $VALGRIND testallf77 $STARGS ) >"$at_stdout" 2>"$at_stder1"
+ at_func_filter_trace $?
else
- ( :; $VALGRIND alltypes $STARGS ) >"$at_stdout" 2>"$at_stderr"
- at_status=$?
+ ( :; test ! \( -f testallf77 -o -f ../../testallf77 \) && exit 77 || $VALGRIND testallf77 $STARGS ) >"$at_stdout" 2>"$at_stderr"
fi
-
+at_status=$?
at_failed=false
-$at_diff "$at_devnull" "$at_stderr" || at_failed=:
+echo stderr:; cat "$at_stderr"
echo stdout:; cat "$at_stdout"
-case $at_status in
- 77) echo 77 > "$at_status_file"; exit 77;;
- 0) ;;
- *) echo "$at_srcdir/testsuite.at:169: exit code was $at_status, expected 0"
- at_failed=:;;
-esac
-if $at_failed; then
-
+at_func_check_status 0 $at_status "$at_srcdir/testsuite.at:317"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+ $at_traceoff
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_63
+#AT_START_64
+# 64. testsuite.at:319: ucdf77
+at_setup_line='testsuite.at:319'
+at_func_banner 5
+at_desc="ucdf77"
+$at_quiet $as_echo_n " 64: $at_desc "
+at_xfail=no
+echo "# -*- compilation -*-" >> "$at_group_log"
+(
+ $as_echo "64. testsuite.at:319: testing ..."
+ $at_traceon
- echo 1 > "$at_status_file"
- exit 1
-fi
-$at_traceon
+{ $at_traceoff
+$as_echo "$at_srcdir/testsuite.at:321: test ! \\( -f ucdf77 -o -f ../../ucdf77 \\) && exit 77 || \$VALGRIND ucdf77 \$STARGS"
+echo testsuite.at:321 >"$at_check_line_file"
- $at_traceoff
- $at_times_p && times >"$at_times_file"
- ) 5>&1 2>&1 | eval $at_tee_pipe
- at_status=`cat "$at_status_file"`
- ;;
+if test -n "$at_traceon" \
+ && at_func_check_newline "test ! \\( -f ucdf77 -o -f ../../ucdf77 \\) && exit 77 || $VALGRIND ucdf77 $STARGS"; then
+ ( $at_traceon; test ! \( -f ucdf77 -o -f ../../ucdf77 \) && exit 77 || $VALGRIND ucdf77 $STARGS ) >"$at_stdout" 2>"$at_stder1"
+ at_func_filter_trace $?
+else
+ ( :; test ! \( -f ucdf77 -o -f ../../ucdf77 \) && exit 77 || $VALGRIND ucdf77 $STARGS ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+echo stderr:; cat "$at_stderr"
+echo stdout:; cat "$at_stdout"
+at_func_check_status 0 $at_status "$at_srcdir/testsuite.at:321"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+ $at_traceoff
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_64
+#AT_START_65
+# 65. testsuite.at:323: csgmesh
+at_setup_line='testsuite.at:323'
+at_func_banner 5
+at_desc="csgmesh"
+$at_quiet $as_echo_n " 65: $at_desc "
+at_xfail=no
+echo "# -*- compilation -*-" >> "$at_group_log"
+(
+ $as_echo "65. testsuite.at:323: testing ..."
+ $at_traceon
- 29 ) # 29. testsuite.at:171: wave
- at_setup_line='testsuite.at:171'
- at_desc="wave"
- $at_quiet $ECHO_N " 29: wave $ECHO_C"
- at_xfail=no
- echo "# -*- compilation -*-" >> "$at_group_log"
- (
- echo "29. testsuite.at:171: testing ..."
- $at_traceon
-
-$at_traceoff
-echo "$at_srcdir/testsuite.at:172: \$VALGRIND wave \$STARGS"
-echo testsuite.at:172 >"$at_check_line_file"
-at_trace_this=
-if test -n "$at_traceon"; then
- case "$VALGRIND wave $STARGS" in
- *'
-'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;;
- *) at_trace_this=yes ;;
- esac
-fi
+{ $at_traceoff
+$as_echo "$at_srcdir/testsuite.at:325: test ! \\( -f csgmesh -o -f ../../csgmesh \\) && exit 77 || \$VALGRIND csgmesh \$STARGS"
+echo testsuite.at:325 >"$at_check_line_file"
-if test -n "$at_trace_this"; then
- ( $at_traceon; $VALGRIND wave $STARGS ) >"$at_stdout" 2>"$at_stder1"
- at_status=$?
- grep '^ *+' "$at_stder1" >&2
- grep -v '^ *+' "$at_stder1" >"$at_stderr"
+if test -n "$at_traceon" \
+ && at_func_check_newline "test ! \\( -f csgmesh -o -f ../../csgmesh \\) && exit 77 || $VALGRIND csgmesh $STARGS"; then
+ ( $at_traceon; test ! \( -f csgmesh -o -f ../../csgmesh \) && exit 77 || $VALGRIND csgmesh $STARGS ) >"$at_stdout" 2>"$at_stder1"
+ at_func_filter_trace $?
else
- ( :; $VALGRIND wave $STARGS ) >"$at_stdout" 2>"$at_stderr"
- at_status=$?
+ ( :; test ! \( -f csgmesh -o -f ../../csgmesh \) && exit 77 || $VALGRIND csgmesh $STARGS ) >"$at_stdout" 2>"$at_stderr"
fi
-
+at_status=$?
at_failed=false
-$at_diff "$at_devnull" "$at_stderr" || at_failed=:
+echo stderr:; cat "$at_stderr"
echo stdout:; cat "$at_stdout"
-case $at_status in
- 77) echo 77 > "$at_status_file"; exit 77;;
- 0) ;;
- *) echo "$at_srcdir/testsuite.at:172: exit code was $at_status, expected 0"
- at_failed=:;;
-esac
-if $at_failed; then
-
-
- echo 1 > "$at_status_file"
- exit 1
-fi
-
-$at_traceon
-
- $at_traceoff
- $at_times_p && times >"$at_times_file"
- ) 5>&1 2>&1 | eval $at_tee_pipe
- at_status=`cat "$at_status_file"`
- ;;
-
- 30 ) # 30. testsuite.at:174: polyzl
- at_setup_line='testsuite.at:174'
- at_desc="polyzl"
- $at_quiet $ECHO_N " 30: polyzl $ECHO_C"
- at_xfail=no
- echo "# -*- compilation -*-" >> "$at_group_log"
- (
- echo "30. testsuite.at:174: testing ..."
- $at_traceon
-
-$at_traceoff
-echo "$at_srcdir/testsuite.at:175: \$VALGRIND polyzl \$STARGS"
-echo testsuite.at:175 >"$at_check_line_file"
-
-at_trace_this=
-if test -n "$at_traceon"; then
- case "$VALGRIND polyzl $STARGS" in
- *'
-'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;;
- *) at_trace_this=yes ;;
- esac
-fi
-
-if test -n "$at_trace_this"; then
- ( $at_traceon; $VALGRIND polyzl $STARGS ) >"$at_stdout" 2>"$at_stder1"
- at_status=$?
- grep '^ *+' "$at_stder1" >&2
- grep -v '^ *+' "$at_stder1" >"$at_stderr"
-else
- ( :; $VALGRIND polyzl $STARGS ) >"$at_stdout" 2>"$at_stderr"
- at_status=$?
-fi
-
-at_failed=false
-$at_diff "$at_devnull" "$at_stderr" || at_failed=:
-echo stdout:; cat "$at_stdout"
-case $at_status in
- 77) echo 77 > "$at_status_file"; exit 77;;
- 0) ;;
- *) echo "$at_srcdir/testsuite.at:175: exit code was $at_status, expected 0"
- at_failed=:;;
-esac
-if $at_failed; then
-
-
- echo 1 > "$at_status_file"
- exit 1
-fi
-
-$at_traceon
-
- $at_traceoff
- $at_times_p && times >"$at_times_file"
- ) 5>&1 2>&1 | eval $at_tee_pipe
- at_status=`cat "$at_status_file"`
- ;;
-
- 31 ) # 31. testsuite.at:177: csg
- at_setup_line='testsuite.at:177'
- at_desc="csg"
- $at_quiet $ECHO_N " 31: csg $ECHO_C"
- at_xfail=no
- echo "# -*- compilation -*-" >> "$at_group_log"
- (
- echo "31. testsuite.at:177: testing ..."
- $at_traceon
-
-$at_traceoff
-echo "$at_srcdir/testsuite.at:178: \$VALGRIND csg \$STARGS"
-echo testsuite.at:178 >"$at_check_line_file"
-
-at_trace_this=
-if test -n "$at_traceon"; then
- case "$VALGRIND csg $STARGS" in
- *'
-'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;;
- *) at_trace_this=yes ;;
- esac
-fi
-
-if test -n "$at_trace_this"; then
- ( $at_traceon; $VALGRIND csg $STARGS ) >"$at_stdout" 2>"$at_stder1"
- at_status=$?
- grep '^ *+' "$at_stder1" >&2
- grep -v '^ *+' "$at_stder1" >"$at_stderr"
-else
- ( :; $VALGRIND csg $STARGS ) >"$at_stdout" 2>"$at_stderr"
- at_status=$?
-fi
-
-at_failed=false
-$at_diff "$at_devnull" "$at_stderr" || at_failed=:
-echo stdout:; cat "$at_stdout"
-case $at_status in
- 77) echo 77 > "$at_status_file"; exit 77;;
- 0) ;;
- *) echo "$at_srcdir/testsuite.at:178: exit code was $at_status, expected 0"
- at_failed=:;;
-esac
-if $at_failed; then
-
-
- echo 1 > "$at_status_file"
- exit 1
-fi
-
-$at_traceon
-
- $at_traceoff
- $at_times_p && times >"$at_times_file"
- ) 5>&1 2>&1 | eval $at_tee_pipe
- at_status=`cat "$at_status_file"`
- ;;
-
- 32 ) # 32. testsuite.at:180: rocket
- at_setup_line='testsuite.at:180'
- at_desc="rocket"
- $at_quiet $ECHO_N " 32: rocket $ECHO_C"
- at_xfail=no
- echo "# -*- compilation -*-" >> "$at_group_log"
- (
- echo "32. testsuite.at:180: testing ..."
- $at_traceon
-
-$at_traceoff
-echo "$at_srcdir/testsuite.at:181: \$VALGRIND rocket \$STARGS"
-echo testsuite.at:181 >"$at_check_line_file"
-
-at_trace_this=
-if test -n "$at_traceon"; then
- case "$VALGRIND rocket $STARGS" in
- *'
-'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;;
- *) at_trace_this=yes ;;
- esac
-fi
-
-if test -n "$at_trace_this"; then
- ( $at_traceon; $VALGRIND rocket $STARGS ) >"$at_stdout" 2>"$at_stder1"
- at_status=$?
- grep '^ *+' "$at_stder1" >&2
- grep -v '^ *+' "$at_stder1" >"$at_stderr"
-else
- ( :; $VALGRIND rocket $STARGS ) >"$at_stdout" 2>"$at_stderr"
- at_status=$?
-fi
-
-at_failed=false
-$at_diff "$at_devnull" "$at_stderr" || at_failed=:
-echo stdout:; cat "$at_stdout"
-case $at_status in
- 77) echo 77 > "$at_status_file"; exit 77;;
- 0) ;;
- *) echo "$at_srcdir/testsuite.at:181: exit code was $at_status, expected 0"
- at_failed=:;;
-esac
-if $at_failed; then
-
-
- echo 1 > "$at_status_file"
- exit 1
-fi
-
-$at_traceon
-
- $at_traceoff
- $at_times_p && times >"$at_times_file"
- ) 5>&1 2>&1 | eval $at_tee_pipe
- at_status=`cat "$at_status_file"`
- ;;
-
- 33 ) # 33. testsuite.at:183: mmadjacency
- at_setup_line='testsuite.at:183'
- at_desc="mmadjacency"
- $at_quiet $ECHO_N " 33: mmadjacency $ECHO_C"
- at_xfail=no
- echo "# -*- compilation -*-" >> "$at_group_log"
- (
- echo "33. testsuite.at:183: testing ..."
- $at_traceon
-
-$at_traceoff
-echo "$at_srcdir/testsuite.at:184: \$VALGRIND mmadjacency \$STARGS"
-echo testsuite.at:184 >"$at_check_line_file"
-
-at_trace_this=
-if test -n "$at_traceon"; then
- case "$VALGRIND mmadjacency $STARGS" in
- *'
-'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;;
- *) at_trace_this=yes ;;
- esac
-fi
-
-if test -n "$at_trace_this"; then
- ( $at_traceon; $VALGRIND mmadjacency $STARGS ) >"$at_stdout" 2>"$at_stder1"
- at_status=$?
- grep '^ *+' "$at_stder1" >&2
- grep -v '^ *+' "$at_stder1" >"$at_stderr"
-else
- ( :; $VALGRIND mmadjacency $STARGS ) >"$at_stdout" 2>"$at_stderr"
- at_status=$?
-fi
-
-at_failed=false
-$at_diff "$at_devnull" "$at_stderr" || at_failed=:
-echo stdout:; cat "$at_stdout"
-case $at_status in
- 77) echo 77 > "$at_status_file"; exit 77;;
- 0) ;;
- *) echo "$at_srcdir/testsuite.at:184: exit code was $at_status, expected 0"
- at_failed=:;;
-esac
-if $at_failed; then
-
-
- echo 1 > "$at_status_file"
- exit 1
-fi
-
-$at_traceon
-
- $at_traceoff
- $at_times_p && times >"$at_times_file"
- ) 5>&1 2>&1 | eval $at_tee_pipe
- at_status=`cat "$at_status_file"`
- ;;
-
- 34 ) # 34. testsuite.at:186: mat3d_3across
- at_setup_line='testsuite.at:186'
- at_desc="mat3d_3across"
- $at_quiet $ECHO_N " 34: mat3d_3across $ECHO_C"
- at_xfail=no
- echo "# -*- compilation -*-" >> "$at_group_log"
- (
- echo "34. testsuite.at:186: testing ..."
- $at_traceon
-
-$at_traceoff
-echo "$at_srcdir/testsuite.at:187: \$VALGRIND mat3d_3across \$STARGS"
-echo testsuite.at:187 >"$at_check_line_file"
-
-at_trace_this=
-if test -n "$at_traceon"; then
- case "$VALGRIND mat3d_3across $STARGS" in
- *'
-'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;;
- *) at_trace_this=yes ;;
- esac
-fi
-
-if test -n "$at_trace_this"; then
- ( $at_traceon; $VALGRIND mat3d_3across $STARGS ) >"$at_stdout" 2>"$at_stder1"
- at_status=$?
- grep '^ *+' "$at_stder1" >&2
- grep -v '^ *+' "$at_stder1" >"$at_stderr"
-else
- ( :; $VALGRIND mat3d_3across $STARGS ) >"$at_stdout" 2>"$at_stderr"
- at_status=$?
-fi
-
-at_failed=false
-$at_diff "$at_devnull" "$at_stderr" || at_failed=:
-$at_diff "$at_devnull" "$at_stdout" || at_failed=:
-case $at_status in
- 77) echo 77 > "$at_status_file"; exit 77;;
- 0) ;;
- *) echo "$at_srcdir/testsuite.at:187: exit code was $at_status, expected 0"
- at_failed=:;;
-esac
-if $at_failed; then
-
-
- echo 1 > "$at_status_file"
- exit 1
-fi
-
-$at_traceon
-
- $at_traceoff
- $at_times_p && times >"$at_times_file"
- ) 5>&1 2>&1 | eval $at_tee_pipe
- at_status=`cat "$at_status_file"`
- ;;
-
- 35 ) # 35. testsuite.at:189: ucd1d
- at_setup_line='testsuite.at:189'
- at_desc="ucd1d"
- $at_quiet $ECHO_N " 35: ucd1d $ECHO_C"
- at_xfail=no
- echo "# -*- compilation -*-" >> "$at_group_log"
- (
- echo "35. testsuite.at:189: testing ..."
- $at_traceon
-
-$at_traceoff
-echo "$at_srcdir/testsuite.at:190: \$VALGRIND ucd1d \$STARGS"
-echo testsuite.at:190 >"$at_check_line_file"
-
-at_trace_this=
-if test -n "$at_traceon"; then
- case "$VALGRIND ucd1d $STARGS" in
- *'
-'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;;
- *) at_trace_this=yes ;;
- esac
-fi
-
-if test -n "$at_trace_this"; then
- ( $at_traceon; $VALGRIND ucd1d $STARGS ) >"$at_stdout" 2>"$at_stder1"
- at_status=$?
- grep '^ *+' "$at_stder1" >&2
- grep -v '^ *+' "$at_stder1" >"$at_stderr"
-else
- ( :; $VALGRIND ucd1d $STARGS ) >"$at_stdout" 2>"$at_stderr"
- at_status=$?
-fi
-
-at_failed=false
-$at_diff "$at_devnull" "$at_stderr" || at_failed=:
-echo stdout:; cat "$at_stdout"
-case $at_status in
- 77) echo 77 > "$at_status_file"; exit 77;;
- 0) ;;
- *) echo "$at_srcdir/testsuite.at:190: exit code was $at_status, expected 0"
- at_failed=:;;
-esac
-if $at_failed; then
-
-
- echo 1 > "$at_status_file"
- exit 1
-fi
-
-$at_traceon
-
- $at_traceoff
- $at_times_p && times >"$at_times_file"
- ) 5>&1 2>&1 | eval $at_tee_pipe
- at_status=`cat "$at_status_file"`
- ;;
+at_func_check_status 0 $at_status "$at_srcdir/testsuite.at:325"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+ $at_traceoff
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_65
+#AT_START_66
+# 66. testsuite.at:329: silock
+at_setup_line='testsuite.at:329'
+at_func_banner 6
+at_desc="silock"
+$at_quiet $as_echo_n " 66: $at_desc "
+at_xfail=no
+echo "# -*- compilation -*-" >> "$at_group_log"
+(
+ $as_echo "66. testsuite.at:329: testing ..."
+ $at_traceon
- 36 ) # 36. testsuite.at:192: dir
- at_setup_line='testsuite.at:192'
- at_desc="dir"
- $at_quiet $ECHO_N " 36: dir $ECHO_C"
- at_xfail=no
- echo "# -*- compilation -*-" >> "$at_group_log"
- (
- echo "36. testsuite.at:192: testing ..."
- $at_traceon
-
-$at_traceoff
-echo "$at_srcdir/testsuite.at:193: \$VALGRIND dir \$STARGS"
-echo testsuite.at:193 >"$at_check_line_file"
-at_trace_this=
-if test -n "$at_traceon"; then
- case "$VALGRIND dir $STARGS" in
- *'
-'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;;
- *) at_trace_this=yes ;;
- esac
-fi
+{ $at_traceoff
+$as_echo "$at_srcdir/testsuite.at:331: testsilock \`pwd\` \$STARGS"
+echo testsuite.at:331 >"$at_check_line_file"
-if test -n "$at_trace_this"; then
- ( $at_traceon; $VALGRIND dir $STARGS ) >"$at_stdout" 2>"$at_stder1"
- at_status=$?
- grep '^ *+' "$at_stder1" >&2
- grep -v '^ *+' "$at_stder1" >"$at_stderr"
+if { echo 'Not enabling shell tracing (command contains a `...` command substitution)'
+ false; }; then
+ ( $at_traceon; testsilock `pwd` $STARGS ) >"$at_stdout" 2>"$at_stder1"
+ at_func_filter_trace $?
else
- ( :; $VALGRIND dir $STARGS ) >"$at_stdout" 2>"$at_stderr"
- at_status=$?
+ ( :; testsilock `pwd` $STARGS ) >"$at_stdout" 2>"$at_stderr"
fi
-
+at_status=$?
at_failed=false
echo stderr:; cat "$at_stderr"
echo stdout:; cat "$at_stdout"
-case $at_status in
- 77) echo 77 > "$at_status_file"; exit 77;;
- 0) ;;
- *) echo "$at_srcdir/testsuite.at:193: exit code was $at_status, expected 0"
- at_failed=:;;
-esac
-if $at_failed; then
-
-
- echo 1 > "$at_status_file"
- exit 1
-fi
-
-$at_traceon
-
- $at_traceoff
- $at_times_p && times >"$at_times_file"
- ) 5>&1 2>&1 | eval $at_tee_pipe
- at_status=`cat "$at_status_file"`
- ;;
+at_func_check_status 0 $at_status "$at_srcdir/testsuite.at:331"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+ $at_traceoff
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_66
+#AT_START_67
+# 67. testsuite.at:333: force single
+at_setup_line='testsuite.at:333'
+at_func_banner 6
+at_desc="force single"
+$at_quiet $as_echo_n " 67: $at_desc "
+at_xfail=no
+echo "# -*- compilation -*-" >> "$at_group_log"
+(
+ $as_echo "67. testsuite.at:333: testing ..."
+ $at_traceon
- 37 ) # 37. testsuite.at:195: quad
- at_setup_line='testsuite.at:195'
- at_desc="quad"
- $at_quiet $ECHO_N " 37: quad $ECHO_C"
- at_xfail=no
- echo "# -*- compilation -*-" >> "$at_group_log"
- (
- echo "37. testsuite.at:195: testing ..."
- $at_traceon
-
-$at_traceoff
-echo "$at_srcdir/testsuite.at:196: \$VALGRIND quad \$STARGS"
-echo testsuite.at:196 >"$at_check_line_file"
-at_trace_this=
-if test -n "$at_traceon"; then
- case "$VALGRIND quad $STARGS" in
- *'
-'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;;
- *) at_trace_this=yes ;;
- esac
-fi
+{ $at_traceoff
+$as_echo "$at_srcdir/testsuite.at:335: specmix \$STARGS"
+echo testsuite.at:335 >"$at_check_line_file"
-if test -n "$at_trace_this"; then
- ( $at_traceon; $VALGRIND quad $STARGS ) >"$at_stdout" 2>"$at_stder1"
- at_status=$?
- grep '^ *+' "$at_stder1" >&2
- grep -v '^ *+' "$at_stder1" >"$at_stderr"
+if test -n "$at_traceon" \
+ && at_func_check_newline "specmix $STARGS"; then
+ ( $at_traceon; specmix $STARGS ) >"$at_stdout" 2>"$at_stder1"
+ at_func_filter_trace $?
else
- ( :; $VALGRIND quad $STARGS ) >"$at_stdout" 2>"$at_stderr"
- at_status=$?
+ ( :; specmix $STARGS ) >"$at_stdout" 2>"$at_stderr"
fi
-
+at_status=$?
at_failed=false
-$at_diff "$at_devnull" "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stderr" || at_failed=:
echo stdout:; cat "$at_stdout"
-case $at_status in
- 77) echo 77 > "$at_status_file"; exit 77;;
- 0) ;;
- *) echo "$at_srcdir/testsuite.at:196: exit code was $at_status, expected 0"
- at_failed=:;;
-esac
-if $at_failed; then
-
-
- echo 1 > "$at_status_file"
- exit 1
-fi
-
-$at_traceon
+at_func_check_status 0 $at_status "$at_srcdir/testsuite.at:335"
- $at_traceoff
- $at_times_p && times >"$at_times_file"
- ) 5>&1 2>&1 | eval $at_tee_pipe
- at_status=`cat "$at_status_file"`
- ;;
-
- 38 ) # 38. testsuite.at:198: arbpoly2d
- at_setup_line='testsuite.at:198'
- at_desc="arbpoly2d"
- $at_quiet $ECHO_N " 38: arbpoly2d $ECHO_C"
- at_xfail=no
- echo "# -*- compilation -*-" >> "$at_group_log"
- (
- echo "38. testsuite.at:198: testing ..."
- $at_traceon
-
-$at_traceoff
-echo "$at_srcdir/testsuite.at:199: \$VALGRIND arbpoly2d \$STARGS"
-echo testsuite.at:199 >"$at_check_line_file"
+$at_failed && at_func_log_failure
+$at_traceon; }
-at_trace_this=
-if test -n "$at_traceon"; then
- case "$VALGRIND arbpoly2d $STARGS" in
- *'
-'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;;
- *) at_trace_this=yes ;;
- esac
-fi
+{ $at_traceoff
+$as_echo "$at_srcdir/testsuite.at:336: testdtypes \`pwd\` \$STARGS"
+echo testsuite.at:336 >"$at_check_line_file"
-if test -n "$at_trace_this"; then
- ( $at_traceon; $VALGRIND arbpoly2d $STARGS ) >"$at_stdout" 2>"$at_stder1"
- at_status=$?
- grep '^ *+' "$at_stder1" >&2
- grep -v '^ *+' "$at_stder1" >"$at_stderr"
+if { echo 'Not enabling shell tracing (command contains a `...` command substitution)'
+ false; }; then
+ ( $at_traceon; testdtypes `pwd` $STARGS ) >"$at_stdout" 2>"$at_stder1"
+ at_func_filter_trace $?
else
- ( :; $VALGRIND arbpoly2d $STARGS ) >"$at_stdout" 2>"$at_stderr"
- at_status=$?
+ ( :; testdtypes `pwd` $STARGS ) >"$at_stdout" 2>"$at_stderr"
fi
-
+at_status=$?
at_failed=false
-$at_diff "$at_devnull" "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stderr" || at_failed=:
echo stdout:; cat "$at_stdout"
-case $at_status in
- 77) echo 77 > "$at_status_file"; exit 77;;
- 0) ;;
- *) echo "$at_srcdir/testsuite.at:199: exit code was $at_status, expected 0"
- at_failed=:;;
-esac
-if $at_failed; then
-
-
- echo 1 > "$at_status_file"
- exit 1
-fi
-
-$at_traceon
-
- $at_traceoff
- $at_times_p && times >"$at_times_file"
- ) 5>&1 2>&1 | eval $at_tee_pipe
- at_status=`cat "$at_status_file"`
- ;;
+at_func_check_status 0 $at_status "$at_srcdir/testsuite.at:336"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+ $at_traceoff
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_67
+#AT_START_68
+# 68. testsuite.at:338: multi_file
+at_setup_line='testsuite.at:338'
+at_func_banner 6
+at_desc="multi_file"
+$at_quiet $as_echo_n " 68: $at_desc "
+at_xfail=no
+echo "# -*- compilation -*-" >> "$at_group_log"
+(
+ $as_echo "68. testsuite.at:338: testing ..."
+ $at_traceon
- 39 ) # 39. testsuite.at:201: readstuff
- at_setup_line='testsuite.at:201'
- at_desc="readstuff"
- $at_quiet $ECHO_N " 39: readstuff $ECHO_C"
- at_xfail=no
- echo "# -*- compilation -*-" >> "$at_group_log"
- (
- echo "39. testsuite.at:201: testing ..."
- $at_traceon
- # needs data file from multi_test
-$at_traceoff
-echo "$at_srcdir/testsuite.at:202: multi_test \$STARGS"
-echo testsuite.at:202 >"$at_check_line_file"
-at_trace_this=
-if test -n "$at_traceon"; then
- case "multi_test $STARGS" in
- *'
-'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;;
- *) at_trace_this=yes ;;
- esac
-fi
+{ $at_traceoff
+$as_echo "$at_srcdir/testsuite.at:340: \$VALGRIND multi_file \$STARGS"
+echo testsuite.at:340 >"$at_check_line_file"
-if test -n "$at_trace_this"; then
- ( $at_traceon; multi_test $STARGS ) >"$at_stdout" 2>"$at_stder1"
- at_status=$?
- grep '^ *+' "$at_stder1" >&2
- grep -v '^ *+' "$at_stder1" >"$at_stderr"
+if test -n "$at_traceon" \
+ && at_func_check_newline "$VALGRIND multi_file $STARGS"; then
+ ( $at_traceon; $VALGRIND multi_file $STARGS ) >"$at_stdout" 2>"$at_stder1"
+ at_func_filter_trace $?
else
- ( :; multi_test $STARGS ) >"$at_stdout" 2>"$at_stderr"
- at_status=$?
+ ( :; $VALGRIND multi_file $STARGS ) >"$at_stdout" 2>"$at_stderr"
fi
-
+at_status=$?
at_failed=false
-$at_diff "$at_devnull" "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stderr" || at_failed=:
echo stdout:; cat "$at_stdout"
-case $at_status in
- 77) echo 77 > "$at_status_file"; exit 77;;
- 0) ;;
- *) echo "$at_srcdir/testsuite.at:202: exit code was $at_status, expected 0"
- at_failed=:;;
-esac
-if $at_failed; then
-
-
- echo 1 > "$at_status_file"
- exit 1
-fi
+at_func_check_status 0 $at_status "$at_srcdir/testsuite.at:340"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+ $at_traceoff
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_68
+#AT_START_69
+# 69. testsuite.at:342: multi_file use-ns
+at_setup_line='testsuite.at:342'
+at_func_banner 6
+at_desc="multi_file use-ns"
+$at_quiet $as_echo_n " 69: $at_desc "
+at_xfail=no
+echo "# -*- compilation -*-" >> "$at_group_log"
+(
+ $as_echo "69. testsuite.at:342: testing ..."
+ $at_traceon
-$at_traceon
- # don't valgrind these intermediate parts
-$at_traceoff
-echo "$at_srcdir/testsuite.at:203: \$VALGRIND readstuff \$STARGS"
-echo testsuite.at:203 >"$at_check_line_file"
-at_trace_this=
-if test -n "$at_traceon"; then
- case "$VALGRIND readstuff $STARGS" in
- *'
-'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;;
- *) at_trace_this=yes ;;
- esac
-fi
+{ $at_traceoff
+$as_echo "$at_srcdir/testsuite.at:344: \$VALGRIND multi_file use-ns \$STARGS"
+echo testsuite.at:344 >"$at_check_line_file"
-if test -n "$at_trace_this"; then
- ( $at_traceon; $VALGRIND readstuff $STARGS ) >"$at_stdout" 2>"$at_stder1"
- at_status=$?
- grep '^ *+' "$at_stder1" >&2
- grep -v '^ *+' "$at_stder1" >"$at_stderr"
+if test -n "$at_traceon" \
+ && at_func_check_newline "$VALGRIND multi_file use-ns $STARGS"; then
+ ( $at_traceon; $VALGRIND multi_file use-ns $STARGS ) >"$at_stdout" 2>"$at_stder1"
+ at_func_filter_trace $?
else
- ( :; $VALGRIND readstuff $STARGS ) >"$at_stdout" 2>"$at_stderr"
- at_status=$?
+ ( :; $VALGRIND multi_file use-ns $STARGS ) >"$at_stdout" 2>"$at_stderr"
fi
-
+at_status=$?
at_failed=false
-$at_diff "$at_devnull" "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stderr" || at_failed=:
echo stdout:; cat "$at_stdout"
-case $at_status in
- 77) echo 77 > "$at_status_file"; exit 77;;
- *);;
-esac
-if $at_failed; then
-
-
- echo 1 > "$at_status_file"
- exit 1
-fi
-
-$at_traceon
-
- $at_traceoff
- $at_times_p && times >"$at_times_file"
- ) 5>&1 2>&1 | eval $at_tee_pipe
- at_status=`cat "$at_status_file"`
- ;;
-
-
- banner-2 ) # Banner 2. testsuite.at:206
- cat <<\_ATEOF
-
-pythonmodule
-
-_ATEOF
- ;;
-
- 40 ) # 40. testsuite.at:207: read
- at_setup_line='testsuite.at:207'
- at_desc="read"
- $at_quiet $ECHO_N " 40: read $ECHO_C"
- at_xfail=no
- echo "# -*- compilation -*-" >> "$at_group_log"
- (
- echo "40. testsuite.at:207: testing ..."
- $at_traceon
-
+at_func_check_status 0 $at_status "$at_srcdir/testsuite.at:344"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+ $at_traceoff
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_69
+#AT_START_70
+# 70. testsuite.at:346: testall -medium
+at_setup_line='testsuite.at:346'
+at_func_banner 6
+at_desc="testall -medium"
+$at_quiet $as_echo_n " 70: $at_desc "
+at_xfail=no
+echo "# -*- compilation -*-" >> "$at_group_log"
+(
+ $as_echo "70. testsuite.at:346: testing ..."
+ $at_traceon
-$at_traceoff
-echo "$at_srcdir/testsuite.at:209: multi_test \$STARGS hdf-friendly"
-echo testsuite.at:209 >"$at_check_line_file"
-at_trace_this=
-if test -n "$at_traceon"; then
- case "multi_test $STARGS hdf-friendly" in
- *'
-'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;;
- *) at_trace_this=yes ;;
- esac
-fi
+{ $at_traceoff
+$as_echo "$at_srcdir/testsuite.at:348: \$VALGRIND testall -medium \$STARGS"
+echo testsuite.at:348 >"$at_check_line_file"
-if test -n "$at_trace_this"; then
- ( $at_traceon; multi_test $STARGS hdf-friendly ) >"$at_stdout" 2>"$at_stder1"
- at_status=$?
- grep '^ *+' "$at_stder1" >&2
- grep -v '^ *+' "$at_stder1" >"$at_stderr"
+if test -n "$at_traceon" \
+ && at_func_check_newline "$VALGRIND testall -medium $STARGS"; then
+ ( $at_traceon; $VALGRIND testall -medium $STARGS ) >"$at_stdout" 2>"$at_stder1"
+ at_func_filter_trace $?
else
- ( :; multi_test $STARGS hdf-friendly ) >"$at_stdout" 2>"$at_stderr"
- at_status=$?
+ ( :; $VALGRIND testall -medium $STARGS ) >"$at_stdout" 2>"$at_stderr"
fi
-
+at_status=$?
at_failed=false
-$at_diff "$at_devnull" "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stderr" || at_failed=:
echo stdout:; cat "$at_stdout"
-case $at_status in
- 77) echo 77 > "$at_status_file"; exit 77;;
- 0) ;;
- *) echo "$at_srcdir/testsuite.at:209: exit code was $at_status, expected 0"
- at_failed=:;;
-esac
-if $at_failed; then
-
+at_func_check_status 0 $at_status "$at_srcdir/testsuite.at:348"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+ $at_traceoff
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_70
+#AT_START_71
+# 71. testsuite.at:350: testall -large
+at_setup_line='testsuite.at:350'
+at_func_banner 6
+at_desc="testall -large"
+$at_quiet $as_echo_n " 71: $at_desc "
+at_xfail=no
+echo "# -*- compilation -*-" >> "$at_group_log"
+(
+ $as_echo "71. testsuite.at:350: testing ..."
+ $at_traceon
- echo 1 > "$at_status_file"
- exit 1
-fi
-$at_traceon
- # generate data for python tests
-$at_traceoff
-echo "$at_srcdir/testsuite.at:210: test -z \"\$PYTHON\" && exit 77 || env PYTHONPATH=../../../tools/python/.libs \$PYTHON ../../test_read.py"
-echo testsuite.at:210 >"$at_check_line_file"
-
-at_trace_this=
-if test -n "$at_traceon"; then
- case "test -z \"$PYTHON\" && exit 77 || env PYTHONPATH=../../../tools/python/.libs $PYTHON ../../test_read.py" in
- *'
-'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;;
- *) at_trace_this=yes ;;
- esac
-fi
+{ $at_traceoff
+$as_echo "$at_srcdir/testsuite.at:352: \$VALGRIND testall -large \$STARGS"
+echo testsuite.at:352 >"$at_check_line_file"
-if test -n "$at_trace_this"; then
- ( $at_traceon; test -z "$PYTHON" && exit 77 || env PYTHONPATH=../../../tools/python/.libs $PYTHON ../../test_read.py ) >"$at_stdout" 2>"$at_stder1"
- at_status=$?
- grep '^ *+' "$at_stder1" >&2
- grep -v '^ *+' "$at_stder1" >"$at_stderr"
+if test -n "$at_traceon" \
+ && at_func_check_newline "$VALGRIND testall -large $STARGS"; then
+ ( $at_traceon; $VALGRIND testall -large $STARGS ) >"$at_stdout" 2>"$at_stder1"
+ at_func_filter_trace $?
else
- ( :; test -z "$PYTHON" && exit 77 || env PYTHONPATH=../../../tools/python/.libs $PYTHON ../../test_read.py ) >"$at_stdout" 2>"$at_stderr"
- at_status=$?
+ ( :; $VALGRIND testall -large $STARGS ) >"$at_stdout" 2>"$at_stderr"
fi
-
+at_status=$?
at_failed=false
-echo stderr:; cat "$at_stderr"
+at_func_diff_devnull "$at_stderr" || at_failed=:
echo stdout:; cat "$at_stdout"
-case $at_status in
- 77) echo 77 > "$at_status_file"; exit 77;;
- 0) ;;
- *) echo "$at_srcdir/testsuite.at:210: exit code was $at_status, expected 0"
- at_failed=:;;
-esac
-if $at_failed; then
-
-
- echo 1 > "$at_status_file"
- exit 1
-fi
-
-$at_traceon
-
- $at_traceoff
- $at_times_p && times >"$at_times_file"
- ) 5>&1 2>&1 | eval $at_tee_pipe
- at_status=`cat "$at_status_file"`
- ;;
-
- 41 ) # 41. testsuite.at:212: write
- at_setup_line='testsuite.at:212'
- at_desc="write"
- $at_quiet $ECHO_N " 41: write $ECHO_C"
- at_xfail=no
- echo "# -*- compilation -*-" >> "$at_group_log"
- (
- echo "41. testsuite.at:212: testing ..."
- $at_traceon
-
-
-cat >expout <<'_ATEOF'
-toc=nvar = 12
-var_names = (_fileinfo, _silolibinfo, t1, t10, t11, t2, t3, t4, t5, t6, t7, t8)
-ndir = 1
-dir_names = (a)
-
-t2='hello'
-t6= (1.2, 10.199999999999999)
-a/t8='x2'
-t9=x3
-/t5= (1.2, 10.0)
-_ATEOF
-
-$at_traceoff
-echo "$at_srcdir/testsuite.at:225: test -z \"\$PYTHON\" && exit 77 || env PYTHONPATH=../../../tools/python/.libs \$PYTHON ../../test_write.py"
-echo testsuite.at:225 >"$at_check_line_file"
-
-at_trace_this=
-if test -n "$at_traceon"; then
- case "test -z \"$PYTHON\" && exit 77 || env PYTHONPATH=../../../tools/python/.libs $PYTHON ../../test_write.py" in
- *'
-'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;;
- *) at_trace_this=yes ;;
- esac
-fi
-
-if test -n "$at_trace_this"; then
- ( $at_traceon; test -z "$PYTHON" && exit 77 || env PYTHONPATH=../../../tools/python/.libs $PYTHON ../../test_write.py ) >"$at_stdout" 2>"$at_stder1"
- at_status=$?
- grep '^ *+' "$at_stder1" >&2
- grep -v '^ *+' "$at_stder1" >"$at_stderr"
-else
- ( :; test -z "$PYTHON" && exit 77 || env PYTHONPATH=../../../tools/python/.libs $PYTHON ../../test_write.py ) >"$at_stdout" 2>"$at_stderr"
- at_status=$?
-fi
-
-at_failed=false
-echo stderr:; cat "$at_stderr"
-$at_diff expout "$at_stdout" || at_failed=:
-case $at_status in
- 77) echo 77 > "$at_status_file"; exit 77;;
- 0) ;;
- *) echo "$at_srcdir/testsuite.at:225: exit code was $at_status, expected 0"
- at_failed=:;;
-esac
-if $at_failed; then
-
-
- echo 1 > "$at_status_file"
- exit 1
-fi
-
-$at_traceon
-
- $at_traceoff
- $at_times_p && times >"$at_times_file"
- ) 5>&1 2>&1 | eval $at_tee_pipe
- at_status=`cat "$at_status_file"`
- ;;
-
- 42 ) # 42. testsuite.at:227: error handling
- at_setup_line='testsuite.at:227'
- at_desc="error handling"
- $at_quiet $ECHO_N " 42: error handling $ECHO_C"
- at_xfail=no
- echo "# -*- compilation -*-" >> "$at_group_log"
- (
- echo "42. testsuite.at:227: testing ..."
- $at_traceon
-
-
-$at_traceoff
-echo "$at_srcdir/testsuite.at:229: multi_test \$STARGS hdf-friendly"
-echo testsuite.at:229 >"$at_check_line_file"
-
-at_trace_this=
-if test -n "$at_traceon"; then
- case "multi_test $STARGS hdf-friendly" in
- *'
-'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;;
- *) at_trace_this=yes ;;
- esac
-fi
-
-if test -n "$at_trace_this"; then
- ( $at_traceon; multi_test $STARGS hdf-friendly ) >"$at_stdout" 2>"$at_stder1"
- at_status=$?
- grep '^ *+' "$at_stder1" >&2
- grep -v '^ *+' "$at_stder1" >"$at_stderr"
-else
- ( :; multi_test $STARGS hdf-friendly ) >"$at_stdout" 2>"$at_stderr"
- at_status=$?
-fi
-
-at_failed=false
-$at_diff "$at_devnull" "$at_stderr" || at_failed=:
-echo stdout:; cat "$at_stdout"
-case $at_status in
- 77) echo 77 > "$at_status_file"; exit 77;;
- 0) ;;
- *) echo "$at_srcdir/testsuite.at:229: exit code was $at_status, expected 0"
- at_failed=:;;
-esac
-if $at_failed; then
-
-
- echo 1 > "$at_status_file"
- exit 1
-fi
-
-$at_traceon
- # generate data for python tests
-$at_traceoff
-echo "$at_srcdir/testsuite.at:230: test -z \"\$PYTHON\" && exit 77 || env PYTHONPATH=../../../tools/python/.libs \$PYTHON ../../test_error.py"
-echo testsuite.at:230 >"$at_check_line_file"
-
-at_trace_this=
-if test -n "$at_traceon"; then
- case "test -z \"$PYTHON\" && exit 77 || env PYTHONPATH=../../../tools/python/.libs $PYTHON ../../test_error.py" in
- *'
-'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;;
- *) at_trace_this=yes ;;
- esac
-fi
-
-if test -n "$at_trace_this"; then
- ( $at_traceon; test -z "$PYTHON" && exit 77 || env PYTHONPATH=../../../tools/python/.libs $PYTHON ../../test_error.py ) >"$at_stdout" 2>"$at_stder1"
- at_status=$?
- grep '^ *+' "$at_stder1" >&2
- grep -v '^ *+' "$at_stder1" >"$at_stderr"
-else
- ( :; test -z "$PYTHON" && exit 77 || env PYTHONPATH=../../../tools/python/.libs $PYTHON ../../test_error.py ) >"$at_stdout" 2>"$at_stderr"
- at_status=$?
-fi
-
-at_failed=false
-echo stderr:; cat "$at_stderr"
-echo stdout:; cat "$at_stdout"
-case $at_status in
- 77) echo 77 > "$at_status_file"; exit 77;;
- 0) ;;
- *) echo "$at_srcdir/testsuite.at:230: exit code was $at_status, expected 0"
- at_failed=:;;
-esac
-if $at_failed; then
-
-
- echo 1 > "$at_status_file"
- exit 1
-fi
-
-$at_traceon
-
- $at_traceoff
- $at_times_p && times >"$at_times_file"
- ) 5>&1 2>&1 | eval $at_tee_pipe
- at_status=`cat "$at_status_file"`
- ;;
-
-
- banner-3 ) # Banner 3. testsuite.at:233
- cat <<\_ATEOF
-
-PDB Specific
-
-_ATEOF
- ;;
-
- 43 ) # 43. testsuite.at:234: testpdb
- at_setup_line='testsuite.at:234'
- at_desc="testpdb"
- $at_quiet $ECHO_N " 43: testpdb $ECHO_C"
- at_xfail=no
- echo "# -*- compilation -*-" >> "$at_group_log"
- (
- echo "43. testsuite.at:234: testing ..."
- $at_traceon
-
-$at_traceoff
-echo "$at_srcdir/testsuite.at:235: test \"\$STARGS\" = DB_HDF5 && exit 77 || \$VALGRIND testpdb"
-echo testsuite.at:235 >"$at_check_line_file"
-
-at_trace_this=
-if test -n "$at_traceon"; then
- case "test \"$STARGS\" = DB_HDF5 && exit 77 || $VALGRIND testpdb" in
- *'
-'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;;
- *) at_trace_this=yes ;;
- esac
-fi
-
-if test -n "$at_trace_this"; then
- ( $at_traceon; test "$STARGS" = DB_HDF5 && exit 77 || $VALGRIND testpdb ) >"$at_stdout" 2>"$at_stder1"
- at_status=$?
- grep '^ *+' "$at_stder1" >&2
- grep -v '^ *+' "$at_stder1" >"$at_stderr"
-else
- ( :; test "$STARGS" = DB_HDF5 && exit 77 || $VALGRIND testpdb ) >"$at_stdout" 2>"$at_stderr"
- at_status=$?
-fi
-
-at_failed=false
-$at_diff "$at_devnull" "$at_stderr" || at_failed=:
-echo stdout:; cat "$at_stdout"
-case $at_status in
- 77) echo 77 > "$at_status_file"; exit 77;;
- *);;
-esac
-if $at_failed; then
-
-
- echo 1 > "$at_status_file"
- exit 1
-fi
-
-$at_traceon
-
- $at_traceoff
- $at_times_p && times >"$at_times_file"
- ) 5>&1 2>&1 | eval $at_tee_pipe
- at_status=`cat "$at_status_file"`
- ;;
-
-
- banner-4 ) # Banner 4. testsuite.at:238
- cat <<\_ATEOF
-
-HDF5 Specific
-
-_ATEOF
- ;;
-
- 44 ) # 44. testsuite.at:239: grab
- at_setup_line='testsuite.at:239'
- at_desc="grab"
- $at_quiet $ECHO_N " 44: grab $ECHO_C"
- at_xfail=no
- echo "# -*- compilation -*-" >> "$at_group_log"
- (
- echo "44. testsuite.at:239: testing ..."
- $at_traceon
-
-$at_traceoff
-echo "$at_srcdir/testsuite.at:240: test \"\$STARGS\" != DB_HDF5 && exit 77 || \$VALGRIND grab"
-echo testsuite.at:240 >"$at_check_line_file"
-
-at_trace_this=
-if test -n "$at_traceon"; then
- case "test \"$STARGS\" != DB_HDF5 && exit 77 || $VALGRIND grab" in
- *'
-'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;;
- *) at_trace_this=yes ;;
- esac
-fi
-
-if test -n "$at_trace_this"; then
- ( $at_traceon; test "$STARGS" != DB_HDF5 && exit 77 || $VALGRIND grab ) >"$at_stdout" 2>"$at_stder1"
- at_status=$?
- grep '^ *+' "$at_stder1" >&2
- grep -v '^ *+' "$at_stder1" >"$at_stderr"
-else
- ( :; test "$STARGS" != DB_HDF5 && exit 77 || $VALGRIND grab ) >"$at_stdout" 2>"$at_stderr"
- at_status=$?
-fi
-
-at_failed=false
-echo stderr:; cat "$at_stderr"
-echo stdout:; cat "$at_stdout"
-case $at_status in
- 77) echo 77 > "$at_status_file"; exit 77;;
- 0) ;;
- *) echo "$at_srcdir/testsuite.at:240: exit code was $at_status, expected 0"
- at_failed=:;;
-esac
-if $at_failed; then
-
-
- echo 1 > "$at_status_file"
- exit 1
-fi
-
-$at_traceon
-
- $at_traceoff
- $at_times_p && times >"$at_times_file"
- ) 5>&1 2>&1 | eval $at_tee_pipe
- at_status=`cat "$at_status_file"`
- ;;
-
- 45 ) # 45. testsuite.at:242: compression gzip
- at_setup_line='testsuite.at:242'
- at_desc="compression gzip"
- $at_quiet $ECHO_N " 45: compression gzip $ECHO_C"
- at_xfail=no
- echo "# -*- compilation -*-" >> "$at_group_log"
- (
- echo "45. testsuite.at:242: testing ..."
- $at_traceon
-
-
-$at_traceoff
-echo "$at_srcdir/testsuite.at:244: test \"\$STARGS\" != DB_HDF5 && exit 77 || \$VALGRIND compression gzip"
-echo testsuite.at:244 >"$at_check_line_file"
-
-at_trace_this=
-if test -n "$at_traceon"; then
- case "test \"$STARGS\" != DB_HDF5 && exit 77 || $VALGRIND compression gzip" in
- *'
-'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;;
- *) at_trace_this=yes ;;
- esac
-fi
-
-if test -n "$at_trace_this"; then
- ( $at_traceon; test "$STARGS" != DB_HDF5 && exit 77 || $VALGRIND compression gzip ) >"$at_stdout" 2>"$at_stder1"
- at_status=$?
- grep '^ *+' "$at_stder1" >&2
- grep -v '^ *+' "$at_stder1" >"$at_stderr"
-else
- ( :; test "$STARGS" != DB_HDF5 && exit 77 || $VALGRIND compression gzip ) >"$at_stdout" 2>"$at_stderr"
- at_status=$?
-fi
-
-at_failed=false
-echo stderr:; cat "$at_stderr"
-echo stdout:; cat "$at_stdout"
-case $at_status in
- 77) echo 77 > "$at_status_file"; exit 77;;
- 0) ;;
- *) echo "$at_srcdir/testsuite.at:244: exit code was $at_status, expected 0"
- at_failed=:;;
-esac
-if $at_failed; then
-
-
- echo 1 > "$at_status_file"
- exit 1
-fi
-
-$at_traceon
-
-$at_traceoff
-echo "$at_srcdir/testsuite.at:245: test \"\$STARGS\" != DB_HDF5 && exit 77 || \$VALGRIND compression readonly"
-echo testsuite.at:245 >"$at_check_line_file"
-
-at_trace_this=
-if test -n "$at_traceon"; then
- case "test \"$STARGS\" != DB_HDF5 && exit 77 || $VALGRIND compression readonly" in
- *'
-'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;;
- *) at_trace_this=yes ;;
- esac
-fi
-
-if test -n "$at_trace_this"; then
- ( $at_traceon; test "$STARGS" != DB_HDF5 && exit 77 || $VALGRIND compression readonly ) >"$at_stdout" 2>"$at_stder1"
- at_status=$?
- grep '^ *+' "$at_stder1" >&2
- grep -v '^ *+' "$at_stder1" >"$at_stderr"
-else
- ( :; test "$STARGS" != DB_HDF5 && exit 77 || $VALGRIND compression readonly ) >"$at_stdout" 2>"$at_stderr"
- at_status=$?
-fi
-
-at_failed=false
-echo stderr:; cat "$at_stderr"
-echo stdout:; cat "$at_stdout"
-case $at_status in
- 77) echo 77 > "$at_status_file"; exit 77;;
- 0) ;;
- *) echo "$at_srcdir/testsuite.at:245: exit code was $at_status, expected 0"
- at_failed=:;;
-esac
-if $at_failed; then
-
-
- echo 1 > "$at_status_file"
- exit 1
-fi
-
-$at_traceon
-
- $at_traceoff
- $at_times_p && times >"$at_times_file"
- ) 5>&1 2>&1 | eval $at_tee_pipe
- at_status=`cat "$at_status_file"`
- ;;
-
- 46 ) # 46. testsuite.at:247: compression szip
- at_setup_line='testsuite.at:247'
- at_desc="compression szip"
- $at_quiet $ECHO_N " 46: compression szip $ECHO_C"
- at_xfail=no
- echo "# -*- compilation -*-" >> "$at_group_log"
- (
- echo "46. testsuite.at:247: testing ..."
- $at_traceon
-
-
-$at_traceoff
-echo "$at_srcdir/testsuite.at:249: test \"\$STARGS\" != DB_HDF5 && exit 77 || \$VALGRIND compression szip"
-echo testsuite.at:249 >"$at_check_line_file"
-
-at_trace_this=
-if test -n "$at_traceon"; then
- case "test \"$STARGS\" != DB_HDF5 && exit 77 || $VALGRIND compression szip" in
- *'
-'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;;
- *) at_trace_this=yes ;;
- esac
-fi
-
-if test -n "$at_trace_this"; then
- ( $at_traceon; test "$STARGS" != DB_HDF5 && exit 77 || $VALGRIND compression szip ) >"$at_stdout" 2>"$at_stder1"
- at_status=$?
- grep '^ *+' "$at_stder1" >&2
- grep -v '^ *+' "$at_stder1" >"$at_stderr"
-else
- ( :; test "$STARGS" != DB_HDF5 && exit 77 || $VALGRIND compression szip ) >"$at_stdout" 2>"$at_stderr"
- at_status=$?
-fi
-
-at_failed=false
-echo stderr:; cat "$at_stderr"
-echo stdout:; cat "$at_stdout"
-case $at_status in
- 77) echo 77 > "$at_status_file"; exit 77;;
- 0) ;;
- *) echo "$at_srcdir/testsuite.at:249: exit code was $at_status, expected 0"
- at_failed=:;;
-esac
-if $at_failed; then
-
-
- echo 1 > "$at_status_file"
- exit 1
-fi
-
-$at_traceon
-
-$at_traceoff
-echo "$at_srcdir/testsuite.at:250: test \"\$STARGS\" != DB_HDF5 && exit 77 || \$VALGRIND compression readonly"
-echo testsuite.at:250 >"$at_check_line_file"
-
-at_trace_this=
-if test -n "$at_traceon"; then
- case "test \"$STARGS\" != DB_HDF5 && exit 77 || $VALGRIND compression readonly" in
- *'
-'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;;
- *) at_trace_this=yes ;;
- esac
-fi
-
-if test -n "$at_trace_this"; then
- ( $at_traceon; test "$STARGS" != DB_HDF5 && exit 77 || $VALGRIND compression readonly ) >"$at_stdout" 2>"$at_stder1"
- at_status=$?
- grep '^ *+' "$at_stder1" >&2
- grep -v '^ *+' "$at_stder1" >"$at_stderr"
-else
- ( :; test "$STARGS" != DB_HDF5 && exit 77 || $VALGRIND compression readonly ) >"$at_stdout" 2>"$at_stderr"
- at_status=$?
-fi
-
-at_failed=false
-echo stderr:; cat "$at_stderr"
-echo stdout:; cat "$at_stdout"
-case $at_status in
- 77) echo 77 > "$at_status_file"; exit 77;;
- 0) ;;
- *) echo "$at_srcdir/testsuite.at:250: exit code was $at_status, expected 0"
- at_failed=:;;
-esac
-if $at_failed; then
-
-
- echo 1 > "$at_status_file"
- exit 1
-fi
-
-$at_traceon
-
- $at_traceoff
- $at_times_p && times >"$at_times_file"
- ) 5>&1 2>&1 | eval $at_tee_pipe
- at_status=`cat "$at_status_file"`
- ;;
-
- 47 ) # 47. testsuite.at:252: compression fpzip
- at_setup_line='testsuite.at:252'
- at_desc="compression fpzip"
- $at_quiet $ECHO_N " 47: compression fpzip $ECHO_C"
- at_xfail=no
- echo "# -*- compilation -*-" >> "$at_group_log"
- (
- echo "47. testsuite.at:252: testing ..."
- $at_traceon
-
-
-$at_traceoff
-echo "$at_srcdir/testsuite.at:254: test ! \\( -e ../src/fpzip/read.o -o -e ../../../src/fpzip/read.o \\) -o \"\$STARGS\" != DB_HDF5 && exit 77 || \$VALGRIND compression fpzip"
-echo testsuite.at:254 >"$at_check_line_file"
-
-at_trace_this=
-if test -n "$at_traceon"; then
- case "test ! \\( -e ../src/fpzip/read.o -o -e ../../../src/fpzip/read.o \\) -o \"$STARGS\" != DB_HDF5 && exit 77 || $VALGRIND compression fpzip" in
- *'
-'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;;
- *) at_trace_this=yes ;;
- esac
-fi
-
-if test -n "$at_trace_this"; then
- ( $at_traceon; test ! \( -e ../src/fpzip/read.o -o -e ../../../src/fpzip/read.o \) -o "$STARGS" != DB_HDF5 && exit 77 || $VALGRIND compression fpzip ) >"$at_stdout" 2>"$at_stder1"
- at_status=$?
- grep '^ *+' "$at_stder1" >&2
- grep -v '^ *+' "$at_stder1" >"$at_stderr"
-else
- ( :; test ! \( -e ../src/fpzip/read.o -o -e ../../../src/fpzip/read.o \) -o "$STARGS" != DB_HDF5 && exit 77 || $VALGRIND compression fpzip ) >"$at_stdout" 2>"$at_stderr"
- at_status=$?
-fi
-
-at_failed=false
-echo stderr:; cat "$at_stderr"
-echo stdout:; cat "$at_stdout"
-case $at_status in
- 77) echo 77 > "$at_status_file"; exit 77;;
- 0) ;;
- *) echo "$at_srcdir/testsuite.at:254: exit code was $at_status, expected 0"
- at_failed=:;;
-esac
-if $at_failed; then
-
-
- echo 1 > "$at_status_file"
- exit 1
-fi
-
-$at_traceon
-
-$at_traceoff
-echo "$at_srcdir/testsuite.at:255: test ! \\( -e ../src/fpzip/read.o -o -e ../../../src/fpzip/read.o \\) -o \"\$STARGS\" != DB_HDF5 && exit 77 || \$VALGRIND compression readonly"
-echo testsuite.at:255 >"$at_check_line_file"
-
-at_trace_this=
-if test -n "$at_traceon"; then
- case "test ! \\( -e ../src/fpzip/read.o -o -e ../../../src/fpzip/read.o \\) -o \"$STARGS\" != DB_HDF5 && exit 77 || $VALGRIND compression readonly" in
- *'
-'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;;
- *) at_trace_this=yes ;;
- esac
-fi
-
-if test -n "$at_trace_this"; then
- ( $at_traceon; test ! \( -e ../src/fpzip/read.o -o -e ../../../src/fpzip/read.o \) -o "$STARGS" != DB_HDF5 && exit 77 || $VALGRIND compression readonly ) >"$at_stdout" 2>"$at_stder1"
- at_status=$?
- grep '^ *+' "$at_stder1" >&2
- grep -v '^ *+' "$at_stder1" >"$at_stderr"
-else
- ( :; test ! \( -e ../src/fpzip/read.o -o -e ../../../src/fpzip/read.o \) -o "$STARGS" != DB_HDF5 && exit 77 || $VALGRIND compression readonly ) >"$at_stdout" 2>"$at_stderr"
- at_status=$?
-fi
-
-at_failed=false
-echo stderr:; cat "$at_stderr"
-echo stdout:; cat "$at_stdout"
-case $at_status in
- 77) echo 77 > "$at_status_file"; exit 77;;
- 0) ;;
- *) echo "$at_srcdir/testsuite.at:255: exit code was $at_status, expected 0"
- at_failed=:;;
-esac
-if $at_failed; then
-
-
- echo 1 > "$at_status_file"
- exit 1
-fi
-
-$at_traceon
-
- $at_traceoff
- $at_times_p && times >"$at_times_file"
- ) 5>&1 2>&1 | eval $at_tee_pipe
- at_status=`cat "$at_status_file"`
- ;;
-
- 48 ) # 48. testsuite.at:257: compression lossy3
- at_setup_line='testsuite.at:257'
- at_desc="compression lossy3"
- $at_quiet $ECHO_N " 48: compression lossy3 $ECHO_C"
- at_xfail=no
- echo "# -*- compilation -*-" >> "$at_group_log"
- (
- echo "48. testsuite.at:257: testing ..."
- $at_traceon
-
-
-$at_traceoff
-echo "$at_srcdir/testsuite.at:259: test ! \\( -e ../src/fpzip/read.o -o -e ../../../src/fpzip/read.o \\) -o \"\$STARGS\" != DB_HDF5 && exit 77 || \$VALGRIND compression lossy3"
-echo testsuite.at:259 >"$at_check_line_file"
-
-at_trace_this=
-if test -n "$at_traceon"; then
- case "test ! \\( -e ../src/fpzip/read.o -o -e ../../../src/fpzip/read.o \\) -o \"$STARGS\" != DB_HDF5 && exit 77 || $VALGRIND compression lossy3" in
- *'
-'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;;
- *) at_trace_this=yes ;;
- esac
-fi
-
-if test -n "$at_trace_this"; then
- ( $at_traceon; test ! \( -e ../src/fpzip/read.o -o -e ../../../src/fpzip/read.o \) -o "$STARGS" != DB_HDF5 && exit 77 || $VALGRIND compression lossy3 ) >"$at_stdout" 2>"$at_stder1"
- at_status=$?
- grep '^ *+' "$at_stder1" >&2
- grep -v '^ *+' "$at_stder1" >"$at_stderr"
-else
- ( :; test ! \( -e ../src/fpzip/read.o -o -e ../../../src/fpzip/read.o \) -o "$STARGS" != DB_HDF5 && exit 77 || $VALGRIND compression lossy3 ) >"$at_stdout" 2>"$at_stderr"
- at_status=$?
-fi
-
-at_failed=false
-echo stderr:; cat "$at_stderr"
-echo stdout:; cat "$at_stdout"
-case $at_status in
- 77) echo 77 > "$at_status_file"; exit 77;;
- 0) ;;
- *) echo "$at_srcdir/testsuite.at:259: exit code was $at_status, expected 0"
- at_failed=:;;
-esac
-if $at_failed; then
-
-
- echo 1 > "$at_status_file"
- exit 1
-fi
-
-$at_traceon
-
-$at_traceoff
-echo "$at_srcdir/testsuite.at:260: test ! \\( -e ../src/fpzip/read.o -o -e ../../../src/fpzip/read.o \\) -o \"\$STARGS\" != DB_HDF5 && exit 77 || \$VALGRIND compression readonly"
-echo testsuite.at:260 >"$at_check_line_file"
-
-at_trace_this=
-if test -n "$at_traceon"; then
- case "test ! \\( -e ../src/fpzip/read.o -o -e ../../../src/fpzip/read.o \\) -o \"$STARGS\" != DB_HDF5 && exit 77 || $VALGRIND compression readonly" in
- *'
-'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;;
- *) at_trace_this=yes ;;
- esac
-fi
-
-if test -n "$at_trace_this"; then
- ( $at_traceon; test ! \( -e ../src/fpzip/read.o -o -e ../../../src/fpzip/read.o \) -o "$STARGS" != DB_HDF5 && exit 77 || $VALGRIND compression readonly ) >"$at_stdout" 2>"$at_stder1"
- at_status=$?
- grep '^ *+' "$at_stder1" >&2
- grep -v '^ *+' "$at_stder1" >"$at_stderr"
-else
- ( :; test ! \( -e ../src/fpzip/read.o -o -e ../../../src/fpzip/read.o \) -o "$STARGS" != DB_HDF5 && exit 77 || $VALGRIND compression readonly ) >"$at_stdout" 2>"$at_stderr"
- at_status=$?
-fi
-
-at_failed=false
-echo stderr:; cat "$at_stderr"
-echo stdout:; cat "$at_stdout"
-case $at_status in
- 77) echo 77 > "$at_status_file"; exit 77;;
- 50) ;;
- *) echo "$at_srcdir/testsuite.at:260: exit code was $at_status, expected 50"
- at_failed=:;;
-esac
-if $at_failed; then
-
-
- echo 1 > "$at_status_file"
- exit 1
-fi
-
-$at_traceon
-
- $at_traceoff
- $at_times_p && times >"$at_times_file"
- ) 5>&1 2>&1 | eval $at_tee_pipe
- at_status=`cat "$at_status_file"`
- ;;
-
- 49 ) # 49. testsuite.at:262: compression minratio1000
- at_setup_line='testsuite.at:262'
- at_desc="compression minratio1000"
- $at_quiet $ECHO_N " 49: compression minratio1000 $ECHO_C"
- at_xfail=no
- echo "# -*- compilation -*-" >> "$at_group_log"
- (
- echo "49. testsuite.at:262: testing ..."
- $at_traceon
-
-
-$at_traceoff
-echo "$at_srcdir/testsuite.at:264: test ! \\( -e ../src/fpzip/read.o -o -e ../../../src/fpzip/read.o \\) -o \"\$STARGS\" != DB_HDF5 && exit 77 || \$VALGRIND compression minratio1000"
-echo testsuite.at:264 >"$at_check_line_file"
-
-at_trace_this=
-if test -n "$at_traceon"; then
- case "test ! \\( -e ../src/fpzip/read.o -o -e ../../../src/fpzip/read.o \\) -o \"$STARGS\" != DB_HDF5 && exit 77 || $VALGRIND compression minratio1000" in
- *'
-'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;;
- *) at_trace_this=yes ;;
- esac
-fi
-
-if test -n "$at_trace_this"; then
- ( $at_traceon; test ! \( -e ../src/fpzip/read.o -o -e ../../../src/fpzip/read.o \) -o "$STARGS" != DB_HDF5 && exit 77 || $VALGRIND compression minratio1000 ) >"$at_stdout" 2>"$at_stder1"
- at_status=$?
- grep '^ *+' "$at_stder1" >&2
- grep -v '^ *+' "$at_stder1" >"$at_stderr"
-else
- ( :; test ! \( -e ../src/fpzip/read.o -o -e ../../../src/fpzip/read.o \) -o "$STARGS" != DB_HDF5 && exit 77 || $VALGRIND compression minratio1000 ) >"$at_stdout" 2>"$at_stderr"
- at_status=$?
-fi
-
-at_failed=false
-echo stderr:; cat "$at_stderr"
-echo stdout:; cat "$at_stdout"
-case $at_status in
- 77) echo 77 > "$at_status_file"; exit 77;;
- 1) ;;
- *) echo "$at_srcdir/testsuite.at:264: exit code was $at_status, expected 1"
- at_failed=:;;
-esac
-if $at_failed; then
-
-
- echo 1 > "$at_status_file"
- exit 1
-fi
-
-$at_traceon
-
- $at_traceoff
- $at_times_p && times >"$at_times_file"
- ) 5>&1 2>&1 | eval $at_tee_pipe
- at_status=`cat "$at_status_file"`
- ;;
-
- 50 ) # 50. testsuite.at:266: testhzip
- at_setup_line='testsuite.at:266'
- at_desc="testhzip"
- $at_quiet $ECHO_N " 50: testhzip $ECHO_C"
- at_xfail=no
- echo "# -*- compilation -*-" >> "$at_group_log"
- (
- echo "50. testsuite.at:266: testing ..."
- $at_traceon
-
-
-$at_traceoff
-echo "$at_srcdir/testsuite.at:268: test ! \\( -e ../src/hzip/hzutil.o -o -e ../../../src/hzip/hzutil.o \\) -o -z \"\$BROWSER\" -o \"\$STARGS\" != DB_HDF5 && exit 77 || \$VALGRIND testhzip \`pwd\`"
-echo testsuite.at:268 >"$at_check_line_file"
-
-at_trace_this=
-if test -n "$at_traceon"; then
- echo 'Not enabling shell tracing (command contains a `...` command substitution)'
-fi
-
-if test -n "$at_trace_this"; then
- ( $at_traceon; test ! \( -e ../src/hzip/hzutil.o -o -e ../../../src/hzip/hzutil.o \) -o -z "$BROWSER" -o "$STARGS" != DB_HDF5 && exit 77 || $VALGRIND testhzip `pwd` ) >"$at_stdout" 2>"$at_stder1"
- at_status=$?
- grep '^ *+' "$at_stder1" >&2
- grep -v '^ *+' "$at_stder1" >"$at_stderr"
-else
- ( :; test ! \( -e ../src/hzip/hzutil.o -o -e ../../../src/hzip/hzutil.o \) -o -z "$BROWSER" -o "$STARGS" != DB_HDF5 && exit 77 || $VALGRIND testhzip `pwd` ) >"$at_stdout" 2>"$at_stderr"
- at_status=$?
-fi
-
-at_failed=false
-echo stderr:; cat "$at_stderr"
-echo stdout:; cat "$at_stdout"
-case $at_status in
- 77) echo 77 > "$at_status_file"; exit 77;;
- 0) ;;
- *) echo "$at_srcdir/testsuite.at:268: exit code was $at_status, expected 0"
- at_failed=:;;
-esac
-if $at_failed; then
-
-
- echo 1 > "$at_status_file"
- exit 1
-fi
-
-$at_traceon
-
- $at_traceoff
- $at_times_p && times >"$at_times_file"
- ) 5>&1 2>&1 | eval $at_tee_pipe
- at_status=`cat "$at_status_file"`
- ;;
-
- 51 ) # 51. testsuite.at:270: checksums
- at_setup_line='testsuite.at:270'
- at_desc="checksums"
- $at_quiet $ECHO_N " 51: checksums $ECHO_C"
- at_xfail=no
- echo "# -*- compilation -*-" >> "$at_group_log"
- (
- echo "51. testsuite.at:270: testing ..."
- $at_traceon
-
-$at_traceoff
-echo "$at_srcdir/testsuite.at:271: test -z \"\$BROWSER\" -o \"\$STARGS\" != DB_HDF5 && exit 77 || \$VALGRIND checksums \`pwd\`"
-echo testsuite.at:271 >"$at_check_line_file"
-
-at_trace_this=
-if test -n "$at_traceon"; then
- echo 'Not enabling shell tracing (command contains a `...` command substitution)'
-fi
-
-if test -n "$at_trace_this"; then
- ( $at_traceon; test -z "$BROWSER" -o "$STARGS" != DB_HDF5 && exit 77 || $VALGRIND checksums `pwd` ) >"$at_stdout" 2>"$at_stder1"
- at_status=$?
- grep '^ *+' "$at_stder1" >&2
- grep -v '^ *+' "$at_stder1" >"$at_stderr"
-else
- ( :; test -z "$BROWSER" -o "$STARGS" != DB_HDF5 && exit 77 || $VALGRIND checksums `pwd` ) >"$at_stdout" 2>"$at_stderr"
- at_status=$?
-fi
-
-at_failed=false
-echo stderr:; cat "$at_stderr"
-echo stdout:; cat "$at_stdout"
-case $at_status in
- 77) echo 77 > "$at_status_file"; exit 77;;
- 0) ;;
- *) echo "$at_srcdir/testsuite.at:271: exit code was $at_status, expected 0"
- at_failed=:;;
-esac
-if $at_failed; then
-
-
- echo 1 > "$at_status_file"
- exit 1
-fi
-
-$at_traceon
-
- $at_traceoff
- $at_times_p && times >"$at_times_file"
- ) 5>&1 2>&1 | eval $at_tee_pipe
- at_status=`cat "$at_status_file"`
- ;;
-
- 52 ) # 52. testsuite.at:273: xversion
- at_setup_line='testsuite.at:273'
- at_desc="xversion"
- $at_quiet $ECHO_N " 52: xversion $ECHO_C"
- at_xfail=no
- echo "# -*- compilation -*-" >> "$at_group_log"
- (
- echo "52. testsuite.at:273: testing ..."
- $at_traceon
-
-$at_traceoff
-echo "$at_srcdir/testsuite.at:274: test -z \"\$BROWSER\" -o \"\$STARGS\" != DB_HDF5 && exit 77 || \$VALGRIND testxvers \`pwd\`"
-echo testsuite.at:274 >"$at_check_line_file"
-
-at_trace_this=
-if test -n "$at_traceon"; then
- echo 'Not enabling shell tracing (command contains a `...` command substitution)'
-fi
-
-if test -n "$at_trace_this"; then
- ( $at_traceon; test -z "$BROWSER" -o "$STARGS" != DB_HDF5 && exit 77 || $VALGRIND testxvers `pwd` ) >"$at_stdout" 2>"$at_stder1"
- at_status=$?
- grep '^ *+' "$at_stder1" >&2
- grep -v '^ *+' "$at_stder1" >"$at_stderr"
-else
- ( :; test -z "$BROWSER" -o "$STARGS" != DB_HDF5 && exit 77 || $VALGRIND testxvers `pwd` ) >"$at_stdout" 2>"$at_stderr"
- at_status=$?
-fi
-
-at_failed=false
-echo stderr:; cat "$at_stderr"
-echo stdout:; cat "$at_stdout"
-case $at_status in
- 77) echo 77 > "$at_status_file"; exit 77;;
- 0) ;;
- *) echo "$at_srcdir/testsuite.at:274: exit code was $at_status, expected 0"
- at_failed=:;;
-esac
-if $at_failed; then
-
-
- echo 1 > "$at_status_file"
- exit 1
-fi
-
-$at_traceon
-
- $at_traceoff
- $at_times_p && times >"$at_times_file"
- ) 5>&1 2>&1 | eval $at_tee_pipe
- at_status=`cat "$at_status_file"`
- ;;
-
- 53 ) # 53. testsuite.at:276: largefile
- at_setup_line='testsuite.at:276'
- at_desc="largefile"
- $at_quiet $ECHO_N " 53: largefile $ECHO_C"
- at_xfail=no
- echo "# -*- compilation -*-" >> "$at_group_log"
- (
- echo "53. testsuite.at:276: testing ..."
- $at_traceon
-
-
-$at_traceoff
-echo "$at_srcdir/testsuite.at:278: test \"\$STARGS\" != DB_HDF5 && exit 77 || \$VALGRIND largefile"
-echo testsuite.at:278 >"$at_check_line_file"
-
-at_trace_this=
-if test -n "$at_traceon"; then
- case "test \"$STARGS\" != DB_HDF5 && exit 77 || $VALGRIND largefile" in
- *'
-'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;;
- *) at_trace_this=yes ;;
- esac
-fi
-
-if test -n "$at_trace_this"; then
- ( $at_traceon; test "$STARGS" != DB_HDF5 && exit 77 || $VALGRIND largefile ) >"$at_stdout" 2>"$at_stder1"
- at_status=$?
- grep '^ *+' "$at_stder1" >&2
- grep -v '^ *+' "$at_stder1" >"$at_stderr"
-else
- ( :; test "$STARGS" != DB_HDF5 && exit 77 || $VALGRIND largefile ) >"$at_stdout" 2>"$at_stderr"
- at_status=$?
-fi
-
-at_failed=false
-echo stderr:; cat "$at_stderr"
-echo stdout:; cat "$at_stdout"
-case $at_status in
- 77) echo 77 > "$at_status_file"; exit 77;;
- 0) ;;
- *) echo "$at_srcdir/testsuite.at:278: exit code was $at_status, expected 0"
- at_failed=:;;
-esac
-if $at_failed; then
-
-
- echo 1 > "$at_status_file"
- exit 1
-fi
-
-$at_traceon
-
- $at_traceoff
- $at_times_p && times >"$at_times_file"
- ) 5>&1 2>&1 | eval $at_tee_pipe
- at_status=`cat "$at_status_file"`
- ;;
-
-
- banner-5 ) # Banner 5. testsuite.at:281
- cat <<\_ATEOF
-
-Fortran
-
-_ATEOF
- ;;
-
- 54 ) # 54. testsuite.at:282: arrayf77
- at_setup_line='testsuite.at:282'
- at_desc="arrayf77"
- $at_quiet $ECHO_N " 54: arrayf77 $ECHO_C"
- at_xfail=no
- echo "# -*- compilation -*-" >> "$at_group_log"
- (
- echo "54. testsuite.at:282: testing ..."
- $at_traceon
-
-
-$at_traceoff
-echo "$at_srcdir/testsuite.at:284: test ! \\( -f arrayf77 -o -f ../../arrayf77 \\) && exit 77 || \$VALGRIND arrayf77"
-echo testsuite.at:284 >"$at_check_line_file"
-
-at_trace_this=
-if test -n "$at_traceon"; then
- case "test ! \\( -f arrayf77 -o -f ../../arrayf77 \\) && exit 77 || $VALGRIND arrayf77" in
- *'
-'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;;
- *) at_trace_this=yes ;;
- esac
-fi
-
-if test -n "$at_trace_this"; then
- ( $at_traceon; test ! \( -f arrayf77 -o -f ../../arrayf77 \) && exit 77 || $VALGRIND arrayf77 ) >"$at_stdout" 2>"$at_stder1"
- at_status=$?
- grep '^ *+' "$at_stder1" >&2
- grep -v '^ *+' "$at_stder1" >"$at_stderr"
-else
- ( :; test ! \( -f arrayf77 -o -f ../../arrayf77 \) && exit 77 || $VALGRIND arrayf77 ) >"$at_stdout" 2>"$at_stderr"
- at_status=$?
-fi
-
-at_failed=false
-echo stderr:; cat "$at_stderr"
-echo stdout:; cat "$at_stdout"
-case $at_status in
- 77) echo 77 > "$at_status_file"; exit 77;;
- 0) ;;
- *) echo "$at_srcdir/testsuite.at:284: exit code was $at_status, expected 0"
- at_failed=:;;
-esac
-if $at_failed; then
-
-
- echo 1 > "$at_status_file"
- exit 1
-fi
-
-$at_traceon
-
- $at_traceoff
- $at_times_p && times >"$at_times_file"
- ) 5>&1 2>&1 | eval $at_tee_pipe
- at_status=`cat "$at_status_file"`
- ;;
-
- 55 ) # 55. testsuite.at:286: curvef77
- at_setup_line='testsuite.at:286'
- at_desc="curvef77"
- $at_quiet $ECHO_N " 55: curvef77 $ECHO_C"
- at_xfail=no
- echo "# -*- compilation -*-" >> "$at_group_log"
- (
- echo "55. testsuite.at:286: testing ..."
- $at_traceon
-
-
-$at_traceoff
-echo "$at_srcdir/testsuite.at:288: test ! \\( -f curvef77 -o -f ../../curvef77 \\) && exit 77 || \$VALGRIND curvef77"
-echo testsuite.at:288 >"$at_check_line_file"
-
-at_trace_this=
-if test -n "$at_traceon"; then
- case "test ! \\( -f curvef77 -o -f ../../curvef77 \\) && exit 77 || $VALGRIND curvef77" in
- *'
-'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;;
- *) at_trace_this=yes ;;
- esac
-fi
-
-if test -n "$at_trace_this"; then
- ( $at_traceon; test ! \( -f curvef77 -o -f ../../curvef77 \) && exit 77 || $VALGRIND curvef77 ) >"$at_stdout" 2>"$at_stder1"
- at_status=$?
- grep '^ *+' "$at_stder1" >&2
- grep -v '^ *+' "$at_stder1" >"$at_stderr"
-else
- ( :; test ! \( -f curvef77 -o -f ../../curvef77 \) && exit 77 || $VALGRIND curvef77 ) >"$at_stdout" 2>"$at_stderr"
- at_status=$?
-fi
-
-at_failed=false
-echo stderr:; cat "$at_stderr"
-echo stdout:; cat "$at_stdout"
-case $at_status in
- 77) echo 77 > "$at_status_file"; exit 77;;
- 0) ;;
- *) echo "$at_srcdir/testsuite.at:288: exit code was $at_status, expected 0"
- at_failed=:;;
-esac
-if $at_failed; then
-
-
- echo 1 > "$at_status_file"
- exit 1
-fi
-
-$at_traceon
-
- $at_traceoff
- $at_times_p && times >"$at_times_file"
- ) 5>&1 2>&1 | eval $at_tee_pipe
- at_status=`cat "$at_status_file"`
- ;;
-
- 56 ) # 56. testsuite.at:290: matf77
- at_setup_line='testsuite.at:290'
- at_desc="matf77"
- $at_quiet $ECHO_N " 56: matf77 $ECHO_C"
- at_xfail=no
- echo "# -*- compilation -*-" >> "$at_group_log"
- (
- echo "56. testsuite.at:290: testing ..."
- $at_traceon
-
-
-$at_traceoff
-echo "$at_srcdir/testsuite.at:292: test ! \\( -f matf77 -o -f ../../matf77 \\) && exit 77 || \$VALGRIND matf77"
-echo testsuite.at:292 >"$at_check_line_file"
-
-at_trace_this=
-if test -n "$at_traceon"; then
- case "test ! \\( -f matf77 -o -f ../../matf77 \\) && exit 77 || $VALGRIND matf77" in
- *'
-'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;;
- *) at_trace_this=yes ;;
- esac
-fi
-
-if test -n "$at_trace_this"; then
- ( $at_traceon; test ! \( -f matf77 -o -f ../../matf77 \) && exit 77 || $VALGRIND matf77 ) >"$at_stdout" 2>"$at_stder1"
- at_status=$?
- grep '^ *+' "$at_stder1" >&2
- grep -v '^ *+' "$at_stder1" >"$at_stderr"
-else
- ( :; test ! \( -f matf77 -o -f ../../matf77 \) && exit 77 || $VALGRIND matf77 ) >"$at_stdout" 2>"$at_stderr"
- at_status=$?
-fi
-
-at_failed=false
-echo stderr:; cat "$at_stderr"
-echo stdout:; cat "$at_stdout"
-case $at_status in
- 77) echo 77 > "$at_status_file"; exit 77;;
- 0) ;;
- *) echo "$at_srcdir/testsuite.at:292: exit code was $at_status, expected 0"
- at_failed=:;;
-esac
-if $at_failed; then
-
-
- echo 1 > "$at_status_file"
- exit 1
-fi
-
-$at_traceon
-
- $at_traceoff
- $at_times_p && times >"$at_times_file"
- ) 5>&1 2>&1 | eval $at_tee_pipe
- at_status=`cat "$at_status_file"`
- ;;
-
- 57 ) # 57. testsuite.at:294: pointf77
- at_setup_line='testsuite.at:294'
- at_desc="pointf77"
- $at_quiet $ECHO_N " 57: pointf77 $ECHO_C"
- at_xfail=no
- echo "# -*- compilation -*-" >> "$at_group_log"
- (
- echo "57. testsuite.at:294: testing ..."
- $at_traceon
-
-
-$at_traceoff
-echo "$at_srcdir/testsuite.at:296: test ! \\( -f pointf77 -o -f ../../pointf77 \\) && exit 77 || \$VALGRIND pointf77"
-echo testsuite.at:296 >"$at_check_line_file"
-
-at_trace_this=
-if test -n "$at_traceon"; then
- case "test ! \\( -f pointf77 -o -f ../../pointf77 \\) && exit 77 || $VALGRIND pointf77" in
- *'
-'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;;
- *) at_trace_this=yes ;;
- esac
-fi
-
-if test -n "$at_trace_this"; then
- ( $at_traceon; test ! \( -f pointf77 -o -f ../../pointf77 \) && exit 77 || $VALGRIND pointf77 ) >"$at_stdout" 2>"$at_stder1"
- at_status=$?
- grep '^ *+' "$at_stder1" >&2
- grep -v '^ *+' "$at_stder1" >"$at_stderr"
-else
- ( :; test ! \( -f pointf77 -o -f ../../pointf77 \) && exit 77 || $VALGRIND pointf77 ) >"$at_stdout" 2>"$at_stderr"
- at_status=$?
-fi
-
-at_failed=false
-echo stderr:; cat "$at_stderr"
-echo stdout:; cat "$at_stdout"
-case $at_status in
- 77) echo 77 > "$at_status_file"; exit 77;;
- 0) ;;
- *) echo "$at_srcdir/testsuite.at:296: exit code was $at_status, expected 0"
- at_failed=:;;
-esac
-if $at_failed; then
-
-
- echo 1 > "$at_status_file"
- exit 1
-fi
-
-$at_traceon
-
- $at_traceoff
- $at_times_p && times >"$at_times_file"
- ) 5>&1 2>&1 | eval $at_tee_pipe
- at_status=`cat "$at_status_file"`
- ;;
-
- 58 ) # 58. testsuite.at:298: quadf77
- at_setup_line='testsuite.at:298'
- at_desc="quadf77"
- $at_quiet $ECHO_N " 58: quadf77 $ECHO_C"
- at_xfail=no
- echo "# -*- compilation -*-" >> "$at_group_log"
- (
- echo "58. testsuite.at:298: testing ..."
- $at_traceon
-
-
-$at_traceoff
-echo "$at_srcdir/testsuite.at:300: test ! \\( -f quadf77 -o -f ../../quadf77 \\) && exit 77 || \$VALGRIND quadf77"
-echo testsuite.at:300 >"$at_check_line_file"
-
-at_trace_this=
-if test -n "$at_traceon"; then
- case "test ! \\( -f quadf77 -o -f ../../quadf77 \\) && exit 77 || $VALGRIND quadf77" in
- *'
-'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;;
- *) at_trace_this=yes ;;
- esac
-fi
-
-if test -n "$at_trace_this"; then
- ( $at_traceon; test ! \( -f quadf77 -o -f ../../quadf77 \) && exit 77 || $VALGRIND quadf77 ) >"$at_stdout" 2>"$at_stder1"
- at_status=$?
- grep '^ *+' "$at_stder1" >&2
- grep -v '^ *+' "$at_stder1" >"$at_stderr"
-else
- ( :; test ! \( -f quadf77 -o -f ../../quadf77 \) && exit 77 || $VALGRIND quadf77 ) >"$at_stdout" 2>"$at_stderr"
- at_status=$?
-fi
-
-at_failed=false
-echo stderr:; cat "$at_stderr"
-echo stdout:; cat "$at_stdout"
-case $at_status in
- 77) echo 77 > "$at_status_file"; exit 77;;
- 0) ;;
- *) echo "$at_srcdir/testsuite.at:300: exit code was $at_status, expected 0"
- at_failed=:;;
-esac
-if $at_failed; then
-
-
- echo 1 > "$at_status_file"
- exit 1
-fi
-
-$at_traceon
-
- $at_traceoff
- $at_times_p && times >"$at_times_file"
- ) 5>&1 2>&1 | eval $at_tee_pipe
- at_status=`cat "$at_status_file"`
- ;;
-
- 59 ) # 59. testsuite.at:302: testallf77
- at_setup_line='testsuite.at:302'
- at_desc="testallf77"
- $at_quiet $ECHO_N " 59: testallf77 $ECHO_C"
- at_xfail=no
- echo "# -*- compilation -*-" >> "$at_group_log"
- (
- echo "59. testsuite.at:302: testing ..."
- $at_traceon
-
-
-$at_traceoff
-echo "$at_srcdir/testsuite.at:304: test ! \\( -f testallf77 -o -f ../../testallf77 \\) && exit 77 || \$VALGRIND testallf77"
-echo testsuite.at:304 >"$at_check_line_file"
-
-at_trace_this=
-if test -n "$at_traceon"; then
- case "test ! \\( -f testallf77 -o -f ../../testallf77 \\) && exit 77 || $VALGRIND testallf77" in
- *'
-'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;;
- *) at_trace_this=yes ;;
- esac
-fi
-
-if test -n "$at_trace_this"; then
- ( $at_traceon; test ! \( -f testallf77 -o -f ../../testallf77 \) && exit 77 || $VALGRIND testallf77 ) >"$at_stdout" 2>"$at_stder1"
- at_status=$?
- grep '^ *+' "$at_stder1" >&2
- grep -v '^ *+' "$at_stder1" >"$at_stderr"
-else
- ( :; test ! \( -f testallf77 -o -f ../../testallf77 \) && exit 77 || $VALGRIND testallf77 ) >"$at_stdout" 2>"$at_stderr"
- at_status=$?
-fi
-
-at_failed=false
-echo stderr:; cat "$at_stderr"
-echo stdout:; cat "$at_stdout"
-case $at_status in
- 77) echo 77 > "$at_status_file"; exit 77;;
- 0) ;;
- *) echo "$at_srcdir/testsuite.at:304: exit code was $at_status, expected 0"
- at_failed=:;;
-esac
-if $at_failed; then
-
-
- echo 1 > "$at_status_file"
- exit 1
-fi
-
-$at_traceon
-
- $at_traceoff
- $at_times_p && times >"$at_times_file"
- ) 5>&1 2>&1 | eval $at_tee_pipe
- at_status=`cat "$at_status_file"`
- ;;
-
- 60 ) # 60. testsuite.at:306: ucdf77
- at_setup_line='testsuite.at:306'
- at_desc="ucdf77"
- $at_quiet $ECHO_N " 60: ucdf77 $ECHO_C"
- at_xfail=no
- echo "# -*- compilation -*-" >> "$at_group_log"
- (
- echo "60. testsuite.at:306: testing ..."
- $at_traceon
-
-
-$at_traceoff
-echo "$at_srcdir/testsuite.at:308: test ! \\( -f ucdf77 -o -f ../../ucdf77 \\) && exit 77 || \$VALGRIND ucdf77"
-echo testsuite.at:308 >"$at_check_line_file"
-
-at_trace_this=
-if test -n "$at_traceon"; then
- case "test ! \\( -f ucdf77 -o -f ../../ucdf77 \\) && exit 77 || $VALGRIND ucdf77" in
- *'
-'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;;
- *) at_trace_this=yes ;;
- esac
-fi
-
-if test -n "$at_trace_this"; then
- ( $at_traceon; test ! \( -f ucdf77 -o -f ../../ucdf77 \) && exit 77 || $VALGRIND ucdf77 ) >"$at_stdout" 2>"$at_stder1"
- at_status=$?
- grep '^ *+' "$at_stder1" >&2
- grep -v '^ *+' "$at_stder1" >"$at_stderr"
-else
- ( :; test ! \( -f ucdf77 -o -f ../../ucdf77 \) && exit 77 || $VALGRIND ucdf77 ) >"$at_stdout" 2>"$at_stderr"
- at_status=$?
-fi
-
-at_failed=false
-echo stderr:; cat "$at_stderr"
-echo stdout:; cat "$at_stdout"
-case $at_status in
- 77) echo 77 > "$at_status_file"; exit 77;;
- 0) ;;
- *) echo "$at_srcdir/testsuite.at:308: exit code was $at_status, expected 0"
- at_failed=:;;
-esac
-if $at_failed; then
-
-
- echo 1 > "$at_status_file"
- exit 1
-fi
-
-$at_traceon
-
- $at_traceoff
- $at_times_p && times >"$at_times_file"
- ) 5>&1 2>&1 | eval $at_tee_pipe
- at_status=`cat "$at_status_file"`
- ;;
-
-
- banner-6 ) # Banner 6. testsuite.at:311
- cat <<\_ATEOF
-
-Special
-
-_ATEOF
- ;;
-
- 61 ) # 61. testsuite.at:312: silock
- at_setup_line='testsuite.at:312'
- at_desc="silock"
- $at_quiet $ECHO_N " 61: silock $ECHO_C"
- at_xfail=no
- echo "# -*- compilation -*-" >> "$at_group_log"
- (
- echo "61. testsuite.at:312: testing ..."
- $at_traceon
-
-
-$at_traceoff
-echo "$at_srcdir/testsuite.at:314: testsilock \`pwd\` \$STARGS"
-echo testsuite.at:314 >"$at_check_line_file"
-
-at_trace_this=
-if test -n "$at_traceon"; then
- echo 'Not enabling shell tracing (command contains a `...` command substitution)'
-fi
-
-if test -n "$at_trace_this"; then
- ( $at_traceon; testsilock `pwd` $STARGS ) >"$at_stdout" 2>"$at_stder1"
- at_status=$?
- grep '^ *+' "$at_stder1" >&2
- grep -v '^ *+' "$at_stder1" >"$at_stderr"
-else
- ( :; testsilock `pwd` $STARGS ) >"$at_stdout" 2>"$at_stderr"
- at_status=$?
-fi
-
-at_failed=false
-echo stderr:; cat "$at_stderr"
-echo stdout:; cat "$at_stdout"
-case $at_status in
- 77) echo 77 > "$at_status_file"; exit 77;;
- 0) ;;
- *) echo "$at_srcdir/testsuite.at:314: exit code was $at_status, expected 0"
- at_failed=:;;
-esac
-if $at_failed; then
-
-
- echo 1 > "$at_status_file"
- exit 1
-fi
-
-$at_traceon
-
- $at_traceoff
- $at_times_p && times >"$at_times_file"
- ) 5>&1 2>&1 | eval $at_tee_pipe
- at_status=`cat "$at_status_file"`
- ;;
-
- 62 ) # 62. testsuite.at:316: force single
- at_setup_line='testsuite.at:316'
- at_desc="force single"
- $at_quiet $ECHO_N " 62: force single $ECHO_C"
- at_xfail=no
- echo "# -*- compilation -*-" >> "$at_group_log"
- (
- echo "62. testsuite.at:316: testing ..."
- $at_traceon
-
-
-$at_traceoff
-echo "$at_srcdir/testsuite.at:318: specmix \$STARGS"
-echo testsuite.at:318 >"$at_check_line_file"
-
-at_trace_this=
-if test -n "$at_traceon"; then
- case "specmix $STARGS" in
- *'
-'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;;
- *) at_trace_this=yes ;;
- esac
-fi
-
-if test -n "$at_trace_this"; then
- ( $at_traceon; specmix $STARGS ) >"$at_stdout" 2>"$at_stder1"
- at_status=$?
- grep '^ *+' "$at_stder1" >&2
- grep -v '^ *+' "$at_stder1" >"$at_stderr"
-else
- ( :; specmix $STARGS ) >"$at_stdout" 2>"$at_stderr"
- at_status=$?
-fi
-
-at_failed=false
-$at_diff "$at_devnull" "$at_stderr" || at_failed=:
-echo stdout:; cat "$at_stdout"
-case $at_status in
- 77) echo 77 > "$at_status_file"; exit 77;;
- 0) ;;
- *) echo "$at_srcdir/testsuite.at:318: exit code was $at_status, expected 0"
- at_failed=:;;
-esac
-if $at_failed; then
-
-
- echo 1 > "$at_status_file"
- exit 1
-fi
-
-$at_traceon
-
-$at_traceoff
-echo "$at_srcdir/testsuite.at:319: testdtypes \`pwd\` \$STARGS"
-echo testsuite.at:319 >"$at_check_line_file"
-
-at_trace_this=
-if test -n "$at_traceon"; then
- echo 'Not enabling shell tracing (command contains a `...` command substitution)'
-fi
-
-if test -n "$at_trace_this"; then
- ( $at_traceon; testdtypes `pwd` $STARGS ) >"$at_stdout" 2>"$at_stder1"
- at_status=$?
- grep '^ *+' "$at_stder1" >&2
- grep -v '^ *+' "$at_stder1" >"$at_stderr"
-else
- ( :; testdtypes `pwd` $STARGS ) >"$at_stdout" 2>"$at_stderr"
- at_status=$?
-fi
-
-at_failed=false
-$at_diff "$at_devnull" "$at_stderr" || at_failed=:
-echo stdout:; cat "$at_stdout"
-case $at_status in
- 77) echo 77 > "$at_status_file"; exit 77;;
- 0) ;;
- *) echo "$at_srcdir/testsuite.at:319: exit code was $at_status, expected 0"
- at_failed=:;;
-esac
-if $at_failed; then
-
-
- echo 1 > "$at_status_file"
- exit 1
-fi
-
-$at_traceon
-
- $at_traceoff
- $at_times_p && times >"$at_times_file"
- ) 5>&1 2>&1 | eval $at_tee_pipe
- at_status=`cat "$at_status_file"`
- ;;
-
- 63 ) # 63. testsuite.at:321: multi_file
- at_setup_line='testsuite.at:321'
- at_desc="multi_file"
- $at_quiet $ECHO_N " 63: multi_file $ECHO_C"
- at_xfail=no
- echo "# -*- compilation -*-" >> "$at_group_log"
- (
- echo "63. testsuite.at:321: testing ..."
- $at_traceon
-
-
-$at_traceoff
-echo "$at_srcdir/testsuite.at:323: \$VALGRIND multi_file \$STARGS"
-echo testsuite.at:323 >"$at_check_line_file"
-
-at_trace_this=
-if test -n "$at_traceon"; then
- case "$VALGRIND multi_file $STARGS" in
- *'
-'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;;
- *) at_trace_this=yes ;;
- esac
-fi
-
-if test -n "$at_trace_this"; then
- ( $at_traceon; $VALGRIND multi_file $STARGS ) >"$at_stdout" 2>"$at_stder1"
- at_status=$?
- grep '^ *+' "$at_stder1" >&2
- grep -v '^ *+' "$at_stder1" >"$at_stderr"
-else
- ( :; $VALGRIND multi_file $STARGS ) >"$at_stdout" 2>"$at_stderr"
- at_status=$?
-fi
-
-at_failed=false
-$at_diff "$at_devnull" "$at_stderr" || at_failed=:
-echo stdout:; cat "$at_stdout"
-case $at_status in
- 77) echo 77 > "$at_status_file"; exit 77;;
- 0) ;;
- *) echo "$at_srcdir/testsuite.at:323: exit code was $at_status, expected 0"
- at_failed=:;;
-esac
-if $at_failed; then
-
-
- echo 1 > "$at_status_file"
- exit 1
-fi
-
-$at_traceon
-
- $at_traceoff
- $at_times_p && times >"$at_times_file"
- ) 5>&1 2>&1 | eval $at_tee_pipe
- at_status=`cat "$at_status_file"`
- ;;
-
- 64 ) # 64. testsuite.at:325: testall -medium
- at_setup_line='testsuite.at:325'
- at_desc="testall -medium"
- $at_quiet $ECHO_N " 64: testall -medium $ECHO_C"
- at_xfail=no
- echo "# -*- compilation -*-" >> "$at_group_log"
- (
- echo "64. testsuite.at:325: testing ..."
- $at_traceon
-
-
-$at_traceoff
-echo "$at_srcdir/testsuite.at:327: \$VALGRIND testall -medium \$STARGS"
-echo testsuite.at:327 >"$at_check_line_file"
-
-at_trace_this=
-if test -n "$at_traceon"; then
- case "$VALGRIND testall -medium $STARGS" in
- *'
-'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;;
- *) at_trace_this=yes ;;
- esac
-fi
-
-if test -n "$at_trace_this"; then
- ( $at_traceon; $VALGRIND testall -medium $STARGS ) >"$at_stdout" 2>"$at_stder1"
- at_status=$?
- grep '^ *+' "$at_stder1" >&2
- grep -v '^ *+' "$at_stder1" >"$at_stderr"
-else
- ( :; $VALGRIND testall -medium $STARGS ) >"$at_stdout" 2>"$at_stderr"
- at_status=$?
-fi
-
-at_failed=false
-$at_diff "$at_devnull" "$at_stderr" || at_failed=:
-echo stdout:; cat "$at_stdout"
-case $at_status in
- 77) echo 77 > "$at_status_file"; exit 77;;
- 0) ;;
- *) echo "$at_srcdir/testsuite.at:327: exit code was $at_status, expected 0"
- at_failed=:;;
-esac
-if $at_failed; then
-
-
- echo 1 > "$at_status_file"
- exit 1
-fi
-
-$at_traceon
-
- $at_traceoff
- $at_times_p && times >"$at_times_file"
- ) 5>&1 2>&1 | eval $at_tee_pipe
- at_status=`cat "$at_status_file"`
- ;;
-
- 65 ) # 65. testsuite.at:329: testall -large
- at_setup_line='testsuite.at:329'
- at_desc="testall -large"
- $at_quiet $ECHO_N " 65: testall -large $ECHO_C"
- at_xfail=no
- echo "# -*- compilation -*-" >> "$at_group_log"
- (
- echo "65. testsuite.at:329: testing ..."
- $at_traceon
-
-
-$at_traceoff
-echo "$at_srcdir/testsuite.at:331: \$VALGRIND testall -large \$STARGS"
-echo testsuite.at:331 >"$at_check_line_file"
-
-at_trace_this=
-if test -n "$at_traceon"; then
- case "$VALGRIND testall -large $STARGS" in
- *'
-'*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;;
- *) at_trace_this=yes ;;
- esac
-fi
-
-if test -n "$at_trace_this"; then
- ( $at_traceon; $VALGRIND testall -large $STARGS ) >"$at_stdout" 2>"$at_stder1"
- at_status=$?
- grep '^ *+' "$at_stder1" >&2
- grep -v '^ *+' "$at_stder1" >"$at_stderr"
-else
- ( :; $VALGRIND testall -large $STARGS ) >"$at_stdout" 2>"$at_stderr"
- at_status=$?
-fi
-
-at_failed=false
-$at_diff "$at_devnull" "$at_stderr" || at_failed=:
-echo stdout:; cat "$at_stdout"
-case $at_status in
- 77) echo 77 > "$at_status_file"; exit 77;;
- 0) ;;
- *) echo "$at_srcdir/testsuite.at:331: exit code was $at_status, expected 0"
- at_failed=:;;
-esac
-if $at_failed; then
-
-
- echo 1 > "$at_status_file"
- exit 1
-fi
-
-$at_traceon
-
- $at_traceoff
- $at_times_p && times >"$at_times_file"
- ) 5>&1 2>&1 | eval $at_tee_pipe
- at_status=`cat "$at_status_file"`
- ;;
-
-
- * )
- echo "$as_me: no such test group: $at_group" >&2
- continue
- ;;
- esac
-
- # Be sure to come back to the suite directory, in particular
- # since below we might `rm' the group directory we are in currently.
- cd "$at_suite_dir"
-
- case $at_group in
- banner-*) ;;
- *)
- if test ! -f "$at_check_line_file"; then
- sed "s/^ */$as_me: warning: /" <<_ATEOF
- A failure happened in a test group before any test could be
- run. This means that test suite is improperly designed. Please
- report this failure to <visit-users at email.ornl.gov>.
-_ATEOF
- echo "$at_setup_line" >"$at_check_line_file"
- fi
- at_group_count=`expr 1 + $at_group_count`
- $at_verbose $ECHO_N "$at_group. $at_setup_line: $ECHO_C"
- echo $ECHO_N "$at_group. $at_setup_line: $ECHO_C" >> "$at_group_log"
- case $at_xfail:$at_status in
- yes:0)
- at_msg="UNEXPECTED PASS"
- at_xpass_list="$at_xpass_list $at_group"
- at_errexit=$at_errexit_p
- ;;
- no:0)
- at_msg="ok"
- at_pass_list="$at_pass_list $at_group"
- at_errexit=false
- ;;
- *:77)
- at_msg='skipped ('`cat "$at_check_line_file"`')'
- at_skip_list="$at_skip_list $at_group"
- at_errexit=false
- ;;
- yes:*)
- at_msg='expected failure ('`cat "$at_check_line_file"`')'
- at_xfail_list="$at_xfail_list $at_group"
- at_errexit=false
- ;;
- no:*)
- at_msg='FAILED ('`cat "$at_check_line_file"`')'
- at_fail_list="$at_fail_list $at_group"
- at_errexit=$at_errexit_p
- ;;
- esac
- # Make sure there is a separator even with long titles.
- echo " $at_msg"
- at_log_msg="$at_group. $at_desc ($at_setup_line): $at_msg"
- case $at_status in
- 0|77)
- # $at_times_file is only available if the group succeeded.
- # We're not including the group log, so the success message
- # is written in the global log separately. But we also
- # write to the group log in case they're using -d.
- if test -f "$at_times_file"; then
- at_log_msg="$at_log_msg ("`sed 1d "$at_times_file"`')'
- rm -f "$at_times_file"
- fi
- echo "$at_log_msg" >> "$at_group_log"
- echo "$at_log_msg" >&5
-
- # Cleanup the group directory, unless the user wants the files.
- if $at_debug_p ; then
- {
- echo "#! /bin/sh"
- echo 'test "${ZSH_VERSION+set}" = set && alias -g '\''${1+"$@"}'\''='\''"$@"'\'''
- echo "cd '$at_dir'"
- echo 'exec ${CONFIG_SHELL-'"$SHELL"'}' "$0" \
- '-v -d' "$at_debug_args" "$at_group" '${1+"$@"}'
- echo 'exit 1'
- } >$at_group_dir/run
- chmod +x $at_group_dir/run
-
- elif test -d "$at_group_dir"; then
- find "$at_group_dir" -type d ! -perm -700 -exec chmod u+rwx \{\} \;
- rm -fr "$at_group_dir"
- fi
- ;;
- *)
- # Upon failure, include the log into the testsuite's global
- # log. The failure message is written in the group log. It
- # is later included in the global log.
- echo "$at_log_msg" >> "$at_group_log"
-
- # Upon failure, keep the group directory for autopsy, and
- # create the debugging script.
- {
- echo "#! /bin/sh"
- echo 'test "${ZSH_VERSION+set}" = set && alias -g '\''${1+"$@"}'\''='\''"$@"'\'''
- echo "cd '$at_dir'"
- echo 'exec ${CONFIG_SHELL-'"$SHELL"'}' "$0" \
- '-v -d' "$at_debug_args" "$at_group" '${1+"$@"}'
- echo 'exit 1'
- } >$at_group_dir/run
- chmod +x $at_group_dir/run
-
- $at_errexit && break
- ;;
- esac
- ;;
- esac
-done
-
-# Back to the top directory.
-cd "$at_dir"
-
-# Compute the duration of the suite.
-at_stop_date=`date`
-at_stop_time=`date +%s 2>/dev/null`
-echo "$as_me: ending at: $at_stop_date" >&5
-case $at_start_time,$at_stop_time in
- [0-9]*,[0-9]*)
- at_duration_s=`expr $at_stop_time - $at_start_time`
- at_duration_m=`expr $at_duration_s / 60`
- at_duration_h=`expr $at_duration_m / 60`
- at_duration_s=`expr $at_duration_s % 60`
- at_duration_m=`expr $at_duration_m % 60`
- at_duration="${at_duration_h}h ${at_duration_m}m ${at_duration_s}s"
- echo "$as_me: test suite duration: $at_duration" >&5
- ;;
-esac
-
-# Wrap up the test suite with summary statistics.
-at_skip_count=`set dummy $at_skip_list; shift; echo $#`
-at_fail_count=`set dummy $at_fail_list; shift; echo $#`
-at_xpass_count=`set dummy $at_xpass_list; shift; echo $#`
-at_xfail_count=`set dummy $at_xfail_list; shift; echo $#`
-
-at_run_count=`expr $at_group_count - $at_skip_count`
-at_unexpected_count=`expr $at_xpass_count + $at_fail_count`
-at_total_fail_count=`expr $at_xfail_count + $at_fail_count`
-
-echo
-cat <<\_ASBOX
-## ------------- ##
-## Test results. ##
-## ------------- ##
-_ASBOX
-echo
-{
- echo
- cat <<\_ASBOX
-## ------------- ##
-## Test results. ##
-## ------------- ##
-_ASBOX
- echo
-} >&5
-
-if test $at_run_count = 1; then
- at_result="1 test"
- at_were=was
-else
- at_result="$at_run_count tests"
- at_were=were
-fi
-if $at_errexit_p && test $at_unexpected_count != 0; then
- if test $at_xpass_count = 1; then
- at_result="$at_result $at_were run, one passed"
- else
- at_result="$at_result $at_were run, one failed"
- fi
- at_result="$at_result unexpectedly and inhibited subsequent tests."
-else
- # Don't you just love exponential explosion of the number of cases?
- case $at_xpass_count:$at_fail_count:$at_xfail_count in
- # So far, so good.
- 0:0:0) at_result="$at_result $at_were successful." ;;
- 0:0:*) at_result="$at_result behaved as expected." ;;
-
- # Some unexpected failures
- 0:*:0) at_result="$at_result $at_were run,
-$at_fail_count failed unexpectedly." ;;
-
- # Some failures, both expected and unexpected
- 0:*:1) at_result="$at_result $at_were run,
-$at_total_fail_count failed ($at_xfail_count expected failure)." ;;
- 0:*:*) at_result="$at_result $at_were run,
-$at_total_fail_count failed ($at_xfail_count expected failures)." ;;
-
- # No unexpected failures, but some xpasses
- *:0:*) at_result="$at_result $at_were run,
-$at_xpass_count passed unexpectedly." ;;
-
- # No expected failures, but failures and xpasses
- *:1:0) at_result="$at_result $at_were run,
-$at_unexpected_count did not behave as expected ($at_fail_count unexpected failure)." ;;
- *:*:0) at_result="$at_result $at_were run,
-$at_unexpected_count did not behave as expected ($at_fail_count unexpected failures)." ;;
-
- # All of them.
- *:*:1) at_result="$at_result $at_were run,
-$at_xpass_count passed unexpectedly,
-$at_total_fail_count failed ($at_xfail_count expected failure)." ;;
- *:*:*) at_result="$at_result $at_were run,
-$at_xpass_count passed unexpectedly,
-$at_total_fail_count failed ($at_xfail_count expected failures)." ;;
- esac
-
- if test $at_skip_count = 0 && test $at_run_count -gt 1; then
- at_result="All $at_result"
- fi
-fi
-
-# Now put skips in the mix.
-case $at_skip_count in
- 0) ;;
- 1) at_result="$at_result
-1 test was skipped." ;;
- *) at_result="$at_result
-$at_skip_count tests were skipped." ;;
-esac
-
-if test $at_unexpected_count = 0; then
- echo "$at_result"
- echo "$at_result" >&5
-else
- echo "ERROR: $at_result" >&2
- echo "ERROR: $at_result" >&5
- {
- echo
- cat <<\_ASBOX
-## ------------------------ ##
-## Summary of the failures. ##
-## ------------------------ ##
-_ASBOX
-
- # Summary of failed and skipped tests.
- if test $at_fail_count != 0; then
- echo "Failed tests:"
- $SHELL "$0" $at_fail_list --list
- echo
- fi
- if test $at_skip_count != 0; then
- echo "Skipped tests:"
- $SHELL "$0" $at_skip_list --list
- echo
- fi
- if test $at_xpass_count != 0; then
- echo "Unexpected passes:"
- $SHELL "$0" $at_xpass_list --list
- echo
- fi
- if test $at_fail_count != 0; then
- cat <<\_ASBOX
-## ---------------------- ##
-## Detailed failed tests. ##
-## ---------------------- ##
-_ASBOX
- echo
- for at_group in $at_fail_list
- do
- at_group_normalized=$at_group
-
- while :; do
- case $at_group_normalized in #(
- $at_format*) break;;
- esac
- at_group_normalized=0$at_group_normalized
- done
-
- cat "$at_suite_dir/$at_group_normalized/$as_me.log"
- echo
- done
- echo
- fi
- if test -n "$at_top_srcdir"; then
- sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-## ${at_top_build_prefix}config.log ##
-_ASBOX
- sed 's/^/| /' ${at_top_build_prefix}config.log
- echo
- fi
- } >&5
-
- sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-## $as_me.log was created. ##
-_ASBOX
-
- echo
- echo "Please send \`${at_testdir+${at_testdir}/}$as_me.log' and all information you think might help:"
- echo
- echo " To: <visit-users at email.ornl.gov>"
- echo " Subject: [silo 4.8] $as_me:$at_fail_list${at_fail_list:+ failed${at_xpass_list:+,}}$at_xpass_list${at_xpass_list:+ passed unexpectedly}"
- echo
- if test $at_debug_p = false; then
- echo
- echo 'You may investigate any problem if you feel able to do so, in which'
- echo 'case the test suite provides a good starting point. Its output may'
- echo "be found below \`${at_testdir+${at_testdir}/}$as_me.dir'."
- echo
- fi
- exit 1
-fi
-
-exit 0
-
+at_func_check_status 0 $at_status "$at_srcdir/testsuite.at:352"
+$at_failed && at_func_log_failure
+$at_traceon; }
+ $at_traceoff
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_71
diff --git a/tests/testsuite.at b/tests/testsuite.at
index c53a306..ec69b0b 100644
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@@ -104,8 +104,8 @@ AT_CLEANUP
AT_SETUP(array)
AT_CHECK($VALGRIND array $STARGS,,ignore)
AT_CLEANUP
-AT_SETUP(multi_test)
-AT_CHECK($VALGRIND multi_test $STARGS,,ignore)
+AT_SETUP(multi_test testread)
+AT_CHECK($VALGRIND multi_test testread $STARGS,,ignore)
AT_CLEANUP
AT_SETUP(multi_test earlyclose)
AT_CHECK($VALGRIND multi_test earlyclose $STARGS,,ignore,ignore)
@@ -202,6 +202,12 @@ AT_SETUP(readstuff) # needs data file from multi_test
AT_CHECK(multi_test $STARGS,,ignore) # don't valgrind these intermediate parts
AT_CHECK($VALGRIND readstuff $STARGS,ignore,ignore)
AT_CLEANUP
+AT_SETUP(testfs)
+AT_CHECK($VALGRIND testfs $STARGS,,ignore)
+AT_CLEANUP
+AT_SETUP(empty)
+AT_CHECK($VALGRIND empty $STARGS,,ignore)
+AT_CLEANUP
AT_BANNER(pythonmodule)
AT_SETUP(read)
@@ -229,13 +235,20 @@ AT_KEYWORDS(python)
AT_CHECK(multi_test $STARGS hdf-friendly,,ignore) # generate data for python tests
AT_CHECK(test -z "$PYTHON" && exit 77 || env PYTHONPATH=../../../tools/python/.libs $PYTHON ../../test_error.py,,ignore,ignore)
AT_CLEANUP
+AT_SETUP(write objects)
+AT_KEYWORDS(python)
+AT_CHECK(test -z "$PYTHON" -o -z "$BROWSER" && exit 77 || $VALGRIND testonehex `pwd`,,ignore,ignore)
+AT_CLEANUP
-AT_BANNER(PDB Specific)
+AT_BANNER(PDB Lite)
AT_SETUP(testpdb)
-AT_CHECK(test "$STARGS" = DB_HDF5 && exit 77 || $VALGRIND testpdb,ignore,ignore)
+AT_CHECK(test ! \( -e ../src/score/lite_score.h -o -e ../../../src/pdb/lite_pdb.h \) -o "$STARGS" = DB_HDF5 && exit 77 || $VALGRIND testpdb,ignore,ignore)
+AT_CLEANUP
+AT_SETUP(pdbtst)
+AT_CHECK(test ! \( -e ../src/score/lite_score.h -o -e ../../../src/pdb/lite_pdb.h \) -o "$STARGS" = DB_HDF5 && exit 77 || $VALGRIND pdbtst,ignore,ignore)
AT_CLEANUP
-AT_BANNER(HDF5 Specific)
+AT_BANNER(HDF5 Driver Specific)
AT_SETUP(grab)
AT_CHECK(test "$STARGS" != DB_HDF5 && exit 77 || $VALGRIND grab,,ignore,ignore)
AT_CLEANUP
@@ -281,31 +294,35 @@ AT_CLEANUP
AT_BANNER(Fortran)
AT_SETUP(arrayf77)
AT_KEYWORDS(fortran)
-AT_CHECK(test ! \( -f arrayf77 -o -f ../../arrayf77 \) && exit 77 || $VALGRIND arrayf77,,ignore,ignore)
+AT_CHECK(test ! \( -f arrayf77 -o -f ../../arrayf77 \) && exit 77 || $VALGRIND arrayf77 $STARGS,,ignore,ignore)
AT_CLEANUP
AT_SETUP(curvef77)
AT_KEYWORDS(fortran)
-AT_CHECK(test ! \( -f curvef77 -o -f ../../curvef77 \) && exit 77 || $VALGRIND curvef77,,ignore,ignore)
+AT_CHECK(test ! \( -f curvef77 -o -f ../../curvef77 \) && exit 77 || $VALGRIND curvef77 $STARGS,,ignore,ignore)
AT_CLEANUP
AT_SETUP(matf77)
AT_KEYWORDS(fortran)
-AT_CHECK(test ! \( -f matf77 -o -f ../../matf77 \) && exit 77 || $VALGRIND matf77,,ignore,ignore)
+AT_CHECK(test ! \( -f matf77 -o -f ../../matf77 \) && exit 77 || $VALGRIND matf77 $STARGS,,ignore,ignore)
AT_CLEANUP
AT_SETUP(pointf77)
AT_KEYWORDS(fortran)
-AT_CHECK(test ! \( -f pointf77 -o -f ../../pointf77 \) && exit 77 || $VALGRIND pointf77,,ignore,ignore)
+AT_CHECK(test ! \( -f pointf77 -o -f ../../pointf77 \) && exit 77 || $VALGRIND pointf77 $STARGS,,ignore,ignore)
AT_CLEANUP
AT_SETUP(quadf77)
AT_KEYWORDS(fortran)
-AT_CHECK(test ! \( -f quadf77 -o -f ../../quadf77 \) && exit 77 || $VALGRIND quadf77,,ignore,ignore)
+AT_CHECK(test ! \( -f quadf77 -o -f ../../quadf77 \) && exit 77 || $VALGRIND quadf77 $STARGS,,ignore,ignore)
AT_CLEANUP
AT_SETUP(testallf77)
AT_KEYWORDS(fortran)
-AT_CHECK(test ! \( -f testallf77 -o -f ../../testallf77 \) && exit 77 || $VALGRIND testallf77,,ignore,ignore)
+AT_CHECK(test ! \( -f testallf77 -o -f ../../testallf77 \) && exit 77 || $VALGRIND testallf77 $STARGS,,ignore,ignore)
AT_CLEANUP
AT_SETUP(ucdf77)
AT_KEYWORDS(fortran)
-AT_CHECK(test ! \( -f ucdf77 -o -f ../../ucdf77 \) && exit 77 || $VALGRIND ucdf77,,ignore,ignore)
+AT_CHECK(test ! \( -f ucdf77 -o -f ../../ucdf77 \) && exit 77 || $VALGRIND ucdf77 $STARGS,,ignore,ignore)
+AT_CLEANUP
+AT_SETUP(csgmesh)
+AT_KEYWORDS(fortran)
+AT_CHECK(test ! \( -f csgmesh -o -f ../../csgmesh \) && exit 77 || $VALGRIND csgmesh $STARGS,,ignore,ignore)
AT_CLEANUP
AT_BANNER(Special)
@@ -322,6 +339,10 @@ AT_SETUP(multi_file)
AT_KEYWORDS(large)
AT_CHECK($VALGRIND multi_file $STARGS,,ignore)
AT_CLEANUP
+AT_SETUP(multi_file use-ns)
+AT_KEYWORDS(large)
+AT_CHECK($VALGRIND multi_file use-ns $STARGS,,ignore)
+AT_CLEANUP
AT_SETUP(testall -medium)
AT_KEYWORDS(large)
AT_CHECK($VALGRIND testall -medium $STARGS,,ignore)
diff --git a/tests/testxvers b/tests/testxvers
index c01d0e7..441041b 100755
--- a/tests/testxvers
+++ b/tests/testxvers
@@ -1,4 +1,4 @@
-#!/bin/sh -x
+#!/bin/sh
# Copyright (c) 1994 - 2010, Lawrence Livermore National Security, LLC.
# LLNL-CODE-425250.
@@ -63,8 +63,8 @@ difffiles () {
bf=`basename $df .h5`
# do a diff on the files
rm -f testxvers.out
- $topDir/../tools/browser/browser -q -e diff $df $topDir/xvers_data/${bf}_$1 1>testxvers.out 2>&1
- if test `wc -l testxvers.out | tr -s ' ' | cut -d' ' -f2` -gt 20; then
+ $topDir/../tools/browser/browser -q -R 0.00001 -e diff $df $topDir/xvers_data/${bf}_$1 1>testxvers.out 2>&1
+ if test $(cat testxvers.out | grep -v 'not centered'\\\|'not specified'\\\|'extensive'\\\|'conserved' | wc -l) -gt 20; then
return 1
break
fi
@@ -111,12 +111,16 @@ bunzip2 < $topDir/xvers_data.tar.bz2 | tar xf -
# Now, run browser and make sure we don't get any errors in the diff
#
result=0
-test $result -gt 0 || difffiles v1${vtest}.h5
-result=$?
-test $result -gt 0 || difffiles v1${vtest}ck.h5
-result=$?
-test $result -gt 0 || difffiles v1${vtest}fpz.h5
-result=$?
+difffiles v1${vtest}.h5
+result=$(expr $result + $?)
+if test $result -eq 0; then
+ difffiles v1${vtest}ck.h5
+ result=$(expr $result + $?)
+fi
+if test $result -eq 0; then
+ difffiles v1${vtest}fpz.h5
+ result=$(expr $result + $?)
+fi
#
# Cleanup
diff --git a/tests/twohex.c b/tests/twohex.c
index aab1948..88f625e 100644
--- a/tests/twohex.c
+++ b/tests/twohex.c
@@ -252,6 +252,8 @@ main(int argc, char *argv[])
DBClose(dbfile);
+ DBFreeFacelist(facelist);
+
dbfile = DBOpen(filename, driver, DB_READ);
{
char tmpname[256];
diff --git a/tests/ucd.c b/tests/ucd.c
index 13e6e24..260a8dd 100644
--- a/tests/ucd.c
+++ b/tests/ucd.c
@@ -264,14 +264,14 @@ build_ucd(DBfile *dbfile, char *name)
NULL, 0, idatatype, DB_NODECENT, NULL);
/* test writing more than 2 or 3 component variable */
- vars[0] = d;
- varnames[0] = "dcompm";
+ vars[0] = x;
+ varnames[0] = "xcompm";
vars[1] = u;
varnames[1] = "ucompm";
vars[2] = v;
varnames[2] = "vcompm";
- vars[3] = d;
- varnames[3] = "dcompm_copy";
+ vars[3] = y;
+ varnames[3] = "ycompm";
vars[4] = u;
varnames[4] = "ucompm_copy";
vars[5] = v;
diff --git a/tests/ucdf77.f b/tests/ucdf77.f
index a6c7d81..c040932 100644
--- a/tests/ucdf77.f
+++ b/tests/ucdf77.f
@@ -64,13 +64,20 @@ c---------------------------------------------------------------------
implicit none
include "silo.inc"
integer builducd
- integer dbid, meshid, err
+ integer dbid, meshid, err, driver, nargs
+ character*256 cloption
+ driver = DB_PDB
+ nargs = iargc()
+ call getarg(1, cloption)
+ if (cloption .eq. "DB_HDF5") then
+ driver = DB_HDF5
+ end if
-c...Create file named "ucdf77.pdb". Database ID is returned in 'dbid'.
+c...Create file named "ucdf77.silo". Database ID is returned in 'dbid'.
- err = dbcreate("ucdf77.pdb", 10, 0, DB_LOCAL,
- . "file info", 9, DB_PDB, dbid)
+ err = dbcreate("ucdf77.silo", 11, 0, DB_LOCAL,
+ . "file info", 9, driver, dbid)
c...Write out necessary objects for MeshTV.
@@ -83,7 +90,7 @@ c...Close data file.
err = dbclose(dbid)
- print *,'Created file: ucdf77.pdb'
+ print *,'Created file: ucdf77.silo'
stop
end
diff --git a/tests/zeros.dat b/tests/zeros.dat
new file mode 100644
index 0000000..01d633b
Binary files /dev/null and b/tests/zeros.dat differ
diff --git a/tools/Makefile.in b/tools/Makefile.in
index f794bf1..1649903 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -68,8 +69,9 @@
#
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -90,12 +92,21 @@ host_triplet = @host@
subdir = tools
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/config/ax_check_compiler_flags.m4 \
+ $(top_srcdir)/config/ax_have_qt.m4 \
+ $(top_srcdir)/config/libtool.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
+ $(top_srcdir)/config/vl_lib_readline.m4 \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
@@ -107,9 +118,37 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
ps-recursive uninstall-recursive
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+ distdir
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+ dir0=`pwd`; \
+ sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+ sed_rest='s,^[^/]*/*,,'; \
+ sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+ sed_butlast='s,/*[^/]*$$,,'; \
+ while test -n "$$dir1"; do \
+ first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+ if test "$$first" != "."; then \
+ if test "$$first" = ".."; then \
+ dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+ dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+ else \
+ first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+ if test "$$first2" = "$$first"; then \
+ dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+ else \
+ dir2="../$$dir2"; \
+ fi; \
+ dir0="$$dir0"/"$$first"; \
+ fi; \
+ fi; \
+ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+ done; \
+ reldir="$$dir2"
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
AR = @AR@
@@ -136,7 +175,8 @@ CXX_FULLPATH = @CXX_FULLPATH@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -148,6 +188,7 @@ FCFLAGS = @FCFLAGS@
FCLIBS = @FCLIBS@
FC_FULLPATH = @FC_FULLPATH@
FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FORTRAN = @FORTRAN@
FPZIP = @FPZIP@
GREP = @GREP@
@@ -158,17 +199,25 @@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
LDFLAGS = @LDFLAGS@
+LIBM = @LIBM@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
NETCDF = @NETCDF@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -178,7 +227,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PDBP_DRV = @PDBP_DRV@
PDB_DRV = @PDB_DRV@
-PRTDIAG = @PRTDIAG@
PYTHON = @PYTHON@
PYTHONMODULE = @PYTHONMODULE@
PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@
@@ -186,17 +234,13 @@ PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
PYTHON_PLATFORM = @PYTHON_PLATFORM@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
-QT_BIN = @QT_BIN@
-QT_CORE = @QT_CORE@
-QT_CORE_LIB = @QT_CORE_LIB@
QT_CXXFLAGS = @QT_CXXFLAGS@
-QT_GUI = @QT_GUI@
-QT_GUI_LIB = @QT_GUI_LIB@
-QT_INCLUDE = @QT_INCLUDE@
-QT_LDFLAGS = @QT_LDFLAGS@
-QT_LIB = @QT_LIB@
+QT_DIR = @QT_DIR@
QT_LIBS = @QT_LIBS@
+QT_LRELEASE = @QT_LRELEASE@
+QT_LUPDATE = @QT_LUPDATE@
QT_MOC = @QT_MOC@
+QT_UIC = @QT_UIC@
RANLIB = @RANLIB@
READLINE_LIBS = @READLINE_LIBS@
SED = @SED@
@@ -214,6 +258,11 @@ SILO_VERS_TAG = @SILO_VERS_TAG@
STRIP = @STRIP@
TAURUS = @TAURUS@
VERSION = @VERSION@
+XMKMF = @XMKMF@
+X_CFLAGS = @X_CFLAGS@
+X_EXTRA_LIBS = @X_EXTRA_LIBS@
+X_LIBS = @X_LIBS@
+X_PRE_LIBS = @X_PRE_LIBS@
ZLIB = @ZLIB@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
@@ -221,6 +270,7 @@ abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_F77 = @ac_ct_F77@
ac_ct_FC = @ac_ct_FC@
am__include = @am__include@
@@ -253,6 +303,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -269,6 +320,7 @@ sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
TOOLS_DIR = $(am__append_1) $(am__append_2) $(am__append_3)
@@ -290,14 +342,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
- && exit 0; \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tools/Makefile'; \
- cd $(top_srcdir) && \
- $(AUTOMAKE) --foreign tools/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tools/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --foreign tools/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -315,6 +367,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
mostlyclean-libtool:
-rm -f *.lo
@@ -329,7 +382,7 @@ clean-libtool:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -346,7 +399,7 @@ $(RECURSIVE_TARGETS):
else \
local_target="$$target"; \
fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
|| eval $$failcom; \
done; \
if test "$$dot_seen" = "no"; then \
@@ -354,7 +407,7 @@ $(RECURSIVE_TARGETS):
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -380,16 +433,16 @@ $(RECURSIVE_CLEAN_TARGETS):
else \
local_target="$$target"; \
fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
|| eval $$failcom; \
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
done
ctags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -397,14 +450,14 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
+ set x; \
here=`pwd`; \
if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
include_option=--etags-include; \
@@ -416,39 +469,43 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
list='$(SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test ! -f $$subdir/TAGS || \
- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
fi
ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
+ $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && cd $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) $$here
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -469,29 +526,44 @@ distdir: $(DISTFILES)
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
if test -d $$d/$$file; then \
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test -d "$(distdir)/$$subdir" \
|| $(MKDIR_P) "$(distdir)/$$subdir" \
|| exit 1; \
- distdir=`$(am__cd) $(distdir) && pwd`; \
- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- (cd $$subdir && \
+ fi; \
+ done
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+ $(am__relativize); \
+ new_distdir=$$reldir; \
+ dir1=$$subdir; dir2="$(top_distdir)"; \
+ $(am__relativize); \
+ new_top_distdir=$$reldir; \
+ echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+ echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+ ($(am__cd) $$subdir && \
$(MAKE) $(AM_MAKEFLAGS) \
- top_distdir="$$top_distdir" \
- distdir="$$distdir/$$subdir" \
+ top_distdir="$$new_top_distdir" \
+ distdir="$$new_distdir" \
am__remove_distdir=: \
am__skip_length_check=: \
+ am__skip_mode_fix=: \
distdir) \
|| exit 1; \
fi; \
@@ -521,6 +593,7 @@ clean-generic:
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -539,6 +612,8 @@ dvi-am:
html: html-recursive
+html-am:
+
info: info-recursive
info-am:
@@ -547,18 +622,28 @@ install-data-am:
install-dvi: install-dvi-recursive
+install-dvi-am:
+
install-exec-am:
install-html: install-html-recursive
+install-html-am:
+
install-info: install-info-recursive
+install-info-am:
+
install-man:
install-pdf: install-pdf-recursive
+install-pdf-am:
+
install-ps: install-ps-recursive
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-recursive
@@ -579,8 +664,8 @@ ps-am:
uninstall-am:
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
- install-strip
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
+ install-am install-strip tags-recursive
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
all all-am check check-am clean clean-generic clean-libtool \
@@ -596,6 +681,7 @@ uninstall-am:
mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
uninstall uninstall-am
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/tools/browser/Makefile.am b/tools/browser/Makefile.am
index 4067326..8ef05f1 100644
--- a/tools/browser/Makefile.am
+++ b/tools/browser/Makefile.am
@@ -87,8 +87,10 @@ AM_MAKEINFOHTMLFLAGS = --no-split
AM_CPPFLAGS = \
-I$(top_builddir)/src/silo \
+ -I$(top_srcdir)/src/filters \
-I$(includedir) \
- -DPUBLIC_INIT_FILE=\"$(includedir)/browser_rc\"
+ -DPUBLIC_INIT_FILE=\"$(includedir)/browser_rc\" \
+ -I$(top_srcdir)/src/filters
EXTRA_DIST = \
browser.html \
diff --git a/tools/browser/Makefile.in b/tools/browser/Makefile.in
index 88e87b1..7f6ed8a 100644
--- a/tools/browser/Makefile.in
+++ b/tools/browser/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -71,8 +72,9 @@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -92,14 +94,22 @@ subdir = tools/browser
DIST_COMMON = $(dist_bin_SCRIPTS) $(noinst_HEADERS) \
$(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/config/ax_check_compiler_flags.m4 \
+ $(top_srcdir)/config/ax_have_qt.m4 \
+ $(top_srcdir)/config/libtool.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
+ $(top_srcdir)/config/vl_lib_readline.m4 \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)"
-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
PROGRAMS = $(bin_PROGRAMS)
am__objects_1 = array.$(OBJEXT) bif.$(OBJEXT) browser.$(OBJEXT) \
cons.$(OBJEXT) file.$(OBJEXT) func.$(OBJEXT) lex.$(OBJEXT) \
@@ -113,11 +123,32 @@ am__DEPENDENCIES_1 =
@HDF5_DRV_NEEDED_FALSE@ $(am__DEPENDENCIES_1)
@HDF5_DRV_NEEDED_TRUE at browser_DEPENDENCIES = ../../src/libsiloh5.la \
@HDF5_DRV_NEEDED_TRUE@ $(am__DEPENDENCIES_1)
-dist_binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == $(am__install_max)) \
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+ END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
SCRIPTS = $(dist_bin_SCRIPTS)
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/config/depcomp
am__depfiles_maybe = depfiles
+am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -150,12 +181,6 @@ TEXI2DVI = texi2dvi
TEXI2PDF = $(TEXI2DVI) --pdf --batch
MAKEINFOHTML = $(MAKEINFO) --html
DVIPS = dvips
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
HEADERS = $(noinst_HEADERS)
ETAGS = etags
CTAGS = ctags
@@ -186,7 +211,8 @@ CXX_FULLPATH = @CXX_FULLPATH@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -198,6 +224,7 @@ FCFLAGS = @FCFLAGS@
FCLIBS = @FCLIBS@
FC_FULLPATH = @FC_FULLPATH@
FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FORTRAN = @FORTRAN@
FPZIP = @FPZIP@
GREP = @GREP@
@@ -208,17 +235,25 @@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
LDFLAGS = @LDFLAGS@
+LIBM = @LIBM@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
NETCDF = @NETCDF@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -228,7 +263,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PDBP_DRV = @PDBP_DRV@
PDB_DRV = @PDB_DRV@
-PRTDIAG = @PRTDIAG@
PYTHON = @PYTHON@
PYTHONMODULE = @PYTHONMODULE@
PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@
@@ -236,17 +270,13 @@ PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
PYTHON_PLATFORM = @PYTHON_PLATFORM@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
-QT_BIN = @QT_BIN@
-QT_CORE = @QT_CORE@
-QT_CORE_LIB = @QT_CORE_LIB@
QT_CXXFLAGS = @QT_CXXFLAGS@
-QT_GUI = @QT_GUI@
-QT_GUI_LIB = @QT_GUI_LIB@
-QT_INCLUDE = @QT_INCLUDE@
-QT_LDFLAGS = @QT_LDFLAGS@
-QT_LIB = @QT_LIB@
+QT_DIR = @QT_DIR@
QT_LIBS = @QT_LIBS@
+QT_LRELEASE = @QT_LRELEASE@
+QT_LUPDATE = @QT_LUPDATE@
QT_MOC = @QT_MOC@
+QT_UIC = @QT_UIC@
RANLIB = @RANLIB@
READLINE_LIBS = @READLINE_LIBS@
SED = @SED@
@@ -264,6 +294,11 @@ SILO_VERS_TAG = @SILO_VERS_TAG@
STRIP = @STRIP@
TAURUS = @TAURUS@
VERSION = @VERSION@
+XMKMF = @XMKMF@
+X_CFLAGS = @X_CFLAGS@
+X_EXTRA_LIBS = @X_EXTRA_LIBS@
+X_LIBS = @X_LIBS@
+X_PRE_LIBS = @X_PRE_LIBS@
ZLIB = @ZLIB@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
@@ -271,6 +306,7 @@ abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_F77 = @ac_ct_F77@
ac_ct_FC = @ac_ct_FC@
am__include = @am__include@
@@ -303,6 +339,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -319,6 +356,7 @@ sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
dist_bin_SCRIPTS = \
@@ -336,8 +374,10 @@ info_TEXINFOS = browser.texi
AM_MAKEINFOHTMLFLAGS = --no-split
AM_CPPFLAGS = \
-I$(top_builddir)/src/silo \
+ -I$(top_srcdir)/src/filters \
-I$(includedir) \
- -DPUBLIC_INIT_FILE=\"$(includedir)/browser_rc\"
+ -DPUBLIC_INIT_FILE=\"$(includedir)/browser_rc\" \
+ -I$(top_srcdir)/src/filters
EXTRA_DIST = \
browser.html \
@@ -375,14 +415,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
- && exit 0; \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tools/browser/Makefile'; \
- cd $(top_srcdir) && \
- $(AUTOMAKE) --foreign tools/browser/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tools/browser/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --foreign tools/browser/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -400,56 +440,87 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
- @list='$(bin_PROGRAMS)'; for p in $$list; do \
- p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
- if test -f $$p \
- || test -f $$p1 \
- ; then \
- f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
- else :; fi; \
- done
+ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed 's/$(EXEEXT)$$//' | \
+ while read p p1; do if test -f $$p || test -f $$p1; \
+ then echo "$$p"; echo "$$p"; else :; fi; \
+ done | \
+ sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+ sed 'N;N;N;s,\n, ,g' | \
+ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+ { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+ if ($$2 == $$4) files[d] = files[d] " " $$1; \
+ else { print "f", $$3 "/" $$4, $$1; } } \
+ END { for (d in files) print "f", d, files[d] }' | \
+ while read type dir files; do \
+ if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+ test -z "$$files" || { \
+ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
+ } \
+ ; done
uninstall-binPROGRAMS:
@$(NORMAL_UNINSTALL)
- @list='$(bin_PROGRAMS)'; for p in $$list; do \
- f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
- echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
- rm -f "$(DESTDIR)$(bindir)/$$f"; \
- done
+ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+ files=`for p in $$list; do echo "$$p"; done | \
+ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+ -e 's/$$/$(EXEEXT)/' `; \
+ test -n "$$list" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(bindir)" && rm -f $$files
clean-binPROGRAMS:
- @list='$(bin_PROGRAMS)'; for p in $$list; do \
- f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
- echo " rm -f $$p $$f"; \
- rm -f $$p $$f ; \
- done
+ @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
+ echo " rm -f" $$list; \
+ rm -f $$list || exit $$?; \
+ test -n "$(EXEEXT)" || exit 0; \
+ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+ echo " rm -f" $$list; \
+ rm -f $$list
browser$(EXEEXT): $(browser_OBJECTS) $(browser_DEPENDENCIES)
@rm -f browser$(EXEEXT)
$(CXXLINK) $(browser_OBJECTS) $(browser_LDADD) $(LIBS)
install-dist_binSCRIPTS: $(dist_bin_SCRIPTS)
@$(NORMAL_INSTALL)
test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
- @list='$(dist_bin_SCRIPTS)'; for p in $$list; do \
+ @list='$(dist_bin_SCRIPTS)'; test -n "$(bindir)" || list=; \
+ for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- if test -f $$d$$p; then \
- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
- echo " $(dist_binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \
- $(dist_binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \
- else :; fi; \
- done
+ if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
+ done | \
+ sed -e 'p;s,.*/,,;n' \
+ -e 'h;s|.*|.|' \
+ -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \
+ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \
+ { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+ if ($$2 == $$4) { files[d] = files[d] " " $$1; \
+ if (++n[d] == $(am__install_max)) { \
+ print "f", d, files[d]; n[d] = 0; files[d] = "" } } \
+ else { print "f", d "/" $$4, $$1 } } \
+ END { for (d in files) print "f", d, files[d] }' | \
+ while read type dir files; do \
+ if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+ test -z "$$files" || { \
+ echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(bindir)$$dir'"; \
+ $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
+ } \
+ ; done
uninstall-dist_binSCRIPTS:
@$(NORMAL_UNINSTALL)
- @list='$(dist_bin_SCRIPTS)'; for p in $$list; do \
- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
- echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
- rm -f "$(DESTDIR)$(bindir)/$$f"; \
- done
+ @list='$(dist_bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \
+ files=`for p in $$list; do echo "$$p"; done | \
+ sed -e 's,.*/,,;$(transform)'`; \
+ test -n "$$list" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(bindir)" && rm -f $$files
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@ -480,42 +551,42 @@ distclean-compile:
.c.o:
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c $<
.c.obj:
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
.c.lo:
@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
.cxx.o:
@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
.cxx.obj:
@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
.cxx.lo:
@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
@@ -528,7 +599,7 @@ clean-libtool:
.texi.info:
restore=: && backupdir="$(am__leading_dot)am$$$$" && \
- am__cwd=`pwd` && cd $(srcdir) && \
+ am__cwd=`pwd` && $(am__cd) $(srcdir) && \
rm -rf $$backupdir && mkdir $$backupdir && \
if ($(MAKEINFO) --version) >/dev/null 2>&1; then \
for f in $@ $@-[0-9] $@-[0-9][0-9] $(@:.info=).i[0-9] $(@:.info=).i[0-9][0-9]; do \
@@ -540,10 +611,10 @@ clean-libtool:
-o $@ $<; \
then \
rc=0; \
- cd $(srcdir); \
+ $(am__cd) $(srcdir); \
else \
rc=$$?; \
- cd $(srcdir) && \
+ $(am__cd) $(srcdir) && \
$$restore $$backupdir/* `echo "./$@" | sed 's|[^/]*$$||'`; \
fi; \
rm -rf $$backupdir; exit $$rc
@@ -581,16 +652,18 @@ browser.html: browser.texi
uninstall-dvi-am:
@$(NORMAL_UNINSTALL)
- @list='$(DVIS)'; for p in $$list; do \
- f=$(am__strip_dir) \
+ @list='$(DVIS)'; test -n "$(dvidir)" || list=; \
+ for p in $$list; do \
+ $(am__strip_dir) \
echo " rm -f '$(DESTDIR)$(dvidir)/$$f'"; \
rm -f "$(DESTDIR)$(dvidir)/$$f"; \
done
uninstall-html-am:
@$(NORMAL_UNINSTALL)
- @list='$(HTMLS)'; for p in $$list; do \
- f=$(am__strip_dir) \
+ @list='$(HTMLS)'; test -n "$(htmldir)" || list=; \
+ for p in $$list; do \
+ $(am__strip_dir) \
echo " rm -rf '$(DESTDIR)$(htmldir)/$$f'"; \
rm -rf "$(DESTDIR)$(htmldir)/$$f"; \
done
@@ -604,7 +677,8 @@ uninstall-info-am:
for file in $$list; do \
relfile=`echo "$$file" | sed 's|^.*/||'`; \
echo " install-info --info-dir='$(DESTDIR)$(infodir)' --remove '$(DESTDIR)$(infodir)/$$relfile'"; \
- install-info --info-dir="$(DESTDIR)$(infodir)" --remove "$(DESTDIR)$(infodir)/$$relfile"; \
+ if install-info --info-dir="$(DESTDIR)$(infodir)" --remove "$(DESTDIR)$(infodir)/$$relfile"; \
+ then :; else test ! -f "$(DESTDIR)$(infodir)/$$relfile" || exit 1; fi; \
done; \
else :; fi
@$(NORMAL_UNINSTALL)
@@ -620,16 +694,18 @@ uninstall-info-am:
uninstall-pdf-am:
@$(NORMAL_UNINSTALL)
- @list='$(PDFS)'; for p in $$list; do \
- f=$(am__strip_dir) \
+ @list='$(PDFS)'; test -n "$(pdfdir)" || list=; \
+ for p in $$list; do \
+ $(am__strip_dir) \
echo " rm -f '$(DESTDIR)$(pdfdir)/$$f'"; \
rm -f "$(DESTDIR)$(pdfdir)/$$f"; \
done
uninstall-ps-am:
@$(NORMAL_UNINSTALL)
- @list='$(PSS)'; for p in $$list; do \
- f=$(am__strip_dir) \
+ @list='$(PSS)'; test -n "$(psdir)" || list=; \
+ for p in $$list; do \
+ $(am__strip_dir) \
echo " rm -f '$(DESTDIR)$(psdir)/$$f'"; \
rm -f "$(DESTDIR)$(psdir)/$$f"; \
done
@@ -646,17 +722,21 @@ dist-info: $(INFO_DEPS)
for file in $$d/$$base $$d/$$base-[0-9] $$d/$$base-[0-9][0-9] $$d/$$base_i[0-9] $$d/$$base_i[0-9][0-9]; do \
if test -f $$file; then \
relfile=`expr "$$file" : "$$d/\(.*\)"`; \
- test -f $(distdir)/$$relfile || \
- cp -p $$file $(distdir)/$$relfile; \
+ test -f "$(distdir)/$$relfile" || \
+ cp -p $$file "$(distdir)/$$relfile"; \
else :; fi; \
done; \
done
mostlyclean-aminfo:
- -rm -rf browser.aux browser.cp browser.cps browser.fn browser.fns browser.ky \
- browser.kys browser.log browser.pg browser.pgs browser.tmp \
- browser.toc browser.tp browser.tps browser.vr browser.vrs \
- browser.dvi browser.pdf browser.ps browser.html
+ -rm -rf browser.aux browser.cp browser.cps browser.fn browser.fns \
+ browser.ky browser.kys browser.log browser.pg browser.pgs \
+ browser.tmp browser.toc browser.tp browser.tps browser.vr \
+ browser.vrs
+
+clean-aminfo:
+ -test -z "browser.dvi browser.pdf browser.ps browser.html" \
+ || rm -rf browser.dvi browser.pdf browser.ps browser.html
maintainer-clean-aminfo:
@list='$(INFO_DEPS)'; for i in $$list; do \
@@ -670,45 +750,49 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
+ set x; \
here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
fi
ctags: CTAGS
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
+ $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && cd $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) $$here
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -729,13 +813,17 @@ distdir: $(DISTFILES)
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
if test -d $$d/$$file; then \
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
@@ -769,13 +857,15 @@ clean-generic:
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
clean: clean-am
-clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
+clean-am: clean-aminfo clean-binPROGRAMS clean-generic clean-libtool \
+ mostlyclean-am
distclean: distclean-am
-rm -rf ./$(DEPDIR)
@@ -802,11 +892,14 @@ install-dvi: install-dvi-am
install-dvi-am: $(DVIS)
@$(NORMAL_INSTALL)
test -z "$(dvidir)" || $(MKDIR_P) "$(DESTDIR)$(dvidir)"
- @list='$(DVIS)'; for p in $$list; do \
+ @list='$(DVIS)'; test -n "$(dvidir)" || list=; \
+ for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
- echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(dvidir)/$$f'"; \
- $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(dvidir)/$$f"; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(dvidir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(dvidir)" || exit $$?; \
done
install-exec-am: install-binPROGRAMS install-dist_binSCRIPTS
@@ -815,26 +908,31 @@ install-html: install-html-am
install-html-am: $(HTMLS)
@$(NORMAL_INSTALL)
test -z "$(htmldir)" || $(MKDIR_P) "$(DESTDIR)$(htmldir)"
- @list='$(HTMLS)'; for p in $$list; do \
+ @list='$(HTMLS)'; list2=; test -n "$(htmldir)" || list=; \
+ for p in $$list; do \
if test -f "$$p" || test -d "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
+ $(am__strip_dir) \
if test -d "$$d$$p"; then \
echo " $(MKDIR_P) '$(DESTDIR)$(htmldir)/$$f'"; \
$(MKDIR_P) "$(DESTDIR)$(htmldir)/$$f" || exit 1; \
echo " $(INSTALL_DATA) '$$d$$p'/* '$(DESTDIR)$(htmldir)/$$f'"; \
- $(INSTALL_DATA) "$$d$$p"/* "$(DESTDIR)$(htmldir)/$$f"; \
+ $(INSTALL_DATA) "$$d$$p"/* "$(DESTDIR)$(htmldir)/$$f" || exit $$?; \
else \
- echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(htmldir)/$$f'"; \
- $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(htmldir)/$$f"; \
+ list2="$$list2 $$d$$p"; \
fi; \
- done
+ done; \
+ test -z "$$list2" || { echo "$$list2" | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(htmldir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(htmldir)" || exit $$?; \
+ done; }
install-info: install-info-am
install-info-am: $(INFO_DEPS)
@$(NORMAL_INSTALL)
test -z "$(infodir)" || $(MKDIR_P) "$(DESTDIR)$(infodir)"
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- list='$(INFO_DEPS)'; \
+ list='$(INFO_DEPS)'; test -n "$(infodir)" || list=; \
for file in $$list; do \
case $$file in \
$(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
@@ -842,18 +940,19 @@ install-info-am: $(INFO_DEPS)
if test -f $$file; then d=.; else d=$(srcdir); fi; \
file_i=`echo "$$file" | sed 's|\.info$$||;s|$$|.i|'`; \
for ifile in $$d/$$file $$d/$$file-[0-9] $$d/$$file-[0-9][0-9] \
- $$d/$$file_i[0-9] $$d/$$file_i[0-9][0-9] ; do \
+ $$d/$$file_i[0-9] $$d/$$file_i[0-9][0-9] ; do \
if test -f $$ifile; then \
- relfile=`echo "$$ifile" | sed 's|^.*/||'`; \
- echo " $(INSTALL_DATA) '$$ifile' '$(DESTDIR)$(infodir)/$$relfile'"; \
- $(INSTALL_DATA) "$$ifile" "$(DESTDIR)$(infodir)/$$relfile"; \
+ echo "$$ifile"; \
else : ; fi; \
done; \
- done
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(infodir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(infodir)" || exit $$?; done
@$(POST_INSTALL)
@if (install-info --version && \
install-info --version 2>&1 | sed 1q | grep -i -v debian) >/dev/null 2>&1; then \
- list='$(INFO_DEPS)'; \
+ list='$(INFO_DEPS)'; test -n "$(infodir)" || list=; \
for file in $$list; do \
relfile=`echo "$$file" | sed 's|^.*/||'`; \
echo " install-info --info-dir='$(DESTDIR)$(infodir)' '$(DESTDIR)$(infodir)/$$relfile'";\
@@ -867,23 +966,27 @@ install-pdf: install-pdf-am
install-pdf-am: $(PDFS)
@$(NORMAL_INSTALL)
test -z "$(pdfdir)" || $(MKDIR_P) "$(DESTDIR)$(pdfdir)"
- @list='$(PDFS)'; for p in $$list; do \
+ @list='$(PDFS)'; test -n "$(pdfdir)" || list=; \
+ for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
- echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(pdfdir)/$$f'"; \
- $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(pdfdir)/$$f"; \
- done
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pdfdir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(pdfdir)" || exit $$?; done
install-ps: install-ps-am
install-ps-am: $(PSS)
@$(NORMAL_INSTALL)
test -z "$(psdir)" || $(MKDIR_P) "$(DESTDIR)$(psdir)"
- @list='$(PSS)'; for p in $$list; do \
+ @list='$(PSS)'; test -n "$(psdir)" || list=; \
+ for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
- echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(psdir)/$$f'"; \
- $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(psdir)/$$f"; \
- done
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(psdir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(psdir)" || exit $$?; done
installcheck-am:
maintainer-clean: maintainer-clean-am
@@ -911,17 +1014,17 @@ uninstall-am: uninstall-binPROGRAMS uninstall-dist_binSCRIPTS \
.MAKE: install-am install-strip
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
- clean-generic clean-libtool ctags dist-info distclean \
- distclean-compile distclean-generic distclean-libtool \
- distclean-tags distdir dvi dvi-am html html-am info info-am \
- install install-am install-binPROGRAMS install-data \
- install-data-am install-dist_binSCRIPTS install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-ps install-ps-am \
- install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-aminfo \
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-aminfo \
+ clean-binPROGRAMS clean-generic clean-libtool ctags dist-info \
+ distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-binPROGRAMS \
+ install-data install-data-am install-dist_binSCRIPTS \
+ install-dvi install-dvi-am install-exec install-exec-am \
+ install-html install-html-am install-info install-info-am \
+ install-man install-pdf install-pdf-am install-ps \
+ install-ps-am install-strip installcheck installcheck-am \
+ installdirs maintainer-clean maintainer-clean-aminfo \
maintainer-clean-generic mostlyclean mostlyclean-aminfo \
mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
pdf pdf-am ps ps-am tags uninstall uninstall-am \
@@ -931,6 +1034,7 @@ uninstall-am: uninstall-binPROGRAMS uninstall-dist_binSCRIPTS \
@HDF5_DRV_NEEDED_TRUE@@HZIP_NEEDED_TRUE@ # Dummy C++ source to cause C++ linking.
@FPZIP_NEEDED_TRUE@@HDF5_DRV_NEEDED_TRUE@ # Dummy C++ source to cause C++ linking.
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/tools/browser/browser.c b/tools/browser/browser.c
index fbc0d15..66241c7 100644
--- a/tools/browser/browser.c
+++ b/tools/browser/browser.c
@@ -86,7 +86,16 @@ be used for advertising or product endorsement purposes.
#include <assert.h>
#include "browser.h"
#include <ctype.h>
-#include <pwd.h>
+#ifndef _WIN32
+ #include <pwd.h>
+#else
+ #ifndef WIN32_LEAN_AND_MEAN
+ #define WIN32_LEAN_AND_MEAN
+ #endif
+ #include <Windows.h>
+ #include <shlobj.h>
+ #include <shlwapi.h>
+#endif
#include <math.h>
#ifdef HAVE_LIBREADLINE
# if defined(HAVE_READLINE_READLINE_H)
@@ -115,10 +124,10 @@ extern int read_history ();
#endif /* HAVE_READLINE_HISTORY */
#include <signal.h>
#ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
+# include <sys/stat.h>
#endif /* HAVE_SYS_STAT_H */
#ifdef HAVE_UNISTD_H
-#include <unistd.h>
+# include <unistd.h>
#endif /* HAVE_UNISTD_H */
const char *arg0; /*argv[0] */
@@ -138,8 +147,8 @@ char *ObjTypeName[BROWSER_NOBJTYPES] = {
/*
* Externals for the ale3d and debug filter registration.
*/
-extern int f_ale3d_Open ();
-extern int f_debug_Open ();
+#include <f_ale3d.h>
+#include <f_sample.h>
/*---------------------------------------------------------------------------
* Purpose: Print a usage message to the standard error stream.
@@ -284,9 +293,9 @@ browser_DBGetToc (DBfile *file, int *nentries, int (*sorter)(toc_t*,toc_t*)) {
toc->nmultimat + toc->nmultimatspecies + toc->nqmesh +
toc->nqvar + toc->nucdmesh + toc->nucdvar + toc->nptmesh +
toc->nptvar + toc->nmat + toc->nmatspecies + toc->nvar +
- toc->nobj + toc->ndir + toc->narrays + toc->ndefvars +
+ toc->nobj + toc->ndir + toc->narray + toc->ndefvars +
toc->ncsgmesh + toc->ncsgvar + toc->nmultimeshadj +
- toc->nmrgtrees + toc->ngroupelmaps + toc->nmrgvars;
+ toc->nmrgtree + toc->ngroupelmap + toc->nmrgvar;
if (total) retval = malloc (total * sizeof(toc_t));
/*
@@ -392,22 +401,22 @@ browser_DBGetToc (DBfile *file, int *nentries, int (*sorter)(toc_t*,toc_t*)) {
retval[at].type = BROWSER_DB_DIR;
}
- for (i=0; i<toc->narrays; i++,at++) {
+ for (i=0; i<toc->narray; i++,at++) {
retval[at].name = safe_strdup (toc->array_names[i]);
retval[at].type = BROWSER_DB_ARRAY;
}
- for (i=0; i<toc->nmrgtrees; i++,at++) {
+ for (i=0; i<toc->nmrgtree; i++,at++) {
retval[at].name = safe_strdup (toc->mrgtree_names[i]);
retval[at].type = BROWSER_DB_MRGTREE;
}
- for (i=0; i<toc->ngroupelmaps; i++,at++) {
+ for (i=0; i<toc->ngroupelmap; i++,at++) {
retval[at].name = safe_strdup (toc->groupelmap_names[i]);
retval[at].type = BROWSER_DB_GROUPELMAP;
}
- for (i=0; i<toc->nmrgvars; i++,at++) {
+ for (i=0; i<toc->nmrgvar; i++,at++) {
retval[at].name = safe_strdup (toc->mrgvar_names[i]);
retval[at].type = BROWSER_DB_MRGVAR;
}
@@ -588,6 +597,9 @@ browser_rl_obj_generator (char *text, int state) {
*
* Mark C. Miller, Wed Nov 11 22:18:17 PST 2009
* Added suppot for alternate relative diff option.
+ *
+ * Mark C. Miller, Tue Feb 7 15:18:38 PST 2012
+ * Made reltol_eps diff mutually exclusive with abstol || reltol diff.
*-------------------------------------------------------------------------
*/
int
@@ -597,22 +609,10 @@ different (double a, double b, double abstol, double reltol,
double num, den;
/*
- * Now the |A-B| but make sure it doesn't overflow which can only
- * happen if one is negative and the other is positive.
- */
- if (abstol>0) {
- if ((a<0 && b>0) || (b<0 && a>0)) {
- if (fabs (a/2 - b/2) > abstol/2) return 1;
- } else {
- if (fabs(a-b) > abstol) return 1;
- }
- }
-
- /*
* First, see if we should use the alternate diff.
* check |A-B|/(|A|+|B|+EPS) in a way that won't overflow.
*/
- if (reltol_eps >= 0)
+ if (reltol_eps >= 0 && reltol > 0)
{
if ((a<0 && b>0) || (b<0 && a>0)) {
num = fabs (a/2 - b/2);
@@ -624,28 +624,40 @@ different (double a, double b, double abstol, double reltol,
}
if (0.0==den && num) return 1;
if (num/den > reltol) return 1;
+ return 0;
}
+ else /* use the old Abs|Rel difference test */
+ {
+ /*
+ * Now the |A-B| but make sure it doesn't overflow which can only
+ * happen if one is negative and the other is positive.
+ */
+ if (abstol>0) {
+ if ((a<0 && b>0) || (b<0 && a>0)) {
+ if (fabs (a/2 - b/2) > abstol/2) return 1;
+ } else {
+ if (fabs(a-b) > abstol) return 1;
+ }
+ }
- /*
- * Now check 2|A-B|/|A+B| in a way that won't overflow.
- */
- if (reltol>0) {
- if ((a<0 && b>0) || (b<0 && a>0)) {
- num = fabs (a/2 - b/2);
- den = fabs (a/2 + b/2);
- reltol /= 2;
- } else {
- num = fabs (a - b);
- den = fabs (a/2 + b/2);
+ /*
+ * Now check 2|A-B|/|A+B| in a way that won't overflow.
+ */
+ if (reltol>0) {
+ if ((a<0 && b>0) || (b<0 && a>0)) {
+ num = fabs (a/2 - b/2);
+ den = fabs (a/2 + b/2);
+ reltol /= 2;
+ } else {
+ num = fabs (a - b);
+ den = fabs (a/2 + b/2);
+ }
+ if (0.0==den && num) return 1;
+ if (num/den > reltol) return 1;
}
- if (0.0==den && num) return 1;
- if (num/den > reltol) return 1;
- }
- /*
- * If all tests tried succeeded then the numbers are equal.
- */
- if (abstol>0 || reltol>0 || reltol_eps>=0) return 0;
+ if (abstol>0 || reltol>0) return 0;
+ }
/*
* Otherwise do a normal exact comparison.
@@ -678,22 +690,10 @@ differentll (long long a, long long b, double abstol, double reltol,
long long num, den;
/*
- * Now the |A-B| but make sure it doesn't overflow which can only
- * happen if one is negative and the other is positive.
- */
- if (abstol>0) {
- if ((a<0 && b>0) || (b<0 && a>0)) {
- if (FABS(a/2 - b/2) > abstol/2) return 1;
- } else {
- if (FABS(a-b) > abstol) return 1;
- }
- }
-
- /*
* First, see if we should use the alternate diff.
* check |A-B|/(|A|+|B|+EPS) in a way that won't overflow.
*/
- if (reltol_eps >= 0)
+ if (reltol_eps >= 0 && reltol > 0)
{
if ((a<0 && b>0) || (b<0 && a>0)) {
num = FABS (a/2 - b/2);
@@ -705,30 +705,42 @@ differentll (long long a, long long b, double abstol, double reltol,
}
if (0.0==den && num) return 1;
if (num/den > reltol) return 1;
+ return 0;
}
+ else
+ {
+ /*
+ * Now the |A-B| but make sure it doesn't overflow which can only
+ * happen if one is negative and the other is positive.
+ */
+ if (abstol>0) {
+ if ((a<0 && b>0) || (b<0 && a>0)) {
+ if (FABS(a/2 - b/2) > abstol/2) return 1;
+ } else {
+ if (FABS(a-b) > abstol) return 1;
+ }
+ }
- /*
- * Now check 2|A-B|/|A+B| in a way that won't overflow.
- */
- if (reltol>0) {
- if ((a<0 && b>0) || (b<0 && a>0)) {
- num = FABS (a/2 - b/2);
- den = FABS (a/2 + b/2);
- reltol /= 2;
- } else {
- num = FABS (a - b);
- den = FABS (a/2 + b/2);
+ /*
+ * Now check 2|A-B|/|A+B| in a way that won't overflow.
+ */
+ if (reltol>0) {
+ if ((a<0 && b>0) || (b<0 && a>0)) {
+ num = FABS (a/2 - b/2);
+ den = FABS (a/2 + b/2);
+ reltol /= 2;
+ } else {
+ num = FABS (a - b);
+ den = FABS (a/2 + b/2);
+ }
+ if (0.0==den && num) return 1;
+ if (num/den > reltol) return 1;
+
+ if (abstol>0 || reltol>0) return 0;
}
- if (0.0==den && num) return 1;
- if (num/den > reltol) return 1;
}
/*
- * If all tests tried succeeded then the numbers are equal.
- */
- if (abstol>0 || reltol>0 || reltol_eps>=0) return 0;
-
- /*
* Otherwise do a normal exact comparison.
*/
return a!=b;
@@ -1380,6 +1392,10 @@ bad_switch(const char *fmt, ...)
*
* Mark C. Miller, Fri Mar 12 00:35:43 PST 2010
* Replaced --split-vfd switch with --hdf5-vfd-opts switch.
+ *
+ * Kathleen Bonnell, Thu Dec 9 09:21:15 PST 2010
+ * Modifications for WIN32: ifdef out sigaction sections; use Win32
+ * retrieval of users 'home' dir; use setvbuf instead of setlinebuf.
*-------------------------------------------------------------------------
*/
int
@@ -1394,14 +1410,20 @@ main(int argc, char *argv[])
strlist_t eval_list, exclude_list, hdf5_vfd_opts;
switches_t *sws=switch_new();
switch_t *sw=NULL;
+#ifndef _WIN32
struct sigaction action;
+#endif
arg0 = argv[0]; /*global executable name*/
/* We want stdout line buffered to prevent possible redirection
from client shells (e.g. 2>&1) from having stderr cause
breaks in lines in stdout */
+#ifndef _WIN32
setlinebuf(stdout);
+#else
+ setvbuf(stdout, NULL, _IONBF, 0);
+#endif
#if defined(HAVE_READLINE_READLINE_H) && defined(HAVE_LIBREADLINE)
/* We have our own readline completion function that tries to complete
@@ -1416,6 +1438,7 @@ main(int argc, char *argv[])
using_history();
stifle_history(HISTORY_STIFLE);
#ifdef HISTORY_FILE
+ #ifndef _WIN32
if ((passwd=getpwuid(getuid())) && passwd->pw_dir) {
assert (strlen(passwd->pw_dir)+strlen(HISTORY_FILE)+2 <
sizeof(HistoryFile));
@@ -1424,6 +1447,30 @@ main(int argc, char *argv[])
} else {
HistoryFile[0] = '\0';
}
+ #else
+ { /* new scope */
+ /* Retrieve users personal folder, generally 'My Documents" or
+ * "Documents"
+ */
+ char userhome[1024];
+ int haveUserHome = 0;
+ TCHAR szPath[MAX_PATH];
+ struct _stat fs;
+ if (SUCCEEDED(SHGetFolderPath(NULL, CSIDL_PERSONAL, NULL,
+ SHGFP_TYPE_CURRENT, szPath)))
+ {
+ ExpandEnvironmentStrings(userhome, szPath, 1024);
+ assert (strlen(userhome) + strlen(HISTORY_FILE) +2 <
+ sizeof(HistoryFile));
+ sprintf(HistoryFile, "%s\\%s", userhome, HISTORY_FILE);
+ read_history(HistoryFile);
+ }
+ else
+ {
+ HistoryFile[0] = '\0';
+ }
+ } /* end new scope */
+ #endif
#endif /*HISTORY_FILE*/
#endif /*HAVE_READLINE_HISTORY_H && HAVE_READLINE_HISTORY*/
@@ -1440,10 +1487,29 @@ main(int argc, char *argv[])
/* Determine where the default startup file is located. Read either
* the user's init file or the system-wide init file, but not both.
* The `--file' command-line option overrides this. */
+#ifndef _WIN32
if ((passwd=getpwuid(getuid())) && passwd->pw_dir) {
sprintf(init_file_buf, "%s/%s", passwd->pw_dir, INIT_FILE);
if (access(init_file_buf, F_OK)>=0) init_file = init_file_buf;
}
+#else
+ {
+ /* Retrieve users personal folder, generally 'My Documents" or
+ * "Documents"
+ */
+ char userhome[1024];
+ int haveUserHome = 0;
+ TCHAR szPath[MAX_PATH];
+ if (SUCCEEDED(SHGetFolderPath(NULL, CSIDL_PERSONAL, NULL,
+ SHGFP_TYPE_CURRENT, szPath)))
+ {
+ ExpandEnvironmentStrings(userhome, szPath, 1024);
+ sprintf(init_file_buf, "%s\\%s", userhome, INIT_FILE);
+ if (access(init_file_buf, F_OK)>=0) init_file = init_file_buf;
+ }
+ } /* end new scope */
+#endif
+
#ifdef PUBLIC_INIT_FILE
if (!init_file) {
strcpy(init_file_buf, PUBLIC_INIT_FILE);
@@ -1649,7 +1715,7 @@ main(int argc, char *argv[])
((sw=switch_find(sws, "--version")) && sw->seen && 2==argc)) {
exit(0);
}
-
+
/* Register the ale3d and debug filters. */
DBFilterRegistration("ale3d", NULL, f_ale3d_Open);
DBFilterRegistration("debug", NULL, f_debug_Open);
@@ -1671,6 +1737,7 @@ main(int argc, char *argv[])
/* Don't dump core on floating-point exceptions. Keep track of window
* size changes. */
+#ifndef _WIN32
action.sa_handler = sigwinch_handler;
sigemptyset(&action.sa_mask);
action.sa_flags = SA_RESTART;
@@ -1680,6 +1747,7 @@ main(int argc, char *argv[])
sigemptyset(&action.sa_mask);
action.sa_flags = SA_RESTART;
sigaction(SIGFPE, &action, NULL);
+#endif
/* Open the initialization file and read it. */
if ((sw=switch_find(sws, "--file")) && sw->seen) init_file = sw->lexeme;
diff --git a/tools/browser/browser.h b/tools/browser/browser.h
index 6784fe2..47341be 100644
--- a/tools/browser/browser.h
+++ b/tools/browser/browser.h
@@ -122,6 +122,9 @@ be used for advertising or product endorsement purposes.
* Mark C. Miller, Tue Mar 10 15:41:50 PDT 2009
* Removed VERSION symbols. No need for browser to maintain
* version information apart from the Silo library it is linked with.
+ *
+ * Kathleen Bonnell, Thu Dec 9 09:28:57 PST 2010
+ * Added declaration of diferentll, couple of Win32-specifics.
*-------------------------------------------------------------------------
*/
#ifndef _BROWSER_H
@@ -132,6 +135,9 @@ be used for advertising or product endorsement purposes.
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#ifdef _WIN32
+# include <silo_win32_compatibility.h>
+#endif
#define false 0
#define true 1
@@ -142,7 +148,9 @@ be used for advertising or product endorsement purposes.
#define NDIMS 10
#define NELMTS(X) (sizeof(X)/sizeof(*(X)))
+#ifndef _WIN32
char *safe_strdup(const char *);
+#endif
#undef strdup
#define strdup(s) safe_strdup(s)
@@ -480,6 +488,7 @@ extern char HistoryFile[];
extern char *ObjTypeName[BROWSER_NOBJTYPES];
void usage(void);
int different (double, double, double, double, double);
+int differentll (long long, long long, double, double, double);
toc_t *browser_DBGetToc (DBfile*, int*, int(*)(toc_t*,toc_t*));
int sort_toc_by_name (toc_t*, toc_t*);
int sort_toc_by_type (toc_t*, toc_t*);
@@ -624,6 +633,7 @@ extern prim_assoc_t PA_DEFVARTYPE[];
extern prim_assoc_t PA_BOUNDARYTYPE[];
extern prim_assoc_t PA_REGIONOP[];
extern prim_assoc_t PA_TOPODIM[];
+extern prim_assoc_t PA_REPRBLOCK[];
obj_t prim_set_io_assoc (obj_t, prim_assoc_t*);
DBdatatype prim_silotype (obj_t);
diff --git a/tools/browser/browser.html b/tools/browser/browser.html
index 3e918aa..6e71422 100644
--- a/tools/browser/browser.html
+++ b/tools/browser/browser.html
@@ -3,7 +3,7 @@
<title>Silo Browser User Manual</title>
<meta http-equiv="Content-Type" content="text/html">
<meta name="description" content="Silo Browser User Manual">
-<meta name="generator" content="makeinfo 4.8">
+<meta name="generator" content="makeinfo 4.13">
<link title="Top" rel="top" href="#Top">
<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
<meta http-equiv="Content-Style-Type" content="text/css">
@@ -22,8 +22,8 @@
<body>
<h1 class="settitle">Silo Browser User Manual</h1>
<div class="node">
-<p><hr>
<a name="Top"></a>
+<p><hr>
Next: <a rel="next" accesskey="n" href="#Copying">Copying</a>,
Up: <a rel="up" accesskey="u" href="#dir">(dir)</a>
@@ -54,8 +54,8 @@ files.
<!-- =========================================================================== -->
<!-- =========================================================================== -->
<div class="node">
-<p><hr>
<a name="Copying"></a>
+<p><hr>
Next: <a rel="next" accesskey="n" href="#Invocation">Invocation</a>,
Previous: <a rel="previous" accesskey="p" href="#Top">Top</a>,
Up: <a rel="up" accesskey="u" href="#Top">Top</a>
@@ -117,8 +117,8 @@ Government or Lawrence Livermore National Security, LLC, and shall not
<!-- ====================================================================== -->
<!-- ====================================================================== -->
<div class="node">
-<p><hr>
<a name="Invocation"></a>
+<p><hr>
Next: <a rel="next" accesskey="n" href="#Syntax">Syntax</a>,
Previous: <a rel="previous" accesskey="p" href="#Copying">Copying</a>,
Up: <a rel="up" accesskey="u" href="#Top">Top</a>
@@ -136,24 +136,24 @@ browser command line is
<p>The browser recognizes the following command line switches. Single
letter switches that don't require an argument can be grouped together
-(so `<samp><span class="samp">-l -q</span></samp>' is the same as `<samp><span class="samp">-lq</span></samp>'). When a single-letter switch
+(so ‘<samp><span class="samp">-l -q</span></samp>’ is the same as ‘<samp><span class="samp">-lq</span></samp>’). When a single-letter switch
takes an argument the argument can appear either immediately after the
-letter or as the next argument such as `<samp><span class="samp">-l3</span></samp>' or `<samp><span class="samp">-l 3</span></samp>'. Long
+letter or as the next argument such as ‘<samp><span class="samp">-l3</span></samp>’ or ‘<samp><span class="samp">-l 3</span></samp>’. Long
format switches are introduced by double hyphens and if they take an
-argument it must follow an equal sign such as `<samp><span class="samp">--eval=exit</span></samp>'.
+argument it must follow an equal sign such as ‘<samp><span class="samp">--eval=exit</span></samp>’.
Command-line options take effect before the initialization file is read,
but also override any settings made in that file.
- <p>Invoking the browser with the switch `<samp><span class="samp">--help</span></samp>' will show a complete
+ <p>Invoking the browser with the switch ‘<samp><span class="samp">--help</span></samp>’ will show a complete
list of command-line switches and their descriptions.
<dl>
<dt><code>-A </code><var>tolerance</var><dt><code>--absolute=</code><var>tolerance</var><dd>All absolute differencing tolerances are set to <var>tolerance</var>, a
-floating point number. All variables of the form `<samp><span class="samp">$diff_*_abs</span></samp>' are
+floating point number. All variables of the form ‘<samp><span class="samp">$diff_*_abs</span></samp>’ are
set to the specified tolerance.
<br><dt><code>-R </code><var>tolerance</var><dt><code>--absolute=</code><var>tolerance</var><dd>All relative differencing tolerances are set to <var>tolerance</var>, a
-floating point number. All variables of the form `<samp><span class="samp">$diff_*_rel</span></samp>' are
+floating point number. All variables of the form ‘<samp><span class="samp">$diff_*_rel</span></samp>’ are
set to the specified tolerance.
<br><dt><code>-V</code><dt><code>--version</code><dd>Prints the browser version number. If no other switches or files are
@@ -168,7 +168,7 @@ documentation for details.
standard output stream. More than one expression can be given to the
browser by using multiple switches. The expressions will be evaluated
in the order given after the initialization file is read. When a
-`<samp><span class="samp">-e</span></samp>' switch is present the browser exits after all expressions are
+‘<samp><span class="samp">-e</span></samp>’ switch is present the browser exits after all expressions are
processed instead of going into interactive mode. If standard output is
a terminal then the browser pages the output in the normal way (see
below). If the interrupt character is pressed when an expression is
@@ -183,9 +183,9 @@ documentation for <code>$exclude</code> for details.
<br><dt><code>-f </code><var>initfile</var><dt><code>--file=</code><var>initfile</var><dd>When the browser begins execution it attempts to read the file
<samp><span class="file">.browser_rc</span></samp> in the user's home directory. If that file isn't
readable then it tries to read a system-wide browser initialization
-file. The `<samp><span class="samp">-f</span></samp>' command line switch causes the browser to try to
+file. The ‘<samp><span class="samp">-f</span></samp>’ command line switch causes the browser to try to
read the specified file instead. To prevent the browser from reading
-any initialization file, say `<samp><span class="samp">-f /dev/null</span></samp>' (internal browser
+any initialization file, say ‘<samp><span class="samp">-f /dev/null</span></samp>’ (internal browser
variables are still initialized to default values). The initialization
file is opened after the database(s) and therefore can contain commands
that reference the database(s).
@@ -198,7 +198,7 @@ message. The usage message will be paged if printed to a terminal.
variable, which causes the browser to load database objects as type
<code>DBobject</code> even if the object is some other composite Silo datatype
like <code>DBquadvar</code>. If <var>value</var> is specified then it will be
-assigned to the <code>$lowlevel</code> variable; otherwise the value `<samp><span class="samp">1</span></samp>'
+assigned to the <code>$lowlevel</code> variable; otherwise the value ‘<samp><span class="samp">1</span></samp>’
is assigned.
<br><dt><code>-c </code><b>[</b><var>value</var><b>]</b><dt><code>--checksums</code><b>[</b><code>=</code><var>value</var><b>]</b><dd>This switch assigns an integer value to the <code>$checksums</code> browser
@@ -214,7 +214,7 @@ choice. The setting is valid only until the browser receives a
the <code>$verbosity</code> variable to zero.
<br><dt><code>-o</code><dt><code>--obase=</code><var>format</var><dd>This switch sets the internal variable <code>$obase</code> to <var>format</var>,
-which should be `<samp><span class="samp">16</span></samp>' for hexadecimal, `<samp><span class="samp">8</span></samp>' for octal, `<samp><span class="samp">2</span></samp>'
+which should be ‘<samp><span class="samp">16</span></samp>’ for hexadecimal, ‘<samp><span class="samp">8</span></samp>’ for octal, ‘<samp><span class="samp">2</span></samp>’
for binary, or anything else for the default decimal format. It controls
how integer, floating-point, character, and string data are
displayed. The default is that these types of data are displayed with a
@@ -260,8 +260,8 @@ is read.
<!-- ====================================================================== -->
<!-- ====================================================================== -->
<div class="node">
-<p><hr>
<a name="Syntax"></a>
+<p><hr>
Next: <a rel="next" accesskey="n" href="#Functions">Functions</a>,
Previous: <a rel="previous" accesskey="p" href="#Invocation">Invocation</a>,
Up: <a rel="up" accesskey="u" href="#Top">Top</a>
@@ -284,15 +284,15 @@ others evaluate only some (or none). For example, the <code>Assign</code>
function doesn't evaluate its first argument, but rather assignes the
evaluated second argument to the l-value specified by the first
argument. The parentheses can be omitted from around the top-level
-function call. Say `<samp><span class="samp">help func</span></samp>' (or `<samp><span class="samp">(help func)</span></samp>') for a list
+function call. Say ‘<samp><span class="samp">help func</span></samp>’ (or ‘<samp><span class="samp">(help func)</span></samp>’) for a list
of all functions.
<p>Most browser operators are infix, binary operators. They take two
operands, one on each side of the operator, and call some function which
-is bound to the operator. For example the expression `<samp><span class="samp">foo=1</span></samp>' is
-equivalent to `<samp><span class="samp">(Assign foo 1)</span></samp>'. The `<samp><span class="samp">{}</span></samp>' operator takes any
+is bound to the operator. For example the expression ‘<samp><span class="samp">foo=1</span></samp>’ is
+equivalent to ‘<samp><span class="samp">(Assign foo 1)</span></samp>’. The ‘<samp><span class="samp">{}</span></samp>’ operator takes any
number of arguments which appear between the open and close curly
-braces. Say `<samp><span class="samp">help operators</span></samp>' for a list of all operators.
+braces. Say ‘<samp><span class="samp">help operators</span></samp>’ for a list of all operators.
<p>The browser has three types of atoms: strings, numbers, and symbols. A
string is a sequence of characters enclosed in single or double
@@ -311,7 +311,7 @@ parentheses. Evaluation of the list results in the browser looking up
the functional value of the first member of the list and calling that
function with the subsequent list members as arguments. Evaluation of
the list can be suppressed by using curly braces instead of parentheses
-(e.g., `<samp><span class="samp">{1 3 5}</span></samp>' is equivalent to `<samp><span class="samp">(Quote 1 3 5)')</span></samp>'.
+(e.g., ‘<samp><span class="samp">{1 3 5}</span></samp>’ is equivalent to ‘<samp><span class="samp">(Quote 1 3 5)')</span></samp>’.
<p>The browser reads commands interactively from its standard input. If
available, the GNU readline library is used allowing the user to edit
@@ -334,14 +334,14 @@ regardless of the location of the cursor within the line.
<p>The readline library default mode is Emacs. If you prefer <code>vi</code> key
bindings, then create a file called <samp><span class="file">.inputrc</span></samp> in your home
-directory with the single line `<samp><span class="samp">set editing-mode vi</span></samp>'.
+directory with the single line ‘<samp><span class="samp">set editing-mode vi</span></samp>’.
<!-- ====================================================================== -->
<!-- ====================================================================== -->
<!-- ====================================================================== -->
<div class="node">
-<p><hr>
<a name="Functions"></a>
+<p><hr>
Next: <a rel="next" accesskey="n" href="#Operators">Operators</a>,
Previous: <a rel="previous" accesskey="p" href="#Syntax">Syntax</a>,
Up: <a rel="up" accesskey="u" href="#Top">Top</a>
@@ -352,7 +352,7 @@ Up: <a rel="up" accesskey="u" href="#Top">Top</a>
<p>Some of the browser functions have more than one form and are overloaded
to do various things depending on the number of actual arguments
-supplied. Arguments shown between `<samp><span class="samp">[</span></samp>' and `<samp><span class="samp">]</span></samp>' are optional.
+supplied. Arguments shown between ‘<samp><span class="samp">[</span></samp>’ and ‘<samp><span class="samp">]</span></samp>’ are optional.
<dl>
<dt><code>array </code><var>dimensions</var> <b>...</b> <var>basetype</var><dd>Creates a new array datatype. The arguments are the size of the array in
@@ -365,29 +365,29 @@ to the root directory (<samp><span class="file">/</span></samp>). This command w
other directory. The first argument is the name of the new CWD. If the
name contains special characters it should be enclosed in quotes to
protect it from the parser. If the name is relative (doesn't start with
-a `<samp><span class="samp">/</span></samp>') then the name is looked up with respect to the current
+a ‘<samp><span class="samp">/</span></samp>’) then the name is looked up with respect to the current
CWD. The second optional argument is the file or list of files whose CWD
is being set (default is the file represented by the browser variable
-`<samp><span class="samp">$1</span></samp>'). The <var>dirname</var> is a string; it is not interpreted by the
-browser and thus a command like `<samp><span class="samp">cd $1.domain_0.angle_walls</span></samp>' will
-fail while `<samp><span class="samp">cd domain_0/angle_walls $1</span></samp>' would work.
+‘<samp><span class="samp">$1</span></samp>’). The <var>dirname</var> is a string; it is not interpreted by the
+browser and thus a command like ‘<samp><span class="samp">cd $1.domain_0.angle_walls</span></samp>’ will
+fail while ‘<samp><span class="samp">cd domain_0/angle_walls $1</span></samp>’ would work.
<br><dt><code>close </code><var>filesym</var> <b>...</b><dd>Closes the database files associated with the specified file symbols.
If objects exist in the browser memory which are associated with the
database then the database will be held open until those objects no
longer exist, but the file symbol will be freed so another file can
immediately be associated with that symbol. This command is equivalent
-to `<samp><var>filesym</var><span class="samp">=nil</span></samp>' (except with extra sanity checks).
+to ‘<samp><var>filesym</var><span class="samp">=nil</span></samp>’ (except with extra sanity checks).
<br><dt><code>diff </code><var>objects...</var><dd>Calculates the differences between its arguments similar to the Unix
<code>diff</code> command. If called with an even number of arguments the
argument list is split in half and each argument from the first half is
compared with the corresponding argument of the second half. If called
with no arguments then the argument list will be the SILO files from the
-command-line (`<samp><span class="samp">$1</span></samp>', `<samp><span class="samp">$2</span></samp>', <i>etc.</i>). If called with just one
-argument which is an object from the silo file `<samp><span class="samp">$1</span></samp>' then that
+command-line (‘<samp><span class="samp">$1</span></samp>’, ‘<samp><span class="samp">$2</span></samp>’, <i>etc.</i>). If called with just one
+argument which is an object from the silo file ‘<samp><span class="samp">$1</span></samp>’ then that
object will be compared to an object with the same name from file
-`<samp><span class="samp">$2</span></samp>'. The behavior is influenced by the `<samp><span class="samp">$diff</span></samp>' browser
+‘<samp><span class="samp">$2</span></samp>’. The behavior is influenced by the ‘<samp><span class="samp">$diff</span></samp>’ browser
variable. In general, if no differences are found then no output is
produced.
@@ -402,9 +402,9 @@ also invokes this command, causing a zero (success) exit.
associated with any symbol. Therefore, as soon as nothing refers to the
file, it is closed. One common use of this function is with the
<code>ls</code> or <code>diff</code> commands which can take file objects as
-arguments. For instance, the command `<samp><span class="samp">ls (file curv2d.pdb)</span></samp>' opens
-the <samp><span class="file">curv2d.pdb</span></samp> file and lists the root directory and `<samp><span class="samp">ls
-(cd dirname (file curv2d.pdb))</span></samp>' lists the contents of the <var>dirname</var>
+arguments. For instance, the command ‘<samp><span class="samp">ls (file curv2d.pdb)</span></samp>’ opens
+the <samp><span class="file">curv2d.pdb</span></samp> file and lists the root directory and ‘<samp><span class="samp">ls
+(cd dirname (file curv2d.pdb))</span></samp>’ lists the contents of the <var>dirname</var>
directory of <samp><span class="file">curv2d.pdb</span></samp>. The file is open for read-write mode
unless the <code>$rdonly</code> browser variable has a non-nil value or the
file has only read permission.
@@ -426,36 +426,36 @@ symbol or string.
useful in user-private initialization files, <samp><span class="file">~/.browser_rc</span></samp>, where
the user wants to augment the actions that would normally happen in the
system-wide browser initialization file. The user-private file should
-contain the line `<samp><span class="samp">include $pubinit</span></samp>'.
+contain the line ‘<samp><span class="samp">include $pubinit</span></samp>’.
<br><dt><code>ls </code><b>[</b><var>filesym</var><b>]</b> <b>[</b><var>objnames</var><b>...]</b><dd>This command lists the contents of the current working directory. If no
-file is specified then the file associated with `<samp><span class="samp">$1</span></samp>' is used. If a
-list of files is specified (e.g., `<samp><span class="samp">$*</span></samp>') then a listing is produced
+file is specified then the file associated with ‘<samp><span class="samp">$1</span></samp>’ is used. If a
+list of files is specified (e.g., ‘<samp><span class="samp">$*</span></samp>’) then a listing is produced
for each of those files. If object names are supplied, then only those
objects are listed. The object names can include the normal Unix
-filename wild cards `<samp><span class="samp">*</span></samp>', `<samp><span class="samp">?</span></samp>', and `<samp><span class="samp">[]</span></samp>' (object names with
-`<samp><span class="samp">[]</span></samp>' wild cards require quotes so the `<samp><span class="samp">[</span></samp>' and `<samp><span class="samp">]</span></samp>' are not
+filename wild cards ‘<samp><span class="samp">*</span></samp>’, ‘<samp><span class="samp">?</span></samp>’, and ‘<samp><span class="samp">[]</span></samp>’ (object names with
+‘<samp><span class="samp">[]</span></samp>’ wild cards require quotes so the ‘<samp><span class="samp">[</span></samp>’ and ‘<samp><span class="samp">]</span></samp>’ are not
intrepretted as array selectors). Wild card matching is not available if
the <code>fnmatch</code> function was not available when the browser was
compiled. If a single object name is supplied and that object is a
directory, then the contents of that directory appear. An alternative
(and shorter) way to list the contents of a subdirectory is to type the
name of the subdirectory on a line by itself (for instance,
-`<samp><span class="samp">dir1</span></samp>').
+‘<samp><span class="samp">dir1</span></samp>’).
<br><dt><dd>Another way to list a directory is to just type the name of the
-directory at the prompt (you can use `<samp><span class="samp">.</span></samp>' as the current working
-directory). So saying `<samp><span class="samp">$2.dir</span></samp>' is the same as saying `<samp><span class="samp">ls $2
-dir</span></samp>' and `<samp><span class="samp">$2..</span></samp>' is the same as `<samp><span class="samp">ls $2</span></samp>' or `<samp><span class="samp">ls $2 .</span></samp>'.
+directory at the prompt (you can use ‘<samp><span class="samp">.</span></samp>’ as the current working
+directory). So saying ‘<samp><span class="samp">$2.dir</span></samp>’ is the same as saying ‘<samp><span class="samp">ls $2
+dir</span></samp>’ and ‘<samp><span class="samp">$2..</span></samp>’ is the same as ‘<samp><span class="samp">ls $2</span></samp>’ or ‘<samp><span class="samp">ls $2 .</span></samp>’.
<br><dt><code>noprint</code><dd>See <code>print</code>.
<br><dt><code>open </code><var>filename</var> <b>[</b><var>filesym</var><b>]</b><dd>The Silo database <var>filename</var> is opened and associated with the
specified file symbol. Any database previously associated with
<var>filesym</var> will be closed as soon as all objects associated with that
-file are freed. If <var>filesym</var> is omitted then `<samp><span class="samp">$1</span></samp>' is used.
-This command is equivalent to `<samp><var>filesym</var><span class="samp"> =
-</span><var>filename</var></samp>'. Files are open in read-write mode unless the
+file are freed. If <var>filesym</var> is omitted then ‘<samp><span class="samp">$1</span></samp>’ is used.
+This command is equivalent to ‘<samp><var>filesym</var><span class="samp"> =
+</span><var>filename</var></samp>’. Files are open in read-write mode unless the
<code>$rdonly</code> browser variable has a non-nil value or the file has only
read permission.
@@ -465,7 +465,7 @@ prints all non-null expressions by default. However, a <code>noprint</code>
can be used to prevent the default output.
<br><dt><code>pwd </code><b>[</b><var>filesym</var><b>]</b><dd>Prints the current working directory for the database associated with
-the specified file symbol, list of files, or `<samp><span class="samp">$1</span></samp>'. This command
+the specified file symbol, list of files, or ‘<samp><span class="samp">$1</span></samp>’. This command
also prints the name of the database. This command is usually not used
because a file symbol appearing by itself causes the database name and
current working directory to be displayed.
@@ -475,9 +475,9 @@ current working directory to be displayed.
<br><dt><code>typeof </code><var>expression</var><dd>The type of a Silo expression is printed. For Silo database objects the
type which is printed is fully qualified and bound to actual values. In
contrast, printing the actual named type shows the unbound values. For
-example, if `<samp><span class="samp">d</span></samp>' is a Silo quadvar object, then `<samp><span class="samp">typeof d.dims</span></samp>'
-might show `<samp><span class="samp">[3] int</span></samp>' while `<samp><span class="samp">print DBquadvar.dims</span></samp>' displays
-`<samp><span class="samp">[self.ndims] int</span></samp>'.
+example, if ‘<samp><span class="samp">d</span></samp>’ is a Silo quadvar object, then ‘<samp><span class="samp">typeof d.dims</span></samp>’
+might show ‘<samp><span class="samp">[3] int</span></samp>’ while ‘<samp><span class="samp">print DBquadvar.dims</span></samp>’ displays
+‘<samp><span class="samp">[self.ndims] int</span></samp>’.
</dl>
@@ -485,8 +485,8 @@ might show `<samp><span class="samp">[3] int</span></samp>' while `<samp><span c
<!-- ====================================================================== -->
<!-- ====================================================================== -->
<div class="node">
-<p><hr>
<a name="Operators"></a>
+<p><hr>
Next: <a rel="next" accesskey="n" href="#Internal-Variables">Internal Variables</a>,
Previous: <a rel="previous" accesskey="p" href="#Functions">Functions</a>,
Up: <a rel="up" accesskey="u" href="#Top">Top</a>
@@ -502,22 +502,22 @@ of arguments.
<dl>
<dt><var>symbol </var><code>=</code><var> value</var><dd>Assigns a value to a browser internal variable or a database object. If
<var>symbol</var> is an internal variable and <var>value</var> is the word
-`<samp><span class="samp">nil</span></samp>' then the symbol loses its variable value.
+‘<samp><span class="samp">nil</span></samp>’ then the symbol loses its variable value.
<br><dt><var>filesym </var><code>.</code><var> varname</var><dd>The variable or directory with the name <var>varname</var> is loaded from the
database associated with the specified file symbol and the Silo data
object is returned. The variable name must be enclosed in quotes unless
it looks like a symbol and does not conflict with a browser internal
-variable. If <var>filesym</var> is `<samp><span class="samp">$1</span></samp>' and the variable name is not
+variable. If <var>filesym</var> is ‘<samp><span class="samp">$1</span></samp>’ and the variable name is not
enclosed in quotes and is not the name of an internal browser variable,
-then the file symbol and dot can be omitted. Thus `<samp><span class="samp">$1.quadmesh</span></samp>'
-can be written as just `<samp><span class="samp">quadmesh</span></samp>'.
+then the file symbol and dot can be omitted. Thus ‘<samp><span class="samp">$1.quadmesh</span></samp>’
+can be written as just ‘<samp><span class="samp">quadmesh</span></samp>’.
<br><dt><var>sdo </var><code>.</code><var> fieldname</var><dd>If <var>sdo</var> is some Silo data object which has a structured type, then
this expression returns a new Silo data object which is the specified
-field of the <var>sdo</var> structure. For instance, a quadmesh `<samp><span class="samp">qm</span></samp>'
-has a field named `<samp><span class="samp">dims</span></samp>' which holds the dimensions of the mesh.
-The expression `<samp><span class="samp">qm.dims</span></samp>' returns just the dimensions.
+field of the <var>sdo</var> structure. For instance, a quadmesh ‘<samp><span class="samp">qm</span></samp>’
+has a field named ‘<samp><span class="samp">dims</span></samp>’ which holds the dimensions of the mesh.
+The expression ‘<samp><span class="samp">qm.dims</span></samp>’ returns just the dimensions.
<br><dt><var>list </var><code>.</code><var> anything</var><dd>If the first argument is a list then the dot operator is applied to each
member of the list and the result is a list of the results.
@@ -525,22 +525,22 @@ member of the list and the result is a list of the results.
<br><dt><var>sdo </var><code>[</code><var> elmtnum </var><code>]</code><dd>If <var>sdo</var> is some Silo data object which has an array type, then this
expression returns the single specified element of that array. The
first element of an array is number zero. For instance,
-`<samp><span class="samp">qm.dims[0]</span></samp>' returns the size of the first mesh dimension.
+‘<samp><span class="samp">qm.dims[0]</span></samp>’ returns the size of the first mesh dimension.
<br><dt><var>sdo </var><code>[</code><var> min </var><code>:</code><var> max </var><code>]</code><dd>If <var>sdo</var> is some Silo data object which has an array type, then this
expression returns a sub-array with elements <var>min</var> through
-<var>max</var>, inclusive. Thus, `<samp><span class="samp">qm.dims[0:2]</span></samp>' are the first three
+<var>max</var>, inclusive. Thus, ‘<samp><span class="samp">qm.dims[0:2]</span></samp>’ are the first three
mesh dimensions.
<br><dt><var>sdo </var><code>[</code><var> expr1</var><code>,</code><var> expr2</var><code>,</code><var> ... </var><code>]</code><dd>If <var>sdo</var> is some Silo data object which has an array type, and
<var>expr</var> are element numbers or ranges, then one <var>expr</var> is applied
to each array dimension in turn, automatically skipping over pointers.
-For instance, if a quadvar `<samp><span class="samp">qv</span></samp>' has a `<samp><span class="samp">vals</span></samp>' of type
-`<samp><span class="samp">*[2] *[36000] float</span></samp>' then the expression `<samp><span class="samp">qv.vals[0,100:199]</span></samp>'
+For instance, if a quadvar ‘<samp><span class="samp">qv</span></samp>’ has a ‘<samp><span class="samp">vals</span></samp>’ of type
+‘<samp><span class="samp">*[2] *[36000] float</span></samp>’ then the expression ‘<samp><span class="samp">qv.vals[0,100:199]</span></samp>’
will be an object consisting of the second 100 values of the first
-variable. (The expression `<samp><span class="samp">qv.vals[0][100:199]</span></samp>' would result in an
-error message because `<samp><span class="samp">qv.vals[0]</span></samp>' returns an object with the type
-`<samp><span class="samp">[1] *[36000] float</span></samp>' to which is then applied the `<samp><span class="samp">[100:199]</span></samp>'
+variable. (The expression ‘<samp><span class="samp">qv.vals[0][100:199]</span></samp>’ would result in an
+error message because ‘<samp><span class="samp">qv.vals[0]</span></samp>’ returns an object with the type
+‘<samp><span class="samp">[1] *[36000] float</span></samp>’ to which is then applied the ‘<samp><span class="samp">[100:199]</span></samp>’
that is invalid because the array only has one element.)
<br><dt><var>expr </var><code>|</code><var> command</var><dd>The expression <var>expr</var> has its output redirected to the shell
@@ -566,8 +566,8 @@ all integers between <var>minimum</var> and <var>maximum</var>, inclusive.
<!-- ====================================================================== -->
<!-- ====================================================================== -->
<div class="node">
-<p><hr>
<a name="Internal-Variables"></a>
+<p><hr>
Next: <a rel="next" accesskey="n" href="#Startup-File">Startup File</a>,
Previous: <a rel="previous" accesskey="p" href="#Operators">Operators</a>,
Up: <a rel="up" accesskey="u" href="#Top">Top</a>
@@ -577,7 +577,7 @@ Up: <a rel="up" accesskey="u" href="#Top">Top</a>
<h2 class="chapter">5 Internal Variables</h2>
<p>Certain aspects of the browser can be configured by setting browser
-variables with the `<samp><span class="samp">=</span></samp>' operator described above. The current value
+variables with the ‘<samp><span class="samp">=</span></samp>’ operator described above. The current value
of an internal variable can be displayed by typing the variable's name.
The variables are initialized with default values when the browser
starts and may then be overridden by command-line options, the
@@ -592,8 +592,8 @@ begin with a dollar sign.
<!-- ====================================================================== -->
<div class="node">
-<p><hr>
<a name="Differencing-Variables"></a>
+<p><hr>
Next: <a rel="next" accesskey="n" href="#Output-Variables">Output Variables</a>,
Previous: <a rel="previous" accesskey="p" href="#Internal-Variables">Internal Variables</a>,
Up: <a rel="up" accesskey="u" href="#Internal-Variables">Internal Variables</a>
@@ -607,7 +607,7 @@ Up: <a rel="up" accesskey="u" href="#Internal-Variables">Internal Variables
<dl>
<dt><code>$diff</code><dd>This variable's value is a list of symbols which control the details of
the <code>diff</code> function. The default is <code>$diff = {detail,
-two_column}</code>. This variable is set by the `<samp><span class="samp">--diff</span></samp>' command-line
+two_column}</code>. This variable is set by the ‘<samp><span class="samp">--diff</span></samp>’ command-line
switch.
<dl>
@@ -640,37 +640,37 @@ for detailed output.
the contents of those directories. However, the <code>$exclude</code> variable
can be a list of character strings which specify object names and/or
types which should be excluded from recursive comparison. The object
-names may include shell wildcards such as `<samp><span class="samp">*</span></samp>', `<samp><span class="samp">?</span></samp>', and
-`<samp><span class="samp">[]</span></samp>'. If a name pattern is relative (doesn't start with a slash) it
+names may include shell wildcards such as ‘<samp><span class="samp">*</span></samp>’, ‘<samp><span class="samp">?</span></samp>’, and
+‘<samp><span class="samp">[]</span></samp>’. If a name pattern is relative (doesn't start with a slash) it
will be compared to the base name of the objects about to be
differenced; but if the name pattern is absolute (begins with a slash)
it will be compared to the full path names of the objects being
differenced. If the <code>$exclude</code> string begins with the string
-`<samp><span class="samp">type:</span></samp>' then the following part should be one of the object types
+‘<samp><span class="samp">type:</span></samp>’ then the following part should be one of the object types
printed by the <code>ls</code> function. A difference operation between two
objects is suppressed if either object matches any of the strings stored
in the <code>$exclude</code> list.
<p>For example, to prevent <code>diff</code> from comparing any objects with the
-base name `<samp><span class="samp">cycle</span></samp>', or any objects whose full name is
-`<samp><span class="samp">/VM/typelist</span></samp>', or any objects whose name ends with `<samp><span class="samp">_list</span></samp>',
-or any object of type `<samp><span class="samp">obj</span></samp>' one would issue the following browser
+base name ‘<samp><span class="samp">cycle</span></samp>’, or any objects whose full name is
+‘<samp><span class="samp">/VM/typelist</span></samp>’, or any objects whose name ends with ‘<samp><span class="samp">_list</span></samp>’,
+or any object of type ‘<samp><span class="samp">obj</span></samp>’ one would issue the following browser
command:
<pre class="example"> > $exclude = {"cycle", "/VM/typelist", "*_list", "type:obj"}
- </pre>
+</pre>
<p class="noindent">or invoke the browser with the switch
<pre class="example"> --exclude='cycle,/VM/typelist,*_list,type:obj'
- </pre>
+</pre>
<br><dt><code>$diff_int8_abs</code><dt><code>$diff_int8_rel</code><dt><code>$diff_short_abs</code><dt><code>$diff_short_rel</code><dt><code>$diff_int_abs</code><dt><code>$diff_int_rel</code><dt><code>$diff_long_abs</code><dt><code>$diff_long_rel</code><dt><code>$diff_float_abs</code><dt><code>$diff_float_rel</code><dt><code>$diff_double_abs</code><dt><code>$diff_double_rel</code><dd>These variables control how the <code>diff</code> function determines whether
two numeric values are the same or different. The ones that end with
-`<samp><span class="samp">_abs</span></samp>' specify the maximum absolute difference allowed between two
+‘<samp><span class="samp">_abs</span></samp>’ specify the maximum absolute difference allowed between two
values <var>a</var> and <var>b</var>. The <code>diff</code> command considers <var>a</var>
-and <var>b</var> to be different if `<samp><span class="samp">|</span><var>a</var><span class="samp">-</span><var>b</var><span class="samp">|></span><var>abs</var></samp>'.
-The variables that end with `<samp><span class="samp">_rel</span></samp>' specify the maximum absolute
+and <var>b</var> to be different if ‘<samp><span class="samp">|</span><var>a</var><span class="samp">-</span><var>b</var><span class="samp">|></span><var>abs</var></samp>’.
+The variables that end with ‘<samp><span class="samp">_rel</span></samp>’ specify the maximum absolute
difference relative to the mean of two values. The <code>diff</code> command
considers <var>a</var> and <var>b</var> to be different if
-`<samp><span class="samp">|</span><var>a</var><span class="samp">-</span><var>b</var><span class="samp">|/|</span><var>a</var><span class="samp">+</span><var>b</var><span class="samp">| > </span><var>rel</var><span class="samp">/2</span></samp>'.
+‘<samp><span class="samp">|</span><var>a</var><span class="samp">-</span><var>b</var><span class="samp">|/|</span><var>a</var><span class="samp">+</span><var>b</var><span class="samp">| > </span><var>rel</var><span class="samp">/2</span></samp>’.
<p>If both tests are performed then <var>a</var> and <var>b</var> are considered
different if either test indicates they are different. If an <var>abs</var> or
@@ -679,13 +679,13 @@ the corresponding test is not performed. If neither test is performed
then an exact comparison is used.
<p>All <code>diff</code> variables have a default value of zero and are set by
-the `<samp><span class="samp">--absolute</span></samp>' and `<samp><span class="samp">--relative</span></samp>' command-line switches.
+the ‘<samp><span class="samp">--absolute</span></samp>’ and ‘<samp><span class="samp">--relative</span></samp>’ command-line switches.
</dl>
<!-- ====================================================================== -->
<div class="node">
-<p><hr>
<a name="Output-Variables"></a>
+<p><hr>
Next: <a rel="next" accesskey="n" href="#File-Variables">File Variables</a>,
Previous: <a rel="previous" accesskey="p" href="#Differencing-Variables">Differencing Variables</a>,
Up: <a rel="up" accesskey="u" href="#Internal-Variables">Internal Variables</a>
@@ -698,58 +698,58 @@ Up: <a rel="up" accesskey="u" href="#Internal-Variables">Internal Variables
<dt><code>$height</code><dd>The height of the output terminal in lines. If set to a positive value
then the browser will pause after each screenful of interactive output
(redirected output is unaffected by this setting). This variable is set
-by the `<samp><span class="samp">--height</span></samp>' command-line switch and is reset whenever the
+by the ‘<samp><span class="samp">--height</span></samp>’ command-line switch and is reset whenever the
browser receives a window size change signal (<code>SIGWINCH</code>).
<br><dt><code>$width</code><dd>The width of the output terminal in characters. The browser will try not
to print data which would wrap from one line to the next. This variable
-is set by the `<samp><span class="samp">--width</span></samp>' command-line switch and is reset whenever
+is set by the ‘<samp><span class="samp">--width</span></samp>’ command-line switch and is reset whenever
the browser receives a window size change signal (<code>SIGWINCH</code>).
- <br><dt><code>$verbosity</code><dd>This variable is set by the `<samp><span class="samp">--quiet</span></samp>' and `<samp><span class="samp">--verbose</span></samp>'
-switches. The `<samp><span class="samp">--quiet</span></samp>' sets it to zero while `<samp><span class="samp">--verbose</span></samp>' sets
+ <br><dt><code>$verbosity</code><dd>This variable is set by the ‘<samp><span class="samp">--quiet</span></samp>’ and ‘<samp><span class="samp">--verbose</span></samp>’
+switches. The ‘<samp><span class="samp">--quiet</span></samp>’ sets it to zero while ‘<samp><span class="samp">--verbose</span></samp>’ sets
it to two (the default is one). Changing its value at runtime changes
the amount of chatter produced by the browser.
<br><dt><code>$truncate</code><dd>If this variable holds a non-negative integer value <var>N</var>, then the
browser shows only <var>N</var> values of each array; otherwise all values of
an array are displayed. Values which are omitted are indicated by a
-string such as `<samp><span class="samp">...(2000 values omitted)...</span></samp>' appearing at the point
+string such as ‘<samp><span class="samp">...(2000 values omitted)...</span></samp>’ appearing at the point
where the values were omitted. Truncation is disabled (all values are
printed) by setting this variable to nil (its default).
- <br><dt><code>$trailing</code><dd>If this variable holds a positive integer value and `<samp><span class="samp">$truncate</span></samp>'
+ <br><dt><code>$trailing</code><dd>If this variable holds a positive integer value and ‘<samp><span class="samp">$truncate</span></samp>’
has a non-negative integer value, then up to <var>n</var> of the printed
array values will come from the end of the array rather than the
beginning. The default value is 50.
<br><dt><code>$fmt_double</code><dd>This variable holds a <code>printf</code> format string which is used to
-format C <code>double</code> values. The default value is `<samp><span class="samp">%1.10g</span></samp>'.
+format C <code>double</code> values. The default value is ‘<samp><span class="samp">%1.10g</span></samp>’.
<br><dt><code>$fmt_float</code><dd>This variable holds a <code>printf</code> format string which is used to
-format C <code>float</code> values. The default value is `<samp><span class="samp">%1.5g</span></samp>'.
+format C <code>float</code> values. The default value is ‘<samp><span class="samp">%1.5g</span></samp>’.
<br><dt><code>$fmt_int</code><dd>This variable holds a <code>printf</code> format string which is used to
-format integer values. The default value is `<samp><span class="samp">%d</span></samp>'.
+format integer values. The default value is ‘<samp><span class="samp">%d</span></samp>’.
<br><dt><code>$fmt_long</code><dd>This variable holds a <code>printf</code> format string which is used to
-format long integer values. The default value is `<samp><span class="samp">(long)%ld</span></samp>'.
+format long integer values. The default value is ‘<samp><span class="samp">(long)%ld</span></samp>’.
<br><dt><code>$fmt_null</code><dd>This variable holds a <code>printf</code> format string which is printed for
-null character strings. The default value is `<samp><span class="samp">(null)</span></samp>'.
+null character strings. The default value is ‘<samp><span class="samp">(null)</span></samp>’.
<br><dt><code>$fmt_int8</code><dd>This variable holds a <code>printf</code> format string which is used to
-format 8-bit integer values. The default is `<samp><span class="samp">(int8)%d</span></samp>' but people
-often like to change it to `<samp><span class="samp">`%c'</span></samp>' to see the ASCII equivalent. Be
+format 8-bit integer values. The default is ‘<samp><span class="samp">(int8)%d</span></samp>’ but people
+often like to change it to ‘<samp><span class="samp">`%c'</span></samp>’ to see the ASCII equivalent. Be
warned that output of non-printable ASCII characters in this manner may
not work if the terminal emulator interprets them as commands.
<br><dt><code>$fmt_short</code><dd>This vairable holds a <code>printf</code> format string which is used to
-format short integer values. The default value is `<samp><span class="samp">(short)%d</span></samp>'.
+format short integer values. The default value is ‘<samp><span class="samp">(short)%d</span></samp>’.
<br><dt><code>$fmt_string</code><dd>This variable holds a <code>printf</code> format string which is used to
format character string values. The default value is
-`<samp><span class="samp">\"%s\"</span></samp>'.
+‘<samp><span class="samp">\"%s\"</span></samp>’.
<br><dt><code>$obase Output of primitive data (integer, character, string, and</code><dd>floating-point), by default, uses the <code>$fmt_</code> variables described
above. However, by setting this variable to 16, 8, or 2 it is possible
@@ -759,8 +759,8 @@ to display primitive data in hexadecimal, octal, or binary format.
<!-- ====================================================================== -->
<div class="node">
-<p><hr>
<a name="File-Variables"></a>
+<p><hr>
Previous: <a rel="previous" accesskey="p" href="#Output-Variables">Output Variables</a>,
Up: <a rel="up" accesskey="u" href="#Internal-Variables">Internal Variables</a>
@@ -776,7 +776,7 @@ user-private initialization file.
<br><dt><code>$lowlevel</code><dd>If this variable has any true value (nil, zero, and the empty string are
considered false), then the browser reads objects as type
<code>DBobject</code> even if that object has some other datatype such as
-<code>DBquadvar</code>. This variable is set by the `<samp><span class="samp">-l</span></samp>' command-line
+<code>DBquadvar</code>. This variable is set by the ‘<samp><span class="samp">-l</span></samp>’ command-line
option and is useful for debugging the low layers of Silo. The default
value is zero.
@@ -813,8 +813,8 @@ reading only.
<!-- ====================================================================== -->
<!-- ====================================================================== -->
<div class="node">
-<p><hr>
<a name="Startup-File"></a>
+<p><hr>
Next: <a rel="next" accesskey="n" href="#Editing">Editing</a>,
Previous: <a rel="previous" accesskey="p" href="#Internal-Variables">Internal Variables</a>,
Up: <a rel="up" accesskey="u" href="#Top">Top</a>
@@ -826,7 +826,7 @@ Up: <a rel="up" accesskey="u" href="#Top">Top</a>
<p>When the browser starts, it looks for a file called <samp><span class="file">.browser_rc</span></samp>
in the user's home directory or a file called
<samp><span class="file">/usr/local/include/browser_rc</span></samp><a rel="footnote" href="#fn-3" name="fnd-3"><sup>3</sup></a>. However, an
-alternate startup file can be specified with the `<samp><span class="samp">--file</span></samp>' browser
+alternate startup file can be specified with the ‘<samp><span class="samp">--file</span></samp>’ browser
command-line switch. The browser reads and executes each command found
in the startup file.
@@ -838,17 +838,17 @@ message (provided that the browser was even able to process the startup
file).
<p>The <code>$browser_version</code> number should be assigned some real constant
-like `<samp><span class="samp">3.004</span></samp>' where `<samp><span class="samp">3</span></samp>' is the browser major version number and
-`<samp><span class="samp">004</span></samp>' is the browser minor version number. To determine what
-version number to specify, invoke the browser as `<samp><span class="samp">browser
---version</span></samp>'.
+like ‘<samp><span class="samp">3.004</span></samp>’ where ‘<samp><span class="samp">3</span></samp>’ is the browser major version number and
+‘<samp><span class="samp">004</span></samp>’ is the browser minor version number. To determine what
+version number to specify, invoke the browser as ‘<samp><span class="samp">browser
+--version</span></samp>’.
<!-- ====================================================================== -->
<!-- ====================================================================== -->
<!-- ====================================================================== -->
<div class="node">
-<p><hr>
<a name="Editing"></a>
+<p><hr>
Next: <a rel="next" accesskey="n" href="#Paging">Paging</a>,
Previous: <a rel="previous" accesskey="p" href="#Startup-File">Startup File</a>,
Up: <a rel="up" accesskey="u" href="#Top">Top</a>
@@ -857,33 +857,33 @@ Up: <a rel="up" accesskey="u" href="#Top">Top</a>
<h2 class="chapter">7 Editing Database Objects</h2>
-<p>The `<samp><span class="samp">=</span></samp>' operator can be used to set the value of an internal
+<p>The ‘<samp><span class="samp">=</span></samp>’ operator can be used to set the value of an internal
browser variable or to change the value of a database object. If the
-left hand side of the `<samp><span class="samp">=</span></samp>' is an internal variable, then the value
+left hand side of the ‘<samp><span class="samp">=</span></samp>’ is an internal variable, then the value
of the internal variable is changed. Otherwise if the left hand side is
a database object, its value is changed. Otherwise, a new internal
variable is created and assigned an initial value.
<p>The browser can change values for objects of type <code>DBobject</code> (most
objects are of this type if the browser is running in low-level mode) or
-objects under the `<samp><span class="samp">var(s)</span></samp>' category in a directory listing.
+objects under the ‘<samp><span class="samp">var(s)</span></samp>’ category in a directory listing.
<p>When changing the value of a string database object like
-`<samp><span class="samp">_fileinfo</span></samp>', the new value will be truncated to the same length as
+‘<samp><span class="samp">_fileinfo</span></samp>’, the new value will be truncated to the same length as
the old value because of limitations in the underlying Silo database
drivers. This does not apply to string fields of a <code>DBobject</code>.
<p>Assigning a scalar value to an array or slice of an array results in all
selected elements of the array to be set to the same value. For
-instance, if the type of `<samp><span class="samp">u_data</span></samp>' is `<samp><span class="samp">[31, 41, 31] float</span></samp>' then
+instance, if the type of ‘<samp><span class="samp">u_data</span></samp>’ is ‘<samp><span class="samp">[31, 41, 31] float</span></samp>’ then
the statement `u_data[5]=0' sets all elements of “row” five to zero.
<!-- ====================================================================== -->
<!-- ====================================================================== -->
<!-- ====================================================================== -->
<div class="node">
-<p><hr>
<a name="Paging"></a>
+<p><hr>
Next: <a rel="next" accesskey="n" href="#Redirection">Redirection</a>,
Previous: <a rel="previous" accesskey="p" href="#Editing">Editing</a>,
Up: <a rel="up" accesskey="u" href="#Top">Top</a>
@@ -898,26 +898,26 @@ whenever output is about to scroll off the top of the screen. The
height and width of the screen is determined by the browser making
certain <code>ioctl</code> calls at startup and each time it gets a
<code>SIGWINCH</code> signal. The initial values can be set with
-`<samp><span class="samp">--height</span></samp>' and `<samp><span class="samp">--width</span></samp>' command-line switches. If the
+‘<samp><span class="samp">--height</span></samp>’ and ‘<samp><span class="samp">--width</span></samp>’ command-line switches. If the
appropriate <code>ioctl</code> is not available then the values of environment
variables <code>LINES</code> and <code>COLUMNS</code> will be used. If all else
fails then the browser uses zero for the number of lines (that is, no
paging of output) and 80 for the number of columns.
- <p>When the browser pauses the output, the message `<samp><span class="samp">more? ('q' to
-quit)</span></samp>' is displayed. The following user responses are recognized:
+ <p>When the browser pauses the output, the message ‘<samp><span class="samp">more? ('q' to
+quit)</span></samp>’ is displayed. The following user responses are recognized:
<dl>
<dt><b>Quit</b><dd>Cancels the command and returns to the browser prompt. This is
equivalent to the browser receiving a <code>SIGPIPE</code> signal.
- <br><dt><b>Continue</b><dd>Pressing the EOF key (usually control-`<samp><span class="samp">d</span></samp>') causes the command to
+ <br><dt><b>Continue</b><dd>Pressing the EOF key (usually control-‘<samp><span class="samp">d</span></samp>’) causes the command to
continue without being paged. Output will simply scroll off the screen).
- <br><dt><b>Next Diff</b><dd>Pressing `<samp><span class="samp">n</span></samp>' causes output to be suspended until the next file
+ <br><dt><b>Next Diff</b><dd>Pressing ‘<samp><span class="samp">n</span></samp>’ causes output to be suspended until the next file
difference report or the next non-diff command.
- <br><dt><b>Interrupt</b><dd>Pressing the interrupt key (usually control-`<samp><span class="samp">c</span></samp>') causes the command
+ <br><dt><b>Interrupt</b><dd>Pressing the interrupt key (usually control-‘<samp><span class="samp">c</span></samp>’) causes the command
to be interrupted as usual.
</dl>
@@ -930,8 +930,8 @@ output redirection.
<!-- ====================================================================== -->
<!-- ====================================================================== -->
<div class="node">
-<p><hr>
<a name="Redirection"></a>
+<p><hr>
Next: <a rel="next" accesskey="n" href="#Interrupts">Interrupts</a>,
Previous: <a rel="previous" accesskey="p" href="#Paging">Paging</a>,
Up: <a rel="up" accesskey="u" href="#Top">Top</a>
@@ -945,30 +945,30 @@ command by appending a redirection character and file name or shell
command to the end of the command.
<p>To save the output of a command in a file, destroying the previous
-contents of the file if any, append a `<samp><span class="samp">></span></samp>' and the name of the
+contents of the file if any, append a ‘<samp><span class="samp">></span></samp>’ and the name of the
file. Unless the file name looks like a browser symbol it must be
-enclosed in quotes. For instance, `<samp><span class="samp">quadvar3d > saved</span></samp>' saves the
-value of Silo database variable `<samp><span class="samp">quadvar</span></samp>' in a text file named
+enclosed in quotes. For instance, ‘<samp><span class="samp">quadvar3d > saved</span></samp>’ saves the
+value of Silo database variable ‘<samp><span class="samp">quadvar</span></samp>’ in a text file named
<samp><span class="file">saved</span></samp>.
- <p>To append the output of a command to a file, append a `<samp><span class="samp">>></span></samp>' and the
+ <p>To append the output of a command to a file, append a ‘<samp><span class="samp">>></span></samp>’ and the
file name to the end of the command. Unless the file name looks like a
-browser symbol it must be enclosed in quotes. For example, `<samp><span class="samp">typeof
-quadvar3d >> saved</span></samp>' appends type information to the <samp><span class="file">saved</span></samp> file.
+browser symbol it must be enclosed in quotes. For example, ‘<samp><span class="samp">typeof
+quadvar3d >> saved</span></samp>’ appends type information to the <samp><span class="file">saved</span></samp> file.
<p>To send the output of a browser command to the standard input of a shell
-command, follow the browser command with a `<samp><span class="samp">|</span></samp>' followed by the
+command, follow the browser command with a ‘<samp><span class="samp">|</span></samp>’ followed by the
shell command in quotes. The quotes are not necessary if the shell
command is a single symbol. Since paging is disabled when output is to
a shell command, one way to display a result without paging is to pipe
-the output through the `<samp><span class="samp">cat</span></samp>' command like `<samp><span class="samp">d | cat</span></samp>'.
+the output through the ‘<samp><span class="samp">cat</span></samp>’ command like ‘<samp><span class="samp">d | cat</span></samp>’.
<!-- ====================================================================== -->
<!-- ====================================================================== -->
<!-- ====================================================================== -->
<div class="node">
-<p><hr>
<a name="Interrupts"></a>
+<p><hr>
Next: <a rel="next" accesskey="n" href="#Examples">Examples</a>,
Previous: <a rel="previous" accesskey="p" href="#Redirection">Redirection</a>,
Up: <a rel="up" accesskey="u" href="#Top">Top</a>
@@ -980,7 +980,7 @@ Up: <a rel="up" accesskey="u" href="#Top">Top</a>
<p>Since some commands may require a long time to execute or produce a huge
amount of output, the user may want to abort the command before it
finishes. If the output is paged interactively to the screen then
-pressing `<samp><span class="samp">q</span></samp>' at the `<samp><span class="samp">more?</span></samp>' prompt accomplishes
+pressing ‘<samp><span class="samp">q</span></samp>’ at the ‘<samp><span class="samp">more?</span></samp>’ prompt accomplishes
this. Otherwise the user can press the interrupt character (usually
control-c) and the browser command will be immediately terminated and
the browser will prompt for the next command. If the interrupt
@@ -995,8 +995,8 @@ signal and terminates.
<!-- ====================================================================== -->
<!-- ====================================================================== -->
<div class="node">
-<p><hr>
<a name="Examples"></a>
+<p><hr>
Previous: <a rel="previous" accesskey="p" href="#Interrupts">Interrupts</a>,
Up: <a rel="up" accesskey="u" href="#Top">Top</a>
@@ -1010,8 +1010,8 @@ Up: <a rel="up" accesskey="u" href="#Top">Top</a>
command-line<a rel="footnote" href="#fn-4" name="fnd-4"><sup>4</sup></a> like in the following
example, and sometimes it's convenient to open multiple files at the
same time. Each file name listed on the command-line is given an
-identifier like `<samp><span class="samp">$1</span></samp>', `<samp><span class="samp">$2</span></samp>', etc., and most of the browser
-commands operate on file `<samp><span class="samp">$1</span></samp>' by default.
+identifier like ‘<samp><span class="samp">$1</span></samp>’, ‘<samp><span class="samp">$2</span></samp>’, etc., and most of the browser
+commands operate on file ‘<samp><span class="samp">$1</span></samp>’ by default.
<pre class="example"> % <b>browser rect3d.pdb</b>
INFO: opening `rect3d.pdb' as $1
@@ -1020,8 +1020,8 @@ commands operate on file `<samp><span class="samp">$1</span></samp>' by default.
it lists the contents of the current working directory. The heading
fields on the left of the equal signs apply until the next heading. The
headings are the same as those used by MeshTV. To list the contents of
-some subdirectory, say `<samp><span class="samp">ls</span></samp>', `<samp><span class="samp">ls dir1</span></samp>',
-`<samp><span class="samp">print dir1</span></samp>', or just `<samp><span class="samp">dir1</span></samp>'.
+some subdirectory, say ‘<samp><span class="samp">ls</span></samp>’, ‘<samp><span class="samp">ls dir1</span></samp>’,
+‘<samp><span class="samp">print dir1</span></samp>’, or just ‘<samp><span class="samp">dir1</span></samp>’.
<pre class="example"> > <b>ls</b>
qmesh(s) = quadmesh3d
@@ -1058,8 +1058,8 @@ some subdirectory, say `<samp><span class="samp">ls</span></samp>', `<samp><span
<p>To keep the size of these examples small, we've specified that at most
50 values should be printed from each array and that 25 of those values
should be from the end of the array (and the other 25, from the
-beginning). To truncate everything say `<samp><span class="samp">$truncate=0</span></samp>' and to turn
-truncating off say `<samp><span class="samp">$truncate=nil</span></samp>'.
+beginning). To truncate everything say ‘<samp><span class="samp">$truncate=0</span></samp>’ and to turn
+truncating off say ‘<samp><span class="samp">$truncate=nil</span></samp>’.
<pre class="example"> > <b>$truncate = 50</b>
= 50
@@ -1101,27 +1101,27 @@ then the type of each component of that structure is printed.
a byte offset from the beginning of the innermost enclosing structure
or array.
- <p>A `<samp><span class="samp">*</span></samp>' means the object is a pointer to whatever type
+ <p>A ‘<samp><span class="samp">*</span></samp>’ means the object is a pointer to whatever type
follows<a rel="footnote" href="#fn-5" name="fnd-5"><sup>5</sup></a>.
- <p>A list of array dimensions between `<samp><span class="samp">[</span></samp>' and `<samp><span class="samp">]</span></samp>' mean that the
+ <p>A list of array dimensions between ‘<samp><span class="samp">[</span></samp>’ and ‘<samp><span class="samp">]</span></samp>’ mean that the
object is an array and each element of the array is the type that
-follows the `<samp><span class="samp">]</span></samp>'.
+follows the ‘<samp><span class="samp">]</span></samp>’.
- <p>The final name is always one of the browser integral types `<samp><span class="samp">string</span></samp>'
-(same as the C `<samp><span class="samp">char*</span></samp>'), `<samp><span class="samp">short</span></samp>', `<samp><span class="samp">int</span></samp>', `<samp><span class="samp">long</span></samp>',
-`<samp><span class="samp">float</span></samp>', or `<samp><span class="samp">double</span></samp>'. If the integral type name is followed
+ <p>The final name is always one of the browser integral types ‘<samp><span class="samp">string</span></samp>’
+(same as the C ‘<samp><span class="samp">char*</span></samp>’), ‘<samp><span class="samp">short</span></samp>’, ‘<samp><span class="samp">int</span></samp>’, ‘<samp><span class="samp">long</span></samp>’,
+‘<samp><span class="samp">float</span></samp>’, or ‘<samp><span class="samp">double</span></samp>’. If the integral type name is followed
by parentheses then the parentheses contain the name of an underlying C
-`<samp><span class="samp">enum</span></samp>' type or a set of related C preprocessor constants.
+‘<samp><span class="samp">enum</span></samp>’ type or a set of related C preprocessor constants.
<p>Some data objects override one or more standard class methods. Such
-objects will have flags like `<samp><span class="samp">__</span><var>flag</var><span class="samp">__</span></samp>' which appear inside
+objects will have flags like ‘<samp><span class="samp">__</span><var>flag</var><span class="samp">__</span></samp>’ which appear inside
the object type.
<p>One can also ask for the Silo definition of a named data type like
-`<samp><span class="samp">DBquadvar</span></samp>'. This prints the definition of the Silo
-`<samp><span class="samp">DBquadvar</span></samp>' structure which is the same as printed above for the
-type of `<samp><span class="samp">d</span></samp>' except that array sizes and some primitive types are
+‘<samp><span class="samp">DBquadvar</span></samp>’. This prints the definition of the Silo
+‘<samp><span class="samp">DBquadvar</span></samp>’ structure which is the same as printed above for the
+type of ‘<samp><span class="samp">d</span></samp>’ except that array sizes and some primitive types are
not bound to actual values yet<a rel="footnote" href="#fn-6" name="fnd-6"><sup>6</sup></a>.
<pre class="example"> > <b>DBquadvar</b>
@@ -1152,14 +1152,14 @@ not bound to actual values yet<a rel="footnote" href="#fn-6" name="fnd-6"><sup>6
vals = +36 *[self.nvals] *[self.nels] self.datatype
= }
</pre>
- <p>Giving just the name of the Silo object is short for `<samp><span class="samp">print $1.d</span></samp>'.
-Notice that the `<samp><span class="samp">vals</span></samp>' array has been truncated as requested and
+ <p>Giving just the name of the Silo object is short for ‘<samp><span class="samp">print $1.d</span></samp>’.
+Notice that the ‘<samp><span class="samp">vals</span></samp>’ array has been truncated as requested and
that <var>mixvals</var> has no value. The subscripts in the labels to the
left of the equal sign correspond to the first value on that line (an
-entire array in the case of `<samp><span class="samp">vals[0]</span></samp>'.
+entire array in the case of ‘<samp><span class="samp">vals[0]</span></samp>’.
<p>One can also ask for tye type of a single structure component by typing the
-command `<samp><span class="samp">DBquadvar.vals</span></samp>'.
+command ‘<samp><span class="samp">DBquadvar.vals</span></samp>’.
<pre class="example"> > <b>d</b>
= DBquadvar: struct
@@ -1199,7 +1199,7 @@ command `<samp><span class="samp">DBquadvar.vals</span></samp>'.
</pre>
<p>The browser does not attempt to be efficient about loading objects from
the database into memory since the underlying Silo library makes it
-difficult to do so. However, if one says `<samp><span class="samp">$lowlevel=1</span></samp>' then the
+difficult to do so. However, if one says ‘<samp><span class="samp">$lowlevel=1</span></samp>’ then the
browser uses lower-level Silo functions to read the file. As a result,
less data is moved from disk to memory.
@@ -1228,7 +1228,7 @@ less data is moved from disk to memory.
use_specmf = -1000
</pre>
<p>Now we'll decrease the number of values printed and increase the
-precision that's displayed for `<samp><span class="samp">float</span></samp>' values.
+precision that's displayed for ‘<samp><span class="samp">float</span></samp>’ values.
<pre class="example"> > <b>$truncate = 12</b>
= 12
@@ -1245,12 +1245,12 @@ precision that's displayed for `<samp><span class="samp">float</span></samp>' va
[35996] = 0.786264479160309, 0.803043246269226,
[35998] = 0.820833325386047, 0.839570462703705}
</pre>
- <p>The `<samp><span class="samp">diff</span></samp>' command compares two objects and reports differences
+ <p>The ‘<samp><span class="samp">diff</span></samp>’ command compares two objects and reports differences
between them. The output is in groups of differences where the group is
delimited at the beginning and end by a line of stars. The first half
-of the group displays (part of) the first argument to `<samp><span class="samp">diff</span></samp>' while
+of the group displays (part of) the first argument to ‘<samp><span class="samp">diff</span></samp>’ while
the part of the group after the line of dashes displays (part of) the
-second argument. Subobjects that differ only partially (`<samp><span class="samp">stride</span></samp>' in
+second argument. Subobjects that differ only partially (‘<samp><span class="samp">stride</span></samp>’ in
this case) appear separately before those which completely differ. The
array truncating parameters apply to each array segment individually.
@@ -1287,9 +1287,9 @@ array truncating parameters apply to each array segment individually.
***************
</pre>
<p>A compound array is composed of zero or more subarrays. A subarray can
-be printed by saying something like `<samp><span class="samp">carray.b</span></samp>', but a subarray is
-also printed by saying just `<samp><span class="samp">b</span></samp>' as long as `<samp><span class="samp">b</span></samp>' is not some
-other type of object and `<samp><span class="samp">b</span></samp>' exists in exactly one compound array.
+be printed by saying something like ‘<samp><span class="samp">carray.b</span></samp>’, but a subarray is
+also printed by saying just ‘<samp><span class="samp">b</span></samp>’ as long as ‘<samp><span class="samp">b</span></samp>’ is not some
+other type of object and ‘<samp><span class="samp">b</span></samp>’ exists in exactly one compound array.
<pre class="example"> > <b>carray</b>
= struct
@@ -1343,7 +1343,7 @@ of the listed values.
</pre>
<p>Pressing control-c during a browser command aborts the command, but
pressing control-c when the browser is asking for input aborts the
-browser. It is more polite to press control-d or type `<samp><span class="samp">exit</span></samp>'
+browser. It is more polite to press control-d or type ‘<samp><span class="samp">exit</span></samp>’
instead since this gives the browser a chance to properly close database
files.
@@ -1370,17 +1370,17 @@ fields before being saved back to the file.</p>
different depending on how the browser was compiled.</p>
<p class="footnote"><small>[<a name="fn-4" href="#fnd-4">4</a>]</small> Opening a file on the command line is the same as
-saying `<samp><span class="samp">open "rect3d.pdb" $1</span></samp>' interactively.</p>
+saying ‘<samp><span class="samp">open "rect3d.pdb" $1</span></samp>’ interactively.</p>
<p class="footnote"><small>[<a name="fn-5" href="#fnd-5">5</a>]</small> Whether or not something is a pointer is generally not
important to using the browser: a 1d array of pointers to 1d arrays of
integers can be treated like a ragged-edge 2d array of integers.</p>
- <p class="footnote"><small>[<a name="fn-6" href="#fnd-6">6</a>]</small> The word `<samp><span class="samp">self</span></samp>' refers to the
+ <p class="footnote"><small>[<a name="fn-6" href="#fnd-6">6</a>]</small> The word ‘<samp><span class="samp">self</span></samp>’ refers to the
object corresponding to the innermost structure which incloses the
-`<samp><span class="samp">self</span></samp>'.</p>
+‘<samp><span class="samp">self</span></samp>’.</p>
- <p><hr></div>
+ <hr></div>
</body></html>
diff --git a/tools/browser/browser.info b/tools/browser/browser.info
index fd87f32..015f355 100644
--- a/tools/browser/browser.info
+++ b/tools/browser/browser.info
@@ -1,7 +1,7 @@
-This is browser.info, produced by makeinfo version 4.5 from
+This is browser.info, produced by makeinfo version 4.13 from
browser.texi.
- This file documents the Silo browser.
+This file documents the Silo browser.
Copyright (c) 1994 - 2010, Lawrence Livermore National Security, LLC.
LLNL-CODE-425250. All rights reserved.
@@ -12,7 +12,7 @@ File: browser.info, Node: Top, Next: Copying, Up: (dir)
The Silo Browser User Manual
****************************
- This document describes the Silo file browser, an application program
+This document describes the Silo file browser, an application program
built on the Silo library for interactive viewing of Silo database
files.
@@ -37,7 +37,7 @@ File: browser.info, Node: Copying, Next: Invocation, Prev: Top, Up: Top
Copyright
*********
- Copyright (C) (c) 1994 - 2010, Lawrence Livermore National Security,
+Copyright (C) (c) 1994 - 2010, Lawrence Livermore National Security,
LLC. LLNL-CODE-425250. All rights reserved.
Redistribution and use in source and binary forms, with or without
@@ -90,10 +90,10 @@ and shall not
File: browser.info, Node: Invocation, Next: Syntax, Prev: Copying, Up: Top
-The Browser Command Line
-************************
+1 The Browser Command Line
+**************************
- The schnauzer is a small terrier with a wiry coat; the browser is a
+The schnauzer is a small terrier with a wiry coat; the browser is a
utility built on Silo for reading scientific database files. The
browser command line is
@@ -265,10 +265,10 @@ interactive browser command aborts the command but not the browser.
File: browser.info, Node: Syntax, Next: Functions, Prev: Invocation, Up: Top
-Command Syntax
-**************
+2 Command Syntax
+****************
- The browser command syntax is quite simple, consisting of function
+The browser command syntax is quite simple, consisting of function
calls, operators, atoms, and lists. Comments begin with a hash mark and
continue to the end of the line (except in strings). White space is
generally ignored except as a token separator. Statements can be
@@ -336,12 +336,12 @@ with the single line `set editing-mode vi'.
File: browser.info, Node: Functions, Next: Operators, Prev: Syntax, Up: Top
-Builtin Functions
-*****************
+3 Builtin Functions
+*******************
- Some of the browser functions have more than one form and are
-overloaded to do various things depending on the number of actual
-arguments supplied. Arguments shown between `[' and `]' are optional.
+Some of the browser functions have more than one form and are overloaded
+to do various things depending on the number of actual arguments
+supplied. Arguments shown between `[' and `]' are optional.
`array DIMENSIONS ... BASETYPE'
Creates a new array datatype. The arguments are the size of the
@@ -491,12 +491,12 @@ arguments supplied. Arguments shown between `[' and `]' are optional.
File: browser.info, Node: Operators, Next: Internal Variables, Prev: Functions, Up: Top
-Operators
-*********
+4 Operators
+***********
- A browser expression is composed of terms and operators. The
-following operators are supported and overloaded depending on the
-number and type of arguments.
+A browser expression is composed of terms and operators. The following
+operators are supported and overloaded depending on the number and type
+of arguments.
SYMBOL `=' VALUE
Assigns a value to a browser internal variable or a database
@@ -574,10 +574,10 @@ MINIMUM `:' MAXIMUM
File: browser.info, Node: Internal Variables, Next: Startup File, Prev: Operators, Up: Top
-Internal Variables
-******************
+5 Internal Variables
+********************
- Certain aspects of the browser can be configured by setting browser
+Certain aspects of the browser can be configured by setting browser
variables with the `=' operator described above. The current value of
an internal variable can be displayed by typing the variable's name.
The variables are initialized with default values when the browser
@@ -594,10 +594,10 @@ begin with a dollar sign.
File: browser.info, Node: Differencing Variables, Next: Output Variables, Prev: Internal Variables, Up: Internal Variables
-Differencing Variables
-======================
+5.1 Differencing Variables
+==========================
- These variables affect the operation of the `diff' function.
+These variables affect the operation of the `diff' function.
`$diff'
This variable's value is a list of symbols which control the
@@ -697,8 +697,8 @@ Differencing Variables
File: browser.info, Node: Output Variables, Next: File Variables, Prev: Differencing Variables, Up: Internal Variables
-Output Variables
-================
+5.2 Output Variables
+====================
`$height'
The height of the output terminal in lines. If set to a positive
@@ -781,8 +781,8 @@ Output Variables
File: browser.info, Node: File Variables, Prev: Output Variables, Up: Internal Variables
-File Variables
-==============
+5.3 File Variables
+==================
`$pubinit'
This variable holds the name of the public initialization file and
@@ -838,10 +838,10 @@ fields before being saved back to the file.
File: browser.info, Node: Startup File, Next: Editing, Prev: Internal Variables, Up: Top
-Initializing the Browser
-************************
+6 Initializing the Browser
+**************************
- When the browser starts, it looks for a file called `.browser_rc' in
+When the browser starts, it looks for a file called `.browser_rc' in
the user's home directory or a file called
`/usr/local/include/browser_rc'(1). However, an alternate startup file
can be specified with the `--file' browser command-line switch. The
@@ -866,10 +866,10 @@ compiled.
File: browser.info, Node: Editing, Next: Paging, Prev: Startup File, Up: Top
-Editing Database Objects
-************************
+7 Editing Database Objects
+**************************
- The `=' operator can be used to set the value of an internal browser
+The `=' operator can be used to set the value of an internal browser
variable or to change the value of a database object. If the left hand
side of the `=' is an internal variable, then the value of the internal
variable is changed. Otherwise if the left hand side is a database
@@ -893,20 +893,19 @@ statement `u_data[5]=0' sets all elements of "row" five to zero.
File: browser.info, Node: Paging, Next: Redirection, Prev: Editing, Up: Top
-Paging
-******
-
- The browser keeps track of how many lines of output have been
-displayed for the currently executing command and temporarily pauses
-that command whenever output is about to scroll off the top of the
-screen. The height and width of the screen is determined by the
-browser making certain `ioctl' calls at startup and each time it gets a
-`SIGWINCH' signal. The initial values can be set with `--height' and
-`--width' command-line switches. If the appropriate `ioctl' is not
-available then the values of environment variables `LINES' and
-`COLUMNS' will be used. If all else fails then the browser uses zero
-for the number of lines (that is, no paging of output) and 80 for the
-number of columns.
+8 Paging
+********
+
+The browser keeps track of how many lines of output have been displayed
+for the currently executing command and temporarily pauses that command
+whenever output is about to scroll off the top of the screen. The
+height and width of the screen is determined by the browser making
+certain `ioctl' calls at startup and each time it gets a `SIGWINCH'
+signal. The initial values can be set with `--height' and `--width'
+command-line switches. If the appropriate `ioctl' is not available
+then the values of environment variables `LINES' and `COLUMNS' will be
+used. If all else fails then the browser uses zero for the number of
+lines (that is, no paging of output) and 80 for the number of columns.
When the browser pauses the output, the message `more? ('q' to
quit)' is displayed. The following user responses are recognized:
@@ -936,10 +935,10 @@ output redirection.
File: browser.info, Node: Redirection, Next: Interrupts, Prev: Paging, Up: Top
-Redirection
-***********
+9 Redirection
+*************
- Output from any browser command can be redirected to a file or shell
+Output from any browser command can be redirected to a file or shell
command by appending a redirection character and file name or shell
command to the end of the command.
@@ -964,11 +963,11 @@ the output through the `cat' command like `d | cat'.
File: browser.info, Node: Interrupts, Next: Examples, Prev: Redirection, Up: Top
-Interrupts
-**********
+10 Interrupts
+*************
- Since some commands may require a long time to execute or produce a
-huge amount of output, the user may want to abort the command before it
+Since some commands may require a long time to execute or produce a huge
+amount of output, the user may want to abort the command before it
finishes. If the output is paged interactively to the screen then
pressing `q' at the `more?' prompt accomplishes this. Otherwise the
user can press the interrupt character (usually control-c) and the
@@ -984,10 +983,10 @@ signal and terminates.
File: browser.info, Node: Examples, Prev: Interrupts, Up: Top
-Examples
-********
+11 Examples
+***********
- This chapter contains some sample output from the browser.
+This chapter contains some sample output from the browser.
Normally, you will specify the name of a database file on the browser
command-line(1) like in the following example, and sometimes it's
@@ -1006,13 +1005,13 @@ some subdirectory, say `ls', `ls dir1', `print dir1', or just `dir1'.
> ls
qmesh(s) = quadmesh3d
-
+
qvar(s) = d p
= t u
= v w
-
+
mat(s) = mat1
-
+
var(s) = _fileinfo _meshtv_defvars
= _meshtvinfo cycle
= d_data d_dims
@@ -1283,11 +1282,11 @@ of object and `b' exists in exactly one compound array.
b[5] = 0.00159}
c[0] = {-0.34036, -0.64130, -0.86496, -0.98441,
c[4] = -0.98523, -0.86735, -0.64495, -0.34485}
-
+
> b
[0] = {0.98468, 0.98496, 0.86656, 0.64374, 0.34335,
[5] = 0.00159}
-
+
> b[2]
[2] = {0.86656}
@@ -1329,7 +1328,7 @@ since this gives the browser a chance to properly close database files.
> $truncate = nil
> d >data_file
control-c
-
+
Command aborted.
> control-c
%
@@ -1349,27 +1348,27 @@ innermost structure which incloses the `self'.
Tag Table:
-Node: Top231
-Node: Copying1208
-Node: Invocation3969
-Ref: Invocation-Footnote-111235
-Node: Syntax11367
-Node: Functions15208
-Node: Operators22930
-Node: Internal Variables26551
-Node: Differencing Variables27205
-Node: Output Variables31644
-Node: File Variables35138
-Ref: File Variables-Footnote-137486
-Node: Startup File37671
-Ref: Startup File-Footnote-138778
-Node: Editing38860
-Node: Paging40126
-Node: Redirection41841
-Node: Interrupts43145
-Node: Examples44024
-Ref: Examples-Footnote-158652
-Ref: Examples-Footnote-258755
-Ref: Examples-Footnote-358955
+Node: Top229
+Node: Copying1203
+Node: Invocation3961
+Ref: Invocation-Footnote-111228
+Node: Syntax11360
+Node: Functions15202
+Node: Operators22925
+Node: Internal Variables26547
+Node: Differencing Variables27202
+Node: Output Variables31646
+Node: File Variables35148
+Ref: File Variables-Footnote-137504
+Node: Startup File37689
+Ref: Startup File-Footnote-138797
+Node: Editing38879
+Node: Paging40146
+Node: Redirection41862
+Node: Interrupts43167
+Node: Examples44049
+Ref: Examples-Footnote-158650
+Ref: Examples-Footnote-258753
+Ref: Examples-Footnote-358953
End Tag Table
diff --git a/tools/browser/file.c b/tools/browser/file.c
index 8b1e89e..fb7e6da 100644
--- a/tools/browser/file.c
+++ b/tools/browser/file.c
@@ -2263,7 +2263,7 @@ file_deref (obj_t _self, int argc, obj_t argv[]) {
}
}
- for (i=0; i<toc->nmrgtrees; i++) {
+ for (i=0; i<toc->nmrgtree; i++) {
if (!strcmp(toc->mrgtree_names[i], base)) {
loadfunc = (void*(*)(DBfile*,char*))DBGetMrgtree;
savefunc = NULL;
@@ -2273,7 +2273,7 @@ file_deref (obj_t _self, int argc, obj_t argv[]) {
}
}
- for (i=0; i<toc->ngroupelmaps; i++) {
+ for (i=0; i<toc->ngroupelmap; i++) {
if (!strcmp(toc->groupelmap_names[i], base)) {
loadfunc = (void*(*)(DBfile*,char*))DBGetGroupelmap;
savefunc = NULL;
@@ -2283,7 +2283,7 @@ file_deref (obj_t _self, int argc, obj_t argv[]) {
}
}
- for (i=0; i<toc->nmrgvars; i++) {
+ for (i=0; i<toc->nmrgvar; i++) {
if (!strcmp(toc->mrgvar_names[i], base)) {
loadfunc = (void*(*)(DBfile*,char*))DBGetMrgvar;
savefunc = NULL;
@@ -2293,7 +2293,7 @@ file_deref (obj_t _self, int argc, obj_t argv[]) {
}
}
- for (i=0; i<toc->narrays; i++) {
+ for (i=0; i<toc->narray; i++) {
if (!strcmp(toc->array_names[i], base)) {
if (Verbosity>=2) {
out_info("file_deref: loading DBcompoundarray %s:%s",
@@ -2385,7 +2385,7 @@ file_deref (obj_t _self, int argc, obj_t argv[]) {
* array then print a warning message to that effect.
*/
if (!strchr(orig, '/')) {
- for (i=0; i<toc->narrays; i++) {
+ for (i=0; i<toc->narray; i++) {
DBcompoundarray *ca = DBGetCompoundarray(file,
toc->array_names[i]);
assert(ca);
diff --git a/tools/browser/func.c b/tools/browser/func.c
index 5310ee5..bf9162b 100644
--- a/tools/browser/func.c
+++ b/tools/browser/func.c
@@ -92,12 +92,19 @@ extern int read_history ();
/* no history */
#endif /* HAVE_READLINE_HISTORY */
#include <stdlib.h>
-#include <sys/wait.h>
-#include <unistd.h>
+#ifndef _WIN32
+ #include <sys/wait.h>
+#endif
+#ifdef HAVE_UNISTD_H
+ #include <unistd.h>
+#endif
+
/* Non-posix functions */
+#ifndef _WIN32
extern FILE *popen (const char *, const char *);
extern int pclose (FILE*);
+#endif
/* Global variables. */
diffopt_t DiffOpt;
@@ -108,7 +115,7 @@ int NHelpVarToc;
helptoc_t HelpOpToc[25];
int NHelpOpToc;
-
+
/*-------------------------------------------------------------------------
* Function: V_array
*
@@ -164,7 +171,7 @@ V_array (int argc, obj_t argv[]) {
return obj_new (C_ARY, buf, obj_copy (argv[argc-1], SHALLOW));
}
-
+
/*-------------------------------------------------------------------------
* Function: V_assign
*
@@ -244,7 +251,7 @@ V_assign (int argc, obj_t argv[]) {
return NIL;
}
-
+
/*-------------------------------------------------------------------------
* Function: V_close
*
@@ -286,7 +293,7 @@ V_close (int argc, obj_t argv[]) {
return NIL;
}
-
+
/*-------------------------------------------------------------------------
* Function: F_cons
*
@@ -310,7 +317,7 @@ F_cons (obj_t head, obj_t tail) {
return obj_new (C_CONS, obj_copy(head, SHALLOW), obj_copy(tail, SHALLOW));
}
-
+
/*-------------------------------------------------------------------------
* Function: diff_lookup
*
@@ -369,7 +376,7 @@ diff_lookup (char *ascii_name) {
return retval;
}
-
+
/*-------------------------------------------------------------------------
* Function: V_diff
*
@@ -691,7 +698,7 @@ V_diff (int argc, obj_t argv[])
return NIL;
}
-
+
/*-------------------------------------------------------------------------
* Function: V_dot
*
@@ -736,7 +743,7 @@ V_dot (int argc, obj_t argv[]) {
return retval;
}
-
+
/*-------------------------------------------------------------------------
* Function: V_exit
*
@@ -804,7 +811,7 @@ V_exit (int argc, obj_t argv[]) {
return NIL;
}
-
+
/*-------------------------------------------------------------------------
* Function: F_fbind
*
@@ -827,7 +834,7 @@ F_fbind (obj_t self, obj_t func) {
sym_fbind (self, obj_copy(func, SHALLOW));
}
-
+
/*-------------------------------------------------------------------------
* Function: V_file
*
@@ -883,7 +890,7 @@ V_file (int argc, obj_t argv[]) {
return retval;
}
-
+
/*-------------------------------------------------------------------------
* Function: F_flatten
*
@@ -950,7 +957,7 @@ F_flatten (obj_t lst) {
return retval;
}
-
+
/*-------------------------------------------------------------------------
* Function: F_head
*
@@ -1006,7 +1013,7 @@ help_apropos(obj_t sym, void *cdata)
return found;
}
-
+
/*-------------------------------------------------------------------------
* Function: V_help
*
@@ -1224,7 +1231,7 @@ V_include(int argc, obj_t argv[])
return NIL;
}
-
+
/*-------------------------------------------------------------------------
* Function: F_length
*
@@ -1253,7 +1260,7 @@ F_length (obj_t lst) {
return i;
}
-
+
/*-------------------------------------------------------------------------
* Function: V_list
*
@@ -1455,7 +1462,7 @@ V_list (int argc, obj_t argv[])
/* Find the widest entry and if any entries were even selected. */
width = 0;
for (i=0; i<nentries; i++) {
- if (selected[i]) width = MAX(width, strlen(toc[i].name));
+ if (selected[i]) width = MAX(width, (int)strlen(toc[i].name));
}
if (0==width) {
out_errorn("ls: no matches");
@@ -1496,7 +1503,7 @@ V_list (int argc, obj_t argv[])
return NIL;
}
-
+
/*-------------------------------------------------------------------------
* Function: V_make_list
*
@@ -1533,7 +1540,7 @@ V_make_list (int argc, obj_t argv[]) {
return retval;
}
-
+
/*-------------------------------------------------------------------------
* Function: V_noprint
*
@@ -1559,7 +1566,7 @@ V_noprint (int argc, obj_t argv[]) {
return NIL;
}
-
+
/*-------------------------------------------------------------------------
* Function: V_open
*
@@ -1645,7 +1652,7 @@ error:
return NIL;
}
-
+
/*-------------------------------------------------------------------------
* Function: V_pipe
*
@@ -1736,7 +1743,7 @@ V_pipe (int argc, obj_t argv[]) {
return NIL;
}
-
+
/*-------------------------------------------------------------------------
* Function: V_pointer
*
@@ -1764,7 +1771,7 @@ V_pointer (int argc, obj_t argv[]) {
return obj_new (C_PTR, obj_copy (argv[0], SHALLOW));
}
-
+
/*-------------------------------------------------------------------------
* Function: V_primitive
*
@@ -1804,7 +1811,7 @@ V_primitive (int argc, obj_t argv[]) {
return obj_new (C_PRIM, s);
}
-
+
/*-------------------------------------------------------------------------
* Function: V_print
*
@@ -1843,7 +1850,7 @@ V_print (int argc, obj_t argv[]) {
return NIL;
}
-
+
/*-------------------------------------------------------------------------
* Function: V_pwd
*
@@ -1916,7 +1923,7 @@ V_pwd (int argc, obj_t argv[])
return NIL;
}
-
+
/*-------------------------------------------------------------------------
* Function: V_quote
*
@@ -1943,7 +1950,7 @@ V_quote (int argc, obj_t argv[]) {
return V_make_list (argc, argv);
}
-
+
/*-------------------------------------------------------------------------
* Function: V_redirect
*
@@ -2021,7 +2028,7 @@ V_redirect (int argc, obj_t argv[]) {
return NIL;
}
-
+
/*-------------------------------------------------------------------------
* Function: F_reverse
*
@@ -2058,7 +2065,7 @@ F_reverse (obj_t lst) {
return ret;
}
-
+
/*-------------------------------------------------------------------------
* Function: V_setcwd
*
@@ -2143,7 +2150,7 @@ V_setcwd (int argc, obj_t argv[])
return NIL;
}
-
+
/*-------------------------------------------------------------------------
* Function: V_setf
*
@@ -2181,7 +2188,7 @@ V_setf (int argc, obj_t argv[]) {
return NIL;
}
-
+
/*-------------------------------------------------------------------------
* Function: V_struct
*
@@ -2284,7 +2291,7 @@ V_struct (int argc, obj_t argv[]) {
obj_copy(sub[31], SHALLOW), offset[31], name[31], NULL);
}
-
+
/*-------------------------------------------------------------------------
* Function: F_tail
*
@@ -2311,7 +2318,7 @@ F_tail (obj_t lst) {
return obj_copy (cons_tail(lst), SHALLOW);
}
-
+
/*-------------------------------------------------------------------------
* Function: V_typeof
*
diff --git a/tools/browser/lex.c b/tools/browser/lex.c
index 4df8964..e028bd4 100644
--- a/tools/browser/lex.c
+++ b/tools/browser/lex.c
@@ -114,7 +114,10 @@ extern int read_history ();
* Non-posix functions
*/
lex_t *LEX_STDIN = NULL;
+
+#ifndef _WIN32
extern FILE *fdopen(int, const char *);
+#endif
/*-------------------------------------------------------------------------
diff --git a/tools/browser/output.c b/tools/browser/output.c
index 9690bb9..4b170de 100644
--- a/tools/browser/output.c
+++ b/tools/browser/output.c
@@ -73,9 +73,14 @@ be used for advertising or product endorsement purposes.
#include <ctype.h>
#include <errno.h>
#include <signal.h>
-#include <termios.h>
-#include <unistd.h>
-#include <sys/ioctl.h>
+#ifndef _WIN32
+# include <termios.h>
+# include <sys/ioctl.h>
+#endif
+
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
#define OUT_INDENT 3 /*chars per indentation level */
#define OUT_RTMAR 2 /*right margin */
@@ -91,7 +96,7 @@ static int Progress=0; /*current progress report size */
out_t *OUT_STDOUT; /*standard output */
out_t *OUT_STDERR; /*standard error */
-
+
/*-------------------------------------------------------------------------
* Function: handle_signals
*
@@ -104,16 +109,19 @@ out_t *OUT_STDERR; /*standard error */
* Jan 13 1997
*
* Modifications:
- *
+ * Kathleen Bonnell, Thu Dec 9 09:33:15 PST 2010\
+ * SIGPIPE is not defined on WIN32.
*-------------------------------------------------------------------------
*/
static void
handle_signals(int signo)
{
switch (signo) {
+#ifndef _WIN32
case SIGPIPE:
BrokenPipe++;
break;
+#endif
case SIGINT:
CaughtSigint++;
@@ -121,7 +129,7 @@ handle_signals(int signo)
}
}
-
+
/*-------------------------------------------------------------------------
* Function: out_brokenpipe
*
@@ -165,7 +173,7 @@ out_brokenpipe(out_t *f)
return f->pflags;
}
-
+
/*-------------------------------------------------------------------------
* Function: out_section
*
@@ -187,7 +195,7 @@ out_section(out_t *f)
if (PAGER_NEXT_SECTION==f->pflags) f->pflags = PAGER_OKAY;
}
-
+
/*-------------------------------------------------------------------------
* Function: out_error
*
@@ -220,7 +228,7 @@ out_error (const char *mesg, obj_t obj) {
}
}
-
+
/*-------------------------------------------------------------------------
* Function: out_errorn
*
@@ -265,7 +273,7 @@ out_errorn (const char *fmt, ...) {
}
}
-
+
/*-------------------------------------------------------------------------
* Function: out_error_disable
*
@@ -290,7 +298,7 @@ out_error_disable (void) {
return 0;
}
-
+
/*-------------------------------------------------------------------------
* Function: out_error_restore
*
@@ -321,7 +329,7 @@ out_error_restore (void) {
return ErrorDisable;
}
-
+
/*-------------------------------------------------------------------------
* Function: out_indent
*
@@ -343,7 +351,7 @@ out_indent (out_t *f) {
f->indent += 1;
}
-
+
/*-------------------------------------------------------------------------
* Function: out_info
*
@@ -445,7 +453,7 @@ out_init_size(void)
OUT_COL2 = (OUT_LTMAR+OUT_NCOLS)/2;
}
-
+
/*-------------------------------------------------------------------------
* Function: out_init
*
@@ -468,12 +476,17 @@ out_init_size(void)
* Robb Matzke, 2000-06-28
* Signal handlers are registered with sigaction() since its
* behavior is more consistent.
+ *
+ * Kathleen Bonnell, Thu Dec 9 09:34:51 PST 2010
+ * sigaction not defined on Win32.
*-------------------------------------------------------------------------
*/
void
out_init (void)
{
+#ifndef _WIN32
struct sigaction action;
+#endif
/* Keep track of terminal size changes */
out_init_size();
@@ -483,14 +496,16 @@ out_init (void)
OUT_STDERR = out_stream (stderr);
/* Arrange to handle broken pipes and interrupts */
+#ifndef _WIN32
action.sa_handler = handle_signals;
sigemptyset(&action.sa_mask);
action.sa_flags = SA_RESTART;
sigaction(SIGPIPE, &action, NULL);
sigaction(SIGINT, &action, NULL);
+#endif
}
-
+
/*-------------------------------------------------------------------------
* Function: out_literal
*
@@ -518,7 +533,7 @@ out_literal (out_t *f, int val) {
return old_literal;
}
-
+
/*-------------------------------------------------------------------------
* Function: out_nl
*
@@ -542,15 +557,20 @@ out_literal (out_t *f, int val) {
* Robb Matzke, 6 Feb 1997
* Lines which would have nothing after the equal are left blank.
*
+ * Kathleen Bonnell, Thu Dec 9 09:34:27 PST 2010
+ * Comment out the paging functionality on Win32. (Till a path forward
+ * for this platform can be determined).
*-------------------------------------------------------------------------
*/
void
out_nl(out_t *f)
{
+#ifndef _WIN32
char buf[256];
int i, n, rawmode=false;
struct termios oldtio, tio;
static const char *prompt = "more? ('q' to quit) ";
+#endif
if (out_brokenpipe(f)) return;
if (isatty(fileno(f->f))) out_progress(NULL);
@@ -558,7 +578,9 @@ out_nl(out_t *f)
putc('\n', f->f);
f->row += 1;
f->col = 0;
-
+#ifdef _WIN32
+ fflush(f->f);
+#else
/* Pause output if it's going to a terminal. */
again:
if (PAGER_ACTIVE(f) && f->row+1==OUT_NROWS) {
@@ -599,9 +621,10 @@ out_nl(out_t *f)
}
f->row = 0;
}
+#endif
}
-
+
/*-------------------------------------------------------------------------
* Function: out_pop
*
@@ -656,7 +679,7 @@ out_header(out_t *f, const char *header)
f->header = safe_strdup(header);
}
-
+
/*-------------------------------------------------------------------------
* Function: out_prefix
*
@@ -804,7 +827,7 @@ out_column(out_t *f, int column, const char *separator)
out_literal(f, oldlit);
}
-
+
/*-------------------------------------------------------------------------
* Function: out_printf
*
@@ -844,7 +867,7 @@ out_printf (out_t *f, const char *fmt, ...) {
}
}
-
+
/*-------------------------------------------------------------------------
* Function: out_push
*
@@ -874,7 +897,7 @@ out_push (out_t *f, const char *name) {
f->nfields += 1;
}
-
+
/*-------------------------------------------------------------------------
* Function: out_push_array
*
@@ -937,7 +960,7 @@ out_push_array (out_t *f, const char *name, int ndims, const int *offset,
return &(f->field[idx].elmtno);
}
-
+
/*-------------------------------------------------------------------------
* Function: out_puts
*
@@ -982,7 +1005,7 @@ out_puts (out_t *f, const char *s) {
}
}
-
+
/*-------------------------------------------------------------------------
* Function: out_line
*
@@ -1042,7 +1065,7 @@ out_line (out_t *f, const char *string)
out_literal (f, oldlit);
}
-
+
/*-------------------------------------------------------------------------
* Function: out_progress
*
@@ -1083,7 +1106,7 @@ out_progress (const char *s) {
Progress = i;
}
-
+
/*-------------------------------------------------------------------------
* Function: out_putw
*
@@ -1147,7 +1170,7 @@ out_putw (out_t *f, const char *s) {
f->nfields = old_nfields; /*restore prefix*/
}
-
+
/*-------------------------------------------------------------------------
* Function: out_reset
*
@@ -1176,7 +1199,7 @@ out_reset (out_t *f) {
f->pflags = PAGER_OKAY;
}
-
+
/*-------------------------------------------------------------------------
* Function: out_stream
*
@@ -1219,7 +1242,7 @@ out_stream (FILE *stream) {
return f;
}
-
+
/*-------------------------------------------------------------------------
* Function: out_undent
*
@@ -1241,7 +1264,7 @@ out_undent (out_t *f) {
if (f->indent>0) f->indent -= 1;
}
-
+
/*-------------------------------------------------------------------------
* Function: out_getindex
*
diff --git a/tools/browser/parse.c b/tools/browser/parse.c
index 6f76322..2566fce 100644
--- a/tools/browser/parse.c
+++ b/tools/browser/parse.c
@@ -66,7 +66,9 @@ be used for advertising or product endorsement purposes.
#include <browser.h>
#include <ctype.h>
#include <signal.h>
-#include <unistd.h>
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
static void bif (const char*, obj_t(*)(int,obj_t[]), int, const char*,
const char*);
@@ -477,6 +479,8 @@ bif (const char *func_name, obj_t(*func_ptr)(int x, obj_t y[]), int flags,
* Signal handlers are registered with sigaction() since its behavior
* is more consistent.
*
+ * Kathleen Bonnell, Thu Dec 9 09:36:44 PST 2010
+ * sigaction not defined on WIN32, ifdef it.
*-------------------------------------------------------------------------
*/
obj_t
@@ -485,6 +489,8 @@ parse_stmt (lex_t *f, int implied_print) {
char *lexeme, buf[1024], *s, *fmode;
int tok, i;
obj_t head=NIL, opstack=NIL, b1=NIL, retval=NIL, tmp=NIL;
+
+#ifndef _WIN32
struct sigaction new_action, old_action;
/* SIGINT should have the default action while we're parsing */
@@ -492,6 +498,7 @@ parse_stmt (lex_t *f, int implied_print) {
sigemptyset(&new_action.sa_mask);
new_action.sa_flags = SA_RESTART;
sigaction(SIGINT, &new_action, &old_action);
+#endif
tok = lex_token (f, &lexeme, false);
@@ -642,14 +649,18 @@ parse_stmt (lex_t *f, int implied_print) {
}
done:
+#ifndef _WIN32
sigaction(SIGINT, &old_action, NULL);
+#endif
return retval;
error:
if (head) head = obj_dest (head);
if (opstack) opstack = obj_dest (opstack);
if (retval) retval = obj_dest (retval);
+#ifndef _WIN32
sigaction(SIGINT, &old_action, NULL);
+#endif
return NIL;
}
diff --git a/tools/browser/prim.c b/tools/browser/prim.c
index a0423c0..63a782d 100644
--- a/tools/browser/prim.c
+++ b/tools/browser/prim.c
@@ -309,7 +309,12 @@ prim_assoc_t PA_TOPODIM[] = {
{ 1, "1"},
{ 2, "2"},
{ 3, "3"},
-};
+ {0, NULL}};
+
+prim_assoc_t PA_REPRBLOCK[] = {
+ {PA_NAME, "representative block index"},
+ {-1, "not specified"},
+ {0, NULL}};
/*-------------------------------------------------------------------------
@@ -599,7 +604,7 @@ prim_octal(char *buf/*out*/, const void *_mem, size_t nbytes)
{
unsigned char *mem = (unsigned char*)_mem;
size_t qlen=0, at=0, stride=(8*nbytes)%3;
- unsigned q=0, d;
+ unsigned q=0;
while (nbytes>0 || qlen) {
diff --git a/tools/browser/stc.c b/tools/browser/stc.c
index 36d10c9..23ee329 100644
--- a/tools/browser/stc.c
+++ b/tools/browser/stc.c
@@ -539,7 +539,7 @@ stc_walk1_DBdirectory (obj_t _self, void *mem, int operation, walk_t *wdata)
assert (WALK_PRINT==operation);
for (i=0; i<dir->nsyms; i++) {
- width = MAX (width, strlen(dir->toc[i].name));
+ width = MAX (width, (int) strlen(dir->toc[i].name));
}
if (0==width) {
out_errorn ("empty directory");
@@ -1629,6 +1629,8 @@ stc_silo_types (void) {
COMP (file_ns, "primitive 'string'");
COMP (block_ns, "primitive 'string'");
COMP (block_type, "primitive 'int'");
+ COMP (repr_block_idx, "primitive 'int'");
+ IOASSOC (PA_REPRBLOCK);
COMP (empty_cnt, "primitive 'int'");
COMP (empty_list,
"pointer (array 'self.empty_cnt' (primitive 'int'))");
@@ -1698,6 +1700,8 @@ stc_silo_types (void) {
COMP (file_ns, "primitive 'string'");
COMP (block_ns, "primitive 'string'");
COMP (block_type, "primitive 'int'");
+ COMP (repr_block_idx, "primitive 'int'");
+ IOASSOC (PA_REPRBLOCK);
COMP (empty_cnt, "primitive 'int'");
COMP (empty_list,
"pointer (array 'self.empty_cnt' (primitive 'int'))");
@@ -1728,6 +1732,8 @@ stc_silo_types (void) {
COMP (mmesh_name, "primitive 'string'");
COMP (file_ns, "primitive 'string'");
COMP (block_ns, "primitive 'string'");
+ COMP (repr_block_idx, "primitive 'int'");
+ IOASSOC (PA_REPRBLOCK);
COMP (empty_cnt, "primitive 'int'");
COMP (empty_list,
"pointer (array 'self.empty_cnt' (primitive 'int'))");
@@ -1759,6 +1765,8 @@ stc_silo_types (void) {
COMP (nmat, "primitive 'int'");
COMP (file_ns, "primitive 'string'");
COMP (block_ns, "primitive 'string'");
+ COMP (repr_block_idx, "primitive 'int'");
+ IOASSOC (PA_REPRBLOCK);
COMP (empty_cnt, "primitive 'int'");
COMP (empty_list,
"pointer (array 'self.empty_cnt' (primitive 'int'))");
@@ -2405,17 +2413,17 @@ stc_silo_types (void) {
COMP (ndir, "primitive 'int'");
COMP (dir_names,
"pointer (array 'self.ndir' (primitive 'string'))");
- COMP (narrays, "primitive 'int'");
+ COMP (narray, "primitive 'int'");
COMP (array_names,
- "pointer (array 'self.narrays' (primitive 'string'))");
- COMP (nmrgtrees, "primitive 'int'");
+ "pointer (array 'self.narray' (primitive 'string'))");
+ COMP (nmrgtree, "primitive 'int'");
COMP (mrgtree_names,
- "pointer (array 'self.nmrgtrees' (primitive 'string'))");
- COMP (ngroupelmaps, "primitive 'int'");
+ "pointer (array 'self.nmrgtree' (primitive 'string'))");
+ COMP (ngroupelmap, "primitive 'int'");
COMP (groupelmap_names,
- "pointer (array 'self.ngroupelmaps' (primitive 'string'))");
- COMP (nmrgvars, "primitive 'int'");
+ "pointer (array 'self.ngroupelmap' (primitive 'string'))");
+ COMP (nmrgvar, "primitive 'int'");
COMP (mrgvar_names,
- "pointer (array 'self.nmrgvars' (primitive 'string'))");
+ "pointer (array 'self.nmrgvar' (primitive 'string'))");
} ESTRUCT;
}
diff --git a/tools/browser/switch.c b/tools/browser/switch.c
index 2cc1afe..6e73015 100644
--- a/tools/browser/switch.c
+++ b/tools/browser/switch.c
@@ -198,7 +198,7 @@ switch_doc(switch_t *sw, const char *doc_string)
switch_t *
switch_find(switches_t *switches, const char *name)
{
- int i;
+ size_t i;
if (name && '-'==name[0] && '-'==name[1]) {
for (i=0; i<switches->nused; i++) {
@@ -285,7 +285,7 @@ switch_synopsis(switch_t *sw, char *buffer)
void
switch_usage(switches_t *switches, const char *arg0, const char *sname)
{
- int i;
+ size_t i;
char synopsis[256];
/* Base name of executable */
diff --git a/tools/browser/sym.c b/tools/browser/sym.c
index 8e74baf..da9784f 100644
--- a/tools/browser/sym.c
+++ b/tools/browser/sym.c
@@ -777,6 +777,9 @@ sym_truth (char *name) {
*
* Mark C. Miller, Fri Mar 12 01:23:15 PST 2010
* Replaced splitvfdexts with $hdf5_vfd_opts
+ *
+ * Kathleen Bonnell, Thu Dec 9 09:40:03 PST 2010
+ * Surround use of PUBLIC_INIT_FILE with ifdef for its existence.
*-------------------------------------------------------------------------
*/
void
@@ -889,12 +892,14 @@ sym_init (void)
"Them in order when attempting to open a file.\n");
/* Name of public init file */
+#ifdef PUBLIC_INIT_FILE
sym_bi_set("pubinit", PUBLIC_INIT_FILE,
"Name of public initialization file.",
"The name of the public initialization file is stored in this "
"variable regardless of whether that file has actually been "
"read. Its primary purpose is to be used as the argument to "
"the `include' function in a user-local startup file.");
+#endif
/* Set $diff to something reasonable */
list[0] = obj_new(C_SYM, "detail");
diff --git a/tools/python/Makefile.am b/tools/python/Makefile.am
index 5348b6e..b266648 100644
--- a/tools/python/Makefile.am
+++ b/tools/python/Makefile.am
@@ -62,7 +62,7 @@ else
Silo_la_LIBADD = ../../src/libsilo.la
endif
-AM_CPPFLAGS = $(PYTHON_CPPFLAGS) -I$(top_builddir)/src/silo -I$(includedir)
+AM_CPPFLAGS = $(PYTHON_CPPFLAGS) -I$(top_builddir)/src/silo -I$(top_srcdir)/src/silo -I$(includedir)
noinst_HEADERS = \
pydbfile.h \
diff --git a/tools/python/Makefile.in b/tools/python/Makefile.in
index d1788e1..a7cd0c1 100644
--- a/tools/python/Makefile.in
+++ b/tools/python/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -70,8 +71,9 @@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -90,20 +92,43 @@ subdir = tools/python
DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/config/ax_check_compiler_flags.m4 \
+ $(top_srcdir)/config/ax_have_qt.m4 \
+ $(top_srcdir)/config/libtool.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
+ $(top_srcdir)/config/vl_lib_readline.m4 \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
*) f=$$p;; \
esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == $(am__install_max)) \
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+ END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
am__installdirs = "$(DESTDIR)$(libdir)"
-libLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(lib_LTLIBRARIES)
@HDF5_DRV_NEEDED_FALSE at Silo_la_DEPENDENCIES = ../../src/libsilo.la
@HDF5_DRV_NEEDED_TRUE at Silo_la_DEPENDENCIES = ../../src/libsiloh5.la
@@ -113,9 +138,10 @@ Silo_la_OBJECTS = $(am_Silo_la_OBJECTS)
Silo_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
$(Silo_la_LDFLAGS) $(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/config/depcomp
am__depfiles_maybe = depfiles
+am__mv = mv -f
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -166,7 +192,8 @@ CXX_FULLPATH = @CXX_FULLPATH@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -178,6 +205,7 @@ FCFLAGS = @FCFLAGS@
FCLIBS = @FCLIBS@
FC_FULLPATH = @FC_FULLPATH@
FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FORTRAN = @FORTRAN@
FPZIP = @FPZIP@
GREP = @GREP@
@@ -188,17 +216,25 @@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
LDFLAGS = @LDFLAGS@
+LIBM = @LIBM@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
NETCDF = @NETCDF@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -208,7 +244,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PDBP_DRV = @PDBP_DRV@
PDB_DRV = @PDB_DRV@
-PRTDIAG = @PRTDIAG@
PYTHON = @PYTHON@
PYTHONMODULE = @PYTHONMODULE@
PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@
@@ -216,17 +251,13 @@ PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
PYTHON_PLATFORM = @PYTHON_PLATFORM@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
-QT_BIN = @QT_BIN@
-QT_CORE = @QT_CORE@
-QT_CORE_LIB = @QT_CORE_LIB@
QT_CXXFLAGS = @QT_CXXFLAGS@
-QT_GUI = @QT_GUI@
-QT_GUI_LIB = @QT_GUI_LIB@
-QT_INCLUDE = @QT_INCLUDE@
-QT_LDFLAGS = @QT_LDFLAGS@
-QT_LIB = @QT_LIB@
+QT_DIR = @QT_DIR@
QT_LIBS = @QT_LIBS@
+QT_LRELEASE = @QT_LRELEASE@
+QT_LUPDATE = @QT_LUPDATE@
QT_MOC = @QT_MOC@
+QT_UIC = @QT_UIC@
RANLIB = @RANLIB@
READLINE_LIBS = @READLINE_LIBS@
SED = @SED@
@@ -244,6 +275,11 @@ SILO_VERS_TAG = @SILO_VERS_TAG@
STRIP = @STRIP@
TAURUS = @TAURUS@
VERSION = @VERSION@
+XMKMF = @XMKMF@
+X_CFLAGS = @X_CFLAGS@
+X_EXTRA_LIBS = @X_EXTRA_LIBS@
+X_LIBS = @X_LIBS@
+X_PRE_LIBS = @X_PRE_LIBS@
ZLIB = @ZLIB@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
@@ -251,6 +287,7 @@ abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_F77 = @ac_ct_F77@
ac_ct_FC = @ac_ct_FC@
am__include = @am__include@
@@ -283,6 +320,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -299,6 +337,7 @@ sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
lib_LTLIBRARIES = Silo.la
@@ -306,7 +345,7 @@ Silo_la_SOURCES = $(FILES)
Silo_la_LDFLAGS = -module -avoid-version
@HDF5_DRV_NEEDED_FALSE at Silo_la_LIBADD = ../../src/libsilo.la
@HDF5_DRV_NEEDED_TRUE at Silo_la_LIBADD = ../../src/libsiloh5.la
-AM_CPPFLAGS = $(PYTHON_CPPFLAGS) -I$(top_builddir)/src/silo -I$(includedir)
+AM_CPPFLAGS = $(PYTHON_CPPFLAGS) -I$(top_builddir)/src/silo -I$(top_srcdir)/src/silo -I$(includedir)
noinst_HEADERS = \
pydbfile.h \
pydbtoc.h \
@@ -328,14 +367,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
- && exit 0; \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tools/python/Makefile'; \
- cd $(top_srcdir) && \
- $(AUTOMAKE) --foreign tools/python/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tools/python/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --foreign tools/python/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -353,23 +392,28 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+ list2=; for p in $$list; do \
if test -f $$p; then \
- f=$(am__strip_dir) \
- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+ list2="$$list2 $$p"; \
else :; fi; \
- done
+ done; \
+ test -z "$$list2" || { \
+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
+ }
uninstall-libLTLIBRARIES:
@$(NORMAL_UNINSTALL)
- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- p=$(am__strip_dir) \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+ @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+ for p in $$list; do \
+ $(am__strip_dir) \
+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \
+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \
done
clean-libLTLIBRARIES:
@@ -395,21 +439,21 @@ distclean-compile:
.cpp.o:
@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
.cpp.obj:
@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
.cpp.lo:
@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
@@ -425,45 +469,49 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
+ set x; \
here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
fi
ctags: CTAGS
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
+ $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && cd $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) $$here
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -484,13 +532,17 @@ distdir: $(DISTFILES)
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
if test -d $$d/$$file; then \
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
@@ -521,6 +573,7 @@ clean-generic:
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -542,6 +595,8 @@ dvi-am:
html: html-am
+html-am:
+
info: info-am
info-am:
@@ -550,18 +605,28 @@ install-data-am:
install-dvi: install-dvi-am
+install-dvi-am:
+
install-exec-am: install-libLTLIBRARIES
install-html: install-html-am
+install-html-am:
+
install-info: install-info-am
+install-info-am:
+
install-man:
install-pdf: install-pdf-am
+install-pdf-am:
+
install-ps: install-ps-am
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-am
@@ -600,6 +665,7 @@ uninstall-am: uninstall-libLTLIBRARIES
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
tags uninstall uninstall-am uninstall-libLTLIBRARIES
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/tools/python/pydbfile.cpp b/tools/python/pydbfile.cpp
index 53d81ce..6c85f22 100644
--- a/tools/python/pydbfile.cpp
+++ b/tools/python/pydbfile.cpp
@@ -52,6 +52,10 @@
#include "pydbtoc.h"
#include "pysilo.h"
+#include <string>
+
+using std::string;
+
// ****************************************************************************
// Method: DBfile_DBGetToc
//
@@ -105,6 +109,12 @@ static PyObject *DBfile_DBGetToc(PyObject *self, PyObject *args)
// was being given a length argument that included the trailing null and
// the result was a bit if an odd string in python.
//
+// Mark C. Miller, Wed Nov 14 15:35:44 PST 2012
+// Removed error return case for 'only flat variables.' This also fixes a
+// problem with string object members on HDF5 driver where the funky "'<s>"
+// construct is used for *both* string valued members and variable
+// members whose value is also a string but is the name of another dataset
+// in the file.
// ****************************************************************************
static PyObject *DBfile_DBGetVar(PyObject *self, PyObject *args)
{
@@ -122,10 +132,7 @@ static PyObject *DBfile_DBGetVar(PyObject *self, PyObject *args)
int vartype = DBInqVarType(db, str);
if (vartype != DB_VARIABLE)
- {
- SiloErrorFunc("Only flat variables are supported.");
return NULL;
- }
int len = DBGetVarLength(db,str);
int type = DBGetVarType(db,str);
@@ -196,6 +203,149 @@ static PyObject *DBfile_DBGetVar(PyObject *self, PyObject *args)
}
// ****************************************************************************
+// Method: DBfile_DBGetVarInfo
+//
+// Purpose: Get metadata for a variable
+//
+// Creation Mark C. Miller, Mon Nov 12 11:12:03 PST 2012
+// Plagerized liberally from Silex' SiloObjectView
+//
+// Mark C. Miller, Tue Nov 13 17:29:29 PST 2012
+// Added optional 1/0 flag to descend into variable components and read their
+// data as a tuple member of the returned python dict.
+// ****************************************************************************
+static PyObject *DBfile_DBGetVarInfo(PyObject *self, PyObject *args)
+{
+ DBfile *db = ((DBfileObject*)self)->db;
+
+ if (!db)
+ {
+ SiloErrorFunc("This file has been closed.");
+ return NULL;
+ }
+
+ char *str;
+ int get_data_flag = 0;
+ if (!PyArg_ParseTuple(args, "si", &str, &get_data_flag))
+ {
+ if (!PyArg_ParseTuple(args, "s", &str))
+ return NULL;
+ else
+ PyErr_Clear();
+ }
+
+ //
+ // Note that because we read the object through Silo's generic object
+ // interface, the Silo library will not be able to correctly apply
+ // object-level de-compression algorithms. We could add logic to the
+ // implementation of the GetObject method to detect the kind of object
+ // being read and, if it is a compressed mesh/var object, do the work
+ // necessary to prepare for its decompression. Too much work for now.
+ //
+ DBobject *silo_obj = DBGetObject(db, str);
+ if (!silo_obj)
+ {
+ char msg[256];
+ snprintf(msg, sizeof(msg), "Unable to get object \"%s\"", str);
+ SiloErrorFunc(msg);
+ return NULL;
+ }
+
+ PyObject *retval = PyDict_New();
+ PyDict_SetItemString(retval, "name", PyString_FromString(silo_obj->name));
+ PyDict_SetItemString(retval, "type", PyString_FromString(silo_obj->type));
+ for (int i=0; i<silo_obj->ncomponents; i++)
+ {
+ string compname = silo_obj->comp_names[i];
+ string pdbname = silo_obj->pdb_names[i];
+ void *comp = DBGetComponent(db, str, compname.c_str());
+ if (!comp)
+ {
+ char msg[256];
+ snprintf(msg, sizeof(msg), "Unable to get component \"%s\" for object \%s\"", compname.c_str(), str);
+ SiloErrorFunc(msg);
+ continue;
+ }
+ int type = DBGetComponentType(db, str, compname.c_str());
+ string typestr = "";
+ int ival = -1;
+ switch (type)
+ {
+ case DB_INT:
+ typestr = "int";
+ ival = *((int*)comp);
+ PyDict_SetItemString(retval, compname.c_str(), PyInt_FromLong((long)ival));
+ break;
+ case DB_SHORT:
+ typestr = "short";
+ ival = *((short*)comp);
+ PyDict_SetItemString(retval, compname.c_str(), PyInt_FromLong((long)ival));
+ break;
+ case DB_LONG:
+ typestr = "long";
+ ival = (int) *((long*)comp);
+ PyDict_SetItemString(retval, compname.c_str(), PyInt_FromLong((long)ival));
+ break;
+ case DB_LONG_LONG:
+ typestr = "long long";
+ ival = (int) *((long long*)comp);
+ PyDict_SetItemString(retval, compname.c_str(), PyInt_FromLong((long)ival));
+ break;
+ case DB_FLOAT:
+ typestr = "float";
+ PyDict_SetItemString(retval, compname.c_str(), PyFloat_FromDouble(*((float*)comp)));
+ break;
+ case DB_DOUBLE:
+ typestr = "double";
+ PyDict_SetItemString(retval, compname.c_str(), PyFloat_FromDouble(*((double*)comp)));
+ break;
+ case DB_CHAR:
+ typestr = "char";
+ if (*((char*)comp)== 0)
+ PyDict_SetItemString(retval, compname.c_str(), PyString_FromString(""));
+ else
+ PyDict_SetItemString(retval, compname.c_str(), PyString_FromString((char*)comp));
+ break;
+ case DB_NOTYPE:
+ typestr = "notype";
+ break;
+ default:
+ typestr = "var";
+ string valStr = std::string(pdbname.c_str());
+ if (pdbname.find("'<s>") == 0)
+ {
+ int len = pdbname.length();
+ valStr = string((const char*)(pdbname.c_str()),4,len-5);
+ }
+ if (get_data_flag)
+ {
+
+ PyObject *argTuple = PyTuple_New(1);
+ PyTuple_SetItem(argTuple, 0, PyString_FromString(valStr.c_str()));
+ PyObject *dobj = DBfile_DBGetVar(self, argTuple);
+ if (dobj)
+ PyDict_SetItemString(retval, compname.c_str(), dobj);
+ else
+ PyDict_SetItemString(retval, compname.c_str(), PyString_FromString(valStr.c_str()));
+ }
+ else
+ {
+ PyDict_SetItemString(retval, compname.c_str(), PyString_FromString(valStr.c_str()));
+ }
+ break;
+ }
+
+ // No such call as "DBFreeComponent". Maybe there should be one!
+ free(comp);
+ comp = NULL;
+
+ }
+ DBFreeObject(silo_obj);
+
+ return retval;
+}
+
+// ****************************************************************************
// Method: DBfile_DBGetVar
//
// Purpose:
@@ -210,6 +360,10 @@ static PyObject *DBfile_DBGetVar(PyObject *self, PyObject *args)
// Programmer: Jeremy Meredith
// Creation: July 12, 2005
//
+// Modifications
+// Mark C. Miller, Thu Dec 20 00:05:41 PST 2012
+// Adjust parsing logic to avoid deprecation warning for parsing a float into
+// an integer variable.
// ****************************************************************************
static PyObject *DBfile_DBWrite(PyObject *self, PyObject *args)
{
@@ -229,12 +383,12 @@ static PyObject *DBfile_DBWrite(PyObject *self, PyObject *args)
double dvar;
char *svar;
PyObject *tuple;
- if (PyArg_ParseTuple(args, "si", &str, &ivar) &&
- PyArg_ParseTuple(args, "sd", &str, &dvar))
+ if (PyArg_ParseTuple(args, "sd", &str, &dvar))
{
dims = 1;
- if (ivar == dvar)
+ if (dvar == (int) dvar)
{
+ ivar = (int) dvar;
err = DBWrite(db, str, &ivar, &dims,1, DB_INT);
}
else
@@ -242,16 +396,6 @@ static PyObject *DBfile_DBWrite(PyObject *self, PyObject *args)
err = DBWrite(db, str, &dvar, &dims,1, DB_DOUBLE);
}
}
- else if (PyArg_ParseTuple(args, "si", &str, &ivar))
- {
- dims = 1;
- err = DBWrite(db, str, &ivar, &dims,1, DB_INT);
- }
- else if (PyArg_ParseTuple(args, "sd", &str, &dvar))
- {
- dims = 1;
- err = DBWrite(db, str, &dvar, &dims,1, DB_DOUBLE);
- }
else if (PyArg_ParseTuple(args, "ss", &str, &svar))
{
dims = strlen(svar);
@@ -337,6 +481,101 @@ static PyObject *DBfile_DBWrite(PyObject *self, PyObject *args)
}
// ****************************************************************************
+// Method: DBfile_DBWriteObject
+//
+// Purpose: Generalized method for writing silo objects.
+//
+// Python Arguments:
+// form 1: object name, python dictionary (with problem sized arrays as
+// members)
+// ****************************************************************************
+static PyObject *DBfile_DBWriteObject(PyObject *self, PyObject *args)
+{
+ DBfile *db = ((DBfileObject*)self)->db;
+
+ if (!db)
+ {
+ SiloErrorFunc("This file has been closed.");
+ return NULL;
+ }
+
+ char *objname;
+ PyDictObject *dictobj;
+ if (!PyArg_ParseTuple(args, "sO!", &objname, &PyDict_Type, &dictobj)) return NULL;
+
+ int ncomps = PyDict_Size((PyObject*)dictobj);
+ if (!ncomps) return NULL;
+ int objtype = DBGetObjtypeTag(PyString_AsString(PyDict_GetItemString((PyObject*)dictobj, "type")));
+ DBobject *siloobj = DBMakeObject(objname, objtype, ncomps);
+
+ PyObject *key, *value;
+#if PY_VERSION_GE(2,5,0)
+ Py_ssize_t pos = 0;
+#else
+ int pos = 0;
+#endif
+ while (PyDict_Next((PyObject*)dictobj, &pos, &key, &value))
+ {
+ if (PyInt_Check(value))
+ DBAddIntComponent(siloobj, PyString_AsString(key), PyInt_AS_LONG(value));
+ else if (PyFloat_Check(value))
+ DBAddDblComponent(siloobj, PyString_AsString(key), PyFloat_AS_DOUBLE(value));
+ else if (PyString_Check(value))
+ DBAddStrComponent(siloobj, PyString_AsString(key), PyString_AsString(value));
+ else if (PyTuple_Check(value))
+ {
+ long len = PyTuple_Size(value);
+ bool allint = true;
+ for (int i = 0; i < len && allint; i++)
+ {
+ if (PyFloat_Check(PyTuple_GET_ITEM(value,i)))
+ {
+ double dval = PyFloat_AS_DOUBLE(PyTuple_GET_ITEM(value,i));
+ if (dval != (int) dval) allint = false;
+ }
+ }
+ if (allint)
+ {
+ int *vals = new int[len];
+ for (int i = 0; i < len; i++)
+ {
+ if (PyFloat_Check(PyTuple_GET_ITEM(value,i)))
+ {
+ double dval = PyFloat_AS_DOUBLE(PyTuple_GET_ITEM(value,i));
+ vals[i] = (int) dval;
+ }
+ else
+ {
+ vals[i] = PyInt_AS_LONG(PyTuple_GET_ITEM(value,i));
+ }
+ }
+ DBWriteComponent(db, siloobj, PyString_AsString(key), objname, "integer", vals, 1, &len);
+ delete [] vals;
+ }
+ else
+ {
+ double *vals = new double[len];
+ for (int i = 0; i < len; i++)
+ {
+ if (PyInt_Check(PyTuple_GET_ITEM(value,i)))
+ vals[i] = (double) PyInt_AS_LONG(PyTuple_GET_ITEM(value,i));
+ else
+ vals[i] = PyFloat_AS_DOUBLE(PyTuple_GET_ITEM(value,i));
+ }
+ DBWriteComponent(db, siloobj, PyString_AsString(key), objname, "double", vals, 1, &len);
+ delete [] vals;
+ }
+ }
+ }
+ DBWriteObject(db, siloobj, 1);
+
+ PyErr_Clear();
+ Py_INCREF(Py_None);
+ return Py_None;
+
+}
+
+// ****************************************************************************
// Method: DBfile_DBMkDir
//
// Purpose:
@@ -463,7 +702,9 @@ static PyObject *DBfile_DBClose(PyObject *self, PyObject *args)
static struct PyMethodDef DBfile_methods[] = {
{"GetToc", DBfile_DBGetToc, METH_VARARGS},
{"GetVar", DBfile_DBGetVar, METH_VARARGS},
+ {"GetVarInfo", DBfile_DBGetVarInfo, METH_VARARGS},
{"Write", DBfile_DBWrite, METH_VARARGS},
+ {"WriteObject", DBfile_DBWriteObject, METH_VARARGS},
{"MkDir", DBfile_DBMkDir, METH_VARARGS},
{"SetDir", DBfile_DBSetDir, METH_VARARGS},
{"Close", DBfile_DBClose, METH_VARARGS},
@@ -619,7 +860,6 @@ static int DBfile_compare(PyObject *v, PyObject *w)
// Creation: July 12, 2005
//
// ****************************************************************************
-static char *DBfile_Purpose = "This class wraps a Silo DBfile object.";
PyTypeObject DBfileType =
{
//
@@ -655,7 +895,7 @@ PyTypeObject DBfileType =
0, // tp_setattro
0, // tp_as_buffer
Py_TPFLAGS_CHECKTYPES, // tp_flags
- DBfile_Purpose, // tp_doc
+ "This class wraps a Silo DBfile object.", // tp_doc
0, // tp_traverse
0, // tp_clear
0, // tp_richcompare
diff --git a/tools/python/pydbfile.h b/tools/python/pydbfile.h
index 1c7f4cf..bd898fa 100644
--- a/tools/python/pydbfile.h
+++ b/tools/python/pydbfile.h
@@ -52,7 +52,7 @@
#define PY_DBFILE_H
#include <Python.h>
-#include <silo.h>
+#include <silo_private.h>
// ****************************************************************************
// Struct: DBfileObject
diff --git a/tools/python/pydbtoc.cpp b/tools/python/pydbtoc.cpp
index 0216070..bfac915 100644
--- a/tools/python/pydbtoc.cpp
+++ b/tools/python/pydbtoc.cpp
@@ -68,6 +68,32 @@ static void DBtoc_dealloc(PyObject *self)
PyObject_Del(self);
}
+#define PRINT_OBJS(nm) \
+{ \
+ if (toc->n ## nm) \
+ { \
+ sprintf(tmp, "n%s = %d\n", #nm, toc->n ## nm); \
+ len += strlen(tmp); \
+ if (s) strcat(s, tmp); \
+ \
+ sprintf(tmp, "%s_names = (", #nm); \
+ len += strlen(tmp); \
+ if (s) strcat(s, tmp); \
+ for (int i=0; i<toc->n ## nm; i++) \
+ { \
+ len += strlen(toc->nm ## _names[i]); \
+ if (s) strcat(s, toc->nm ## _names[i]); \
+ if (i < toc->n ## nm -1) \
+ { \
+ len += strlen(sep); \
+ if (s) strcat(s, sep); \
+ } \
+ } \
+ len += strlen(term); \
+ if (s) strcat(s, term); \
+ } \
+}
+
// ****************************************************************************
// Method: DBtoc_as_string
//
@@ -80,6 +106,9 @@ static void DBtoc_dealloc(PyObject *self)
// Programmer: Jeremy Meredith
// Creation: July 12, 2005
//
+// Modifications
+// Mark C. Miller, Tue Nov 13 14:36:36 PST 2012
+// Added all the members of the toc.
// ****************************************************************************
static int DBtoc_as_string(PyObject *self, char *s)
{
@@ -92,45 +121,28 @@ static int DBtoc_as_string(PyObject *self, char *s)
if (s) strcpy(s, "");
- sprintf(tmp, "nvar = %d\n", toc->nvar);
- len += strlen(tmp);
- if (s) strcat(s, tmp);
-
- sprintf(tmp, "var_names = (");
- len += strlen(tmp);
- if (s) strcat(s, tmp);
- for (int i=0; i<toc->nvar; i++)
- {
- len += strlen(toc->var_names[i]);
- if (s) strcat(s, toc->var_names[i]);
- if (i < toc->nvar-1)
- {
- len += strlen(sep);
- if (s) strcat(s, sep);
- }
- }
- len += strlen(term);
- if (s) strcat(s, term);
-
- sprintf(tmp, "ndir = %d\n", toc->ndir);
- len += strlen(tmp);
- if (s) strcat(s, tmp);
+ PRINT_OBJS(var);
+ PRINT_OBJS(dir);
+ PRINT_OBJS(curve);
+ PRINT_OBJS(multimesh);
+ PRINT_OBJS(multivar);
+ PRINT_OBJS(multimat);
+ PRINT_OBJS(multimatspecies);
+ PRINT_OBJS(csgmesh);
+ PRINT_OBJS(csgvar);
+ PRINT_OBJS(defvars);
+ PRINT_OBJS(qmesh);
+ PRINT_OBJS(qvar);
+ PRINT_OBJS(ucdmesh);
+ PRINT_OBJS(ptmesh);
+ PRINT_OBJS(ptvar);
+ PRINT_OBJS(mat);
+ PRINT_OBJS(matspecies);
+ PRINT_OBJS(array);
+ PRINT_OBJS(mrgtree);
+ PRINT_OBJS(mrgvar);
+ PRINT_OBJS(groupelmap);
- sprintf(tmp, "dir_names = (");
- len += strlen(tmp);
- if (s) strcat(s, tmp);
- for (int i=0; i<toc->ndir; i++)
- {
- len += strlen(toc->dir_names[i]);
- if (s) strcat(s, toc->dir_names[i]);
- if (i < toc->ndir-1)
- {
- len += strlen(sep);
- if (s) strcat(s, sep);
- }
- }
- len += strlen(term);
- if (s) strcat(s, term);
return len;
}
@@ -183,70 +195,48 @@ static int DBtoc_print(PyObject *self, FILE *fp, int flags)
return 0;
}
-
-// ****************************************************************************
-// Method: DBtoc_GetNVar
-//
-// Programmer: Jeremy Meredith
-// Creation: July 12, 2005
-//
-// ****************************************************************************
-static PyObject *DBtoc_GetNVar(PyObject *self, PyObject *args)
-{
- DBtoc *toc = ((DBtocObject*)self)->toc;
- PyObject *retval = PyInt_FromLong(toc->nvar);
- return retval;
+#define GET_FUNC_DEFS(nm) \
+static PyObject *DBtoc_GetN ## nm(PyObject *self, PyObject *args) \
+{ \
+ DBtoc *toc = ((DBtocObject*)self)->toc; \
+ PyObject *retval = PyInt_FromLong(toc->n ## nm); \
+ return retval; \
+} \
+static PyObject *DBtoc_Get ## nm ## names(PyObject *self, PyObject *args) \
+{ \
+ DBtoc *toc = ((DBtocObject*)self)->toc; \
+ PyObject *retval = PyTuple_New(toc->n ## nm); \
+ for (int i=0; i<toc->n ## nm; i++) \
+ { \
+ PyTuple_SET_ITEM(retval, i, PyString_FromString(toc->nm ## _names[i])); \
+ } \
+ return retval; \
}
-// ****************************************************************************
-// Method: DBtoc_GetVarNames
-//
-// Programmer: Jeremy Meredith
-// Creation: July 12, 2005
-//
-// ****************************************************************************
-static PyObject *DBtoc_GetVarNames(PyObject *self, PyObject *args)
-{
- DBtoc *toc = ((DBtocObject*)self)->toc;
- PyObject *retval = PyTuple_New(toc->nvar);
- for (int i=0; i<toc->nvar; i++)
- {
- PyTuple_SET_ITEM(retval, i, PyString_FromString(toc->var_names[i]));
- }
- return retval;
-}
+GET_FUNC_DEFS(var)
+GET_FUNC_DEFS(dir)
+GET_FUNC_DEFS(curve);
+GET_FUNC_DEFS(multimesh);
+GET_FUNC_DEFS(multivar);
+GET_FUNC_DEFS(multimat);
+GET_FUNC_DEFS(multimatspecies);
+GET_FUNC_DEFS(csgmesh);
+GET_FUNC_DEFS(csgvar);
+GET_FUNC_DEFS(defvars);
+GET_FUNC_DEFS(qmesh);
+GET_FUNC_DEFS(qvar);
+GET_FUNC_DEFS(ucdmesh);
+GET_FUNC_DEFS(ptmesh);
+GET_FUNC_DEFS(ptvar);
+GET_FUNC_DEFS(mat);
+GET_FUNC_DEFS(matspecies);
+GET_FUNC_DEFS(array);
+GET_FUNC_DEFS(mrgtree);
+GET_FUNC_DEFS(mrgvar);
+GET_FUNC_DEFS(groupelmap);
-// ****************************************************************************
-// Method: DBtoc_GetNDir
-//
-// Programmer: Jeremy Meredith
-// Creation: July 12, 2005
-//
-// ****************************************************************************
-static PyObject *DBtoc_GetNDir(PyObject *self, PyObject *args)
-{
- DBtoc *toc = ((DBtocObject*)self)->toc;
- PyObject *retval = PyInt_FromLong(toc->ndir);
- return retval;
-}
-
-// ****************************************************************************
-// Method: DBtoc_GetDirNames
-//
-// Programmer: Jeremy Meredith
-// Creation: July 12, 2005
-//
-// ****************************************************************************
-static PyObject *DBtoc_GetDirNames(PyObject *self, PyObject *args)
-{
- DBtoc *toc = ((DBtocObject*)self)->toc;
- PyObject *retval = PyTuple_New(toc->ndir);
- for (int i=0; i<toc->ndir; i++)
- {
- PyTuple_SET_ITEM(retval, i, PyString_FromString(toc->dir_names[i]));
- }
- return retval;
-}
+#define GET_FUNC_N(nm) if (!strcmp(name, "n" #nm)) return DBtoc_GetN ## nm(self, NULL);
+#define GET_FUNC_NAMES(nm) if (!strcmp(name, #nm "_names")) return DBtoc_Get ## nm ## names(self, NULL);
// ****************************************************************************
// Method: DBtoc_getattr
@@ -260,17 +250,56 @@ static PyObject *DBtoc_GetDirNames(PyObject *self, PyObject *args)
// Programmer: Jeremy Meredith
// Creation: July 12, 2005
//
+// Modifications
+// Mark C. Miller, Tue Nov 13 14:36:36 PST 2012
+// Added all the members of the toc.
// ****************************************************************************
static PyObject *DBtoc_getattr(PyObject *self, char *name)
{
- if (strcmp(name, "nvar") == 0)
- return DBtoc_GetNVar(self, NULL);
- if (strcmp(name, "var_names") == 0)
- return DBtoc_GetVarNames(self, NULL);
- if (strcmp(name, "ndir") == 0)
- return DBtoc_GetNDir(self, NULL);
- if (strcmp(name, "dir_names") == 0)
- return DBtoc_GetDirNames(self, NULL);
+ GET_FUNC_N(var);
+ GET_FUNC_N(dir);
+ GET_FUNC_N(curve);
+ GET_FUNC_N(multimesh);
+ GET_FUNC_N(multivar);
+ GET_FUNC_N(multimat);
+ GET_FUNC_N(multimatspecies);
+ GET_FUNC_N(csgmesh);
+ GET_FUNC_N(csgvar);
+ GET_FUNC_N(defvars);
+ GET_FUNC_N(qmesh);
+ GET_FUNC_N(qvar);
+ GET_FUNC_N(ucdmesh);
+ GET_FUNC_N(ptmesh);
+ GET_FUNC_N(ptvar);
+ GET_FUNC_N(mat);
+ GET_FUNC_N(matspecies);
+ GET_FUNC_N(array);
+ GET_FUNC_N(mrgtree);
+ GET_FUNC_N(mrgvar);
+ GET_FUNC_N(groupelmap);
+
+ GET_FUNC_NAMES(var);
+ GET_FUNC_NAMES(dir);
+ GET_FUNC_NAMES(curve);
+ GET_FUNC_NAMES(multimesh);
+ GET_FUNC_NAMES(multivar);
+ GET_FUNC_NAMES(multimat);
+ GET_FUNC_NAMES(multimatspecies);
+ GET_FUNC_NAMES(csgmesh);
+ GET_FUNC_NAMES(csgvar);
+ GET_FUNC_NAMES(defvars);
+ GET_FUNC_NAMES(qmesh);
+ GET_FUNC_NAMES(qvar);
+ GET_FUNC_NAMES(ucdmesh);
+ GET_FUNC_NAMES(ptmesh);
+ GET_FUNC_NAMES(ptvar);
+ GET_FUNC_NAMES(mat);
+ GET_FUNC_NAMES(matspecies);
+ GET_FUNC_NAMES(array);
+ GET_FUNC_NAMES(mrgtree);
+ GET_FUNC_NAMES(mrgvar);
+ GET_FUNC_NAMES(groupelmap);
+
return 0;
}
@@ -302,7 +331,6 @@ static int DBtoc_compare(PyObject *v, PyObject *w)
// Creation: July 12, 2005
//
// ****************************************************************************
-static char *DBtoc_Purpose = "This class wraps a Silo DBtoc object.";
PyTypeObject DBtocType =
{
//
@@ -338,7 +366,7 @@ PyTypeObject DBtocType =
0, // tp_setattro
0, // tp_as_buffer
Py_TPFLAGS_CHECKTYPES, // tp_flags
- DBtoc_Purpose, // tp_doc
+ "This class wraps a Silo DBtoc object.", // tp_doc
0, // tp_traverse
0, // tp_clear
0, // tp_richcompare
diff --git a/tools/python/pysilo.cpp b/tools/python/pysilo.cpp
index 7c2fcf7..3c9e5d3 100644
--- a/tools/python/pysilo.cpp
+++ b/tools/python/pysilo.cpp
@@ -204,13 +204,14 @@ PyObject *silo_Create(PyObject *self, PyObject *args)
"File creation failed");
return NULL;
}
+ DBSetAllowOverwrites(1);
return DBfile_NEW(db);
}
// ****************************************************************************
// Method: initSilo
//
-// Purpose:
+
// Called by python to initialize the Silo module.
//
// Arguments:
@@ -219,7 +220,13 @@ PyObject *silo_Create(PyObject *self, PyObject *args)
// Programmer: Jeremy Meredith
// Creation: July 12, 2005
//
+// Modifications:
+// Mark C. Miller, Tue Nov 13 10:56:57 PST 2012
+// Added a slew of constants so calllers can properly examine dict
+// contents returned by GetVarInfo method.
+//
// ****************************************************************************
+#define ADD_CONSTANT(C) PyDict_SetItemString(d, #C, PyInt_FromLong(C))
extern "C" void initSilo()
{
AddMethod("Open", silo_Open,
@@ -236,15 +243,83 @@ extern "C" void initSilo()
SiloError = PyErr_NewException("Silo.SiloException", NULL, NULL);
PyDict_SetItemString(d, "SiloException", SiloError);
- // Drivers
- PyDict_SetItemString(d, "DB_PDB", PyInt_FromLong(DB_PDB));
- PyDict_SetItemString(d, "DB_HDF5", PyInt_FromLong(DB_HDF5));
-
- // Clobber
- PyDict_SetItemString(d, "DB_CLOBBER", PyInt_FromLong(DB_CLOBBER));
- PyDict_SetItemString(d, "DB_NOCLOBBER", PyInt_FromLong(DB_NOCLOBBER));
-
- // Read/Append
- PyDict_SetItemString(d, "DB_READ", PyInt_FromLong(DB_READ));
- PyDict_SetItemString(d, "DB_APPEND", PyInt_FromLong(DB_APPEND));
+ // File Drivers
+ ADD_CONSTANT(DB_PDB);
+ ADD_CONSTANT(DB_HDF5);
+ ADD_CONSTANT(DB_HDF5_SEC2);
+ ADD_CONSTANT(DB_HDF5_STDIO);
+ ADD_CONSTANT(DB_HDF5_CORE);
+ ADD_CONSTANT(DB_HDF5_LOG);
+ ADD_CONSTANT(DB_HDF5_SPLIT);
+ ADD_CONSTANT(DB_HDF5_DIRECT);
+ ADD_CONSTANT(DB_HDF5_FAMILY);
+ ADD_CONSTANT(DB_HDF5_MPIO);
+ ADD_CONSTANT(DB_HDF5_MPIOP);
+ ADD_CONSTANT(DB_HDF5_MPIP);
+ ADD_CONSTANT(DB_HDF5_SILO);
+
+ // File flags
+ ADD_CONSTANT(DB_CLOBBER);
+ ADD_CONSTANT(DB_NOCLOBBER);
+ ADD_CONSTANT(DB_READ);
+ ADD_CONSTANT(DB_APPEND);
+
+ // Coordinate type flags
+ ADD_CONSTANT(DB_COLLINEAR);
+ ADD_CONSTANT(DB_NONCOLLINEAR);
+ ADD_CONSTANT(DB_QUAD_RECT);
+ ADD_CONSTANT(DB_QUAD_CURV);
+
+ // Centering
+ ADD_CONSTANT(DB_NOTCENT);
+ ADD_CONSTANT(DB_NODECENT);
+ ADD_CONSTANT(DB_ZONECENT);
+ ADD_CONSTANT(DB_FACECENT);
+ ADD_CONSTANT(DB_BNDCENT);
+ ADD_CONSTANT(DB_EDGECENT);
+ ADD_CONSTANT(DB_BLOCKCENT);
+
+ // Major order
+ ADD_CONSTANT(DB_ROWMAJOR);
+ ADD_CONSTANT(DB_COLMAJOR);
+
+ // Coordinate system
+ ADD_CONSTANT(DB_CARTESIAN);
+ ADD_CONSTANT(DB_CYLINDRICAL);
+ ADD_CONSTANT(DB_SPHERICAL);
+ ADD_CONSTANT(DB_NUMERICAL);
+ ADD_CONSTANT(DB_OTHER);
+
+ // Planar
+ ADD_CONSTANT(DB_AREA);
+ ADD_CONSTANT(DB_VOLUME);
+
+ // Facetype
+ ADD_CONSTANT(DB_RECTILINEAR);
+ ADD_CONSTANT(DB_CURVILINEAR);
+
+ // Datatype
+ ADD_CONSTANT(DB_INT);
+ ADD_CONSTANT(DB_SHORT);
+ ADD_CONSTANT(DB_LONG);
+ ADD_CONSTANT(DB_LONG_LONG);
+ ADD_CONSTANT(DB_FLOAT);
+ ADD_CONSTANT(DB_DOUBLE);
+ ADD_CONSTANT(DB_CHAR);
+ ADD_CONSTANT(DB_NOTYPE);
+
+ ADD_CONSTANT(DB_ON);
+ ADD_CONSTANT(DB_OFF);
+
+ ADD_CONSTANT(DB_ABUTTING);
+ ADD_CONSTANT(DB_FLOATING);
+
+ ADD_CONSTANT(DB_VARTYPE_SCALAR);
+ ADD_CONSTANT(DB_VARTYPE_VECTOR);
+ ADD_CONSTANT(DB_VARTYPE_TENSOR);
+ ADD_CONSTANT(DB_VARTYPE_SYMTENSOR);
+ ADD_CONSTANT(DB_VARTYPE_ARRAY);
+ ADD_CONSTANT(DB_VARTYPE_MATERIAL);
+ ADD_CONSTANT(DB_VARTYPE_SPECIES);
+ ADD_CONSTANT(DB_VARTYPE_LABEL);
}
diff --git a/tools/python/pysilo.h b/tools/python/pysilo.h
index 694e138..a5d774e 100644
--- a/tools/python/pysilo.h
+++ b/tools/python/pysilo.h
@@ -60,6 +60,10 @@
//
// ****************************************************************************
+#define PY_VERSION_GE(Maj,Min,Mic) \
+ (((PY_MAJOR_VERSION==Maj) && (PY_MINOR_VERSION==Min) && (PY_MICRO_VERSION>=Mic)) || \
+ ((PY_MAJOR_VERSION==Maj) && (PY_MINOR_VERSION>Min)) || \
+ (PY_MAJOR_VERSION>Maj))
void SiloErrorFunc(const char *errString);
diff --git a/tools/silex/Makefile.in b/tools/silex/Makefile.in
index 8c26ba0..a514b59 100644
--- a/tools/silex/Makefile.in
+++ b/tools/silex/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -70,8 +71,9 @@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -91,14 +93,22 @@ subdir = tools/silex
DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/config/ax_check_compiler_flags.m4 \
+ $(top_srcdir)/config/ax_have_qt.m4 \
+ $(top_srcdir)/config/libtool.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
+ $(top_srcdir)/config/vl_lib_readline.m4 \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
am__installdirs = "$(DESTDIR)$(bindir)"
-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
PROGRAMS = $(bin_PROGRAMS)
am__objects_1 = Explorer.$(OBJEXT) SiloView.$(OBJEXT) \
SiloDirView.$(OBJEXT) SiloDirTreeView.$(OBJEXT) \
@@ -113,14 +123,13 @@ nodist_silex_OBJECTS = $(am__objects_2)
silex_OBJECTS = $(am_silex_OBJECTS) $(nodist_silex_OBJECTS)
am__DEPENDENCIES_1 =
@HDF5_DRV_NEEDED_FALSE at silex_DEPENDENCIES = ../../src/libsilo.la \
- at HDF5_DRV_NEEDED_FALSE@ $(am__DEPENDENCIES_1) \
@HDF5_DRV_NEEDED_FALSE@ $(am__DEPENDENCIES_1)
@HDF5_DRV_NEEDED_TRUE at silex_DEPENDENCIES = ../../src/libsiloh5.la \
- at HDF5_DRV_NEEDED_TRUE@ $(am__DEPENDENCIES_1) \
@HDF5_DRV_NEEDED_TRUE@ $(am__DEPENDENCIES_1)
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/config/depcomp
am__depfiles_maybe = depfiles
+am__mv = mv -f
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -162,7 +171,8 @@ CXX_FULLPATH = @CXX_FULLPATH@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -174,6 +184,7 @@ FCFLAGS = @FCFLAGS@
FCLIBS = @FCLIBS@
FC_FULLPATH = @FC_FULLPATH@
FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FORTRAN = @FORTRAN@
FPZIP = @FPZIP@
GREP = @GREP@
@@ -184,17 +195,25 @@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
LDFLAGS = @LDFLAGS@
+LIBM = @LIBM@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
NETCDF = @NETCDF@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -204,7 +223,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PDBP_DRV = @PDBP_DRV@
PDB_DRV = @PDB_DRV@
-PRTDIAG = @PRTDIAG@
PYTHON = @PYTHON@
PYTHONMODULE = @PYTHONMODULE@
PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@
@@ -212,17 +230,13 @@ PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
PYTHON_PLATFORM = @PYTHON_PLATFORM@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
-QT_BIN = @QT_BIN@
-QT_CORE = @QT_CORE@
-QT_CORE_LIB = @QT_CORE_LIB@
QT_CXXFLAGS = @QT_CXXFLAGS@
-QT_GUI = @QT_GUI@
-QT_GUI_LIB = @QT_GUI_LIB@
-QT_INCLUDE = @QT_INCLUDE@
-QT_LDFLAGS = @QT_LDFLAGS@
-QT_LIB = @QT_LIB@
+QT_DIR = @QT_DIR@
QT_LIBS = @QT_LIBS@
+QT_LRELEASE = @QT_LRELEASE@
+QT_LUPDATE = @QT_LUPDATE@
QT_MOC = @QT_MOC@
+QT_UIC = @QT_UIC@
RANLIB = @RANLIB@
READLINE_LIBS = @READLINE_LIBS@
SED = @SED@
@@ -240,6 +254,11 @@ SILO_VERS_TAG = @SILO_VERS_TAG@
STRIP = @STRIP@
TAURUS = @TAURUS@
VERSION = @VERSION@
+XMKMF = @XMKMF@
+X_CFLAGS = @X_CFLAGS@
+X_EXTRA_LIBS = @X_EXTRA_LIBS@
+X_LIBS = @X_LIBS@
+X_PRE_LIBS = @X_PRE_LIBS@
ZLIB = @ZLIB@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
@@ -247,6 +266,7 @@ abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_F77 = @ac_ct_F77@
ac_ct_FC = @ac_ct_FC@
am__include = @am__include@
@@ -279,6 +299,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -295,6 +316,7 @@ sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
silex_SOURCES = $(FILES)
@@ -358,14 +380,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
- && exit 0; \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tools/silex/Makefile'; \
- cd $(top_srcdir) && \
- $(AUTOMAKE) --foreign tools/silex/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tools/silex/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --foreign tools/silex/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -383,34 +405,50 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
- @list='$(bin_PROGRAMS)'; for p in $$list; do \
- p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
- if test -f $$p \
- || test -f $$p1 \
- ; then \
- f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
- else :; fi; \
- done
+ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed 's/$(EXEEXT)$$//' | \
+ while read p p1; do if test -f $$p || test -f $$p1; \
+ then echo "$$p"; echo "$$p"; else :; fi; \
+ done | \
+ sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+ sed 'N;N;N;s,\n, ,g' | \
+ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+ { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+ if ($$2 == $$4) files[d] = files[d] " " $$1; \
+ else { print "f", $$3 "/" $$4, $$1; } } \
+ END { for (d in files) print "f", d, files[d] }' | \
+ while read type dir files; do \
+ if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+ test -z "$$files" || { \
+ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
+ } \
+ ; done
uninstall-binPROGRAMS:
@$(NORMAL_UNINSTALL)
- @list='$(bin_PROGRAMS)'; for p in $$list; do \
- f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
- echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
- rm -f "$(DESTDIR)$(bindir)/$$f"; \
- done
+ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+ files=`for p in $$list; do echo "$$p"; done | \
+ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+ -e 's/$$/$(EXEEXT)/' `; \
+ test -n "$$list" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(bindir)" && rm -f $$files
clean-binPROGRAMS:
- @list='$(bin_PROGRAMS)'; for p in $$list; do \
- f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
- echo " rm -f $$p $$f"; \
- rm -f $$p $$f ; \
- done
+ @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
+ echo " rm -f" $$list; \
+ rm -f $$list || exit $$?; \
+ test -n "$(EXEEXT)" || exit 0; \
+ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+ echo " rm -f" $$list; \
+ rm -f $$list
silex$(EXEEXT): $(silex_OBJECTS) $(silex_DEPENDENCIES)
@rm -f silex$(EXEEXT)
$(CXXLINK) $(silex_OBJECTS) $(silex_LDADD) $(LIBS)
@@ -440,21 +478,21 @@ distclean-compile:
.cpp.o:
@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
.cpp.obj:
@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
.cpp.lo:
@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
@@ -470,45 +508,49 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
+ set x; \
here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
fi
ctags: CTAGS
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
+ $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && cd $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) $$here
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -529,13 +571,17 @@ distdir: $(DISTFILES)
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
if test -d $$d/$$file; then \
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
@@ -569,6 +615,7 @@ clean-generic:
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -590,6 +637,8 @@ dvi-am:
html: html-am
+html-am:
+
info: info-am
info-am:
@@ -598,20 +647,29 @@ install-data-am:
install-dvi: install-dvi-am
+install-dvi-am:
+
install-exec-am: install-binPROGRAMS
@$(NORMAL_INSTALL)
$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
-
install-html: install-html-am
+install-html-am:
+
install-info: install-info-am
+install-info-am:
+
install-man:
install-pdf: install-pdf-am
+install-pdf-am:
+
install-ps: install-ps-am
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-am
@@ -634,7 +692,7 @@ ps-am:
uninstall-am: uninstall-binPROGRAMS
-.MAKE: install-am install-exec-am install-strip
+.MAKE: all check install install-am install-exec-am install-strip
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
clean-generic clean-libtool ctags distclean distclean-compile \
@@ -684,6 +742,7 @@ silex.app:
echo 'APPLSILX' > $@/Contents/PkgInfo
.PHONY: silex.app
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/tools/silex/SiloArrayView.cpp b/tools/silex/SiloArrayView.cpp
index bce7426..fd186e1 100644
--- a/tools/silex/SiloArrayView.cpp
+++ b/tools/silex/SiloArrayView.cpp
@@ -93,6 +93,9 @@ using std::cerr;
//
// Mark C. Miller, Mon Jan 11 16:02:16 PST 2010
// Made long long support UNconditionally compiled.
+//
+// Mark C. Miller, Wed Sep 12 15:34:28 PDT 2012
+// Added logic to NOT cut DB_CHAR arrays shorter than 400 chars.
// ****************************************************************************
SiloArrayViewWindow::SiloArrayViewWindow(SiloFile *s, const QString &n,
QWidget *p)
@@ -170,8 +173,11 @@ SiloArrayViewWindow::SiloArrayViewWindow(SiloFile *s, const QString &n,
if (((char*)var)[j] == ';')
numSemi++;
}
-
- if (numSpace < numMax && numSemi < numMax)
+ if (len < 400)
+ {
+ lb->addItem((char*)var);
+ }
+ else if (numSpace < numMax && numSemi < numMax)
{
// Copy the character array into a temporary buffer,
// splitting by length
diff --git a/tools/silex/SiloFile.cpp b/tools/silex/SiloFile.cpp
index 5d9206e..3ab563c 100644
--- a/tools/silex/SiloFile.cpp
+++ b/tools/silex/SiloFile.cpp
@@ -145,10 +145,16 @@ SiloDir::SiloDir(DBfile *db, const QString &name_, const QString &path_)
var.push_back(toc->var_names[i]);
for (i=0; i<toc->nobj; i++)
obj.push_back(toc->obj_names[i]);
- for (i=0; i<toc->narrays; i++)
+ for (i=0; i<toc->narray; i++)
array.push_back(toc->array_names[i]);
for (i=0; i<toc->ndir; i++)
dir.push_back(toc->dir_names[i]);
+ for (i=0; i<toc->nmrgtree; i++)
+ dir.push_back(toc->mrgtree_names[i]);
+ for (i=0; i<toc->nmrgvar; i++)
+ dir.push_back(toc->mrgvar_names[i]);
+ for (i=0; i<toc->ngroupelmap; i++)
+ dir.push_back(toc->groupelmap_names[i]);
for (unsigned int i=0; i<dir.size(); i++)
{
diff --git a/tools/silock/Makefile.in b/tools/silock/Makefile.in
index 9bf5d88..a28f4f8 100644
--- a/tools/silock/Makefile.in
+++ b/tools/silock/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -69,8 +70,9 @@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -89,22 +91,31 @@ bin_PROGRAMS = silock$(EXEEXT)
subdir = tools/silock
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/config/ax_check_compiler_flags.m4 \
+ $(top_srcdir)/config/ax_have_qt.m4 \
+ $(top_srcdir)/config/libtool.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
+ $(top_srcdir)/config/vl_lib_readline.m4 \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
am__installdirs = "$(DESTDIR)$(bindir)"
-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
PROGRAMS = $(bin_PROGRAMS)
am_silock_OBJECTS = silock.$(OBJEXT)
silock_OBJECTS = $(am_silock_OBJECTS)
@HDF5_DRV_NEEDED_FALSE at silock_DEPENDENCIES = ../../src/libsilo.la
@HDF5_DRV_NEEDED_TRUE at silock_DEPENDENCIES = ../../src/libsiloh5.la
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/config/depcomp
am__depfiles_maybe = depfiles
+am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -154,7 +165,8 @@ CXX_FULLPATH = @CXX_FULLPATH@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -166,6 +178,7 @@ FCFLAGS = @FCFLAGS@
FCLIBS = @FCLIBS@
FC_FULLPATH = @FC_FULLPATH@
FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FORTRAN = @FORTRAN@
FPZIP = @FPZIP@
GREP = @GREP@
@@ -176,17 +189,25 @@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
LDFLAGS = @LDFLAGS@
+LIBM = @LIBM@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
NETCDF = @NETCDF@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -196,7 +217,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PDBP_DRV = @PDBP_DRV@
PDB_DRV = @PDB_DRV@
-PRTDIAG = @PRTDIAG@
PYTHON = @PYTHON@
PYTHONMODULE = @PYTHONMODULE@
PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@
@@ -204,17 +224,13 @@ PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
PYTHON_PLATFORM = @PYTHON_PLATFORM@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
-QT_BIN = @QT_BIN@
-QT_CORE = @QT_CORE@
-QT_CORE_LIB = @QT_CORE_LIB@
QT_CXXFLAGS = @QT_CXXFLAGS@
-QT_GUI = @QT_GUI@
-QT_GUI_LIB = @QT_GUI_LIB@
-QT_INCLUDE = @QT_INCLUDE@
-QT_LDFLAGS = @QT_LDFLAGS@
-QT_LIB = @QT_LIB@
+QT_DIR = @QT_DIR@
QT_LIBS = @QT_LIBS@
+QT_LRELEASE = @QT_LRELEASE@
+QT_LUPDATE = @QT_LUPDATE@
QT_MOC = @QT_MOC@
+QT_UIC = @QT_UIC@
RANLIB = @RANLIB@
READLINE_LIBS = @READLINE_LIBS@
SED = @SED@
@@ -232,6 +248,11 @@ SILO_VERS_TAG = @SILO_VERS_TAG@
STRIP = @STRIP@
TAURUS = @TAURUS@
VERSION = @VERSION@
+XMKMF = @XMKMF@
+X_CFLAGS = @X_CFLAGS@
+X_EXTRA_LIBS = @X_EXTRA_LIBS@
+X_LIBS = @X_LIBS@
+X_PRE_LIBS = @X_PRE_LIBS@
ZLIB = @ZLIB@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
@@ -239,6 +260,7 @@ abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_F77 = @ac_ct_F77@
ac_ct_FC = @ac_ct_FC@
am__include = @am__include@
@@ -271,6 +293,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -287,6 +310,7 @@ sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
silock_SOURCES = silock.c
@@ -303,14 +327,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
- && exit 0; \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tools/silock/Makefile'; \
- cd $(top_srcdir) && \
- $(AUTOMAKE) --foreign tools/silock/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tools/silock/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --foreign tools/silock/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -328,34 +352,50 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
- @list='$(bin_PROGRAMS)'; for p in $$list; do \
- p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
- if test -f $$p \
- || test -f $$p1 \
- ; then \
- f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
- else :; fi; \
- done
+ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed 's/$(EXEEXT)$$//' | \
+ while read p p1; do if test -f $$p || test -f $$p1; \
+ then echo "$$p"; echo "$$p"; else :; fi; \
+ done | \
+ sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+ sed 'N;N;N;s,\n, ,g' | \
+ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+ { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+ if ($$2 == $$4) files[d] = files[d] " " $$1; \
+ else { print "f", $$3 "/" $$4, $$1; } } \
+ END { for (d in files) print "f", d, files[d] }' | \
+ while read type dir files; do \
+ if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+ test -z "$$files" || { \
+ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
+ } \
+ ; done
uninstall-binPROGRAMS:
@$(NORMAL_UNINSTALL)
- @list='$(bin_PROGRAMS)'; for p in $$list; do \
- f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
- echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
- rm -f "$(DESTDIR)$(bindir)/$$f"; \
- done
+ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+ files=`for p in $$list; do echo "$$p"; done | \
+ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+ -e 's/$$/$(EXEEXT)/' `; \
+ test -n "$$list" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(bindir)" && rm -f $$files
clean-binPROGRAMS:
- @list='$(bin_PROGRAMS)'; for p in $$list; do \
- f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
- echo " rm -f $$p $$f"; \
- rm -f $$p $$f ; \
- done
+ @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
+ echo " rm -f" $$list; \
+ rm -f $$list || exit $$?; \
+ test -n "$(EXEEXT)" || exit 0; \
+ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+ echo " rm -f" $$list; \
+ rm -f $$list
silock$(EXEEXT): $(silock_OBJECTS) $(silock_DEPENDENCIES)
@rm -f silock$(EXEEXT)
$(CXXLINK) $(silock_OBJECTS) $(silock_LDADD) $(LIBS)
@@ -371,42 +411,42 @@ distclean-compile:
.c.o:
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c $<
.c.obj:
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
.c.lo:
@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
.cxx.o:
@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
.cxx.obj:
@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
.cxx.lo:
@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
@@ -422,45 +462,49 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
+ set x; \
here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
fi
ctags: CTAGS
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
+ $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && cd $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) $$here
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -481,13 +525,17 @@ distdir: $(DISTFILES)
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
if test -d $$d/$$file; then \
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
@@ -518,6 +566,7 @@ clean-generic:
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -538,6 +587,8 @@ dvi-am:
html: html-am
+html-am:
+
info: info-am
info-am:
@@ -546,18 +597,28 @@ install-data-am:
install-dvi: install-dvi-am
+install-dvi-am:
+
install-exec-am: install-binPROGRAMS
install-html: install-html-am
+install-html-am:
+
install-info: install-info-am
+install-info-am:
+
install-man:
install-pdf: install-pdf-am
+install-pdf-am:
+
install-ps: install-ps-am
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-am
@@ -598,6 +659,7 @@ uninstall-am: uninstall-binPROGRAMS
@HDF5_DRV_NEEDED_TRUE@@HZIP_NEEDED_TRUE@ # Dummy C++ source to cause C++ linking.
@FPZIP_NEEDED_TRUE@@HDF5_DRV_NEEDED_TRUE@ # Dummy C++ source to cause C++ linking.
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/silo-llnl.git
More information about the debian-science-commits
mailing list