[libgetdata] 01/06: upstream 0.9.1 releaee
Alastair McKinstry
mckinstry at moszumanska.debian.org
Wed May 3 10:35:09 UTC 2017
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to tag debian/0.9.1-2
in repository libgetdata.
commit 82895d216f5d99c7549241d20840d0f2eb284a67
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Sat Feb 20 16:09:36 2016 +0000
upstream 0.9.1 releaee
---
ChangeLog | 221 +-
Makefile.in | 60 +-
NEWS | 160 +-
aclocal.m4 | 9191 +-------------------------
bindings/Makefile.in | 33 +-
bindings/cxx/Makefile.in | 34 +-
bindings/cxx/dirfile.cpp | 1 -
bindings/cxx/internal.h | 12 +-
bindings/cxx/test/Makefile.in | 33 +-
bindings/cxx/windowentry.cpp | 11 +-
bindings/f77/Makefile.in | 33 +-
bindings/f77/fgetdata.c | 6 +-
bindings/f77/test/Makefile.in | 33 +-
bindings/idl/Makefile.in | 34 +-
bindings/idl/getdata.c | 108 +-
bindings/idl/test/Makefile.in | 32 +-
bindings/idl/test/big_test.pro | 21 +
bindings/matlab/Makefile.in | 36 +-
bindings/matlab/gd_alter_frameoffset.c | 6 +-
bindings/matlab/gd_bof.c | 6 +-
bindings/matlab/gd_eof.c | 6 +-
bindings/matlab/gd_framenum.c | 8 +-
bindings/matlab/gd_frameoffset.c | 6 +-
bindings/matlab/gd_get_carray.c | 28 +-
bindings/matlab/gd_get_carray_slice.c | 22 +-
bindings/matlab/gd_getdata.c | 35 +-
bindings/matlab/gd_matlab.h | 32 +-
bindings/matlab/gd_nframes.c | 6 +-
bindings/matlab/gd_putdata.c | 8 +-
bindings/matlab/gd_seek.c | 12 +-
bindings/matlab/gd_tell.c | 6 +-
bindings/matlab/getdata_constants.m | 2 +-
bindings/matlab/matlab.c | 45 +-
bindings/matlab/test/Makefile.in | 32 +-
bindings/matlab/test/big_test.m | 25 +
bindings/perl/Build.PL.in | 57 -
bindings/perl/GetData.pm.in | 32 +-
bindings/perl/MANIFEST.in | 2 -
bindings/perl/Makefile.am | 97 +-
bindings/perl/Makefile.in | 128 +-
bindings/perl/simple_funcs.pl | 24 +-
bindings/perl/simple_funcs.xsin | 6 +-
bindings/perl/{ => src}/GetData.xs | 155 +-
bindings/perl/src/Makefile.PL.in | 34 +
bindings/perl/{ => src}/typemap | 22 +
bindings/perl/t/big_test.t | 32 +-
bindings/php/Makefile.in | 33 +-
bindings/php/getdata.c | 89 +-
bindings/php/test/Makefile.in | 32 +-
bindings/php/test/big_test.php | 21 +
bindings/python/Makefile.am | 10 +-
bindings/python/Makefile.in | 44 +-
bindings/python/pydirfile.c | 136 +-
bindings/python/pyentry.c | 27 +-
bindings/python/pyfragment.c | 8 +-
bindings/python/pygetdata.c | 22 +-
bindings/python/test/Makefile.in | 32 +-
bindings/python/test/big_test.py | 160 +-
compile | 2 +-
config.guess | 173 +-
config.sub | 36 +-
configure | 443 +-
configure.ac | 53 +-
depcomp | 2 +-
doc/Makefile.in | 34 +-
install-sh | 366 +-
aclocal.m4 => m4/libtool.m4 | 2118 +-----
m4/ltoptions.m4 | 437 ++
m4/ltsugar.m4 | 124 +
m4/ltversion.m4 | 23 +
m4/lt~obsolete.m4 | 99 +
m4/perl.m4 | 9 +-
m4/version.m4 | 6 +-
man/Makefile.am | 7 +-
man/Makefile.in | 45 +-
man/dirfile-encoding.5 | 2 +-
man/gd_constants.3 | 112 +-
man/gd_fragment_affixes.3 | 14 +-
man/gd_getdata.3 | 25 +-
man/gd_hidden.3 | 6 +-
man/gd_mconstants.3 | 107 -
man/gd_putdata.3 | 23 +-
man/gd_tell.3 | 6 +-
missing | 2 +-
src/Makefile.am | 6 +-
src/Makefile.in | 61 +-
src/add.c | 166 +-
src/ascii.c | 217 +-
src/bzip.c | 31 +-
src/close.c | 13 +-
src/common.c | 40 +-
src/compat.c | 6 +-
src/constant.c | 8 +-
src/del.c | 11 +-
src/encoding.c | 44 +-
src/endian.c | 4 +-
src/entry.c | 46 +-
src/errors.c | 9 +-
src/field_list.c | 540 +-
src/flac.c | 31 +-
src/flimits.c | 19 +-
src/flush.c | 43 +-
src/gd_config.h.in | 13 +
src/getdata.c | 163 +-
src/gzip.c | 32 +-
src/include.c | 10 +-
src/index.c | 17 +-
src/internal.h | 167 +-
src/{fpos.c => iopos.c} | 88 +-
src/legacy.c | 6 +-
src/lzma.c | 25 +-
src/mod.c | 143 +-
src/move.c | 6 +-
src/name.c | 12 +-
src/nframes.c | 4 +-
src/open.c | 1 +
src/parse.c | 58 +-
src/putdata.c | 91 +-
src/raw.c | 18 +-
src/sie.c | 52 +-
src/slim.c | 14 +-
src/spf.c | 5 +-
src/string.c | 12 +-
src/types.c | 28 +-
src/zzip.c | 41 +-
test/Makefile.am | 32 +-
test/Makefile.in | 385 +-
test/cvlist_array.c | 22 +-
test/cvlist_array_meta.c | 22 +-
test/{cvlist_array.c => cvlist_array_null.c} | 33 +-
test/cvlist_hidden.c | 27 +-
test/{cvlist_hidden.c => cvlist_null.c} | 14 +-
test/{cvlist_hidden.c => del_bad_code.c} | 30 +-
test/{cvlist_hidden.c => get_range.c} | 33 +-
test/gzip_put_off.c | 2 +-
test/gzip_seek_put.c | 2 +-
test/{cvlist_hidden.c => hide_bad.c} | 30 +-
test/{cvlist_hidden.c => hide_hidden_bad.c} | 30 +-
test/{cvlist_hidden.c => hide_unhide_bad.c} | 30 +-
test/{cvlist_hidden.c => put_range.c} | 34 +-
test/{cvlist_hidden.c => seek_range.c} | 37 +-
test/{cvlist_hidden.c => seek_range2.c} | 37 +-
test/svlist_hidden.c | 37 +-
test/test.h | 24 +-
test/trunc.c | 5 +-
test/trunc_dir.c | 5 +-
test/trunc_truncsub.c | 5 +-
test/vlist.c | 14 +-
test/vlist_meta.c | 21 +-
util/Makefile.in | 33 +-
util/checkdirfile.c | 5 +-
util/dirfile2ascii.c | 11 +-
152 files changed, 4882 insertions(+), 14200 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index a5077f3..ccd0eea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,221 @@
+2016-02-17 D. V. Wiebe <getdata at ketiltrout.net> svn:1037
+ * src/gzip.c (_GD_GzipWrite): A return value of zero from gzwrite indicates
+ error.
+
+ * configure.ac: Added --disable-large-tests. Define NO_LARGE_TESTS if
+ given.
+ * test/gzip_put_off.c test/gzip_seek_put.c: Skip if NO_LARGE_TESTS defined.
+
+ * configure.ac: Call both AC_TYPE_UNSIGNED_LONG_LONG_INT and
+ AC_TYPE_LONG_LONG_INT.
+
+ * bindings/perl/simple_funcs.pl (printfmt): Fix format codes for gd_shift_t,
+ gdp_shift_t, gd_off64_t, size_t.
+
+2016-02-17 D. V. Wiebe <getdata at ketiltrout.net> svn:1036
+ * bindings/idl/package/configure.ac bindings/matlab/package/configure.ac:
+ Update to match changes in ./configure.ac. Remove cruft.
+
+2016-01-17 D. V. Wiebe <getdata at ketiltrout.net> svn:1035
+ * bindings/perl/Makefile.am: Remove gnuism.
+
+ * bindings/php/getdata.c (gd_getdata): Don't call gdphp_from_data with
+ GD_NULL.
+
+ * bindings/python/pydirfile.c (gdpy_dirfile_getcarray gdpy_dirfile_getdata
+ gdpy_dirfile_putcarray) bindings/python/pyentry.c (gdpy_set_entry_from_tuple
+ gdpy_entry_getdatatype gdpy_entry_getwindop) bindings/python/pyfragment.c
+ (gdpy_fragment_setprotection) bindings/python/pygetdata.c
+ (gdpy_convert_from_pylist): Fix data types and conversions.
+
+2015-12-19 D. V. Wiebe <getdata at ketiltrout.net> svn:1033,1034
+ * src/ascii.c (_GD_ScanFormat): Don't strcpy, just return the string.
+ * src/ascii.c (_GD_AsciiWrite): Merge duplicate code into WRITE_ASCII and
+ WRITE_CASCII macros.
+
+ * src/getdata.c (_GD_DoField gd_getdata64) src/putdata.c (_GD_DoFieldOut
+ gd_putdata64): Truncate requests to avoid overflow of ssize_t.
+ * src/getdata.c (_GD_DoField gd_getdata64 _GD_DoSeek gd_seek64
+ _GD_DoFieldOut gd_putdata64): Return GD_E_RANGE if we would overflow the
+ I/O position.
+ * test/get_range.c test/put_range.c test/seek_range.c test/seek_range2.c:
+ Added.
+
+ * src/internal.h: Define PRIuSIZE and PRIdSIZE if necessary.
+ * src/flush.c (_GD_FlushFragment): Use inttype printf macros to write
+ frameoffset, &c.
+
+ * configure.ac: Call AC_TYPE_LONG_LONG_INT
+ * bindings/idl/getdata.c (gdidl_get_frameoffset): Use IDL_LONG64 for long
+ long.
+ * bindings/python/pydirfile.c (gdpy_dirfile_seek gdpy_dirfile_tell)
+ bindings/python/pyentry.c (gdpy_entry_getparms gdpy_entry_getthreshold)
+ bindings/python/pyfragment.c (gdpy_fragment_getoffset
+ gdpy_fragment_setoffset) bindings/python/pygetdata.c (gdpy_convert_to_pylist
+ gdpy_convert_to_pyobj): Use PY_LONG_LONG for long long.
+ * bindings/perl/simple_funcs.pl: Use inttypes printf macros and avoid long
+ long.
+
+ * bindings/matlab/gd_matlab.h: Define int64_t and uint64_t.
+ * bindings/matlab/matlab.c (gdmx_to_int64_): Renamed from gdmx_to_llong_.
+ * bindings/matlab/matlab.c (gdmx_to_int64): Renamed from gdmx_to_llong.
+ * bindings/matlab/matlab.c (gdmx_to_uint64_): Renamed from gdmx_to_ullong_.
+ * bindings/matlab/matlab.c (gdmx_to_uint64): Renamed from gdmx_to_ullong.
+ * bindings/matlab/matlab.c (gdmx_from_int64): Renamed from gdmx_from_llong.
+ * bindings/matlab/matlab.c (gdmx_from_uint64): Renamed from gdmx_from_ullong.
+
+ * src/internal.h: Properly distinguish between _MSC_VER (compiler stuff) and
+ __MSCVRT__ (library stuff).
+
+ * bindings/idl/getdata.c (gdidl_getdata gdidl_get_constant
+ gdidl_get_carray) bindings/matlab/gd_get_carray.c
+ bindings/matlab/gd_get_carray_slice.c bindings/matlab/gd_getdata.c
+ bindings/perl/src/GetData.xs (get_carray get_carray_slice get_constant
+ getdata) bindings/php/getdata.c (gd_get_carray gd_get_constant gd_getdata)
+ bindings/python/pydirfile.c (gdpy_dirfile_getcarray gdpy_dirfile_getconstant
+ gdpy_dirfile_getdata): Handle GD_NULL.
+ * bindings/test/matlab/big_test.m: Add tests 11, 273, 274.
+ * bindings/test/idl/big_test.pro bindings/perl/t/big_test.t
+ bindings/php/test/big_test.php: Add tests 11, 20, 273, 274.
+ * bindings/python/test/big_test.py: Add tests 11, 16, 20, 274.
+
+ * bindings/python/pydirfile.c (gdpy_dirfile_getcarray
+ gdpy_dirfile_getconstant): Make return_type optional.
+
+ * bindings/python/test/big_test.py: Delete all the __numpy_supported__
+ conditionals.
+
+ * bindings/perl/Makefile.am: Fix verbose tests and test dependency tracking.
+
+2015-12-10 D. V. Wiebe <getdata at ketiltrout.net> svn:1032
+ * src/field_list.c (_GD_EntryList): Fix _GD_ListEntry call.
+ * test/vlist.c test/vlist_meta.c: Updated.
+
+2015-12-10 D. V. Wiebe <getdata at ketiltrout.net> svn:1031
+ * man/gd_mconstants.3: Merged into gd_constants.3 and deleted.
+ * man/gd_constants.3: Merge in gd_mconstants.3.
+
+ * src/bzip.c (_GD_Bzip2Sync) src/flac.c (_GD_FlacSync) src/gzip.c
+ (_GD_GzipSync): Deleted. (Replaced by _GD_NopSync.)
+ * src/encoding.c (_GD_NopSync): Added.
+ * src/encoding.c: Deal with _GD_NopSync in the gd_ef_ initialisation.
+ _GD_NopSync added to Slim functions.
+
+ * src/internal.h: Merge the entry_list stuff found in both gd_private_entry_
+ and gd_dirfile_ into a common struct gd_flist_ used by both.
+ * src/entry.c (_GD_FreeFL): Added.
+ * src/close.c (_GD_FreeD) src/entry.c (_GD_FreeE): Call _GD_FreeFL().
+
+ * src/errors.c src/internal.h: Distinguish GD_E_BAD_TYPE errors where
+ the caller has invalidly passed GD_NULL.
+ * src/field_list.c (_GD_Constants): Set GD_E_BAD_TYPE if passed GD_NULL.
+ * test/cvlist_array_null.c test/cvlist_null.c: Added.
+
+ * src/internal.h: Only export _GD_StrError when using modules.
+ * src/compat.c (_GD_StrError): Renamed from gd_strerror.
+
+ * src/field_list.c (_GD_EntryList _GD_Constants _GD_Carrays _GD_Strings):
+ Remove the _GD_NEntries call to avoid running throught the field list twice.
+ Instead, dynamically resize the output buffer.
+
+2015-11-25 D. V. Wiebe <getdata at ketiltrout.net> svn:1030
+ * bindings/idl/getdata.c (gdidl_alter_lincom gdidl_alter_polynom): Set
+ comp_scal = 0 by default.
+
+ * bindings/matlab/matlab.c (gdmx_free_entry): Fix GD_LINTERP_ENTRY case.
+
+ * bindings/perl/src/GetData.xs bindings/perl/simple_funcs.pl: Handle
+ gdp_complex_undef.
+ * bindings/perl/src/typemap: rename T_COMPLEXIN to T_COMPLEX_UNDEF and add
+ new T_COMPLEXIN which doesn't allow NULL.
+
+ * bindings/perl/src/GetData.xs (gdp_fetch_scalars): Don't dereference a NULL
+ scalar_ind.
+
+ * bindings/php/getdata.c (gdphp_convert_data): Properly handle GD_NULL.
+
+ * bindings/python/pydirfile.c (gdpy_dirfile_getstring): Free data on error.
+
+ * bindings/python/pyentry.c (gdpy_entry_init): Fix field_type check.
+
+ * doc/cov_mod.c: Added mexErrMsgIdAndTxt.
+
+ * src/bzip.c (_GD_Bzip2DoOpen) src/lzma.c (_GD_LzmaSeek): Record error before
+ free.
+
+ * src/sie.c (_GD_SampIndSize): Handle overflow.
+
+ * src/flush.c (_GD_StringEscapeise): Check fputc return value.
+
+ * src/flush.c (_GD_FlushFragment): Don't try another fclose after fclose
+ fails.
+
+ * src/lzma.c (_GD_LzmaDoOpen): close stream on error.
+
+ * src/zzip.c (_GD_ZzipName): Immediately return if file->name is defined.
+
+2015-11-05 D. V. Wiebe <getdata at ketiltrout.net> svn:1028
+ * src/field_list.c (_GD_ListEntry): Force meta_ok and hidden_ok on after
+ dereferencing an alias.
+ * src/field_list.c (_GD_Constants _GD_Carrays _GD_Strings): Handle aliases.
+ * test/cvlist_array.c test/cvlist_array_meta.c test/cvlist_hidden.c
+ test/svlist_hidden.c: Update test.
+
+ * src/open.c (_GD_Open): Zero the unused nsl in fragment[0].
+
+ * src/iopos.c: Renamed from src/fpos.c.
+ * src/iopos.c (_GD_GetIOPos): Renamed from _GD_GetFilePos.
+
+ * src/del.c (gd_delete) src/entry.c (gd_hide gd_hidden gd_unhide): Properly
+ check for failure of _GD_FindField.
+ * test/del_bad_code.c test/hide_bad.c test/hide_hidden_bad.c
+ test/hide_unhide_bad.c: Added.
+
+ * src/entry.c (gd_entry): Don't doubly set GD_E_BAD_CODE.
+
+ * src/common.c (_GD_FindEntry): Removed parameters index, set, err: anyone
+ who calls this function wants it to succeed or return error.
+
+ * src/move.c (_GD_Move): Statickify.
+
+ * src/fpos.c (_GD_GetFilePos gd_seek64 gd_tell64): Return -1 on error.
+
+2015-11-05 D. V. Wiebe <getdata at ketiltrout.net> svn:1024
+ * src/add.c (gd_add_spec gd_madd_spec _GD_AddSpec): Merge gd_add_spec and
+ gd_madd_spec into _GD_AddSpec and make the public functions boilerpates for
+ the new common code.
+ * src/field_list.c (gd_carrays gd_mcarrays _GD_Carrays): Similarly, gd_carrays
+ and gd_mcarrays into _GD_Carrays.
+ * src/field_list.c (gd_constants gd_mconstants _GD_Constants): gd_constants
+ and gd_mconstants into _GD_Constants.
+ * src/field_list.c (gd_strings gd_mstrings _GD_Strings): gd_strings and
+ gd_mstrings into _GD_Strings.
+ * src/mod.c (gd_alter_spec gd_malter_spec _GD_AlterSpec): gd_alter_spec and
+ gd_malter_spec into _GD_AlterSpec.
+
+ * src/parse.c (_GD_RawType): Reduce the number of string compares.
+
+2015-10-16 D. V. Wiebe <getdata at ketiltrout.net> svn:1022
+ * bindings/perl/Makefile: Use ExtUtils::MakeMaker instead of Module::Build.
+ Because EU::MM creates a Makefile, run everything in a "build" subdir created
+ and populated at build-time.
+ * bindings/perl/Build.PL.in bindings/perl/MANIFEST.in: Deleted.
+ * bindings/perl/src: Added.
+ * bindings/perl/src/GetData.xs bindings/perl/src/typemap: Moved from ..
+ * bindings/perl/src/Makefile.PL.in: Added.
+ * m4/perl.m4: Look for and use ExtUtils::MakeMaker instead of Module::Build.
+
+ * bindings/python/Makefile.am: Fix race condition in "make -j distclean"
+
+2015-10-16 D. V. Wiebe <getdata at ketiltrout.net> svn:1021
+ * src/legacy.c: Correct GD_ERROR_CODES.
+
+ * bindings/python/pygetdata.c bindings/matlab/matlab.c: Deprecate
+ GD_E_BAD_REPR.
+
+2015-10-16 D. V. Wiebe <getdata at ketiltrout.net> svn:1011
+ GetData-0.9.0 released.
+
2015-10-05 D. V. Wiebe <getdata at ketiltrout.net> svn:1009
GetData-0.9.0rc3:
@@ -163,7 +381,8 @@
* src/del.c (_GD_Delete) src/encoding.c (_GD_FiniRawIO _GD_InitRawIO)
src/flimits.c (_GD_GetEOF) src/fpos.c (_GD_DoSeek gd_tell) src/getdata.c
(_GD_DoRaw) src/mod.c (_GD_Change) src/move.c (_GD_MogrifyFile) src/name.c
- (_GD_Rename) src/nframes.c (gd_nframes64) src/putdata.c (_GD_DoRawOut): Set error via _GD_SetEncIOError.
+ (_GD_Rename) src/nframes.c (gd_nframes64) src/putdata.c (_GD_DoRawOut): Set
+ error via _GD_SetEncIOError.
* src/encoding.c (_GD_MissingFramework): Deal with GD_EF_STRERR
* src/fpos.c (_GD_Seek): _GD_DoSeek has already set the error.
* src/errors.c: Added GD_E_IO_ENC_*.
diff --git a/Makefile.in b/Makefile.in
index ae57dd8..da3cc37 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -15,7 +15,17 @@
@SET_MAKE@
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -79,27 +89,26 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
subdir = .
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(top_srcdir)/configure $(am__configure_deps) $(dist_doc_DATA) \
- AUTHORS COPYING COPYING.DOC ChangeLog INSTALL NEWS README TODO \
- compile config.guess config.sub depcomp install-sh missing \
- ltmain.sh
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compare_version.m4 \
$(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/encoding.m4 \
$(top_srcdir)/m4/floatordering.m4 $(top_srcdir)/m4/idl.m4 \
- $(top_srcdir)/m4/matlab.m4 $(top_srcdir)/m4/perl.m4 \
- $(top_srcdir)/m4/php.m4 $(top_srcdir)/m4/python.m4 \
- $(top_srcdir)/m4/win32.m4 $(top_srcdir)/m4/version.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/matlab.m4 \
+ $(top_srcdir)/m4/perl.m4 $(top_srcdir)/m4/php.m4 \
+ $(top_srcdir)/m4/python.m4 $(top_srcdir)/m4/win32.m4 \
+ $(top_srcdir)/m4/version.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
+ $(am__configure_deps) $(dist_doc_DATA) $(am__DIST_COMMON)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno config.status.lineno
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/src/gd_config.h \
$(top_builddir)/src/getdata.h
-CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_FILES = bindings/perl/src/Makefile.PL
CONFIG_CLEAN_VPATH_FILES =
AM_V_P = $(am__v_P_ at AM_V@)
am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
@@ -186,6 +195,10 @@ ETAGS = etags
CTAGS = ctags
CSCOPE = cscope
DIST_SUBDIRS = $(SUBDIRS)
+am__DIST_COMMON = $(srcdir)/Makefile.in \
+ $(top_srcdir)/bindings/perl/src/Makefile.PL.in AUTHORS COPYING \
+ COPYING.DOC ChangeLog INSTALL NEWS README TODO compile \
+ config.guess config.sub depcomp install-sh ltmain.sh missing
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
@@ -509,7 +522,6 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
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 \
*config.status*) \
@@ -528,6 +540,8 @@ $(top_srcdir)/configure: $(am__configure_deps)
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
$(am__aclocal_m4_deps):
+bindings/perl/src/Makefile.PL: $(top_builddir)/config.status $(top_srcdir)/bindings/perl/src/Makefile.PL.in
+ cd $(top_builddir) && $(SHELL) ./config.status $@
mostlyclean-libtool:
-rm -f *.lo
@@ -751,15 +765,15 @@ dist-xz: distdir
$(am__post_remove_distdir)
dist-tarZ: distdir
- @echo WARNING: "Support for shar distribution archives is" \
- "deprecated." >&2
+ @echo WARNING: "Support for distribution archives compressed with" \
+ "legacy program 'compress' is deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__post_remove_distdir)
dist-shar: distdir
- @echo WARNING: "Support for distribution archives compressed with" \
- "legacy program 'compress' is deprecated." >&2
+ @echo WARNING: "Support for shar distribution archives is" \
+ "deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
$(am__post_remove_distdir)
@@ -795,17 +809,17 @@ distcheck: dist
esac
chmod -R a-w $(distdir)
chmod u+w $(distdir)
- mkdir $(distdir)/_build $(distdir)/_inst
+ mkdir $(distdir)/_build $(distdir)/_build/sub $(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-$$$$/" \
&& am__cwd=`pwd` \
- && $(am__cd) $(distdir)/_build \
- && ../configure \
+ && $(am__cd) $(distdir)/_build/sub \
+ && ../../configure \
$(AM_DISTCHECK_CONFIGURE_FLAGS) \
$(DISTCHECK_CONFIGURE_FLAGS) \
- --srcdir=.. --prefix="$$dc_install_base" \
+ --srcdir=../.. --prefix="$$dc_install_base" \
&& $(MAKE) $(AM_MAKEFLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) dvi \
&& $(MAKE) $(AM_MAKEFLAGS) check \
@@ -986,6 +1000,8 @@ uninstall-am: uninstall-dist_docDATA
ps ps-am tags tags-am uninstall uninstall-am \
uninstall-dist_docDATA
+.PRECIOUS: Makefile
+
clean-local:
if [ -e $(distdir) ]; then chmod -R u+w $(distdir); fi
diff --git a/NEWS b/NEWS
index 561e936..08f68b8 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,120 @@
+New in version 0.9.1:
+
+ Library Changes:
+
+ * Functions returning entry lists (gd_entry_list(), &c.) or bulk scalar
+ field data (gd_constants(), gd_carrays(), &c.) no longer run through
+ the entry list twice, resulting in noticable speed improvements when
+ operating on large dirfiles.
+
+ * BUG FIX: Top-level aliases pointing to metafields, and non-hidden
+ aliases pointing to hidden entries are now included in the data
+ returned by gd_nentries() and gd_entry_list() when they should be.
+
+ * BUG FIX: Surprising combinations of hidden fields, meta fields, and
+ aliases no long confuse the functions which return bulk scalar data
+ (gd_constants, gd_strings, gd_carrays, &c.). Previously, given the
+ right metadata, these functions would segfault, return incorrect
+ data, or raise GD_E_INTERNAL_ERROR.
+
+ * BUG FIX: The functions gd_delete(), gd_hide(), gd_hidden(), and
+ gd_unhide() no longer segfault when asked to operate on a field that
+ doesn't exist; instead, they properly report error (GD_E_BAD_CODE).
+
+ * BUG FIX: gd_seek() and gd_tell() now always return -1 on error.
+ Previously, they would return zero for some errors; they always
+ still correctly set the dirfile error.
+
+ * BUG FIX: Several memory or other resource leaks triggered by error
+ returns have been fixed.
+
+ * BUG FIX: GetData no longer ignores errors reported by zlib when
+ writing to gzipped data files. In the past, this could, in some
+ cases, cause GetData to wegde.
+
+ API Changes:
+
+ * BUG FIX: gd_constants() and gd_mconstants() now return NULL and set the
+ dirfile error to GD_E_BAD_TYPE if passed GD_NULL as the return_type.
+ Previously these functions would return NULL without setting an error
+ when passed GD_NULL.
+
+ * BUG FIX: gd_getdata() and gd_putdata() now truncate their operation to
+ avoid overflow. If size_t is N-bytes wide, and GetData is operating on
+ an M-byte wide data type, then truncation occurs at 2**(8N-M)-1
+ samples. Note, however, that truncation can also be triggered by
+ intermediate data products, which may have wider data types (larger M)
+ than the type specified by the caller. If truncation occurs, a short
+ read/write will occur, without raising an error. Truncation occurs
+ even when the data type is GD_NULL (i.e. when these functions have
+ nothing to do). For GD_NULL, M is taken to be 1. Callers should
+ check the return value of these functions, and make another call to
+ handle the truncation, if necessary.
+
+ * BUG FIX: Instead of seeking to a random place, gd_seek() now returns
+ GD_E_RANGE when the specified offset, or the resultant position would
+ overflow a 64-bit signed integer. Note, however, that, in most cases,
+ the file size limit imposed by your filesystem or OS will be
+ encountered first (in which case GD_E_IO will be returned). For
+ comparison, the Windows NTFS driver limits files to 2**44 bytes,
+ as does the ext4 filesystem.
+
+ * BUG FIX: Similarly, gd_getdata() and gd_putdata() return GD_E_RANGE if
+ asked to operate on data outside the addressable range (more than 2**63
+ samples past the start of the dirfile).
+
+ Bindings Changes:
+
+ * PYTHON: The return_type parameter to dirfile.get_constant() and
+ dirfile.get_carray() is now optional, and will default to the native
+ type of the data returned, as happens with dirfile.getdata().
+
+ * IDL BUG FIX: Using !GD.NULL with GD_GETDATA(), GD_GET_CONSTANT() and
+ GD_GET_CARRAY() now works. In this case GD_GETDATA() returns the
+ number of samples read (as in the C API), and the other functions
+ return zero on success.
+
+ * MATLAB BUG FIX: Using GD.NULL with gd_getdata(), gd_get_constant(),
+ gd_get_carray(), and gd_get_carray_slice(), now works. In this case,
+ gd_getdata() returns the number of samples read (as in the C API), and
+ the other functions return zero on success.
+
+ * PERL BUG FIX: Using $GetData::NULL with getdata(), get_constant(),
+ get_carray(), and get_carray_slice() now works. In scalar context,
+ getdata() returns the number of samples read, while the others return
+ undef. In list context, they all return an empty array in this case.
+
+ * PHP BUG FIX: Passing data with a GD_NULL data type now behaves as
+ expected (i.e. the passed data is ignored).
+
+ * PHP BUG FIX: Using GD_NULL with gd_getdata(), gd_get_constant(),
+ gd_get_carray() now works. In this case, gd_getdata() returns the
+ number of samples read (as in the C API), and the other functions
+ return TRUE on success.
+
+ * PYTHON BUG FIX: Using return_type=pygetdata.NULL with
+ dirfile.getdata(), dirfile.get_constant() or dirfile.get_carray() now
+ works. dirfile.getdata() will return the number of samples read (as in
+ the C API), ignoring as_list. The other functions return None on
+ success.
+
+ * PYTHON BUG FIX: Reflecting the merge of GD_E_BAD_REPR into
+ GD_E_BAD_CODE in the C API in 0.9.0, the BadRepr exception is now an
+ alias of BadCode.
+
+ Miscellaneous:
+
+ * The build system now uses ExtUtils::MakeMaker instead of Module::Build
+ to build the perl bindings. Module::Build was removed from the Perl 5
+ core in Perl 5.22. ExtUtils::MakeMaker is still a core module. The
+ bindings are unchanged; the change in build prerequisites is the only
+ difference users should notice due to this switch.
+
+ * A new configure option, --disable-large-tests, will cause the test
+ suite to skip running tests that write large amounts (>~10MB) of data.
+
+|=========================================================================|
+
New in verison 0.9.0:
Library Changes:
@@ -49,6 +166,10 @@ New in verison 0.9.0:
gd_putdata, gd_raw_close, gd_raw_filename, gd_seek, gd_spf, gd_sync,
gd_tell.
+ * The error code GD_E_BAD_REPR has been merged into GD_E_BAD_CODE. The
+ symbol GD_E_BAD_REPR remains as an alias for GD_E_BAD_CODE, but is
+ deprecated.
+
* Attempts to seek past the end-of-field with gd_seek() now always
succeed, although the resultant position is encoding specific.
Previously, attempting to seek past the end-of-field on some encodings
@@ -83,7 +204,7 @@ New in verison 0.9.0:
is now interpreted as a simple field code (which may be rejected later
due to the presence of the invalid '<' character).
- * BUG FIX: The parser no-longer interprets various numbers as field codes
+ * BUG FIX: The parser no longer interprets various numbers as field codes
when it shouldn't (e.g. when specifying a PHASE shift as "1." instead
of "1").
@@ -124,18 +245,8 @@ New in verison 0.9.0:
these obsolete, cached LUTs would sometimes linger, causing incorrect
LINTERP computation.
- * BUG FIX: The library now properly recovers from an I/O error while
- trying to open an unencoded datafile. Previously, such an error would
- poison the library's bookkeeping data, preventing all subsequent
- attempts to open that file unless the Dirfile was re-opened. Reported
- by Alexandra Rahlin.
-
- * BUG FIX: Calling gd_putdata() to write gzip data with a non-zero
- starting offset equal to the field's current I/O position, no longer
- result in the call hanging.
-
- * BUG FIX: The I/O position reported by gd_tell and gd_seek for slim, zzip,
- and zzslim encoded data is now correct.
+ * BUG FIX: The I/O position reported by gd_tell and gd_seek for slim,
+ zzip, and zzslim encoded data is now correct.
API Changes:
@@ -197,8 +308,7 @@ New in verison 0.9.0:
* BUG FIX: If the dirfile path provided cannot be resolved (due to, for
instance, a symbolic link pointing to a non-existent path), gd_open()
- and friends now return GD_E_OPEN, as documented, instead of
- GD_E_RAW_IO.
+ and friends now return the correct error code (GD_E_IO).
* BUG FIX: gd_naliases() now returns an unsigned int, and zero on error,
as documented.
@@ -213,12 +323,12 @@ New in verison 0.9.0:
* C++: There is no longer a default value for the "index" argument for
Entry methods (including subclasses) which accept it (viz. Input,
Scalar, ScalarIndex, Scale, CScale, Offset COffset, Coefficient,
- CCoefficient). The exception to this is with Entry subclasses for which
- zero is the only allowed value for the parameter.
+ CCoefficient). The exception to this is with Entry subclasses for
+ which zero is the only allowed value for the parameter.
* F77 and F95: The bindings no longer raise SIGABRT when the dirfile
- space is exhausted. Instead they simply return a invalid dirfile unit
- number.
+ space is exhausted. Instead they simply return a dirfile unit number
+ referenceing a static, invalid dirfile.
* F77: Functions to add fields with named scalar parameters have been
added (GDASBT GDASCL GDASCP GDASCR GDASLC GDASMX GDASPH GDASPN GDASRC
@@ -258,13 +368,13 @@ New in verison 0.9.0:
simply aliases for the current ones and are never returned by the
bindings.
- * C++ BUG FIX: The Entry methods Input, Scalar, and ScalarIndex (including
- subclasses) now return zero or NULL when passed an out-of-range index value.
- Previously they would return, variously, zero, NULL, another value for some
- other, valid index value, or segfault.
+ * C++ BUG FIX: The Entry methods Input, Scalar, and ScalarIndex
+ (including subclasses) now return zero or NULL when passed an out-of-
+ range index value. Previously they would return, variously, zero,
+ NULL, another value for some other, valid index value, or segfault.
- * C++ BUG FIX: The flags parameter to Dirfile::Delete() is now unsigned, as it
- is in the C API.
+ * C++ BUG FIX: The flags parameter to Dirfile::Delete() is now unsigned,
+ as it is in the C API.
* F95 BUG FIX: fgd_add and fgd_alter_entry no longer ignore named scalar
parameters provided in supplied entry structures.
diff --git a/aclocal.m4 b/aclocal.m4
index cf88453..c507f20 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.14.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.15 -*- Autoconf -*-
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -20,9036 +20,121 @@ 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'.])])
-# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-#
-# Copyright (C) 1996-2001, 2003-2015 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) 2014 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 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 this program. If not, see <http://www.gnu.org/licenses/>.
-])
-
-# serial 58 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.62])dnl We use AC_PATH_PROGS_FEATURE_CHECK
-AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
-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
-
-_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}])
-
-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_PREPARE_CC_BASENAME
-# -----------------------
-m4_defun([_LT_PREPARE_CC_BASENAME], [
-# Calculate cc_basename. Skip known compiler wrappers and cross-prefix.
-func_cc_basename ()
-{
- for cc_temp in @S|@*""; do
- case $cc_temp in
- compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
- distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
- \-*) ;;
- *) break;;
- esac
- done
- func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
-}
-])# _LT_PREPARE_CC_BASENAME
-
-
-# _LT_CC_BASENAME(CC)
-# -------------------
-# It would be clearer to call AC_REQUIREs from _LT_PREPARE_CC_BASENAME,
-# but that macro is also expanded into generated libtool script, which
-# arranges for $SED and $ECHO to be set by different means.
-m4_defun([_LT_CC_BASENAME],
-[m4_require([_LT_PREPARE_CC_BASENAME])dnl
-AC_REQUIRE([_LT_DECL_SED])dnl
-AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
-func_cc_basename $1
-cc_basename=$func_cc_basename_result
-])
-
-
-# _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
-AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl
-AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
-
-_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl
-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_PATH_CONVERSION_FUNCTIONS])dnl
-m4_require([_LT_CMD_RELOAD])dnl
-m4_require([_LT_CHECK_MAGIC_METHOD])dnl
-m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl
-m4_require([_LT_CMD_OLD_ARCHIVE])dnl
-m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
-m4_require([_LT_WITH_SYSROOT])dnl
-m4_require([_LT_CMD_TRUNCATE])dnl
-
-_LT_CONFIG_LIBTOOL_INIT([
-# See if we are running on zsh, and set the options that 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
-
-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 set != "${COLLECT_NAMES+set}"; then
- COLLECT_NAMES=
- export COLLECT_NAMES
- fi
- ;;
-esac
-
-# 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_PREPARE_SED_QUOTE_VARS
-# --------------------------
-# Define a few sed substitution that help us do robust quoting.
-m4_defun([_LT_PREPARE_SED_QUOTE_VARS],
-[# Backslashify 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'
-])
-
-# _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
-
-
-
-# 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], [[!?.]$], [], [.])
-)])
-
-
-
-
-
-# _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 "$][$1" | $SED "$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 "$<var>" | $SED "$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'
-
-# A function that is used when there is no print builtin or printf.
-func_fallback_echo ()
-{
- eval 'cat <<_LTECHO_EOF
-\$[]1
-_LTECHO_EOF'
-}
-
-# Quote evaled strings.
-for var in lt_decl_all_varnames([[ \
-]], lt_decl_quote_varnames); do
- case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
- *[[\\\\\\\`\\"\\\$]]*)
- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
- ;;
- *)
- 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 \\\\""\\\\\$\$var"\\\\"\` in
- *[[\\\\\\\`\\"\\\$]]*)
- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
- ;;
- *)
- eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
- ;;
- esac
-done
-
-_LT_OUTPUT_LIBTOOL_INIT
-])
-
-# _LT_GENERATED_FILE_INIT(FILE, [COMMENT])
-# ------------------------------------
-# Generate a child script FILE with all initialization necessary to
-# reuse the environment learned by the parent script, and make the
-# file executable. If COMMENT is supplied, it is inserted after the
-# '#!' sequence but before initialization text begins. After this
-# macro, additional text can be appended to FILE to form the body of
-# the child script. The macro ends with non-zero status if the
-# file could not be fully written (such as if the disk is full).
-m4_ifdef([AS_INIT_GENERATED],
-[m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])],
-[m4_defun([_LT_GENERATED_FILE_INIT],
-[m4_require([AS_PREPARE])]dnl
-[m4_pushdef([AS_MESSAGE_LOG_FD])]dnl
-[lt_write_fail=0
-cat >$1 <<_ASEOF || lt_write_fail=1
-#! $SHELL
-# Generated by $as_me.
-$2
-SHELL=\${CONFIG_SHELL-$SHELL}
-export SHELL
-_ASEOF
-cat >>$1 <<\_ASEOF || lt_write_fail=1
-AS_SHELL_SANITIZE
-_AS_PREPARE
-exec AS_MESSAGE_FD>&1
-_ASEOF
-test 0 = "$lt_write_fail" && chmod +x $1[]dnl
-m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_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])
-_LT_GENERATED_FILE_INIT(["$CONFIG_LT"],
-[# Run this file to recreate a libtool stub with the current configuration.])
-
-cat >>"$CONFIG_LT" <<\_LTEOF
-lt_cl_silent=false
-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) 2011 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.
-lt_cl_success=:
-test yes = "$silent" &&
- 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)
-])# 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 that 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
-# Generated automatically by $as_me ($PACKAGE) $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.
-
-# Provide generalized library-building support services.
-# Written by Gordon Matzigkeit, 1996
-
-_LT_COPYING
-_LT_LIBTOOL_TAGS
-
-# Configured defaults for sys_lib_dlsearch_path munging.
-: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"}
-
-# ### BEGIN LIBTOOL CONFIG
-_LT_LIBTOOL_CONFIG_VARS
-_LT_LIBTOOL_TAG_VARS
-# ### END LIBTOOL CONFIG
-
-_LT_EOF
-
- cat <<'_LT_EOF' >> "$cfgfile"
-
-# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE
-
-_LT_PREPARE_MUNGE_PATH_LIST
-_LT_PREPARE_CC_BASENAME
-
-# ### END FUNCTIONS SHARED WITH CONFIGURE
-
-_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 set != "${COLLECT_NAMES+set}"; 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 '$q' "$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'
- 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)],
- [Go], [_LT_LANG(GO)],
- [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
-
-
-m4_ifndef([AC_PROG_GO], [
-# NOTE: This macro has been submitted for inclusion into #
-# GNU Autoconf as AC_PROG_GO. When it is available in #
-# a released version of Autoconf we should remove this #
-# macro and use it instead. #
-m4_defun([AC_PROG_GO],
-[AC_LANG_PUSH(Go)dnl
-AC_ARG_VAR([GOC], [Go compiler command])dnl
-AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl
-_AC_ARG_VAR_LDFLAGS()dnl
-AC_CHECK_TOOL(GOC, gccgo)
-if test -z "$GOC"; then
- if test -n "$ac_tool_prefix"; then
- AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo])
- fi
-fi
-if test -z "$GOC"; then
- AC_CHECK_PROG(GOC, gccgo, gccgo, false)
-fi
-])#m4_defun
-])#m4_ifndef
-
-
-# _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([AC_PROG_GO],
- [LT_LANG(GO)],
- [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])])
-
-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)])
-AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)])
-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], [])
-dnl AC_DEFUN([AC_LIBTOOL_RC], [])
-
-
-# _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 there is a non-empty error log, and "single_module"
- # appears in it, assume the flag caused a linker warning
- if test -s conftest.err && $GREP single_module conftest.err; then
- cat conftest.err >&AS_MESSAGE_LOG_FD
- # Otherwise, if the output was created with a 0 exit code from
- # the compiler, it worked.
- elif test -f libconftest.dylib && test 0 = "$_lt_result"; 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
- ])
-
- AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],
- [lt_cv_ld_force_load=no
- cat > conftest.c << _LT_EOF
-int forced_loaded() { return 2;}
-_LT_EOF
- echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD
- $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
- echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
- $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
- echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
- $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
- cat > conftest.c << _LT_EOF
-int main() { return 0;}
-_LT_EOF
- echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD
- $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
- _lt_result=$?
- if test -s conftest.err && $GREP force_load conftest.err; then
- cat conftest.err >&AS_MESSAGE_LOG_FD
- elif test -f conftest && test 0 = "$_lt_result" && $GREP forced_load conftest >/dev/null 2>&1; then
- lt_cv_ld_force_load=yes
- else
- cat conftest.err >&AS_MESSAGE_LOG_FD
- fi
- rm -f conftest.err libconftest.a conftest conftest.c
- rm -rf conftest.dSYM
- ])
- 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 yes = "$lt_cv_apple_cc_single_mod"; then
- _lt_dar_single_mod='$single_module'
- fi
- if test yes = "$lt_cv_ld_exported_symbols_list"; 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" && test no = "$lt_cv_ld_force_load"; then
- _lt_dsymutil='~$DSYMUTIL $lib || :'
- else
- _lt_dsymutil=
- fi
- ;;
- esac
-])
-
-
-# _LT_DARWIN_LINKER_FEATURES([TAG])
-# ---------------------------------
-# 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
- if test yes = "$lt_cv_ld_force_load"; then
- _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
- m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes],
- [FC], [_LT_TAGVAR(compiler_needs_object, $1)=yes])
- else
- _LT_TAGVAR(whole_archive_flag_spec, $1)=''
- fi
- _LT_TAGVAR(link_all_deplibs, $1)=yes
- _LT_TAGVAR(allow_undefined_flag, $1)=$_lt_dar_allow_undefined
- case $cc_basename in
- ifort*|nagfor*) _lt_dar_can_shared=yes ;;
- *) _lt_dar_can_shared=$GCC ;;
- esac
- if test yes = "$_lt_dar_can_shared"; then
- output_verbose_link_cmd=func_echo_all
- _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 yes != "$lt_cv_apple_cc_single_mod"; 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([TAGNAME])
-# ----------------------------------
-# 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.
-# Store the results from the different compilers for each TAGNAME.
-# Allow to override them for all tags through lt_cv_aix_libpath.
-m4_defun([_LT_SYS_MODULE_PATH_AIX],
-[m4_require([_LT_DECL_SED])dnl
-if test set = "${lt_cv_aix_libpath+set}"; then
- aix_libpath=$lt_cv_aix_libpath
-else
- AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])],
- [AC_LINK_IFELSE([AC_LANG_PROGRAM],[
- lt_aix_libpath_sed='[
- /Import File Strings/,/^$/ {
- /^0/ {
- s/^0 *\([^ ]*\) *$/\1/
- p
- }
- }]'
- _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`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 "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
- _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- fi],[])
- if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
- _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=/usr/lib:/lib
- fi
- ])
- aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])
-fi
-])# _LT_SYS_MODULE_PATH_AIX
-
-
-# _LT_SHELL_INIT(ARG)
-# -------------------
-m4_define([_LT_SHELL_INIT],
-[m4_divert_text([M4SH-INIT], [$1
-])])# _LT_SHELL_INIT
-
-
-
-# _LT_PROG_ECHO_BACKSLASH
-# -----------------------
-# Find how we can fake an echo command that does not interpret backslash.
-# In particular, with Autoconf 2.60 or later we add some code to the start
-# of the generated configure script that will find a shell with a builtin
-# printf (that we can use as an echo command).
-m4_defun([_LT_PROG_ECHO_BACKSLASH],
-[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
-ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
-
-AC_MSG_CHECKING([how to print strings])
-# Test print first, because it will be a builtin if present.
-if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
- test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
- ECHO='print -r --'
-elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
- ECHO='printf %s\n'
-else
- # Use this function as a fallback that always works.
- func_fallback_echo ()
- {
- eval 'cat <<_LTECHO_EOF
-$[]1
-_LTECHO_EOF'
- }
- ECHO='func_fallback_echo'
-fi
-
-# func_echo_all arg...
-# Invoke $ECHO with all args, space-separated.
-func_echo_all ()
-{
- $ECHO "$*"
-}
-
-case $ECHO in
- printf*) AC_MSG_RESULT([printf]) ;;
- print*) AC_MSG_RESULT([print -r]) ;;
- *) AC_MSG_RESULT([cat]) ;;
-esac
-
-m4_ifdef([_AS_DETECT_SUGGESTED],
-[_AS_DETECT_SUGGESTED([
- test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || (
- ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
- ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
- ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
- PATH=/empty FPATH=/empty; export PATH FPATH
- test "X`printf %s $ECHO`" = "X$ECHO" \
- || test "X`print -r -- $ECHO`" = "X$ECHO" )])])
-
-_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts])
-_LT_DECL([], [ECHO], [1], [An echo program that protects backslashes])
-])# _LT_PROG_ECHO_BACKSLASH
-
-
-# _LT_WITH_SYSROOT
-# ----------------
-AC_DEFUN([_LT_WITH_SYSROOT],
-[AC_MSG_CHECKING([for sysroot])
-AC_ARG_WITH([sysroot],
-[AS_HELP_STRING([--with-sysroot@<:@=DIR@:>@],
- [Search for dependent libraries within DIR (or the compiler's sysroot
- if not specified).])],
-[], [with_sysroot=no])
-
-dnl lt_sysroot will always be passed unquoted. We quote it here
-dnl in case the user passed a directory name.
-lt_sysroot=
-case $with_sysroot in #(
- yes)
- if test yes = "$GCC"; then
- lt_sysroot=`$CC --print-sysroot 2>/dev/null`
- fi
- ;; #(
- /*)
- lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
- ;; #(
- no|'')
- ;; #(
- *)
- AC_MSG_RESULT([$with_sysroot])
- AC_MSG_ERROR([The sysroot must be an absolute path.])
- ;;
-esac
-
- AC_MSG_RESULT([${lt_sysroot:-no}])
-_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl
-[dependent libraries, and where our libraries should be installed.])])
-
-# _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 no = "$enable_libtool_lock" || 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 what ABI is being produced by ac_compile, and set mode
- # options accordingly.
- 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 what ABI is being produced by ac_compile, and set linker
- # options accordingly.
- echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext
- if AC_TRY_EVAL(ac_compile); then
- if test yes = "$lt_cv_prog_gnu_ld"; 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*
- ;;
-
-mips64*-*linux*)
- # Find out what ABI is being produced by ac_compile, and set linker
- # options accordingly.
- echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext
- if AC_TRY_EVAL(ac_compile); then
- emul=elf
- case `/usr/bin/file conftest.$ac_objext` in
- *32-bit*)
- emul="${emul}32"
- ;;
- *64-bit*)
- emul="${emul}64"
- ;;
- esac
- case `/usr/bin/file conftest.$ac_objext` in
- *MSB*)
- emul="${emul}btsmip"
- ;;
- *LSB*)
- emul="${emul}ltsmip"
- ;;
- esac
- case `/usr/bin/file conftest.$ac_objext` in
- *N32*)
- emul="${emul}n32"
- ;;
- esac
- LD="${LD-ld} -m $emul"
- fi
- rm -rf conftest*
- ;;
-
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
-s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
- # Find out what ABI is being produced by ac_compile, and set linker
- # options accordingly. Note that the listed cases only cover the
- # situations where additional linker options are needed (such as when
- # doing 32-bit compilation for a host where ld defaults to 64-bit, or
- # vice versa); the common cases where no linker options are needed do
- # not appear in the list.
- 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*)
- case `/usr/bin/file conftest.o` in
- *x86-64*)
- LD="${LD-ld} -m elf32_x86_64"
- ;;
- *)
- LD="${LD-ld} -m elf_i386"
- ;;
- esac
- ;;
- powerpc64le-*linux*)
- LD="${LD-ld} -m elf32lppclinux"
- ;;
- 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"
- ;;
- powerpcle-*linux*)
- LD="${LD-ld} -m elf64lppc"
- ;;
- 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 yes != "$lt_cv_cc_needs_belf"; then
- # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
- CFLAGS=$SAVE_CFLAGS
- fi
- ;;
-*-*solaris*)
- # Find out what ABI is being produced by ac_compile, and set linker
- # options accordingly.
- 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*)
- case $host in
- i?86-*-solaris*|x86_64-*-solaris*)
- LD="${LD-ld} -m elf_x86_64"
- ;;
- sparc*-*-solaris*)
- LD="${LD-ld} -m elf64_sparc"
- ;;
- esac
- # GNU ld 2.21 introduced _sol2 emulations. Use them if available.
- if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
- LD=${LD-ld}_sol2
- fi
- ;;
- *)
- 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_PROG_AR
-# -----------
-m4_defun([_LT_PROG_AR],
-[AC_CHECK_TOOLS(AR, [ar], false)
-: ${AR=ar}
-: ${AR_FLAGS=cru}
-_LT_DECL([], [AR], [1], [The archiver])
-_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive])
-
-AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file],
- [lt_cv_ar_at_file=no
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM],
- [echo conftest.$ac_objext > conftest.lst
- lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD'
- AC_TRY_EVAL([lt_ar_try])
- if test 0 -eq "$ac_status"; then
- # Ensure the archiver fails upon bogus file names.
- rm -f conftest.$ac_objext libconftest.a
- AC_TRY_EVAL([lt_ar_try])
- if test 0 -ne "$ac_status"; then
- lt_cv_ar_at_file=@
- fi
- fi
- rm -f conftest.* libconftest.a
- ])
- ])
-
-if test no = "$lt_cv_ar_at_file"; then
- archiver_list_spec=
-else
- archiver_list_spec=$lt_cv_ar_at_file
-fi
-_LT_DECL([], [archiver_list_spec], [1],
- [How to feed a file listing to the archiver])
-])# _LT_PROG_AR
-
-
-# _LT_CMD_OLD_ARCHIVE
-# -------------------
-m4_defun([_LT_CMD_OLD_ARCHIVE],
-[_LT_PROG_AR
-
-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
- bitrig* | openbsd*)
- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
- ;;
- *)
- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
- ;;
- esac
- old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
-fi
-
-case $host_os in
- darwin*)
- lock_old_archive_extraction=yes ;;
- *)
- lock_old_archive_extraction=no ;;
-esac
-_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_DECL([], [lock_old_archive_extraction], [0],
- [Whether to use a lock for old archive extraction])
-])# _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" ## exclude from sc_useless_quotes_in_assignment
- # 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:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&AS_MESSAGE_LOG_FD
- echo "$as_me:$LINENO: \$? = $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 "$_lt_compiler_boilerplate" | $SED '/^$/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 yes = "[$]$2"; 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 "$_lt_linker_boilerplate" | $SED '/^$/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 yes = "[$]$2"; 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;
- ;;
-
- mint*)
- # On MiNT this can take a long time and run out of memory.
- 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;
- ;;
-
- bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*)
- # 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
- ;;
-
- os2*)
- # The test takes a long time on OS/2.
- lt_cv_sys_max_cmd_len=8192
- ;;
-
- 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" && \
- test undefined != "$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`env echo "$teststring$teststring" 2>/dev/null` \
- = "X$teststring$teststring"; } >/dev/null 2>&1 &&
- test 17 != "$i" # 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 yes = "$cross_compiling"; 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 $LINENO "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
-
-/* When -fvisibility=hidden is used, assume the code has been annotated
- correspondingly for the symbols needed. */
-#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
-int fnord () __attribute__((visibility("default")));
-#endif
-
-int fnord () { return 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;
- else puts (dlerror ());
- }
- /* 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 yes != "$enable_dlopen"; 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
- ])
- ;;
-
- tpf*)
- # Don't try to run any link tests for TPF. We know it's impossible
- # because TPF is a cross-compiler, and we know how we open DSOs.
- lt_cv_dlopen=dlopen
- lt_cv_dlopen_libs=
- lt_cv_dlopen_self=no
- ;;
-
- *)
- 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 no = "$lt_cv_dlopen"; then
- enable_dlopen=no
- else
- enable_dlopen=yes
- fi
-
- case $lt_cv_dlopen in
- dlopen)
- save_CPPFLAGS=$CPPFLAGS
- test yes = "$ac_cv_header_dlfcn_h" && 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 yes = "$lt_cv_dlopen_self"; 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:$LINENO: $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:$LINENO: \$? = $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 "$_lt_compiler_boilerplate" | $SED '/^$/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 no = "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" && test no != "$need_locks"; 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 no = "$hard_links"; 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 where 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 yes = "$_LT_TAGVAR(hardcode_automatic, $1)"; then
-
- # We can hardcode non-existent directories.
- if test no != "$_LT_TAGVAR(hardcode_direct, $1)" &&
- # 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 no != "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" &&
- test no != "$_LT_TAGVAR(hardcode_minus_L, $1)"; 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 relink = "$_LT_TAGVAR(hardcode_action, $1)" ||
- test yes = "$_LT_TAGVAR(inherit_rpath, $1)"; then
- # Fast installation is not supported
- enable_fast_install=no
-elif test yes = "$shlibpath_overrides_runpath" ||
- test no = "$enable_shared"; 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_PREPARE_MUNGE_PATH_LIST
-# ---------------------------
-# Make sure func_munge_path_list() is defined correctly.
-m4_defun([_LT_PREPARE_MUNGE_PATH_LIST],
-[[# func_munge_path_list VARIABLE PATH
-# -----------------------------------
-# VARIABLE is name of variable containing _space_ separated list of
-# directories to be munged by the contents of PATH, which is string
-# having a format:
-# "DIR[:DIR]:"
-# string "DIR[ DIR]" will be prepended to VARIABLE
-# ":DIR[:DIR]"
-# string "DIR[ DIR]" will be appended to VARIABLE
-# "DIRP[:DIRP]::[DIRA:]DIRA"
-# string "DIRP[ DIRP]" will be prepended to VARIABLE and string
-# "DIRA[ DIRA]" will be appended to VARIABLE
-# "DIR[:DIR]"
-# VARIABLE will be replaced by "DIR[ DIR]"
-func_munge_path_list ()
-{
- case x at S|@2 in
- x)
- ;;
- *:)
- eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'` \@S|@@S|@1\"
- ;;
- x:*)
- eval @S|@1=\"\@S|@@S|@1 `$ECHO @S|@2 | $SED 's/:/ /g'`\"
- ;;
- *::*)
- eval @S|@1=\"\@S|@@S|@1\ `$ECHO @S|@2 | $SED -e 's/.*:://' -e 's/:/ /g'`\"
- eval @S|@1=\"`$ECHO @S|@2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \@S|@@S|@1\"
- ;;
- *)
- eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'`\"
- ;;
- esac
-}
-]])# _LT_PREPARE_PATH_LIST
-
-
-# _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
-m4_require([_LT_CHECK_SHELL_FEATURES])dnl
-m4_require([_LT_PREPARE_MUNGE_PATH_LIST])dnl
-AC_MSG_CHECKING([dynamic linker characteristics])
-m4_if([$1],
- [], [
-if test yes = "$GCC"; then
- case $host_os in
- darwin*) lt_awk_arg='/^libraries:/,/LR/' ;;
- *) lt_awk_arg='/^libraries:/' ;;
- esac
- case $host_os in
- mingw* | cegcc*) lt_sed_strip_eq='s|=\([[A-Za-z]]:\)|\1|g' ;;
- *) lt_sed_strip_eq='s|=/|/|g' ;;
- esac
- lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
- case $lt_search_path_spec in
- *\;*)
- # 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 's/;/ /g'`
- ;;
- *)
- lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
- ;;
- esac
- # 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`
- # ...but if some path component already ends with the multilib dir we assume
- # that all is fine and trust -print-search-dirs as is (GCC 4.2? or newer).
- case "$lt_multi_os_dir; $lt_search_path_spec " in
- "/; "* | "/.; "* | "/./; "* | *"$lt_multi_os_dir "* | *"$lt_multi_os_dir/ "*)
- lt_multi_os_dir=
- ;;
- esac
- 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"
- elif test -n "$lt_multi_os_dir"; then
- 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; }
-}'`
- # AWK program above erroneously prepends '/' to C:/dos/paths
- # for these hosts.
- case $host_os in
- mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
- $SED 's|/\([[A-Za-z]]:\)|\1|g'` ;;
- esac
- sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
-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
-
-AC_ARG_VAR([LT_SYS_LIBRARY_PATH],
-[User-defined run-time library search path.])
-
-case $host_os in
-aix3*)
- version_type=linux # correct to gnu/linux during the next big refactor
- 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 # correct to gnu/linux during the next big refactor
- need_lib_prefix=no
- need_version=no
- hardcode_into_libs=yes
- if test ia64 = "$host_cpu"; 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
- # Using Import Files as archive members, it is possible to support
- # filename-based versioning of shared library archives on AIX. While
- # this would work for both with and without runtime linking, it will
- # prevent static linking of such archives. So we do filename-based
- # shared library versioning with .so extension only, which is used
- # when both runtime linking and shared linking is enabled.
- # Unfortunately, runtime linking may impact performance, so we do
- # not want this to be the default eventually. Also, we use the
- # versioned .so libs for executables only if there is the -brtl
- # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only.
- # To allow for filename-based versioning support, we need to create
- # libNAME.so.V as an archive file, containing:
- # *) an Import File, referring to the versioned filename of the
- # archive as well as the shared archive member, telling the
- # bitwidth (32 or 64) of that shared object, and providing the
- # list of exported symbols of that shared object, eventually
- # decorated with the 'weak' keyword
- # *) the shared object with the F_LOADONLY flag set, to really avoid
- # it being seen by the linker.
- # At run time we better use the real file rather than another symlink,
- # but for link time we create the symlink libNAME.so -> libNAME.so.V
-
- case $with_aix_soname,$aix_use_runtimelinking in
- # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct
- # soname into executable. Probably we can add versioning support to
- # collect2, so additional links can be useful in future.
- aix,yes) # traditional libtool
- dynamic_linker='AIX unversionable lib.so'
- # 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'
- ;;
- aix,no) # traditional AIX only
- dynamic_linker='AIX lib.a[(]lib.so.V[)]'
- # 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'
- ;;
- svr4,*) # full svr4 only
- dynamic_linker="AIX lib.so.V[(]$shared_archive_member_spec.o[)]"
- library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
- # We do not specify a path in Import Files, so LIBPATH fires.
- shlibpath_overrides_runpath=yes
- ;;
- *,yes) # both, prefer svr4
- dynamic_linker="AIX lib.so.V[(]$shared_archive_member_spec.o[)], lib.a[(]lib.so.V[)]"
- library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
- # unpreferred sharedlib libNAME.a needs extra handling
- postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"'
- postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"'
- # We do not specify a path in Import Files, so LIBPATH fires.
- shlibpath_overrides_runpath=yes
- ;;
- *,no) # both, prefer aix
- dynamic_linker="AIX lib.a[(]lib.so.V[)], lib.so.V[(]$shared_archive_member_spec.o[)]"
- library_names_spec='$libname$release.a $libname.a'
- soname_spec='$libname$release$shared_ext$major'
- # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling
- postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)'
- postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"'
- ;;
- esac
- 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=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; $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 # correct to gnu/linux during the next big refactor
- 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,$cc_basename in
- yes,*)
- # gcc
- 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'
-m4_if([$1], [],[
- sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"])
- ;;
- mingw* | cegcc*)
- # MinGW DLLs use traditional 'lib' prefix
- soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
- ;;
- 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
- dynamic_linker='Win32 ld.exe'
- ;;
-
- *,cl*)
- # Native MSVC
- libname_spec='$name'
- soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
- library_names_spec='$libname.dll.lib'
-
- case $build_os in
- mingw*)
- sys_lib_search_path_spec=
- lt_save_ifs=$IFS
- IFS=';'
- for lt_path in $LIB
- do
- IFS=$lt_save_ifs
- # Let DOS variable expansion print the short 8.3 style file name.
- lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
- sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
- done
- IFS=$lt_save_ifs
- # Convert to MSYS style.
- sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'`
- ;;
- cygwin*)
- # Convert to unix form, then to dos form, then back to unix form
- # but this time dos style (no spaces!) so that the unix form looks
- # like /cygdrive/c/PROGRA~1:/cygdr...
- sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
- sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
- sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
- ;;
- *)
- sys_lib_search_path_spec=$LIB
- if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
- # It is most probably a Windows format PATH.
- 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
- # FIXME: find the short name or the path components, as spaces are
- # common. (e.g. "Program Files" -> "PROGRA~1")
- ;;
- esac
-
- # 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'
- postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
- dlpath=$dir/\$dldll~
- $RM \$dlpath'
- shlibpath_overrides_runpath=yes
- dynamic_linker='Win32 link.exe'
- ;;
-
- *)
- # Assume MSVC wrapper
- library_names_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext $libname.lib'
- dynamic_linker='Win32 ld.exe'
- ;;
- esac
- # 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 # correct to gnu/linux during the next big refactor
- 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
- ;;
-
-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[[23]].*) 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$major $libname$shared_ext'
- soname_spec='$libname$release$shared_ext$major'
- 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
- ;;
-
-haiku*)
- version_type=linux # correct to gnu/linux during the next big refactor
- need_lib_prefix=no
- need_version=no
- dynamic_linker="$host_os runtime_loader"
- 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=LIBRARY_PATH
- shlibpath_overrides_runpath=no
- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
- 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 32 = "$HPUX_IA64_MODE"; then
- sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
- sys_lib_dlsearch_path_spec=/usr/lib/hpux32
- else
- sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
- sys_lib_dlsearch_path_spec=/usr/lib/hpux64
- fi
- ;;
- 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'
- # or fails outright, so override atomically:
- install_override_mode=555
- ;;
-
-interix[[3-9]]*)
- version_type=linux # correct to gnu/linux during the next big refactor
- 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 yes = "$lt_cv_prog_gnu_ld"; then
- version_type=linux # correct to gnu/linux during the next big refactor
- 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
- ;;
-
-linux*android*)
- version_type=none # Android doesn't support versioned libraries.
- need_lib_prefix=no
- need_version=no
- library_names_spec='$libname$release$shared_ext'
- soname_spec='$libname$release$shared_ext'
- finish_cmds=
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes
-
- # 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
-
- dynamic_linker='Android linker'
- # Don't embed -rpath directories since the linker doesn't support them.
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- ;;
-
-# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
- version_type=linux # correct to gnu/linux during the next big refactor
- 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
- AC_CACHE_VAL([lt_cv_shlibpath_overrides_runpath],
- [lt_cv_shlibpath_overrides_runpath=no
- 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],
- [lt_cv_shlibpath_overrides_runpath=yes])])
- LDFLAGS=$save_LDFLAGS
- libdir=$save_libdir
- ])
- shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
-
- # 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
-
- # Ideally, we could use ldconfig to report *all* directores which are
- # searched for libraries, however this is still not possible. Aside from not
- # being certain /sbin/ldconfig is available, command
- # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64,
- # even though it is searched at run-time. Try to do the best guess by
- # appending ld.so.conf contents (and includes) 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;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 # correct to gnu/linux during the next big refactor
- 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* | bitrig*)
- version_type=sunos
- sys_lib_dlsearch_path_spec=/usr/lib
- need_lib_prefix=no
- if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
- need_version=no
- else
- need_version=yes
- fi
- 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
- shlibpath_overrides_runpath=yes
- ;;
-
-os2*)
- libname_spec='$name'
- version_type=windows
- shrext_cmds=.dll
- need_version=no
- need_lib_prefix=no
- # OS/2 can only load a DLL with a base name of 8 characters or less.
- soname_spec='`test -n "$os2dllname" && libname="$os2dllname";
- v=$($ECHO $release$versuffix | tr -d .-);
- n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _);
- $ECHO $n$v`$shared_ext'
- library_names_spec='${libname}_dll.$libext'
- dynamic_linker='OS/2 ld.exe'
- shlibpath_var=BEGINLIBPATH
- sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
- 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'
- ;;
-
-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 # correct to gnu/linux during the next big refactor
- 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 yes = "$with_gnu_ld"; then
- need_lib_prefix=no
- fi
- need_version=yes
- ;;
-
-sysv4 | sysv4.3*)
- version_type=linux # correct to gnu/linux during the next big refactor
- 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 # correct to gnu/linux during the next big refactor
- 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=sco
- 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 yes = "$with_gnu_ld"; 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 # correct to gnu/linux during the next big refactor
- 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 # correct to gnu/linux during the next big refactor
- 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 no = "$dynamic_linker" && can_build_shared=no
-
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test yes = "$GCC"; then
- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
-
-if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then
- sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec
-fi
-
-if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then
- sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec
-fi
-
-# remember unaugmented sys_lib_dlsearch_path content for libtool script decls...
-configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec
-
-# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code
-func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH"
-
-# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool
-configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH
-
-_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([], [install_override_mode], [1],
- [Permission mode override for installation of shared libraries])
-_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], [configure_time_dlsearch_path], [2],
- [Detected run-time system search path for libraries])
-_LT_DECL([], [configure_time_lt_sys_library_path], [2],
- [Explicit LT_SYS_LIBRARY_PATH set during ./configure time])
-])# _LT_SYS_DYNAMIC_LINKER
-
-
-# _LT_PATH_TOOL_PREFIX(TOOL)
-# --------------------------
-# find a file program that 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 that 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
-m4_require([_LT_PROG_ECHO_BACKSLASH])dnl
-
-AC_ARG_WITH([gnu-ld],
- [AS_HELP_STRING([--with-gnu-ld],
- [assume the C compiler uses GNU ld @<:@default=no@:>@])],
- [test no = "$withval" || with_gnu_ld=yes],
- [with_gnu_ld=no])dnl
-
-ac_prog=ld
-if test yes = "$GCC"; 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 yes = "$with_gnu_ld"; 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 no != "$with_gnu_ld" && break
- ;;
- *)
- test yes != "$with_gnu_ld" && 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
- cygwin* | mingw* | pw32* | cegcc*)
- if test yes != "$GCC"; then
- reload_cmds=false
- fi
- ;;
- darwin*)
- if test yes = "$GCC"; 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_TAGDECL([], [reload_flag], [1], [How to create reloadable object files])dnl
-_LT_TAGDECL([], [reload_cmds], [2])dnl
-])# _LT_CMD_RELOAD
-
-
-# _LT_PATH_DD
-# -----------
-# find a working dd
-m4_defun([_LT_PATH_DD],
-[AC_CACHE_CHECK([for a working dd], [ac_cv_path_lt_DD],
-[printf 0123456789abcdef0123456789abcdef >conftest.i
-cat conftest.i conftest.i >conftest2.i
-: ${lt_DD:=$DD}
-AC_PATH_PROGS_FEATURE_CHECK([lt_DD], [dd],
-[if "$ac_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
- cmp -s conftest.i conftest.out \
- && ac_cv_path_lt_DD="$ac_path_lt_DD" ac_path_lt_DD_found=:
-fi])
-rm -f conftest.i conftest2.i conftest.out])
-])# _LT_PATH_DD
-
-
-# _LT_CMD_TRUNCATE
-# ----------------
-# find command to truncate a binary pipe
-m4_defun([_LT_CMD_TRUNCATE],
-[m4_require([_LT_PATH_DD])
-AC_CACHE_CHECK([how to truncate binary pipes], [lt_cv_truncate_bin],
-[printf 0123456789abcdef0123456789abcdef >conftest.i
-cat conftest.i conftest.i >conftest2.i
-lt_cv_truncate_bin=
-if "$ac_cv_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
- cmp -s conftest.i conftest.out \
- && lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1"
-fi
-rm -f conftest.i conftest2.i conftest.out
-test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q"])
-_LT_DECL([lt_truncate_bin], [lt_cv_truncate_bin], [1],
- [Command to truncate a binary pipe])
-])# _LT_CMD_TRUNCATE
-
-
-# _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
-# that 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
- # Keep this pattern in sync with the one in func_win32_libid.
- lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
- 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
- ;;
-
-haiku*)
- 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])(-bit)?( [LM]SB)? 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 glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu | 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* | bitrig*)
- if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; 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
- ;;
-os2*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-esac
-])
-
-file_magic_glob=
-want_nocaseglob=no
-if test "$build" = "$host"; then
- case $host_os in
- mingw* | pw32*)
- if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
- want_nocaseglob=yes
- else
- file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"`
- fi
- ;;
- esac
-fi
-
-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_DECL([], [file_magic_glob], [1],
- [How to find potential files when deplibs_check_method = "file_magic"])
-_LT_DECL([], [want_nocaseglob], [1],
- [Find potential files using nocaseglob 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
- # MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty
- case $build_os in
- mingw*) lt_bad_file=conftest.nm/nofile ;;
- *) lt_bad_file=/dev/null ;;
- esac
- case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in
- *$lt_bad_file* | *'Invalid file or object type'*)
- lt_cv_path_NM="$tmp_nm -B"
- break 2
- ;;
- *)
- case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
- */dev/null*)
- lt_cv_path_NM="$tmp_nm -p"
- break 2
- ;;
- *)
- 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 no != "$lt_cv_path_NM"; then
- NM=$lt_cv_path_NM
-else
- # Didn't find any BSD compatible name lister, look for dumpbin.
- if test -n "$DUMPBIN"; then :
- # Let the user override the test.
- else
- AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :)
- case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in
- *COFF*)
- DUMPBIN="$DUMPBIN -symbols -headers"
- ;;
- *)
- DUMPBIN=:
- ;;
- esac
- fi
- 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:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
- (eval "$ac_compile" 2>conftest.err)
- cat conftest.err >&AS_MESSAGE_LOG_FD
- (eval echo "\"\$as_me:$LINENO: $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:$LINENO: 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_CHECK_SHAREDLIB_FROM_LINKLIB
-# --------------------------------
-# how to determine the name of the shared library
-# associated with a specific link library.
-# -- PORTME fill in with the dynamic library characteristics
-m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB],
-[m4_require([_LT_DECL_EGREP])
-m4_require([_LT_DECL_OBJDUMP])
-m4_require([_LT_DECL_DLLTOOL])
-AC_CACHE_CHECK([how to associate runtime and link libraries],
-lt_cv_sharedlib_from_linklib_cmd,
-[lt_cv_sharedlib_from_linklib_cmd='unknown'
-
-case $host_os in
-cygwin* | mingw* | pw32* | cegcc*)
- # two different shell functions defined in ltmain.sh;
- # decide which one to use based on capabilities of $DLLTOOL
- case `$DLLTOOL --help 2>&1` in
- *--identify-strict*)
- lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
- ;;
- *)
- lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
- ;;
- esac
- ;;
-*)
- # fallback: assume linklib IS sharedlib
- lt_cv_sharedlib_from_linklib_cmd=$ECHO
- ;;
-esac
-])
-sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
-test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
-
-_LT_DECL([], [sharedlib_from_linklib_cmd], [1],
- [Command to associate shared and link libraries])
-])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
-
-
-# _LT_PATH_MANIFEST_TOOL
-# ----------------------
-# locate the manifest tool
-m4_defun([_LT_PATH_MANIFEST_TOOL],
-[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :)
-test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
-AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool],
- [lt_cv_path_mainfest_tool=no
- echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD
- $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
- cat conftest.err >&AS_MESSAGE_LOG_FD
- if $GREP 'Manifest Tool' conftest.out > /dev/null; then
- lt_cv_path_mainfest_tool=yes
- fi
- rm -f conftest*])
-if test yes != "$lt_cv_path_mainfest_tool"; then
- MANIFEST_TOOL=:
-fi
-_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl
-])# _LT_PATH_MANIFEST_TOOL
-
-
-# _LT_DLL_DEF_P([FILE])
-# ---------------------
-# True iff FILE is a Windows DLL '.def' file.
-# Keep in sync with func_dll_def_p in the libtool script
-AC_DEFUN([_LT_DLL_DEF_P],
-[dnl
- test DEF = "`$SED -n dnl
- -e '\''s/^[[ ]]*//'\'' dnl Strip leading whitespace
- -e '\''/^\(;.*\)*$/d'\'' dnl Delete empty lines and comments
- -e '\''s/^\(EXPORTS\|LIBRARY\)\([[ ]].*\)*$/DEF/p'\'' dnl
- -e q dnl Only consider the first "real" line
- $1`" dnl
-])# _LT_DLL_DEF_P
-
-
-# LT_LIB_M
-# --------
-# check for math library
-AC_DEFUN([LT_LIB_M],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-LIBM=
-case $host in
-*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-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 yes = "$GCC"; then
- case $cc_basename in
- nvcc*)
- _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;;
- *)
- _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;;
- esac
-
- _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([AC_PROG_AWK])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 ia64 = "$host_cpu"; 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
-
-if test "$lt_cv_nm_interface" = "MS dumpbin"; then
- # Gets list of data symbols to import.
- lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'"
- # Adjust the below global symbol transforms to fixup imported variables.
- lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'"
- lt_c_name_hook=" -e 's/^I .* \(.*\)$/ {\"\1\", (void *) 0},/p'"
- lt_c_name_lib_hook="\
- -e 's/^I .* \(lib.*\)$/ {\"\1\", (void *) 0},/p'\
- -e 's/^I .* \(.*\)$/ {\"lib\1\", (void *) 0},/p'"
-else
- # Disable hooks by default.
- lt_cv_sys_global_symbol_to_import=
- lt_cdecl_hook=
- lt_c_name_hook=
- lt_c_name_lib_hook=
-fi
-
-# 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"\
-$lt_cdecl_hook\
-" -e 's/^T .* \(.*\)$/extern int \1();/p'"\
-" -e 's/^$symcode$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"\
-$lt_c_name_hook\
-" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\
-" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/p'"
-
-# Transform an extracted symbol line into symbol name with lib prefix and
-# symbol address.
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\
-$lt_c_name_lib_hook\
-" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\
-" -e 's/^$symcode$symcode* .* \(lib.*\)$/ {\"\1\", (void *) \&\1},/p'"\
-" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"lib\1\", (void *) \&\1},/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,
- # D for any global variable and I for any imported 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};"\
-" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
-" /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
-" /^ *Symbol name *: /{split(\$ 0,sn,\":\"); si=substr(sn[2],2)};"\
-" /^ *Type *: code/{print \"T\",si,substr(si,length(prfx))};"\
-" /^ *Type *: data/{print \"I\",si,substr(si,length(prfx))};"\
-" \$ 0!~/External *\|/{next};"\
-" / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
-" {if(hide[section]) next};"\
-" {f=\"D\"}; \$ 0~/\(\).*\|/{f=\"T\"};"\
-" {split(\$ 0,a,/\||\r/); split(a[2],s)};"\
-" s[1]~/^[@?]/{print f,s[1],s[1]; next};"\
-" s[1]~prfx {split(s[1],t,\"@\"); print f,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
- lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
-
- # 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
-/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
-#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE
-/* DATA imports from DLLs on WIN32 can't be const, because runtime
- relocations are performed -- see ld's documentation on pseudo-relocs. */
-# define LT@&t at _DLSYM_CONST
-#elif defined __osf__
-/* This system does not cope well with relocations in const data. */
-# define LT@&t at _DLSYM_CONST
-#else
-# define LT@&t at _DLSYM_CONST const
-#endif
-
-#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. */
-LT@&t at _DLSYM_CONST struct {
- const char *name;
- void *address;
-}
-lt__PROGRAM__LTX_preloaded_symbols[[]] =
-{
- { "@PROGRAM@", (void *) 0 },
-_LT_EOF
- $SED "s/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/" < "$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_globsym_save_LIBS=$LIBS
- lt_globsym_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_globsym_save_LIBS
- CFLAGS=$lt_globsym_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 yes = "$pipe_works"; 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
-
-# Response file support.
-if test "$lt_cv_nm_interface" = "MS dumpbin"; then
- nm_file_list_spec='@'
-elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then
- nm_file_list_spec='@'
-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_import], [lt_cv_sys_global_symbol_to_import], [1],
- [Transform the output of nm into a list of symbols to manually relocate])
-_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_DECL([nm_interface], [lt_cv_nm_interface], [1],
- [The name lister interface])
-_LT_DECL([], [nm_file_list_spec], [1],
- [Specify filename containing input files for $NM])
-]) # _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)=
-
-m4_if([$1], [CXX], [
- # C++ specific cases for pic, static, wl, etc.
- if test yes = "$GXX"; 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 ia64 = "$host_cpu"; then
- # AIX 5 now supports IA64 processor
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- fi
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
- ;;
-
- 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'])
- case $host_os in
- os2*)
- _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static'
- ;;
- esac
- ;;
- 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)=
- ;;
- haiku*)
- # PIC is the default for Haiku.
- # The "-static" flag exists, but is broken.
- _LT_TAGVAR(lt_prog_compiler_static, $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 ia64 = "$host_cpu"; 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
- ;;
- 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).
- m4_if([$1], [GCJ], [],
- [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
- ;;
- 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 ia64 != "$host_cpu"; 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 | kopensolaris*-gnu | 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* | bgxl[[cC]]* | mpixl[[cC]]*)
- # IBM XL 8.0, 9.0 on PPC and BlueGene
- _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* | sunCC*)
- # 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 yes = "$GCC"; 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 ia64 = "$host_cpu"; then
- # AIX 5 now supports IA64 processor
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- fi
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
- ;;
-
- 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'])
- case $host_os in
- os2*)
- _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static'
- ;;
- esac
- ;;
-
- 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'
- ;;
-
- haiku*)
- # PIC is the default for Haiku.
- # The "-static" flag exists, but is broken.
- _LT_TAGVAR(lt_prog_compiler_static, $1)=
- ;;
-
- 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
-
- case $cc_basename in
- nvcc*) # Cuda Compiler Driver 2.2
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker '
- if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
- _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)"
- fi
- ;;
- 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 ia64 = "$host_cpu"; 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
- ;;
-
- 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'
- case $cc_basename in
- nagfor*)
- # NAG Fortran compiler
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,'
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- ;;
- esac
- ;;
-
- 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'])
- case $host_os in
- os2*)
- _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static'
- ;;
- esac
- ;;
-
- 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 | kopensolaris*-gnu | 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'
- ;;
- nagfor*)
- # NAG Fortran compiler
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,'
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- ;;
- tcc*)
- # Fabrice Bellard et al's Tiny 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)='-static'
- ;;
- pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
- # 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* | bgxl* | bgf* | mpixl*)
- # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
- _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\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*)
- # 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)=''
- ;;
- *Sun\ F* | *Sun*Fortran*)
- _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 '
- ;;
- *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,'
- ;;
- *Intel*\ [[CF]]*Compiler*)
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
- ;;
- *Portland\ Group*)
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- ;;
- 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* | sunf77* | sunf90* | sunf95*)
- _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 that 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_CACHE_CHECK([for $compiler option to produce PIC],
- [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)],
- [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
-_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)
-
-#
-# 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])
-
-_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
- [How to pass a linker flag through the compiler])
-#
-# 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_PATH_MANIFEST_TOOL])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'
- _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
- 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 GNU nm, but means don't demangle to AIX nm.
- # Without the "-l" option, or with the "-B" option, AIX nm treats
- # weak defined symbols like other global defined symbols, whereas
- # GNU nm marks them as "W".
- # While the 'weak' keyword is ignored in the Export File, we need
- # it in the Import File for the 'aix-soname' feature, so we have
- # to replace the "-B" option with "-P" for AIX 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") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
- else
- _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
- fi
- ;;
- pw32*)
- _LT_TAGVAR(export_symbols_cmds, $1)=$ltdll_cmds
- ;;
- cygwin* | mingw* | cegcc*)
- case $cc_basename in
- cl*)
- _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
- ;;
- *)
- _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
- _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
- ;;
- esac
- ;;
- *)
- _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
- ;;
- esac
-], [
- 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_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 yes != "$GCC"; then
- with_gnu_ld=no
- fi
- ;;
- interix*)
- # we just hope/assume this is gcc and not c89 (= MSVC++)
- with_gnu_ld=yes
- ;;
- openbsd* | bitrig*)
- with_gnu_ld=no
- ;;
- esac
-
- _LT_TAGVAR(ld_shlibs, $1)=yes
-
- # On some targets, GNU ld is compatible enough with the native linker
- # that we're better off using the native interface for both.
- lt_use_gnu_ld_interface=no
- if test yes = "$with_gnu_ld"; then
- case $host_os in
- aix*)
- # The AIX port of GNU ld has always aspired to compatibility
- # with the native linker. However, as the warning in the GNU ld
- # block says, versions before 2.19.5* couldn't really create working
- # shared libraries, regardless of the interface used.
- case `$LD -v 2>&1` in
- *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
- *\ \(GNU\ Binutils\)\ 2.[[2-9]]*) ;;
- *\ \(GNU\ Binutils\)\ [[3-9]]*) ;;
- *)
- lt_use_gnu_ld_interface=yes
- ;;
- esac
- ;;
- *)
- lt_use_gnu_ld_interface=yes
- ;;
- esac
- fi
-
- if test yes = "$lt_use_gnu_ld_interface"; 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 | $SED -e 's/([^)]\+)\s\+//' 2>&1` in
- *GNU\ gold*) supports_anon_versioning=yes ;;
- *\ [[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 ia64 != "$host_cpu"; then
- _LT_TAGVAR(ld_shlibs, $1)=no
- cat <<_LT_EOF 1>&2
-
-*** Warning: the GNU linker, at least up to release 2.19, 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 install binutils
-*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
-*** You will then need to restart the configuration process.
-
-_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(export_dynamic_flag_spec, $1)='$wl--export-all-symbols'
- _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/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
- _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
-
- 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, use it as
- # is; otherwise, prepend EXPORTS...
- _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); 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
- ;;
-
- haiku*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
- _LT_TAGVAR(link_all_deplibs, $1)=yes
- ;;
-
- os2*)
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- _LT_TAGVAR(hardcode_minus_L, $1)=yes
- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
- shrext_cmds=.dll
- _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
- $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
- $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
- $ECHO EXPORTS >> $output_objdir/$libname.def~
- emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
- $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
- emximp -o $lib $output_objdir/$libname.def'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
- $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
- $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
- $ECHO EXPORTS >> $output_objdir/$libname.def~
- prefix_cmds="$SED"~
- if test EXPORTS = "`$SED 1q $export_symbols`"; then
- prefix_cmds="$prefix_cmds -e 1d";
- fi~
- prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
- cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
- $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
- emximp -o $lib $output_objdir/$libname.def'
- _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
- ;;
-
- 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 | kopensolaris*-gnu)
- tmp_diet=no
- if test linux-dietlibc = "$host_os"; 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 no = "$tmp_diet"
- then
- tmp_addflag=' $pic_flag'
- 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; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
- tmp_addflag=' $pic_flag'
- ;;
- pgf77* | pgf90* | pgf95* | pgfortran*)
- # 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; func_echo_all \"$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' ;;
- nagfor*) # NAGFOR 5.3
- tmp_sharedflag='-Wl,-shared' ;;
- xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below)
- tmp_sharedflag='-qmkshrobj'
- tmp_addflag= ;;
- nvcc*) # Cuda Compiler Driver 2.2
- _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
- _LT_TAGVAR(compiler_needs_object, $1)=yes
- ;;
- 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; func_echo_all \"$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 yes = "$supports_anon_versioning"; 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
- tcc*)
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='-rdynamic'
- ;;
- xlf* | bgf* | bgxlf* | mpixlf*)
- # 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)='$wl-rpath $wl$libdir'
- _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
- if test yes = "$supports_anon_versioning"; 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 $linker_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 $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $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 $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $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 cannot
-*** 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 $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $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 no = "$_LT_TAGVAR(ld_shlibs, $1)"; 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 yes = "$GCC" && 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 ia64 = "$host_cpu"; 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 GNU nm, but means don't demangle to AIX nm.
- # Without the "-l" option, or with the "-B" option, AIX nm treats
- # weak defined symbols like other global defined symbols, whereas
- # GNU nm marks them as "W".
- # While the 'weak' keyword is ignored in the Export File, we need
- # it in the Import File for the 'aix-soname' feature, so we have
- # to replace the "-B" option with "-P" for AIX 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") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
- else
- _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | 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
- # have runtime linking enabled, and use it for executables.
- # For shared libraries, we enable/disable runtime linking
- # depending on the kind of the shared library created -
- # when "with_aix_soname,aix_use_runtimelinking" is:
- # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables
- # "aix,yes" lib.so shared, rtl:yes, for executables
- # lib.a static archive
- # "both,no" lib.so.V(shr.o) shared, rtl:yes
- # lib.a(lib.so.V) shared, rtl:no, for executables
- # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
- # lib.a(lib.so.V) shared, rtl:no
- # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables
- # lib.a static archive
- case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
- for ld_flag in $LDFLAGS; do
- if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then
- aix_use_runtimelinking=yes
- break
- fi
- done
- if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
- # With aix-soname=svr4, we create the lib.so.V shared archives only,
- # so we don't have lib.a shared libs to link our executables.
- # We have to force runtime linking in this case.
- aix_use_runtimelinking=yes
- LDFLAGS="$LDFLAGS -Wl,-brtl"
- fi
- ;;
- 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,'
- case $with_aix_soname,$aix_use_runtimelinking in
- aix,*) ;; # traditional, no import file
- svr4,* | *,yes) # use import file
- # The Import File defines what to hardcode.
- _LT_TAGVAR(hardcode_direct, $1)=no
- _LT_TAGVAR(hardcode_direct_absolute, $1)=no
- ;;
- esac
-
- if test yes = "$GCC"; 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 yes = "$aix_use_runtimelinking"; then
- shared_flag="$shared_flag "'$wl-G'
- fi
- # Need to ensure runtime linking is disabled for the traditional
- # shared library, or the linker may eventually find shared libraries
- # /with/ Import File - we do not want to mix them.
- shared_flag_aix='-shared'
- shared_flag_svr4='-shared $wl-G'
- else
- # not using gcc
- if test ia64 = "$host_cpu"; 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 yes = "$aix_use_runtimelinking"; then
- shared_flag='$wl-G'
- else
- shared_flag='$wl-bM:SRE'
- fi
- shared_flag_aix='$wl-bM:SRE'
- shared_flag_svr4='$wl-G'
- 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,yes = "$with_aix_soname,$aix_use_runtimelinking"; 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([$1])
- _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 -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag
- else
- if test ia64 = "$host_cpu"; 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([$1])
- _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'
- if test yes = "$with_gnu_ld"; then
- # We only use this code for GNU lds that support --whole-archive.
- _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive'
- else
- # Exported symbols can be pulled into shared objects from archives
- _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
- fi
- _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
- _LT_TAGVAR(archive_expsym_cmds, $1)='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
- # -brtl affects multiple linker settings, -berok does not and is overridden later
- compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([[, ]]\\)%-berok\\1%g"`'
- if test svr4 != "$with_aix_soname"; then
- # This is similar to how AIX traditionally builds its shared libraries.
- _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
- fi
- if test aix != "$with_aix_soname"; then
- _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 3 [...]
- else
- # used by -dlpreopen to get the symbols
- _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$MV $output_objdir/$realname.d/$soname $output_objdir'
- fi
- _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$RM -r $output_objdir/$realname.d'
- 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.
- case $cc_basename in
- cl*)
- # Native MSVC
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
- _LT_TAGVAR(always_export_symbols, $1)=yes
- _LT_TAGVAR(file_list_spec, $1)='@'
- # 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 $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
- _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then
- cp "$export_symbols" "$output_objdir/$soname.def";
- echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
- else
- $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp;
- fi~
- $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
- linknames='
- # The linker will not automatically build a static lib if we build a DLL.
- # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
- _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
- _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'
- # Don't use ranlib
- _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
- _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
- lt_tool_outputfile="@TOOL_OUTPUT@"~
- case $lt_outputfile in
- *.exe|*.EXE) ;;
- *)
- lt_outputfile=$lt_outputfile.exe
- lt_tool_outputfile=$lt_tool_outputfile.exe
- ;;
- esac~
- if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then
- $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
- $RM "$lt_outputfile.manifest";
- fi'
- ;;
- *)
- # Assume MSVC wrapper
- _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 `func_echo_all "$deplibs" | $SED '\''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(enable_shared_with_static_runtimes, $1)=yes
- ;;
- esac
- ;;
-
- 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
- ;;
-
- # 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 $pic_flag -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 yes = "$GCC"; then
- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test "x$output_objdir/$soname" = "x$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 "x$output_objdir/$soname" = "x$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 yes,no = "$GCC,$with_gnu_ld"; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $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 no = "$with_gnu_ld"; then
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$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 yes,no = "$GCC,$with_gnu_ld"; 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 $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
- ;;
- *)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $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'
- ;;
- *)
- m4_if($1, [], [
- # Older versions of the 11.00 compiler do not understand -b yet
- # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
- _LT_LINKER_OPTION([if $CC understands -b],
- _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b],
- [_LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'],
- [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_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 no = "$with_gnu_ld"; 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 yes = "$GCC"; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $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.
- # This should be the same for all languages, so no per-tag cache variable.
- AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol],
- [lt_cv_irix_exported_symbol],
- [save_LDFLAGS=$LDFLAGS
- LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null"
- AC_LINK_IFELSE(
- [AC_LANG_SOURCE(
- [AC_LANG_CASE([C], [[int foo (void) { return 0; }]],
- [C++], [[int foo (void) { return 0; }]],
- [Fortran 77], [[
- subroutine foo
- end]],
- [Fortran], [[
- subroutine foo
- end]])])],
- [lt_cv_irix_exported_symbol=yes],
- [lt_cv_irix_exported_symbol=no])
- LDFLAGS=$save_LDFLAGS])
- if test yes = "$lt_cv_irix_exported_symbol"; then
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib'
- fi
- else
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -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" && func_echo_all "-set_version $verstring"` -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
- ;;
-
- linux*)
- case $cc_basename in
- tcc*)
- # Fabrice Bellard et al's Tiny C Compiler
- _LT_TAGVAR(ld_shlibs, $1)=yes
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
- ;;
- esac
- ;;
-
- 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* | bitrig*)
- 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__`"; 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
- _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'
- 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
- shrext_cmds=.dll
- _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
- $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
- $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
- $ECHO EXPORTS >> $output_objdir/$libname.def~
- emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
- $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
- emximp -o $lib $output_objdir/$libname.def'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
- $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
- $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
- $ECHO EXPORTS >> $output_objdir/$libname.def~
- prefix_cmds="$SED"~
- if test EXPORTS = "`$SED 1q $export_symbols`"; then
- prefix_cmds="$prefix_cmds -e 1d";
- fi~
- prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
- cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
- $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
- emximp -o $lib $output_objdir/$libname.def'
- _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
- ;;
-
- osf3*)
- if test yes = "$GCC"; 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" && func_echo_all "$wl-set_version $wl$verstring"` $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" && func_echo_all "-set_version $verstring"` -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 yes = "$GCC"; then
- _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*'
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $pic_flag $libobjs $deplibs $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $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" && func_echo_all "-set_version $verstring"` -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 "-set_version $verstring"` -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 yes = "$GCC"; then
- wlarc='$wl'
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $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 $pic_flag $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 yes = "$GCC"; 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 sequent = "$host_vendor"; 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 yes = "$GCC"; 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 CANNOT 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 yes = "$GCC"; 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 sni = "$host_vendor"; 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 no = "$_LT_TAGVAR(ld_shlibs, $1)" && 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 yes,yes = "$GCC,$enable_shared"; 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_CACHE_CHECK([whether -lc should be explicitly linked in],
- [lt_cv_]_LT_TAGVAR(archive_cmds_need_lc, $1),
- [$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_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=no
- else
- lt_cv_[]_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*
- ])
- _LT_TAGVAR(archive_cmds_need_lc, $1)=$lt_cv_[]_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_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([], [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([], [postlink_cmds], [2],
- [Commands necessary for finishing linking programs])
-_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
-
-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 what 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 no = "$can_build_shared" && 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 yes = "$enable_shared" && enable_static=no
- if test -n "$RANLIB"; then
- archive_cmds="$archive_cmds~\$RANLIB \$lib"
- postinstall_cmds='$RANLIB $lib'
- fi
- ;;
-
- aix[[4-9]]*)
- if test ia64 != "$host_cpu"; then
- case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
- yes,aix,yes) ;; # shared object as lib.so file only
- yes,svr4,*) ;; # shared object as lib.so archive member only
- yes,*) enable_static=no ;; # shared object in lib.a archive as well
- esac
- 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 yes = "$enable_shared" || enable_static=yes
- AC_MSG_RESULT([$enable_static])
-
- _LT_CONFIG($1)
-fi
-AC_LANG_POP
-CC=$lt_save_CC
-])# _LT_LANG_C_CONFIG
-
-
-# _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],
-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_DECL_EGREP])dnl
-m4_require([_LT_PATH_MANIFEST_TOOL])dnl
-if test -n "$CXX" && ( test no != "$CXX" &&
- ( (test g++ = "$CXX" && `g++ -v >/dev/null 2>&1` ) ||
- (test g++ != "$CXX"))); then
- AC_PROG_CXXCPP
-else
- _lt_caught_CXX_error=yes
-fi
-
-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_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(reload_flag, $1)=$reload_flag
-_LT_TAGVAR(reload_cmds, $1)=$reload_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 yes != "$_lt_caught_CXX_error"; 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_CFLAGS=$CFLAGS
- 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++"}
- CFLAGS=$CXXFLAGS
- 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 yes = "$GXX"; 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 yes = "$GXX"; 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 yes = "$with_gnu_ld"; then
- _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -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 -v "^Configured with:" | $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 ia64 = "$host_cpu"; 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
- # have runtime linking enabled, and use it for executables.
- # For shared libraries, we enable/disable runtime linking
- # depending on the kind of the shared library created -
- # when "with_aix_soname,aix_use_runtimelinking" is:
- # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables
- # "aix,yes" lib.so shared, rtl:yes, for executables
- # lib.a static archive
- # "both,no" lib.so.V(shr.o) shared, rtl:yes
- # lib.a(lib.so.V) shared, rtl:no, for executables
- # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
- # lib.a(lib.so.V) shared, rtl:no
- # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables
- # lib.a static archive
- 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
- if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
- # With aix-soname=svr4, we create the lib.so.V shared archives only,
- # so we don't have lib.a shared libs to link our executables.
- # We have to force runtime linking in this case.
- aix_use_runtimelinking=yes
- LDFLAGS="$LDFLAGS -Wl,-brtl"
- fi
- ;;
- 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,'
- case $with_aix_soname,$aix_use_runtimelinking in
- aix,*) ;; # no import file
- svr4,* | *,yes) # use import file
- # The Import File defines what to hardcode.
- _LT_TAGVAR(hardcode_direct, $1)=no
- _LT_TAGVAR(hardcode_direct_absolute, $1)=no
- ;;
- esac
-
- if test yes = "$GXX"; 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 yes = "$aix_use_runtimelinking"; then
- shared_flag=$shared_flag' $wl-G'
- fi
- # Need to ensure runtime linking is disabled for the traditional
- # shared library, or the linker may eventually find shared libraries
- # /with/ Import File - we do not want to mix them.
- shared_flag_aix='-shared'
- shared_flag_svr4='-shared $wl-G'
- else
- # not using gcc
- if test ia64 = "$host_cpu"; 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 yes = "$aix_use_runtimelinking"; then
- shared_flag='$wl-G'
- else
- shared_flag='$wl-bM:SRE'
- fi
- shared_flag_aix='$wl-bM:SRE'
- shared_flag_svr4='$wl-G'
- 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,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
- # Warning - without using the other runtime loading flags (-brtl),
- # -berok will link without error, but may produce a broken library.
- # The "-G" linker flag allows undefined symbols.
- _LT_TAGVAR(no_undefined_flag, $1)='-bernotok'
- # Determine the default libpath from the value encoded in an empty
- # executable.
- _LT_SYS_MODULE_PATH_AIX([$1])
- _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 -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag
- else
- if test ia64 = "$host_cpu"; 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([$1])
- _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'
- if test yes = "$with_gnu_ld"; then
- # We only use this code for GNU lds that support --whole-archive.
- _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive'
- else
- # Exported symbols can be pulled into shared objects from archives
- _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
- fi
- _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
- _LT_TAGVAR(archive_expsym_cmds, $1)='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
- # -brtl affects multiple linker settings, -berok does not and is overridden later
- compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([[, ]]\\)%-berok\\1%g"`'
- if test svr4 != "$with_aix_soname"; then
- # This is similar to how AIX traditionally builds its shared
- # libraries. Need -bnortl late, we may have -brtl in LDFLAGS.
- _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
- fi
- if test aix != "$with_aix_soname"; then
- _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# [...]
- else
- # used by -dlpreopen to get the symbols
- _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$MV $output_objdir/$realname.d/$soname $output_objdir'
- fi
- _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$RM -r $output_objdir/$realname.d'
- 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*)
- case $GXX,$cc_basename in
- ,cl* | no,cl*)
- # Native MSVC
- # 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
- _LT_TAGVAR(always_export_symbols, $1)=yes
- _LT_TAGVAR(file_list_spec, $1)='@'
- # 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 $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
- _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then
- cp "$export_symbols" "$output_objdir/$soname.def";
- echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
- else
- $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp;
- fi~
- $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
- linknames='
- # The linker will not automatically build a static lib if we build a DLL.
- # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
- # Don't use ranlib
- _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
- _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
- lt_tool_outputfile="@TOOL_OUTPUT@"~
- case $lt_outputfile in
- *.exe|*.EXE) ;;
- *)
- lt_outputfile=$lt_outputfile.exe
- lt_tool_outputfile=$lt_tool_outputfile.exe
- ;;
- esac~
- func_to_tool_file "$lt_outputfile"~
- if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then
- $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
- $RM "$lt_outputfile.manifest";
- fi'
- ;;
- *)
- # g++
- # _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(export_dynamic_flag_spec, $1)='$wl--export-all-symbols'
- _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, use it as
- # is; otherwise, prepend EXPORTS...
- _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); 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
- ;;
- esac
- ;;
- darwin* | rhapsody*)
- _LT_DARWIN_LINKER_FEATURES($1)
- ;;
-
- os2*)
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- _LT_TAGVAR(hardcode_minus_L, $1)=yes
- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
- shrext_cmds=.dll
- _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
- $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
- $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
- $ECHO EXPORTS >> $output_objdir/$libname.def~
- emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
- $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
- emximp -o $lib $output_objdir/$libname.def'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
- $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
- $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
- $ECHO EXPORTS >> $output_objdir/$libname.def~
- prefix_cmds="$SED"~
- if test EXPORTS = "`$SED 1q $export_symbols`"; then
- prefix_cmds="$prefix_cmds -e 1d";
- fi~
- prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
- cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
- $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
- emximp -o $lib $output_objdir/$libname.def'
- _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
- ;;
-
- 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
- ;;
-
- freebsd2.*)
- # 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
- ;;
-
- haiku*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
- _LT_TAGVAR(link_all_deplibs, $1)=yes
- ;;
-
- 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 "x$output_objdir/$soname" = "x$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; func_echo_all "$list"'
- ;;
- *)
- if test yes = "$GXX"; then
- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$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 no = "$with_gnu_ld"; 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; func_echo_all "$list"'
- ;;
- *)
- if test yes = "$GXX"; then
- if test no = "$with_gnu_ld"; 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 $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
- ;;
- *)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag $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" && func_echo_all "-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_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
- ;;
- *)
- if test yes = "$GXX"; then
- if test no = "$with_gnu_ld"; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
- else
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` -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 | kopensolaris*-gnu | 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; func_echo_all "$list"'
-
- _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 | sort | $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 | sort | $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 | sort | $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 | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
- ;;
- *) # Version 6 and above 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; func_echo_all \"$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=`func_echo_all "$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; func_echo_all "X$list" | $Xsed'
- ;;
- xl* | mpixl* | bgxl*)
- # 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 yes = "$supports_anon_versioning"; 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; func_echo_all \"$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='func_echo_all'
-
- # 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
- ;;
-
- openbsd* | bitrig*)
- 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__`"; 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=func_echo_all
- 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" && func_echo_all "$wl-set_version $verstring"` -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" && func_echo_all "-set_version $verstring"` -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 "-set_version $verstring"` -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=`func_echo_all "$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; func_echo_all "$list"'
- ;;
- *)
- if test yes,no = "$GXX,$with_gnu_ld"; 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" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
- ;;
- *)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $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 -v "^Configured with:" | $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* | sunCC*)
- # 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='func_echo_all'
-
- # 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 yes,no = "$GXX,$with_gnu_ld"; 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 $pic_flag -nostdlib $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 $pic_flag -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -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 -v "^Configured with:" | $GREP "\-L"'
- else
- # g++ 2.7 appears to require '-G' NOT '-shared' on this
- # platform.
- _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $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 $wl-h $wl$soname -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 -v "^Configured with:" | $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 CANNOT 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(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~
- '"$_LT_TAGVAR(old_archive_cmds, $1)"
- _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~
- '"$_LT_TAGVAR(reload_cmds, $1)"
- ;;
- *)
- _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 no = "$_LT_TAGVAR(ld_shlibs, $1)" && 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
- CFLAGS=$lt_save_CFLAGS
- 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 yes != "$_lt_caught_CXX_error"
-
-AC_LANG_POP
-])# _LT_LANG_CXX_CONFIG
-
-
-# _LT_FUNC_STRIPNAME_CNF
-# ----------------------
-# func_stripname_cnf 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).
-#
-# This function is identical to the (non-XSI) version of func_stripname,
-# except this one can be used by m4 code that may be executed by configure,
-# rather than the libtool script.
-m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl
-AC_REQUIRE([_LT_DECL_SED])
-AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])
-func_stripname_cnf ()
-{
- case @S|@2 in
- .*) func_stripname_result=`$ECHO "@S|@3" | $SED "s%^@S|@1%%; s%\\\\@S|@2\$%%"`;;
- *) func_stripname_result=`$ECHO "@S|@3" | $SED "s%^@S|@1%%; s%@S|@2\$%%"`;;
- esac
-} # func_stripname_cnf
-])# _LT_FUNC_STRIPNAME_CNF
-
-
-# _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
-AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])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
-], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF
-package foo
-func foo() {
-}
-_LT_EOF
-])
-
-_lt_libdeps_save_CFLAGS=$CFLAGS
-case "$CC $CFLAGS " in #(
-*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
-*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
-*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
-esac
+# longlong.m4 serial 17
+dnl Copyright (C) 1999-2007, 2009-2015 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
-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 $prev$p in
-
- -L* | -R* | -l*)
- # Some compilers place space between "-{L,R}" and the path.
- # Remove the space.
- if test x-L = "$p" ||
- test x-R = "$p"; then
- prev=$p
- continue
- fi
-
- # Expand the sysroot to ease extracting the directories later.
- if test -z "$prev"; then
- case $p in
- -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
- -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
- -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
- esac
- fi
- case $p in
- =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
- esac
- if test no = "$pre_test_object_deps_done"; then
- case $prev 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
- prev=
- ;;
-
- *.lto.$objext) ;; # Ignore GCC LTO objects
- *.$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 no = "$pre_test_object_deps_done"; 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
-CFLAGS=$_lt_libdeps_save_CFLAGS
-
-# 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)=
- ;;
-esac
-])
+dnl From Paul Eggert.
-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_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_LANG_PUSH(Fortran 77)
-if test -z "$F77" || test no = "$F77"; then
- _lt_disable_F77=yes
-fi
+# Define HAVE_LONG_LONG_INT if 'long long int' works.
+# This fixes a bug in Autoconf 2.61, and can be faster
+# than what's in Autoconf 2.62 through 2.68.
-_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_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(reload_flag, $1)=$reload_flag
-_LT_TAGVAR(reload_cmds, $1)=$reload_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 yes != "$_lt_disable_F77"; 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
- lt_save_CFLAGS=$CFLAGS
- CC=${F77-"f77"}
- CFLAGS=$FFLAGS
- 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 no = "$can_build_shared" && 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 yes = "$enable_shared" && enable_static=no
- if test -n "$RANLIB"; then
- archive_cmds="$archive_cmds~\$RANLIB \$lib"
- postinstall_cmds='$RANLIB $lib'
- fi
- ;;
- aix[[4-9]]*)
- if test ia64 != "$host_cpu"; then
- case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
- yes,aix,yes) ;; # shared object as lib.so file only
- yes,svr4,*) ;; # shared object as lib.so archive member only
- yes,*) enable_static=no ;; # shared object in lib.a archive as well
- esac
- 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 yes = "$enable_shared" || 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
- CFLAGS=$lt_save_CFLAGS
-fi # test yes != "$_lt_disable_F77"
-
-AC_LANG_POP
-])# _LT_LANG_F77_CONFIG
-
-
-# _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_LANG_PUSH(Fortran)
-
-if test -z "$FC" || test no = "$FC"; then
- _lt_disable_FC=yes
-fi
+# Note: If the type 'long long int' exists but is only 32 bits large
+# (as on some very old compilers), HAVE_LONG_LONG_INT will not be
+# defined. In this case you can treat 'long long int' like 'long int'.
-_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_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(reload_flag, $1)=$reload_flag
-_LT_TAGVAR(reload_cmds, $1)=$reload_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 yes != "$_lt_disable_FC"; 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
- lt_save_CFLAGS=$CFLAGS
- CC=${FC-"f95"}
- CFLAGS=$FCFLAGS
- 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 no = "$can_build_shared" && 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 yes = "$enable_shared" && enable_static=no
- if test -n "$RANLIB"; then
- archive_cmds="$archive_cmds~\$RANLIB \$lib"
- postinstall_cmds='$RANLIB $lib'
+AC_DEFUN([AC_TYPE_LONG_LONG_INT],
+[
+ AC_REQUIRE([AC_TYPE_UNSIGNED_LONG_LONG_INT])
+ AC_CACHE_CHECK([for long long int], [ac_cv_type_long_long_int],
+ [ac_cv_type_long_long_int=yes
+ if test "x${ac_cv_prog_cc_c99-no}" = xno; then
+ ac_cv_type_long_long_int=$ac_cv_type_unsigned_long_long_int
+ if test $ac_cv_type_long_long_int = yes; then
+ dnl Catch a bug in Tandem NonStop Kernel (OSS) cc -O circa 2004.
+ dnl If cross compiling, assume the bug is not important, since
+ dnl nobody cross compiles for this platform as far as we know.
+ AC_RUN_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[@%:@include <limits.h>
+ @%:@ifndef LLONG_MAX
+ @%:@ define HALF \
+ (1LL << (sizeof (long long int) * CHAR_BIT - 2))
+ @%:@ define LLONG_MAX (HALF - 1 + HALF)
+ @%:@endif]],
+ [[long long int n = 1;
+ int i;
+ for (i = 0; ; i++)
+ {
+ long long int m = n << i;
+ if (m >> i != n)
+ return 1;
+ if (LLONG_MAX / 2 < m)
+ break;
+ }
+ return 0;]])],
+ [],
+ [ac_cv_type_long_long_int=no],
+ [:])
fi
- ;;
- aix[[4-9]]*)
- if test ia64 != "$host_cpu"; then
- case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
- yes,aix,yes) ;; # shared object as lib.so file only
- yes,svr4,*) ;; # shared object as lib.so archive member only
- yes,*) enable_static=no ;; # shared object in lib.a archive as well
- esac
- 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 yes = "$enable_shared" || 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
- CFLAGS=$lt_save_CFLAGS
-fi # test yes != "$_lt_disable_FC"
-
-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_CFLAGS=$CFLAGS
-lt_save_GCC=$GCC
-GCC=yes
-CC=${GCJ-"gcj"}
-CFLAGS=$GCJFLAGS
-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
-_LT_TAGVAR(reload_flag, $1)=$reload_flag
-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
-
-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
-CFLAGS=$lt_save_CFLAGS
-])# _LT_LANG_GCJ_CONFIG
-
-
-# _LT_LANG_GO_CONFIG([TAG])
-# --------------------------
-# Ensure that the configuration variables for the GNU Go compiler
-# are suitably defined. These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to 'libtool'.
-m4_defun([_LT_LANG_GO_CONFIG],
-[AC_REQUIRE([LT_PROG_GO])dnl
-AC_LANG_SAVE
-
-# Source file extension for Go test sources.
-ac_ext=go
-
-# Object file extension for compiled Go test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="package main; func main() { }"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='package main; func main() { }'
-
-# 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_CFLAGS=$CFLAGS
-lt_save_GCC=$GCC
-GCC=yes
-CC=${GOC-"gccgo"}
-CFLAGS=$GOFLAGS
-compiler=$CC
-_LT_TAGVAR(compiler, $1)=$CC
-_LT_TAGVAR(LD, $1)=$LD
-_LT_CC_BASENAME([$compiler])
-
-# Go 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
-_LT_TAGVAR(reload_flag, $1)=$reload_flag
-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
-
-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
-CFLAGS=$lt_save_CFLAGS
-])# _LT_LANG_GO_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_CFLAGS=$CFLAGS
-lt_save_GCC=$GCC
-GCC=
-CC=${RC-"windres"}
-CFLAGS=
-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
-CFLAGS=$lt_save_CFLAGS
-])# _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 set = "${GCJFLAGS+set}" || 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_GO
-# ----------
-AC_DEFUN([LT_PROG_GO],
-[AC_CHECK_TOOL(GOC, gccgo,)
-])
-
-
-# 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_DLLTOOL
-# ----------------
-# Ensure DLLTOOL variable is set.
-m4_defun([_LT_DECL_DLLTOOL],
-[AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-test -z "$DLLTOOL" && DLLTOOL=dlltool
-_LT_DECL([], [DLLTOOL], [1], [DLL creation program])
-AC_SUBST([DLLTOOL])
-])
-
-# _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])
+ if test $ac_cv_type_long_long_int = yes; then
+ AC_DEFINE([HAVE_LONG_LONG_INT], [1],
+ [Define to 1 if the system has the type 'long long int'.])
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 10 -lt "$lt_ac_count" && 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],
-[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_PATH_CONVERSION_FUNCTIONS
-# -----------------------------
-# Determine what file name conversion functions should be used by
-# func_to_host_file (and, implicitly, by func_to_host_path). These are needed
-# for certain cross-compile configurations and native mingw.
-m4_defun([_LT_PATH_CONVERSION_FUNCTIONS],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-AC_MSG_CHECKING([how to convert $build file names to $host format])
-AC_CACHE_VAL(lt_cv_to_host_file_cmd,
-[case $host in
- *-*-mingw* )
- case $build in
- *-*-mingw* ) # actually msys
- lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
- ;;
- *-*-cygwin* )
- lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
- ;;
- * ) # otherwise, assume *nix
- lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
- ;;
- esac
- ;;
- *-*-cygwin* )
- case $build in
- *-*-mingw* ) # actually msys
- lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
- ;;
- *-*-cygwin* )
- lt_cv_to_host_file_cmd=func_convert_file_noop
- ;;
- * ) # otherwise, assume *nix
- lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
- ;;
- esac
- ;;
- * ) # unhandled hosts (and "normal" native builds)
- lt_cv_to_host_file_cmd=func_convert_file_noop
- ;;
-esac
-])
-to_host_file_cmd=$lt_cv_to_host_file_cmd
-AC_MSG_RESULT([$lt_cv_to_host_file_cmd])
-_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd],
- [0], [convert $build file names to $host format])dnl
-
-AC_MSG_CHECKING([how to convert $build file names to toolchain format])
-AC_CACHE_VAL(lt_cv_to_tool_file_cmd,
-[#assume ordinary cross tools, or native build.
-lt_cv_to_tool_file_cmd=func_convert_file_noop
-case $host in
- *-*-mingw* )
- case $build in
- *-*-mingw* ) # actually msys
- lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
- ;;
- esac
- ;;
-esac
-])
-to_tool_file_cmd=$lt_cv_to_tool_file_cmd
-AC_MSG_RESULT([$lt_cv_to_tool_file_cmd])
-_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd],
- [0], [convert $build files to toolchain format])dnl
-])# _LT_PATH_CONVERSION_FUNCTIONS
-
-# Helper functions for option handling. -*- Autoconf -*-
-#
-# Copyright (C) 2004-2005, 2007-2009, 2011-2015 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 8 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_UNLESS_OPTIONS([LT_INIT], [aix-soname=aix aix-soname=both aix-soname=svr4],
- [_LT_WITH_AIX_SONAME([aix])])
- ])
-])# _LT_SET_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], [1], [Assembler program])dnl
-
-test -z "$DLLTOOL" && DLLTOOL=dlltool
-_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl
-
-test -z "$OBJDUMP" && OBJDUMP=objdump
-_LT_DECL([], [OBJDUMP], [1], [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.])
-])
+# Define HAVE_UNSIGNED_LONG_LONG_INT if 'unsigned long long int' works.
+# This fixes a bug in Autoconf 2.61, and can be faster
+# than what's in Autoconf 2.62 through 2.68.
-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.])
-])
+# Note: If the type 'unsigned long long int' exists but is only 32 bits
+# large (as on some very old compilers), AC_TYPE_UNSIGNED_LONG_LONG_INT
+# will not be defined. In this case you can treat 'unsigned long long int'
+# like 'unsigned long int'.
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], [])
-dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])
-
-
-# _LT_WITH_AIX_SONAME([DEFAULT])
-# ----------------------------------
-# implement the --with-aix-soname flag, and support the `aix-soname=aix'
-# and `aix-soname=both' and `aix-soname=svr4' LT_INIT options. DEFAULT
-# is either `aix', `both' or `svr4'. If omitted, it defaults to `aix'.
-m4_define([_LT_WITH_AIX_SONAME],
-[m4_define([_LT_WITH_AIX_SONAME_DEFAULT], [m4_if($1, svr4, svr4, m4_if($1, both, both, aix))])dnl
-shared_archive_member_spec=
-case $host,$enable_shared in
-power*-*-aix[[5-9]]*,yes)
- AC_MSG_CHECKING([which variant of shared library versioning to provide])
- AC_ARG_WITH([aix-soname],
- [AS_HELP_STRING([--with-aix-soname=aix|svr4|both],
- [shared library versioning (aka "SONAME") variant to provide on AIX, @<:@default=]_LT_WITH_AIX_SONAME_DEFAULT[@:>@.])],
- [case $withval in
- aix|svr4|both)
- ;;
- *)
- AC_MSG_ERROR([Unknown argument to --with-aix-soname])
- ;;
- esac
- lt_cv_with_aix_soname=$with_aix_soname],
- [AC_CACHE_VAL([lt_cv_with_aix_soname],
- [lt_cv_with_aix_soname=]_LT_WITH_AIX_SONAME_DEFAULT)
- with_aix_soname=$lt_cv_with_aix_soname])
- AC_MSG_RESULT([$with_aix_soname])
- if test aix != "$with_aix_soname"; then
- # For the AIX way of multilib, we name the shared archive member
- # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o',
- # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File.
- # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag,
- # the AIX toolchain works better with OBJECT_MODE set (default 32).
- if test 64 = "${OBJECT_MODE-32}"; then
- shared_archive_member_spec=shr_64
- else
- shared_archive_member_spec=shr
- fi
+AC_DEFUN([AC_TYPE_UNSIGNED_LONG_LONG_INT],
+[
+ AC_CACHE_CHECK([for unsigned long long int],
+ [ac_cv_type_unsigned_long_long_int],
+ [ac_cv_type_unsigned_long_long_int=yes
+ if test "x${ac_cv_prog_cc_c99-no}" = xno; then
+ AC_LINK_IFELSE(
+ [_AC_TYPE_LONG_LONG_SNIPPET],
+ [],
+ [ac_cv_type_unsigned_long_long_int=no])
+ fi])
+ if test $ac_cv_type_unsigned_long_long_int = yes; then
+ AC_DEFINE([HAVE_UNSIGNED_LONG_LONG_INT], [1],
+ [Define to 1 if the system has the type 'unsigned long long int'.])
fi
- ;;
-*)
- with_aix_soname=aix
- ;;
-esac
-
-_LT_DECL([], [shared_archive_member_spec], [0],
- [Shared archive member basename, for filename based shared library versioning on AIX])dnl
-])# _LT_WITH_AIX_SONAME
-
-LT_OPTION_DEFINE([LT_INIT], [aix-soname=aix], [_LT_WITH_AIX_SONAME([aix])])
-LT_OPTION_DEFINE([LT_INIT], [aix-soname=both], [_LT_WITH_AIX_SONAME([both])])
-LT_OPTION_DEFINE([LT_INIT], [aix-soname=svr4], [_LT_WITH_AIX_SONAME([svr4])])
-
-
-# _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@<:@=PKGS@:>@],
- [try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
- [lt_p=${PACKAGE-default}
- case $withval in
- yes|no) pic_mode=$withval ;;
- *)
- pic_mode=default
- # Look at the argument we got. We use all the common list separators.
- lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
- for lt_pkg in $withval; do
- IFS=$lt_save_ifs
- if test "X$lt_pkg" = "X$lt_p"; then
- pic_mode=yes
- fi
- done
- IFS=$lt_save_ifs
- ;;
- esac],
- [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], [])
-
-
-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])])
-
-# ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*-
-#
-# Copyright (C) 2004-2005, 2007-2008, 2011-2015 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
-])
-
-# ltversion.m4 -- version numbers -*- Autoconf -*-
-#
-# Copyright (C) 2004, 2011-2015 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.
-
-# @configure_input@
-
-# serial 4179 ltversion.m4
-# This file is part of GNU Libtool
-
-m4_define([LT_PACKAGE_VERSION], [2.4.6])
-m4_define([LT_PACKAGE_REVISION], [2.4.6])
-
-AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.4.6'
-macro_revision='2.4.6'
-_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
-_LT_DECL(, macro_revision, 0)
])
-# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*-
-#
-# Copyright (C) 2004-2005, 2007, 2009, 2011-2015 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 5 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_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])])
-m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS], [AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])])
-m4_ifndef([_LT_AC_PROG_CXXCPP], [AC_DEFUN([_LT_AC_PROG_CXXCPP])])
-m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS], [AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])])
-m4_ifndef([_LT_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])])
-m4_ifndef([_LT_PROG_F77], [AC_DEFUN([_LT_PROG_F77])])
-m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])])
-m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])])
-
-# Copyright (C) 2002-2013 Free Software Foundation, Inc.
+# Expands to a C program that can be used to test for simultaneous support
+# of 'long long' and 'unsigned long long'. We don't want to say that
+# 'long long' is available if 'unsigned long long' is not, or vice versa,
+# because too many programs rely on the symmetry between signed and unsigned
+# integer types (excluding 'bool').
+AC_DEFUN([_AC_TYPE_LONG_LONG_SNIPPET],
+[
+ AC_LANG_PROGRAM(
+ [[/* For now, do not test the preprocessor; as of 2007 there are too many
+ implementations with broken preprocessors. Perhaps this can
+ be revisited in 2012. In the meantime, code should not expect
+ #if to work with literals wider than 32 bits. */
+ /* Test literals. */
+ long long int ll = 9223372036854775807ll;
+ long long int nll = -9223372036854775807LL;
+ unsigned long long int ull = 18446744073709551615ULL;
+ /* Test constant expressions. */
+ typedef int a[((-9223372036854775807LL < 0 && 0 < 9223372036854775807ll)
+ ? 1 : -1)];
+ typedef int b[(18446744073709551615ULL <= (unsigned long long int) -1
+ ? 1 : -1)];
+ int i = 63;]],
+ [[/* Test availability of runtime routines for shift and division. */
+ long long int llmax = 9223372036854775807ll;
+ unsigned long long int ullmax = 18446744073709551615ull;
+ return ((ll << 63) | (ll >> 63) | (ll < i) | (ll > i)
+ | (llmax / ll) | (llmax % ll)
+ | (ull << 63) | (ull >> 63) | (ull << i) | (ull >> i)
+ | (ullmax / ull) | (ullmax % ull));]])
+])
+
+# Copyright (C) 2002-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -9061,10 +146,10 @@ m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])])
# 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.14'
+[am__api_version='1.15'
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.14.1], [],
+m4_if([$1], [1.15], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -9080,14 +165,14 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.14.1])dnl
+[AM_AUTOMAKE_VERSION([1.15])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
# Figure out how to run the assembler. -*- Autoconf -*-
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -9107,7 +192,7 @@ _AM_IF_OPTION([no-dependencies],, [_AM_DEPENDENCIES([CCAS])])dnl
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -9152,15 +237,14 @@ _AM_IF_OPTION([no-dependencies],, [_AM_DEPENDENCIES([CCAS])])dnl
# configured tree to be moved without reconfiguration.
AC_DEFUN([AM_AUX_DIR_EXPAND],
-[dnl Rely on autoconf to set up CDPATH properly.
-AC_PREREQ([2.50])dnl
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
+[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
])
# AM_CONDITIONAL -*- Autoconf -*-
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
+# Copyright (C) 1997-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -9191,7 +275,7 @@ AC_CONFIG_COMMANDS_PRE(
Usually this means the macro was only invoked conditionally.]])
fi])])
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -9382,7 +466,7 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl
# Generate code to set up dependency tracking. -*- Autoconf -*-
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -9458,7 +542,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
# Do all the work for Automake. -*- Autoconf -*-
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -9548,8 +632,8 @@ AC_REQUIRE([AC_PROG_MKDIR_P])dnl
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
-# We need awk for the "check" target. The system "awk" is bad on
-# some platforms.
+# We need awk for the "check" target (and possibly the TAP driver). The
+# system "awk" is bad on some platforms.
AC_REQUIRE([AC_PROG_AWK])dnl
AC_REQUIRE([AC_PROG_MAKE_SET])dnl
AC_REQUIRE([AM_SET_LEADING_DOT])dnl
@@ -9622,7 +706,11 @@ to "yes", and re-run configure.
END
AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
fi
-fi])
+fi
+dnl The trailing newline in this macro's definition is deliberate, for
+dnl backward compatibility and to allow trailing 'dnl'-style comments
+dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841.
+])
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
@@ -9651,7 +739,7 @@ for _am_header in $config_headers :; do
done
echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -9662,7 +750,7 @@ echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_co
# Define $install_sh.
AC_DEFUN([AM_PROG_INSTALL_SH],
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-if test x"${install_sh}" != xset; then
+if test x"${install_sh+set}" != xset; then
case $am_aux_dir in
*\ * | *\ *)
install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
@@ -9672,7 +760,7 @@ if test x"${install_sh}" != xset; then
fi
AC_SUBST([install_sh])])
-# Copyright (C) 2003-2013 Free Software Foundation, Inc.
+# Copyright (C) 2003-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -9693,7 +781,7 @@ AC_SUBST([am__leading_dot])])
# Check to see how 'make' treats includes. -*- Autoconf -*-
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -9743,7 +831,7 @@ rm -f confinc confmf
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
+# Copyright (C) 1997-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -9782,7 +870,7 @@ fi
# Helper functions for option handling. -*- Autoconf -*-
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -9811,7 +899,7 @@ AC_DEFUN([_AM_SET_OPTIONS],
AC_DEFUN([_AM_IF_OPTION],
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -9858,7 +946,7 @@ AC_LANG_POP([C])])
# For backward compatibility.
AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -10093,7 +1181,7 @@ 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])])
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -10112,7 +1200,7 @@ AC_DEFUN([AM_RUN_LOG],
# Check to make sure that the build environment is sane. -*- Autoconf -*-
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -10193,7 +1281,7 @@ AC_CONFIG_COMMANDS_PRE(
rm -f conftest.file
])
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -10253,7 +1341,7 @@ AC_SUBST([AM_BACKSLASH])dnl
_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
])
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -10281,7 +1369,7 @@ fi
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
-# Copyright (C) 2006-2013 Free Software Foundation, Inc.
+# Copyright (C) 2006-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -10300,7 +1388,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
# Check how to create a tarball. -*- Autoconf -*-
-# Copyright (C) 2004-2013 Free Software Foundation, Inc.
+# Copyright (C) 2004-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -10436,6 +1524,11 @@ m4_include([m4/compiler.m4])
m4_include([m4/encoding.m4])
m4_include([m4/floatordering.m4])
m4_include([m4/idl.m4])
+m4_include([m4/libtool.m4])
+m4_include([m4/ltoptions.m4])
+m4_include([m4/ltsugar.m4])
+m4_include([m4/ltversion.m4])
+m4_include([m4/lt~obsolete.m4])
m4_include([m4/matlab.m4])
m4_include([m4/perl.m4])
m4_include([m4/php.m4])
diff --git a/bindings/Makefile.in b/bindings/Makefile.in
index b81e0b3..df4459c 100644
--- a/bindings/Makefile.in
+++ b/bindings/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -15,7 +15,17 @@
@SET_MAKE@
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -80,18 +90,19 @@ build_triplet = @build@
host_triplet = @host@
noinst_PROGRAMS = make_parameters$(EXEEXT)
subdir = bindings
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(top_srcdir)/depcomp
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compare_version.m4 \
$(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/encoding.m4 \
$(top_srcdir)/m4/floatordering.m4 $(top_srcdir)/m4/idl.m4 \
- $(top_srcdir)/m4/matlab.m4 $(top_srcdir)/m4/perl.m4 \
- $(top_srcdir)/m4/php.m4 $(top_srcdir)/m4/python.m4 \
- $(top_srcdir)/m4/win32.m4 $(top_srcdir)/m4/version.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/matlab.m4 \
+ $(top_srcdir)/m4/perl.m4 $(top_srcdir)/m4/php.m4 \
+ $(top_srcdir)/m4/python.m4 $(top_srcdir)/m4/win32.m4 \
+ $(top_srcdir)/m4/version.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/src/gd_config.h \
$(top_builddir)/src/getdata.h
@@ -184,6 +195,7 @@ am__define_uniq_tagged_files = \
ETAGS = etags
CTAGS = ctags
DIST_SUBDIRS = . f77 cxx idl python perl matlab php
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
am__relativize = \
dir0=`pwd`; \
@@ -484,7 +496,6 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign bindings/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign bindings/Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -824,6 +835,8 @@ uninstall-am:
mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
uninstall-am
+.PRECIOUS: Makefile
+
make_parameters$(EXEEXT): $(make_parameters_SOURCES) \
$(nodist_make_parameters_SOURCES)
diff --git a/bindings/cxx/Makefile.in b/bindings/cxx/Makefile.in
index 7df17ba..022798e 100644
--- a/bindings/cxx/Makefile.in
+++ b/bindings/cxx/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -16,7 +16,17 @@
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -80,18 +90,20 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
subdir = bindings/cxx
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(top_srcdir)/depcomp $(getdata_include_HEADERS)
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compare_version.m4 \
$(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/encoding.m4 \
$(top_srcdir)/m4/floatordering.m4 $(top_srcdir)/m4/idl.m4 \
- $(top_srcdir)/m4/matlab.m4 $(top_srcdir)/m4/perl.m4 \
- $(top_srcdir)/m4/php.m4 $(top_srcdir)/m4/python.m4 \
- $(top_srcdir)/m4/win32.m4 $(top_srcdir)/m4/version.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/matlab.m4 \
+ $(top_srcdir)/m4/perl.m4 $(top_srcdir)/m4/php.m4 \
+ $(top_srcdir)/m4/python.m4 $(top_srcdir)/m4/win32.m4 \
+ $(top_srcdir)/m4/version.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(getdata_include_HEADERS) \
+ $(am__DIST_COMMON)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/src/gd_config.h \
$(top_builddir)/src/getdata.h
@@ -239,6 +251,7 @@ am__define_uniq_tagged_files = \
ETAGS = etags
CTAGS = ctags
DIST_SUBDIRS = $(SUBDIRS)
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
am__relativize = \
dir0=`pwd`; \
@@ -552,7 +565,6 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign bindings/cxx/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign bindings/cxx/Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -965,6 +977,8 @@ uninstall-am: uninstall-getdata_includeHEADERS \
tags tags-am uninstall uninstall-am \
uninstall-getdata_includeHEADERS uninstall-libLTLIBRARIES
+.PRECIOUS: Makefile
+
clean-local:
rm -rf *~ getdata/*~
diff --git a/bindings/cxx/dirfile.cpp b/bindings/cxx/dirfile.cpp
index cc6ec8b..5379700 100644
--- a/bindings/cxx/dirfile.cpp
+++ b/bindings/cxx/dirfile.cpp
@@ -18,7 +18,6 @@
// along with GetData; if not, write to the Free Software Foundation, Inc.,
// 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-#include "getdata/dirfile.h"
#include "internal.h"
// This is not part of the Dirfile class, but it's convenient to put it here
diff --git a/bindings/cxx/internal.h b/bindings/cxx/internal.h
index 83f1a8c..123aa7c 100644
--- a/bindings/cxx/internal.h
+++ b/bindings/cxx/internal.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2011 D. V. Wiebe
+// Copyright (C) 2011, 2015 D. V. Wiebe
//
///////////////////////////////////////////////////////////////////////////
//
@@ -25,9 +25,15 @@
#include "getdata/dirfile.h"
#include <cstring>
-#include <stdlib.h>
-#include <stdio.h>
+#include <cstdlib>
+#include <cstdio>
#include <stdint.h>
+#ifdef HAVE_INTTYPES_H
+#ifndef __STDC_FORMAT_MACROS
+#define __STDC_FORMAT_MACROS
+#endif
+#include <inttypes.h>
+#endif
/* debugging macros */
#ifdef GETDATA_DEBUG
diff --git a/bindings/cxx/test/Makefile.in b/bindings/cxx/test/Makefile.in
index eac6347..2a690af 100644
--- a/bindings/cxx/test/Makefile.in
+++ b/bindings/cxx/test/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -14,7 +14,17 @@
@SET_MAKE@
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -80,18 +90,19 @@ host_triplet = @host@
TESTS = big_test$(EXEEXT)
check_PROGRAMS = $(am__EXEEXT_1)
subdir = bindings/cxx/test
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(top_srcdir)/depcomp
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compare_version.m4 \
$(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/encoding.m4 \
$(top_srcdir)/m4/floatordering.m4 $(top_srcdir)/m4/idl.m4 \
- $(top_srcdir)/m4/matlab.m4 $(top_srcdir)/m4/perl.m4 \
- $(top_srcdir)/m4/php.m4 $(top_srcdir)/m4/python.m4 \
- $(top_srcdir)/m4/win32.m4 $(top_srcdir)/m4/version.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/matlab.m4 \
+ $(top_srcdir)/m4/perl.m4 $(top_srcdir)/m4/php.m4 \
+ $(top_srcdir)/m4/python.m4 $(top_srcdir)/m4/win32.m4 \
+ $(top_srcdir)/m4/version.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/src/gd_config.h \
$(top_builddir)/src/getdata.h
@@ -188,6 +199,7 @@ am__tty_colors = { \
std='[m'; \
fi; \
}
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -454,7 +466,6 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign bindings/cxx/test/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign bindings/cxx/test/Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -820,6 +831,8 @@ uninstall-am:
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
tags tags-am uninstall uninstall-am
+.PRECIOUS: Makefile
+
# clean up after the tests
check-local: check-TESTS
diff --git a/bindings/cxx/windowentry.cpp b/bindings/cxx/windowentry.cpp
index e500ca1..49253fb 100644
--- a/bindings/cxx/windowentry.cpp
+++ b/bindings/cxx/windowentry.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2011, 2012 D. V. Wiebe
+// Copyright (C) 2011, 2012, 2015 D. V. Wiebe
//
///////////////////////////////////////////////////////////////////////////
//
@@ -24,9 +24,9 @@ WindowEntry::WindowEntry(const char* field_code, const char* in_field,
const char* check, WindOpType windop, gd_triplet_t threshold,
int fragment_index) : Entry()
{
- dtrace("\"%s\", \"%s\", \"%s\", %i, {%g,%llx,%lli}, %i", field_code,
- in_field, check, (unsigned)windop, threshold.r,
- (unsigned long long)threshold.u, (long long)threshold.i, fragment_index);
+ dtrace("\"%s\", \"%s\", \"%s\", %i, {%g,%" PRIX64 ",%" PRId64 "}, %i",
+ field_code, in_field, check, (unsigned)windop, threshold.r, threshold.u,
+ threshold.i, fragment_index);
E.field = strdup(field_code);
E.field_type = GD_WINDOW_ENTRY;
@@ -78,8 +78,7 @@ int WindowEntry::SetThreshold(gd_triplet_t threshold)
{
int ret = 0;
- dtrace("{%g,%llX,%lli}", threshold.r, (unsigned long long)threshold.u,
- (long long)threshold.i);
+ dtrace("{%g,%" PRIX64 ",%" PRId64 "}", threshold.r, threshold.u, threshold.i);
E.u.window.threshold = threshold;
diff --git a/bindings/f77/Makefile.in b/bindings/f77/Makefile.in
index b9bd333..74b0025 100644
--- a/bindings/f77/Makefile.in
+++ b/bindings/f77/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -16,7 +16,17 @@
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -80,18 +90,19 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
subdir = bindings/f77
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(top_srcdir)/depcomp
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compare_version.m4 \
$(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/encoding.m4 \
$(top_srcdir)/m4/floatordering.m4 $(top_srcdir)/m4/idl.m4 \
- $(top_srcdir)/m4/matlab.m4 $(top_srcdir)/m4/perl.m4 \
- $(top_srcdir)/m4/php.m4 $(top_srcdir)/m4/python.m4 \
- $(top_srcdir)/m4/win32.m4 $(top_srcdir)/m4/version.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/matlab.m4 \
+ $(top_srcdir)/m4/perl.m4 $(top_srcdir)/m4/php.m4 \
+ $(top_srcdir)/m4/python.m4 $(top_srcdir)/m4/win32.m4 \
+ $(top_srcdir)/m4/version.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/src/gd_config.h \
$(top_builddir)/src/getdata.h
@@ -238,6 +249,7 @@ am__define_uniq_tagged_files = \
ETAGS = etags
CTAGS = ctags
DIST_SUBDIRS = $(SUBDIRS)
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
am__relativize = \
dir0=`pwd`; \
@@ -541,7 +553,6 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign bindings/f77/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign bindings/f77/Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -959,6 +970,8 @@ uninstall-am: uninstall-libLTLIBRARIES uninstall-nodist_includeHEADERS
tags tags-am uninstall uninstall-am uninstall-libLTLIBRARIES \
uninstall-nodist_includeHEADERS
+.PRECIOUS: Makefile
+
getdata.mod: getdata.o
diff --git a/bindings/f77/fgetdata.c b/bindings/f77/fgetdata.c
index 493bf25..5bf9df5 100644
--- a/bindings/f77/fgetdata.c
+++ b/bindings/f77/fgetdata.c
@@ -151,16 +151,16 @@ static gd_triplet_t _GDF_SetTriplet(gd_windop_t op, const void *data)
case GD_WINDOP_EQ:
case GD_WINDOP_NE:
t.i = *(int32_t*)data;
- dreturn("%lli", (long long)t.i);
+ dreturn("%" PRId64, t.i);
break;
case GD_WINDOP_SET:
case GD_WINDOP_CLR:
t.u = *(int32_t*)data;
- dreturn("%llu", (unsigned long long)t.u);
+ dreturn("%" PRIu64, t.u);
break;
default:
t.r = *(double*)data;
- dreturn("%g", t.r);
+ dreturn("%.15g", t.r);
break;
}
diff --git a/bindings/f77/test/Makefile.in b/bindings/f77/test/Makefile.in
index 9b9da64..93cca23 100644
--- a/bindings/f77/test/Makefile.in
+++ b/bindings/f77/test/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -14,7 +14,17 @@
@SET_MAKE@
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -80,18 +90,19 @@ host_triplet = @host@
TESTS = gdcopn$(EXEEXT) big_test$(EXEEXT) $(am__EXEEXT_1)
check_PROGRAMS = $(am__EXEEXT_2)
subdir = bindings/f77/test
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(srcdir)/test_getdata.f.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compare_version.m4 \
$(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/encoding.m4 \
$(top_srcdir)/m4/floatordering.m4 $(top_srcdir)/m4/idl.m4 \
- $(top_srcdir)/m4/matlab.m4 $(top_srcdir)/m4/perl.m4 \
- $(top_srcdir)/m4/php.m4 $(top_srcdir)/m4/python.m4 \
- $(top_srcdir)/m4/win32.m4 $(top_srcdir)/m4/version.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/matlab.m4 \
+ $(top_srcdir)/m4/perl.m4 $(top_srcdir)/m4/php.m4 \
+ $(top_srcdir)/m4/python.m4 $(top_srcdir)/m4/win32.m4 \
+ $(top_srcdir)/m4/version.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/src/gd_config.h \
$(top_builddir)/src/getdata.h
@@ -225,6 +236,7 @@ am__tty_colors = { \
std='[m'; \
fi; \
}
+am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/test_getdata.f.in
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -500,7 +512,6 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign bindings/f77/test/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign bindings/f77/test/Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -868,6 +879,8 @@ uninstall-am:
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
tags tags-am uninstall uninstall-am
+.PRECIOUS: Makefile
+
clean-local:
rm -rf test_dirfile
diff --git a/bindings/idl/Makefile.in b/bindings/idl/Makefile.in
index 41b65fc..45b56e7 100644
--- a/bindings/idl/Makefile.in
+++ b/bindings/idl/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -16,7 +16,17 @@
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -80,18 +90,19 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
subdir = bindings/idl
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(srcdir)/makedlm.sh.in $(top_srcdir)/depcomp
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compare_version.m4 \
$(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/encoding.m4 \
$(top_srcdir)/m4/floatordering.m4 $(top_srcdir)/m4/idl.m4 \
- $(top_srcdir)/m4/matlab.m4 $(top_srcdir)/m4/perl.m4 \
- $(top_srcdir)/m4/php.m4 $(top_srcdir)/m4/python.m4 \
- $(top_srcdir)/m4/win32.m4 $(top_srcdir)/m4/version.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/matlab.m4 \
+ $(top_srcdir)/m4/perl.m4 $(top_srcdir)/m4/php.m4 \
+ $(top_srcdir)/m4/python.m4 $(top_srcdir)/m4/win32.m4 \
+ $(top_srcdir)/m4/version.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/src/gd_config.h \
$(top_builddir)/src/getdata.h
@@ -218,6 +229,8 @@ am__define_uniq_tagged_files = \
ETAGS = etags
CTAGS = ctags
DIST_SUBDIRS = $(SUBDIRS)
+am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/makedlm.sh.in \
+ $(top_srcdir)/depcomp
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
am__relativize = \
dir0=`pwd`; \
@@ -523,7 +536,6 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign bindings/idl/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign bindings/idl/Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -926,6 +938,8 @@ uninstall-am: uninstall-idlLTLIBRARIES uninstall-nodist_idlHEADERS
pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
uninstall-idlLTLIBRARIES uninstall-nodist_idlHEADERS
+.PRECIOUS: Makefile
+
sublist.c.in: getdata.c makedlm.sh
${SHELL} ./makedlm.sh -c $< > $@
diff --git a/bindings/idl/getdata.c b/bindings/idl/getdata.c
index 94418f1..c092638 100644
--- a/bindings/idl/getdata.c
+++ b/bindings/idl/getdata.c
@@ -2413,7 +2413,7 @@ void gdidl_alter_lincom(int argc, IDL_VPTR argv[], char *argk)
const char** in_field = NULL;
IDL_VPTR tmp_m = NULL;
IDL_VPTR tmp_b = NULL;
- int comp_scal = 1;
+ int comp_scal = 0;
GDIDL_KW_INIT_ERROR;
kw.in_field = kw.m = kw.b = NULL;
@@ -2769,7 +2769,7 @@ void gdidl_alter_polynom(int argc, IDL_VPTR argv[], char *argk)
} KW_RESULT;
KW_RESULT kw;
- int comp_scal = 1;
+ int comp_scal = 0;
double* a = NULL;
double complex* ca = NULL;
const char* in_field = NULL;
@@ -3676,18 +3676,25 @@ IDL_VPTR gdidl_getdata(int argc, IDL_VPTR argv[], char *argk)
if (kw.return_type == GD_INT8)
GDIDL_KW_ABORT("Cannot return data as a signed 8-bit integer.");
- void* data = malloc(kw.n_samples * GD_SIZE(kw.return_type));
-
- n = gd_getdata64(D, field_code, kw.first_frame, kw.first_sample, 0,
- kw.n_samples, kw.return_type, data);
+ if (kw.return_type == GD_NULL) {
+ n = gd_getdata64(D, field_code, kw.first_frame, kw.first_sample, 0,
+ kw.n_samples, GD_NULL, NULL);
- if (n == 0) {
- free(data);
- r = IDL_GettmpInt(0);
+ r = IDL_GettmpInt(n);
} else {
- IDL_MEMINT dim[] = { n };
- r = IDL_ImportArray(1, dim, gdidl_idl_type(kw.return_type), data,
- (IDL_ARRAY_FREE_CB)free, NULL);
+ void* data = malloc(kw.n_samples * GD_SIZE(kw.return_type));
+
+ n = gd_getdata64(D, field_code, kw.first_frame, kw.first_sample, 0,
+ kw.n_samples, kw.return_type, data);
+
+ if (n == 0) {
+ free(data);
+ r = IDL_GettmpInt(0);
+ } else {
+ IDL_MEMINT dim[] = { n };
+ r = IDL_ImportArray(1, dim, gdidl_idl_type(kw.return_type), data,
+ (IDL_ARRAY_FREE_CB)free, NULL);
+ }
}
}
@@ -3733,6 +3740,7 @@ IDL_VPTR gdidl_get_constant(int argc, IDL_VPTR argv[], char *argk)
int const_type;
} KW_RESULT;
KW_RESULT kw;
+ IDL_VPTR r;
GDIDL_KW_INIT_ERROR;
kw.const_type = GD_FLOAT64;
@@ -3749,20 +3757,25 @@ IDL_VPTR gdidl_get_constant(int argc, IDL_VPTR argv[], char *argk)
DIRFILE* D = gdidl_get_dirfile(IDL_LongScalar(argv[0]));
const char* field_code = IDL_VarGetString(argv[1]);
- void* data = malloc(16);
+ if (kw.const_type == GD_NULL) {
+ int ret = gd_get_constant(D, field_code, GD_NULL, NULL);
- int ret = gd_get_constant(D, field_code, kw.const_type, data);
-
- IDL_VPTR r;
- if (!ret) {
- r = IDL_Gettmp();
- r->value = gdidl_to_alltypes(kw.const_type, data);
- r->type = gdidl_idl_type(kw.const_type);
+ r = IDL_GettmpInt(ret);
} else {
- GDIDL_SET_ERROR(D);
- r = IDL_GettmpInt(0);
+ void* data = malloc(16);
+
+ int ret = gd_get_constant(D, field_code, kw.const_type, data);
+
+ if (!ret) {
+ r = IDL_Gettmp();
+ r->value = gdidl_to_alltypes(kw.const_type, data);
+ r->type = gdidl_idl_type(kw.const_type);
+ } else {
+ GDIDL_SET_ERROR(D);
+ r = IDL_GettmpInt(0);
+ }
+ free(data);
}
- free(data);
IDL_KW_FREE;
@@ -3785,6 +3798,7 @@ IDL_VPTR gdidl_get_carray(int argc, IDL_VPTR argv[], char *argk)
int const_type;
} KW_RESULT;
KW_RESULT kw;
+ IDL_VPTR r;
GDIDL_KW_INIT_ERROR;
kw.const_type = GD_FLOAT64;
@@ -3803,27 +3817,37 @@ IDL_VPTR gdidl_get_carray(int argc, IDL_VPTR argv[], char *argk)
DIRFILE* D = gdidl_get_dirfile(IDL_LongScalar(argv[0]));
const char* field_code = IDL_VarGetString(argv[1]);
- if (kw.n == 0) {
- kw.n = gd_array_len(D, field_code);
- if (kw.n > kw.start)
- kw.n -= kw.start;
- else
- kw.n = 0;
- }
- data = malloc(16 * kw.n);
- ret = gd_get_carray_slice(D, field_code, kw.start, kw.n, kw.const_type,
- data);
+ if (kw.const_type == GD_NULL) {
+ if (kw.n == 0)
+ ret = gd_get_carray(D, field_code, GD_NULL, NULL);
+ else
+ ret = gd_get_carray_slice(D, field_code, kw.start, kw.n, GD_NULL, NULL);
- IDL_VPTR r;
- if (!ret) {
- IDL_MEMINT dim[] = { kw.n };
- r = IDL_ImportArray(1, dim, gdidl_idl_type(kw.const_type), data,
- (IDL_ARRAY_FREE_CB)free, NULL);
- } else {
- free(data);
GDIDL_SET_ERROR(D);
- r = IDL_GettmpInt(0);
+ r = IDL_GettmpInt(ret);
+ } else {
+ if (kw.n == 0) {
+ kw.n = gd_array_len(D, field_code);
+ if (kw.n > kw.start)
+ kw.n -= kw.start;
+ else
+ kw.n = 0;
+ }
+
+ data = malloc(16 * kw.n);
+ ret = gd_get_carray_slice(D, field_code, kw.start, kw.n, kw.const_type,
+ data);
+
+ if (!ret) {
+ IDL_MEMINT dim[] = { kw.n };
+ r = IDL_ImportArray(1, dim, gdidl_idl_type(kw.const_type), data,
+ (IDL_ARRAY_FREE_CB)free, NULL);
+ } else {
+ free(data);
+ GDIDL_SET_ERROR(D);
+ r = IDL_GettmpInt(0);
+ }
}
IDL_KW_FREE;
@@ -4282,7 +4306,7 @@ IDL_VPTR gdidl_get_frameoffset(int argc, IDL_VPTR argv[], char *argk)
IDL_VPTR r = IDL_Gettmp();
r->type = IDL_TYP_LONG64;
- r->value.l64 = (long long)foffs;
+ r->value.l64 = (IDL_LONG64)foffs;
dreturn("%p", r);
return r;
}
diff --git a/bindings/idl/test/Makefile.in b/bindings/idl/test/Makefile.in
index db6f7b6..71b4be7 100644
--- a/bindings/idl/test/Makefile.in
+++ b/bindings/idl/test/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -14,7 +14,17 @@
@SET_MAKE@
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -78,17 +88,19 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
subdir = bindings/idl/test
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compare_version.m4 \
$(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/encoding.m4 \
$(top_srcdir)/m4/floatordering.m4 $(top_srcdir)/m4/idl.m4 \
- $(top_srcdir)/m4/matlab.m4 $(top_srcdir)/m4/perl.m4 \
- $(top_srcdir)/m4/php.m4 $(top_srcdir)/m4/python.m4 \
- $(top_srcdir)/m4/win32.m4 $(top_srcdir)/m4/version.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/matlab.m4 \
+ $(top_srcdir)/m4/perl.m4 $(top_srcdir)/m4/php.m4 \
+ $(top_srcdir)/m4/python.m4 $(top_srcdir)/m4/win32.m4 \
+ $(top_srcdir)/m4/version.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/src/gd_config.h \
$(top_builddir)/src/getdata.h
@@ -136,6 +148,7 @@ am__tty_colors = { \
std='[m'; \
fi; \
}
+am__DIST_COMMON = $(srcdir)/Makefile.in
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -402,7 +415,6 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign bindings/idl/test/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign bindings/idl/test/Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -672,6 +684,8 @@ uninstall-am:
mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
uninstall-am
+.PRECIOUS: Makefile
+
# clean up after the tests
check-local: check-TESTS
diff --git a/bindings/idl/test/big_test.pro b/bindings/idl/test/big_test.pro
index c60880e..1c61466 100644
--- a/bindings/idl/test/big_test.pro
+++ b/bindings/idl/test/big_test.pro
@@ -99,11 +99,21 @@ n = gd_getdata(d, "data", type=!GD.INT16, first_frame=5, num_frames=1)
nume += check_ok(3, d)
nume += check_simple(3, n, INDGEN(8) + 41)
+; 11: gd_getdata check (NULL)
+n = gd_getdata(d, "data", type=!GD.NULL, first_frame=5, num_frames=1)
+nume += check_ok(11, d)
+nume += check_simple(11, n, 8)
+
; 12: gd_get_constant check
n = gd_get_constant(d, "const", type=!GD.FLOAT64)
nume += check_ok(12, d)
nume += check_simple(12, n, 5.5)
+; 20: gd_get_constant check (NULL)
+n = gd_get_constant(d, "const", type=!GD.NULL)
+nume += check_ok(20, d)
+nume += check_simple(20, n, 0)
+
; 23: gd_nfields check
n = gd_nfields(d)
nume += check_ok(23, d)
@@ -1597,6 +1607,17 @@ nume += check_simple2(259, 13, n.scalar, [ "", "const", "const", "carray", $
n = gd_encoding_support(!GD.SIE_ENCODED)
nume += check_simple(271, n, !GD.RDWR)
+; 273: gd_get_carray
+n = gd_get_carray(d, "carray", type=!GD.NULL)
+nume += check_ok(273, d)
+nume += check_simple(273, n, 0)
+
+; 274: gd_get_carray_slice
+n = gd_get_carray(d, "carray", type=!GD.NULL, len=2, start=2)
+nume += check_ok(274, d)
+nume += check_simple(274, n, 0)
+
+
diff --git a/bindings/matlab/Makefile.in b/bindings/matlab/Makefile.in
index 9f2f5be..3f6ae12 100644
--- a/bindings/matlab/Makefile.in
+++ b/bindings/matlab/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -16,7 +16,17 @@
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -80,19 +90,20 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
subdir = bindings/matlab
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(srcdir)/make_contents.sh.in $(dist_matlab_SCRIPTS) \
- $(top_srcdir)/depcomp
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compare_version.m4 \
$(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/encoding.m4 \
$(top_srcdir)/m4/floatordering.m4 $(top_srcdir)/m4/idl.m4 \
- $(top_srcdir)/m4/matlab.m4 $(top_srcdir)/m4/perl.m4 \
- $(top_srcdir)/m4/php.m4 $(top_srcdir)/m4/python.m4 \
- $(top_srcdir)/m4/win32.m4 $(top_srcdir)/m4/version.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/matlab.m4 \
+ $(top_srcdir)/m4/perl.m4 $(top_srcdir)/m4/php.m4 \
+ $(top_srcdir)/m4/python.m4 $(top_srcdir)/m4/win32.m4 \
+ $(top_srcdir)/m4/version.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(dist_matlab_SCRIPTS) \
+ $(am__DIST_COMMON)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/src/gd_config.h \
$(top_builddir)/src/getdata.h
@@ -218,6 +229,8 @@ am__define_uniq_tagged_files = \
ETAGS = etags
CTAGS = ctags
DIST_SUBDIRS = $(SUBDIRS)
+am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/make_contents.sh.in \
+ $(top_srcdir)/depcomp
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
am__relativize = \
dir0=`pwd`; \
@@ -572,7 +585,6 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign bindings/matlab/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign bindings/matlab/Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -1029,6 +1041,8 @@ uninstall-am: uninstall-dist_matlabSCRIPTS uninstall-libLTLIBRARIES \
uninstall-dist_matlabSCRIPTS uninstall-libLTLIBRARIES \
uninstall-nodist_matlabSCRIPTS
+.PRECIOUS: Makefile
+
%.m: %.c ${srcdir}/doc.tail
${GREP} '^ %' $< | ${SED} -e 's/^ //' > $@
diff --git a/bindings/matlab/gd_alter_frameoffset.c b/bindings/matlab/gd_alter_frameoffset.c
index 8922424..0174ffa 100644
--- a/bindings/matlab/gd_alter_frameoffset.c
+++ b/bindings/matlab/gd_alter_frameoffset.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2013 D. V. Wiebe
+/* Copyright (C) 2013, 2015 D. V. Wiebe
*
***************************************************************************
*
@@ -41,13 +41,13 @@ void mexFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prhs[])
{
DIRFILE *D;
int i, r;
- unsigned long long o;
+ uint64_t o;
GDMX_NO_LHS;
GDMX_CHECK_RHS(4);
D = gdmx_to_dirfile(prhs[0]);
- o = gdmx_to_ullong(prhs, 1);
+ o = gdmx_to_uint64(prhs, 1);
i = gdmx_to_int(prhs, 2);
r = gdmx_to_int(prhs, 3);
diff --git a/bindings/matlab/gd_bof.c b/bindings/matlab/gd_bof.c
index 597076c..012b16e 100644
--- a/bindings/matlab/gd_bof.c
+++ b/bindings/matlab/gd_bof.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2013 D. V. Wiebe
+/* Copyright (C) 2013, 2015 D. V. Wiebe
*
***************************************************************************
*
@@ -40,7 +40,7 @@ void mexFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prhs[])
DIRFILE *D;
void *data;
char *field_code;
- unsigned long long n;
+ uint64_t n;
GDMX_CHECK_RHS(2);
@@ -52,5 +52,5 @@ void mexFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prhs[])
mxFree(field_code);
gdmx_err(D, 0);
- plhs[0] = gdmx_from_ullong(n);
+ plhs[0] = gdmx_from_uint64(n);
}
diff --git a/bindings/matlab/gd_eof.c b/bindings/matlab/gd_eof.c
index 6e85037..8054755 100644
--- a/bindings/matlab/gd_eof.c
+++ b/bindings/matlab/gd_eof.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2013 D. V. Wiebe
+/* Copyright (C) 2013, 2015 D. V. Wiebe
*
***************************************************************************
*
@@ -40,7 +40,7 @@ void mexFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prhs[])
DIRFILE *D;
void *data;
char *field_code;
- unsigned long long n;
+ uint64_t n;
GDMX_CHECK_RHS(2);
@@ -52,5 +52,5 @@ void mexFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prhs[])
mxFree(field_code);
gdmx_err(D, 0);
- plhs[0] = gdmx_from_ullong(n);
+ plhs[0] = gdmx_from_uint64(n);
}
diff --git a/bindings/matlab/gd_framenum.c b/bindings/matlab/gd_framenum.c
index f9902e7..b619e5f 100644
--- a/bindings/matlab/gd_framenum.c
+++ b/bindings/matlab/gd_framenum.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2013 D. V. Wiebe
+/* Copyright (C) 2013, 2015 D. V. Wiebe
*
***************************************************************************
*
@@ -43,7 +43,7 @@ void mexFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prhs[])
void *data;
char *field_code;
double r, value;
- long long first_samp = 0, last_samp = 0;
+ int64_t first_samp = 0, last_samp = 0;
GDMX_CHECK_RHS2(3,5);
@@ -51,9 +51,9 @@ void mexFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prhs[])
field_code = gdmx_to_string(prhs, 1, 0);
value = gdmx_to_double(prhs, 2);
if (nrhs > 3)
- first_samp = gdmx_to_llong(prhs, 3);
+ first_samp = gdmx_to_int64(prhs, 3);
if (nrhs > 4)
- last_samp = gdmx_to_llong(prhs, 4);
+ last_samp = gdmx_to_int64(prhs, 4);
r = gd_framenum_subset64(D, field_code, value, first_samp, last_samp);
diff --git a/bindings/matlab/gd_frameoffset.c b/bindings/matlab/gd_frameoffset.c
index c19b0f5..35ab634 100644
--- a/bindings/matlab/gd_frameoffset.c
+++ b/bindings/matlab/gd_frameoffset.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2013 D. V. Wiebe
+/* Copyright (C) 2013, 2015 D. V. Wiebe
*
***************************************************************************
*
@@ -38,7 +38,7 @@
void mexFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prhs[])
{
DIRFILE *D;
- unsigned long long n;
+ uint64_t n;
int i;
GDMX_CHECK_RHS(2);
@@ -50,5 +50,5 @@ void mexFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prhs[])
gdmx_err(D, 0);
- plhs[0] = gdmx_from_ullong(n);
+ plhs[0] = gdmx_from_uint64(n);
}
diff --git a/bindings/matlab/gd_get_carray.c b/bindings/matlab/gd_get_carray.c
index ce500e3..ff37fd8 100644
--- a/bindings/matlab/gd_get_carray.c
+++ b/bindings/matlab/gd_get_carray.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2013, 2014 D. V. Wiebe
+/* Copyright (C) 2013, 2014, 2015 D. V. Wiebe
*
***************************************************************************
*
@@ -25,10 +25,13 @@
%
% A = GD_GET_CARRAY(DIRFILE,FIELD_CODE[,TYPE])
% retrieves an array, A, of value of the CARRAY field called
- % FIELD_CODE. If type is given, it should be one of the data type
+ % FIELD_CODE. If TYPE is given, it should be one of the data type
% symbols provided by GETDATA_CONSTANTS, otherwise the data are
% returned in their native type.
%
+ % If TYPE is the NULL data type, this function simply returns zero
+ % on success.
+ %
% The DIRFILE object should have previously been created with GD_OPEN.
%
% See the documentation on the C API function gd_get_carray_slice(3) in
@@ -55,16 +58,21 @@ void mexFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prhs[])
type = gd_native_type(D, field_code);
gdmx_err(D, 0);
}
+
+ if (type == GD_NULL) {
+ gd_get_carray(D, field_code, GD_NULL, NULL);
+ plhs[0] = gdmx_from_int(0);
+ } else {
+ len = gd_array_len(D, field_code);
+ gdmx_err(D, 0);
- len = gd_array_len(D, field_code);
- gdmx_err(D, 0);
-
- plhs[0] = gdmx_vector(type, len, &data);
+ plhs[0] = gdmx_vector(type, len, &data);
- gd_get_carray(D, field_code, type, data);
+ gd_get_carray(D, field_code, type, data);
- mxFree(field_code);
- gdmx_err(D, 0);
+ mxFree(field_code);
+ gdmx_err(D, 0);
- gdmx_fix_vector(plhs[0], type, len, data);
+ gdmx_fix_vector(plhs[0], type, len, data);
+ }
}
diff --git a/bindings/matlab/gd_get_carray_slice.c b/bindings/matlab/gd_get_carray_slice.c
index 7dc8245..20adb89 100644
--- a/bindings/matlab/gd_get_carray_slice.c
+++ b/bindings/matlab/gd_get_carray_slice.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2013 D. V. Wiebe
+/* Copyright (C) 2013, 2015 D. V. Wiebe
*
***************************************************************************
*
@@ -25,11 +25,14 @@
%
% A = GD_GET_CARRAY_SLICE(DIRFILE,FIELD_CODE,START,LEN[,TYPE])
% retrieves a subset, A, of the CARRAY field called FIELD_CODE.
- % LEN elements are retrieved, starting with element START. If type
+ % LEN elements are retrieved, starting with element START. If TYPE
% is given, it should be one of the data type symbols provided by
% GETDATA_CONSTANTS, otherwise the data are returned in their
% native type.
%
+ % If TYPE is the NULL data type, this function simply returns zero
+ % on success.
+ %
% The DIRFILE object should have previously been created with GD_OPEN.
%
% See the documentation on the C API function gd_get_carray_slice(3) in
@@ -60,12 +63,17 @@ void mexFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prhs[])
gdmx_err(D, 0);
}
- plhs[0] = gdmx_vector(type, len, &data);
+ if (type == GD_NULL) {
+ gd_get_carray_slice(D, field_code, start, len, GD_NULL, NULL);
+ plhs[0] = gdmx_from_int(0);
+ } else {
+ plhs[0] = gdmx_vector(type, len, &data);
- gd_get_carray_slice(D, field_code, start, len, type, data);
+ gd_get_carray_slice(D, field_code, start, len, type, data);
- mxFree(field_code);
- gdmx_err(D, 0);
+ mxFree(field_code);
+ gdmx_err(D, 0);
- gdmx_fix_vector(plhs[0], type, len, data);
+ gdmx_fix_vector(plhs[0], type, len, data);
+ }
}
diff --git a/bindings/matlab/gd_getdata.c b/bindings/matlab/gd_getdata.c
index 997c0fd..56d97e7 100644
--- a/bindings/matlab/gd_getdata.c
+++ b/bindings/matlab/gd_getdata.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2013 D. V. Wiebe
+/* Copyright (C) 2013, 2015 D. V. Wiebe
*
***************************************************************************
*
@@ -27,10 +27,13 @@
% [,TYPE])
% retrieves a vector, V, of NFRAMES frames plus NSAMPLES samples of
% data from the vector field FIELD_CODE starting FIRST_SAMP samples
- % past the start of FIRST_FRAME. If type is given, it should be
+ % past the start of FIRST_FRAME. If TYPE is given, it should be
% one of the data type symbols provided by GETDATA_CONSTANTS,
% otherwise the data are returned in their native type.
%
+ % If TYPE is the NULL data type, this function simply returns the
+ % number of samples read, instead of a vector of data.
+ %
% The DIRFILE object should have previously been created with GD_OPEN.
%
% See the documentation on the C API function gd_getdata(3) in
@@ -44,7 +47,7 @@ void mexFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prhs[])
{
DIRFILE *D;
char *field_code;
- long long first_frame, first_samp;
+ int64_t first_frame, first_samp;
size_t nsamp;
gd_type_t type;
void *data;
@@ -53,8 +56,8 @@ void mexFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prhs[])
D = gdmx_to_dirfile(prhs[0]);
field_code = gdmx_to_string(prhs, 1, 0);
- first_frame = gdmx_to_llong(prhs, 2);
- first_samp = gdmx_to_llong(prhs, 3);
+ first_frame = gdmx_to_int64(prhs, 2);
+ first_samp = gdmx_to_int64(prhs, 3);
nsamp = gdmx_to_nsamp(D, field_code, prhs, 4, 5);
if (nrhs > 6)
type = gdmx_to_gd_type(prhs, 6);
@@ -63,13 +66,23 @@ void mexFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prhs[])
gdmx_err(D, 0);
}
- plhs[0] = gdmx_vector(type, nsamp, &data);
+ if (type == GD_NULL) {
+ nsamp = gd_getdata64(D, field_code, (gd_off64_t)first_frame,
+ (gd_off64_t)first_samp, 0, nsamp, GD_NULL, NULL);
+
+ gdmx_err(D, 0);
- nsamp = gd_getdata64(D, field_code, (gd_off64_t)first_frame,
- (gd_off64_t)first_samp, 0, nsamp, type, data);
+ plhs[0] = gdmx_from_int64(nsamp);
+ } else {
+ plhs[0] = gdmx_vector(type, nsamp, &data);
- mxFree(field_code);
- gdmx_err(D, 0);
+ nsamp = gd_getdata64(D, field_code, (gd_off64_t)first_frame,
+ (gd_off64_t)first_samp, 0, nsamp, type, data);
- gdmx_fix_vector(plhs[0], type, nsamp, data);
+ mxFree(field_code);
+ gdmx_err(D, 0);
+
+
+ gdmx_fix_vector(plhs[0], type, nsamp, data);
+ }
}
diff --git a/bindings/matlab/gd_matlab.h b/bindings/matlab/gd_matlab.h
index 8ba5e2e..fbd2c01 100644
--- a/bindings/matlab/gd_matlab.h
+++ b/bindings/matlab/gd_matlab.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2013, 2014 D. V. Wiebe
+/* Copyright (C) 2013, 2014, 2015 D. V. Wiebe
*
***************************************************************************
*
@@ -23,7 +23,20 @@
/* mex runs GCC in -ansi mode */
#ifndef GDMXLIB
#define GD_C89_API
+
+# define uint64_t gd_uint64_t
+# define int64_t gd_int64_t
+#else
+
+#ifdef HAVE_INTTYPES_H
+#ifndef __STDC_FORMAT_MACROS
+#define __STDC_FORMAT_MACROS
#endif
+#include <inttypes.h>
+#endif
+
+#endif
+
#define GD_64BIT_API
#include "getdata.h"
@@ -56,11 +69,14 @@
/* integer type aliases */
#if SIZEOF_SIZE_T == 8
-#define gdmx_to_size_t(a,b) ((size_t)gdmx_to_ullong(a,b))
-#define gdmx_from_size_t gdmx_from_ullong
-#else
+#define gdmx_to_size_t(a,b) ((size_t)gdmx_to_uint64(a,b))
+#define gdmx_from_size_t gdmx_from_uint64
+#elif SIZEOF_SIZE_T == SIZEOF_LONG
#define gdmx_to_size_t(a,b) ((size_t)gdmx_to_ulong(a,b))
#define gdmx_from_size_t gdmx_from_ulong
+#else
+#define gdmx_to_size_t(a,b) ((size_t)gdmx_to_uint(a,b))
+#define gdmx_from_size_t gdmx_from_uint
#endif
#define gdmx_to_gd_type(a,b) ((gd_type_t)gdmx_to_int(a,b))
#define gdmx_from_gd_type gdmx_from_int
@@ -88,9 +104,9 @@ mxArray *gdmx_from_string_list(const char **);
#define gdmx_from_double mxCreateDoubleScalar
mxArray *gdmx_from_bool(int);
mxArray *gdmx_from_long(long);
-mxArray *gdmx_from_llong(long long);
+mxArray *gdmx_from_int64(int64_t);
mxArray *gdmx_from_ulong(unsigned long);
-mxArray *gdmx_from_ullong(unsigned long long);
+mxArray *gdmx_from_uint64(uint64_t);
mxArray *gdmx_from_carrays(const gd_carray_t *, gd_type_t);
mxArray *gdmx_from_sarrays(const char ***);
@@ -108,10 +124,10 @@ gd_entry_t *gdmx_to_entry(const mxArray **, int, unsigned);
double gdmx_to_double(const mxArray **, int);
long gdmx_to_long(const mxArray **, int);
-long long gdmx_to_llong(const mxArray **, int);
+int64_t gdmx_to_int64_t(const mxArray **, int);
#define gdmx_to_uint(a,b) ((unsigned int)gdmx_to_ulong(a,b))
unsigned long gdmx_to_ulong(const mxArray **, int);
-unsigned long long gdmx_to_ullong(const mxArray **, int);
+uint64_t gdmx_to_uint64(const mxArray **, int);
size_t gdmx_to_nsamp(DIRFILE*, const char*, const mxArray**, int, int);
void gdmx_to_data(void**, gd_type_t*, size_t*, const mxArray*, int);
diff --git a/bindings/matlab/gd_nframes.c b/bindings/matlab/gd_nframes.c
index 280f995..6c79cd2 100644
--- a/bindings/matlab/gd_nframes.c
+++ b/bindings/matlab/gd_nframes.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2013 D. V. Wiebe
+/* Copyright (C) 2013, 2015 D. V. Wiebe
*
***************************************************************************
*
@@ -37,7 +37,7 @@
void mexFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prhs[])
{
DIRFILE *D;
- unsigned long long n;
+ uint64_t n;
GDMX_CHECK_RHS(1);
@@ -47,5 +47,5 @@ void mexFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prhs[])
gdmx_err(D, 0);
- plhs[0] = gdmx_from_ullong(n);
+ plhs[0] = gdmx_from_uint64(n);
}
diff --git a/bindings/matlab/gd_putdata.c b/bindings/matlab/gd_putdata.c
index 171ef94..985b4f4 100644
--- a/bindings/matlab/gd_putdata.c
+++ b/bindings/matlab/gd_putdata.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2013, 2014 D. V. Wiebe
+/* Copyright (C) 2013, 2014, 2015 D. V. Wiebe
*
***************************************************************************
*
@@ -41,7 +41,7 @@ void mexFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prhs[])
DIRFILE *D;
void *data;
char *field_code;
- long long first_frame, first_samp;
+ int64_t first_frame, first_samp;
size_t nsamp, n;
gd_type_t type;
@@ -49,8 +49,8 @@ void mexFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prhs[])
D = gdmx_to_dirfile(prhs[0]);
field_code = gdmx_to_string(prhs, 1, 0);
- first_frame = gdmx_to_llong(prhs, 2);
- first_samp = gdmx_to_llong(prhs, 3);
+ first_frame = gdmx_to_int64(prhs, 2);
+ first_samp = gdmx_to_int64(prhs, 3);
gdmx_to_data(&data, &type, &nsamp, prhs[4], 4);
n = gd_putdata64(D, field_code, (gd_off64_t)first_frame,
diff --git a/bindings/matlab/gd_seek.c b/bindings/matlab/gd_seek.c
index 0b9f161..1bd5302 100644
--- a/bindings/matlab/gd_seek.c
+++ b/bindings/matlab/gd_seek.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2013 D. V. Wiebe
+/* Copyright (C) 2013, 2015 D. V. Wiebe
*
***************************************************************************
*
@@ -44,16 +44,16 @@ void mexFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prhs[])
DIRFILE *D;
void *data;
char *field_code;
- long long first_frame, first_samp;
+ int64_t first_frame, first_samp;
int flags;
- unsigned long long pos;
+ uint64_t pos;
GDMX_CHECK_RHS(5);
D = gdmx_to_dirfile(prhs[0]);
field_code = gdmx_to_string(prhs, 1, 0);
- first_frame = gdmx_to_llong(prhs, 2);
- first_samp = gdmx_to_llong(prhs, 3);
+ first_frame = gdmx_to_int64(prhs, 2);
+ first_samp = gdmx_to_int64(prhs, 3);
flags = gdmx_to_int(prhs, 4);
pos = gd_seek64(D, field_code, (gd_off64_t)first_frame,
@@ -62,5 +62,5 @@ void mexFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prhs[])
mxFree(field_code);
gdmx_err(D, 0);
- plhs[0] = gdmx_from_ullong(pos);
+ plhs[0] = gdmx_from_uint64(pos);
}
diff --git a/bindings/matlab/gd_tell.c b/bindings/matlab/gd_tell.c
index 4546ec5..44ed502 100644
--- a/bindings/matlab/gd_tell.c
+++ b/bindings/matlab/gd_tell.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2013 D. V. Wiebe
+/* Copyright (C) 2013, 2015 D. V. Wiebe
*
***************************************************************************
*
@@ -40,7 +40,7 @@ void mexFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prhs[])
DIRFILE *D;
void *data;
char *field_code;
- unsigned long long pos;
+ uint64_t pos;
GDMX_CHECK_RHS(2);
@@ -52,5 +52,5 @@ void mexFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prhs[])
mxFree(field_code);
gdmx_err(D, 0);
- plhs[0] = gdmx_from_ullong(pos);
+ plhs[0] = gdmx_from_uint64(pos);
}
diff --git a/bindings/matlab/getdata_constants.m b/bindings/matlab/getdata_constants.m
index 2020ef0..57c2783 100644
--- a/bindings/matlab/getdata_constants.m
+++ b/bindings/matlab/getdata_constants.m
@@ -31,7 +31,7 @@ function GD = getdata_constants()
% See also GETDATA
GD = struct(...
- 'VERSION', '0.9.0', ...
+ 'VERSION', '0.9.1', ...
'E_OK', int32(0), ...
'E_FORMAT', int32(2), ...
'E_CREAT', int32(4), ...
diff --git a/bindings/matlab/matlab.c b/bindings/matlab/matlab.c
index 869aacb..1b0e9c4 100644
--- a/bindings/matlab/matlab.c
+++ b/bindings/matlab/matlab.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2013, 2014 D. V. Wiebe
+/* Copyright (C) 2013, 2014, 2015 D. V. Wiebe
*
***************************************************************************
*
@@ -86,7 +86,7 @@ static const char *gdmx_msgid[GD_N_ERROR_CODES] =
GD_LIBCOMP "Exists",
GD_LIBCOMP "UncleanDB",
GD_LIBCOMP "Domain",
- GD_LIBCOMP "BadRepr",
+ GD_LIBCOMP "Error32", /* unused */
GD_LIBCOMP "Error33", /* unused */
GD_LIBCOMP "Error34", /* unused */
GD_LIBCOMP "Bounds",
@@ -160,8 +160,7 @@ void gdmx_err(DIRFILE *D, int discard)
gd_colclear();
#endif
- mexErrMsgIdAndTxt(gdmx_msgid[gdmx_errno],
- gdmx_estring);
+ mexErrMsgIdAndTxt(gdmx_msgid[gdmx_errno], gdmx_estring);
}
static gd_type_t gdmx_type(const mxArray *a, const struct gdmx_context_t *ctx,
@@ -566,7 +565,7 @@ int gdmx_to_int(const mxArray **rhs, int n)
}
-static long long gdmx_to_llong_(const mxArray *a,
+static int64_t gdmx_to_int64_(const mxArray *a,
const struct gdmx_context_t *ctx)
{
int64_t v;
@@ -575,18 +574,18 @@ static long long gdmx_to_llong_(const mxArray *a,
gdmx_convert_scalar(a, ctx, GD_INT64, -1, &v);
- dreturn("%lli", (long long)v);
+ dreturn("%" PRId64, v);
- return (long long)v;
+ return v;
}
-long long gdmx_to_llong(const mxArray **rhs, int n)
+int64_t gdmx_to_int64(const mxArray **rhs, int n)
{
struct gdmx_context_t ctx = { NULL, NULL, n };
- return gdmx_to_llong_(rhs[n], &ctx);
+ return gdmx_to_int64_(rhs[n], &ctx);
}
-static unsigned long long gdmx_to_ullong_(const mxArray *a,
+static uint64_t gdmx_to_uint64_(const mxArray *a,
const struct gdmx_context_t *ctx)
{
uint64_t v;
@@ -595,15 +594,15 @@ static unsigned long long gdmx_to_ullong_(const mxArray *a,
gdmx_convert_scalar(a, ctx, GD_UINT64, -1, &v);
- dreturn("%llu", (unsigned long long)v);
+ dreturn("%" PRIu64, v);
- return (unsigned long long)v;
+ return v;
}
-unsigned long long gdmx_to_ullong(const mxArray **rhs, int n)
+uint64_t gdmx_to_uint64(const mxArray **rhs, int n)
{
struct gdmx_context_t ctx = { NULL, NULL, n };
- return gdmx_to_ullong_(rhs[n], &ctx);
+ return gdmx_to_uint64_(rhs[n], &ctx);
}
static unsigned long gdmx_to_ulong_(const mxArray *a,
@@ -665,11 +664,11 @@ mxArray *gdmx_from_long(long x)
return lhs;
}
-mxArray *gdmx_from_llong(long long x)
+mxArray *gdmx_from_int64(int64_t x)
{
mxArray *lhs;
- dtrace("%lli", x);
+ dtrace("%" PRId64, x);
lhs = mxCreateNumericMatrix(1, 1, mxINT64_CLASS, mxREAL);
*((int64_t*)mxGetData(lhs)) = x;
@@ -691,11 +690,11 @@ mxArray *gdmx_from_ulong(unsigned long x)
return lhs;
}
-mxArray *gdmx_from_ullong(unsigned long long x)
+mxArray *gdmx_from_uint64(uint64_t x)
{
mxArray *lhs;
- dtrace("%llu", x);
+ dtrace("%" PRIu64, x);
lhs = mxCreateNumericMatrix(1, 1, mxUINT64_CLASS, mxREAL);
*((uint64_t*)mxGetData(lhs)) = x;
@@ -708,16 +707,16 @@ mxArray *gdmx_from_triplet(gd_triplet_t datum, gd_windop_t windop)
{
mxArray *a;
- dtrace("{%g, %llu, %lli}, %i", datum.r, datum.u, datum.i, windop);
+ dtrace("{%g, %" PRIu64 ", %lli}, %i", datum.r, datum.u, datum.i, windop);
switch (windop) {
case GD_WINDOP_EQ:
case GD_WINDOP_NE:
- a = gdmx_from_llong(datum.i);
+ a = gdmx_from_int64(datum.i);
break;
case GD_WINDOP_SET:
case GD_WINDOP_CLR:
- a = gdmx_from_ullong(datum.u);
+ a = gdmx_from_uint64(datum.u);
break;
default:
a = gdmx_from_double(datum.r);
@@ -985,7 +984,7 @@ mxArray *gdmx_from_entry(const gd_entry_t *E)
break;
case GD_PHASE_ENTRY:
mxSetField(lhs, 0, "in_fields", mxCreateString(E->in_fields[0]));
- mxSetField(lhs, 0, "shift", gdmx_from_llong(E->EN(phase,shift)));
+ mxSetField(lhs, 0, "shift", gdmx_from_int64(E->EN(phase,shift)));
nscalar = 1;
break;
case GD_POLYNOM_ENTRY:
@@ -1135,6 +1134,8 @@ void gdmx_free_entry(gd_entry_t *E)
break;
case GD_LINTERP_ENTRY:
mxFree(E->EN(linterp,table));
+ ni = 1;
+ break;
case GD_DIVIDE_ENTRY:
case GD_MULTIPLY_ENTRY:
ni = 2;
diff --git a/bindings/matlab/test/Makefile.in b/bindings/matlab/test/Makefile.in
index b086184..4932b33 100644
--- a/bindings/matlab/test/Makefile.in
+++ b/bindings/matlab/test/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -14,7 +14,17 @@
@SET_MAKE@
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -78,17 +88,19 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
subdir = bindings/matlab/test
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compare_version.m4 \
$(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/encoding.m4 \
$(top_srcdir)/m4/floatordering.m4 $(top_srcdir)/m4/idl.m4 \
- $(top_srcdir)/m4/matlab.m4 $(top_srcdir)/m4/perl.m4 \
- $(top_srcdir)/m4/php.m4 $(top_srcdir)/m4/python.m4 \
- $(top_srcdir)/m4/win32.m4 $(top_srcdir)/m4/version.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/matlab.m4 \
+ $(top_srcdir)/m4/perl.m4 $(top_srcdir)/m4/php.m4 \
+ $(top_srcdir)/m4/python.m4 $(top_srcdir)/m4/win32.m4 \
+ $(top_srcdir)/m4/version.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/src/gd_config.h \
$(top_builddir)/src/getdata.h
@@ -136,6 +148,7 @@ am__tty_colors = { \
std='[m'; \
fi; \
}
+am__DIST_COMMON = $(srcdir)/Makefile.in
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -402,7 +415,6 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign bindings/matlab/test/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign bindings/matlab/test/Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -672,6 +684,8 @@ uninstall-am:
mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
uninstall-am
+.PRECIOUS: Makefile
+
check-local: check-TESTS
echo $(MAKE) getdata-clean-dirs
diff --git a/bindings/matlab/test/big_test.m b/bindings/matlab/test/big_test.m
index 51f71d6..8ee741b 100644
--- a/bindings/matlab/test/big_test.m
+++ b/bindings/matlab/test/big_test.m
@@ -109,6 +109,14 @@ try
ne = ne + check_ok(exc, 10);
end
+ % 11: getdata check (NULL)
+ try
+ d = gd_getdata(D, 'data', 5, 0, 1, 0, GD.NULL);
+ ne = ne + check_num(11, d, 8);
+ catch exc
+ ne = ne + check_ok(exc, 11);
+ end
+
% 12: gd_get_constant check
try
d = gd_get_constant(D, 'const');
@@ -2003,6 +2011,23 @@ try
ne = ne + check_ok2(exc, 272, 1);
end
+ % 273: get_carray (NULL)
+ try
+ d = gd_get_carray(D, 'carray', GD.NULL);
+ ne = ne + check_num(273, d, 0);
+ catch exc
+ ne = ne + check_ok(exc, 273);
+ end
+
+ % 274: gd_carray_slice (NULL)
+ try
+ d = gd_get_carray_slice(D, 'carray', 2, 2, GD.NULL);
+ ne = ne + check_array(274, d, 0);
+ catch exc
+ ne = ne + check_ok(exc, 274);
+ end
+
+
diff --git a/bindings/perl/Build.PL.in b/bindings/perl/Build.PL.in
deleted file mode 100644
index 8bc6450..0000000
--- a/bindings/perl/Build.PL.in
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright (C) 2011-2013 D. V. Wiebe
-#
-##########################################################################
-#
-# This file is part of the GetData project.
-#
-# GetData is free software; you can redistribute it and/or modify it under
-# the terms of the GNU Lesser General Public License as published by the
-# Free Software Foundation; either version 2.1 of the License, or (at your
-# option) any later version.
-#
-# GetData is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-#
-# @configure_input@
-
-use Module::Build;
-
-# divert up_to_date to allow consideration of various other dependencies
-my $class = Module::Build->subclass(
- class => "GetData::Build",
- code => <<'SUBCLASS' );
-
-sub up_to_date {
- my ($self, $source, $derived) = @_;
-
- if ($source eq "lib/GetData.xs") {
- return 0 if (not $self->up_to_date("lib/typemap", $derived));
- return 0 if (not $self->up_to_date("lib/simple_funcs.xs", $derived));
- return 0 if (not $self->up_to_date("@top_builddir@/src/getdata.h",
- $derived));
- return 0 if (not $self->up_to_date("@top_builddir@/src/internal.h",
- $derived));
- }
- return $self->SUPER::up_to_date($source, $derived);
-}
-SUBCLASS
-
-my $build = $class->new(
- dist_abstract => "Perl bindings to the GetData library",
- dist_author => 'The GetData Project <@PACKAGE_BUGREPORT@>',
- dist_version_from => "GetData.pm",
- extra_compiler_flags => ['@DEFS@', '-I at top_builddir@/src'],
- extra_linker_flags => ['-L at top_builddir@/src/.libs/', '-lgetdata'],
- include_dirs => ['@top_srcdir@/src'],
- license => 'lgpl',
- module_name => "GetData",
- pm_files => { 'GetData.pm' => 'lib/GetData.pm' },
- release_status => "testing",
- requires => {
- perl => '5.6.0',
- 'Math::Complex' => '1.34'
- },
- test_files => '@srcdir@/t/*.t',
- xs_files => { 'lib/GetData.xs' => 'lib/GetData.xs' }
-);
-$build->create_build_script;
diff --git a/bindings/perl/GetData.pm.in b/bindings/perl/GetData.pm.in
index e1f4acf..5c081fa 100644
--- a/bindings/perl/GetData.pm.in
+++ b/bindings/perl/GetData.pm.in
@@ -581,26 +581,30 @@ order that they're indexed. See gd_nfragments(3) and gd_fragmentname(3).
Returns the value of the CARRAY named C<$FIELD_CODE> after converting its
elements to the return type C<$RETURN_TYPE>, which should be one of the symbols
-listed under L</"Data Types"> above. If called in scalar context, returns a
-packed string containing the data. If called in list context, the data will be
-unpacked and returned as an array. See gd_get_carray(3).
+listed under L</"Data Types"> above. If C<$RETURN_TYPE> is C<$GetData::NULL>,
+in scalar context this function returns undef. Otherwise, if called in scalar
+context, returns a packed string containing the data. If called in list
+context, the data will be unpacked and returned as an array. See
+gd_get_carray(3).
=item $dirfile->get_carray_slice ($FIELD_CODE, $START, $LEN, $RETURN_TYPE)
Returns the value of a portion of the CARRAY named C<$FIELD_CODE> after
converting its elements to the return type C<$RETURN_TYPE>, which should be one
of the symbols listed under L</"Data Types"> above. The first element returned
-is given by C<$START>, and the number of elements by C<$LEN>. If called in
-scalar context, returns a packed string containing the data. If called in list
-context, the data will be unpacked and returned as an array. Less data than
-requested may be returned, if insufficient data exists. See
-gd_get_carray_slice(3).
+is given by C<$START>, and the number of elements by C<$LEN>. If
+C<$RETURN_TYPE> is C<$GetData::NULL>, in scalar context this function returns
+undef. Otherwise, if called in scalar context, returns a packed string
+containing the data. If called in list context, the data will be unpacked and
+returned as an array. Less data than requested may be returned, if insufficient
+data exist. See gd_get_carray_slice(3).
=item $dirfile->get_constant ($FIELD_CODE, $RETURN_TYPE)
Returns the value of the CONST named C<$FIELD_CODE> after converting it to the
return type C<$RETURN_TYPE>, which should be one of the symbols listed under
-L</"Data Types"> above. See gd_get_constant(3).
+L</"Data Types"> above. If C<$RETURN_TYPE> is C<$GetData::NULL>, returns undef
+on success. See gd_get_constant(3).
=item $dirfile->getdata ($FIELD_CODE, $FIRST_FRAME, $FIRST_SAMP, $NUM_FRAMES,
$NUM_SAMP, $RETURN_TYPE)
@@ -609,10 +613,12 @@ Returns data from the field specified by C<$FIELD_CODE> after converting them
to the return type C<$RETURN_TYPE>, which should be one of the symbols listed
under L</"Data Types"> above. The first sample returned is C<$FIRST_SAMP>
samples after the start of C<$FIRST_FRAME> and the amount of data returned is
-C<$NUM_FRAMES> frames plus C<$NUM_SAMP> samples. If called in scalar context
-returns a string of packed data. If called in array context, the data will be
-unpacked and returned as an array. Complex data are returned as
-C<Math::Complex> objects. See gd_getdata(3).
+C<$NUM_FRAMES> frames plus C<$NUM_SAMP> samples. If C<$RETURN_TYPE> is
+C<$GetData::NULL>, in scalar context this function returns the number of
+samples read. Otherwise, if called in scalar context, it returns a string of
+packed data. If called in array context, the data will be unpacked and returned
+as an array. Complex data are returned as C<Math::Complex> objects. See
+gd_getdata(3).
=item $dirfile->get_string ($FIELD_CODE)
diff --git a/bindings/perl/MANIFEST.in b/bindings/perl/MANIFEST.in
deleted file mode 100644
index c6136cc..0000000
--- a/bindings/perl/MANIFEST.in
+++ /dev/null
@@ -1,2 +0,0 @@
-MANIFEST This list of files
-GetData.pm
diff --git a/bindings/perl/Makefile.am b/bindings/perl/Makefile.am
index 7f59599..58cf932 100644
--- a/bindings/perl/Makefile.am
+++ b/bindings/perl/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2011, 2012, 2013, 2015 D. V. Wiebe
+# Copyright (C) 2011, 2012, 2013, 2015, 2016 D. V. Wiebe
#
##########################################################################
#
@@ -21,40 +21,52 @@
AUTOMAKE_OPTIONS = foreign
if GETDATA_DEBUG
-TEST_VERBOSE=verbose=1
+VERBOSE_TESTS=TEST_VERBOSE=1
endif
+blibdir=build/blib
+
plTESTS=t/big_test.t t/callback.t
-PERL_TESTS=$(addprefix ${srcdir}/, $(plTESTS))
-EXTRA_DIST=funclist.pl GetData.xs simple_funcs.pl simple_funcs.xsin typemap \
- GetData.pm.in MANIFEST.in ${plTESTS}
+EXTRA_DIST=funclist.pl simple_funcs.pl simple_funcs.xsin GetData.pm.in \
+ src/typemap src/GetData.xs ${plTESTS}
man3dir=${perlmandir}
-nodist_man3_MANS=blib/libdoc/GetData.$(PERL_MAN3EXT)
+nodist_man3_MANS=${blibdir}/man3/GetData.$(PERL_MAN3EXT)
-nodist_perl_SCRIPTS=blib/lib/GetData.pm
+nodist_perl_SCRIPTS=${blibdir}/lib/GetData.pm
perlautogetdatadir=${perldir}/auto/GetData
-nodist_perlautogetdata_SCRIPTS=blib/arch/auto/GetData/GetData.bs blib/arch/auto/GetData/GetData.so
-
-lib:
- mkdir -p $@
-
-lib/GetData.xs: GetData.xs
- $(MAKE) lib
- cat $(srcdir)/GetData.xs > $@
+nodist_perlautogetdata_SCRIPTS=${blibdir}/arch/auto/GetData/GetData.so
+
+src/Makefile.PL: src/Makefile.PL.in $(top_builddir)/config.status
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+
+# build.stamp creates the build/ arena for the build. Makefile.PL (above)
+# is a built file in the src directory. As a result, in a VPATH build it won't
+# be in $(srcdir)/src but in ./src, hence the special Makefile.PL line.
+build/build.stamp: src/Makefile.PL src/GetData.xs src/typemap
+ rm -rf build
+ mkdir build
+ cp -r $(srcdir)/src/* build
+ [ -e build/Makefile.PL ] || cp src/Makefile.PL build
+ mkdir build/lib
+ touch $@
-lib/typemap: typemap
- $(MAKE) lib
- cat $(srcdir)/typemap > $@
+# this enssures that the test files are present and up-to-date
+build/test.stamp: build/build.stamp ${plTESTS}
+ [ -e build/t ] || mkdir build/t
+ cp -r $(srcdir)/t/* build/t
+ touch $@
-lib/simple_funcs.xs: simple_funcs.xsin simple_funcs.pl
- $(MAKE) lib
+build/simple_funcs.xs: simple_funcs.xsin simple_funcs.pl build/build.stamp
$(PERL) $(srcdir)/simple_funcs.pl $(srcdir)/simple_funcs.xsin > $@
-MANIFEST: MANIFEST.in
- cat $(srcdir)/MANIFEST.in > $@
+build/Makefile: build/build.stamp build/test.stamp build/lib/GetData.pm
+ cd build && ${PERL} Makefile.PL
+ mv $@ $@.tmp
+ $(SED) 's|^LD_RUN_PATH|#LD_RUN_PATH|g;s|LD_RUN_PATH="$$(LD_RUN_PATH)" ||g' \
+ $@.tmp > $@
make_parameters.sed: ../make_parameters ../../src/getdata.h
../make_parameters P > $@
@@ -62,42 +74,39 @@ make_parameters.sed: ../make_parameters ../../src/getdata.h
../make_parameters: ../make_parameters.c ../../src/gd_config.h
cd .. && ${MAKE} make_parameters
-GetData.pm: GetData.pm.in make_parameters.sed funclist.pl lib/GetData.xs \
- lib/simple_funcs.xs
+build/lib/GetData.pm: GetData.pm.in make_parameters.sed funclist.pl \
+ src/GetData.xs build/simple_funcs.xs build/build.stamp
rm -f $@
$(SED) -f make_parameters.sed $(srcdir)/GetData.pm.in | \
- $(PERL) $(srcdir)/funclist.pl lib/GetData.xs lib/simple_funcs.xs > $@
+ $(PERL) $(srcdir)/funclist.pl $(srcdir)/src/GetData.xs \
+ build/simple_funcs.xs > $@
chmod a-w $@
-blib/arch/auto/GetData/GetData.bs blib/arch/auto/GetData/GetData.so \
- blib/lib/GetData.pm blib/libdoc/GetData.$(PERL_MAN3EXT): build.stamp
+# The make.stamp rule here is to avoid running this recipe separately
+# for each target
+${blibdir}/arch/auto/GetData/GetData.so ${blibdir}/lib/GetData.pm \
+ ${blibdir}/man3/GetData.$(PERL_MAN3EXT): build/make.stamp
-build.stamp: Build lib/GetData.xs lib/simple_funcs.xs lib/typemap
- $(PERL) Build build
+build/make.stamp: build/Makefile
+ cd build && ${MAKE}
touch $@
-.PRECIOUS: Build
-Build: Build.PL GetData.pm lib/GetData.xs lib/simple_funcs.xs lib/typemap \
- MANIFEST
- $(PERL) Build.PL
-
clean-local:
- rm -rf lib blib
- if test -e Build; then \
- $(PERL) Build clean || true; \
- fi
- rm -f $(BUILT_SOURCES) make_parameters.sed MYMETA.yml MYMETA.json GetData.pm
- rm -rf Build _build MANIFEST build.stamp t/*~
+ rm -rf build
+ rm -f $(BUILT_SOURCES) make_parameters.sed src/Makefile.PL
+ rm -rf src/*~ t/*~ *~
uninstall-hook:
rmdir $(DESTDIR)${perlautogetdatadir}
if TEST_PERL
-check: $(PERL_TESTS)
- ${DL_LIBRARY_PATH}=../../src/.libs:${${DL_LIBRARY_PATH}} $(PERL) ./Build test ${TEST_VERBOSE}
+check: build/Makefile build/test.stamp
+ export ${DL_LIBRARY_PATH}=../../../src/.libs:${${DL_LIBRARY_PATH}} && \
+ ( cd build && ${MAKE} test ${VERBOSE_TESTS} )
-testdb testcover: $(PERL_TESTS)
- ${DL_LIBRARY_PATH}=../../src/.libs:${${DL_LIBRARY_PATH}} $(PERL) ./Build $@ ${TEST_VERBOSE}
+testdb testcover: build/Makefile build/test.stamp
+ export ${DL_LIBRARY_PATH}=../../../src/.libs:${${DL_LIBRARY_PATH}} && \
+ ( cd build && ${MAKE} $@ ${VERBOSE_TESTS} )
.PHONY: check testdb testcover
endif
diff --git a/bindings/perl/Makefile.in b/bindings/perl/Makefile.in
index cfd302f..6997998 100644
--- a/bindings/perl/Makefile.in
+++ b/bindings/perl/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -15,7 +15,17 @@
@SET_MAKE@
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -79,22 +89,23 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
subdir = bindings/perl
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(srcdir)/Build.PL.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compare_version.m4 \
$(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/encoding.m4 \
$(top_srcdir)/m4/floatordering.m4 $(top_srcdir)/m4/idl.m4 \
- $(top_srcdir)/m4/matlab.m4 $(top_srcdir)/m4/perl.m4 \
- $(top_srcdir)/m4/php.m4 $(top_srcdir)/m4/python.m4 \
- $(top_srcdir)/m4/win32.m4 $(top_srcdir)/m4/version.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/matlab.m4 \
+ $(top_srcdir)/m4/perl.m4 $(top_srcdir)/m4/php.m4 \
+ $(top_srcdir)/m4/python.m4 $(top_srcdir)/m4/win32.m4 \
+ $(top_srcdir)/m4/version.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/src/gd_config.h \
$(top_builddir)/src/getdata.h
-CONFIG_CLEAN_FILES = Build.PL
+CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
@@ -148,6 +159,7 @@ am__can_run_installinfo = \
NROFF = nroff
MANS = $(nodist_man3_MANS)
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -374,7 +386,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-# Copyright (C) 2011, 2012, 2013, 2015 D. V. Wiebe
+# Copyright (C) 2011, 2012, 2013, 2015, 2016 D. V. Wiebe
#
##########################################################################
#
@@ -395,17 +407,17 @@ top_srcdir = @top_srcdir@
# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
AUTOMAKE_OPTIONS = foreign
- at GETDATA_DEBUG_TRUE@TEST_VERBOSE = verbose=1
+ at GETDATA_DEBUG_TRUE@VERBOSE_TESTS = TEST_VERBOSE=1
+blibdir = build/blib
plTESTS = t/big_test.t t/callback.t
-PERL_TESTS = $(addprefix ${srcdir}/, $(plTESTS))
-EXTRA_DIST = funclist.pl GetData.xs simple_funcs.pl simple_funcs.xsin typemap \
- GetData.pm.in MANIFEST.in ${plTESTS}
+EXTRA_DIST = funclist.pl simple_funcs.pl simple_funcs.xsin GetData.pm.in \
+ src/typemap src/GetData.xs ${plTESTS}
man3dir = ${perlmandir}
-nodist_man3_MANS = blib/libdoc/GetData.$(PERL_MAN3EXT)
-nodist_perl_SCRIPTS = blib/lib/GetData.pm
+nodist_man3_MANS = ${blibdir}/man3/GetData.$(PERL_MAN3EXT)
+nodist_perl_SCRIPTS = ${blibdir}/lib/GetData.pm
perlautogetdatadir = ${perldir}/auto/GetData
-nodist_perlautogetdata_SCRIPTS = blib/arch/auto/GetData/GetData.bs blib/arch/auto/GetData/GetData.so
+nodist_perlautogetdata_SCRIPTS = ${blibdir}/arch/auto/GetData/GetData.so
all: all-am
.SUFFIXES:
@@ -438,8 +450,6 @@ $(top_srcdir)/configure: $(am__configure_deps)
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
-Build.PL: $(top_builddir)/config.status $(srcdir)/Build.PL.in
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
install-nodist_perlSCRIPTS: $(nodist_perl_SCRIPTS)
@$(NORMAL_INSTALL)
@list='$(nodist_perl_SCRIPTS)'; test -n "$(perldir)" || list=; \
@@ -720,24 +730,37 @@ uninstall-man: uninstall-man3
uninstall-nodist_perlSCRIPTS \
uninstall-nodist_perlautogetdataSCRIPTS
+.PRECIOUS: Makefile
-lib:
- mkdir -p $@
-lib/GetData.xs: GetData.xs
- $(MAKE) lib
- cat $(srcdir)/GetData.xs > $@
+src/Makefile.PL: src/Makefile.PL.in $(top_builddir)/config.status
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-lib/typemap: typemap
- $(MAKE) lib
- cat $(srcdir)/typemap > $@
+# build.stamp creates the build/ arena for the build. Makefile.PL (above)
+# is a built file in the src directory. As a result, in a VPATH build it won't
+# be in $(srcdir)/src but in ./src, hence the special Makefile.PL line.
+build/build.stamp: src/Makefile.PL src/GetData.xs src/typemap
+ rm -rf build
+ mkdir build
+ cp -r $(srcdir)/src/* build
+ [ -e build/Makefile.PL ] || cp src/Makefile.PL build
+ mkdir build/lib
+ touch $@
-lib/simple_funcs.xs: simple_funcs.xsin simple_funcs.pl
- $(MAKE) lib
+# this enssures that the test files are present and up-to-date
+build/test.stamp: build/build.stamp ${plTESTS}
+ [ -e build/t ] || mkdir build/t
+ cp -r $(srcdir)/t/* build/t
+ touch $@
+
+build/simple_funcs.xs: simple_funcs.xsin simple_funcs.pl build/build.stamp
$(PERL) $(srcdir)/simple_funcs.pl $(srcdir)/simple_funcs.xsin > $@
-MANIFEST: MANIFEST.in
- cat $(srcdir)/MANIFEST.in > $@
+build/Makefile: build/build.stamp build/test.stamp build/lib/GetData.pm
+ cd build && ${PERL} Makefile.PL
+ mv $@ $@.tmp
+ $(SED) 's|^LD_RUN_PATH|#LD_RUN_PATH|g;s|LD_RUN_PATH="$$(LD_RUN_PATH)" ||g' \
+ $@.tmp > $@
make_parameters.sed: ../make_parameters ../../src/getdata.h
../make_parameters P > $@
@@ -745,41 +768,38 @@ make_parameters.sed: ../make_parameters ../../src/getdata.h
../make_parameters: ../make_parameters.c ../../src/gd_config.h
cd .. && ${MAKE} make_parameters
-GetData.pm: GetData.pm.in make_parameters.sed funclist.pl lib/GetData.xs \
- lib/simple_funcs.xs
+build/lib/GetData.pm: GetData.pm.in make_parameters.sed funclist.pl \
+ src/GetData.xs build/simple_funcs.xs build/build.stamp
rm -f $@
$(SED) -f make_parameters.sed $(srcdir)/GetData.pm.in | \
- $(PERL) $(srcdir)/funclist.pl lib/GetData.xs lib/simple_funcs.xs > $@
+ $(PERL) $(srcdir)/funclist.pl $(srcdir)/src/GetData.xs \
+ build/simple_funcs.xs > $@
chmod a-w $@
-blib/arch/auto/GetData/GetData.bs blib/arch/auto/GetData/GetData.so \
- blib/lib/GetData.pm blib/libdoc/GetData.$(PERL_MAN3EXT): build.stamp
+# The make.stamp rule here is to avoid running this recipe separately
+# for each target
+${blibdir}/arch/auto/GetData/GetData.so ${blibdir}/lib/GetData.pm \
+ ${blibdir}/man3/GetData.$(PERL_MAN3EXT): build/make.stamp
-build.stamp: Build lib/GetData.xs lib/simple_funcs.xs lib/typemap
- $(PERL) Build build
+build/make.stamp: build/Makefile
+ cd build && ${MAKE}
touch $@
-.PRECIOUS: Build
-Build: Build.PL GetData.pm lib/GetData.xs lib/simple_funcs.xs lib/typemap \
- MANIFEST
- $(PERL) Build.PL
-
clean-local:
- rm -rf lib blib
- if test -e Build; then \
- $(PERL) Build clean || true; \
- fi
- rm -f $(BUILT_SOURCES) make_parameters.sed MYMETA.yml MYMETA.json GetData.pm
- rm -rf Build _build MANIFEST build.stamp t/*~
+ rm -rf build
+ rm -f $(BUILT_SOURCES) make_parameters.sed src/Makefile.PL
+ rm -rf src/*~ t/*~ *~
uninstall-hook:
rmdir $(DESTDIR)${perlautogetdatadir}
- at TEST_PERL_TRUE@check: $(PERL_TESTS)
- at TEST_PERL_TRUE@ ${DL_LIBRARY_PATH}=../../src/.libs:${${DL_LIBRARY_PATH}} $(PERL) ./Build test ${TEST_VERBOSE}
+ at TEST_PERL_TRUE@check: build/Makefile build/test.stamp
+ at TEST_PERL_TRUE@ export ${DL_LIBRARY_PATH}=../../../src/.libs:${${DL_LIBRARY_PATH}} && \
+ at TEST_PERL_TRUE@ ( cd build && ${MAKE} test ${VERBOSE_TESTS} )
- at TEST_PERL_TRUE@testdb testcover: $(PERL_TESTS)
- at TEST_PERL_TRUE@ ${DL_LIBRARY_PATH}=../../src/.libs:${${DL_LIBRARY_PATH}} $(PERL) ./Build $@ ${TEST_VERBOSE}
+ at TEST_PERL_TRUE@testdb testcover: build/Makefile build/test.stamp
+ at TEST_PERL_TRUE@ export ${DL_LIBRARY_PATH}=../../../src/.libs:${${DL_LIBRARY_PATH}} && \
+ at TEST_PERL_TRUE@ ( cd build && ${MAKE} $@ ${VERBOSE_TESTS} )
@TEST_PERL_TRUE at .PHONY: check testdb testcover
diff --git a/bindings/perl/simple_funcs.pl b/bindings/perl/simple_funcs.pl
index be6e2ac..3a3dcc1 100644
--- a/bindings/perl/simple_funcs.pl
+++ b/bindings/perl/simple_funcs.pl
@@ -30,7 +30,8 @@ sub printcleanup {
my ($t, $n) = @$_;
return "\t\tsafefree($n);\n" if (
- $t eq "gdp_complex_in" or $t eq "const char **" or $t eq "gdp_data_in *"
+ $t eq "gdp_complex_undef" or $t eq "gdp_complex_in"
+ or $t eq "const char **" or $t eq "gdp_data_in *"
or $t eq "gdp_double_in *"
);
return "";
@@ -41,13 +42,10 @@ sub printmunge {
my ($t, $n) = @$_;
return "&$n" if ($t =~ /&$/);
- return "(long long)$n" if ($t eq "gd_off64_t" or $t eq "gd_shift_t" or
- $t eq "gdp_shift_t" or $t eq "int64_t");
- return "(unsigned long long)$n" if ($t eq "uint64_t");
+ return "(int64_t)$n" if ($t eq "gd_off64_t");
return "creal($n), cimag($n)" if ($t eq "_Complex double" or
$t eq "gdp_complex");
- return "$n.r, (unsigned long long)$n.u, (long long)$n.i"
- if ($t eq "gd_triplet_t");
+ return "$n.r, $n.u, $n.i" if ($t eq "gd_triplet_t");
return $n;
}
@@ -57,7 +55,7 @@ sub printfmt {
if (/char \*$/) {
return "\\\"%s\\\"";
- } elsif (/[\*&]$/ or $_ eq "gdp_complex_in") {
+ } elsif (/[\*&]$/ or $_ eq "gdp_complex_in" or $_ eq "gdp_complex_undef") {
return "%p";
} elsif ($_ eq "_Complex double" or $_ eq "gdp_complex") {
return "%g;%g";
@@ -68,25 +66,25 @@ sub printfmt {
{
return "%i";
} elsif ($_ eq "gd_entype_t") {
- return "%02x";
+ return "0x%02X";
} elsif ($_ eq "gd_shift_t" or $_ eq "gdp_shift_t") {
- return "%lli";
+ return "%\" PRId64 \"";
} elsif ($_ eq "gdp_uint_t") {
return "%u";
} elsif ($_ eq "gd_type_t" or $_ eq "gdp_type_t") {
- return "%03x";
+ return "0x%03X";
} elsif ($_ eq "int" or $_ eq "gdp_int") {
return "%i";
} elsif ($_ eq "gd_off64_t") {
- return "%lli";
+ return "%\" PRId64 \"";
} elsif ($_ eq "size_t") {
- return "%zi";
+ return "%\" PRIuSIZE \"";
} elsif ($_ eq "unsigned int") {
return "%u";
} elsif ($_ eq "unsigned long int") {
return "%lu";
} elsif ($_ eq "gd_triplet_t") {
- return "{%g,%llX,%lli}";
+ return "{%g,%\" PRIX64 \",%\" PRId64 \"}";
} else {
die "Can't format \"$_\"";
}
diff --git a/bindings/perl/simple_funcs.xsin b/bindings/perl/simple_funcs.xsin
index 660f616..31fe513 100644
--- a/bindings/perl/simple_funcs.xsin
+++ b/bindings/perl/simple_funcs.xsin
@@ -25,10 +25,10 @@ int alter_bit(DIRFILE *dirfile, const char *field_code,
int alter_carray(DIRFILE* dirfile, const char* field_code, gd_type_t const_type,
size_t array_len)
int alter_clincom:alter_lincom(DIRFILE *dirfile, const char *field_code,
- gdp_int n_fields=0, const char **in_fields=NULL, gdp_complex_in m=NULL,
- gdp_complex_in b=NULL)
+ gdp_int n_fields=0, const char **in_fields=NULL, gdp_complex_undef m=NULL,
+ gdp_complex_undef b=NULL)
int alter_cpolynom:alter_polynom(DIRFILE *dirfile, const char *field_code,
- gdp_int poly_ord=0, gdp_char *in_field=NULL, gdp_complex_in a=NULL)
+ gdp_int poly_ord=0, gdp_char *in_field=NULL, gdp_complex_undef a=NULL)
int alter_crecip:alter_recip(DIRFILE *dirfile, const char *field_code,
gdp_char *in_field=NULL, gdp_complex cdividend)
int alter_divide(DIRFILE *dirfile, const char *field_code,
diff --git a/bindings/perl/GetData.xs b/bindings/perl/src/GetData.xs
similarity index 94%
rename from bindings/perl/GetData.xs
rename to bindings/perl/src/GetData.xs
index 2d4f2f8..4d573aa 100644
--- a/bindings/perl/GetData.xs
+++ b/bindings/perl/src/GetData.xs
@@ -1,4 +1,4 @@
-/* Copyright (C) 2011-2015 D. V. Wiebe
+/* Copyright (C) 2011-2016 D. V. Wiebe
*
**************************************************************************
*
@@ -43,6 +43,7 @@
/* fake data types to simplify our typemap */
typedef GD_DCOMPLEXP_t gdp_complex_in;
+typedef GD_DCOMPLEXP_t gdp_complex_undef;
typedef GD_DCOMPLEXA(gdp_complex);
typedef int gdp_bitnum_t;
typedef int gdp_numbits_t;
@@ -400,11 +401,11 @@ static unsigned gdp_fetch_scalars(gd_entry_t *E, HV *hv, unsigned int mask,
v = gdp_hv_fetchs(hv, "scalar_ind", 0);
if (v) {
scalar_ind = *v;
- while (SvROK(scalar_ind))
+ while ((SvTYPE(scalar_ind) != SVt_NULL) && SvROK(scalar_ind))
scalar_ind = SvRV(scalar_ind);
if (SvTYPE(scalar_ind) == SVt_NULL)
- scalar_ind == NULL;
+ scalar_ind = NULL;
}
if (SvTYPE(scalar) != SVt_PVAV)
@@ -710,8 +711,8 @@ static struct gdp_din gdp_convert_data(SV *d, I32 items, I32 ax, size_t idx,
size_t i;
AV *av = NULL;
- dtrace("%p, %i, %i, %zi, \"%s\", \"%s\"", d, (int)items, (int)ax, idx, pkg,
- func);
+ dtrace("%p, %i, %i, %" PRIuSIZE ", \"%s\", \"%s\"", d, (int)items, (int)ax,
+ idx, pkg, func);
/* argument grokking goes thus (in order!):
* if d == undef, the remaining arguments are taken to be data
@@ -773,8 +774,8 @@ static struct gdp_din gdp_convert_data(SV *d, I32 items, I32 ax, size_t idx,
}
}
- dreturn("{ %p, %03x, %i, %zi }", din.data_in, din.type, din.arg_type,
- din.nsamp);
+ dreturn("{ %p, %03x, %i, %" PRIuSIZE " }", din.data_in, din.type,
+ din.arg_type, din.nsamp);
return din;
}
@@ -870,7 +871,7 @@ static SV *gdp_newRVavpv0(const char **l)
/* convert a char ** with length into a reference to a list of strings */
static SV *gdp_newRVavpv(const char **l, size_t n)
{
- dtrace("%p, %zi", l, n);
+ dtrace("%p, %" PRIuSIZE, l, n);
SV *rv;
int i;
AV *av = newAV();
@@ -887,7 +888,7 @@ static SV *gdp_newRVavpv(const char **l, size_t n)
/* convert a complex double * into a reference to a list of complex data */
static SV *gdp_newRVavcmp(GD_DCOMPLEXV(l), size_t n)
{
- dtrace("%p, %zi", l, n);
+ dtrace("%p, %" PRIuSIZE, l, n);
SV *rv;
int i;
AV *av = newAV();
@@ -1086,7 +1087,7 @@ static int gdp_parser_callback(gd_parser_data_t *pdata, void *extra)
* stack; returns the updated stack pointer */
static void * gdp_unpack(SV **sp, const void *data, size_t n, gd_type_t type)
{
- dtrace("%p, %p, %zi, %03x", sp, data, n, type);
+ dtrace("%p, %p, %" PRIuSIZE ", %03x", sp, data, n, type);
size_t i;
AV *av = NULL;
@@ -1242,18 +1243,31 @@ get_carray(dirfile, field_code, return_type)
PPCODE:
dtrace("%p, \"%s\", %03x; %i", dirfile, field_code, return_type,
(int)GIMME_V);
- size_t len = gd_array_len(dirfile, field_code);
- data_out = safemalloc(GD_SIZE(return_type) * len);
- gd_get_carray(dirfile, field_code, return_type, data_out);
- GDP_UNDEF_ON_ERROR(safefree(data_out));
+ if (return_type == GD_NULL) {
+ gd_get_carray(dirfile, field_code, GD_NULL, NULL);
- if (GIMME_V == G_ARRAY)
- sp = (SV **)gdp_unpack(sp, data_out, len, return_type);
- else
- XPUSHs(sv_2mortal(newSVpvn(data_out, len * GD_SIZE(return_type))));
+ GDP_UNDEF_ON_ERROR();
+
+ if (GIMME_V != G_ARRAY) {
+ dreturnvoid();
+ XSRETURN_UNDEF;
+ }
+ } else {
+ size_t len = gd_array_len(dirfile, field_code);
+ data_out = safemalloc(GD_SIZE(return_type) * len);
+ gd_get_carray(dirfile, field_code, return_type, data_out);
+
+ GDP_UNDEF_ON_ERROR(safefree(data_out));
+
+ if (GIMME_V == G_ARRAY)
+ sp = (SV **)gdp_unpack(sp, data_out, len, return_type);
+ else
+ XPUSHs(sv_2mortal(newSVpvn(data_out, len * GD_SIZE(return_type))));
+
+ safefree(data_out);
+ }
- safefree(data_out);
dreturnvoid();
void
@@ -1269,19 +1283,32 @@ get_carray_slice(dirfile, field_code, start, len, return_type)
ALIAS:
GetData::Dirfile::get_carray_slice = 1
PPCODE:
- dtrace("%p, \"%s\", %u, %zi, %03x; %i", dirfile, field_code, start, len,
- return_type, (int)GIMME_V);
- data_out = safemalloc(GD_SIZE(return_type) * len);
- gd_get_carray_slice(dirfile, field_code, start, len, return_type, data_out);
+ dtrace("%p, \"%s\", %u, %" PRIuSIZE ", %03x; %i", dirfile, field_code,
+ start, len, return_type, (int)GIMME_V);
- GDP_UNDEF_ON_ERROR(safefree(data_out));
+ if (return_type == GD_NULL) {
+ gd_get_carray_slice(dirfile, field_code, start, len, GD_NULL, NULL);
- if (GIMME_V == G_ARRAY)
- sp = (SV **)gdp_unpack(sp, data_out, len, return_type);
- else
- XPUSHs(sv_2mortal(newSVpvn(data_out, len * GD_SIZE(return_type))));
+ GDP_UNDEF_ON_ERROR();
+
+ if (GIMME_V != G_ARRAY) {
+ dreturnvoid();
+ XSRETURN_UNDEF;
+ }
+ } else {
+ data_out = safemalloc(GD_SIZE(return_type) * len);
+ gd_get_carray_slice(dirfile, field_code, start, len, return_type,
+ data_out);
- safefree(data_out);
+ GDP_UNDEF_ON_ERROR(safefree(data_out));
+
+ if (GIMME_V == G_ARRAY)
+ sp = (SV **)gdp_unpack(sp, data_out, len, return_type);
+ else
+ XPUSHs(sv_2mortal(newSVpvn(data_out, len * GD_SIZE(return_type))));
+
+ safefree(data_out);
+ }
dreturnvoid();
SV *
@@ -1299,7 +1326,9 @@ get_constant(dirfile, field_code, return_type)
dtrace("%p, \"%s\", %03x", dirfile, field_code, return_type);
data_out = safemalloc(16);
- if (return_type & GD_COMPLEX)
+ if (return_type == GD_NULL)
+ type = GD_NULL;
+ else if (return_type & GD_COMPLEX)
type = GD_COMPLEX128;
else if (return_type & GD_IEEE754)
type = GD_FLOAT64;
@@ -1312,7 +1341,11 @@ get_constant(dirfile, field_code, return_type)
GDP_UNDEF_ON_ERROR(safefree(data_out));
- if (type == GD_COMPLEX128)
+ if (type == GD_NULL) {
+ safefree(data_out);
+ dreturnvoid();
+ XSRETURN_UNDEF;
+ } else if (type == GD_COMPLEX128)
RETVAL = gdp_newSVcmp(((double*)data_out)[0], ((double*)data_out)[1]);
else if (type == GD_FLOAT64)
RETVAL = newSVnv(*(double*)data_out);
@@ -1511,6 +1544,7 @@ entry(dirfile, field_code)
break;
case GD_INDEX_ENTRY:
case GD_STRING_ENTRY:
+ case GD_ALIAS_ENTRY: /* avoid compiler warnings */
case GD_NO_ENTRY:
break;
}
@@ -1693,7 +1727,8 @@ discard(dirfile)
dreturn("%i", RETVAL);
void
-getdata(dirfile, field_code, first_frame, first_samp, num_frames, num_samp, return_type=GD_UNKNOWN)
+getdata(dirfile, field_code, first_frame, first_samp, num_frames, num_samp, \
+ return_type=GD_UNKNOWN)
DIRFILE * dirfile
const char * field_code
gd_off64_t first_frame
@@ -1710,9 +1745,9 @@ getdata(dirfile, field_code, first_frame, first_samp, num_frames, num_samp, retu
ALIAS:
GetData::Dirfile::getdata = 1
PPCODE:
- dtrace("%p, \"%s\", %lli, %lli, %zi, %zi, %03x; %i", dirfile, field_code,
- (long long)first_frame, (long long)first_samp, num_frames, num_samp,
- return_type, (int)GIMME_V);
+ dtrace("%p, \"%s\", %" PRId64 ", %" PRId64 ", %" PRIuSIZE ", %" PRIuSIZE
+ ", %03x; %i", dirfile, field_code, (int64_t)first_frame,
+ (int64_t)first_samp, num_frames, num_samp, return_type, (int)GIMME_V);
t = gd_entry_type(dirfile, field_code);
@@ -1728,22 +1763,37 @@ getdata(dirfile, field_code, first_frame, first_samp, num_frames, num_samp, retu
if (return_type == GD_UNKNOWN)
croak("%s::getdata() - No return type specified", gdp_package);
+
+ if (return_type == GD_NULL) {
+ len = gd_getdata64(dirfile, field_code, first_frame, first_samp, 0,
+ num_samp, GD_NULL, NULL);
+
+ GDP_UNDEF_ON_ERROR();
- data_out = safemalloc(GD_SIZE(return_type) * num_samp);
+ /* For GD_NULL, we return len in scalar context and an empty array
+ * in array context */
+ if (GIMME_V == G_ARRAY)
+ ; /* nothing to return */
+ else
+ GDP_PUSHuv(len);
+ } else {
+ data_out = safemalloc(GD_SIZE(return_type) * num_samp);
- len = gd_getdata64(dirfile, field_code, first_frame, first_samp, 0,
- num_samp, return_type, data_out);
+ len = gd_getdata64(dirfile, field_code, first_frame, first_samp, 0,
+ num_samp, return_type, data_out);
- GDP_UNDEF_ON_ERROR(safefree(data_out));
+ GDP_UNDEF_ON_ERROR(safefree(data_out));
- /* In array context, unpack the array and push it onto the stack,
- * otherwise just return the packed data */
- if (GIMME_V == G_ARRAY)
- sp = (SV **)gdp_unpack(sp, data_out, len, return_type);
- else
- XPUSHs(sv_2mortal(newSVpvn(data_out, len * GD_SIZE(return_type))));
+ /* In array context, unpack the array and push it onto the stack,
+ * otherwise just return the packed data */
+ if (GIMME_V == G_ARRAY)
+ sp = (SV **)gdp_unpack(sp, data_out, len, return_type);
+ else
+ XPUSHs(sv_2mortal(newSVpvn(data_out, len * GD_SIZE(return_type))));
+
+ safefree(data_out);
+ }
- safefree(data_out);
dreturnvoid();
void
@@ -2056,8 +2106,8 @@ put_carray_slice(dirfile, field_code, start, d, ...)
ALIAS:
GetData::Dirfile::put_carray_slice = 1
CODE:
- dtrace("%p, \"%s\", %lli, %p, ...[%li]", dirfile, field_code,
- (long long)start, d, (long)items - 4);
+ dtrace("%p, \"%s\", %" PRId64 ", %p, ...[%li]", dirfile, field_code,
+ (int64_t)start, d, (long)items - 4);
din = gdp_convert_data(d, items, ax, 3, gdp_package, "put_carray_slice");
@@ -2146,8 +2196,9 @@ putdata(dirfile, field_code, first_frame, first_sample, d, ...)
ALIAS:
GetData::Dirfile::putdata = 1
CODE:
- dtrace("%p, \"%s\", %lli, %lli, %p, ...[%li]", dirfile, field_code,
- (long long)first_frame, (long long)first_sample, d, (long)items - 5);
+ dtrace("%p, \"%s\", %" PRId64 ", %" PRId64 ", %p, ...[%li]", dirfile,
+ field_code, (int64_t)first_frame, (int64_t)first_sample, d,
+ (long)items - 5);
din = gdp_convert_data(d, items, ax, 4, gdp_package, "putdata");
@@ -2161,7 +2212,7 @@ putdata(dirfile, field_code, first_frame, first_sample, d, ...)
CLEANUP:
if (din.arg_type != GDP_DATA_IN_PACK)
safefree(din.data_in);
- dreturn("%zi", RETVAL);
+ dreturn("%" PRIuSIZE, RETVAL);
int
add_const(dirfile, field_code, const_type, value=undef, fragment_index=0)
@@ -2384,6 +2435,6 @@ carray_len(dirfile, field_code)
OUTPUT:
RETVAL
CLEANUP:
- dreturn("%zi", RETVAL);
+ dreturn("%" PRIuSIZE, RETVAL);
INCLUDE: simple_funcs.xs
diff --git a/bindings/perl/src/Makefile.PL.in b/bindings/perl/src/Makefile.PL.in
new file mode 100644
index 0000000..be767a1
--- /dev/null
+++ b/bindings/perl/src/Makefile.PL.in
@@ -0,0 +1,34 @@
+# Copyright (C) 2015 D. V. Wiebe
+#
+##########################################################################
+#
+# This file is part of the GetData project.
+#
+# GetData is free software; you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License as published by the
+# Free Software Foundation; either version 2.1 of the License, or (at your
+# option) any later version.
+#
+# GetData is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+#
+# @configure_input@
+
+use ExtUtils::MakeMaker;
+
+WriteMakefile(
+ ABSTRACT => "Perl bindings to the GetData library",
+ AUTHOR => 'The GetData Project <@PACKAGE_BUGREPORT@>',
+ VERSION_FROM => "lib/GetData.pm",
+ DEFINE => "@DEFS@ -I at top_builddir@/src",
+ LIBS => ['-L at top_builddir@/src/.libs/ -lgetdata'],
+ INC => '-I at top_srcdir@/src',
+ LICENSE => 'lgpl_2_1',
+ NAME => "GetData",
+# OBJECT => 'GetData.o',
+ PREREQ_PM => {
+ perl => '5.6.0',
+ 'Math::Complex' => '1.34'
+ },
+# XS => { 'GetData.xs' => 'GetData.c' }
+);
diff --git a/bindings/perl/typemap b/bindings/perl/src/typemap
similarity index 84%
rename from bindings/perl/typemap
rename to bindings/perl/src/typemap
index 783c5b8..b516608 100644
--- a/bindings/perl/typemap
+++ b/bindings/perl/src/typemap
@@ -35,6 +35,7 @@ gd_windop_t T_IV
# GetData Perl pseudotypes
gdp_complex_in T_COMPLEXIN
+gdp_complex_undef T_COMPLEX_UNDEF
gdp_bitnum_t T_IV_FFFF
gdp_char * T_PV_NULL
gdp_int T_IV_ZERO
@@ -57,6 +58,27 @@ T_DIRFILE
} else
croak(\"%s::${func_name}() - Invalid dirfile object\", gdp_package);
T_COMPLEXIN
+ if (SvROK($arg) && SvTYPE(SvRV($arg)) == SVt_PVAV) {
+ AV *av = (AV*)SvRV($arg);
+ I32 i, len = av_len(av);
+
+ $var = ($type)safemalloc(2 * sizeof(double) * (1 + len));
+ for (i = 0; i <= len; ++i) {
+ SV **sv = av_fetch(av, i, 0);
+ if (sv == NULL) {
+ safefree($var);
+ croak(\"%s::${func_name}() - Expected array of complex numbers\",
+ gdp_package);
+ }
+ gdp_convert_cmp(gd_cap_(${var}, i), *sv, NULL, gdp_package,
+ \"${func_name}\");
+ }
+ } else {
+ $var = NULL;
+ croak(\"%s::${func_name}() - Expected array of complex numbers\",
+ gdp_package);
+ }
+T_COMPLEX_UNDEF
if ($arg == undef)
$var = NULL;
else if (SvROK($arg) && SvTYPE(SvRV($arg)) == SVt_PVAV) {
diff --git a/bindings/perl/t/big_test.t b/bindings/perl/t/big_test.t
index 4cbb964..d43a170 100644
--- a/bindings/perl/t/big_test.t
+++ b/bindings/perl/t/big_test.t
@@ -22,7 +22,7 @@
use GetData;
use Math::Complex;
use strict;
-use Test::More tests => 1519;
+use Test::More tests => 1533;
my $ne = 0;
my ($s, @a, %h);
@@ -210,6 +210,14 @@ CheckArray(4, \@a, 41 .. 48);
CheckOK(10);
CheckArray(10, \@a, 41 .. 48);
+# 11: getdata (GD_NULL) check - in both scalar and array context
+$s = $_->getdata("data", 5, 0, 1, 0, $GetData::NULL);
+CheckOK2(11,1);
+CheckNum(11, $s, 8);
+ at a = $_->getdata("data", 5, 0, 1, 0, $GetData::NULL);
+CheckOK2(11,2);
+CheckArray(11, @a);
+
# 12: constant (INT8) check
$s = $_->get_constant("const", $GetData::INT8);
CheckOK(12);
@@ -220,6 +228,11 @@ $s = $_->get_constant("const", $GetData::COMPLEX128);
CheckOK(19);
CheckNum(19, $s, 5.5);
+# 20: constant (GD_NULL) check
+$s = $_->get_constant("const", $GetData::NULL);
+CheckOK(20);
+CheckNum(20, $s, undef);
+
# 23: nfields check
$s = $_->field_list;
CheckOK(23);
@@ -2003,6 +2016,23 @@ CheckArray2(259, 13, $h{'scalar_ind'}, undef, -1, -1, 4, undef, -1);
CheckString(272, $s, undef);
}
+# 273: get_carray (GD_NULL)
+$s = $_->get_carray("carray", $GetData::NULL);
+CheckOK(273);
+CheckNum(273, $s, undef);
+ at a = $_->get_carray("carray", $GetData::NULL);
+CheckOK(273);
+CheckArray(273, \@a);
+
+# 274: get_carray_slice (GD_NULL)
+ at a = $_->get_carray_slice("carray", 2, 2, $GetData::NULL);
+CheckOK(274);
+CheckNum(273, $s, undef);
+ at a = $_->get_carray_slice("carray", 2, 2, $GetData::NULL);
+CheckOK(274);
+CheckArray(274, \@a);
+
+
diff --git a/bindings/php/Makefile.in b/bindings/php/Makefile.in
index b1256e7..db560c3 100644
--- a/bindings/php/Makefile.in
+++ b/bindings/php/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -15,7 +15,17 @@
@SET_MAKE@
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -79,18 +89,19 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
subdir = bindings/php
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(top_srcdir)/depcomp
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compare_version.m4 \
$(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/encoding.m4 \
$(top_srcdir)/m4/floatordering.m4 $(top_srcdir)/m4/idl.m4 \
- $(top_srcdir)/m4/matlab.m4 $(top_srcdir)/m4/perl.m4 \
- $(top_srcdir)/m4/php.m4 $(top_srcdir)/m4/python.m4 \
- $(top_srcdir)/m4/win32.m4 $(top_srcdir)/m4/version.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/matlab.m4 \
+ $(top_srcdir)/m4/perl.m4 $(top_srcdir)/m4/php.m4 \
+ $(top_srcdir)/m4/python.m4 $(top_srcdir)/m4/win32.m4 \
+ $(top_srcdir)/m4/version.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/src/gd_config.h \
$(top_builddir)/src/getdata.h
@@ -214,6 +225,7 @@ am__define_uniq_tagged_files = \
ETAGS = etags
CTAGS = ctags
DIST_SUBDIRS = $(SUBDIRS)
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
am__relativize = \
dir0=`pwd`; \
@@ -511,7 +523,6 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign bindings/php/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign bindings/php/Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -888,6 +899,8 @@ uninstall-am: uninstall-phpLTLIBRARIES
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
tags tags-am uninstall uninstall-am uninstall-phpLTLIBRARIES
+.PRECIOUS: Makefile
+
constants.c: ../make_parameters ../../src/getdata.h
../make_parameters h > $@
diff --git a/bindings/php/getdata.c b/bindings/php/getdata.c
index d7ca690..0b61e52 100644
--- a/bindings/php/getdata.c
+++ b/bindings/php/getdata.c
@@ -965,19 +965,25 @@ static struct gdphp_din gdphp_convert_data(zval *zdata1, zval *zdata2, int p1,
din.type = gdphp_type_from_long(zdata1, &ctx); /* doesn't return on error */
- ctx.p = p2;
+ if (din.type == GD_NULL) { /* Weird, but we'll allow it */
+ din.data = NULL;
+ din.ns = 0;
+ din.free_din = 0;
+ } else {
+ ctx.p = p2;
- switch (Z_TYPE_P(zdata2)) {
- case IS_STRING: /* packed data -- just use it in place */
- din.data = Z_STRVAL_P(zdata2);
- din.ns = Z_STRLEN_P(zdata2) / GD_SIZE(din.type);
- din.free_din = 0;
- break;
- case IS_ARRAY:
- gdphp_convert_array(&din, zdata2, &ctx);
- break;
- default:
- GDPHP_DIE(&ctx, "bad input data: expected array or string");
+ switch (Z_TYPE_P(zdata2)) {
+ case IS_STRING: /* packed data -- just use it in place */
+ din.data = Z_STRVAL_P(zdata2);
+ din.ns = Z_STRLEN_P(zdata2) / GD_SIZE(din.type);
+ din.free_din = 0;
+ break;
+ case IS_ARRAY:
+ gdphp_convert_array(&din, zdata2, &ctx);
+ break;
+ default:
+ GDPHP_DIE(&ctx, "bad input data: expected array or string");
+ }
}
}
@@ -3231,6 +3237,14 @@ PHP_FUNCTION(gd_get_carray)
len = gdphp_long_from_zval_null(zlen, -1);
unpack = gdphp_unpack(zunpack);
+ if (data_type == GD_NULL) {
+ if (len == -1)
+ GDPHP_RETURN_BOOL(gd_get_carray(D, field_code, GD_NULL, NULL));
+ else
+ GDPHP_RETURN_BOOL(gd_get_carray_slice(D, field_code, start, len, GD_NULL,
+ NULL));
+ }
+
if (len == -1) {
len = gd_array_len(D, field_code) - start;
if (len == 0) /* error */
@@ -3274,6 +3288,9 @@ PHP_FUNCTION(gd_get_constant)
if (gd_get_constant(D, field_code, data_type, datum))
GDPHP_RETURN_F;
+ if (data_type == GD_NULL)
+ GDPHP_RETURN_T;
+
gdphp_from_datum(return_value, datum, data_type);
dreturnvoid();
}
@@ -3333,31 +3350,41 @@ PHP_FUNCTION(gd_getdata)
unpack = gdphp_unpack(zunpack);
- /* figure out how much data we have */
- if (num_frames > 0) {
- unsigned spf = gd_spf(D, field_code);
- if (spf == 0)
- GDPHP_RETURN_F;
- ns = num_frames * spf + num_samples;
- } else
- ns = num_samples;
+ if (data_type == GD_NULL) {
+ n = gd_getdata(D, field_code, first_frame, first_sample, num_frames,
+ num_samples, GD_NULL, NULL);
- /* get the type, if needed */
- if (data_type == GD_UNKNOWN)
- data_type = gd_native_type(D, field_code);
+ GDPHP_CHECK_ERROR(D);
- /* allocate a buffer */
- gdphp_validate_type(data_type, &ctx);
- data = emalloc(ns * GD_SIZE(data_type));
+ dreturn("%" PRIuSIZE, n);
+ RETURN_LONG(n);
+ } else {
+ /* figure out how much data we have */
+ if (num_frames > 0) {
+ unsigned spf = gd_spf(D, field_code);
+ if (spf == 0)
+ GDPHP_RETURN_F;
+ ns = num_frames * spf + num_samples;
+ } else
+ ns = num_samples;
- n = gd_getdata(D, field_code, first_frame, first_sample, 0, ns, data_type,
- data);
+ /* get the type, if needed */
+ if (data_type == GD_UNKNOWN)
+ data_type = gd_native_type(D, field_code);
- GDPHP_CHECK_ERROR(D);
+ /* allocate a buffer */
+ gdphp_validate_type(data_type, &ctx);
+ data = emalloc(ns * GD_SIZE(data_type));
+
+ n = gd_getdata(D, field_code, first_frame, first_sample, 0, ns, data_type,
+ data);
- gdphp_from_data(return_value, n, data_type, data, 0, unpack);
+ GDPHP_CHECK_ERROR(D);
- dreturn("%" PRNsize_t, n);
+ gdphp_from_data(return_value, n, data_type, data, 0, unpack);
+
+ dreturn("%" PRIuSIZE, n);
+ }
}
PHP_FUNCTION(gd_hidden)
diff --git a/bindings/php/test/Makefile.in b/bindings/php/test/Makefile.in
index 3a5acd2..51b3cf6 100644
--- a/bindings/php/test/Makefile.in
+++ b/bindings/php/test/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -14,7 +14,17 @@
@SET_MAKE@
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -78,17 +88,19 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
subdir = bindings/php/test
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compare_version.m4 \
$(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/encoding.m4 \
$(top_srcdir)/m4/floatordering.m4 $(top_srcdir)/m4/idl.m4 \
- $(top_srcdir)/m4/matlab.m4 $(top_srcdir)/m4/perl.m4 \
- $(top_srcdir)/m4/php.m4 $(top_srcdir)/m4/python.m4 \
- $(top_srcdir)/m4/win32.m4 $(top_srcdir)/m4/version.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/matlab.m4 \
+ $(top_srcdir)/m4/perl.m4 $(top_srcdir)/m4/php.m4 \
+ $(top_srcdir)/m4/python.m4 $(top_srcdir)/m4/win32.m4 \
+ $(top_srcdir)/m4/version.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/src/gd_config.h \
$(top_builddir)/src/getdata.h
@@ -136,6 +148,7 @@ am__tty_colors = { \
std='[m'; \
fi; \
}
+am__DIST_COMMON = $(srcdir)/Makefile.in
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -413,7 +426,6 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign bindings/php/test/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign bindings/php/test/Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -683,6 +695,8 @@ uninstall-am:
mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
uninstall-am
+.PRECIOUS: Makefile
+
# clean up after the tests
check-local: check-TESTS
diff --git a/bindings/php/test/big_test.php b/bindings/php/test/big_test.php
index 66f10d0..d127746 100644
--- a/bindings/php/test/big_test.php
+++ b/bindings/php/test/big_test.php
@@ -192,6 +192,11 @@ $v = gd_getdata($D, 'data', 5, 0, 1, 0, GD_COMPLEX128, TRUE);
check_ok(10, $D);
check_var(10, $v, array(41., 42., 43., 44., 45., 46., 47., 48.));
+# 11: getdata (NULL)
+$v = gd_getdata($D, 'data', 5, 0, 1, 0, GD_NULL);
+check_ok(11, $D);
+check_var(11, $v, 8);
+
# 12: gd_get_constant (INT8)
$v = gd_get_constant($D, 'const', GD_UINT8);
check_ok(12, $D);
@@ -202,6 +207,11 @@ $v = gd_get_constant($D, 'const', GD_COMPLEX128);
check_ok(19, $D);
check_var(19, $v, 5.5);
+# 20: gd_get_constant (NULL)
+$v = gd_get_constant($D, 'const', GD_NULL);
+check_ok(20, $D);
+check_var(20, $v, true);
+
# 23: nfields
$v = gd_nfields($D);
check_ok(23, $D);
@@ -1668,6 +1678,17 @@ check_var(272, $v, null);
gd_discard($D2);
+# 273: get carray (NULL)
+$v = gd_get_carray($D, 'carray', GD_NULL);
+check_ok(273, $D);
+check_var(273, $v, true);
+
+# 274: get carray slice (NULL)
+$v = gd_get_carray($D, 'carray', GD_NULL, 2, 2);
+check_ok(274, $D);
+check_var(274, $v, true);
+
+
diff --git a/bindings/python/Makefile.am b/bindings/python/Makefile.am
index 757a787..75f520c 100644
--- a/bindings/python/Makefile.am
+++ b/bindings/python/Makefile.am
@@ -43,7 +43,15 @@ pyconstants.c: ../make_parameters
clean-local:
if MAKE_PYBINDINGS
- if [ -e setup.py ]; then ${PYTHON} setup.py clean; fi
+ test ! -f setup.py || ${PYTHON} setup.py clean
endif
rm -rf build pygetdata.so ${BUILT_SOURCES} debug.c *~
+# Avoid a race condition from distclean deleting setup.py between the test and
+# the ${PYTHON} in the clean-local rule. The variable shennanigans here are to
+# fool automake into letting us add a second distclean-generic rule. Had we
+# defined this rule with a bare "disclean-generic:", automake would assume we've
+# redefined the distclean-generic recipe, with an empty one, which we don't want
+# to do.
+gd_distclean_generic = distclean-generic
+$(gd_distclean_generic): clean-local
diff --git a/bindings/python/Makefile.in b/bindings/python/Makefile.in
index 2ca68d8..4bb1368 100644
--- a/bindings/python/Makefile.in
+++ b/bindings/python/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -15,7 +15,17 @@
@SET_MAKE@
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -79,18 +89,19 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
subdir = bindings/python
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(srcdir)/setup.py.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compare_version.m4 \
$(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/encoding.m4 \
$(top_srcdir)/m4/floatordering.m4 $(top_srcdir)/m4/idl.m4 \
- $(top_srcdir)/m4/matlab.m4 $(top_srcdir)/m4/perl.m4 \
- $(top_srcdir)/m4/php.m4 $(top_srcdir)/m4/python.m4 \
- $(top_srcdir)/m4/win32.m4 $(top_srcdir)/m4/version.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/matlab.m4 \
+ $(top_srcdir)/m4/perl.m4 $(top_srcdir)/m4/php.m4 \
+ $(top_srcdir)/m4/python.m4 $(top_srcdir)/m4/win32.m4 \
+ $(top_srcdir)/m4/version.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/src/gd_config.h \
$(top_builddir)/src/getdata.h
@@ -180,6 +191,7 @@ am__define_uniq_tagged_files = \
ETAGS = etags
CTAGS = ctags
DIST_SUBDIRS = $(SUBDIRS)
+am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/setup.py.in
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
am__relativize = \
dir0=`pwd`; \
@@ -457,6 +469,14 @@ nodist_python_SCRIPTS = pygetdata.so
BUILT_SOURCES = pyconstants.c
EXTRA_DIST = pydirfile.c pygetdata.c pyentry.c pygetdata.h pyfragment.c
distutils_path = build/lib.${PYTHON_PLATFORM}-${PYTHON_VERSION}
+
+# Avoid a race condition from distclean deleting setup.py between the test and
+# the ${PYTHON} in the clean-local rule. The variable shennanigans here are to
+# fool automake into letting us add a second distclean-generic rule. Had we
+# defined this rule with a bare "disclean-generic:", automake would assume we've
+# redefined the distclean-generic recipe, with an empty one, which we don't want
+# to do.
+gd_distclean_generic = distclean-generic
all: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) all-recursive
@@ -473,7 +493,6 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign bindings/python/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign bindings/python/Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -814,6 +833,8 @@ uninstall-am: uninstall-nodist_pythonSCRIPTS
ps ps-am tags tags-am uninstall uninstall-am \
uninstall-nodist_pythonSCRIPTS
+.PRECIOUS: Makefile
+
pygetdata.so: ${distutils_path}/pygetdata.so
cp $< $@
@@ -827,8 +848,9 @@ pyconstants.c: ../make_parameters
cd .. && ${MAKE} make_parameters
clean-local:
- at MAKE_PYBINDINGS_TRUE@ if [ -e setup.py ]; then ${PYTHON} setup.py clean; fi
+ at MAKE_PYBINDINGS_TRUE@ test ! -f setup.py || ${PYTHON} setup.py clean
rm -rf build pygetdata.so ${BUILT_SOURCES} debug.c *~
+$(gd_distclean_generic): clean-local
# 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/bindings/python/pydirfile.c b/bindings/python/pydirfile.c
index e80c92e..adedde8 100644
--- a/bindings/python/pydirfile.c
+++ b/bindings/python/pydirfile.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2009-2015 D. V. Wiebe
+/* Copyright (C) 2009-2016 D. V. Wiebe
*
***************************************************************************
*
@@ -376,22 +376,49 @@ static PyObject *gdpy_dirfile_getcarray(struct gdpy_dirfile_t *self,
char *keywords[] = {"field_code", "return_type", "start", "len", "as_list",
NULL};
const char *field_code;
- unsigned int start = 0, len = 0;
+ unsigned int start = 0;
+ size_t len = 0;
int as_list = 0;
gd_type_t return_type;
+ PyObject *return_type_obj = NULL;
PyObject *pyobj = NULL;
npy_intp dims[] = { 0 };
dtrace("%p, %p, %p", self, args, keys);
if (!PyArg_ParseTupleAndKeywords(args, keys,
- "si|IIi:pygetdata.dirfile.get_carray", keywords, &field_code,
- &return_type, &start, &len, &as_list))
+ "s|OIIi:pygetdata.dirfile.get_carray", keywords, &field_code,
+ &return_type_obj, &start, &len, &as_list))
{
dreturn("%p", NULL);
return NULL;
}
+ /* get return type */
+ if (return_type_obj) {
+ return_type = (gd_type_t)PyInt_AsLong(return_type_obj);
+ if (PyErr_Occurred()) {
+ dreturn("%p", NULL);
+ return NULL;
+ }
+ } else {
+ return_type = gd_native_type(self->D, field_code);
+ PYGD_CHECK_ERROR(self->D, NULL);
+ }
+
+ if (return_type == GD_NULL) {
+ if (len == 0)
+ gd_get_carray(self->D, field_code, GD_NULL, NULL);
+ else
+ gd_get_carray_slice(self->D, field_code, start, len, GD_NULL, NULL);
+
+ PYGD_CHECK_ERROR(self->D, NULL);
+
+ Py_INCREF(Py_None);
+ dreturn("%p", Py_None);
+ return Py_None;
+ }
+
if (len == 0) {
len = gd_array_len(self->D, field_code);
if (len > start)
@@ -436,6 +463,7 @@ static PyObject *gdpy_dirfile_getconstant(struct gdpy_dirfile_t *self,
{
char *keywords[] = {"field_code", "return_type", NULL};
const char *field_code;
+ PyObject *return_type_obj = NULL;
gd_type_t return_type;
char data[16];
PyObject *pyobj;
@@ -443,13 +471,25 @@ static PyObject *gdpy_dirfile_getconstant(struct gdpy_dirfile_t *self,
dtrace("%p, %p, %p", self, args, keys);
if (!PyArg_ParseTupleAndKeywords(args, keys,
- "si:pygetdata.dirfile.get_constant", keywords, &field_code,
- &return_type))
+ "s|O:pygetdata.dirfile.get_constant", keywords, &field_code,
+ &return_type_obj))
{
dreturn("%p", NULL);
return NULL;
}
+ /* get return type */
+ if (return_type_obj) {
+ return_type = (gd_type_t)PyInt_AsLong(return_type_obj);
+ if (PyErr_Occurred()) {
+ dreturn("%p", NULL);
+ return NULL;
+ }
+ } else {
+ return_type = gd_native_type(self->D, field_code);
+ PYGD_CHECK_ERROR(self->D, NULL);
+ }
+
gd_get_constant(self->D, field_code, return_type, data);
PYGD_CHECK_ERROR(self->D, NULL);
@@ -593,7 +633,7 @@ static PyObject *gdpy_dirfile_getdata(struct gdpy_dirfile_t *self,
PY_LONG_LONG first_frame = 0, first_sample = 0;
PyObject *num_frames_obj = NULL, *num_samples_obj = NULL;
PyObject *return_type_obj = NULL;
- long int num_frames = 0, num_samples = 0;
+ PY_LONG_LONG num_frames = 0, num_samples = 0;
size_t ns;
int as_list = 0, read_to_end = 0;
gd_type_t return_type = GD_NULL;
@@ -674,7 +714,16 @@ static PyObject *gdpy_dirfile_getdata(struct gdpy_dirfile_t *self,
num_samples += num_frames * spf;
}
- if (num_samples == 0) {
+ /* Handle GD_NULL -- this still needs to be run though the C library to
+ * check for errors and get the return value */
+ if (return_type == GD_NULL) {
+ ns = gd_getdata64(self->D, field_code, first_frame, first_sample, 0,
+ (size_t)num_samples, GD_NULL, NULL);
+
+ PYGD_CHECK_ERROR(self->D, NULL);
+
+ pyobj = PyLong_FromLongLong(ns);
+ } else if (num_samples == 0) {
if (!as_list)
pyobj = PyArray_ZEROS(1, dims, gdpy_npytype_from_type(return_type), 0);
else
@@ -686,7 +735,7 @@ static PyObject *gdpy_dirfile_getdata(struct gdpy_dirfile_t *self,
pyobj = PyArray_SimpleNew(1, dims, gdpy_npytype_from_type(return_type));
data = PyArray_DATA(pyobj);
} else
- data = malloc(num_samples * GD_SIZE(return_type));
+ data = malloc((size_t)num_samples * GD_SIZE(return_type));
ns = gd_getdata64(self->D, field_code, first_frame, first_sample, 0,
(size_t)num_samples, return_type, data);
@@ -1679,7 +1728,7 @@ static PyObject *gdpy_dirfile_getstring(struct gdpy_dirfile_t *self,
gd_get_string(self->D, field_code, len, data);
- PYGD_CHECK_ERROR(self->D, NULL);
+ PYGD_CHECK_ERROR2(self->D, NULL, free(data));
pyobj = PyString_FromString(data);
@@ -1763,7 +1812,8 @@ static PyObject *gdpy_dirfile_putcarray(struct gdpy_dirfile_t *self,
{
char *keywords[] = { "field_code", "data", "type", "start", NULL };
const char *field_code;
- unsigned int start = 0, len;
+ unsigned int start = 0;
+ size_t len;
gd_type_t type = GD_UNKNOWN;
PyObject *pyobj;
int have_ndarray = 0;
@@ -1786,7 +1836,7 @@ static PyObject *gdpy_dirfile_putcarray(struct gdpy_dirfile_t *self,
return NULL;
}
have_ndarray = 1;
- len = PyArray_DIM(pyobj, 0);
+ len = (size_t)PyArray_DIM(pyobj, 0);
} else {
if (!PyList_Check(pyobj)) {
PyErr_SetString(PyExc_TypeError,
@@ -2239,7 +2289,7 @@ static PyObject *gdpy_dirfile_seek(struct gdpy_dirfile_t *self, PyObject *args,
PYGD_CHECK_ERROR(self->D, NULL);
- pyobj = PyLong_FromLongLong((long long)pos);
+ pyobj = PyLong_FromLongLong((PY_LONG_LONG)pos);
dreturn("%p", pyobj);
return pyobj;
@@ -2266,7 +2316,7 @@ static PyObject *gdpy_dirfile_tell(struct gdpy_dirfile_t *self, PyObject *args,
PYGD_CHECK_ERROR(self->D, NULL);
- pyobj = PyLong_FromLongLong((long long)pos);
+ pyobj = PyLong_FromLongLong((PY_LONG_LONG)pos);
dreturn("%p", pyobj);
return pyobj;
@@ -2858,15 +2908,17 @@ static PyMethodDef gdpy_dirfile_methods[] = {
},
{"get_carray", (PyCFunction)gdpy_dirfile_getcarray,
METH_VARARGS | METH_KEYWORDS,
- "get_carray(field_code, return_type [, start, len, as_list])\n\n"
+ "get_carray(field_code [, return_type, start, len, as_list])\n\n"
"Retrieve the value of the CARRAY field specified by 'field_code'.\n"
- "The 'return_type' parameter indicates the desired type of the\n"
- "elements of the array returned, and should be (typically) one of:\n"
- "pygetdata.INT, pygetdata.LONG, pygetdata.ULONG, pygetdata.FLOAT,\n"
+ "The 'return_type' parameter, if given, indicates the desired type of\n"
+ "the elements of the array returned, and should be (typically) one\n"
+ "of: pygetdata.INT, pygetdata.LONG, pygetdata.ULONG, pygetdata.FLOAT,\n"
"or pygetdata.COMPLEX, although any GetData data type code is\n"
- "permitted. If NumPy support is present in pygetdata, and 'as_list'\n"
- "is not given or is zero, a NumPy array will be returned. Otherwise\n"
- "a list of values will be returned.\n\n"
+ "permitted. If 'as_list' is not given or is zero, a NumPy array will\n"
+ "be returned. Otherwise a list of values will be returned. If\n"
+ "omitted, the return type defaults to the native type of the field\n"
+ "(see dirfile.native_type()). If 'return_type' is pygetdata.NULL,\n"
+ "None is returned on success.\n\n"
"The first element returned is given by 'start', counting from zero.\n"
"If omitted, zero is assumed. The number of elements returned is\n"
"given by 'len'. If omitted or zero, all elements from 'start' to\n"
@@ -2874,13 +2926,16 @@ static PyMethodDef gdpy_dirfile_methods[] = {
},
{"get_constant", (PyCFunction)gdpy_dirfile_getconstant,
METH_VARARGS | METH_KEYWORDS,
- "get_constant(field_code, return_type)\n\n"
+ "get_constant(field_code [, return_type])\n\n"
"Retrieve the value of the CONST field specified by 'field_code'.\n"
- "The 'return_type' parameter indicates the desired type of the object\n"
- "returned, and should be (typically) one of: pygetdata.INT,\n"
- "pygetdata.LONG, pygetdata.ULONG, pygetdata.FLOAT, or\n"
+ "The 'return_type' parameter, if given, indicates the desired type of\n"
+ "the object returned, and should be (typically) one of:\n"
+ "pygetdata.INT, pygetdata.LONG, pygetdata.ULONG, pygetdata.FLOAT, or\n"
"pygetdata.COMPLEX, although any GetData data type code is permitted.\n"
- "See gd_get_constant(3)."
+ "If omitted, the return type defaults to the native type of the field\n"
+ "(see dirfile.native_type()). If 'return_type' is pygetdata.NULL,\n"
+ "None is returned on success. See gd_get_constant(3)."
+ /* ------- handy ruler ---------------------------------------------| */
},
{"constants", (PyCFunction)gdpy_dirfile_getconstants,
METH_VARARGS | METH_KEYWORDS,
@@ -2909,9 +2964,9 @@ static PyMethodDef gdpy_dirfile_methods[] = {
"carrays(return_type [, as_list])\n\n"
"Retrieve all CARRAY fields, and their values. A list of tuples\n"
"will be returned, each tuple containing the name and values of the\n"
- "field. If NumPy support is present in pygetdata, and 'as_list' is\n"
- "not given or zero, the values will be returned in NumPy arrays;\n"
- "otherwise, the values will be returned as lists.\n\n"
+ "field. If 'as_list' is not given or is zero, the values will be\n"
+ "returned in NumPy arrays; otherwise, the values will be returned as\n"
+ "lists.\n\n"
"The 'return_type' parameter indicates the desired type of the values\n"
"returned, and should be (typically) one of: pygetdata.INT,\n"
"pygetdata.LONG, pygetdata.ULONG, pygetdata.FLOAT, or\n"
@@ -2922,19 +2977,20 @@ static PyMethodDef gdpy_dirfile_methods[] = {
{"getdata", (PyCFunction)gdpy_dirfile_getdata, METH_VARARGS | METH_KEYWORDS,
"getdata(field_code [, return_type, first_frame, first_sample,\n"
"num_frames, num_samples, as_list])\n\n"
- "Retrieve a data vector from the dirfile. If NumPy support is\n"
- "present in pygetdata, and 'as_list' is not given or zero, a NumPy\n"
- "array will be returned. Otherwise a list of data values will\n"
- "be returned. NumPy arrays should be preferred for large datasets:\n"
- "they are more efficient both in terms of memory usage and retrieval\n"
- "time.\n\n"
+ "Retrieve a data vector from the dirfile. If 'as_list' is not given\n"
+ "or is zero, a NumPy array will be returned. Otherwise a list of\n"
+ "data values will be returned. NumPy arrays should be preferred for\n"
+ "large datasets: they are more efficient both in terms of memory\n"
+ "usage and retrieval time.\n\n"
"The 'return_type' parameter indicates the desired type of the values\n"
"returned. For NumPy data, the NumPy array will have the dtype\n"
"indicated. For list data it should be (typically) one of:\n"
"pygetdata.INT, pygetdata.LONG, pygetdata.ULONG, pygetdata.FLOAT, or\n"
"pygetdata.COMPLEX, although any GetData data type code is permitted.\n"
"If omitted, the return type defaults to the native type of the field\n"
- "(see dirfile.native_type()).\n\n"
+ "(see dirfile.native_type()). If 'return_type' is pygetdata.NULL,\n"
+ "this function will simply return the number of samples read (as in\n"
+ "the C API), ignoring 'as_list'.\n\n"
"The 'first_frame' and 'first_sample' parameters indicate first\n"
"datum to read. If they are both omitted, data is read from the\n"
"first sample. Similarly, 'num_frames' and 'num_samples' indicate\n"
@@ -3007,10 +3063,9 @@ static PyMethodDef gdpy_dirfile_methods[] = {
"mcarrays(parent, return_type [, as_list])\n\n"
"Retrieve all CARRAY metafields, and their values, for the parent\n"
"field 'parent'. A list of tuples will be returned, each tuple\n"
- "containing the name and values of the field. If NumPy support is\n"
- "present in pygetdata, and 'as_list' is not given or zero, the values\n"
- "will be returned in NumPy arrays; otherwise, the values will be\n"
- "returned as lists.\n\n"
+ "containing the name and values of the field. If 'as_list' is not\n"
+ "given or is zero, the values will be returned in NumPy arrays;\n"
+ "otherwise, the values will be returned as lists.\n\n"
"The 'return_type' parameter indicates the desired type of the values\n"
"returned, and should be (typically) one of: pygetdata.INT,\n"
"pygetdata.LONG, pygetdata.ULONG, pygetdata.FLOAT, or\n"
@@ -3205,7 +3260,6 @@ static PyMethodDef gdpy_dirfile_methods[] = {
"same type. The parameter 'start' indicates where the first sample\n"
"in which the data will be stored. Zero is assumed if not given.\n"
"See gd_put_carray_slice(3)."
- /* ------- handy ruler ---------------------------------------------| */
},
{"put_constant", (PyCFunction)gdpy_dirfile_putconstant,
METH_VARARGS | METH_KEYWORDS,
diff --git a/bindings/python/pyentry.c b/bindings/python/pyentry.c
index c9ced75..d591f44 100644
--- a/bindings/python/pyentry.c
+++ b/bindings/python/pyentry.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2009-2015 D. V. Wiebe
+/* Copyright (C) 2009-2016 D. V. Wiebe
*
***************************************************************************
*
@@ -43,6 +43,7 @@ static const char *gdpy_entry_type_names[] =
"STRING_ENTRY", /* 0x11 */
"CARRAY_ENTRY", /* 0x12 */
};
+#define GDPY_N_ENTYPES 0x12
static char *gdpy_dup_pystring(PyObject *obj)
{
@@ -157,7 +158,8 @@ static void gdpy_set_entry_from_tuple(gd_entry_t *E, PyObject *tuple,
PyObject *parm2;
PyObject *parm3;
PyObject *obj;
- int i, count, size, min;
+ int i, count, min;
+ long size;
dtrace("%p, %p, \"%s\"", E, tuple, name);
@@ -203,7 +205,7 @@ static void gdpy_set_entry_from_tuple(gd_entry_t *E, PyObject *tuple,
size = PyTuple_Size(tuple);
if (size < min) {
PyErr_Format(PyExc_TypeError, "'pygetdata.entry' "
- "%s: needed %d entry parameters, but got only %d",
+ "%s: needed %d entry parameters, but got only %" PRIdSIZE,
name, min, size);
dreturnvoid();
return;
@@ -233,7 +235,7 @@ static void gdpy_set_entry_from_tuple(gd_entry_t *E, PyObject *tuple,
return;
}
- count = E->EN(lincom,n_fields) = PyTuple_Size(parm1);
+ count = E->EN(lincom,n_fields) = (int)PyTuple_Size(parm1);
if (count > GD_MAX_LINCOM)
count = GD_MAX_LINCOM;
@@ -385,7 +387,7 @@ static void gdpy_set_entry_from_tuple(gd_entry_t *E, PyObject *tuple,
return;
}
- E->EN(polynom,poly_ord) = count = PyTuple_Size(parm2) - 1;
+ E->EN(polynom,poly_ord) = count = (int)PyTuple_Size(parm2) - 1;
if (count > GD_MAX_POLYORD)
count = GD_MAX_POLYORD;
@@ -659,7 +661,7 @@ static int gdpy_entry_init(struct gdpy_entry_t *self, PyObject *args,
}
/* check for valid field type */
- if (E.field_type > 0x13 || E.field_type <= 0 ||
+ if (E.field_type > GDPY_N_ENTYPES || E.field_type <= 0 ||
gdpy_entry_type_names[E.field_type] == NULL) {
PyErr_SetString(PyExc_ValueError,
"'pygetdata.entry.__init__' invalid entry type");
@@ -1005,7 +1007,7 @@ static PyObject *gdpy_entry_getdatatype(struct gdpy_entry_t *self,
static int gdpy_entry_setdatatype(struct gdpy_entry_t *self, PyObject *value,
void *closure)
{
- int t;
+ long t;
dtrace("%p, %p, %p", self, value, closure);
@@ -2014,13 +2016,13 @@ static PyObject *gdpy_entry_getparms(struct gdpy_entry_t *self, void *closure)
case GD_WINDOP_NE:
tuple = Py_BuildValue("(ssiL)", self->E->in_fields[0],
self->E->in_fields[1], self->E->EN(window,windop),
- (long long)self->E->EN(window,threshold).i);
+ (PY_LONG_LONG)self->E->EN(window,threshold).i);
break;
case GD_WINDOP_SET:
case GD_WINDOP_CLR:
tuple = Py_BuildValue("(ssiK)", self->E->in_fields[0],
self->E->in_fields[1], self->E->EN(window,windop),
- (unsigned long long)self->E->EN(window,threshold).u);
+ (unsigned PY_LONG_LONG)self->E->EN(window,threshold).u);
break;
default:
tuple = Py_BuildValue("(ssid)", self->E->in_fields[0],
@@ -2100,7 +2102,7 @@ static PyObject *gdpy_entry_getwindop(struct gdpy_entry_t *self, void *closure)
static int gdpy_entry_setwindop(struct gdpy_entry_t *self, PyObject *value,
void *closure)
{
- int t;
+ long t;
dtrace("%p, %p, %p", self, value, closure);
@@ -2141,12 +2143,13 @@ static PyObject *gdpy_entry_getthreshold(struct gdpy_entry_t *self,
switch (self->E->EN(window,windop)) {
case GD_WINDOP_EQ:
case GD_WINDOP_NE:
- obj = PyLong_FromLongLong((long long)self->E->EN(window,threshold).i);
+ obj = PyLong_FromLongLong(
+ (PY_LONG_LONG)self->E->EN(window,threshold).i);
break;
case GD_WINDOP_SET:
case GD_WINDOP_CLR:
obj = PyLong_FromUnsignedLongLong(
- (unsigned long long)self->E->EN(window,threshold).u);
+ (unsigned PY_LONG_LONG)self->E->EN(window,threshold).u);
break;
default:
obj = PyFloat_FromDouble(self->E->EN(window,threshold).r);
diff --git a/bindings/python/pyfragment.c b/bindings/python/pyfragment.c
index 26aaab2..26baf5d 100644
--- a/bindings/python/pyfragment.c
+++ b/bindings/python/pyfragment.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2009-2015 D. V. Wiebe
+/* Copyright (C) 2009-2016 D. V. Wiebe
*
***************************************************************************
*
@@ -211,7 +211,7 @@ static PyObject *gdpy_fragment_getoffset(struct gdpy_fragment_t *self,
PYGD_CHECK_ERROR(self->dirfile->D, NULL);
- pyobj = PyLong_FromLongLong((long long)offset);
+ pyobj = PyLong_FromLongLong((PY_LONG_LONG)offset);
dreturn("%p", pyobj);
return pyobj;
@@ -221,7 +221,7 @@ static PyObject *gdpy_fragment_setoffset(struct gdpy_fragment_t *self,
PyObject *args, PyObject *keys)
{
char *keywords[] = { "frameoffset", "recode", NULL };
- long long offset;
+ PY_LONG_LONG offset;
int recode = 0;
dtrace("%p, %p, %p", self, args, keys);
@@ -286,7 +286,7 @@ static int gdpy_fragment_setprotection(struct gdpy_fragment_t *self,
dtrace("%p, %p, %p", self, value, closure);
- p = PyInt_AsLong(value);
+ p = (int)PyInt_AsLong(value);
if (PyErr_Occurred()) {
dreturn("%i", -1);
diff --git a/bindings/python/pygetdata.c b/bindings/python/pygetdata.c
index 738c01d..13f21be 100644
--- a/bindings/python/pygetdata.c
+++ b/bindings/python/pygetdata.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2009-2015 D. V. Wiebe
+/* Copyright (C) 2009-2016 D. V. Wiebe
*
***************************************************************************
*
@@ -54,7 +54,7 @@ static const char *gdpy_exception_list[GD_N_ERROR_CODES] = {
"Exists",
"UncleanDatabase",
"Domain",
- "BadRepr",
+ NULL, /* 32 */
NULL, /* 33 */
NULL, /* 34 */
"Bounds",
@@ -70,6 +70,7 @@ static struct {
} gdpy_dead_exceptions[] = {
{ "BadEndianness", GD_E_ARGUMENT },
{ "BadProtection", GD_E_ARGUMENT },
+ { "BadRepr", GD_E_BAD_CODE },
{ "BadVersion", GD_E_ARGUMENT },
{ "OpenLinfile", GD_E_LUT },
{ "Flush", GD_E_IO },
@@ -241,9 +242,9 @@ gd_type_t gdpy_convert_from_pylist(PyObject *value, void *data, gd_type_t type,
switch(data_type) {
case GDPY_INT_AS_LONG:
type = GD_INT32;
- *(int32_t*)data = tmp.s;
+ *(int32_t*)data = (int32_t)tmp.s;
for (i = 1; i < ns; ++i)
- ((int32_t*)data)[i] = PyInt_AsLong(PyList_GetItem(value, i));
+ ((int32_t*)data)[i] = (int32_t)PyInt_AsLong(PyList_GetItem(value, i));
break;
case GDPY_LONG_AS_ULL:
type = GD_UINT64;
@@ -456,13 +457,13 @@ PyObject *gdpy_convert_to_pylist(const void *data, gd_type_t type, size_t ns)
case GD_UINT64:
for (i = 0; i < ns; ++i)
if (gdpylist_append(pyobj, PyLong_FromUnsignedLongLong(
- (unsigned long long)((uint64_t*)data)[i])))
+ (unsigned PY_LONG_LONG)((uint64_t*)data)[i])))
return NULL;
break;
case GD_INT64:
for (i = 0; i < ns; ++i)
if (gdpylist_append(pyobj,
- PyLong_FromLongLong((long long)((int64_t*)data)[i])))
+ PyLong_FromLongLong((PY_LONG_LONG)((int64_t*)data)[i])))
return NULL;
break;
case GD_FLOAT32:
@@ -499,7 +500,7 @@ PyObject *gdpy_convert_to_pyobj(const void *data, gd_type_t type)
{
PyObject *pyobj = NULL;
- dtrace("%p, %02x", data, type);
+ dtrace("%p, 0x%X", data, type);
switch(type) {
case GD_NULL:
@@ -525,10 +526,11 @@ PyObject *gdpy_convert_to_pyobj(const void *data, gd_type_t type)
pyobj = PyInt_FromLong((long)*(int32_t*)data);
break;
case GD_UINT64:
- pyobj = PyLong_FromUnsignedLongLong((unsigned long long)*(uint64_t*)data);
+ pyobj = PyLong_FromUnsignedLongLong(
+ (unsigned PY_LONG_LONG)*(uint64_t*)data);
break;
case GD_INT64:
- pyobj = PyLong_FromLongLong((long long)*(int64_t*)data);
+ pyobj = PyLong_FromLongLong((PY_LONG_LONG)*(int64_t*)data);
break;
case GD_FLOAT32:
pyobj = PyFloat_FromDouble((double)*(float*)data);
@@ -589,7 +591,7 @@ static PyMethodDef GetDataMethods[] = {
"symbols. This method will return pygetdata.RDWR if the library can\n"
"read and write the encoding, pygetdata.RDONLY if the library can\n"
/* ------- handy ruler ---------------------------------------------| */
- "only read the encodin, or None otherwise. See\n"
+ "only read the encoding, or None otherwise. See\n"
"gd_encoding_support(3)."
},
{ NULL, NULL, 0, NULL }
diff --git a/bindings/python/test/Makefile.in b/bindings/python/test/Makefile.in
index 75d371b..43269e7 100644
--- a/bindings/python/test/Makefile.in
+++ b/bindings/python/test/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -14,7 +14,17 @@
@SET_MAKE@
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -78,17 +88,19 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
subdir = bindings/python/test
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compare_version.m4 \
$(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/encoding.m4 \
$(top_srcdir)/m4/floatordering.m4 $(top_srcdir)/m4/idl.m4 \
- $(top_srcdir)/m4/matlab.m4 $(top_srcdir)/m4/perl.m4 \
- $(top_srcdir)/m4/php.m4 $(top_srcdir)/m4/python.m4 \
- $(top_srcdir)/m4/win32.m4 $(top_srcdir)/m4/version.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/matlab.m4 \
+ $(top_srcdir)/m4/perl.m4 $(top_srcdir)/m4/php.m4 \
+ $(top_srcdir)/m4/python.m4 $(top_srcdir)/m4/win32.m4 \
+ $(top_srcdir)/m4/version.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/src/gd_config.h \
$(top_builddir)/src/getdata.h
@@ -136,6 +148,7 @@ am__tty_colors = { \
std='[m'; \
fi; \
}
+am__DIST_COMMON = $(srcdir)/Makefile.in
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -402,7 +415,6 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign bindings/python/test/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign bindings/python/test/Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -672,6 +684,8 @@ uninstall-am:
mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
uninstall-am
+.PRECIOUS: Makefile
+
# clean up after the tests
check-local: check-TESTS
diff --git a/bindings/python/test/big_test.py b/bindings/python/test/big_test.py
index 3726162..034db02 100644
--- a/bindings/python/test/big_test.py
+++ b/bindings/python/test/big_test.py
@@ -23,9 +23,7 @@ import os
import re
import array
import pygetdata
-
-if (pygetdata.__numpy_supported__):
- import numpy
+import numpy
def CheckOK(t):
global ne
@@ -142,10 +140,7 @@ try:
except:
CheckOK(3)
CheckSimple(3,len(n),8)
-if (pygetdata.__numpy_supported__):
- CheckNumpy(3,n,numpy.arange(41,49))
-else:
- CheckSimple(3,n,range(41,49))
+CheckNumpy(3,n,numpy.arange(41,49))
# 6: getdata (long) check
try:
@@ -153,10 +148,7 @@ try:
except:
CheckOK(6)
CheckSimple(6,len(n),8)
-if (pygetdata.__numpy_supported__):
- CheckNumpy(6,n,numpy.arange(41L,49L))
-else:
- CheckSimple(6,n,range(41L,49L))
+CheckNumpy(6,n,numpy.arange(41L,49L))
# 8: getdata (float) check
try:
@@ -164,10 +156,7 @@ try:
except:
CheckOK(8)
CheckSimple(8,len(n),8)
-if (pygetdata.__numpy_supported__):
- CheckNumpy(8,n,numpy.arange(41.,49.))
-else:
- CheckSimple(8,n,[41.,42.,43.,44.,45.,46.,47.,48.])
+CheckNumpy(8,n,numpy.arange(41.,49.))
# 10: getdata (complex) check
try:
@@ -175,10 +164,14 @@ try:
except:
CheckOK(10)
CheckSimple(10,len(n),8)
-if (pygetdata.__numpy_supported__):
- CheckNumpy(10,n,numpy.arange(41,49,dtype=numpy.complex128))
-else:
- CheckSimple(10,n,[41.+0j,42.+0j,43.+0j,44.+0j,45.+0j,46.+0j,47.+0j,48.+0j])
+CheckNumpy(10,n,numpy.arange(41,49,dtype=numpy.complex128))
+
+# 11: getdata (GD_NULL) check
+try:
+ n = d.getdata("data", pygetdata.NULL, first_frame=5, num_frames=1)
+except:
+ CheckOK(11)
+CheckSimple(11, n, 8);
# 12: constant (int) check
try:
@@ -194,6 +187,13 @@ except:
CheckOK(15)
CheckSimple(15,n,5L)
+# 16: constant (float) check
+try:
+ n = d.get_constant("const")
+except:
+ CheckOK(16)
+CheckSimple(16,n,5.5)
+
# 17: constant (float) check
try:
n = d.get_constant("const", pygetdata.FLOAT)
@@ -208,6 +208,13 @@ except:
CheckOK(19)
CheckSimple(19,n,5.5+0j)
+# 20: constant (GD_NULL) check
+try:
+ n = d.get_constant("const", pygetdata.NULL)
+except:
+ CheckOK(20)
+CheckSimple(20,n,None)
+
# 23: nfields check
try:
n = d.nfields()
@@ -265,19 +272,18 @@ except:
CheckSimple2(30,2,n,[41, 13, 14, 15, 16, 46, 47, 48])
# 32: putdata (numpy) check
-if (pygetdata.__numpy_supported__):
- p = numpy.array([ 73, 74, 75, 76 ])
- try:
- n = d.putdata("data", p, first_frame=5, first_sample=1)
- except:
- CheckOK2(32,1)
- CheckSimple2(32,1,n,4)
-
- try:
- n = d.getdata("data", pygetdata.INT, first_frame=5, num_frames=1)
- except:
- CheckOK(32,2)
- CheckNumpy2(32,2,n,numpy.array([41, 73, 74, 75, 76, 46, 47, 48]))
+p = numpy.array([ 73, 74, 75, 76 ])
+try:
+ n = d.putdata("data", p, first_frame=5, first_sample=1)
+except:
+ CheckOK2(32,1)
+CheckSimple2(32,1,n,4)
+
+try:
+ n = d.getdata("data", pygetdata.INT, first_frame=5, num_frames=1)
+except:
+ CheckOK(32,2)
+CheckNumpy2(32,2,n,numpy.array([41, 73, 74, 75, 76, 46, 47, 48]))
# 33: putdata (long) check
p = [ 23L, 24L, 25L, 26L ]
@@ -1334,10 +1340,7 @@ try:
except:
CheckOK(158)
-if (pygetdata.__numpy_supported__):
- CheckNumpy(158,n,numpy.arange(1,7))
-else:
- CheckSimple(158,n,[1, 2, 3, 4, 5, 6])
+CheckNumpy(158,n,numpy.arange(1,7))
# 159: gd_get_carray_slice (INT8)
try:
@@ -1345,10 +1348,7 @@ try:
except:
CheckOK(159)
-if (pygetdata.__numpy_supported__):
- CheckNumpy(159,n,numpy.arange(3,5))
-else:
- CheckSimple(159,n,[3, 4])
+CheckNumpy(159,n,numpy.arange(3,5))
# 162: gd_get_carray_slice (INT64)
try:
@@ -1356,10 +1356,15 @@ try:
except:
CheckOK(162)
-if (pygetdata.__numpy_supported__):
- CheckNumpy(162,n,numpy.arange(3L,5L))
-else:
- CheckSimple(162,n,[3L, 4L])
+CheckNumpy(162,n,numpy.arange(3L,5L))
+
+# 163: gd_get_carray_slice (auto-type)
+try:
+ n = d.get_carray("carray", start=2, len=2)
+except:
+ CheckOK(163)
+
+CheckNumpy(163,n,numpy.array([3.3, 4.4]))
# 164: gd_get_carray_slice (FLOAT64)
try:
@@ -1367,10 +1372,7 @@ try:
except:
CheckOK(164)
-if (pygetdata.__numpy_supported__):
- CheckNumpy(164,n,numpy.array([3.3, 4.4]))
-else:
- CheckSimple(164,n,[3.3, 4.4])
+CheckNumpy(163,n,numpy.array([3.3, 4.4]))
# 166: gd_get_carray_slice (COMPLEX128)
try:
@@ -1378,10 +1380,7 @@ try:
except:
CheckOK(166)
-if (pygetdata.__numpy_supported__):
- CheckNumpy(166,n,numpy.array([3.3+0j, 4.4+0j]))
-else:
- CheckSimple(166,n,[3.3+0j, 4.4+0j])
+CheckNumpy(166,n,numpy.array([3.3+0j, 4.4+0j]))
# 167: gd_carrays
try:
@@ -1390,11 +1389,8 @@ except:
CheckOK(167)
CheckSimple2(167,1,len(n),1)
-if (pygetdata.__numpy_supported__):
- CheckSimple2(167,2,n[0][0],"carray")
- CheckNumpy2(167,3,n[0][1],numpy.arange(1,7))
-else:
- CheckSimple(167,n,[("carray", [1,2,3,4,5,6])])
+CheckSimple2(167,2,n[0][0],"carray")
+CheckNumpy2(167,3,n[0][1],numpy.arange(1,7))
# 168: gd_put_carray
try:
@@ -1407,10 +1403,7 @@ try:
except:
CheckOK2(168,2)
-if (pygetdata.__numpy_supported__):
- CheckNumpy(168,n,numpy.arange(9,3,-1))
-else:
- CheckSimple(168,n,[9,8,7,6,5,4])
+CheckNumpy(168,n,numpy.arange(9,3,-1))
# 169: gd_put_carray_slice (INT8)
try:
@@ -1423,10 +1416,7 @@ try:
except:
CheckOK2(169,2)
-if (pygetdata.__numpy_supported__):
- CheckNumpy(169,n,numpy.array([9,8,169,169,5,4]))
-else:
- CheckSimple(169,n,[9,8,169,169,5,4])
+CheckNumpy(169,n,numpy.array([9,8,169,169,5,4]))
# 172: gd_put_carray_slice (INT64)
try:
@@ -1439,10 +1429,7 @@ try:
except:
CheckOK2(172,2)
-if (pygetdata.__numpy_supported__):
- CheckNumpy(172,n,numpy.array([9,8,172,172,5,4]))
-else:
- CheckSimple(172,n,[9,8,172,172,5,4])
+CheckNumpy(172,n,numpy.array([9,8,172,172,5,4]))
# 174: gd_put_carray_slice (FLOAT64)
try:
@@ -1455,10 +1442,7 @@ try:
except:
CheckOK2(174,2)
-if (pygetdata.__numpy_supported__):
- CheckNumpy(174,n,numpy.array([9,8,174,174,5,4]))
-else:
- CheckSimple(174,n,[9,8,174,174,5,4])
+CheckNumpy(174,n,numpy.array([9,8,174,174,5,4]))
# 176: gd_put_carray_slice (COMPLEX128)
try:
@@ -1471,10 +1455,7 @@ try:
except:
CheckOK2(176,2)
-if (pygetdata.__numpy_supported__):
- CheckNumpy(176,n,numpy.array([9,8,176,176,5,4]))
-else:
- CheckSimple(176,n,[9,8,176,176,5,4])
+CheckNumpy(176,n,numpy.array([9,8,176,176,5,4]))
# 177: gd_carray_len
try:
@@ -1616,10 +1597,7 @@ except:
CheckOK2(203,1)
CheckSimple2(203,0,n,280)
CheckSimple2(203,1,len(m),8)
-if (pygetdata.__numpy_supported__):
- CheckNumpy2(203,2,m,numpy.arange(17,25))
-else:
- CheckSimple2(203,2,m,range(17,25))
+CheckNumpy2(203,2,m,numpy.arange(17,25))
# 204: gd_tell
try:
@@ -1980,13 +1958,10 @@ except:
CheckOK(242)
CheckSimple2(242,1,len(n),2)
-if (pygetdata.__numpy_supported__):
- CheckSimple2(242,2,n[0][0],"mcarray")
- CheckNumpy2(242,3,n[0][1],1.9 + 0.9 * numpy.arange(0,5))
- CheckSimple2(242,4,n[1][0],"mnew17")
- CheckNumpy2(242,5,n[1][1],[0,0])
-else:
- CheckSimple(242,n,[("mcarray", [1.9, 2.8, 3.7, 4.6, 5.5]), ("mnew17", [0,0])])
+CheckSimple2(242,2,n[0][0],"mcarray")
+CheckNumpy2(242,3,n[0][1],1.9 + 0.9 * numpy.arange(0,5))
+CheckSimple2(242,4,n[1][0],"mnew17")
+CheckNumpy2(242,5,n[1][1],[0,0])
# 271: encoding_support
n = pygetdata.encoding_support(pygetdata.SIE_ENCODED)
@@ -2005,6 +1980,14 @@ try:
except:
CheckOK2(272, 2)
+# 274: gd_get_carray_slice (NULL)
+try:
+ n = d.get_carray("carray", pygetdata.NULL, start=2, len=2)
+except:
+ CheckOK(274)
+CheckSimple(274, n, None);
+
+
@@ -2025,5 +2008,4 @@ os.system("rm -rf dirfile")
if (ne > 0):
print "ne =", ne
- print "__numpy_supported__ =", pygetdata.__numpy_supported__
sys.exit(1)
diff --git a/compile b/compile
index 531136b..a85b723 100755
--- a/compile
+++ b/compile
@@ -3,7 +3,7 @@
scriptversion=2012-10-14.11; # UTC
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
# Written by Tom Tromey <tromey at cygnus.com>.
#
# This program is free software; you can redistribute it and/or modify
diff --git a/config.guess b/config.guess
index 9afd676..6c32c86 100755
--- a/config.guess
+++ b/config.guess
@@ -1,8 +1,8 @@
#! /bin/sh
# Attempt to guess a canonical system name.
-# Copyright 1992-2013 Free Software Foundation, Inc.
+# Copyright 1992-2014 Free Software Foundation, Inc.
-timestamp='2013-11-29'
+timestamp='2014-11-04'
# 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
@@ -24,12 +24,12 @@ timestamp='2013-11-29'
# program. This Exception is an additional permission under section 7
# of the GNU General Public License, version 3 ("GPLv3").
#
-# Originally written by Per Bothner.
+# Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
#
# 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
#
-# Please send patches with a ChangeLog entry to config-patches at gnu.org.
+# Please send patches to <config-patches at gnu.org>.
me=`echo "$0" | sed -e 's,.*/,,'`
@@ -50,7 +50,7 @@ version="\
GNU config.guess ($timestamp)
Originally written by Per Bothner.
-Copyright 1992-2013 Free Software Foundation, Inc.
+Copyright 1992-2014 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."
@@ -149,7 +149,7 @@ Linux|GNU|GNU/*)
LIBC=gnu
#endif
EOF
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
;;
esac
@@ -579,8 +579,9 @@ EOF
else
IBM_ARCH=powerpc
fi
- if [ -x /usr/bin/oslevel ] ; then
- IBM_REV=`/usr/bin/oslevel`
+ if [ -x /usr/bin/lslpp ] ; then
+ IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc |
+ awk -F: '{ print $3 }' | sed s/[0-9]*$/0/`
else
IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
fi
@@ -826,7 +827,7 @@ EOF
*:MINGW*:*)
echo ${UNAME_MACHINE}-pc-mingw32
exit ;;
- i*:MSYS*:*)
+ *:MSYS*:*)
echo ${UNAME_MACHINE}-pc-msys
exit ;;
i*:windows32*:*)
@@ -969,10 +970,10 @@ EOF
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
;;
- or1k:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ openrisc*:Linux:*:*)
+ echo or1k-unknown-linux-${LIBC}
exit ;;
- or32:Linux:*:*)
+ or32:Linux:*:* | or1k*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
padre:Linux:*:*)
@@ -1371,154 +1372,6 @@ EOF
exit ;;
esac
-eval $set_cc_for_build
-cat >$dummy.c <<EOF
-#ifdef _SEQUENT_
-# include <sys/types.h>
-# include <sys/utsname.h>
-#endif
-main ()
-{
-#if defined (sony)
-#if defined (MIPSEB)
- /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed,
- I don't know.... */
- printf ("mips-sony-bsd\n"); exit (0);
-#else
-#include <sys/param.h>
- printf ("m68k-sony-newsos%s\n",
-#ifdef NEWSOS4
- "4"
-#else
- ""
-#endif
- ); exit (0);
-#endif
-#endif
-
-#if defined (__arm) && defined (__acorn) && defined (__unix)
- printf ("arm-acorn-riscix\n"); exit (0);
-#endif
-
-#if defined (hp300) && !defined (hpux)
- printf ("m68k-hp-bsd\n"); exit (0);
-#endif
-
-#if defined (NeXT)
-#if !defined (__ARCHITECTURE__)
-#define __ARCHITECTURE__ "m68k"
-#endif
- int version;
- version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
- if (version < 4)
- printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
- else
- printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
- exit (0);
-#endif
-
-#if defined (MULTIMAX) || defined (n16)
-#if defined (UMAXV)
- printf ("ns32k-encore-sysv\n"); exit (0);
-#else
-#if defined (CMU)
- printf ("ns32k-encore-mach\n"); exit (0);
-#else
- printf ("ns32k-encore-bsd\n"); exit (0);
-#endif
-#endif
-#endif
-
-#if defined (__386BSD__)
- printf ("i386-pc-bsd\n"); exit (0);
-#endif
-
-#if defined (sequent)
-#if defined (i386)
- printf ("i386-sequent-dynix\n"); exit (0);
-#endif
-#if defined (ns32000)
- printf ("ns32k-sequent-dynix\n"); exit (0);
-#endif
-#endif
-
-#if defined (_SEQUENT_)
- struct utsname un;
-
- uname(&un);
-
- if (strncmp(un.version, "V2", 2) == 0) {
- printf ("i386-sequent-ptx2\n"); exit (0);
- }
- if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
- printf ("i386-sequent-ptx1\n"); exit (0);
- }
- printf ("i386-sequent-ptx\n"); exit (0);
-
-#endif
-
-#if defined (vax)
-# if !defined (ultrix)
-# include <sys/param.h>
-# if defined (BSD)
-# if BSD == 43
- printf ("vax-dec-bsd4.3\n"); exit (0);
-# else
-# if BSD == 199006
- printf ("vax-dec-bsd4.3reno\n"); exit (0);
-# else
- printf ("vax-dec-bsd\n"); exit (0);
-# endif
-# endif
-# else
- printf ("vax-dec-bsd\n"); exit (0);
-# endif
-# else
- printf ("vax-dec-ultrix\n"); exit (0);
-# endif
-#endif
-
-#if defined (alliant) && defined (i860)
- printf ("i860-alliant-bsd\n"); exit (0);
-#endif
-
- exit (1);
-}
-EOF
-
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
- { echo "$SYSTEM_NAME"; exit; }
-
-# Apollos put the system type in the environment.
-
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
-
-# Convex versions that predate uname can use getsysinfo(1)
-
-if [ -x /usr/convex/getsysinfo ]
-then
- case `getsysinfo -f cpu_type` in
- c1*)
- echo c1-convex-bsd
- exit ;;
- c2*)
- if getsysinfo -f scalar_acc
- then echo c32-convex-bsd
- else echo c2-convex-bsd
- fi
- exit ;;
- c34*)
- echo c34-convex-bsd
- exit ;;
- c38*)
- echo c38-convex-bsd
- exit ;;
- c4*)
- echo c4-convex-bsd
- exit ;;
- esac
-fi
-
cat >&2 <<EOF
$0: unable to guess system type
diff --git a/config.sub b/config.sub
index 61cb4bc..7ffe373 100755
--- a/config.sub
+++ b/config.sub
@@ -1,8 +1,8 @@
#! /bin/sh
# Configuration validation subroutine script.
-# Copyright 1992-2013 Free Software Foundation, Inc.
+# Copyright 1992-2014 Free Software Foundation, Inc.
-timestamp='2013-10-01'
+timestamp='2014-12-03'
# 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
@@ -25,7 +25,7 @@ timestamp='2013-10-01'
# of the GNU General Public License, version 3 ("GPLv3").
-# Please send patches with a ChangeLog entry to config-patches at gnu.org.
+# Please send patches to <config-patches at gnu.org>.
#
# Configuration subroutine to validate and canonicalize a configuration type.
# Supply the specified configuration type as an argument.
@@ -68,7 +68,7 @@ Report bugs and patches to <config-patches at gnu.org>."
version="\
GNU config.sub ($timestamp)
-Copyright 1992-2013 Free Software Foundation, Inc.
+Copyright 1992-2014 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."
@@ -283,8 +283,10 @@ case $basic_machine in
| mips64vr5900 | mips64vr5900el \
| mipsisa32 | mipsisa32el \
| mipsisa32r2 | mipsisa32r2el \
+ | mipsisa32r6 | mipsisa32r6el \
| mipsisa64 | mipsisa64el \
| mipsisa64r2 | mipsisa64r2el \
+ | mipsisa64r6 | mipsisa64r6el \
| mipsisa64sb1 | mipsisa64sb1el \
| mipsisa64sr71k | mipsisa64sr71kel \
| mipsr5900 | mipsr5900el \
@@ -296,11 +298,11 @@ case $basic_machine in
| nds32 | nds32le | nds32be \
| nios | nios2 | nios2eb | nios2el \
| ns16k | ns32k \
- | open8 \
- | or1k | or32 \
+ | open8 | or1k | or1knd | or32 \
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle \
| pyramid \
+ | riscv32 | riscv64 \
| rl78 | rx \
| score \
| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
@@ -311,6 +313,7 @@ case $basic_machine in
| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
| ubicom32 \
| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
+ | visium \
| we32k \
| x86 | xc16x | xstormy16 | xtensa \
| z8k | z80)
@@ -325,6 +328,9 @@ case $basic_machine in
c6x)
basic_machine=tic6x-unknown
;;
+ leon|leon[3-9])
+ basic_machine=sparc-$basic_machine
+ ;;
m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
basic_machine=$basic_machine-unknown
os=-none
@@ -402,8 +408,10 @@ case $basic_machine in
| mips64vr5900-* | mips64vr5900el-* \
| mipsisa32-* | mipsisa32el-* \
| mipsisa32r2-* | mipsisa32r2el-* \
+ | mipsisa32r6-* | mipsisa32r6el-* \
| mipsisa64-* | mipsisa64el-* \
| mipsisa64r2-* | mipsisa64r2el-* \
+ | mipsisa64r6-* | mipsisa64r6el-* \
| mipsisa64sb1-* | mipsisa64sb1el-* \
| mipsisa64sr71k-* | mipsisa64sr71kel-* \
| mipsr5900-* | mipsr5900el-* \
@@ -415,6 +423,7 @@ case $basic_machine in
| nios-* | nios2-* | nios2eb-* | nios2el-* \
| none-* | np1-* | ns16k-* | ns32k-* \
| open8-* \
+ | or1k*-* \
| orion-* \
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
@@ -432,6 +441,7 @@ case $basic_machine in
| ubicom32-* \
| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
| vax-* \
+ | visium-* \
| we32k-* \
| x86-* | x86_64-* | xc16x-* | xps100-* \
| xstormy16-* | xtensa*-* \
@@ -769,6 +779,9 @@ case $basic_machine in
basic_machine=m68k-isi
os=-sysv
;;
+ leon-*|leon[3-9]-*)
+ basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'`
+ ;;
m68knommu)
basic_machine=m68k-unknown
os=-linux
@@ -824,6 +837,10 @@ case $basic_machine in
basic_machine=powerpc-unknown
os=-morphos
;;
+ moxiebox)
+ basic_machine=moxie-unknown
+ os=-moxiebox
+ ;;
msdos)
basic_machine=i386-pc
os=-msdos
@@ -1369,14 +1386,14 @@ case $os in
| -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
| -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
| -linux-newlib* | -linux-musl* | -linux-uclibc* \
- | -uxpv* | -beos* | -mpeix* | -udk* \
+ | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
| -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
| -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
- | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
+ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
@@ -1594,9 +1611,6 @@ case $basic_machine in
mips*-*)
os=-elf
;;
- or1k-*)
- os=-elf
- ;;
or32-*)
os=-coff
;;
diff --git a/configure b/configure
index d01bbe2..e50cfdb 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for GetData 0.9.0.
+# Generated by GNU Autoconf 2.69 for GetData 0.9.1.
#
# Report bugs to <getdata-devel at lists.sourceforge.net>.
#
@@ -598,8 +598,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='GetData'
PACKAGE_TARNAME='getdata'
-PACKAGE_VERSION='0.9.0'
-PACKAGE_STRING='GetData 0.9.0'
+PACKAGE_VERSION='0.9.1'
+PACKAGE_STRING='GetData 0.9.1'
PACKAGE_BUGREPORT='getdata-devel at lists.sourceforge.net'
PACKAGE_URL='http://getdata.sourceforge.net/'
@@ -933,6 +933,7 @@ enable_legacy_api
enable_assert
enable_debug
enable_ansi_c
+enable_large_tests
enable_bindings
enable_cplusplus
enable_fortran
@@ -1542,7 +1543,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 GetData 0.9.0 to adapt to many kinds of systems.
+\`configure' configures GetData 0.9.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1612,7 +1613,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of GetData 0.9.0:";;
+ short | recursive ) echo "Configuration of GetData 0.9.1:";;
esac
cat <<\_ACEOF
@@ -1624,6 +1625,8 @@ Optional Features:
--enable-assert enable assertions
--enable-debug enable debugging messages
--enable-ansi-c use ANSI C (C89) work-arounds for C99 code
+ --disable-large-tests don't run tests that write large amounts of
+ temporary data (>1MB)
--disable-bindings don't build any bindings; just build the C library
--disable-cplusplus don't build the C++ bindings (libgetdata++)
--disable-fortran don't build the Fortran 77 bindings (libfgetdata)
@@ -1831,7 +1834,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-GetData configure 0.9.0
+GetData configure 0.9.1
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2494,27 +2497,22 @@ fi
} # ac_fn_fc_try_link
-# ac_fn_c_find_intX_t LINENO BITS VAR
-# -----------------------------------
-# Finds a signed integer type with width BITS, setting cache variable VAR
-# accordingly.
-ac_fn_c_find_intX_t ()
+# ac_fn_c_check_type LINENO TYPE VAR INCLUDES
+# -------------------------------------------
+# Tests whether TYPE exists after having included INCLUDES, setting cache
+# variable VAR accordingly.
+ac_fn_c_check_type ()
{
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for int$2_t" >&5
-$as_echo_n "checking for int$2_t... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
if eval \${$3+:} false; then :
$as_echo_n "(cached) " >&6
else
eval "$3=no"
- # Order is important - never check a type that is potentially smaller
- # than half of the expected target width.
- for ac_type in int$2_t 'int' 'long int' \
- 'long long int' 'short int' 'signed char'; do
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-$ac_includes_default
- enum { N = $2 / 2 - 1 };
+$4
#ifdef F77_DUMMY_MAIN
# ifdef __cplusplus
@@ -2526,10 +2524,8 @@ $ac_includes_default
int
main ()
{
-static int test_array [1 - 2 * !(0 < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1))];
-test_array [0] = 0;
-return test_array [0];
-
+if (sizeof ($2))
+ return 0;
;
return 0;
}
@@ -2537,8 +2533,7 @@ _ACEOF
if ac_fn_c_try_compile "$LINENO"; then :
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-$ac_includes_default
- enum { N = $2 / 2 - 1 };
+$4
#ifdef F77_DUMMY_MAIN
# ifdef __cplusplus
@@ -2550,11 +2545,8 @@ $ac_includes_default
int
main ()
{
-static int test_array [1 - 2 * !(($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1)
- < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 2))];
-test_array [0] = 0;
-return test_array [0];
-
+if (sizeof (($2)))
+ return 0;
;
return 0;
}
@@ -2562,46 +2554,40 @@ _ACEOF
if ac_fn_c_try_compile "$LINENO"; then :
else
- case $ac_type in #(
- int$2_t) :
- eval "$3=yes" ;; #(
- *) :
- eval "$3=\$ac_type" ;;
-esac
+ eval "$3=yes"
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- if eval test \"x\$"$3"\" = x"no"; then :
-
-else
- break
-fi
- done
fi
eval ac_res=\$$3
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-} # ac_fn_c_find_intX_t
+} # ac_fn_c_check_type
-# ac_fn_c_check_type LINENO TYPE VAR INCLUDES
-# -------------------------------------------
-# Tests whether TYPE exists after having included INCLUDES, setting cache
-# variable VAR accordingly.
-ac_fn_c_check_type ()
+# ac_fn_c_find_intX_t LINENO BITS VAR
+# -----------------------------------
+# Finds a signed integer type with width BITS, setting cache variable VAR
+# accordingly.
+ac_fn_c_find_intX_t ()
{
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for int$2_t" >&5
+$as_echo_n "checking for int$2_t... " >&6; }
if eval \${$3+:} false; then :
$as_echo_n "(cached) " >&6
else
eval "$3=no"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ # Order is important - never check a type that is potentially smaller
+ # than half of the expected target width.
+ for ac_type in int$2_t 'int' 'long int' \
+ 'long long int' 'short int' 'signed char'; do
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-$4
+$ac_includes_default
+ enum { N = $2 / 2 - 1 };
#ifdef F77_DUMMY_MAIN
# ifdef __cplusplus
@@ -2613,8 +2599,10 @@ $4
int
main ()
{
-if (sizeof ($2))
- return 0;
+static int test_array [1 - 2 * !(0 < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1))];
+test_array [0] = 0;
+return test_array [0];
+
;
return 0;
}
@@ -2622,7 +2610,8 @@ _ACEOF
if ac_fn_c_try_compile "$LINENO"; then :
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-$4
+$ac_includes_default
+ enum { N = $2 / 2 - 1 };
#ifdef F77_DUMMY_MAIN
# ifdef __cplusplus
@@ -2634,8 +2623,11 @@ $4
int
main ()
{
-if (sizeof (($2)))
- return 0;
+static int test_array [1 - 2 * !(($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1)
+ < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 2))];
+test_array [0] = 0;
+return test_array [0];
+
;
return 0;
}
@@ -2643,18 +2635,29 @@ _ACEOF
if ac_fn_c_try_compile "$LINENO"; then :
else
- eval "$3=yes"
+ case $ac_type in #(
+ int$2_t) :
+ eval "$3=yes" ;; #(
+ *) :
+ eval "$3=\$ac_type" ;;
+esac
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ if eval test \"x\$"$3"\" = x"no"; then :
+
+else
+ break
+fi
+ done
fi
eval ac_res=\$$3
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-} # ac_fn_c_check_type
+} # ac_fn_c_find_intX_t
# ac_fn_c_find_uintX_t LINENO BITS VAR
# ------------------------------------
@@ -3006,7 +3009,7 @@ 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 GetData $as_me 0.9.0, which was
+It was created by GetData $as_me 0.9.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3364,7 +3367,7 @@ $as_echo "#define GETDATA_MAJOR 0" >>confdefs.h
$as_echo "#define GETDATA_MINOR 9" >>confdefs.h
-$as_echo "#define GETDATA_REVISION 0" >>confdefs.h
+$as_echo "#define GETDATA_REVISION 1" >>confdefs.h
$as_echo "#define GETDATA_VERSION_SUFFIX \"\"" >>confdefs.h
@@ -3374,7 +3377,7 @@ GETDATA_MAJOR=0
GETDATA_MINOR=9
-GETDATA_REVISION=0
+GETDATA_REVISION=1
GETDATA_VERSION_SUFFIX=
@@ -3388,7 +3391,7 @@ GETDATA_VERSION_SUFFIX=
GETDATA_IFACE_VERSION=7
-GETDATA_IMPL_REVISION=0
+GETDATA_IMPL_REVISION=1
GETDATA_IFACE_AGE=0
@@ -3398,7 +3401,7 @@ FGETDATA_VERSION=5:0:0
F95GETDATA_VERSION=6:0:0
-MATLABGETDATA_VERSION=1:0:1
+MATLABGETDATA_VERSION=1:1:1
@@ -3607,6 +3610,29 @@ $as_echo_n "checking whether to build in ANSI C compliance mode... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $disable_c99" >&5
$as_echo "$disable_c99" >&6; }
+# Check whether --enable-large-tests was given.
+if test "${enable_large_tests+set}" = set; then :
+ enableval=$enable_large_tests;
+ if test "x${enableval}" = "xno"; then
+ run_large_tests="no";
+ else
+ run_large_tests="yes";
+ fi
+
+else
+ run_large_tests="yes"
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to run large tests" >&5
+$as_echo_n "checking whether to run large tests... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $run_large_tests" >&5
+$as_echo "$run_large_tests" >&6; }
+if test "x$run_large_tests" = "xno"; then
+
+$as_echo "#define NO_LARGE_TESTS 1" >>confdefs.h
+
+fi
+
make_cxxbindings="yes"
make_f77bindings="yes"
make_pybindings="yes"
@@ -3831,7 +3857,7 @@ fi
echo
echo "*** Initialising build system"
echo
-am__api_version='1.14'
+am__api_version='1.15'
# Find a good install program. We prefer a C program (faster),
# so one script is as good as another. But avoid the broken or
@@ -4003,8 +4029,8 @@ test "$program_suffix" != NONE &&
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`
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
if test x"${MISSING+set}" != xset; then
case $am_aux_dir in
@@ -4023,7 +4049,7 @@ else
$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
fi
-if test x"${install_sh}" != xset; then
+if test x"${install_sh+set}" != xset; then
case $am_aux_dir in
*\ * | *\ *)
install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
@@ -4317,7 +4343,7 @@ fi
# Define the identity of the package.
PACKAGE='getdata'
- VERSION='0.9.0'
+ VERSION='0.9.1'
cat >>confdefs.h <<_ACEOF
@@ -4351,8 +4377,8 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
mkdir_p='$(MKDIR_P)'
-# We need awk for the "check" target. The system "awk" is bad on
-# some platforms.
+# We need awk for the "check" target (and possibly the TAP driver). The
+# system "awk" is bad on some platforms.
# Always define AMTAR for backward compatibility. Yes, it's still used
# in the wild :-( We should find a proper way to deprecate it ...
AMTAR='$${TAR-tar}'
@@ -4409,6 +4435,7 @@ END
as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
fi
fi
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
$as_echo_n "checking whether ln -s works... " >&6; }
LN_S=$as_ln_s
@@ -4846,9 +4873,9 @@ _ACEOF
fi
-DEFINE_GD_GETDATA_VERSION="#define GD_GETDATA_VERSION \"0.9.0\""
+DEFINE_GD_GETDATA_VERSION="#define GD_GETDATA_VERSION \"0.9.1\""
-DEFINE_GD_GETDATA_INT_VERSION="#define GD_GETDATA_INT_VERSION `${PRINTF} %i%02i 9 0`"
+DEFINE_GD_GETDATA_INT_VERSION="#define GD_GETDATA_INT_VERSION `${PRINTF} %i%02i 9 1`"
echo
echo "*** Checking host environment"
@@ -12609,6 +12636,10 @@ _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=
@@ -26138,7 +26169,7 @@ Usage: $0 [OPTIONS]
Report bugs to <bug-libtool at gnu.org>."
lt_cl_version="\
-GetData config.lt 0.9.0
+GetData config.lt 0.9.1
configured by $0, generated by GNU Autoconf 2.69.
Copyright (C) 2011 Free Software Foundation, Inc.
@@ -29224,11 +29255,11 @@ fi
echo
echo "*** Looking for additional header files"
echo
-for ac_header in asm/unaligned.h Availability.h byteswap.h direct.h fcntl.h \
- float.h inttypes.h io.h libgen.h libkern/OSByteOrder.h \
- math.h stddef.h stdint.h sys/endian.h sys/file.h sys/param.h \
- sys/resource.h sys/stat.h sys/time.h sys/types.h sys/wait.h \
- unistd.h
+for ac_header in asm/unaligned.h Availability.h byteswap.h crtdefs.h direct.h \
+ fcntl.h float.h inttypes.h io.h libgen.h \
+ libkern/OSByteOrder.h math.h stddef.h stdint.h sys/endian.h \
+ sys/file.h sys/param.h sys/resource.h sys/stat.h sys/time.h \
+ sys/types.h sys/wait.h unistd.h
do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -29905,6 +29936,29 @@ elif test $gd_cv_c_floatordering = "big"; then
$as_echo "#define FLOATS_BIGENDIAN 1" >>confdefs.h
fi
+
+if test "x$disable_c99" = "xno"; then
+ac_fn_c_check_type "$LINENO" "_Complex float" "ac_cv_type__Complex_float" "$ac_includes_default"
+if test "x$ac_cv_type__Complex_float" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE__COMPLEX_FLOAT 1
+_ACEOF
+
+
+fi
+ac_fn_c_check_type "$LINENO" "_Complex double" "ac_cv_type__Complex_double" "$ac_includes_default"
+if test "x$ac_cv_type__Complex_double" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE__COMPLEX_DOUBLE 1
+_ACEOF
+
+
+fi
+
+fi
+
ac_fn_c_find_intX_t "$LINENO" "8" "ac_cv_c_int8_t"
case $ac_cv_c_int8_t in #(
no|yes) ;; #(
@@ -29971,6 +30025,16 @@ _ACEOF
fi
+ac_fn_c_check_type "$LINENO" "off64_t" "ac_cv_type_off64_t" "$ac_includes_default"
+if test "x$ac_cv_type_off64_t" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_OFF64_T 1
+_ACEOF
+
+
+fi
+
ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
if test "x$ac_cv_type_size_t" = xyes; then :
@@ -29993,6 +30057,34 @@ _ACEOF
fi
+ac_fn_c_check_type "$LINENO" "struct stat64" "ac_cv_type_struct_stat64" "$ac_includes_default"
+if test "x$ac_cv_type_struct_stat64" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_STAT64 1
+_ACEOF
+
+
+fi
+ac_fn_c_check_type "$LINENO" "struct _stat64" "ac_cv_type_struct__stat64" "$ac_includes_default"
+if test "x$ac_cv_type_struct__stat64" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT__STAT64 1
+_ACEOF
+
+
+fi
+ac_fn_c_check_type "$LINENO" "struct __stat64" "ac_cv_type_struct___stat64" "$ac_includes_default"
+if test "x$ac_cv_type_struct___stat64" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT___STAT64 1
+_ACEOF
+
+
+fi
+
ac_fn_c_find_uintX_t "$LINENO" "8" "ac_cv_c_uint8_t"
case $ac_cv_c_uint8_t in #(
no|yes) ;; #(
@@ -30048,64 +30140,138 @@ _ACEOF
esac
-if test "x$disable_c99" = "xno"; then
-ac_fn_c_check_type "$LINENO" "_Complex float" "ac_cv_type__Complex_float" "$ac_includes_default"
-if test "x$ac_cv_type__Complex_float" = xyes; then :
-cat >>confdefs.h <<_ACEOF
-#define HAVE__COMPLEX_FLOAT 1
-_ACEOF
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for unsigned long long int" >&5
+$as_echo_n "checking for unsigned long long int... " >&6; }
+if ${ac_cv_type_unsigned_long_long_int+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_cv_type_unsigned_long_long_int=yes
+ if test "x${ac_cv_prog_cc_c99-no}" = xno; then
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+ /* For now, do not test the preprocessor; as of 2007 there are too many
+ implementations with broken preprocessors. Perhaps this can
+ be revisited in 2012. In the meantime, code should not expect
+ #if to work with literals wider than 32 bits. */
+ /* Test literals. */
+ long long int ll = 9223372036854775807ll;
+ long long int nll = -9223372036854775807LL;
+ unsigned long long int ull = 18446744073709551615ULL;
+ /* Test constant expressions. */
+ typedef int a[((-9223372036854775807LL < 0 && 0 < 9223372036854775807ll)
+ ? 1 : -1)];
+ typedef int b[(18446744073709551615ULL <= (unsigned long long int) -1
+ ? 1 : -1)];
+ int i = 63;
+#ifdef F77_DUMMY_MAIN
-fi
-ac_fn_c_check_type "$LINENO" "_Complex double" "ac_cv_type__Complex_double" "$ac_includes_default"
-if test "x$ac_cv_type__Complex_double" = xyes; then :
+# ifdef __cplusplus
+ extern "C"
+# endif
+ int F77_DUMMY_MAIN() { return 1; }
-cat >>confdefs.h <<_ACEOF
-#define HAVE__COMPLEX_DOUBLE 1
-_ACEOF
+#endif
+int
+main ()
+{
+/* Test availability of runtime routines for shift and division. */
+ long long int llmax = 9223372036854775807ll;
+ unsigned long long int ullmax = 18446744073709551615ull;
+ return ((ll << 63) | (ll >> 63) | (ll < i) | (ll > i)
+ | (llmax / ll) | (llmax % ll)
+ | (ull << 63) | (ull >> 63) | (ull << i) | (ull >> i)
+ | (ullmax / ull) | (ullmax % ull));
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+else
+ ac_cv_type_unsigned_long_long_int=no
fi
-
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_unsigned_long_long_int" >&5
+$as_echo "$ac_cv_type_unsigned_long_long_int" >&6; }
+ if test $ac_cv_type_unsigned_long_long_int = yes; then
-ac_fn_c_check_type "$LINENO" "struct stat64" "ac_cv_type_struct_stat64" "$ac_includes_default"
-if test "x$ac_cv_type_struct_stat64" = xyes; then :
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_STAT64 1
-_ACEOF
+$as_echo "#define HAVE_UNSIGNED_LONG_LONG_INT 1" >>confdefs.h
+ fi
-fi
-ac_fn_c_check_type "$LINENO" "struct _stat64" "ac_cv_type_struct__stat64" "$ac_includes_default"
-if test "x$ac_cv_type_struct__stat64" = xyes; then :
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT__STAT64 1
-_ACEOF
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for long long int" >&5
+$as_echo_n "checking for long long int... " >&6; }
+if ${ac_cv_type_long_long_int+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_cv_type_long_long_int=yes
+ if test "x${ac_cv_prog_cc_c99-no}" = xno; then
+ ac_cv_type_long_long_int=$ac_cv_type_unsigned_long_long_int
+ if test $ac_cv_type_long_long_int = yes; then
+ if test "$cross_compiling" = yes; then :
+ :
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <limits.h>
+ #ifndef LLONG_MAX
+ # define HALF \
+ (1LL << (sizeof (long long int) * CHAR_BIT - 2))
+ # define LLONG_MAX (HALF - 1 + HALF)
+ #endif
+#ifdef F77_DUMMY_MAIN
-fi
-ac_fn_c_check_type "$LINENO" "struct __stat64" "ac_cv_type_struct___stat64" "$ac_includes_default"
-if test "x$ac_cv_type_struct___stat64" = xyes; then :
+# ifdef __cplusplus
+ extern "C"
+# endif
+ int F77_DUMMY_MAIN() { return 1; }
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT___STAT64 1
+#endif
+int
+main ()
+{
+long long int n = 1;
+ int i;
+ for (i = 0; ; i++)
+ {
+ long long int m = n << i;
+ if (m >> i != n)
+ return 1;
+ if (LLONG_MAX / 2 < m)
+ break;
+ }
+ return 0;
+ ;
+ return 0;
+}
_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
-
+else
+ ac_cv_type_long_long_int=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
-ac_fn_c_check_type "$LINENO" "off64_t" "ac_cv_type_off64_t" "$ac_includes_default"
-if test "x$ac_cv_type_off64_t" = xyes; then :
-cat >>confdefs.h <<_ACEOF
-#define HAVE_OFF64_T 1
-_ACEOF
+ fi
+ fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_long_long_int" >&5
+$as_echo "$ac_cv_type_long_long_int" >&6; }
+ if test $ac_cv_type_long_long_int = yes; then
+$as_echo "#define HAVE_LONG_LONG_INT 1" >>confdefs.h
-fi
+ fi
# The cast to long int works around a bug in the HP C Compiler
@@ -30273,6 +30439,7 @@ cat >>confdefs.h <<_ACEOF
_ACEOF
+if test "x$ac_cv_type_long_long_int" = "xyes"; then
# 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]];'.
@@ -30306,6 +30473,9 @@ cat >>confdefs.h <<_ACEOF
_ACEOF
+else
+ ac_cv_sizeof_long_long_int=0
+fi
# 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]];'.
@@ -30405,6 +30575,7 @@ cat >>confdefs.h <<_ACEOF
_ACEOF
+if test "x$ac_cv_type_unsigned_long_long_int" = "xyes"; then
# 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]];'.
@@ -30438,6 +30609,9 @@ cat >>confdefs.h <<_ACEOF
_ACEOF
+else
+ ac_cv_sizeof_unsigned_long_long_int=0
+fi
# 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]];'.
@@ -31770,6 +31944,17 @@ fi
if test "x${have_perl}" != "xno"; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ExtUtils::MakeMaker" >&5
+$as_echo_n "checking for ExtUtils::MakeMaker... " >&6; }
+if $PERL -MExtUtils::MakeMaker -e 'exit' > /dev/null 2>&1; then
+ HAVE_ExtUtils__MakeMaker=yes
+else
+ HAVE_ExtUtils__MakeMaker=no
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${HAVE_ExtUtils__MakeMaker}" >&5
+$as_echo "${HAVE_ExtUtils__MakeMaker}" >&6; }
+
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Math::Complex" >&5
$as_echo_n "checking for Math::Complex... " >&6; }
if $PERL -MMath::Complex -e 'exit' > /dev/null 2>&1; then
@@ -31781,17 +31966,6 @@ fi
$as_echo "${HAVE_Math__Complex}" >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Module::Build" >&5
-$as_echo_n "checking for Module::Build... " >&6; }
-if $PERL -MModule::Build -e 'exit' > /dev/null 2>&1; then
- HAVE_Module__Build=yes
-else
- HAVE_Module__Build=no
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${HAVE_Module__Build}" >&5
-$as_echo "${HAVE_Module__Build}" >&6; }
-
-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Test::Harness" >&5
$as_echo_n "checking for Test::Harness... " >&6; }
if $PERL -MTest::Harness -e 'exit' > /dev/null 2>&1; then
@@ -31804,7 +31978,7 @@ $as_echo "${HAVE_Test__Harness}" >&6; }
fi
-if test "$HAVE_Math__Complex$HAVE_Module__Build" != "yesyes"; then
+if test "$HAVE_Math__Complex$HAVE_ExtUtils__MakeMaker" != "yesyes"; then
have_perl=no
fi
@@ -31861,7 +32035,7 @@ $as_echo "$perlmandir" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the section 3 manual page extension" >&5
$as_echo_n "checking for the section 3 manual page extension... " >&6; }
-PERL_MAN3EXT=`$PERL -MModule::Build -e 'print "\n>>GD ", Module::Build->new(module_name=>"conftest",dist_version=>0)->config('man3ext'), " GD<<";' | $AWK '/>>GD .* GD<</ { print $2 }'`
+PERL_MAN3EXT=`$PERL -MExtUtils::MakeMaker::Config -e 'print "\n>>GD ", $Config{man3ext}, " GD<<";' | $AWK '/>>GD .* GD<</ { print $2 }'`
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: .$PERL_MAN3EXT" >&5
$as_echo ".$PERL_MAN3EXT" >&6; }
@@ -34027,7 +34201,7 @@ ac_config_files="$ac_config_files bindings/matlab/test/Makefile"
ac_config_files="$ac_config_files bindings/perl/Makefile"
-ac_config_files="$ac_config_files bindings/perl/Build.PL"
+ac_config_files="$ac_config_files bindings/perl/src/Makefile.PL"
ac_config_files="$ac_config_files bindings/php/Makefile"
@@ -34239,7 +34413,6 @@ else
fi
-
LDFLAGS="${LDFLAGS}${NO_UNDEFINED}"
cat >confcache <<\_ACEOF
@@ -34897,7 +35070,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by GetData $as_me 0.9.0, which was
+This file was extended by GetData $as_me 0.9.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -34964,7 +35137,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-GetData config.status 0.9.0
+GetData config.status 0.9.1
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
@@ -35664,7 +35837,7 @@ do
"bindings/matlab/make_contents.sh") CONFIG_FILES="$CONFIG_FILES bindings/matlab/make_contents.sh" ;;
"bindings/matlab/test/Makefile") CONFIG_FILES="$CONFIG_FILES bindings/matlab/test/Makefile" ;;
"bindings/perl/Makefile") CONFIG_FILES="$CONFIG_FILES bindings/perl/Makefile" ;;
- "bindings/perl/Build.PL") CONFIG_FILES="$CONFIG_FILES bindings/perl/Build.PL" ;;
+ "bindings/perl/src/Makefile.PL") CONFIG_FILES="$CONFIG_FILES bindings/perl/src/Makefile.PL" ;;
"bindings/php/Makefile") CONFIG_FILES="$CONFIG_FILES bindings/php/Makefile" ;;
"bindings/php/test/Makefile") CONFIG_FILES="$CONFIG_FILES bindings/php/test/Makefile" ;;
"bindings/python/Makefile") CONFIG_FILES="$CONFIG_FILES bindings/python/Makefile" ;;
diff --git a/configure.ac b/configure.ac
index f3c5c59..be2455e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -147,6 +147,24 @@ AC_ARG_ENABLE(ansi-c, AS_HELP_STRING([--enable-ansi-c],
AC_MSG_CHECKING([whether to build in ANSI C compliance mode])
AC_MSG_RESULT([$disable_c99])
+dnl large tests
+AC_ARG_ENABLE([large-tests], AS_HELP_STRING([--disable-large-tests],
+ [don't run tests that write large amounts of temporary ]dnl'
+ [data (>1MB)]),
+ [
+ if test "x${enableval}" = "xno"; then
+ run_large_tests="no";
+ else
+ run_large_tests="yes";
+ fi
+ ], [run_large_tests="yes"])
+AC_MSG_CHECKING([whether to run large tests])
+AC_MSG_RESULT([$run_large_tests])
+if test "x$run_large_tests" = "xno"; then
+ AC_DEFINE([NO_LARGE_TESTS], [1], [ Define to 1 to disable tests that ]
+ [write large quantities (>1MB) of temporary data.])
+fi
+
dnl bindings, globally
make_cxxbindings="yes"
make_f77bindings="yes"
@@ -658,11 +676,11 @@ dnl headers
echo
echo "*** Looking for additional header files"
echo
-AC_CHECK_HEADERS([asm/unaligned.h Availability.h byteswap.h direct.h fcntl.h \
- float.h inttypes.h io.h libgen.h libkern/OSByteOrder.h \
- math.h stddef.h stdint.h sys/endian.h sys/file.h sys/param.h \
- sys/resource.h sys/stat.h sys/time.h sys/types.h sys/wait.h \
- unistd.h])
+AC_CHECK_HEADERS([asm/unaligned.h Availability.h byteswap.h crtdefs.h direct.h \
+ fcntl.h float.h inttypes.h io.h libgen.h \
+ libkern/OSByteOrder.h math.h stddef.h stdint.h sys/endian.h \
+ sys/file.h sys/param.h sys/resource.h sys/stat.h sys/time.h \
+ sys/types.h sys/wait.h unistd.h])
if test "x$disable_c99" = "xno"; then
AC_CHECK_HEADERS([complex.h])
fi
@@ -675,24 +693,28 @@ echo
AC_C_CONST
AC_C_BIGENDIAN
GD_C_FLOATORDERING
+
+if test "x$disable_c99" = "xno"; then
+AC_CHECK_TYPES([_Complex float, _Complex double])
+fi
+
AC_TYPE_INT8_T
AC_TYPE_INT16_T
AC_TYPE_INT32_T
AC_TYPE_INT64_T
AC_TYPE_MODE_T
AC_TYPE_OFF_T
+AC_CHECK_TYPES([off64_t])
AC_TYPE_SIZE_T
AC_TYPE_SSIZE_T
+AC_CHECK_TYPES([struct stat64, struct _stat64, struct __stat64])
AC_TYPE_UINT8_T
AC_TYPE_UINT16_T
AC_TYPE_UINT32_T
AC_TYPE_UINT64_T
-if test "x$disable_c99" = "xno"; then
-AC_CHECK_TYPES([_Complex float, _Complex double])
-fi
-
-AC_CHECK_TYPES([struct stat64, struct _stat64, struct __stat64, off64_t])
+AC_TYPE_UNSIGNED_LONG_LONG_INT
+AC_TYPE_LONG_LONG_INT
dnl integer sizes
AC_CHECK_SIZEOF([off_t])
@@ -700,11 +722,19 @@ AC_CHECK_SIZEOF([size_t])
AC_CHECK_SIZEOF([short int])
AC_CHECK_SIZEOF([int])
AC_CHECK_SIZEOF([long int])
+if test "x$ac_cv_type_long_long_int" = "xyes"; then
AC_CHECK_SIZEOF([long long int])
+else
+ ac_cv_sizeof_long_long_int=0
+fi
AC_CHECK_SIZEOF([unsigned short int])
AC_CHECK_SIZEOF([unsigned int])
AC_CHECK_SIZEOF([unsigned long int])
+if test "x$ac_cv_type_unsigned_long_long_int" = "xyes"; then
AC_CHECK_SIZEOF([unsigned long long int])
+else
+ ac_cv_sizeof_unsigned_long_long_int=0
+fi
AC_CHECK_SIZEOF([void *])
dnl C89 API types
@@ -1072,7 +1102,7 @@ AC_CONFIG_FILES([bindings/matlab/Makefile])
AC_CONFIG_FILES([bindings/matlab/make_contents.sh])
AC_CONFIG_FILES([bindings/matlab/test/Makefile])
AC_CONFIG_FILES([bindings/perl/Makefile])
-AC_CONFIG_FILES([bindings/perl/Build.PL])
+AC_CONFIG_FILES([bindings/perl/src/Makefile.PL])
AC_CONFIG_FILES([bindings/php/Makefile])
AC_CONFIG_FILES([bindings/php/test/Makefile])
AC_CONFIG_FILES([bindings/python/Makefile])
@@ -1117,7 +1147,6 @@ AM_CONDITIONAL(HAVE_DIFF, [test "x$DIFF" != "x"])
AM_CONDITIONAL(USE_ZZSLIM, [test "x$use_zzslim" = "xyes"])
AM_CONDITIONAL(GD_EXTERNAL, [false])
-
dnl we do this here to avoid screwing up other tests
LDFLAGS="${LDFLAGS}${NO_UNDEFINED}"
diff --git a/depcomp b/depcomp
index 4ebd5b3..fc98710 100755
--- a/depcomp
+++ b/depcomp
@@ -3,7 +3,7 @@
scriptversion=2013-05-30.07; # UTC
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 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
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 5745345..85358ce 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -15,7 +15,17 @@
@SET_MAKE@
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -79,18 +89,20 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
subdir = doc
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(am__dist_doc_DATA_DIST)
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compare_version.m4 \
$(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/encoding.m4 \
$(top_srcdir)/m4/floatordering.m4 $(top_srcdir)/m4/idl.m4 \
- $(top_srcdir)/m4/matlab.m4 $(top_srcdir)/m4/perl.m4 \
- $(top_srcdir)/m4/php.m4 $(top_srcdir)/m4/python.m4 \
- $(top_srcdir)/m4/win32.m4 $(top_srcdir)/m4/version.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/matlab.m4 \
+ $(top_srcdir)/m4/perl.m4 $(top_srcdir)/m4/php.m4 \
+ $(top_srcdir)/m4/python.m4 $(top_srcdir)/m4/win32.m4 \
+ $(top_srcdir)/m4/version.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__dist_doc_DATA_DIST) \
+ $(am__DIST_COMMON)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/src/gd_config.h \
$(top_builddir)/src/getdata.h
@@ -148,6 +160,7 @@ am__uninstall_files_from_dir = { \
am__installdirs = "$(DESTDIR)$(docdir)"
DATA = $(dist_doc_DATA)
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -421,7 +434,6 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign doc/Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -621,6 +633,8 @@ uninstall-am: uninstall-dist_docDATA
mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
uninstall-am uninstall-dist_docDATA
+.PRECIOUS: Makefile
+
clean-local:
rm -rf *~
diff --git a/install-sh b/install-sh
index 377bb86..0b0fdcb 100755
--- a/install-sh
+++ b/install-sh
@@ -1,7 +1,7 @@
#!/bin/sh
# install - install a program, script, or datafile
-scriptversion=2011-11-20.07; # UTC
+scriptversion=2013-12-25.23; # UTC
# This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the
@@ -41,19 +41,15 @@ scriptversion=2011-11-20.07; # UTC
# This script is compatible with the BSD install script, but was written
# from scratch.
+tab=' '
nl='
'
-IFS=" "" $nl"
+IFS=" $tab$nl"
-# set DOITPROG to echo to test this script
+# Set DOITPROG to "echo" to test this script.
-# Don't use :- since 4.3BSD and earlier shells don't like it.
doit=${DOITPROG-}
-if test -z "$doit"; then
- doit_exec=exec
-else
- doit_exec=$doit
-fi
+doit_exec=${doit:-exec}
# Put in absolute file names if you don't have them in your path;
# or use environment vars.
@@ -68,17 +64,6 @@ 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_mkdir=
# Desired mode of installed file.
@@ -97,7 +82,7 @@ dir_arg=
dst_arg=
copy_on_change=false
-no_target_directory=
+is_target_a_directory=possibly
usage="\
Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
@@ -137,46 +122,57 @@ while test $# -ne 0; do
-d) dir_arg=true;;
-g) chgrpcmd="$chgrpprog $2"
- shift;;
+ shift;;
--help) echo "$usage"; exit $?;;
-m) mode=$2
- case $mode in
- *' '* | *' '* | *'
-'* | *'*'* | *'?'* | *'['*)
- echo "$0: invalid mode: $mode" >&2
- exit 1;;
- esac
- shift;;
+ case $mode in
+ *' '* | *"$tab"* | *"$nl"* | *'*'* | *'?'* | *'['*)
+ echo "$0: invalid mode: $mode" >&2
+ exit 1;;
+ esac
+ shift;;
-o) chowncmd="$chownprog $2"
- shift;;
+ shift;;
-s) stripcmd=$stripprog;;
- -t) dst_arg=$2
- # Protect names problematic for 'test' and other utilities.
- case $dst_arg in
- -* | [=\(\)!]) dst_arg=./$dst_arg;;
- esac
- shift;;
+ -t)
+ is_target_a_directory=always
+ dst_arg=$2
+ # Protect names problematic for 'test' and other utilities.
+ case $dst_arg in
+ -* | [=\(\)!]) dst_arg=./$dst_arg;;
+ esac
+ shift;;
- -T) no_target_directory=true;;
+ -T) is_target_a_directory=never;;
--version) echo "$0 $scriptversion"; exit $?;;
- --) shift
- break;;
+ --) shift
+ break;;
- -*) echo "$0: invalid option: $1" >&2
- exit 1;;
+ -*) echo "$0: invalid option: $1" >&2
+ exit 1;;
*) break;;
esac
shift
done
+# We allow the use of options -d and -T together, by making -d
+# take the precedence; this is for compatibility with GNU install.
+
+if test -n "$dir_arg"; then
+ if test -n "$dst_arg"; then
+ echo "$0: target directory not allowed when installing a directory." >&2
+ exit 1
+ fi
+fi
+
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.
@@ -208,6 +204,15 @@ if test $# -eq 0; then
fi
if test -z "$dir_arg"; then
+ if test $# -gt 1 || test "$is_target_a_directory" = always; then
+ if test ! -d "$dst_arg"; then
+ echo "$0: $dst_arg: Is not a directory." >&2
+ exit 1
+ fi
+ fi
+fi
+
+if test -z "$dir_arg"; then
do_exit='(exit $ret); exit $ret'
trap "ret=129; $do_exit" 1
trap "ret=130; $do_exit" 2
@@ -223,16 +228,16 @@ if test -z "$dir_arg"; then
*[0-7])
if test -z "$stripcmd"; then
- u_plus_rw=
+ u_plus_rw=
else
- u_plus_rw='% 200'
+ u_plus_rw='% 200'
fi
cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
*)
if test -z "$stripcmd"; then
- u_plus_rw=
+ u_plus_rw=
else
- u_plus_rw=,u+rw
+ u_plus_rw=,u+rw
fi
cp_umask=$mode$u_plus_rw;;
esac
@@ -269,41 +274,15 @@ do
# 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: $dst_arg: Is a directory" >&2
- exit 1
+ if test "$is_target_a_directory" = never; then
+ echo "$0: $dst_arg: Is a directory" >&2
+ exit 1
fi
dstdir=$dst
dst=$dstdir/`basename "$src"`
dstdir_status=0
else
- # Prefer dirname, but fall back on a substitute if dirname fails.
- dstdir=`
- (dirname "$dst") 2>/dev/null ||
- expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$dst" : 'X\(//\)[^/]' \| \
- X"$dst" : 'X\(//\)$' \| \
- X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
- echo X"$dst" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
- s//\1/
- q
- }
- /^X\(\/\/\)[^/].*/{
- s//\1/
- q
- }
- /^X\(\/\/\)$/{
- s//\1/
- q
- }
- /^X\(\/\).*/{
- s//\1/
- q
- }
- s/.*/./; q'
- `
-
+ dstdir=`dirname "$dst"`
test -d "$dstdir"
dstdir_status=$?
fi
@@ -314,74 +293,74 @@ do
if test $dstdir_status != 0; then
case $posix_mkdir in
'')
- # Create intermediate dirs using mode 755 as modified by the umask.
- # This is like FreeBSD 'install' as of 1997-10-28.
- umask=`umask`
- case $stripcmd.$umask in
- # Optimize common cases.
- *[2367][2367]) mkdir_umask=$umask;;
- .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
-
- *[0-7])
- mkdir_umask=`expr $umask + 22 \
- - $umask % 100 % 40 + $umask % 20 \
- - $umask % 10 % 4 + $umask % 2
- `;;
- *) mkdir_umask=$umask,go-w;;
- esac
-
- # With -d, create the new directory with the user-specified mode.
- # Otherwise, rely on $mkdir_umask.
- if test -n "$dir_arg"; then
- mkdir_mode=-m$mode
- else
- mkdir_mode=
- fi
-
- posix_mkdir=false
- case $umask in
- *[123567][0-7][0-7])
- # POSIX mkdir -p sets u+wx bits regardless of umask, which
- # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
- ;;
- *)
- tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
- trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
-
- if (umask $mkdir_umask &&
- exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
- then
- if test -z "$dir_arg" || {
- # Check for POSIX incompatibilities with -m.
- # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
- # other-writable bit of parent directory when it shouldn't.
- # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
- ls_ld_tmpdir=`ls -ld "$tmpdir"`
- case $ls_ld_tmpdir in
- d????-?r-*) different_mode=700;;
- d????-?--*) different_mode=755;;
- *) false;;
- esac &&
- $mkdirprog -m$different_mode -p -- "$tmpdir" && {
- ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
- test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
- }
- }
- then posix_mkdir=:
- fi
- rmdir "$tmpdir/d" "$tmpdir"
- else
- # Remove any dirs left behind by ancient mkdir implementations.
- rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
- fi
- trap '' 0;;
- esac;;
+ # Create intermediate dirs using mode 755 as modified by the umask.
+ # This is like FreeBSD 'install' as of 1997-10-28.
+ umask=`umask`
+ case $stripcmd.$umask in
+ # Optimize common cases.
+ *[2367][2367]) mkdir_umask=$umask;;
+ .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
+
+ *[0-7])
+ mkdir_umask=`expr $umask + 22 \
+ - $umask % 100 % 40 + $umask % 20 \
+ - $umask % 10 % 4 + $umask % 2
+ `;;
+ *) mkdir_umask=$umask,go-w;;
+ esac
+
+ # With -d, create the new directory with the user-specified mode.
+ # Otherwise, rely on $mkdir_umask.
+ if test -n "$dir_arg"; then
+ mkdir_mode=-m$mode
+ else
+ mkdir_mode=
+ fi
+
+ posix_mkdir=false
+ case $umask in
+ *[123567][0-7][0-7])
+ # POSIX mkdir -p sets u+wx bits regardless of umask, which
+ # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
+ ;;
+ *)
+ tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
+ trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
+
+ if (umask $mkdir_umask &&
+ exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
+ then
+ if test -z "$dir_arg" || {
+ # Check for POSIX incompatibilities with -m.
+ # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
+ # other-writable bit of parent directory when it shouldn't.
+ # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
+ ls_ld_tmpdir=`ls -ld "$tmpdir"`
+ case $ls_ld_tmpdir in
+ d????-?r-*) different_mode=700;;
+ d????-?--*) different_mode=755;;
+ *) false;;
+ esac &&
+ $mkdirprog -m$different_mode -p -- "$tmpdir" && {
+ ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
+ test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
+ }
+ }
+ then posix_mkdir=:
+ fi
+ rmdir "$tmpdir/d" "$tmpdir"
+ else
+ # Remove any dirs left behind by ancient mkdir implementations.
+ rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
+ fi
+ trap '' 0;;
+ esac;;
esac
if
$posix_mkdir && (
- umask $mkdir_umask &&
- $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
+ umask $mkdir_umask &&
+ $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
)
then :
else
@@ -391,53 +370,51 @@ do
# directory the slow way, step by step, checking for races as we go.
case $dstdir in
- /*) prefix='/';;
- [-=\(\)!]*) prefix='./';;
- *) prefix='';;
+ /*) prefix='/';;
+ [-=\(\)!]*) prefix='./';;
+ *) prefix='';;
esac
- eval "$initialize_posix_glob"
-
oIFS=$IFS
IFS=/
- $posix_glob set -f
+ set -f
set fnord $dstdir
shift
- $posix_glob set +f
+ set +f
IFS=$oIFS
prefixes=
for d
do
- test X"$d" = X && continue
-
- prefix=$prefix$d
- if test -d "$prefix"; then
- prefixes=
- else
- if $posix_mkdir; then
- (umask=$mkdir_umask &&
- $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
- # Don't fail if two instances are running concurrently.
- test -d "$prefix" || exit 1
- else
- case $prefix in
- *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
- *) qprefix=$prefix;;
- esac
- prefixes="$prefixes '$qprefix'"
- fi
- fi
- prefix=$prefix/
+ test X"$d" = X && continue
+
+ prefix=$prefix$d
+ if test -d "$prefix"; then
+ prefixes=
+ else
+ if $posix_mkdir; then
+ (umask=$mkdir_umask &&
+ $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
+ # Don't fail if two instances are running concurrently.
+ test -d "$prefix" || exit 1
+ else
+ case $prefix in
+ *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
+ *) qprefix=$prefix;;
+ esac
+ prefixes="$prefixes '$qprefix'"
+ fi
+ fi
+ prefix=$prefix/
done
if test -n "$prefixes"; then
- # Don't fail if two instances are running concurrently.
- (umask $mkdir_umask &&
- eval "\$doit_exec \$mkdirprog $prefixes") ||
- test -d "$dstdir" || exit 1
- obsolete_mkdir_used=true
+ # Don't fail if two instances are running concurrently.
+ (umask $mkdir_umask &&
+ eval "\$doit_exec \$mkdirprog $prefixes") ||
+ test -d "$dstdir" || exit 1
+ obsolete_mkdir_used=true
fi
fi
fi
@@ -472,15 +449,12 @@ do
# 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 &&
+ old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` &&
+ new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` &&
+ set -f &&
set X $old && old=:$2:$4:$5:$6 &&
set X $new && new=:$2:$4:$5:$6 &&
- $posix_glob set +f &&
-
+ set +f &&
test "$old" = "$new" &&
$cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
then
@@ -493,24 +467,24 @@ do
# 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"
+ # 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
diff --git a/aclocal.m4 b/m4/libtool.m4
similarity index 79%
copy from aclocal.m4
copy to m4/libtool.m4
index cf88453..a3bc337 100644
--- a/aclocal.m4
+++ b/m4/libtool.m4
@@ -1,25 +1,3 @@
-# generated automatically by aclocal 1.14.1 -*- Autoconf -*-
-
-# Copyright (C) 1996-2013 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.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
-m4_ifndef([AC_AUTOCONF_VERSION],
- [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
-[m4_warning([this file was generated for autoconf 2.69.
-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'.])])
-
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
#
# Copyright (C) 1996-2001, 2003-2015 Free Software Foundation, Inc.
@@ -312,6 +290,9 @@ 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
@@ -365,6 +346,9 @@ m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])],
+## ------------------------ ##
+## FIXME: Eliminate VARNAME ##
+## ------------------------ ##
# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?])
@@ -864,10 +848,12 @@ m4_defun([_LT_LANG],
m4_ifndef([AC_PROG_GO], [
+############################################################
# NOTE: This macro has been submitted for inclusion into #
# GNU Autoconf as AC_PROG_GO. When it is available in #
# a released version of Autoconf we should remove this #
# macro and use it instead. #
+############################################################
m4_defun([AC_PROG_GO],
[AC_LANG_PUSH(Go)dnl
AC_ARG_VAR([GOC], [Go compiler command])dnl
@@ -6235,6 +6221,10 @@ compiler_DEFAULT=$CC
_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)
@@ -7980,6 +7970,10 @@ _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
_LT_TAGVAR(reload_flag, $1)=$reload_flag
_LT_TAGVAR(reload_cmds, $1)=$reload_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)
@@ -8047,6 +8041,10 @@ _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
_LT_TAGVAR(reload_flag, $1)=$reload_flag
_LT_TAGVAR(reload_cmds, $1)=$reload_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)
@@ -8205,10 +8203,12 @@ _LT_DECL([], [Xsed], ["\$SED -e 1s/^X//"],
])# _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])
@@ -8367,2077 +8367,3 @@ AC_MSG_RESULT([$lt_cv_to_tool_file_cmd])
_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd],
[0], [convert $build files to toolchain format])dnl
])# _LT_PATH_CONVERSION_FUNCTIONS
-
-# Helper functions for option handling. -*- Autoconf -*-
-#
-# Copyright (C) 2004-2005, 2007-2009, 2011-2015 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 8 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_UNLESS_OPTIONS([LT_INIT], [aix-soname=aix aix-soname=both aix-soname=svr4],
- [_LT_WITH_AIX_SONAME([aix])])
- ])
-])# _LT_SET_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], [1], [Assembler program])dnl
-
-test -z "$DLLTOOL" && DLLTOOL=dlltool
-_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl
-
-test -z "$OBJDUMP" && OBJDUMP=objdump
-_LT_DECL([], [OBJDUMP], [1], [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_AIX_SONAME([DEFAULT])
-# ----------------------------------
-# implement the --with-aix-soname flag, and support the `aix-soname=aix'
-# and `aix-soname=both' and `aix-soname=svr4' LT_INIT options. DEFAULT
-# is either `aix', `both' or `svr4'. If omitted, it defaults to `aix'.
-m4_define([_LT_WITH_AIX_SONAME],
-[m4_define([_LT_WITH_AIX_SONAME_DEFAULT], [m4_if($1, svr4, svr4, m4_if($1, both, both, aix))])dnl
-shared_archive_member_spec=
-case $host,$enable_shared in
-power*-*-aix[[5-9]]*,yes)
- AC_MSG_CHECKING([which variant of shared library versioning to provide])
- AC_ARG_WITH([aix-soname],
- [AS_HELP_STRING([--with-aix-soname=aix|svr4|both],
- [shared library versioning (aka "SONAME") variant to provide on AIX, @<:@default=]_LT_WITH_AIX_SONAME_DEFAULT[@:>@.])],
- [case $withval in
- aix|svr4|both)
- ;;
- *)
- AC_MSG_ERROR([Unknown argument to --with-aix-soname])
- ;;
- esac
- lt_cv_with_aix_soname=$with_aix_soname],
- [AC_CACHE_VAL([lt_cv_with_aix_soname],
- [lt_cv_with_aix_soname=]_LT_WITH_AIX_SONAME_DEFAULT)
- with_aix_soname=$lt_cv_with_aix_soname])
- AC_MSG_RESULT([$with_aix_soname])
- if test aix != "$with_aix_soname"; then
- # For the AIX way of multilib, we name the shared archive member
- # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o',
- # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File.
- # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag,
- # the AIX toolchain works better with OBJECT_MODE set (default 32).
- if test 64 = "${OBJECT_MODE-32}"; then
- shared_archive_member_spec=shr_64
- else
- shared_archive_member_spec=shr
- fi
- fi
- ;;
-*)
- with_aix_soname=aix
- ;;
-esac
-
-_LT_DECL([], [shared_archive_member_spec], [0],
- [Shared archive member basename, for filename based shared library versioning on AIX])dnl
-])# _LT_WITH_AIX_SONAME
-
-LT_OPTION_DEFINE([LT_INIT], [aix-soname=aix], [_LT_WITH_AIX_SONAME([aix])])
-LT_OPTION_DEFINE([LT_INIT], [aix-soname=both], [_LT_WITH_AIX_SONAME([both])])
-LT_OPTION_DEFINE([LT_INIT], [aix-soname=svr4], [_LT_WITH_AIX_SONAME([svr4])])
-
-
-# _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@<:@=PKGS@:>@],
- [try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
- [lt_p=${PACKAGE-default}
- case $withval in
- yes|no) pic_mode=$withval ;;
- *)
- pic_mode=default
- # Look at the argument we got. We use all the common list separators.
- lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
- for lt_pkg in $withval; do
- IFS=$lt_save_ifs
- if test "X$lt_pkg" = "X$lt_p"; then
- pic_mode=yes
- fi
- done
- IFS=$lt_save_ifs
- ;;
- esac],
- [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], [])
-
-
-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])])
-
-# ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*-
-#
-# Copyright (C) 2004-2005, 2007-2008, 2011-2015 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
-])
-
-# ltversion.m4 -- version numbers -*- Autoconf -*-
-#
-# Copyright (C) 2004, 2011-2015 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.
-
-# @configure_input@
-
-# serial 4179 ltversion.m4
-# This file is part of GNU Libtool
-
-m4_define([LT_PACKAGE_VERSION], [2.4.6])
-m4_define([LT_PACKAGE_REVISION], [2.4.6])
-
-AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.4.6'
-macro_revision='2.4.6'
-_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
-_LT_DECL(, macro_revision, 0)
-])
-
-# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*-
-#
-# Copyright (C) 2004-2005, 2007, 2009, 2011-2015 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 5 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_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])])
-m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS], [AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])])
-m4_ifndef([_LT_AC_PROG_CXXCPP], [AC_DEFUN([_LT_AC_PROG_CXXCPP])])
-m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS], [AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])])
-m4_ifndef([_LT_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])])
-m4_ifndef([_LT_PROG_F77], [AC_DEFUN([_LT_PROG_F77])])
-m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])])
-m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])])
-
-# Copyright (C) 2002-2013 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.
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# 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.14'
-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.14.1], [],
- [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
-])
-
-# _AM_AUTOCONF_VERSION(VERSION)
-# -----------------------------
-# aclocal traces this macro to find the Autoconf version.
-# This is a private macro too. Using m4_define simplifies
-# the logic in aclocal, which can simply ignore this definition.
-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 AM_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.14.1])dnl
-m4_ifndef([AC_AUTOCONF_VERSION],
- [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
-
-# Figure out how to run the assembler. -*- Autoconf -*-
-
-# Copyright (C) 2001-2013 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.
-
-# AM_PROG_AS
-# ----------
-AC_DEFUN([AM_PROG_AS],
-[# By default we simply use the C compiler to build assembly code.
-AC_REQUIRE([AC_PROG_CC])
-test "${CCAS+set}" = set || CCAS=$CC
-test "${CCASFLAGS+set}" = set || CCASFLAGS=$CFLAGS
-AC_ARG_VAR([CCAS], [assembler compiler command (defaults to CC)])
-AC_ARG_VAR([CCASFLAGS], [assembler compiler flags (defaults to CFLAGS)])
-_AM_IF_OPTION([no-dependencies],, [_AM_DEPENDENCIES([CCAS])])dnl
-])
-
-# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-
-# Copyright (C) 2001-2013 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.
-
-# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
-# $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to
-# '$srcdir', '$srcdir/..', or '$srcdir/../..'.
-#
-# Of course, Automake must honor this variable whenever it calls a
-# tool from the auxiliary directory. The problem is that $srcdir (and
-# therefore $ac_aux_dir as well) can be either absolute or relative,
-# depending on how configure is run. This is pretty annoying, since
-# it makes $ac_aux_dir quite unusable in subdirectories: in the top
-# source directory, any form will work fine, but in subdirectories a
-# relative path needs to be adjusted first.
-#
-# $ac_aux_dir/missing
-# fails when called from a subdirectory if $ac_aux_dir is relative
-# $top_srcdir/$ac_aux_dir/missing
-# fails if $ac_aux_dir is absolute,
-# fails when called from a subdirectory in a VPATH build with
-# a relative $ac_aux_dir
-#
-# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
-# are both prefixed by $srcdir. In an in-source build this is usually
-# harmless because $srcdir is '.', but things will broke when you
-# start a VPATH build or use an absolute $srcdir.
-#
-# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
-# iff we strip the leading $srcdir from $ac_aux_dir. That would be:
-# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
-# and then we would define $MISSING as
-# MISSING="\${SHELL} $am_aux_dir/missing"
-# This will work as long as MISSING is not called from configure, because
-# unfortunately $(top_srcdir) has no meaning in configure.
-# However there are other variables, like CC, which are often used in
-# configure, and could therefore not use this "fixed" $ac_aux_dir.
-#
-# Another solution, used here, is to always expand $ac_aux_dir to an
-# absolute PATH. The drawback is that using absolute paths prevent a
-# configured tree to be moved without reconfiguration.
-
-AC_DEFUN([AM_AUX_DIR_EXPAND],
-[dnl Rely on autoconf to set up CDPATH properly.
-AC_PREREQ([2.50])dnl
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
-])
-
-# AM_CONDITIONAL -*- Autoconf -*-
-
-# Copyright (C) 1997-2013 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.
-
-# AM_CONDITIONAL(NAME, SHELL-CONDITION)
-# -------------------------------------
-# Define a conditional.
-AC_DEFUN([AM_CONDITIONAL],
-[AC_PREREQ([2.52])dnl
- m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
- [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
-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='#'
-else
- $1_TRUE='#'
- $1_FALSE=
-fi
-AC_CONFIG_COMMANDS_PRE(
-[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
- AC_MSG_ERROR([[conditional "$1" was never defined.
-Usually this means the macro was only invoked conditionally.]])
-fi])])
-
-# Copyright (C) 1999-2013 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.
-
-
-# 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,
-# will think it sees a *use*, and therefore will trigger all it's
-# C support machinery. Also note that it means that autoscan, seeing
-# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
-
-
-# _AM_DEPENDENCIES(NAME)
-# ----------------------
-# See how the compiler implements dependency checking.
-# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC".
-# We try a few techniques and use that to set a single cache variable.
-#
-# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
-# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
-# dependency, and given that the user is not expected to run this macro,
-# just rely on AC_PROG_CC.
-AC_DEFUN([_AM_DEPENDENCIES],
-[AC_REQUIRE([AM_SET_DEPDIR])dnl
-AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
-AC_REQUIRE([AM_MAKE_INCLUDE])dnl
-AC_REQUIRE([AM_DEP_TRACK])dnl
-
-m4_if([$1], [CC], [depcc="$CC" am_compiler_list=],
- [$1], [CXX], [depcc="$CXX" am_compiler_list=],
- [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
- [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'],
- [$1], [UPC], [depcc="$UPC" am_compiler_list=],
- [$1], [GCJ], [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
- [depcc="$$1" am_compiler_list=])
-
-AC_CACHE_CHECK([dependency style of $depcc],
- [am_cv_$1_dependencies_compiler_type],
-[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".
- rm -rf conftest.dir
- 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
-
- am_cv_$1_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
- 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
- # 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 10 /bin/sh.
- echo '/* dummy */' > sub/conftst$i.h
- 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.
- if test "x$enable_dependency_tracking" = xyes; then
- continue
- else
- break
- fi
- ;;
- msvc7 | msvc7msys | 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_$1_dependencies_compiler_type=$depmode
- break
- fi
- fi
- done
-
- cd ..
- rm -rf conftest.dir
-else
- am_cv_$1_dependencies_compiler_type=none
-fi
-])
-AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
-AM_CONDITIONAL([am__fastdep$1], [
- test "x$enable_dependency_tracking" != xno \
- && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
-])
-
-
-# AM_SET_DEPDIR
-# -------------
-# Choose a directory name for dependency files.
-# This macro is AC_REQUIREd in _AM_DEPENDENCIES.
-AC_DEFUN([AM_SET_DEPDIR],
-[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
-])
-
-
-# AM_DEP_TRACK
-# ------------
-AC_DEFUN([AM_DEP_TRACK],
-[AC_ARG_ENABLE([dependency-tracking], [dnl
-AS_HELP_STRING(
- [--enable-dependency-tracking],
- [do not reject slow dependency extractors])
-AS_HELP_STRING(
- [--disable-dependency-tracking],
- [speeds up one-time build])])
-if test "x$enable_dependency_tracking" != xno; then
- am_depcomp="$ac_aux_dir/depcomp"
- AMDEPBACKSLASH='\'
- am__nodep='_no'
-fi
-AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-AC_SUBST([AMDEPBACKSLASH])dnl
-_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
-AC_SUBST([am__nodep])dnl
-_AM_SUBST_NOTMAKE([am__nodep])dnl
-])
-
-# Generate code to set up dependency tracking. -*- Autoconf -*-
-
-# Copyright (C) 1999-2013 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.
-
-
-# _AM_OUTPUT_DEPENDENCY_COMMANDS
-# ------------------------------
-AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
-[{
- # Older Autoconf 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"`
- # 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'`; 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
-}
-])# _AM_OUTPUT_DEPENDENCY_COMMANDS
-
-
-# AM_OUTPUT_DEPENDENCY_COMMANDS
-# -----------------------------
-# This macro should only be invoked once -- use via AC_REQUIRE.
-#
-# This code is only required when automatic dependency tracking
-# is enabled. FIXME. This creates each '.P' file that we will
-# need in order to bootstrap the dependency handling code.
-AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
-[AC_CONFIG_COMMANDS([depfiles],
- [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
- [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
-])
-
-# Do all the work for Automake. -*- Autoconf -*-
-
-# Copyright (C) 1996-2013 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.
-
-# 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.
-
-dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O.
-m4_define([AC_PROG_CC],
-m4_defn([AC_PROG_CC])
-[_AM_PROG_CC_C_O
-])
-
-# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
-# AM_INIT_AUTOMAKE([OPTIONS])
-# -----------------------------------------------
-# The call with PACKAGE and VERSION arguments is the old style
-# call (pre autoconf-2.50), which is being phased out. PACKAGE
-# and VERSION should now be passed to AC_INIT and removed from
-# the call to AM_INIT_AUTOMAKE.
-# We support both call styles for the transition. After
-# the next Automake release, Autoconf can make the AC_INIT
-# 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.65])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
-AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])dnl
-if test "`cd $srcdir && pwd`" != "`pwd`"; then
- # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
- # is not polluted with repeated "-I."
- AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
- # test to see if srcdir already configured
- if test -f $srcdir/config.status; then
- AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
- fi
-fi
-
-# test whether we have cygpath
-if test -z "$CYGPATH_W"; then
- if (cygpath --version) >/dev/null 2>/dev/null; then
- CYGPATH_W='cygpath -w'
- else
- CYGPATH_W=echo
- fi
-fi
-AC_SUBST([CYGPATH_W])
-
-# Define the identity of the package.
-dnl Distinguish between old-style and new-style calls.
-m4_ifval([$2],
-[AC_DIAGNOSE([obsolete],
- [$0: two- and three-arguments forms are deprecated.])
-m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
- AC_SUBST([PACKAGE], [$1])dnl
- AC_SUBST([VERSION], [$2])],
-[_AM_SET_OPTIONS([$1])dnl
-dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
-m4_if(
- m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]),
- [ok:ok],,
- [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
-
-_AM_IF_OPTION([no-define],,
-[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package])
- AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl
-
-# Some tools Automake needs.
-AC_REQUIRE([AM_SANITY_CHECK])dnl
-AC_REQUIRE([AC_ARG_PROGRAM])dnl
-AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}])
-AM_MISSING_PROG([AUTOCONF], [autoconf])
-AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}])
-AM_MISSING_PROG([AUTOHEADER], [autoheader])
-AM_MISSING_PROG([MAKEINFO], [makeinfo])
-AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
-AC_REQUIRE([AC_PROG_MKDIR_P])dnl
-# For better backward compatibility. To be removed once Automake 1.9.x
-# dies out for good. For more background, see:
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
-AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
-# We need awk for the "check" target. The system "awk" is bad on
-# some platforms.
-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([no-dependencies],,
-[AC_PROVIDE_IFELSE([AC_PROG_CC],
- [_AM_DEPENDENCIES([CC])],
- [m4_define([AC_PROG_CC],
- m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_CXX],
- [_AM_DEPENDENCIES([CXX])],
- [m4_define([AC_PROG_CXX],
- m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_OBJC],
- [_AM_DEPENDENCIES([OBJC])],
- [m4_define([AC_PROG_OBJC],
- m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
- [_AM_DEPENDENCIES([OBJCXX])],
- [m4_define([AC_PROG_OBJCXX],
- m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl
-])
-AC_REQUIRE([AM_SILENT_RULES])dnl
-dnl The testsuite driver may need to know about EXEEXT, so add the
-dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This
-dnl macro 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
-
-# POSIX will say in a future version that running "rm -f" with no argument
-# is OK; and we want to be able to make that assumption in our Makefile
-# recipes. So use an aggressive probe to check that the usage we want is
-# actually supported "in the wild" to an acceptable degree.
-# See automake bug#10828.
-# To make any issue more visible, cause the running configure to be aborted
-# by default if the 'rm' program in use doesn't match our expectations; the
-# user can still override this though.
-if rm -f && rm -fr && rm -rf; then : OK; else
- cat >&2 <<'END'
-Oops!
-
-Your 'rm' program seems unable to run without file operands specified
-on the command line, even when the '-f' option is present. This is contrary
-to the behaviour of most rm programs out there, and not conforming with
-the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
-
-Please tell bug-automake at gnu.org about your system, including the value
-of your $PATH and any error possibly output before this message. This
-can help us improve future automake versions.
-
-END
- if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
- echo 'Configuration will proceed anyway, since you have set the' >&2
- echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
- echo >&2
- else
- cat >&2 <<'END'
-Aborting the configuration process, to ensure you take notice of the issue.
-
-You can download and install GNU coreutils to get an 'rm' implementation
-that behaves properly: <http://www.gnu.org/software/coreutils/>.
-
-If you want to complete the configuration process using your problematic
-'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
-to "yes", and re-run configure.
-
-END
- AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
- fi
-fi])
-
-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
-# that is generated. The stamp files are numbered to have different names.
-
-# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
-# loop where config.status creates the headers, so we can generate
-# 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
- $_am_arg | $_am_arg:* )
- break ;;
- * )
- _am_stamp_count=`expr $_am_stamp_count + 1` ;;
- esac
-done
-echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-
-# Copyright (C) 2001-2013 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.
-
-# AM_PROG_INSTALL_SH
-# ------------------
-# Define $install_sh.
-AC_DEFUN([AM_PROG_INSTALL_SH],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-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-2013 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.
-
-# Check whether the underlying file-system supports filenames
-# with a leading dot. For instance MS-DOS doesn't.
-AC_DEFUN([AM_SET_LEADING_DOT],
-[rm -rf .tst 2>/dev/null
-mkdir .tst 2>/dev/null
-if test -d .tst; then
- am__leading_dot=.
-else
- am__leading_dot=_
-fi
-rmdir .tst 2>/dev/null
-AC_SUBST([am__leading_dot])])
-
-# Check to see how 'make' treats includes. -*- Autoconf -*-
-
-# Copyright (C) 2001-2013 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.
-
-# AM_MAKE_INCLUDE()
-# -----------------
-# Check to see how make treats includes.
-AC_DEFUN([AM_MAKE_INCLUDE],
-[am_make=${MAKE-make}
-cat > confinc << 'END'
-am__doit:
- @echo this is the am__doit target
-.PHONY: am__doit
-END
-# If we don't find an include directive, just comment out the code.
-AC_MSG_CHECKING([for style of include used by $am_make])
-am__include="#"
-am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# 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
- 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])
-AC_MSG_RESULT([$_am_result])
-rm -f confinc confmf
-])
-
-# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-
-# Copyright (C) 1997-2013 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.
-
-# AM_MISSING_PROG(NAME, PROGRAM)
-# ------------------------------
-AC_DEFUN([AM_MISSING_PROG],
-[AC_REQUIRE([AM_MISSING_HAS_RUN])
-$1=${$1-"${am_missing_run}$2"}
-AC_SUBST($1)])
-
-# AM_MISSING_HAS_RUN
-# ------------------
-# Define MISSING if not defined so far and test if it is modern enough.
-# If it is, set am_missing_run to use it, otherwise, to nothing.
-AC_DEFUN([AM_MISSING_HAS_RUN],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-AC_REQUIRE_AUX_FILE([missing])dnl
-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 --is-lightweight"; then
- am_missing_run="$MISSING "
-else
- am_missing_run=
- AC_MSG_WARN(['missing' script is too old or missing])
-fi
-])
-
-# Helper functions for option handling. -*- Autoconf -*-
-
-# Copyright (C) 2001-2013 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.
-
-# _AM_MANGLE_OPTION(NAME)
-# -----------------------
-AC_DEFUN([_AM_MANGLE_OPTION],
-[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
-
-# _AM_SET_OPTION(NAME)
-# --------------------
-# Set option NAME. Presently that only means defining a flag for this option.
-AC_DEFUN([_AM_SET_OPTION],
-[m4_define(_AM_MANGLE_OPTION([$1]), [1])])
-
-# _AM_SET_OPTIONS(OPTIONS)
-# ------------------------
-# OPTIONS is a space-separated list of Automake options.
-AC_DEFUN([_AM_SET_OPTIONS],
-[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
-
-# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
-# -------------------------------------------
-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
-AC_DEFUN([_AM_IF_OPTION],
-[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-
-# Copyright (C) 1999-2013 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.
-
-# _AM_PROG_CC_C_O
-# ---------------
-# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC
-# to automatically call this.
-AC_DEFUN([_AM_PROG_CC_C_O],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-AC_REQUIRE_AUX_FILE([compile])dnl
-AC_LANG_PUSH([C])dnl
-AC_CACHE_CHECK(
- [whether $CC understands -c and -o together],
- [am_cv_prog_cc_c_o],
- [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])])
- # Make sure it works both with $CC and with simple cc.
- # Following AC_PROG_CC_C_O, we do the test twice because some
- # compilers refuse to overwrite an existing .o file with -o,
- # though they will create one.
- am_cv_prog_cc_c_o=yes
- for am_i in 1 2; do
- if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \
- && test -f conftest2.$ac_objext; then
- : OK
- else
- am_cv_prog_cc_c_o=no
- break
- fi
- done
- rm -f core conftest*
- unset am_i])
-if test "$am_cv_prog_cc_c_o" != yes; then
- # Losing compiler, so override with the script.
- # FIXME: It is wrong to rewrite CC.
- # But if we don't then we get into trouble of one sort or another.
- # A longer-term fix would be to have automake use am__CC in this case,
- # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
- CC="$am_aux_dir/compile $CC"
-fi
-AC_LANG_POP([C])])
-
-# For backward compatibility.
-AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
-
-# Copyright (C) 1999-2013 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.
-
-
-# AM_PATH_PYTHON([MINIMUM-VERSION], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-# ---------------------------------------------------------------------------
-# Adds support for distributing Python modules and packages. To
-# install modules, copy them to $(pythondir), using the python_PYTHON
-# automake variable. To install a package with the same name as the
-# automake package, install to $(pkgpythondir), or use the
-# pkgpython_PYTHON automake variable.
-#
-# The variables $(pyexecdir) and $(pkgpyexecdir) are provided as
-# locations to install python extension modules (shared libraries).
-# Another macro is required to find the appropriate flags to compile
-# extension modules.
-#
-# If your package is configured with a different prefix to python,
-# users will have to add the install directory to the PYTHONPATH
-# environment variable, or create a .pth file (see the python
-# documentation for details).
-#
-# If the MINIMUM-VERSION argument is passed, AM_PATH_PYTHON will
-# cause an error if the version of python installed on the system
-# doesn't meet the requirement. MINIMUM-VERSION should consist of
-# numbers and dots only.
-AC_DEFUN([AM_PATH_PYTHON],
- [
- 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 python3 python3.3 python3.2 python3.1 python3.0 python2.7 dnl
- python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0])
-
- AC_ARG_VAR([PYTHON], [the Python interpreter])
-
- m4_if([$1],[],[
- dnl No version check is needed.
- # Find any Python interpreter.
- if test -z "$PYTHON"; then
- AC_PATH_PROGS([PYTHON], _AM_PYTHON_INTERPRETER_LIST, :)
- fi
- am_display_PYTHON=python
- ], [
- dnl A version check is needed.
- if test -n "$PYTHON"; then
- # If the user set $PYTHON, use it and don't search something else.
- AC_MSG_CHECKING([whether $PYTHON version is >= $1])
- AM_PYTHON_CHECK_VERSION([$PYTHON], [$1],
- [AC_MSG_RESULT([yes])],
- [AC_MSG_RESULT([no])
- AC_MSG_ERROR([Python interpreter is too old])])
- am_display_PYTHON=$PYTHON
- else
- # Otherwise, try each interpreter until we find one that satisfies
- # VERSION.
- AC_CACHE_CHECK([for a Python interpreter with version >= $1],
- [am_cv_pathless_PYTHON],[
- for am_cv_pathless_PYTHON in _AM_PYTHON_INTERPRETER_LIST none; do
- test "$am_cv_pathless_PYTHON" = none && break
- AM_PYTHON_CHECK_VERSION([$am_cv_pathless_PYTHON], [$1], [break])
- done])
- # Set $PYTHON to the absolute path of $am_cv_pathless_PYTHON.
- if test "$am_cv_pathless_PYTHON" = none; then
- PYTHON=:
- else
- AC_PATH_PROG([PYTHON], [$am_cv_pathless_PYTHON])
- fi
- am_display_PYTHON=$am_cv_pathless_PYTHON
- fi
- ])
-
- if test "$PYTHON" = :; then
- dnl Run any user-specified action, or abort.
- m4_default([$3], [AC_MSG_ERROR([no suitable Python interpreter found])])
- else
-
- dnl Query Python for its version number. Getting [:3] seems to be
- dnl the best way to do this; it's what "site.py" does in the standard
- dnl library.
-
- AC_CACHE_CHECK([for $am_display_PYTHON version], [am_cv_python_version],
- [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
- dnl values of PYTHON_PREFIX and PYTHON_EXEC_PREFIX. These are made
- dnl distinct variables so they can be overridden if need be. However,
- dnl general consensus is that you shouldn't need this ability.
-
- AC_SUBST([PYTHON_PREFIX], ['${prefix}'])
- AC_SUBST([PYTHON_EXEC_PREFIX], ['${exec_prefix}'])
-
- dnl At times (like when building shared libraries) you may want
- 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; sys.stdout.write(sys.platform)"`])
- AC_SUBST([PYTHON_PLATFORM], [$am_cv_python_platform])
-
- # Just factor out some code duplication.
- am_python_setup_sysconfig="\
-import sys
-# Prefer sysconfig over distutils.sysconfig, for better compatibility
-# with python 3.x. See automake bug#10227.
-try:
- import sysconfig
-except ImportError:
- can_use_sysconfig = 0
-else:
- can_use_sysconfig = 1
-# Can't use sysconfig in CPython 2.7, since it's broken in virtualenvs:
-# <https://github.com/pypa/virtualenv/issues/118>
-try:
- from platform import python_implementation
- if python_implementation() == 'CPython' and sys.version[[:3]] == '2.7':
- can_use_sysconfig = 0
-except ImportError:
- pass"
-
- dnl Set up 4 directories:
-
- dnl pythondir -- where to install python scripts. This is the
- dnl site-packages directory, not the python standard library
- dnl directory like in previous automake betas. This behavior
- dnl is more consistent with lispdir.m4 for example.
- dnl Query distutils for this directory.
- AC_CACHE_CHECK([for $am_display_PYTHON script directory],
- [am_cv_python_pythondir],
- [if test "x$prefix" = xNONE
- then
- am_py_prefix=$ac_default_prefix
- else
- am_py_prefix=$prefix
- fi
- am_cv_python_pythondir=`$PYTHON -c "
-$am_python_setup_sysconfig
-if can_use_sysconfig:
- sitedir = sysconfig.get_path('purelib', vars={'base':'$am_py_prefix'})
-else:
- from distutils import sysconfig
- sitedir = sysconfig.get_python_lib(0, 0, prefix='$am_py_prefix')
-sys.stdout.write(sitedir)"`
- 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
- dnl PYTHON_SITE_PACKAGE in previous betas, but this naming is
- dnl more consistent with the rest of automake.
-
- AC_SUBST([pkgpythondir], [\${pythondir}/$PACKAGE])
-
- dnl pyexecdir -- directory for installing python extension modules
- dnl (shared libraries)
- dnl Query distutils for this directory.
- AC_CACHE_CHECK([for $am_display_PYTHON extension module directory],
- [am_cv_python_pyexecdir],
- [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 "
-$am_python_setup_sysconfig
-if can_use_sysconfig:
- sitedir = sysconfig.get_path('platlib', vars={'platbase':'$am_py_prefix'})
-else:
- from distutils import sysconfig
- sitedir = sysconfig.get_python_lib(1, 0, prefix='$am_py_prefix')
-sys.stdout.write(sitedir)"`
- 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)
-
- AC_SUBST([pkgpyexecdir], [\${pyexecdir}/$PACKAGE])
-
- dnl Run any user-specified action.
- $2
- fi
-
-])
-
-
-# AM_PYTHON_CHECK_VERSION(PROG, VERSION, [ACTION-IF-TRUE], [ACTION-IF-FALSE])
-# ---------------------------------------------------------------------------
-# Run ACTION-IF-TRUE if the Python interpreter PROG has version >= VERSION.
-# 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.
-# This supports Python 2.0 or higher. (2.0 was released on October 16, 2000).
-AC_DEFUN([AM_PYTHON_CHECK_VERSION],
- [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'.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)"
- AS_IF([AM_RUN_LOG([$1 -c "$prog"])], [$3], [$4])])
-
-# Copyright (C) 2001-2013 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.
-
-# AM_RUN_LOG(COMMAND)
-# -------------------
-# Run COMMAND, save the exit status in ac_status, and log it.
-# (This has been adapted from Autoconf's _AC_RUN_LOG macro.)
-AC_DEFUN([AM_RUN_LOG],
-[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
- ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
- (exit $ac_status); }])
-
-# Check to make sure that the build environment is sane. -*- Autoconf -*-
-
-# Copyright (C) 1996-2013 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.
-
-# AM_SANITY_CHECK
-# ---------------
-AC_DEFUN([AM_SANITY_CHECK],
-[AC_MSG_CHECKING([whether build environment is sane])
-# 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 (
- am_has_slept=no
- for am_try in 1 2; do
- echo "timestamp, slept: $am_has_slept" > conftest.file
- 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`
- fi
- if test "$[*]" != "X $srcdir/configure conftest.file" \
- && test "$[*]" != "X conftest.file $srcdir/configure"; then
-
- # If neither matched, then we have a broken ls. This can happen
- # 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".
- AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
- alias in your environment])
- fi
- if test "$[2]" = conftest.file || test $am_try -eq 2; then
- break
- fi
- # Just in case.
- sleep 1
- am_has_slept=yes
- done
- test "$[2]" = conftest.file
- )
-then
- # Ok.
- :
-else
- AC_MSG_ERROR([newly created file is older than distributed files!
-Check your system clock])
-fi
-AC_MSG_RESULT([yes])
-# If we didn't sleep, we still need to ensure time stamps of config.status and
-# generated files are strictly newer.
-am_sleep_pid=
-if grep 'slept: no' conftest.file >/dev/null 2>&1; then
- ( sleep 1 ) &
- am_sleep_pid=$!
-fi
-AC_CONFIG_COMMANDS_PRE(
- [AC_MSG_CHECKING([that generated files are newer than configure])
- if test -n "$am_sleep_pid"; then
- # Hide warnings about reused PIDs.
- wait $am_sleep_pid 2>/dev/null
- fi
- AC_MSG_RESULT([done])])
-rm -f conftest.file
-])
-
-# Copyright (C) 2009-2013 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.
-
-# AM_SILENT_RULES([DEFAULT])
-# --------------------------
-# Enable less verbose build rules; with the default set to DEFAULT
-# ("yes" being less verbose, "no" or empty being verbose).
-AC_DEFUN([AM_SILENT_RULES],
-[AC_ARG_ENABLE([silent-rules], [dnl
-AS_HELP_STRING(
- [--enable-silent-rules],
- [less verbose build output (undo: "make V=1")])
-AS_HELP_STRING(
- [--disable-silent-rules],
- [verbose build output (undo: "make V=0")])dnl
-])
-case $enable_silent_rules in @%:@ (((
- yes) AM_DEFAULT_VERBOSITY=0;;
- no) AM_DEFAULT_VERBOSITY=1;;
- *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
-esac
-dnl
-dnl A few 'make' implementations (e.g., NonStop OS and NextStep)
-dnl do not support nested variable expansions.
-dnl See automake bug#9928 and bug#10237.
-am_make=${MAKE-make}
-AC_CACHE_CHECK([whether $am_make supports nested variables],
- [am_cv_make_support_nested_variables],
- [if AS_ECHO([['TRUE=$(BAR$(V))
-BAR0=false
-BAR1=true
-V=1
-am__doit:
- @$(TRUE)
-.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then
- am_cv_make_support_nested_variables=yes
-else
- am_cv_make_support_nested_variables=no
-fi])
-if test $am_cv_make_support_nested_variables = yes; then
- dnl Using '$V' instead of '$(V)' breaks IRIX make.
- AM_V='$(V)'
- AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
-else
- AM_V=$AM_DEFAULT_VERBOSITY
- AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
-fi
-AC_SUBST([AM_V])dnl
-AM_SUBST_NOTMAKE([AM_V])dnl
-AC_SUBST([AM_DEFAULT_V])dnl
-AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl
-AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
-AM_BACKSLASH='\'
-AC_SUBST([AM_BACKSLASH])dnl
-_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
-])
-
-# Copyright (C) 2001-2013 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.
-
-# AM_PROG_INSTALL_STRIP
-# ---------------------
-# One issue with vendor 'install' (even GNU) is that you can't
-# specify the program used to strip binaries. This is especially
-# annoying in cross-compiling environments, where the build's strip
-# is unlikely to handle the host's binaries.
-# Fortunately install-sh will honor a STRIPPROG variable, so we
-# always use install-sh in "make install-strip", and initialize
-# STRIPPROG with the value of the STRIP variable (set by the user).
-AC_DEFUN([AM_PROG_INSTALL_STRIP],
-[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-# 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.
-dnl Don't test for $cross_compiling = yes, because it might be 'maybe'.
-if test "$cross_compiling" != no; then
- AC_CHECK_TOOL([STRIP], [strip], :)
-fi
-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
-AC_SUBST([INSTALL_STRIP_PROGRAM])])
-
-# Copyright (C) 2006-2013 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.
-
-# _AM_SUBST_NOTMAKE(VARIABLE)
-# ---------------------------
-# 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-2013 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.
-
-# _AM_PROG_TAR(FORMAT)
-# --------------------
-# Check how to create a tarball in format FORMAT.
-# FORMAT should be one of 'v7', 'ustar', or 'pax'.
-#
-# Substitute a variable $(am__tar) that is a command
-# writing to stdout a FORMAT-tarball containing the directory
-# $tardir.
-# tardir=directory && $(am__tar) > result.tar
-#
-# Substitute a variable $(am__untar) that extract such
-# a tarball read from stdin.
-# $(am__untar) < result.tar
-#
-AC_DEFUN([_AM_PROG_TAR],
-[# Always define AMTAR for backward compatibility. Yes, it's still used
-# in the wild :-( We should find a proper way to deprecate it ...
-AC_SUBST([AMTAR], ['$${TAR-tar}'])
-
-# We'll loop over all known methods to create a tar archive until one works.
-_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
-
-m4_if([$1], [v7],
- [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
-
- [m4_case([$1],
- [ustar],
- [# The POSIX 1988 'ustar' format is defined with fixed-size fields.
- # There is notably a 21 bits limit for the UID and the GID. In fact,
- # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343
- # and bug#13588).
- am_max_uid=2097151 # 2^21 - 1
- am_max_gid=$am_max_uid
- # The $UID and $GID variables are not portable, so we need to resort
- # to the POSIX-mandated id(1) utility. Errors in the 'id' calls
- # below are definitely unexpected, so allow the users to see them
- # (that is, avoid stderr redirection).
- am_uid=`id -u || echo unknown`
- am_gid=`id -g || echo unknown`
- AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format])
- if test $am_uid -le $am_max_uid; then
- AC_MSG_RESULT([yes])
- else
- AC_MSG_RESULT([no])
- _am_tools=none
- fi
- AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format])
- if test $am_gid -le $am_max_gid; then
- AC_MSG_RESULT([yes])
- else
- AC_MSG_RESULT([no])
- _am_tools=none
- fi],
-
- [pax],
- [],
-
- [m4_fatal([Unknown tar format])])
-
- AC_MSG_CHECKING([how to create a $1 tar archive])
-
- # Go ahead even if we have the value already cached. We do so because we
- # need to set the values for the 'am__tar' and 'am__untar' variables.
- _am_tools=${am_cv_prog_tar_$1-$_am_tools}
-
- for _am_tool in $_am_tools; do
- case $_am_tool in
- gnutar)
- for _am_tar in tar gnutar gtar; do
- AM_RUN_LOG([$_am_tar --version]) && break
- done
- am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
- am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
- am__untar="$_am_tar -xf -"
- ;;
- plaintar)
- # Must skip GNU tar: if it does not support --format= it doesn't create
- # ustar tarball either.
- (tar --version) >/dev/null 2>&1 && continue
- am__tar='tar chf - "$$tardir"'
- am__tar_='tar chf - "$tardir"'
- am__untar='tar xf -'
- ;;
- pax)
- am__tar='pax -L -x $1 -w "$$tardir"'
- am__tar_='pax -L -x $1 -w "$tardir"'
- am__untar='pax -r'
- ;;
- cpio)
- am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
- am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
- am__untar='cpio -i -H $1 -d'
- ;;
- none)
- am__tar=false
- am__tar_=false
- am__untar=false
- ;;
- esac
-
- # If the value was cached, stop now. We just wanted to have am__tar
- # and am__untar set.
- test -n "${am_cv_prog_tar_$1}" && break
-
- # tar/untar a dummy directory, and stop if the command works.
- rm -rf conftest.dir
- mkdir conftest.dir
- echo GrepMe > conftest.dir/file
- AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
- rm -rf conftest.dir
- if test -s conftest.tar; then
- AM_RUN_LOG([$am__untar <conftest.tar])
- AM_RUN_LOG([cat conftest.dir/file])
- grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
- fi
- done
- rm -rf conftest.dir
-
- AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
- AC_MSG_RESULT([$am_cv_prog_tar_$1])])
-
-AC_SUBST([am__tar])
-AC_SUBST([am__untar])
-]) # _AM_PROG_TAR
-
-m4_include([m4/ax_compare_version.m4])
-m4_include([m4/compiler.m4])
-m4_include([m4/encoding.m4])
-m4_include([m4/floatordering.m4])
-m4_include([m4/idl.m4])
-m4_include([m4/matlab.m4])
-m4_include([m4/perl.m4])
-m4_include([m4/php.m4])
-m4_include([m4/python.m4])
-m4_include([m4/win32.m4])
diff --git a/m4/ltoptions.m4 b/m4/ltoptions.m4
new file mode 100644
index 0000000..94b0829
--- /dev/null
+++ b/m4/ltoptions.m4
@@ -0,0 +1,437 @@
+# Helper functions for option handling. -*- Autoconf -*-
+#
+# Copyright (C) 2004-2005, 2007-2009, 2011-2015 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 8 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_UNLESS_OPTIONS([LT_INIT], [aix-soname=aix aix-soname=both aix-soname=svr4],
+ [_LT_WITH_AIX_SONAME([aix])])
+ ])
+])# _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], [1], [Assembler program])dnl
+
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl
+
+test -z "$OBJDUMP" && OBJDUMP=objdump
+_LT_DECL([], [OBJDUMP], [1], [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_AIX_SONAME([DEFAULT])
+# ----------------------------------
+# implement the --with-aix-soname flag, and support the `aix-soname=aix'
+# and `aix-soname=both' and `aix-soname=svr4' LT_INIT options. DEFAULT
+# is either `aix', `both' or `svr4'. If omitted, it defaults to `aix'.
+m4_define([_LT_WITH_AIX_SONAME],
+[m4_define([_LT_WITH_AIX_SONAME_DEFAULT], [m4_if($1, svr4, svr4, m4_if($1, both, both, aix))])dnl
+shared_archive_member_spec=
+case $host,$enable_shared in
+power*-*-aix[[5-9]]*,yes)
+ AC_MSG_CHECKING([which variant of shared library versioning to provide])
+ AC_ARG_WITH([aix-soname],
+ [AS_HELP_STRING([--with-aix-soname=aix|svr4|both],
+ [shared library versioning (aka "SONAME") variant to provide on AIX, @<:@default=]_LT_WITH_AIX_SONAME_DEFAULT[@:>@.])],
+ [case $withval in
+ aix|svr4|both)
+ ;;
+ *)
+ AC_MSG_ERROR([Unknown argument to --with-aix-soname])
+ ;;
+ esac
+ lt_cv_with_aix_soname=$with_aix_soname],
+ [AC_CACHE_VAL([lt_cv_with_aix_soname],
+ [lt_cv_with_aix_soname=]_LT_WITH_AIX_SONAME_DEFAULT)
+ with_aix_soname=$lt_cv_with_aix_soname])
+ AC_MSG_RESULT([$with_aix_soname])
+ if test aix != "$with_aix_soname"; then
+ # For the AIX way of multilib, we name the shared archive member
+ # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o',
+ # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File.
+ # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag,
+ # the AIX toolchain works better with OBJECT_MODE set (default 32).
+ if test 64 = "${OBJECT_MODE-32}"; then
+ shared_archive_member_spec=shr_64
+ else
+ shared_archive_member_spec=shr
+ fi
+ fi
+ ;;
+*)
+ with_aix_soname=aix
+ ;;
+esac
+
+_LT_DECL([], [shared_archive_member_spec], [0],
+ [Shared archive member basename, for filename based shared library versioning on AIX])dnl
+])# _LT_WITH_AIX_SONAME
+
+LT_OPTION_DEFINE([LT_INIT], [aix-soname=aix], [_LT_WITH_AIX_SONAME([aix])])
+LT_OPTION_DEFINE([LT_INIT], [aix-soname=both], [_LT_WITH_AIX_SONAME([both])])
+LT_OPTION_DEFINE([LT_INIT], [aix-soname=svr4], [_LT_WITH_AIX_SONAME([svr4])])
+
+
+# _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@<:@=PKGS@:>@],
+ [try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
+ [lt_p=${PACKAGE-default}
+ case $withval in
+ yes|no) pic_mode=$withval ;;
+ *)
+ pic_mode=default
+ # Look at the argument we got. We use all the common list separators.
+ lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
+ for lt_pkg in $withval; do
+ IFS=$lt_save_ifs
+ if test "X$lt_pkg" = "X$lt_p"; then
+ pic_mode=yes
+ fi
+ done
+ IFS=$lt_save_ifs
+ ;;
+ esac],
+ [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/m4/ltsugar.m4 b/m4/ltsugar.m4
new file mode 100644
index 0000000..48bc934
--- /dev/null
+++ b/m4/ltsugar.m4
@@ -0,0 +1,124 @@
+# ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*-
+#
+# Copyright (C) 2004-2005, 2007-2008, 2011-2015 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/m4/ltversion.m4 b/m4/ltversion.m4
new file mode 100644
index 0000000..fa04b52
--- /dev/null
+++ b/m4/ltversion.m4
@@ -0,0 +1,23 @@
+# ltversion.m4 -- version numbers -*- Autoconf -*-
+#
+# Copyright (C) 2004, 2011-2015 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.
+
+# @configure_input@
+
+# serial 4179 ltversion.m4
+# This file is part of GNU Libtool
+
+m4_define([LT_PACKAGE_VERSION], [2.4.6])
+m4_define([LT_PACKAGE_REVISION], [2.4.6])
+
+AC_DEFUN([LTVERSION_VERSION],
+[macro_version='2.4.6'
+macro_revision='2.4.6'
+_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
+_LT_DECL(, macro_revision, 0)
+])
diff --git a/m4/lt~obsolete.m4 b/m4/lt~obsolete.m4
new file mode 100644
index 0000000..c6b26f8
--- /dev/null
+++ b/m4/lt~obsolete.m4
@@ -0,0 +1,99 @@
+# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*-
+#
+# Copyright (C) 2004-2005, 2007, 2009, 2011-2015 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 5 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_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])])
+m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS], [AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])])
+m4_ifndef([_LT_AC_PROG_CXXCPP], [AC_DEFUN([_LT_AC_PROG_CXXCPP])])
+m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS], [AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])])
+m4_ifndef([_LT_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])])
+m4_ifndef([_LT_PROG_F77], [AC_DEFUN([_LT_PROG_F77])])
+m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])])
+m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])])
diff --git a/m4/perl.m4 b/m4/perl.m4
index 8665f11..bb6cbba 100644
--- a/m4/perl.m4
+++ b/m4/perl.m4
@@ -48,11 +48,12 @@ fi
dnl GD_PERL_MAN3EXT
dnl ---------------------------------------------------------------
-dnl Define PERL_MAN3EXT to the section 3 manual extension used by Module::Build
+dnl Define PERL_MAN3EXT to the section 3 manual extension used by
+dnl ExtUtils::MakeMaker
AC_DEFUN([GD_PERL_MAN3EXT],
[
AC_MSG_CHECKING([for the section 3 manual page extension])
-PERL_MAN3EXT=`$PERL -MModule::Build -e 'print "\n>>GD ", Module::Build->new(module_name=>"conftest",dist_version=>0)->config('man3ext'), " GD<<";' | $AWK '/>>GD .* GD<</ { print @S|@2 }'`
+PERL_MAN3EXT=`$PERL -MExtUtils::MakeMaker::Config -e 'print "\n>>GD ", @S|@Config{man3ext}, " GD<<";' | $AWK '/>>GD .* GD<</ { print @S|@2 }'`
AC_MSG_RESULT([.$PERL_MAN3EXT])
AC_SUBST([PERL_MAN3EXT])
])
@@ -151,12 +152,12 @@ site-specific module directory. [default: site] ]),
], [ perl_inst_type="site" ])
if test "x${have_perl}" != "xno"; then
+ GD_PERL_CHECK_MODULE([ExtUtils::MakeMaker])
GD_PERL_CHECK_MODULE([Math::Complex])
- GD_PERL_CHECK_MODULE([Module::Build])
GD_PERL_CHECK_MODULE([Test::Harness])
fi
-if test "$HAVE_Math__Complex$HAVE_Module__Build" != "yesyes"; then
+if test "$HAVE_Math__Complex$HAVE_ExtUtils__MakeMaker" != "yesyes"; then
have_perl=no
fi
diff --git a/m4/version.m4 b/m4/version.m4
index fe7a500..58fdec9 100644
--- a/m4/version.m4
+++ b/m4/version.m4
@@ -20,7 +20,7 @@ dnl 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
m4_define(getdata_major, 0)
m4_define(getdata_minor, 9)
-m4_define(getdata_revision, 0)
+m4_define(getdata_revision, 1)
m4_define(getdata_extra, [])
m4_define(getdata_version,
getdata_major.getdata_minor.getdata_revision[]getdata_extra)
@@ -28,7 +28,7 @@ m4_define(getdata_version,
dnl libgetdata current interface version
m4_define(getdata_iface_version, 7)
dnl libgetdata current interface implementation revision
-m4_define(getdata_impl_revision, 0)
+m4_define(getdata_impl_revision, 1)
dnl libgetdata interface age (current interface - oldest supported interface)
m4_define(getdata_iface_age, 0)
@@ -42,4 +42,4 @@ dnl libf95getdata interface version info
m4_define(f95getdata_version, 6:0:0)
dnl libgetdata-matlab interface version info
-m4_define(matlabgetdata_version, 1:0:1)
+m4_define(matlabgetdata_version, 1:1:1)
diff --git a/man/Makefile.am b/man/Makefile.am
index 723c7f0..e1761e8 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2014 D. V. Wiebe
+# Copyright (C) 2008-2015 D. V. Wiebe
#
##########################################################################
#
@@ -37,8 +37,8 @@ dist_man_MANS = checkdirfile.1 dirfile2ascii.1 gd_add.3 gd_add_alias.3 \
gd_free_entry_strings.3 gd_get_carray_slice.3 gd_get_string.3 \
gd_getdata.3 gd_getdata64.3 gd_hidden.3 gd_hide.3 \
gd_include_affix.3 gd_invalid_dirfile.3 gd_linterp_tablename.3 \
- gd_madd_bit.3 gd_mcarrays.3 gd_mconstants.3 gd_metaflush.3 \
- gd_move.3 gd_mplex_lookback.3 gd_mstrings.3 gd_naliases.3 \
+ gd_madd_bit.3 gd_mcarrays.3 gd_metaflush.3 gd_move.3 \
+ gd_mplex_lookback.3 gd_mstrings.3 gd_naliases.3 \
gd_native_type.3 gd_nentries.3 gd_nfragments.3 gd_nframes.3 \
gd_nframes64.3 gd_parent_fragment.3 gd_parser_callback.3 \
gd_protection.3 gd_put_carray_slice.3 \
@@ -70,6 +70,7 @@ MAN3ALIASES=gd_add_bit.3:gd_add_carray.3 gd_add_bit.3:gd_add_clincom.3 \
gd_add_spec.3:gd_madd_spec.3 \
gd_cbopen.3:gd_open.3 \
gd_close.3:gd_discard.3 \
+ gd_constants.3:gd_mconstants.3 \
gd_include_affix.3:gd_include.3 \
gd_alter_bit.3:gd_alter_carray.3 gd_alter_bit.3:gd_alter_clincom.3 \
gd_alter_bit.3:gd_alter_const.3 gd_alter_bit.3:gd_alter_cpolynom.3 \
diff --git a/man/Makefile.in b/man/Makefile.in
index 82416ad..dd94ff3 100644
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -14,7 +14,17 @@
@SET_MAKE@
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -78,20 +88,19 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
subdir = man
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(srcdir)/gd_alter_encoding.3.in \
- $(srcdir)/gd_alter_endianness.3.in \
- $(srcdir)/gd_alter_frameoffset.3.in $(dist_man_MANS)
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compare_version.m4 \
$(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/encoding.m4 \
$(top_srcdir)/m4/floatordering.m4 $(top_srcdir)/m4/idl.m4 \
- $(top_srcdir)/m4/matlab.m4 $(top_srcdir)/m4/perl.m4 \
- $(top_srcdir)/m4/php.m4 $(top_srcdir)/m4/python.m4 \
- $(top_srcdir)/m4/win32.m4 $(top_srcdir)/m4/version.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/matlab.m4 \
+ $(top_srcdir)/m4/perl.m4 $(top_srcdir)/m4/php.m4 \
+ $(top_srcdir)/m4/python.m4 $(top_srcdir)/m4/win32.m4 \
+ $(top_srcdir)/m4/version.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/src/gd_config.h \
$(top_builddir)/src/getdata.h
@@ -152,6 +161,10 @@ man5dir = $(mandir)/man5
NROFF = nroff
MANS = $(dist_man_MANS) $(nodist_man_MANS)
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.in \
+ $(srcdir)/gd_alter_encoding.3.in \
+ $(srcdir)/gd_alter_endianness.3.in \
+ $(srcdir)/gd_alter_frameoffset.3.in
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -378,7 +391,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-# Copyright (C) 2008-2014 D. V. Wiebe
+# Copyright (C) 2008-2015 D. V. Wiebe
#
##########################################################################
#
@@ -417,8 +430,8 @@ dist_man_MANS = checkdirfile.1 dirfile2ascii.1 gd_add.3 gd_add_alias.3 \
gd_free_entry_strings.3 gd_get_carray_slice.3 gd_get_string.3 \
gd_getdata.3 gd_getdata64.3 gd_hidden.3 gd_hide.3 \
gd_include_affix.3 gd_invalid_dirfile.3 gd_linterp_tablename.3 \
- gd_madd_bit.3 gd_mcarrays.3 gd_mconstants.3 gd_metaflush.3 \
- gd_move.3 gd_mplex_lookback.3 gd_mstrings.3 gd_naliases.3 \
+ gd_madd_bit.3 gd_mcarrays.3 gd_metaflush.3 gd_move.3 \
+ gd_mplex_lookback.3 gd_mstrings.3 gd_naliases.3 \
gd_native_type.3 gd_nentries.3 gd_nfragments.3 gd_nframes.3 \
gd_nframes64.3 gd_parent_fragment.3 gd_parser_callback.3 \
gd_protection.3 gd_put_carray_slice.3 \
@@ -451,6 +464,7 @@ MAN3ALIASES = gd_add_bit.3:gd_add_carray.3 gd_add_bit.3:gd_add_clincom.3 \
gd_add_spec.3:gd_madd_spec.3 \
gd_cbopen.3:gd_open.3 \
gd_close.3:gd_discard.3 \
+ gd_constants.3:gd_mconstants.3 \
gd_include_affix.3:gd_include.3 \
gd_alter_bit.3:gd_alter_carray.3 gd_alter_bit.3:gd_alter_clincom.3 \
gd_alter_bit.3:gd_alter_const.3 gd_alter_bit.3:gd_alter_cpolynom.3 \
@@ -499,7 +513,6 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign man/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign man/Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -818,6 +831,8 @@ uninstall-man: uninstall-man1 uninstall-man3 uninstall-man5
ps ps-am tags-am uninstall uninstall-am uninstall-hook \
uninstall-man uninstall-man1 uninstall-man3 uninstall-man5
+.PRECIOUS: Makefile
+
%.html: % make_html.pl
./make_html.pl $< > $@
diff --git a/man/dirfile-encoding.5 b/man/dirfile-encoding.5
index c4d4f62..370647b 100644
--- a/man/dirfile-encoding.5
+++ b/man/dirfile-encoding.5
@@ -149,7 +149,7 @@ The file extension of the BZip2 Encoding is
The FLAC Encoding compresses raw binary files using the Free Lossless Audio
Codec. GetData's FLAC Encoding scheme is implemented through the libFLAC
reference implementation developed by Josh Coalson and the Xiph.Org Foundation.
-All operations are supported by the FLAC Encdoing, but writing occurs
+All operations are supported by the FLAC Encoding, but writing occurs
out-of-place. See the
.B Out-of-place writes
section above for details.
diff --git a/man/gd_constants.3 b/man/gd_constants.3
index 228a2bb..13804be 100644
--- a/man/gd_constants.3
+++ b/man/gd_constants.3
@@ -1,6 +1,6 @@
.\" gd_constants.3. The gd_constants man page.
.\"
-.\" Copyright (C) 2008, 2009, 2010 D. V. Wiebe
+.\" Copyright (C) 2008, 2010, 2011, 2015 D. V. Wiebe
.\"
.\""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
.\"
@@ -13,9 +13,9 @@
.\" Texts. A copy of the license is included in the `COPYING.DOC' file
.\" as part of this distribution.
.\"
-.TH gd_constants 3 "18 August 2011" "Version 0.8.0" "GETDATA"
+.TH gd_constants 3 "4 December 2015" "Version 0.9.1" "GETDATA"
.SH NAME
-gd_constants \(em retrieve a list of constant values from a dirfile
+gd_constants, gd_mconstants \(em retrieve a list of constant values from a dirfile
.SH SYNOPSIS
.B #include <getdata.h>
.HP
@@ -23,6 +23,9 @@ gd_constants \(em retrieve a list of constant values from a dirfile
.ad l
.BI "const void *gd_constants(DIRFILE *" dirfile ", gd_type_t
.IB return_type );
+.HP
+.BI "const void *gd_mconstants(DIRFILE *" dirfile ", const char"
+.BI * parent ", gd_type_t " return_type );
.hy
.ad n
.SH DESCRIPTION
@@ -32,63 +35,102 @@ function queries a dirfile(5) database specified by
.I dirfile
and returns a read-only list of values of the all
.B CONST
-type fields defined in the database after type conversion to the data type
-specified by
+fields defined in the database, excluding meta subfields. The values returned
+are converted to the data type specified by
.IR return_type .
-Notably, this list does not include /META subfields. For a list of valid
-symbols to use for
-.IR return_type ,
-see the
-.BR gd_get_constant (3)
-man page.
-
The
+.I return_type
+should be one of the following symbols:
+.IP
+.nh
+.ad l
+.BR GD_UINT8 ,\~ GD_INT8 ,\~ GD_UINT16 ,\~ GD_INT16 ,\~ GD_UINT32 ,\~ GD_INT32 ,
+.BR GD_UINT64, \~ GD_INT64 ,\~ GD_FLOAT32 ,\~ GD_FLOAT64 ,\~ GD_COMPLEX64 ,
+.BR GD_COMPLEX128 .
+.ad n
+.hy
+.PP
+See
+.BR gd_get_constant (3)
+for the meaning of these symbols. The
.I dirfile
argument must point to a valid DIRFILE object previously created by a call to
.BR gd_open (3).
-The array returned will be de-allocated by a call to
-.BR gd_close (3)
-and should not be de-allocated by the caller. The list returned should not be
-assumed to be in any particular order, although it is guaranteed to be in the
-same order as the list of
+
+The
+.BR gd_mconstants ()
+function returns the same list for
+.B CONST
+meta subfields of the parent field specified by
+.IR parent .
+
+The list returned should not be assumed to be in any particular order, although
+it is guaranteed to be in the same order as the list of
.B CONST
fields returned by
-.BR gd_field_list_by_type (3).
+.BR gd_field_list_by_type (3)
+or
+.BR gd_mfield_list_by_type (3).
The array is unterminated. The number of values in the array can be obtained
from a call to
-.BR gd_nfields_by_type (3).
+.BR gd_nfields_by_type (3)
+or
+.BR gd_nmfields_by_type (3),
+as appropriate.
-The caller may not modify any values in the array, or the array itself. Doing
-so may cause database corruption. The pointer returned is guaranteed to be
-valid only until
-.BR gd_constants ()
-is called again with the same arguments, or until the dirfile's metadata is
-modified (by adding, modifying or deleting an entry), or until the array is
-de-allocated by a call to
-.BR gd_close (3).
+Memory for the returned array is managed by GetData and should not be
+de-allocated by the caller. The caller may not modify any values in the array.
+Doing so may cause database corruption. The pointer returned is guaranteed to
+be valid only until the function is called again, with the exception that, since
+each top-level field maintains its own arrays, calling
+.BR gd_mconstants ()
+for a one parent field does not invalidate the pointer returned for a any other
+parent.
+
+Modifying the dirfile's metadata invalidates any pointer returned by these
+functions. And no pointers remain valid after the dirfile is de-allocated by a
+call to
+.BR gd_close (3)
+or
+.BR gd_discard (3).
+Once a pointer is invalidated, the caller should not dereference it.
A corresponding list of names for these fields may be obtained by calling
-.BR gd_field_list_by_type (3).
+.BR gd_field_list_by_type (3)
+or
+.BR gd_mfield_list_by_type (3).
.SH RETURN VALUE
Upon successful completion,
.BR gd_constants ()
-returns a pointer to an array of values containing the values of all the
-constants defined in the dirfile database. If no constants are defined in the
-database, NULL is returned. On error it returns NULL and sets the dirfile error
-to a non-zero error value. Possible error values are:
+returns a pointer to an array containing the values of all the constants defined
+in the dirfile database. Similarly,
+.BR gd_mconstants ()
+returns a pointer to an array containing the values of the all the meta subfield
+constants of the specified parent field.
+
+If no constants of the appropriate class are defined in the database, NULL is
+returned. On error, it returns NULL and sets the dirfile error to a non-zero
+error value. Possible error values are:
.TP 8
.B GD_E_ALLOC
The library was unable to allocate memory.
.TP
+.B GD_E_BAD_CODE
+The specified
+.I parent
+field code was not found, or referred to a metafield
+.RB ( gd_mconstants ()
+only).
+.TP
.B GD_E_BAD_DIRFILE
The supplied dirfile was invalid.
.TP
.B GD_E_BAD_TYPE
The
.I return_type
-specified was invalid.
+specified was not one of the symbols listed above.
.TP
.B GD_E_INTERNAL_ERROR
An internal error occurred in the library while trying to perform the task.
@@ -107,4 +149,6 @@ a call to
.BR gd_error_string (3),
.BR gd_field_list_by_type (3),
.BR gd_get_constant (3),
-.BR gd_nfields_by_type (3)
+.BR gd_mfield_list_by_type (3),
+.BR gd_nfields_by_type (3),
+.BR gd_nmfields_by_type (3)
diff --git a/man/gd_fragment_affixes.3 b/man/gd_fragment_affixes.3
index 3f9526a..2b99c7e 100644
--- a/man/gd_fragment_affixes.3
+++ b/man/gd_fragment_affixes.3
@@ -1,6 +1,6 @@
-.\" gd_fragment_affix.3. The gd_fragment_affix man page.
+.\" gd_fragment_affixes.3. The gd_fragment_affixes man page.
.\"
-.\" Copyright (C) 2012 D. V. Wiebe
+.\" Copyright (C) 2012, 2015 D. V. Wiebe
.\"
.\""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
.\"
@@ -13,21 +13,21 @@
.\" Texts. A copy of the license is included in the `COPYING.DOC' file
.\" as part of this distribution.
.\"
-.TH gd_fragment_affix 3 "2 August 2012" "Version 0.8.1" "GETDATA"
+.TH gd_fragment_affixes 3 "4 November 2015" "Version 0.9.1" "GETDATA"
.SH NAME
-gd_fragment_affix \(em report the field affixes of a fragment of a dirfile database
+gd_fragment_affixes \(em report the field affixes of a fragment of a dirfile database
.SH SYNOPSIS
.B #include <getdata.h>
.HP
.nh
.ad l
-.BI "int gd_fragment_affix(DIRFILE *" dirfile ", int " fragment_index ,
+.BI "int gd_fragment_affixes(DIRFILE *" dirfile ", int " fragment_index ,
.BI "char **" prefix ", char **" suffix );
.hy
.ad n
.SH DESCRIPTION
The
-.BR gd_fragment_affix ()
+.BR gd_fragment_affixes ()
function queries a dirfile(5) database specified by
.I dirfile
and returns the field affixes for the fragment indexed by
@@ -49,7 +49,7 @@ argument must point to a valid DIRFILE object previously created by a call to
.SH RETURN VALUE
Upon successful completion,
-.BR gd_fragment_affix ()
+.BR gd_fragment_affixes ()
returns zero. If non-empty, the prefix and suffix are reported in
.BR malloc (3)'d
buffers whose addresses are returned in
diff --git a/man/gd_getdata.3 b/man/gd_getdata.3
index fde4a3f..18ed01a 100644
--- a/man/gd_getdata.3
+++ b/man/gd_getdata.3
@@ -1,6 +1,6 @@
.\" gd_getdata.3. The gd_getdata man page.
.\"
-.\" Copyright (C) 2008, 2009, 2010, 2011, 2012, 2013, 2014 D. V. Wiebe
+.\" Copyright (C) 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 D. V. Wiebe
.\"
.\""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
.\"
@@ -13,7 +13,7 @@
.\" Texts. A copy of the license is included in the `COPYING.DOC' file
.\" as part of this distribution.
.\"
-.TH gd_getdata 3 "16 October 2014" "Version 0.9.0" "GETDATA"
+.TH gd_getdata 3 "16 December 2015" "Version 0.9.1" "GETDATA"
.SH NAME
gd_getdata \(em retrieve data from a dirfile database
.SH SYNOPSIS
@@ -354,7 +354,26 @@ reclaimed by calling
.BR gd_raw_close (3)
on fields when finished reading them.
-.SH GETDATA I/O POINTERs
+When operating on a platform whose
+.B size_t
+is
+.IR N -bytes
+wide, a single call of
+.BR gd_getdata ()
+will never return more than (2**(\fIN\fR-1) - 1) samples. The request will
+be truncated at (2**(\fIN\fR-\fIM\fR) - 1) samples, where \fIM\fR is the size,
+in bytes, of the largest data type used to calculate the returned field. If a
+larger request is specified, less data than requested will be returned, without
+raising an error. This limit is imposed even when
+.I return_type
+is
+.B GD_NULL
+or when reading from the
+.I INDEX
+field (i.e., even when no actual I/O or calculation occurs). In all cases, the
+actual amount of data is returned.
+
+.SH GETDATA I/O POINTERS
This is a general discussion of field I/O pointers in the GetData library, and
contains information not directly applicable to
.BR gd_getdata ().
diff --git a/man/gd_hidden.3 b/man/gd_hidden.3
index c0a4425..7cbd045 100644
--- a/man/gd_hidden.3
+++ b/man/gd_hidden.3
@@ -1,6 +1,6 @@
.\" gd_hidden.3. The gd_hidden man page.
.\"
-.\" Copyright (C) 2012, 2013 D. V. Wiebe
+.\" Copyright (C) 2012, 2013, 2015 D. V. Wiebe
.\"
.\""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
.\"
@@ -13,9 +13,9 @@
.\" Texts. A copy of the license is included in the `COPYING.DOC' file
.\" as part of this distribution.
.\"
-.TH gd_hidden 3 "10 December 2013" "Version 0.9.0" "GETDATA"
+.TH gd_hidden 3 "5 November 2015" "Version 0.9.1" "GETDATA"
.SH NAME
-gd_hidden \(em retrieve the fragment containing a dirfile field
+gd_hidden \(em check whether a dirfile entry is hidden or not
.SH SYNOPSIS
.B #include <getdata.h>
.HP
diff --git a/man/gd_mconstants.3 b/man/gd_mconstants.3
deleted file mode 100644
index 589d174..0000000
--- a/man/gd_mconstants.3
+++ /dev/null
@@ -1,107 +0,0 @@
-.\" gd_mconstants.3. The gd_mconstants man page.
-.\"
-.\" Copyright (C) 2008, 2010, 2011 D. V. Wiebe
-.\"
-.\""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-.\"
-.\" This file is part of the GetData project.
-.\"
-.\" Permission is granted to copy, distribute and/or modify this document
-.\" under the terms of the GNU Free Documentation License, Version 1.2 or
-.\" any later version published by the Free Software Foundation; with no
-.\" Invariant Sections, with no Front-Cover Texts, and with no Back-Cover
-.\" Texts. A copy of the license is included in the `COPYING.DOC' file
-.\" as part of this distribution.
-.\"
-.TH gd_mconstants 3 "17 August 2011" "Version 0.8.0" "GETDATA"
-.SH NAME
-gd_mconstants \(em retrieve a list of constant values from a dirfile
-.SH SYNOPSIS
-.B #include <getdata.h>
-.HP
-.nh
-.ad l
-.BI "const void *gd_mconstants(DIRFILE *" dirfile ", const char"
-.BI * parent ", gd_type_t " return_type );
-.hy
-.ad n
-.SH DESCRIPTION
-The
-.BR gd_mconstants ()
-function queries a dirfile(5) database specified by
-.I dirfile
-and returns a read-only list of values of the all
-.B CONST
-type metafields for the supplied
-.I parent
-field after type conversion to the data type specified by
-.IR return_type .
-
-The
-.I dirfile
-argument must point to a valid DIRFILE object previously created by a call to
-.BR gd_open (3).
-
-The array returned will be de-allocated by a call to
-.BR gd_close (3)
-and should not be de-allocated by the caller. The list returned should not be
-assumed to be in any particular order, although it is guaranteed to be in the
-same order as the list of
-.B CONST
-fields returned by
-.BR gd_mfield_list_by_type (3).
-The array is unterminated. The number of values in the array can be obtained
-from a call to
-.BR gd_nmfields_by_type (3).
-
-The caller may not modify any values in the array, or the array itself. Doing
-so may cause database corruption. The pointer returned is guaranteed to be
-valid until
-.BR gd_mconstants ()
-is called again, or until the array is de-allocated by a call to
-.BR gd_close (3).
-
-A corresponding list of names for these fields may be obtained by calling
-.BR gd_mfield_list_by_type (3).
-
-.SH RETURN VALUE
-Upon successful completion,
-.BR gd_mconstants ()
-returns a pointer to an array of values containing the values of all the
-.B CONST
-metafields for the supplied parent field. If the parent field has no constant
-metafields, NULL is returned. On error it returns NULL and sets the dirfile
-error to a non-zero error value. Possible error values are:
-.TP 8
-.B GD_E_ALLOC
-The library was unable to allocate memory.
-.TP
-.B GD_E_BAD_CODE
-The supplied parent field code was not found, or referred to a metafield itself.
-.TP
-.B GD_E_BAD_DIRFILE
-The supplied dirfile was invalid.
-.TP
-.B GD_E_BAD_TYPE
-The
-.I return_type
-specified was invalid.
-.TP
-.B GD_E_INTERNAL_ERROR
-An internal error occurred in the library while trying to perform the task.
-This indicates a bug in the library. Please report the incident to the
-GetData developers.
-.PP
-The dirfile error may be retrieved by calling
-.BR gd_error (3).
-A descriptive error string for the last error encountered can be obtained from
-a call to
-.BR gd_error_string (3).
-.SH SEE ALSO
-.BR dirfile (5),
-.BR gd_error (3),
-.BR gd_error_string (3),
-.BR gd_field_list_by_type (3),
-.BR gd_nfields_by_type (3),
-.BR gd_mcarrays (3),
-.BR gd_open (3)
diff --git a/man/gd_putdata.3 b/man/gd_putdata.3
index 873dce8..39156bc 100644
--- a/man/gd_putdata.3
+++ b/man/gd_putdata.3
@@ -1,6 +1,6 @@
.\" gd_putdata.3. The gd_putdata man page.
.\"
-.\" Copyright (C) 2008, 2009, 2010, 2011, 2012, 2014 D. V. Wiebe
+.\" Copyright (C) 2008, 2009, 2010, 2011, 2012, 2014, 2015 D. V. Wiebe
.\"
.\""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
.\"
@@ -13,7 +13,7 @@
.\" Texts. A copy of the license is included in the `COPYING.DOC' file
.\" as part of this distribution.
.\"
-.TH gd_putdata 3 "16 October 2014" "Version 0.9.0" "GETDATA"
+.TH gd_putdata 3 "16 December 2015" "Version 0.9.1" "GETDATA"
.SH NAME
gd_putdata \(em write data to a dirfile database
.SH SYNOPSIS
@@ -249,6 +249,25 @@ The dirfile error may be retrieved by calling
A descriptive error string for the last error encountered can be obtained from
a call to
.BR gd_error_string (3).
+
+.SH NOTES
+When operating on a platform whose
+.B size_t
+is
+.IR N -bytes
+wide, a single call of
+.BR gd_putdata ()
+will never write more than (2**(\fIN\fR-1) - 1) samples. The request will
+be truncated at (2**(\fIN\fR-\fIM\fR) - 1) samples, where \fIM\fR is the size,
+in bytes, of the largest data type used to calculate the stored field. If a
+larger request is specified, less data than requested will be written, without
+raising an error. This limit is imposed even when
+.I data_type
+is
+.B GD_NULL
+(i.e., even when no actual I/O or calculation occurs). In all cases, the actual
+amount of data is returned.
+
.SH SEE ALSO
.BR dirfile (5),
.BR dirfile-encoding (5),
diff --git a/man/gd_tell.3 b/man/gd_tell.3
index 00f035a..fe09d3d 100644
--- a/man/gd_tell.3
+++ b/man/gd_tell.3
@@ -1,6 +1,6 @@
.\" gd_getdata.3. The gd_getdata man page.
.\"
-.\" Copyright (C) 2011, 2014 D. V. Wiebe
+.\" Copyright (C) 2011, 2014, 2015 D. V. Wiebe
.\"
.\""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
.\"
@@ -13,9 +13,9 @@
.\" Texts. A copy of the license is included in the `COPYING.DOC' file
.\" as part of this distribution.
.\"
-.TH gd_tell 3 "16 October 2014" "Version 0.9.0" "GETDATA"
+.TH gd_tell 3 "5 November 2015" "Version 0.9.1" "GETDATA"
.SH NAME
-gd_tell \(em reposition a dirfile field pointer
+gd_tell \(em report the position of a dirfile field I/O pointer
.SH SYNOPSIS
.B #include <getdata.h>
.HP
diff --git a/missing b/missing
index db98974..f62bbae 100755
--- a/missing
+++ b/missing
@@ -3,7 +3,7 @@
scriptversion=2013-10-28.13; # UTC
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
# Originally written by Fran,cois Pinard <pinard at iro.umontreal.ca>, 1996.
# This program is free software; you can redistribute it and/or modify
diff --git a/src/Makefile.am b/src/Makefile.am
index 9de54b1..2ec8c4c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -129,8 +129,8 @@ module_LTLIBRARIES = ${LIBGETDATABZIP2_LA} ${LIBGETDATAFLAC_LA} \
libgetdata_la_SOURCES = add.c ascii.c ${BZIP2_C} close.c common.c compat.c \
constant.c ${DEBUG_C} del.c encoding.c endian.c \
entry.c errors.c field_list.c ${FLAC_C} flimits.c \
- flush.c fpos.c fragment.c getdata.c globals.c \
- ${GZIP_C} index.c include.c ${LEGACY_C} ${LZMA_C} \
+ flush.c fragment.c getdata.c globals.c ${GZIP_C} \
+ index.c include.c iopos.c ${LEGACY_C} ${LZMA_C} \
mod.c move.c name.c native.c nfields.c nframes.c \
open.c parse.c protect.c putdata.c raw.c sie.c \
${SLIM_C} spf.c string.c types.c ${ZZIP_C} ${ZZSLIM_C} \
@@ -182,4 +182,4 @@ libgetdatazzslim_la_LDFLAGS = $(SLIM_LDFLAGS) $(ZZIP_LDFLAGS) \
libgetdatazzslim_la_CPPFLAGS = $(AM_CPPFLAGS) $(SLIM_CPPFLAGS) $(ZZIP_CPPFLAGS)
clean-local:
- rm -rf *~ getdata.pc
+ rm -rf *~ getdata.pc *.gcno
diff --git a/src/Makefile.in b/src/Makefile.in
index fdae068..f635242 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -17,7 +17,17 @@
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -81,20 +91,20 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
subdir = src
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(srcdir)/gd_config.h.in $(srcdir)/getdata.h.in \
- $(srcdir)/getdata.pc.in $(top_srcdir)/depcomp \
- $(am__include_HEADERS_DIST)
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compare_version.m4 \
$(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/encoding.m4 \
$(top_srcdir)/m4/floatordering.m4 $(top_srcdir)/m4/idl.m4 \
- $(top_srcdir)/m4/matlab.m4 $(top_srcdir)/m4/perl.m4 \
- $(top_srcdir)/m4/php.m4 $(top_srcdir)/m4/python.m4 \
- $(top_srcdir)/m4/win32.m4 $(top_srcdir)/m4/version.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/matlab.m4 \
+ $(top_srcdir)/m4/perl.m4 $(top_srcdir)/m4/php.m4 \
+ $(top_srcdir)/m4/python.m4 $(top_srcdir)/m4/win32.m4 \
+ $(top_srcdir)/m4/version.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__include_HEADERS_DIST) \
+ $(am__DIST_COMMON)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = gd_config.h getdata.h
CONFIG_CLEAN_FILES = getdata.h.in2 getdata.pc
@@ -139,12 +149,11 @@ libgetdata_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3)
am__libgetdata_la_SOURCES_DIST = add.c ascii.c bzip.c close.c common.c \
compat.c constant.c debug.c del.c encoding.c endian.c entry.c \
- errors.c field_list.c flac.c flimits.c flush.c fpos.c \
- fragment.c getdata.c globals.c gzip.c index.c include.c \
- legacy.c lzma.c mod.c move.c name.c native.c nfields.c \
- nframes.c open.c parse.c protect.c putdata.c raw.c sie.c \
- slim.c spf.c string.c types.c zzip.c zzslim.c getdata_legacy.h \
- internal.h
+ errors.c field_list.c flac.c flimits.c flush.c fragment.c \
+ getdata.c globals.c gzip.c index.c include.c iopos.c legacy.c \
+ lzma.c mod.c move.c name.c native.c nfields.c nframes.c open.c \
+ parse.c protect.c putdata.c raw.c sie.c slim.c spf.c string.c \
+ types.c zzip.c zzslim.c getdata_legacy.h internal.h
@USE_BZIP2_TRUE@@USE_MODULES_FALSE at am__objects_1 = bzip.lo
@GETDATA_DEBUG_TRUE at am__objects_2 = debug.lo
@USE_FLAC_TRUE@@USE_MODULES_FALSE at am__objects_3 = flac.lo
@@ -158,8 +167,8 @@ am__objects_10 =
am_libgetdata_la_OBJECTS = add.lo ascii.lo $(am__objects_1) close.lo \
common.lo compat.lo constant.lo $(am__objects_2) del.lo \
encoding.lo endian.lo entry.lo errors.lo field_list.lo \
- $(am__objects_3) flimits.lo flush.lo fpos.lo fragment.lo \
- getdata.lo globals.lo $(am__objects_4) index.lo include.lo \
+ $(am__objects_3) flimits.lo flush.lo fragment.lo getdata.lo \
+ globals.lo $(am__objects_4) index.lo include.lo iopos.lo \
$(am__objects_5) $(am__objects_6) mod.lo move.lo name.lo \
native.lo nfields.lo nframes.lo open.lo parse.lo protect.lo \
putdata.lo raw.lo sie.lo $(am__objects_7) spf.lo string.lo \
@@ -306,6 +315,9 @@ am__define_uniq_tagged_files = \
done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/gd_config.h.in \
+ $(srcdir)/getdata.h.in $(srcdir)/getdata.pc.in \
+ $(top_srcdir)/depcomp
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -604,8 +616,8 @@ module_LTLIBRARIES = ${LIBGETDATABZIP2_LA} ${LIBGETDATAFLAC_LA} \
libgetdata_la_SOURCES = add.c ascii.c ${BZIP2_C} close.c common.c compat.c \
constant.c ${DEBUG_C} del.c encoding.c endian.c \
entry.c errors.c field_list.c ${FLAC_C} flimits.c \
- flush.c fpos.c fragment.c getdata.c globals.c \
- ${GZIP_C} index.c include.c ${LEGACY_C} ${LZMA_C} \
+ flush.c fragment.c getdata.c globals.c ${GZIP_C} \
+ index.c include.c iopos.c ${LEGACY_C} ${LZMA_C} \
mod.c move.c name.c native.c nfields.c nframes.c \
open.c parse.c protect.c putdata.c raw.c sie.c \
${SLIM_C} spf.c string.c types.c ${ZZIP_C} ${ZZSLIM_C} \
@@ -672,7 +684,6 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
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 \
*config.status*) \
@@ -835,13 +846,13 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/flac.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/flimits.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/flush.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/fpos.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/fragment.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/getdata.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/globals.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gzip.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/include.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/index.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/iopos.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/legacy.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libgetdatabzip2_la-bzip.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libgetdataflac_la-flac.Plo at am__quote@
@@ -1233,6 +1244,8 @@ uninstall-am: uninstall-includeHEADERS uninstall-libLTLIBRARIES \
uninstall-moduleLTLIBRARIES uninstall-nodist_includeHEADERS \
uninstall-pkgconfigDATA
+.PRECIOUS: Makefile
+
@INCLUDE_LEGACY_API_TRUE at install-data-hook:
@INCLUDE_LEGACY_API_TRUE@ cd $(DESTDIR)$(includedir) && \
@@ -1245,7 +1258,7 @@ uninstall-am: uninstall-includeHEADERS uninstall-libLTLIBRARIES \
$(DLOPEN_LIBGETDATAZZSLIM_LA) $(DLOPEN_LIBGETDATAFLAC_LA)
clean-local:
- rm -rf *~ getdata.pc
+ rm -rf *~ getdata.pc *.gcno
# 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/add.c b/src/add.c
index 0d40f94..bbfc387 100644
--- a/src/add.c
+++ b/src/add.c
@@ -313,7 +313,8 @@ static gd_entry_t *_GD_Add(DIRFILE *restrict D,
_GD_SetError(D, GD_E_BAD_ENTRY, GD_E_ENTRY_SPF, NULL, 0, NULL);
else if (E->EN(raw,data_type) & 0x40 || (E->e->u.raw.size =
GD_SIZE(E->EN(raw,data_type))) == 0)
- _GD_SetError(D, GD_E_BAD_TYPE, entry->EN(raw,data_type), NULL, 0, NULL);
+ _GD_SetError(D, GD_E_BAD_TYPE, 0, NULL, entry->EN(raw,data_type),
+ NULL);
else if (_GD_InitRawIO(D, E, NULL, -1, NULL, 0,
GD_FILE_WRITE | GD_FILE_TOUCH, _GD_FileSwapBytes(D, E)))
{
@@ -495,7 +496,7 @@ static gd_entry_t *_GD_Add(DIRFILE *restrict D,
if (E->EN(scalar,const_type) & 0x40 || GD_SIZE(E->EN(scalar,const_type))
== 0)
{
- _GD_SetError(D, GD_E_BAD_TYPE, E->EN(scalar,const_type), NULL, 0, NULL);
+ _GD_SetError(D, GD_E_BAD_TYPE, 0, NULL, E->EN(scalar,const_type), NULL);
} else {
size_t size = GD_SIZE(_GD_ConstType(D, E->EN(scalar,const_type)));
if (!D->error)
@@ -511,7 +512,7 @@ static gd_entry_t *_GD_Add(DIRFILE *restrict D,
if (E->EN(scalar,const_type) & 0x40 || GD_SIZE(E->EN(scalar,const_type))
== 0)
{
- _GD_SetError(D, GD_E_BAD_TYPE, E->EN(scalar,const_type), NULL, 0, NULL);
+ _GD_SetError(D, GD_E_BAD_TYPE, 0, NULL, E->EN(scalar,const_type), NULL);
} else {
size_t size = GD_SIZE(_GD_ConstType(D, E->EN(scalar,const_type))) *
E->EN(scalar,array_len);
@@ -613,12 +614,12 @@ static gd_entry_t *_GD_Add(DIRFILE *restrict D,
P->e->p.meta_entry[P->e->n_meta] = E;
P->e->n_meta++;
- P->e->value_list_validity = 0;
- P->e->entry_list_validity = 0;
+ P->e->fl.value_list_validity = 0;
+ P->e->fl.entry_list_validity = 0;
} else {
/* Invalidate the field lists */
- D->value_list_validity = 0;
- D->entry_list_validity = 0;
+ D->fl.value_list_validity = 0;
+ D->fl.entry_list_validity = 0;
}
@@ -658,18 +659,17 @@ static gd_entry_t *_GD_Add(DIRFILE *restrict D,
return E;
}
-/* add a META field by parsing a field spec */
-int gd_madd_spec(DIRFILE* D, const char* line, const char* parent) gd_nothrow
+static int _GD_AddSpec(DIRFILE* D, const char* line, const char* parent,
+ int me, const char *name) gd_nothrow
{
char *outstring = NULL;
char *in_cols[MAX_IN_COLS];
const char *tok_pos = NULL;
int n_cols;
- int me;
gd_entry_t* E = NULL;
struct parser_state p;
- dtrace("%p, \"%s\", \"%s\"", D, line, parent);
+ dtrace("%p, \"%s\", \"%s\", %i, \"%s\"", D, line, parent, me, name);
if (D->flags & GD_INVALID) {/* don't crash */
_GD_SetError(D, GD_E_BAD_DIRFILE, 0, NULL, 0, NULL);
@@ -686,17 +686,25 @@ int gd_madd_spec(DIRFILE* D, const char* line, const char* parent) gd_nothrow
_GD_ClearError(D);
- /* Find parent -- we don't do code mungeing here because we don't know
- * which fragment this is yet. */
- E = _GD_FindField(D, parent, D->entry, D->n_entries, 1, NULL);
- if (E == NULL) {
- _GD_SetError(D, GD_E_BAD_CODE, GD_E_CODE_MISSING, NULL, 0, parent);
- dreturn("%i", -1);
- return -1;
+ if (parent) {
+ /* Find parent -- we don't do code mungeing here because we don't know
+ * which fragment this is yet. */
+ E = _GD_FindField(D, parent, D->entry, D->n_entries, 1, NULL);
+ if (E == NULL) {
+ _GD_SetError(D, GD_E_BAD_CODE, GD_E_CODE_MISSING, NULL, 0, parent);
+ dreturn("%i", -1);
+ return -1;
+ }
+ me = E->fragment_index;
+ } else {
+ /* check for fragment index out of range */
+ if (me < 0 || me >= D->n_fragment) {
+ _GD_SetError(D, GD_E_BAD_INDEX, 0, NULL, me, NULL);
+ dreturn("%i", -1);
+ return -1;
+ }
}
- me = E->fragment_index;
-
/* check protection */
if (D->fragment[me].protection & GD_PROTECT_FORMAT) {
_GD_SetError(D, GD_E_PROTECTED, GD_E_PROTECTED_FORMAT, NULL, 0,
@@ -704,15 +712,15 @@ int gd_madd_spec(DIRFILE* D, const char* line, const char* parent) gd_nothrow
dreturn("%i", -1);
return -1;
}
-
+
/* start parsing */
- _GD_SimpleParserInit(D, "gd_madd_spec()", &p);
+ _GD_SimpleParserInit(D, name, &p);
n_cols = _GD_Tokenise(D, &p, line, &outstring, &tok_pos, MAX_IN_COLS,
in_cols);
/* Directive parsing is skipped -- The Field Spec parser will add the field */
if (!D->error)
- _GD_ParseFieldSpec(D, &p, n_cols, in_cols, E, me, 1, 1, &outstring,
+ _GD_ParseFieldSpec(D, &p, n_cols, in_cols, E, me, 1, 1, &outstring,
tok_pos);
free(outstring);
@@ -731,79 +739,29 @@ int gd_madd_spec(DIRFILE* D, const char* line, const char* parent) gd_nothrow
return 0;
}
-/* add a field by parsing a field spec */
-int gd_add_spec(DIRFILE* D, const char* line, int fragment_index)
+int gd_madd_spec(DIRFILE* D, const char* line, const char *parent)
{
- char *outstring;
- const char *tok_pos = NULL;
- char *in_cols[MAX_IN_COLS];
- int n_cols;
- struct parser_state p;
-
- dtrace("%p, \"%s\", %i", D, line, fragment_index);
-
- if (D->flags & GD_INVALID) {/* don't crash */
- _GD_SetError(D, GD_E_BAD_DIRFILE, 0, NULL, 0, NULL);
- dreturn("%i", -1);
- return -1;
- }
-
- /* check access mode */
- if ((D->flags & GD_ACCMODE) == GD_RDONLY) {
- _GD_SetError(D, GD_E_ACCMODE, 0, NULL, 0, NULL);
- dreturn("%i", -1);
- return -1;
- }
-
- /* check for include index out of range */
- if (fragment_index < 0 || fragment_index >= D->n_fragment) {
- _GD_SetError(D, GD_E_BAD_INDEX, 0, NULL, fragment_index, NULL);
- dreturn("%i", -1);
- return -1;
- }
-
- /* check protection */
- if (D->fragment[fragment_index].protection & GD_PROTECT_FORMAT) {
- _GD_SetError(D, GD_E_PROTECTED, GD_E_PROTECTED_FORMAT, NULL, 0,
- D->fragment[fragment_index].cname);
- dreturn("%i", -1);
- return -1;
- }
-
- _GD_ClearError(D);
-
- if (~D->flags & GD_HAVE_VERSION)
- _GD_FindVersion(D);
+ int ret;
- if (D->av) {
- p.standards = D->standards;
- p.pedantic = 1;
- }
+ dtrace("%p, \"%s\", \"%s\"", D, line, parent);
- /* start parsing */
- _GD_SimpleParserInit(D, "gd_add_spec()", &p);
- n_cols = _GD_Tokenise(D, &p, line, &outstring, &tok_pos, MAX_IN_COLS,
- in_cols);
+ ret = _GD_AddSpec(D, line, parent, 0, "gd_madd_spec()");
- /* Directive parsing is skipped -- The Field Spec parser will add the field */
- if (!D->error)
- _GD_ParseFieldSpec(D, &p, n_cols, in_cols, NULL, fragment_index, 1, 1,
- &outstring, tok_pos);
+ dreturn("%i", ret);
+ return ret;
+}
- free(outstring);
+/* add a field by parsing a field spec */
+int gd_add_spec(DIRFILE* D, const char* line, int fragment_index)
+{
+ int ret;
- if (D->error) {
- dreturn("%i", -1); /* parser threw an error */
- return -1;
- }
+ dtrace("%p, \"%s\", %i", D, line, fragment_index);
- /* Update aliases */
- _GD_UpdateAliases(D, 0);
+ ret = _GD_AddSpec(D, line, NULL, fragment_index, "gd_add_spec()");
- D->fragment[fragment_index].modified = 1;
- D->flags &= ~GD_HAVE_VERSION;
- dreturn("%i", 0);
- return 0;
+ dreturn("%i", ret);
+ return ret;
}
int gd_add(DIRFILE* D, const gd_entry_t* entry)
@@ -1250,8 +1208,8 @@ int gd_add_phase(DIRFILE* D, const char* field_code, const char* in_field,
{
gd_entry_t P;
- dtrace("%p, \"%s\", \"%s\", %lli, %i", D, field_code, in_field,
- (long long)shift, fragment_index);
+ dtrace("%p, \"%s\", \"%s\", %" PRId64 ", %i", D, field_code, in_field,
+ (int64_t)shift, fragment_index);
if (D->flags & GD_INVALID) {/* don't crash */
_GD_SetError(D, GD_E_BAD_DIRFILE, 0, NULL, 0, NULL);
@@ -1282,9 +1240,9 @@ int gd_add_window(DIRFILE *D, const char *field_code, const char *in_field,
{
gd_entry_t E;
- dtrace("%p, \"%s\", \"%s\", \"%s\", %i, {%g,%llx,%lli}, %i", D, field_code,
- in_field, check_field, windop, threshold.r,
- (unsigned long long)threshold.u, (long long)threshold.i, fragment_index);
+ dtrace("%p, \"%s\", \"%s\", \"%s\", %i, {%g,%" PRIX64 ",%" PRId64 "}, %i", D,
+ field_code, in_field, check_field, windop, threshold.r, threshold.u,
+ threshold.i, fragment_index);
if (D->flags & GD_INVALID) {/* don't crash */
_GD_SetError(D, GD_E_BAD_DIRFILE, 0, NULL, 0, NULL);
@@ -1424,7 +1382,7 @@ int gd_add_carray(DIRFILE* D, const char* field_code, gd_type_t const_type,
gd_entry_t *entry;
gd_entry_t C;
- dtrace("%p, \"%s\", 0x%X, %" PRNsize_t ", 0x%X, %p, %i", D, field_code,
+ dtrace("%p, \"%s\", 0x%X, %" PRIuSIZE ", 0x%X, %p, %i", D, field_code,
const_type, array_len, data_type, values, fragment_index);
if (D->flags & GD_INVALID) {
@@ -1701,8 +1659,8 @@ int gd_madd_phase(DIRFILE* D, const char* parent, const char* field_code,
{
gd_entry_t P;
- dtrace("%p, \"%s\", \"%s\", \"%s\", %lli", D, field_code, parent, in_field,
- (long long)shift);
+ dtrace("%p, \"%s\", \"%s\", \"%s\", %" PRId64, D, field_code, parent,
+ in_field, shift);
if (D->flags & GD_INVALID) {/* don't crash */
_GD_SetError(D, GD_E_BAD_DIRFILE, 0, NULL, 0, NULL);
@@ -1905,9 +1863,9 @@ int gd_madd_window(DIRFILE *D, const char *parent, const char *field_code,
{
gd_entry_t E;
- dtrace("%p, \"%s\", \"%s\", \"%s\", \"%s\", %i, {%g,%llx,%lli}", D, parent,
- field_code, in_field, check_field, windop, threshold.r,
- (unsigned long long)threshold.u, (long long)threshold.i);
+ dtrace("%p, \"%s\", \"%s\", \"%s\", \"%s\", %i, {%g,%" PRIX64 ",%" PRId64 "}",
+ D, parent, field_code, in_field, check_field, windop, threshold.r,
+ threshold.u, threshold.i);
if (D->flags & GD_INVALID) {/* don't crash */
_GD_SetError(D, GD_E_BAD_DIRFILE, 0, NULL, 0, NULL);
@@ -2045,7 +2003,7 @@ int gd_madd_carray(DIRFILE* D, const char* parent, const char* field_code,
gd_entry_t *entry;
gd_entry_t C;
- dtrace("%p, \"%s\", \"%s\", 0x%X, %" PRNsize_t ", 0x%X, %p", D, parent,
+ dtrace("%p, \"%s\", \"%s\", 0x%X, %" PRIuSIZE ", 0x%X, %p", D, parent,
field_code, const_type, array_len, data_type, values);
if (D->flags & GD_INVALID) {/* don't crash */
@@ -2184,11 +2142,11 @@ static int _GD_AddAlias(DIRFILE *restrict D, const char *restrict parent,
/* Invalidate the field lists */
if (P) {
- P->e->value_list_validity = 0;
- P->e->entry_list_validity = 0;
+ P->e->fl.value_list_validity = 0;
+ P->e->fl.entry_list_validity = 0;
} else {
- D->value_list_validity = 0;
- D->entry_list_validity = 0;
+ D->fl.value_list_validity = 0;
+ D->fl.entry_list_validity = 0;
}
/* Update aliases */
diff --git a/src/ascii.c b/src/ascii.c
index 9273d16..cc08512 100644
--- a/src/ascii.c
+++ b/src/ascii.c
@@ -65,7 +65,7 @@ off64_t _GD_AsciiSeek(struct gd_raw_file_* file, off64_t count,
{
char line[64];
- dtrace("%p, %lli, <unused>, 0x%X", file, (long long)count, mode);
+ dtrace("%p, %" PRId64 ", <unused>, 0x%X", file, (int64_t)count, mode);
if (count < file->pos) {
rewind((FILE *)file->edata);
@@ -82,81 +82,83 @@ off64_t _GD_AsciiSeek(struct gd_raw_file_* file, off64_t count,
fputs(line, (FILE *)file->edata);
}
- dreturn("%lli", (long long)file->pos);
+ dreturn("%" PRId64, (int64_t)file->pos);
return file->pos;
}
-static void _GD_ScanFormat(char* fmt, gd_type_t data_type)
-{
- dtrace("%p, 0x%X", fmt, data_type);
+static const char * _GD_ScanFormat(gd_type_t data_type)
+{
+ const char *fmt;
+ dtrace("0x%X", data_type);
switch(data_type) {
case GD_UINT8:
#ifndef NO_8BIT_INT_PREFIX
- strcpy(fmt, "%" SCNu8);
+ fmt = "%" SCNu8 "\n";
break;
+#else
+ /* FALLTHROUGH */
#endif
case GD_UINT16:
- strcpy(fmt, "%" SCNu16);
+ fmt = "%" SCNu16 "\n";
break;
case GD_INT8:
#ifndef NO_8BIT_INT_PREFIX
- strcpy(fmt, "%" SCNi8);
+ fmt = "%" SCNi8 "\n";
break;
+#else
+ /* FALLTHROUGH */
#endif
case GD_INT16:
- strcpy(fmt, "%" SCNi16);
+ fmt = "%" SCNi16 "\n";
break;
case GD_UINT32:
- strcpy(fmt, "%" SCNu32);
+ fmt = "%" SCNu32 "\n";
break;
case GD_INT32:
- strcpy(fmt, "%" SCNi32);
+ fmt = "%" SCNi32 "\n";
break;
case GD_UINT64:
- strcpy(fmt, "%" SCNu64);
+ fmt = "%" SCNu64 "\n";
break;
case GD_INT64:
- strcpy(fmt, "%" SCNi64);
+ fmt = "%" SCNi64 "\n";
break;
case GD_FLOAT32:
- strcpy(fmt, "%f");
+ fmt = "%f\n";
break;
case GD_FLOAT64:
- strcpy(fmt, "%lf");
+ fmt = "%lf\n";
break;
case GD_COMPLEX64:
- strcpy(fmt, "%f;%f");
+ fmt = "%f;%f\n";
break;
case GD_COMPLEX128:
- strcpy(fmt, "%lf;%lf");
+ fmt = "%lf;%lf\n";
break;
default:
- fmt[0] = 0;
+ fmt = NULL;
break;
}
- if (fmt[0])
- strcat(fmt, "\n");
-
- dreturn("[\"%s\"]", fmt);
+ dreturn("\"%s\"", fmt);
+ return fmt;
}
ssize_t _GD_AsciiRead(struct gd_raw_file_ *restrict file, void *restrict ptr,
gd_type_t data_type, size_t nmemb)
{
- char fmt[50];
- size_t n = 0;
- ssize_t ret = 0;
+ const char *fmt;
+ ssize_t n = 0;
#ifdef NO_8BIT_INT_PREFIX
short int i16;
#endif
- dtrace("%p, %p, 0x%X, %" PRNsize_t, file, ptr, data_type, nmemb);
+ dtrace("%p, %p, 0x%X, %" PRIuSIZE, file, ptr, data_type, nmemb);
- _GD_ScanFormat(fmt, data_type);
+ fmt = _GD_ScanFormat(data_type);
if (data_type & GD_COMPLEX) {
- for (n = 0; n < nmemb; ++n) {
+ for (n = 0; n < (ssize_t)nmemb; ++n) {
if (feof((FILE *)file->edata))
break;
@@ -164,13 +166,13 @@ ssize_t _GD_AsciiRead(struct gd_raw_file_ *restrict file, void *restrict ptr,
(char *)ptr + GD_SIZE(data_type) * n + GD_SIZE(data_type) / 2) < 2)
{
if (ferror((FILE *)file->edata))
- ret = -1;
+ n = -1;
break;
}
file->pos++;
}
} else {
- for (n = 0; n < nmemb; ++n) {
+ for (n = 0; n < (ssize_t)nmemb; ++n) {
if (ferror((FILE *)file->edata))
break;
@@ -179,7 +181,7 @@ ssize_t _GD_AsciiRead(struct gd_raw_file_ *restrict file, void *restrict ptr,
if (GD_SIZE(data_type) == 1) {
if (fscanf((FILE *)file->edata, fmt, &i16) < 1) {
if (ferror((FILE *)file->edata))
- ret = -1;
+ n = -1;
break;
}
if (data_type & GD_SIGNED)
@@ -193,7 +195,7 @@ ssize_t _GD_AsciiRead(struct gd_raw_file_ *restrict file, void *restrict ptr,
n) < 1)
{
if (ferror((FILE *)file->edata))
- ret = -1;
+ n = -1;
break;
}
}
@@ -201,130 +203,45 @@ ssize_t _GD_AsciiRead(struct gd_raw_file_ *restrict file, void *restrict ptr,
}
}
- dreturn("%li", (ret) ? (long)ret : (long)n);
- return (ret) ? ret : (ssize_t)n;
+ dreturn("%" PRIdSIZE, n);
+ return n;
}
+#define WRITE_ASCII(fmt,t) do { \
+ for (n = 0; n < (ssize_t)nmemb; ++n) \
+ if (fprintf((FILE *)file->edata, "%" fmt "\n", ((t*)ptr)[n]) < 0) { n = -1; break; } \
+} while (0)
+#define WRITE_CASCII(fmt,t) do { \
+ for (n = 0; n < (ssize_t)nmemb; ++n) \
+ if (fprintf((FILE *)file->edata, "%" fmt ";%" fmt "\n", ((t*)ptr)[n*2], ((t*)ptr)[n*2+1]) < 0) \
+ { n = -1; break; } \
+} while (0)
+
ssize_t _GD_AsciiWrite(struct gd_raw_file_ *restrict file,
const void *restrict ptr, gd_type_t data_type, size_t nmemb)
{
- ssize_t ret = 0;
- size_t n = 0;
-
- dtrace("%p, %p, 0x%X, %" PRNsize_t, file, ptr, data_type, nmemb);
-
- switch(data_type) {
- case GD_UINT8:
- for (n = 0; n < nmemb; ++n)
- if (fprintf((FILE *)file->edata, "%" PRIu8 "\n",
- ((uint8_t *)ptr)[n]) < 0)
- {
- ret = -1;
- break;
- }
- break;
- case GD_INT8:
- for (n = 0; n < nmemb; ++n)
- if (fprintf((FILE *)file->edata, "%" PRIi8 "\n",
- ((int8_t *)ptr)[n]) < 0)
- {
- ret = -1;
- break;
- }
- break;
- case GD_UINT16:
- for (n = 0; n < nmemb; ++n)
- if (fprintf((FILE *)file->edata, "%" PRIu16 "\n", ((uint16_t *)ptr)[n])
- < 0)
- {
- ret = -1;
- break;
- }
- break;
- case GD_INT16:
- for (n = 0; n < nmemb; ++n)
- if (fprintf((FILE *)file->edata, "%" PRIi16 "\n", ((int16_t *)ptr)[n])
- < 0)
- {
- ret = -1;
- break;
- }
- break;
- case GD_UINT32:
- for (n = 0; n < nmemb; ++n)
- if (fprintf((FILE *)file->edata, "%" PRIu32 "\n", ((uint32_t *)ptr)[n])
- < 0)
- {
- ret = -1;
- break;
- }
- break;
- case GD_INT32:
- for (n = 0; n < nmemb; ++n)
- if (fprintf((FILE *)file->edata, "%" PRIi32 "\n", ((int32_t *)ptr)[n])
- < 0)
- {
- ret = -1;
- break;
- }
- break;
- case GD_UINT64:
- for (n = 0; n < nmemb; ++n)
- if (fprintf((FILE *)file->edata, "%" PRIu64 "\n", ((uint64_t *)ptr)[n])
- < 0)
- {
- ret = -1;
- break;
- }
- break;
- case GD_INT64:
- for (n = 0; n < nmemb; ++n)
- if (fprintf((FILE *)file->edata, "%" PRIi64 "\n", ((int64_t *)ptr)[n])
- < 0)
- {
- ret = -1;
- break;
- }
- break;
- case GD_FLOAT32:
- for (n = 0; n < nmemb; ++n)
- if (fprintf((FILE *)file->edata, "%.7g\n", ((float *)ptr)[n]) < 0) {
- ret = -1;
- break;
- }
- break;
- case GD_FLOAT64:
- for (n = 0; n < nmemb; ++n)
- if (fprintf((FILE *)file->edata, "%.16lg\n", ((double *)ptr)[n]) < 0) {
- ret = -1;
- break;
- }
- break;
- case GD_COMPLEX64:
- for (n = 0; n < nmemb; ++n)
- if (fprintf((FILE *)file->edata, "%.16g;%.16g\n", ((float *)ptr)[n * 2],
- (((float *)ptr)[n * 2 + 1])) < 0)
- {
- ret = -1;
- break;
- }
- break;
- case GD_COMPLEX128:
- for (n = 0; n < nmemb; ++n)
- if (fprintf((FILE *)file->edata, "%.16lg;%.16lg\n",
- ((double *)ptr)[n * 2], (((double *)ptr)[n * 2 + 1])) < 0)
- {
- ret = -1;
- break;
- }
- break;
- default:
- ret = -1;
- break;
+ ssize_t n = -1;
+
+ dtrace("%p, %p, 0x%X, %" PRIuSIZE, file, ptr, data_type, nmemb);
+
+ switch (data_type) {
+ case GD_UINT8: WRITE_ASCII(PRIu8 , uint8_t); break;
+ case GD_INT8: WRITE_ASCII(PRId8 , int8_t); break;
+ case GD_UINT16: WRITE_ASCII(PRIu16, uint16_t); break;
+ case GD_INT16: WRITE_ASCII(PRId16, int16_t); break;
+ case GD_UINT32: WRITE_ASCII(PRIu32, uint32_t); break;
+ case GD_INT32: WRITE_ASCII(PRId32, int32_t); break;
+ case GD_UINT64: WRITE_ASCII(PRIu64, uint64_t); break;
+ case GD_INT64: WRITE_ASCII(PRId64, int64_t); break;
+ case GD_FLOAT32: WRITE_ASCII(".7g", float); break;
+ case GD_FLOAT64: WRITE_ASCII(".16g", double); break;
+ case GD_COMPLEX64: WRITE_CASCII(".7g", float); break;
+ case GD_COMPLEX128: WRITE_CASCII(".16g", double); break;
+ default: errno = EINVAL; break; /* internal error */
}
- dreturn("%li", (ret) ? (long)ret : (long)n);
- return (ret) ? ret : (ssize_t)n;
+ dreturn("%" PRIdSIZE, n);
+ return n;
}
int _GD_AsciiSync(struct gd_raw_file_ *file)
@@ -392,6 +309,6 @@ off64_t _GD_AsciiSize(int dirfd, struct gd_raw_file_* file,
fclose(stream);
- dreturn("%lli", (long long)n);
+ dreturn("%" PRId64, (int64_t)n);
return n;
}
diff --git a/src/bzip.c b/src/bzip.c
index 42a4539..bf16405 100644
--- a/src/bzip.c
+++ b/src/bzip.c
@@ -96,8 +96,8 @@ static struct gd_bzdata *_GD_Bzip2DoOpen(int dirfd, struct gd_raw_file_* file,
else
BZ2_bzWriteClose(&ptr->bzerror, ptr->bzfile, 0, NULL, NULL);
fclose(stream);
- free(ptr);
file->error = ptr->bzerror;
+ free(ptr);
dreturn("%p", NULL);
return NULL;
}
@@ -136,7 +136,7 @@ ssize_t _GD_Bzip2Read(struct gd_raw_file_ *restrict file, void *restrict data,
struct gd_bzdata *ptr = (struct gd_bzdata *)file->edata;
uint64_t nbytes = nmemb * GD_SIZE(data_type);
- dtrace("%p, %p, 0x%X, %" PRNsize_t, file, data, data_type, nmemb);
+ dtrace("%p, %p, 0x%X, %" PRIuSIZE, file, data, data_type, nmemb);
while (nbytes > (uint64_t)(ptr->end - ptr->pos)) {
int n;
@@ -194,7 +194,7 @@ ssize_t _GD_Bzip2Write(struct gd_raw_file_ *file, const void *data,
struct gd_bzdata *ptr = (struct gd_bzdata *)file->edata;
ssize_t n;
- dtrace("%p, %p, 0x%X, %" PRNsize_t, file, data, data_type, nmemb);
+ dtrace("%p, %p, 0x%X, %" PRIuSIZE, file, data, data_type, nmemb);
n = GD_SIZE(data_type) * nmemb;
if (n > INT_MAX)
@@ -211,7 +211,7 @@ ssize_t _GD_Bzip2Write(struct gd_raw_file_ *file, const void *data,
file->pos += n;
}
- dreturn("%" PRNssize_t, n);
+ dreturn("%" PRIdSIZE, n);
return n;
}
@@ -220,13 +220,13 @@ off64_t _GD_Bzip2Seek(struct gd_raw_file_* file, off64_t count,
{
struct gd_bzdata *ptr;
- dtrace("%p, %lli, 0x%X, 0x%X", file, (long long)count, data_type, mode);
+ dtrace("%p, %" PRId64 ", 0x%X, 0x%X", file, (int64_t)count, data_type, mode);
ptr = (struct gd_bzdata *)(file[(mode == GD_FILE_WRITE) ? 1 : 0].edata);
/* nothing to do */
if (ptr->base + ptr->pos == count * GD_SIZE(data_type)) {
- dreturn("%lli", (long long)count);
+ dreturn("%" PRId64, (int64_t)count);
return count;
}
@@ -301,17 +301,8 @@ off64_t _GD_Bzip2Seek(struct gd_raw_file_* file, off64_t count,
file->pos = (ptr->base + ptr->pos) / GD_SIZE(data_type);
- dreturn("%lli", (long long)file->pos);
- return file->pos;;
-}
-
-/* This function does nothing */
-int _GD_Bzip2Sync(struct gd_raw_file_ *file gd_unused_)
-{
- dtrace("<unused>");
-
- dreturn("%i", 0);
- return 0;
+ dreturn("%" PRId64, (int64_t)file->pos);
+ return file->pos;
}
int _GD_Bzip2Close(struct gd_raw_file_ *file)
@@ -381,7 +372,7 @@ off64_t _GD_Bzip2Size(int dirfd, struct gd_raw_file_ *file, gd_type_t data_type,
n = (ptr->base + ptr->end) / GD_SIZE(data_type);
free(ptr);
- dreturn("%lli", (long long)n);
+ dreturn("%" PRId64, (int64_t)n);
return n;
}
@@ -389,12 +380,12 @@ int _GD_Bzip2Strerr(const struct gd_raw_file_ *file, char *buf, size_t buflen)
{
int r = 0;
- dtrace("%p, %p, %" PRNsize_t, file, buf, buflen);
+ dtrace("%p, %p, %" PRIuSIZE, file, buf, buflen);
switch (file->error) {
case BZ_OK:
case BZ_IO_ERROR:
- r = gd_strerror(errno, buf, buflen);
+ r = gd_StrError(errno, buf, buflen);
break;
case BZ_SEQUENCE_ERROR:
case BZ_PARAM_ERROR:
diff --git a/src/close.c b/src/close.c
index bfc0dfe..eeb6995 100644
--- a/src/close.c
+++ b/src/close.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2008, 2010, 2012, 2014 D. V. Wiebe
+/* Copyright (C) 2008-2012, 2014, 2015 D. V. Wiebe
*
***************************************************************************
*
@@ -49,16 +49,7 @@ static void _GD_FreeD(DIRFILE *D, int keep_dirfile)
free(D->error_prefix);
free(D->error_string);
free(D->error_file);
- for (j = 0; j < GD_N_ENTRY_LISTS; ++j)
- free(D->entry_list[j]);
- free(D->string_value_list);
- free(D->const_value_list);
-
- if (D->carray_value_list) {
- for (i = 0; D->carray_value_list[i].n != 0; ++i)
- free(D->carray_value_list[i].d);
- free(D->carray_value_list);
- }
+ _GD_FreeFL(&D->fl);
free(D->fragment);
free(D->name);
diff --git a/src/common.c b/src/common.c
index 1b5fb52..ef3ff11 100644
--- a/src/common.c
+++ b/src/common.c
@@ -59,7 +59,7 @@ char *_GD_GetLine(FILE *restrict fp, size_t *restrict n, int *restrict linenum)
if (len != -1) {
- dreturn("\"%s\" (%" PRNsize_t ")", line, *n);
+ dreturn("\"%s\" (%" PRIuSIZE ")", line, *n);
return line; /* a line was read */
}
@@ -185,7 +185,7 @@ void* _GD_Alloc(DIRFILE* D, gd_type_t type, size_t n)
{
void* ptr = NULL;
- dtrace("%p, 0x%x, %" PRNsize_t, D, type, n);
+ dtrace("%p, 0x%x, %" PRIuSIZE, D, type, n);
if (n == 0) {
_GD_InternalError(D);
dreturn("%p", NULL);
@@ -197,8 +197,8 @@ void* _GD_Alloc(DIRFILE* D, gd_type_t type, size_t n)
return NULL;
}
- else if (GD_SIZE(type) == 0) {
- _GD_SetError(D, GD_E_BAD_TYPE, type, NULL, 0, NULL);
+ if (GD_SIZE(type) == 0) {
+ _GD_SetError(D, GD_E_BAD_TYPE, 0, NULL, type, NULL);
dreturn("%p", NULL);
return NULL;
}
@@ -389,7 +389,7 @@ LUT_ERROR:
static size_t _GD_GetIndex(double x, const struct gd_lut_ *lut, size_t idx,
size_t n)
{
- dtrace("%g, %p, %" PRNsize_t ", %" PRNsize_t, x, lut, idx, n);
+ dtrace("%g, %p, %" PRIuSIZE ", %" PRIuSIZE, x, lut, idx, n);
/* Just linearly search - we're probably right to start */
/* increment until we are bigger */
@@ -400,7 +400,7 @@ static size_t _GD_GetIndex(double x, const struct gd_lut_ *lut, size_t idx,
while ((idx > 0) && (x < lut[idx].x))
idx--;
- dreturn("%" PRNsize_t, idx);
+ dreturn("%" PRIuSIZE, idx);
return idx;
}
@@ -482,7 +482,7 @@ void _GD_LinterpData(DIRFILE *restrict D, void *restrict data, gd_type_t type,
size_t i;
double x;
- dtrace("%p, %p, 0x%x, %i, %p, %" PRNsize_t ", %p, %" PRNsize_t, D, data, type,
+ dtrace("%p, %p, 0x%x, %i, %p, %" PRIuSIZE ", %p, %" PRIuSIZE, D, data, type,
complex_table, data_in, npts, lut, n_ln);
switch (type) {
@@ -499,7 +499,7 @@ void _GD_LinterpData(DIRFILE *restrict D, void *restrict data, gd_type_t type,
case GD_FLOAT64: LINTERP(double ); break;
case GD_COMPLEX64: LINTERPC(float ); break;
case GD_COMPLEX128: LINTERPC(double ); break;
- default: _GD_SetError(D, GD_E_BAD_TYPE, type, NULL, 0, NULL);
+ default: _GD_SetError(D, GD_E_BAD_TYPE, 0, NULL, type, NULL);
}
dreturnvoid();
@@ -576,7 +576,7 @@ void _GD_LincomData(DIRFILE *restrict D, int n, void *restrict data1,
{
size_t i;
- dtrace("%p, %i, %p, 0x%x, %p, %p, %p, %p, %p, %" PRNsize_t, D, n, data1,
+ dtrace("%p, %i, %p, 0x%x, %p, %p, %p, %p, %p, %" PRIuSIZE, D, n, data1,
return_type, data2, data3, m, b, spf, n_read);
switch(return_type) {
@@ -685,7 +685,7 @@ void _GD_CLincomData(DIRFILE *restrict D, int n, void *restrict data1,
{
size_t i;
- dtrace("%p, %i, %p, 0x%x, %p, %p, %p, %p, %p, %" PRNsize_t, D, n, data1,
+ dtrace("%p, %i, %p, 0x%x, %p, %p, %p, %p, %p, %" PRIuSIZE, D, n, data1,
return_type, data2, data3, m, b, spf, n_read);
switch(return_type) {
@@ -731,7 +731,7 @@ void _GD_InvertData(DIRFILE *restrict D, void *restrict data,
{
size_t i;
- dtrace("%p, %p, 0x%x, %g, %" PRNsize_t, D, data, return_type, dividend,
+ dtrace("%p, %p, 0x%x, %g, %" PRIuSIZE, D, data, return_type, dividend,
n_read);
switch(return_type) {
@@ -788,7 +788,7 @@ void _GD_CInvertData(DIRFILE *restrict D, void *restrict data,
{
size_t i;
- dtrace("%p, %p, 0x%x, %g;%g, %" PRNsize_t, D, data, return_type,
+ dtrace("%p, %p, 0x%x, %g;%g, %" PRIuSIZE, D, data, return_type,
creal(dividend), cimag(dividend), n_read);
switch(return_type) {
@@ -893,23 +893,21 @@ int _GD_BadInput(DIRFILE *D, const gd_entry_t *E, int i, gd_entype_t t, int err)
return 0;
}
-/* Find an entry without a representation */
-gd_entry_t *_GD_FindEntry(DIRFILE *restrict D, const char *restrict field_code,
- unsigned int *restrict index, int set, int err)
+/* Find an entry without a representation; this function will de-alias */
+gd_entry_t *_GD_FindEntry(DIRFILE *restrict D, const char *restrict field_code)
{
gd_entry_t *E = NULL;
- dtrace("%p, \"%s\", %p, %i, %i", D, field_code, index, set, err);
+ dtrace("%p, \"%s\"", D, field_code);
if (D->n_dot > 0)
E = _GD_FindField(D, field_code, D->dot_list, D->n_dot, 1, NULL);
- if (E == NULL || index != NULL)
- E = _GD_FindField(D, field_code, D->entry, D->n_entries, 1, index);
+ if (E == NULL)
+ E = _GD_FindField(D, field_code, D->entry, D->n_entries, 1, NULL);
- if (E == NULL && set)
- if (err)
- _GD_SetError(D, GD_E_BAD_CODE, GD_E_CODE_MISSING, NULL, 0, field_code);
+ if (E == NULL)
+ _GD_SetError(D, GD_E_BAD_CODE, GD_E_CODE_MISSING, NULL, 0, field_code);
dreturn("%p", E);
return E;
diff --git a/src/compat.c b/src/compat.c
index a8bae0e..f2cecd7 100644
--- a/src/compat.c
+++ b/src/compat.c
@@ -158,7 +158,7 @@ int strerror_r(int errnum, char *buf, size_t buflen)
{
char *ptr;
- dtrace("%i, %p, %" PRNsize_t, errnum, buf, buflen);
+ dtrace("%i, %p, %" PRIuSIZE, errnum, buf, buflen);
ptr = strerror(errnum);
strncpy(buf, ptr, buflen);
@@ -474,11 +474,11 @@ double gd_strtod(const char *nptr, char **endptr)
/* There are two versions of this function: one deals with no strerror_r,
* the other with GNU's non XSI-conforming strerror_r */
#if !defined HAVE_STRERROR_R || defined STRERROR_R_CHAR_P
-int gd_strerror(int errnum, char *buf, size_t buflen)
+int _GD_StrError(int errnum, char *buf, size_t buflen)
{
char *ptr;
- dtrace("%i, %p, %" PRNsize_t, errnum, buf, buflen);
+ dtrace("%i, %p, %" PRIuSIZE, errnum, buf, buflen);
#ifdef STRERROR_R_CHAR_P
ptr = strerror_r(errnum, buf, buflen);
diff --git a/src/constant.c b/src/constant.c
index e373fc7..01c792b 100644
--- a/src/constant.c
+++ b/src/constant.c
@@ -28,7 +28,7 @@ int gd_get_carray_slice(DIRFILE *D, const char *field_code_in,
char* field_code;
int repr;
- dtrace("%p, \"%s\", %lu, %" PRNsize_t ", 0x%x, %p", D, field_code_in, start,
+ dtrace("%p, \"%s\", %lu, %" PRIuSIZE ", 0x%x, %p", D, field_code_in, start,
n, return_type, data_out);
if (D->flags & GD_INVALID) {
@@ -159,7 +159,7 @@ size_t gd_array_len(DIRFILE *D, const char *field_code_in) gd_nothrow
if (field_code != field_code_in)
free(field_code);
- dreturn("%" PRNsize_t, len);
+ dreturn("%" PRIuSIZE, len);
return len;
}
@@ -174,7 +174,7 @@ static int _GD_PutCarraySlice(DIRFILE* D, gd_entry_t *E, unsigned long first,
{
int i;
- dtrace("%p, %p, %lu, %" PRNsize_t ", 0x%X, %p", D, E, first, n, data_type,
+ dtrace("%p, %p, %lu, %" PRIuSIZE ", 0x%X, %p", D, E, first, n, data_type,
data_in);
if ((D->flags & GD_ACCMODE) != GD_RDWR) {
@@ -214,7 +214,7 @@ int gd_put_carray_slice(DIRFILE* D, const char *field_code, unsigned long first,
gd_entry_t *entry;
int r = -1;
- dtrace("%p, \"%s\", %lu, %" PRNsize_t ", 0x%X, %p", D, field_code, first,
+ dtrace("%p, \"%s\", %lu, %" PRIuSIZE ", 0x%X, %p", D, field_code, first,
n, data_type, data_in);
if (D->flags & GD_INVALID) {
diff --git a/src/del.c b/src/del.c
index 8eff8cf..d798c3d 100644
--- a/src/del.c
+++ b/src/del.c
@@ -454,8 +454,8 @@ static int _GD_Delete(DIRFILE *restrict D, gd_entry_t *restrict E,
}
/* Invalidate the field lists */
- D->entry_list_validity = 0;
- D->value_list_validity = 0;
+ D->fl.entry_list_validity = 0;
+ D->fl.value_list_validity = 0;
} else {
/* If this is a metafield, update its parent's lists */
struct gd_private_entry_ *Pe = E->e->p.parent->e;
@@ -471,8 +471,8 @@ static int _GD_Delete(DIRFILE *restrict D, gd_entry_t *restrict E,
Pe->n_meta--;
/* Invalidate the field lists */
- Pe->entry_list_validity = 0;
- Pe->value_list_validity = 0;
+ Pe->fl.entry_list_validity = 0;
+ Pe->fl.value_list_validity = 0;
}
/* Remove the entry from the list -- we need not worry about the way we've
@@ -507,7 +507,8 @@ int gd_delete(DIRFILE *D, const char *field_code, unsigned int flags)
E = _GD_FindField(D, field_code, D->entry, D->n_entries, 0, &index);
- if (D->error) {
+ if (E == NULL) {
+ _GD_SetError(D, GD_E_BAD_CODE, GD_E_CODE_MISSING, NULL, 0, field_code);
dreturn("%i", -1);
return -1;
}
diff --git a/src/encoding.c b/src/encoding.c
index fa6852e..9274e78 100644
--- a/src/encoding.c
+++ b/src/encoding.c
@@ -40,16 +40,21 @@ static int framework_initialised = 0;
NULL, NULL
#define GD_EF_GENERIC_SET &_GD_GenericName, NULL, NULL, NULL, NULL, NULL, \
NULL, NULL, &_GD_GenericMove, &_GD_GenericUnlink, NULL
+#define GD_EF_GENERICNOP_SET &_GD_GenericName, NULL, NULL, NULL, NULL, NULL, \
+ NULL, &_GD_NopSync, &_GD_GenericMove, &_GD_GenericUnlink, NULL
#ifdef USE_MODULES
#define GD_EXT_ENCODING_NULL(sc,ex,ec,af,ff) \
{ sc,ex,ec,af,ff,GD_EF_PROVIDES,GD_EF_NULL_SET }
#define GD_EXT_ENCODING_GEN(sc,ex,ec,af,ff) \
{ sc,ex,ec,af,ff,GD_EF_PROVIDES,GD_EF_GENERIC_SET }
+#define GD_EXT_ENCODING_GENOP(sc,ex,ec,af,ff) \
+{ sc,ex,ec,af,ff,GD_EF_PROVIDES,GD_EF_GENERICNOP_SET }
#else
#define GD_EXT_ENCODING(sc,ex,ec,af,ff) { sc,ex,ec,af,ff,0,GD_INT_FUNCS }
#define GD_EXT_ENCODING_NULL GD_EXT_ENCODING
#define GD_EXT_ENCODING_GEN GD_EXT_ENCODING
+#define GD_EXT_ENCODING_GENOP GD_EXT_ENCODING
#endif
struct encoding_t _GD_ef[GD_N_SUBENCODINGS] = {
{ GD_UNENCODED, "", GD_EF_ECOR, NULL, "none", 0,
@@ -61,16 +66,16 @@ struct encoding_t _GD_ef[GD_N_SUBENCODINGS] = {
#ifdef USE_GZIP
#define GD_EF_PROVIDES \
GD_EF_OPEN | GD_EF_CLOSE | GD_EF_SEEK | GD_EF_READ | GD_EF_SIZE | \
- GD_EF_WRITE | GD_EF_SYNC | GD_EF_STRERR
+ GD_EF_WRITE | GD_EF_STRERR
#define GD_INT_FUNCS \
&_GD_GenericName, &_GD_GzipOpen, &_GD_GzipClose, &_GD_GzipSeek, \
- &_GD_GzipRead, &_GD_GzipSize, &_GD_GzipWrite, &_GD_GzipSync, \
+ &_GD_GzipRead, &_GD_GzipSize, &_GD_GzipWrite, &_GD_NopSync, \
&_GD_GenericMove, &_GD_GenericUnlink, &_GD_GzipStrerr
#else
#define GD_EF_PROVIDES 0
#define GD_INT_FUNCS GD_EF_NULL_SET
#endif
- GD_EXT_ENCODING_GEN(GD_GZIP_ENCODED, ".gz", GD_EF_ECOR | GD_EF_OOP, "Gzip",
+ GD_EXT_ENCODING_GENOP(GD_GZIP_ENCODED, ".gz", GD_EF_ECOR | GD_EF_OOP, "Gzip",
"gzip"),
#undef GD_INT_FUNCS
#undef GD_EF_PROVIDES
@@ -79,17 +84,17 @@ struct encoding_t _GD_ef[GD_N_SUBENCODINGS] = {
#ifdef USE_BZIP2
#define GD_EF_PROVIDES \
GD_EF_OPEN | GD_EF_CLOSE | GD_EF_SEEK | GD_EF_READ | GD_EF_SIZE | \
- GD_EF_WRITE | GD_EF_SYNC | GD_EF_STRERR
+ GD_EF_WRITE | GD_EF_STRERR
#define GD_INT_FUNCS \
&_GD_GenericName, &_GD_Bzip2Open, &_GD_Bzip2Close, &_GD_Bzip2Seek, \
- &_GD_Bzip2Read, &_GD_Bzip2Size, &_GD_Bzip2Write, &_GD_Bzip2Sync, \
+ &_GD_Bzip2Read, &_GD_Bzip2Size, &_GD_Bzip2Write, &_GD_NopSync, \
&_GD_GenericMove, &_GD_GenericUnlink, &_GD_Bzip2Strerr
#else
#define GD_INT_FUNCS GD_EF_NULL_SET
#define GD_EF_PROVIDES 0
#endif
- GD_EXT_ENCODING_GEN(GD_BZIP2_ENCODED, ".bz2", GD_EF_ECOR | GD_EF_OOP, "Bzip2",
- "bzip2"),
+ GD_EXT_ENCODING_GENOP(GD_BZIP2_ENCODED, ".bz2", GD_EF_ECOR | GD_EF_OOP,
+ "Bzip2", "bzip2"),
#undef GD_INT_FUNCS
#undef GD_EF_PROVIDES
@@ -99,13 +104,13 @@ struct encoding_t _GD_ef[GD_N_SUBENCODINGS] = {
GD_EF_OPEN | GD_EF_CLOSE | GD_EF_SEEK | GD_EF_READ | GD_EF_SIZE | GD_EF_STRERR
#define GD_INT_FUNCS \
&_GD_GenericName, &_GD_SlimOpen, &_GD_SlimClose, &_GD_SlimSeek, \
- &_GD_SlimRead, &_GD_SlimSize, NULL /* WRITE */, NULL /* SYNC */, \
+ &_GD_SlimRead, &_GD_SlimSize, NULL /* WRITE */, &_GD_NopSync, \
&_GD_GenericMove, &_GD_GenericUnlink, &_GD_SlimStrerr
#else
#define GD_INT_FUNCS GD_EF_NULL_SET
#define GD_EF_PROVIDES 0
#endif
- GD_EXT_ENCODING_GEN(GD_SLIM_ENCODED, ".slm", GD_EF_ECOR, "Slim", "slim"),
+ GD_EXT_ENCODING_GENOP(GD_SLIM_ENCODED, ".slm", GD_EF_ECOR, "Slim", "slim"),
#undef GD_INT_FUNCS
#undef GD_EF_PROVIDES
@@ -196,17 +201,17 @@ struct encoding_t _GD_ef[GD_N_SUBENCODINGS] = {
#ifdef USE_FLAC
#define GD_EF_PROVIDES \
GD_EF_OPEN | GD_EF_CLOSE | GD_EF_SEEK | GD_EF_READ | GD_EF_SIZE | \
- GD_EF_WRITE | GD_EF_SYNC | GD_EF_STRERR
+ GD_EF_WRITE | GD_EF_STRERR
#define GD_INT_FUNCS \
&_GD_GenericName, &_GD_FlacOpen, &_GD_FlacClose, &_GD_FlacSeek, \
- &_GD_FlacRead, &_GD_FlacSize, &_GD_FlacWrite, &_GD_FlacSync, \
+ &_GD_FlacRead, &_GD_FlacSize, &_GD_FlacWrite, &_GD_NopSync, \
&_GD_GenericMove, &_GD_GenericUnlink, &_GD_FlacStrerr
#else
#define GD_INT_FUNCS GD_EF_NULL_SET
#define GD_EF_PROVIDES 0
#endif
- GD_EXT_ENCODING_GEN(GD_FLAC_ENCODED, ".flac", GD_EF_ECOR | GD_EF_OOP, "Flac",
- "flac"),
+ GD_EXT_ENCODING_GENOP(GD_FLAC_ENCODED, ".flac", GD_EF_ECOR | GD_EF_OOP,
+ "Flac", "flac"),
#undef GD_INT_FUNCS
#undef GD_EF_PROVIDES
@@ -525,7 +530,7 @@ ssize_t _GD_WriteOut(const gd_entry_t *E, const struct encoding_t *enc,
{
ssize_t n_wrote;
- dtrace("%p, %p, %p, 0x%X, %" PRNsize_t ", %i", E, enc, ptr, type, n, temp);
+ dtrace("%p, %p, %p, 0x%X, %" PRIuSIZE ", %i", E, enc, ptr, type, n, temp);
if (temp)
n_wrote = (*enc->write)(E->e->u.raw.file + 1, ptr, type, n);
@@ -545,7 +550,7 @@ ssize_t _GD_WriteOut(const gd_entry_t *E, const struct encoding_t *enc,
n_wrote = (*enc->write)(E->e->u.raw.file, ptr, type, n);
}
- dreturn("%" PRNssize_t, n_wrote);
+ dreturn("%" PRIdSIZE, n_wrote);
return n_wrote;
}
@@ -1100,5 +1105,14 @@ int _GD_GenericMove(int olddirfd, struct gd_raw_file_ *restrict file,
dreturn("%i", r);
return r;
}
+
+/* This function does nothing */
+int _GD_NopSync(struct gd_raw_file_ *file gd_unused_)
+{
+ dtrace("<unused>");
+
+ dreturn("%i", 0);
+ return 0;
+}
/* vim: ts=2 sw=2 et tw=80
*/
diff --git a/src/endian.c b/src/endian.c
index 96c6cdb..5494685 100644
--- a/src/endian.c
+++ b/src/endian.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2008-2011, 2013, 2014 D. V. Wiebe
+/* Copyright (C) 2008-2011, 2013, 2014, 2015 D. V. Wiebe
*
***************************************************************************
*
@@ -302,7 +302,7 @@ void _GD_FixEndianness(void* databuffer, size_t ns, gd_type_t type, unsigned
size_t i;
int endian_fix, arm_fix;
- dtrace("%p, %" PRNsize_t ", 0x%X, 0x%X, 0x%X", databuffer, ns, type, old_sex,
+ dtrace("%p, %" PRIuSIZE ", 0x%X, 0x%X, 0x%X", databuffer, ns, type, old_sex,
new_sex);
/* compare byte sexes */
diff --git a/src/entry.c b/src/entry.c
index cec07be..c01ceac 100644
--- a/src/entry.c
+++ b/src/entry.c
@@ -20,6 +20,26 @@
*/
#include "internal.h"
+void _GD_FreeFL(struct gd_flist_ *fl)
+{
+ int i;
+
+ dtrace("%p", fl);
+
+ for (i = 0; i < GD_N_ENTRY_LISTS; ++i)
+ free(fl->entry_list[i]);
+ free(fl->string_value_list);
+ free(fl->const_value_list);
+
+ if (fl->carray_value_list) {
+ for (i = 0; fl->carray_value_list[i].n != 0; ++i)
+ free(fl->carray_value_list[i].d);
+ free(fl->carray_value_list);
+ }
+
+ dreturnvoid();
+}
+
void _GD_FreeE(DIRFILE *restrict D, gd_entry_t *restrict entry, int priv)
{
int i;
@@ -113,16 +133,7 @@ void _GD_FreeE(DIRFILE *restrict D, gd_entry_t *restrict entry, int priv)
if (priv) {
free(entry->e->alias_list);
- for (i = 0; i < GD_N_ENTRY_LISTS; ++i)
- free(entry->e->entry_list[i]);
- free(entry->e->string_value_list);
- free(entry->e->const_value_list);
-
- if (entry->e->carray_value_list) {
- for (i = 0; entry->e->carray_value_list[i].n != 0; ++i)
- free(entry->e->carray_value_list[i].d);
- free(entry->e->carray_value_list);
- }
+ _GD_FreeFL(&entry->e->fl);
if (entry->e->n_meta > -1)
free(entry->e->p.meta_entry);
@@ -339,7 +350,7 @@ char* gd_raw_filename(DIRFILE* D, const char* field_code) gd_nothrow
}
/* Check field */
- E = _GD_FindEntry(D, field_code, NULL, 1, 1);
+ E = _GD_FindEntry(D, field_code);
if (D->error) {
dreturn("%p", NULL);
@@ -394,10 +405,9 @@ int gd_entry(DIRFILE* D, const char* field_code, gd_entry_t* entry) gd_nothrow
_GD_ClearError(D);
- E = _GD_FindEntry(D, field_code, NULL, 1, 1);
+ E = _GD_FindEntry(D, field_code);
if (D->error) {
- _GD_SetError(D, GD_E_BAD_CODE, GD_E_CODE_MISSING, NULL, 0, field_code);
dreturn("%i", -1);
return -1;
}
@@ -613,7 +623,7 @@ gd_entype_t gd_entry_type(DIRFILE* D, const char* field_code) gd_nothrow
_GD_ClearError(D);
- E = _GD_FindEntry(D, field_code, NULL, 1, 1);
+ E = _GD_FindEntry(D, field_code);
if (D->error) {
dreturn("%i", GD_NO_ENTRY);
@@ -670,7 +680,7 @@ int gd_hide(DIRFILE *D, const char *field_code) gd_nothrow
E = _GD_FindField(D, field_code, D->entry, D->n_entries, 0, NULL);
- if (D->error) {
+ if (E == NULL) {
_GD_SetError(D, GD_E_BAD_CODE, GD_E_CODE_MISSING, NULL, 0, field_code);
dreturn("%i", -1);
return -1;
@@ -708,7 +718,7 @@ int gd_hidden(DIRFILE *D, const char *field_code) gd_nothrow
E = _GD_FindField(D, field_code, D->entry, D->n_entries, 0, NULL);
- if (D->error) {
+ if (E == NULL) {
_GD_SetError(D, GD_E_BAD_CODE, GD_E_CODE_MISSING, NULL, 0, field_code);
dreturn("%i", -1);
return -1;
@@ -738,7 +748,7 @@ int gd_unhide(DIRFILE *D, const char *field_code) gd_nothrow
E = _GD_FindField(D, field_code, D->entry, D->n_entries, 0, NULL);
- if (D->error) {
+ if (E == NULL) {
_GD_SetError(D, GD_E_BAD_CODE, GD_E_CODE_MISSING, NULL, 0, field_code);
dreturn("%i", -1);
return -1;
@@ -844,7 +854,7 @@ char *gd_linterp_tablename(DIRFILE *D, const char *field_code) gd_nothrow
_GD_ClearError(D);
- E = _GD_FindEntry(D, field_code, NULL, 1, 1);
+ E = _GD_FindEntry(D, field_code);
if (D->error) {
dreturn("%p", NULL);
diff --git a/src/errors.c b/src/errors.c
index 2b96f6a..7861476 100644
--- a/src/errors.c
+++ b/src/errors.c
@@ -82,8 +82,9 @@ static const struct {
{ GD_E_BAD_CODE, GD_E_CODE_AMBIGUOUS, "Ambiguous field code: {4}", 0 },
{ GD_E_BAD_CODE, GD_E_CODE_INVALID_NS, "Bad namespace: {4}", 0 },
{ GD_E_BAD_CODE, GD_E_CODE_REPR, "Invalid representation suffix in: {4}", 0 },
- /* GD_E_BAD_TYPE: 1 = data type */
- { GD_E_BAD_TYPE, 0, "Bad data type: {1}", 0 },
+ /* GD_E_BAD_TYPE: 1 = suberror, 4 = data type */
+ { GD_E_BAD_TYPE, GD_E_TYPE_NULL, "Bad data type: GD_NULL not allowed", 0 },
+ { GD_E_BAD_TYPE, 0, "Bad data type: {4}", 0 },
/* GD_E_IO: 2 = filename; 3 = line; 4 = included file/encoding error */
{ GD_E_IO, GD_E_IO_OPEN, "Error opening {2}: ", 1 },
{ GD_E_IO, GD_E_IO_READ, "Error reading {2}: ", 1 },
@@ -294,7 +295,7 @@ char* gd_error_string(const DIRFILE* D, char* buffer, size_t buflen) gd_nothrow
char* bufend;
int i, s = -1;
- dtrace("%p, %p, %" PRNsize_t, D, buffer, buflen);
+ dtrace("%p, %p, %" PRIuSIZE, D, buffer, buflen);
/* Sanity check */
if (buffer && buflen < 1) {
@@ -363,7 +364,7 @@ char* gd_error_string(const DIRFILE* D, char* buffer, size_t buflen) gd_nothrow
*op = '\0';
if (op < bufend - 1 && error_string[s].adderr)
- gd_strerror(D->stdlib_errno, op, bufend - op);
+ _GD_StrError(D->stdlib_errno, op, bufend - op);
}
dreturn("\"%s\"", buffer);
diff --git a/src/field_list.c b/src/field_list.c
index 223fc9f..7ca2b59 100644
--- a/src/field_list.c
+++ b/src/field_list.c
@@ -22,7 +22,7 @@
/* zero length lists */
static const char* zero_list[1] = { NULL };
-static const gd_carray_t zero_carrays[1] = { {0, NULL} };
+static gd_carray_t zero_carrays[1] = { {0, NULL} };
gd_static_inline_ int _GD_EntryIndex(unsigned int t)
{
@@ -101,20 +101,20 @@ gd_static_inline_ int _GD_EntryIndex(unsigned int t)
}
/* returns true if E a member of the given list */
-int _GD_ListEntry(const gd_entry_t *E, int meta, int hidden, int noalias,
+int _GD_ListEntry(const gd_entry_t *E, int meta_ok, int hidden_ok, int noalias,
int special, gd_entype_t type)
{
- dtrace("%p{%s}, %i, %i, %i, %i, 0x%X", E, E->field, meta, hidden, noalias,
- special, type);
+ dtrace("%p{%s}, %i, %i, %i, %i, 0x%X", E, E->field, meta_ok, hidden_ok,
+ noalias, special, type);
/* check hidden */
- if (!hidden && (E->flags & GD_EN_HIDDEN)) {
+ if (!hidden_ok && (E->flags & GD_EN_HIDDEN)) {
dreturn("%i (hidden)", 0);
return 0;
}
/* check meta */
- if (!meta && E->e->n_meta == -1) {
+ if (!meta_ok && E->e->n_meta == -1) {
dreturn("%i (meta)", 0);
return 0;
}
@@ -135,7 +135,7 @@ int _GD_ListEntry(const gd_entry_t *E, int meta, int hidden, int noalias,
}
if (E->e->entry[0])
- ret = _GD_ListEntry(E->e->entry[0], meta, hidden, 0, special, type);
+ ret = _GD_ListEntry(E->e->entry[0], 1, 1, 0, special, type);
dreturn("%i", ret);
return ret;
}
@@ -166,14 +166,18 @@ static const char **_GD_EntryList(DIRFILE *D, struct gd_private_entry_ *p,
{
char** el;
int i, index;
- unsigned int u, n = 0;
+ unsigned int n;
const int special = (type & GD_SPECIAL_ENTRY_BIT) ? type : 0;
const gd_entype_t ctype = (type & GD_SPECIAL_ENTRY_BIT) ? GD_NO_ENTRY :
(gd_entype_t)type;
const int hidden = (flags & GD_ENTRIES_HIDDEN);
const int noalias = (flags & GD_ENTRIES_NOALIAS);
+ size_t len = 10;
+ gd_entry_t **entry;
+ struct gd_flist_ *l;
+ int nentries;
- dtrace("%p, %p, %" PRNsize_t ", 0x%X, 0x%X", D, p, offs, type, flags);
+ dtrace("%p, %p, %" PRIuSIZE ", 0x%X, 0x%X", D, p, offs, type, flags);
index = _GD_EntryIndex(type);
if (index < 0) {
@@ -183,62 +187,58 @@ static const char **_GD_EntryList(DIRFILE *D, struct gd_private_entry_ *p,
}
if (p) {
- if (p->entry_list_validity & (1 << index) &&
- p->entry_list_flags[index] == flags)
- {
- /* list already made */
- dreturn("%p", p->entry_list[index]);
- return p->entry_list[index];
- }
- } else if (D->entry_list_validity & (1 << index) &&
- D->entry_list_flags[index] == flags)
+ nentries = p->n_meta;
+ entry = p->p.meta_entry;
+ l = &p->fl;
+ } else {
+ nentries = D->n_entries;
+ entry = D->entry;
+ l = &D->fl;
+ }
+
+ if (l->entry_list_validity & (1 << index) &&
+ l->entry_list_flags[index] == flags)
{
/* list already made */
- dreturn("%p", D->entry_list[index]);
- return D->entry_list[index];
+ dreturn("%p", l->entry_list[index]);
+ return l->entry_list[index];
}
- n = _GD_NEntries(D, p, type, flags);
+ el = _GD_Malloc(D, sizeof(*el) * len);
- if (D->error) {
+ if (el == NULL) {
dreturn("%p", NULL);
return NULL;
}
+ for (i = n = 0; i < nentries; ++i) {
+ if (n == len) {
+ void *ptr = _GD_Realloc(D, el, sizeof(*el) * (len *= 2));
+ if (ptr == NULL) {
+ free(el);
+ dreturn("%p", NULL);
+ return NULL;
+ }
+ el = ptr;
+ }
+
+ if (_GD_ListEntry(entry[i], p ? 1 : 0, hidden, noalias, special, ctype))
+ el[n++] = entry[i]->field + offs;
+ }
+
if (n == 0) {
+ free(el);
dreturn("%p", zero_list);
return zero_list;
}
- el = _GD_Malloc(D, sizeof(*el) * (n + 1));
-
- if (el == NULL) {
- dreturn("%p", NULL);
- return NULL;
- }
-
- n = 0;
- if (p) {
- for (i = 0; i < p->n_meta; ++i)
- if (_GD_ListEntry(p->p.meta_entry[i], 1, hidden, noalias, special, ctype))
- el[n++] = p->p.meta_entry[i]->field + offs;
-
- free(p->entry_list[index]);
- p->entry_list[index] = (const char **)el;
- p->entry_list_flags[index] = flags;
- p->entry_list_validity |= 1 << index;
- } else {
- for (u = 0; u < D->n_entries; ++u)
- if (_GD_ListEntry(D->entry[u], 0, hidden, noalias, special, ctype))
- el[n++] = D->entry[u]->field;
-
- free(D->entry_list[index]);
- D->entry_list[index] = (const char **)el;
- D->entry_list_flags[index] = flags;
- D->entry_list_validity |= 1 << index;
- }
el[n] = NULL;
+ free(l->entry_list[index]);
+ l->entry_list[index] = (const char **)el;
+ l->entry_list_flags[index] = flags;
+ l->entry_list_validity |= 1 << index;
+
dreturn("%p", (const char **)el);
return (const char **)el;
}
@@ -278,53 +278,111 @@ const char **gd_entry_list(DIRFILE* D, const char *parent, int type,
return el;
}
-const void *gd_constants(DIRFILE* D, gd_type_t return_type) gd_nothrow
+static void *_GD_Constants(DIRFILE* D, const char* parent,
+ gd_type_t return_type) gd_nothrow
{
- unsigned int i, n;
- char* fl;
+ int i, nentries;
+ void* fl;
+ gd_entry_t *P;
+ gd_entry_t **entry;
+ void **list;
+ struct gd_private_entry_ *e = NULL;
+ unsigned n;
+ size_t len = 10;
- dtrace("%p, 0x%x", D, return_type);
+ dtrace("%p, \"%s\", 0x%x", D, parent, return_type);
if (D->flags & GD_INVALID) {
_GD_SetError(D, GD_E_BAD_DIRFILE, 0, NULL, 0, NULL);
dreturn("%p", NULL);
return NULL;
+ } else if (return_type == GD_NULL) {
+ _GD_SetError(D, GD_E_BAD_TYPE, GD_E_TYPE_NULL, NULL, return_type, NULL);
+ dreturn("%p", NULL);
+ return NULL;
}
_GD_ClearError(D);
- if ((n = _GD_NEntries(D, NULL, GD_CONST_ENTRY, 0)) == 0) {
- dreturn("%p", NULL);
- return NULL;
+ if (parent) {
+ P = _GD_FindField(D, parent, D->entry, D->n_entries, 1, NULL);
+
+ if (P == NULL || P->e->n_meta == -1) {
+ _GD_SetError(D, GD_E_BAD_CODE, P ? GD_E_CODE_INVALID : GD_E_CODE_MISSING,
+ NULL, 0, parent);
+ dreturn("%p", NULL);
+ return NULL;
+ }
+
+ e = P->e;
+ nentries = e->n_meta;
+ entry = e->p.meta_entry;
+ list = &e->fl.const_value_list;
+ } else {
+ nentries = D->n_entries;
+ entry = D->entry;
+ list = &D->fl.const_value_list;
}
- fl = (char *)_GD_Alloc(D, return_type, n);
+ fl = (char *)_GD_Alloc(D, return_type, len);
if (fl == NULL) {
dreturn("%p", NULL);
return NULL;
}
- for (i = n = 0; i < D->n_entries; ++i) {
- if (_GD_ListEntry(D->entry[i], 0, 0, 0, 0, GD_CONST_ENTRY))
- if (_GD_DoField(D, D->entry[i], 0, 0, 1, return_type,
+ /* DoField will implicitly choose GD_REPR_AUTO for complex data being returned
+ * as purely real */
+ for (i = n = 0; i < nentries; ++i) {
+ if (n == len) {
+ void *ptr = _GD_Realloc(D, fl, GD_SIZE(return_type) * (len *= 2));
+ if (ptr == NULL) {
+ free(fl);
+ dreturn("%p", NULL);
+ return NULL;
+ }
+ fl = ptr;
+ }
+
+ if (_GD_ListEntry(entry[i], e ? 1 : 0, 0, 0, 0, GD_CONST_ENTRY)) {
+ gd_entry_t *E = entry[i];
+
+ if (E->field_type == GD_ALIAS_ENTRY)
+ E = E->e->entry[0];
+
+ if (_GD_DoField(D, E, 0, 0, 1, return_type,
fl + n++ * GD_SIZE(return_type)) != 1)
- break;
+ {
+ break; /* error */
+ }
+ }
}
- free(D->const_value_list);
- D->const_value_list = fl;
+ if (n == 0 || D->error) {
+ free(fl);
+ fl = NULL;
+ }
- dreturn("%p", D->error ? NULL : D->const_value_list);
- return D->error ? NULL : D->const_value_list;
+ free(*list);
+ *list = fl;
+
+ dreturn("%p", fl);
+ return fl;
}
-const gd_carray_t *gd_carrays(DIRFILE* D, gd_type_t return_type) gd_nothrow
+static gd_carray_t *_GD_Carrays(DIRFILE* D, const char* parent,
+ gd_type_t return_type) gd_nothrow
{
- unsigned int i, n;
- gd_carray_t* fl;
+ int i, nentries;
+ gd_carray_t *fl;
+ gd_entry_t *P;
+ gd_entry_t **entry;
+ gd_carray_t **list;
+ struct gd_private_entry_ *e = NULL;
+ unsigned n;
+ size_t len = 10;
- dtrace("%p, 0x%x", D, return_type);
+ dtrace("%p, \"%s\", 0x%x", D, parent, return_type);
if (D->flags & GD_INVALID) {
_GD_SetError(D, GD_E_BAD_DIRFILE, 0, NULL, 0, NULL);
@@ -334,48 +392,95 @@ const gd_carray_t *gd_carrays(DIRFILE* D, gd_type_t return_type) gd_nothrow
_GD_ClearError(D);
- if ((n = _GD_NEntries(D, NULL, GD_CARRAY_ENTRY, 0)) == 0) {
- dreturn("%p", zero_carrays);
- return zero_carrays;
+ if (parent) {
+ P = _GD_FindField(D, parent, D->entry, D->n_entries, 1, NULL);
+
+ if (P == NULL || P->e->n_meta == -1) {
+ _GD_SetError(D, GD_E_BAD_CODE, P ? GD_E_CODE_INVALID : GD_E_CODE_MISSING,
+ NULL, 0, parent);
+ dreturn("%p", NULL);
+ return NULL;
+ }
+
+ e = P->e;
+ nentries = e->n_meta;
+ entry = e->p.meta_entry;
+ list = &e->fl.carray_value_list;
+ } else {
+ nentries = D->n_entries;
+ entry = D->entry;
+ list = &D->fl.carray_value_list;
}
- fl = _GD_Malloc(D, sizeof(*fl) * (n + 1));
+ fl = _GD_Malloc(D, sizeof(*fl) * len);
if (fl == NULL) {
dreturn("%p", NULL);
return NULL;
}
- memset(fl, 0, sizeof(gd_carray_t) * (n + 1));
+ /* DoField will implicitly choose GD_REPR_AUTO for complex data being returned
+ * as purely real */
+ for (i = n = 0; i < nentries; ++i) {
+ if (n == len) {
+ void *ptr = _GD_Realloc(D, fl, sizeof(*fl) * (len *= 2));
+ if (ptr == NULL) {
+ free(fl);
+ dreturn("%p", NULL);
+ return NULL;
+ }
+ fl = ptr;
+ }
- for (i = n = 0; i < D->n_entries; ++i) {
- if (_GD_ListEntry(D->entry[i], 0, 0, 0, 0, GD_CARRAY_ENTRY)) {
- fl[n].n = D->entry[i]->EN(scalar,array_len);
+ if (_GD_ListEntry(entry[i], e ? 1 : 0, 0, 0, 0, GD_CARRAY_ENTRY)) {
+ gd_entry_t *E = entry[i];
+
+ if (E->field_type == GD_ALIAS_ENTRY)
+ E = E->e->entry[0];
+
+ fl[n].n = E->EN(scalar,array_len);
fl[n].d = _GD_Alloc(D, return_type, fl[n].n);
- if (D->error || _GD_DoField(D, D->entry[i], 0, 0, fl[n].n, return_type,
+ if (D->error || _GD_DoField(D, E, 0, 0, fl[n].n, return_type,
fl[n].d) < 1)
+ {
break;
+ }
n++;
}
}
+
+ if (n == 0) {
+ free(fl);
+ dreturn("%p", zero_carrays);
+ return zero_carrays;
+ }
+
fl[n].n = 0;
- if (D->carray_value_list)
- for (i = 0; D->carray_value_list[i].n != 0; ++i)
- free(D->carray_value_list[i].d);
- free(D->carray_value_list);
- D->carray_value_list = fl;
+ if (*list) {
+ for (i = 0; (*list)[i].n != 0; ++i)
+ free((*list)[i].d);
+ free(*list);
+ }
+
+ *list = fl;
dreturn("%p", D->error ? NULL : fl);
return D->error ? NULL : fl;
}
-const char **gd_strings(DIRFILE* D) gd_nothrow
+static const char **_GD_Strings(DIRFILE* D, const char* parent) gd_nothrow
{
- unsigned int i, n;
- char** fl;
+ int i, nentries;
+ const char** fl;
+ gd_entry_t *P;
+ gd_entry_t **entry;
+ const char ***list;
+ struct gd_private_entry_ *e = NULL;
+ unsigned n;
+ size_t len = 10;
- dtrace("%p", D);
+ dtrace("%p, \"%s\"", D, parent);
if (D->flags & GD_INVALID) {
_GD_SetError(D, GD_E_BAD_DIRFILE, 0, NULL, 0, NULL);
@@ -385,36 +490,102 @@ const char **gd_strings(DIRFILE* D) gd_nothrow
_GD_ClearError(D);
- if ((n = _GD_NEntries(D, NULL, GD_STRING_ENTRY, 0)) == 0) {
- dreturn("%p", zero_list);
- return zero_list;
- }
+ if (parent) {
+ P = _GD_FindField(D, parent, D->entry, D->n_entries, 1, NULL);
- if (D->value_list_validity & GD_LIST_VALID_STRING_VALUE) {
- /* list already made */
- dreturn("%p", D->string_value_list);
- return D->string_value_list;
+ if (P == NULL || P->e->n_meta == -1) {
+ _GD_SetError(D, GD_E_BAD_CODE, P ? GD_E_CODE_INVALID : GD_E_CODE_MISSING,
+ NULL, 0, parent);
+ dreturn("%p", NULL);
+ return NULL;
+ }
+
+ e = P->e;
+ nentries = e->n_meta;
+ entry = e->p.meta_entry;
+ list = &e->fl.string_value_list;
+ } else {
+ nentries = D->n_entries;
+ entry = D->entry;
+ list = &D->fl.string_value_list;
}
- fl = _GD_Malloc(D, sizeof(*fl) * (n + 1));
+ fl = _GD_Malloc(D, sizeof(*fl) * len);
if (fl == NULL) {
dreturn("%p", NULL);
return NULL;
}
- for (i = n = 0; i < D->n_entries; ++i) {
- if (_GD_ListEntry(D->entry[i], 0, 0, 0, 0, GD_STRING_ENTRY))
- fl[n++] = D->entry[i]->e->u.string;
+ for (i = n = 0; i < nentries; ++i) {
+ if (n == len) {
+ void *ptr = _GD_Realloc(D, fl, sizeof(*fl) * (len *= 2));
+ if (ptr == NULL) {
+ free(fl);
+ dreturn("%p", NULL);
+ return NULL;
+ }
+ fl = ptr;
+ }
+
+ if (_GD_ListEntry(entry[i], e ? 1 : 0, 0, 0, 0, GD_STRING_ENTRY))
+ {
+ if (entry[i]->field_type == GD_ALIAS_ENTRY)
+ fl[n++] = entry[i]->e->entry[0]->e->u.string;
+ else
+ fl[n++] = entry[i]->e->u.string;
+ }
}
+
+ if (n == 0) {
+ free(fl);
+ dreturn("%p", zero_list);
+ return zero_list;
+ }
+
fl[n] = NULL;
- free(D->string_value_list);
- D->string_value_list = (const char **)fl;
- D->value_list_validity |= GD_LIST_VALID_STRING_VALUE;
+ free(*list);
+ *list = fl;
+
+ dreturn("%p", fl);
+ return fl;
+}
+
+const void *gd_constants(DIRFILE* D, gd_type_t return_type) gd_nothrow
+{
+ void *ret;
+
+ dtrace("%p, 0x%x", D, return_type);
+
+ ret = _GD_Constants(D, NULL, return_type);
+
+ dreturn("%p", ret);
+ return ret;
+}
+
+const gd_carray_t *gd_carrays(DIRFILE* D, gd_type_t return_type) gd_nothrow
+{
+ gd_carray_t *ret;
+
+ dtrace("%p, 0x%x", D, return_type);
+
+ ret = _GD_Carrays(D, NULL, return_type);
+
+ dreturn("%p", ret);
+ return ret;
+}
+
+const char **gd_strings(DIRFILE* D) gd_nothrow
+{
+ const char **ret;
+
+ dtrace("%p", D);
+
+ ret = _GD_Strings(D, NULL);
- dreturn("%p", D->string_value_list);
- return D->string_value_list;
+ dreturn("%p", ret);
+ return ret;
}
const char **gd_field_list_by_type(DIRFILE* D, gd_entype_t type) gd_nothrow
@@ -451,176 +622,39 @@ const char **gd_field_list(DIRFILE* D) gd_nothrow
const void *gd_mconstants(DIRFILE* D, const char* parent,
gd_type_t return_type) gd_nothrow
{
- int i, n;
- char* fl;
- gd_entry_t *P;
- struct gd_private_entry_ *e;
+ void *ret;
dtrace("%p, \"%s\", 0x%x", D, parent, return_type);
- if (D->flags & GD_INVALID) {
- _GD_SetError(D, GD_E_BAD_DIRFILE, 0, NULL, 0, NULL);
- dreturn("%p", NULL);
- return NULL;
- }
-
- _GD_ClearError(D);
-
- P = _GD_FindField(D, parent, D->entry, D->n_entries, 1, NULL);
-
- if (P == NULL || P->e->n_meta == -1) {
- _GD_SetError(D, GD_E_BAD_CODE, P ? GD_E_CODE_INVALID : GD_E_CODE_MISSING,
- NULL, 0, parent);
- dreturn("%p", NULL);
- return NULL;
- }
-
- e = P->e;
+ ret = _GD_Constants(D, parent, return_type);
- if ((n = gd_nmfields_by_type(D, parent, GD_CONST_ENTRY)) == 0) {
- dreturn("%p", NULL);
- return NULL;
- }
-
- fl = (char *)_GD_Alloc(D, return_type, n);
-
- if (fl == NULL) {
- dreturn("%p", NULL);
- return NULL;
- }
-
- /* DoField will implicitly choose GD_REPR_AUTO for complex data being returned
- * as purely real */
- for (i = n = 0; i < e->n_meta; ++i) {
- if (_GD_ListEntry(e->p.meta_entry[i], 1, 0, 0, 0, GD_CONST_ENTRY))
- if (_GD_DoField(D, e->p.meta_entry[i], 0, 0, 1, return_type,
- fl + n++ * GD_SIZE(return_type)) != 1)
- break;
- }
-
- free(e->const_value_list);
- e->const_value_list = fl;
-
- dreturn("%p", e->const_value_list);
- return e->const_value_list;
+ dreturn("%p", ret);
+ return ret;
}
const gd_carray_t *gd_mcarrays(DIRFILE* D, const char* parent,
gd_type_t return_type) gd_nothrow
{
- int i, n;
- gd_carray_t *fl;
- gd_entry_t *P;
- struct gd_private_entry_ *e;
+ gd_carray_t *ret;
dtrace("%p, \"%s\", 0x%x", D, parent, return_type);
- if (D->flags & GD_INVALID) {
- _GD_SetError(D, GD_E_BAD_DIRFILE, 0, NULL, 0, NULL);
- dreturn("%p", NULL);
- return NULL;
- }
-
- _GD_ClearError(D);
-
- P = _GD_FindField(D, parent, D->entry, D->n_entries, 1, NULL);
+ ret = _GD_Carrays(D, parent, return_type);
- if (P == NULL || P->e->n_meta == -1) {
- _GD_SetError(D, GD_E_BAD_CODE, P ? GD_E_CODE_INVALID : GD_E_CODE_MISSING,
- NULL, 0, parent);
- dreturn("%p", NULL);
- return NULL;
- }
-
- e = P->e;
-
- if ((n = gd_nmfields_by_type(D, parent, GD_CARRAY_ENTRY)) == 0) {
- dreturn("%p", zero_carrays);
- return zero_carrays;
- }
-
- fl = _GD_Malloc(D, sizeof(*fl) * (n + 1));
-
- if (fl == NULL) {
- dreturn("%p", NULL);
- return NULL;
- }
-
- /* DoField will implicitly choose GD_REPR_AUTO for complex data being returned
- * as purely real */
- for (i = n = 0; i < e->n_meta; ++i) {
- if (_GD_ListEntry(e->p.meta_entry[i], 1, 0, 0, 0, GD_CARRAY_ENTRY)) {
- fl[n].n = e->p.meta_entry[i]->EN(scalar,array_len);
- fl[n].d = _GD_Alloc(D, return_type, fl[n].n);
- if (D->error || _GD_DoField(D, e->p.meta_entry[i], 0, 0, fl[n].n,
- return_type, fl[n].d) < 1)
- break;
- n++;
- }
- }
- fl[n].n = 0;
-
- if (e->carray_value_list)
- for (i = 0; e->carray_value_list[i].n != 0; ++i)
- free(e->carray_value_list[i].d);
- free(e->carray_value_list);
-
- e->carray_value_list = fl;
-
- dreturn("%p", D->error ? NULL : fl);
- return D->error ? NULL : fl;
+ dreturn("%p", ret);
+ return ret;
}
const char **gd_mstrings(DIRFILE* D, const char* parent) gd_nothrow
{
- int i, n;
- char** fl;
- gd_entry_t *P;
- struct gd_private_entry_ *e;
+ const char **ret;
dtrace("%p, \"%s\"", D, parent);
- if (D->flags & GD_INVALID) {
- _GD_SetError(D, GD_E_BAD_DIRFILE, 0, NULL, 0, NULL);
- dreturn("%p", NULL);
- return NULL;
- }
-
- _GD_ClearError(D);
-
- P = _GD_FindField(D, parent, D->entry, D->n_entries, 1, NULL);
-
- if (P == NULL || P->e->n_meta == -1) {
- _GD_SetError(D, GD_E_BAD_CODE, P ? GD_E_CODE_INVALID : GD_E_CODE_MISSING,
- NULL, 0, parent);
- dreturn("%p", NULL);
- return NULL;
- }
-
- e = P->e;
-
- if ((n = gd_nmfields_by_type(D, parent, GD_STRING_ENTRY)) == 0) {
- dreturn("%p", zero_list);
- return zero_list;
- }
-
- fl = _GD_Malloc(D, sizeof(*fl) * (n + 1));
-
- if (fl == NULL) {
- dreturn("%p", NULL);
- return NULL;
- }
-
- for (i = n = 0; i < e->n_meta; ++i)
- if (_GD_ListEntry(e->p.meta_entry[i], 1, 0, 0, 0, GD_STRING_ENTRY))
- fl[n++] = e->p.meta_entry[i]->e->u.string;
- fl[n] = NULL;
-
- free(e->string_value_list);
- e->string_value_list = (const char **)fl;
+ ret = _GD_Strings(D, parent);
- dreturn("%p", e->string_value_list);
- return e->string_value_list;
+ dreturn("%p", ret);
+ return ret;
}
const char **gd_mfield_list_by_type(DIRFILE* D, const char* parent,
diff --git a/src/flac.c b/src/flac.c
index ef9a97e..12d3d05 100644
--- a/src/flac.c
+++ b/src/flac.c
@@ -262,7 +262,7 @@ int _GD_FlacOpen(int dirfd, struct gd_raw_file_* file, gd_type_t data_type,
static size_t _GD_FlacOutput(struct gd_flacdata *gdfl, gd_type_t data_type,
char *output, size_t ns)
{
- dtrace("%p, 0x%X, %p, %" PRNsize_t, gdfl, data_type, output, ns);
+ dtrace("%p, 0x%X, %p, %" PRIuSIZE, gdfl, data_type, output, ns);
if (ns > gdfl->dlen - gdfl->pos)
ns = gdfl->dlen - gdfl->pos;
@@ -270,7 +270,7 @@ static size_t _GD_FlacOutput(struct gd_flacdata *gdfl, gd_type_t data_type,
memcpy(output, gdfl->data + gdfl->pos, ns * GD_SIZE(data_type));
gdfl->pos += ns;
- dreturn("%" PRNsize_t, ns);
+ dreturn("%" PRIuSIZE, ns);
return ns;
}
@@ -281,7 +281,7 @@ ssize_t _GD_FlacRead(struct gd_raw_file_ *restrict file, void *restrict data,
void *output = data;
size_t ns = nmemb;
- dtrace("%p, %p, 0x%X, %" PRNsize_t, file, data, data_type, nmemb);
+ dtrace("%p, %p, 0x%X, %" PRIuSIZE, file, data, data_type, nmemb);
for (;;) {
/* copy the currently loaded frame to the output */
@@ -327,7 +327,7 @@ ssize_t _GD_FlacWrite(struct gd_raw_file_ *file, const void *data,
const int8_t *i8 = data;
const int16_t *i16 = data;
- dtrace("%p, %p, 0x%X, %" PRNsize_t, file, data, data_type, nmemb);
+ dtrace("%p, %p, 0x%X, %" PRIuSIZE, file, data, data_type, nmemb);
if (nmemb > 0 && size) {
/* Allocate buffers */
@@ -370,7 +370,7 @@ WRITE_ERROR:
for (i = 0; i < gdfl->cps; ++i)
free(buffer[i]);
- dreturn("%" PRNssize_t, n);
+ dreturn("%" PRIdSIZE, n);
return n;
}
@@ -379,13 +379,13 @@ off64_t _GD_FlacSeek(struct gd_raw_file_* file, off64_t count,
{
struct gd_flacdata *gdfl;
- dtrace("%p, %lli, 0x%X, 0x%X", file, (long long)count, data_type, mode);
+ dtrace("%p, %" PRId64 ", 0x%X, 0x%X", file, (int64_t)count, data_type, mode);
gdfl = (struct gd_flacdata *)(file[(mode == GD_FILE_WRITE) ? 1 : 0].edata);
/* nothing to do */
if (gdfl->base + gdfl->pos == count) {
- dreturn("%lli", (long long)count);
+ dreturn("%" PRId64, (int64_t)count);
return count;
}
@@ -452,19 +452,10 @@ off64_t _GD_FlacSeek(struct gd_raw_file_* file, off64_t count,
file->pos = count;
- dreturn("%lli", (long long)file->pos);
+ dreturn("%" PRId64, (int64_t)file->pos);
return file->pos;
}
-/* This function does nothing */
-int _GD_FlacSync(struct gd_raw_file_ *file gd_unused_)
-{
- dtrace("<unused>");
-
- dreturn("%i", 0);
- return 0;
-}
-
int _GD_FlacClose(struct gd_raw_file_ *file)
{
struct gd_flacdata *gdfl = (struct gd_flacdata *)file->edata;
@@ -504,7 +495,7 @@ off64_t _GD_FlacSize(int dirfd, struct gd_raw_file_ *file, gd_type_t data_type,
free(gdfl);
- dreturn("%lli", (long long)n);
+ dreturn("%" PRId64, (int64_t)n);
return n;
}
@@ -512,7 +503,7 @@ int _GD_FlacStrerr(const struct gd_raw_file_ *file, char *buf, size_t buflen)
{
int r = 0;
- dtrace("%p, %p, %" PRNsize_t, file, buf, buflen);
+ dtrace("%p, %p, %" PRIuSIZE, file, buf, buflen);
switch(file->error) {
case GD_FLAC_E_EOS:
@@ -526,7 +517,7 @@ int _GD_FlacStrerr(const struct gd_raw_file_ *file, char *buf, size_t buflen)
break;
case GD_FLAC_E_IO:
case GD_FLAC_E_SES | FLAC__STREAM_ENCODER_IO_ERROR:
- r = gd_strerror(errno, buf, buflen);
+ r = gd_StrError(errno, buf, buflen);
break;
case GD_FLAC_E_MEM:
case GD_FLAC_E_SDS | FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR:
diff --git a/src/flimits.c b/src/flimits.c
index e1bd154..1308970 100644
--- a/src/flimits.c
+++ b/src/flimits.c
@@ -25,7 +25,7 @@ static void _GD_ShiftFragment(DIRFILE* D, off64_t offset, int fragment,
{
unsigned int i, n_raw = 0;
- dtrace("%p, %lli, %i, %i", D, (long long)offset, fragment, move);
+ dtrace("%p, %" PRId64 ", %i, %i", D, (int64_t)offset, fragment, move);
/* check protection */
if (D->fragment[fragment].protection & GD_PROTECT_FORMAT) {
@@ -94,7 +94,7 @@ int gd_alter_frameoffset64(DIRFILE* D, off64_t offset, int fragment, int move)
{
int i;
- dtrace("%p, %lli, %i, %i", D, (long long)offset, fragment, move);
+ dtrace("%p, %" PRId64 ", %i, %i", D, (int64_t)offset, fragment, move);
if (D->flags & GD_INVALID) {/* don't crash */
_GD_SetError(D, GD_E_BAD_DIRFILE, 0, NULL, 0, NULL);
@@ -154,7 +154,7 @@ off64_t gd_frameoffset64(DIRFILE* D, int fragment)
_GD_ClearError(D);
- dreturn("%lli", (long long)D->fragment[fragment].frame_offset);
+ dreturn("%" PRId64, (int64_t)D->fragment[fragment].frame_offset);
return D->fragment[fragment].frame_offset;
}
@@ -348,7 +348,7 @@ off64_t _GD_GetEOF(DIRFILE *restrict D, const gd_entry_t *restrict E,
D->recurse_level--;
- dreturn("%lli %i", (unsigned long long)ns, *is_index);
+ dreturn("%" PRId64 " %i", (int64_t)ns, *is_index);
return ns;
}
@@ -368,7 +368,7 @@ off64_t gd_eof64(DIRFILE* D, const char *field_code)
return -1;
}
- entry = _GD_FindEntry(D, field_code, NULL, 1, 1);
+ entry = _GD_FindEntry(D, field_code);
if (D->error) {
dreturn("%i", -1);
@@ -380,7 +380,7 @@ off64_t gd_eof64(DIRFILE* D, const char *field_code)
if (is_index)
_GD_SetError(D, GD_E_BAD_FIELD_TYPE, GD_E_FIELD_BAD, NULL, 0, field_code);
- dreturn("%lli", (unsigned long long)ns);
+ dreturn("%" PRId64, (int64_t)ns);
return ns;
}
@@ -534,8 +534,7 @@ static off64_t _GD_GetBOF(DIRFILE *restrict D, const gd_entry_t *restrict E,
D->recurse_level--;
- dreturn("%llu %lu %lli", (unsigned long long)bof, (unsigned long)*spf,
- (long long)*ds);
+ dreturn("%" PRIu64 " %u %" PRId64, bof, *spf, *ds);
return bof;
}
@@ -556,7 +555,7 @@ off64_t gd_bof64(DIRFILE* D, const char *field_code) gd_nothrow
return -1;
}
- entry = _GD_FindEntry(D, field_code, NULL, 1, 1);
+ entry = _GD_FindEntry(D, field_code);
if (D->error) {
dreturn("%i", -1);
@@ -568,7 +567,7 @@ off64_t gd_bof64(DIRFILE* D, const char *field_code) gd_nothrow
if (bof != -1)
bof = bof * spf + ds;
- dreturn("%lli", (unsigned long long)bof);
+ dreturn("%" PRId64, (int64_t)bof);
return bof;
}
diff --git a/src/flush.c b/src/flush.c
index ad3a2c9..0fb02f8 100644
--- a/src/flush.c
+++ b/src/flush.c
@@ -242,14 +242,18 @@ static ssize_t _GD_StringEscapeise(FILE *stream, const char *in, int meta,
if (stream)
if (fputs(in, stream) == EOF)
goto WRITE_ERR;
- dreturn("%" PRNsize_t, strlen(in));
+ dreturn("%" PRIuSIZE, strlen(in));
return strlen(in);
}
for (; *in != '\0'; ++in) {
if (*in == '\\' || *in == '#' || *in == '"' || *in == ' ') {
- fputc('\\', stream);
- fputc(*in, stream);
+ if (stream) {
+ if (fputc('\\', stream) == EOF)
+ goto WRITE_ERR;
+ if (fputc(*in, stream) == EOF)
+ goto WRITE_ERR;
+ }
len += 2;
} else if (*in < 0x20
#if CHAR_MIN != 0
@@ -276,7 +280,7 @@ static ssize_t _GD_StringEscapeise(FILE *stream, const char *in, int meta,
}
}
- dreturn("%" PRNsize_t, len);
+ dreturn("%" PRIuSIZE, len);
return len;
WRITE_ERR:
@@ -331,7 +335,7 @@ static ssize_t _GD_WriteFieldCode(DIRFILE *D, FILE *stream, int me,
free(ptr);
- dreturn("%" PRNssize_t, len);
+ dreturn("%" PRIdSIZE, len);
return len;
}
@@ -341,7 +345,7 @@ static ssize_t _GD_PadField(DIRFILE *D, FILE *stream, int me, const char *in,
{
ssize_t i;
- dtrace("%p, %p, %i, \"%s\", %" PRNsize_t ", %i, %i", D, stream, me, in, len,
+ dtrace("%p, %p, %i, \"%s\", %" PRIuSIZE ", %i, %i", D, stream, me, in, len,
permissive, standards);
i = _GD_WriteFieldCode(D, stream, me, in, 0, permissive, standards, 0);
@@ -353,7 +357,7 @@ static ssize_t _GD_PadField(DIRFILE *D, FILE *stream, int me, const char *in,
break;
}
- dreturn("%" PRNssize_t, i);
+ dreturn("%" PRIdSIZE, i);
return i;
}
@@ -381,7 +385,7 @@ static int _GD_WriteConst(DIRFILE *D, FILE *stream, int me, int permissive,
} else if (type == GD_UINT64)
fprintf(stream, "%" PRIu64 "%s", *(uint64_t *)value, postamble);
else if (type == GD_INT64)
- fprintf(stream, "%" PRIi64 "%s", *(int64_t *)value, postamble);
+ fprintf(stream, "%" PRId64 "%s", *(int64_t *)value, postamble);
else if (type == GD_UINT32)
fprintf(stream, "%" PRIu32 "%s", *(uint32_t *)value, postamble);
else if (type == GD_INT32)
@@ -416,7 +420,7 @@ static int _GD_FieldSpec(DIRFILE* D, FILE* stream, const gd_entry_t* E,
char buffer[1000];
size_t z;
- dtrace("%p, %p, %p, %i, %i, %" PRNsize_t ", %i, %i", D, stream, E, me, meta,
+ dtrace("%p, %p, %p, %i, %i, %" PRIuSIZE ", %i, %i", D, stream, E, me, meta,
max_len, pretty, permissive);
/* INDEX is implicit, and it is an error to define it in the format file */
@@ -665,7 +669,7 @@ static int _GD_FieldSpec(DIRFILE* D, FILE* stream, const gd_entry_t* E,
goto WRITE_ERR;
}
if (E->EN(scalar,const_type) & GD_SIGNED) {
- if (fprintf(stream, "%" PRIi64, *(int64_t*)E->e->u.scalar.d) < 0)
+ if (fprintf(stream, "%" PRId64, *(int64_t*)E->e->u.scalar.d) < 0)
goto WRITE_ERR;
} else if (E->EN(scalar,const_type) & GD_IEEE754) {
if (fprintf(stream, "%.15g", *(double*)E->e->u.scalar.d) < 0)
@@ -688,7 +692,7 @@ static int _GD_FieldSpec(DIRFILE* D, FILE* stream, const gd_entry_t* E,
for (z = 0; z < E->EN(scalar,array_len); ++z) {
if (E->EN(scalar,const_type) & GD_SIGNED)
- len = sprintf(buffer, " %" PRIi64, ((int64_t*)E->e->u.scalar.d)[z]);
+ len = sprintf(buffer, " %" PRId64, ((int64_t*)E->e->u.scalar.d)[z]);
else if (E->EN(scalar,const_type) & GD_IEEE754)
len = sprintf(buffer, " %.15g", ((double*)E->e->u.scalar.d)[z]);
else if (E->EN(scalar,const_type) & GD_COMPLEX)
@@ -702,7 +706,8 @@ static int _GD_FieldSpec(DIRFILE* D, FILE* stream, const gd_entry_t* E,
/* don't write lines that are too long
* also, add one to length for the trailing '\n' */
if (GD_SSIZE_T_MAX - (len + 1) <= pos) {
- _GD_SetError(D, GD_E_LINE_TOO_LONG, GD_E_LONG_FLUSH, E->field, 0, NULL);
+ _GD_SetError(D, GD_E_LINE_TOO_LONG, GD_E_LONG_FLUSH, E->field, 0,
+ NULL);
dreturn("%i", -1);
return -1;
}
@@ -892,9 +897,8 @@ static void _GD_FlushFragment(DIRFILE* D, int i, int permissive)
/* Frame offset */
if (permissive || D->standards >= 1)
if (D->fragment[i].frame_offset != 0)
- if (fprintf(stream, "%sFRAMEOFFSET %llu\n",
- (D->standards >= 5) ? "/" : "",
- (unsigned long long)D->fragment[i].frame_offset) < 0)
+ if (fprintf(stream, "%sFRAMEOFFSET %" PRIu64 "\n",
+ (D->standards >= 5) ? "/" : "", D->fragment[i].frame_offset) < 0)
{
goto WRITE_ERR;
}
@@ -1035,13 +1039,18 @@ static void _GD_FlushFragment(DIRFILE* D, int i, int permissive)
#endif
/* if there's no error, try closing */
- if (ferror(stream) || fclose(stream) == EOF) {
+ if (ferror(stream)) {
WRITE_ERR:
if (!D->error)
_GD_SetError(D, GD_E_IO, GD_E_IO_WRITE, NULL, 0, NULL);
fclose(stream);
}
+ if (fclose(stream) == EOF) {
+ if (!D->error)
+ _GD_SetError(D, GD_E_IO, GD_E_IO_WRITE, NULL, 0, NULL);
+ }
+
/* If no error was encountered, move the temporary file over the
* old format file, otherwise abort */
@@ -1149,7 +1158,7 @@ static int _GD_SyncOrClose(DIRFILE* D, const char* field_code, int syn, int clo)
if (D->entry[i]->field_type == GD_RAW_ENTRY)
_GD_Flush(D, D->entry[i], syn, clo);
} else {
- E = _GD_FindEntry(D, field_code, NULL, 1, 1);
+ E = _GD_FindEntry(D, field_code);
if (!D->error)
_GD_Flush(D, E, syn, clo);
diff --git a/src/gd_config.h.in b/src/gd_config.h.in
index 110d4f0..33a5aad 100644
--- a/src/gd_config.h.in
+++ b/src/gd_config.h.in
@@ -91,6 +91,9 @@
/* Define to 1 if you have the <complex.h> header file. */
#undef HAVE_COMPLEX_H
+/* Define to 1 if you have the <crtdefs.h> header file. */
+#undef HAVE_CRTDEFS_H
+
/* Define to 1 if you have the declaration of `bswap16', and to 0 if you
don't. */
#undef HAVE_DECL_BSWAP16
@@ -239,6 +242,9 @@
/* Define to 1 if you have the `zzip' library (-lzzip). */
#undef HAVE_LIBZZIP
+/* Define to 1 if the system has the type 'long long int'. */
+#undef HAVE_LONG_LONG_INT
+
/* Define to 1 if you have the `lseek64' function. */
#undef HAVE_LSEEK64
@@ -391,6 +397,9 @@
/* Define to 1 if you have the `unlinkat' function. */
#undef HAVE_UNLINKAT
+/* Define to 1 if the system has the type 'unsigned long long int'. */
+#undef HAVE_UNSIGNED_LONG_LONG_INT
+
/* Define to 1 if you have the `vfork' function. */
#undef HAVE_VFORK
@@ -487,6 +496,10 @@
/* Define to disable assertions */
#undef NDEBUG
+/* Define to 1 to disable tests that write large quantities (>1MB) of
+ temporary data. */
+#undef NO_LARGE_TESTS
+
/* Define to 1 if your C compiler doesn't accept -c and -o together. */
#undef NO_MINUS_C_MINUS_O
diff --git a/src/getdata.c b/src/getdata.c
index 0d41cd8..1d60969 100644
--- a/src/getdata.c
+++ b/src/getdata.c
@@ -52,7 +52,7 @@
case GD_NULL: \
break; \
default: \
- _GD_SetError(D, GD_E_BAD_TYPE, in_type, NULL, 0, NULL); \
+ _GD_SetError(D, GD_E_BAD_TYPE, 0, NULL, in_type, NULL); \
}
#define EXTRACT_REPRC2(it,ot) \
@@ -75,7 +75,7 @@ static void _GD_ExtractRepr(DIRFILE *restrict D, const void *restrict cdata,
{
size_t i;
- dtrace("%p, %p, 0x%X, %p, 0x%X, %" PRNsize_t ", %i", D, cdata, in_type, rdata,
+ dtrace("%p, %p, 0x%X, %p, 0x%X, %" PRIuSIZE ", %i", D, cdata, in_type, rdata,
type, n, repr);
switch (type) {
@@ -116,7 +116,7 @@ static void _GD_ExtractRepr(DIRFILE *restrict D, const void *restrict cdata,
#endif
case GD_NULL: break;
default:
- _GD_SetError(D, GD_E_BAD_TYPE, type, NULL, 0, NULL);
+ _GD_SetError(D, GD_E_BAD_TYPE, 0, NULL, type, NULL);
break;
}
@@ -130,7 +130,7 @@ static void _GD_FillFileFrame(void *dataout, gd_type_t rtype, off64_t s0,
{
size_t i;
- dtrace("%p, 0x%X, %lli, %" PRNsize_t, dataout, rtype, (long long)s0, n);
+ dtrace("%p, 0x%X, %" PRId64 ", %" PRIuSIZE, dataout, rtype, (int64_t)s0, n);
switch (rtype) {
case GD_INT8:
@@ -195,7 +195,7 @@ static int _GD_FillZero(void *databuffer, gd_type_t type, size_t nz)
size_t i;
const double NaN = NAN;
- dtrace("%p, 0x%X, %" PRNsize_t, databuffer, type, nz);
+ dtrace("%p, 0x%X, %" PRIuSIZE, databuffer, type, nz);
if (type & GD_IEEE754) {
if (type == GD_FLOAT32)
@@ -214,7 +214,7 @@ static int _GD_FillZero(void *databuffer, gd_type_t type, size_t nz)
} else
memset(databuffer, 0, nz * GD_SIZE(type));
- dreturn("%" PRNsize_t, nz);
+ dreturn("%" PRIuSIZE, nz);
return (nz);
}
@@ -229,7 +229,7 @@ static size_t _GD_DoRaw(DIRFILE *restrict D, gd_entry_t *restrict E, off64_t s0,
char *databuffer;
size_t zero_pad = 0;
- dtrace("%p, %p, %lli, %" PRNsize_t ", 0x%X, %p)", D, E, (long long)s0, ns,
+ dtrace("%p, %p, %" PRId64 ", %" PRIuSIZE ", 0x%X, %p)", D, E, (int64_t)s0, ns,
return_type, data_out);
if (s0 < E->EN(raw,spf) * D->fragment[E->fragment_index].frame_offset)
@@ -308,7 +308,7 @@ static size_t _GD_DoRaw(DIRFILE *restrict D, gd_entry_t *restrict E, off64_t s0,
free(databuffer);
- dreturn("%" PRNsize_t, (D->error == GD_E_OK) ? n_read : (size_t)0);
+ dreturn("%" PRIuSIZE, (D->error == GD_E_OK) ? n_read : (size_t)0);
return (D->error == GD_E_OK) ? n_read : (size_t)0;
}
@@ -452,7 +452,7 @@ static void _GD_PolynomData(DIRFILE *restrict D, void *restrict data,
{
size_t i;
- dtrace("%p, %p, 0x%X, %" PRNsize_t ", %i, %p", D, data, type, npts, n, a);
+ dtrace("%p, %p, 0x%X, %" PRIuSIZE ", %i, %p", D, data, type, npts, n, a);
if (n == 1) {
/* no need to duplicate this case */
@@ -472,7 +472,7 @@ static void _GD_PolynomData(DIRFILE *restrict D, void *restrict data,
case GD_FLOAT64: POLYNOM( double); break;
case GD_COMPLEX64: POLYNOMC( float); break;
case GD_COMPLEX128: POLYNOMC( double); break;
- default: _GD_SetError(D, GD_E_BAD_TYPE, type, NULL, 0, NULL);
+ default: _GD_SetError(D, GD_E_BAD_TYPE, 0, NULL, type, NULL);
break;
}
}
@@ -599,7 +599,7 @@ static void _GD_CPolynomData(DIRFILE *restrict D, void *restrict data,
{
size_t i;
- dtrace("%p, %p, 0x%X, %" PRNsize_t ", %i, %p", D, data, type, npts, n, a);
+ dtrace("%p, %p, 0x%X, %" PRIuSIZE ", %i, %p", D, data, type, npts, n, a);
if (n == 1) {
/* no need to duplicate this case */
@@ -619,7 +619,7 @@ static void _GD_CPolynomData(DIRFILE *restrict D, void *restrict data,
case GD_FLOAT64: _GD_InternalError(D); break;
case GD_COMPLEX64: POLYNOMC( float); break;
case GD_COMPLEX128: POLYNOMC( double); break;
- default: _GD_SetError(D, GD_E_BAD_TYPE, type, NULL, 0, NULL);
+ default: _GD_SetError(D, GD_E_BAD_TYPE, 0, NULL, type, NULL);
break;
}
}
@@ -650,7 +650,7 @@ static void _GD_MultiplyData(DIRFILE *restrict D, void *restrict A,
{
size_t i;
- dtrace("%p, %p, %u, %p, %u, 0x%X, %" PRNsize_t, D, A, spfA, B, spfB, type, n);
+ dtrace("%p, %p, %u, %p, %u, 0x%X, %" PRIuSIZE, D, A, spfA, B, spfB, type, n);
switch (type) {
case GD_NULL: break;
@@ -666,7 +666,7 @@ static void _GD_MultiplyData(DIRFILE *restrict D, void *restrict A,
case GD_FLOAT64: MULTIPLY( double); break;
case GD_COMPLEX64: MULTIPLYC( float); break;
case GD_COMPLEX128: MULTIPLYC( double); break;
- default: _GD_SetError(D, GD_E_BAD_TYPE, type, NULL, 0, NULL);
+ default: _GD_SetError(D, GD_E_BAD_TYPE, 0, NULL, type, NULL);
break;
}
@@ -698,7 +698,7 @@ static void _GD_CMultiplyData(DIRFILE *restrict D, void *restrict A,
{
size_t i;
- dtrace("%p, %p, %u, %p, %u, 0x%X, %" PRNsize_t, D, A, spfA, B, spfB, type, n);
+ dtrace("%p, %p, %u, %p, %u, 0x%X, %" PRIuSIZE, D, A, spfA, B, spfB, type, n);
switch (type) {
case GD_NULL: break;
@@ -714,7 +714,7 @@ static void _GD_CMultiplyData(DIRFILE *restrict D, void *restrict A,
case GD_FLOAT64: _GD_InternalError(D); break;
case GD_COMPLEX64: MULTIPLYC( float); break;
case GD_COMPLEX128: MULTIPLYC( double); break;
- default: _GD_SetError(D, GD_E_BAD_TYPE, type, NULL, 0, NULL);
+ default: _GD_SetError(D, GD_E_BAD_TYPE, 0, NULL, type, NULL);
break;
}
@@ -745,7 +745,7 @@ static void _GD_DivideData(DIRFILE *restrict D, void *restrict A,
{
size_t i;
- dtrace("%p, %p, %u, %p, %u, 0x%X, %" PRNsize_t, D, A, spfA, B, spfB, type, n);
+ dtrace("%p, %p, %u, %p, %u, 0x%X, %" PRIuSIZE, D, A, spfA, B, spfB, type, n);
switch (type) {
case GD_NULL: break;
@@ -761,7 +761,7 @@ static void _GD_DivideData(DIRFILE *restrict D, void *restrict A,
case GD_FLOAT64: DIVIDE( double); break;
case GD_COMPLEX64: DIVIDEC( float); break;
case GD_COMPLEX128: DIVIDEC( double); break;
- default: _GD_SetError(D, GD_E_BAD_TYPE, type, NULL, 0, NULL);
+ default: _GD_SetError(D, GD_E_BAD_TYPE, 0, NULL, type, NULL);
break;
}
@@ -794,7 +794,7 @@ static void _GD_CDivideData(DIRFILE *restrict D, void *restrict A,
{
size_t i;
- dtrace("%p, %p, %u, %p, %u, 0x%X, %" PRNsize_t, D, A, spfA, B, spfB, type, n);
+ dtrace("%p, %p, %u, %p, %u, 0x%X, %" PRIuSIZE, D, A, spfA, B, spfB, type, n);
switch (type) {
case GD_NULL: break;
@@ -810,7 +810,7 @@ static void _GD_CDivideData(DIRFILE *restrict D, void *restrict A,
case GD_FLOAT64: _GD_InternalError(D); break;
case GD_COMPLEX64: DIVIDEC( float); break;
case GD_COMPLEX128: DIVIDEC( double); break;
- default: _GD_SetError(D, GD_E_BAD_TYPE, type, NULL, 0, NULL);
+ default: _GD_SetError(D, GD_E_BAD_TYPE, 0, NULL, type, NULL);
break;
}
@@ -864,9 +864,9 @@ static void _GD_WindowData(DIRFILE *restrict D, void *restrict A,
size_t i;
const double NaN = NAN;
- dtrace("%p, %p, %u, %p, %u, 0x%X, %i, {%g,%llx,%lli}, %" PRNsize_t, D, A,
- spfA, B, spfB, type, op, threshold.r, (unsigned long long)threshold.u,
- (long long)threshold.i, n);
+ dtrace("%p, %p, %u, %p, %u, 0x%X, %i, {%g,%" PRIX64 ",%" PRId64 "}, %"
+ PRIuSIZE, D, A, spfA, B, spfB, type, op, threshold.r, threshold.u,
+ threshold.i, n);
switch (type) {
case GD_NULL: break;
@@ -882,7 +882,7 @@ static void _GD_WindowData(DIRFILE *restrict D, void *restrict A,
case GD_FLOAT64: WINDOW( double,NaN) break;
case GD_COMPLEX64: WINDOWC( float,NaN) break;
case GD_COMPLEX128: WINDOWC( double,NaN) break;
- default: _GD_SetError(D, GD_E_BAD_TYPE, type, NULL, 0, NULL);
+ default: _GD_SetError(D, GD_E_BAD_TYPE, 0, NULL, type, NULL);
break;
}
@@ -922,7 +922,7 @@ static void _GD_MplexData(DIRFILE *restrict D, void *restrict A,
{
size_t i;
- dtrace("%p, %p, %u, %p, %u, 0x%X, %i, %p, %" PRNsize_t, D, A, spfA, B, spfB,
+ dtrace("%p, %p, %u, %p, %u, 0x%X, %i, %p, %" PRIuSIZE, D, A, spfA, B, spfB,
type, val, start, n);
switch (type) {
@@ -939,7 +939,7 @@ static void _GD_MplexData(DIRFILE *restrict D, void *restrict A,
case GD_FLOAT64: MPLEX( double); break;
case GD_COMPLEX64: MPLEXC( float); break;
case GD_COMPLEX128: MPLEXC( double); break;
- default: _GD_SetError(D, GD_E_BAD_TYPE, type, NULL, 0, NULL);
+ default: _GD_SetError(D, GD_E_BAD_TYPE, 0, NULL, type, NULL);
break;
}
@@ -960,8 +960,8 @@ static size_t _GD_DoLincom(DIRFILE *restrict D, gd_entry_t *restrict E,
const gd_type_t ntype = (return_type & GD_COMPLEX) ? GD_COMPLEX128
: GD_FLOAT64;
- dtrace("%p, %p, %lli, %" PRNsize_t ", 0x%X, %p", D, E, (long long)first_samp,
- num_samp, return_type, data_out);
+ dtrace("%p, %p, %" PRId64 ", %" PRIuSIZE ", 0x%X, %p", D, E,
+ (int64_t)first_samp, num_samp, return_type, data_out);
/* input field checks */
for (i = 0; i < E->EN(lincom,n_fields); ++i) {
@@ -1000,7 +1000,7 @@ static size_t _GD_DoLincom(DIRFILE *restrict D, gd_entry_t *restrict E,
if (E->EN(lincom,n_fields) == 1 && gd_ccmpl_(E->EN(lincom,cm)[0],1,0) &&
gd_ccmpl_(E->EN(lincom,cb)[0],0,0))
{
- dreturn("%" PRNsize_t, n_read);
+ dreturn("%" PRIuSIZE, n_read);
return n_read;
}
@@ -1078,7 +1078,7 @@ static size_t _GD_DoLincom(DIRFILE *restrict D, gd_entry_t *restrict E,
if (D->error)
n_read = 0;
- dreturn("%" PRNsize_t, n_read);
+ dreturn("%" PRIuSIZE, n_read);
return n_read;
}
@@ -1094,8 +1094,8 @@ static size_t _GD_DoMultiply(DIRFILE *restrict D, gd_entry_t *restrict E,
off64_t first_samp2;
gd_type_t type2;
- dtrace("%p, %p, %lli, %" PRNsize_t ", 0x%X, %p", D, E, (long long)first_samp,
- num_samp, return_type, data_out);
+ dtrace("%p, %p, %" PRId64 ", %" PRIuSIZE ", 0x%X, %p", D, E,
+ (int64_t)first_samp, num_samp, return_type, data_out);
/* Check input fields */
if (_GD_BadInput(D, E, 0, GD_NO_ENTRY, 1)) {
@@ -1175,7 +1175,7 @@ static size_t _GD_DoMultiply(DIRFILE *restrict D, gd_entry_t *restrict E,
free(tmpbuf);
- dreturn("%" PRNsize_t, n_read);
+ dreturn("%" PRIuSIZE, n_read);
return n_read;
}
@@ -1187,8 +1187,8 @@ static size_t _GD_DoRecip(DIRFILE *restrict D, gd_entry_t *restrict E,
{
size_t n_read;
- dtrace("%p, %p, %lli, %" PRNsize_t ", 0x%X, %p", D, E, (long long)first_samp,
- num_samp, return_type, data_out);
+ dtrace("%p, %p, %" PRId64 ", %" PRIuSIZE ", 0x%X, %p", D, E,
+ (int64_t)first_samp, num_samp, return_type, data_out);
/* Check input fields */
if (_GD_BadInput(D, E, 0, GD_NO_ENTRY, 1)) {
@@ -1217,7 +1217,7 @@ static size_t _GD_DoRecip(DIRFILE *restrict D, gd_entry_t *restrict E,
else
_GD_InvertData(D, data_out, return_type, E->EN(recip,dividend), num_samp);
- dreturn("%" PRNsize_t, n_read);
+ dreturn("%" PRIuSIZE, n_read);
return n_read;
}
@@ -1233,8 +1233,8 @@ static size_t _GD_DoDivide(DIRFILE *restrict D, gd_entry_t *restrict E,
off64_t first_samp2;
gd_type_t type2;
- dtrace("%p, %p, %lli, %" PRNsize_t ", 0x%X, %p", D, E, (long long)first_samp,
- num_samp, return_type, data_out);
+ dtrace("%p, %p, %" PRId64 ", %" PRIuSIZE ", 0x%X, %p", D, E,
+ (int64_t)first_samp, num_samp, return_type, data_out);
/* Check input fields */
if (_GD_BadInput(D, E, 0, GD_NO_ENTRY, 1) ||
@@ -1314,7 +1314,7 @@ static size_t _GD_DoDivide(DIRFILE *restrict D, gd_entry_t *restrict E,
free(tmpbuf);
- dreturn("%" PRNsize_t, n_read);
+ dreturn("%" PRIuSIZE, n_read);
return n_read;
}
@@ -1331,8 +1331,8 @@ static size_t _GD_DoBit(DIRFILE *restrict D, gd_entry_t *restrict E,
const uint64_t mask = (E->EN(bit,numbits) == 64) ? 0xffffffffffffffffULL :
((uint64_t)1 << E->EN(bit,numbits)) - 1;
- dtrace("%p, %p, %i, %lli, %" PRNsize_t ", 0x%X, %p", D, E, is_signed,
- (long long)first_samp, num_samp, return_type, data_out);
+ dtrace("%p, %p, %i, %" PRId64 ", %" PRIuSIZE ", 0x%X, %p", D, E, is_signed,
+ (int64_t)first_samp, num_samp, return_type, data_out);
if (_GD_BadInput(D, E, 0, GD_NO_ENTRY, 1)) {
dreturn("%i", 0);
@@ -1372,7 +1372,7 @@ static size_t _GD_DoBit(DIRFILE *restrict D, gd_entry_t *restrict E,
return_type, n_read);
free(tmpbuf);
- dreturn("%" PRNsize_t, n_read);
+ dreturn("%" PRIuSIZE, n_read);
return n_read;
}
@@ -1384,8 +1384,8 @@ static size_t _GD_DoPhase(DIRFILE *restrict D, gd_entry_t *restrict E,
{
size_t n_read;
- dtrace("%p, %p, %lli, %" PRNsize_t ", 0x%X, %p", D, E, (long long)first_samp,
- num_samp, return_type, data_out);
+ dtrace("%p, %p, %" PRId64 ", %" PRIuSIZE ", 0x%X, %p", D, E,
+ (int64_t)first_samp, num_samp, return_type, data_out);
if (_GD_BadInput(D, E, 0, GD_NO_ENTRY, 1)) {
dreturn("%i", 0);
@@ -1395,7 +1395,7 @@ static size_t _GD_DoPhase(DIRFILE *restrict D, gd_entry_t *restrict E,
n_read = _GD_DoField(D, E->e->entry[0], E->e->repr[0], first_samp +
E->EN(phase,shift), num_samp, return_type, data_out);
- dreturn("%" PRNsize_t, n_read);
+ dreturn("%" PRIuSIZE, n_read);
return n_read;
}
@@ -1408,8 +1408,8 @@ static size_t _GD_DoLinterp(DIRFILE *restrict D, gd_entry_t *restrict E,
size_t n_read = 0;
double* data_in;
- dtrace("%p, %p, %lli, %" PRNsize_t ", 0x%X, %p", D, E, (long long)first_samp,
- num_samp, return_type, data_out);
+ dtrace("%p, %p, %" PRId64 ", %" PRIuSIZE ", 0x%X, %p", D, E,
+ (int64_t)first_samp, num_samp, return_type, data_out);
if (_GD_BadInput(D, E, 0, GD_NO_ENTRY, 1)) {
dreturn("%i", 0);
@@ -1438,7 +1438,7 @@ static size_t _GD_DoLinterp(DIRFILE *restrict D, gd_entry_t *restrict E,
data_in, n_read, E->e->u.linterp.lut, E->e->u.linterp.table_len);
free(data_in);
- dreturn("%" PRNsize_t, n_read);
+ dreturn("%" PRIuSIZE, n_read);
return n_read;
}
@@ -1450,8 +1450,8 @@ static size_t _GD_DoPolynom(DIRFILE *restrict D, gd_entry_t *restrict E,
{
size_t n_read;
- dtrace("%p, %p, %lli, %" PRNsize_t ", 0x%X, %p", D, E, (long long)first_samp,
- num_samp, return_type, data_out);
+ dtrace("%p, %p, %" PRId64 ", %" PRIuSIZE ", 0x%X, %p", D, E,
+ (int64_t)first_samp, num_samp, return_type, data_out);
if (_GD_BadInput(D, E, 0, GD_NO_ENTRY, 1)) {
dreturn("%i", 0);
@@ -1480,7 +1480,7 @@ static size_t _GD_DoPolynom(DIRFILE *restrict D, gd_entry_t *restrict E,
_GD_PolynomData(D, data_out, return_type, n_read, E->EN(polynom,poly_ord),
E->EN(polynom,a));
- dreturn("%" PRNsize_t, n_read);
+ dreturn("%" PRIuSIZE, n_read);
return n_read;
}
@@ -1496,8 +1496,8 @@ static size_t _GD_DoWindow(DIRFILE *restrict D, gd_entry_t *restrict E,
off64_t first_samp2;
gd_type_t type2;
- dtrace("%p, %p, %lli, %" PRNsize_t ", 0x%X, %p", D, E, (long long)first_samp,
- num_samp, return_type, data_out);
+ dtrace("%p, %p, %" PRId64 ", %" PRIuSIZE ", 0x%X, %p", D, E,
+ (int64_t)first_samp, num_samp, return_type, data_out);
/* Check input fields */
if (_GD_BadInput(D, E, 0, GD_NO_ENTRY, 1)) {
@@ -1585,7 +1585,7 @@ static size_t _GD_DoWindow(DIRFILE *restrict D, gd_entry_t *restrict E,
free(tmpbuf);
- dreturn("%" PRNsize_t, n_read);
+ dreturn("%" PRIuSIZE, n_read);
return n_read;
}
@@ -1602,8 +1602,8 @@ static size_t _GD_DoMplex(DIRFILE *restrict D, gd_entry_t *restrict E,
const size_t size = GD_SIZE(return_type);
off64_t first_samp2;
- dtrace("%p, %p, %lli, %" PRNsize_t ", 0x%X, %p", D, E, (long long)first_samp,
- num_samp, return_type, data_out);
+ dtrace("%p, %p, %" PRId64 ", %" PRIuSIZE ", 0x%X, %p", D, E,
+ (int64_t)first_samp, num_samp, return_type, data_out);
/* Check input fields */
if (_GD_BadInput(D, E, 0, GD_NO_ENTRY, 1)) {
@@ -1769,7 +1769,7 @@ static size_t _GD_DoMplex(DIRFILE *restrict D, gd_entry_t *restrict E,
free(tmpbuf);
- dreturn("%" PRNsize_t, n_read);
+ dreturn("%" PRIuSIZE, n_read);
return n_read;
}
@@ -1779,8 +1779,8 @@ static size_t _GD_DoConst(DIRFILE *restrict D, const gd_entry_t *restrict E,
{
gd_type_t type;
- dtrace("%p, %p, %lli, %" PRNsize_t ", 0x%X, %p", D, E, (long long)first, len,
- return_type, data_out);
+ dtrace("%p, %p, %" PRId64 ", %" PRIuSIZE ", 0x%X, %p", D, E, (int64_t)first,
+ len, return_type, data_out);
type = _GD_ConstType(D, E->EN(scalar,const_type));
_GD_ConvertType(D, (char *)E->e->u.scalar.d + first * GD_SIZE(type), type,
@@ -1807,8 +1807,8 @@ size_t _GD_DoField(DIRFILE *restrict D, gd_entry_t *restrict E, int repr,
const gd_type_t true_return_type = return_type;
int out_of_place = 0;
- dtrace("%p, %p(%s), %i, %lli, %" PRNsize_t ", 0x%X, %p", D, E, E->field, repr,
- (long long)first_samp, num_samp, return_type, data_out);
+ dtrace("%p, %p(%s), %i, %" PRId64 ", %" PRIuSIZE ", 0x%X, %p", D, E, E->field,
+ repr, (int64_t)first_samp, num_samp, return_type, data_out);
if (++D->recurse_level >= GD_MAX_RECURSE_LEVEL) {
_GD_SetError(D, GD_E_RECURSE_LEVEL, GD_E_RECURSE_CODE, NULL, 0, E->field);
@@ -1837,7 +1837,7 @@ size_t _GD_DoField(DIRFILE *restrict D, gd_entry_t *restrict E, int repr,
}
if (first_samp == GD_HERE) {
- first_samp = _GD_GetFilePos(D, E, -1);
+ first_samp = _GD_GetIOPos(D, E, -1);
if (D->error) {
D->recurse_level--;
dreturn("%i", 0);
@@ -1845,11 +1845,22 @@ size_t _GD_DoField(DIRFILE *restrict D, gd_entry_t *restrict E, int repr,
}
}
+ /* avoid craziness */
+ if (num_samp > GD_TRANSACTION_MAX(return_type))
+ num_samp = GD_TRANSACTION_MAX(return_type);
+ if (num_samp > GD_TRANSACTION_MAX(ntype))
+ num_samp = GD_TRANSACTION_MAX(ntype);
+ if (first_samp > (int64_t)(GD_INT64_MAX - num_samp)) {
+ _GD_SetError(D, GD_E_RANGE, GD_E_OUT_OF_RANGE, NULL, 0, NULL);
+ dreturn("%i", 0);
+ return 0;
+ }
+
/* short circuit for purely real native types */
if (~ntype & GD_COMPLEX) {
if (repr == GD_REPR_IMAG) {
memset(data_out, 0, GD_SIZE(return_type) * num_samp);
- dreturn("%" PRNsize_t, num_samp);
+ dreturn("%" PRIuSIZE, num_samp);
return num_samp;
} else if (repr == GD_REPR_REAL)
repr = GD_REPR_NONE;
@@ -1862,6 +1873,10 @@ size_t _GD_DoField(DIRFILE *restrict D, gd_entry_t *restrict E, int repr,
if (ntype & GD_COMPLEX && ~return_type & GD_COMPLEX) {
out_of_place = 1;
return_type = GD_COMPLEX128;
+
+ if (num_samp > GD_TRANSACTION_MAX(GD_COMPLEX128))
+ num_samp = GD_TRANSACTION_MAX(GD_COMPLEX128);
+
data_out = _GD_Alloc(D, GD_COMPLEX128, num_samp);
if (repr == GD_REPR_NONE)
repr = GD_REPR_AUTO;
@@ -1930,7 +1945,7 @@ size_t _GD_DoField(DIRFILE *restrict D, gd_entry_t *restrict E, int repr,
free(data_out);
D->recurse_level--;
- dreturn("%" PRNsize_t, n_read);
+ dreturn("%" PRIuSIZE, n_read);
return n_read;
}
@@ -1945,9 +1960,9 @@ size_t gd_getdata64(DIRFILE* D, const char *field_code_in, off64_t first_frame,
int repr;
unsigned int spf;
- dtrace("%p, \"%s\", %lli, %lli, %" PRNsize_t ", %" PRNsize_t ", 0x%X, %p", D,
- field_code_in, (long long)first_frame, (long long)first_samp, num_frames,
- num_samp, return_type, data_out);
+ dtrace("%p, \"%s\", %" PRId64 ", %" PRId64 ", %" PRIuSIZE ", %" PRIuSIZE
+ ", 0x%X, %p", D, field_code_in, (int64_t)first_frame, (int64_t)first_samp,
+ num_frames, num_samp, return_type, data_out);
if (D->flags & GD_INVALID) {/* don't crash */
_GD_SetError(D, GD_E_BAD_DIRFILE, 0, NULL, 0, NULL);
@@ -1990,8 +2005,18 @@ size_t gd_getdata64(DIRFILE* D, const char *field_code_in, off64_t first_frame,
return 0;
}
+ /* don't overflow */
+ if (first_samp > GD_INT64_MAX - spf * first_frame) {
+ _GD_SetError(D, GD_E_RANGE, GD_E_OUT_OF_RANGE, NULL, 0, NULL);
+ dreturn("%i", 0);
+ return 0;
+ }
first_samp += spf * first_frame;
- num_samp += spf * num_frames;
+
+ if (num_samp > GD_SIZE_T_MAX - spf * num_frames)
+ num_samp = GD_SIZE_T_MAX;
+ else
+ num_samp += spf * num_frames;
}
if (first_samp < 0 && (first_samp != GD_HERE || first_frame != 0)) {
@@ -2003,7 +2028,7 @@ size_t gd_getdata64(DIRFILE* D, const char *field_code_in, off64_t first_frame,
n_read = _GD_DoField(D, entry, repr, first_samp, num_samp, return_type,
data_out);
- dreturn("%" PRNsize_t, n_read);
+ dreturn("%" PRIuSIZE, n_read);
return n_read;
}
diff --git a/src/gzip.c b/src/gzip.c
index 9accdd8..1388796 100644
--- a/src/gzip.c
+++ b/src/gzip.c
@@ -81,10 +81,10 @@ off64_t _GD_GzipSeek(struct gd_raw_file_* file, off64_t count,
{
off64_t n = 0;
- dtrace("%p, %lli, 0x%X, 0x%X", file, (long long)count, data_type, mode);
+ dtrace("%p, %" PRId64 ", 0x%X, 0x%X", file, (int64_t)count, data_type, mode);
if (file->pos == count) {
- dreturn("%lli", (long long)count);
+ dreturn("%" PRId64, (int64_t)count);
return count;
}
@@ -108,7 +108,7 @@ off64_t _GD_GzipSeek(struct gd_raw_file_* file, off64_t count,
file->pos = n;
}
- dreturn("%lli", (long long)n);
+ dreturn("%" PRId64, (int64_t)n);
return n;
}
@@ -118,7 +118,7 @@ ssize_t _GD_GzipRead(struct gd_raw_file_ *file, void *ptr, gd_type_t data_type,
ssize_t n;
int errnum;
- dtrace("%p, %p, 0x%X, %" PRNsize_t, file, ptr, data_type, nmemb);
+ dtrace("%p, %p, 0x%X, %" PRIuSIZE, file, ptr, data_type, nmemb);
n = gzread((gzFile)file->edata, ptr, GD_SIZE(data_type) * nmemb);
@@ -131,7 +131,7 @@ ssize_t _GD_GzipRead(struct gd_raw_file_ *file, void *ptr, gd_type_t data_type,
n = -1;
}
- dreturn("%" PRNsize_t, n);
+ dreturn("%" PRIuSIZE, n);
return n;
}
@@ -141,11 +141,11 @@ ssize_t _GD_GzipWrite(struct gd_raw_file_ *file, const void *ptr,
ssize_t n;
int errnum;
- dtrace("%p, %p, 0x%X, %" PRNsize_t, file, ptr, data_type, nmemb);
+ dtrace("%p, %p, 0x%X, %" PRIuSIZE, file, ptr, data_type, nmemb);
n = gzwrite((gzFile)file->edata, ptr, GD_SIZE(data_type) * nmemb);
- if (n >= 0) {
+ if (n > 0) {
n /= GD_SIZE(data_type);
file->pos += n;
} else {
@@ -154,20 +154,10 @@ ssize_t _GD_GzipWrite(struct gd_raw_file_ *file, const void *ptr,
n = -1;
}
- dreturn("%" PRNssize_t, n);
+ dreturn("%" PRIdSIZE, n);
return n;
}
-/* Because calling gzflush can result in degredation of compression, we avoid
- * doing anything here */
-int _GD_GzipSync(struct gd_raw_file_ *file gd_unused_)
-{
- dtrace("<unused>");
-
- dreturn("%i", 0);
- return 0;
-}
-
int _GD_GzipClose(struct gd_raw_file_ *file)
{
int ret;
@@ -222,7 +212,7 @@ off64_t _GD_GzipSize(int dirfd, struct gd_raw_file_ *file, gd_type_t data_type,
size /= GD_SIZE(data_type);
- dreturn("%lli", (long long)size);
+ dreturn("%" PRIu32, size);
return size;
}
@@ -232,12 +222,12 @@ int _GD_GzipStrerr(const struct gd_raw_file_ *file, char *buf, size_t buflen)
int gzerrnum = 0;
const char *gzerr;
- dtrace("%p, %p, %" PRNsize_t, file, buf, buflen);
+ dtrace("%p, %p, %" PRIuSIZE, file, buf, buflen);
gzerr = gzerror((gzFile)file->edata, &gzerrnum);
if (gzerrnum == Z_ERRNO)
- r = gd_strerror(errno, buf, buflen);
+ r = gd_StrError(errno, buf, buflen);
else {
strncpy(buf, gzerr, buflen);
buf[buflen - 1] = 0;
diff --git a/src/include.c b/src/include.c
index cd76510..aaee504 100644
--- a/src/include.c
+++ b/src/include.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2008, 2010-2015 D. V. Wiebe
+/* Copyright (C) 2008-2015 D. V. Wiebe
*
***************************************************************************
*
@@ -589,13 +589,13 @@ int gd_uninclude(DIRFILE* D, int fragment_index, int del)
D->entry[i]->flags &= ~GD_EN_CALC;
for (j = 0; j < GD_MAX_LINCOM; ++j)
D->entry[i]->e->entry[j] = NULL;
- D->entry[i]->e->value_list_validity = 0;
- D->entry[i]->e->entry_list_validity = 0;
+ D->entry[i]->e->fl.value_list_validity = 0;
+ D->entry[i]->e->fl.entry_list_validity = 0;
}
/* Invalidate the field lists */
- D->value_list_validity = 0;
- D->entry_list_validity = 0;
+ D->fl.value_list_validity = 0;
+ D->fl.entry_list_validity = 0;
free(f);
diff --git a/src/index.c b/src/index.c
index f048ab1..a5f8a64 100644
--- a/src/index.c
+++ b/src/index.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2009-2013 D. V. Wiebe
+/* Copyright (C) 2009-2013, 2015 D. V. Wiebe
*
***************************************************************************
*
@@ -27,7 +27,8 @@ static double _GD_Extrapolate(DIRFILE *D, gd_entry_t *E, int repr, double value,
double sample = NAN;
double data[2];
- dtrace("%p, %p, %i, %g, %lli, %i", D, E, repr, value, (long long)limit, eof);
+ dtrace("%p, %p, %i, %g, %" PRId64 ", %i", D, E, repr, value, (int64_t)limit,
+ eof);
/* load data */
n = _GD_DoField(D, E, repr, limit - eof, 2, GD_FLOAT64, data);
@@ -58,8 +59,8 @@ static double _GD_GetIndex(DIRFILE* D, gd_entry_t *E, int repr, double value,
double low_v, high_v, field_start_v, c_v;
size_t n;
- dtrace("%p, %p, %i, %g, %lli, %lli", D, E, repr, value,
- (long long)field_start, (long long)field_end);
+ dtrace("%p, %p, %i, %g, %" PRId64 ", %" PRId64, D, E, repr, value,
+ (int64_t)field_start, (int64_t)field_end);
/* find the end-points */
n = _GD_DoField(D, E, repr, field_start, 1, GD_FLOAT64, &low_v);
@@ -212,8 +213,8 @@ double gd_framenum_subset64(DIRFILE* D, const char* field_code_in,
int repr = GD_REPR_NONE;
unsigned int spf;
- dtrace("%p, \"%s\", %g, %lli, %lli", D, field_code_in, value,
- (long long)field_start, (long long)field_end);
+ dtrace("%p, \"%s\", %g, %" PRId64 ", %" PRId64, D, field_code_in, value,
+ (int64_t)field_start, (int64_t)field_end);
if (D->flags & GD_INVALID) {/* don't crash */
_GD_SetError(D, GD_E_BAD_DIRFILE, 0, NULL, 0, NULL);
@@ -270,8 +271,8 @@ double gd_framenum_subset(DIRFILE* D, const char* field_code, double value,
{
double frame;
- dtrace("%p, \"%s\", %g, %lli, %lli", D, field_code, value,
- (long long int)field_start, (long long int)field_end);
+ dtrace("%p, \"%s\", %g, %" PRId64 ", %" PRId64, D, field_code, value,
+ (int64_t)field_start, (int64_t)field_end);
frame = gd_framenum_subset64(D, field_code, value, (off64_t)field_start,
(off64_t)field_end);
diff --git a/src/internal.h b/src/internal.h
index 3d0e7a0..6666ce8 100644
--- a/src/internal.h
+++ b/src/internal.h
@@ -73,6 +73,9 @@
#include <time.h>
#endif
+#ifdef HAVE_CRTDEFS_H
+#include <crtdefs.h>
+#endif
#ifdef HAVE_FCNTL_H
#include <fcntl.h>
#endif
@@ -104,27 +107,50 @@
#include <io.h>
#endif
-/* MSVC types */
-#ifdef _MSC_VER
-#ifdef _WIN64
+#ifndef SIZEOF_SIZE_T
+#define SIZEOF_SIZE_T (sizeof size_t)
+#endif
+
+/* MSCVRT defines ssize_t but not ssize_t */
+#ifdef __MSVCRT__
+#if SIZEOF_SIZE_T == 8
typedef __int64 ssize_t;
-#define PRNssize_t "li"
-#define PRNsize_t "lu"
#else
typedef int ssize_t;
-#define PRNssize_t "i"
-#define PRNsize_t "u"
#endif
-#else
-#define PRNssize_t "zi"
-#define PRNsize_t "zu"
+#endif
+
+#ifndef SIZEOF_UNSIGNED_LONG_LONG
+#define SIZEOF_UNSIGNED_LONG_LONG 0
+#endif
+
+#if !defined(PRIuSIZE) || !defined(PRIdSIZE)
+# ifdef __MSVCRT__
+# define GD_PRISIZE_PREFIX "I"
+# elif defined (__GNUC__)
+# define GD_PRISIZE_PREFIX "z"
+# elif SIZEOF_SIZE_T == SIZEOF_UNSIGNED_LONG
+# define GD_PRISIZE_PREFIX "l"
+# elif SIZEOF_SIZE_T == SIZEOF_UNSIGNED_LONG_LONG
+# define GD_PRISIZE_PREFIX "ll"
+# else
+# define GD_PRISIZE_PREFIX ""
+# endif
+#endif
+
+#ifndef PRIuSIZE
+# define PRIuSIZE GD_PRISIZE_PREFIX "u"
+#endif
+
+#ifndef PRIdSIZE
+# define PRIdSIZE GD_PRISIZE_PREFIX "d"
#endif
#ifndef HAVE_OFF64_T
typedef gd_off64_t off64_t;
#endif
-#ifdef _MSC_VER
+#ifdef __MSVCRT__
/* missing in sys/stat.h */
#define S_ISREG(m) (((m) & _S_IFMT) == _S_IFREG)
#define S_ISDIR(m) (((m) & _S_IFMT) == _S_IFDIR)
@@ -287,14 +313,14 @@ double cimag(double complex z);
#define GD_UINT_TYPE ((gd_type_t)(SIZEOF_UNSIGNED_INT))
/* a few integer limits */
-#ifndef SIZEOF_SIZE_T
-#define SIZEOF_SIZE_T (sizeof(size_t))
-#endif
-
#define GD_INT64_MAX ((int64_t)((uint64_t)-1>>1))
#define GD_SSIZE_T_MAX ((ssize_t)((size_t)-1>>1))
#define GD_SIZE_T_MAX ((size_t)-1)
+/* Maximum samples in getdata and putdata */
+#define GD_TRANSACTION_MAX(t) \
+ (GD_SIZE(t) ? (GD_SSIZE_T_MAX / GD_SIZE(t)) : GD_SSIZE_T_MAX)
+
/* default buffer size */
#if SIZEOF_INT < 4
#define GD_BUFFER_SIZE 32767
@@ -636,12 +662,6 @@ int strerror_r(int, char*, size_t);
# endif
#endif
-#if !defined HAVE_STRERROR_R || defined STRERROR_R_CHAR_P
-int gd_strerror(int errnum, char *buf, size_t buflen);
-#else
-# define gd_strerror strerror_r
-#endif
-
#if defined HAVE_FTRUNCATE64
#define gd_truncate ftruncate64
#elif defined HAVE_FTRUNCATE
@@ -759,6 +779,8 @@ ssize_t getdelim(char**, size_t*, int, FILE*);
#define GD_E_CODE_INVALID_NS 4
#define GD_E_CODE_REPR 5
+#define GD_E_TYPE_NULL 1
+
#define GD_E_IO_OPEN 1
#define GD_E_IO_READ 2
#define GD_E_IO_WRITE 3
@@ -897,6 +919,18 @@ struct gd_lut_ {
} y;
};
+/* field lists */
+struct gd_flist_ {
+ const char **alias_list;
+ const char **entry_list[GD_N_ENTRY_LISTS];
+ unsigned int entry_list_flags[GD_N_ENTRY_LISTS];
+ const char **string_value_list;
+ void *const_value_list;
+ gd_carray_t *carray_value_list;
+ uint32_t value_list_validity;
+ uint32_t entry_list_validity;
+};
+
/* Unified entry struct */
struct gd_private_entry_ {
gd_entry_t* entry[GD_MAX_LINCOM];
@@ -910,13 +944,7 @@ struct gd_private_entry_ {
/* field lists */
const char **alias_list;
- const char **entry_list[GD_N_ENTRY_LISTS];
- unsigned int entry_list_flags[GD_N_ENTRY_LISTS];
- const char **string_value_list;
- void *const_value_list;
- gd_carray_t *carray_value_list;
- uint32_t value_list_validity;
- uint32_t entry_list_validity;
+ struct gd_flist_ fl;
union {
struct { /* RAW */
@@ -1149,19 +1177,52 @@ struct gd_dirfile_ {
int n_fragment;
/* field lists */
- const char **entry_list[GD_N_ENTRY_LISTS];
- unsigned int entry_list_flags[GD_N_ENTRY_LISTS];
- const char **string_value_list;
- void *const_value_list;
- gd_carray_t *carray_value_list;
- uint32_t value_list_validity;
- uint32_t entry_list_validity;
+ struct gd_flist_ fl;
/* syntax error callback */
gd_parser_callback_t sehandler;
void* sehandler_extra;
};
+/* These are internal functions we need to expose so that modules can use them
+ */
+#ifdef USE_MODULES
+/* Alias the internal symbols to the external ones */
+#define _GD_MakeFullPathOnly gd_MakeFullPathOnly
+#define _GD_MakeTempFile gd_MakeTempFile
+#define _GD_StrError gd_StrError
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#else
+/* Alias the external symbols to the internal ones */
+#define gd_StrError _GD_StrError
+#define gd_MakeFullPathOnly _GD_MakeFullPathOnly
+#define gd_MakeTempFile _GD_MakeTempFile
+#endif
+
+#if !defined HAVE_STRERROR_R || defined STRERROR_R_CHAR_P
+int _GD_StrError(int errnum, char *buf, size_t buflen);
+#else
+# ifdef USE_MODULES
+# define gd_StrError strerror_r
+# else
+# define _GD_StrError strerror_r
+# endif
+#endif
+
+char *_GD_MakeFullPathOnly(const DIRFILE *D, int dirfd, const char *name);
+int _GD_MakeTempFile(const DIRFILE*, int, char*);
+
+#ifdef USE_MODULES
+#ifdef __cplusplus
+}
+#endif
+#endif
+
+
/* forward declarations */
void *_GD_Alloc(DIRFILE*, gd_type_t, size_t) __attribute_malloc__;
int _GD_BadInput(DIRFILE *, const gd_entry_t *, int, gd_entype_t, int);
@@ -1201,8 +1262,7 @@ size_t _GD_DoFieldOut(DIRFILE *restrict, gd_entry_t *restrict, off64_t, size_t,
off64_t _GD_DoSeek(DIRFILE *restrict, gd_entry_t *restrict,
const struct encoding_t *restrict, off64_t, unsigned int mode);
int _GD_EntryCmp(const void*, const void*);
-gd_entry_t *_GD_FindEntry(DIRFILE *restrict, const char *restrict,
- unsigned int *restrict, int, int);
+gd_entry_t *_GD_FindEntry(DIRFILE *restrict, const char *restrict);
gd_entry_t *_GD_FindField(const DIRFILE *restrict, const char *restrict,
gd_entry_t *const *, unsigned int, int, unsigned int *restrict);
gd_entry_t *_GD_FindFieldAndRepr(DIRFILE *restrict, const char *restrict,
@@ -1214,9 +1274,10 @@ int _GD_FiniRawIO(DIRFILE*, const gd_entry_t*, int, int);
void _GD_Flush(DIRFILE *restrict, gd_entry_t *restrict, int, int);
void _GD_FlushMeta(DIRFILE* D, int fragment, int force);
void _GD_FreeE(DIRFILE *restrict, gd_entry_t *restrict, int);
+void _GD_FreeFL(struct gd_flist_ *);
off64_t _GD_GetEOF(DIRFILE *restrict, const gd_entry_t *restrict,
const char *restrict, int *restrict);
-off64_t _GD_GetFilePos(DIRFILE *restrict, gd_entry_t *restrict, off64_t);
+off64_t _GD_GetIOPos(DIRFILE *restrict, gd_entry_t *restrict, off64_t);
char *_GD_GetLine(FILE *restrict, size_t *restrict, int *restrict);
int _GD_GetRepr(DIRFILE *restrict, const char *restrict,
char **restrict, int);
@@ -1245,29 +1306,6 @@ void _GD_LinterpData(DIRFILE *restrict, void *restrict, gd_type_t, int,
int _GD_ListEntry(const gd_entry_t *E, int meta, int hidden, int noalias,
int special, gd_entype_t type);
char *_GD_MakeFullPath(DIRFILE *restrict, int, const char *restrict, int);
-
-#ifdef USE_MODULES
-#define _GD_MakeFullPathOnly gd_MakeFullPathOnly
-#define _GD_MakeTempFile gd_MakeTempFile
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#else
-#define gd_MakeFullPathOnly _GD_MakeFullPathOnly
-#define gd_MakeTempFile _GD_MakeTempFile
-#endif
-
-char *_GD_MakeFullPathOnly(const DIRFILE *D, int dirfd, const char *name);
-int _GD_MakeTempFile(const DIRFILE*, int, char*);
-
-#ifdef USE_MODULES
-#ifdef __cplusplus
-}
-#endif
-#endif
-
void *_GD_Malloc(DIRFILE *D, size_t size);
int _GD_MissingFramework(int encoding, unsigned int funcs);
int _GD_MogrifyFile(DIRFILE *restrict, gd_entry_t *restrict, unsigned long int,
@@ -1319,6 +1357,7 @@ int _GD_GenericMove(int, struct gd_raw_file_ *restrict, int, char *restrict);
int _GD_GenericName(DIRFILE *restrict, const char *restrict,
struct gd_raw_file_ *restrict, const char *restrict, int, int);
int _GD_GenericUnlink(int, struct gd_raw_file_* file);
+int _GD_NopSync(struct gd_raw_file_*);
/* unencoded I/O methods */
int _GD_RawOpen(int, struct gd_raw_file_*, gd_type_t, int, unsigned int);
@@ -1364,7 +1403,6 @@ off64_t _GD_SampIndSize(int, struct gd_raw_file_* file, gd_type_t data_type,
#define _GD_Bzip2Seek lt_libgetdatabzip2_LTX_GD_Bzip2Seek
#define _GD_Bzip2Read lt_libgetdatabzip2_LTX_GD_Bzip2Read
#define _GD_Bzip2Write lt_libgetdatabzip2_LTX_GD_Bzip2Write
-#define _GD_Bzip2Sync lt_libgetdatabzip2_LTX_GD_Bzip2Sync
#define _GD_Bzip2Close lt_libgetdatabzip2_LTX_GD_Bzip2Close
#define _GD_Bzip2Size lt_libgetdatabzip2_LTX_GD_Bzip2Size
#define _GD_Bzip2Strerr lt_libgetdatabzip2_LTX_GD_Bzip2Strerr
@@ -1373,7 +1411,6 @@ off64_t _GD_SampIndSize(int, struct gd_raw_file_* file, gd_type_t data_type,
#define _GD_FlacSeek lt_libgetdataflac_LTX_GD_FlacSeek
#define _GD_FlacRead lt_libgetdataflac_LTX_GD_FlacRead
#define _GD_FlacWrite lt_libgetdataflac_LTX_GD_FlacWrite
-#define _GD_FlacSync lt_libgetdataflac_LTX_GD_FlacSync
#define _GD_FlacClose lt_libgetdataflac_LTX_GD_FlacClose
#define _GD_FlacSize lt_libgetdataflac_LTX_GD_FlacSize
#define _GD_FlacStrerr lt_libgetdataflac_LTX_GD_FlacStrerr
@@ -1382,7 +1419,6 @@ off64_t _GD_SampIndSize(int, struct gd_raw_file_* file, gd_type_t data_type,
#define _GD_GzipSeek lt_libgetdatagzip_LTX_GD_GzipSeek
#define _GD_GzipRead lt_libgetdatagzip_LTX_GD_GzipRead
#define _GD_GzipWrite lt_libgetdatagzip_LTX_GD_GzipWrite
-#define _GD_GzipSync lt_libgetdatagzip_LTX_GD_GzipSync
#define _GD_GzipClose lt_libgetdatagzip_LTX_GD_GzipClose
#define _GD_GzipSize lt_libgetdatagzip_LTX_GD_GzipSize
#define _GD_GzipStrerr lt_libgetdatagzip_LTX_GD_GzipStrerr
@@ -1432,7 +1468,6 @@ ssize_t _GD_Bzip2Read(struct gd_raw_file_ *restrict, void *restrict, gd_type_t,
size_t);
ssize_t _GD_Bzip2Write(struct gd_raw_file_ *restrict, const void *restrict,
gd_type_t, size_t);
-int _GD_Bzip2Sync(struct gd_raw_file_*);
int _GD_Bzip2Close(struct gd_raw_file_*);
off64_t _GD_Bzip2Size(int, struct gd_raw_file_*, gd_type_t, int);
int _GD_Bzip2Strerr(const struct gd_raw_file_*, char*, size_t);
@@ -1445,7 +1480,6 @@ ssize_t _GD_FlacRead(struct gd_raw_file_ *restrict, void *restrict, gd_type_t,
size_t);
ssize_t _GD_FlacWrite(struct gd_raw_file_ *restrict, const void *restrict,
gd_type_t, size_t);
-int _GD_FlacSync(struct gd_raw_file_*);
int _GD_FlacClose(struct gd_raw_file_* file);
off64_t _GD_FlacSize(int, struct gd_raw_file_* file, gd_type_t data_type,
int swap);
@@ -1459,7 +1493,6 @@ ssize_t _GD_GzipRead(struct gd_raw_file_ *restrict, void *restrict, gd_type_t,
size_t);
ssize_t _GD_GzipWrite(struct gd_raw_file_ *restrict, const void *restrict,
gd_type_t, size_t);
-int _GD_GzipSync(struct gd_raw_file_*);
int _GD_GzipClose(struct gd_raw_file_* file);
off64_t _GD_GzipSize(int, struct gd_raw_file_* file, gd_type_t data_type,
int swap);
diff --git a/src/fpos.c b/src/iopos.c
similarity index 83%
rename from src/fpos.c
rename to src/iopos.c
index d64c098..8a0b695 100644
--- a/src/fpos.c
+++ b/src/iopos.c
@@ -20,18 +20,18 @@
*/
#include "internal.h"
-off64_t _GD_GetFilePos(DIRFILE *D, gd_entry_t *E, off64_t index_pos)
+off64_t _GD_GetIOPos(DIRFILE *D, gd_entry_t *E, off64_t index_pos)
{
int i;
off64_t pos = -1, pos2;
- dtrace("%p, %p, %lli", D, E, (long long)index_pos);
+ dtrace("%p, %p, %" PRId64, D, E, (int64_t)index_pos);
if (++D->recurse_level >= GD_MAX_RECURSE_LEVEL) {
_GD_SetError(D, GD_E_RECURSE_LEVEL, GD_E_RECURSE_CODE, NULL, 0, E->field);
- dreturn("%u", 0);
D->recurse_level--;
- return 0;
+ dreturn("%u", -1);
+ return -1;
}
switch (E->field_type) {
@@ -50,14 +50,14 @@ off64_t _GD_GetFilePos(DIRFILE *D, gd_entry_t *E, off64_t index_pos)
if (_GD_BadInput(D, E, 0, GD_NO_ENTRY, 1))
break;
- pos = _GD_GetFilePos(D, E->e->entry[0], -1);
+ pos = _GD_GetIOPos(D, E->e->entry[0], -1);
if (!D->error)
for (i = 1; i < E->EN(lincom,n_fields); ++i) {
if (_GD_BadInput(D, E, i, GD_NO_ENTRY, 1)) {
pos = -1;
break;
}
- pos2 = _GD_GetFilePos(D, E->e->entry[i], pos);
+ pos2 = _GD_GetIOPos(D, E->e->entry[i], pos);
if (pos2 != pos) {
_GD_SetError(D, GD_E_DOMAIN, GD_E_DOMAIN_MULTIPOS, NULL, 0, NULL);
pos = -1;
@@ -72,7 +72,7 @@ off64_t _GD_GetFilePos(DIRFILE *D, gd_entry_t *E, off64_t index_pos)
case GD_RECIP_ENTRY:
if (_GD_BadInput(D, E, 0, GD_NO_ENTRY, 1))
break;
- pos = _GD_GetFilePos(D, E->e->entry[0], -1);
+ pos = _GD_GetIOPos(D, E->e->entry[0], -1);
break;
case GD_MULTIPLY_ENTRY:
case GD_DIVIDE_ENTRY:
@@ -83,10 +83,10 @@ off64_t _GD_GetFilePos(DIRFILE *D, gd_entry_t *E, off64_t index_pos)
{
break;
}
- pos = _GD_GetFilePos(D, E->e->entry[0], -1);
+ pos = _GD_GetIOPos(D, E->e->entry[0], -1);
if (D->error)
break;
- pos2 = _GD_GetFilePos(D, E->e->entry[1], pos);
+ pos2 = _GD_GetIOPos(D, E->e->entry[1], pos);
if (!D->error && pos != pos2) {
_GD_SetError(D, GD_E_DOMAIN, GD_E_DOMAIN_MULTIPOS, NULL, 0, NULL);
pos = -1;
@@ -95,7 +95,7 @@ off64_t _GD_GetFilePos(DIRFILE *D, gd_entry_t *E, off64_t index_pos)
case GD_PHASE_ENTRY:
if (_GD_BadInput(D, E, 0, GD_NO_ENTRY, 1))
break;
- pos = _GD_GetFilePos(D, E->e->entry[0], -1);
+ pos = _GD_GetIOPos(D, E->e->entry[0], -1);
if (pos >= 0)
pos += E->EN(phase,shift);
break;
@@ -114,7 +114,7 @@ off64_t _GD_GetFilePos(DIRFILE *D, gd_entry_t *E, off64_t index_pos)
}
D->recurse_level--;
- dreturn("%lli", (long long)pos);
+ dreturn("%" PRId64, (int64_t)pos);
return pos;
}
@@ -129,25 +129,25 @@ off64_t gd_tell64(DIRFILE *D, const char *field_code) gd_nothrow
if (D->flags & GD_INVALID) {/* don't crash */
_GD_SetError(D, GD_E_BAD_DIRFILE, 0, NULL, 0, NULL);
- dreturn("%u", 0);
- return 0;
+ dreturn("%u", -1);
+ return -1;
}
_GD_ClearError(D);
- entry = _GD_FindEntry(D, field_code, NULL, 1, 1);
+ entry = _GD_FindEntry(D, field_code);
if (D->error) {
- dreturn("%u", 0);
- return 0;
+ dreturn("%u", -1);
+ return -1;
}
if (entry->field_type & GD_SCALAR_ENTRY_BIT)
_GD_SetError(D, GD_E_DIMENSION, GD_E_DIM_CALLER, NULL, 0, field_code);
else
- pos = _GD_GetFilePos(D, entry, -1);
+ pos = _GD_GetIOPos(D, entry, -1);
- dreturn("%lli", (long long)pos);
+ dreturn("%" PRId64, (int64_t)pos);
return pos;
}
@@ -164,7 +164,16 @@ off64_t _GD_DoSeek(DIRFILE *D, gd_entry_t *E, const struct encoding_t *enc,
const int oop_write = ((enc->flags & GD_EF_OOP) && (mode & GD_FILE_WRITE))
? 1 : 0;
- dtrace("%p, %p, %p, %lli, 0x%X", D, E, enc, (long long)offset, mode);
+ dtrace("%p, %p, %p, %" PRId64 ", 0x%X", D, E, enc, (int64_t)offset, mode);
+
+ /* Yet another overflow check */
+ if (GD_SIZE(E->EN(raw,data_type)) > 0 &&
+ offset > GD_INT64_MAX / GD_SIZE(E->EN(raw,data_type)))
+ {
+ _GD_SetError(D, GD_E_RANGE, GD_E_OUT_OF_RANGE, NULL, 0, NULL);
+ dreturn("%i", -1);
+ return -1;
+ }
if (oop_write) {
/* in this case we need to close and then re-open the file */
@@ -238,7 +247,7 @@ off64_t _GD_DoSeek(DIRFILE *D, gd_entry_t *E, const struct encoding_t *enc,
_GD_SetEncIOError(D, (mode & GD_FILE_WRITE) ? GD_E_IO_WRITE : GD_E_IO_READ,
E->e->u.raw.file + 0);
- dreturn("%lli", (long long)pos);
+ dreturn("%" PRId64, (int64_t)pos);
return pos;
}
@@ -246,7 +255,7 @@ int _GD_Seek(DIRFILE *D, gd_entry_t *E, off64_t offset, unsigned int mode)
{
int i;
- dtrace("%p, %p, %lli, 0x%X", D, E, (long long)offset, mode);
+ dtrace("%p, %p, %" PRId64 ", 0x%X", D, E, (int64_t)offset, mode);
if (++D->recurse_level >= GD_MAX_RECURSE_LEVEL) {
_GD_SetError(D, GD_E_RECURSE_LEVEL, GD_E_RECURSE_CODE, NULL, 0, E->field);
@@ -338,18 +347,18 @@ off64_t gd_seek64(DIRFILE *D, const char *field_code, off64_t frame_num,
int is_index = 0;
unsigned int mode = (whence & GD_SEEK_WRITE) ? GD_FILE_WRITE : GD_FILE_READ;
- dtrace("%p, \"%s\", %lli, %lli, 0x%X", D, field_code, (long long)frame_num,
- (long long)sample_num, whence);
+ dtrace("%p, \"%s\", %" PRId64 ", %" PRId64 ", 0x%X", D, field_code,
+ (int64_t)frame_num, (int64_t)sample_num, whence);
if (D->flags & GD_INVALID) {/* don't crash */
_GD_SetError(D, GD_E_BAD_DIRFILE, 0, NULL, 0, NULL);
- dreturn("%u", 0);
- return 0;
+ dreturn("%u", -1);
+ return -1;
}
_GD_ClearError(D);
- entry = _GD_FindEntry(D, field_code, NULL, 1, 1);
+ entry = _GD_FindEntry(D, field_code);
if (D->error) {
dreturn("%i", -1);
@@ -369,15 +378,23 @@ off64_t gd_seek64(DIRFILE *D, const char *field_code, off64_t frame_num,
dreturn("%i", -1);
return -1;
}
- }
- sample_num += frame_num * spf;
+ /* don't overflow */
+ if ((frame_num > 0 && sample_num > GD_INT64_MAX - spf * frame_num) ||
+ (frame_num < 0 && sample_num < -GD_INT64_MAX - spf * frame_num))
+ {
+ _GD_SetError(D, GD_E_RANGE, GD_E_OUT_OF_RANGE, NULL, 0, NULL);
+ dreturn("%i", -1);
+ return -1;
+ }
+ sample_num += frame_num * spf;
+ }
whence &= (GD_SEEK_SET | GD_SEEK_CUR | GD_SEEK_END);
if (whence == GD_SEEK_SET)
pos = 0;
else if (whence == GD_SEEK_CUR)
- pos = _GD_GetFilePos(D, entry, -1);
+ pos = _GD_GetIOPos(D, entry, -1);
else if (whence == GD_SEEK_END) {
pos = _GD_GetEOF(D, entry, NULL, &is_index);
if (is_index)
@@ -385,15 +402,24 @@ off64_t gd_seek64(DIRFILE *D, const char *field_code, off64_t frame_num,
} else
_GD_SetError(D, GD_E_ARGUMENT, GD_E_ARG_WHENCE, NULL, 0, NULL);
+ /* Check for overflow again */
+ if ((sample_num > 0 && pos > GD_INT64_MAX - sample_num) ||
+ (sample_num < 0 && pos < -GD_INT64_MAX - sample_num))
+ {
+ _GD_SetError(D, GD_E_RANGE, GD_E_OUT_OF_RANGE, NULL, 0, NULL);
+ dreturn("%i", 0);
+ return 0;
+ }
+
if (!D->error)
_GD_Seek(D, entry, sample_num + pos, mode);
if (D->error)
pos = -1;
else
- pos = _GD_GetFilePos(D, entry, -1);
+ pos = _GD_GetIOPos(D, entry, -1);
- dreturn("%lli", (long long)pos);
+ dreturn("%" PRId64, (int64_t)pos);
return pos;
}
diff --git a/src/legacy.c b/src/legacy.c
index 9d663ec..66c4890 100644
--- a/src/legacy.c
+++ b/src/legacy.c
@@ -56,11 +56,11 @@ const char *GD_ERROR_CODES[GD_N_ERROR_CODES] = {
"Internal error", /* GD_E_INTERNAL_ERROR */
"Memory allocation failed", /* GD_E_ALLOC */
"Request out-of-range", /* GD_E_RANGE */
- "Bad LINTERP table", /* GD_E_LINTERP */
+ "Syntax error in LINTERP table", /* GD_E_LUT */
"Too many levels of recursion", /* GD_E_RECURSE_LEVEL */
"Bad dirfile", /* GD_E_BAD_DIRFILE */
"Bad field type", /* GD_E_BAD_FIELD_TYPE */
- "Read-only dirfile", /* GD_E_ACC_MODE */
+ "Read-only dirfile", /* GD_E_ACCMODE */
"Operation not supported by current encoding scheme", /* GD_E_UNSUPPORTED */
"Unknown encoding scheme", /* GD_E_UNKNOWN_ENCODING */
NULL, /* GD_E_BAD_ENTRY */
@@ -76,7 +76,7 @@ const char *GD_ERROR_CODES[GD_N_ERROR_CODES] = {
NULL, /* GD_E_EXISTS */
NULL, /* GD_E_UNCLEAN_DB */
"Improper domain", /* GD_E_DOMAIN */
- "Bad representation", /* GD_E_BAD_REPR */
+ NULL, /* unused */
NULL, /* unused */
NULL, /* unused */
NULL, /* GD_E_BOUNDS */
diff --git a/src/lzma.c b/src/lzma.c
index 647e19e..c0fab1a 100644
--- a/src/lzma.c
+++ b/src/lzma.c
@@ -93,6 +93,7 @@ static struct gd_lzmadata *_GD_LzmaDoOpen(int dirfd, struct gd_raw_file_* file,
if ((lzd = (struct gd_lzmadata *)malloc(sizeof(struct gd_lzmadata))) == NULL)
{
+ fclose(stream);
dreturn("%p", NULL);
return NULL;
}
@@ -152,7 +153,7 @@ static int _GD_LzmaReady(struct gd_lzmadata *lzd, size_t nreq, int *errnum)
lzma_ret e;
int ready = READY(*lzd);
- dtrace("%p, %" PRNsize_t " %p", lzd, nreq, errnum);
+ dtrace("%p, %" PRIuSIZE " %p", lzd, nreq, errnum);
/* already have enough data, or no more data to read */
if (LZEOF(*lzd) || (size_t)ready >= nreq) {
@@ -249,7 +250,7 @@ ssize_t _GD_LzmaWrite(struct gd_raw_file_ *file, const void *data,
size_t n;
struct gd_lzmadata *lzd = (struct gd_lzmadata *)file->edata;
- dtrace("%p, %p, 0x%X, %" PRNsize_t, file, data, data_type, nmemb);
+ dtrace("%p, %p, 0x%X, %" PRIuSIZE, file, data, data_type, nmemb);
n = nmemb * GD_SIZE(data_type);
@@ -273,7 +274,7 @@ ssize_t _GD_LzmaWrite(struct gd_raw_file_ *file, const void *data,
}
/* we always write all the input, if successful */
- dreturn("%" PRNssize_t, (ssize_t)nmemb);
+ dreturn("%" PRIdSIZE, (ssize_t)nmemb);
return nmemb;
}
@@ -284,7 +285,7 @@ off64_t _GD_LzmaSeek(struct gd_raw_file_* file, off64_t count,
lzma_ret e;
uint64_t bcount;
- dtrace("%p, %lli, 0x%X, 0x%X", file, (long long)count, data_type, mode);
+ dtrace("%p, %" PRId64 ", 0x%X, 0x%X", file, (int64_t)count, data_type, mode);
bcount = count * GD_SIZE(data_type);
@@ -298,7 +299,7 @@ off64_t _GD_LzmaSeek(struct gd_raw_file_* file, off64_t count,
lzd->offset = bcount - BASE(*lzd);
file->pos = count;
- dreturn("%lli", (long long)(file->pos));
+ dreturn("%" PRId64, (int64_t)(file->pos));
return file->pos;
}
@@ -314,9 +315,9 @@ off64_t _GD_LzmaSeek(struct gd_raw_file_* file, off64_t count,
if (e != LZMA_OK) {
file->error = e;
file->idata = -1;
+ fclose(lzd->stream);
free(lzd);
file->edata = NULL;
- fclose(lzd->stream);
dreturn("%i", 1);
return 1;
}
@@ -360,7 +361,7 @@ off64_t _GD_LzmaSeek(struct gd_raw_file_* file, off64_t count,
file->pos = lzd->xz.total_in / GD_SIZE(data_type);
}
- dreturn("%lli", (long long)(file->pos));
+ dreturn("%" PRId64, (int64_t)file->pos);
return file->pos;
}
@@ -371,7 +372,7 @@ ssize_t _GD_LzmaRead(struct gd_raw_file_ *file, void *data, gd_type_t data_type,
struct gd_lzmadata *lzd = (struct gd_lzmadata *)file->edata;
ssize_t nread = 0;
- dtrace("%p, %p, 0x%X, %" PRNsize_t, file, data, data_type, nmemb);
+ dtrace("%p, %p, 0x%X, %" PRIuSIZE, file, data, data_type, nmemb);
if (nmemb > GD_SSIZE_T_MAX / GD_SIZE(data_type))
nmemb = GD_SSIZE_T_MAX / GD_SIZE(data_type);
@@ -408,7 +409,7 @@ ssize_t _GD_LzmaRead(struct gd_raw_file_ *file, void *data, gd_type_t data_type,
break;
}
- dreturn("%" PRNssize_t, nread);
+ dreturn("%" PRIdSIZE, nread);
return nread;
}
@@ -507,7 +508,7 @@ off64_t _GD_LzmaSize(int dirfd, struct gd_raw_file_ *file, gd_type_t data_type,
free(lzd);
- dreturn("%lli", (long long)n);
+ dreturn("%" PRId64, (int64_t)n);
return n;
}
@@ -515,11 +516,11 @@ int _GD_LzmaStrerr(const struct gd_raw_file_ *file, char *buf, size_t buflen)
{
int r = 0;
- dtrace("%p, %p, %" PRNsize_t, file, buf, buflen);
+ dtrace("%p, %p, %" PRIuSIZE, file, buf, buflen);
switch(file->error) {
case LZMA_OK:
- r = gd_strerror(errno, buf, buflen);
+ r = gd_StrError(errno, buf, buflen);
break;
case LZMA_MEM_ERROR:
case LZMA_MEMLIMIT_ERROR:
diff --git a/src/mod.c b/src/mod.c
index b204aa5..a3df845 100644
--- a/src/mod.c
+++ b/src/mod.c
@@ -142,7 +142,7 @@ static void _GD_SPFConvert(DIRFILE* D, void *A, unsigned int spfA, void *B,
{
size_t i;
- dtrace("%p, %p, %u, %p, %u, 0x%X, %" PRNsize_t, D, A, spfA, B, spfB, type, n);
+ dtrace("%p, %p, %u, %p, %u, 0x%X, %" PRIuSIZE, D, A, spfA, B, spfB, type, n);
switch (type) {
case GD_NULL: /* null read */
@@ -198,7 +198,7 @@ static void _GD_SPFConvert(DIRFILE* D, void *A, unsigned int spfA, void *B,
2 * sizeof(double));
break;
default:
- _GD_SetError(D, GD_E_BAD_TYPE, type, NULL, 0, NULL);
+ _GD_SetError(D, GD_E_BAD_TYPE, 0, NULL, type, NULL);
break;
}
@@ -303,7 +303,7 @@ static int _GD_Change(DIRFILE *D, const char *field_code, const gd_entry_t *N,
if (Q.EN(raw,data_type) & 0x40 ||
(Qe.u.raw.size = GD_SIZE(Q.EN(raw,data_type))) == 0)
{
- _GD_SetError(D, GD_E_BAD_TYPE, Q.EN(raw,data_type), NULL, 0, NULL);
+ _GD_SetError(D, GD_E_BAD_TYPE, 0, NULL, Q.EN(raw,data_type), NULL);
dreturn("%i", -1);
return -1;
}
@@ -869,7 +869,7 @@ static int _GD_Change(DIRFILE *D, const char *field_code, const gd_entry_t *N,
if (Q.EN(scalar,const_type) & 0x40 || GD_SIZE(Q.EN(scalar,const_type))
== 0)
{
- _GD_SetError(D, GD_E_BAD_TYPE, Q.EN(scalar,const_type), NULL, 0, NULL);
+ _GD_SetError(D, GD_E_BAD_TYPE, 0, NULL, Q.EN(scalar,const_type), NULL);
dreturn("%i", -1);
return -1;
}
@@ -925,7 +925,7 @@ static int _GD_Change(DIRFILE *D, const char *field_code, const gd_entry_t *N,
if (Q.EN(scalar,const_type) & 0x40 ||
GD_SIZE(Q.EN(scalar,const_type)) == 0)
{
- _GD_SetError(D, GD_E_BAD_TYPE, Q.EN(scalar,const_type), NULL, 0,
+ _GD_SetError(D, GD_E_BAD_TYPE, 0, NULL, Q.EN(scalar,const_type),
NULL);
break;
}
@@ -1391,7 +1391,7 @@ int gd_alter_phase(DIRFILE* D, const char* field_code, const char* in_field,
int ret;
gd_entry_t N;
- dtrace("%p, \"%s\", \"%s\", %lli", D, field_code, in_field, (long long)shift);
+ dtrace("%p, \"%s\", \"%s\", %" PRId64, D, field_code, in_field, shift);
if (D->flags & GD_INVALID) {/* don't crash */
_GD_SetError(D, GD_E_BAD_DIRFILE, 0, NULL, 0, NULL);
@@ -1441,7 +1441,7 @@ int gd_alter_carray(DIRFILE* D, const char* field_code, gd_type_t const_type,
int ret;
gd_entry_t N;
- dtrace("%p, \"%s\", 0x%X, %" PRNsize_t, D, field_code, const_type, array_len);
+ dtrace("%p, \"%s\", 0x%X, %" PRIuSIZE, D, field_code, const_type, array_len);
if (D->flags & GD_INVALID) {
_GD_SetError(D, GD_E_BAD_DIRFILE, 0, NULL, 0, NULL);
@@ -1578,9 +1578,9 @@ gd_nothrow
int ret;
gd_entry_t N;
- dtrace("%p, \"%s\", \"%s\", \"%s\", %i, {%g,%llx,%lli}", D, field_code,
- in_field, check_field, windop, threshold.r,
- (unsigned long long)threshold.u, (long long)threshold.i);
+ dtrace("%p, \"%s\", \"%s\", \"%s\", %i, {%g,%" PRIX64 ",%" PRId64 "}", D,
+ field_code, in_field, check_field, windop, threshold.r, threshold.u,
+ threshold.i);
if (D->flags & GD_INVALID) {
_GD_SetError(D, GD_E_BAD_DIRFILE, 0, NULL, 0, NULL);
@@ -1632,16 +1632,17 @@ gd_nothrow
return ret;
}
-int gd_alter_spec(DIRFILE* D, const char* line, int move)
+static int _GD_AlterSpec(DIRFILE* D, const char* line, const char* parent,
+ const char *name, int move)
{
- const char *tok_pos = NULL;
char *outstring = NULL, *new_code;
+ const char *tok_pos;
char *in_cols[MAX_IN_COLS];
int n_cols, ret;
gd_entry_t *N = NULL;
struct parser_state p;
- dtrace("%p, \"%s\", %i", D, line, move);
+ dtrace("%p, \"%s\", \"%s\", \"%s\", %i", D, line, parent, name, move);
if (D->flags & GD_INVALID) {/* don't crash */
_GD_SetError(D, GD_E_BAD_DIRFILE, 0, NULL, 0, NULL);
@@ -1659,56 +1660,64 @@ int gd_alter_spec(DIRFILE* D, const char* line, int move)
_GD_ClearError(D);
/* start parsing */
- _GD_SimpleParserInit(D, "gd_alter_spec()", &p);
+ _GD_SimpleParserInit(D, name, &p);
n_cols = _GD_Tokenise(D, &p, line, &outstring, &tok_pos, MAX_IN_COLS,
in_cols);
+ /* Sanity check */
+ if (!D->error && n_cols == 0)
+ _GD_SetError(D, GD_E_FORMAT, GD_E_FORMAT_N_TOK, name, 0, NULL);
+
if (D->error) {
free(outstring);
dreturn("%i", -1); /* tokeniser threw an error */
return -1;
}
- /* Sanity check */
- if (n_cols == 0) {
- free(outstring);
- _GD_SetError(D, GD_E_FORMAT, GD_E_FORMAT_N_TOK, "dirfile_alter_spec()", 0,
- NULL);
- dreturn("%i", -1);
- return -1;
+ if (parent) {
+ N = _GD_FindField(D, parent, D->entry, D->n_entries, 1, NULL);
+ if (N == NULL)
+ _GD_SetError(D, GD_E_BAD_CODE, GD_E_CODE_MISSING, NULL, 0, parent);
+ } else {
+ N = _GD_FindField(D, in_cols[0], D->entry, D->n_entries, 1, NULL);
+ if (N == NULL)
+ _GD_SetError(D, GD_E_BAD_CODE, GD_E_CODE_MISSING, NULL, 0, in_cols[0]);
}
- N = _GD_FindField(D, in_cols[0], D->entry, D->n_entries, 1, NULL);
-
- if (N == NULL) {
+ if (D->error) {
free(outstring);
- _GD_SetError(D, GD_E_BAD_CODE, GD_E_CODE_MISSING, NULL, 0, in_cols[0]);
dreturn("%i", -1);
return -1;
}
/* the parser will modifiy in_cols[0] if it contains a metafield code */
- if ((new_code = _GD_Strdup(D, in_cols[0])) == NULL) {
+ if (parent) {
+ if ((new_code = _GD_Malloc(D, strlen(parent) + strlen(in_cols[0]) + 2)))
+ sprintf(new_code, "%s/%s", parent, in_cols[0]);
+ } else
+ new_code = _GD_Strdup(D, in_cols[0]);
+
+ if (D->error) { /* malloc error */
+ free(outstring);
dreturn("%i", -1);
return -1;
}
/* Let the parser compose the entry */
- N = _GD_ParseFieldSpec(D, &p, n_cols, in_cols, NULL, N->fragment_index, 0, 0,
- &outstring, tok_pos);
+ N = _GD_ParseFieldSpec(D, &p, n_cols, in_cols, parent ? N : NULL,
+ N->fragment_index, 0, 0, &outstring, tok_pos);
+
+ /* The parser will have re-applied the prefix and suffix, undo that */
+ free(N->field);
+ N->field = new_code;
free(outstring);
if (D->error) {
- free(new_code);
dreturn("%i", -1); /* field spec parser threw an error */
return -1;
}
- /* The parse will have re-applied the prefix and suffix, undo that */
- free(N->field);
- N->field = new_code;
-
if (N->field_type == GD_LINCOM_ENTRY || N->field_type == GD_POLYNOM_ENTRY)
move = 7;
@@ -1721,69 +1730,25 @@ int gd_alter_spec(DIRFILE* D, const char* line, int move)
return ret;
}
-int gd_malter_spec(DIRFILE* D, const char* line, const char* parent, int move)
+int gd_alter_spec(DIRFILE* D, const char* line, int move)
{
- char *outstring = NULL;
- const char *tok_pos;
- char *in_cols[MAX_IN_COLS];
- int n_cols, ret;
- gd_entry_t *N = NULL;
- struct parser_state p;
-
- dtrace("%p, \"%s\", \"%s\", %i", D, line, parent, move);
-
- if (D->flags & GD_INVALID) {/* don't crash */
- _GD_SetError(D, GD_E_BAD_DIRFILE, 0, NULL, 0, NULL);
- dreturn("%i", -1);
- return -1;
- }
-
- /* check access mode */
- if ((D->flags & GD_ACCMODE) == GD_RDONLY) {
- _GD_SetError(D, GD_E_ACCMODE, 0, NULL, 0, NULL);
- dreturn("%i", -1);
- return -1;
- }
-
- _GD_ClearError(D);
-
- N = _GD_FindField(D, parent, D->entry, D->n_entries, 1, NULL);
- if (N == NULL) {
- _GD_SetError(D, GD_E_BAD_CODE, GD_E_CODE_MISSING, NULL, 0, parent);
- dreturn("%i", -1);
- return -1;
- }
-
- /* start parsing */
- _GD_SimpleParserInit(D, "gd_malter_spec()", &p);
- n_cols = _GD_Tokenise(D, &p, line, &outstring, &tok_pos, MAX_IN_COLS,
- in_cols);
-
- if (!D->error) {
- /* Let the parser compose the entry */
- N = _GD_ParseFieldSpec(D, &p, n_cols, in_cols, N, N->fragment_index, 0, 0,
- &outstring, tok_pos);
+ int ret;
- /* The parse will have re-applied the prefix and suffix, undo that */
- free(N->field);
- if ((N->field = _GD_Malloc(D, strlen(parent) + strlen(in_cols[0]) + 2)))
- sprintf(N->field, "%s/%s", parent, in_cols[0]);
- }
+ dtrace("%p, \"%s\", %i", D, line, move);
- free(outstring);
+ ret = _GD_AlterSpec(D, line, NULL, "gd_alter_spec()", move);
- if (D->error) {
- dreturn("%i", -1); /* field spec parser threw an error */
- return -1;
- }
+ dreturn("%i", ret);
+ return ret;
+}
- if (N->field_type == GD_LINCOM_ENTRY || N->field_type == GD_POLYNOM_ENTRY)
- move = 7;
+int gd_malter_spec(DIRFILE* D, const char* line, const char* parent, int move)
+{
+ int ret;
- /* Change the entry */
- ret = _GD_Change(D, N->field, N, move);
+ dtrace("%p, \"%s\", \"%s\", %i", D, line, parent, move);
- _GD_FreeE(D, N, 1);
+ ret = _GD_AlterSpec(D, line, parent, "gd_malter_spec()", move);
dreturn("%i", ret);
return ret;
diff --git a/src/move.c b/src/move.c
index 599e434..0b74cb1 100644
--- a/src/move.c
+++ b/src/move.c
@@ -33,8 +33,8 @@ int _GD_MogrifyFile(DIRFILE* D, gd_entry_t* E, unsigned long encoding,
int arm_fix = 0, endian_fix = 0;
void *buffer;
- dtrace("%p, %p, %lu, %lu, %lli, %i, %i, %p", D, E, encoding, byte_sex,
- (long long)offset, finalise, new_fragment, new_filebase);
+ dtrace("%p, %p, %lu, %lu, %" PRId64 ", %i, %i, %p", D, E, encoding, byte_sex,
+ (int64_t)offset, finalise, new_fragment, new_filebase);
if (new_fragment == -1)
new_fragment = E->fragment_index;
@@ -315,7 +315,7 @@ int _GD_StrCmpNull(const char *s1, const char *s2)
return r;
}
-int _GD_Move(DIRFILE *D, gd_entry_t *E, int new_fragment, unsigned flags)
+static int _GD_Move(DIRFILE *D, gd_entry_t *E, int new_fragment, unsigned flags)
{
char *new_filebase, *new_code;
struct gd_rename_data_ *rdat = NULL;
diff --git a/src/name.c b/src/name.c
index 0bf594b..2af95e3 100644
--- a/src/name.c
+++ b/src/name.c
@@ -32,7 +32,7 @@ char *_GD_MungeCode(DIRFILE *D, const char *ns, size_t len_newns,
const char *ptr, *slash, *old_ns;
char *new_code, *nptr;
- dtrace("%p, \"%s\", %" PRNsize_t ", \"%s\", \"%s\", \"%s\", \"%s\", \"%s\", "
+ dtrace("%p, \"%s\", %" PRIuSIZE ", \"%s\", \"%s\", \"%s\", \"%s\", \"%s\", "
"%p, 0x%X", D, ns, len_newns, old_prefix, old_suffix, new_prefix,
new_suffix, code, nso, flags);
@@ -339,7 +339,7 @@ static int _GD_MatchCode(const char *candidate, const char *code, size_t len,
{
int c;
- dtrace("\"%s\", \"%s\", %" PRNsize_t ", %i", candidate, code, len,
+ dtrace("\"%s\", \"%s\", %" PRIuSIZE ", %i", candidate, code, len,
meta_ok);
if (strncmp(candidate, code, len)) {
@@ -726,11 +726,11 @@ void _GD_PerformRename(DIRFILE *restrict D,
/* Invalidate the field lists */
if (rdat->E->e->n_meta == -1) {
- rdat->E->e->p.parent->e->value_list_validity = 0;
- rdat->E->e->p.parent->e->entry_list_validity = 0;
+ rdat->E->e->p.parent->e->fl.value_list_validity = 0;
+ rdat->E->e->p.parent->e->fl.entry_list_validity = 0;
} else {
- D->value_list_validity = 0;
- D->entry_list_validity = 0;
+ D->fl.value_list_validity = 0;
+ D->fl.entry_list_validity = 0;
}
/* rehash the aliases */
diff --git a/src/nframes.c b/src/nframes.c
index 71c9a7b..c919a27 100644
--- a/src/nframes.c
+++ b/src/nframes.c
@@ -74,14 +74,14 @@ off64_t gd_nframes64(DIRFILE* D)
if (nf < 0) {
_GD_SetEncIOError(D, GD_E_IO_READ, D->reference_field->e->u.raw.file);
- dreturn("%lli", 0LL);
+ dreturn("%i", 0);
return 0;
}
nf /= D->reference_field->EN(raw,spf);
nf += D->fragment[D->reference_field->fragment_index].frame_offset;
- dreturn("%lli", (unsigned long long)nf);
+ dreturn("%" PRId64, (int64_t)nf);
return nf;
}
diff --git a/src/open.c b/src/open.c
index d3a5f2c..b44766d 100644
--- a/src/open.c
+++ b/src/open.c
@@ -589,6 +589,7 @@ DIRFILE *_GD_Open(DIRFILE *D, int dirfd, const char *filedir,
0;
D->fragment[0].suffix = D->fragment[0].prefix = NULL;
D->fragment[0].ns = NULL;
+ D->fragment[0].nsl = 0;
/* parser proto-state */
p.line = 0;
diff --git a/src/parse.c b/src/parse.c
index 81d598a..e0ccaee 100644
--- a/src/parse.c
+++ b/src/parse.c
@@ -31,31 +31,32 @@ static gd_type_t _GD_RawType(const char* type, int standards, int pedantic)
else if (pedantic && standards < 5)
t = GD_UNKNOWN;
- else if (strcmp(type, "NULL") == 0)
- t = GD_NULL;
- else if (strcmp(type, "INT8") == 0)
- t = GD_INT8;
- else if (strcmp(type, "UINT8") == 0)
- t = GD_UINT8;
- else if (strcmp(type, "INT16") == 0)
- t = GD_INT16;
- else if (strcmp(type, "INT32") == 0)
- t = GD_INT32;
- else if (strcmp(type, "UINT32") == 0)
- t = GD_UINT32;
- else if (strcmp(type, "UINT64") == 0)
- t = GD_UINT64;
- else if (strcmp(type, "INT64") == 0)
- t = GD_INT64;
- else if (strcmp(type, "UINT16") == 0)
- t = GD_UINT16;
- else if (strcmp(type, "FLOAT32") == 0)
- t = GD_FLOAT32;
- else if (strcmp(type, "FLOAT") == 0)
- t = GD_FLOAT32;
- else if (strcmp(type, "FLOAT64") == 0)
- t = GD_FLOAT64;
- else if (strcmp(type, "DOUBLE") == 0)
+ else if (type[0] == 'I') {
+ if (strcmp(type, "INT8") == 0)
+ t = GD_INT8;
+ else if (strcmp(type, "INT16") == 0)
+ t = GD_INT16;
+ else if (strcmp(type, "INT32") == 0)
+ t = GD_INT32;
+ else if (strcmp(type, "INT64") == 0)
+ t = GD_INT64;
+ } else if (type[0] == 'U') {
+ if (strcmp(type, "UINT8") == 0)
+ t = GD_UINT8;
+ else if (strcmp(type, "UINT16") == 0)
+ t = GD_UINT16;
+ else if (strcmp(type, "UINT32") == 0)
+ t = GD_UINT32;
+ else if (strcmp(type, "UINT64") == 0)
+ t = GD_UINT64;
+ } else if (type[0] == 'F') {
+ if (strcmp(type, "FLOAT32") == 0)
+ t = GD_FLOAT32;
+ else if (strcmp(type, "FLOAT") == 0)
+ t = GD_FLOAT32;
+ else if (strcmp(type, "FLOAT64") == 0)
+ t = GD_FLOAT64;
+ } else if (strcmp(type, "DOUBLE") == 0)
t = GD_FLOAT64;
else if (pedantic && standards < 7)
t = GD_UNKNOWN;
@@ -520,7 +521,7 @@ static char *_GD_SetScalar(DIRFILE *restrict D,
return NULL;
carray_check:
- /* look a < > delimeters */
+ /* look for < > delimeters */
*index = -1;
for (lt = ptr; *lt; ++lt) {
if (*lt == '<') {
@@ -679,9 +680,10 @@ static gd_entry_t *_GD_ParseLincom(DIRFILE *restrict D,
if ((E->EN(lincom,n_fields) < 1) || (E->EN(lincom,n_fields) >
GD_MAX_LINCOM))
+ {
_GD_SetError(D, GD_E_FORMAT, GD_E_FORMAT_N_FIELDS, p->file, p->line,
in_cols[2]);
- else if (n_cols < E->EN(lincom,n_fields) * 3 + 3)
+ } else if (n_cols < E->EN(lincom,n_fields) * 3 + 3)
_GD_SetError(D, GD_E_FORMAT, GD_E_FORMAT_N_TOK, p->file, p->line, NULL);
else
for (i = 0; i < E->EN(lincom,n_fields); i++) {
@@ -1516,7 +1518,7 @@ static gd_entry_t *_GD_ParseString(DIRFILE *restrict D,
static int _GD_UTF8Encode(DIRFILE *restrict D, const char *restrict format_file,
int linenum, char **restrict op, uint32_t value)
{
- dtrace("%p, %p, %llx", D, op, (unsigned long long)value);
+ dtrace("%p, %p, 0x%" PRIX32, D, op, value);
if (value > 0x10FFFF || value == 0) {
_GD_SetError(D, GD_E_FORMAT, GD_E_FORMAT_CHARACTER, format_file, linenum,
diff --git a/src/putdata.c b/src/putdata.c
index 0f10c2b..2d6fc79 100644
--- a/src/putdata.c
+++ b/src/putdata.c
@@ -36,7 +36,7 @@ static size_t _GD_DoRawOut(DIRFILE *restrict D, gd_entry_t *restrict E,
return 0;
}
- dtrace("%p, %p, %lli, %" PRNsize_t ", 0x%X, %p", D, E, (long long)s0, ns,
+ dtrace("%p, %p, %" PRId64 ", %" PRIuSIZE ", 0x%X, %p", D, E, (int64_t)s0, ns,
data_type, data_in);
if (s0 < D->fragment[E->fragment_index].frame_offset * E->EN(raw,spf)) {
@@ -99,7 +99,7 @@ static size_t _GD_DoRawOut(DIRFILE *restrict D, gd_entry_t *restrict E,
free(databuffer);
- dreturn("%" PRNssize_t, n_wrote);
+ dreturn("%" PRIdSIZE, n_wrote);
return (size_t)n_wrote;
}
@@ -112,8 +112,8 @@ static size_t _GD_DoLinterpOut(DIRFILE *restrict D, gd_entry_t *restrict E,
double *tmpbuf;
struct gd_lut_ *tmp_lut;
- dtrace("%p, %p, %lli, %" PRNsize_t ", 0x%X, %p", D, E, (long long)first_samp,
- num_samp, data_type, data_in);
+ dtrace("%p, %p, %" PRId64 ", %" PRIuSIZE ", 0x%X, %p", D, E,
+ (int64_t)first_samp, num_samp, data_type, data_in);
if (_GD_BadInput(D, E, 0, GD_NO_ENTRY, 1)) {
dreturn("%i", 0);
@@ -207,7 +207,7 @@ static size_t _GD_DoLinterpOut(DIRFILE *restrict D, gd_entry_t *restrict E,
free(tmpbuf);
- dreturn("%" PRNsize_t, n_wrote);
+ dreturn("%" PRIuSIZE, n_wrote);
return n_wrote;
}
@@ -218,8 +218,8 @@ static size_t _GD_DoLincomOut(DIRFILE *restrict D, gd_entry_t *restrict E,
size_t n_wrote;
void* tmpbuf;
- dtrace("%p, %p, %lli, %" PRNsize_t ", 0x%X, %p", D, E, (long long)first_samp,
- num_samp, data_type, data_in);
+ dtrace("%p, %p, %" PRId64 ", %" PRIuSIZE ", 0x%X, %p", D, E,
+ (int64_t)first_samp, num_samp, data_type, data_in);
/* we cannot write to LINCOM fields that are a linear combination */
/* of more than one raw field (no way to know how to split data). */
@@ -289,7 +289,7 @@ static size_t _GD_DoLincomOut(DIRFILE *restrict D, gd_entry_t *restrict E,
tmpbuf);
free(tmpbuf);
- dreturn("%" PRNsize_t, n_wrote);
+ dreturn("%" PRIuSIZE, n_wrote);
return n_wrote;
}
@@ -303,8 +303,8 @@ static size_t _GD_DoBitOut(DIRFILE *restrict D, gd_entry_t *restrict E,
const uint64_t mask = (E->EN(bit,numbits) == 64) ? 0xffffffffffffffffULL :
((uint64_t)1 << E->EN(bit,numbits)) - 1;
- dtrace("%p, %p, %lli, %" PRNsize_t ", 0x%X, %p", D, E, (long long)first_samp,
- num_samp, data_type, data_in);
+ dtrace("%p, %p, %" PRId64 ", %" PRIuSIZE ", 0x%X, %p", D, E,
+ (int64_t)first_samp, num_samp, data_type, data_in);
if (_GD_BadInput(D, E, 0, GD_NO_ENTRY, 1)) {
dreturn("%i", 0);
@@ -354,7 +354,7 @@ static size_t _GD_DoBitOut(DIRFILE *restrict D, gd_entry_t *restrict E,
free(readbuf);
free(tmpbuf);
- dreturn("%" PRNsize_t, n_wrote);
+ dreturn("%" PRIuSIZE, n_wrote);
return n_wrote;
}
@@ -364,8 +364,8 @@ static size_t _GD_DoPhaseOut(DIRFILE *restrict D, gd_entry_t *restrict E,
{
size_t n_wrote;
- dtrace("%p, %p, %lli, %" PRNsize_t ", 0x%X, %p", D, E, (long long)first_samp,
- num_samp, data_type, data_in);
+ dtrace("%p, %p, %" PRId64 ", %" PRIuSIZE ", 0x%X, %p", D, E,
+ (int64_t)first_samp, num_samp, data_type, data_in);
if (_GD_BadInput(D, E, 0, GD_NO_ENTRY, 1)) {
dreturn("%i", 0);
@@ -381,7 +381,7 @@ static size_t _GD_DoPhaseOut(DIRFILE *restrict D, gd_entry_t *restrict E,
n_wrote = _GD_DoFieldOut(D, E->e->entry[0], first_samp + E->EN(phase,shift),
num_samp, data_type, data_in);
- dreturn("%" PRNsize_t, n_wrote);
+ dreturn("%" PRIuSIZE, n_wrote);
return n_wrote;
}
@@ -393,8 +393,8 @@ static size_t _GD_DoRecipOut(DIRFILE *restrict D, gd_entry_t *restrict E,
size_t n_wrote;
void* tmpbuf;
- dtrace("%p, %p, %lli, %" PRNsize_t ", 0x%X, %p", D, E, (long long)first_samp,
- num_samp, data_type, data_in);
+ dtrace("%p, %p, %" PRId64 ", %" PRIuSIZE ", 0x%X, %p", D, E,
+ (int64_t)first_samp, num_samp, data_type, data_in);
if (_GD_BadInput(D, E, 0, GD_NO_ENTRY, 1)) {
dreturn("%i", 0);
@@ -433,7 +433,7 @@ static size_t _GD_DoRecipOut(DIRFILE *restrict D, gd_entry_t *restrict E,
tmpbuf);
free(tmpbuf);
- dreturn("%" PRNsize_t, n_wrote);
+ dreturn("%" PRIuSIZE, n_wrote);
return n_wrote;
}
@@ -445,8 +445,8 @@ static size_t _GD_DoPolynomOut(DIRFILE *restrict D, gd_entry_t *restrict E,
size_t n_wrote;
void* tmpbuf;
- dtrace("%p, %p, %lli, %" PRNsize_t ", 0x%X, %p", D, E, (long long)first_samp,
- num_samp, data_type, data_in);
+ dtrace("%p, %p, %" PRId64 ", %" PRIuSIZE ", 0x%X, %p", D, E,
+ (int64_t)first_samp, num_samp, data_type, data_in);
/* we cannot write to POLYNOM fields that are quadradic or higher order */
@@ -521,7 +521,7 @@ static size_t _GD_DoPolynomOut(DIRFILE *restrict D, gd_entry_t *restrict E,
tmpbuf);
free(tmpbuf);
- dreturn("%" PRNsize_t, n_wrote);
+ dreturn("%" PRIuSIZE, n_wrote);
return n_wrote;
}
@@ -545,7 +545,7 @@ static void _GD_MplexOutData(DIRFILE *restrict D, void *restrict A,
{
size_t i;
- dtrace("%p, %p, %u, %p, %u, %p, 0x%X %i, %" PRNsize_t, D, A, spfA, B, spfB, C,
+ dtrace("%p, %p, %u, %p, %u, %p, 0x%X %i, %" PRIuSIZE, D, A, spfA, B, spfB, C,
type, val, n);
switch (type) {
@@ -562,7 +562,7 @@ static void _GD_MplexOutData(DIRFILE *restrict D, void *restrict A,
case GD_FLOAT64: MPLEX( double); break;
case GD_COMPLEX64: MPLEXC( float); break;
case GD_COMPLEX128: MPLEXC( double); break;
- default: _GD_SetError(D, GD_E_BAD_TYPE, type, NULL, 0, NULL);
+ default: _GD_SetError(D, GD_E_BAD_TYPE, 0, NULL, type, NULL);
break;
}
@@ -579,8 +579,8 @@ static size_t _GD_DoMplexOut(DIRFILE *restrict D, gd_entry_t *restrict E,
off64_t first_samp2;
unsigned int spf1, spf2;
- dtrace("%p, %p, %lli, %" PRNsize_t ", 0x%X, %p", D, E, (long long)first_samp,
- num_samp, data_type, data_in);
+ dtrace("%p, %p, %" PRId64 ", %" PRIuSIZE ", 0x%X, %p", D, E,
+ (int64_t)first_samp, num_samp, data_type, data_in);
if (_GD_BadInput(D, E, 0, GD_NO_ENTRY, 1)) {
dreturn("%i", 0);
@@ -647,7 +647,7 @@ static size_t _GD_DoMplexOut(DIRFILE *restrict D, gd_entry_t *restrict E,
tmpbuf);
free(tmpbuf);
- dreturn("%" PRNsize_t, n_wrote);
+ dreturn("%" PRIuSIZE, n_wrote);
return n_wrote;
}
@@ -655,8 +655,8 @@ static size_t _GD_DoConstOut(DIRFILE *restrict D, gd_entry_t *restrict E,
off64_t first, size_t len, gd_type_t data_type,
const void *restrict data_in)
{
- dtrace("%p, %p, %lli, %" PRNsize_t ", 0x%X, %p", D, E, (long long)first, len,
- data_type, data_in);
+ dtrace("%p, %p, %" PRId64 ", %" PRIuSIZE ", 0x%X, %p", D, E, (int64_t)first,
+ len, data_type, data_in);
/* check protection */
if (D->fragment[E->fragment_index].protection & GD_PROTECT_FORMAT)
@@ -685,8 +685,8 @@ size_t _GD_DoFieldOut(DIRFILE *restrict D, gd_entry_t *restrict E,
{
size_t n_wrote = 0;
- dtrace("%p, %p, %lli, %" PRNsize_t ", 0x%X, %p", D, E, (long long)first_samp,
- num_samp, data_type, data_in);
+ dtrace("%p, %p, %" PRId64 ", %" PRIuSIZE ", 0x%X, %p", D, E,
+ (int64_t)first_samp, num_samp, data_type, data_in);
if (++D->recurse_level >= GD_MAX_RECURSE_LEVEL) {
_GD_SetError(D, GD_E_RECURSE_LEVEL, GD_E_RECURSE_CODE, NULL, 0, E->field);
@@ -705,12 +705,21 @@ size_t _GD_DoFieldOut(DIRFILE *restrict D, gd_entry_t *restrict E,
}
}
+ /* Avoid craziness */
+ if (num_samp > GD_TRANSACTION_MAX(data_type))
+ num_samp = GD_TRANSACTION_MAX(data_type);
+ if (first_samp > (int64_t)(GD_INT64_MAX - num_samp)) {
+ _GD_SetError(D, GD_E_RANGE, GD_E_OUT_OF_RANGE, NULL, 0, NULL);
+ dreturn("%i", 0);
+ return 0;
+ }
+
/* this call will throw GD_E_DOMAIN if a problem arises; however, that only
* happens in cases where the field has multiple inputs, which putdata will
* reject anyways; so we ignore this error for a more relevant one later
*/
if (first_samp == GD_HERE)
- first_samp = _GD_GetFilePos(D, E, -1);
+ first_samp = _GD_GetIOPos(D, E, -1);
switch (E->field_type) {
case GD_RAW_ENTRY:
@@ -758,7 +767,7 @@ size_t _GD_DoFieldOut(DIRFILE *restrict D, gd_entry_t *restrict E,
}
D->recurse_level--;
- dreturn("%" PRNsize_t, n_wrote);
+ dreturn("%" PRIuSIZE, n_wrote);
return n_wrote;
}
@@ -771,9 +780,9 @@ size_t gd_putdata64(DIRFILE* D, const char *field_code, off64_t first_frame,
gd_entry_t *entry;
unsigned int spf = 0;
- dtrace("%p, \"%s\", %lli, %lli, %" PRNsize_t ", %" PRNsize_t ", 0x%X, %p", D,
- field_code, (long long)first_frame, (long long)first_samp, num_frames,
- num_samp, data_type, data_in);
+ dtrace("%p, \"%s\", %" PRId64 ", %" PRId64 ", %" PRIuSIZE ", %" PRIuSIZE
+ ", 0x%X, %p", D, field_code, (int64_t)first_frame, (int64_t)first_samp,
+ num_frames, num_samp, data_type, data_in);
if (D->flags & GD_INVALID) {/* don't crash */
_GD_SetError(D, GD_E_BAD_DIRFILE, 0, NULL, 0, NULL);
@@ -819,8 +828,18 @@ size_t gd_putdata64(DIRFILE* D, const char *field_code, off64_t first_frame,
return 0;
}
+ /* don't overflow */
+ if (first_samp > GD_INT64_MAX - spf * first_frame) {
+ _GD_SetError(D, GD_E_RANGE, GD_E_OUT_OF_RANGE, NULL, 0, NULL);
+ dreturn("%i", 0);
+ return 0;
+ }
first_samp += spf * first_frame;
- num_samp += spf * num_frames;
+
+ if (num_samp > GD_SSIZE_T_MAX - spf * num_frames)
+ num_samp = GD_SSIZE_T_MAX;
+ else
+ num_samp += spf * num_frames;
}
if (first_samp < 0 && (first_samp != GD_HERE || first_frame != 0)) {
@@ -837,7 +856,7 @@ size_t gd_putdata64(DIRFILE* D, const char *field_code, off64_t first_frame,
n_wrote = _GD_DoFieldOut(D, entry, first_samp, num_samp, data_type, data_in);
- dreturn("%" PRNsize_t, n_wrote);
+ dreturn("%" PRIuSIZE, n_wrote);
return n_wrote;
}
diff --git a/src/raw.c b/src/raw.c
index a49c1fa..677d386 100644
--- a/src/raw.c
+++ b/src/raw.c
@@ -56,11 +56,11 @@ off64_t _GD_RawSeek(struct gd_raw_file_* file, off64_t count,
{
off64_t pos;
- dtrace("%p, %lli, 0x%X, <unused>", file, (long long)count, data_type);
+ dtrace("%p, %" PRId64 ", 0x%X, <unused>", file, (int64_t)count, data_type);
/* short circuit */
if (file->pos == count) {
- dreturn("%lli", (long long)count);
+ dreturn("%" PRId64, (int64_t)count);
return count;
}
@@ -78,7 +78,7 @@ off64_t _GD_RawSeek(struct gd_raw_file_* file, off64_t count,
pos /= GD_SIZE(data_type);
file->pos = pos;
- dreturn("%lli", (long long)pos);
+ dreturn("%" PRId64, (int64_t)pos);
return pos;
}
@@ -87,7 +87,7 @@ ssize_t _GD_RawRead(struct gd_raw_file_ *restrict file, void *restrict ptr,
{
ssize_t nread;
- dtrace("%p, %p, 0x%X, %" PRNsize_t, file, ptr, data_type, nmemb);
+ dtrace("%p, %p, 0x%X, %" PRIuSIZE, file, ptr, data_type, nmemb);
nread = read(file->idata, ptr, nmemb * GD_SIZE(data_type));
@@ -96,7 +96,7 @@ ssize_t _GD_RawRead(struct gd_raw_file_ *restrict file, void *restrict ptr,
file->pos += nread;
}
- dreturn("%" PRNssize_t, nread);
+ dreturn("%" PRIdSIZE, nread);
return nread;
}
@@ -105,7 +105,7 @@ ssize_t _GD_RawWrite(struct gd_raw_file_ *restrict file,
{
ssize_t nwrote;
- dtrace("%p, %p, 0x%X, %" PRNsize_t, file, ptr, data_type, nmemb);
+ dtrace("%p, %p, 0x%X, %" PRIuSIZE, file, ptr, data_type, nmemb);
nwrote = write(file->idata, ptr, nmemb * GD_SIZE(data_type));
@@ -114,7 +114,7 @@ ssize_t _GD_RawWrite(struct gd_raw_file_ *restrict file,
file->pos += nwrote;
}
- dreturn("%" PRNsize_t, nwrote);
+ dreturn("%" PRIuSIZE, nwrote);
return nwrote;
}
@@ -154,10 +154,10 @@ off64_t _GD_RawSize(int dirfd, struct gd_raw_file_ *file, gd_type_t data_type,
dtrace("%i, %p, 0x%X, <unused>", dirfd, file, data_type);
if (gd_StatAt64(file->D, dirfd, file->name, &statbuf, 0) < 0) {
- dreturn("%lli", -1LL);
+ dreturn("%i", -1);
return -1;
}
- dreturn("%lli", (long long)statbuf.st_size);
+ dreturn("%" PRId64, (int64_t)statbuf.st_size);
return statbuf.st_size / GD_SIZE(data_type);
}
diff --git a/src/sie.c b/src/sie.c
index 58ce09e..ed4d405 100644
--- a/src/sie.c
+++ b/src/sie.c
@@ -29,9 +29,10 @@
#define dprintf_sie(...)
#endif
-#define DPRINTF dprintf_sie("F r:%zi p:0x%llX s:%i,0x%llX " \
- "d:0x%llX,0x%llX l:%i/0x%llX,0x%llX @%li", f->r, f->p, f->bof, f->s, \
- f->d[0], f->d[1], f->have_l, f->l[0], f->l[1], ftell(f->fp));
+#define DPRINTF dprintf_sie("F r:%zi p:0x%" PRIX64 " s:%i,0x%" PRIX64 " " \
+ "d:0x%" PRIX64 ",0x%" PRIX64 " l:%i/0x%" PRIX64 ",0x%" PRIX64 " @%li", \
+ f->r, f->p, f->bof, f->s, f->d[0], f->d[1], f->have_l, f->l[0], f->l[1], \
+ ftell(f->fp));
struct gd_siedata {
int swap; /* byte swapping required */
@@ -126,7 +127,7 @@ static int _GD_Advance(struct gd_siedata *f, size_t size)
size_t n;
int64_t p = f->s + 1;
int64_t l[3];
- dtrace("%p, %" PRNsize_t, f, size);
+ dtrace("%p, %" PRIuSIZE, f, size);
/* save the current record */
if (p > 0)
@@ -172,10 +173,11 @@ off64_t _GD_SampIndSeek(struct gd_raw_file_ *file, off64_t sample,
const size_t size = sizeof(int64_t) + GD_SIZE(data_type);
struct gd_siedata *f = (struct gd_siedata*)(file->edata);
- dtrace("%p, 0x%llx, 0x%X, 0x%X", file, (long long)sample, data_type, mode);
+ dtrace("%p, 0x%" PRIX64 ", 0x%X, 0x%X", file, (uint64_t)sample, data_type,
+ mode);
if (file->pos == sample && f->p >= 0) {
- dreturn("0x%llX", (long long)sample);
+ dreturn("0x%" PRIX64, (uint64_t)sample);
return sample;
}
@@ -246,7 +248,7 @@ off64_t _GD_SampIndSeek(struct gd_raw_file_ *file, off64_t sample,
DPRINTF;
- dreturn("0x%llX", (unsigned long long)sample);
+ dreturn("0x%" PRIX64, (uint64_t)sample);
return (off64_t)(sample);
}
@@ -255,7 +257,7 @@ static void *_GD_Duplicate(void *restrict d, const void *restrict s, size_t l,
int64_t n)
{
int64_t i;
- dtrace("%p, %p, %" PRNsize_t ", 0x%llx", d, s, l, (long long)n);
+ dtrace("%p, %p, %" PRIuSIZE ", 0x%" PRIX64, d, s, l, (uint64_t)n);
if (n > 0) {
if (l == 1) {
@@ -311,7 +313,7 @@ ssize_t _GD_SampIndRead(struct gd_raw_file_ *restrict file, void *restrict ptr,
struct gd_siedata *f = (struct gd_siedata*)(file->edata);
void *cur = ptr;
- dtrace("%p, %p, 0x%03x, %" PRNsize_t, file, ptr, data_type, nelem);
+ dtrace("%p, %p, 0x%03x, %" PRIuSIZE, file, ptr, data_type, nelem);
/* not enough data in the current run */
while (f->s - f->p < (int64_t)(nelem - count)) {
@@ -346,7 +348,7 @@ ssize_t _GD_SampIndRead(struct gd_raw_file_ *restrict file, void *restrict ptr,
file->pos = f->p;
- dreturn("%lli", (long long)count);
+ dreturn("%" PRIdSIZE, count);
return count;
}
@@ -354,14 +356,14 @@ ssize_t _GD_SampIndRead(struct gd_raw_file_ *restrict file, void *restrict ptr,
static ssize_t _GD_GetNRec(struct gd_siedata *f, size_t size)
{
gd_stat64_t statbuf;
- dtrace("%p, %" PRNsize_t, f, size);
+ dtrace("%p, %" PRIuSIZE, f, size);
if (gd_fstat64(fileno(f->fp), &statbuf)) {
dreturn("%i", -1);
return -1;
}
- dreturn("%" PRNssize_t, (ssize_t)(statbuf.st_size / size));
+ dreturn("%" PRIdSIZE, (ssize_t)(statbuf.st_size / size));
return (ssize_t)(statbuf.st_size / size);
}
@@ -380,7 +382,7 @@ ssize_t _GD_SampIndWrite(struct gd_raw_file_ *restrict file,
struct gd_siedata *f = (struct gd_siedata*)(file->edata);
const size_t dlen = GD_SIZE(data_type);
const size_t size = sizeof(int64_t) + dlen;
- dtrace("%p, %p, 0x%03x, %" PRNsize_t, file, ptr, data_type, nelem);
+ dtrace("%p, %p, 0x%03x, %" PRIuSIZE, file, ptr, data_type, nelem);
if ((nrec = _GD_GetNRec(f, size)) < 0) {
dreturn("%i", -1);
@@ -430,7 +432,7 @@ ssize_t _GD_SampIndWrite(struct gd_raw_file_ *restrict file,
* it is, combine them
*/
if (memcmp(f->l + 1, ptr, dlen) == 0) {
- dprintf_sie("combine: 0x%llX", f->l[1]);
+ dprintf_sie("combine: 0x%" PRIX64, f->l[1]);
/* the new value is the same as the value of the previous record, so
* back up a record and combine */
@@ -481,7 +483,8 @@ ssize_t _GD_SampIndWrite(struct gd_raw_file_ *restrict file,
cur_end = (int64_t*)((char*)p + size * (rin - 1));
}
end = f->p + i - 1;
- dprintf_sie("*cur_end: %llX -> %llX", FIXSEX(f->swap, *cur_end), end);
+ dprintf_sie("*cur_end: 0x%" PRIX64 " -> 0x%" PRIX64, FIXSEX(f->swap,
+ *cur_end), end);
gd_put_unaligned64(FIXSEX(f->swap, end), cur_end);
dprintf_sie(" cur_end: %p -> %p", cur_end, (char*)p + size * rin);
cur_end = (int64_t*)((char*)p + size * rin);
@@ -493,7 +496,8 @@ ssize_t _GD_SampIndWrite(struct gd_raw_file_ *restrict file,
}
}
end = f->p + nelem - 1;
- dprintf_sie("*cur_end: %llX -> %llX", FIXSEX(f->swap, *cur_end), end);
+ dprintf_sie("*cur_end: 0x%" PRIX64 " -> 0x%" PRIX64, FIXSEX(f->swap,
+ *cur_end), end);
gd_put_unaligned64(FIXSEX(f->swap, end), cur_end);
rin++;
@@ -528,7 +532,8 @@ ssize_t _GD_SampIndWrite(struct gd_raw_file_ *restrict file,
}
DPRINTF;
- dprintf_sie("nrec:%zi rin:%zi rout:%zi fr:%lli", nrec, rin, rout, fr);
+ dprintf_sie("nrec:%" PRIdSIZE " rin:%" PRIdSIZE " rout:%" PRIdSIZE
+ " fr:%" PRId64, nrec, rin, rout, fr);
/* now, do some moving: first, move the trailing records, forward by
* (rin - rout) records */
@@ -599,7 +604,7 @@ ssize_t _GD_SampIndWrite(struct gd_raw_file_ *restrict file,
free(p);
file->pos = f->p;
- dreturn("%llu", (unsigned long long)nelem);
+ dreturn("%" PRIuSIZE, nelem);
return nelem;
}
@@ -678,6 +683,13 @@ off64_t _GD_SampIndSize(int dirfd, struct gd_raw_file_* file,
fclose(f.fp);
- dreturn("%llx", (long long unsigned)n + 1);
- return (off64_t)n + 1;
+ /* check for overflow */
+ if (n > GD_INT64_MAX - 1) {
+ errno = ERANGE;
+ dreturn("%i", -1);
+ return -1;
+ }
+
+ dreturn("0x%" PRIX64, (uint64_t)(n + 1));
+ return n + 1;
}
diff --git a/src/slim.c b/src/slim.c
index cf55642..049d89e 100644
--- a/src/slim.c
+++ b/src/slim.c
@@ -116,7 +116,7 @@ off64_t GD_SLIM(Seek)(struct gd_raw_file_* file, off64_t count,
{
struct gd_slimdata *gdsl = file->edata;
- dtrace("%p, %lli, 0x%X, <unused>", file, (long long)count, data_type);
+ dtrace("%p, %" PRId64 ", 0x%X, <unused>", file, (int64_t)count, data_type);
/* slimlib appears to do a rewind before every SEEK_SET ! */
if (slimseek(gdsl->f, (long)count * GD_SIZE(data_type), SEEK_SET))
@@ -131,7 +131,7 @@ off64_t GD_SLIM(Seek)(struct gd_raw_file_* file, off64_t count,
}
file->pos = count;
- dreturn("%lli", (long long)count);
+ dreturn("%" PRId64, (int64_t)count);
return count;
}
@@ -141,11 +141,11 @@ ssize_t GD_SLIM(Read)(struct gd_raw_file_ *restrict file, void *restrict ptr,
ssize_t n;
struct gd_slimdata *gdsl = file->edata;
- dtrace("%p, %p, 0x%X, %" PRNsize_t, file, ptr, data_type, nmemb);
+ dtrace("%p, %p, 0x%X, %" PRIuSIZE, file, ptr, data_type, nmemb);
n = slimread(ptr, GD_SIZE(data_type), nmemb, gdsl->f);
- dreturn("%" PRNsize_t, n);
+ dreturn("%" PRIuSIZE, n);
return n;
}
@@ -211,7 +211,7 @@ off64_t GD_SLIM(Size)(int dirfd, struct gd_raw_file_ *file, gd_type_t data_type,
size /= GD_SIZE(data_type);
- dreturn("%lli", (long long)size);
+ dreturn("%" PRId64, (int64_t)size);
return size;
}
@@ -219,10 +219,10 @@ int GD_SLIM(Strerr)(const struct gd_raw_file_ *file, char *buf, size_t buflen)
{
int r = 0;
- dtrace("%p, %p, %" PRNsize_t, file, buf, buflen);
+ dtrace("%p, %p, %" PRIuSIZE, file, buf, buflen);
if (file->error)
- r = gd_strerror(file->error, buf, buflen);
+ r = gd_StrError(file->error, buf, buflen);
else /* the slimlib C API has no error reporting */
strncpy(buf, "SLIMLIB: Unspecified error", buflen);
diff --git a/src/spf.c b/src/spf.c
index 202ee63..1229a33 100644
--- a/src/spf.c
+++ b/src/spf.c
@@ -92,10 +92,7 @@ unsigned int gd_spf(DIRFILE* D, const char *field_code) gd_nothrow
_GD_ClearError(D);
- /* the representation is unimportant: it doesn't change the SPF of the field,
- * yet we have to run the field code through here to potentially remove it
- */
- entry = _GD_FindEntry(D, field_code, NULL, 1, 1);
+ entry = _GD_FindEntry(D, field_code);
if (D->error) {
dreturn("%u", 0);
diff --git a/src/string.c b/src/string.c
index d581746..fead4d2 100644
--- a/src/string.c
+++ b/src/string.c
@@ -26,7 +26,7 @@ gd_nothrow
{
gd_entry_t *E;
- dtrace("%p, \"%s\", %lu, %" PRNsize_t ", %p", D, field_code, start, n,
+ dtrace("%p, \"%s\", %lu, %" PRIuSIZE ", %p", D, field_code, start, n,
data_out);
if (D->flags & GD_INVALID) {
@@ -79,7 +79,7 @@ size_t gd_get_string(DIRFILE *D, const char *field_code, size_t len,
size_t n_read;
const char *ptr;
- dtrace("%p, \"%s\", %" PRNsize_t ", %p", D, field_code, len, data_out);
+ dtrace("%p, \"%s\", %" PRIuSIZE ", %p", D, field_code, len, data_out);
/* get string */
if (gd_get_sarray_slice(D, field_code, 0, 1, &ptr)) {
@@ -93,7 +93,7 @@ size_t gd_get_string(DIRFILE *D, const char *field_code, size_t len,
n_read = strlen(ptr) + 1;
- dreturn("%" PRNsize_t, n_read);
+ dreturn("%" PRIuSIZE, n_read);
return n_read;
}
@@ -102,7 +102,7 @@ static size_t _GD_PutSarraySlice(DIRFILE *restrict D, gd_entry_t *restrict E,
{
size_t len;
- dtrace("%p, %p, %lu, %" PRNsize_t ", %p", D, E, first, n, data_in);
+ dtrace("%p, %p, %lu, %" PRIuSIZE ", %p", D, E, first, n, data_in);
if ((D->flags & GD_ACCMODE) != GD_RDWR) {
_GD_SetError(D, GD_E_ACCMODE, 0, NULL, 0, NULL);
@@ -172,7 +172,7 @@ static size_t _GD_PutSarraySlice(DIRFILE *restrict D, gd_entry_t *restrict E,
D->fragment[E->fragment_index].modified = 1;
len = strlen(data_in[0]) + 1;
- dreturn("%" PRNsize_t, len);
+ dreturn("%" PRIuSIZE, len);
return len;
}
@@ -201,7 +201,7 @@ size_t gd_put_string(DIRFILE *D, const char *field_code, const char *data_in)
} else
n_wrote = _GD_PutSarraySlice(D, E, 0, 1, &data_in);
- dreturn("%" PRNsize_t, n_wrote);
+ dreturn("%" PRIuSIZE, n_wrote);
return n_wrote;
}
/* vim: ts=2 sw=2 et tw=80
diff --git a/src/types.c b/src/types.c
index 4588233..0977e71 100644
--- a/src/types.c
+++ b/src/types.c
@@ -1,5 +1,5 @@
/* Copyright (C) 2002-2005 C. Barth Netterfield
- * Copyright (C) 2005-2010, 2012, 2014 D. V. Wiebe
+ * Copyright (C) 2005-2012, 2014, 2015 D. V. Wiebe
*
***************************************************************************
*
@@ -63,7 +63,7 @@ gd_nothrow
{
size_t i;
- dtrace("%p, %p, 0x%x, %p, 0x%x, %" PRNsize_t, D, data_in, in_type, data_out,
+ dtrace("%p, %p, 0x%x, %p, 0x%x, %" PRIuSIZE, D, data_in, in_type, data_out,
out_type, n);
dreturnvoid();
@@ -119,7 +119,7 @@ gd_nothrow
TO_COMPLEX(double,int8_t);
return;
default:
- _GD_SetError(D, GD_E_BAD_TYPE, out_type, NULL, 0, NULL);
+ _GD_SetError(D, GD_E_BAD_TYPE, 0, NULL, out_type, NULL);
break;
}
break;
@@ -171,7 +171,7 @@ gd_nothrow
TO_COMPLEX(double,uint8_t);
return;
default:
- _GD_SetError(D, GD_E_BAD_TYPE, out_type, NULL, 0, NULL);
+ _GD_SetError(D, GD_E_BAD_TYPE, 0, NULL, out_type, NULL);
break;
}
break;
@@ -223,7 +223,7 @@ gd_nothrow
TO_COMPLEX(double,int16_t);
return;
default:
- _GD_SetError(D, GD_E_BAD_TYPE, out_type, NULL, 0, NULL);
+ _GD_SetError(D, GD_E_BAD_TYPE, 0, NULL, out_type, NULL);
break;
}
break;
@@ -275,7 +275,7 @@ gd_nothrow
TO_COMPLEX(double,uint16_t);
return;
default:
- _GD_SetError(D, GD_E_BAD_TYPE, out_type, NULL, 0, NULL);
+ _GD_SetError(D, GD_E_BAD_TYPE, 0, NULL, out_type, NULL);
break;
}
break;
@@ -327,7 +327,7 @@ gd_nothrow
TO_COMPLEX(double,int32_t);
return;
default:
- _GD_SetError(D, GD_E_BAD_TYPE, out_type, NULL, 0, NULL);
+ _GD_SetError(D, GD_E_BAD_TYPE, 0, NULL, out_type, NULL);
break;
}
break;
@@ -430,7 +430,7 @@ gd_nothrow
TO_COMPLEX(double,int64_t);
return;
default:
- _GD_SetError(D, GD_E_BAD_TYPE, out_type, NULL, 0, NULL);
+ _GD_SetError(D, GD_E_BAD_TYPE, 0, NULL, out_type, NULL);
break;
}
break;
@@ -482,7 +482,7 @@ gd_nothrow
TO_COMPLEX(double,uint64_t);
return;
default:
- _GD_SetError(D, GD_E_BAD_TYPE, out_type, NULL, 0, NULL);
+ _GD_SetError(D, GD_E_BAD_TYPE, 0, NULL, out_type, NULL);
break;
}
break;
@@ -534,7 +534,7 @@ gd_nothrow
TO_COMPLEX(double,float);
return;
default:
- _GD_SetError(D, GD_E_BAD_TYPE, out_type, NULL, 0, NULL);
+ _GD_SetError(D, GD_E_BAD_TYPE, 0, NULL, out_type, NULL);
break;
}
break;
@@ -586,7 +586,7 @@ gd_nothrow
TO_COMPLEX(double,double);
return;
default:
- _GD_SetError(D, GD_E_BAD_TYPE, out_type, NULL, 0, NULL);
+ _GD_SetError(D, GD_E_BAD_TYPE, 0, NULL, out_type, NULL);
break;
}
break;
@@ -630,7 +630,7 @@ gd_nothrow
((double *)data_out)[i] = (double)((float *)data_in)[i];
return;
default:
- _GD_SetError(D, GD_E_BAD_TYPE, out_type, NULL, 0, NULL);
+ _GD_SetError(D, GD_E_BAD_TYPE, 0, NULL, out_type, NULL);
break;
}
break;
@@ -674,12 +674,12 @@ gd_nothrow
memcpy(data_out, data_in, 2 * n * sizeof(double));
return;
default:
- _GD_SetError(D, GD_E_BAD_TYPE, out_type, NULL, 0, NULL);
+ _GD_SetError(D, GD_E_BAD_TYPE, 0, NULL, out_type, NULL);
break;
}
break;
default:
- _GD_SetError(D, GD_E_BAD_TYPE, in_type, NULL, 0, NULL);
+ _GD_SetError(D, GD_E_BAD_TYPE, 0, NULL, in_type, NULL);
break;
}
}
diff --git a/src/zzip.c b/src/zzip.c
index 3c7508c..9224ed4 100644
--- a/src/zzip.c
+++ b/src/zzip.c
@@ -42,23 +42,26 @@ int _GD_ZzipName(DIRFILE *restrict D gd_unused_, const char *restrict enc_data,
dtrace("%p, \"%s\", %p, \"%s\", <unused>, <unused>", D, enc_data, file, base);
- if (file->name == NULL) {
- if (enc_data == NULL)
- enc_data = "raw";
+ if (file->name) {
+ dreturn("%i (%s)", 0, file->name);
+ return 0;
+ }
- enc_len = strlen(enc_data);
+ if (enc_data == NULL)
+ enc_data = "raw";
- file->name = (char*)malloc(enc_len + 5 + strlen(base) + 1);
- if (file->name == NULL) {
- dreturn("%i", -1);
- return -1;
- }
+ enc_len = strlen(enc_data);
- sprintf(file->name, "%s.zip_%s", enc_data, base);
- /* Now replace the '_' with a NUL */
- file->name[enc_len + 4] = '\0';
+ file->name = (char*)malloc(enc_len + 5 + strlen(base) + 1);
+ if (file->name == NULL) {
+ dreturn("%i", -1);
+ return -1;
}
+ sprintf(file->name, "%s.zip_%s", enc_data, base);
+ /* Now replace the '_' with a NUL */
+ file->name[enc_len + 4] = '\0';
+
dreturn("%i (%s\\0%s)", 0, file->name, file->name + enc_len + 5);
return 0;
}
@@ -139,7 +142,7 @@ off64_t _GD_ZzipSeek(struct gd_raw_file_* file, off64_t count,
struct gd_zzipdata *gdzz = file->edata;
- dtrace("%p, %lli, 0x%X, <unused>", file, (long long)count, data_type);
+ dtrace("%p, %" PRId64 ", 0x%X, <unused>", file, (int64_t)count, data_type);
n = (off64_t)zzip_seek(gdzz->file, (zzip_off_t)(count * GD_SIZE(data_type)),
SEEK_SET);
@@ -162,7 +165,7 @@ off64_t _GD_ZzipSeek(struct gd_raw_file_* file, off64_t count,
file->pos = n;
- dreturn("%lli", (long long)n);
+ dreturn("%" PRId64, (int64_t)n);
return n;
}
@@ -173,7 +176,7 @@ ssize_t _GD_ZzipRead(struct gd_raw_file_ *restrict file, void *restrict data,
struct gd_zzipdata *gdzz = file->edata;
- dtrace("%p, %p, 0x%X, %" PRNsize_t, file, data, data_type, nmemb);
+ dtrace("%p, %p, 0x%X, %" PRIuSIZE, file, data, data_type, nmemb);
n = zzip_read(gdzz->file, data, GD_SIZE(data_type) * nmemb);
@@ -184,7 +187,7 @@ ssize_t _GD_ZzipRead(struct gd_raw_file_ *restrict file, void *restrict data,
file->pos += n;
- dreturn("%lli", (long long)n);
+ dreturn("%" PRId64, (int64_t)n);
return n;
}
@@ -231,7 +234,7 @@ off64_t _GD_ZzipSize(int dirfd, struct gd_raw_file_ *file, gd_type_t data_type,
zzip_file_close(gdzz->file);
zzip_dir_close(gdzz->dir);
- dreturn("%lli", (long long)size);
+ dreturn("%" PRId64, (int64_t)size);
return size;
}
@@ -239,7 +242,7 @@ int _GD_ZzipStrerr(const struct gd_raw_file_ *file, char *buf, size_t buflen)
{
int r = 0;
- dtrace("%p, %p, %" PRNsize_t, file, buf, buflen);
+ dtrace("%p, %p, %" PRIuSIZE, file, buf, buflen);
switch (file->error) {
case ZZIP_OUTOFMEM:
@@ -250,7 +253,7 @@ int _GD_ZzipStrerr(const struct gd_raw_file_ *file, char *buf, size_t buflen)
case ZZIP_DIR_SEEK:
case ZZIP_DIR_READ:
case -1:
- r = gd_strerror(errno, buf, buflen);
+ r = gd_StrError(errno, buf, buflen);
break;
default:
snprintf(buf, buflen, "ZZIP: Unkown error 0x%X", file->error);
diff --git a/test/Makefile.am b/test/Makefile.am
index b7bbe27..ba34f82 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -128,14 +128,14 @@ CREAT_TESTS=creat creat_excl creat_rdonly creat_rdonly_exists
CVLIST_TESTS=cvlist cvlist_array cvlist_array0 cvlist_array_free \
cvlist_array_hidden cvlist_array_meta cvlist_array_meta0 \
- cvlist_array_meta_free cvlist_array_meta_hidden cvlist_hidden \
- cvlist_invalid cvlist_meta cvlist_meta0 cvlist_meta_hidden \
- cvlist_meta_invalid
+ cvlist_array_meta_free cvlist_array_meta_hidden cvlist_array_null \
+ cvlist_hidden cvlist_invalid cvlist_meta cvlist_meta0 \
+ cvlist_meta_hidden cvlist_meta_invalid cvlist_null
-DEL_TESTS=del_alias del_carray del_carray_deref del_const del_const_deref \
- del_const_force del_data del_data_enoent del_data_open del_derived \
- del_derived_after del_derived_force del_del del_meta del_meta_force \
- del_ref
+DEL_TESTS=del_alias del_bad_code del_carray del_carray_deref del_const \
+ del_const_deref del_const_force del_data del_data_enoent \
+ del_data_open del_derived del_derived_after del_derived_force \
+ del_del del_meta del_meta_force del_ref
DESYNC_TESTS=desync desync_flush desync_path desync_reopen desync_reopen_inv
@@ -210,7 +210,7 @@ GET_TESTS=get64 get_affix get_bad_code get_bit get_carray get_carray_len \
get_multiply_ccin get_multiply_crin get_multiply_crinr \
get_multiply_noin get_multiply_rcin get_multiply_s get_neg get_none \
get_nonexistent get_null get_off64 get_phase get_phase_affix \
- get_polynom get_polynom_cmpin get_polynom_noin get_recip \
+ get_polynom get_polynom_cmpin get_polynom_noin get_range get_recip \
get_recip_const get_recurse get_rofs get_sbit get_sf get_ss \
get_string get_type get_uint16 get_uint32 get_uint64 get_window \
get_window_clr get_window_complex get_window_ge get_window_gt \
@@ -227,7 +227,8 @@ GZIP_TESTS=gzip_add gzip_del gzip_get gzip_get_far gzip_get_get gzip_get_get2 \
HEADER_TESTS=header_complex header_off64t
-HIDE_TESTS=hide hide_hidden hide_unhide
+HIDE_TESTS=hide hide_bad hide_hidden hide_hidden_bad hide_unhide \
+ hide_unhide_bad
INCLUDE_TESTS=include_accmode include_affix include_auto include_cb \
include_creat include_ignore include_include include_index \
@@ -356,10 +357,10 @@ PUT_TESTS=put64 put_bad_code put_bit put_bof put_carray put_carray_client \
put_lincom_noin put_linterp put_linterp_noin put_linterp_nomono \
put_linterp_notab put_linterp_reverse put_mplex put_mplex_complex \
put_multiply put_nofile put_null put_off64 put_phase put_phase_noin \
- put_polynom1 put_polynom2 put_polynom_noin put_protect put_rdonly \
- put_recip put_recurse put_repr put_rofs put_sbit put_sf put_ss \
- put_string put_string_protect put_sub put_type put_uint16 put_uint32 \
- put_uint64 put_window put_zero
+ put_polynom1 put_polynom2 put_polynom_noin put_protect put_range \
+ put_rdonly put_recip put_recurse put_repr put_rofs put_sbit put_sf \
+ put_ss put_string put_string_protect put_sub put_type put_uint16 \
+ put_uint32 put_uint64 put_window put_zero
REF_TESTS=ref ref_none ref_two
@@ -369,7 +370,8 @@ REPR_TESTS=repr_a repr_bad repr_float32 repr_float64 repr_i repr_int16 \
repr_uint64 repr_uint8
SEEK_TESTS=seek64 seek_cur seek_end seek_far seek_foffs seek_foffs2 seek_index \
- seek_lincom seek_mult seek_neg seek_phase seek_set seek_sub
+ seek_lincom seek_mult seek_neg seek_phase seek_range seek_range2 \
+ seek_set seek_sub
SIE_TESTS=sie_get_big sie_get_little sie_move_from sie_move_to sie_nframes_big \
sie_nframes_little sie_put_append sie_put_append2 sie_put_back \
@@ -451,4 +453,4 @@ getdata-clean-dir:
clean-local:
$(MAKE) getdata-clean-dir
- rm -rf *~
+ rm -rf *~ *.gcno *.gcda
diff --git a/test/Makefile.in b/test/Makefile.in
index 8882142..544fa5c 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -14,7 +14,17 @@
@SET_MAKE@
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -100,18 +110,19 @@ TESTS = $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_3) \
$(am__EXEEXT_61) $(am__EXEEXT_62)
check_PROGRAMS = $(am__EXEEXT_63)
subdir = test
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(top_srcdir)/depcomp
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compare_version.m4 \
$(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/encoding.m4 \
$(top_srcdir)/m4/floatordering.m4 $(top_srcdir)/m4/idl.m4 \
- $(top_srcdir)/m4/matlab.m4 $(top_srcdir)/m4/perl.m4 \
- $(top_srcdir)/m4/php.m4 $(top_srcdir)/m4/python.m4 \
- $(top_srcdir)/m4/win32.m4 $(top_srcdir)/m4/version.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/matlab.m4 \
+ $(top_srcdir)/m4/perl.m4 $(top_srcdir)/m4/php.m4 \
+ $(top_srcdir)/m4/python.m4 $(top_srcdir)/m4/win32.m4 \
+ $(top_srcdir)/m4/version.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/src/gd_config.h \
$(top_builddir)/src/getdata.h
@@ -281,18 +292,19 @@ am__EXEEXT_10 = cvlist$(EXEEXT) cvlist_array$(EXEEXT) \
cvlist_array0$(EXEEXT) cvlist_array_free$(EXEEXT) \
cvlist_array_hidden$(EXEEXT) cvlist_array_meta$(EXEEXT) \
cvlist_array_meta0$(EXEEXT) cvlist_array_meta_free$(EXEEXT) \
- cvlist_array_meta_hidden$(EXEEXT) cvlist_hidden$(EXEEXT) \
- cvlist_invalid$(EXEEXT) cvlist_meta$(EXEEXT) \
- cvlist_meta0$(EXEEXT) cvlist_meta_hidden$(EXEEXT) \
- cvlist_meta_invalid$(EXEEXT)
-am__EXEEXT_11 = del_alias$(EXEEXT) del_carray$(EXEEXT) \
- del_carray_deref$(EXEEXT) del_const$(EXEEXT) \
- del_const_deref$(EXEEXT) del_const_force$(EXEEXT) \
- del_data$(EXEEXT) del_data_enoent$(EXEEXT) \
- del_data_open$(EXEEXT) del_derived$(EXEEXT) \
- del_derived_after$(EXEEXT) del_derived_force$(EXEEXT) \
- del_del$(EXEEXT) del_meta$(EXEEXT) del_meta_force$(EXEEXT) \
- del_ref$(EXEEXT)
+ cvlist_array_meta_hidden$(EXEEXT) cvlist_array_null$(EXEEXT) \
+ cvlist_hidden$(EXEEXT) cvlist_invalid$(EXEEXT) \
+ cvlist_meta$(EXEEXT) cvlist_meta0$(EXEEXT) \
+ cvlist_meta_hidden$(EXEEXT) cvlist_meta_invalid$(EXEEXT) \
+ cvlist_null$(EXEEXT)
+am__EXEEXT_11 = del_alias$(EXEEXT) del_bad_code$(EXEEXT) \
+ del_carray$(EXEEXT) del_carray_deref$(EXEEXT) \
+ del_const$(EXEEXT) del_const_deref$(EXEEXT) \
+ del_const_force$(EXEEXT) del_data$(EXEEXT) \
+ del_data_enoent$(EXEEXT) del_data_open$(EXEEXT) \
+ del_derived$(EXEEXT) del_derived_after$(EXEEXT) \
+ del_derived_force$(EXEEXT) del_del$(EXEEXT) del_meta$(EXEEXT) \
+ del_meta_force$(EXEEXT) del_ref$(EXEEXT)
am__EXEEXT_12 = dfes_bit$(EXEEXT) dfes_divide$(EXEEXT) \
dfes_lincom$(EXEEXT) dfes_linterp$(EXEEXT) \
dfes_multiply$(EXEEXT) dfes_null$(EXEEXT) dfes_phase$(EXEEXT) \
@@ -410,18 +422,18 @@ am__EXEEXT_26 = get64$(EXEEXT) get_affix$(EXEEXT) \
get_nonexistent$(EXEEXT) get_null$(EXEEXT) get_off64$(EXEEXT) \
get_phase$(EXEEXT) get_phase_affix$(EXEEXT) \
get_polynom$(EXEEXT) get_polynom_cmpin$(EXEEXT) \
- get_polynom_noin$(EXEEXT) get_recip$(EXEEXT) \
- get_recip_const$(EXEEXT) get_recurse$(EXEEXT) \
- get_rofs$(EXEEXT) get_sbit$(EXEEXT) get_sf$(EXEEXT) \
- get_ss$(EXEEXT) get_string$(EXEEXT) get_type$(EXEEXT) \
- get_uint16$(EXEEXT) get_uint32$(EXEEXT) get_uint64$(EXEEXT) \
- get_window$(EXEEXT) get_window_clr$(EXEEXT) \
- get_window_complex$(EXEEXT) get_window_ge$(EXEEXT) \
- get_window_gt$(EXEEXT) get_window_le$(EXEEXT) \
- get_window_lt$(EXEEXT) get_window_ne$(EXEEXT) \
- get_window_s$(EXEEXT) get_window_set$(EXEEXT) \
- get_zero$(EXEEXT) get_zero_complex$(EXEEXT) \
- get_zero_float$(EXEEXT)
+ get_polynom_noin$(EXEEXT) get_range$(EXEEXT) \
+ get_recip$(EXEEXT) get_recip_const$(EXEEXT) \
+ get_recurse$(EXEEXT) get_rofs$(EXEEXT) get_sbit$(EXEEXT) \
+ get_sf$(EXEEXT) get_ss$(EXEEXT) get_string$(EXEEXT) \
+ get_type$(EXEEXT) get_uint16$(EXEEXT) get_uint32$(EXEEXT) \
+ get_uint64$(EXEEXT) get_window$(EXEEXT) \
+ get_window_clr$(EXEEXT) get_window_complex$(EXEEXT) \
+ get_window_ge$(EXEEXT) get_window_gt$(EXEEXT) \
+ get_window_le$(EXEEXT) get_window_lt$(EXEEXT) \
+ get_window_ne$(EXEEXT) get_window_s$(EXEEXT) \
+ get_window_set$(EXEEXT) get_zero$(EXEEXT) \
+ get_zero_complex$(EXEEXT) get_zero_float$(EXEEXT)
am__EXEEXT_27 = global_flags$(EXEEXT) global_name$(EXEEXT) \
global_ref$(EXEEXT) global_ref_empty$(EXEEXT) \
global_ref_set$(EXEEXT)
@@ -436,8 +448,9 @@ am__EXEEXT_28 = gzip_add$(EXEEXT) gzip_del$(EXEEXT) gzip_get$(EXEEXT) \
gzip_seek_far$(EXEEXT) gzip_seek_put$(EXEEXT) \
gzip_sync$(EXEEXT)
am__EXEEXT_29 = header_complex$(EXEEXT) header_off64t$(EXEEXT)
-am__EXEEXT_30 = hide$(EXEEXT) hide_hidden$(EXEEXT) \
- hide_unhide$(EXEEXT)
+am__EXEEXT_30 = hide$(EXEEXT) hide_bad$(EXEEXT) hide_hidden$(EXEEXT) \
+ hide_hidden_bad$(EXEEXT) hide_unhide$(EXEEXT) \
+ hide_unhide_bad$(EXEEXT)
am__EXEEXT_31 = include_accmode$(EXEEXT) include_affix$(EXEEXT) \
include_auto$(EXEEXT) include_cb$(EXEEXT) \
include_creat$(EXEEXT) include_ignore$(EXEEXT) \
@@ -645,12 +658,13 @@ am__EXEEXT_46 = put64$(EXEEXT) put_bad_code$(EXEEXT) put_bit$(EXEEXT) \
put_phase$(EXEEXT) put_phase_noin$(EXEEXT) \
put_polynom1$(EXEEXT) put_polynom2$(EXEEXT) \
put_polynom_noin$(EXEEXT) put_protect$(EXEEXT) \
- put_rdonly$(EXEEXT) put_recip$(EXEEXT) put_recurse$(EXEEXT) \
- put_repr$(EXEEXT) put_rofs$(EXEEXT) put_sbit$(EXEEXT) \
- put_sf$(EXEEXT) put_ss$(EXEEXT) put_string$(EXEEXT) \
- put_string_protect$(EXEEXT) put_sub$(EXEEXT) put_type$(EXEEXT) \
- put_uint16$(EXEEXT) put_uint32$(EXEEXT) put_uint64$(EXEEXT) \
- put_window$(EXEEXT) put_zero$(EXEEXT)
+ put_range$(EXEEXT) put_rdonly$(EXEEXT) put_recip$(EXEEXT) \
+ put_recurse$(EXEEXT) put_repr$(EXEEXT) put_rofs$(EXEEXT) \
+ put_sbit$(EXEEXT) put_sf$(EXEEXT) put_ss$(EXEEXT) \
+ put_string$(EXEEXT) put_string_protect$(EXEEXT) \
+ put_sub$(EXEEXT) put_type$(EXEEXT) put_uint16$(EXEEXT) \
+ put_uint32$(EXEEXT) put_uint64$(EXEEXT) put_window$(EXEEXT) \
+ put_zero$(EXEEXT)
am__EXEEXT_47 = ref$(EXEEXT) ref_none$(EXEEXT) ref_two$(EXEEXT)
am__EXEEXT_48 = repr_a$(EXEEXT) repr_bad$(EXEEXT) \
repr_float32$(EXEEXT) repr_float64$(EXEEXT) repr_i$(EXEEXT) \
@@ -662,8 +676,8 @@ am__EXEEXT_48 = repr_a$(EXEEXT) repr_bad$(EXEEXT) \
am__EXEEXT_49 = seek64$(EXEEXT) seek_cur$(EXEEXT) seek_end$(EXEEXT) \
seek_far$(EXEEXT) seek_foffs$(EXEEXT) seek_foffs2$(EXEEXT) \
seek_index$(EXEEXT) seek_lincom$(EXEEXT) seek_mult$(EXEEXT) \
- seek_neg$(EXEEXT) seek_phase$(EXEEXT) seek_set$(EXEEXT) \
- seek_sub$(EXEEXT)
+ seek_neg$(EXEEXT) seek_phase$(EXEEXT) seek_range$(EXEEXT) \
+ seek_range2$(EXEEXT) seek_set$(EXEEXT) seek_sub$(EXEEXT)
am__EXEEXT_50 = sie_get_big$(EXEEXT) sie_get_little$(EXEEXT) \
sie_move_from$(EXEEXT) sie_move_to$(EXEEXT) \
sie_nframes_big$(EXEEXT) sie_nframes_little$(EXEEXT) \
@@ -1974,6 +1988,10 @@ cvlist_array_meta_hidden_SOURCES = cvlist_array_meta_hidden.c
cvlist_array_meta_hidden_OBJECTS = cvlist_array_meta_hidden.$(OBJEXT)
cvlist_array_meta_hidden_LDADD = $(LDADD)
cvlist_array_meta_hidden_DEPENDENCIES = ../src/libgetdata.la
+cvlist_array_null_SOURCES = cvlist_array_null.c
+cvlist_array_null_OBJECTS = cvlist_array_null.$(OBJEXT)
+cvlist_array_null_LDADD = $(LDADD)
+cvlist_array_null_DEPENDENCIES = ../src/libgetdata.la
cvlist_hidden_SOURCES = cvlist_hidden.c
cvlist_hidden_OBJECTS = cvlist_hidden.$(OBJEXT)
cvlist_hidden_LDADD = $(LDADD)
@@ -1998,10 +2016,18 @@ cvlist_meta_invalid_SOURCES = cvlist_meta_invalid.c
cvlist_meta_invalid_OBJECTS = cvlist_meta_invalid.$(OBJEXT)
cvlist_meta_invalid_LDADD = $(LDADD)
cvlist_meta_invalid_DEPENDENCIES = ../src/libgetdata.la
+cvlist_null_SOURCES = cvlist_null.c
+cvlist_null_OBJECTS = cvlist_null.$(OBJEXT)
+cvlist_null_LDADD = $(LDADD)
+cvlist_null_DEPENDENCIES = ../src/libgetdata.la
del_alias_SOURCES = del_alias.c
del_alias_OBJECTS = del_alias.$(OBJEXT)
del_alias_LDADD = $(LDADD)
del_alias_DEPENDENCIES = ../src/libgetdata.la
+del_bad_code_SOURCES = del_bad_code.c
+del_bad_code_OBJECTS = del_bad_code.$(OBJEXT)
+del_bad_code_LDADD = $(LDADD)
+del_bad_code_DEPENDENCIES = ../src/libgetdata.la
del_carray_SOURCES = del_carray.c
del_carray_OBJECTS = del_carray.$(OBJEXT)
del_carray_LDADD = $(LDADD)
@@ -2997,6 +3023,10 @@ get_polynom_noin_SOURCES = get_polynom_noin.c
get_polynom_noin_OBJECTS = get_polynom_noin.$(OBJEXT)
get_polynom_noin_LDADD = $(LDADD)
get_polynom_noin_DEPENDENCIES = ../src/libgetdata.la
+get_range_SOURCES = get_range.c
+get_range_OBJECTS = get_range.$(OBJEXT)
+get_range_LDADD = $(LDADD)
+get_range_DEPENDENCIES = ../src/libgetdata.la
get_recip_SOURCES = get_recip.c
get_recip_OBJECTS = get_recip.$(OBJEXT)
get_recip_LDADD = $(LDADD)
@@ -3217,14 +3247,26 @@ hide_SOURCES = hide.c
hide_OBJECTS = hide.$(OBJEXT)
hide_LDADD = $(LDADD)
hide_DEPENDENCIES = ../src/libgetdata.la
+hide_bad_SOURCES = hide_bad.c
+hide_bad_OBJECTS = hide_bad.$(OBJEXT)
+hide_bad_LDADD = $(LDADD)
+hide_bad_DEPENDENCIES = ../src/libgetdata.la
hide_hidden_SOURCES = hide_hidden.c
hide_hidden_OBJECTS = hide_hidden.$(OBJEXT)
hide_hidden_LDADD = $(LDADD)
hide_hidden_DEPENDENCIES = ../src/libgetdata.la
+hide_hidden_bad_SOURCES = hide_hidden_bad.c
+hide_hidden_bad_OBJECTS = hide_hidden_bad.$(OBJEXT)
+hide_hidden_bad_LDADD = $(LDADD)
+hide_hidden_bad_DEPENDENCIES = ../src/libgetdata.la
hide_unhide_SOURCES = hide_unhide.c
hide_unhide_OBJECTS = hide_unhide.$(OBJEXT)
hide_unhide_LDADD = $(LDADD)
hide_unhide_DEPENDENCIES = ../src/libgetdata.la
+hide_unhide_bad_SOURCES = hide_unhide_bad.c
+hide_unhide_bad_OBJECTS = hide_unhide_bad.$(OBJEXT)
+hide_unhide_bad_LDADD = $(LDADD)
+hide_unhide_bad_DEPENDENCIES = ../src/libgetdata.la
include_accmode_SOURCES = include_accmode.c
include_accmode_OBJECTS = include_accmode.$(OBJEXT)
include_accmode_LDADD = $(LDADD)
@@ -4849,6 +4891,10 @@ put_protect_SOURCES = put_protect.c
put_protect_OBJECTS = put_protect.$(OBJEXT)
put_protect_LDADD = $(LDADD)
put_protect_DEPENDENCIES = ../src/libgetdata.la
+put_range_SOURCES = put_range.c
+put_range_OBJECTS = put_range.$(OBJEXT)
+put_range_LDADD = $(LDADD)
+put_range_DEPENDENCIES = ../src/libgetdata.la
put_rdonly_SOURCES = put_rdonly.c
put_rdonly_OBJECTS = put_rdonly.$(OBJEXT)
put_rdonly_LDADD = $(LDADD)
@@ -5049,6 +5095,14 @@ seek_phase_SOURCES = seek_phase.c
seek_phase_OBJECTS = seek_phase.$(OBJEXT)
seek_phase_LDADD = $(LDADD)
seek_phase_DEPENDENCIES = ../src/libgetdata.la
+seek_range_SOURCES = seek_range.c
+seek_range_OBJECTS = seek_range.$(OBJEXT)
+seek_range_LDADD = $(LDADD)
+seek_range_DEPENDENCIES = ../src/libgetdata.la
+seek_range2_SOURCES = seek_range2.c
+seek_range2_OBJECTS = seek_range2.$(OBJEXT)
+seek_range2_LDADD = $(LDADD)
+seek_range2_DEPENDENCIES = ../src/libgetdata.la
seek_set_SOURCES = seek_set.c
seek_set_OBJECTS = seek_set.$(OBJEXT)
seek_set_LDADD = $(LDADD)
@@ -5630,8 +5684,9 @@ SOURCES = add_add.c add_affix.c add_alias.c add_alias_affix.c \
cvlist_array.c cvlist_array0.c cvlist_array_free.c \
cvlist_array_hidden.c cvlist_array_meta.c cvlist_array_meta0.c \
cvlist_array_meta_free.c cvlist_array_meta_hidden.c \
- cvlist_hidden.c cvlist_invalid.c cvlist_meta.c cvlist_meta0.c \
- cvlist_meta_hidden.c cvlist_meta_invalid.c del_alias.c \
+ cvlist_array_null.c cvlist_hidden.c cvlist_invalid.c \
+ cvlist_meta.c cvlist_meta0.c cvlist_meta_hidden.c \
+ cvlist_meta_invalid.c cvlist_null.c del_alias.c del_bad_code.c \
del_carray.c del_carray_deref.c del_const.c del_const_deref.c \
del_const_force.c del_data.c del_data_enoent.c del_data_open.c \
del_del.c del_derived.c del_derived_after.c \
@@ -5705,9 +5760,9 @@ SOURCES = add_add.c add_affix.c add_alias.c add_alias_affix.c \
get_multiply_s.c get_neg.c get_none.c get_nonexistent.c \
get_null.c get_off64.c get_phase.c get_phase_affix.c \
get_polynom.c get_polynom_cmpin.c get_polynom_noin.c \
- get_recip.c get_recip_const.c get_recurse.c get_rofs.c \
- get_sbit.c get_sf.c get_ss.c get_string.c get_type.c \
- get_uint16.c get_uint32.c get_uint64.c get_window.c \
+ get_range.c get_recip.c get_recip_const.c get_recurse.c \
+ get_rofs.c get_sbit.c get_sf.c get_ss.c get_string.c \
+ get_type.c get_uint16.c get_uint32.c get_uint64.c get_window.c \
get_window_clr.c get_window_complex.c get_window_ge.c \
get_window_gt.c get_window_le.c get_window_lt.c \
get_window_ne.c get_window_s.c get_window_set.c get_zero.c \
@@ -5719,7 +5774,8 @@ SOURCES = add_add.c add_affix.c add_alias.c add_alias_affix.c \
gzip_put_get.c gzip_put_nframes.c gzip_put_off.c \
gzip_put_pad.c gzip_put_sub.c gzip_seek.c gzip_seek_far.c \
gzip_seek_put.c gzip_sync.c header_complex.c header_off64t.c \
- hide.c hide_hidden.c hide_unhide.c include_accmode.c \
+ hide.c hide_bad.c hide_hidden.c hide_hidden_bad.c \
+ hide_unhide.c hide_unhide_bad.c include_accmode.c \
include_affix.c include_auto.c include_cb.c include_creat.c \
include_ignore.c include_include.c include_index.c \
include_invalid.c include_nonexistent.c include_pc.c \
@@ -5850,9 +5906,9 @@ SOURCES = add_add.c add_affix.c add_alias.c add_alias_affix.c \
put_linterp_reverse.c put_mplex.c put_mplex_complex.c \
put_multiply.c put_nofile.c put_null.c put_off64.c put_phase.c \
put_phase_noin.c put_polynom1.c put_polynom2.c \
- put_polynom_noin.c put_protect.c put_rdonly.c put_recip.c \
- put_recurse.c put_repr.c put_rofs.c put_sbit.c put_sf.c \
- put_ss.c put_string.c put_string_protect.c put_sub.c \
+ put_polynom_noin.c put_protect.c put_range.c put_rdonly.c \
+ put_recip.c put_recurse.c put_repr.c put_rofs.c put_sbit.c \
+ put_sf.c put_ss.c put_string.c put_string_protect.c put_sub.c \
put_type.c put_uint16.c put_uint32.c put_uint64.c put_window.c \
put_zero.c ref.c ref_none.c ref_two.c repr_a.c repr_bad.c \
repr_float32.c repr_float64.c repr_i.c repr_int16.c \
@@ -5861,35 +5917,36 @@ SOURCES = add_add.c add_affix.c add_alias.c add_alias_affix.c \
repr_uint16.c repr_uint32.c repr_uint64.c repr_uint8.c \
seek64.c seek_cur.c seek_end.c seek_far.c seek_foffs.c \
seek_foffs2.c seek_index.c seek_lincom.c seek_mult.c \
- seek_neg.c seek_phase.c seek_set.c seek_sub.c sie_get_big.c \
- sie_get_little.c sie_move_from.c sie_move_to.c \
- sie_nframes_big.c sie_nframes_little.c sie_put_append.c \
- sie_put_append2.c sie_put_back.c sie_put_big.c \
- sie_put_little.c sie_put_many.c sie_put_newo.c sie_put_newo0.c \
- sie_put_pad.c sie_put_pad0.c sie_put_trunc.c sie_put_trunc2.c \
- sie_put_trunc_nf.c sie_seek.c sie_seek_far.c sie_sync.c \
- slim_get.c slim_nframes.c slim_seek.c slim_seek_far.c \
- spf_alias.c spf_alias_meta.c spf_alias_missing.c spf_divide.c \
- spf_lincom.c spf_multiply.c spf_polynom.c spf_raw.c \
- spf_recip.c spf_recurse.c svlist.c svlist0.c svlist2.c \
- svlist_hidden.c svlist_invalid.c svlist_meta.c svlist_meta0.c \
- svlist_meta_hidden.c svlist_meta_invalid.c table.c \
- table_code.c table_type.c tell.c tell64.c tell_multidiv.c \
- tell_sub.c tok_arg.c tok_escape.c tok_quote.c trunc.c \
- trunc_dir.c trunc_rdonly.c trunc_rofs.c trunc_truncsub.c \
- unclude.c unclude_del.c unclude_move.c unclude_open.c \
- version_0.c version_0_write.c version_1.c version_1_write.c \
- version_2.c version_2_write.c version_3.c version_3_write.c \
- version_4.c version_4_write.c version_5.c version_5_strict.c \
- version_5_write.c version_6.c version_6_strict.c \
- version_6_write.c version_7.c version_7_strict.c \
- version_7_write.c version_8.c version_8_strict.c \
- version_8_write.c version_9.c version_9_strict.c \
- version_9_write.c vlist.c vlist_alias.c vlist_hidden.c \
- vlist_invalid.c vlist_meta.c vlist_meta_hidden.c \
- vlist_meta_invalid.c zzip_data.c zzip_get.c zzip_get_get.c \
- zzip_nframes.c zzip_seek.c zzip_seek_far.c zzslim_get.c \
- zzslim_nframes.c zzslim_seek.c zzslim_seek_far.c
+ seek_neg.c seek_phase.c seek_range.c seek_range2.c seek_set.c \
+ seek_sub.c sie_get_big.c sie_get_little.c sie_move_from.c \
+ sie_move_to.c sie_nframes_big.c sie_nframes_little.c \
+ sie_put_append.c sie_put_append2.c sie_put_back.c \
+ sie_put_big.c sie_put_little.c sie_put_many.c sie_put_newo.c \
+ sie_put_newo0.c sie_put_pad.c sie_put_pad0.c sie_put_trunc.c \
+ sie_put_trunc2.c sie_put_trunc_nf.c sie_seek.c sie_seek_far.c \
+ sie_sync.c slim_get.c slim_nframes.c slim_seek.c \
+ slim_seek_far.c spf_alias.c spf_alias_meta.c \
+ spf_alias_missing.c spf_divide.c spf_lincom.c spf_multiply.c \
+ spf_polynom.c spf_raw.c spf_recip.c spf_recurse.c svlist.c \
+ svlist0.c svlist2.c svlist_hidden.c svlist_invalid.c \
+ svlist_meta.c svlist_meta0.c svlist_meta_hidden.c \
+ svlist_meta_invalid.c table.c table_code.c table_type.c tell.c \
+ tell64.c tell_multidiv.c tell_sub.c tok_arg.c tok_escape.c \
+ tok_quote.c trunc.c trunc_dir.c trunc_rdonly.c trunc_rofs.c \
+ trunc_truncsub.c unclude.c unclude_del.c unclude_move.c \
+ unclude_open.c version_0.c version_0_write.c version_1.c \
+ version_1_write.c version_2.c version_2_write.c version_3.c \
+ version_3_write.c version_4.c version_4_write.c version_5.c \
+ version_5_strict.c version_5_write.c version_6.c \
+ version_6_strict.c version_6_write.c version_7.c \
+ version_7_strict.c version_7_write.c version_8.c \
+ version_8_strict.c version_8_write.c version_9.c \
+ version_9_strict.c version_9_write.c vlist.c vlist_alias.c \
+ vlist_hidden.c vlist_invalid.c vlist_meta.c \
+ vlist_meta_hidden.c vlist_meta_invalid.c zzip_data.c \
+ zzip_get.c zzip_get_get.c zzip_nframes.c zzip_seek.c \
+ zzip_seek_far.c zzslim_get.c zzslim_nframes.c zzslim_seek.c \
+ zzslim_seek_far.c
DIST_SOURCES = add_add.c add_affix.c add_alias.c add_alias_affix.c \
add_alias_meta.c add_amb_code7.c add_bit.c add_bit_bitnum.c \
add_bit_bitsize.c add_bit_invalid.c add_bit_numbits.c \
@@ -6005,8 +6062,9 @@ DIST_SOURCES = add_add.c add_affix.c add_alias.c add_alias_affix.c \
cvlist_array.c cvlist_array0.c cvlist_array_free.c \
cvlist_array_hidden.c cvlist_array_meta.c cvlist_array_meta0.c \
cvlist_array_meta_free.c cvlist_array_meta_hidden.c \
- cvlist_hidden.c cvlist_invalid.c cvlist_meta.c cvlist_meta0.c \
- cvlist_meta_hidden.c cvlist_meta_invalid.c del_alias.c \
+ cvlist_array_null.c cvlist_hidden.c cvlist_invalid.c \
+ cvlist_meta.c cvlist_meta0.c cvlist_meta_hidden.c \
+ cvlist_meta_invalid.c cvlist_null.c del_alias.c del_bad_code.c \
del_carray.c del_carray_deref.c del_const.c del_const_deref.c \
del_const_force.c del_data.c del_data_enoent.c del_data_open.c \
del_del.c del_derived.c del_derived_after.c \
@@ -6080,9 +6138,9 @@ DIST_SOURCES = add_add.c add_affix.c add_alias.c add_alias_affix.c \
get_multiply_s.c get_neg.c get_none.c get_nonexistent.c \
get_null.c get_off64.c get_phase.c get_phase_affix.c \
get_polynom.c get_polynom_cmpin.c get_polynom_noin.c \
- get_recip.c get_recip_const.c get_recurse.c get_rofs.c \
- get_sbit.c get_sf.c get_ss.c get_string.c get_type.c \
- get_uint16.c get_uint32.c get_uint64.c get_window.c \
+ get_range.c get_recip.c get_recip_const.c get_recurse.c \
+ get_rofs.c get_sbit.c get_sf.c get_ss.c get_string.c \
+ get_type.c get_uint16.c get_uint32.c get_uint64.c get_window.c \
get_window_clr.c get_window_complex.c get_window_ge.c \
get_window_gt.c get_window_le.c get_window_lt.c \
get_window_ne.c get_window_s.c get_window_set.c get_zero.c \
@@ -6094,7 +6152,8 @@ DIST_SOURCES = add_add.c add_affix.c add_alias.c add_alias_affix.c \
gzip_put_get.c gzip_put_nframes.c gzip_put_off.c \
gzip_put_pad.c gzip_put_sub.c gzip_seek.c gzip_seek_far.c \
gzip_seek_put.c gzip_sync.c header_complex.c header_off64t.c \
- hide.c hide_hidden.c hide_unhide.c include_accmode.c \
+ hide.c hide_bad.c hide_hidden.c hide_hidden_bad.c \
+ hide_unhide.c hide_unhide_bad.c include_accmode.c \
include_affix.c include_auto.c include_cb.c include_creat.c \
include_ignore.c include_include.c include_index.c \
include_invalid.c include_nonexistent.c include_pc.c \
@@ -6225,9 +6284,9 @@ DIST_SOURCES = add_add.c add_affix.c add_alias.c add_alias_affix.c \
put_linterp_reverse.c put_mplex.c put_mplex_complex.c \
put_multiply.c put_nofile.c put_null.c put_off64.c put_phase.c \
put_phase_noin.c put_polynom1.c put_polynom2.c \
- put_polynom_noin.c put_protect.c put_rdonly.c put_recip.c \
- put_recurse.c put_repr.c put_rofs.c put_sbit.c put_sf.c \
- put_ss.c put_string.c put_string_protect.c put_sub.c \
+ put_polynom_noin.c put_protect.c put_range.c put_rdonly.c \
+ put_recip.c put_recurse.c put_repr.c put_rofs.c put_sbit.c \
+ put_sf.c put_ss.c put_string.c put_string_protect.c put_sub.c \
put_type.c put_uint16.c put_uint32.c put_uint64.c put_window.c \
put_zero.c ref.c ref_none.c ref_two.c repr_a.c repr_bad.c \
repr_float32.c repr_float64.c repr_i.c repr_int16.c \
@@ -6236,35 +6295,36 @@ DIST_SOURCES = add_add.c add_affix.c add_alias.c add_alias_affix.c \
repr_uint16.c repr_uint32.c repr_uint64.c repr_uint8.c \
seek64.c seek_cur.c seek_end.c seek_far.c seek_foffs.c \
seek_foffs2.c seek_index.c seek_lincom.c seek_mult.c \
- seek_neg.c seek_phase.c seek_set.c seek_sub.c sie_get_big.c \
- sie_get_little.c sie_move_from.c sie_move_to.c \
- sie_nframes_big.c sie_nframes_little.c sie_put_append.c \
- sie_put_append2.c sie_put_back.c sie_put_big.c \
- sie_put_little.c sie_put_many.c sie_put_newo.c sie_put_newo0.c \
- sie_put_pad.c sie_put_pad0.c sie_put_trunc.c sie_put_trunc2.c \
- sie_put_trunc_nf.c sie_seek.c sie_seek_far.c sie_sync.c \
- slim_get.c slim_nframes.c slim_seek.c slim_seek_far.c \
- spf_alias.c spf_alias_meta.c spf_alias_missing.c spf_divide.c \
- spf_lincom.c spf_multiply.c spf_polynom.c spf_raw.c \
- spf_recip.c spf_recurse.c svlist.c svlist0.c svlist2.c \
- svlist_hidden.c svlist_invalid.c svlist_meta.c svlist_meta0.c \
- svlist_meta_hidden.c svlist_meta_invalid.c table.c \
- table_code.c table_type.c tell.c tell64.c tell_multidiv.c \
- tell_sub.c tok_arg.c tok_escape.c tok_quote.c trunc.c \
- trunc_dir.c trunc_rdonly.c trunc_rofs.c trunc_truncsub.c \
- unclude.c unclude_del.c unclude_move.c unclude_open.c \
- version_0.c version_0_write.c version_1.c version_1_write.c \
- version_2.c version_2_write.c version_3.c version_3_write.c \
- version_4.c version_4_write.c version_5.c version_5_strict.c \
- version_5_write.c version_6.c version_6_strict.c \
- version_6_write.c version_7.c version_7_strict.c \
- version_7_write.c version_8.c version_8_strict.c \
- version_8_write.c version_9.c version_9_strict.c \
- version_9_write.c vlist.c vlist_alias.c vlist_hidden.c \
- vlist_invalid.c vlist_meta.c vlist_meta_hidden.c \
- vlist_meta_invalid.c zzip_data.c zzip_get.c zzip_get_get.c \
- zzip_nframes.c zzip_seek.c zzip_seek_far.c zzslim_get.c \
- zzslim_nframes.c zzslim_seek.c zzslim_seek_far.c
+ seek_neg.c seek_phase.c seek_range.c seek_range2.c seek_set.c \
+ seek_sub.c sie_get_big.c sie_get_little.c sie_move_from.c \
+ sie_move_to.c sie_nframes_big.c sie_nframes_little.c \
+ sie_put_append.c sie_put_append2.c sie_put_back.c \
+ sie_put_big.c sie_put_little.c sie_put_many.c sie_put_newo.c \
+ sie_put_newo0.c sie_put_pad.c sie_put_pad0.c sie_put_trunc.c \
+ sie_put_trunc2.c sie_put_trunc_nf.c sie_seek.c sie_seek_far.c \
+ sie_sync.c slim_get.c slim_nframes.c slim_seek.c \
+ slim_seek_far.c spf_alias.c spf_alias_meta.c \
+ spf_alias_missing.c spf_divide.c spf_lincom.c spf_multiply.c \
+ spf_polynom.c spf_raw.c spf_recip.c spf_recurse.c svlist.c \
+ svlist0.c svlist2.c svlist_hidden.c svlist_invalid.c \
+ svlist_meta.c svlist_meta0.c svlist_meta_hidden.c \
+ svlist_meta_invalid.c table.c table_code.c table_type.c tell.c \
+ tell64.c tell_multidiv.c tell_sub.c tok_arg.c tok_escape.c \
+ tok_quote.c trunc.c trunc_dir.c trunc_rdonly.c trunc_rofs.c \
+ trunc_truncsub.c unclude.c unclude_del.c unclude_move.c \
+ unclude_open.c version_0.c version_0_write.c version_1.c \
+ version_1_write.c version_2.c version_2_write.c version_3.c \
+ version_3_write.c version_4.c version_4_write.c version_5.c \
+ version_5_strict.c version_5_write.c version_6.c \
+ version_6_strict.c version_6_write.c version_7.c \
+ version_7_strict.c version_7_write.c version_8.c \
+ version_8_strict.c version_8_write.c version_9.c \
+ version_9_strict.c version_9_write.c vlist.c vlist_alias.c \
+ vlist_hidden.c vlist_invalid.c vlist_meta.c \
+ vlist_meta_hidden.c vlist_meta_invalid.c zzip_data.c \
+ zzip_get.c zzip_get_get.c zzip_nframes.c zzip_seek.c \
+ zzip_seek_far.c zzslim_get.c zzslim_nframes.c zzslim_seek.c \
+ zzslim_seek_far.c
am__can_run_installinfo = \
case $$AM_UPDATE_INFO_DIR in \
n|no|NO) false;; \
@@ -6311,6 +6371,7 @@ am__tty_colors = { \
std='[m'; \
fi; \
}
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -6661,14 +6722,14 @@ CONVERT_TESTS = convert_complex128_complex64 convert_complex128_float64 \
CREAT_TESTS = creat creat_excl creat_rdonly creat_rdonly_exists
CVLIST_TESTS = cvlist cvlist_array cvlist_array0 cvlist_array_free \
cvlist_array_hidden cvlist_array_meta cvlist_array_meta0 \
- cvlist_array_meta_free cvlist_array_meta_hidden cvlist_hidden \
- cvlist_invalid cvlist_meta cvlist_meta0 cvlist_meta_hidden \
- cvlist_meta_invalid
+ cvlist_array_meta_free cvlist_array_meta_hidden cvlist_array_null \
+ cvlist_hidden cvlist_invalid cvlist_meta cvlist_meta0 \
+ cvlist_meta_hidden cvlist_meta_invalid cvlist_null
-DEL_TESTS = del_alias del_carray del_carray_deref del_const del_const_deref \
- del_const_force del_data del_data_enoent del_data_open del_derived \
- del_derived_after del_derived_force del_del del_meta del_meta_force \
- del_ref
+DEL_TESTS = del_alias del_bad_code del_carray del_carray_deref del_const \
+ del_const_deref del_const_force del_data del_data_enoent \
+ del_data_open del_derived del_derived_after del_derived_force \
+ del_del del_meta del_meta_force del_ref
DESYNC_TESTS = desync desync_flush desync_path desync_reopen desync_reopen_inv
DFES_TESTS = dfes_bit dfes_divide dfes_lincom dfes_linterp dfes_multiply \
@@ -6738,7 +6799,7 @@ GET_TESTS = get64 get_affix get_bad_code get_bit get_carray get_carray_len \
get_multiply_ccin get_multiply_crin get_multiply_crinr \
get_multiply_noin get_multiply_rcin get_multiply_s get_neg get_none \
get_nonexistent get_null get_off64 get_phase get_phase_affix \
- get_polynom get_polynom_cmpin get_polynom_noin get_recip \
+ get_polynom get_polynom_cmpin get_polynom_noin get_range get_recip \
get_recip_const get_recurse get_rofs get_sbit get_sf get_ss \
get_string get_type get_uint16 get_uint32 get_uint64 get_window \
get_window_clr get_window_complex get_window_ge get_window_gt \
@@ -6753,7 +6814,9 @@ GZIP_TESTS = gzip_add gzip_del gzip_get gzip_get_far gzip_get_get gzip_get_get2
gzip_seek_put gzip_sync
HEADER_TESTS = header_complex header_off64t
-HIDE_TESTS = hide hide_hidden hide_unhide
+HIDE_TESTS = hide hide_bad hide_hidden hide_hidden_bad hide_unhide \
+ hide_unhide_bad
+
INCLUDE_TESTS = include_accmode include_affix include_auto include_cb \
include_creat include_ignore include_include include_index \
include_invalid include_nonexistent include_pc \
@@ -6876,10 +6939,10 @@ PUT_TESTS = put64 put_bad_code put_bit put_bof put_carray put_carray_client \
put_lincom_noin put_linterp put_linterp_noin put_linterp_nomono \
put_linterp_notab put_linterp_reverse put_mplex put_mplex_complex \
put_multiply put_nofile put_null put_off64 put_phase put_phase_noin \
- put_polynom1 put_polynom2 put_polynom_noin put_protect put_rdonly \
- put_recip put_recurse put_repr put_rofs put_sbit put_sf put_ss \
- put_string put_string_protect put_sub put_type put_uint16 put_uint32 \
- put_uint64 put_window put_zero
+ put_polynom1 put_polynom2 put_polynom_noin put_protect put_range \
+ put_rdonly put_recip put_recurse put_repr put_rofs put_sbit put_sf \
+ put_ss put_string put_string_protect put_sub put_type put_uint16 \
+ put_uint32 put_uint64 put_window put_zero
REF_TESTS = ref ref_none ref_two
REPR_TESTS = repr_a repr_bad repr_float32 repr_float64 repr_i repr_int16 \
@@ -6888,7 +6951,8 @@ REPR_TESTS = repr_a repr_bad repr_float32 repr_float64 repr_i repr_int16 \
repr_uint64 repr_uint8
SEEK_TESTS = seek64 seek_cur seek_end seek_far seek_foffs seek_foffs2 seek_index \
- seek_lincom seek_mult seek_neg seek_phase seek_set seek_sub
+ seek_lincom seek_mult seek_neg seek_phase seek_range seek_range2 \
+ seek_set seek_sub
SIE_TESTS = sie_get_big sie_get_little sie_move_from sie_move_to sie_nframes_big \
sie_nframes_little sie_put_append sie_put_append2 sie_put_back \
@@ -6936,7 +7000,6 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign test/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign test/Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -8184,6 +8247,10 @@ cvlist_array_meta_hidden$(EXEEXT): $(cvlist_array_meta_hidden_OBJECTS) $(cvlist_
@rm -f cvlist_array_meta_hidden$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(cvlist_array_meta_hidden_OBJECTS) $(cvlist_array_meta_hidden_LDADD) $(LIBS)
+cvlist_array_null$(EXEEXT): $(cvlist_array_null_OBJECTS) $(cvlist_array_null_DEPENDENCIES) $(EXTRA_cvlist_array_null_DEPENDENCIES)
+ @rm -f cvlist_array_null$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(cvlist_array_null_OBJECTS) $(cvlist_array_null_LDADD) $(LIBS)
+
cvlist_hidden$(EXEEXT): $(cvlist_hidden_OBJECTS) $(cvlist_hidden_DEPENDENCIES) $(EXTRA_cvlist_hidden_DEPENDENCIES)
@rm -f cvlist_hidden$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(cvlist_hidden_OBJECTS) $(cvlist_hidden_LDADD) $(LIBS)
@@ -8208,10 +8275,18 @@ cvlist_meta_invalid$(EXEEXT): $(cvlist_meta_invalid_OBJECTS) $(cvlist_meta_inval
@rm -f cvlist_meta_invalid$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(cvlist_meta_invalid_OBJECTS) $(cvlist_meta_invalid_LDADD) $(LIBS)
+cvlist_null$(EXEEXT): $(cvlist_null_OBJECTS) $(cvlist_null_DEPENDENCIES) $(EXTRA_cvlist_null_DEPENDENCIES)
+ @rm -f cvlist_null$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(cvlist_null_OBJECTS) $(cvlist_null_LDADD) $(LIBS)
+
del_alias$(EXEEXT): $(del_alias_OBJECTS) $(del_alias_DEPENDENCIES) $(EXTRA_del_alias_DEPENDENCIES)
@rm -f del_alias$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(del_alias_OBJECTS) $(del_alias_LDADD) $(LIBS)
+del_bad_code$(EXEEXT): $(del_bad_code_OBJECTS) $(del_bad_code_DEPENDENCIES) $(EXTRA_del_bad_code_DEPENDENCIES)
+ @rm -f del_bad_code$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(del_bad_code_OBJECTS) $(del_bad_code_LDADD) $(LIBS)
+
del_carray$(EXEEXT): $(del_carray_OBJECTS) $(del_carray_DEPENDENCIES) $(EXTRA_del_carray_DEPENDENCIES)
@rm -f del_carray$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(del_carray_OBJECTS) $(del_carray_LDADD) $(LIBS)
@@ -9200,6 +9275,10 @@ get_polynom_noin$(EXEEXT): $(get_polynom_noin_OBJECTS) $(get_polynom_noin_DEPEND
@rm -f get_polynom_noin$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(get_polynom_noin_OBJECTS) $(get_polynom_noin_LDADD) $(LIBS)
+get_range$(EXEEXT): $(get_range_OBJECTS) $(get_range_DEPENDENCIES) $(EXTRA_get_range_DEPENDENCIES)
+ @rm -f get_range$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(get_range_OBJECTS) $(get_range_LDADD) $(LIBS)
+
get_recip$(EXEEXT): $(get_recip_OBJECTS) $(get_recip_DEPENDENCIES) $(EXTRA_get_recip_DEPENDENCIES)
@rm -f get_recip$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(get_recip_OBJECTS) $(get_recip_LDADD) $(LIBS)
@@ -9420,14 +9499,26 @@ hide$(EXEEXT): $(hide_OBJECTS) $(hide_DEPENDENCIES) $(EXTRA_hide_DEPENDENCIES)
@rm -f hide$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(hide_OBJECTS) $(hide_LDADD) $(LIBS)
+hide_bad$(EXEEXT): $(hide_bad_OBJECTS) $(hide_bad_DEPENDENCIES) $(EXTRA_hide_bad_DEPENDENCIES)
+ @rm -f hide_bad$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(hide_bad_OBJECTS) $(hide_bad_LDADD) $(LIBS)
+
hide_hidden$(EXEEXT): $(hide_hidden_OBJECTS) $(hide_hidden_DEPENDENCIES) $(EXTRA_hide_hidden_DEPENDENCIES)
@rm -f hide_hidden$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(hide_hidden_OBJECTS) $(hide_hidden_LDADD) $(LIBS)
+hide_hidden_bad$(EXEEXT): $(hide_hidden_bad_OBJECTS) $(hide_hidden_bad_DEPENDENCIES) $(EXTRA_hide_hidden_bad_DEPENDENCIES)
+ @rm -f hide_hidden_bad$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(hide_hidden_bad_OBJECTS) $(hide_hidden_bad_LDADD) $(LIBS)
+
hide_unhide$(EXEEXT): $(hide_unhide_OBJECTS) $(hide_unhide_DEPENDENCIES) $(EXTRA_hide_unhide_DEPENDENCIES)
@rm -f hide_unhide$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(hide_unhide_OBJECTS) $(hide_unhide_LDADD) $(LIBS)
+hide_unhide_bad$(EXEEXT): $(hide_unhide_bad_OBJECTS) $(hide_unhide_bad_DEPENDENCIES) $(EXTRA_hide_unhide_bad_DEPENDENCIES)
+ @rm -f hide_unhide_bad$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(hide_unhide_bad_OBJECTS) $(hide_unhide_bad_LDADD) $(LIBS)
+
include_accmode$(EXEEXT): $(include_accmode_OBJECTS) $(include_accmode_DEPENDENCIES) $(EXTRA_include_accmode_DEPENDENCIES)
@rm -f include_accmode$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(include_accmode_OBJECTS) $(include_accmode_LDADD) $(LIBS)
@@ -11044,6 +11135,10 @@ put_protect$(EXEEXT): $(put_protect_OBJECTS) $(put_protect_DEPENDENCIES) $(EXTRA
@rm -f put_protect$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(put_protect_OBJECTS) $(put_protect_LDADD) $(LIBS)
+put_range$(EXEEXT): $(put_range_OBJECTS) $(put_range_DEPENDENCIES) $(EXTRA_put_range_DEPENDENCIES)
+ @rm -f put_range$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(put_range_OBJECTS) $(put_range_LDADD) $(LIBS)
+
put_rdonly$(EXEEXT): $(put_rdonly_OBJECTS) $(put_rdonly_DEPENDENCIES) $(EXTRA_put_rdonly_DEPENDENCIES)
@rm -f put_rdonly$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(put_rdonly_OBJECTS) $(put_rdonly_LDADD) $(LIBS)
@@ -11244,6 +11339,14 @@ seek_phase$(EXEEXT): $(seek_phase_OBJECTS) $(seek_phase_DEPENDENCIES) $(EXTRA_se
@rm -f seek_phase$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(seek_phase_OBJECTS) $(seek_phase_LDADD) $(LIBS)
+seek_range$(EXEEXT): $(seek_range_OBJECTS) $(seek_range_DEPENDENCIES) $(EXTRA_seek_range_DEPENDENCIES)
+ @rm -f seek_range$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(seek_range_OBJECTS) $(seek_range_LDADD) $(LIBS)
+
+seek_range2$(EXEEXT): $(seek_range2_OBJECTS) $(seek_range2_DEPENDENCIES) $(EXTRA_seek_range2_DEPENDENCIES)
+ @rm -f seek_range2$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(seek_range2_OBJECTS) $(seek_range2_LDADD) $(LIBS)
+
seek_set$(EXEEXT): $(seek_set_OBJECTS) $(seek_set_DEPENDENCIES) $(EXTRA_seek_set_DEPENDENCIES)
@rm -f seek_set$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(seek_set_OBJECTS) $(seek_set_LDADD) $(LIBS)
@@ -11987,13 +12090,16 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/cvlist_array_meta0.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/cvlist_array_meta_free.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/cvlist_array_meta_hidden.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/cvlist_array_null.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/cvlist_hidden.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/cvlist_invalid.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/cvlist_meta.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/cvlist_meta0.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/cvlist_meta_hidden.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/cvlist_meta_invalid.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/cvlist_null.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/del_alias.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/del_bad_code.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/del_carray.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/del_carray_deref.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/del_const.Po at am__quote@
@@ -12241,6 +12347,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/get_polynom.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/get_polynom_cmpin.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/get_polynom_noin.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/get_range.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/get_recip.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/get_recip_const.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/get_recurse.Po at am__quote@
@@ -12296,8 +12403,11 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/header_complex.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/header_off64t.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/hide.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/hide_bad.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/hide_hidden.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/hide_hidden_bad.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/hide_unhide.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/hide_unhide_bad.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/include_accmode.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/include_affix.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/include_auto.Po at am__quote@
@@ -12702,6 +12812,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/put_polynom2.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/put_polynom_noin.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/put_protect.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/put_range.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/put_rdonly.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/put_recip.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/put_recurse.Po at am__quote@
@@ -12752,6 +12863,8 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/seek_mult.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/seek_neg.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/seek_phase.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/seek_range.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/seek_range2.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/seek_set.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/seek_sub.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/sie_get_big.Po at am__quote@
@@ -13187,6 +13300,8 @@ uninstall-am:
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
tags tags-am uninstall uninstall-am
+.PRECIOUS: Makefile
+
# fast tests
.PHONY: fastcheck
@@ -13211,7 +13326,7 @@ getdata-clean-dir:
clean-local:
$(MAKE) getdata-clean-dir
- rm -rf *~
+ rm -rf *~ *.gcno *.gcda
# 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/test/cvlist_array.c b/test/cvlist_array.c
index a24bb04..6e654f9 100644
--- a/test/cvlist_array.c
+++ b/test/cvlist_array.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2010-2011, 2013 D. V. Wiebe
+/* Copyright (C) 2010-2011, 2013, 2015 D. V. Wiebe
*
***************************************************************************
*
@@ -37,8 +37,10 @@ int main(void)
"data1 CARRAY UINT8 1 2 3 4 5\n"
"data2 CARRAY UINT8 2 4 6 8 10 12\n"
"data3 CARRAY UINT8 3 6 9 12 15 18 21\n"
- "data4 RAW UINT8 1\n";
- int fd, error, r = 0;
+ "data4 RAW UINT8 1\n"
+ "data4/meta CARRAY UINT8 4 8 12 16 20 24 28 32\n"
+ "/ALIAS data5 data4/meta\n";
+ int j, error, r = 0;
size_t i;
struct uint8_carrays {
size_t n;
@@ -49,9 +51,9 @@ int main(void)
rmdirfile();
mkdir(filedir, 0777);
- fd = open(format, O_CREAT | O_EXCL | O_WRONLY, 0666);
- write(fd, format_data, strlen(format_data));
- close(fd);
+ j = open(format, O_CREAT | O_EXCL | O_WRONLY, 0666);
+ write(j, format_data, strlen(format_data));
+ close(j);
D = gd_open(filedir, GD_RDONLY | GD_VERBOSE);
field_list = (struct uint8_carrays*)gd_carrays(D, GD_UINT8);
@@ -61,10 +63,10 @@ int main(void)
CHECKI(error, 0);
if (!r)
- for (fd = 0; fd < 3; ++fd) {
- CHECKUi(fd,field_list[fd].n, (size_t)(5 + fd));
- for (i = 0; i < field_list[fd].n; ++i)
- CHECKUi(fd * 1000 + i,field_list[fd].d[i], (fd + 1) * (i + 1));
+ for (j = 0; j < 4; ++j) {
+ CHECKUi(j,field_list[j].n, (size_t)(5 + j));
+ for (i = 0; i < field_list[j].n; ++i)
+ CHECKUi(j * 1000 + i,field_list[j].d[i], (j + 1) * (i + 1));
}
gd_discard(D);
diff --git a/test/cvlist_array_meta.c b/test/cvlist_array_meta.c
index 8cc340b..47959de 100644
--- a/test/cvlist_array_meta.c
+++ b/test/cvlist_array_meta.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2010-2011, 2013 D. V. Wiebe
+/* Copyright (C) 2010-2011, 2013, 2015 D. V. Wiebe
*
***************************************************************************
*
@@ -34,12 +34,14 @@ int main(void)
const char *filedir = "dirfile";
const char *format = "dirfile/format";
const char *format_data =
+ "data0 CARRAY UINT8 4 8 12 16 20 24 28 32\n"
"parent CARRAY UINT8 1\n"
"parent/data1 CARRAY UINT8 1 2 3 4 5\n"
"parent/data2 CARRAY UINT8 2 4 6 8 10 12\n"
"parent/data3 CARRAY UINT8 3 6 9 12 15 18 21\n"
- "META parent data4 LINTERP UINT8 1\n";
- int fd, r = 0;
+ "META parent data4 LINTERP UINT8 1\n"
+ "/ALIAS parent/data5 data0\n";
+ int j, r = 0;
size_t i, error;
struct uint8_carrays {
size_t n;
@@ -50,9 +52,9 @@ int main(void)
rmdirfile();
mkdir(filedir, 0777);
- fd = open(format, O_CREAT | O_EXCL | O_WRONLY, 0666);
- write(fd, format_data, strlen(format_data));
- close(fd);
+ j = open(format, O_CREAT | O_EXCL | O_WRONLY, 0666);
+ write(j, format_data, strlen(format_data));
+ close(j);
D = gd_open(filedir, GD_RDONLY | GD_VERBOSE);
field_list = (struct uint8_carrays *)gd_mcarrays(D, "parent", GD_UINT8);
@@ -61,10 +63,10 @@ int main(void)
CHECKI(error, 0);
if (!r)
- for (fd = 0; fd < 3; ++fd) {
- CHECKUi(fd,field_list[fd].n, (size_t)(5 + fd));
- for (i = 0; i < field_list[fd].n; ++i)
- CHECKUi(fd * 1000 + i,field_list[fd].d[i], (fd + 1) * (i + 1));
+ for (j = 0; j < 4; ++j) {
+ CHECKUi(j,field_list[j].n, (size_t)(5 + j));
+ for (i = 0; i < field_list[j].n; ++i)
+ CHECKUi(j * 1000 + i,field_list[j].d[i], (j + 1) * (i + 1));
}
diff --git a/test/cvlist_array.c b/test/cvlist_array_null.c
similarity index 68%
copy from test/cvlist_array.c
copy to test/cvlist_array_null.c
index a24bb04..bd743aa 100644
--- a/test/cvlist_array.c
+++ b/test/cvlist_array_null.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2010-2011, 2013 D. V. Wiebe
+/* Copyright (C) 2015 D. V. Wiebe
*
***************************************************************************
*
@@ -20,15 +20,6 @@
*/
#include "test.h"
-#include <inttypes.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <string.h>
-#include <errno.h>
-
int main(void)
{
const char *filedir = "dirfile";
@@ -37,9 +28,10 @@ int main(void)
"data1 CARRAY UINT8 1 2 3 4 5\n"
"data2 CARRAY UINT8 2 4 6 8 10 12\n"
"data3 CARRAY UINT8 3 6 9 12 15 18 21\n"
- "data4 RAW UINT8 1\n";
- int fd, error, r = 0;
- size_t i;
+ "data4 RAW UINT8 1\n"
+ "data4/meta CARRAY UINT8 4 8 12 16 20 24 28 32\n"
+ "/ALIAS data5 data4/meta\n";
+ int j, error, r = 0;
struct uint8_carrays {
size_t n;
uint8_t *d;
@@ -49,22 +41,21 @@ int main(void)
rmdirfile();
mkdir(filedir, 0777);
- fd = open(format, O_CREAT | O_EXCL | O_WRONLY, 0666);
- write(fd, format_data, strlen(format_data));
- close(fd);
+ j = open(format, O_CREAT | O_EXCL | O_WRONLY, 0666);
+ write(j, format_data, strlen(format_data));
+ close(j);
D = gd_open(filedir, GD_RDONLY | GD_VERBOSE);
- field_list = (struct uint8_carrays*)gd_carrays(D, GD_UINT8);
+ field_list = (struct uint8_carrays*)gd_carrays(D, GD_NULL);
error = gd_error(D);
CHECKI(error, 0);
if (!r)
- for (fd = 0; fd < 3; ++fd) {
- CHECKUi(fd,field_list[fd].n, (size_t)(5 + fd));
- for (i = 0; i < field_list[fd].n; ++i)
- CHECKUi(fd * 1000 + i,field_list[fd].d[i], (fd + 1) * (i + 1));
+ for (j = 0; j < 4; ++j) {
+ CHECKUi(j,field_list[j].n, (size_t)(5 + j));
+ CHECKPi(j,field_list[j].d);
}
gd_discard(D);
diff --git a/test/cvlist_hidden.c b/test/cvlist_hidden.c
index 6676749..fc49723 100644
--- a/test/cvlist_hidden.c
+++ b/test/cvlist_hidden.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2011, 2013 D. V. Wiebe
+/* Copyright (C) 2011, 2013, 2015 D. V. Wiebe
*
***************************************************************************
*
@@ -25,32 +25,35 @@ int main(void)
const char *filedir = "dirfile";
const char *format = "dirfile/format";
const char *format_data =
- "data1 CONST UINT8 1\n"
- "data2 CONST UINT8 2\n"
+ "data1 CONST UINT8 2\n"
+ "data2 CONST UINT8 4\n"
"/HIDDEN data2\n"
"data3 CONST UINT8 3\n"
- "data4 RAW UINT8 1\n";
- int fd, error, r = 0;
- const uint8_t *field_list;
+ "/ALIAS data4 data2\n"
+ "data5 CONST UINT8 5\n"
+ "/ALIAS data6 data5\n"
+ "/HIDDEN data6\n";
+ int i, error, r = 0;
+ const uint8_t *data;
DIRFILE *D;
rmdirfile();
mkdir(filedir, 0777);
- fd = open(format, O_CREAT | O_EXCL | O_WRONLY, 0666);
- write(fd, format_data, strlen(format_data));
- close(fd);
+ i = open(format, O_CREAT | O_EXCL | O_WRONLY, 0666);
+ write(i, format_data, strlen(format_data));
+ close(i);
D = gd_open(filedir, GD_RDONLY | GD_VERBOSE);
- field_list = (const uint8_t *)gd_constants(D, GD_UINT8);
+ data = (const uint8_t *)gd_constants(D, GD_UINT8);
error = gd_error(D);
CHECKI(error, 0);
if (!r)
- for (fd = 0; fd < 2; ++fd)
- CHECKUi(fd,field_list[fd], 2 * fd + 1);
+ for (i = 0; i < 4; ++i)
+ CHECKUi(i,data[i], i + 2);
gd_discard(D);
unlink(format);
diff --git a/test/cvlist_hidden.c b/test/cvlist_null.c
similarity index 83%
copy from test/cvlist_hidden.c
copy to test/cvlist_null.c
index 6676749..cd4a0e2 100644
--- a/test/cvlist_hidden.c
+++ b/test/cvlist_null.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2011, 2013 D. V. Wiebe
+/* Copyright (C) 2015 D. V. Wiebe
*
***************************************************************************
*
@@ -27,7 +27,6 @@ int main(void)
const char *format_data =
"data1 CONST UINT8 1\n"
"data2 CONST UINT8 2\n"
- "/HIDDEN data2\n"
"data3 CONST UINT8 3\n"
"data4 RAW UINT8 1\n";
int fd, error, r = 0;
@@ -41,16 +40,13 @@ int main(void)
write(fd, format_data, strlen(format_data));
close(fd);
- D = gd_open(filedir, GD_RDONLY | GD_VERBOSE);
- field_list = (const uint8_t *)gd_constants(D, GD_UINT8);
+ D = gd_open(filedir, GD_RDONLY);
+ field_list = gd_constants(D, GD_NULL);
error = gd_error(D);
- CHECKI(error, 0);
-
- if (!r)
- for (fd = 0; fd < 2; ++fd)
- CHECKUi(fd,field_list[fd], 2 * fd + 1);
+ CHECKI(error, GD_E_BAD_TYPE);
+ CHECKP(field_list);
gd_discard(D);
unlink(format);
diff --git a/test/cvlist_hidden.c b/test/del_bad_code.c
similarity index 62%
copy from test/cvlist_hidden.c
copy to test/del_bad_code.c
index 6676749..1595d4e 100644
--- a/test/cvlist_hidden.c
+++ b/test/del_bad_code.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2011, 2013 D. V. Wiebe
+/* Copyright (C) 2015 D. V. Wiebe
*
***************************************************************************
*
@@ -24,33 +24,17 @@ int main(void)
{
const char *filedir = "dirfile";
const char *format = "dirfile/format";
- const char *format_data =
- "data1 CONST UINT8 1\n"
- "data2 CONST UINT8 2\n"
- "/HIDDEN data2\n"
- "data3 CONST UINT8 3\n"
- "data4 RAW UINT8 1\n";
- int fd, error, r = 0;
- const uint8_t *field_list;
+ int fd, h1, e1, r = 0;
DIRFILE *D;
rmdirfile();
- mkdir(filedir, 0777);
- fd = open(format, O_CREAT | O_EXCL | O_WRONLY, 0666);
- write(fd, format_data, strlen(format_data));
- close(fd);
+ D = gd_open(filedir, GD_RDWR | GD_CREAT | GD_EXCL);
+ h1 = gd_delete(D, "something", 0);
+ e1 = gd_error(D);
- D = gd_open(filedir, GD_RDONLY | GD_VERBOSE);
- field_list = (const uint8_t *)gd_constants(D, GD_UINT8);
-
- error = gd_error(D);
-
- CHECKI(error, 0);
-
- if (!r)
- for (fd = 0; fd < 2; ++fd)
- CHECKUi(fd,field_list[fd], 2 * fd + 1);
+ CHECKI(e1, GD_E_BAD_CODE);
+ CHECKI(h1, -1);
gd_discard(D);
unlink(format);
diff --git a/test/cvlist_hidden.c b/test/get_range.c
similarity index 69%
copy from test/cvlist_hidden.c
copy to test/get_range.c
index 6676749..4ecc5c0 100644
--- a/test/cvlist_hidden.c
+++ b/test/get_range.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2011, 2013 D. V. Wiebe
+/* Copyright (C) 2015 D. V. Wiebe
*
***************************************************************************
*
@@ -24,35 +24,36 @@ int main(void)
{
const char *filedir = "dirfile";
const char *format = "dirfile/format";
- const char *format_data =
- "data1 CONST UINT8 1\n"
- "data2 CONST UINT8 2\n"
- "/HIDDEN data2\n"
- "data3 CONST UINT8 3\n"
- "data4 RAW UINT8 1\n";
- int fd, error, r = 0;
- const uint8_t *field_list;
+ const char *data = "dirfile/data";
+ const char *format_data = "data RAW UINT8 8\n";
+ unsigned char data_data[256];
+ int fd, n, error, r = 0;
DIRFILE *D;
rmdirfile();
mkdir(filedir, 0777);
+ for (fd = 0; fd < 256; ++fd)
+ data_data[fd] = (unsigned char)fd;
+
fd = open(format, O_CREAT | O_EXCL | O_WRONLY, 0666);
write(fd, format_data, strlen(format_data));
close(fd);
- D = gd_open(filedir, GD_RDONLY | GD_VERBOSE);
- field_list = (const uint8_t *)gd_constants(D, GD_UINT8);
+ fd = open(data, O_CREAT | O_EXCL | O_WRONLY | O_BINARY, 0666);
+ write(fd, data_data, 256);
+ close(fd);
+ D = gd_open(filedir, GD_RDONLY);
+ n = gd_getdata64(D, "data", GD_INT64_MAX, GD_INT64_MAX, 1, 0, GD_NULL, NULL);
error = gd_error(D);
- CHECKI(error, 0);
-
- if (!r)
- for (fd = 0; fd < 2; ++fd)
- CHECKUi(fd,field_list[fd], 2 * fd + 1);
+ CHECKI(error, GD_E_RANGE);
+ CHECKI(n, 0);
gd_discard(D);
+
+ unlink(data);
unlink(format);
rmdir(filedir);
diff --git a/test/gzip_put_off.c b/test/gzip_put_off.c
index 58b6041..477144c 100644
--- a/test/gzip_put_off.c
+++ b/test/gzip_put_off.c
@@ -24,7 +24,7 @@ uint32_t d[GD_BUFFER_SIZE];
int main(void)
{
-#ifndef USE_GZIP
+#if !defined(USE_GZIP) || defined(NO_LARGE_TESTS)
return 77;
#else
const char *filedir = "dirfile";
diff --git a/test/gzip_seek_put.c b/test/gzip_seek_put.c
index 6be65fa..709df4d 100644
--- a/test/gzip_seek_put.c
+++ b/test/gzip_seek_put.c
@@ -24,7 +24,7 @@ uint32_t d[GD_BUFFER_SIZE];
int main(void)
{
-#ifndef USE_GZIP
+#if !defined(USE_GZIP) || defined(NO_LARGE_TESTS)
return 77;
#else
const char *filedir = "dirfile";
diff --git a/test/cvlist_hidden.c b/test/hide_bad.c
old mode 100644
new mode 100755
similarity index 62%
copy from test/cvlist_hidden.c
copy to test/hide_bad.c
index 6676749..f0d3338
--- a/test/cvlist_hidden.c
+++ b/test/hide_bad.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2011, 2013 D. V. Wiebe
+/* Copyright (C) 2015 D. V. Wiebe
*
***************************************************************************
*
@@ -24,33 +24,17 @@ int main(void)
{
const char *filedir = "dirfile";
const char *format = "dirfile/format";
- const char *format_data =
- "data1 CONST UINT8 1\n"
- "data2 CONST UINT8 2\n"
- "/HIDDEN data2\n"
- "data3 CONST UINT8 3\n"
- "data4 RAW UINT8 1\n";
- int fd, error, r = 0;
- const uint8_t *field_list;
+ int h1, e1, r = 0;
DIRFILE *D;
rmdirfile();
- mkdir(filedir, 0777);
- fd = open(format, O_CREAT | O_EXCL | O_WRONLY, 0666);
- write(fd, format_data, strlen(format_data));
- close(fd);
+ D = gd_open(filedir, GD_RDWR | GD_CREAT | GD_EXCL);
+ h1 = gd_hide(D, "something");
+ e1 = gd_error(D);
- D = gd_open(filedir, GD_RDONLY | GD_VERBOSE);
- field_list = (const uint8_t *)gd_constants(D, GD_UINT8);
-
- error = gd_error(D);
-
- CHECKI(error, 0);
-
- if (!r)
- for (fd = 0; fd < 2; ++fd)
- CHECKUi(fd,field_list[fd], 2 * fd + 1);
+ CHECKI(e1, GD_E_BAD_CODE);
+ CHECKI(h1, -1);
gd_discard(D);
unlink(format);
diff --git a/test/cvlist_hidden.c b/test/hide_hidden_bad.c
old mode 100644
new mode 100755
similarity index 62%
copy from test/cvlist_hidden.c
copy to test/hide_hidden_bad.c
index 6676749..44f9f41
--- a/test/cvlist_hidden.c
+++ b/test/hide_hidden_bad.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2011, 2013 D. V. Wiebe
+/* Copyright (C) 2015 D. V. Wiebe
*
***************************************************************************
*
@@ -24,33 +24,17 @@ int main(void)
{
const char *filedir = "dirfile";
const char *format = "dirfile/format";
- const char *format_data =
- "data1 CONST UINT8 1\n"
- "data2 CONST UINT8 2\n"
- "/HIDDEN data2\n"
- "data3 CONST UINT8 3\n"
- "data4 RAW UINT8 1\n";
- int fd, error, r = 0;
- const uint8_t *field_list;
+ int h1, e1, r = 0;
DIRFILE *D;
rmdirfile();
- mkdir(filedir, 0777);
- fd = open(format, O_CREAT | O_EXCL | O_WRONLY, 0666);
- write(fd, format_data, strlen(format_data));
- close(fd);
+ D = gd_open(filedir, GD_RDWR | GD_CREAT | GD_EXCL);
+ h1 = gd_hidden(D, "something");
+ e1 = gd_error(D);
- D = gd_open(filedir, GD_RDONLY | GD_VERBOSE);
- field_list = (const uint8_t *)gd_constants(D, GD_UINT8);
-
- error = gd_error(D);
-
- CHECKI(error, 0);
-
- if (!r)
- for (fd = 0; fd < 2; ++fd)
- CHECKUi(fd,field_list[fd], 2 * fd + 1);
+ CHECKI(e1, GD_E_BAD_CODE);
+ CHECKI(h1, -1);
gd_discard(D);
unlink(format);
diff --git a/test/cvlist_hidden.c b/test/hide_unhide_bad.c
old mode 100644
new mode 100755
similarity index 62%
copy from test/cvlist_hidden.c
copy to test/hide_unhide_bad.c
index 6676749..21bbcab
--- a/test/cvlist_hidden.c
+++ b/test/hide_unhide_bad.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2011, 2013 D. V. Wiebe
+/* Copyright (C) 2015 D. V. Wiebe
*
***************************************************************************
*
@@ -24,33 +24,17 @@ int main(void)
{
const char *filedir = "dirfile";
const char *format = "dirfile/format";
- const char *format_data =
- "data1 CONST UINT8 1\n"
- "data2 CONST UINT8 2\n"
- "/HIDDEN data2\n"
- "data3 CONST UINT8 3\n"
- "data4 RAW UINT8 1\n";
- int fd, error, r = 0;
- const uint8_t *field_list;
+ int h1, e1, r = 0;
DIRFILE *D;
rmdirfile();
- mkdir(filedir, 0777);
- fd = open(format, O_CREAT | O_EXCL | O_WRONLY, 0666);
- write(fd, format_data, strlen(format_data));
- close(fd);
+ D = gd_open(filedir, GD_RDWR | GD_CREAT | GD_EXCL);
+ h1 = gd_unhide(D, "something");
+ e1 = gd_error(D);
- D = gd_open(filedir, GD_RDONLY | GD_VERBOSE);
- field_list = (const uint8_t *)gd_constants(D, GD_UINT8);
-
- error = gd_error(D);
-
- CHECKI(error, 0);
-
- if (!r)
- for (fd = 0; fd < 2; ++fd)
- CHECKUi(fd,field_list[fd], 2 * fd + 1);
+ CHECKI(e1, GD_E_BAD_CODE);
+ CHECKI(h1, -1);
gd_discard(D);
unlink(format);
diff --git a/test/cvlist_hidden.c b/test/put_range.c
similarity index 69%
copy from test/cvlist_hidden.c
copy to test/put_range.c
index 6676749..ea01e93 100644
--- a/test/cvlist_hidden.c
+++ b/test/put_range.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2011, 2013 D. V. Wiebe
+/* Copyright (C) 2015 D. V. Wiebe
*
***************************************************************************
*
@@ -24,35 +24,37 @@ int main(void)
{
const char *filedir = "dirfile";
const char *format = "dirfile/format";
- const char *format_data =
- "data1 CONST UINT8 1\n"
- "data2 CONST UINT8 2\n"
- "/HIDDEN data2\n"
- "data3 CONST UINT8 3\n"
- "data4 RAW UINT8 1\n";
- int fd, error, r = 0;
- const uint8_t *field_list;
+ const char *data = "dirfile/data";
+ const char *format_data = "data RAW UINT8 8\n";
+ unsigned char data_data[256];
+ int fd, n, error, r = 0;
DIRFILE *D;
rmdirfile();
mkdir(filedir, 0777);
+ for (fd = 0; fd < 256; ++fd)
+ data_data[fd] = (unsigned char)fd;
+
fd = open(format, O_CREAT | O_EXCL | O_WRONLY, 0666);
write(fd, format_data, strlen(format_data));
close(fd);
- D = gd_open(filedir, GD_RDONLY | GD_VERBOSE);
- field_list = (const uint8_t *)gd_constants(D, GD_UINT8);
+ fd = open(data, O_CREAT | O_EXCL | O_WRONLY | O_BINARY, 0666);
+ write(fd, data_data, 256);
+ close(fd);
+ D = gd_open(filedir, GD_RDWR);
+ n = gd_putdata64(D, "data", GD_INT64_MAX, GD_INT64_MAX, 1, 0, GD_UINT8,
+ data_data);
error = gd_error(D);
- CHECKI(error, 0);
-
- if (!r)
- for (fd = 0; fd < 2; ++fd)
- CHECKUi(fd,field_list[fd], 2 * fd + 1);
+ CHECKI(error, GD_E_RANGE);
+ CHECKI(n, 0);
gd_discard(D);
+
+ unlink(data);
unlink(format);
rmdir(filedir);
diff --git a/test/cvlist_hidden.c b/test/seek_range.c
similarity index 67%
copy from test/cvlist_hidden.c
copy to test/seek_range.c
index 6676749..0d11df9 100644
--- a/test/cvlist_hidden.c
+++ b/test/seek_range.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2011, 2013 D. V. Wiebe
+/* Copyright (C) 2015 D. V. Wiebe
*
***************************************************************************
*
@@ -24,35 +24,38 @@ int main(void)
{
const char *filedir = "dirfile";
const char *format = "dirfile/format";
- const char *format_data =
- "data1 CONST UINT8 1\n"
- "data2 CONST UINT8 2\n"
- "/HIDDEN data2\n"
- "data3 CONST UINT8 3\n"
- "data4 RAW UINT8 1\n";
- int fd, error, r = 0;
- const uint8_t *field_list;
+ const char *data = "dirfile/data";
+ const char *format_data = "data RAW UINT8 2\n";
+ unsigned char data_data[256];
+ int fd, e1, r = 0;
+ off_t m;
DIRFILE *D;
rmdirfile();
mkdir(filedir, 0777);
+ for (fd = 0; fd < 256; ++fd)
+ data_data[fd] = (unsigned char)fd;
+
fd = open(format, O_CREAT | O_EXCL | O_WRONLY, 0666);
write(fd, format_data, strlen(format_data));
close(fd);
- D = gd_open(filedir, GD_RDONLY | GD_VERBOSE);
- field_list = (const uint8_t *)gd_constants(D, GD_UINT8);
-
- error = gd_error(D);
+ fd = open(data, O_CREAT | O_EXCL | O_WRONLY | O_BINARY, 0666);
+ write(fd, data_data, 256);
+ close(fd);
- CHECKI(error, 0);
+ D = gd_open(filedir, GD_RDONLY);
+ /* Sample position: 2 * INT64_MAX (bad) */;
+ m = gd_seek64(D, "data", GD_INT64_MAX, 0, GD_SEEK_SET);
+ CHECKI(m, -1);
- if (!r)
- for (fd = 0; fd < 2; ++fd)
- CHECKUi(fd,field_list[fd], 2 * fd + 1);
+ e1 = gd_error(D);
+ CHECKI(e1, GD_E_RANGE);
gd_discard(D);
+
+ unlink(data);
unlink(format);
rmdir(filedir);
diff --git a/test/cvlist_hidden.c b/test/seek_range2.c
similarity index 66%
copy from test/cvlist_hidden.c
copy to test/seek_range2.c
index 6676749..b9f0f9d 100644
--- a/test/cvlist_hidden.c
+++ b/test/seek_range2.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2011, 2013 D. V. Wiebe
+/* Copyright (C) 2015 D. V. Wiebe
*
***************************************************************************
*
@@ -24,35 +24,38 @@ int main(void)
{
const char *filedir = "dirfile";
const char *format = "dirfile/format";
- const char *format_data =
- "data1 CONST UINT8 1\n"
- "data2 CONST UINT8 2\n"
- "/HIDDEN data2\n"
- "data3 CONST UINT8 3\n"
- "data4 RAW UINT8 1\n";
- int fd, error, r = 0;
- const uint8_t *field_list;
+ const char *data = "dirfile/data";
+ const char *format_data = "data RAW UINT16 1\n";
+ unsigned char data_data[256];
+ int fd, e1, r = 0;
+ off_t m;
DIRFILE *D;
rmdirfile();
mkdir(filedir, 0777);
+ for (fd = 0; fd < 256; ++fd)
+ data_data[fd] = (unsigned char)fd;
+
fd = open(format, O_CREAT | O_EXCL | O_WRONLY, 0666);
write(fd, format_data, strlen(format_data));
close(fd);
- D = gd_open(filedir, GD_RDONLY | GD_VERBOSE);
- field_list = (const uint8_t *)gd_constants(D, GD_UINT8);
-
- error = gd_error(D);
+ fd = open(data, O_CREAT | O_EXCL | O_WRONLY | O_BINARY, 0666);
+ write(fd, data_data, 256);
+ close(fd);
- CHECKI(error, 0);
+ D = gd_open(filedir, GD_RDONLY);
+ /* Sample position: INT64_MAX (OK), byte position INT64_MAX * 2 (bad) */;
+ m = gd_seek64(D, "data", GD_INT64_MAX, 0, GD_SEEK_SET);
+ CHECKI(m, -1);
- if (!r)
- for (fd = 0; fd < 2; ++fd)
- CHECKUi(fd,field_list[fd], 2 * fd + 1);
+ e1 = gd_error(D);
+ CHECKI(e1, GD_E_RANGE);
gd_discard(D);
+
+ unlink(data);
unlink(format);
rmdir(filedir);
diff --git a/test/svlist_hidden.c b/test/svlist_hidden.c
index 8c45505..5f5def9 100644
--- a/test/svlist_hidden.c
+++ b/test/svlist_hidden.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2011, 2013 D. V. Wiebe
+/* Copyright (C) 2011, 2013, 2015 D. V. Wiebe
*
***************************************************************************
*
@@ -25,13 +25,16 @@ int main(void)
const char *filedir = "dirfile";
const char *format = "dirfile/format";
const char *format_data =
- "data1 STRING valu1\n"
- "data2 STRING valu2\n"
+ "data1 STRING valu2\n"
+ "data2 STRING valu4\n"
"/HIDDEN data2\n"
"data3 STRING valu3\n"
- "data4 CONST UINT8 1\n";
+ "/ALIAS data4 data2\n"
+ "data5 STRING valu5\n"
+ "/ALIAS data6 data5\n"
+ "/HIDDEN data6\n";
int fd, i, error, r = 0;
- const char **field_list;
+ const char **data;
DIRFILE *D;
rmdirfile();
@@ -42,28 +45,26 @@ int main(void)
close(fd);
D = gd_open(filedir, GD_RDONLY | GD_VERBOSE);
- field_list = gd_strings(D);
+ data = gd_strings(D);
error = gd_error(D);
CHECKI(error, 0);
- CHECKPN(field_list);
+ CHECKPN(data);
- for (i = 0; field_list[i]; ++i) {
- int len = strlen(field_list[i]);
+ for (i = 0; data[i]; ++i) {
+ int len = strlen(data[i]);
CHECKIi(i,len,5);
- CHECKIi(i,field_list[i][0], 'v');
- CHECKIi(i,field_list[i][1], 'a');
- CHECKIi(i,field_list[i][2], 'l');
- CHECKIi(i,field_list[i][3], 'u');
-
- if (field_list[i][4] != '1' && field_list[i][4] != '3') {
- fprintf(stderr, "field_list[%i] = \"%s\"\n", i, field_list[i]);
- r = 1;
+ if (len == 5) {
+ CHECKIi(i,data[i][0], 'v');
+ CHECKIi(i,data[i][1], 'a');
+ CHECKIi(i,data[i][2], 'l');
+ CHECKIi(i,data[i][3], 'u');
+ CHECKIi(i,data[i][4], '2' + i);
}
}
- CHECKI(i,2);
+ CHECKI(i,4);
gd_discard(D);
unlink(format);
diff --git a/test/test.h b/test/test.h
index bbf4e12..a50b62d 100644
--- a/test/test.h
+++ b/test/test.h
@@ -125,10 +125,10 @@ int gd_system(const char* command)
(double)(v))
#define CHECKFi(i,n,v) CHECKi(i,fabs((n)-(v)) > 1e-10,n,"%.15g","%.15g",\
(double)(n),(double)(v))
-#define CHECKI(n,v) CHECK((n) != (v),n,"%lli","%lli",(long long)(n),\
- (long long)(v))
-#define CHECKIi(i,n,v) CHECKi(i,(long long)(n) != (long long)(v),n,"%lli",\
- "%lli", (long long)(n),(long long)(v))
+#define CHECKI(n,v) CHECK((n) != (v),n,"%" PRId64,"%" PRId64,(int64_t)(n),\
+ (int64_t)(v))
+#define CHECKIi(i,n,v) CHECKi(i,(int64_t)(n) != (int64_t)(v),n,"%" PRId64,\
+ "%" PRId64, (int64_t)(n),(int64_t)(v))
#define CHECKNAN(n) CHECK(!isnan(n),n,"%.15g","%s",(double)(n),"nan")
#define CHECKNANi(i,n) CHECKi(i,!isnan(n),n,"%.15g","%s",(double)(n),"nan")
#define CHECKP(n) CHECK((n) != NULL,n,"%p","%s",n,"NULL")
@@ -145,11 +145,11 @@ int gd_system(const char* command)
(n),(v));
#define CHECKEOS(n,v) CHECK(strcmp((n) + strlen(n) - sizeof(v) + 1,(v)),n,\
"...\"%s\"","\"%s\"",(n) + strlen(n) - sizeof(v) + 1,(v));
-#define CHECKU(n,v) CHECK((n) != (v),n,"%llu","%llu",\
- (unsigned long long)(n),(unsigned long long)(v))
-#define CHECKUi(i,n,v) CHECKi(i,(n) != (v),n,"%llu","%llu",\
- (unsigned long long)(n),(unsigned long long)(v))
-#define CHECKX(n,v) CHECK((n) != (v),n,"0x%llX","0x%llX",\
- (unsigned long long)(n),(unsigned long long)(v))
-#define CHECKXi(i,n,v) CHECKi(i,(n) != (v),n,"0x%llX","0x%llX",\
- (unsigned long long)(n),(unsigned long long)(v))
+#define CHECKU(n,v) CHECK((n) != (v),n,"%" PRIu64,"%" PRIu64,\
+ (uint64_t)(n),(uint64_t)(v))
+#define CHECKUi(i,n,v) CHECKi(i,(n) != (v),n,"%" PRIu64,"%" PRIu64,\
+ (uint64_t)(n),(uint64_t)(v))
+#define CHECKX(n,v) CHECK((n) != (v),n,"0x%" PRIX64,"0x%" PRIX64,\
+ (uint64_t)(n),(uint64_t)(v))
+#define CHECKXi(i,n,v) CHECKi(i,(n) != (v),n,"0x%" PRIX64,"0x%" PRIX64,\
+ (uint64_t)(n),(uint64_t)(v))
diff --git a/test/trunc.c b/test/trunc.c
index b2f8d74..5cb0c35 100644
--- a/test/trunc.c
+++ b/test/trunc.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2008-2011, 2013 D. V. Wiebe
+/* Copyright (C) 2008-2011, 2013, 2015 D. V. Wiebe
*
***************************************************************************
*
@@ -57,7 +57,8 @@ int main(void)
stat_format = stat(format, &buf);
CHECKI(stat_format, 0);
- CHECK((buf.st_size > 0),buf.st_size,"%lli","%s",(long long)buf.st_size,"> 0");
+ CHECK((buf.st_size > 0),buf.st_size,"%" PRId64,"%s",(int64_t)buf.st_size,
+ "> 0");
unlink(format);
rmdir(filedir);
diff --git a/test/trunc_dir.c b/test/trunc_dir.c
index fb3bcfa..02bef99 100644
--- a/test/trunc_dir.c
+++ b/test/trunc_dir.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2008-2011, 2013 D. V. Wiebe
+/* Copyright (C) 2008-2011, 2013, 2015 D. V. Wiebe
*
***************************************************************************
*
@@ -59,7 +59,8 @@ int main(void)
stat_format = stat(format, &buf);
CHECKI(stat_format, 0);
- CHECK((buf.st_size > 0),buf.st_size,"%lli","%s",(long long)buf.st_size,"> 0");
+ CHECK((buf.st_size > 0),buf.st_size,"%" PRId64,"%s",(int64_t)buf.st_size,
+ "> 0");
rmdir_sub = rmdir(subdir);
CHECKI(rmdir_sub, 0);
diff --git a/test/trunc_truncsub.c b/test/trunc_truncsub.c
index 389ef33..cc7a9e6 100644
--- a/test/trunc_truncsub.c
+++ b/test/trunc_truncsub.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2008-2013 D. V. Wiebe
+/* Copyright (C) 2008-2013, 2015 D. V. Wiebe
*
***************************************************************************
*
@@ -59,7 +59,8 @@ int main(void)
stat_format = stat(format, &buf);
CHECKI(stat_format, 0);
- CHECK((buf.st_size > 0),buf.st_size,"%lli","%s",(long long)buf.st_size,"> 0");
+ CHECK((buf.st_size > 0),buf.st_size,"%" PRId64,"%s",(int64_t)buf.st_size,
+ "> 0");
rmdir_sub = rmdir(subdir);
CHECKI(rmdir_sub, -1);
diff --git a/test/vlist.c b/test/vlist.c
index 2144d1d..3d62dde 100644
--- a/test/vlist.c
+++ b/test/vlist.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2008-2011, 2013 D. V. Wiebe
+/* Copyright (C) 2008-2011, 2013, 2015 D. V. Wiebe
*
***************************************************************************
*
@@ -18,17 +18,8 @@
* along with GetData; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-/* Retreiving the number of fields of a field should succeed cleanly */
#include "test.h"
-#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <string.h>
-#include <errno.h>
-
int main(void)
{
const char *filedir = "dirfile";
@@ -37,7 +28,8 @@ int main(void)
"data1 RAW UINT8 1\n"
"data2 RAW UINT8 1\n"
"data3 RAW UINT8 1\n"
- "data4 CONST UINT8 1\n";
+ "data4 CONST UINT8 1\n"
+ "data4/sub LINCOM data1 1 0 data2 1 0\n";
int fd, i, error, r = 0;
const char **field_list;
DIRFILE *D;
diff --git a/test/vlist_meta.c b/test/vlist_meta.c
index 2f3c525..0074179 100644
--- a/test/vlist_meta.c
+++ b/test/vlist_meta.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2008-2011, 2013 D. V. Wiebe
+/* Copyright (C) 2008-2011, 2013, 2015 D. V. Wiebe
*
***************************************************************************
*
@@ -18,27 +18,20 @@
* along with GetData; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-/* Retreiving the number of fields of a field should succeed cleanly */
#include "test.h"
-#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <string.h>
-#include <errno.h>
-
int main(void)
{
const char *filedir = "dirfile";
const char *format = "dirfile/format";
const char *format_data =
"parent RAW UINT8 1\n"
- "META parent data1 LINTERP UINT8 1\n"
- "META parent data2 LINTERP UINT8 1\n"
- "META parent data3 LINTERP UINT8 1\n"
- "META parent data4 CONST UINT8 1\n";
+ "META parent data1 LINCOM parent 1 0\n"
+ "META parent data2 LINCOM parent 1 0\n"
+ "META parent data3 LINCOM parent 1 0\n"
+ "META parent data4 CONST UINT8 1\n"
+ "other RAW UINT8 1\n"
+ "META other data5 LINCOM parent 1 0\n";
int fd, i, error, r = 0;
const char **field_list;
DIRFILE *D;
diff --git a/util/Makefile.in b/util/Makefile.in
index 21e6ffe..708b9f4 100644
--- a/util/Makefile.in
+++ b/util/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -15,7 +15,17 @@
@SET_MAKE@
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -80,18 +90,19 @@ build_triplet = @build@
host_triplet = @host@
bin_PROGRAMS = checkdirfile$(EXEEXT) dirfile2ascii$(EXEEXT)
subdir = util
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(top_srcdir)/depcomp
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compare_version.m4 \
$(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/encoding.m4 \
$(top_srcdir)/m4/floatordering.m4 $(top_srcdir)/m4/idl.m4 \
- $(top_srcdir)/m4/matlab.m4 $(top_srcdir)/m4/perl.m4 \
- $(top_srcdir)/m4/php.m4 $(top_srcdir)/m4/python.m4 \
- $(top_srcdir)/m4/win32.m4 $(top_srcdir)/m4/version.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/matlab.m4 \
+ $(top_srcdir)/m4/perl.m4 $(top_srcdir)/m4/php.m4 \
+ $(top_srcdir)/m4/python.m4 $(top_srcdir)/m4/win32.m4 \
+ $(top_srcdir)/m4/version.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/src/gd_config.h \
$(top_builddir)/src/getdata.h
@@ -171,6 +182,7 @@ am__define_uniq_tagged_files = \
done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -438,7 +450,6 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign util/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign util/Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -757,6 +768,8 @@ uninstall-am: uninstall-binPROGRAMS
pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
uninstall-binPROGRAMS
+.PRECIOUS: Makefile
+
clean-local:
rm -rf *~
diff --git a/util/checkdirfile.c b/util/checkdirfile.c
index a5a3cd5..ef34d65 100644
--- a/util/checkdirfile.c
+++ b/util/checkdirfile.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2007-2010, 2012, 2014 D. V. Wiebe
+/* Copyright (C) 2007-2010, 2012, 2014, 2015 D. V. Wiebe
*
***************************************************************************
*
@@ -248,8 +248,7 @@ int main(int argc, char* argv[])
return 1;
}
- printf(" Found %llu %s.\n", (unsigned long long)n,
- n == 1 ? "frame" : "frames");
+ printf(" Found %" PRIu64 " %s.\n", n, n == 1 ? "frame" : "frames");
gd_close(dirfile);
return 0;
diff --git a/util/dirfile2ascii.c b/util/dirfile2ascii.c
index e5c6c19..0435d7f 100644
--- a/util/dirfile2ascii.c
+++ b/util/dirfile2ascii.c
@@ -1,5 +1,5 @@
/* Copyright (C) 2010, 2011 Matthew Truch
- * Copyright (C) 2010, 2012, 2014 D. V. Wiebe
+ * Copyright (C) 2010, 2012, 2014, 2015 D. V. Wiebe
*
***************************************************************************
*
@@ -203,7 +203,7 @@ int main (int argc, char **argv)
type_data[(int)'G'].t = READ_AS_DOUBLE;
type_data[(int)'G'].f = "G";
type_data[(int)'i'].t = READ_AS_INT;
- type_data[(int)'i'].f = PRIi64;
+ type_data[(int)'i'].f = PRId64;
type_data[(int)'o'].t = READ_AS_UINT;
type_data[(int)'o'].f = PRIo64;
type_data[(int)'u'].t = READ_AS_UINT;
@@ -386,8 +386,8 @@ int main (int argc, char **argv)
if (verbose) {
fprintf(stderr, "Reading %d field%s from %s\n", numfields,
(numfields > 1) ? "s" : "", dirfile_name);
- fprintf(stderr, "First frame: %llu Number of frames: %zd\n",
- (long long)ff, nf);
+ fprintf(stderr, "First frame: %" PRIu64 " Number of frames: %" PRIdSIZE
+ "\n", ff, nf);
}
for (i = 0; i < numfields; i++) { /* Read in all the fields */
@@ -430,7 +430,8 @@ int main (int argc, char **argv)
exit(5);
} else if (!zero && n_want > fields[i].n_read) {
if (verbose)
- fprintf(stderr, "Short read on field %i, padding %zu frames\n",
+ fprintf(stderr,
+ "Short read on field %i, padding %" PRIuSIZE " frames\n",
i, n_want - fields[i].n_read);
if (type_data[fields[i].type].t == READ_AS_DOUBLE) {
for (k = fields[i].n_read; k < n_want; ++k)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/libgetdata.git
More information about the debian-science-commits
mailing list