diff options
46 files changed, 1129 insertions, 4512 deletions
diff --git a/beecrypt/Makefile.am b/beecrypt/Makefile.am index c241d0d47..5c49bc085 100644 --- a/beecrypt/Makefile.am +++ b/beecrypt/Makefile.am @@ -28,14 +28,18 @@ # 3. Interfaces removed (bad): Increment CURRENT, set AGE and REVISION to 0. # -LIBBEECRYPT_LT_CURRENT = 3 -LIBBEECRYPT_LT_AGE = 1 +LIBBEECRYPT_LT_CURRENT = 4 +LIBBEECRYPT_LT_AGE = 2 LIBBEECRYPT_LT_REVISION = 0 AUTOMAKE_OPTIONS = gnu check-news no-dependencies SUBDIRS = docs gas masm mwerks tests +SUFFIXES = .S +.S.lo: + $(LTCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$< + BEECRYPT_OBJECTS = base64.lo beecrypt.lo blockmode.lo blockpad.lo blowfish.lo blowfishopt.lo dhaes.lo dldp.lo dlkp.lo dlpk.lo dlsvdp-dh.lo dsa.lo elgamal.lo endianness.lo entropy.lo fips180.lo fips180opt.lo fips186.lo hmac.lo hmacmd5.lo hmacsha1.lo hmacsha256.lo md5.lo memchunk.lo mp32.lo mp32barrett.lo mp32number.lo mp32opt.lo mp32prime.lo mtprng.lo rsa.lo rsakp.lo rsapk.lo sha256.lo timestamp.lo BEECRYPT_JAVA_OBJECTS = javaglue.lo @@ -50,7 +54,7 @@ libbeecrypt_la_LIBADD = blowfishopt.lo fips180opt.lo mp32opt.lo libbeecrypt_la_LDFLAGS = -version-info $(LIBBEECRYPT_LT_CURRENT):$(LIBBEECRYPT_LT_REVISION):$(LIBBEECRYPT_LT_AGE) -pkginclude_HEADERS = base64.h beecrypt.h blockmode.h blockpad.h blowfish.h blowfishopt.h dhaes.h dldp.h dlkp.h dlpk.h dlsvdp-dh.h elgamal.h endianness.h entropy.h fips180.h fips180opt.h fips186.h hmac.h hmacmd5.h hmacsha1.h hmacsha256.h md5.h memchunk.h mp32.h mp32barrett.h mp32number.h mp32opt.h mp32prime.h mtprng.h rsa.h rsakp.h rsapk.h sha256.h timestamp.h +pkginclude_HEADERS = base64.h beecrypt.h blockmode.h blockpad.h blowfish.h blowfishopt.h dhaes.h dldp.h dlkp.h dlpk.h dlsvdp-dh.h dsa.h elgamal.h endianness.h entropy.h fips180.h fips180opt.h fips186.h hmac.h hmacmd5.h hmacsha1.h hmacsha256.h md5.h memchunk.h mp32.h mp32barrett.h mp32number.h mp32opt.h mp32prime.h mtprng.h rsa.h rsakp.h rsapk.h sha256.h timestamp.h EXTRA_DIST = BENCHMARKS BUGS CONTRIBUTORS Doxyfile.in Doxyheader README.DLL README.WIN32 beecrypt.def beecrypt.mcp beecrypt.rc beecrypt.spec config.h config.gas.h config.win.h javaglue.h diff --git a/beecrypt/Makefile.in b/beecrypt/Makefile.in index 98f0766ea..962611aaf 100644 --- a/beecrypt/Makefile.in +++ b/beecrypt/Makefile.in @@ -113,14 +113,16 @@ VERSION = @VERSION@ ac_cv_have_java = @ac_cv_have_java@ ac_cv_have_javac = @ac_cv_have_javac@ -LIBBEECRYPT_LT_CURRENT = 3 -LIBBEECRYPT_LT_AGE = 1 +LIBBEECRYPT_LT_CURRENT = 4 +LIBBEECRYPT_LT_AGE = 2 LIBBEECRYPT_LT_REVISION = 0 AUTOMAKE_OPTIONS = gnu check-news no-dependencies SUBDIRS = docs gas masm mwerks tests +SUFFIXES = .S + BEECRYPT_OBJECTS = base64.lo beecrypt.lo blockmode.lo blockpad.lo blowfish.lo blowfishopt.lo dhaes.lo dldp.lo dlkp.lo dlpk.lo dlsvdp-dh.lo dsa.lo elgamal.lo endianness.lo entropy.lo fips180.lo fips180opt.lo fips186.lo hmac.lo hmacmd5.lo hmacsha1.lo hmacsha256.lo md5.lo memchunk.lo mp32.lo mp32barrett.lo mp32number.lo mp32opt.lo mp32prime.lo mtprng.lo rsa.lo rsakp.lo rsapk.lo sha256.lo timestamp.lo BEECRYPT_JAVA_OBJECTS = javaglue.lo @@ -135,7 +137,7 @@ libbeecrypt_la_LIBADD = blowfishopt.lo fips180opt.lo mp32opt.lo libbeecrypt_la_LDFLAGS = -version-info $(LIBBEECRYPT_LT_CURRENT):$(LIBBEECRYPT_LT_REVISION):$(LIBBEECRYPT_LT_AGE) -pkginclude_HEADERS = base64.h beecrypt.h blockmode.h blockpad.h blowfish.h blowfishopt.h dhaes.h dldp.h dlkp.h dlpk.h dlsvdp-dh.h elgamal.h endianness.h entropy.h fips180.h fips180opt.h fips186.h hmac.h hmacmd5.h hmacsha1.h hmacsha256.h md5.h memchunk.h mp32.h mp32barrett.h mp32number.h mp32opt.h mp32prime.h mtprng.h rsa.h rsakp.h rsapk.h sha256.h timestamp.h +pkginclude_HEADERS = base64.h beecrypt.h blockmode.h blockpad.h blowfish.h blowfishopt.h dhaes.h dldp.h dlkp.h dlpk.h dlsvdp-dh.h dsa.h elgamal.h endianness.h entropy.h fips180.h fips180opt.h fips186.h hmac.h hmacmd5.h hmacsha1.h hmacsha256.h md5.h memchunk.h mp32.h mp32barrett.h mp32number.h mp32opt.h mp32prime.h mtprng.h rsa.h rsakp.h rsapk.h sha256.h timestamp.h EXTRA_DIST = BENCHMARKS BUGS CONTRIBUTORS Doxyfile.in Doxyheader README.DLL README.WIN32 beecrypt.def beecrypt.mcp beecrypt.rc beecrypt.spec config.h config.gas.h config.win.h javaglue.h @@ -281,9 +283,6 @@ maintainer-clean-compile: .s.lo: $(LIBTOOL) --mode=compile $(COMPILE) -c $< -.S.lo: - $(LIBTOOL) --mode=compile $(COMPILE) -c $< - mostlyclean-libtool: -rm -f *.lo @@ -553,7 +552,6 @@ install uninstall-am uninstall all-redirect all-am all installdirs-am \ installdirs mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean - .PHONY: beetest beetest: all make -C tests beetest @@ -576,6 +574,9 @@ doxygen apidocs: Doxyfile Doxyheader mkdir -p $@ - [ -x ${DOXYGEN} ] && ${DOXYGEN} +.S.lo: + $(LTCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$< + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/beecrypt/aclocal.m4 b/beecrypt/aclocal.m4 index 21bcffb35..b1e2546e5 100644 --- a/beecrypt/aclocal.m4 +++ b/beecrypt/aclocal.m4 @@ -2675,181 +2675,31 @@ EOF ;; esac - case $host_os in - cygwin* | mingw* | pw32* | os2*) - cat <<'EOF' >> "${ofile}T" - # This is a source program that is used to create dlls on Windows - # Don't remove nor modify the starting and closing comments -# /* ltdll.c starts here */ -# #define WIN32_LEAN_AND_MEAN -# #include <windows.h> -# #undef WIN32_LEAN_AND_MEAN -# #include <stdio.h> -# -# #ifndef __CYGWIN__ -# # ifdef __CYGWIN32__ -# # define __CYGWIN__ __CYGWIN32__ -# # endif -# #endif -# -# #ifdef __cplusplus -# extern "C" { -# #endif -# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved); -# #ifdef __cplusplus -# } -# #endif -# -# #ifdef __CYGWIN__ -# #include <cygwin/cygwin_dll.h> -# DECLARE_CYGWIN_DLL( DllMain ); -# #endif -# HINSTANCE __hDllInstance_base; -# -# BOOL APIENTRY -# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved) -# { -# __hDllInstance_base = hInst; -# return TRUE; -# } -# /* ltdll.c ends here */ - # This is a source program that is used to create import libraries - # on Windows for dlls which lack them. Don't remove nor modify the - # starting and closing comments -# /* impgen.c starts here */ -# /* Copyright (C) 1999-2000 Free Software Foundation, Inc. -# -# This file is part of GNU libtool. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# */ -# -# #include <stdio.h> /* for printf() */ -# #include <unistd.h> /* for open(), lseek(), read() */ -# #include <fcntl.h> /* for O_RDONLY, O_BINARY */ -# #include <string.h> /* for strdup() */ -# -# /* O_BINARY isn't required (or even defined sometimes) under Unix */ -# #ifndef O_BINARY -# #define O_BINARY 0 -# #endif -# -# static unsigned int -# pe_get16 (fd, offset) -# int fd; -# int offset; -# { -# unsigned char b[2]; -# lseek (fd, offset, SEEK_SET); -# read (fd, b, 2); -# return b[0] + (b[1]<<8); -# } -# -# static unsigned int -# pe_get32 (fd, offset) -# int fd; -# int offset; -# { -# unsigned char b[4]; -# lseek (fd, offset, SEEK_SET); -# read (fd, b, 4); -# return b[0] + (b[1]<<8) + (b[2]<<16) + (b[3]<<24); -# } -# -# static unsigned int -# pe_as32 (ptr) -# void *ptr; -# { -# unsigned char *b = ptr; -# return b[0] + (b[1]<<8) + (b[2]<<16) + (b[3]<<24); -# } -# -# int -# main (argc, argv) -# int argc; -# char *argv[]; -# { -# int dll; -# unsigned long pe_header_offset, opthdr_ofs, num_entries, i; -# unsigned long export_rva, export_size, nsections, secptr, expptr; -# unsigned long name_rvas, nexp; -# unsigned char *expdata, *erva; -# char *filename, *dll_name; -# -# filename = argv[1]; -# -# dll = open(filename, O_RDONLY|O_BINARY); -# if (dll < 1) -# return 1; -# -# dll_name = filename; -# -# for (i=0; filename[i]; i++) -# if (filename[i] == '/' || filename[i] == '\\' || filename[i] == ':') -# dll_name = filename + i +1; -# -# pe_header_offset = pe_get32 (dll, 0x3c); -# opthdr_ofs = pe_header_offset + 4 + 20; -# num_entries = pe_get32 (dll, opthdr_ofs + 92); -# -# if (num_entries < 1) /* no exports */ -# return 1; -# -# export_rva = pe_get32 (dll, opthdr_ofs + 96); -# export_size = pe_get32 (dll, opthdr_ofs + 100); -# nsections = pe_get16 (dll, pe_header_offset + 4 +2); -# secptr = (pe_header_offset + 4 + 20 + -# pe_get16 (dll, pe_header_offset + 4 + 16)); -# -# expptr = 0; -# for (i = 0; i < nsections; i++) -# { -# char sname[8]; -# unsigned long secptr1 = secptr + 40 * i; -# unsigned long vaddr = pe_get32 (dll, secptr1 + 12); -# unsigned long vsize = pe_get32 (dll, secptr1 + 16); -# unsigned long fptr = pe_get32 (dll, secptr1 + 20); -# lseek(dll, secptr1, SEEK_SET); -# read(dll, sname, 8); -# if (vaddr <= export_rva && vaddr+vsize > export_rva) -# { -# expptr = fptr + (export_rva - vaddr); -# if (export_rva + export_size > vaddr + vsize) -# export_size = vsize - (export_rva - vaddr); -# break; -# } -# } -# -# expdata = (unsigned char*)malloc(export_size); -# lseek (dll, expptr, SEEK_SET); -# read (dll, expdata, export_size); -# erva = expdata - export_rva; -# -# nexp = pe_as32 (expdata+24); -# name_rvas = pe_as32 (expdata+32); +case "$target" in +NONE) lt_target="$host" ;; +*) lt_target="$target" ;; +esac + +# Check for any special flags to pass to ltconfig. # -# printf ("EXPORTS\n"); -# for (i = 0; i<nexp; i++) -# { -# unsigned long name_rva = pe_as32 (erva+name_rvas+i*4); -# printf ("\t%s @ %ld ;\n", erva+name_rva, 1+ i); -# } +# the following will cause an existing older ltconfig to fail, so +# we ignore this at the expense of the cache file... Checking this +# will just take longer ... bummer! +#libtool_flags="--cache-file=$cache_file" # -# return 0; -# } -# /* impgen.c ends here */ +test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared" +test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static" +test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install" +test "$ac_cv_prog_gcc" = yes && libtool_flags="$libtool_flags --with-gcc" +test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld" +ifdef([AC_PROVIDE_AC_LIBTOOL_DLOPEN], +[libtool_flags="$libtool_flags --enable-dlopen"]) +ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL], +[libtool_flags="$libtool_flags --enable-win32-dll"]) +AC_ARG_ENABLE(libtool-lock, + [ --disable-libtool-lock avoid locking (might break parallel builds)]) +test "x$enable_libtool_lock" = xno && libtool_flags="$libtool_flags --disable-lock" +test x"$silent" = xyes && libtool_flags="$libtool_flags --silent" EOF ;; diff --git a/beecrypt/base64.c b/beecrypt/base64.c index 31bd90c1c..a35627acf 100644 --- a/beecrypt/base64.c +++ b/beecrypt/base64.c @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2000 Virtual Unlimited B.V. + * Copyright (c) 2000-2001 Virtual Unlimited B.V. * * Author: Bob Deblier <bob@virtualunlimited.com> * @@ -37,12 +37,213 @@ static int _debug = 0; #if HAVE_STRING_H # include <string.h> #endif +#if HAVE_CTYPE_H +# include <ctype.h> +#endif #if HAVE_UNISTD_H # include <unistd.h> #endif #include <stdio.h> +static const char* to_b64 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; + +/* encode 64 characters per line */ +#define CHARS_PER_LINE 64 + +char* b64enc(const memchunk* chunk) +{ + int div = chunk->size / 3; + int rem = chunk->size % 3; + int chars = div*4 + rem + 1; + int newlines = (chars + CHARS_PER_LINE - 1) / CHARS_PER_LINE; + + const byte* data = chunk->data; + char* string = (char*) malloc(chars + newlines + 1); + + if (string) + { + register char* buf = string; + + chars = 0; + + while (div > 0) + { + buf[0] = to_b64[ (data[0] >> 2) & 0x3f]; + buf[1] = to_b64[((data[0] << 4) & 0x30) | ((data[1] >> 4) & 0xf)]; + buf[2] = to_b64[((data[1] << 2) & 0x3c) | ((data[2] >> 6) & 0x3)]; + buf[3] = to_b64[ data[2] & 0x3f]; + data += 3; + buf += 4; + div--; + chars += 4; + if (chars == CHARS_PER_LINE) + { + chars = 0; + *(buf++) = '\n'; + } + } + + switch (rem) + { + case 2: + buf[0] = to_b64[ (data[0] >> 2) & 0x3f]; + buf[1] = to_b64[((data[0] << 4) & 0x30) + ((data[1] >> 4) & 0xf)]; + buf[2] = to_b64[ (data[1] << 2) & 0x3c]; + buf[3] = '='; + buf += 4; + chars += 4; + break; + case 1: + buf[0] = to_b64[ (data[0] >> 2) & 0x3f]; + buf[1] = to_b64[ (data[0] << 4) & 0x30]; + buf[2] = '='; + buf[3] = '='; + buf += 4; + chars += 4; + break; + } + + /* *(buf++) = '\n'; This would result in a buffer overrun */ + *buf = '\0'; + } + + return string; +} + +memchunk* b64dec(const char* string) +{ + /* return a decoded memchunk, or a null pointer in case of failure */ + + memchunk* rc = 0; + + if (string) + { + register int length = strlen(string); + + /* do a format verification first */ + if (length > 0) + { + register int count = 0, rem = 0; + register const char* tmp = string; + + while (length > 0) + { + register int skip = strspn(tmp, to_b64); + count += skip; + length -= skip; + tmp += skip; + if (length > 0) + { + register int i, vrfy = strcspn(tmp, to_b64); + + for (i = 0; i < vrfy; i++) + { + if (isspace(tmp[i])) + continue; + + if (tmp[i] == '=') + { + /* we should check if we're close to the end of the string */ + rem = count % 4; + + /* rem must be either 2 or 3, otherwise no '=' should be here */ + if (rem < 2) + return 0; + + /* end-of-message recognized */ + break; + } + else + { + /* Transmission error; RFC tells us to ignore this, but: + * - the rest of the message is going to even more corrupt since we're sliding bits out of place + * If a message is corrupt, it should be dropped. Period. + */ + + return 0; + } + } + + length -= vrfy; + tmp += vrfy; + } + } + + rc = memchunkAlloc((count / 4) * 3 + (rem ? (rem - 1) : 0)); + + if (rc) + { + if (count > 0) + { + register int i, qw = 0, tw = 0; + register byte* data = rc->data; + + length = strlen(tmp = string); + + for (i = 0; i < length; i++) + { + register char ch = string[i]; + register byte bits; + + if (isspace(ch)) + continue; + + if ((ch >= 'A') && (ch <= 'Z')) + { + bits = (byte) (ch - 'A'); + } + else if ((ch >= 'a') && (ch <= 'z')) + { + bits = (byte) (ch - 'a' + 26); + } + else if ((ch >= '0') && (ch <= '9')) + { + bits = (byte) (ch - '0' + 52); + } + else if (ch == '+') + { + bits = 62; + } + else if (ch == '/') + { + bits = 63; + } + else if (ch == '=') + break; + + switch (qw++) + { + case 0: + data[tw+0] = (bits << 2) & 0xfc; + break; + case 1: + data[tw+0] |= (bits >> 4) & 0x03; + data[tw+1] = (bits << 4) & 0xf0; + break; + case 2: + data[tw+1] |= (bits >> 2) & 0x0f; + data[tw+2] = (bits << 6) & 0xc0; + break; + case 3: + data[tw+2] |= bits & 0x3f; + break; + } + + if (qw == 4) + { + qw = 0; + tw += 3; + } + } + } + } + } + } + + return rc; +} + int b64encode_chars_per_line = B64ENCODE_CHARS_PER_LINE; const char * b64encode_eolstr = B64ENCODE_EOLSTR; diff --git a/beecrypt/base64.h b/beecrypt/base64.h index d205f2efb..0c8016215 100644 --- a/beecrypt/base64.h +++ b/beecrypt/base64.h @@ -66,7 +66,7 @@ extern "C" { * @param ns no. bytes of data (0 uses strlen(data)) * @return (malloc'd) base64 string */ -BEEDLLAPI /*@only@*/ /*@null@*/ /*@unused@*/ +BEECRYPTAPI /*@only@*/ /*@null@*/ /*@unused@*/ char * b64encode (const void * data, int ns) /*@*/; @@ -77,10 +77,20 @@ char * b64encode (const void * data, int ns) * @retval lenp address of no. bytes of binary data * @return 0 on success, 1: s == NULL, 2: bad length, 3: bad char */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ int b64decode (const char * s, /*@out@*/ void ** datap, /*@out@*/ int *lenp) /*@modifies *datap, *lenp @*/; +/** + */ +BEECRYPTAPI /*@only@*/ /*@null@*/ /*@unused@*/ +char* b64enc(const memchunk*); + +/** + */ +BEECRYPTAPI /*@unused@*/ +memchunk* b64dec(const char*); + #ifdef __cplusplus } #endif diff --git a/beecrypt/beecrypt.c b/beecrypt/beecrypt.c index e482f9c08..858788680 100644 --- a/beecrypt/beecrypt.c +++ b/beecrypt/beecrypt.c @@ -248,6 +248,11 @@ int randomGeneratorContextFree(randomGeneratorContext* ctxt) /*@=nullstate@*/ } +int randomGeneratorContextNext(randomGeneratorContext* ctxt, uint32* data, int size) +{ + return ctxt->rng->next(ctxt->param, data, size); +} + /*@observer@*/ static const hashFunction* hashFunctionList[] = { &md5, diff --git a/beecrypt/beecrypt.h b/beecrypt/beecrypt.h index 3a9a7bf20..289499d46 100644 --- a/beecrypt/beecrypt.h +++ b/beecrypt/beecrypt.h @@ -65,7 +65,7 @@ extern "C" { * Return the number of entropy sources available. * @return number of entropy sources available */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ int entropySourceCount(void) /*@*/; @@ -74,7 +74,7 @@ int entropySourceCount(void) * @param index entropy source index * @return entropy source pointer (or NULL) */ -BEEDLLAPI /*@observer@*/ /*@null@*/ /*@unused@*/ +BEECRYPTAPI /*@observer@*/ /*@null@*/ /*@unused@*/ const entropySource* entropySourceGet(int index) /*@*/; @@ -84,7 +84,7 @@ const entropySource* entropySourceGet(int index) * @return entropy source pointer (or NULL) */ /*@-exportlocal@*/ -BEEDLLAPI /*@observer@*/ /*@null@*/ +BEECRYPTAPI /*@observer@*/ /*@null@*/ const entropySource* entropySourceFind(const char* name) /*@*/; /*@=exportlocal@*/ @@ -95,7 +95,7 @@ const entropySource* entropySourceFind(const char* name) * entropy source. Otherwise, use the 1st entry in the internal table. * @return entropy source pointer (or NULL) */ -BEEDLLAPI /*@observer@*/ /*@null@*/ /*@unused@*/ +BEECRYPTAPI /*@observer@*/ /*@null@*/ /*@unused@*/ const entropySource* entropySourceDefault(void) /*@*/; @@ -106,7 +106,7 @@ const entropySource* entropySourceDefault(void) * @param size no. of ints of data * @return 0 on success, -1 on failure */ -BEEDLLAPI +BEECRYPTAPI int entropyGatherNext(uint32* data, int size) /*@*/; @@ -196,7 +196,7 @@ extern "C" { * Return the number of generators available. * @return number of generators available */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ int randomGeneratorCount(void) /*@*/; @@ -205,7 +205,7 @@ int randomGeneratorCount(void) * @param index generator index * @return generator pointer (or NULL) */ -BEEDLLAPI /*@observer@*/ /*@null@*/ /*@unused@*/ +BEECRYPTAPI /*@observer@*/ /*@null@*/ /*@unused@*/ const randomGenerator* randomGeneratorGet(int index) /*@*/; @@ -215,7 +215,7 @@ const randomGenerator* randomGeneratorGet(int index) * @return generator pointer (or NULL) */ /*@-exportlocal@*/ -BEEDLLAPI /*@observer@*/ /*@null@*/ +BEECRYPTAPI /*@observer@*/ /*@null@*/ const randomGenerator* randomGeneratorFind(const char* name) /*@*/; /*@=exportlocal@*/ @@ -226,7 +226,7 @@ const randomGenerator* randomGeneratorFind(const char* name) * generator. Otherwise, use "fips186prng". * @return generator pointer */ -BEEDLLAPI /*@observer@*/ /*@null@*/ /*@unused@*/ +BEECRYPTAPI /*@observer@*/ /*@null@*/ /*@unused@*/ const randomGenerator* randomGeneratorDefault(void) /*@*/; @@ -250,19 +250,23 @@ extern "C" { /** \ingroup PRNG_m * Initialize a randomGenerator instance. */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ int randomGeneratorContextInit(randomGeneratorContext* ctxt, /*@observer@*/ /*@dependent@*/ const randomGenerator* rng) /*@modifies ctxt->rng, ctxt->param @*/; /** \ingroup PRNG_m * Destroy a randomGenerator instance. */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ int randomGeneratorContextFree(/*@special@*/ randomGeneratorContext* ctxt) /*@uses ctxt->rng @*/ /*@releases ctxt->param @*/ /*@modifies ctxt->rng, ctxt->param @*/; +BEECRYPTAPI /*@unused@*/ +int randomGeneratorContextNext(randomGeneratorContext* ctxt, /*@out@*/ uint32* data, int size) + /*@modifies ctxt->param, *data @*/; + #ifdef __cplusplus } #endif @@ -273,7 +277,7 @@ int randomGeneratorContextFree(/*@special@*/ randomGeneratorContext* ctxt) /** \ingroup HASH_m */ -BEEDLLAPI +BEECRYPTAPI typedef void hashFunctionParam; /** \ingroup HASH_m @@ -336,7 +340,7 @@ extern "C" { * Return the number of hash functions available. * @return number of hash functions available */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ int hashFunctionCount(void) /*@*/; @@ -345,7 +349,7 @@ int hashFunctionCount(void) * @param index hash function index * @return hash function pointer (or NULL) */ -BEEDLLAPI /*@observer@*/ /*@null@*/ /*@unused@*/ +BEECRYPTAPI /*@observer@*/ /*@null@*/ /*@unused@*/ const hashFunction* hashFunctionGet(int index) /*@*/; @@ -355,7 +359,7 @@ const hashFunction* hashFunctionGet(int index) * @return hash function pointer (or NULL) */ /*@-exportlocal@*/ -BEEDLLAPI /*@observer@*/ /*@null@*/ +BEECRYPTAPI /*@observer@*/ /*@null@*/ const hashFunction* hashFunctionFind(const char* name) /*@*/; /*@=exportlocal@*/ @@ -366,7 +370,7 @@ const hashFunction* hashFunctionFind(const char* name) * hash function. Otherwise, use "sha1". * @return hash function pointer (or NULL) */ -BEEDLLAPI /*@observer@*/ /*@null@*/ /*@unused@*/ +BEECRYPTAPI /*@observer@*/ /*@null@*/ /*@unused@*/ const hashFunction* hashFunctionDefault(void) /*@*/; @@ -390,51 +394,51 @@ extern "C" { /** \ingroup HASH_m * Initialize a hashFunction instance. */ -BEEDLLAPI +BEECRYPTAPI int hashFunctionContextInit(hashFunctionContext* ctxt, /*@observer@*/ /*@dependent@*/ const hashFunction* hash) /*@modifies ctxt->algo, ctxt->param */; /** \ingroup HASH_m * Destroy a hashFunction instance. */ -BEEDLLAPI +BEECRYPTAPI int hashFunctionContextFree(/*@special@*/ hashFunctionContext* ctxt) /*@releases ctxt->param @*/ /*@modifies ctxt->algo, ctxt->param */; /** \ingroup HASH_m */ -BEEDLLAPI +BEECRYPTAPI int hashFunctionContextReset(hashFunctionContext* ctxt) /*@modifies ctxt */; /** \ingroup HASH_m */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ int hashFunctionContextUpdate(hashFunctionContext* ctxt, const byte* data, int size) /*@modifies ctxt */; /** \ingroup HASH_m */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ int hashFunctionContextUpdateMC(hashFunctionContext* ctxt, const memchunk* m) /*@modifies ctxt */; /** \ingroup HASH_m */ -BEEDLLAPI +BEECRYPTAPI int hashFunctionContextUpdateMP32(hashFunctionContext* ctxt, const mp32number* n) /*@modifies ctxt */; /** \ingroup HASH_m */ -BEEDLLAPI +BEECRYPTAPI int hashFunctionContextDigest(hashFunctionContext* ctxt, mp32number* dig) /*@modifies ctxt, *dig */; /** \ingroup HASH_m */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ int hashFunctionContextDigestMatch(hashFunctionContext* ctxt, const mp32number* match) /*@modifies ctxt */; @@ -529,7 +533,7 @@ extern "C" { * Return the number of keyed hash functions available. * @return number of keyed hash functions available */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ int keyedHashFunctionCount(void) /*@*/; @@ -538,7 +542,7 @@ int keyedHashFunctionCount(void) * @param index keyed hash function index * @return keyed hash function pointer (or NULL) */ -BEEDLLAPI /*@observer@*/ /*@null@*/ /*@unused@*/ +BEECRYPTAPI /*@observer@*/ /*@null@*/ /*@unused@*/ const keyedHashFunction* keyedHashFunctionGet(int index) /*@*/; @@ -548,7 +552,7 @@ const keyedHashFunction* keyedHashFunctionGet(int index) * @return keyed hash function pointer (or NULL) */ /*@-exportlocal@*/ -BEEDLLAPI /*@observer@*/ /*@null@*/ +BEECRYPTAPI /*@observer@*/ /*@null@*/ const keyedHashFunction* keyedHashFunctionFind(const char* name) /*@*/; /*@=exportlocal@*/ @@ -559,7 +563,7 @@ const keyedHashFunction* keyedHashFunctionFind(const char* name) * hash function. Otherwise, use "hmacsha1". * @return keyed hash function pointer */ -BEEDLLAPI /*@observer@*/ /*@null@*/ /*@unused@*/ +BEECRYPTAPI /*@observer@*/ /*@null@*/ /*@unused@*/ const keyedHashFunction* keyedHashFunctionDefault(void) /*@*/; @@ -583,14 +587,14 @@ extern "C" { /** \ingroup HMAC_m * Initialize a keyedHashFunction instance. */ -BEEDLLAPI +BEECRYPTAPI int keyedHashFunctionContextInit(keyedHashFunctionContext* ctxt, /*@observer@*/ /*@dependent@*/ const keyedHashFunction* mac) /*@modifies ctxt->algo, ctxt->param @*/; /** \ingroup HMAC_m * Destroy a keyedHashFunction instance. */ -BEEDLLAPI +BEECRYPTAPI int keyedHashFunctionContextFree(/*@special@*/ keyedHashFunctionContext* ctxt) /*@uses ctxt->algo @*/ /*@releases ctxt->param @*/ @@ -598,43 +602,43 @@ int keyedHashFunctionContextFree(/*@special@*/ keyedHashFunctionContext* ctxt) /** \ingroup HMAC_m */ -BEEDLLAPI +BEECRYPTAPI int keyedHashFunctionContextSetup(keyedHashFunctionContext* ctxt, const uint32* key, int keybits) /*@modifies ctxt @*/; /** \ingroup HMAC_m */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ int keyedHashFunctionContextReset(keyedHashFunctionContext* ctxt) /*@modifies ctxt @*/; /** \ingroup HMAC_m */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ int keyedHashFunctionContextUpdate(keyedHashFunctionContext* ctxt, const byte* data, int size) /*@modifies ctxt @*/; /** \ingroup HMAC_m */ -BEEDLLAPI +BEECRYPTAPI int keyedHashFunctionContextUpdateMC(keyedHashFunctionContext* ctxt, const memchunk* m) /*@modifies ctxt @*/; /** \ingroup HMAC_m */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ int keyedHashFunctionContextUpdateMP32(keyedHashFunctionContext* ctxt, const mp32number* n) /*@modifies ctxt @*/; /** \ingroup HMAC_m */ -BEEDLLAPI +BEECRYPTAPI int keyedHashFunctionContextDigest(keyedHashFunctionContext* ctxt, mp32number* dig) /*@modifies ctxt, *dig @*/; /** \ingroup HMAC_m */ -BEEDLLAPI +BEECRYPTAPI int keyedHashFunctionContextDigestMatch(keyedHashFunctionContext* ctxt, const mp32number* match) /*@modifies ctxt @*/; @@ -774,7 +778,7 @@ extern "C" { * Return the number of blockciphers available. * @return number of blockciphers available */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ int blockCipherCount(void) /*@*/; @@ -783,7 +787,7 @@ int blockCipherCount(void) * @param index blockcipher index * @return blockcipher pointer (or NULL) */ -BEEDLLAPI /*@observer@*/ /*@null@*/ /*@unused@*/ +BEECRYPTAPI /*@observer@*/ /*@null@*/ /*@unused@*/ const blockCipher* blockCipherGet(int index) /*@*/; @@ -793,7 +797,7 @@ const blockCipher* blockCipherGet(int index) * @return blockcipher pointer (or NULL) */ /*@-exportlocal@*/ -BEEDLLAPI /*@observer@*/ /*@null@*/ +BEECRYPTAPI /*@observer@*/ /*@null@*/ const blockCipher* blockCipherFind(const char* name) /*@*/; /*@=exportlocal@*/ @@ -804,7 +808,7 @@ const blockCipher* blockCipherFind(const char* name) * Otherwise, use "blowfish". * @return blockcipher pointer */ -BEEDLLAPI /*@observer@*/ /*@null@*/ /*@unused@*/ +BEECRYPTAPI /*@observer@*/ /*@null@*/ /*@unused@*/ const blockCipher* blockCipherDefault(void) /*@*/; @@ -828,26 +832,26 @@ extern "C" { /** \ingroup BC_m * Initialize a blockCipher instance. */ -BEEDLLAPI +BEECRYPTAPI int blockCipherContextInit(blockCipherContext* ctxt, /*@observer@*/ /*@dependent@*/ const blockCipher* ciph) /*@modifies ctxt->algo, ctxt->param @*/; /** \ingroup BC_m */ -BEEDLLAPI +BEECRYPTAPI int blockCipherContextSetup(blockCipherContext* ctxt, const uint32* key, int keybits, cipherOperation op) /*@modifies ctxt @*/; /** \ingroup BC_m */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ int blockCipherContextSetIV(blockCipherContext* ctxt, const uint32* iv) /*@modifies ctxt @*/; /** \ingroup BC_m * Destroy a blockCipher instance. */ -BEEDLLAPI +BEECRYPTAPI int blockCipherContextFree(/*@special@*/ blockCipherContext* ctxt) /*@releases ctxt->param @*/ /*@modifies ctxt->algo, ctxt->param @*/; diff --git a/beecrypt/blockmode.h b/beecrypt/blockmode.h index 2d825adf9..07ecc57fd 100644 --- a/beecrypt/blockmode.h +++ b/beecrypt/blockmode.h @@ -43,7 +43,7 @@ extern "C" { * @param src plaintext block * @return 0 on success, -1 on failure */ -BEEDLLAPI +BEECRYPTAPI int blockEncrypt(const blockCipher* bc, blockCipherParam* bp, cipherMode mode, int blocks, /*@out@*/ uint32* dst, const uint32* src) /*@modifies bp, dst @*/; @@ -56,7 +56,7 @@ int blockEncrypt(const blockCipher* bc, blockCipherParam* bp, cipherMode mode, i * @param src ciphertext block * @return 0 on success, -1 on failure */ -BEEDLLAPI +BEECRYPTAPI int blockDecrypt(const blockCipher* bc, blockCipherParam* bp, cipherMode mode, int blocks, /*@out@*/ uint32* dst, const uint32* src) /*@modifies bp, dst @*/; diff --git a/beecrypt/blockpad.h b/beecrypt/blockpad.h index 4c0719d06..0eb0c08ef 100644 --- a/beecrypt/blockpad.h +++ b/beecrypt/blockpad.h @@ -40,7 +40,7 @@ extern "C" { * @param tmp buffer to pad * @return buffer with pad added */ -BEEDLLAPI /*@only@*/ /*@null@*/ /*@unused@*/ +BEECRYPTAPI /*@only@*/ /*@null@*/ /*@unused@*/ memchunk* pkcs5Pad (int blockbytes, /*@only@*/ /*@null@*/ memchunk* tmp) /*@*/; @@ -50,7 +50,7 @@ memchunk* pkcs5Pad (int blockbytes, /*@only@*/ /*@null@*/ memchunk* tmp) * @param tmp buffer to unpad * @return buffer with pad removed */ -BEEDLLAPI /*@only@*/ /*@null@*/ +BEECRYPTAPI /*@only@*/ /*@null@*/ memchunk* pkcs5Unpad(int blockbytes, /*@returned@*/ /*@null@*/ memchunk* tmp) /*@modifies tmp */; @@ -60,7 +60,7 @@ memchunk* pkcs5Unpad(int blockbytes, /*@returned@*/ /*@null@*/ memchunk* tmp) * @param tmp buffer to pad * @return copy of buffer with pad added */ -BEEDLLAPI /*@only@*/ /*@null@*/ +BEECRYPTAPI /*@only@*/ /*@null@*/ memchunk* pkcs5PadCopy (int blockbytes, const memchunk* src) /*@*/; @@ -70,7 +70,7 @@ memchunk* pkcs5PadCopy (int blockbytes, const memchunk* src) * @param tmp buffer to unpad * @return copy of buffer with pad removed */ -BEEDLLAPI /*@only@*/ /*@null@*/ /*@unused@*/ +BEECRYPTAPI /*@only@*/ /*@null@*/ /*@unused@*/ memchunk* pkcs5UnpadCopy(int blockbytes, const memchunk* src) /*@*/; diff --git a/beecrypt/blowfish.h b/beecrypt/blowfish.h index f6c4311f5..47b2bdc9a 100644 --- a/beecrypt/blowfish.h +++ b/beecrypt/blowfish.h @@ -49,12 +49,12 @@ extern "C" { /** \ingroup BC_blowfish_m */ -extern const BEEDLLAPI blockCipher blowfish; +extern const BEECRYPTAPI blockCipher blowfish; /** \ingroup BC_blowfish_m */ /*@-exportlocal@*/ -BEEDLLAPI +BEECRYPTAPI int blowfishSetup (blowfishParam* bp, const uint32* key, int keybits, cipherOperation op) /*@modifies bp */; /*@=exportlocal@*/ @@ -62,7 +62,7 @@ int blowfishSetup (blowfishParam* bp, const uint32* key, int keybits, cipherOpe /** \ingroup BC_blowfish_m */ /*@-exportlocal@*/ -BEEDLLAPI +BEECRYPTAPI int blowfishSetIV (blowfishParam* bp, const uint32* iv) /*@modifies bp */; /*@=exportlocal@*/ @@ -70,7 +70,7 @@ int blowfishSetIV (blowfishParam* bp, const uint32* iv) /** \ingroup BC_blowfish_m */ /*@-exportlocal@*/ -BEEDLLAPI +BEECRYPTAPI int blowfishEncrypt(blowfishParam* bp, uint32* dst, const uint32* src) /*@modifies bp, dst */; /*@=exportlocal@*/ @@ -78,7 +78,7 @@ int blowfishEncrypt(blowfishParam* bp, uint32* dst, const uint32* src) /** \ingroup BC_blowfish_m */ /*@-exportlocal@*/ -BEEDLLAPI +BEECRYPTAPI int blowfishDecrypt(blowfishParam* bp, uint32* dst, const uint32* src) /*@modifies bp, dst */; /*@=exportlocal@*/ @@ -86,7 +86,7 @@ int blowfishDecrypt(blowfishParam* bp, uint32* dst, const uint32* src) /** \ingroup BC_blowfish_m */ /*@-exportlocal@*/ -BEEDLLAPI +BEECRYPTAPI int blowfishECBEncrypt(blowfishParam* bp, int count, uint32* dst, const uint32* src) /*@modifies bp, dst */; /*@=exportlocal@*/ @@ -94,7 +94,7 @@ int blowfishECBEncrypt(blowfishParam* bp, int count, uint32* dst, const uint32* /** \ingroup BC_blowfish_m */ /*@-exportlocal@*/ -BEEDLLAPI +BEECRYPTAPI int blowfishECBDecrypt(blowfishParam* bp, int count, uint32* dst, const uint32* src) /*@modifies bp, dst */; /*@=exportlocal@*/ @@ -102,7 +102,7 @@ int blowfishECBDecrypt(blowfishParam* bp, int count, uint32* dst, const uint32* /** \ingroup BC_blowfish_m */ /*@-exportlocal@*/ -BEEDLLAPI +BEECRYPTAPI int blowfishCBCEncrypt(blowfishParam* bp, int count, uint32* dst, const uint32* src) /*@modifies bp, dst */; /*@=exportlocal@*/ @@ -110,7 +110,7 @@ int blowfishCBCEncrypt(blowfishParam* bp, int count, uint32* dst, const uint32* /** \ingroup BC_blowfish_m */ /*@-exportlocal@*/ -BEEDLLAPI +BEECRYPTAPI int blowfishCBCDecrypt(blowfishParam* bp, int count, uint32* dst, const uint32* src) /*@modifies bp, dst */; /*@=exportlocal@*/ diff --git a/beecrypt/config.gnu.h.in b/beecrypt/config.gnu.h.in index bf2818f3b..4ab5f4eb6 100644 --- a/beecrypt/config.gnu.h.in +++ b/beecrypt/config.gnu.h.in @@ -123,9 +123,6 @@ /* Define if you have the <ctype.h> header file. */ #undef HAVE_CTYPE_H -/* Define if you have the <dlfcn.h> header file. */ -#undef HAVE_DLFCN_H - /* Define if you have the <errno.h> header file. */ #undef HAVE_ERRNO_H diff --git a/beecrypt/config.h b/beecrypt/config.h index d5af4b2f6..dbab02eff 100644 --- a/beecrypt/config.h +++ b/beecrypt/config.h @@ -34,14 +34,14 @@ #if WIN32 && !__CYGWIN32__ # include "config.win.h" # ifdef BEECRYPT_DLL_EXPORT -# define BEEDLLAPI +# define BEECRYPTAPI __declspec(dllexport) # else -# define BEEDLLAPI __declspec(dllimport) +# define BEECRYPTAPI __declspec(dllimport) # endif /*typedef UINT8_TYPE byte;*/ #else # include "config.gnu.h" -# define BEEDLLAPI +# define BEECRYPTAPI typedef UINT8_TYPE byte; #endif diff --git a/beecrypt/configure b/beecrypt/configure index 845da73a8..48af91182 100755 --- a/beecrypt/configure +++ b/beecrypt/configure @@ -19,169 +19,9 @@ ac_help="$ac_help --enable-fast-install[=PKGS] optimize for fast installation [default=yes]" ac_help="$ac_help --with-gnu-ld assume the C compiler uses GNU ld [default=no]" - -# Find the correct PATH separator. Usually this is `:', but -# DJGPP uses `;' like DOS. -if test "X${PATH_SEPARATOR+set}" != Xset; then - UNAME=${UNAME-`uname 2>/dev/null`} - case X$UNAME in - *-DOS) lt_cv_sys_path_separator=';' ;; - *) lt_cv_sys_path_separator=':' ;; - esac -fi - - -# Check that we are running under the correct shell. -SHELL=${CONFIG_SHELL-/bin/sh} - -case X$ECHO in -X*--fallback-echo) - # Remove one level of quotation (which was required for Make). - ECHO=`echo "$ECHO" | sed 's,\\\\\$\\$0,'$0','` - ;; -esac - -echo=${ECHO-echo} -if test "X$1" = X--no-reexec; then - # Discard the --no-reexec flag, and continue. - shift -elif test "X$1" = X--fallback-echo; then - # Avoid inline document here, it may be left over - : -elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then - # Yippee, $echo works! - : -else - # Restart under the correct shell. - exec $SHELL "$0" --no-reexec ${1+"$@"} -fi - -if test "X$1" = X--fallback-echo; then - # used as fallback echo - shift - cat <<EOF - -EOF - exit 0 -fi - -# The HP-UX ksh and POSIX shell print the target directory to stdout -# if CDPATH is set. -if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi - -if test -z "$ECHO"; then -if test "X${echo_test_string+set}" != Xset; then -# find a string as large as possible, as long as the shell can cope with it - for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do - # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... - if (echo_test_string="`eval $cmd`") 2>/dev/null && - echo_test_string="`eval $cmd`" && - (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null - then - break - fi - done -fi - -if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && - echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - : -else - # The Solaris, AIX, and Digital Unix default echo programs unquote - # backslashes. This makes it impossible to quote backslashes using - # echo "$something" | sed 's/\\/\\\\/g' - # - # So, first we look for a working echo in the user's PATH. - - IFS="${IFS= }"; save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}" - for dir in $PATH /usr/ucb; do - if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && - test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && - echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - echo="$dir/echo" - break - fi - done - IFS="$save_ifs" - - if test "X$echo" = Xecho; then - # We didn't find a better echo, so look for alternatives. - if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' && - echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - # This shell has a builtin print -r that does the trick. - echo='print -r' - elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) && - test "X$CONFIG_SHELL" != X/bin/ksh; then - # If we have ksh, try running configure again with it. - ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} - export ORIGINAL_CONFIG_SHELL - CONFIG_SHELL=/bin/ksh - export CONFIG_SHELL - exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"} - else - # Try using printf. - echo='printf %s\n' - if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && - echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - # Cool, printf works - : - elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` && - test "X$echo_testing_string" = 'X\t' && - echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL - export CONFIG_SHELL - SHELL="$CONFIG_SHELL" - export SHELL - echo="$CONFIG_SHELL $0 --fallback-echo" - elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` && - test "X$echo_testing_string" = 'X\t' && - echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - echo="$CONFIG_SHELL $0 --fallback-echo" - else - # maybe with a smaller string... - prev=: - - for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do - if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null - then - break - fi - prev="$cmd" - done - - if test "$prev" != 'sed 50q "$0"'; then - echo_test_string=`eval $prev` - export echo_test_string - exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"} - else - # Oops. We lost completely, so just stick with echo. - echo=echo - fi - fi - fi - fi -fi -fi - -# Copy echo and quote the copy suitably for passing to libtool from -# the Makefile, instead of quoting the original, which is used later. -ECHO=$echo -if test "X$ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then - ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo" -fi - - ac_help="$ac_help --disable-libtool-lock avoid locking (might break parallel builds)" ac_help="$ac_help - --with-pic try to use only PIC/non-PIC objects [default=use both]" -ac_help="$ac_help --enable-debug creates debugging code [default=no]" ac_help="$ac_help --enable-optimized enables the assembler optimizations [default depends on --enable-debug value]" @@ -750,7 +590,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:754: checking host system type" >&5 +echo "configure:594: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -771,7 +611,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` echo "$ac_t""$host" 1>&6 echo $ac_n "checking target system type""... $ac_c" 1>&6 -echo "configure:775: checking target system type" >&5 +echo "configure:615: checking target system type" >&5 target_alias=$target case "$target_alias" in @@ -789,7 +629,7 @@ target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` echo "$ac_t""$target" 1>&6 echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:793: checking build system type" >&5 +echo "configure:633: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -824,7 +664,7 @@ test "$host_alias" != "$target_alias" && # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:828: checking for a BSD compatible install" >&5 +echo "configure:668: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -877,7 +717,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6 -echo "configure:881: checking whether build environment is sane" >&5 +echo "configure:721: checking whether build environment is sane" >&5 # Just in case sleep 1 echo timestamp > conftestfile @@ -934,7 +774,7 @@ test "$program_suffix" != NONE && test "$program_transform_name" = "" && program_transform_name="s,x,x," echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:938: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:778: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -963,7 +803,7 @@ fi PACKAGE=beecrypt -VERSION=2.1.0 +VERSION=2.2.0 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; } @@ -980,7 +820,7 @@ EOF missing_dir=`cd $ac_aux_dir && pwd` echo $ac_n "checking for working aclocal""... $ac_c" 1>&6 -echo "configure:984: checking for working aclocal" >&5 +echo "configure:824: checking for working aclocal" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -993,7 +833,7 @@ else fi echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 -echo "configure:997: checking for working autoconf" >&5 +echo "configure:837: checking for working autoconf" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -1006,7 +846,7 @@ else fi echo $ac_n "checking for working automake""... $ac_c" 1>&6 -echo "configure:1010: checking for working automake" >&5 +echo "configure:850: checking for working automake" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -1019,7 +859,7 @@ else fi echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 -echo "configure:1023: checking for working autoheader" >&5 +echo "configure:863: checking for working autoheader" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -1032,7 +872,7 @@ else fi echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 -echo "configure:1036: checking for working makeinfo" >&5 +echo "configure:876: checking for working makeinfo" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -1052,7 +892,7 @@ fi if test "${enable_static+set}" = set; then enableval="$enable_static" p=${PACKAGE-default} -case $enableval in +case "$enableval" in yes) enable_static=yes ;; no) enable_static=no ;; *) @@ -1160,7 +1000,7 @@ esac # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1164: checking for $ac_word" >&5 +echo "configure:1004: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1190,7 +1030,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1194: checking for $ac_word" >&5 +echo "configure:1034: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1241,7 +1081,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1245: checking for $ac_word" >&5 +echo "configure:1085: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1273,7 +1113,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1277: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1117: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1284,12 +1124,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 1288 "configure" +#line 1128 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1293: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1133: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1315,12 +1155,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1319: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1159: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1324: checking whether we are using GNU C" >&5 +echo "configure:1164: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1329,7 +1169,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1333: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1173: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1348,7 +1188,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1352: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1192: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1380,7 +1220,7 @@ else fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1384: checking how to run the C preprocessor" >&5 +echo "configure:1224: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1395,13 +1235,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext <<EOF -#line 1399 "configure" +#line 1239 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1405: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1245: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1412,13 +1252,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext <<EOF -#line 1416 "configure" +#line 1256 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1422: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1262: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1429,13 +1269,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext <<EOF -#line 1433 "configure" +#line 1273 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1439: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1279: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1460,7 +1300,7 @@ fi echo "$ac_t""$CPP" 1>&6 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:1464: checking whether ln -s works" >&5 +echo "configure:1304: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1480,73 +1320,11 @@ else echo "$ac_t""no" 1>&6 fi -echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 -echo "configure:1485: checking for Cygwin environment" >&5 -if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext <<EOF -#line 1490 "configure" -#include "confdefs.h" - -int main() { - -#ifndef __CYGWIN__ -#define __CYGWIN__ __CYGWIN32__ -#endif -return __CYGWIN__; -; return 0; } -EOF -if { (eval echo configure:1501: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_cygwin=yes -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_cygwin=no -fi -rm -f conftest* -rm -f conftest* -fi - -echo "$ac_t""$ac_cv_cygwin" 1>&6 -CYGWIN= -test "$ac_cv_cygwin" = yes && CYGWIN=yes -echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6 -echo "configure:1518: checking for mingw32 environment" >&5 -if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext <<EOF -#line 1523 "configure" -#include "confdefs.h" - -int main() { -return __MINGW32__; -; return 0; } -EOF -if { (eval echo configure:1530: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_mingw32=yes -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_mingw32=no -fi -rm -f conftest* -rm -f conftest* -fi - -echo "$ac_t""$ac_cv_mingw32" 1>&6 -MINGW32= -test "$ac_cv_mingw32" = yes && MINGW32=yes # Check whether --enable-shared or --disable-shared was given. if test "${enable_shared+set}" = set; then enableval="$enable_shared" p=${PACKAGE-default} -case $enableval in +case "$enableval" in yes) enable_shared=yes ;; no) enable_shared=no ;; *) @@ -1569,7 +1347,7 @@ fi if test "${enable_fast_install+set}" = set; then enableval="$enable_fast_install" p=${PACKAGE-default} -case $enableval in +case "$enableval" in yes) enable_fast_install=yes ;; no) enable_fast_install=no ;; *) @@ -1588,6 +1366,36 @@ else enable_fast_install=yes fi +# Extract the first word of "ranlib", so it can be a program name with args. +set dummy ranlib; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:1373: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$RANLIB"; then + ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_RANLIB="ranlib" + break + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":" +fi +fi +RANLIB="$ac_cv_prog_RANLIB" +if test -n "$RANLIB"; then + echo "$ac_t""$RANLIB" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + # Check whether --with-gnu-ld or --without-gnu-ld was given. if test "${with_gnu_ld+set}" = set; then withval="$with_gnu_ld" @@ -1597,18 +1405,12 @@ else fi ac_prog=ld -if test "$GCC" = yes; then +if test "$ac_cv_prog_gcc" = yes; then # Check if gcc -print-prog-name=ld gives a path. echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6 -echo "configure:1604: checking for ld used by GCC" >&5 - 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 +echo "configure:1412: checking for ld used by GCC" >&5 + ac_prog=`($CC -print-prog-name=ld) 2>&5` + case "$ac_prog" in # Accept absolute paths. [\\/]* | [A-Za-z]:[\\/]*) re_direlt='/[^/][^/]*/\.\./' @@ -1630,12 +1432,12 @@ echo "configure:1604: checking for ld used by GCC" >&5 esac elif test "$with_gnu_ld" = yes; then echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 -echo "configure:1634: checking for GNU ld" >&5 +echo "configure:1436: checking for GNU ld" >&5 else echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 -echo "configure:1637: checking for non-GNU ld" >&5 +echo "configure:1439: checking for non-GNU ld" >&5 fi -if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then +if eval "test \"`echo '$''{'ac_cv_path_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -z "$LD"; then @@ -1643,11 +1445,11 @@ else for ac_dir in $PATH; do 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" + ac_cv_path_LD="$ac_dir/$ac_prog" # Check to see if the program is GNU ld. I'd rather use --version, # but apparently some GNU ld's only accept -v. # Break only if it was the GNU/non-GNU ld that we prefer. - if "$lt_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then + if "$ac_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then test "$with_gnu_ld" != no && break else test "$with_gnu_ld" != yes && break @@ -1656,11 +1458,11 @@ else done IFS="$ac_save_ifs" else - lt_cv_path_LD="$LD" # Let the user override the test with a path. + ac_cv_path_LD="$LD" # Let the user override the test with a path. fi fi -LD="$lt_cv_path_LD" +LD="$ac_cv_path_LD" if test -n "$LD"; then echo "$ac_t""$LD" 1>&6 else @@ -1668,302 +1470,57 @@ else fi test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; } echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6 -echo "configure:1672: checking if the linker ($LD) is GNU ld" >&5 -if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then +echo "configure:1474: checking if the linker ($LD) is GNU ld" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_gnu_ld'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else # I'd rather use --version here, but apparently some GNU ld's only accept -v. if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then - lt_cv_prog_gnu_ld=yes + ac_cv_prog_gnu_ld=yes else - lt_cv_prog_gnu_ld=no + ac_cv_prog_gnu_ld=no fi fi -echo "$ac_t""$lt_cv_prog_gnu_ld" 1>&6 -with_gnu_ld=$lt_cv_prog_gnu_ld +echo "$ac_t""$ac_cv_prog_gnu_ld" 1>&6 -echo $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6 -echo "configure:1689: checking for $LD option to reload object files" >&5 -if eval "test \"`echo '$''{'lt_cv_ld_reload_flag'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - lt_cv_ld_reload_flag='-r' -fi - -echo "$ac_t""$lt_cv_ld_reload_flag" 1>&6 -reload_flag=$lt_cv_ld_reload_flag -test -n "$reload_flag" && reload_flag=" $reload_flag" - echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6 -echo "configure:1701: checking for BSD-compatible nm" >&5 -if eval "test \"`echo '$''{'lt_cv_path_NM'+set}'`\" = set"; then +echo "configure:1490: checking for BSD-compatible nm" >&5 +if eval "test \"`echo '$''{'ac_cv_path_NM'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$NM"; then # Let the user override the test. - lt_cv_path_NM="$NM" + ac_cv_path_NM="$NM" else IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do test -z "$ac_dir" && ac_dir=. - tmp_nm=$ac_dir/${ac_tool_prefix}nm - if test -f $tmp_nm || test -f $tmp_nm$ac_exeext ; then + if test -f $ac_dir/nm || test -f $ac_dir/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 - if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep '(/dev/null|Invalid file or object type)' >/dev/null; then - lt_cv_path_NM="$tmp_nm -B" + if ($ac_dir/nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then + ac_cv_path_NM="$ac_dir/nm -B" break - elif ($tmp_nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then - lt_cv_path_NM="$tmp_nm -p" + elif ($ac_dir/nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then + ac_cv_path_NM="$ac_dir/nm -p" break else - lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but + ac_cv_path_NM=${ac_cv_path_NM="$ac_dir/nm"} # keep the first match, but continue # so that we can try to find one that supports BSD flags fi fi done IFS="$ac_save_ifs" - test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm + test -z "$ac_cv_path_NM" && ac_cv_path_NM=nm fi fi -NM="$lt_cv_path_NM" +NM="$ac_cv_path_NM" echo "$ac_t""$NM" 1>&6 -echo $ac_n "checking how to recognise dependant libraries""... $ac_c" 1>&6 -echo "configure:1739: checking how to recognise dependant libraries" >&5 -if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - lt_cv_file_magic_cmd='$MAGIC_CMD' -lt_cv_file_magic_test_file= -lt_cv_deplibs_check_method='unknown' -# Need to set the preceding variable on all platforms that support -# interlibrary dependencies. -# 'none' -- dependencies not supported. -# `unknown' -- same as none, but documents that we really don't know. -# 'pass_all' -- all dependencies passed with no checks. -# 'test_compile' -- check by making test program. -# ['file_magic [regex]'] -- check by looking for files in library path -# which responds to the $file_magic_cmd with a given egrep regex. -# If you have `file' or equivalent on your system and you're not sure -# whether `pass_all' will *always* work, you probably want this one. - -case $host_os in -aix4* | aix5*) - lt_cv_deplibs_check_method=pass_all - ;; - -beos*) - lt_cv_deplibs_check_method=pass_all - ;; - -bsdi4*) - 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* | mingw* | pw32*) - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' - lt_cv_file_magic_cmd='$OBJDUMP -f' - ;; - -darwin* | rhapsody*) - lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library' - lt_cv_file_magic_cmd='/usr/bin/file -L' - case "$host_os" in - rhapsody* | darwin1.012) - lt_cv_file_magic_test_file=`echo /System/Library/Frameworks/System.framework/Versions/*/System | head -1` - ;; - *) # Darwin 1.3 on - lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib' - ;; - esac - ;; - -freebsd*) - 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)/i[3-9]86 (compact )?demand paged shared library' - lt_cv_file_magic_cmd=/usr/bin/file - lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` - ;; - esac - else - lt_cv_deplibs_check_method=pass_all - fi - ;; - -gnu*) - lt_cv_deplibs_check_method=pass_all - ;; - -hpux10.20*|hpux11*) - lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library' - lt_cv_file_magic_cmd=/usr/bin/file - lt_cv_file_magic_test_file=/usr/lib/libc.sl - ;; - -irix5* | irix6*) - case $host_os in - irix5*) - # this will be overridden with pass_all, but let us keep it just in case - lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1" - ;; - *) - case $LD in - *-32|*"-32 ") libmagic=32-bit;; - *-n32|*"-n32 ") libmagic=N32;; - *-64|*"-64 ") libmagic=64-bit;; - *) libmagic=never-match;; - esac - # this will be overridden with pass_all, but let us keep it just in case - lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[1234] dynamic lib MIPS - version 1" - ;; - esac - lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*` - lt_cv_deplibs_check_method=pass_all - ;; - -# This must be Linux ELF. -linux-gnu*) - case $host_cpu in - alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* | s390* ) - lt_cv_deplibs_check_method=pass_all ;; - *) - # glibc up to 2.1.1 does not perform some relocations on ARM - lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' ;; - esac - lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so` - ;; - -netbsd*) - if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then - lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$' - else - lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so$' - 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 - ;; - -osf3* | osf4* | osf5*) - # this will be overridden with pass_all, but let us keep it just in case - lt_cv_deplibs_check_method='file_magic COFF format alpha shared library' - lt_cv_file_magic_test_file=/shlib/libc.so - lt_cv_deplibs_check_method=pass_all - ;; - -sco3.2v5*) - lt_cv_deplibs_check_method=pass_all - ;; - -solaris*) - lt_cv_deplibs_check_method=pass_all - lt_cv_file_magic_test_file=/lib/libc.so - ;; - -sysv5uw[78]* | sysv4*uw2*) - lt_cv_deplibs_check_method=pass_all - ;; - -sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) - 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 - ;; - esac - ;; -esac - -fi - -echo "$ac_t""$lt_cv_deplibs_check_method" 1>&6 -file_magic_cmd=$lt_cv_file_magic_cmd -deplibs_check_method=$lt_cv_deplibs_check_method - -echo $ac_n "checking for object suffix""... $ac_c" 1>&6 -echo "configure:1912: checking for object suffix" >&5 -if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - rm -f conftest* -echo 'int i = 1;' > conftest.$ac_ext -if { (eval echo configure:1918: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - for ac_file in conftest.*; do - case $ac_file in - *.c) ;; - *) ac_cv_objext=`echo $ac_file | sed -e s/conftest.//` ;; - esac - done -else - { echo "configure: error: installation or configuration problem; compiler does not work" 1>&2; exit 1; } -fi -rm -f conftest* -fi - -echo "$ac_t""$ac_cv_objext" 1>&6 -OBJEXT=$ac_cv_objext -ac_objext=$ac_cv_objext - - - -echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1938: checking for executable suffix" >&5 -if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test "$CYGWIN" = yes || test "$MINGW32" = yes; then - ac_cv_exeext=.exe -else - rm -f conftest* - echo 'int main () { return 0; }' > conftest.$ac_ext - ac_cv_exeext= - if { (eval echo configure:1948: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then - for file in conftest.*; do - case $file in - *.c | *.o | *.obj) ;; - *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;; - esac - done - else - { echo "configure: error: installation or configuration problem: compiler cannot create executables." 1>&2; exit 1; } - fi - rm -f conftest* - test x"${ac_cv_exeext}" = x && ac_cv_exeext=no -fi -fi - -EXEEXT="" -test x"${ac_cv_exeext}" != xno && EXEEXT=${ac_cv_exeext} -echo "$ac_t""${ac_cv_exeext}" 1>&6 -ac_exeext=$EXEEXT - if test $host != $build; then ac_tool_prefix=${host_alias}- else @@ -1971,515 +1528,42 @@ else fi - - -# Check for command to grab the raw symbol name followed by C symbol from nm. -echo $ac_n "checking command to parse $NM output""... $ac_c" 1>&6 -echo "configure:1979: checking command to parse $NM output" >&5 -if eval "test \"`echo '$''{'lt_cv_sys_global_symbol_pipe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - -# These are sane defaults that work on at least a few old systems. -# [They come from Ultrix. What could be older than Ultrix?!! ;)] - -# Character class describing NM global symbol codes. -symcode='[BCDEGRST]' - -# Regexp to match symbols that can be accessed directly from C. -sympat='\([_A-Za-z][_A-Za-z0-9]*\)' - -# Transform the above into a raw symbol and a C symbol. -symxfrm='\1 \2\3 \3' - -# Transform an extracted symbol line into a proper C declaration -lt_cv_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern char \1;/p'" - -# Define system-specific variables. -case $host_os in -aix*) - symcode='[BCDT]' - ;; -cygwin* | mingw* | pw32*) - symcode='[ABCDGISTW]' - ;; -hpux*) # Its linker distinguishes data from code symbols - lt_cv_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" - ;; -irix*) - symcode='[BCDEGRST]' - ;; -solaris* | sysv5*) - symcode='[BDT]' - ;; -sysv4) - symcode='[DFNSTU]' - ;; -esac - -# Handle CRLF in mingw tool chain -opt_cr= -case $host_os in -mingw*) - opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp - ;; -esac - -# If we're using GNU nm, then use its standard symbol codes. -if $NM -V 2>&1 | egrep '(GNU|with BFD)' > /dev/null; then - symcode='[ABCDGISTW]' -fi - -# Try without a prefix undercore, then with it. -for ac_symprfx in "" "_"; do - - # Write the raw and C identifiers. -lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'" - - # Check to see that the pipe works correctly. - pipe_works=no - rm -f conftest* - cat > conftest.$ac_ext <<EOF -#ifdef __cplusplus -extern "C" { -#endif -char nm_test_var; -void nm_test_func(){} -#ifdef __cplusplus -} -#endif -int main(){nm_test_var='a';nm_test_func();return(0);} -EOF - - if { (eval echo configure:2055: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - # Now try to grab the symbols. - nlist=conftest.nm - if { (eval echo configure:2058: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5; } && 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 egrep ' nm_test_var$' "$nlist" >/dev/null; then - if egrep ' nm_test_func$' "$nlist" >/dev/null; then - cat <<EOF > conftest.$ac_ext -#ifdef __cplusplus -extern "C" { -#endif - -EOF - # Now generate the symbol file. - eval "$lt_cv_global_symbol_to_cdecl"' < "$nlist" >> conftest.$ac_ext' - - cat <<EOF >> conftest.$ac_ext -#if defined (__STDC__) && __STDC__ -# define lt_ptr_t void * -#else -# define lt_ptr_t char * -# define const -#endif - -/* The mapping between symbol names and symbols. */ -const struct { - const char *name; - lt_ptr_t address; -} -lt_preloaded_symbols[] = -{ -EOF - sed "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" >> conftest.$ac_ext - cat <<\EOF >> conftest.$ac_ext - {0, (lt_ptr_t) 0} -}; - -#ifdef __cplusplus -} -#endif -EOF - # Now try linking the two files. - mv conftest.$ac_objext conftstm.$ac_objext - save_LIBS="$LIBS" - save_CFLAGS="$CFLAGS" - LIBS="conftstm.$ac_objext" - CFLAGS="$CFLAGS$no_builtin_flag" - if { (eval echo configure:2109: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then - pipe_works=yes - fi - LIBS="$save_LIBS" - CFLAGS="$save_CFLAGS" - else - echo "cannot find nm_test_func in $nlist" >&5 - fi - else - echo "cannot find nm_test_var in $nlist" >&5 - fi - else - echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5 - fi - else - echo "$progname: failed program was:" >&5 - cat conftest.$ac_ext >&5 - fi - rm -f conftest* conftst* - - # Do not use the global_symbol_pipe unless it works. - if test "$pipe_works" = yes; then - break - else - lt_cv_sys_global_symbol_pipe= - fi -done - -fi - -global_symbol_pipe="$lt_cv_sys_global_symbol_pipe" -if test -z "$lt_cv_sys_global_symbol_pipe"; then - global_symbol_to_cdecl= -else - global_symbol_to_cdecl="$lt_cv_global_symbol_to_cdecl" -fi -if test -z "$global_symbol_pipe$global_symbol_to_cdecl"; then - echo "$ac_t""failed" 1>&6 -else - echo "$ac_t""ok" 1>&6 -fi - -for ac_hdr in dlfcn.h -do -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2155: checking for $ac_hdr" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext <<EOF -#line 2160 "configure" -#include "confdefs.h" -#include <$ac_hdr> -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2165: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" -else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" -fi -rm -f conftest* -fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <<EOF -#define $ac_tr_hdr 1 -EOF - -else - echo "$ac_t""no" 1>&6 -fi -done - - - - - -# Only perform the check for file, if the check method requires it -case $deplibs_check_method in -file_magic*) - if test "$file_magic_cmd" = '$MAGIC_CMD'; then - echo $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6 -echo "configure:2200: checking for ${ac_tool_prefix}file" >&5 -if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - case $MAGIC_CMD in - /*) - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. - ;; - ?:/*) - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path. - ;; - *) - ac_save_MAGIC_CMD="$MAGIC_CMD" - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="/usr/bin:$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/${ac_tool_prefix}file; then - lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file" - if test -n "$file_magic_test_file"; then - case $deplibs_check_method in - "file_magic "*) - file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`" - MAGIC_CMD="$lt_cv_path_MAGIC_CMD" - if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | - egrep "$file_magic_regex" > /dev/null; then - : - else - cat <<EOF 1>&2 - -*** 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@gnu.org - -EOF - fi ;; - esac - fi - break - fi - done - IFS="$ac_save_ifs" - MAGIC_CMD="$ac_save_MAGIC_CMD" - ;; -esac -fi - -MAGIC_CMD="$lt_cv_path_MAGIC_CMD" -if test -n "$MAGIC_CMD"; then - echo "$ac_t""$MAGIC_CMD" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - -if test -z "$lt_cv_path_MAGIC_CMD"; then - if test -n "$ac_tool_prefix"; then - echo $ac_n "checking for file""... $ac_c" 1>&6 -echo "configure:2262: checking for file" >&5 -if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - case $MAGIC_CMD in - /*) - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. - ;; - ?:/*) - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path. - ;; - *) - ac_save_MAGIC_CMD="$MAGIC_CMD" - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="/usr/bin:$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/file; then - lt_cv_path_MAGIC_CMD="$ac_dir/file" - if test -n "$file_magic_test_file"; then - case $deplibs_check_method in - "file_magic "*) - file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`" - MAGIC_CMD="$lt_cv_path_MAGIC_CMD" - if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | - egrep "$file_magic_regex" > /dev/null; then - : - else - cat <<EOF 1>&2 - -*** Warning: the command libtool uses to detect shared libraries, -*** $file_magic_cmd, produces output that libtool cannot recognize. -*** The result is that libtool may fail to recognize shared libraries -*** as such. This will affect the creation of libtool libraries that -*** depend on shared libraries, but programs linked with such libtool -*** libraries will work regardless of this problem. Nevertheless, you -*** may want to report the problem to your system manager and/or to -*** bug-libtool@gnu.org - -EOF - fi ;; - esac - fi - break - fi - done - IFS="$ac_save_ifs" - MAGIC_CMD="$ac_save_MAGIC_CMD" - ;; -esac -fi - -MAGIC_CMD="$lt_cv_path_MAGIC_CMD" -if test -n "$MAGIC_CMD"; then - echo "$ac_t""$MAGIC_CMD" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - - else - MAGIC_CMD=: - fi -fi - - fi - ;; +case "$target" in +NONE) lt_target="$host" ;; +*) lt_target="$target" ;; esac -# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. -set dummy ${ac_tool_prefix}ranlib; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2333: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$RANLIB"; then - ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" - break - fi - done - IFS="$ac_save_ifs" -fi -fi -RANLIB="$ac_cv_prog_RANLIB" -if test -n "$RANLIB"; then - echo "$ac_t""$RANLIB" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - - -if test -z "$ac_cv_prog_RANLIB"; then -if test -n "$ac_tool_prefix"; then - # Extract the first word of "ranlib", so it can be a program name with args. -set dummy ranlib; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2365: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$RANLIB"; then - ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_RANLIB="ranlib" - break - fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":" -fi -fi -RANLIB="$ac_cv_prog_RANLIB" -if test -n "$RANLIB"; then - echo "$ac_t""$RANLIB" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - -else - RANLIB=":" -fi -fi - -# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. -set dummy ${ac_tool_prefix}strip; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2400: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$STRIP"; then - ac_cv_prog_STRIP="$STRIP" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_STRIP="${ac_tool_prefix}strip" - break - fi - done - IFS="$ac_save_ifs" -fi -fi -STRIP="$ac_cv_prog_STRIP" -if test -n "$STRIP"; then - echo "$ac_t""$STRIP" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - - -if test -z "$ac_cv_prog_STRIP"; then -if test -n "$ac_tool_prefix"; then - # Extract the first word of "strip", so it can be a program name with args. -set dummy strip; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2432: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$STRIP"; then - ac_cv_prog_STRIP="$STRIP" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_STRIP="strip" - break - fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_prog_STRIP" && ac_cv_prog_STRIP=":" -fi -fi -STRIP="$ac_cv_prog_STRIP" -if test -n "$STRIP"; then - echo "$ac_t""$STRIP" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - -else - STRIP=":" -fi -fi - - -enable_dlopen=no -enable_win32_dll=yes +# Check for any special flags to pass to ltconfig. +# +# the following will cause an existing older ltconfig to fail, so +# we ignore this at the expense of the cache file... Checking this +# will just take longer ... bummer! +#libtool_flags="--cache-file=$cache_file" +# +test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared" +test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static" +test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install" +test "$ac_cv_prog_gcc" = yes && libtool_flags="$libtool_flags --with-gcc" +test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld" +libtool_flags="$libtool_flags --enable-win32-dll" # Check whether --enable-libtool-lock or --disable-libtool-lock was given. if test "${enable_libtool_lock+set}" = set; then enableval="$enable_libtool_lock" : fi -test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes +test "x$enable_libtool_lock" = xno && libtool_flags="$libtool_flags --disable-lock" +test x"$silent" = xyes && libtool_flags="$libtool_flags --silent" # Some flags need to be propagated to the compiler or linker for good # libtool support. -case $host in +case "$lt_target" in *-*-irix6*) # Find out which ABI we are using. - echo '#line 2481 "configure"' > conftest.$ac_ext - if { (eval echo configure:2482: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - case `/usr/bin/file conftest.$ac_objext` in + echo '#line 1565 "configure"' > conftest.$ac_ext + if { (eval echo configure:1566: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + case "`/usr/bin/file conftest.o`" in *32-bit*) LD="${LD-ld} -32" ;; @@ -2499,27 +1583,19 @@ case $host in SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6 -echo "configure:2503: checking whether the C compiler needs -belf" >&5 +echo "configure:1587: checking whether the C compiler needs -belf" >&5 if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - - ac_ext=c -# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -ac_cpp='$CPP $CPPFLAGS' -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -cross_compiling=$ac_cv_prog_cc_cross - - cat > conftest.$ac_ext <<EOF -#line 2516 "configure" + cat > conftest.$ac_ext <<EOF +#line 1592 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:2523: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1599: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_cc_needs_belf=yes else @@ -2529,13 +1605,6 @@ else lt_cv_cc_needs_belf=no fi rm -f conftest* - ac_ext=c -# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -ac_cpp='$CPP $CPPFLAGS' -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -cross_compiling=$ac_cv_prog_cc_cross - fi echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6 @@ -2545,11 +1614,11 @@ echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6 fi ;; -*-*-cygwin* | *-*-mingw* | *-*-pw32*) +*-*-cygwin* | *-*-mingw*) # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. set dummy ${ac_tool_prefix}dlltool; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2553: checking for $ac_word" >&5 +echo "configure:1622: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2581,7 +1650,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "dlltool", so it can be a program name with args. set dummy dlltool; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2585: checking for $ac_word" >&5 +echo "configure:1654: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2616,7 +1685,7 @@ fi # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. set dummy ${ac_tool_prefix}as; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2620: checking for $ac_word" >&5 +echo "configure:1689: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2648,7 +1717,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "as", so it can be a program name with args. set dummy as; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2652: checking for $ac_word" >&5 +echo "configure:1721: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2683,7 +1752,7 @@ fi # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. set dummy ${ac_tool_prefix}objdump; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2687: checking for $ac_word" >&5 +echo "configure:1756: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2715,7 +1784,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "objdump", so it can be a program name with args. set dummy objdump; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2719: checking for $ac_word" >&5 +echo "configure:1788: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2747,2755 +1816,107 @@ else fi fi - - # recent cygwin and mingw systems supply a stub DllMain which the user - # can override, but on older systems we have to supply one - echo $ac_n "checking if libtool should supply DllMain function""... $ac_c" 1>&6 -echo "configure:2755: checking if libtool should supply DllMain function" >&5 -if eval "test \"`echo '$''{'lt_cv_need_dllmain'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext <<EOF -#line 2760 "configure" -#include "confdefs.h" - -int main() { -extern int __attribute__((__stdcall__)) DllMain(void*, int, void*); - DllMain (0, 0, 0); -; return 0; } -EOF -if { (eval echo configure:2768: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - lt_cv_need_dllmain=no -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - lt_cv_need_dllmain=yes -fi -rm -f conftest* -fi - -echo "$ac_t""$lt_cv_need_dllmain" 1>&6 - - case $host/$CC in - *-*-cygwin*/gcc*-mno-cygwin*|*-*-mingw*) - # old mingw systems require "-dll" to link a DLL, while more recent ones - # require "-mdll" - SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -mdll" - echo $ac_n "checking how to link DLLs""... $ac_c" 1>&6 -echo "configure:2789: checking how to link DLLs" >&5 -if eval "test \"`echo '$''{'lt_cv_cc_dll_switch'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext <<EOF -#line 2794 "configure" -#include "confdefs.h" - -int main() { - -; return 0; } -EOF -if { (eval echo configure:2801: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - lt_cv_cc_dll_switch=-mdll -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - lt_cv_cc_dll_switch=-dll -fi -rm -f conftest* -fi - -echo "$ac_t""$lt_cv_cc_dll_switch" 1>&6 - CFLAGS="$SAVE_CFLAGS" ;; - *-*-cygwin* | *-*-pw32*) - # cygwin systems need to pass --dll to the linker, and not link - # crt.o which will require a WinMain@16 definition. - lt_cv_cc_dll_switch="-Wl,--dll -nostartfiles" ;; - esac - ;; - -esac - -# Sed substitution that helps us do robust quoting. It backslashifies -# metacharacters that are still active within double-quoted strings. -Xsed='sed -e s/^X//' -sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g' - -# Same as above, but do not quote variable references. -double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g' - -# Sed substitution to delay expansion of an escaped shell variable in a -# double_quote_subst'ed string. -delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' - -# Constants: -rm="rm -f" - -# Global variables: -default_ofile=libtool -can_build_shared=yes - -# All known linkers require a `.a' archive for static linking (except M$VC, -# which needs '.lib'). -libext=a -ltmain="$ac_aux_dir/ltmain.sh" -ofile="$default_ofile" -with_gnu_ld="$lt_cv_prog_gnu_ld" -need_locks="$enable_libtool_lock" - -old_CC="$CC" -old_CFLAGS="$CFLAGS" - -# Set sane defaults for various variables -test -z "$AR" && AR=ar -test -z "$AR_FLAGS" && AR_FLAGS=cru -test -z "$AS" && AS=as -test -z "$CC" && CC=cc -test -z "$DLLTOOL" && DLLTOOL=dlltool -test -z "$LD" && LD=ld -test -z "$LN_S" && LN_S="ln -s" -test -z "$MAGIC_CMD" && MAGIC_CMD=file -test -z "$NM" && NM=nm -test -z "$OBJDUMP" && OBJDUMP=objdump -test -z "$RANLIB" && RANLIB=: -test -z "$STRIP" && STRIP=: -test -z "$ac_objext" && ac_objext=o - -if test x"$host" != x"$build"; then - ac_tool_prefix=${host_alias}- -else - ac_tool_prefix= -fi - -# Transform linux* to *-*-linux-gnu*, to support old configure scripts. -case $host_os in -linux-gnu*) ;; -linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'` -esac - -case $host_os in -aix3*) - # AIX sometimes has problems with the GCC collect2 program. For some - # reason, if we set the COLLECT_NAMES environment variable, the problems - # vanish in a puff of smoke. - if test "X${COLLECT_NAMES+set}" != Xset; then - COLLECT_NAMES= - export COLLECT_NAMES - fi - ;; -esac - -# Determine commands to create old-style static archives. -old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs' -old_postinstall_cmds='chmod 644 $oldlib' -old_postuninstall_cmds= - -if test -n "$RANLIB"; then - old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" - old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds" -fi - -# Allow CC to be a program name with arguments. -set dummy $CC -compiler="$2" - -echo $ac_n "checking for objdir""... $ac_c" 1>&6 -echo "configure:2908: checking for objdir" >&5 -rm -f .libs 2>/dev/null -mkdir .libs 2>/dev/null -if test -d .libs; then - objdir=.libs -else - # MS-DOS does not allow filenames that begin with a dot. - objdir=_libs -fi -rmdir .libs 2>/dev/null -echo "$ac_t""$objdir" 1>&6 - - -# Check whether --with-pic or --without-pic was given. -if test "${with_pic+set}" = set; then - withval="$with_pic" - pic_mode="$withval" -else - pic_mode=default -fi - -test -z "$pic_mode" && pic_mode=default - -# We assume here that the value for lt_cv_prog_cc_pic will not be cached -# in isolation, and that seeing it set (from the cache) indicates that -# the associated values are set (in the cache) correctly too. -echo $ac_n "checking for $compiler option to produce PIC""... $ac_c" 1>&6 -echo "configure:2935: checking for $compiler option to produce PIC" >&5 -if eval "test \"`echo '$''{'lt_cv_prog_cc_pic'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - lt_cv_prog_cc_pic= - lt_cv_prog_cc_shlib= - lt_cv_prog_cc_wl= - lt_cv_prog_cc_static= - lt_cv_prog_cc_no_builtin= - lt_cv_prog_cc_can_build_shared=$can_build_shared - - if test "$GCC" = yes; then - lt_cv_prog_cc_wl='-Wl,' - lt_cv_prog_cc_static='-static' - - case $host_os in - aix*) - # Below there is a dirty hack to force normal static linking with -ldl - # The problem is because libdl dynamically linked with both libc and - # libC (AIX C++ library), which obviously doesn't included in libraries - # list by gcc. This cause undefined symbols with -static flags. - # This hack allows C programs to be linked with "-static -ldl", but - # we not sure about C++ programs. - lt_cv_prog_cc_static="$lt_cv_prog_cc_static ${lt_cv_prog_cc_wl}-lC" - ;; - amigaos*) - # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. - lt_cv_prog_cc_pic='-m68020 -resident32 -malways-restore-a4' - ;; - beos* | irix5* | irix6* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - darwin* | rhapsody*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - lt_cv_prog_cc_pic='-fno-common' - ;; - cygwin* | mingw* | pw32* | os2*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - lt_cv_prog_cc_pic='-DDLL_EXPORT' - ;; - sysv4*MP*) - if test -d /usr/nec; then - lt_cv_prog_cc_pic=-Kconform_pic - fi - ;; - *) - lt_cv_prog_cc_pic='-fPIC' - ;; - esac - else - # PORTME Check for PIC flags for the system compiler. - case $host_os in - aix3* | aix4* | aix5*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - lt_cv_prog_cc_static='-Bstatic' - lt_cv_prog_cc_wl='-Wl,' - else - lt_cv_prog_cc_static='-bnso -bI:/lib/syscalls.exp' - fi - ;; - - hpux9* | hpux10* | hpux11*) - # Is there a better lt_cv_prog_cc_static that works with the bundled CC? - lt_cv_prog_cc_wl='-Wl,' - lt_cv_prog_cc_static="${lt_cv_prog_cc_wl}-a ${lt_cv_prog_cc_wl}archive" - lt_cv_prog_cc_pic='+Z' - ;; - - irix5* | irix6*) - lt_cv_prog_cc_wl='-Wl,' - lt_cv_prog_cc_static='-non_shared' - # PIC (with -KPIC) is the default. - ;; - - cygwin* | mingw* | pw32* | os2*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - lt_cv_prog_cc_pic='-DDLL_EXPORT' - ;; - - newsos6) - lt_cv_prog_cc_pic='-KPIC' - lt_cv_prog_cc_static='-Bstatic' - ;; - - osf3* | osf4* | osf5*) - # All OSF/1 code is PIC. - lt_cv_prog_cc_wl='-Wl,' - lt_cv_prog_cc_static='-non_shared' - ;; - - sco3.2v5*) - lt_cv_prog_cc_pic='-Kpic' - lt_cv_prog_cc_static='-dn' - lt_cv_prog_cc_shlib='-belf' - ;; - - solaris*) - lt_cv_prog_cc_pic='-KPIC' - lt_cv_prog_cc_static='-Bstatic' - lt_cv_prog_cc_wl='-Wl,' - ;; - - sunos4*) - lt_cv_prog_cc_pic='-PIC' - lt_cv_prog_cc_static='-Bstatic' - lt_cv_prog_cc_wl='-Qoption ld ' - ;; - - sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) - lt_cv_prog_cc_pic='-KPIC' - lt_cv_prog_cc_static='-Bstatic' - if test "x$host_vendor" = xsni; then - lt_cv_prog_cc_wl='-LD' - else - lt_cv_prog_cc_wl='-Wl,' - fi - ;; - - uts4*) - lt_cv_prog_cc_pic='-pic' - lt_cv_prog_cc_static='-Bstatic' - ;; - - sysv4*MP*) - if test -d /usr/nec ;then - lt_cv_prog_cc_pic='-Kconform_pic' - lt_cv_prog_cc_static='-Bstatic' - fi - ;; - - *) - lt_cv_prog_cc_can_build_shared=no - ;; - esac - fi - -fi - -if test -z "$lt_cv_prog_cc_pic"; then - echo "$ac_t""none" 1>&6 -else - echo "$ac_t""$lt_cv_prog_cc_pic" 1>&6 - - # Check to make sure the pic_flag actually works. - echo $ac_n "checking if $compiler PIC flag $lt_cv_prog_cc_pic works""... $ac_c" 1>&6 -echo "configure:3087: checking if $compiler PIC flag $lt_cv_prog_cc_pic works" >&5 - if eval "test \"`echo '$''{'lt_cv_prog_cc_pic_works'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $lt_cv_prog_cc_pic -DPIC" - cat > conftest.$ac_ext <<EOF -#line 3094 "configure" -#include "confdefs.h" - -int main() { - -; return 0; } -EOF -if { (eval echo configure:3101: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - case $host_os in - hpux9* | hpux10* | hpux11*) - # On HP-UX, both CC and GCC only warn that PIC is supported... then - # they create non-PIC objects. So, if there were any warnings, we - # assume that PIC is not supported. - if test -s conftest.err; then - lt_cv_prog_cc_pic_works=no - else - lt_cv_prog_cc_pic_works=yes - fi - ;; - *) - lt_cv_prog_cc_pic_works=yes - ;; - esac - -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - lt_cv_prog_cc_pic_works=no - -fi -rm -f conftest* - CFLAGS="$save_CFLAGS" - -fi - - - if test "X$lt_cv_prog_cc_pic_works" = Xno; then - lt_cv_prog_cc_pic= - lt_cv_prog_cc_can_build_shared=no - else - lt_cv_prog_cc_pic=" $lt_cv_prog_cc_pic" - fi - - echo "$ac_t""$lt_cv_prog_cc_pic_works" 1>&6 -fi - -# Check for any special shared library compilation flags. -if test -n "$lt_cv_prog_cc_shlib"; then - echo "configure: warning: \`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries" 1>&2 - if echo "$old_CC $old_CFLAGS " | egrep -e "[ ]$lt_cv_prog_cc_shlib[ ]" >/dev/null; then : - else - echo "configure: warning: add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" 1>&2 - lt_cv_prog_cc_can_build_shared=no - fi -fi - -echo $ac_n "checking if $compiler static flag $lt_cv_prog_cc_static works""... $ac_c" 1>&6 -echo "configure:3153: checking if $compiler static flag $lt_cv_prog_cc_static works" >&5 -if eval "test \"`echo '$''{'lt_cv_prog_cc_static_works'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - lt_cv_prog_cc_static_works=no - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS $lt_cv_prog_cc_static" - cat > conftest.$ac_ext <<EOF -#line 3161 "configure" -#include "confdefs.h" - -int main() { - -; return 0; } -EOF -if { (eval echo configure:3168: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - lt_cv_prog_cc_static_works=yes -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 -fi -rm -f conftest* - LDFLAGS="$save_LDFLAGS" - -fi - - -# Belt *and* braces to stop my trousers falling down: -test "X$lt_cv_prog_cc_static_works" = Xno && lt_cv_prog_cc_static= -echo "$ac_t""$lt_cv_prog_cc_static_works" 1>&6 - -pic_flag="$lt_cv_prog_cc_pic" -special_shlib_compile_flags="$lt_cv_prog_cc_shlib" -wl="$lt_cv_prog_cc_wl" -link_static_flag="$lt_cv_prog_cc_static" -no_builtin_flag="$lt_cv_prog_cc_no_builtin" -can_build_shared="$lt_cv_prog_cc_can_build_shared" - - -# Check to see if options -o and -c are simultaneously supported by compiler -echo $ac_n "checking if $compiler supports -c -o file.$ac_objext""... $ac_c" 1>&6 -echo "configure:3195: checking if $compiler supports -c -o file.$ac_objext" >&5 -if eval "test \"`echo '$''{'lt_cv_compiler_c_o'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - -$rm -r conftest 2>/dev/null -mkdir conftest -cd conftest -echo "int some_variable = 0;" > conftest.$ac_ext -mkdir out -# According to Tom Tromey, Ian Lance Taylor reported there are C compilers -# that will create temporary files in the current directory regardless of -# the output directory. Thus, making CWD read-only will cause this test -# to fail, enabling locking or at least warning the user not to do parallel -# builds. -chmod -w . -save_CFLAGS="$CFLAGS" -CFLAGS="$CFLAGS -o out/conftest2.$ac_objext" -compiler_c_o=no -if { (eval echo configure:3214: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && 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 - if test -s out/conftest.err; then - lt_cv_compiler_c_o=no - else - lt_cv_compiler_c_o=yes - fi -else - # Append any errors to the config.log. - cat out/conftest.err 1>&5 - lt_cv_compiler_c_o=no -fi -CFLAGS="$save_CFLAGS" -chmod u+w . -$rm conftest* out/* -rmdir out -cd .. -rmdir conftest -$rm -r conftest 2>/dev/null - -fi - -compiler_c_o=$lt_cv_compiler_c_o -echo "$ac_t""$compiler_c_o" 1>&6 - -if test x"$compiler_c_o" = x"yes"; then - # Check to see if we can write to a .lo - echo $ac_n "checking if $compiler supports -c -o file.lo""... $ac_c" 1>&6 -echo "configure:3243: checking if $compiler supports -c -o file.lo" >&5 - if eval "test \"`echo '$''{'lt_cv_compiler_o_lo'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - - lt_cv_compiler_o_lo=no - save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -c -o conftest.lo" - cat > conftest.$ac_ext <<EOF -#line 3252 "configure" -#include "confdefs.h" - -int main() { -int some_variable = 0; -; return 0; } -EOF -if { (eval echo configure:3259: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings - if test -s conftest.err; then - lt_cv_compiler_o_lo=no - else - lt_cv_compiler_o_lo=yes - fi - -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 -fi -rm -f conftest* - CFLAGS="$save_CFLAGS" - -fi - - compiler_o_lo=$lt_cv_compiler_o_lo - echo "$ac_t""$compiler_o_lo" 1>&6 -else - compiler_o_lo=no -fi - -# Check to see if we can do hard links to lock some files if needed -hard_links="nottested" -if test "$compiler_c_o" = no && test "$need_locks" != no; then - # do not overwrite the value of need_locks provided by the user - echo $ac_n "checking if we can lock with hard links""... $ac_c" 1>&6 -echo "configure:3289: checking if we can lock with hard links" >&5 - hard_links=yes - $rm conftest* - ln conftest.a conftest.b 2>/dev/null && hard_links=no - touch conftest.a - ln conftest.a conftest.b 2>&5 || hard_links=no - ln conftest.a conftest.b 2>/dev/null && hard_links=no - echo "$ac_t""$hard_links" 1>&6 - if test "$hard_links" = no; then - echo "configure: warning: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" 1>&2 - need_locks=warn - fi -else - need_locks=no -fi - -if test "$GCC" = yes; then - # Check to see if options -fno-rtti -fno-exceptions are supported by compiler - echo $ac_n "checking if $compiler supports -fno-rtti -fno-exceptions""... $ac_c" 1>&6 -echo "configure:3308: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 - echo "int some_variable = 0;" > conftest.$ac_ext - save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -fno-rtti -fno-exceptions -c conftest.$ac_ext" - compiler_rtti_exceptions=no - cat > conftest.$ac_ext <<EOF -#line 3314 "configure" -#include "confdefs.h" - -int main() { -int some_variable = 0; -; return 0; } -EOF -if { (eval echo configure:3321: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings - if test -s conftest.err; then - compiler_rtti_exceptions=no - else - compiler_rtti_exceptions=yes - fi - -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 -fi -rm -f conftest* - CFLAGS="$save_CFLAGS" - echo "$ac_t""$compiler_rtti_exceptions" 1>&6 - - if test "$compiler_rtti_exceptions" = "yes"; then - no_builtin_flag=' -fno-builtin -fno-rtti -fno-exceptions' - else - no_builtin_flag=' -fno-builtin' - fi -fi - -# See if the linker supports building shared libraries. -echo $ac_n "checking whether the linker ($LD) supports shared libraries""... $ac_c" 1>&6 -echo "configure:3348: checking whether the linker ($LD) supports shared libraries" >&5 - -allow_undefined_flag= -no_undefined_flag= -need_lib_prefix=unknown -need_version=unknown -# when you set need_version to no, make sure it does not cause -set_version -# flags to be left without arguments -archive_cmds= -archive_expsym_cmds= -old_archive_from_new_cmds= -old_archive_from_expsyms_cmds= -export_dynamic_flag_spec= -whole_archive_flag_spec= -thread_safe_flag_spec= -hardcode_into_libs=no -hardcode_libdir_flag_spec= -hardcode_libdir_separator= -hardcode_direct=no -hardcode_minus_L=no -hardcode_shlibpath_var=unsupported -runpath_var= -link_all_deplibs=unknown -always_export_symbols=no -export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | sed '\''s/.* //'\'' | sort | uniq > $export_symbols' -# include_expsyms should be a list of space-separated symbols to be *always* -# included in the symbol list -include_expsyms= -# exclude_expsyms can be an egrep regular expression of symbols to exclude -# it will be wrapped by ` (' and `)$', so one must not match beginning or -# end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', -# as well as any symbol that contains `d'. -exclude_expsyms="_GLOBAL_OFFSET_TABLE_" -# Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out -# platforms (ab)use it in PIC code, but their linkers get confused if -# the symbol is explicitly referenced. Since portable code cannot -# rely on this symbol name, it's probably fine to never include it in -# preloaded symbol tables. -extract_expsyms_cmds= - -case $host_os in -cygwin* | mingw* | pw32* ) - # FIXME: the MSVC++ port hasn't been tested in a loooong time - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - if test "$GCC" != yes; then - with_gnu_ld=no - fi ;; esac -ld_shlibs=yes -if test "$with_gnu_ld" = yes; then - # If archive_cmds runs LD, not CC, wlarc should be empty - wlarc='${wl}' - - # See if GNU ld supports shared libraries. - case $host_os in - aix3* | aix4* | aix5*) - # On AIX, the GNU linker is very broken - # Note:Check GNU linker on AIX 5-IA64 when/if it becomes available. - ld_shlibs=no - cat <<EOF 1>&2 - -*** Warning: the GNU linker, at least up to release 2.9.1, is reported -*** to be unable to reliably create shared libraries on AIX. -*** Therefore, libtool is disabling shared libraries support. If you -*** really care for shared libraries, you may want to modify your PATH -*** so that a non-GNU linker is found, and then restart. - -EOF - ;; - - amigaos*) - archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - - # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports - # that the semantics of dynamic libraries on AmigaOS, at least up - # to version 4, is to share data among multiple programs linked - # with the same dynamic library. Since this doesn't match the - # behavior of shared libraries on other platforms, we can use - # them. - ld_shlibs=no - ;; - - beos*) - if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then - allow_undefined_flag=unsupported - # Joseph Beckenbach <jrb3@best.com> says some releases of gcc - # support --undefined. This deserves some investigation. FIXME - archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - else - ld_shlibs=no - fi - ;; - - cygwin* | mingw* | pw32*) - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. - hardcode_libdir_flag_spec='-L$libdir' - allow_undefined_flag=unsupported - always_export_symbols=yes - - extract_expsyms_cmds='test -f $output_objdir/impgen.c || \ - sed -e "/^# \/\* impgen\.c starts here \*\//,/^# \/\* impgen.c ends here \*\// { s/^# //;s/^# *$//; p; }" -e d < $''0 > $output_objdir/impgen.c~ - test -f $output_objdir/impgen.exe || (cd $output_objdir && \ - if test "x$HOST_CC" != "x" ; then $HOST_CC -o impgen impgen.c ; \ - else $CC -o impgen impgen.c ; fi)~ - $output_objdir/impgen $dir/$soroot > $output_objdir/$soname-def' - - old_archive_from_expsyms_cmds='$DLLTOOL --as=$AS --dllname $soname --def $output_objdir/$soname-def --output-lib $output_objdir/$newlib' - - # cygwin and mingw dlls have different entry points and sets of symbols - # to exclude. - # FIXME: what about values for MSVC? - dll_entry=__cygwin_dll_entry@12 - dll_exclude_symbols=DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12~ - case $host_os in - mingw*) - # mingw values - dll_entry=_DllMainCRTStartup@12 - dll_exclude_symbols=DllMain@12,DllMainCRTStartup@12,DllEntryPoint@12~ - ;; - esac - - # mingw and cygwin differ, and it's simplest to just exclude the union - # of the two symbol sets. - dll_exclude_symbols=DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12,DllMainCRTStartup@12,DllEntryPoint@12 - - # recent cygwin and mingw systems supply a stub DllMain which the user - # can override, but on older systems we have to supply one (in ltdll.c) - if test "x$lt_cv_need_dllmain" = "xyes"; then - ltdll_obj='$output_objdir/$soname-ltdll.'"$ac_objext " - ltdll_cmds='test -f $output_objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < [$]0 > $output_objdir/$soname-ltdll.c~ - test -f $output_objdir/$soname-ltdll.$ac_objext || (cd $output_objdir && $CC -c $soname-ltdll.c)~' - else - ltdll_obj= - ltdll_cmds= - fi - - # Extract the symbol export list from an `--export-all' def file, - # then regenerate the def file from the symbol export list, so that - # the compiled dll only exports the symbol export list. - # Be careful not to strip the DATA tag left be newer dlltools. - export_symbols_cmds="$ltdll_cmds"' - $DLLTOOL --export-all --exclude-symbols '$dll_exclude_symbols' --output-def $output_objdir/$soname-def '$ltdll_obj'$libobjs $convenience~ - sed -e "1,/EXPORTS/d" -e "s/ @ [0-9]*//" -e "s/ *;.*$//" < $output_objdir/$soname-def > $export_symbols' - - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is. - # If DATA tags from a recent dlltool are present, honour them! - archive_expsym_cmds='if test "x`head -1 $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname-def; - else - echo EXPORTS > $output_objdir/$soname-def; - _lt_hint=1; - cat $export_symbols | while read symbol; do - set dummy \$symbol; - case \$# in - 2) echo " \$2 @ \$_lt_hint ; " >> $output_objdir/$soname-def;; - *) echo " \$2 @ \$_lt_hint \$3 ; " >> $output_objdir/$soname-def;; - esac; - _lt_hint=`expr 1 + \$_lt_hint`; - done; - fi~ - '"$ltdll_cmds"' - $CC -Wl,--base-file,$output_objdir/$soname-base '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags~ - $DLLTOOL --as=$AS --dllname $soname --exclude-symbols '$dll_exclude_symbols' --def $output_objdir/$soname-def --base-file $output_objdir/$soname-base --output-exp $output_objdir/$soname-exp~ - $CC -Wl,--base-file,$output_objdir/$soname-base $output_objdir/$soname-exp '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags~ - $DLLTOOL --as=$AS --dllname $soname --exclude-symbols '$dll_exclude_symbols' --def $output_objdir/$soname-def --base-file $output_objdir/$soname-base --output-exp $output_objdir/$soname-exp --output-lib $output_objdir/$libname.dll.a~ - $CC $output_objdir/$soname-exp '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags' - ;; - - netbsd*) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= - else - archive_cmds='$CC -shared -nodefaultlibs $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared -nodefaultlibs $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - fi - ;; - - solaris* | sysv5*) - if $LD -v 2>&1 | egrep 'BFD 2\.8' > /dev/null; then - ld_shlibs=no - cat <<EOF 1>&2 - -*** Warning: The releases 2.8.* of the GNU linker cannot reliably -*** create shared libraries on Solaris systems. Therefore, libtool -*** is disabling shared libraries support. We urge you to upgrade GNU -*** binutils to release 2.9.1 or newer. Another option is to modify -*** your PATH or compiler configuration so that the native linker is -*** used, and then restart. +# Save cache, so that ltconfig can load it +cat > confcache <<\EOF +# This file is a shell script that caches the results of configure +# tests run on this system so they can be shared between configure +# scripts and configure runs. It is not useful on other systems. +# If it contains results you don't want to keep, you may remove or edit it. +# +# By default, configure uses ./config.cache as the cache file, +# creating it if it does not exist already. You can give configure +# the --cache-file=FILE option to use a different cache file; that is +# what configure does when it calls configure scripts in +# subdirectories, so they share the cache. +# Giving --cache-file=/dev/null disables caching, for debugging configure. +# config.status only pays attention to the cache file if you give it the +# --recheck option to rerun configure. +# EOF - elif $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi - ;; - - sunos4*) - archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' - wlarc= - hardcode_direct=yes - hardcode_shlibpath_var=no - ;; - - *) - if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi - ;; - esac - - if test "$ld_shlibs" = yes; then - runpath_var=LD_RUN_PATH - hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir' - export_dynamic_flag_spec='${wl}--export-dynamic' - case $host_os in - cygwin* | mingw* | pw32*) - # dlltool doesn't understand --whole-archive et. al. - whole_archive_flag_spec= - ;; - *) - # ancient GNU ld didn't support --whole-archive et. al. - if $LD --help 2>&1 | egrep 'no-whole-archive' > /dev/null; then - whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - else - whole_archive_flag_spec= - fi - ;; - esac - fi -else - # PORTME fill in a description of your system's linker (not GNU ld) - case $host_os in - aix3*) - allow_undefined_flag=unsupported - always_export_symbols=yes - archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' - # Note: this linker hardcodes the directories in LIBPATH if there - # are no directories specified by -L. - hardcode_minus_L=yes - if test "$GCC" = yes && test -z "$link_static_flag"; then - # Neither direct hardcoding nor static linking is supported with a - # broken collect2. - hardcode_direct=unsupported - fi - ;; - - aix4* | aix5*) - # When large executables or shared objects are built, AIX ld can - # have problems creating the table of contents. If linking a library - # or program results in "error TOC overflow" add -mminimal-toc to - # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not - # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. - - archive_cmds='' - hardcode_libdir_separator=':' - if test "$GCC" = yes; then - collect2name=`${CC} -print-prog-name=collect2` - if test -f "$collect2name" && \ - strings "$collect2name" | grep resolve_lib_name >/dev/null - then - # We have reworked collect2 - hardcode_direct=yes - else - # We have old collect2 - hardcode_direct=unsupported - # It fails to find uninstalled libraries when the uninstalled - # path is not listed in the libpath. Setting hardcode_minus_L - # to unsupported forces relinking - hardcode_minus_L=yes - hardcode_libdir_flag_spec='-L$libdir' - hardcode_libdir_separator= - fi - shared_flag='-shared' - else - if test "$host_cpu" = ia64; then - shared_flag='-G' - else - shared_flag='${wl}-bM:SRE' - fi - hardcode_direct=yes - fi - - if test "$host_cpu" = ia64; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. - aix_use_runtimelinking=no - exp_sym_flag='-Bexport' - no_entry_flag="" - else - # Test if we are trying to use run time linking, or normal AIX style linking. - # If -brtl is somewhere in LDFLAGS, we need to do run time linking. - aix_use_runtimelinking=no - for ld_flag in $LDFLAGS; do - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl" ); then - aix_use_runtimelinking=yes - break - fi - done - exp_sym_flag='-bexport' - no_entry_flag='-bnoentry' - fi - # It seems that -bexpall can do strange things, so it is better to - # generate a list of symbols to export. - always_export_symbols=yes - if test "$aix_use_runtimelinking" = yes; then - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:/usr/lib:/lib' - allow_undefined_flag=' -Wl,-G' - archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" - else - if test "$host_cpu" = ia64; then - hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' - allow_undefined_flag="-znodefs" - archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname ${wl}-h$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" - else - hardcode_libdir_flag_spec='${wl}-bnolibpath ${wl}-blibpath:$libdir:/usr/lib:/lib' - # Warning - without using the other run time loading flags, -berok will - # link without error, but may produce a broken library. - allow_undefined_flag='${wl}-berok' - # This is a bit strange, but is similar to how AIX traditionally builds - # it's shared libraries. - archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"' ~$AR -crlo $objdir/$libname$release.a $objdir/$soname' - fi - fi - ;; - - amigaos*) - archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - # see comment about different semantics on the GNU ld section - ld_shlibs=no - ;; - - cygwin* | mingw* | pw32*) - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. - hardcode_libdir_flag_spec=' ' - allow_undefined_flag=unsupported - # Tell ltmain to make .lib files, not .a files. - libext=lib - # FIXME: Setting linknames here is a bad hack. - archive_cmds='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | sed -e '\''s/ -lc$//'\''` -link -dll~linknames=' - # The linker will automatically build a .lib file if we build a DLL. - old_archive_from_new_cmds='true' - # FIXME: Should let the user specify the lib program. - old_archive_cmds='lib /OUT:$oldlib$oldobjs$old_deplibs' - fix_srcfile_path='`cygpath -w "$srcfile"`' - ;; - - darwin* | rhapsody*) - allow_undefined_flag='-undefined suppress' - # FIXME: Relying on posixy $() will cause problems for - # cross-compilation, but unfortunately the echo tests do not - # yet detect zsh echo's removal of \ escapes. - archive_cmds='$CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linkopts -install_name $rpath/$soname $(test -n "$verstring" -a x$verstring != x0.0 && echo $verstring)' - # We need to add '_' to the symbols in $export_symbols first - #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols' - hardcode_direct=yes - hardcode_shlibpath_var=no - whole_archive_flag_spec='-all_load $convenience' - ;; - - freebsd1*) - ld_shlibs=no - ;; - - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor - # support. Future versions do this automatically, but an explicit c++rt0.o - # does not break anything, and helps significantly (at the cost of a little - # extra space). - freebsd2.2*) - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no - ;; - - # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2*) - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct=yes - hardcode_minus_L=yes - hardcode_shlibpath_var=no - ;; - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd*) - archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no - ;; - - hpux9* | hpux10* | hpux11*) - case $host_os in - hpux9*) archive_cmds='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ;; - *) archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' ;; - esac - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' - hardcode_libdir_separator=: - hardcode_direct=yes - hardcode_minus_L=yes # Not in the search PATH, but as the default - # location of the library. - export_dynamic_flag_spec='${wl}-E' - ;; - - irix5* | irix6*) - if test "$GCC" = yes; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - fi - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator=: - link_all_deplibs=yes - ;; - - netbsd*) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out - else - archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF - fi - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no - ;; - - newsos6) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts' - hardcode_direct=yes - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator=: - hardcode_shlibpath_var=no - ;; - - openbsd*) - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no - ;; - - os2*) - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - allow_undefined_flag=unsupported - archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' - old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' - ;; - - osf3*) - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - allow_undefined_flag=' -expect_unresolved \*' - archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - fi - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator=: - ;; - - osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - else - allow_undefined_flag=' -expect_unresolved \*' - archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds='for i in `cat $export_symbols`; do printf "-exported_symbol " >> $lib.exp; echo "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ - $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp' - - #Both c and cxx compiler support -rpath directly - hardcode_libdir_flag_spec='-rpath $libdir' - fi - hardcode_libdir_separator=: - ;; - - sco3.2v5*) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_shlibpath_var=no - runpath_var=LD_RUN_PATH - hardcode_runpath_var=yes - ;; - - solaris*) - no_undefined_flag=' -z defs' - # $CC -shared without GNU ld will not create a library from C++ - # object files and a static libstdc++, better avoid it by now - archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' - archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' - hardcode_libdir_flag_spec='-R$libdir' - hardcode_shlibpath_var=no - case $host_os in - solaris2.[0-5] | solaris2.[0-5].*) ;; - *) # Supported since Solaris 2.6 (maybe 2.5.1?) - whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;; - esac - link_all_deplibs=yes - ;; - - sunos4*) - if test "x$host_vendor" = xsequent; then - # Use $CC to link under sequent, because it throws in some extra .o - # files that make .init and .fini sections work. - archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' - fi - hardcode_libdir_flag_spec='-L$libdir' - hardcode_direct=yes - hardcode_minus_L=yes - hardcode_shlibpath_var=no - ;; - - sysv4) - if test "x$host_vendor" = xsno; then - archive_cmds='$LD -G -Bsymbolic -h $soname -o $lib $libobjs $deplibs $linkopts' - hardcode_direct=yes # is this really true??? - else - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct=no #Motorola manual says yes, but my tests say they lie - fi - runpath_var='LD_RUN_PATH' - hardcode_shlibpath_var=no - ;; - - sysv4.3*) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_shlibpath_var=no - export_dynamic_flag_spec='-Bexport' - ;; - - sysv5*) - no_undefined_flag=' -z text' - # $CC -shared without GNU ld will not create a library from C++ - # object files and a static libstdc++, better avoid it by now - archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' - archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' - hardcode_libdir_flag_spec= - hardcode_shlibpath_var=no - runpath_var='LD_RUN_PATH' - ;; - - uts4*) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec='-L$libdir' - hardcode_shlibpath_var=no - ;; - - dgux*) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec='-L$libdir' - hardcode_shlibpath_var=no - ;; - - sysv4*MP*) - if test -d /usr/nec; then - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_shlibpath_var=no - runpath_var=LD_RUN_PATH - hardcode_runpath_var=yes - ld_shlibs=yes - fi - ;; - - sysv4.2uw2*) - archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct=yes - hardcode_minus_L=no - hardcode_shlibpath_var=no - hardcode_runpath_var=yes - runpath_var=LD_RUN_PATH - ;; - - sysv5uw7* | unixware7*) - no_undefined_flag='${wl}-z ${wl}text' - if test "$GCC" = yes; then - archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - fi - runpath_var='LD_RUN_PATH' - hardcode_shlibpath_var=no - ;; - - *) - ld_shlibs=no - ;; - esac -fi -echo "$ac_t""$ld_shlibs" 1>&6 -test "$ld_shlibs" = no && can_build_shared=no - -# Check hardcoding attributes. -echo $ac_n "checking how to hardcode library paths into programs""... $ac_c" 1>&6 -echo "configure:3964: checking how to hardcode library paths into programs" >&5 -hardcode_action= -if test -n "$hardcode_libdir_flag_spec" || \ - test -n "$runpath_var"; then - - # We can hardcode non-existant directories. - if test "$hardcode_direct" != no && - # If the only mechanism to avoid hardcoding is shlibpath_var, we - # have to relink, otherwise we might link with an installed library - # when we should be linking with a yet-to-be-installed one - ## test "$hardcode_shlibpath_var" != no && - test "$hardcode_minus_L" != no; then - # Linking always hardcodes the temporary library directory. - hardcode_action=relink - else - # We can link without hardcoding, and we can hardcode nonexisting dirs. - hardcode_action=immediate - fi -else - # We cannot hardcode anything, or else we can only hardcode existing - # directories. - hardcode_action=unsupported -fi -echo "$ac_t""$hardcode_action" 1>&6 - -striplib= -old_striplib= -echo $ac_n "checking whether stripping libraries is possible""... $ac_c" 1>&6 -echo "configure:3992: checking whether stripping libraries is possible" >&5 -if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then - test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" - test -z "$striplib" && striplib="$STRIP --strip-unneeded" - echo "$ac_t""yes" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - -reload_cmds='$LD$reload_flag -o $output$reload_objs' -test -z "$deplibs_check_method" && deplibs_check_method=unknown - -# PORTME Fill in your ld.so characteristics -echo $ac_n "checking dynamic linker characteristics""... $ac_c" 1>&6 -echo "configure:4006: checking dynamic linker characteristics" >&5 -library_names_spec= -libname_spec='lib$name' -soname_spec= -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" -sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" - -case $host_os in -aix3*) - version_type=linux - library_names_spec='${libname}${release}.so$versuffix $libname.a' - shlibpath_var=LIBPATH - - # AIX has no versioning support, so we append a major version to the name. - soname_spec='${libname}${release}.so$major' - ;; - -aix4* | aix5*) - version_type=linux - if test "$host_cpu" = ia64; then - # AIX 5 supports IA64 - library_names_spec='${libname}${release}.so$major ${libname}${release}.so$versuffix $libname.so' - shlibpath_var=LD_LIBRARY_PATH - else - # With GCC up to 2.95.x, collect2 would create an import file - # for dependence libraries. The import file would start with - # the line `#! .'. This would cause the generated library to - # depend on `.', always an invalid library. This was fixed in - # development snapshots of GCC prior to 3.0. - case $host_os in - aix4 | aix4.[01] | aix4.[01].*) - if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' - echo ' yes ' - echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then - : - else - can_build_shared=no - fi - ;; - esac - # AIX (on Power*) has no versioning support, so currently we can not hardcode correct - # soname into executable. Probably we can add versioning support to - # collect2, so additional links can be useful in future. - if test "$aix_use_runtimelinking" = yes; then - # If using run time linking (on AIX 4.2 or later) use lib<name>.so instead of - # lib<name>.a to let people know that these are not typical AIX shared libraries. - library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' - else - # We preserve .a as extension for shared libraries through AIX4.2 - # and later when we are not doing run time linking. - library_names_spec='${libname}${release}.a $libname.a' - soname_spec='${libname}${release}.so$major' - fi - shlibpath_var=LIBPATH - deplibs_check_method=pass_all - fi - ;; - -amigaos*) - library_names_spec='$libname.ixlibrary $libname.a' - # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done' - ;; - -beos*) - library_names_spec='${libname}.so' - dynamic_linker="$host_os ld.so" - shlibpath_var=LIBRARY_PATH - ;; - -bsdi4*) - version_type=linux - need_version=no - library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' - soname_spec='${libname}${release}.so$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" - export_dynamic_flag_spec=-rdynamic - # the default ld.so.conf also contains /usr/contrib/lib and - # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow - # libtool to hard-code these into programs - ;; - -cygwin* | mingw* | pw32*) - version_type=windows - need_version=no - need_lib_prefix=no - case $GCC,$host_os in - yes,cygwin*) - library_names_spec='$libname.dll.a' - soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll' - postinstall_cmds='dlpath=`bash 2>&1 -c '\''. $dir/${file}i;echo \$dlname'\''`~ - dldir=$destdir/`dirname \$dlpath`~ - test -d \$dldir || mkdir -p \$dldir~ - $install_prog .libs/$dlname \$dldir/$dlname' - postuninstall_cmds='dldll=`bash 2>&1 -c '\''. $file; echo \$dlname'\''`~ - dlpath=$dir/\$dldll~ - $rm \$dlpath' - ;; - yes,mingw*) - library_names_spec='${libname}`echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll' - sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g"` - ;; - yes,pw32*) - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | sed -e 's/./-/g'`${versuffix}.dll' - ;; - *) - library_names_spec='${libname}`echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll $libname.lib' - ;; - esac - dynamic_linker='Win32 ld.exe' - # FIXME: first we should search . and the directory the executable is in - shlibpath_var=PATH - ;; - -darwin* | rhapsody*) - dynamic_linker="$host_os dyld" - version_type=darwin - need_lib_prefix=no - need_version=no - # FIXME: Relying on posixy $() will cause problems for - # cross-compilation, but unfortunately the echo tests do not - # yet detect zsh echo's removal of \ escapes. - library_names_spec='${libname}${release}${versuffix}.$(test .$module = .yes && echo so || echo dylib) ${libname}${release}${major}.$(test .$module = .yes && echo so || echo dylib) ${libname}.$(test .$module = .yes && echo so || echo dylib)' - soname_spec='${libname}${release}${major}.$(test .$module = .yes && echo so || echo dylib)' - shlibpath_overrides_runpath=yes - shlibpath_var=DYLD_LIBRARY_PATH - ;; - -freebsd1*) - dynamic_linker=no - ;; - -freebsd*) - objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` - version_type=freebsd-$objformat - case $version_type in - freebsd-elf*) - library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so' - need_version=no - need_lib_prefix=no - ;; - freebsd-*) - library_names_spec='${libname}${release}.so$versuffix $libname.so$versuffix' - need_version=yes - ;; - esac - shlibpath_var=LD_LIBRARY_PATH - case $host_os in - freebsd2*) - shlibpath_overrides_runpath=yes - ;; - *) - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - esac - ;; - -gnu*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so${major} ${libname}.so' - soname_spec='${libname}${release}.so$major' - shlibpath_var=LD_LIBRARY_PATH - hardcode_into_libs=yes - ;; - -hpux9* | hpux10* | hpux11*) - # Give a soname corresponding to the major version so that dld.sl refuses to - # link against other versions. - dynamic_linker="$host_os dld.sl" - version_type=sunos - need_lib_prefix=no - need_version=no - shlibpath_var=SHLIB_PATH - shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH - library_names_spec='${libname}${release}.sl$versuffix ${libname}${release}.sl$major $libname.sl' - soname_spec='${libname}${release}.sl$major' - # HP-UX runs *really* slowly unless shared libraries are mode 555. - postinstall_cmds='chmod 555 $lib' - ;; - -irix5* | irix6*) - version_type=irix - need_lib_prefix=no - need_version=no - soname_spec='${libname}${release}.so$major' - library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so $libname.so' - case $host_os in - irix5*) - libsuff= shlibsuff= +# The following way of writing the cache mishandles newlines in values, +# but we know of no workaround that is simple, portable, and efficient. +# So, don't put newlines in cache variables' values. +# Ultrix sh set writes to stderr and can't be redirected directly, +# and sets the high bit in the cache file unless we assign to the vars. +(set) 2>&1 | + case `(ac_space=' '; set | grep ac_space) 2>&1` in + *ac_space=\ *) + # `set' does not quote correctly, so add quotes (double-quote substitution + # turns \\\\ into \\, and sed turns \\ into \). + sed -n \ + -e "s/'/'\\\\''/g" \ + -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p" ;; *) - case $LD in # libtool.m4 will add one of these switches to LD - *-32|*"-32 ") libsuff= shlibsuff= libmagic=32-bit;; - *-n32|*"-n32 ") libsuff=32 shlibsuff=N32 libmagic=N32;; - *-64|*"-64 ") 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}" - ;; - -# No shared lib support for Linux oldld, aout, or coff. -linux-gnuoldld* | linux-gnuaout* | linux-gnucoff*) - dynamic_linker=no - ;; - -# This must be Linux ELF. -linux-gnu*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' - soname_spec='${libname}${release}.so$major' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - # This implies no fast_install, which is unacceptable. - # Some rework will be needed to allow for fast_install - # before this can be enabled. - hardcode_into_libs=yes - - # 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}.so$versuffix ${libname}.so$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - dynamic_linker='NetBSD (a.out) ld.so' - else - library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so' - soname_spec='${libname}${release}.so$major' - dynamic_linker='NetBSD ld.elf_so' - fi - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - -newsos6) - version_type=linux - library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - ;; - -openbsd*) - version_type=sunos - if test "$with_gnu_ld" = yes; then - need_lib_prefix=no - need_version=no - fi - library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH - ;; - -os2*) - libname_spec='$name' - need_lib_prefix=no - library_names_spec='$libname.dll $libname.a' - dynamic_linker='OS/2 ld.exe' - shlibpath_var=LIBPATH - ;; - -osf3* | osf4* | osf5*) - version_type=osf - need_version=no - soname_spec='${libname}${release}.so' - library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so' - 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" - ;; - -sco3.2v5*) - version_type=osf - soname_spec='${libname}${release}.so$major' - library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' - shlibpath_var=LD_LIBRARY_PATH - ;; - -solaris*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' - soname_spec='${libname}${release}.so$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}.so$versuffix ${libname}.so$versuffix' - finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - if test "$with_gnu_ld" = yes; then - need_lib_prefix=no - fi - need_version=yes - ;; - -sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) - version_type=linux - library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' - soname_spec='${libname}${release}.so$major' - shlibpath_var=LD_LIBRARY_PATH - case $host_vendor in - sni) - shlibpath_overrides_runpath=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 - ;; - -uts4*) - version_type=linux - library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' - soname_spec='${libname}${release}.so$major' - shlibpath_var=LD_LIBRARY_PATH - ;; - -dgux*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' - soname_spec='${libname}${release}.so$major' - shlibpath_var=LD_LIBRARY_PATH - ;; - -sysv4*MP*) - if test -d /usr/nec ;then - version_type=linux - library_names_spec='$libname.so.$versuffix $libname.so.$major $libname.so' - soname_spec='$libname.so.$major' - shlibpath_var=LD_LIBRARY_PATH - fi - ;; - -*) - dynamic_linker=no - ;; -esac -echo "$ac_t""$dynamic_linker" 1>&6 -test "$dynamic_linker" = no && can_build_shared=no - -# Report the final consequences. -echo $ac_n "checking if libtool supports shared libraries""... $ac_c" 1>&6 -echo "configure:4392: checking if libtool supports shared libraries" >&5 -echo "$ac_t""$can_build_shared" 1>&6 - -if test "$hardcode_action" = relink; then - # Fast installation is not supported - enable_fast_install=no -elif test "$shlibpath_overrides_runpath" = yes || - test "$enable_shared" = no; then - # Fast installation is not necessary - enable_fast_install=needless -fi - -variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; then - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -fi - -if test "x$enable_dlopen" != xyes; then - enable_dlopen=unknown - enable_dlopen_self=unknown - enable_dlopen_self_static=unknown -else - lt_cv_dlopen=no - lt_cv_dlopen_libs= - - case $host_os in - beos*) - lt_cv_dlopen="load_add_on" - lt_cv_dlopen_libs= - lt_cv_dlopen_self=yes + # `set' quotes correctly as required by POSIX, so do not add quotes. + sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p' ;; - - cygwin* | mingw* | pw32*) - lt_cv_dlopen="LoadLibrary" - lt_cv_dlopen_libs= - ;; - - *) - echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:4431: checking for dlopen in -ldl" >&5 -ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" -LIBS="-ldl $LIBS" -cat > conftest.$ac_ext <<EOF -#line 4439 "configure" -#include "confdefs.h" -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char dlopen(); - -int main() { -dlopen() -; return 0; } -EOF -if { (eval echo configure:4450: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" -else - echo "$ac_t""no" 1>&6 -echo $ac_n "checking for dlopen""... $ac_c" 1>&6 -echo "configure:4469: checking for dlopen" >&5 -if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext <<EOF -#line 4474 "configure" -#include "confdefs.h" -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char dlopen(); below. */ -#include <assert.h> -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char dlopen(); - -int main() { - -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_dlopen) || defined (__stub___dlopen) -choke me -#else -dlopen(); -#endif - -; return 0; } -EOF -if { (eval echo configure:4497: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_dlopen=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_dlopen=no" -fi -rm -f conftest* -fi - -if eval "test \"`echo '$ac_cv_func_'dlopen`\" = yes"; then - echo "$ac_t""yes" 1>&6 - lt_cv_dlopen="dlopen" -else - echo "$ac_t""no" 1>&6 -echo $ac_n "checking for shl_load""... $ac_c" 1>&6 -echo "configure:4515: checking for shl_load" >&5 -if eval "test \"`echo '$''{'ac_cv_func_shl_load'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext <<EOF -#line 4520 "configure" -#include "confdefs.h" -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char shl_load(); below. */ -#include <assert.h> -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char shl_load(); - -int main() { - -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_shl_load) || defined (__stub___shl_load) -choke me -#else -shl_load(); -#endif - -; return 0; } -EOF -if { (eval echo configure:4543: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_shl_load=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_shl_load=no" -fi -rm -f conftest* -fi - -if eval "test \"`echo '$ac_cv_func_'shl_load`\" = yes"; then - echo "$ac_t""yes" 1>&6 - lt_cv_dlopen="shl_load" -else - echo "$ac_t""no" 1>&6 -echo $ac_n "checking for dlopen in -lsvld""... $ac_c" 1>&6 -echo "configure:4561: checking for dlopen in -lsvld" >&5 -ac_lib_var=`echo svld'_'dlopen | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" -LIBS="-lsvld $LIBS" -cat > conftest.$ac_ext <<EOF -#line 4569 "configure" -#include "confdefs.h" -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char dlopen(); - -int main() { -dlopen() -; return 0; } -EOF -if { (eval echo configure:4580: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" -else - echo "$ac_t""no" 1>&6 -echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6 -echo "configure:4599: checking for shl_load in -ldld" >&5 -ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" -LIBS="-ldld $LIBS" -cat > conftest.$ac_ext <<EOF -#line 4607 "configure" -#include "confdefs.h" -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char shl_load(); - -int main() { -shl_load() -; return 0; } -EOF -if { (eval echo configure:4618: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld" + esac >> confcache +if cmp -s $cache_file confcache; then + : else - echo "$ac_t""no" 1>&6 -fi - - -fi - - -fi - - -fi - - -fi - - ;; - esac - - if test "x$lt_cv_dlopen" != xno; then - enable_dlopen=yes + if test -w $cache_file; then + echo "updating cache $cache_file" + cat confcache > $cache_file else - enable_dlopen=no - fi - - case $lt_cv_dlopen in - dlopen) - save_CPPFLAGS="$CPPFLAGS" - test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" - - save_LDFLAGS="$LDFLAGS" - eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" - - save_LIBS="$LIBS" - LIBS="$lt_cv_dlopen_libs $LIBS" - - echo $ac_n "checking whether a program can dlopen itself""... $ac_c" 1>&6 -echo "configure:4671: checking whether a program can dlopen itself" >&5 -if eval "test \"`echo '$''{'lt_cv_dlopen_self'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test "$cross_compiling" = yes; then : - lt_cv_dlopen_self=cross -else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<EOF -#line 4681 "configure" -#include "confdefs.h" - -#if HAVE_DLFCN_H -#include <dlfcn.h> -#endif - -#include <stdio.h> - -#ifdef RTLD_GLOBAL -# define LT_DLGLOBAL RTLD_GLOBAL -#else -# ifdef DL_GLOBAL -# define LT_DLGLOBAL DL_GLOBAL -# else -# define LT_DLGLOBAL 0 -# endif -#endif - -/* We may have to define LT_DLLAZY_OR_NOW in the command line if we - find out it does not work in some platform. */ -#ifndef LT_DLLAZY_OR_NOW -# ifdef RTLD_LAZY -# define LT_DLLAZY_OR_NOW RTLD_LAZY -# else -# ifdef DL_LAZY -# define LT_DLLAZY_OR_NOW DL_LAZY -# else -# ifdef RTLD_NOW -# define LT_DLLAZY_OR_NOW RTLD_NOW -# else -# ifdef DL_NOW -# define LT_DLLAZY_OR_NOW DL_NOW -# else -# define LT_DLLAZY_OR_NOW 0 -# endif -# endif -# endif -# endif -#endif - -#ifdef __cplusplus -extern "C" void exit (int); -#endif - -void fnord() { int i=42;} -int main () -{ - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); - int status = $lt_dlunknown; - - if (self) - { - if (dlsym (self,"fnord")) status = $lt_dlno_uscore; - else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; - /* dlclose (self); */ - } - - exit (status); -} -EOF - if { (eval echo configure:4742: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then - (./conftest; exit; ) 2>/dev/null - lt_status=$? - case x$lt_status in - x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;; - x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;; - x$lt_unknown|x*) lt_cv_dlopen_self=no ;; - esac - else : - # compilation failed - lt_cv_dlopen_self=no - fi -fi -rm -fr conftest* - - -fi - -echo "$ac_t""$lt_cv_dlopen_self" 1>&6 - - if test "x$lt_cv_dlopen_self" = xyes; then - LDFLAGS="$LDFLAGS $link_static_flag" - echo $ac_n "checking whether a statically linked program can dlopen itself""... $ac_c" 1>&6 -echo "configure:4765: checking whether a statically linked program can dlopen itself" >&5 -if eval "test \"`echo '$''{'lt_cv_dlopen_self_static'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test "$cross_compiling" = yes; then : - lt_cv_dlopen_self_static=cross -else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<EOF -#line 4775 "configure" -#include "confdefs.h" - -#if HAVE_DLFCN_H -#include <dlfcn.h> -#endif - -#include <stdio.h> - -#ifdef RTLD_GLOBAL -# define LT_DLGLOBAL RTLD_GLOBAL -#else -# ifdef DL_GLOBAL -# define LT_DLGLOBAL DL_GLOBAL -# else -# define LT_DLGLOBAL 0 -# endif -#endif - -/* We may have to define LT_DLLAZY_OR_NOW in the command line if we - find out it does not work in some platform. */ -#ifndef LT_DLLAZY_OR_NOW -# ifdef RTLD_LAZY -# define LT_DLLAZY_OR_NOW RTLD_LAZY -# else -# ifdef DL_LAZY -# define LT_DLLAZY_OR_NOW DL_LAZY -# else -# ifdef RTLD_NOW -# define LT_DLLAZY_OR_NOW RTLD_NOW -# else -# ifdef DL_NOW -# define LT_DLLAZY_OR_NOW DL_NOW -# else -# define LT_DLLAZY_OR_NOW 0 -# endif -# endif -# endif -# endif -#endif - -#ifdef __cplusplus -extern "C" void exit (int); -#endif - -void fnord() { int i=42;} -int main () -{ - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); - int status = $lt_dlunknown; - - if (self) - { - if (dlsym (self,"fnord")) status = $lt_dlno_uscore; - else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; - /* dlclose (self); */ - } - - exit (status); -} -EOF - if { (eval echo configure:4836: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then - (./conftest; exit; ) 2>/dev/null - lt_status=$? - case x$lt_status in - x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;; - x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;; - x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;; - esac - else : - # compilation failed - lt_cv_dlopen_self_static=no + echo "not updating unwritable cache $cache_file" fi fi -rm -fr conftest* - - -fi - -echo "$ac_t""$lt_cv_dlopen_self_static" 1>&6 - fi - - CPPFLAGS="$save_CPPFLAGS" - LDFLAGS="$save_LDFLAGS" - LIBS="$save_LIBS" - ;; - esac - - case $lt_cv_dlopen_self in - yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; - *) enable_dlopen_self=unknown ;; - esac - - case $lt_cv_dlopen_self_static in - yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; - *) enable_dlopen_self_static=unknown ;; - esac -fi - +rm -f confcache -if test "$enable_shared" = yes && test "$GCC" = yes; then - case $archive_cmds in - *'~'*) - # FIXME: we may have to deal with multi-command sequences. - ;; - '$CC '*) - # Test whether the compiler implicitly links with -lc since on some - # systems, -lgcc has to come before -lc. If gcc already passes -lc - # to ld, don't add -lc before -lgcc. - echo $ac_n "checking whether -lc should be explicitly linked in""... $ac_c" 1>&6 -echo "configure:4885: checking whether -lc should be explicitly linked in" >&5 - if eval "test \"`echo '$''{'lt_cv_archive_cmds_need_lc'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - $rm conftest* - echo 'static int dummy;' > conftest.$ac_ext - - if { (eval echo configure:4892: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - soname=conftest - lib=conftest - libobjs=conftest.$ac_objext - deplibs= - wl=$lt_cv_prog_cc_wl - compiler_flags=-v - linker_flags=-v - verstring= - output_objdir=. - libname=conftest - save_allow_undefined_flag=$allow_undefined_flag - allow_undefined_flag= - if { (eval echo configure:4905: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\") 1>&5; (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5; } - then - lt_cv_archive_cmds_need_lc=no - else - lt_cv_archive_cmds_need_lc=yes - fi - allow_undefined_flag=$save_allow_undefined_flag - else - cat conftest.err 1>&5 - fi -fi - echo "$ac_t""$lt_cv_archive_cmds_need_lc" 1>&6 - ;; - esac -fi -need_lc=${lt_cv_archive_cmds_need_lc-yes} +# Actually configure libtool. ac_aux_dir is where install-sh is found. +CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \ +LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \ +LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \ +DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \ +${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \ +$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $lt_target \ +|| { echo "configure: error: libtool configure failed" 1>&2; exit 1; } -# The second clause should only fire when bootstrapping the -# libtool distribution, otherwise you forgot to ship ltmain.sh -# with your package, and you will get complaints that there are -# no rules to generate ltmain.sh. -if test -f "$ltmain"; then - : +# Reload cache, that may have been modified by ltconfig +if test -r "$cache_file"; then + echo "loading cache $cache_file" + . $cache_file else - # If there is no Makefile yet, we rely on a make rule to execute - # `config.status --recheck' to rerun these tests and create the - # libtool script then. - test -f Makefile && make "$ltmain" -fi - -if test -f "$ltmain"; then - trap "$rm \"${ofile}T\"; exit 1" 1 2 15 - $rm -f "${ofile}T" - - echo creating $ofile - - # Now quote all the things that may contain metacharacters while being - # careful not to overquote the AC_SUBSTed values. We take copies of the - # variables and quote the copies for generation of the libtool script. - for var in echo old_CC old_CFLAGS \ - AR AR_FLAGS CC LD LN_S NM SHELL \ - reload_flag reload_cmds wl \ - pic_flag link_static_flag no_builtin_flag export_dynamic_flag_spec \ - thread_safe_flag_spec whole_archive_flag_spec libname_spec \ - library_names_spec soname_spec \ - RANLIB old_archive_cmds old_archive_from_new_cmds old_postinstall_cmds \ - old_postuninstall_cmds archive_cmds archive_expsym_cmds postinstall_cmds \ - postuninstall_cmds extract_expsyms_cmds old_archive_from_expsyms_cmds \ - old_striplib striplib file_magic_cmd export_symbols_cmds \ - deplibs_check_method allow_undefined_flag no_undefined_flag \ - finish_cmds finish_eval global_symbol_pipe global_symbol_to_cdecl \ - hardcode_libdir_flag_spec hardcode_libdir_separator \ - sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ - compiler_c_o compiler_o_lo need_locks exclude_expsyms include_expsyms; do - - case $var in - reload_cmds | old_archive_cmds | old_archive_from_new_cmds | \ - old_postinstall_cmds | old_postuninstall_cmds | \ - export_symbols_cmds | archive_cmds | archive_expsym_cmds | \ - extract_expsyms_cmds | old_archive_from_expsyms_cmds | \ - postinstall_cmds | postuninstall_cmds | \ - finish_cmds | sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) - # Double-quote double-evaled strings. - eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" - ;; - *) - eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" - ;; - esac - done - - cat <<__EOF__ > "${ofile}T" -#! $SHELL - -# `$echo "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. -# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP) -# NOTE: Changes made to this file will be lost: look at ltmain.sh. -# -# Copyright (C) 1996-2000 Free Software Foundation, Inc. -# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# Sed that helps us avoid accidentally triggering echo(1) options like -n. -Xsed="sed -e s/^X//" - -# The HP-UX ksh and POSIX shell print the target directory to stdout -# if CDPATH is set. -if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi - -# ### BEGIN LIBTOOL CONFIG - -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: - -# Shell to use when invoking shell scripts. -SHELL=$lt_SHELL - -# Whether or not to build shared libraries. -build_libtool_libs=$enable_shared - -# Whether or not to add -lc for building shared libraries. -build_libtool_need_lc=$need_lc - -# Whether or not to build static libraries. -build_old_libs=$enable_static - -# Whether or not to optimize for fast installation. -fast_install=$enable_fast_install - -# The host system. -host_alias=$host_alias -host=$host - -# An echo program that does not interpret backslashes. -echo=$lt_echo - -# The archiver. -AR=$lt_AR -AR_FLAGS=$lt_AR_FLAGS - -# The default C compiler. -CC=$lt_CC - -# Is the compiler the GNU C compiler? -with_gcc=$GCC - -# The linker used to build libraries. -LD=$lt_LD - -# Whether we need hard or soft links. -LN_S=$lt_LN_S - -# A BSD-compatible nm program. -NM=$lt_NM - -# A symbol stripping program -STRIP=$STRIP - -# Used to examine libraries when file_magic_cmd begins "file" -MAGIC_CMD=$MAGIC_CMD - -# Used on cygwin: DLL creation program. -DLLTOOL="$DLLTOOL" - -# Used on cygwin: object dumper. -OBJDUMP="$OBJDUMP" - -# Used on cygwin: assembler. -AS="$AS" - -# The name of the directory that contains temporary libtool files. -objdir=$objdir - -# How to create reloadable object files. -reload_flag=$lt_reload_flag -reload_cmds=$lt_reload_cmds - -# How to pass a linker flag through the compiler. -wl=$lt_wl - -# Object file suffix (normally "o"). -objext="$ac_objext" - -# Old archive suffix (normally "a"). -libext="$libext" - -# Executable file suffix (normally ""). -exeext="$exeext" - -# Additional compiler flags for building library objects. -pic_flag=$lt_pic_flag -pic_mode=$pic_mode - -# Does compiler simultaneously support -c and -o options? -compiler_c_o=$lt_compiler_c_o - -# Can we write directly to a .lo ? -compiler_o_lo=$lt_compiler_o_lo - -# Must we lock files when doing compilation ? -need_locks=$lt_need_locks - -# Do we need the lib prefix for modules? -need_lib_prefix=$need_lib_prefix - -# Do we need a version for libraries? -need_version=$need_version - -# Whether dlopen is supported. -dlopen_support=$enable_dlopen - -# Whether dlopen of programs is supported. -dlopen_self=$enable_dlopen_self - -# Whether dlopen of statically linked programs is supported. -dlopen_self_static=$enable_dlopen_self_static - -# Compiler flag to prevent dynamic linking. -link_static_flag=$lt_link_static_flag - -# Compiler flag to turn off builtin functions. -no_builtin_flag=$lt_no_builtin_flag - -# Compiler flag to allow reflexive dlopens. -export_dynamic_flag_spec=$lt_export_dynamic_flag_spec - -# Compiler flag to generate shared objects directly from archives. -whole_archive_flag_spec=$lt_whole_archive_flag_spec - -# Compiler flag to generate thread-safe objects. -thread_safe_flag_spec=$lt_thread_safe_flag_spec - -# Library versioning type. -version_type=$version_type - -# Format of library name prefix. -libname_spec=$lt_libname_spec - -# List of archive names. First name is the real one, the rest are links. -# The last name is the one that the linker finds with -lNAME. -library_names_spec=$lt_library_names_spec - -# The coded name of the library, if different from the real name. -soname_spec=$lt_soname_spec - -# Commands used to build and install an old-style archive. -RANLIB=$lt_RANLIB -old_archive_cmds=$lt_old_archive_cmds -old_postinstall_cmds=$lt_old_postinstall_cmds -old_postuninstall_cmds=$lt_old_postuninstall_cmds - -# Create an old-style archive from a shared archive. -old_archive_from_new_cmds=$lt_old_archive_from_new_cmds - -# Create a temporary old-style archive to link instead of a shared archive. -old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds - -# Commands used to build and install a shared archive. -archive_cmds=$lt_archive_cmds -archive_expsym_cmds=$lt_archive_expsym_cmds -postinstall_cmds=$lt_postinstall_cmds -postuninstall_cmds=$lt_postuninstall_cmds - -# Commands to strip libraries. -old_striplib=$lt_old_striplib -striplib=$lt_striplib - -# Method to check whether dependent libraries are shared objects. -deplibs_check_method=$lt_deplibs_check_method - -# Command to use when deplibs_check_method == file_magic. -file_magic_cmd=$lt_file_magic_cmd - -# Flag that allows shared libraries with undefined symbols to be built. -allow_undefined_flag=$lt_allow_undefined_flag - -# Flag that forces no undefined symbols. -no_undefined_flag=$lt_no_undefined_flag - -# Commands used to finish a libtool library installation in a directory. -finish_cmds=$lt_finish_cmds - -# Same as above, but a single script fragment to be evaled but not shown. -finish_eval=$lt_finish_eval - -# Take the output of nm and produce a listing of raw symbols and C names. -global_symbol_pipe=$lt_global_symbol_pipe - -# Transform the output of nm in a proper C declaration -global_symbol_to_cdecl=$lt_global_symbol_to_cdecl - -# This is the shared library runtime path variable. -runpath_var=$runpath_var - -# This is the shared library path variable. -shlibpath_var=$shlibpath_var - -# Is shlibpath searched before the hard-coded library search path? -shlibpath_overrides_runpath=$shlibpath_overrides_runpath - -# How to hardcode a shared library path into an executable. -hardcode_action=$hardcode_action - -# Whether we should hardcode library paths into libraries. -hardcode_into_libs=$hardcode_into_libs - -# Flag to hardcode \$libdir into a binary during linking. -# This must work even if \$libdir does not exist. -hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec - -# Whether we need a single -rpath flag with a separated argument. -hardcode_libdir_separator=$lt_hardcode_libdir_separator - -# Set to yes if using DIR/libNAME.so during linking hardcodes DIR into the -# resulting binary. -hardcode_direct=$hardcode_direct - -# Set to yes if using the -LDIR flag during linking hardcodes DIR into the -# resulting binary. -hardcode_minus_L=$hardcode_minus_L - -# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into -# the resulting binary. -hardcode_shlibpath_var=$hardcode_shlibpath_var - -# Variables whose values should be saved in libtool wrapper scripts and -# restored at relink time. -variables_saved_for_relink="$variables_saved_for_relink" - -# Whether libtool must link a program against all its dependency libraries. -link_all_deplibs=$link_all_deplibs - -# Compile-time system search path for libraries -sys_lib_search_path_spec=$lt_sys_lib_search_path_spec - -# Run-time system search path for libraries -sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec - -# Fix the shell variable \$srcfile for the compiler. -fix_srcfile_path="$fix_srcfile_path" - -# Set to yes if exported symbols are required. -always_export_symbols=$always_export_symbols - -# The commands to list exported symbols. -export_symbols_cmds=$lt_export_symbols_cmds - -# The commands to extract the exported symbol list from a shared archive. -extract_expsyms_cmds=$lt_extract_expsyms_cmds - -# Symbols that should not be listed in the preloaded symbols. -exclude_expsyms=$lt_exclude_expsyms - -# Symbols that must always be exported. -include_expsyms=$lt_include_expsyms - -# ### END LIBTOOL CONFIG - -__EOF__ - - case $host_os in - aix3*) - cat <<\EOF >> "${ofile}T" - -# AIX sometimes has problems with the GCC collect2 program. For some -# reason, if we set the COLLECT_NAMES environment variable, the problems -# vanish in a puff of smoke. -if test "X${COLLECT_NAMES+set}" != Xset; then - COLLECT_NAMES= - export COLLECT_NAMES -fi -EOF - ;; - esac - - case $host_os in - cygwin* | mingw* | pw32* | os2*) - cat <<'EOF' >> "${ofile}T" - # This is a source program that is used to create dlls on Windows - # Don't remove nor modify the starting and closing comments -# /* ltdll.c starts here */ -# #define WIN32_LEAN_AND_MEAN -# #include <windows.h> -# #undef WIN32_LEAN_AND_MEAN -# #include <stdio.h> -# -# #ifndef __CYGWIN__ -# # ifdef __CYGWIN32__ -# # define __CYGWIN__ __CYGWIN32__ -# # endif -# #endif -# -# #ifdef __cplusplus -# extern "C" { -# #endif -# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved); -# #ifdef __cplusplus -# } -# #endif -# -# #ifdef __CYGWIN__ -# #include <cygwin/cygwin_dll.h> -# DECLARE_CYGWIN_DLL( DllMain ); -# #endif -# HINSTANCE __hDllInstance_base; -# -# BOOL APIENTRY -# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved) -# { -# __hDllInstance_base = hInst; -# return TRUE; -# } -# /* ltdll.c ends here */ - # This is a source program that is used to create import libraries - # on Windows for dlls which lack them. Don't remove nor modify the - # starting and closing comments -# /* impgen.c starts here */ -# /* Copyright (C) 1999-2000 Free Software Foundation, Inc. -# -# This file is part of GNU libtool. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# */ -# -# #include <stdio.h> /* for printf() */ -# #include <unistd.h> /* for open(), lseek(), read() */ -# #include <fcntl.h> /* for O_RDONLY, O_BINARY */ -# #include <string.h> /* for strdup() */ -# -# /* O_BINARY isn't required (or even defined sometimes) under Unix */ -# #ifndef O_BINARY -# #define O_BINARY 0 -# #endif -# -# static unsigned int -# pe_get16 (fd, offset) -# int fd; -# int offset; -# { -# unsigned char b[2]; -# lseek (fd, offset, SEEK_SET); -# read (fd, b, 2); -# return b[0] + (b[1]<<8); -# } -# -# static unsigned int -# pe_get32 (fd, offset) -# int fd; -# int offset; -# { -# unsigned char b[4]; -# lseek (fd, offset, SEEK_SET); -# read (fd, b, 4); -# return b[0] + (b[1]<<8) + (b[2]<<16) + (b[3]<<24); -# } -# -# static unsigned int -# pe_as32 (ptr) -# void *ptr; -# { -# unsigned char *b = ptr; -# return b[0] + (b[1]<<8) + (b[2]<<16) + (b[3]<<24); -# } -# -# int -# main (argc, argv) -# int argc; -# char *argv[]; -# { -# int dll; -# unsigned long pe_header_offset, opthdr_ofs, num_entries, i; -# unsigned long export_rva, export_size, nsections, secptr, expptr; -# unsigned long name_rvas, nexp; -# unsigned char *expdata, *erva; -# char *filename, *dll_name; -# -# filename = argv[1]; -# -# dll = open(filename, O_RDONLY|O_BINARY); -# if (dll < 1) -# return 1; -# -# dll_name = filename; -# -# for (i=0; filename[i]; i++) -# if (filename[i] == '/' || filename[i] == '\\' || filename[i] == ':') -# dll_name = filename + i +1; -# -# pe_header_offset = pe_get32 (dll, 0x3c); -# opthdr_ofs = pe_header_offset + 4 + 20; -# num_entries = pe_get32 (dll, opthdr_ofs + 92); -# -# if (num_entries < 1) /* no exports */ -# return 1; -# -# export_rva = pe_get32 (dll, opthdr_ofs + 96); -# export_size = pe_get32 (dll, opthdr_ofs + 100); -# nsections = pe_get16 (dll, pe_header_offset + 4 +2); -# secptr = (pe_header_offset + 4 + 20 + -# pe_get16 (dll, pe_header_offset + 4 + 16)); -# -# expptr = 0; -# for (i = 0; i < nsections; i++) -# { -# char sname[8]; -# unsigned long secptr1 = secptr + 40 * i; -# unsigned long vaddr = pe_get32 (dll, secptr1 + 12); -# unsigned long vsize = pe_get32 (dll, secptr1 + 16); -# unsigned long fptr = pe_get32 (dll, secptr1 + 20); -# lseek(dll, secptr1, SEEK_SET); -# read(dll, sname, 8); -# if (vaddr <= export_rva && vaddr+vsize > export_rva) -# { -# expptr = fptr + (export_rva - vaddr); -# if (export_rva + export_size > vaddr + vsize) -# export_size = vsize - (export_rva - vaddr); -# break; -# } -# } -# -# expdata = (unsigned char*)malloc(export_size); -# lseek (dll, expptr, SEEK_SET); -# read (dll, expdata, export_size); -# erva = expdata - export_rva; -# -# nexp = pe_as32 (expdata+24); -# name_rvas = pe_as32 (expdata+32); -# -# printf ("EXPORTS\n"); -# for (i = 0; i<nexp; i++) -# { -# unsigned long name_rva = pe_as32 (erva+name_rvas+i*4); -# printf ("\t%s @ %ld ;\n", erva+name_rva, 1+ i); -# } -# -# return 0; -# } -# /* impgen.c ends here */ - -EOF - ;; - esac - - # We use sed instead of cat because bash on DJGPP gets confused if - # if finds mixed CR/LF and LF-only lines. Since sed operates in - # text mode, it properly converts lines to CR/LF. This bash problem - # is reportedly fixed, but why not run on old versions too? - sed '$q' "$ltmain" >> "${ofile}T" || (rm -f "${ofile}T"; exit 1) - - mv -f "${ofile}T" "$ofile" || \ - (rm -f "$ofile" && cp "${ofile}T" "$ofile" && rm -f "${ofile}T") - chmod +x "$ofile" + echo "creating cache $cache_file" + > $cache_file fi - - - # This can be used to rebuild libtool when needed -LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" +LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh" # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' -# Prevent multiple expansion - +# Redirect the config.log output again, so that the ltconfig log is not +# clobbered by the next message. +exec 5>>./config.log echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:5485: checking for inline" >&5 +echo "configure:1906: checking for inline" >&5 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <<EOF -#line 5492 "configure" +#line 1913 "configure" #include "confdefs.h" int main() { } $ac_kw foo() { ; return 0; } EOF -if { (eval echo configure:5499: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1920: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -5523,13 +1944,13 @@ esac if test "$ac_cv_prog_gcc" != yes; then echo $ac_n "checking whether we are using Sun Workshop C""... $ac_c" 1>&6 -echo "configure:5527: checking whether we are using Sun Workshop C" >&5 +echo "configure:1948: checking whether we are using Sun Workshop C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_SUNPRO_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5533 "configure" +#line 1954 "configure" #include "confdefs.h" #ifdef __SUNPRO_C @@ -5553,13 +1974,13 @@ fi echo "$ac_t""$ac_cv_prog_SUNPRO_CC" 1>&6 if test "$ac_cv_prog_SUNPRO_CC" != yes; then echo $ac_n "checking whether we are using Compaq's C compiler""... $ac_c" 1>&6 -echo "configure:5557: checking whether we are using Compaq's C compiler" >&5 +echo "configure:1978: checking whether we are using Compaq's C compiler" >&5 if eval "test \"`echo '$''{'ac_cv_prog_DECC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5563 "configure" +#line 1984 "configure" #include "confdefs.h" #ifdef __DECC @@ -5635,7 +2056,7 @@ if test "$ac_with_javaglue" = yes ; then # Extract the first word of "java", so it can be a program name with args. set dummy java; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5639: checking for $ac_word" >&5 +echo "configure:2060: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_ac_cv_have_java'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5666,7 +2087,7 @@ fi # Extract the first word of "javac", so it can be a program name with args. set dummy javac; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5670: checking for $ac_word" >&5 +echo "configure:2091: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_ac_cv_have_javac'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5695,7 +2116,7 @@ fi if test "$ac_cv_have_javac" = yes; then echo $ac_n "checking for java native interface headers""... $ac_c" 1>&6 -echo "configure:5699: checking for java native interface headers" >&5 +echo "configure:2120: checking for java native interface headers" >&5 if eval "test \"`echo '$''{'ac_cv_java_include'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5718,7 +2139,13 @@ EOF if test -d "$ac_cv_java_include" ; then ac_cv_java_headers=yes else - ac_cv_java_include="$java_home"/../include + case $target_os in + darwin*) + ac_cv_java_include="$java_home"/../../../Headers + ;; + *) + ac_cv_java_include="$java_home"/../include + esac if test -d "$ac_cv_java_include" ; then ac_cv_java_headers=yes else @@ -5803,12 +2230,12 @@ fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:5807: checking for working const" >&5 +echo "configure:2234: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5812 "configure" +#line 2239 "configure" #include "confdefs.h" int main() { @@ -5857,7 +2284,7 @@ ccp = (char const *const *) p; ; return 0; } EOF -if { (eval echo configure:5861: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2288: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -5878,12 +2305,12 @@ EOF fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:5882: checking for ANSI C header files" >&5 +echo "configure:2309: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5887 "configure" +#line 2314 "configure" #include "confdefs.h" #include <stdlib.h> #include <stdarg.h> @@ -5891,7 +2318,7 @@ else #include <float.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5895: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2322: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5908,7 +2335,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 5912 "configure" +#line 2339 "configure" #include "confdefs.h" #include <string.h> EOF @@ -5926,7 +2353,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 5930 "configure" +#line 2357 "configure" #include "confdefs.h" #include <stdlib.h> EOF @@ -5947,7 +2374,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext <<EOF -#line 5951 "configure" +#line 2378 "configure" #include "confdefs.h" #include <ctype.h> #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -5958,7 +2385,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:5962: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2389: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -5982,12 +2409,12 @@ EOF fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:5986: checking for size_t" >&5 +echo "configure:2413: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5991 "configure" +#line 2418 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -6016,7 +2443,7 @@ fi echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 -echo "configure:6020: checking for 8-bit clean memcmp" >&5 +echo "configure:2447: checking for 8-bit clean memcmp" >&5 if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6024,7 +2451,7 @@ else ac_cv_func_memcmp_clean=no else cat > conftest.$ac_ext <<EOF -#line 6028 "configure" +#line 2455 "configure" #include "confdefs.h" main() @@ -6034,7 +2461,7 @@ main() } EOF -if { (eval echo configure:6038: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2465: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_memcmp_clean=yes else @@ -6056,17 +2483,17 @@ for ac_hdr in errno.h string.h ctype.h stdlib.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6060: checking for $ac_hdr" >&5 +echo "configure:2487: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6065 "configure" +#line 2492 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6070: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2497: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6096,17 +2523,17 @@ for ac_hdr in unistd.h fcntl.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6100: checking for $ac_hdr" >&5 +echo "configure:2527: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6105 "configure" +#line 2532 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6110: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2537: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6136,17 +2563,17 @@ for ac_hdr in sys/types.h sys/stat.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6140: checking for $ac_hdr" >&5 +echo "configure:2567: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6145 "configure" +#line 2572 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6150: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2577: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6176,17 +2603,17 @@ for ac_hdr in termio.h termios.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6180: checking for $ac_hdr" >&5 +echo "configure:2607: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6185 "configure" +#line 2612 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6190: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2617: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6216,17 +2643,17 @@ for ac_hdr in sys/audioio.h sys/ioctl.h sys/soundcard.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6220: checking for $ac_hdr" >&5 +echo "configure:2647: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6225 "configure" +#line 2652 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6230: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2657: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6257,17 +2684,17 @@ for ac_hdr in time.h sys/time.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6261: checking for $ac_hdr" >&5 +echo "configure:2688: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6266 "configure" +#line 2693 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6271: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2698: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6295,12 +2722,12 @@ done if test "$ac_cv_header_sys_time_h" = yes; then echo $ac_n "checking for gettimeofday""... $ac_c" 1>&6 -echo "configure:6299: checking for gettimeofday" >&5 +echo "configure:2726: checking for gettimeofday" >&5 if eval "test \"`echo '$''{'ac_cv_func_gettimeofday'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6304 "configure" +#line 2731 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char gettimeofday(); below. */ @@ -6323,7 +2750,7 @@ gettimeofday(); ; return 0; } EOF -if { (eval echo configure:6327: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2754: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gettimeofday=yes" else @@ -6348,12 +2775,12 @@ else fi echo $ac_n "checking for gethrtime""... $ac_c" 1>&6 -echo "configure:6352: checking for gethrtime" >&5 +echo "configure:2779: checking for gethrtime" >&5 if eval "test \"`echo '$''{'ac_cv_func_gethrtime'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6357 "configure" +#line 2784 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char gethrtime(); below. */ @@ -6376,7 +2803,7 @@ gethrtime(); ; return 0; } EOF -if { (eval echo configure:6380: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2807: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gethrtime=yes" else @@ -6415,17 +2842,17 @@ EOF do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6419: checking for $ac_hdr" >&5 +echo "configure:2846: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6424 "configure" +#line 2851 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6429: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2856: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6453,21 +2880,21 @@ done if test "$ac_cv_header_thread_h" = yes; then echo $ac_n "checking for -lthread""... $ac_c" 1>&6 -echo "configure:6457: checking for -lthread" >&5 +echo "configure:2884: checking for -lthread" >&5 if eval "test \"`echo '$''{'ac_cv_lib_thread'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" LIBS="-lthread $LIBS" cat > conftest.$ac_ext <<EOF -#line 6464 "configure" +#line 2891 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:6471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2898: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_lib_thread=yes else @@ -6492,21 +2919,21 @@ fi elif test "$ac_cv_header_pthread_h" = yes; then echo $ac_n "checking for -lpthread""... $ac_c" 1>&6 -echo "configure:6496: checking for -lpthread" >&5 +echo "configure:2923: checking for -lpthread" >&5 if eval "test \"`echo '$''{'ac_cv_lib_pthread'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" LIBS="-lpthread $LIBS" cat > conftest.$ac_ext <<EOF -#line 6503 "configure" +#line 2930 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:6510: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2937: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_lib_pthread=yes else @@ -6543,17 +2970,17 @@ EOF do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6547: checking for $ac_hdr" >&5 +echo "configure:2974: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6552 "configure" +#line 2979 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6557: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2984: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6582,14 +3009,14 @@ done if test "$ac_cv_header_aio_h" = yes; then echo $ac_n "checking for library containing aio_read""... $ac_c" 1>&6 -echo "configure:6586: checking for library containing aio_read" >&5 +echo "configure:3013: checking for library containing aio_read" >&5 if eval "test \"`echo '$''{'ac_cv_search_aio_read'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_func_search_save_LIBS="$LIBS" ac_cv_search_aio_read="no" cat > conftest.$ac_ext <<EOF -#line 6593 "configure" +#line 3020 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -6600,7 +3027,7 @@ int main() { aio_read() ; return 0; } EOF -if { (eval echo configure:6604: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3031: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_search_aio_read="none required" else @@ -6611,7 +3038,7 @@ rm -f conftest* test "$ac_cv_search_aio_read" = "no" && for i in c rt aio posix4; do LIBS="-l$i $ac_func_search_save_LIBS" cat > conftest.$ac_ext <<EOF -#line 6615 "configure" +#line 3042 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -6622,7 +3049,7 @@ int main() { aio_read() ; return 0; } EOF -if { (eval echo configure:6626: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3053: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_search_aio_read="-l$i" break @@ -6645,7 +3072,7 @@ else : fi echo $ac_n "checking whether aio works""... $ac_c" 1>&6 -echo "configure:6649: checking whether aio works" >&5 +echo "configure:3076: checking whether aio works" >&5 if eval "test \"`echo '$''{'ac_cv_have_working_aio'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6657,7 +3084,7 @@ EOF { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <<EOF -#line 6661 "configure" +#line 3088 "configure" #include "confdefs.h" #if HAVE_ERRNO_H @@ -6730,7 +3157,7 @@ main() } EOF -if { (eval echo configure:6734: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3161: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_have_working_aio=yes else @@ -6761,17 +3188,17 @@ EOF do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6765: checking for $ac_hdr" >&5 +echo "configure:3192: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6770 "configure" +#line 3197 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6775: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3202: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6798,21 +3225,21 @@ fi done echo $ac_n "checking for -lmtmalloc""... $ac_c" 1>&6 -echo "configure:6802: checking for -lmtmalloc" >&5 +echo "configure:3229: checking for -lmtmalloc" >&5 if eval "test \"`echo '$''{'ac_cv_lib_mtmalloc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" LIBS="-lmtmalloc $LIBS" cat > conftest.$ac_ext <<EOF -#line 6809 "configure" +#line 3236 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:6816: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3243: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_lib_mtmalloc=yes else @@ -6908,7 +3335,7 @@ if test "$ac_enable_debug" = yes; then fi else if test "$ac_cv_prog_gcc" = yes; then - CFLAGS="$CFLAGS -O3 -g" + CFLAGS="$CFLAGS -O3" if test "$ac_enable_optimized" = yes; then case $target_cpu in # This switch makes the mp32 routines slower by about 10%, so it's disabled @@ -6928,7 +3355,7 @@ else CFLAGS="$CFLAGS -mpentium -march=pentium -fomit-frame-pointer" ;; i686) - CFLAGS="$CFLAGS -mpentiumpro -march=pentiumpro -fomit-frame-pointer" + CFLAGS="$CFLAGS -mpentiumpro -march=pentiumpro -fomit-frame-pointer" ;; sparcv8) CFLAGS="$CFLAGS -mv8" @@ -7004,6 +3431,8 @@ if test "$ac_with_javaglue" = yes ; then cygwin*) CFLAGS="$CFLAGS -I$ac_cv_java_include"/win32 ;; + darwin*) + ;; linux*) CFLAGS="$CFLAGS -I$ac_cv_java_include"/linux ;; @@ -7020,14 +3449,14 @@ if test "$ac_with_javaglue" = yes ; then fi echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:7024: checking whether byte ordering is bigendian" >&5 +echo "configure:3453: checking whether byte ordering is bigendian" >&5 if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_bigendian=unknown # See if sys/param.h defines the BYTE_ORDER macro. cat > conftest.$ac_ext <<EOF -#line 7031 "configure" +#line 3460 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/param.h> @@ -7038,11 +3467,11 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:7042: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3471: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* # It does; now see whether it defined to BIG_ENDIAN or not. cat > conftest.$ac_ext <<EOF -#line 7046 "configure" +#line 3475 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/param.h> @@ -7053,7 +3482,7 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:7057: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3486: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_bigendian=yes else @@ -7073,7 +3502,7 @@ if test "$cross_compiling" = yes; then { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <<EOF -#line 7077 "configure" +#line 3506 "configure" #include "confdefs.h" main () { /* Are we little or big endian? From Harbison&Steele. */ @@ -7086,7 +3515,7 @@ main () { exit (u.c[sizeof (long) - 1] == 1); } EOF -if { (eval echo configure:7090: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3519: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_bigendian=no else @@ -7111,7 +3540,7 @@ fi echo $ac_n "checking size of char""... $ac_c" 1>&6 -echo "configure:7115: checking size of char" >&5 +echo "configure:3544: checking size of char" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_char'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7119,18 +3548,18 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <<EOF -#line 7123 "configure" +#line 3552 "configure" #include "confdefs.h" #include <stdio.h> -int main() +main() { FILE *f=fopen("conftestval", "w"); - if (!f) return(1); + if (!f) exit(1); fprintf(f, "%d\n", sizeof(char)); - return(0); + exit(0); } EOF -if { (eval echo configure:7134: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3563: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_char=`cat conftestval` else @@ -7150,7 +3579,7 @@ EOF echo $ac_n "checking size of unsigned char""... $ac_c" 1>&6 -echo "configure:7154: checking size of unsigned char" >&5 +echo "configure:3583: checking size of unsigned char" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_unsigned_char'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7158,18 +3587,18 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <<EOF -#line 7162 "configure" +#line 3591 "configure" #include "confdefs.h" #include <stdio.h> -int main() +main() { FILE *f=fopen("conftestval", "w"); - if (!f) return(1); + if (!f) exit(1); fprintf(f, "%d\n", sizeof(unsigned char)); - return(0); + exit(0); } EOF -if { (eval echo configure:7173: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3602: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_unsigned_char=`cat conftestval` else @@ -7206,7 +3635,7 @@ else fi echo $ac_n "checking size of short""... $ac_c" 1>&6 -echo "configure:7210: checking size of short" >&5 +echo "configure:3639: checking size of short" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7214,18 +3643,18 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <<EOF -#line 7218 "configure" +#line 3647 "configure" #include "confdefs.h" #include <stdio.h> -int main() +main() { FILE *f=fopen("conftestval", "w"); - if (!f) return(1); + if (!f) exit(1); fprintf(f, "%d\n", sizeof(short)); - return(0); + exit(0); } EOF -if { (eval echo configure:7229: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3658: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_short=`cat conftestval` else @@ -7245,7 +3674,7 @@ EOF echo $ac_n "checking size of unsigned short""... $ac_c" 1>&6 -echo "configure:7249: checking size of unsigned short" >&5 +echo "configure:3678: checking size of unsigned short" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_unsigned_short'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7253,18 +3682,18 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <<EOF -#line 7257 "configure" +#line 3686 "configure" #include "confdefs.h" #include <stdio.h> -int main() +main() { FILE *f=fopen("conftestval", "w"); - if (!f) return(1); + if (!f) exit(1); fprintf(f, "%d\n", sizeof(unsigned short)); - return(0); + exit(0); } EOF -if { (eval echo configure:7268: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3697: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_unsigned_short=`cat conftestval` else @@ -7301,7 +3730,7 @@ else fi echo $ac_n "checking size of int""... $ac_c" 1>&6 -echo "configure:7305: checking size of int" >&5 +echo "configure:3734: checking size of int" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7309,18 +3738,18 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <<EOF -#line 7313 "configure" +#line 3742 "configure" #include "confdefs.h" #include <stdio.h> -int main() +main() { FILE *f=fopen("conftestval", "w"); - if (!f) return(1); + if (!f) exit(1); fprintf(f, "%d\n", sizeof(int)); - return(0); + exit(0); } EOF -if { (eval echo configure:7324: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3753: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_int=`cat conftestval` else @@ -7340,7 +3769,7 @@ EOF echo $ac_n "checking size of unsigned int""... $ac_c" 1>&6 -echo "configure:7344: checking size of unsigned int" >&5 +echo "configure:3773: checking size of unsigned int" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_unsigned_int'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7348,18 +3777,18 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <<EOF -#line 7352 "configure" +#line 3781 "configure" #include "confdefs.h" #include <stdio.h> -int main() +main() { FILE *f=fopen("conftestval", "w"); - if (!f) return(1); + if (!f) exit(1); fprintf(f, "%d\n", sizeof(unsigned int)); - return(0); + exit(0); } EOF -if { (eval echo configure:7363: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3792: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_unsigned_int=`cat conftestval` else @@ -7379,7 +3808,7 @@ EOF echo $ac_n "checking size of long""... $ac_c" 1>&6 -echo "configure:7383: checking size of long" >&5 +echo "configure:3812: checking size of long" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7387,18 +3816,18 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <<EOF -#line 7391 "configure" +#line 3820 "configure" #include "confdefs.h" #include <stdio.h> -int main() +main() { FILE *f=fopen("conftestval", "w"); - if (!f) return(1); + if (!f) exit(1); fprintf(f, "%d\n", sizeof(long)); - return(0); + exit(0); } EOF -if { (eval echo configure:7402: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3831: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_long=`cat conftestval` else @@ -7418,7 +3847,7 @@ EOF echo $ac_n "checking size of unsigned long""... $ac_c" 1>&6 -echo "configure:7422: checking size of unsigned long" >&5 +echo "configure:3851: checking size of unsigned long" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_unsigned_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7426,18 +3855,18 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <<EOF -#line 7430 "configure" +#line 3859 "configure" #include "confdefs.h" #include <stdio.h> -int main() +main() { FILE *f=fopen("conftestval", "w"); - if (!f) return(1); + if (!f) exit(1); fprintf(f, "%d\n", sizeof(unsigned long)); - return(0); + exit(0); } EOF -if { (eval echo configure:7441: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3870: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_unsigned_long=`cat conftestval` else @@ -7490,7 +3919,7 @@ EOF else echo $ac_n "checking size of long long""... $ac_c" 1>&6 -echo "configure:7494: checking size of long long" >&5 +echo "configure:3923: checking size of long long" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7498,18 +3927,18 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <<EOF -#line 7502 "configure" +#line 3931 "configure" #include "confdefs.h" #include <stdio.h> -int main() +main() { FILE *f=fopen("conftestval", "w"); - if (!f) return(1); + if (!f) exit(1); fprintf(f, "%d\n", sizeof(long long)); - return(0); + exit(0); } EOF -if { (eval echo configure:7513: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3942: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_long_long=`cat conftestval` else @@ -7548,7 +3977,7 @@ EOF else echo $ac_n "checking size of unsigned long long""... $ac_c" 1>&6 -echo "configure:7552: checking size of unsigned long long" >&5 +echo "configure:3981: checking size of unsigned long long" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_unsigned_long_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7556,18 +3985,18 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <<EOF -#line 7560 "configure" +#line 3989 "configure" #include "confdefs.h" #include <stdio.h> -int main() +main() { FILE *f=fopen("conftestval", "w"); - if (!f) return(1); + if (!f) exit(1); fprintf(f, "%d\n", sizeof(unsigned long long)); - return(0); + exit(0); } EOF -if { (eval echo configure:7571: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4000: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_unsigned_long_long=`cat conftestval` else @@ -7601,7 +4030,7 @@ EOF fi echo $ac_n "checking size of float""... $ac_c" 1>&6 -echo "configure:7605: checking size of float" >&5 +echo "configure:4034: checking size of float" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_float'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7609,18 +4038,18 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <<EOF -#line 7613 "configure" +#line 4042 "configure" #include "confdefs.h" #include <stdio.h> -int main() +main() { FILE *f=fopen("conftestval", "w"); - if (!f) return(1); + if (!f) exit(1); fprintf(f, "%d\n", sizeof(float)); - return(0); + exit(0); } EOF -if { (eval echo configure:7624: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4053: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_float=`cat conftestval` else @@ -7649,7 +4078,7 @@ else fi echo $ac_n "checking size of double""... $ac_c" 1>&6 -echo "configure:7653: checking size of double" >&5 +echo "configure:4082: checking size of double" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_double'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7657,18 +4086,18 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <<EOF -#line 7661 "configure" +#line 4090 "configure" #include "confdefs.h" #include <stdio.h> -int main() +main() { FILE *f=fopen("conftestval", "w"); - if (!f) return(1); + if (!f) exit(1); fprintf(f, "%d\n", sizeof(double)); - return(0); + exit(0); } EOF -if { (eval echo configure:7672: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4101: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_double=`cat conftestval` else @@ -7697,22 +4126,22 @@ else fi echo "checking for specific entropy devices" 1>&6 -echo "configure:7701: checking for specific entropy devices" >&5 +echo "configure:4130: checking for specific entropy devices" >&5 case $target_os in cygwin*) echo $ac_n "checking for wavein""... $ac_c" 1>&6 -echo "configure:7705: checking for wavein" >&5 +echo "configure:4134: checking for wavein" >&5 echo "$ac_t""yes" 1>&6 echo $ac_n "checking for wincrypt""... $ac_c" 1>&6 -echo "configure:7708: checking for wincrypt" >&5 +echo "configure:4137: checking for wincrypt" >&5 echo "$ac_t""yes" 1>&6 echo $ac_n "checking for console""... $ac_c" 1>&6 -echo "configure:7711: checking for console" >&5 +echo "configure:4140: checking for console" >&5 echo "$ac_t""yes" 1>&6 ;; linux*) echo $ac_n "checking for /dev/dsp""... $ac_c" 1>&6 -echo "configure:7716: checking for /dev/dsp" >&5 +echo "configure:4145: checking for /dev/dsp" >&5 if eval "test \"`echo '$''{'ac_cv_have_dev_dsp'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7735,7 +4164,7 @@ EOF ;; solaris*) echo $ac_n "checking for /dev/audio""... $ac_c" 1>&6 -echo "configure:7739: checking for /dev/audio" >&5 +echo "configure:4168: checking for /dev/audio" >&5 if eval "test \"`echo '$''{'ac_cv_have_dev_audio'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7766,9 +4195,9 @@ case $target_os in ;; *) echo "checking for generic entropy devices" 1>&6 -echo "configure:7770: checking for generic entropy devices" >&5 +echo "configure:4199: checking for generic entropy devices" >&5 echo $ac_n "checking for /dev/random""... $ac_c" 1>&6 -echo "configure:7772: checking for /dev/random" >&5 +echo "configure:4201: checking for /dev/random" >&5 if eval "test \"`echo '$''{'ac_cv_have_dev_random'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7789,7 +4218,7 @@ EOF fi echo $ac_n "checking for /dev/urandom""... $ac_c" 1>&6 -echo "configure:7793: checking for /dev/urandom" >&5 +echo "configure:4222: checking for /dev/urandom" >&5 if eval "test \"`echo '$''{'ac_cv_have_dev_urandom'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7810,7 +4239,7 @@ EOF fi echo $ac_n "checking for /dev/tty""... $ac_c" 1>&6 -echo "configure:7814: checking for /dev/tty" >&5 +echo "configure:4243: checking for /dev/tty" >&5 if eval "test \"`echo '$''{'ac_cv_have_dev_tty'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7995,7 +4424,7 @@ done ac_given_srcdir=$srcdir ac_given_INSTALL="$INSTALL" -trap 'rm -fr `echo "Doxyfile Makefile docs/Makefile gas/Makefile masm/Makefile mwerks/Makefile tests/Makefile config.gnu.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 +trap 'rm -fr `echo "Makefile docs/Makefile gas/Makefile masm/Makefile mwerks/Makefile tests/Makefile config.gnu.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 EOF cat >> $CONFIG_STATUS <<EOF @@ -8056,11 +4485,7 @@ s%@SET_MAKE@%$SET_MAKE%g s%@CC@%$CC%g s%@CPP@%$CPP%g s%@LN_S@%$LN_S%g -s%@OBJEXT@%$OBJEXT%g -s%@EXEEXT@%$EXEEXT%g -s%@ECHO@%$ECHO%g s%@RANLIB@%$RANLIB%g -s%@STRIP@%$STRIP%g s%@DLLTOOL@%$DLLTOOL%g s%@AS@%$AS%g s%@OBJDUMP@%$OBJDUMP%g @@ -8111,7 +4536,7 @@ EOF cat >> $CONFIG_STATUS <<EOF -CONFIG_FILES=\${CONFIG_FILES-"Doxyfile Makefile docs/Makefile gas/Makefile masm/Makefile mwerks/Makefile tests/Makefile"} +CONFIG_FILES=\${CONFIG_FILES-"Makefile docs/Makefile gas/Makefile masm/Makefile mwerks/Makefile tests/Makefile"} EOF cat >> $CONFIG_STATUS <<\EOF for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then diff --git a/beecrypt/configure.in b/beecrypt/configure.in index 5d6a50701..c9174e56a 100644 --- a/beecrypt/configure.in +++ b/beecrypt/configure.in @@ -5,7 +5,7 @@ AC_INIT() AC_CANONICAL_SYSTEM dnl Automake -AM_INIT_AUTOMAKE(beecrypt, 2.1.0) +AM_INIT_AUTOMAKE(beecrypt, 2.2.0) AM_CONFIG_HEADER(config.gnu.h) AM_DISABLE_STATIC AC_LIBTOOL_WIN32_DLL @@ -140,7 +140,13 @@ EOF if test -d "$ac_cv_java_include" ; then ac_cv_java_headers=yes else - ac_cv_java_include="$java_home"/../include + case $target_os in + darwin*) + ac_cv_java_include="$java_home"/../../../Headers + ;; + *) + ac_cv_java_include="$java_home"/../include + esac if test -d "$ac_cv_java_include" ; then ac_cv_java_headers=yes else @@ -503,6 +509,8 @@ if test "$ac_with_javaglue" = yes ; then cygwin*) CFLAGS="$CFLAGS -I$ac_cv_java_include"/win32 ;; + darwin*) + ;; linux*) CFLAGS="$CFLAGS -I$ac_cv_java_include"/linux ;; diff --git a/beecrypt/dhaes.h b/beecrypt/dhaes.h index 0676f858f..c3e07aed6 100644 --- a/beecrypt/dhaes.h +++ b/beecrypt/dhaes.h @@ -64,7 +64,7 @@ extern "C" { /** */ /*@-exportlocal@*/ -BEEDLLAPI +BEECRYPTAPI int dhaes_pUsable(const dhaes_pParameters* params) /*@*/; /*@=exportlocal@*/ @@ -72,39 +72,38 @@ int dhaes_pUsable(const dhaes_pParameters* params) /** */ /*@-exportlocal@*/ -BEEDLLAPI +BEECRYPTAPI int dhaes_pContextInit (dhaes_pContext* ctxt, const dhaes_pParameters* params) /*@modifies ctxt */; /*@=exportlocal@*/ /** */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ int dhaes_pContextInitDecrypt(dhaes_pContext* ctxt, const dhaes_pParameters* params, const mp32number* pri) /*@modifies ctxt */; /** */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ int dhaes_pContextInitEncrypt(dhaes_pContext* ctxt, const dhaes_pParameters* params, const mp32number* pub) /*@modifies ctxt */; /** */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ int dhaes_pContextFree (/*@only@*/ dhaes_pContext* ctxt) /*@modifies ctxt */; - /** */ -BEEDLLAPI /*@only@*/ /*@null@*/ /*@unused@*/ +BEECRYPTAPI /*@only@*/ /*@null@*/ /*@unused@*/ memchunk* dhaes_pContextEncrypt(dhaes_pContext* ctxt, mp32number* ephemeralPublicKey, mp32number* mac, const memchunk* cleartext, randomGeneratorContext* rng) /*@modifies ctxt, ephemeralPublicKey, mac, rng */; /** */ -BEEDLLAPI /*@only@*/ /*@null@*/ /*@unused@*/ +BEECRYPTAPI /*@only@*/ /*@null@*/ /*@unused@*/ memchunk* dhaes_pContextDecrypt(dhaes_pContext* ctxt, const mp32number* ephemeralPublicKey, const mp32number* mac, const memchunk* ciphertext) /*@modifies ctxt */; diff --git a/beecrypt/dldp.h b/beecrypt/dldp.h index 9f2caf7d2..cb49fbfdf 100644 --- a/beecrypt/dldp.h +++ b/beecrypt/dldp.h @@ -63,22 +63,31 @@ extern "C" { /** */ -BEEDLLAPI +BEECRYPTAPI int dldp_pInit(dldp_p* dp) /*@modifies dp->p, dp->q, dp->r, dp->g, dp->n @*/; /** */ -BEEDLLAPI +BEECRYPTAPI int dldp_pFree(/*@special@*/ dldp_p* dp) /*@releases dp->p.modl, dp->q.modl, dp->n.modl @*/ /*@modifies dp->p, dp->q, dp->r, dp->g, dp->n @*/; +<<<<<<< dldp.h /** */ -BEEDLLAPI +BEECRYPTAPI int dldp_pCopy(dldp_p* dst, const dldp_p* src) /*@modifies dst @*/; +======= +BEECRYPTAPI +int dldp_pInit(dldp_p*); +BEECRYPTAPI +int dldp_pFree(dldp_p*); +BEECRYPTAPI +int dldp_pCopy(dldp_p*, const dldp_p*); +>>>>>>> 1.1.1.3 /* * Functions for generating keys @@ -86,19 +95,19 @@ int dldp_pCopy(dldp_p* dst, const dldp_p* src) /** */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ int dldp_pPrivate(const dldp_p* dp, randomGeneratorContext* rgc, mp32number* x) /*@modifies rgc, x @*/; /** */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ int dldp_pPublic(const dldp_p* dp, const mp32number* x, mp32number* y) /*@modifies y @*/; /** */ -BEEDLLAPI +BEECRYPTAPI int dldp_pPair(const dldp_p* dp, randomGeneratorContext* rgc, mp32number* x, mp32number* y) /*@modifies rgc, x, y @*/; @@ -109,7 +118,7 @@ int dldp_pPair(const dldp_p* dp, randomGeneratorContext* rgc, mp32number* x, mp3 /** */ -BEEDLLAPI +BEECRYPTAPI int dldp_pEqual(const dldp_p* a, const dldp_p* b) /*@*/; @@ -120,25 +129,25 @@ int dldp_pEqual(const dldp_p* a, const dldp_p* b) /** */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ int dldp_pgoqMake(dldp_p* dp, randomGeneratorContext* rgc, uint32 psize, uint32 qsize, int cofactor) /*@modifies dp->p, dp->q, dp->r, dp->g, dp->n, rgc @*/; /** */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ int dldp_pgoqMakeSafe(dldp_p* dp, randomGeneratorContext* rgc, uint32 psize) /*@modifies dp->p, dp->q, dp->r, dp->g, dp->n, rgc @*/; /** */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ int dldp_pgoqGenerator(dldp_p* dp, randomGeneratorContext* rgc) /*@modifies dp->p, dp->q, dp->r, dp->g, dp->n, rgc @*/; /** */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ int dldp_pgoqValidate(const dldp_p*, randomGeneratorContext* rgc, int cofactor) /*@modifies rgc @*/; @@ -146,28 +155,27 @@ int dldp_pgoqValidate(const dldp_p*, randomGeneratorContext* rgc, int cofactor) * Functions for generating and validating dldp_pgon variant domain parameters */ - /** */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ int dldp_pgonMake(dldp_p* dp, randomGeneratorContext* rgc, uint32 psize, uint32 qsize) /*@modifies dp->p, dp->q, dp->r, dp->g, dp->n, rgc @*/; /** */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ int dldp_pgonMakeSafe(dldp_p* dp, randomGeneratorContext* rgc, uint32 psize) /*@modifies dp->p, dp->q, dp->r, dp->g, dp->n, rgc @*/; /** */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ int dldp_pgonGenerator(dldp_p* dp, randomGeneratorContext* rgc) /*@modifies dp->p, dp->q, dp->r, dp->g, dp->n, rgc @*/; /** */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ int dldp_pgonValidate(const dldp_p* dp, randomGeneratorContext* rgc) /*@modifies rgc @*/; diff --git a/beecrypt/dlkp.h b/beecrypt/dlkp.h index 90d87bb7a..85581a414 100644 --- a/beecrypt/dlkp.h +++ b/beecrypt/dlkp.h @@ -47,25 +47,25 @@ extern "C" { /** */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ int dlkp_pPair(dlkp_p* kp, randomGeneratorContext* rgc, const dldp_p* param) /*@modifies kp, rgc */; /** */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ int dlkp_pInit(dlkp_p* kp) /*@modifies kp */; /** */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ int dlkp_pFree(dlkp_p* kp) /*@modifies kp */; /** */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ int dlkp_pCopy(dlkp_p* dst, const dlkp_p* src) /*@modifies dst */; diff --git a/beecrypt/dlpk.h b/beecrypt/dlpk.h index f663d4385..bea7bbb07 100644 --- a/beecrypt/dlpk.h +++ b/beecrypt/dlpk.h @@ -44,37 +44,37 @@ extern "C" { /** */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ int dlpk_pInit(dlpk_p* pk) /*@modifies pk */; /** */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ int dlpk_pFree(dlpk_p* pk) /*@modifies pk */; /** */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ int dlpk_pCopy(dlpk_p* dst, const dlpk_p* src) /*@modifies dst */; /** */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ int dlpk_pEqual(const dlpk_p* a, const dlpk_p* b) /*@*/; /** */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ int dlpk_pgoqValidate(const dlpk_p* pk, randomGeneratorContext* rgc, int cofactor) /*@modifies rgc @*/; /** */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ int dlpk_pgonValidate(const dlpk_p* pk, randomGeneratorContext* rgc) /*@modifies rgc @*/; diff --git a/beecrypt/dlsvdp-dh.h b/beecrypt/dlsvdp-dh.h index 02668574a..ba6445f6a 100644 --- a/beecrypt/dlsvdp-dh.h +++ b/beecrypt/dlsvdp-dh.h @@ -36,7 +36,7 @@ extern "C" { /** */ -BEEDLLAPI +BEECRYPTAPI int dlsvdp_pDHSecret(const dldp_p* dp, const mp32number* x, const mp32number* y, mp32number* s) /*@modifies s */; diff --git a/beecrypt/dsa.h b/beecrypt/dsa.h index fbf68ffad..a804bf199 100644 --- a/beecrypt/dsa.h +++ b/beecrypt/dsa.h @@ -28,8 +28,6 @@ #ifndef _DSA_H #define _DSA_H -#define BEECRYPTAPI - #include "mp32barrett.h" #ifdef __cplusplus @@ -44,7 +42,7 @@ int dsasign(const mp32barrett* p, const mp32barrett* q, const mp32number* g, ran /** */ -BEECRYPTAPI /*@unused@*/ +BEECRYPTAPI int dsavrfy(const mp32barrett* p, const mp32barrett* q, const mp32number* g, const mp32number* hm, const mp32number* y, const mp32number* r, const mp32number* s) /*@*/; diff --git a/beecrypt/elgamal.h b/beecrypt/elgamal.h index 8af14163a..c990ab562 100644 --- a/beecrypt/elgamal.h +++ b/beecrypt/elgamal.h @@ -36,25 +36,25 @@ extern "C" { /** */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ int elgv1sign(const mp32barrett* p, const mp32barrett* n, const mp32number* g, randomGeneratorContext*, const mp32number* hm, const mp32number* x, mp32number* r, mp32number* s) /*@modifies r, s */; /** */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ int elgv3sign(const mp32barrett* p, const mp32barrett* n, const mp32number* g, randomGeneratorContext*, const mp32number* hm, const mp32number* x, mp32number* r, mp32number* s) /*@modifies r, s */; /** */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ int elgv1vrfy(const mp32barrett* p, const mp32barrett* n, const mp32number* g, const mp32number* hm, const mp32number* y, const mp32number* r, const mp32number* s) /*@*/; /** */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ int elgv3vrfy(const mp32barrett* p, const mp32barrett* n, const mp32number* g, const mp32number* hm, const mp32number* y, const mp32number* r, const mp32number* s) /*@*/; diff --git a/beecrypt/endianness.h b/beecrypt/endianness.h index bdf4db193..4f59bafb7 100644 --- a/beecrypt/endianness.h +++ b/beecrypt/endianness.h @@ -132,134 +132,134 @@ extern "C" { /** */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ int encodeByte(javabyte b, /*@out@*/ byte* data) /*@modifies data */; /** */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ int encodeShort(javashort s, /*@out@*/ byte* data) /*@modifies data */; /** */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ int encodeInt(javaint i, /*@out@*/ byte* data) /*@modifies data */; /** */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ int encodeLong(javalong l, /*@out@*/ byte* data) /*@modifies data */; /** */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ int encodeChar(javachar c, /*@out@*/ byte* data) /*@modifies data */; /** */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ int encodeFloat(javafloat f, /*@out@*/ byte* data) /*@modifies data */; /** */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ int encodeDouble(javadouble d, /*@out@*/ byte* data) /*@modifies data */; /** */ -BEEDLLAPI +BEECRYPTAPI int encodeInts(const javaint* i, /*@out@*/ byte* data, int count) /*@modifies data */; /** */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ int encodeIntsPartial(const javaint* i, /*@out@*/ byte* data, int bytecount) /*@modifies data */; /** */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ int encodeChars(const javachar* c, /*@out@*/ byte* data, int count) /*@modifies data */; /** */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ int decodeByte(/*@out@*/ javabyte* b, const byte* data) /*@modifies b */; /** */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ int decodeShort(/*@out@*/ javashort* s, const byte* data) /*@modifies s */; /** */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ int decodeInt(/*@out@*/ javaint* i, const byte* data) /*@modifies i */; /** */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ int decodeLong(/*@out@*/ javalong* l, const byte* data) /*@modifies l */; /** */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ int decodeChar(/*@out@*/ javachar* c, const byte* data) /*@modifies c */; /** */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ int decodeFloat(/*@out@*/ javafloat* f, const byte* data) /*@modifies f */; /** */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ int decodeDouble(/*@out@*/ javadouble* d, const byte* data) /*@modifies d */; /** */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ int decodeInts(/*@out@*/ javaint* i, const byte* data, int count) /*@modifies i */; /** */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ int decodeIntsPartial(/*@out@*/ javaint* i, const byte* data, int bytecount) /*@modifies i */; /** */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ int decodeChars(/*@out@*/ javachar* c, const byte* data, int count) /*@modifies c */; /** */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ int writeByte(javabyte b, FILE* ofp) /*@globals fileSystem @*/ /*@modifies ofp, fileSystem */; /** */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ int writeShort(javashort s, FILE* ofp) /*@globals fileSystem @*/ /*@modifies ofp, fileSystem */; @@ -267,7 +267,7 @@ int writeShort(javashort s, FILE* ofp) /** */ /*@-exportlocal@*/ -BEEDLLAPI +BEECRYPTAPI int writeInt(javaint i, FILE* ofp) /*@globals fileSystem @*/ /*@modifies ofp, fileSystem */; @@ -275,7 +275,7 @@ int writeInt(javaint i, FILE* ofp) /** */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ int writeLong(javalong l, FILE* ofp) /*@globals fileSystem @*/ /*@modifies ofp, fileSystem */; @@ -283,7 +283,7 @@ int writeLong(javalong l, FILE* ofp) /** */ /*@-exportlocal@*/ -BEEDLLAPI +BEECRYPTAPI int writeChar(javachar c, FILE* ofp) /*@globals fileSystem @*/ /*@modifies ofp, fileSystem */; @@ -291,63 +291,63 @@ int writeChar(javachar c, FILE* ofp) /** */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ int writeInts(const javaint* i, FILE* ofp, int count) /*@globals fileSystem @*/ /*@modifies ofp, fileSystem */; /** */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ int writeChars(const javachar* c, FILE* ofp, int count) /*@globals fileSystem @*/ /*@modifies ofp, fileSystem */; /** */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ int readByte(/*@out@*/ javabyte* b, FILE* ifp) /*@globals fileSystem @*/ /*@modifies b, ifp, fileSystem */; /** */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ int readShort(/*@out@*/ javashort* s, FILE* ifp) /*@globals fileSystem @*/ /*@modifies s, ifp, fileSystem */; /** */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ int readInt(/*@out@*/ javaint* i, FILE* ifp) /*@globals fileSystem @*/ /*@modifies i, ifp, fileSystem */; /** */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ int readLong(/*@out@*/ javalong* l, FILE* ifp) /*@globals fileSystem @*/ /*@modifies l, ifp, fileSystem */; /** */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ int readChar(/*@out@*/ javachar* c, FILE* ifp) /*@globals fileSystem @*/ /*@modifies c, ifp, fileSystem */; /** */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ int readInts(/*@out@*/ javaint* i, FILE* ifp, int count) /*@globals fileSystem @*/ /*@modifies i, ifp, fileSystem */; /** */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ int readChars(/*@out@*/ javachar* c, FILE* ifp, int count) /*@globals fileSystem @*/ /*@modifies c, ifp, fileSystem */; diff --git a/beecrypt/entropy.h b/beecrypt/entropy.h index fd204bcb2..08e8d3d6a 100644 --- a/beecrypt/entropy.h +++ b/beecrypt/entropy.h @@ -39,16 +39,16 @@ extern "C" { #endif #if WIN32 -BEEDLLAPI +BEECRYPTAPI int entropy_provider_setup(HINSTANCE); -BEEDLLAPI +BEECRYPTAPI int entropy_provider_cleanup(void); -BEEDLLAPI +BEECRYPTAPI int entropy_wavein(uint32* data, int size); -BEEDLLAPI +BEECRYPTAPI int entropy_console(uint32* data, int size); -BEEDLLAPI +BEECRYPTAPI int entropy_wincrypt(uint32* data, int size); #else diff --git a/beecrypt/fips180.h b/beecrypt/fips180.h index d96d9ddd9..224212a3e 100644 --- a/beecrypt/fips180.h +++ b/beecrypt/fips180.h @@ -47,29 +47,29 @@ extern "C" { /** \ingroup HASH_sha1_m */ -extern BEEDLLAPI const hashFunction sha1; +extern BEECRYPTAPI const hashFunction sha1; /** \ingroup HASH_sha1_m */ -BEEDLLAPI +BEECRYPTAPI void sha1Process(sha1Param* p) /*@modifies p */; /** \ingroup HASH_sha1_m */ -BEEDLLAPI +BEECRYPTAPI int sha1Reset (sha1Param* p) /*@modifies p */; /** \ingroup HASH_sha1_m */ -BEEDLLAPI +BEECRYPTAPI int sha1Update (sha1Param* p, const byte* data, int size) /*@modifies p */; /** \ingroup HASH_sha1_m */ -BEEDLLAPI +BEECRYPTAPI int sha1Digest (sha1Param* p, /*@out@*/ uint32* data) /*@modifies p, data */; diff --git a/beecrypt/fips186.h b/beecrypt/fips186.h index 8d77433a7..ec19c6077 100644 --- a/beecrypt/fips186.h +++ b/beecrypt/fips186.h @@ -78,12 +78,12 @@ extern "C" { /** */ -extern BEEDLLAPI const randomGenerator fips186prng; +extern BEECRYPTAPI const randomGenerator fips186prng; /** */ /*@-exportlocal@*/ -BEEDLLAPI +BEECRYPTAPI int fips186Setup (fips186Param* fp) /*@modifies fp */; /*@=exportlocal@*/ @@ -91,7 +91,7 @@ int fips186Setup (fips186Param* fp) /** */ /*@-exportlocal@*/ -BEEDLLAPI +BEECRYPTAPI int fips186Seed (fips186Param* fp, const uint32* data, int size) /*@modifies fp */; /*@=exportlocal@*/ @@ -99,7 +99,7 @@ int fips186Seed (fips186Param* fp, const uint32* data, int size) /** */ /*@-exportlocal@*/ -BEEDLLAPI +BEECRYPTAPI int fips186Next (fips186Param* fp, uint32* data, int size) /*@modifies fp, data */; /*@=exportlocal@*/ @@ -107,7 +107,7 @@ int fips186Next (fips186Param* fp, uint32* data, int size) /** */ /*@-exportlocal@*/ -BEEDLLAPI +BEECRYPTAPI int fips186Cleanup(fips186Param* fp) /*@modifies fp */; /*@=exportlocal@*/ diff --git a/beecrypt/gas/Makefile.in b/beecrypt/gas/Makefile.in index 862033a30..c4842ca2d 100644 --- a/beecrypt/gas/Makefile.in +++ b/beecrypt/gas/Makefile.in @@ -107,7 +107,7 @@ ac_cv_have_javac = @ac_cv_have_javac@ AUTOMAKE_OPTIONS = gnu no-dependencies -SOURCES = blowfishopt.i586.S fips180opt.i586.S mp32opt.arm.S mp32opt.i386.S mp32opt.ia64.S mp32opt.powerpc.S mp32opt.sparcv8.S mp32opt.sparcv9.S mp64opt.ia64.S +EXTRA_DIST = blowfishopt.i586.S fips180opt.i586.S mp32opt.arm.S mp32opt.i386.S mp32opt.ia64.S mp32opt.powerpc.S mp32opt.sparcv8.S mp32opt.sparcv9.S mp64opt.ia64.S mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../config.gnu.h CONFIG_CLEAN_FILES = diff --git a/beecrypt/gas/mp32opt.i386.S b/beecrypt/gas/mp32opt.i386.S index 1154baf33..4c49d4750 100644 --- a/beecrypt/gas/mp32opt.i386.S +++ b/beecrypt/gas/mp32opt.i386.S @@ -33,6 +33,7 @@ C_FUNCTION_BEGIN(mp32zero) +LABEL(mp32zero) pushl %edi movl 8(%esp),%ecx @@ -43,10 +44,11 @@ C_FUNCTION_BEGIN(mp32zero) popl %edi ret -C_FUNCTION_END(mp32zero, .Lmp32zero_size) +C_FUNCTION_END(mp32zero, LOCAL(mp32zero_size)) C_FUNCTION_BEGIN(mp32fill) +LABEL(mp32fill) pushl %edi movl 8(%esp),%ecx @@ -57,31 +59,32 @@ C_FUNCTION_BEGIN(mp32fill) popl %edi ret -C_FUNCTION_END(mp32fill, .Lmp32fill_size) +C_FUNCTION_END(mp32fill, LOCAL(mp32fill_size)) -#if 0 /* BROKEN! */ C_FUNCTION_BEGIN(mp32even) - mov 4(%esp),%ecx - mov 8(%esp),%eax - mov 4(%esp,%ecx,4),%eax - not %eax - and %eax,1 +LABEL(mp32even) + movl 4(%esp),%ecx + movl 8(%esp),%eax + movl -4(%eax,%ecx,4),%eax + notl %eax + andl $1,%eax ret -C_FUNCTION_END(mp32even, .Lmp32even_size) +C_FUNCTION_END(mp32even, LOCAL(mp32even_size)) C_FUNCTION_BEGIN(mp32odd) - mov 4(%esp),%ecx - mov 8(%esp),%eax - mov 4(%esp,%ecx,4),%eax - and %eax,1 +LABEL(mp32odd) + movl 4(%esp),%ecx + movl 8(%esp),%eax + movl -4(%eax,%ecx,4),%eax + andl $1,%eax ret -C_FUNCTION_END(mp32odd, .Lmp32odd_size) -#endif +C_FUNCTION_END(mp32odd, LOCAL(mp32odd_size)) C_FUNCTION_BEGIN(mp32addw) +LABEL(mp32addw) pushl %edi movl 8(%esp),%ecx @@ -92,25 +95,26 @@ C_FUNCTION_BEGIN(mp32addw) leal -4(%edi,%ecx,4),%edi addl %eax,(%edi) decl %ecx - jz .Lmp32addw_skip + jz LOCAL(mp32addw_skip) leal -4(%edi),%edi .align 4 -.Lmp32addw_loop: +LOCAL(mp32addw_loop): adcl %edx,(%edi) leal -4(%edi),%edi decl %ecx - jnz .Lmp32addw_loop -.Lmp32addw_skip: + jnz LOCAL(mp32addw_loop) +LOCAL(mp32addw_skip): sbbl %eax,%eax negl %eax popl %edi ret -C_FUNCTION_END(mp32addw, .Lmp32addw_size) +C_FUNCTION_END(mp32addw, LOCAL(mp32addw_size)) C_FUNCTION_BEGIN(mp32subw) +LABEL(mp32subw) pushl %edi movl 8(%esp),%ecx @@ -121,24 +125,25 @@ C_FUNCTION_BEGIN(mp32subw) leal -4(%edi,%ecx,4),%edi subl %eax,(%edi) decl %ecx - jz .Lmp32subw_skip + jz LOCAL(mp32subw_skip) leal -4(%edi),%edi .align 4 -.Lmp32subw_loop: +LOCAL(mp32subw_loop): sbbl %edx,(%edi) leal -4(%edi),%edi decl %ecx - jnz .Lmp32subw_loop -.Lmp32subw_skip: + jnz LOCAL(mp32subw_loop) +LOCAL(mp32subw_skip): sbbl %eax,%eax negl %eax popl %edi ret -C_FUNCTION_END(mp32subw, .Lmp32subw_size) +C_FUNCTION_END(mp32subw, LOCAL(mp32subw_size)) C_FUNCTION_BEGIN(mp32add) +LABEL(mp32add) pushl %edi pushl %esi @@ -150,11 +155,11 @@ C_FUNCTION_BEGIN(mp32add) decl %ecx .align 4 -.Lmp32add_loop: +LOCAL(mp32add_loop): movl (%esi,%ecx,4),%eax adcl %eax,(%edi,%ecx,4) decl %ecx - jns .Lmp32add_loop + jns LOCAL(mp32add_loop) sbbl %eax,%eax negl %eax @@ -162,10 +167,11 @@ C_FUNCTION_BEGIN(mp32add) popl %esi popl %edi ret -C_FUNCTION_END(mp32add, .Lmp32add_size) +C_FUNCTION_END(mp32add, LOCAL(mp32add_size)) C_FUNCTION_BEGIN(mp32sub) +LABEL(mp32sub) pushl %edi pushl %esi @@ -177,21 +183,22 @@ C_FUNCTION_BEGIN(mp32sub) decl %ecx .align 4 -.Lmp32sub_loop: +LOCAL(mp32sub_loop): movl (%esi,%ecx,4),%eax sbbl %eax,(%edi,%ecx,4) decl %ecx - jns .Lmp32sub_loop + jns LOCAL(mp32sub_loop) sbbl %eax,%eax negl %eax popl %esi popl %edi ret -C_FUNCTION_END(mp32sub, .Lmp32sub_size) +C_FUNCTION_END(mp32sub, LOCAL(mp32sub_size)) C_FUNCTION_BEGIN(mp32divtwo) +LABEL(mp32divtwo) pushl %edi movl 8(%esp),%ecx @@ -202,17 +209,18 @@ C_FUNCTION_BEGIN(mp32divtwo) clc .align 4 -.Lmp32divtwo_loop: +LOCAL(mp32divtwo_loop): rcrl $1,(%edi,%ecx,4) inc %ecx - jnz .Lmp32divtwo_loop + jnz LOCAL(mp32divtwo_loop) popl %edi ret -C_FUNCTION_END(mp32divtwo, .Lmp32divtwo_size) +C_FUNCTION_END(mp32divtwo, LOCAL(mp32divtwo_size)) C_FUNCTION_BEGIN(mp32multwo) +LABEL(mp32multwo) pushl %edi movl 8(%esp),%ecx @@ -222,20 +230,21 @@ C_FUNCTION_BEGIN(mp32multwo) decl %ecx .align 4 -.Lmp32multwo_loop: +LOCAL(mp32multwo_loop): rcll $1,(%edi,%ecx,4) decl %ecx - jns .Lmp32multwo_loop + jns LOCAL(mp32multwo_loop) sbbl %eax,%eax negl %eax popl %edi ret -C_FUNCTION_END(mp32multwo, .Lmp32multwo_size) +C_FUNCTION_END(mp32multwo, LOCAL(mp32multwo_size)) C_FUNCTION_BEGIN(mp32setmul) +LABEL(mp32setmul) pushl %edi pushl %esi pushl %ebx @@ -250,7 +259,7 @@ C_FUNCTION_BEGIN(mp32setmul) decl %ecx .align 4 -.Lmp32setmul_loop: +LOCAL(mp32setmul_loop): movl %edx,%ebx movl (%esi,%ecx,4),%eax mull %ebp @@ -258,7 +267,7 @@ C_FUNCTION_BEGIN(mp32setmul) adcl $0,%edx movl %eax,(%edi,%ecx,4) decl %ecx - jns .Lmp32setmul_loop + jns LOCAL(mp32setmul_loop) movl %edx,%eax @@ -267,10 +276,11 @@ C_FUNCTION_BEGIN(mp32setmul) popl %esi popl %edi ret -C_FUNCTION_END(mp32setmul, .Lmp32setmul_size) +C_FUNCTION_END(mp32setmul, LOCAL(mp32setmul_size)) C_FUNCTION_BEGIN(mp32addmul) +LABEL(mp32addmul) pushl %edi pushl %esi pushl %ebx @@ -285,7 +295,7 @@ C_FUNCTION_BEGIN(mp32addmul) decl %ecx .align 4 -.Lmp32addmul_loop: +LOCAL(mp32addmul_loop): movl %edx,%ebx movl (%esi,%ecx,4),%eax mull %ebp @@ -295,7 +305,7 @@ C_FUNCTION_BEGIN(mp32addmul) adcl $0,%edx movl %eax,(%edi,%ecx,4) decl %ecx - jns .Lmp32addmul_loop + jns LOCAL(mp32addmul_loop) movl %edx,%eax @@ -304,10 +314,11 @@ C_FUNCTION_BEGIN(mp32addmul) popl %esi popl %edi ret -C_FUNCTION_END(mp32addmul, .Lmp32addmul_size) +C_FUNCTION_END(mp32addmul, LOCAL(mp32addmul_size)) C_FUNCTION_BEGIN(mp32addsqrtrc) +LABEL(mp32addsqrtrc) pushl %edi pushl %esi pushl %ebx @@ -320,7 +331,7 @@ C_FUNCTION_BEGIN(mp32addsqrtrc) decl %ecx .align 4 -.Lmp32addsqrtrc_loop: +LOCAL(mp32addsqrtrc_loop): movl (%esi,%ecx,4),%eax mull %eax addl %ebx,%eax @@ -330,7 +341,7 @@ C_FUNCTION_BEGIN(mp32addsqrtrc) sbbl %ebx,%ebx negl %ebx decl %ecx - jns .Lmp32addsqrtrc_loop + jns LOCAL(mp32addsqrtrc_loop) movl %ebx,%eax @@ -338,4 +349,4 @@ C_FUNCTION_BEGIN(mp32addsqrtrc) popl %esi popl %edi ret -C_FUNCTION_END(mp32addsqrtrc, .Lmp32addsqrtrc_size) +C_FUNCTION_END(mp32addsqrtrc, LOCAL(mp32addsqrtrc_size)) diff --git a/beecrypt/hmac.h b/beecrypt/hmac.h index 7a56a1c92..32d94e18d 100644 --- a/beecrypt/hmac.h +++ b/beecrypt/hmac.h @@ -44,25 +44,25 @@ extern "C" { /** */ -BEEDLLAPI +BEECRYPTAPI int hmacSetup (hmacParam* hp, const hashFunction* hash, hashFunctionParam* param, const uint32* key, int keybits) /*@modifies hp */; /** */ -BEEDLLAPI +BEECRYPTAPI int hmacReset (hmacParam* hp, const hashFunction* hash, hashFunctionParam* param) /*@modifies hp */; /** */ -BEEDLLAPI +BEECRYPTAPI int hmacUpdate(hmacParam* hp, const hashFunction* hash, hashFunctionParam* param, const byte* data, int size) /*@modifies hp */; /** */ -BEEDLLAPI +BEECRYPTAPI int hmacDigest(hmacParam* hp, const hashFunction* hash, hashFunctionParam* param, /*@out@*/ uint32* data) /*@modifies hp, data */; diff --git a/beecrypt/hmacmd5.h b/beecrypt/hmacmd5.h index 30737bb16..6ef2b3616 100644 --- a/beecrypt/hmacmd5.h +++ b/beecrypt/hmacmd5.h @@ -46,12 +46,12 @@ extern "C" { /** \ingroup HMAC_md5_m */ -extern BEEDLLAPI const keyedHashFunction hmacmd5; +extern BEECRYPTAPI const keyedHashFunction hmacmd5; /** \ingroup HMAC_md5_m */ /*@-exportlocal@*/ -BEEDLLAPI +BEECRYPTAPI int hmacmd5Setup (hmacmd5Param* sp, const uint32* key, int keybits) /*@globals md5 @*/ /*@modifies sp @*/; @@ -60,7 +60,7 @@ int hmacmd5Setup (hmacmd5Param* sp, const uint32* key, int keybits) /** \ingroup HMAC_md5_m */ /*@-exportlocal@*/ -BEEDLLAPI +BEECRYPTAPI int hmacmd5Reset (hmacmd5Param* sp) /*@globals md5 @*/ /*@modifies sp @*/; @@ -69,7 +69,7 @@ int hmacmd5Reset (hmacmd5Param* sp) /** \ingroup HMAC_md5_m */ /*@-exportlocal@*/ -BEEDLLAPI +BEECRYPTAPI int hmacmd5Update(hmacmd5Param* sp, const byte* data, int size) /*@globals md5 @*/ /*@modifies sp @*/; @@ -78,7 +78,7 @@ int hmacmd5Update(hmacmd5Param* sp, const byte* data, int size) /** \ingroup HMAC_md5_m */ /*@-exportlocal@*/ -BEEDLLAPI +BEECRYPTAPI int hmacmd5Digest(hmacmd5Param* sp, uint32* data) /*@globals md5 @*/ /*@modifies sp, data @*/; diff --git a/beecrypt/hmacsha1.h b/beecrypt/hmacsha1.h index 1b613a465..0844827e7 100644 --- a/beecrypt/hmacsha1.h +++ b/beecrypt/hmacsha1.h @@ -46,12 +46,12 @@ extern "C" { /** \ingroup HMAC_sha1_m */ -extern BEEDLLAPI const keyedHashFunction hmacsha1; +extern BEECRYPTAPI const keyedHashFunction hmacsha1; /** \ingroup HMAC_sha1_m */ /*@-exportlocal@*/ -BEEDLLAPI +BEECRYPTAPI int hmacsha1Setup (hmacsha1Param* sp, const uint32* key, int keybits) /*@globals sha1 @*/ /*@modifies sp @*/; @@ -60,7 +60,7 @@ int hmacsha1Setup (hmacsha1Param* sp, const uint32* key, int keybits) /** \ingroup HMAC_sha1_m */ /*@-exportlocal@*/ -BEEDLLAPI +BEECRYPTAPI int hmacsha1Reset (hmacsha1Param* sp) /*@globals sha1 @*/ /*@modifies sp @*/; @@ -69,7 +69,7 @@ int hmacsha1Reset (hmacsha1Param* sp) /** \ingroup HMAC_sha1_m */ /*@-exportlocal@*/ -BEEDLLAPI +BEECRYPTAPI int hmacsha1Update(hmacsha1Param* sp, const byte* data, int size) /*@globals sha1 @*/ /*@modifies sp @*/; @@ -78,7 +78,7 @@ int hmacsha1Update(hmacsha1Param* sp, const byte* data, int size) /** \ingroup HMAC_sha1_m */ /*@-exportlocal@*/ -BEEDLLAPI +BEECRYPTAPI int hmacsha1Digest(hmacsha1Param* sp, uint32* data) /*@globals sha1 @*/ /*@modifies sp, data @*/; diff --git a/beecrypt/hmacsha256.h b/beecrypt/hmacsha256.h index d0f06eb52..68f7946a1 100644 --- a/beecrypt/hmacsha256.h +++ b/beecrypt/hmacsha256.h @@ -46,12 +46,12 @@ extern "C" { /** \ingroup HMAC_sha256_m */ -/*@observer@*/ /*@checkedstrict@*/ extern BEEDLLAPI const keyedHashFunction hmacsha256; +/*@observer@*/ /*@checkedstrict@*/ extern BEECRYPTAPI const keyedHashFunction hmacsha256; /** \ingroup HMAC_sha256_m */ /*@-exportlocal@*/ -BEEDLLAPI +BEECRYPTAPI int hmacsha256Setup (hmacsha256Param* sp, const uint32* key, int keybits) /*@globals sha256 @*/ /*@modifies sp @*/; @@ -60,7 +60,7 @@ int hmacsha256Setup (hmacsha256Param* sp, const uint32* key, int keybits) /** \ingroup HMAC_sha256_m */ /*@-exportlocal@*/ -BEEDLLAPI +BEECRYPTAPI int hmacsha256Reset (hmacsha256Param* sp) /*@globals sha256 @*/ /*@modifies sp @*/; @@ -69,7 +69,7 @@ int hmacsha256Reset (hmacsha256Param* sp) /** \ingroup HMAC_sha256_m */ /*@-exportlocal@*/ -BEEDLLAPI +BEECRYPTAPI int hmacsha256Update(hmacsha256Param* sp, const byte* data, int size) /*@globals sha256 @*/ /*@modifies sp @*/; @@ -78,7 +78,7 @@ int hmacsha256Update(hmacsha256Param* sp, const byte* data, int size) /** \ingroup HMAC_sha256_m */ /*@-exportlocal@*/ -BEEDLLAPI +BEECRYPTAPI int hmacsha256Digest(hmacsha256Param* sp, uint32* data) /*@globals sha256 @*/ /*@modifies sp, data @*/; diff --git a/beecrypt/md5.h b/beecrypt/md5.h index 8f2fb42ff..68ee2ca94 100644 --- a/beecrypt/md5.h +++ b/beecrypt/md5.h @@ -46,12 +46,12 @@ extern "C" { /** \ingroup HASH_md5_m */ -extern BEEDLLAPI const hashFunction md5; +extern BEECRYPTAPI const hashFunction md5; /** \ingroup HASH_md5_m */ /*@-exportlocal@*/ -BEEDLLAPI +BEECRYPTAPI void md5Process(md5Param* p) /*@modifies p @*/; /*@=exportlocal@*/ @@ -59,7 +59,7 @@ void md5Process(md5Param* p) /** \ingroup HASH_md5_m */ /*@-exportlocal@*/ -BEEDLLAPI +BEECRYPTAPI int md5Reset (md5Param* p) /*@modifies p @*/; /*@=exportlocal@*/ @@ -67,7 +67,7 @@ int md5Reset (md5Param* p) /** \ingroup HASH_md5_m */ /*@-exportlocal@*/ -BEEDLLAPI +BEECRYPTAPI int md5Update (md5Param* p, const byte* data, int size) /*@modifies p @*/; /*@=exportlocal@*/ @@ -75,7 +75,7 @@ int md5Update (md5Param* p, const byte* data, int size) /** \ingroup HASH_md5_m */ /*@-exportlocal@*/ -BEEDLLAPI +BEECRYPTAPI int md5Digest (md5Param* p, /*@out@*/ uint32* data) /*@modifies p, data @*/; /*@=exportlocal@*/ diff --git a/beecrypt/memchunk.c b/beecrypt/memchunk.c index bc1a519c3..0e3a29c71 100644 --- a/beecrypt/memchunk.c +++ b/beecrypt/memchunk.c @@ -96,3 +96,18 @@ memchunk* memchunkResize(memchunk* m, int size) return m; /*@=nullret =compdef@*/ } + +memchunk* memchunkClone(const memchunk* m) +{ + if (m) + { + memchunk* tmp = memchunkAlloc(m->size); + + if (tmp) + memcpy(tmp->data, m->data, m->size); + + return tmp; + } + + return (memchunk*) 0; +} diff --git a/beecrypt/memchunk.h b/beecrypt/memchunk.h index 85fa9a185..120bc4683 100644 --- a/beecrypt/memchunk.h +++ b/beecrypt/memchunk.h @@ -41,22 +41,27 @@ extern "C" { /** */ -BEEDLLAPI /*@only@*/ /*@null@*/ +BEECRYPTAPI /*@only@*/ /*@null@*/ memchunk* memchunkAlloc(int size) /*@*/; /** */ -BEEDLLAPI +BEECRYPTAPI /*@unused@*/ void memchunkFree(/*@only@*/ /*@null@*/memchunk* m) /*@*/; /** */ -BEEDLLAPI /*@only@*/ /*@null@*/ +BEECRYPTAPI /*@only@*/ /*@null@*/ memchunk* memchunkResize(/*@only@*/ /*@null@*/memchunk* m, int size) /*@*/; +/** + */ +BEECRYPTAPI /*@only@*/ /*@null@*/ +memchunk* memchunkClone(const memchunk* m); + #ifdef __cplusplus } #endif diff --git a/beecrypt/mp32.c b/beecrypt/mp32.c index 8e8a6a64f..d63e6c5e9 100644 --- a/beecrypt/mp32.c +++ b/beecrypt/mp32.c @@ -912,6 +912,8 @@ void mp32rshift(register uint32 xsize, register uint32* xdata, uint32 count) } #endif +/* try an alternate version here, with descending sizes */ +/* also integrate lszcnt and rshift properly into one function */ #ifndef ASM_MP32GCD_W /** * mp32gcd_w diff --git a/beecrypt/mp32.h b/beecrypt/mp32.h index 15f7f3e6b..c4e0cee53 100644 --- a/beecrypt/mp32.h +++ b/beecrypt/mp32.h @@ -42,7 +42,7 @@ extern "C" { /** */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ void mp32copy(uint32 size, /*@out@*/ uint32* dst, const uint32* src) /*@modifies dst @*/; #ifndef ASM_MP32COPY @@ -55,7 +55,7 @@ void mp32copy(uint32 size, /*@out@*/ uint32* dst, const uint32* src) /** */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ void mp32move(uint32 size, /*@out@*/ uint32* dst, const uint32* src) /*@modifies dst @*/; #ifndef ASM_MP32MOVE @@ -68,52 +68,52 @@ void mp32move(uint32 size, /*@out@*/ uint32* dst, const uint32* src) /** */ -BEEDLLAPI +BEECRYPTAPI void mp32zero(uint32 xsize, /*@out@*/ uint32* xdata) /*@modifies xdata @*/; /** */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ void mp32fill(uint32 xsize, /*@out@*/ uint32* xdata, uint32 val) /*@modifies xdata @*/; /** */ -BEEDLLAPI +BEECRYPTAPI int mp32odd (uint32 xsize, const uint32* xdata) /*@*/; /** */ -BEEDLLAPI +BEECRYPTAPI int mp32even(uint32 xsize, const uint32* xdata) /*@*/; /** */ -BEEDLLAPI +BEECRYPTAPI int mp32z (uint32 xsize, const uint32* xdata) /*@*/; /** */ /*@-exportlocal@*/ -BEEDLLAPI +BEECRYPTAPI int mp32nz (uint32 xsize, const uint32* xdata) /*@*/; /*@=exportlocal@*/ /** */ -BEEDLLAPI +BEECRYPTAPI int mp32eq (uint32 size, const uint32* xdata, const uint32* ydata) /*@*/; /** */ /*@-exportlocal@*/ -BEEDLLAPI +BEECRYPTAPI int mp32ne (uint32 size, const uint32* xdata, const uint32* ydata) /*@*/; /*@=exportlocal@*/ @@ -121,7 +121,7 @@ int mp32ne (uint32 size, const uint32* xdata, const uint32* ydata) /** */ /*@-exportlocal@*/ -BEEDLLAPI +BEECRYPTAPI int mp32gt (uint32 size, const uint32* xdata, const uint32* ydata) /*@*/; /*@=exportlocal@*/ @@ -129,209 +129,209 @@ int mp32gt (uint32 size, const uint32* xdata, const uint32* ydata) /** */ /*@-exportlocal@*/ -BEEDLLAPI +BEECRYPTAPI int mp32lt (uint32 size, const uint32* xdata, const uint32* ydata) /*@*/; /*@=exportlocal@*/ /** */ -BEEDLLAPI +BEECRYPTAPI int mp32ge (uint32 size, const uint32* xdata, const uint32* ydata) /*@*/; /** */ -BEEDLLAPI +BEECRYPTAPI int mp32le (uint32 size, const uint32* xdata, const uint32* ydata) /*@*/; /** */ -BEEDLLAPI +BEECRYPTAPI int mp32eqx(uint32 xsize, const uint32* xdata, uint32 ysize, const uint32* ydata) /*@*/; /** */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ int mp32nex(uint32 xsize, const uint32* xdata, uint32 ysize, const uint32* ydata) /*@*/; /** */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ int mp32gtx(uint32 xsize, const uint32* xdata, uint32 ysize, const uint32* ydata) /*@*/; /** */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ int mp32ltx(uint32 xsize, const uint32* xdata, uint32 ysize, const uint32* ydata) /*@*/; /** */ -BEEDLLAPI +BEECRYPTAPI int mp32gex(uint32 xsize, const uint32* xdata, uint32 ysize, const uint32* ydata) /*@*/; /** */ -BEEDLLAPI +BEECRYPTAPI int mp32lex(uint32 xsize, const uint32* xdata, uint32 ysize, const uint32* ydata) /*@*/; /** */ -BEEDLLAPI +BEECRYPTAPI int mp32isone(uint32 xsize, const uint32* xdata) /*@*/; /** */ -BEEDLLAPI +BEECRYPTAPI int mp32istwo(uint32 xsize, const uint32* xdata) /*@*/; /** */ -BEEDLLAPI +BEECRYPTAPI int mp32leone(uint32 xsize, const uint32* xdata) /*@*/; /** */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ int mp32eqmone(uint32 size, const uint32* xdata, const uint32* ydata) /*@*/; /** */ -BEEDLLAPI +BEECRYPTAPI int mp32msbset(uint32 xsize, const uint32* xdata) /*@*/; /** */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ int mp32lsbset(uint32 xsize, const uint32* xdata) /*@*/; /** */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ void mp32setmsb(uint32 xsize, uint32* xdata) /*@modifies xdata @*/; /** */ -BEEDLLAPI +BEECRYPTAPI void mp32setlsb(uint32 xsize, uint32* xdata) /*@modifies xdata @*/; /** */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ void mp32clrmsb(uint32 xsize, uint32* xdata) /*@modifies xdata @*/; /** */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ void mp32clrlsb(uint32 xsize, uint32* xdata) /*@modifies xdata @*/; /** */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ void mp32xor(uint32 size, uint32* xdata, const uint32* ydata) /*@modifies xdata @*/; /** */ /*@-exportlocal@*/ -BEEDLLAPI +BEECRYPTAPI void mp32not(uint32 xsize, uint32* xdata) /*@modifies xdata @*/; /*@=exportlocal@*/ /** */ -BEEDLLAPI +BEECRYPTAPI void mp32setw(uint32 xsize, /*@out@*/ uint32* xdata, uint32 y) /*@modifies xdata @*/; /** */ -BEEDLLAPI +BEECRYPTAPI void mp32setx(uint32 xsize, /*@out@*/ uint32* xdata, uint32 ysize, const uint32* ydata) /*@modifies xdata @*/; /** */ -BEEDLLAPI +BEECRYPTAPI uint32 mp32addw(uint32 xsize, uint32* xdata, uint32 y) /*@modifies xdata @*/; /** */ -BEEDLLAPI +BEECRYPTAPI uint32 mp32add (uint32 size, uint32* xdata, const uint32* ydata) /*@modifies xdata @*/; /** */ -BEEDLLAPI +BEECRYPTAPI uint32 mp32addx(uint32 xsize, uint32* xdata, uint32 ysize, const uint32* ydata) /*@modifies xdata @*/; /** */ -BEEDLLAPI +BEECRYPTAPI uint32 mp32subw(uint32 xsize, uint32* xdata, uint32 y) /*@modifies xdata @*/; /** */ -BEEDLLAPI +BEECRYPTAPI uint32 mp32sub (uint32 size, uint32* xdata, const uint32* ydata) /*@modifies xdata @*/; /** */ -BEEDLLAPI +BEECRYPTAPI uint32 mp32subx(uint32 xsize, uint32* xdata, uint32 ysize, const uint32* ydata) /*@modifies xdata @*/; /** */ -BEEDLLAPI +BEECRYPTAPI uint32 mp32multwo(uint32 xsize, uint32* xdata) /*@modifies xdata @*/; /** */ -BEEDLLAPI +BEECRYPTAPI void mp32neg(uint32 xsize, uint32* xdata) /*@modifies xdata @*/; /** */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ uint32 mp32size(uint32 xsize, const uint32* xdata) /*@*/; /** */ -BEEDLLAPI +BEECRYPTAPI uint32 mp32mszcnt(uint32 xsize, const uint32* xdata) /*@*/; /** */ /*@-exportlocal@*/ -BEEDLLAPI +BEECRYPTAPI uint32 mp32lszcnt(uint32 xsize, const uint32* xdata) /*@*/; /*@=exportlocal@*/ @@ -339,107 +339,107 @@ uint32 mp32lszcnt(uint32 xsize, const uint32* xdata) /** */ /*@-exportlocal@*/ -BEEDLLAPI +BEECRYPTAPI void mp32lshift(uint32 xsize, uint32* xdata, uint32 count) /*@modifies xdata @*/; /*@=exportlocal@*/ /** */ -BEEDLLAPI +BEECRYPTAPI void mp32rshift(uint32 xsize, uint32* xdata, uint32 count) /*@modifies xdata @*/; /** */ -BEEDLLAPI +BEECRYPTAPI uint32 mp32norm(uint32 xsize, uint32* xdata) /*@modifies xdata @*/; /** */ -BEEDLLAPI +BEECRYPTAPI uint32 mp32divpowtwo(uint32 xsize, uint32* xdata) /*@modifies xdata @*/; /** */ -BEEDLLAPI +BEECRYPTAPI void mp32divtwo (uint32 xsize, uint32* xdata) /*@modifies xdata @*/; /** */ -BEEDLLAPI +BEECRYPTAPI void mp32sdivtwo(uint32 xsize, uint32* xdata) /*@modifies xdata @*/; /** */ -BEEDLLAPI +BEECRYPTAPI uint32 mp32setmul (uint32 size, /*@out@*/ uint32* result, const uint32* xdata, uint32 y) /*@modifies result @*/; /** */ -BEEDLLAPI +BEECRYPTAPI uint32 mp32addmul (uint32 size, /*@out@*/ uint32* result, const uint32* xdata, uint32 y) /*@modifies result @*/; /** */ /*@-exportlocal@*/ -BEEDLLAPI +BEECRYPTAPI uint32 mp32addsqrtrc(uint32 size, /*@out@*/ uint32* result, const uint32* xdata) /*@modifies result @*/; /*@=exportlocal@*/ /** */ -BEEDLLAPI +BEECRYPTAPI void mp32mul(/*@out@*/ uint32* result, uint32 xsize, const uint32* xdata, uint32 ysize, const uint32* ydata) /*@modifies result @*/; /** */ -BEEDLLAPI +BEECRYPTAPI void mp32sqr(/*@out@*/ uint32* result, uint32 xsize, const uint32* xdata) /*@modifies result @*/; /** */ -BEEDLLAPI +BEECRYPTAPI void mp32gcd_w(uint32 size, const uint32* xdata, const uint32* ydata, /*@out@*/ uint32* result, /*@out@*/ uint32* wksp) /*@modifies result, wksp @*/; /** */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ uint32 mp32nmodw(/*@out@*/ uint32* result, uint32 xsize, const uint32* xdata, uint32 y, /*@out@*/ uint32* wksp) /*@modifies result, wksp @*/; /** */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ void mp32nmod(/*@out@*/ uint32* result, uint32 xsize, const uint32* xdata, uint32 ysize, const uint32* ydata, /*@out@*/ uint32* wksp) /*@modifies result, wksp @*/; /** */ -BEEDLLAPI +BEECRYPTAPI void mp32ndivmod(/*@out@*/ uint32* result, uint32 xsize, const uint32* xdata, uint32 ysize, const uint32* ydata, /*@out@*/ uint32* wksp) /*@modifies result, wksp @*/; /** */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ void mp32print(uint32 xsize, const uint32* xdata) /*@globals fileSystem @*/ /*@modifies fileSystem @*/; /** */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ void mp32println(uint32 xsize, const uint32* xdata) /*@globals fileSystem @*/ /*@modifies fileSystem @*/; diff --git a/beecrypt/mp32barrett.h b/beecrypt/mp32barrett.h index 8b8a5660d..0f680f83e 100644 --- a/beecrypt/mp32barrett.h +++ b/beecrypt/mp32barrett.h @@ -44,19 +44,19 @@ extern "C" { /** */ -BEEDLLAPI +BEECRYPTAPI void mp32bzero(/*@out@*/ mp32barrett* b) /*@modifies b->size, b->modl, b->mu @*/; /** */ -BEEDLLAPI +BEECRYPTAPI void mp32binit(mp32barrett* b, uint32 size) /*@modifies b->size, b->modl, b->mu @*/; /** */ -BEEDLLAPI +BEECRYPTAPI void mp32bfree(/*@special@*/ mp32barrett* b) /*@uses b->size, b->modl @*/ /*@releases b->modl @*/ @@ -64,100 +64,100 @@ void mp32bfree(/*@special@*/ mp32barrett* b) /** */ -BEEDLLAPI +BEECRYPTAPI void mp32bcopy(mp32barrett* b, const mp32barrett* copy) /*@modifies b->size, b->modl, b->mu @*/; /** */ -BEEDLLAPI +BEECRYPTAPI void mp32bset(mp32barrett* b, uint32 size, const uint32* data) /*@modifies b->size, b->modl, b->mu @*/; /** */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ void mp32bsethex(mp32barrett* b, const char* hex) /*@modifies b->size, b->modl, b->mu @*/; /** */ -BEEDLLAPI +BEECRYPTAPI void mp32bsubone(const mp32barrett* b, uint32* result) /*@modifies result @*/; /** */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ void mp32bneg(const mp32barrett* b, const uint32* xdata, uint32* result) /*@modifies result @*/; /** */ -BEEDLLAPI +BEECRYPTAPI void mp32bmu_w(mp32barrett* b, /*@out@*/ uint32* wksp) /*@modifies b->size, b->modl, b->mu, wksp @*/; /** */ -BEEDLLAPI +BEECRYPTAPI void mp32brnd_w (const mp32barrett* b, randomGeneratorContext* rc, /*@out@*/ uint32* result, /*@out@*/ uint32* wksp) /*@modifies result, wksp @*/; /** */ /*@-exportlocal@*/ -BEEDLLAPI +BEECRYPTAPI void mp32brndodd_w(const mp32barrett* b, randomGeneratorContext* rc, /*@out@*/ uint32* result, /*@out@*/ uint32* wksp) /*@modifies result, wksp @*/; /*@=exportlocal@*/ /** */ -BEEDLLAPI +BEECRYPTAPI void mp32brndinv_w(const mp32barrett* b, randomGeneratorContext* rc, /*@out@*/ uint32* result, /*@out@*/ uint32* inverse, /*@out@*/ uint32* wksp) /*@modifies result, inverse, wksp @*/; /** */ -BEEDLLAPI +BEECRYPTAPI void mp32bmod_w(const mp32barrett* b, const uint32* xdata, /*@out@*/ uint32* result, /*@out@*/ uint32* wksp) /*@modifies result, wksp @*/; /** */ -BEEDLLAPI +BEECRYPTAPI void mp32baddmod_w(const mp32barrett* b, uint32 xsize, const uint32* xdata, uint32 ysize, const uint32* ydata, /*@out@*/ uint32* result, /*@out@*/ uint32* wksp) /*@modifies result, wksp @*/; /** */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ void mp32bsubmod_w(const mp32barrett* b, uint32 xsize, const uint32* xdata, uint32 ysize, const uint32* ydata, /*@out@*/ uint32* result, /*@out@*/ uint32* wksp) /*@modifies result, wksp @*/; /** */ -BEEDLLAPI +BEECRYPTAPI void mp32bmulmod_w(const mp32barrett* b, uint32 xsize, const uint32* xdata, uint32 ysize, const uint32* ydata, /*@out@*/ uint32* result, /*@out@*/ uint32* wksp) /*@modifies result, wksp @*/; /** */ -BEEDLLAPI +BEECRYPTAPI void mp32bsqrmod_w(const mp32barrett* b, uint32 xsize, const uint32* xdata, /*@out@*/ uint32* result, /*@out@*/ uint32* wksp) /*@modifies result, wksp @*/; /** */ -BEEDLLAPI +BEECRYPTAPI void mp32bpowmod_w(const mp32barrett* b, uint32 xsize, const uint32* xdata, uint32 psize, const uint32* pdata, /*@out@*/ uint32* result, /*@out@*/ uint32* wksp) /*@modifies result, wksp @*/; /** */ /*@-exportlocal@*/ -BEEDLLAPI +BEECRYPTAPI void mp32bpowmodsld_w(const mp32barrett* b, const uint32* slide, uint32 psize, const uint32* pdata, /*@out@*/ uint32* result, /*@out@*/ uint32* wksp) /*@globals internalState @*/ /*@modifies result, wksp, internalState @*/; @@ -165,13 +165,13 @@ void mp32bpowmodsld_w(const mp32barrett* b, const uint32* slide, uint32 psize, c /** */ -BEEDLLAPI +BEECRYPTAPI void mp32btwopowmod_w(const mp32barrett* b, uint32 psize, const uint32* pdata, /*@out@*/ uint32* result, /*@out@*/ uint32* wksp) /*@modifies result, wksp @*/; /** */ -BEEDLLAPI +BEECRYPTAPI int mp32binv_w(const mp32barrett* b, uint32 xsize, const uint32* xdata, /*@out@*/ uint32* result, /*@out@*/ uint32* wksp) /*@modifies result, wksp @*/; @@ -180,53 +180,53 @@ int mp32binv_w(const mp32barrett* b, uint32 xsize, const uint32* xdata, /*@out@ * @todo Simultaneous multiple exponentiation, for use in dsa and elgamal * signature verification. */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ void mp32bsm2powmod(const mp32barrett* b, const uint32*, const uint32*, const uint32*, const uint32*); /** */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ void mp32bsm3powmod(const mp32barrett* b, const uint32*, const uint32*, const uint32*, const uint32*, const uint32*, const uint32*); #endif /* NOTYET */ /** */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ int mp32bpprime_w(const mp32barrett* b, randomGeneratorContext* rc, int t, /*@out@*/ uint32* wksp) /*@modifies wksp @*/; /** * @note Takes mp32number as parameter. */ -BEEDLLAPI +BEECRYPTAPI void mp32bnrnd(const mp32barrett* b, randomGeneratorContext* rc, mp32number* result) /*@modifies result @*/; /** * @note Takes mp32number as parameter. */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ void mp32bnmulmod(const mp32barrett* b, const mp32number* x, const mp32number* y, mp32number* result) /*@modifies result @*/; /** * @note Takes mp32number as parameter. */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ void mp32bnsqrmod(const mp32barrett* b, const mp32number* x, mp32number* result) /*@modifies result @*/; /** * @note Takes mp32number as parameter. */ -BEEDLLAPI +BEECRYPTAPI void mp32bnpowmod (const mp32barrett* b, const mp32number* x, const mp32number* pow, mp32number* y) /*@modifies y @*/; /** * @note Takes mp32number as parameter. */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ void mp32bnpowmodsld(const mp32barrett* b, const uint32* slide, const mp32number* pow, mp32number* y) /*@modifies y @*/; diff --git a/beecrypt/mp32number.h b/beecrypt/mp32number.h index f2cfc2b15..b37138ced 100644 --- a/beecrypt/mp32number.h +++ b/beecrypt/mp32number.h @@ -46,55 +46,55 @@ extern "C" { /** */ -BEEDLLAPI +BEECRYPTAPI void mp32nzero(/*@out@*/ mp32number* n) /*@modifies n->size, n->data @*/; /** */ -BEEDLLAPI +BEECRYPTAPI void mp32nsize(mp32number* n, uint32 size) /*@modifies n->size, n->data @*/; /** */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ void mp32ninit(mp32number* n, uint32 size, const uint32* data) /*@modifies n->size, n->data @*/; /** */ -BEEDLLAPI +BEECRYPTAPI void mp32nfree(mp32number* n) /*@modifies n->size, n->data @*/; /** */ -BEEDLLAPI +BEECRYPTAPI void mp32ncopy(/*@out@*/ mp32number* n, const mp32number* copy) /*@modifies n->size, n->data @*/; /** */ -BEEDLLAPI +BEECRYPTAPI void mp32nwipe(mp32number* n) /*@modifies n->size, n->data @*/; /** */ -BEEDLLAPI +BEECRYPTAPI void mp32nset (mp32number* n, uint32 size, /*@null@*/ const uint32* data) /*@modifies n->size, n->data @*/; /** */ -BEEDLLAPI +BEECRYPTAPI void mp32nsetw (mp32number* n, uint32 val) /*@modifies n->size, n->data @*/; /** */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ void mp32nsethex(mp32number* n, const char* hex) /*@modifies n->size, n->data @*/; diff --git a/beecrypt/mp32prime.h b/beecrypt/mp32prime.h index e8c1d2898..66d10cf0f 100644 --- a/beecrypt/mp32prime.h +++ b/beecrypt/mp32prime.h @@ -44,39 +44,39 @@ extern "C" { /** */ -BEEDLLAPI +BEECRYPTAPI int mp32ptrials (uint32 bits) /*@*/; /** */ -BEEDLLAPI +BEECRYPTAPI int mp32pmilrab_w (const mp32barrett* p, randomGeneratorContext* rc, int t, /*@out@*/ uint32* wksp) /*@modifies wksp @*/; /** */ -BEEDLLAPI +BEECRYPTAPI void mp32prnd_w (mp32barrett* p, randomGeneratorContext* rc, uint32 size, int t, /*@null@*/ const mp32number* f, /*@out@*/ uint32* wksp) /*@modifies p, rc, wksp @*/; /** */ -BEEDLLAPI +BEECRYPTAPI void mp32prndsafe_w (mp32barrett* p, randomGeneratorContext* rc, uint32 size, int t, /*@out@*/ uint32* wksp) /*@modifies p, rc, wksp @*/; #ifdef NOTYET /** */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ void mp32prndcon_w (mp32barrett* p, randomGeneratorContext* rc, uint32, int, const mp32number*, const mp32number*, const mp32number*, mp32number*, /*@out@*/ uint32* wksp) /*@modifies wksp @*/; #endif /** */ -BEEDLLAPI +BEECRYPTAPI void mp32prndconone_w(mp32barrett* p, randomGeneratorContext* rc, uint32 size, int t, const mp32barrett* q, /*@null@*/ const mp32number* f, mp32number* r, int cofactor, /*@out@*/ uint32* wksp) /*@modifies p, rc, r, wksp @*/; diff --git a/beecrypt/mtprng.h b/beecrypt/mtprng.h index e9242a39b..140cc1b4e 100644 --- a/beecrypt/mtprng.h +++ b/beecrypt/mtprng.h @@ -75,12 +75,12 @@ extern "C" { /** */ -extern BEEDLLAPI const randomGenerator mtprng; +extern BEECRYPTAPI const randomGenerator mtprng; /** */ /*@-exportlocal@*/ -BEEDLLAPI +BEECRYPTAPI int mtprngSetup (mtprngParam* mp) /*@modifies mp @*/; /*@=exportlocal@*/ @@ -88,7 +88,7 @@ int mtprngSetup (mtprngParam* mp) /** */ /*@-exportlocal@*/ -BEEDLLAPI +BEECRYPTAPI int mtprngSeed (mtprngParam* mp, const uint32* data, int size) /*@modifies mp @*/; /*@=exportlocal@*/ @@ -96,7 +96,7 @@ int mtprngSeed (mtprngParam* mp, const uint32* data, int size) /** */ /*@-exportlocal@*/ -BEEDLLAPI +BEECRYPTAPI int mtprngNext (mtprngParam* mp, uint32* data, int size) /*@modifies mp, data @*/; /*@=exportlocal@*/ @@ -104,7 +104,7 @@ int mtprngNext (mtprngParam* mp, uint32* data, int size) /** */ /*@-exportlocal@*/ -BEEDLLAPI +BEECRYPTAPI int mtprngCleanup(mtprngParam* mp) /*@modifies mp @*/; /*@=exportlocal@*/ diff --git a/beecrypt/rsa.h b/beecrypt/rsa.h index b0941b381..6cf408196 100644 --- a/beecrypt/rsa.h +++ b/beecrypt/rsa.h @@ -36,19 +36,19 @@ extern "C" { /** */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ int rsapri (const rsakp* kp, const mp32number* m, mp32number* c) /*@modifies c */; /** */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ int rsapricrt(const rsakp* kp, const mp32number* m, mp32number* c) /*@modifies c */; /** */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ int rsavrfy (const rsapk* pk, const mp32number* m, const mp32number* c) /*@*/; diff --git a/beecrypt/rsakp.h b/beecrypt/rsakp.h index 1e34a2d32..9fdc0fb46 100644 --- a/beecrypt/rsakp.h +++ b/beecrypt/rsakp.h @@ -50,25 +50,25 @@ extern "C" { /** */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ int rsakpMake(rsakp* kp, randomGeneratorContext* rgc, int nsize) /*@modifies kp, rgc @*/; /** */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ int rsakpInit(rsakp* kp) /*@modifies kp @*/; /** */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ int rsakpFree(rsakp* kp) /*@modifies kp @*/; /** */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ int rsakpCopy(rsakp* dst, const rsakp* src) /*@modifies dst @*/; diff --git a/beecrypt/rsapk.h b/beecrypt/rsapk.h index 908584ae7..ff8b83a1a 100644 --- a/beecrypt/rsapk.h +++ b/beecrypt/rsapk.h @@ -44,19 +44,19 @@ extern "C" { /** */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ int rsapkInit(rsapk* pk) /*@modifies pk @*/; /** */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ int rsapkFree(rsapk* pk) /*@modifies pk @*/; /** */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ int rsapkCopy(rsapk* dst, const rsapk* src) /*@modifies dst @*/; diff --git a/beecrypt/sha256.h b/beecrypt/sha256.h index 7e8626261..a57bd3ae6 100644 --- a/beecrypt/sha256.h +++ b/beecrypt/sha256.h @@ -46,32 +46,32 @@ extern "C" { /** \ingroup HASH_sha256_m */ -/*@observer@*/ /*@checkedstrict@*/ extern BEEDLLAPI const hashFunction sha256; +/*@observer@*/ /*@checkedstrict@*/ extern BEECRYPTAPI const hashFunction sha256; /*@-exportlocal@*/ /** \ingroup HASH_sha256_m */ -BEEDLLAPI +BEECRYPTAPI void sha256Process(sha256Param* p) /*@globals internalState @*/ /*@modifies p, internalState @*/; /** \ingroup HASH_sha256_m */ -BEEDLLAPI +BEECRYPTAPI int sha256Reset (sha256Param* p) /*@modifies p @*/; /** \ingroup HASH_sha256_m */ -BEEDLLAPI +BEECRYPTAPI int sha256Update (sha256Param* p, const byte* data, int size) /*@globals internalState @*/ /*@modifies p, internalState @*/; /** \ingroup HASH_sha256_m */ -BEEDLLAPI +BEECRYPTAPI int sha256Digest (sha256Param* p, /*@out@*/ uint32* data) /*@globals internalState @*/ /*@modifies p, data, internalState @*/; diff --git a/beecrypt/tests/beetest.c b/beecrypt/tests/beetest.c index 5d5675dac..9b7fb353c 100644 --- a/beecrypt/tests/beetest.c +++ b/beecrypt/tests/beetest.c @@ -29,12 +29,14 @@ #include "mp32barrett.h" #include "dhaes.h" #include "dlkp.h" +#include "dsa.h" #include "elgamal.h" #include "fips180.h" #include "hmacmd5.h" #include "md5.h" #include "rsa.h" #include "sha256.h" +#include "mp32.h" #if HAVE_STDLIB_H # include <stdlib.h> @@ -116,6 +118,40 @@ static const char* elg_n = "8df2a494492276aa3d25759bb06869cbeac0d83afb8d0cf7cbb8 return rc; } +/*@unused@*/ static int testVectorDSA(const dlkp_p* keypair) + /*@*/ +{ + int rc = 0; + + randomGeneratorContext rngc; + + /*@-nullpass -modobserver @*/ + if (randomGeneratorContextInit(&rngc, randomGeneratorDefault()) == 0) + /*@=nullpass =modobserver @*/ + { + mp32number digest, r, s; + + mp32nzero(&digest); + mp32nzero(&r); + mp32nzero(&s); + + mp32nsize(&digest, 5); + + rngc.rng->next(rngc.param, digest.data, digest.size); + + dsasign(&keypair->param.p, &keypair->param.q, &keypair->param.g, &rngc, &digest, &keypair->x, &r, &s); + + rc = dsavrfy(&keypair->param.p, &keypair->param.q, &keypair->param.g, &digest, &keypair->y, &r, &s); + + mp32nfree(&digest); + mp32nfree(&r); + mp32nfree(&s); + + randomGeneratorContextFree(&rngc); + } + return rc; +} + /*@unused@*/ static int testVectorElGamalV1(const dlkp_p* keypair) /*@*/ { @@ -301,19 +337,6 @@ static int testVectorDHAES(const dlkp_p* keypair) return -1; } -#if 0 -/*@unused@*/ static int testVectorDSA(void) - /*@globals fileSystem @*/ - /*@modifies fileSystem @*/ -{ - int rc = 0; - - randomGeneratorContext rngc; - - return rc; -} -#endif - /*@unused@*/ static int testVectorDLDP(void) /*@*/ { @@ -732,61 +755,104 @@ static void testExpMods(void) printf("random generator setup problem\n"); } -static void testDLParams(void) +static void testDLAlgorithms(void) /*@globals fileSystem, internalState */ /*@modifies fileSystem, internalState */ { - randomGeneratorContext rc; + randomGeneratorContext rngc; + mp32number hm, r, s; dldp_p dp; + dlkp_p kp; memset(&rc, 0, sizeof(randomGeneratorContext)); memset(&dp, 0, sizeof(dldp_p)); + mp32nzero(&hm); + mp32nzero(&r); + mp32nzero(&s); + + dldp_pInit(&dp); + dlkp_pInit(&kp); + /*@-nullpass -modobserver @*/ - if (randomGeneratorContextInit(&rc, randomGeneratorDefault()) == 0) + if (randomGeneratorContextInit(&rngc, randomGeneratorDefault()) == 0) /*@=nullpass =modobserver @*/ { + int i; + #if HAVE_TIME_H double ttime; clock_t tstart, tstop; #endif - printf("Generating P (768 bits) Q (512 bits) G with order Q\n"); + printf("Generating P (1024 bits) Q (160 bits) G with order Q\n"); #if HAVE_TIME_H tstart = clock(); #endif - (void) dldp_pgoqMake(&dp, &rc, 768 >> 5, 512 >> 5, 1); + (void) dldp_pgoqMake(&dp, &rngc, 1024 >> 5, 160 >> 5, 1); + #if HAVE_TIME_H + tstop = clock(); + ttime = ((double)(tstop - tstart)) / CLOCKS_PER_SEC; + printf(" done in %.3f seconds\n", ttime); + #endif + + dlkp_pInit(&kp); + printf("Generating keypair\n"); + #if HAVE_TIME_H + tstart = clock(); + #endif + dlkp_pPair(&kp, &rngc, &dp); #if HAVE_TIME_H tstop = clock(); ttime = ((double)(tstop - tstart)) / CLOCKS_PER_SEC; printf(" done in %.3f seconds\n", ttime); #endif - printf("P = "); (void) fflush(stdout); mp32println(dp.p.size, dp.p.modl); - printf("Q = "); (void) fflush(stdout); mp32println(dp.q.size, dp.q.modl); - printf("G = "); (void) fflush(stdout); mp32println(dp.g.size, dp.g.data); - (void) dldp_pFree(&dp); - printf("Generating P (768 bits) Q (512 bits) G with order (P-1)\n"); + mp32nsize(&hm, 5); + rngc.rng->next(rngc.param, hm.data, hm.size); + + printf("DSA signing (%d bits)\n", kp.param.p.size << 5); #if HAVE_TIME_H tstart = clock(); #endif + for (i = 0; i < 100; i++) + { + dsasign(&kp.param.p, &kp.param.q, &kp.param.g, &rngc, &hm, &kp.x, &r, &s); + } + #if HAVE_TIME_H + tstop = clock(); + ttime = ((double)(tstop - tstart)) / CLOCKS_PER_SEC; + printf(" 100x in %.3f seconds\n", ttime); + #endif - /*@-usereleased -compdef @*/ /* annotate dldp_pgonMake correctly */ - (void) dldp_pgonMake(&dp, &rc, 768 >> 5, 512 >> 5); + printf("DSA verification (%d bits)\n", kp.param.p.size << 5); + #if HAVE_TIME_H + tstart = clock(); + #endif + for (i = 0; i < 100; i++) + { + dsavrfy(&kp.param.p, &kp.param.q, &kp.param.g, &hm, &kp.y, &r, &s); + } + #if HAVE_TIME_H + tstop = clock(); + ttime = ((double)(tstop - tstart)) / CLOCKS_PER_SEC; + printf(" 100x in %.3f seconds\n", ttime); + #endif + (void) dlkp_pFree(&kp); + (void) dldp_pFree(&dp); + + printf("Generating P (1024 bits) Q (768 bits) G with order (P-1)\n"); + #if HAVE_TIME_H + tstart = clock(); + #endif + (void) dldp_pgonMake(&dp, &rngc, 1024 >> 5, 768 >> 5); #if HAVE_TIME_H tstop = clock(); ttime = ((double)(tstop - tstart)) / CLOCKS_PER_SEC; printf(" done in %.3f seconds\n", ttime); #endif - printf("P = "); (void) fflush(stdout); mp32println(dp.p.size, dp.p.modl); - printf("Q = "); (void) fflush(stdout); mp32println(dp.q.size, dp.q.modl); - printf("G = "); (void) fflush(stdout); mp32println(dp.g.size, dp.g.data); - printf("N = "); (void) fflush(stdout); mp32println(dp.n.size, dp.n.modl); (void) dldp_pFree(&dp); - /*@=usereleased =compdef @*/ - /*@-modobserver@*/ - (void) randomGeneratorContextFree(&rc); - /*@=modobserver@*/ + (void) randomGeneratorContextFree(&rngc); } } @@ -829,6 +895,11 @@ int main(/*@unused@*/int argc, /*@unused@*/char *argv[]) else exit(1); + if (testVectorDSA(&keypair)) + printf("DSA works!\n"); + else + exit(1); + if (testVectorElGamalV1(&keypair)) printf("ElGamal v1 works!\n"); else @@ -930,7 +1001,8 @@ int main(/*@unused@*/int argc, /*@unused@*/char *argv[]) testBlockCiphers(); testHashFunctions(); testExpMods(); - testDLParams(); + testDLAlgorithms(); + /*@=modnomods@*/ if (testVectorMD5()) diff --git a/beecrypt/timestamp.h b/beecrypt/timestamp.h index 75b289123..f94628f72 100644 --- a/beecrypt/timestamp.h +++ b/beecrypt/timestamp.h @@ -36,12 +36,14 @@ # define ONE_HOUR 3600000LL # define ONE_DAY 86400000LL # define ONE_WEEK 604800000LL +# define ONE_YEAR 31536000000LL #else # define ONE_SECOND 1000L # define ONE_MINUTE 60000L # define ONE_HOUR 3600000L # define ONE_DAY 86400000L # define ONE_WEEK 604800000L +# define ONE_YEAR 31536000000L #endif #ifdef __cplusplus @@ -50,7 +52,7 @@ extern "C" { /** */ -BEEDLLAPI /*@unused@*/ +BEECRYPTAPI /*@unused@*/ javalong timestamp(void); #ifdef __cplusplus |