diff --git a/README b/README index 6cd73919..b974bc64 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -Berkeley DB 11g Release 2, library version 11.2.5.2.28: (June 10, 2011) +Berkeley DB 11g Release 2, library version 11.2.5.2.36: (September 14, 2011) This is Berkeley DB 11g Release 2 from Oracle. To view release and installation documentation, load the distribution file docs/index.html diff --git a/build_android/Android.mk b/build_android/Android.mk index e7a2db98..991e7f85 100644 --- a/build_android/Android.mk +++ b/build_android/Android.mk @@ -1,6 +1,6 @@ # DO NOT EDIT: automatically built by dist/s_android. # Makefile for building a drop-in replacement of SQLite using -# Berkeley DB 11g Release 2, library version 11.2.5.2.28: (June 10, 2011) +# Berkeley DB 11g Release 2, library version 11.2.5.2.36: (September 14, 2011) ################################################################### LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) @@ -10,7 +10,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := libsqlite # BDB_TOP will change with release numbers -BDB_TOP := db-5.2.28 +BDB_TOP := db-5.2.36 BDB_PATH := $(LOCAL_PATH)/$(BDB_TOP)/src # This directive results in arm (vs thumb) code. It's necessary to diff --git a/build_android/db.h b/build_android/db.h index 021264be..a232356b 100644 --- a/build_android/db.h +++ b/build_android/db.h @@ -46,9 +46,9 @@ extern "C" { #define DB_VERSION_RELEASE 2 #define DB_VERSION_MAJOR 5 #define DB_VERSION_MINOR 2 -#define DB_VERSION_PATCH 28 -#define DB_VERSION_STRING "Berkeley DB 5.2.28: (June 10, 2011)" -#define DB_VERSION_FULL_STRING "Berkeley DB 11g Release 2, library version 11.2.5.2.28: (June 10, 2011)" +#define DB_VERSION_PATCH 36 +#define DB_VERSION_STRING "Berkeley DB 5.2.36: (September 14, 2011)" +#define DB_VERSION_FULL_STRING "Berkeley DB 11g Release 2, library version 11.2.5.2.36: (September 14, 2011)" /* * !!! diff --git a/build_android/db_config.h b/build_android/db_config.h index e55badc2..4ae7456f 100644 --- a/build_android/db_config.h +++ b/build_android/db_config.h @@ -557,16 +557,16 @@ #define PACKAGE_NAME "Berkeley DB" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "Berkeley DB 5.2.28" +#define PACKAGE_STRING "Berkeley DB 5.2.36" /* Define to the one symbol short name of this package. */ -#define PACKAGE_TARNAME "db-5.2.28" +#define PACKAGE_TARNAME "db-5.2.36" /* Define to the home page for this package. */ #define PACKAGE_URL "http://www.oracle.com/technology/software/products/berkeley-db/index.html" /* Define to the version of this package. */ -#define PACKAGE_VERSION "5.2.28" +#define PACKAGE_VERSION "5.2.36" /* The size of `char', as computed by sizeof. */ #define SIZEOF_CHAR 1 diff --git a/build_vxworks/db.h b/build_vxworks/db.h index a5296142..cfc2ad87 100644 --- a/build_vxworks/db.h +++ b/build_vxworks/db.h @@ -47,9 +47,9 @@ extern "C" { #define DB_VERSION_RELEASE 2 #define DB_VERSION_MAJOR 5 #define DB_VERSION_MINOR 2 -#define DB_VERSION_PATCH 28 -#define DB_VERSION_STRING "Berkeley DB 5.2.28: (June 10, 2011)" -#define DB_VERSION_FULL_STRING "Berkeley DB 11g Release 2, library version 11.2.5.2.28: (June 10, 2011)" +#define DB_VERSION_PATCH 36 +#define DB_VERSION_STRING "Berkeley DB 5.2.36: (September 14, 2011)" +#define DB_VERSION_FULL_STRING "Berkeley DB 11g Release 2, library version 11.2.5.2.36: (September 14, 2011)" /* * !!! diff --git a/build_vxworks/db_config.h b/build_vxworks/db_config.h index 538a63d5..218e0e7f 100644 --- a/build_vxworks/db_config.h +++ b/build_vxworks/db_config.h @@ -568,16 +568,16 @@ #define PACKAGE_NAME "Berkeley DB" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "Berkeley DB 5.2.28" +#define PACKAGE_STRING "Berkeley DB 5.2.36" /* Define to the one symbol short name of this package. */ -#define PACKAGE_TARNAME "db-5.2.28" +#define PACKAGE_TARNAME "db-5.2.36" /* Define to the home page for this package. */ #define PACKAGE_URL "http://www.oracle.com/technology/software/products/berkeley-db/index.html" /* Define to the version of this package. */ -#define PACKAGE_VERSION "5.2.28" +#define PACKAGE_VERSION "5.2.36" /* The size of a `char', as computed by sizeof. */ /* #undef SIZEOF_CHAR */ diff --git a/build_vxworks/db_config_small.h b/build_vxworks/db_config_small.h index a834e51b..dc240281 100644 --- a/build_vxworks/db_config_small.h +++ b/build_vxworks/db_config_small.h @@ -568,16 +568,16 @@ #define PACKAGE_NAME "Berkeley DB" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "Berkeley DB 5.2.28" +#define PACKAGE_STRING "Berkeley DB 5.2.36" /* Define to the one symbol short name of this package. */ -#define PACKAGE_TARNAME "db-5.2.28" +#define PACKAGE_TARNAME "db-5.2.36" /* Define to the home page for this package. */ #define PACKAGE_URL "http://www.oracle.com/technology/software/products/berkeley-db/index.html" /* Define to the version of this package. */ -#define PACKAGE_VERSION "5.2.28" +#define PACKAGE_VERSION "5.2.36" /* The size of a `char', as computed by sizeof. */ /* #undef SIZEOF_CHAR */ diff --git a/build_wince/db.h b/build_wince/db.h index f55f4ef1..35811167 100644 --- a/build_wince/db.h +++ b/build_wince/db.h @@ -61,9 +61,9 @@ extern "C" { #define DB_VERSION_RELEASE 2 #define DB_VERSION_MAJOR 5 #define DB_VERSION_MINOR 2 -#define DB_VERSION_PATCH 28 -#define DB_VERSION_STRING "Berkeley DB 5.2.28: (June 10, 2011)" -#define DB_VERSION_FULL_STRING "Berkeley DB 11g Release 2, library version 11.2.5.2.28: (June 10, 2011)" +#define DB_VERSION_PATCH 36 +#define DB_VERSION_STRING "Berkeley DB 5.2.36: (September 14, 2011)" +#define DB_VERSION_FULL_STRING "Berkeley DB 11g Release 2, library version 11.2.5.2.36: (September 14, 2011)" /* * !!! diff --git a/build_wince/db_config.h b/build_wince/db_config.h index ac3256fa..e8823bb1 100644 --- a/build_wince/db_config.h +++ b/build_wince/db_config.h @@ -576,16 +576,16 @@ #define PACKAGE_NAME "Berkeley DB" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "Berkeley DB 5.2.28" +#define PACKAGE_STRING "Berkeley DB 5.2.36" /* Define to the one symbol short name of this package. */ -#define PACKAGE_TARNAME "db-5.2.28" +#define PACKAGE_TARNAME "db-5.2.36" /* Define to the home page for this package. */ #define PACKAGE_URL "http://www.oracle.com/technology/software/products/berkeley-db/index.html" /* Define to the version of this package. */ -#define PACKAGE_VERSION "5.2.28" +#define PACKAGE_VERSION "5.2.36" /* The size of a `char', as computed by sizeof. */ /* #undef SIZEOF_CHAR */ diff --git a/build_windows/db.h b/build_windows/db.h index f55f4ef1..35811167 100644 --- a/build_windows/db.h +++ b/build_windows/db.h @@ -61,9 +61,9 @@ extern "C" { #define DB_VERSION_RELEASE 2 #define DB_VERSION_MAJOR 5 #define DB_VERSION_MINOR 2 -#define DB_VERSION_PATCH 28 -#define DB_VERSION_STRING "Berkeley DB 5.2.28: (June 10, 2011)" -#define DB_VERSION_FULL_STRING "Berkeley DB 11g Release 2, library version 11.2.5.2.28: (June 10, 2011)" +#define DB_VERSION_PATCH 36 +#define DB_VERSION_STRING "Berkeley DB 5.2.36: (September 14, 2011)" +#define DB_VERSION_FULL_STRING "Berkeley DB 11g Release 2, library version 11.2.5.2.36: (September 14, 2011)" /* * !!! diff --git a/build_windows/db_config.h b/build_windows/db_config.h index 55feb8fa..f0d30569 100644 --- a/build_windows/db_config.h +++ b/build_windows/db_config.h @@ -583,16 +583,16 @@ #define PACKAGE_NAME "Berkeley DB" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "Berkeley DB 5.2.28" +#define PACKAGE_STRING "Berkeley DB 5.2.36" /* Define to the one symbol short name of this package. */ -#define PACKAGE_TARNAME "db-5.2.28" +#define PACKAGE_TARNAME "db-5.2.36" /* Define to the home page for this package. */ #define PACKAGE_URL "http://www.oracle.com/technology/software/products/berkeley-db/index.html" /* Define to the version of this package. */ -#define PACKAGE_VERSION "5.2.28" +#define PACKAGE_VERSION "5.2.36" /* The size of a `char', as computed by sizeof. */ /* #undef SIZEOF_CHAR */ diff --git a/build_windows/libdb.rc b/build_windows/libdb.rc index 8b35f008..852aa7d7 100644 --- a/build_windows/libdb.rc +++ b/build_windows/libdb.rc @@ -1,6 +1,6 @@ 1 VERSIONINFO - FILEVERSION 5,0,2,28 - PRODUCTVERSION 5,0,2,28 + FILEVERSION 5,0,2,36 + PRODUCTVERSION 5,0,2,36 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -18,12 +18,12 @@ BEGIN BEGIN VALUE "CompanyName", "Oracle\0" VALUE "FileDescription", "Berkeley DB 5.2 DLL\0" - VALUE "FileVersion", "5.2.28\0" + VALUE "FileVersion", "5.2.36\0" VALUE "InternalName", "libdb52.dll\0" VALUE "LegalCopyright", "Copyright © Oracle 1997-2009\0" VALUE "OriginalFilename", "libdb52.dll\0" VALUE "ProductName", "Oracle libdb\0" - VALUE "ProductVersion", "5.2.28\0" + VALUE "ProductVersion", "5.2.36\0" END END BLOCK "VarFileInfo" diff --git a/dist/ChangeLog b/dist/ChangeLog index 23a44691..7f5e94d2 100644 --- a/dist/ChangeLog +++ b/dist/ChangeLog @@ -1,29 +1,92 @@ = Berkeley DB 5.2 Changelog = +== Changes between 11.2.5.2.28 and 11.2.5.2.36 == + +Updated the JDBC version shipped with Berkeley DB to support +Oracle Java Embedded Client. [#19814] + +Fixed several memory leaks in the Online Backup API. [#19850] + +Fix a bug in the SQL API when using a blob field with a lot of content +and multiple concurrent connections to the database. [#19945] + +Update EID_MASTER to be public static final so that it will be exposed +in Java docs. [#20184] + +Fixed a bug where BFile module crashes when using BFile handle for SQL +expressions interface on 64 bit platforms. [#20193] + +Fixed a bug where, on systems without FTRUNCATE, db_verify will return an +error for truncated heap databases. [#20195] + +Let ADO.NET solution building skip SQLite Designer and Linq by +default. [#20218] + +Fixed a bug that could cause BDB to run out of avaliable mutexes when +renaming many databases. [#20228] + +Fixed a bug where the metadata page in hash databases would not be flushed +to disk. [#20265] + +Fixed a bug where printlog would fail on in-memory heap databases. [#20269] + +Fixed a bug that would cause verify to call the wrong compare function if +there are user defined compare functions used and the database has multilevel +off page sorted duplicate trees. [#20284] + +Fixed a bug where two processes accessing the same table and one of those drops +the table and recreates, the second process can crash. [#20319] + +Fixed a bug where it was possible to panic a heap database without an error +message being printed. [#20320] + +Fixed a bug where it would fail to put records with overflow keys into hash +duplicate database. [#20329] + +Fixed a bug where multiple Replication Manager processes would +sometimes not all conform to replication-group-aware log archiving. [#20342] + +Fixed a bug in the Java API where getting a Stat object could cause a segfault. +[#20377] + +Fix a bug where cache page eviction statistics could be inaccurate. [#20410] + +Fix a bug where extending an almost-full region could cause a seg fault. +[#20414] + +Fix a bug where multiple long running transactions across checkpoints +could cause Log Sequence errors on client systems. [#20421] + +Fix a bug where aborting an exclusive transaction followed by an +auto-commit read operation could cause an assert failure. [#20567] + +Detect obsolete MVCC buffers earlier by refreshing stale old_reader LSNs. +[#20570] + == Database or Log File On-Disk Format Changes == -Existing database file formats were unchanged in library version 11.2.5.2. +Existing database file formats were unchanged in library version 11.2.5.2. However, a new database file format, "heap", was introduced. The log file format changed in library version 11.2.5.2. == New Features == -Replication Manager now manages Group Membership. This allows sites to be added to -and removed from the replication group dynamically. Replication Manager +Replication Manager now manages Group Membership. This allows sites to be added +to and removed from the replication group dynamically. Replication Manager also now automatically keeps track of the group size (nsites). [#14778] -Initial allocations for various non-pagebuffer (mpool) system resources -may now be specified, as well as a total maximum of memory to use, rather than +Initial allocations for various non-pagebuffer (mpool) system resources +may now be specified, as well as a total maximum of memory to use, rather than specifying a maximum value for each resource. [#16334] -Implemented Berkeley DB globalization support architecture to enable localized -and stripped error and output messages. [#16863] +Implemented Berkeley DB globalization support architecture to enable localized +and stripped error and output messages. [#16863] -Added a new access method, DB_HEAP. Heap aims for efficient use (and re-use) -of disk space. Keys in a heap database are automatically generated by BDB, it -is recommended that one or more secondary indexes be used with a heap -database. For full details on DB_HEAP, see the Programmer's Reference +Added a new access method, DB_HEAP. Heap aims for efficient use (and re-use) +of disk space. Keys in a heap database are automatically generated by BDB, it +is recommended that one or more secondary indexes be used with a heap +database. For full details on DB_HEAP, see the Programmer's Reference Guide. [#17627] Added a compatible mode for 32bit and 64bit Windows environment. [#18225] @@ -35,20 +98,20 @@ used to configure the Berkeley DB datastore. [#18521] Add several new pragmas to provide in-process support for replication in the SQL API. [#18528] -The Berkeley DB X/open compliant XA resource manager has been restored, +The Berkeley DB X/open compliant XA resource manager has been restored, including support for multi-threaded servers. [#18701] -Improved the ability to recover from an application crash on connections -through the SQL API. Berkeley DB will try to automatically clean up locks, +Improved the ability to recover from an application crash on connections +through the SQL API. Berkeley DB will try to automatically clean up locks, mutexes and transactions from the failed process. [#18713] -Add support for sequence usage in the SQL API using SQLite custom +Add support for sequence usage in the SQL API using SQLite custom functions. [#19007] -Add a pragma in the SQL API to allow execution of a cache trickle +Add a pragma in the SQL API to allow execution of a cache trickle command. [#19202] -Add a pragma in the SQL API to allow configuration of DB_SYSTEM_MEM +Add a pragma in the SQL API to allow configuration of DB_SYSTEM_MEM environments. [#19249] The new db_env_set_win_security(SECURITY_ATTRIBUTES *) function allows an @@ -67,135 +130,138 @@ None == Access Method Changes == -Modified the queue access method so that it only uses latches on the metadata -page rather than a latch and a lock. This was done to improve +Modified the queue access method so that it only uses latches on the metadata +page rather than a latch and a lock. This was done to improve performance. [#18749] -Fixed several bugs that could cause an update running with MVCC to get the -wrong version of a page or improperly update the metadata last page +Fixed several bugs that could cause an update running with MVCC to get the +wrong version of a page or improperly update the metadata last page number. [#19063] -The database open code will no longer log the open and close of the master +The database open code will no longer log the open and close of the master database in a file when opening a sub database in that file. [#19071] -Fixed a bug where an error during an update to a hash database with -DB_NOOVERWRITE set could return DB_KEYEXIST rather than the correct +Fixed a bug where an error during an update to a hash database with +DB_NOOVERWRITE set could return DB_KEYEXIST rather than the correct error. [#19077] -Fixed a bug that could cause the wrong page number to be on a root or metadata -page if DB->compact moved the page and the operation was later rolled +Fixed a bug that could cause the wrong page number to be on a root or metadata +page if DB->compact moved the page and the operation was later rolled forward. [#19167] -Fixed a bug that could cause the close of a secondary index database to fail +Fixed a bug that could cause the close of a secondary index database to fail if the transaction doing the open aborted. [#19169] -Fixed a bug that could prevent an update to a primary recno or queue database +Fixed a bug that could prevent an update to a primary recno or queue database with DB_NOOVERWITE set. [#19230] -Fixed a bug when an update to a database with DB_NOOVERWRITE set could -incorrectly return DB_KEYEXIST rather than the correct error +Fixed a bug when an update to a database with DB_NOOVERWRITE set could +incorrectly return DB_KEYEXIST rather than the correct error (e.g., DB_LOCK_DEADLOCK). [#19345] -Fixed a bug preventing the use of the set_re_len and set_re_pad methods with +Fixed a bug preventing the use of the set_re_len and set_re_pad methods with a RECNO database when configuring with --disable-queue. [#19367] -Fixed a bug in DB->compact on BTREE databases that did not check if the last +Fixed a bug in DB->compact on BTREE databases that did not check if the last page in the database could be moved to a lower numbered page. [#19394] -Fixed a bug that could cause a Log Sequence Error when recovering the +Fixed a bug that could cause a Log Sequence Error when recovering the deallocation of a multiple page overflow chain. [#19474] Fixed a bug that could cause a diagnostic assertion if MVCC was in use and multiple levels of a btree needed to be split. [#19481] -Fixed a few error paths that could cause a Panic with an "unpinned page +Fixed a few error paths that could cause a Panic with an "unpinned page returned" error. [#19493] -Fixed a bug that closed a race condition that under heavy mult-threaded +Fixed a bug that closed a race condition that under heavy mult-threaded appending to a queue database could cause some records to be lost. [#19498] -Fixed a bug that might cause DB->compact to mis-estimate the size of an -overflow record when merging two pages. This may cause the page to have more +Fixed a bug that might cause DB->compact to mis-estimate the size of an +overflow record when merging two pages. This may cause the page to have more data than desired. [#19562] -Fixed a bug in DB_ENV->fileid_reset that did not update the fileid's on the -metadata pages of subdatabases if the database file was not in native +Fixed a bug in DB_ENV->fileid_reset that did not update the fileid's on the +metadata pages of subdatabases if the database file was not in native byte order. [#19608] -Fixed a bug that caused the first directory specified in the create of +Fixed a bug that caused the first directory specified in the create of a partitioned database to get too many partitions. [#20041] +Fixed a bug that could leave deleted pages from a HEAP database in the buffer +cache. [#20309] + == SQL API Changes == -Fixed a race condition that would cause a corruption error in one process when +Fixed a race condition that would cause a corruption error in one process when two processes created the same SQL database. [#18929] -Fixed a bug that would cause a constraint violation when updating the +Fixed a bug that would cause a constraint violation when updating the primary key with the same value. [#18976] -Overwriting an old backup with a new backup using the SQL online backup API +Overwriting an old backup with a new backup using the SQL online backup API will no longer double the size of the database. [#19021] Implemented index optimizations for indexes on large values. [#19094] -Fixed a bug that could cause an undetected deadlock between a -thread which moved a metadata or root page via a DB->compact operation and -another thread trying to open the database if the old page was being removed +Fixed a bug that could cause an undetected deadlock between a +thread which moved a metadata or root page via a DB->compact operation and +another thread trying to open the database if the old page was being removed from the file. [#19186] -Fix a bug in the BDBSQL_FILE_PER_TABLE option, to allow absolute +Fix a bug in the BDBSQL_FILE_PER_TABLE option, to allow absolute path names. [#19190] Add a pragma to allow configuration of DB_SYSTEM_MEM environments. [#19249] -Exclusive transactions will now block new transactions and will prevent +Exclusive transactions will now block new transactions and will prevent existing transactions from making forward progress. [#19256] -Fixed a bug that would cause assert error when opening an in-memory hash -database with thread count configured when compiled with ---enable-diagnostic. [#19357] +Fixed a bug that would cause assert error when opening an in-memory hash +database with thread count configured when compiled with +--enable-diagnostic. [#19357] Upgrade the bundled version of SQLite to 3.7.6.2 [#19376] -Fixed a performance bug with the cache victim selection algorithm when there +Fixed a performance bug with the cache victim selection algorithm when there were multiple cache regions. [#19385] Fixed a bug which could cause two SQL threads to have an undetected deadlock when opening or closing tables. [#19386] -Fix a bug that could cause a hang when deleting a table if there are multiple +Fix a bug that could cause a hang when deleting a table if there are multiple connections to a database from different processes. [#19419] -Fixed a bug which could cause multiple threads performing DB->compact on -the same database file to overrun the in-memory freelist, which could +Fixed a bug which could cause multiple threads performing DB->compact on +the same database file to overrun the in-memory freelist, which could potentially lead to memory corruption. [#19571] -Fixed a bug in DB->compact that could cause a loop if an attempt to move a +Fixed a bug in DB->compact that could cause a loop if an attempt to move a sub-database meta data page deadlocked. [#20028] == C API Changes == -Fixed a bug where encryption could not be enabled for individual databases +Fixed a bug where encryption could not be enabled for individual databases in an encrypted environment. [#18891] Removed two unused error codes, DB_NOSERVER_HOME and DB_NOSERVER_ID. [#18978] -Added a DB_DBT_READONLY flag so that users can pass in a non-usermem key -(DB_DBT_USERMEM) for get operations. [#19360] +Added a DB_DBT_READONLY flag so that users can pass in a non-usermem key +(DB_DBT_USERMEM) for get operations. [#19360] Fixed a bug in DB/DBC->get/pget that the partial flags are silently ignored with positional flags and return inconsistent DBT. [#19540] -Fixed a bug which prevented items from being deleted on a secondary -database. [#19573] +Fixed a bug which prevented items from being deleted on a secondary +database. [#19573] -Fixed a bug to correctly handle the DB_BUFFER_SMALL case on delete +Fixed a bug to correctly handle the DB_BUFFER_SMALL case on delete operations when compression is enabled. [#19660] - + == Tcl-specific API Changes == -None. - +None. + == C#-specific API Changes == @@ -224,10 +290,10 @@ transactions. [#17497] Changed election criteria so that later group transactions won't get overwritten by earlier generations with more log. [#17815] -Added changes to master lease checks that result in improved +Added changes to master lease checks that result in improved performance when using master leases. [#18960] -A log write failure on a replication master will now cause +A log write failure on a replication master will now cause a panic since the transaction may be committed on some clients. [#19054] Fixed a few memory leak conditions on error paths. [#19131] @@ -235,8 +301,8 @@ Fixed a few memory leak conditions on error paths. [#19131] Change lease code so that zero priority sites do not count in lease guarantees since they cannot be elected. [#19154] -Repmgr rerequest processing is moved from a dedicated thread to heartbeat -messages. Repmgr clients using heartbeats can now detect and rerequest +Repmgr rerequest processing is moved from a dedicated thread to heartbeat +messages. Repmgr clients using heartbeats can now detect and rerequest missing final master log records without master activity. [#19197] Repmgr statistics are now included in full statistics output for @@ -266,7 +332,7 @@ Fixed a bug that could cause a crash in replication groups of more than 10 sites, with multiple processes sharing each DB environment concurrently. [#19818] -Fix a bug where an assertion failure could happen if pages in a database +Fix a bug where an assertion failure could happen if pages in a database were deallocated during a client internal initialization.[#19851] Fix a bug where an internal initialization of a queue database with @@ -281,41 +347,41 @@ need for application activity. [#19950] == Locking Subsystem Changes == -Fixed a bug where an updater supporting DB_READ_UNCOMMITED might downgrade +Fixed a bug where an updater supporting DB_READ_UNCOMMITED might downgrade its lock too soon if there was an error during the update. [#19155] -Fixed a bug where transaction timeouts could have been specified in a +Fixed a bug where transaction timeouts could have been specified in a database environment where the locking subsystem was disabled. [#19582] -Fixed a bug in a diagnostic assertion that was improperly triggered by the +Fixed a bug in a diagnostic assertion that was improperly triggered by the removal of a sub-database. [#19683] -Fixed a bug that would cause DB_ENV->failcheck to free locks for a locker -associated with a database handle after the thread that opened the handle +Fixed a bug that would cause DB_ENV->failcheck to free locks for a locker +associated with a database handle after the thread that opened the handle exited. [#19881] == Logging Subsystem Changes == -Enhanced recovery so that it will not output extra checkpoint or transaction -id recycle log records if there was no activity since the last +Enhanced recovery so that it will not output extra checkpoint or transaction +id recycle log records if there was no activity since the last checkpoint. [#15330] -Log checksums can now be disabled using the compile argument ---disable-log-checksum. This will give a performance increase at the risk -of undetectable corruption in the log records, which would make recovery +Log checksums can now be disabled using the compile argument +--disable-log-checksum. This will give a performance increase at the risk +of undetectable corruption in the log records, which would make recovery impossible. [#19143] -Fixed a bug that could cause a page that should have been removed from the +Fixed a bug that could cause a page that should have been removed from the end of a file still be in the copy of the file in a hot backup. [#19996] == Memory Pool Subsystem Changes == -Fixed a bug in MPOOLFILE->get that did not permit the DB_MPOOL_DIRTY flag +Fixed a bug in MPOOLFILE->get that did not permit the DB_MPOOL_DIRTY flag to be used with other flags. [#19421] == Mutex Subsystem Changes == -Fixed a bug when the mutex region needs to be larger than 4GB, the region size +Fixed a bug when the mutex region needs to be larger than 4GB, the region size was incorrectly adjusted to be slightly too small to fit the mutexes. [#18968] Fixed a performance problem with hybrid shared latches in which a request for @@ -332,16 +398,16 @@ which might result in a hang. [#19047] == Transaction Subsystem Changes == -Fixed a leak of log file ids when a database is closed before the end of a +Fixed a leak of log file ids when a database is closed before the end of a transaction that references it. [#15957] -Fixed a bug that would cause a panic if a child transaction performed a database +Fixed a bug that would cause a panic if a child transaction performed a database rename, then aborted, and then the parent transaction committed. [#18069] Fixed a bug where we released the metadata page lock too early if a non-transactional update was being done. [#19036] -Removed the possibility that checkpoints will overlap in the log, decreasing +Removed the possibility that checkpoints will overlap in the log, decreasing the time to recover. [#19062] @@ -354,29 +420,29 @@ Require Tcl 8.5 or greater. Added a new utility, db_tuner, which analyzes the data in a btree database, and suggests a reasonable pagesize. [#18910] -Fixed some bugs in log_verify when there are in-memory database logs and subdb +Fixed some bugs in log_verify when there are in-memory database logs and subdb logs. [#19157] -Modified db_hotbackup to not read from the file system as required on non-UNIX +Modified db_hotbackup to not read from the file system as required on non-UNIX systems. Also provided the db_copy function for this purpose. [#19863] -Fixed db_hotbackup so that when -d/-l or -D is not specified, DB_CONFIG is -used to determine the locations of the databases and logs in the source +Fixed db_hotbackup so that when -d/-l or -D is not specified, DB_CONFIG is +used to determine the locations of the databases and logs in the source environment. [#19994] == Configuration, Documentation, Sample Apps, Portability and Build Changes == -Changed SQL API library built on *nix to link with libpthreads when +Changed SQL API library built on *nix to link with libpthreads when necessary. [#19098] Added CPPFLAGS into our --enable-jdbc configuration. [#19234] Added encryption support into the Windows CE build project for SQL API. [#19632] -Fixed a bug in the STAT_INC_VERB() dtrace probe that was causing compiler +Fixed a bug in the STAT_INC_VERB() dtrace probe that was causing compiler warnings. [#19707] -Fixed a bug that could cause a trap in db_dump using salvage mode if a +Fixed a bug that could cause a trap in db_dump using salvage mode if a page was found that was not associated with any database in the file. [#19974] On Cygwin, circumvented a bug in libtool that is exposed when building the @@ -386,7 +452,7 @@ BDB SQL API in a directory path containing whitespace characters. [#19812] Update repmgr C, C#, C++, Java examples(ex_rep_mgr, ex_rep_gsg_repmgr, ex_rep_chan, excs_repquote, excxx_repquote, excxx_epquote_gsg, repquote, -repquote_gsg) with their related API changes for group +repquote_gsg) with their related API changes for group membership. [#19586][#19622] Port ex_rep_chan, ex_rep_gsg_repmgr,ex_rep_gsg_simple, @@ -403,24 +469,18 @@ None == Known Bugs == -The SQL API has a known issue when using a blob field with a lot of content -and multiple concurrent connections to the database. [#19945] - -Rollback of a dropped table in the SQL layer contains a mutex leak, which -can consume all mutex resources if enough rollbacks of table drops are +Rollback of a dropped table in the SQL layer contains a mutex leak, which +can consume all mutex resources if enough rollbacks of table drops are performed. [#20077] The DB_CONFIG configuration parameters which specify path names currently do not support names containing any whitespace characters. [#20158] -The BFile module has a known crash issue when using BFile handle for SQL -expressions interface on 64bit platforms. [#20193] - -On systems without FTRUNCATE, db_verify will return an error for truncated -heap databases. This is a bug in db_verify, the database has been truncated +On systems without FTRUNCATE, db_verify will return an error for truncated +heap databases. This is a bug in db_verify, the database has been truncated correctly and can be used in the future. [#20195] -An application using queue extents which is append mostly could see a -decrease in the buffer pool hit rate due to the failure to remove pages +An application using queue extents which is append mostly could see a +decrease in the buffer pool hit rate due to the failure to remove pages from closed extents from the buffer pool. [#20217] diff --git a/dist/Makefile.in b/dist/Makefile.in index 1ee35140..7fb1d6c3 100644 --- a/dist/Makefile.in +++ b/dist/Makefile.in @@ -1,6 +1,7 @@ # $Id$ topdir= @topdir@ +abs_topdir= @abs_topdir@ srcdir= $(topdir)/src langdir= $(topdir)/lang exampledir= $(topdir)/examples @@ -155,7 +156,7 @@ JAVA_EXCLASSTOP=./classes.ex JAVA_SRCDIR= $(langdir)/java/src JAVA_EXDIR= $(exampledir)/java/src JAVA_SLEEPYCAT= $(langdir)/java/src/com/sleepycat -JAVA_MANIFEST= $(langdir)/java/jarManifestEntries +JAVA_MANIFEST= $(abs_topdir)/lang/java/jarManifestEntries libj_jarfile= db.jar libj_exjarfile= dbexamples.jar @@ -967,7 +968,7 @@ $(libj_jarfile): $(JAVA_DBSRCS) $(JAVA) -classpath $(JAVA_CLASSTOP) \ com.sleepycat.persist.model.ClassEnhancer $(JAVA_CLASSTOP) cd $(JAVA_CLASSTOP) && \ - $(JAR) cfm ../$(libj_jarfile) ../$(JAVA_MANIFEST) ./com/sleepycat + $(JAR) cfm ../$(libj_jarfile) $(JAVA_MANIFEST) ./com/sleepycat $(libj_exjarfile): $(libj_jarfile) $(JAVA_EXSRCS) @test -d $(JAVA_EXCLASSTOP) || \ diff --git a/dist/RELEASE b/dist/RELEASE index 61670208..517ff181 100644 --- a/dist/RELEASE +++ b/dist/RELEASE @@ -5,12 +5,12 @@ DB_VERSION_LETTER="g" DB_VERSION_RELEASE=2 DB_VERSION_MAJOR=5 DB_VERSION_MINOR=2 -DB_VERSION_PATCH=28 +DB_VERSION_PATCH=36 DB_VERSION="$DB_VERSION_MAJOR.$DB_VERSION_MINOR.$DB_VERSION_PATCH" DB_VERSION_FULL="$DB_VERSION_FAMILY.$DB_VERSION_RELEASE.$DB_VERSION_MAJOR.$DB_VERSION_MINOR.$DB_VERSION_PATCH" DB_VERSION_UNIQUE_NAME=`printf "_%d%03d" $DB_VERSION_MAJOR $DB_VERSION_MINOR` -DB_RELEASE_DATE="June 10, 2011" +DB_RELEASE_DATE="September 14, 2011" DB_VERSION_STRING="Berkeley DB $DB_VERSION: ($DB_RELEASE_DATE)" DB_VERSION_FULL_STRING="Berkeley DB $DB_VERSION_FAMILY$DB_VERSION_LETTER Release $DB_VERSION_RELEASE, library version $DB_VERSION_FULL: ($DB_RELEASE_DATE)" diff --git a/dist/aclocal/sql.m4 b/dist/aclocal/sql.m4 index 89f34acd..f37545ee 100644 --- a/dist/aclocal/sql.m4 +++ b/dist/aclocal/sql.m4 @@ -90,8 +90,8 @@ esac # !!! END COPIED from autoconf distribution -sqlite_dir=$srcdir/../lang/sql/sqlite -(cd sql && eval "\$SHELL ../$sqlite_dir/configure --disable-option-checking $ac_sub_configure_args CPPFLAGS=\"-I.. $CPPFLAGS\" --enable-amalgamation=$db_cv_sql_amalgamation --enable-readline=$with_readline" && cat build_config.h >> config.h) || exit 1 +sqlite_dir=$abs_srcdir/../lang/sql/sqlite +(cd sql && eval "\$SHELL $sqlite_dir/configure --disable-option-checking $ac_sub_configure_args CPPFLAGS=\"-I.. $CPPFLAGS\" --enable-amalgamation=$db_cv_sql_amalgamation --enable-readline=$with_readline" && cat build_config.h >> config.h) || exit 1 # Configure JDBC if --enable-jdbc if test "$db_cv_jdbc" != "no"; then @@ -121,14 +121,15 @@ if test "$db_cv_jdbc" != "no"; then test "$prefix" != "" && jdbc_args="--prefix=$prefix --with-jardir=$prefix/jar" test "$enable_shared" != "" && jdbc_args="$jdbc_args --enable-shared=$enable_shared" test "$enable_static" != "" && jdbc_args="$jdbc_args --enable-static=$enable_static" + test "$cross_compiling" = yes && jdbc_args="$jdbc_args --build=$build --host=$host " # 1. The build directory is build_unix/jdbc, so the include paths are relative # to that. # 2. The JDBC driver does not accept CPPFLAGS. So we move the CPPFLAGS options # into CFLAGS for the JDBC driver. - jdbc_flags="$jdbc_flags CFLAGS=\"-I.. -I../../src/dbinc -I../sql \ - -DHAVE_ERRNO_H -D_HAVE_SQLITE_CONFIG_H -DHAVE_SQLITE3_MALLOC \ - $CFLAGS $CPPFLAGS\"" + jdbc_flags="$jdbc_flags HOST_CFLAGS=\"$HOST_CFLAGS\" \ + CFLAGS=\"-I.. -I../../src/dbinc -I../sql -DHAVE_ERRNO_H \ + -DHAVE_SQLITE_CONFIG_H -DHAVE_SQLITE3_MALLOC $CFLAGS $CPPFLAGS\"" # Set LDFLAGS for JDBC driver test "$LDFLAGS" != "" && jdbc_flags="$jdbc_flags LDFLAGS=\"$LDFLAGS\"" @@ -142,7 +143,15 @@ if test "$db_cv_jdbc" != "no"; then # Run the jdbc/configure cd jdbc test ! -e Makefile.in.tmp && mv Makefile.in Makefile.in.tmp - sed "s/@BDB_LIB@/$BDB_LIB/g" Makefile.in.tmp > Makefile.in - eval "\$SHELL ./configure --with-sqlite3=../../lang/sql/generated $jdbc_args $jdbc_flags" + # JAVAC_FLAGS - compiling jdbc - to be passed from configure + sed "{s/@BDB_LIB@/$BDB_LIB/g;s,@JAVAC_FLAGS@,$JAVAC_FLAGS,g}" \ + Makefile.in.tmp > Makefile.in + + echo "jdbc_path=$jdbc_path with_sqlite3=$with_sqlite3 \ + abs_srcdir=$abs_srcdir tmp=$tmp" + sqlite3_path="$abs_srcdir/../lang/sql/generated" + echo "\$SHELL ./configure --with-sqlite3=$sqlite3_path $jdbc_args $jdbc_flags" + eval "\$SHELL ./configure --with-sqlite3=$sqlite3_path $jdbc_args $jdbc_flags" + fi ]) diff --git a/dist/buildpkg b/dist/buildpkg index aa1b07cd..78cc95c3 100644 --- a/dist/buildpkg +++ b/dist/buildpkg @@ -57,8 +57,8 @@ START_DIR=`pwd` D=`pwd`/../release R="$D/db-${VERSION}" RNC="$D/db-$VERSION.NC" -DOCS=`pwd`/../../docs_books -DB_ADDONS=`pwd`/../../db_addons +DOCS=`pwd`/../../docs_books-5.2 +DB_ADDONS=`pwd`/../../db_addons-5.2 if [ ! -d $DB_ADDONS ]; then echo "buildpkg requires a db_addons repository at the same level as the db repository." diff --git a/dist/configure b/dist/configure index e28f2a38..dee998d3 100755 --- a/dist/configure +++ b/dist/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for Berkeley DB 5.2.28. +# Generated by GNU Autoconf 2.68 for Berkeley DB 5.2.36. # # Report bugs to . # @@ -569,9 +569,9 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='Berkeley DB' -PACKAGE_TARNAME='db-5.2.28' -PACKAGE_VERSION='5.2.28' -PACKAGE_STRING='Berkeley DB 5.2.28' +PACKAGE_TARNAME='db-5.2.36' +PACKAGE_VERSION='5.2.36' +PACKAGE_STRING='Berkeley DB 5.2.36' PACKAGE_BUGREPORT='Oracle Technology Network Berkeley DB forum' PACKAGE_URL='' @@ -716,6 +716,7 @@ DB_VERSION_RELEASE DB_VERSION_FAMILY platform_footer platform_header +abs_topdir topdir subdir_cmd o @@ -1439,7 +1440,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures Berkeley DB 5.2.28 to adapt to many kinds of systems. +\`configure' configures Berkeley DB 5.2.36 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1488,7 +1489,7 @@ Fine tuning of the installation directories: --localedir=DIR locale-dependent data [DATAROOTDIR/locale] --mandir=DIR man documentation [DATAROOTDIR/man] --docdir=DIR documentation root - [DATAROOTDIR/doc/db-5.2.28] + [DATAROOTDIR/doc/db-5.2.36] --htmldir=DIR html documentation [DOCDIR] --dvidir=DIR dvi documentation [DOCDIR] --pdfdir=DIR pdf documentation [DOCDIR] @@ -1510,7 +1511,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Berkeley DB 5.2.28:";; + short | recursive ) echo "Configuration of Berkeley DB 5.2.36:";; esac cat <<\_ACEOF @@ -1668,7 +1669,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Berkeley DB configure 5.2.28 +Berkeley DB configure 5.2.36 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2447,7 +2448,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Berkeley DB $as_me 5.2.28, which was +It was created by Berkeley DB $as_me 5.2.36, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2932,6 +2933,18 @@ fi $as_echo "no" >&6; } topdir=`echo "$srcdir/.." | sed 's,/dist/\.\.,,'` +# abs_srcdir: for relative building, jdbc configure-ing, +# use --with-sqlite3=$abs_srcdir/../lang/sql/generated +# rather than --with-sqlite3=../../lang/sql/generated which is correct only for in-place +# --with-sqlite3=$srcdir/../lang/sql/generated does not work for relative $srcdir +ac_pwd=`pwd`; cd $srcdir; abs_srcdir=`pwd`; cd $ac_pwd + +# abs_topdir: use it for JAVA_MANIFEST in Makefile; +# that's because $topdir could be either absolute or relative path, and +# - ../$(JAVA_MANIFEST) is wrong for absolute path $topdir +# - while for relative $topdir, one level back ../$(JAVA_MANIFEST) would needed +abs_topdir=`echo "$abs_srcdir/.." | sed 's,/dist/\.\.,,'` + # Substitution variables. BDB additions need to be documented. @@ -2992,6 +3005,7 @@ topdir=`echo "$srcdir/.." | sed 's,/dist/\.\.,,'` + # The Windows public header has two extra symbols we need to remove. @@ -3011,11 +3025,11 @@ DB_VERSION_MAJOR="5" DB_VERSION_MINOR="2" -DB_VERSION_PATCH="28" +DB_VERSION_PATCH="36" -DB_VERSION_STRING='"Berkeley DB 5.2.28: (June 10, 2011)"' +DB_VERSION_STRING='"Berkeley DB 5.2.36: (September 14, 2011)"' -DB_VERSION_FULL_STRING='"Berkeley DB 11g Release 2, library version 11.2.5.2.28: (June 10, 2011)"' +DB_VERSION_FULL_STRING='"Berkeley DB 11g Release 2, library version 11.2.5.2.36: (September 14, 2011)"' # Process all options before using them. @@ -17857,7 +17871,7 @@ else JAVA_TEST=Test.java CLASS_TEST=Test.class cat << \EOF > $JAVA_TEST -/* #line 17860 "configure" */ +/* #line 17874 "configure" */ public class Test { } EOF @@ -18120,7 +18134,7 @@ EOF if uudecode$EXEEXT Test.uue; then ac_cv_prog_uudecode_base64=yes else - echo "configure: 18123: uudecode had trouble decoding base 64 file 'Test.uue'" >&5 + echo "configure: 18137: uudecode had trouble decoding base 64 file 'Test.uue'" >&5 echo "configure: failed file was:" >&5 cat Test.uue >&5 ac_cv_prog_uudecode_base64=no @@ -18238,7 +18252,7 @@ else JAVA_TEST=Test.java CLASS_TEST=Test.class cat << \EOF > $JAVA_TEST -/* #line 18241 "configure" */ +/* #line 18255 "configure" */ public class Test { } EOF @@ -18273,7 +18287,7 @@ JAVA_TEST=Test.java CLASS_TEST=Test.class TEST=Test cat << \EOF > $JAVA_TEST -/* [#]line 18276 "configure" */ +/* [#]line 18290 "configure" */ public class Test { public static void main (String args[]) { System.exit (0); @@ -25211,7 +25225,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Berkeley DB $as_me 5.2.28, which was +This file was extended by Berkeley DB $as_me 5.2.36, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -25277,7 +25291,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -Berkeley DB config.status 5.2.28 +Berkeley DB config.status 5.2.36 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" @@ -27276,8 +27290,8 @@ esac # !!! END COPIED from autoconf distribution -sqlite_dir=$srcdir/../lang/sql/sqlite -(cd sql && eval "\$SHELL ../$sqlite_dir/configure --disable-option-checking $ac_sub_configure_args CPPFLAGS=\"-I.. $CPPFLAGS\" --enable-amalgamation=$db_cv_sql_amalgamation --enable-readline=$with_readline" && cat build_config.h >> config.h) || exit 1 +sqlite_dir=$abs_srcdir/../lang/sql/sqlite +(cd sql && eval "\$SHELL $sqlite_dir/configure --disable-option-checking $ac_sub_configure_args CPPFLAGS=\"-I.. $CPPFLAGS\" --enable-amalgamation=$db_cv_sql_amalgamation --enable-readline=$with_readline" && cat build_config.h >> config.h) || exit 1 # Configure JDBC if --enable-jdbc if test "$db_cv_jdbc" != "no"; then @@ -27307,14 +27321,15 @@ if test "$db_cv_jdbc" != "no"; then test "$prefix" != "" && jdbc_args="--prefix=$prefix --with-jardir=$prefix/jar" test "$enable_shared" != "" && jdbc_args="$jdbc_args --enable-shared=$enable_shared" test "$enable_static" != "" && jdbc_args="$jdbc_args --enable-static=$enable_static" + test "$cross_compiling" = yes && jdbc_args="$jdbc_args --build=$build --host=$host " # 1. The build directory is build_unix/jdbc, so the include paths are relative # to that. # 2. The JDBC driver does not accept CPPFLAGS. So we move the CPPFLAGS options # into CFLAGS for the JDBC driver. - jdbc_flags="$jdbc_flags CFLAGS=\"-I.. -I../../src/dbinc -I../sql \ - -DHAVE_ERRNO_H -D_HAVE_SQLITE_CONFIG_H -DHAVE_SQLITE3_MALLOC \ - $CFLAGS $CPPFLAGS\"" + jdbc_flags="$jdbc_flags HOST_CFLAGS=\"$HOST_CFLAGS\" \ + CFLAGS=\"-I.. -I../../src/dbinc -I../sql -DHAVE_ERRNO_H \ + -DHAVE_SQLITE_CONFIG_H -DHAVE_SQLITE3_MALLOC $CFLAGS $CPPFLAGS\"" # Set LDFLAGS for JDBC driver test "$LDFLAGS" != "" && jdbc_flags="$jdbc_flags LDFLAGS=\"$LDFLAGS\"" @@ -27328,8 +27343,16 @@ if test "$db_cv_jdbc" != "no"; then # Run the jdbc/configure cd jdbc test ! -e Makefile.in.tmp && mv Makefile.in Makefile.in.tmp - sed "s/@BDB_LIB@/$BDB_LIB/g" Makefile.in.tmp > Makefile.in - eval "\$SHELL ./configure --with-sqlite3=../../lang/sql/generated $jdbc_args $jdbc_flags" + # JAVAC_FLAGS - compiling jdbc - to be passed from configure + sed "{s/@BDB_LIB@/$BDB_LIB/g;s,@JAVAC_FLAGS@,$JAVAC_FLAGS,g}" \ + Makefile.in.tmp > Makefile.in + + echo "jdbc_path=$jdbc_path with_sqlite3=$with_sqlite3 \ + abs_srcdir=$abs_srcdir tmp=$tmp" + sqlite3_path="$abs_srcdir/../lang/sql/generated" + echo "\$SHELL ./configure --with-sqlite3=$sqlite3_path $jdbc_args $jdbc_flags" + eval "\$SHELL ./configure --with-sqlite3=$sqlite3_path $jdbc_args $jdbc_flags" + fi fi diff --git a/dist/configure.ac b/dist/configure.ac index 1608c3b2..8421b85c 100644 --- a/dist/configure.ac +++ b/dist/configure.ac @@ -29,6 +29,18 @@ fi AC_MSG_RESULT(no) topdir=`echo "$srcdir/.." | sed 's,/dist/\.\.,,'` +# abs_srcdir: for relative building, jdbc configure-ing, +# use --with-sqlite3=$abs_srcdir/../lang/sql/generated +# rather than --with-sqlite3=../../lang/sql/generated which is correct only for in-place +# --with-sqlite3=$srcdir/../lang/sql/generated does not work for relative $srcdir +ac_pwd=`pwd`; cd $srcdir; abs_srcdir=`pwd`; cd $ac_pwd + +# abs_topdir: use it for JAVA_MANIFEST in Makefile; +# that's because $topdir could be either absolute or relative path, and +# - ../$(JAVA_MANIFEST) is wrong for absolute path $topdir +# - while for relative $topdir, one level back ../$(JAVA_MANIFEST) would needed +abs_topdir=`echo "$abs_srcdir/.." | sed 's,/dist/\.\.,,'` + # Substitution variables. BDB additions need to be documented. AC_SUBST(ADDITIONAL_INCS) AC_SUBST(ADDITIONAL_LANG) @@ -90,6 +102,7 @@ AC_SUBST(db_int_def) AC_SUBST(o) AC_SUBST(subdir_cmd) AC_SUBST(topdir) +AC_SUBST(abs_topdir) # The Windows public header has two extra symbols we need to remove. AC_SUBST(platform_header) diff --git a/dist/javasqlite-20110430/.IGNORE_ME b/dist/javasqlite-20110430/.IGNORE_ME deleted file mode 100644 index e69de29b..00000000 diff --git a/dist/s_docs b/dist/s_docs index d901944c..a7f12b6d 100755 --- a/dist/s_docs +++ b/dist/s_docs @@ -22,7 +22,7 @@ tmp_dir=$distdir/s_docs.tmp rm -rf $tmp_dir && mkdir $tmp_dir && mkdir $tmp_dir/logs if [ "$docs_dir" = "" ]; then - docs_dir=$rootdir/docs_books + docs_dir=$rootdir/docs_books-5.2 fi # Verify that the docs_books repository is where we expect it. @@ -90,14 +90,15 @@ cd $docs_dir/tools/buildBooks for book in DB_PROG_REF DB_REF_C DB_REF_CXX DB_REF_STL DB_REF_TCL \ DB_GSG_C DB_GSG_CXX DB_GSG_JAVA DB_REP_C DB_REP_CXX \ DB_REP_JAVA DB_COLLECTIONS DB_TXN_C DB_TXN_CXX DB_TXN_JAVA \ - DB_PORT DB_INSTALL DB_UPGRADE DB_SQL DB_SQL_ADO core_inmem_app; do + DB_PORT DB_INSTALL DB_UPGRADE DB_SQL DB_SQL_ADO \ + core_inmem_app core_mssgtxt; do case $book in DB_PROG_REF) HTML_OPTS="-x" PDF_OPTS= ;; - core_inmem_app) + core_*) HTML_OPTS="-a" PDF_OPTS="-a" ;; diff --git a/dist/s_sql_drivers b/dist/s_sql_drivers index e6456e94..25f195a3 100755 --- a/dist/s_sql_drivers +++ b/dist/s_sql_drivers @@ -36,7 +36,8 @@ else PKG_ROOT=../.. fi -DB_ADDONS_REPO=$PKG_ROOT/db_addons +#DB_ADDONS_REPO=$PKG_ROOT/db_addons +DB_ADDONS_REPO=$PKG_ROOT/db_addons-5.2 update_repo() { if [ ! -d $DB_ADDONS_REPO ]; then @@ -392,6 +393,35 @@ do rm ${f}.tmp done +# +# Don't build Designer and Linq by default -- users can build them +# as needed. +for sln in `ls *.sln` +do + # Dos to unix + sed 's/$\r//' $sln > ${sln}.tmp + + # Remove the projects from default building list + for project_name in "SQLite.Designer" "System.Data.SQLite.Linq" + do + project_id=`cat ${sln}.tmp | grep $project_name | head -n 1 | \ + awk -F '[{}]' '{print $4}'` + if [ "$project_id" != "" ]; then + sed -e "/{$project_id}\./d" ${sln}.tmp > ${sln} + cp ${sln} ${sln}.tmp + fi + done + + # Unix to dos + if [ "$is_cygwin" = "true" ]; then + # Unix to Dos for cygwin for sed behavior difference on cygwin + sed -e "s/$/\r/" ${sln}.tmp > $sln + else + cat ${sln}.tmp > $sln + fi + rm ${sln}.tmp +done + # # Generate WinCE edition for Solution files # diff --git a/dist/sqliteodbc-0.86/.IGNORE_ME b/dist/sqliteodbc-0.86/.IGNORE_ME deleted file mode 100644 index e69de29b..00000000 diff --git a/docs/gsg_txn/C/rwlocks1.jpg b/docs/gsg_txn/C/rwlocks1.jpg deleted file mode 100644 index 0fc88fd3..00000000 Binary files a/docs/gsg_txn/C/rwlocks1.jpg and /dev/null differ diff --git a/docs/gsg_txn/C/simplelock.jpg b/docs/gsg_txn/C/simplelock.jpg deleted file mode 100644 index 8dca4ad8..00000000 Binary files a/docs/gsg_txn/C/simplelock.jpg and /dev/null differ diff --git a/docs/gsg_txn/C/writeblock.jpg b/docs/gsg_txn/C/writeblock.jpg deleted file mode 100644 index 4b382b82..00000000 Binary files a/docs/gsg_txn/C/writeblock.jpg and /dev/null differ diff --git a/docs/gsg_txn/CXX/rwlocks1.jpg b/docs/gsg_txn/CXX/rwlocks1.jpg deleted file mode 100644 index 0fc88fd3..00000000 Binary files a/docs/gsg_txn/CXX/rwlocks1.jpg and /dev/null differ diff --git a/docs/gsg_txn/CXX/simplelock.jpg b/docs/gsg_txn/CXX/simplelock.jpg deleted file mode 100644 index 8dca4ad8..00000000 Binary files a/docs/gsg_txn/CXX/simplelock.jpg and /dev/null differ diff --git a/docs/gsg_txn/CXX/writeblock.jpg b/docs/gsg_txn/CXX/writeblock.jpg deleted file mode 100644 index 4b382b82..00000000 Binary files a/docs/gsg_txn/CXX/writeblock.jpg and /dev/null differ diff --git a/docs/gsg_txn/JAVA/rwlocks1.jpg b/docs/gsg_txn/JAVA/rwlocks1.jpg deleted file mode 100644 index 0fc88fd3..00000000 Binary files a/docs/gsg_txn/JAVA/rwlocks1.jpg and /dev/null differ diff --git a/docs/gsg_txn/JAVA/simplelock.jpg b/docs/gsg_txn/JAVA/simplelock.jpg deleted file mode 100644 index 8dca4ad8..00000000 Binary files a/docs/gsg_txn/JAVA/simplelock.jpg and /dev/null differ diff --git a/docs/gsg_txn/JAVA/writeblock.jpg b/docs/gsg_txn/JAVA/writeblock.jpg deleted file mode 100644 index 4b382b82..00000000 Binary files a/docs/gsg_txn/JAVA/writeblock.jpg and /dev/null differ diff --git a/lang/csharp/src/Internal/DbConstants.cs b/lang/csharp/src/Internal/DbConstants.cs index 76b204ee..d1cf1937 100644 --- a/lang/csharp/src/Internal/DbConstants.cs +++ b/lang/csharp/src/Internal/DbConstants.cs @@ -303,10 +303,10 @@ namespace BerkeleyDB.Internal { internal const uint DB_VERSION_MINOR = 2; internal const string DB_VERSION_MINOR_STR = "2"; internal const int DB_VERSION_MISMATCH = -30969; - internal const uint DB_VERSION_PATCH = 28; - internal const string DB_VERSION_PATCH_STR = "28"; - internal const string DB_VERSION_STRING = "Berkeley DB 5.2.28: June 10 2011 "; - internal const string DB_VERSION_FULL_STRING = "Berkeley DB 11g Release 2 library version 11.2.5.2.28: June 10 2011 "; + internal const uint DB_VERSION_PATCH = 36; + internal const string DB_VERSION_PATCH_STR = "36"; + internal const string DB_VERSION_STRING = "Berkeley DB 5.2.36: September 14 2011 "; + internal const string DB_VERSION_FULL_STRING = "Berkeley DB 11g Release 2 library version 11.2.5.2.36: September 14 2011 "; internal const uint DB_WRITECURSOR = 0x00000008; internal const uint DB_YIELDCPU = 0x00080000; internal const uint DB_USERCOPY_GETDATA = 0x00000001; diff --git a/lang/csharp/src/Properties/AssemblyInfo.cs b/lang/csharp/src/Properties/AssemblyInfo.cs index 07735a4a..e8c9787d 100644 --- a/lang/csharp/src/Properties/AssemblyInfo.cs +++ b/lang/csharp/src/Properties/AssemblyInfo.cs @@ -29,4 +29,4 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("5.2.28")] +[assembly: AssemblyVersion("5.2.36")] diff --git a/lang/java/libdb_java/db_java_wrap.c b/lang/java/libdb_java/db_java_wrap.c index f4b2a46f..b2e7f1ba 100644 --- a/lang/java/libdb_java/db_java_wrap.c +++ b/lang/java/libdb_java/db_java_wrap.c @@ -8638,10 +8638,14 @@ SWIGEXPORT jobject JNICALL Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1loc } - jresult = (*jenv)->NewObject(jenv, lock_stat_class, lock_stat_construct); - if (jresult != NULL) - __dbj_fill_lock_stat(jenv, jresult, result); - __os_ufree(NULL, result); + if (result == NULL) + jresult = NULL; + else { + jresult = (*jenv)->NewObject(jenv, lock_stat_class, lock_stat_construct); + if (jresult != NULL) + __dbj_fill_lock_stat(jenv, jresult, result); + __os_ufree(NULL, result); + } return jresult; } @@ -9436,10 +9440,14 @@ SWIGEXPORT jobject JNICALL Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1log } - jresult = (*jenv)->NewObject(jenv, log_stat_class, log_stat_construct); - if (jresult != NULL) - __dbj_fill_log_stat(jenv, jresult, result); - __os_ufree(NULL, result); + if (result == NULL) + jresult = NULL; + else { + jresult = (*jenv)->NewObject(jenv, log_stat_class, log_stat_construct); + if (jresult != NULL) + __dbj_fill_log_stat(jenv, jresult, result); + __os_ufree(NULL, result); + } return jresult; } @@ -9923,10 +9931,14 @@ SWIGEXPORT jobject JNICALL Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1mem } - jresult = (*jenv)->NewObject(jenv, mpool_stat_class, mpool_stat_construct); - if (jresult != NULL) - __dbj_fill_mpool_stat(jenv, jresult, result); - __os_ufree(NULL, result); + if (result == NULL) + jresult = NULL; + else { + jresult = (*jenv)->NewObject(jenv, mpool_stat_class, mpool_stat_construct); + if (jresult != NULL) + __dbj_fill_mpool_stat(jenv, jresult, result); + __os_ufree(NULL, result); + } return jresult; } @@ -9958,26 +9970,30 @@ SWIGEXPORT jobjectArray JNICALL Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv { int i, len; - len = 0; - while (result[len] != NULL) - len++; - jresult = (*jenv)->NewObjectArray(jenv, (jsize)len, - mpool_fstat_class, 0); - if (jresult == NULL) { - __os_ufree(NULL, result); - return 0; - } - for (i = 0; i < len; i++) { - jobject obj = (*jenv)->NewObject(jenv, mpool_fstat_class, - mpool_fstat_construct); - if (obj == NULL) { + if (result == NULL) + jresult = NULL; + else { + len = 0; + while (result[len] != NULL) + len++; + jresult = (*jenv)->NewObjectArray(jenv, (jsize)len, + mpool_fstat_class, 0); + if (jresult == NULL) { __os_ufree(NULL, result); - return 0; /* an exception is pending */ + return 0; } - (*jenv)->SetObjectArrayElement(jenv, jresult, i, obj); - __dbj_fill_mpool_fstat(jenv, obj, result[i]); + for (i = 0; i < len; i++) { + jobject obj = (*jenv)->NewObject(jenv, mpool_fstat_class, + mpool_fstat_construct); + if (obj == NULL) { + __os_ufree(NULL, result); + return 0; /* an exception is pending */ + } + (*jenv)->SetObjectArrayElement(jenv, jresult, i, obj); + __dbj_fill_mpool_fstat(jenv, obj, result[i]); + } + __os_ufree(NULL, result); } - __os_ufree(NULL, result); } return jresult; } @@ -10328,10 +10344,14 @@ SWIGEXPORT jobject JNICALL Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1mut } - jresult = (*jenv)->NewObject(jenv, mutex_stat_class, mutex_stat_construct); - if (jresult != NULL) - __dbj_fill_mutex_stat(jenv, jresult, result); - __os_ufree(NULL, result); + if (result == NULL) + jresult = NULL; + else { + jresult = (*jenv)->NewObject(jenv, mutex_stat_class, mutex_stat_construct); + if (jresult != NULL) + __dbj_fill_mutex_stat(jenv, jresult, result); + __os_ufree(NULL, result); + } return jresult; } @@ -10549,29 +10569,33 @@ SWIGEXPORT jobjectArray JNICALL Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv { int i, len; - len = 0; - while (result[len].txn != NULL) - len++; - jresult = (*jenv)->NewObjectArray(jenv, (jsize)len, dbpreplist_class, - NULL); - if (jresult == NULL) - return 0; /* an exception is pending */ - for (i = 0; i < len; i++) { - jobject jtxn = (*jenv)->NewObject(jenv, dbtxn_class, - dbtxn_construct, result[i].txn, JNI_FALSE); - jobject bytearr = (*jenv)->NewByteArray(jenv, - (jsize)sizeof(result[i].gid)); - jobject obj = (*jenv)->NewObject(jenv, dbpreplist_class, - dbpreplist_construct, jtxn, bytearr); - - if (jtxn == NULL || bytearr == NULL || obj == NULL) - return 0; /* An exception is pending */ - - (*jenv)->SetByteArrayRegion(jenv, bytearr, 0, - (jsize)sizeof(result[i].gid), (jbyte *)result[i].gid); - (*jenv)->SetObjectArrayElement(jenv, jresult, i, obj); + if (result == NULL) + jresult = NULL; + else { + len = 0; + while (result[len].txn != NULL) + len++; + jresult = (*jenv)->NewObjectArray(jenv, (jsize)len, dbpreplist_class, + NULL); + if (jresult == NULL) + return 0; /* an exception is pending */ + for (i = 0; i < len; i++) { + jobject jtxn = (*jenv)->NewObject(jenv, dbtxn_class, + dbtxn_construct, result[i].txn, JNI_FALSE); + jobject bytearr = (*jenv)->NewByteArray(jenv, + (jsize)sizeof(result[i].gid)); + jobject obj = (*jenv)->NewObject(jenv, dbpreplist_class, + dbpreplist_construct, jtxn, bytearr); + + if (jtxn == NULL || bytearr == NULL || obj == NULL) + return 0; /* An exception is pending */ + + (*jenv)->SetByteArrayRegion(jenv, bytearr, 0, + (jsize)sizeof(result[i].gid), (jbyte *)result[i].gid); + (*jenv)->SetObjectArrayElement(jenv, jresult, i, obj); + } + __os_ufree(NULL, result); } - __os_ufree(NULL, result); } return jresult; } @@ -10603,29 +10627,34 @@ SWIGEXPORT jobject JNICALL Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1txn { unsigned int i; jobjectArray actives; - jresult = (*jenv)->NewObject(jenv, txn_stat_class, txn_stat_construct); - if (jresult != NULL) - __dbj_fill_txn_stat(jenv, jresult, result); - actives = (*jenv)->NewObjectArray(jenv, (jsize)result->st_nactive, - txn_active_class, 0); - if (actives == NULL) { - __os_ufree(NULL, result); - return 0; - } - (*jenv)->SetObjectField(jenv, jresult, - txn_stat_st_txnarray_fid, actives); - for (i = 0; i < result->st_nactive; i++) { - jobject obj = (*jenv)->NewObject(jenv, txn_active_class, - txn_active_construct); - if (obj == NULL) { + if (result == NULL) + jresult = NULL; + else { + jresult = (*jenv)->NewObject(jenv, txn_stat_class, txn_stat_construct); + if (jresult != NULL) + __dbj_fill_txn_stat(jenv, jresult, result); + + actives = (*jenv)->NewObjectArray(jenv, (jsize)result->st_nactive, + txn_active_class, 0); + if (actives == NULL) { __os_ufree(NULL, result); - return 0; /* an exception is pending */ + return 0; } - (*jenv)->SetObjectArrayElement(jenv, actives, (jsize)i, obj); - __dbj_fill_txn_active(jenv, obj, &result->st_txnarray[i]); + (*jenv)->SetObjectField(jenv, jresult, + txn_stat_st_txnarray_fid, actives); + for (i = 0; i < result->st_nactive; i++) { + jobject obj = (*jenv)->NewObject(jenv, txn_active_class, + txn_active_construct); + if (obj == NULL) { + __os_ufree(NULL, result); + return 0; /* an exception is pending */ + } + (*jenv)->SetObjectArrayElement(jenv, actives, (jsize)i, obj); + __dbj_fill_txn_active(jenv, obj, &result->st_txnarray[i]); + } + __os_ufree(NULL, result); } - __os_ufree(NULL, result); } return jresult; } @@ -10984,10 +11013,14 @@ SWIGEXPORT jobject JNICALL Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1rep } - jresult = (*jenv)->NewObject(jenv, rep_stat_class, rep_stat_construct); - if (jresult != NULL) - __dbj_fill_rep_stat(jenv, jresult, result); - __os_ufree(NULL, result); + if (result == NULL) + jresult = NULL; + else { + jresult = (*jenv)->NewObject(jenv, rep_stat_class, rep_stat_construct); + if (jresult != NULL) + __dbj_fill_rep_stat(jenv, jresult, result); + __os_ufree(NULL, result); + } return jresult; } @@ -11583,10 +11616,14 @@ SWIGEXPORT jobject JNICALL Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1rep } - jresult = (*jenv)->NewObject(jenv, repmgr_stat_class, repmgr_stat_construct); - if (jresult != NULL) - __dbj_fill_repmgr_stat(jenv, jresult, result); - __os_ufree(NULL, result); + if (result == NULL) + jresult = NULL; + else { + jresult = (*jenv)->NewObject(jenv, repmgr_stat_class, repmgr_stat_construct); + if (jresult != NULL) + __dbj_fill_repmgr_stat(jenv, jresult, result); + __os_ufree(NULL, result); + } return jresult; } @@ -12390,10 +12427,14 @@ SWIGEXPORT jobject JNICALL Java_com_sleepycat_db_internal_db_1javaJNI_DbSequence } - jresult = (*jenv)->NewObject(jenv, seq_stat_class, seq_stat_construct); - if (jresult != NULL) - __dbj_fill_seq_stat(jenv, jresult, result); - __os_ufree(NULL, result); + if (result == NULL) + jresult = NULL; + else { + jresult = (*jenv)->NewObject(jenv, seq_stat_class, seq_stat_construct); + if (jresult != NULL) + __dbj_fill_seq_stat(jenv, jresult, result); + __os_ufree(NULL, result); + } return jresult; } diff --git a/lang/java/libdb_java/java_stat.i b/lang/java/libdb_java/java_stat.i index 975246d1..c186f085 100644 --- a/lang/java/libdb_java/java_stat.i +++ b/lang/java/libdb_java/java_stat.i @@ -38,10 +38,14 @@ %define JAVA_STAT_CLASS(_ctype, _jtype, _name) JAVA_TYPEMAP(_ctype, _jtype, jobject) %typemap(out) _ctype %{ - $result = (*jenv)->NewObject(jenv, _name##_class, _name##_construct); - if ($result != NULL) - __dbj_fill_##_name(jenv, $result, $1); - __os_ufree(NULL, $1); + if ($1 == NULL) + $result = NULL; + else { + $result = (*jenv)->NewObject(jenv, _name##_class, _name##_construct); + if ($result != NULL) + __dbj_fill_##_name(jenv, $result, $1); + __os_ufree(NULL, $1); + } %} %enddef @@ -66,26 +70,30 @@ JAVA_TYPEMAP(DB_MPOOL_FSTAT **, com.sleepycat.db.CacheFileStats[], jobjectArray) %typemap(out) DB_MPOOL_FSTAT ** { int i, len; - len = 0; - while ($1[len] != NULL) - len++; - $result = (*jenv)->NewObjectArray(jenv, (jsize)len, - mpool_fstat_class, 0); - if ($result == NULL) { - __os_ufree(NULL, $1); - return $null; - } - for (i = 0; i < len; i++) { - jobject obj = (*jenv)->NewObject(jenv, mpool_fstat_class, - mpool_fstat_construct); - if (obj == NULL) { + if ($1 == NULL) + $result = NULL; + else { + len = 0; + while ($1[len] != NULL) + len++; + $result = (*jenv)->NewObjectArray(jenv, (jsize)len, + mpool_fstat_class, 0); + if ($result == NULL) { __os_ufree(NULL, $1); - return $null; /* an exception is pending */ + return $null; } - (*jenv)->SetObjectArrayElement(jenv, $result, i, obj); - __dbj_fill_mpool_fstat(jenv, obj, $1[i]); + for (i = 0; i < len; i++) { + jobject obj = (*jenv)->NewObject(jenv, mpool_fstat_class, + mpool_fstat_construct); + if (obj == NULL) { + __os_ufree(NULL, $1); + return $null; /* an exception is pending */ + } + (*jenv)->SetObjectArrayElement(jenv, $result, i, obj); + __dbj_fill_mpool_fstat(jenv, obj, $1[i]); + } + __os_ufree(NULL, $1); } - __os_ufree(NULL, $1); } JAVA_STAT_CLASS(DB_MUTEX_STAT *, com.sleepycat.db.MutexStats, mutex_stat) @@ -96,29 +104,34 @@ JAVA_TYPEMAP(DB_TXN_STAT *, com.sleepycat.db.TransactionStats, jobject) %typemap(out) DB_TXN_STAT * { unsigned int i; jobjectArray actives; - $result = (*jenv)->NewObject(jenv, txn_stat_class, txn_stat_construct); - if ($result != NULL) - __dbj_fill_txn_stat(jenv, $result, $1); + + if ($1 == NULL) + $result = NULL; + else { + $result = (*jenv)->NewObject(jenv, txn_stat_class, txn_stat_construct); + if ($result != NULL) + __dbj_fill_txn_stat(jenv, $result, $1); - actives = (*jenv)->NewObjectArray(jenv, (jsize)$1->st_nactive, - txn_active_class, 0); - if (actives == NULL) { - __os_ufree(NULL, $1); - return $null; - } - (*jenv)->SetObjectField(jenv, $result, - txn_stat_st_txnarray_fid, actives); - for (i = 0; i < $1->st_nactive; i++) { - jobject obj = (*jenv)->NewObject(jenv, txn_active_class, - txn_active_construct); - if (obj == NULL) { + actives = (*jenv)->NewObjectArray(jenv, (jsize)$1->st_nactive, + txn_active_class, 0); + if (actives == NULL) { __os_ufree(NULL, $1); - return $null; /* an exception is pending */ + return $null; } - (*jenv)->SetObjectArrayElement(jenv, actives, (jsize)i, obj); - __dbj_fill_txn_active(jenv, obj, &$1->st_txnarray[i]); + (*jenv)->SetObjectField(jenv, $result, + txn_stat_st_txnarray_fid, actives); + for (i = 0; i < $1->st_nactive; i++) { + jobject obj = (*jenv)->NewObject(jenv, txn_active_class, + txn_active_construct); + if (obj == NULL) { + __os_ufree(NULL, $1); + return $null; /* an exception is pending */ + } + (*jenv)->SetObjectArrayElement(jenv, actives, (jsize)i, obj); + __dbj_fill_txn_active(jenv, obj, &$1->st_txnarray[i]); + } + __os_ufree(NULL, $1); } - __os_ufree(NULL, $1); } /* Db.stat return - special case */ diff --git a/lang/java/libdb_java/java_typemaps.i b/lang/java/libdb_java/java_typemaps.i index cd7674b3..31aacede 100644 --- a/lang/java/libdb_java/java_typemaps.i +++ b/lang/java/libdb_java/java_typemaps.i @@ -582,29 +582,33 @@ JAVA_TYPEMAP(DB_PREPLIST *, com.sleepycat.db.PreparedTransaction[], %typemap(out) DB_PREPLIST * { int i, len; - len = 0; - while ($1[len].txn != NULL) - len++; - $result = (*jenv)->NewObjectArray(jenv, (jsize)len, dbpreplist_class, - NULL); - if ($result == NULL) - return $null; /* an exception is pending */ - for (i = 0; i < len; i++) { - jobject jtxn = (*jenv)->NewObject(jenv, dbtxn_class, - dbtxn_construct, $1[i].txn, JNI_FALSE); - jobject bytearr = (*jenv)->NewByteArray(jenv, - (jsize)sizeof($1[i].gid)); - jobject obj = (*jenv)->NewObject(jenv, dbpreplist_class, - dbpreplist_construct, jtxn, bytearr); + if ($1 == NULL) + $result = NULL; + else { + len = 0; + while ($1[len].txn != NULL) + len++; + $result = (*jenv)->NewObjectArray(jenv, (jsize)len, dbpreplist_class, + NULL); + if ($result == NULL) + return $null; /* an exception is pending */ + for (i = 0; i < len; i++) { + jobject jtxn = (*jenv)->NewObject(jenv, dbtxn_class, + dbtxn_construct, $1[i].txn, JNI_FALSE); + jobject bytearr = (*jenv)->NewByteArray(jenv, + (jsize)sizeof($1[i].gid)); + jobject obj = (*jenv)->NewObject(jenv, dbpreplist_class, + dbpreplist_construct, jtxn, bytearr); + + if (jtxn == NULL || bytearr == NULL || obj == NULL) + return $null; /* An exception is pending */ - if (jtxn == NULL || bytearr == NULL || obj == NULL) - return $null; /* An exception is pending */ - - (*jenv)->SetByteArrayRegion(jenv, bytearr, 0, - (jsize)sizeof($1[i].gid), (jbyte *)$1[i].gid); - (*jenv)->SetObjectArrayElement(jenv, $result, i, obj); + (*jenv)->SetByteArrayRegion(jenv, bytearr, 0, + (jsize)sizeof($1[i].gid), (jbyte *)$1[i].gid); + (*jenv)->SetObjectArrayElement(jenv, $result, i, obj); + } + __os_ufree(NULL, $1); } - __os_ufree(NULL, $1); } JAVA_TYPEMAP(DB_LOCKREQ *, com.sleepycat.db.LockRequest[], jobjectArray) diff --git a/lang/java/src/com/sleepycat/db/Environment.java b/lang/java/src/com/sleepycat/db/Environment.java index 0619df61..d802804b 100644 --- a/lang/java/src/com/sleepycat/db/Environment.java +++ b/lang/java/src/com/sleepycat/db/Environment.java @@ -1867,5 +1867,5 @@ The release patch number. {@link com.sleepycat.db.Environment#openChannel Environment.openChannel} to create channel to send messages only to the master site. */ - int EID_MASTER = DbConstants.DB_EID_MASTER; + public static final int EID_MASTER = DbConstants.DB_EID_MASTER; } diff --git a/lang/java/src/com/sleepycat/db/internal/DbConstants.java b/lang/java/src/com/sleepycat/db/internal/DbConstants.java index 509f5502..7ec59c28 100644 --- a/lang/java/src/com/sleepycat/db/internal/DbConstants.java +++ b/lang/java/src/com/sleepycat/db/internal/DbConstants.java @@ -248,7 +248,7 @@ public interface DbConstants int DB_VERIFY = 0x00000002; int DB_VERSION_MAJOR = 5; int DB_VERSION_MINOR = 2; - int DB_VERSION_PATCH = 28; + int DB_VERSION_PATCH = 36; int DB_WRITECURSOR = 0x00000008; int DB_YIELDCPU = 0x00080000; } diff --git a/lang/sql/adapter/backup.c b/lang/sql/adapter/backup.c index df72fb69..a72a91d2 100644 --- a/lang/sql/adapter/backup.c +++ b/lang/sql/adapter/backup.c @@ -259,6 +259,8 @@ err: if (p != 0) { sqlite3_free(p->destName); if (p->fullName != 0) sqlite3_free(p->fullName); + if (p->tables != 0) + sqlite3_free(p->tables); sqlite3_free(p); p = NULL; } @@ -502,10 +504,13 @@ static int backupCleanup(sqlite3_backup *p) SQLITE_DEFAULT_CACHE_SIZE | SQLITE_OPEN_MAIN_DB, p->pDestDb->openFlags); p->pDestDb->aDb[p->iDb].pBt = p->pDest; - p->pDestDb->aDb[p->iDb].pSchema = - sqlite3SchemaGet(p->pDestDb, p->pDest); - if (!p->pDestDb->aDb[p->iDb].pSchema) - p->rc = SQLITE_NOMEM; + if (rc == SQLITE_OK) { + p->pDestDb->aDb[p->iDb].pSchema = + sqlite3SchemaGet(p->pDestDb, p->pDest); + if (!p->pDestDb->aDb[p->iDb].pSchema) + p->rc = SQLITE_NOMEM; + } else + p->pDestDb->aDb[p->iDb].pSchema = NULL; if (rc == SQLITE_OK) p->pDest->pBt->db_oflags |= DB_CREATE; /* diff --git a/lang/sql/adapter/btree.c b/lang/sql/adapter/btree.c index 0a4f13a6..6fc7007f 100644 --- a/lang/sql/adapter/btree.c +++ b/lang/sql/adapter/btree.c @@ -95,7 +95,9 @@ static int btreeCreateDataTable(Btree *, int, CACHED_DB **); static int btreeCreateSharedBtree( Btree *, const char *, u_int8_t *, sqlite3 *, int, storage_mode_t); static int btreeCreateTable(Btree *p, int *piTable, int flags); -static int btreeDbHandleIsLocked(Btree *p, CACHED_DB *cached_db); +static void btreeHandleDbError( + const DB_ENV *dbenv, const char *errpfx, const char *msg); +static int btreeDbHandleIsLocked(CACHED_DB *cached_db); static int btreeDbHandleLock(Btree *p, CACHED_DB *cached_db); static int btreeDbHandleUnlock(Btree *p, CACHED_DB *cached_db); static int btreeDecompressInt(const u_int8_t *buf, u_int64_t *i); @@ -103,6 +105,7 @@ static int btreeFindOrCreateDataTable(Btree *, int *, CACHED_DB **, int); static void btreeFreeSharedBtree(BtShared *p, int clear_cache); static int btreeGetSharedBtree( BtShared **, u_int8_t *, sqlite3 *, storage_mode_t, int); +static int btreeInvalidateHandleCache(Btree *p); static int btreeLoadBufferIntoTable(BtCursor *pCur); static int btreeMoveto(BtCursor *pCur, const void *pKey, i64 nKey, int bias, int *pRes); @@ -229,6 +232,9 @@ u_int32_t g_uid_next = 0; if (ret == DB_LOCK_DEADLOCK && pCur->isIncrblobHandle) {\ if (!pCur->wrFlag) \ pCur->pBtree->read_txn = NULL; \ + if (pCur->txn == pCur->pBtree->savepoint_txn) \ + pCur->pBtree->savepoint_txn = \ + pCur->pBtree->savepoint_txn->parent;\ pCur->txn->abort(pCur->txn); \ pCur->txn = NULL; \ return SQLITE_LOCKED; \ @@ -341,6 +347,55 @@ int closeDB(Btree *p, DB *dbp, u_int32_t flags) return ret; } +int btreeGetErrorFile(const BtShared *pBt, char *fname) { + int set; + + set = 0; + if (pBt != NULL) { + sqlite3_mutex_enter(pBt->mutex); + if (pBt->err_file != NULL) { + sqlite3_snprintf(BT_MAX_PATH, fname, + "%s", pBt->err_file); + set = 1; + } + sqlite3_mutex_leave(pBt->mutex); + } + if (set == 0) + return SQLITE_ERROR; + return (0); +} + +static void btreeHandleDbError( + const DB_ENV *dbenv, + const char *errpfx, + const char *msg +) { + BtShared *pBt; + FILE *fp; + char fname[BT_MAX_PATH]; + + pBt = (BtShared *)dbenv->app_private; + + /* Filter out harmless error messages. */ + if (strncmp(msg, "rename: database o", 18) == 0) + return; + + /* + * If error_file is set, flush the error to the error file. Else flush + * the error msg to stderr. + */ + if (btreeGetErrorFile(pBt, fname) == 0) + fp = fopen(fname, "a"); + else + fp = stderr; + + fprintf(fp, "%s:%s\n", errpfx, msg); + if (fp != stderr) { + fflush(fp); + fclose(fp); + } +} + /* * Used in cases where SQLITE_LOCKED should be returned instead of * SQLITE_BUSY. @@ -563,7 +618,7 @@ int btreeOpenMetaTables(Btree *p, int *pCreating) ret = db_env_create(&tmp_env, 0); if (ret != 0) goto err; - tmp_env->set_errfile(tmp_env, NULL); + tmp_env->set_errcall(tmp_env, NULL); if (pBt->encrypted) { ret = tmp_env->set_encrypt(tmp_env, pBt->encrypt_pwd, DB_ENCRYPT_AES); @@ -868,10 +923,8 @@ static void btreeFreeSharedBtree(BtShared *p, int clear_cache) sqlite3_free(p->full_name); if (p->orig_name != NULL) sqlite3_free(p->orig_name); - if (p->errfile_name != NULL) - sqlite3_free(p->errfile_name); - if (p->errfile != NULL) - fclose(p->errfile); + if (p->err_file != NULL) + sqlite3_free(p->err_file); sqlite3_free(p); } @@ -1310,6 +1363,8 @@ static int btreePrepareEnvironment(Btree *p) if ((ret = db_env_create(&pDbEnv, 0)) != 0) goto err; pDbEnv->set_errpfx(pDbEnv, pBt->full_name); + pDbEnv->app_private = pBt; + pDbEnv->set_errcall(pDbEnv, btreeHandleDbError); #ifndef BDBSQL_SINGLE_THREAD pDbEnv->set_flags(pDbEnv, DB_DATABASE_LOCKING, 1); pDbEnv->set_lk_detect(pDbEnv, DB_LOCK_DEFAULT); @@ -1364,6 +1419,8 @@ static int btreePrepareEnvironment(Btree *p) if ((ret = db_env_create(&pDbEnv, 0)) != 0) goto err; pDbEnv->set_errpfx(pDbEnv, ""); + pDbEnv->app_private = pBt; + pDbEnv->set_errcall(pDbEnv, btreeHandleDbError); pBt->env_oflags |= DB_CREATE | DB_INIT_TXN | DB_PRIVATE; /* @@ -1539,8 +1596,7 @@ int btreeOpenEnvironment(Btree *p, int needLock) (ret = pDbEnv->set_mp_pagesize(pDbEnv, pBt->pageSize)) != 0) goto err; pDbEnv->set_mp_mmapsize(pDbEnv, 0); - if (!pBt->errfile) - pDbEnv->set_errfile(pDbEnv, stderr); + pDbEnv->set_errcall(pDbEnv, btreeHandleDbError); if (pBt->dir_name != NULL) { createdDir = (__os_mkdir(NULL, pBt->dir_name, 0777) == 0); @@ -1928,7 +1984,7 @@ int sqlite3BtreeOpen( int flags, /* Options */ int vfsFlags) /* Flags passed through to VFS open */ { - Btree *p; + Btree *p, *next_btree; BtShared *pBt, *next_bt; int rc; sqlite3_mutex *mutexOpen; @@ -2043,6 +2099,21 @@ int sqlite3BtreeOpen( } } + /* Add this Btree object to the list of Btrees seen by the BtShared */ + for (next_btree = pBt->btrees; next_btree != NULL; + next_btree = next_btree->pNext) { + if (next_btree == p) + break; + } + if (next_btree == NULL) { + if (pBt->btrees == NULL) + pBt->btrees = p; + else { + p->pNext = pBt->btrees; + pBt->btrees->pPrev = p; + pBt->btrees = p; + } + } p->readonly = (p->vfsFlags & SQLITE_OPEN_READONLY) ? 1 : 0; *ppBtree = p; @@ -2245,6 +2316,7 @@ static int btreeCleanupCachedHandles(Btree *p, cleanup_mode_t cleanup) */ int sqlite3BtreeClose(Btree *p) { + Btree *next_btree; BtShared *pBt; int ret, rc, t_rc, t_ret; sqlite3_mutex *mutexOpen; @@ -2295,6 +2367,7 @@ int sqlite3BtreeClose(Btree *p) ret = pFamilyTxn->commit(pFamilyTxn, 0); pFamilyTxn = NULL; p->inTrans = TRANS_NONE; + p->txn_excl = 0; if (ret != 0 && rc == SQLITE_OK) rc = dberr2sqlite(ret); } @@ -2324,7 +2397,24 @@ int sqlite3BtreeClose(Btree *p) mutexOpen = sqlite3MutexAlloc(OPEN_MUTEX(pBt->dbStorage)); sqlite3_mutex_enter(mutexOpen); + /* Remove this pBt from the BtShared list of btrees. */ + for (next_btree = pBt->btrees; next_btree != NULL; + next_btree = next_btree->pNext) { + if (next_btree == p) { + if (next_btree == pBt->btrees) { + pBt->btrees = next_btree->pNext; + if (pBt->btrees != NULL) + pBt->btrees->pPrev = NULL; + } else { + p->pPrev->pNext = p->pNext; + if (p->pNext != NULL) + p->pNext->pPrev = p->pPrev; + } + } + } + if (--pBt->nRef == 0) { + assert (pBt->btrees == NULL); if (pBt->dbStorage == DB_STORE_NAMED) { /* Remove it from the linked list of shared envs. */ assert(pBt == g_shared_btrees || pBt->pPrevDb != NULL); @@ -2373,7 +2463,7 @@ int sqlite3BtreeClose(Btree *p) } #ifdef BDBSQL_SHARE_PRIVATE /* don't flush the cache; checkpoint has been done */ - pDbEnv->set_errfile(pDbEnv, NULL); + pDbEnv->set_errcall(pDbEnv, NULL); pDbEnv->set_flags(pDbEnv, DB_NOFLUSH, 1); #endif if ((t_ret = pDbEnv->close(pDbEnv, 0)) != 0 && ret == 0) @@ -2453,6 +2543,106 @@ int sqlite3BtreeSetSafetyLevel( return SQLITE_OK; } +/* + * If the schema version has changed since the last transaction we need to + * close all handles in the handle cache that aren't holding a handle lock. + * Ideally we could do this via the sqlite3ResetInternalSchema method + * but there is no obvious hook there, and.. since we do the GET_LOCKS + * call here, we need to close handles now or we can't tell if they need to be + * closed. + * TODO: We'll probably be best altering the sqlite code to make this work + * more efficiently. + */ +static int btreeInvalidateHandleCache(Btree *p) { + BtShared *pBt; + int cookie, i, rc, ret; + CACHED_DB *cached_db, **tables_to_close; + DB *dbp; + HashElem *e, *e_next; + u_int32_t flags; + + rc = ret = 0; + pBt = p->pBt; + + if (p->inTrans == TRANS_NONE && p->db != NULL && p->db->aDb != NULL) { + sqlite3BtreeGetMeta(p, BTREE_SCHEMA_VERSION, (u32 *)&cookie); + if (p->db->aDb[0].pSchema != NULL && + p->db->aDb[0].pSchema->schema_cookie != cookie) { + /* + * TODO: Is it possible that this function is called + * while already holding the mutex? Maybe from the + * sequence code. + */ + sqlite3_mutex_enter(pBt->mutex); + /* + * We can't call DB->close while holding the mutex, so + * record which handles we want to close and do the + * actual close after the mutex is released. + */ + for (e = sqliteHashFirst(&pBt->db_cache), i = 0; + e != NULL; e = sqliteHashNext(e), i++) {} + + if (i == 0) { + sqlite3_mutex_leave(pBt->mutex); + return (0); + } + + tables_to_close = + sqlite3_malloc(i * sizeof(CACHED_DB *)); + if (tables_to_close == NULL) { + sqlite3_mutex_leave(pBt->mutex); + return SQLITE_NOMEM; + } + memset(tables_to_close, 0, i * sizeof(CACHED_DB *)); + /* + * Ideally we'd be able to find out if the Berkeley DB + * fileid is still valid, but that's not currently + * simple, so close all handles. + */ + for (e = sqliteHashFirst(&pBt->db_cache), i = 0; + e != NULL; e = e_next) { + e_next = sqliteHashNext(e); + cached_db = sqliteHashData(e); + + /* Skip table name db and in memory tables. */ + if (cached_db == NULL || + strcmp(cached_db->key, "1") == 0 || + cached_db->dbp == NULL) + continue; + dbp = cached_db->dbp; + dbp->dbenv->get_open_flags(dbp->dbenv, &flags); + if (flags & DB_PRIVATE) + continue; + if (btreeDbHandleIsLocked(cached_db)) + continue; + tables_to_close[i++] = cached_db; + sqlite3HashInsert(&pBt->db_cache, + cached_db->key, + (int)strlen(cached_db->key), NULL); + } + sqlite3_mutex_leave(pBt->mutex); + for (i = 0; tables_to_close[i] != NULL; i++) { + cached_db = tables_to_close[i]; + dbp = cached_db->dbp; +#ifndef BDBSQL_SINGLE_THREAD + if (dbp->app_private != NULL) + sqlite3_free(dbp->app_private); +#endif + if ((ret = closeDB(p, dbp, DB_NOSYNC)) == 0 && + rc == SQLITE_OK) + rc = dberr2sqlite(ret); + if (cached_db->cookie != NULL) + sqlite3_free(cached_db->cookie); + sqlite3_free(cached_db); + } + sqlite3_free(tables_to_close); + if (rc != 0) + return (rc); + } + } + return (0); +} + /* ** Attempt to start a new transaction. A write-transaction is started if the ** second argument is true, otherwise a read-transaction. No-op if a @@ -2508,6 +2698,10 @@ int sqlite3BtreeBeginTrans(Btree *p, int wrflag) /* The btreeOpenEnvironment call might have updated pBt. */ pBt = p->pBt; } + + if ((rc = btreeInvalidateHandleCache(p)) != 0) + return (rc); + btreeCleanupCachedHandles(p, CLEANUP_GET_LOCKS); if (wrflag == 2) p->txn_excl = 1; @@ -2603,12 +2797,13 @@ int sqlite3BtreeCommitPhaseOne(Btree *p, const char *zMaster) */ int sqlite3BtreeCommitPhaseTwo(Btree *p, int bCleanup) { + Btree *next_btree; BtShared *pBt; DELETED_TABLE *dtable, *next; char *tableName, tableNameBuf[DBNAME_SIZE]; char *oldTableName, oldTableNameBuf[DBNAME_SIZE], *fileName; int needVacuum, rc, ret, t_rc; - int removeFlags; + int in_trans, removeFlags; u_int32_t defaultTxnPriority; #ifdef BDBSQL_SHARE_PRIVATE int deleted = 0; /* indicates tables were deleted */ @@ -2737,8 +2932,23 @@ next: if (ret != 0 && rc == SQLITE_OK) (t_rc = btreeLockSchema(p, LOCKMODE_NONE)) != SQLITE_OK && rc == SQLITE_OK) rc = t_rc; + + /* + * Only release the handle locks if no transactions are active + * in any Btree. + */ + in_trans = 0; + for (next_btree = pBt->btrees; next_btree != NULL; + next_btree = next_btree->pNext) { + if (next_btree->inTrans != TRANS_NONE) { + in_trans = 1; + break; + } + } + /* Drop any handle locks if this was the only active txn. */ - btreeCleanupCachedHandles(p, CLEANUP_DROP_LOCKS); + if (in_trans == 0) + btreeCleanupCachedHandles(p, CLEANUP_DROP_LOCKS); } if (needVacuum && rc == SQLITE_OK) @@ -3575,8 +3785,8 @@ static int btreeCloseCursor(BtCursor *pCur, int listRemove) } /* Incrblob write cursors have their own dedicated transactions. */ - if (pCur->isIncrblobHandle && - pCur->txn && pCur->wrFlag && pSavepointTxn) { + if (pCur->isIncrblobHandle && pCur->txn && pCur->wrFlag && + pSavepointTxn && pCur->txn != pSavepointTxn) { ret = pCur->txn->commit(pCur->txn, DB_TXN_NOSYNC); pCur->txn = 0; } @@ -6464,6 +6674,7 @@ int sqlite3BtreeSavepoint(Btree *p, int op, int iSavepoint) pMainTxn = pReadTxn = pSavepointTxn = NULL; p->nSavepoint = 0; p->inTrans = TRANS_NONE; + p->txn_excl = 0; /* pReadTxn is only NULL if the read txn is being aborted */ } else if (p->inTrans == TRANS_WRITE && pReadTxn) pSavepointTxn = txn->parent; @@ -6523,6 +6734,7 @@ int btreeGetUserTable(Btree *p, DB_TXN *pTxn, DB **pDb, int iTable) BtShared *pBt; DB *dbp; KeyInfo *keyInfo; + void *app; rc = SQLITE_OK; pBt = p->pBt; @@ -6570,7 +6782,11 @@ int btreeGetUserTable(Btree *p, DB_TXN *pTxn, DB **pDb, int iTable) *pDb = dbp; return rc; -err: dbp->close(dbp, 0); +err: app = dbp->app_private; + dbp->app_private = NULL; + dbp->close(dbp, 0); + if (app) + sqlite3DbFree(p->db, app); return MAP_ERR(rc, ret); } @@ -6795,7 +7011,7 @@ static int btreeDbHandleLock(Btree *p, CACHED_DB *cached_db) ret = 0; dbp = cached_db->dbp; - if (btreeDbHandleIsLocked(p, cached_db)) + if (btreeDbHandleIsLocked(cached_db)) return (0); /* Ensure we're going to ask for a reasonable lock. */ @@ -6826,14 +7042,14 @@ static int btreeDbHandleUnlock(Btree *p, CACHED_DB *cached_db) BtShared *pBt; pBt = p->pBt; - if (!btreeDbHandleIsLocked(p, cached_db)) + if (!btreeDbHandleIsLocked(cached_db)) return (0); cached_db->lock_mode = cached_db->dbp->handle_lock.mode; return (pDbEnv->lock_put(pDbEnv, &cached_db->dbp->handle_lock)); } -static int btreeDbHandleIsLocked(Btree *p, CACHED_DB *cached_db) +static int btreeDbHandleIsLocked(CACHED_DB *cached_db) { #define LOCK_INVALID 0 return (cached_db->dbp->handle_lock.off != LOCK_INVALID); @@ -7295,7 +7511,8 @@ static int openPrivateEnvironment(Btree *p, int startFamily) goto err; pDbEnv->set_mp_mmapsize(pDbEnv, 0); pDbEnv->set_mp_mtxcount(pDbEnv, pBt->mp_mutex_count); - pDbEnv->set_errfile(pDbEnv, stderr); + pDbEnv->app_private = pBt; + pDbEnv->set_errcall(pDbEnv, btreeHandleDbError); ret = pDbEnv->open(pDbEnv, pBt->dir_name, pBt->env_oflags, 0); /* There is no acceptable failure for this reopen. */ @@ -7404,11 +7621,11 @@ static int btreeReopenPrivateEnvironment(Btree *p) pBt->meta[idx].cached = 0; /* * close environment: - * - set the error file to nothing to quiet any errors + * - set the error call to nothing to quiet any errors * - set DB_NOFLUSH to prevent the cache from flushing * - ignore a DB_RUNRECOVERY error */ - pDbEnv->set_errfile(pDbEnv, NULL); + pDbEnv->set_errcall(pDbEnv, NULL); pDbEnv->set_flags(pDbEnv, DB_NOFLUSH, 1); if ((t_ret = pDbEnv->close(pDbEnv, 0)) != 0 && ret == 0) { if (t_ret != DB_RUNRECOVERY) /* ignore runrecovery */ diff --git a/lang/sql/adapter/btreeInt.h b/lang/sql/adapter/btreeInt.h index f21dd480..e225548e 100644 --- a/lang/sql/adapter/btreeInt.h +++ b/lang/sql/adapter/btreeInt.h @@ -157,6 +157,7 @@ typedef enum { NO_LSN_RESET, LSN_RESET_FILE } lsn_reset_t; /* Declarations for functions that are shared by adapter source files. */ void *btreeCreateIndexKey(BtCursor *pCur); +int btreeGetErrorFile(const BtShared *pBt, char *fname); Index *btreeGetIndex(Btree *p, int iTable); int btreeGetPageCount(Btree *p, int **tables, u32 *pageCount, DB_TXN *txn); int btreeGetUserTable(Btree *p, DB_TXN *pTxn, DB **pDb, int iTable); @@ -226,10 +227,9 @@ struct BtShared { char *full_name; char *short_name; /* A pointer into orig_name memory. */ char *orig_name; - char *errfile_name; + char *err_file; u_int8_t fileid[DB_FILE_ID_LEN]; char *encrypt_pwd; - FILE *errfile; lsn_reset_t lsn_reset; storage_mode_t dbStorage; u_int32_t env_oflags; @@ -281,6 +281,7 @@ struct BtShared { /* Fields used to maintain the linked list of shared objects. */ BtShared *pNextDb; BtShared *pPrevDb; + Btree *btrees; /* A linked list of btrees that have been opened in this BtShared. */ int nRef; int readonly; int repStartMaster; /* Start replication site as initial master? */ diff --git a/lang/sql/adapter/db_pragma.c b/lang/sql/adapter/db_pragma.c index 98afe1b3..41c31e99 100644 --- a/lang/sql/adapter/db_pragma.c +++ b/lang/sql/adapter/db_pragma.c @@ -693,55 +693,44 @@ int bdbsqlPragma(Parse *pParse, char *zLeft, char *zRight, int iDb) * current setting. */ } else if (sqlite3StrNICmp(zLeft, "bdbsql_error_file", 17) == 0) { - DB_ENV *dbenv; - char *errfile_name; + char filename[BT_MAX_PATH]; + char *err_file; btreeUpdateBtShared(pDb->pBt, 1); - dbenv = pDb->pBt->pBt->dbenv; - errfile_name = NULL; + err_file = NULL; if (zRight) { - FILE *errfile, *old_errfile; - - errfile = fopen(zRight, "a+"); - old_errfile = NULL; - - if (errfile == NULL) + FILE *tmpfile; + tmpfile = fopen(zRight, "a"); + if (tmpfile == NULL) sqlite3ErrorMsg(pParse, - "Can't open error file %s", zRight); + "Can't open error file %s", zRight); else { + fclose(tmpfile); sqlite3_mutex_enter(pBt->pBt->mutex); - old_errfile = pBt->pBt->errfile; - pBt->pBt->errfile = errfile; - dbenv->set_errfile(dbenv, errfile); - sqlite3_free(pBt->pBt->errfile_name); - pBt->pBt->errfile_name = - sqlite3DbStrDup(0, zRight); + sqlite3_free(pBt->pBt->err_file); + pBt->pBt->err_file = + sqlite3_mprintf("%s", zRight); sqlite3_mutex_leave(pBt->pBt->mutex); - - if (old_errfile) - fclose(old_errfile); - errfile_name = zRight; + err_file = zRight; } } - if (errfile_name == NULL) { - sqlite3_mutex_enter(pBt->pBt->mutex); - errfile_name = - sqlite3DbStrDup(0, pBt->pBt->errfile_name); - sqlite3_mutex_leave(pBt->pBt->mutex); - if (!errfile_name) - errfile_name = sqlite3DbStrDup(0, "Default"); + if (err_file == NULL) { + err_file = filename; + if (btreeGetErrorFile(pDb->pBt->pBt, err_file) != 0) + err_file = "stderr"; } - sqlite3VdbeSetNumCols(pParse->pVdbe, 1); sqlite3VdbeSetColName(pParse->pVdbe, 0, COLNAME_NAME, zLeft, SQLITE_STATIC); - sqlite3VdbeAddOp4(pParse->pVdbe, OP_String8, 0, 1, 0, - errfile_name, 0); + if (err_file) + sqlite3VdbeAddOp4(pParse->pVdbe, OP_String8, 0, 1, 0, + err_file, 0); + else + sqlite3VdbeAddOp4(pParse->pVdbe, OP_String8, 0, 1, 0, + "NULL", 0); sqlite3VdbeAddOp2(pParse->pVdbe, OP_ResultRow, 1, 1); - if (errfile_name != zRight) - sqlite3_free(errfile_name); parsed = 1; } /* Return semantics to match strcmp. */ diff --git a/lang/sql/generated/sqlite3.c b/lang/sql/generated/sqlite3.c index 14306b45..8aa99df0 100644 --- a/lang/sql/generated/sqlite3.c +++ b/lang/sql/generated/sqlite3.c @@ -34605,6 +34605,7 @@ typedef enum { NO_LSN_RESET, LSN_RESET_FILE } lsn_reset_t; /* Declarations for functions that are shared by adapter source files. */ void *btreeCreateIndexKey(BtCursor *pCur); +int btreeGetErrorFile(const BtShared *pBt, char *fname); Index *btreeGetIndex(Btree *p, int iTable); int btreeGetPageCount(Btree *p, int **tables, u32 *pageCount, DB_TXN *txn); int btreeGetUserTable(Btree *p, DB_TXN *pTxn, DB **pDb, int iTable); @@ -34674,10 +34675,9 @@ struct BtShared { char *full_name; char *short_name; /* A pointer into orig_name memory. */ char *orig_name; - char *errfile_name; + char *err_file; u_int8_t fileid[DB_FILE_ID_LEN]; char *encrypt_pwd; - FILE *errfile; lsn_reset_t lsn_reset; storage_mode_t dbStorage; u_int32_t env_oflags; @@ -34729,6 +34729,7 @@ struct BtShared { /* Fields used to maintain the linked list of shared objects. */ BtShared *pNextDb; BtShared *pPrevDb; + Btree *btrees; /* A linked list of btrees that have been opened in this BtShared. */ int nRef; int readonly; int repStartMaster; /* Start replication site as initial master? */ @@ -35257,7 +35258,9 @@ static int btreeCreateDataTable(Btree *, int, CACHED_DB **); static int btreeCreateSharedBtree( Btree *, const char *, u_int8_t *, sqlite3 *, int, storage_mode_t); static int btreeCreateTable(Btree *p, int *piTable, int flags); -static int btreeDbHandleIsLocked(Btree *p, CACHED_DB *cached_db); +static void btreeHandleDbError( + const DB_ENV *dbenv, const char *errpfx, const char *msg); +static int btreeDbHandleIsLocked(CACHED_DB *cached_db); static int btreeDbHandleLock(Btree *p, CACHED_DB *cached_db); static int btreeDbHandleUnlock(Btree *p, CACHED_DB *cached_db); static int btreeDecompressInt(const u_int8_t *buf, u_int64_t *i); @@ -35265,6 +35268,7 @@ static int btreeFindOrCreateDataTable(Btree *, int *, CACHED_DB **, int); static void btreeFreeSharedBtree(BtShared *p, int clear_cache); static int btreeGetSharedBtree( BtShared **, u_int8_t *, sqlite3 *, storage_mode_t, int); +static int btreeInvalidateHandleCache(Btree *p); static int btreeLoadBufferIntoTable(BtCursor *pCur); static int btreeMoveto(BtCursor *pCur, const void *pKey, i64 nKey, int bias, int *pRes); @@ -35391,6 +35395,9 @@ u_int32_t g_uid_next = 0; if (ret == DB_LOCK_DEADLOCK && pCur->isIncrblobHandle) {\ if (!pCur->wrFlag) \ pCur->pBtree->read_txn = NULL; \ + if (pCur->txn == pCur->pBtree->savepoint_txn) \ + pCur->pBtree->savepoint_txn = \ + pCur->pBtree->savepoint_txn->parent;\ pCur->txn->abort(pCur->txn); \ pCur->txn = NULL; \ return SQLITE_LOCKED; \ @@ -35503,6 +35510,55 @@ int closeDB(Btree *p, DB *dbp, u_int32_t flags) return ret; } +int btreeGetErrorFile(const BtShared *pBt, char *fname) { + int set; + + set = 0; + if (pBt != NULL) { + sqlite3_mutex_enter(pBt->mutex); + if (pBt->err_file != NULL) { + sqlite3_snprintf(BT_MAX_PATH, fname, + "%s", pBt->err_file); + set = 1; + } + sqlite3_mutex_leave(pBt->mutex); + } + if (set == 0) + return SQLITE_ERROR; + return (0); +} + +static void btreeHandleDbError( + const DB_ENV *dbenv, + const char *errpfx, + const char *msg +) { + BtShared *pBt; + FILE *fp; + char fname[BT_MAX_PATH]; + + pBt = (BtShared *)dbenv->app_private; + + /* Filter out harmless error messages. */ + if (strncmp(msg, "rename: database o", 18) == 0) + return; + + /* + * If error_file is set, flush the error to the error file. Else flush + * the error msg to stderr. + */ + if (btreeGetErrorFile(pBt, fname) == 0) + fp = fopen(fname, "a"); + else + fp = stderr; + + fprintf(fp, "%s:%s\n", errpfx, msg); + if (fp != stderr) { + fflush(fp); + fclose(fp); + } +} + /* * Used in cases where SQLITE_LOCKED should be returned instead of * SQLITE_BUSY. @@ -35725,7 +35781,7 @@ int btreeOpenMetaTables(Btree *p, int *pCreating) ret = db_env_create(&tmp_env, 0); if (ret != 0) goto err; - tmp_env->set_errfile(tmp_env, NULL); + tmp_env->set_errcall(tmp_env, NULL); if (pBt->encrypted) { ret = tmp_env->set_encrypt(tmp_env, pBt->encrypt_pwd, DB_ENCRYPT_AES); @@ -36030,10 +36086,8 @@ static void btreeFreeSharedBtree(BtShared *p, int clear_cache) sqlite3_free(p->full_name); if (p->orig_name != NULL) sqlite3_free(p->orig_name); - if (p->errfile_name != NULL) - sqlite3_free(p->errfile_name); - if (p->errfile != NULL) - fclose(p->errfile); + if (p->err_file != NULL) + sqlite3_free(p->err_file); sqlite3_free(p); } @@ -36472,6 +36526,8 @@ static int btreePrepareEnvironment(Btree *p) if ((ret = db_env_create(&pDbEnv, 0)) != 0) goto err; pDbEnv->set_errpfx(pDbEnv, pBt->full_name); + pDbEnv->app_private = pBt; + pDbEnv->set_errcall(pDbEnv, btreeHandleDbError); #ifndef BDBSQL_SINGLE_THREAD pDbEnv->set_flags(pDbEnv, DB_DATABASE_LOCKING, 1); pDbEnv->set_lk_detect(pDbEnv, DB_LOCK_DEFAULT); @@ -36526,6 +36582,8 @@ static int btreePrepareEnvironment(Btree *p) if ((ret = db_env_create(&pDbEnv, 0)) != 0) goto err; pDbEnv->set_errpfx(pDbEnv, ""); + pDbEnv->app_private = pBt; + pDbEnv->set_errcall(pDbEnv, btreeHandleDbError); pBt->env_oflags |= DB_CREATE | DB_INIT_TXN | DB_PRIVATE; /* @@ -36701,8 +36759,7 @@ int btreeOpenEnvironment(Btree *p, int needLock) (ret = pDbEnv->set_mp_pagesize(pDbEnv, pBt->pageSize)) != 0) goto err; pDbEnv->set_mp_mmapsize(pDbEnv, 0); - if (!pBt->errfile) - pDbEnv->set_errfile(pDbEnv, stderr); + pDbEnv->set_errcall(pDbEnv, btreeHandleDbError); if (pBt->dir_name != NULL) { createdDir = (__os_mkdir(NULL, pBt->dir_name, 0777) == 0); @@ -37090,7 +37147,7 @@ SQLITE_PRIVATE int sqlite3BtreeOpen( int flags, /* Options */ int vfsFlags) /* Flags passed through to VFS open */ { - Btree *p; + Btree *p, *next_btree; BtShared *pBt, *next_bt; int rc; sqlite3_mutex *mutexOpen; @@ -37205,6 +37262,21 @@ SQLITE_PRIVATE int sqlite3BtreeOpen( } } + /* Add this Btree object to the list of Btrees seen by the BtShared */ + for (next_btree = pBt->btrees; next_btree != NULL; + next_btree = next_btree->pNext) { + if (next_btree == p) + break; + } + if (next_btree == NULL) { + if (pBt->btrees == NULL) + pBt->btrees = p; + else { + p->pNext = pBt->btrees; + pBt->btrees->pPrev = p; + pBt->btrees = p; + } + } p->readonly = (p->vfsFlags & SQLITE_OPEN_READONLY) ? 1 : 0; *ppBtree = p; @@ -37407,6 +37479,7 @@ static int btreeCleanupCachedHandles(Btree *p, cleanup_mode_t cleanup) */ SQLITE_PRIVATE int sqlite3BtreeClose(Btree *p) { + Btree *next_btree; BtShared *pBt; int ret, rc, t_rc, t_ret; sqlite3_mutex *mutexOpen; @@ -37457,6 +37530,7 @@ SQLITE_PRIVATE int sqlite3BtreeClose(Btree *p) ret = pFamilyTxn->commit(pFamilyTxn, 0); pFamilyTxn = NULL; p->inTrans = TRANS_NONE; + p->txn_excl = 0; if (ret != 0 && rc == SQLITE_OK) rc = dberr2sqlite(ret); } @@ -37486,7 +37560,24 @@ SQLITE_PRIVATE int sqlite3BtreeClose(Btree *p) mutexOpen = sqlite3MutexAlloc(OPEN_MUTEX(pBt->dbStorage)); sqlite3_mutex_enter(mutexOpen); + /* Remove this pBt from the BtShared list of btrees. */ + for (next_btree = pBt->btrees; next_btree != NULL; + next_btree = next_btree->pNext) { + if (next_btree == p) { + if (next_btree == pBt->btrees) { + pBt->btrees = next_btree->pNext; + if (pBt->btrees != NULL) + pBt->btrees->pPrev = NULL; + } else { + p->pPrev->pNext = p->pNext; + if (p->pNext != NULL) + p->pNext->pPrev = p->pPrev; + } + } + } + if (--pBt->nRef == 0) { + assert (pBt->btrees == NULL); if (pBt->dbStorage == DB_STORE_NAMED) { /* Remove it from the linked list of shared envs. */ assert(pBt == g_shared_btrees || pBt->pPrevDb != NULL); @@ -37535,7 +37626,7 @@ SQLITE_PRIVATE int sqlite3BtreeClose(Btree *p) } #ifdef BDBSQL_SHARE_PRIVATE /* don't flush the cache; checkpoint has been done */ - pDbEnv->set_errfile(pDbEnv, NULL); + pDbEnv->set_errcall(pDbEnv, NULL); pDbEnv->set_flags(pDbEnv, DB_NOFLUSH, 1); #endif if ((t_ret = pDbEnv->close(pDbEnv, 0)) != 0 && ret == 0) @@ -37615,6 +37706,106 @@ SQLITE_PRIVATE int sqlite3BtreeSetSafetyLevel( return SQLITE_OK; } +/* + * If the schema version has changed since the last transaction we need to + * close all handles in the handle cache that aren't holding a handle lock. + * Ideally we could do this via the sqlite3ResetInternalSchema method + * but there is no obvious hook there, and.. since we do the GET_LOCKS + * call here, we need to close handles now or we can't tell if they need to be + * closed. + * TODO: We'll probably be best altering the sqlite code to make this work + * more efficiently. + */ +static int btreeInvalidateHandleCache(Btree *p) { + BtShared *pBt; + int cookie, i, rc, ret; + CACHED_DB *cached_db, **tables_to_close; + DB *dbp; + HashElem *e, *e_next; + u_int32_t flags; + + rc = ret = 0; + pBt = p->pBt; + + if (p->inTrans == TRANS_NONE && p->db != NULL && p->db->aDb != NULL) { + sqlite3BtreeGetMeta(p, BTREE_SCHEMA_VERSION, (u32 *)&cookie); + if (p->db->aDb[0].pSchema != NULL && + p->db->aDb[0].pSchema->schema_cookie != cookie) { + /* + * TODO: Is it possible that this function is called + * while already holding the mutex? Maybe from the + * sequence code. + */ + sqlite3_mutex_enter(pBt->mutex); + /* + * We can't call DB->close while holding the mutex, so + * record which handles we want to close and do the + * actual close after the mutex is released. + */ + for (e = sqliteHashFirst(&pBt->db_cache), i = 0; + e != NULL; e = sqliteHashNext(e), i++) {} + + if (i == 0) { + sqlite3_mutex_leave(pBt->mutex); + return (0); + } + + tables_to_close = + sqlite3_malloc(i * sizeof(CACHED_DB *)); + if (tables_to_close == NULL) { + sqlite3_mutex_leave(pBt->mutex); + return SQLITE_NOMEM; + } + memset(tables_to_close, 0, i * sizeof(CACHED_DB *)); + /* + * Ideally we'd be able to find out if the Berkeley DB + * fileid is still valid, but that's not currently + * simple, so close all handles. + */ + for (e = sqliteHashFirst(&pBt->db_cache), i = 0; + e != NULL; e = e_next) { + e_next = sqliteHashNext(e); + cached_db = sqliteHashData(e); + + /* Skip table name db and in memory tables. */ + if (cached_db == NULL || + strcmp(cached_db->key, "1") == 0 || + cached_db->dbp == NULL) + continue; + dbp = cached_db->dbp; + dbp->dbenv->get_open_flags(dbp->dbenv, &flags); + if (flags & DB_PRIVATE) + continue; + if (btreeDbHandleIsLocked(cached_db)) + continue; + tables_to_close[i++] = cached_db; + sqlite3HashInsert(&pBt->db_cache, + cached_db->key, + (int)strlen(cached_db->key), NULL); + } + sqlite3_mutex_leave(pBt->mutex); + for (i = 0; tables_to_close[i] != NULL; i++) { + cached_db = tables_to_close[i]; + dbp = cached_db->dbp; +#ifndef BDBSQL_SINGLE_THREAD + if (dbp->app_private != NULL) + sqlite3_free(dbp->app_private); +#endif + if ((ret = closeDB(p, dbp, DB_NOSYNC)) == 0 && + rc == SQLITE_OK) + rc = dberr2sqlite(ret); + if (cached_db->cookie != NULL) + sqlite3_free(cached_db->cookie); + sqlite3_free(cached_db); + } + sqlite3_free(tables_to_close); + if (rc != 0) + return (rc); + } + } + return (0); +} + /* ** Attempt to start a new transaction. A write-transaction is started if the ** second argument is true, otherwise a read-transaction. No-op if a @@ -37670,6 +37861,10 @@ SQLITE_PRIVATE int sqlite3BtreeBeginTrans(Btree *p, int wrflag) /* The btreeOpenEnvironment call might have updated pBt. */ pBt = p->pBt; } + + if ((rc = btreeInvalidateHandleCache(p)) != 0) + return (rc); + btreeCleanupCachedHandles(p, CLEANUP_GET_LOCKS); if (wrflag == 2) p->txn_excl = 1; @@ -37765,12 +37960,13 @@ SQLITE_PRIVATE int sqlite3BtreeCommitPhaseOne(Btree *p, const char *zMaster) */ SQLITE_PRIVATE int sqlite3BtreeCommitPhaseTwo(Btree *p, int bCleanup) { + Btree *next_btree; BtShared *pBt; DELETED_TABLE *dtable, *next; char *tableName, tableNameBuf[DBNAME_SIZE]; char *oldTableName, oldTableNameBuf[DBNAME_SIZE], *fileName; int needVacuum, rc, ret, t_rc; - int removeFlags; + int in_trans, removeFlags; u_int32_t defaultTxnPriority; #ifdef BDBSQL_SHARE_PRIVATE int deleted = 0; /* indicates tables were deleted */ @@ -37899,8 +38095,23 @@ next: if (ret != 0 && rc == SQLITE_OK) (t_rc = btreeLockSchema(p, LOCKMODE_NONE)) != SQLITE_OK && rc == SQLITE_OK) rc = t_rc; + + /* + * Only release the handle locks if no transactions are active + * in any Btree. + */ + in_trans = 0; + for (next_btree = pBt->btrees; next_btree != NULL; + next_btree = next_btree->pNext) { + if (next_btree->inTrans != TRANS_NONE) { + in_trans = 1; + break; + } + } + /* Drop any handle locks if this was the only active txn. */ - btreeCleanupCachedHandles(p, CLEANUP_DROP_LOCKS); + if (in_trans == 0) + btreeCleanupCachedHandles(p, CLEANUP_DROP_LOCKS); } if (needVacuum && rc == SQLITE_OK) @@ -38737,8 +38948,8 @@ static int btreeCloseCursor(BtCursor *pCur, int listRemove) } /* Incrblob write cursors have their own dedicated transactions. */ - if (pCur->isIncrblobHandle && - pCur->txn && pCur->wrFlag && pSavepointTxn) { + if (pCur->isIncrblobHandle && pCur->txn && pCur->wrFlag && + pSavepointTxn && pCur->txn != pSavepointTxn) { ret = pCur->txn->commit(pCur->txn, DB_TXN_NOSYNC); pCur->txn = 0; } @@ -41626,6 +41837,7 @@ SQLITE_PRIVATE int sqlite3BtreeSavepoint(Btree *p, int op, int iSavepoint) pMainTxn = pReadTxn = pSavepointTxn = NULL; p->nSavepoint = 0; p->inTrans = TRANS_NONE; + p->txn_excl = 0; /* pReadTxn is only NULL if the read txn is being aborted */ } else if (p->inTrans == TRANS_WRITE && pReadTxn) pSavepointTxn = txn->parent; @@ -41685,6 +41897,7 @@ int btreeGetUserTable(Btree *p, DB_TXN *pTxn, DB **pDb, int iTable) BtShared *pBt; DB *dbp; KeyInfo *keyInfo; + void *app; rc = SQLITE_OK; pBt = p->pBt; @@ -41732,7 +41945,11 @@ int btreeGetUserTable(Btree *p, DB_TXN *pTxn, DB **pDb, int iTable) *pDb = dbp; return rc; -err: dbp->close(dbp, 0); +err: app = dbp->app_private; + dbp->app_private = NULL; + dbp->close(dbp, 0); + if (app) + sqlite3DbFree(p->db, app); return MAP_ERR(rc, ret); } @@ -41957,7 +42174,7 @@ static int btreeDbHandleLock(Btree *p, CACHED_DB *cached_db) ret = 0; dbp = cached_db->dbp; - if (btreeDbHandleIsLocked(p, cached_db)) + if (btreeDbHandleIsLocked(cached_db)) return (0); /* Ensure we're going to ask for a reasonable lock. */ @@ -41988,14 +42205,14 @@ static int btreeDbHandleUnlock(Btree *p, CACHED_DB *cached_db) BtShared *pBt; pBt = p->pBt; - if (!btreeDbHandleIsLocked(p, cached_db)) + if (!btreeDbHandleIsLocked(cached_db)) return (0); cached_db->lock_mode = cached_db->dbp->handle_lock.mode; return (pDbEnv->lock_put(pDbEnv, &cached_db->dbp->handle_lock)); } -static int btreeDbHandleIsLocked(Btree *p, CACHED_DB *cached_db) +static int btreeDbHandleIsLocked(CACHED_DB *cached_db) { #define LOCK_INVALID 0 return (cached_db->dbp->handle_lock.off != LOCK_INVALID); @@ -42457,7 +42674,8 @@ static int openPrivateEnvironment(Btree *p, int startFamily) goto err; pDbEnv->set_mp_mmapsize(pDbEnv, 0); pDbEnv->set_mp_mtxcount(pDbEnv, pBt->mp_mutex_count); - pDbEnv->set_errfile(pDbEnv, stderr); + pDbEnv->app_private = pBt; + pDbEnv->set_errcall(pDbEnv, btreeHandleDbError); ret = pDbEnv->open(pDbEnv, pBt->dir_name, pBt->env_oflags, 0); /* There is no acceptable failure for this reopen. */ @@ -42566,11 +42784,11 @@ static int btreeReopenPrivateEnvironment(Btree *p) pBt->meta[idx].cached = 0; /* * close environment: - * - set the error file to nothing to quiet any errors + * - set the error call to nothing to quiet any errors * - set DB_NOFLUSH to prevent the cache from flushing * - ignore a DB_RUNRECOVERY error */ - pDbEnv->set_errfile(pDbEnv, NULL); + pDbEnv->set_errcall(pDbEnv, NULL); pDbEnv->set_flags(pDbEnv, DB_NOFLUSH, 1); if ((t_ret = pDbEnv->close(pDbEnv, 0)) != 0 && ret == 0) { if (t_ret != DB_RUNRECOVERY) /* ignore runrecovery */ @@ -43165,6 +43383,8 @@ err: if (p != 0) { sqlite3_free(p->destName); if (p->fullName != 0) sqlite3_free(p->fullName); + if (p->tables != 0) + sqlite3_free(p->tables); sqlite3_free(p); p = NULL; } @@ -43408,10 +43628,13 @@ static int backupCleanup(sqlite3_backup *p) SQLITE_DEFAULT_CACHE_SIZE | SQLITE_OPEN_MAIN_DB, p->pDestDb->openFlags); p->pDestDb->aDb[p->iDb].pBt = p->pDest; - p->pDestDb->aDb[p->iDb].pSchema = - sqlite3SchemaGet(p->pDestDb, p->pDest); - if (!p->pDestDb->aDb[p->iDb].pSchema) - p->rc = SQLITE_NOMEM; + if (rc == SQLITE_OK) { + p->pDestDb->aDb[p->iDb].pSchema = + sqlite3SchemaGet(p->pDestDb, p->pDest); + if (!p->pDestDb->aDb[p->iDb].pSchema) + p->rc = SQLITE_NOMEM; + } else + p->pDestDb->aDb[p->iDb].pSchema = NULL; if (rc == SQLITE_OK) p->pDest->pBt->db_oflags |= DB_CREATE; /* @@ -44723,55 +44946,44 @@ int bdbsqlPragma(Parse *pParse, char *zLeft, char *zRight, int iDb) * current setting. */ } else if (sqlite3StrNICmp(zLeft, "bdbsql_error_file", 17) == 0) { - DB_ENV *dbenv; - char *errfile_name; + char filename[BT_MAX_PATH]; + char *err_file; btreeUpdateBtShared(pDb->pBt, 1); - dbenv = pDb->pBt->pBt->dbenv; - errfile_name = NULL; + err_file = NULL; if (zRight) { - FILE *errfile, *old_errfile; - - errfile = fopen(zRight, "a+"); - old_errfile = NULL; - - if (errfile == NULL) + FILE *tmpfile; + tmpfile = fopen(zRight, "a"); + if (tmpfile == NULL) sqlite3ErrorMsg(pParse, - "Can't open error file %s", zRight); + "Can't open error file %s", zRight); else { + fclose(tmpfile); sqlite3_mutex_enter(pBt->pBt->mutex); - old_errfile = pBt->pBt->errfile; - pBt->pBt->errfile = errfile; - dbenv->set_errfile(dbenv, errfile); - sqlite3_free(pBt->pBt->errfile_name); - pBt->pBt->errfile_name = - sqlite3DbStrDup(0, zRight); + sqlite3_free(pBt->pBt->err_file); + pBt->pBt->err_file = + sqlite3_mprintf("%s", zRight); sqlite3_mutex_leave(pBt->pBt->mutex); - - if (old_errfile) - fclose(old_errfile); - errfile_name = zRight; + err_file = zRight; } } - if (errfile_name == NULL) { - sqlite3_mutex_enter(pBt->pBt->mutex); - errfile_name = - sqlite3DbStrDup(0, pBt->pBt->errfile_name); - sqlite3_mutex_leave(pBt->pBt->mutex); - if (!errfile_name) - errfile_name = sqlite3DbStrDup(0, "Default"); + if (err_file == NULL) { + err_file = filename; + if (btreeGetErrorFile(pDb->pBt->pBt, err_file) != 0) + err_file = "stderr"; } - sqlite3VdbeSetNumCols(pParse->pVdbe, 1); sqlite3VdbeSetColName(pParse->pVdbe, 0, COLNAME_NAME, zLeft, SQLITE_STATIC); - sqlite3VdbeAddOp4(pParse->pVdbe, OP_String8, 0, 1, 0, - errfile_name, 0); + if (err_file) + sqlite3VdbeAddOp4(pParse->pVdbe, OP_String8, 0, 1, 0, + err_file, 0); + else + sqlite3VdbeAddOp4(pParse->pVdbe, OP_String8, 0, 1, 0, + "NULL", 0); sqlite3VdbeAddOp2(pParse->pVdbe, OP_ResultRow, 1, 1); - if (errfile_name != zRight) - sqlite3_free(errfile_name); parsed = 1; } /* Return semantics to match strcmp. */ diff --git a/lang/sql/jdbc/ChangeLog b/lang/sql/jdbc/ChangeLog index 803a5b50..5c506764 100644 --- a/lang/sql/jdbc/ChangeLog +++ b/lang/sql/jdbc/ChangeLog @@ -1,3 +1,7 @@ +2011-08-05 + + * Add updates so the package can work with Oracle Java Embedded Client + 2011-04-30 * update to SQLite 3.7.6.2 diff --git a/lang/sql/jdbc/Makefile.in b/lang/sql/jdbc/Makefile.in index ca3902d1..de50fc62 100644 --- a/lang/sql/jdbc/Makefile.in +++ b/lang/sql/jdbc/Makefile.in @@ -2,6 +2,7 @@ prefix = @prefix@ CC = @CC@ +HOSTCC = @HOSTCC@ LIBTOOL = ./libtool SQLITE_INC = @SQLITE_INC@ SQLITE_LIB = @SQLITE_LIB@ @@ -12,6 +13,7 @@ SQLITE3_A10N_O = @SQLITE3_A10N_O@ JAVAH = @JAVAH@ JAVA_RUN = @JAVA_RUN@ JAVAC = @JAVAC@ +JAVAC_FLAGS = @JAVAC_FLAGS@ JAVADOC = @JAVADOC@ JAVADOCLINK = http://java.sun.com/javase/6/docs/api JAR = @JAR@ @@ -87,11 +89,11 @@ CLASSES = \ SQLite/SQLRestore.class \ SQLite/Profile.class -PRIVATE_CLASSES = \ +COMMON_CLASSES = \ SQLite/Benchmark.class \ SQLite/BenchmarkThread.class \ SQLite/DBDump.class \ - SQLite/JDBCDriver.class \ + SQLite/JDBC.class \ SQLite/@JDBCVER@/JDBCConnection.class \ SQLite/@JDBCVER@/JDBCStatement.class \ SQLite/@JDBCVER@/JDBCResultSet.class \ @@ -102,6 +104,23 @@ PRIVATE_CLASSES = \ SQLite/@JDBCVER@/TableResultX.class \ SQLite/@JDBCVER@/DatabaseX.class +JDBC_DATA_SOURCE_CLASSES = \ + SQLite/JDBCDataSource.class \ + SQLite/BenchmarkDataSource.class + +JDBC_DRIVER_CLASSES = \ + SQLite/JDBCDriver.class \ + SQLite/BenchmarkDriver.class + +JDBC0_CLASSES = $(JDBC_DATA_SOURCE_CLASSES) +JDBC1_CLASSES = $(JDBC_DRIVER_CLASSES) +JDBC2_CLASSES = $(JDBC_DRIVER_CLASSES) +JDBC2x_CLASSES = $(JDBC_DRIVER_CLASSES) +JDBC2y_CLASSES = $(JDBC_DRIVER_CLASSES) +JDBC2z_CLASSES = $(JDBC_DRIVER_CLASSES) + +PRIVATE_CLASSES = $(COMMON_CLASSES) $(@JDBCVER@_CLASSES) + DOCSRCS = \ SQLite/Authorizer.java \ SQLite/Backup.java \ @@ -161,9 +180,9 @@ libsqlite_jni.la: sqlite_jni.lo $(SQLITE3_A10N_O) -module -avoid-version $(LIBS) native/mkconst: native/mkconst.c - $(LIBTOOL) --mode=link $(CC) @CFLAGS@ $(SQLITE_INC) $(SQLITE3_INC) \ - -DHAVE_SQLITE2=@HAVE_SQLITE2@ -DHAVE_SQLITE3=@HAVE_SQLITE3@ \ - -o native/mkconst native/mkconst.c $(LIBS) + $(LIBTOOL) --mode=link $(HOSTCC) @HOST_CFLAGS@ $(SQLITE_INC) \ + $(SQLITE3_INC) -DHAVE_SQLITE2=@HAVE_SQLITE2@ \ + -DHAVE_SQLITE3=@HAVE_SQLITE3@ -o native/mkconst native/mkconst.c Makefile: Makefile.in configure config.status ./config.status diff --git a/lang/sql/jdbc/SQLite/Benchmark.java b/lang/sql/jdbc/SQLite/Benchmark.java index 22a99cba..d7320d12 100644 --- a/lang/sql/jdbc/SQLite/Benchmark.java +++ b/lang/sql/jdbc/SQLite/Benchmark.java @@ -10,7 +10,6 @@ package SQLite; import java.sql.Connection; -import java.sql.DriverManager; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; @@ -18,7 +17,7 @@ import java.sql.Statement; import java.util.Enumeration; import java.util.Vector; -public class Benchmark { +public abstract class Benchmark { /* the tps scaling factor: here it is 1 */ public static int tps = 1; @@ -56,8 +55,8 @@ public class Benchmark { * runs one TPC BM B transaction */ - public static void main(String[] args) { - String DriverName = "SQLite.JDBCDriver"; + public void run(String[] args) { + String DriverName = ""; String DBUrl = ""; String DBUser = ""; String DBPassword = ""; @@ -138,15 +137,14 @@ public class Benchmark { System.out.println(); try { - Class.forName(DriverName); - new Benchmark(DBUrl, DBUser, DBPassword, initialize_dataset); + benchmark(DBUrl, DBUser, DBPassword, initialize_dataset); } catch (java.lang.Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); } } - public Benchmark(String url, String user, String password, boolean init) { + public void benchmark(String url, String user, String password, boolean init) { Vector vClient = new Vector(); Thread Client = null; Enumeration en = null; @@ -561,18 +559,8 @@ public class Benchmark { return (getRandomInt(min, max)); } - public static Connection connect(String DBUrl, String DBUser, - String DBPassword) { - try { - Connection conn = - DriverManager.getConnection(DBUrl, DBUser, DBPassword); - return conn; - } catch (java.lang.Exception e) { - System.out.println(e.getMessage()); - e.printStackTrace(); - } - return null; - } + public abstract Connection connect(String DBUrl, String DBUser, + String DBPassword); public static void connectClose(Connection c) { if (c == null) { @@ -604,7 +592,7 @@ class BenchmarkThread extends Thread { Benchmark b) { bench = b; ntrans = number_of_txns; - Conn = Benchmark.connect(url, user, password); + Conn = b.connect(url, user, password); if (Conn == null) { return; } diff --git a/lang/sql/jdbc/SQLite/JDBC1/JDBCConnection.java b/lang/sql/jdbc/SQLite/JDBC1/JDBCConnection.java index cb8e827b..86e9c688 100644 --- a/lang/sql/jdbc/SQLite/JDBC1/JDBCConnection.java +++ b/lang/sql/jdbc/SQLite/JDBC1/JDBCConnection.java @@ -329,7 +329,7 @@ public class JDBCConnection } public void setTransactionIsolation(int level) throws SQLException { - if (db.is3() && SQLite.JDBCDriver.sharedCache) { + if (db.is3() && SQLite.JDBC.sharedCache) { String flag = null; if (level == TRANSACTION_READ_UNCOMMITTED && trmode != TRANSACTION_READ_UNCOMMITTED) { diff --git a/lang/sql/jdbc/SQLite/JDBC1/JDBCDatabaseMetaData.java b/lang/sql/jdbc/SQLite/JDBC1/JDBCDatabaseMetaData.java index 8bd24766..db70886c 100644 --- a/lang/sql/jdbc/SQLite/JDBC1/JDBCDatabaseMetaData.java +++ b/lang/sql/jdbc/SQLite/JDBC1/JDBCDatabaseMetaData.java @@ -60,12 +60,12 @@ public class JDBCDatabaseMetaData implements DatabaseMetaData { } public String getDriverVersion() throws SQLException { - return "" + SQLite.JDBCDriver.MAJORVERSION + "." + + return "" + SQLite.JDBC.MAJORVERSION + "." + SQLite.Constants.drv_minor; } public int getDriverMajorVersion() { - return SQLite.JDBCDriver.MAJORVERSION; + return SQLite.JDBC.MAJORVERSION; } public int getDriverMinorVersion() { diff --git a/lang/sql/jdbc/SQLite/JDBC2/JDBCConnection.java b/lang/sql/jdbc/SQLite/JDBC2/JDBCConnection.java index 6b2d4268..642116e4 100644 --- a/lang/sql/jdbc/SQLite/JDBC2/JDBCConnection.java +++ b/lang/sql/jdbc/SQLite/JDBC2/JDBCConnection.java @@ -372,7 +372,7 @@ public class JDBCConnection } public void setTransactionIsolation(int level) throws SQLException { - if (db.is3() && SQLite.JDBCDriver.sharedCache) { + if (db.is3() && SQLite.JDBC.sharedCache) { String flag = null; if (level == TRANSACTION_READ_UNCOMMITTED && trmode != TRANSACTION_READ_UNCOMMITTED) { diff --git a/lang/sql/jdbc/SQLite/JDBC2/JDBCDatabaseMetaData.java b/lang/sql/jdbc/SQLite/JDBC2/JDBCDatabaseMetaData.java index 46e9c34a..df12f51f 100644 --- a/lang/sql/jdbc/SQLite/JDBC2/JDBCDatabaseMetaData.java +++ b/lang/sql/jdbc/SQLite/JDBC2/JDBCDatabaseMetaData.java @@ -64,12 +64,12 @@ public class JDBCDatabaseMetaData implements DatabaseMetaData { } public String getDriverVersion() throws SQLException { - return "" + SQLite.JDBCDriver.MAJORVERSION + "." + + return "" + SQLite.JDBC.MAJORVERSION + "." + SQLite.Constants.drv_minor; } public int getDriverMajorVersion() { - return SQLite.JDBCDriver.MAJORVERSION; + return SQLite.JDBC.MAJORVERSION; } public int getDriverMinorVersion() { diff --git a/lang/sql/jdbc/SQLite/JDBC2x/JDBCConnection.java b/lang/sql/jdbc/SQLite/JDBC2x/JDBCConnection.java index 55cf0985..7b8b7500 100644 --- a/lang/sql/jdbc/SQLite/JDBC2x/JDBCConnection.java +++ b/lang/sql/jdbc/SQLite/JDBC2x/JDBCConnection.java @@ -373,7 +373,7 @@ public class JDBCConnection } public void setTransactionIsolation(int level) throws SQLException { - if (db.is3() && SQLite.JDBCDriver.sharedCache) { + if (db.is3() && SQLite.JDBC.sharedCache) { String flag = null; if (level == TRANSACTION_READ_UNCOMMITTED && trmode != TRANSACTION_READ_UNCOMMITTED) { diff --git a/lang/sql/jdbc/SQLite/JDBC2x/JDBCDatabaseMetaData.java b/lang/sql/jdbc/SQLite/JDBC2x/JDBCDatabaseMetaData.java index bab221a2..a5a0df20 100644 --- a/lang/sql/jdbc/SQLite/JDBC2x/JDBCDatabaseMetaData.java +++ b/lang/sql/jdbc/SQLite/JDBC2x/JDBCDatabaseMetaData.java @@ -64,12 +64,12 @@ public class JDBCDatabaseMetaData implements DatabaseMetaData { } public String getDriverVersion() throws SQLException { - return "" + SQLite.JDBCDriver.MAJORVERSION + "." + + return "" + SQLite.JDBC.MAJORVERSION + "." + SQLite.Constants.drv_minor; } public int getDriverMajorVersion() { - return SQLite.JDBCDriver.MAJORVERSION; + return SQLite.JDBC.MAJORVERSION; } public int getDriverMinorVersion() { @@ -1632,7 +1632,7 @@ public class JDBCDatabaseMetaData implements DatabaseMetaData { } public int getDatabaseMajorVersion() { - return SQLite.JDBCDriver.MAJORVERSION; + return SQLite.JDBC.MAJORVERSION; } public int getDatabaseMinorVersion() { diff --git a/lang/sql/jdbc/SQLite/JDBC2y/JDBCConnection.java b/lang/sql/jdbc/SQLite/JDBC2y/JDBCConnection.java index 4ae51071..b5e794e6 100644 --- a/lang/sql/jdbc/SQLite/JDBC2y/JDBCConnection.java +++ b/lang/sql/jdbc/SQLite/JDBC2y/JDBCConnection.java @@ -373,7 +373,7 @@ public class JDBCConnection } public void setTransactionIsolation(int level) throws SQLException { - if (db.is3() && SQLite.JDBCDriver.sharedCache) { + if (db.is3() && SQLite.JDBC.sharedCache) { String flag = null; if (level == TRANSACTION_READ_UNCOMMITTED && trmode != TRANSACTION_READ_UNCOMMITTED) { diff --git a/lang/sql/jdbc/SQLite/JDBC2y/JDBCDatabaseMetaData.java b/lang/sql/jdbc/SQLite/JDBC2y/JDBCDatabaseMetaData.java index 9250d1f5..b550e58d 100644 --- a/lang/sql/jdbc/SQLite/JDBC2y/JDBCDatabaseMetaData.java +++ b/lang/sql/jdbc/SQLite/JDBC2y/JDBCDatabaseMetaData.java @@ -64,12 +64,12 @@ public class JDBCDatabaseMetaData implements DatabaseMetaData { } public String getDriverVersion() throws SQLException { - return "" + SQLite.JDBCDriver.MAJORVERSION + "." + + return "" + SQLite.JDBC.MAJORVERSION + "." + SQLite.Constants.drv_minor; } public int getDriverMajorVersion() { - return SQLite.JDBCDriver.MAJORVERSION; + return SQLite.JDBC.MAJORVERSION; } public int getDriverMinorVersion() { @@ -1634,7 +1634,7 @@ public class JDBCDatabaseMetaData implements DatabaseMetaData { } public int getDatabaseMajorVersion() { - return SQLite.JDBCDriver.MAJORVERSION; + return SQLite.JDBC.MAJORVERSION; } public int getDatabaseMinorVersion() { diff --git a/lang/sql/jdbc/SQLite/JDBC2z/JDBCConnection.java b/lang/sql/jdbc/SQLite/JDBC2z/JDBCConnection.java index 6e7ec7e8..de8e2843 100644 --- a/lang/sql/jdbc/SQLite/JDBC2z/JDBCConnection.java +++ b/lang/sql/jdbc/SQLite/JDBC2z/JDBCConnection.java @@ -399,7 +399,7 @@ public class JDBCConnection @Override public void setTransactionIsolation(int level) throws SQLException { - if (db.is3() && SQLite.JDBCDriver.sharedCache) { + if (db.is3() && SQLite.JDBC.sharedCache) { String flag = null; if (level == TRANSACTION_READ_UNCOMMITTED && trmode != TRANSACTION_READ_UNCOMMITTED) { diff --git a/lang/sql/jdbc/SQLite/JDBC2z/JDBCDatabaseMetaData.java b/lang/sql/jdbc/SQLite/JDBC2z/JDBCDatabaseMetaData.java index fade9c89..92944639 100644 --- a/lang/sql/jdbc/SQLite/JDBC2z/JDBCDatabaseMetaData.java +++ b/lang/sql/jdbc/SQLite/JDBC2z/JDBCDatabaseMetaData.java @@ -78,13 +78,13 @@ public class JDBCDatabaseMetaData implements DatabaseMetaData { @Override public String getDriverVersion() throws SQLException { - return "" + SQLite.JDBCDriver.MAJORVERSION + "." + + return "" + SQLite.JDBC.MAJORVERSION + "." + SQLite.Constants.drv_minor; } @Override public int getDriverMajorVersion() { - return SQLite.JDBCDriver.MAJORVERSION; + return SQLite.JDBC.MAJORVERSION; } @Override @@ -1790,7 +1790,7 @@ public class JDBCDatabaseMetaData implements DatabaseMetaData { @Override public int getDatabaseMajorVersion() { - return SQLite.JDBCDriver.MAJORVERSION; + return SQLite.JDBC.MAJORVERSION; } @Override diff --git a/lang/sql/jdbc/SQLite/JDBCDriver.java b/lang/sql/jdbc/SQLite/JDBCDriver.java index 2350f5c6..f91f5e94 100644 --- a/lang/sql/jdbc/SQLite/JDBCDriver.java +++ b/lang/sql/jdbc/SQLite/JDBCDriver.java @@ -1,11 +1,12 @@ package SQLite; import java.sql.Connection; +import java.sql.Driver; import java.sql.DriverPropertyInfo; import java.sql.SQLException; import java.util.Properties; -public class JDBCDriver implements java.sql.Driver { +public class JDBCDriver extends JDBC implements Driver { public static final int MAJORVERSION = 1; @@ -19,63 +20,7 @@ public class JDBCDriver implements java.sql.Driver { static { try { - Class connClass = null; - Class args[] = new Class[5]; - args[0] = Class.forName("java.lang.String"); - args[1] = args[0]; - args[2] = args[0]; - args[3] = args[0]; - args[4] = args[0]; - String jvers = java.lang.System.getProperty("java.version"); - String cvers; - if (jvers == null || jvers.startsWith("1.0")) { - throw new java.lang.Exception("unsupported java version " + jvers); - } else if (jvers.startsWith("1.1")) { - cvers = "SQLite.JDBC1.JDBCConnection"; - } else if (jvers.startsWith("1.2") || jvers.startsWith("1.3")) { - cvers = "SQLite.JDBC2.JDBCConnection"; - } else if (jvers.startsWith("1.4")) { - cvers = "SQLite.JDBC2x.JDBCConnection"; - } else if (jvers.startsWith("1.5")) { - cvers = "SQLite.JDBC2y.JDBCConnection"; - try { - Class.forName(cvers); - } catch (java.lang.Exception e) { - cvers = "SQLite.JDBC2x.JDBCConnection"; - } - } else { - cvers = "SQLite.JDBC2z.JDBCConnection"; - try { - Class.forName(cvers); - } catch (java.lang.Exception e) { - cvers = "SQLite.JDBC2y.JDBCConnection"; - try { - Class.forName(cvers); - } catch (java.lang.Exception ee) { - cvers = "SQLite.JDBC2x.JDBCConnection"; - } - } - } - connClass = Class.forName(cvers); - makeConn = connClass.getConstructor(args); java.sql.DriverManager.registerDriver(new JDBCDriver()); - try { - String shcache = - java.lang.System.getProperty("SQLite.sharedcache"); - if (shcache != null && - (shcache.startsWith("y") || shcache.startsWith("Y"))) { - sharedCache = SQLite.Database._enable_shared_cache(true); - } - } catch (java.lang.Exception e) { - } - try { - String tvfs = - java.lang.System.getProperty("SQLite.vfs"); - if (tvfs != null) { - vfs = tvfs; - } - } catch (java.lang.Exception e) { - } } catch (java.lang.Exception e) { System.err.println(e); } @@ -84,48 +29,6 @@ public class JDBCDriver implements java.sql.Driver { public JDBCDriver() { } - public boolean acceptsURL(String url) throws SQLException { - return url.startsWith("sqlite:/") || - url.startsWith("jdbc:sqlite:/"); - } - - public Connection connect(String url, Properties info) - throws SQLException { - if (!acceptsURL(url)) { - return null; - } - Object args[] = new Object[5]; - args[0] = url; - if (info != null) { - args[1] = info.getProperty("encoding"); - args[2] = info.getProperty("password"); - args[3] = info.getProperty("daterepr"); - args[4] = info.getProperty("vfs"); - } - if (args[1] == null) { - args[1] = java.lang.System.getProperty("SQLite.encoding"); - } - if (args[4] == null) { - args[4] = vfs; - } - try { - conn = (Connection) makeConn.newInstance(args); - } catch (java.lang.reflect.InvocationTargetException ie) { - throw new SQLException(ie.getTargetException().toString()); - } catch (java.lang.Exception e) { - throw new SQLException(e.toString()); - } - return conn; - } - - public int getMajorVersion() { - return MAJORVERSION; - } - - public int getMinorVersion() { - return Constants.drv_minor; - } - public DriverPropertyInfo[] getPropertyInfo(String url, Properties info) throws SQLException { DriverPropertyInfo p[] = new DriverPropertyInfo[4]; diff --git a/lang/sql/jdbc/VERSION b/lang/sql/jdbc/VERSION index f9df375c..5bf258bd 100644 --- a/lang/sql/jdbc/VERSION +++ b/lang/sql/jdbc/VERSION @@ -1 +1 @@ -20110430 +20110817 diff --git a/lang/sql/jdbc/config.sub b/lang/sql/jdbc/config.sub index d6d67c3f..7c895641 100755 --- a/lang/sql/jdbc/config.sub +++ b/lang/sql/jdbc/config.sub @@ -3,7 +3,7 @@ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, # 2000, 2001, 2002, 2003 Free Software Foundation, Inc. -timestamp='2003-01-03' +timestamp='2011-08-05' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -118,7 +118,7 @@ esac # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in - nto-qnx* | linux-gnu* | freebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) + nto-qnx* | linux-gnu* | freebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova* | linux-uclibc* ) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; diff --git a/lang/sql/jdbc/configure b/lang/sql/jdbc/configure index 1dad3d11..de975e9b 100755 --- a/lang/sql/jdbc/configure +++ b/lang/sql/jdbc/configure @@ -1,11 +1,538 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.53. +# Generated by GNU Autoconf 2.68. +# +# +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, +# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software +# Foundation, Inc. +# # -# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 -# Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. +## -------------------- ## +## M4sh Initialization. ## +## -------------------- ## + +# Be more Bourne compatible +DUALCASE=1; export DUALCASE # for MKS sh +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : + emulate sh + NULLCMD=: + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; +esac +fi + + +as_nl=' +' +export as_nl +# Printing a long string crashes Solaris 7 /usr/bin/printf. +as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo +# Prefer a ksh shell builtin over an external printf program on Solaris, +# but without wasting forks for bash or zsh. +if test -z "$BASH_VERSION$ZSH_VERSION" \ + && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='print -r --' + as_echo_n='print -rn --' +elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='printf %s\n' + as_echo_n='printf %s' +else + if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then + as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' + as_echo_n='/usr/ucb/echo -n' + else + as_echo_body='eval expr "X$1" : "X\\(.*\\)"' + as_echo_n_body='eval + arg=$1; + case $arg in #( + *"$as_nl"*) + expr "X$arg" : "X\\(.*\\)$as_nl"; + arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; + esac; + expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" + ' + export as_echo_n_body + as_echo_n='sh -c $as_echo_n_body as_echo' + fi + export as_echo_body + as_echo='sh -c $as_echo_body as_echo' +fi + +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { + (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || + PATH_SEPARATOR=';' + } +fi + + +# IFS +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent editors from complaining about space-tab. +# (If _AS_PATH_WALK were called with IFS unset, it would disable word +# splitting by setting IFS to empty value.) +IFS=" "" $as_nl" + +# Find who we are. Look in the path if we contain no directory separator. +as_myself= +case $0 in #(( + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + done +IFS=$as_save_IFS + + ;; +esac +# We did not find ourselves, most probably we were run as `sh COMMAND' +# in which case we are not to be found in the path. +if test "x$as_myself" = x; then + as_myself=$0 +fi +if test ! -f "$as_myself"; then + $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + exit 1 +fi + +# Unset variables that we do not need and which cause bugs (e.g. in +# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" +# suppresses any "Segmentation fault" message there. '((' could +# trigger a bug in pdksh 5.2.14. +for as_var in BASH_ENV ENV MAIL MAILPATH +do eval test x\${$as_var+set} = xset \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : +done +PS1='$ ' +PS2='> ' +PS4='+ ' + +# NLS nuisances. +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE + +# CDPATH. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + +if test "x$CONFIG_SHELL" = x; then + as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : + emulate sh + NULLCMD=: + # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which + # is contrary to our usage. Disable this feature. + alias -g '\${1+\"\$@\"}'='\"\$@\"' + setopt NO_GLOB_SUBST +else + case \`(set -o) 2>/dev/null\` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; +esac +fi +" + as_required="as_fn_return () { (exit \$1); } +as_fn_success () { as_fn_return 0; } +as_fn_failure () { as_fn_return 1; } +as_fn_ret_success () { return 0; } +as_fn_ret_failure () { return 1; } + +exitcode=0 +as_fn_success || { exitcode=1; echo as_fn_success failed.; } +as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; } +as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; } +as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } +if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : + +else + exitcode=1; echo positional parameters were not saved. +fi +test x\$exitcode = x0 || exit 1" + as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO + as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO + eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && + test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1 +test \$(( 1 + 1 )) = 2 || exit 1" + if (eval "$as_required") 2>/dev/null; then : + as_have_required=yes +else + as_have_required=no +fi + if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then : + +else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +as_found=false +for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + as_found=: + case $as_dir in #( + /*) + for as_base in sh bash ksh sh5; do + # Try only shells that exist, to save several forks. + as_shell=$as_dir/$as_base + if { test -f "$as_shell" || test -f "$as_shell.exe"; } && + { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then : + CONFIG_SHELL=$as_shell as_have_required=yes + if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then : + break 2 +fi +fi + done;; + esac + as_found=false +done +$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } && + { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then : + CONFIG_SHELL=$SHELL as_have_required=yes +fi; } +IFS=$as_save_IFS + + + if test "x$CONFIG_SHELL" != x; then : + # We cannot yet assume a decent shell, so we have to provide a + # neutralization value for shells without unset; and this also + # works around shells that cannot unset nonexistent variables. + # Preserve -v and -x to the replacement shell. + BASH_ENV=/dev/null + ENV=/dev/null + (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV + export CONFIG_SHELL + case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; + esac + exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} +fi + + if test x$as_have_required = xno; then : + $as_echo "$0: This script requires a shell more modern than all" + $as_echo "$0: the shells that I found on your system." + if test x${ZSH_VERSION+set} = xset ; then + $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" + $as_echo "$0: be upgraded to zsh 4.3.4 or later." + else + $as_echo "$0: Please tell bug-autoconf@gnu.org about your system, +$0: including any error possibly output before this +$0: message. Then install a modern shell, or manually run +$0: the script under such a shell if you do have one." + fi + exit 1 +fi +fi +fi +SHELL=${CONFIG_SHELL-/bin/sh} +export SHELL +# Unset more variables known to interfere with behavior of common tools. +CLICOLOR_FORCE= GREP_OPTIONS= +unset CLICOLOR_FORCE GREP_OPTIONS + +## --------------------- ## +## M4sh Shell Functions. ## +## --------------------- ## +# as_fn_unset VAR +# --------------- +# Portably unset VAR. +as_fn_unset () +{ + { eval $1=; unset $1;} +} +as_unset=as_fn_unset + +# as_fn_set_status STATUS +# ----------------------- +# Set $? to STATUS, without forking. +as_fn_set_status () +{ + return $1 +} # as_fn_set_status + +# as_fn_exit STATUS +# ----------------- +# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. +as_fn_exit () +{ + set +e + as_fn_set_status $1 + exit $1 +} # as_fn_exit + +# as_fn_mkdir_p +# ------------- +# Create "$as_dir" as a directory, including parents if necessary. +as_fn_mkdir_p () +{ + + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac + test -d "$as_dir" || eval $as_mkdir_p || { + as_dirs= + while :; do + case $as_dir in #( + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" + as_dir=`$as_dirname -- "$as_dir" || +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + test -d "$as_dir" && break + done + test -z "$as_dirs" || eval "mkdir $as_dirs" + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" + + +} # as_fn_mkdir_p +# as_fn_append VAR VALUE +# ---------------------- +# Append the text in VALUE to the end of the definition contained in VAR. Take +# advantage of any shell optimizations that allow amortized linear growth over +# repeated appends, instead of the typical quadratic growth present in naive +# implementations. +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : + eval 'as_fn_append () + { + eval $1+=\$2 + }' +else + as_fn_append () + { + eval $1=\$$1\$2 + } +fi # as_fn_append + +# as_fn_arith ARG... +# ------------------ +# Perform arithmetic evaluation on the ARGs, and store the result in the +# global $as_val. Take advantage of shells that can avoid forks. The arguments +# must be portable across $(()) and expr. +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : + eval 'as_fn_arith () + { + as_val=$(( $* )) + }' +else + as_fn_arith () + { + as_val=`expr "$@" || test $? -eq 1` + } +fi # as_fn_arith + + +# as_fn_error STATUS ERROR [LINENO LOG_FD] +# ---------------------------------------- +# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are +# provided, also output the error to LOG_FD, referencing LINENO. Then exit the +# script with STATUS, using 1 if that was 0. +as_fn_error () +{ + as_status=$1; test $as_status -eq 0 && as_status=1 + if test "$4"; then + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + fi + $as_echo "$as_me: error: $2" >&2 + as_fn_exit $as_status +} # as_fn_error + +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr +else + as_expr=false +fi + +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then + as_basename=basename +else + as_basename=false +fi + +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname +else + as_dirname=false +fi + +as_me=`$as_basename -- "$0" || +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q + } + /^X\/\(\/\/\)$/{ + s//\1/ + q + } + /^X\/\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits + + + as_lineno_1=$LINENO as_lineno_1a=$LINENO + as_lineno_2=$LINENO as_lineno_2a=$LINENO + eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" && + test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || { + # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-) + sed -n ' + p + /[$]LINENO/= + ' <$as_myself | + sed ' + s/[$]LINENO.*/&-/ + t lineno + b + :lineno + N + :loop + s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ + t loop + s/-\n.*// + ' >$as_me.lineno && + chmod +x "$as_me.lineno" || + { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + + # Don't try to exec as it changes $[0], causing all sort of problems + # (the dirname of $[0] is not the place where we might find the + # original and so on. Autoconf is especially sensitive to this). + . "./$as_me.lineno" + # Exit status is that of the last command. + exit +} + +ECHO_C= ECHO_N= ECHO_T= +case `echo -n x` in #((((( +-n*) + case `echo 'xy\c'` in + *c*) ECHO_T=' ';; # ECHO_T is single tab character. + xy) ECHO_C='\c';; + *) echo `echo ksh88 bug on AIX 6.1` > /dev/null + ECHO_T=' ';; + esac;; +*) + ECHO_N='-n';; +esac + +rm -f conf$$ conf$$.exe conf$$.file +if test -d conf$$.dir; then + rm -f conf$$.dir/conf$$.file +else + rm -f conf$$.dir + mkdir conf$$.dir 2>/dev/null +fi +if (echo >conf$$.file) 2>/dev/null; then + if ln -s conf$$.file conf$$ 2>/dev/null; then + as_ln_s='ln -s' + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -p'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || + as_ln_s='cp -p' + elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln + else + as_ln_s='cp -p' + fi +else + as_ln_s='cp -p' +fi +rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file +rmdir conf$$.dir 2>/dev/null + +if mkdir -p . 2>/dev/null; then + as_mkdir_p='mkdir -p "$as_dir"' +else + test -d ./-p && rmdir ./-p + as_mkdir_p=false +fi + +if test -x / >/dev/null 2>&1; then + as_test_x='test -x' +else + if ls -dL / >/dev/null 2>&1; then + as_ls_L_option=L + else + as_ls_L_option= + fi + as_test_x=' + eval sh -c '\'' + if test -d "$1"; then + test -d "$1/."; + else + case $1 in #( + -*)set "./$1";; + esac; + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( + ???[sx]*):;;*)false;;esac;fi + '\'' sh + ' +fi +as_executable_p=$as_test_x + +# Sed expression to map a string onto a valid CPP name. +as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" + +# Sed expression to map a string onto a valid variable name. +as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" + # Find the correct PATH separator. Usually this is `:', but # DJGPP uses `;' like DOS. @@ -166,249 +693,25 @@ fi -if expr a : '\(a\)' >/dev/null 2>&1; then - as_expr=expr -else - as_expr=false -fi - - -## --------------------- ## -## M4sh Initialization. ## -## --------------------- ## - -# Be Bourne compatible -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: -elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then - set -o posix -fi - -# NLS nuisances. -# Support unset when possible. -if (FOO=FOO; unset FOO) >/dev/null 2>&1; then - as_unset=unset -else - as_unset=false -fi - -(set +x; test -n "`(LANG=C; export LANG) 2>&1`") && - { $as_unset LANG || test "${LANG+set}" != set; } || - { LANG=C; export LANG; } -(set +x; test -n "`(LC_ALL=C; export LC_ALL) 2>&1`") && - { $as_unset LC_ALL || test "${LC_ALL+set}" != set; } || - { LC_ALL=C; export LC_ALL; } -(set +x; test -n "`(LC_TIME=C; export LC_TIME) 2>&1`") && - { $as_unset LC_TIME || test "${LC_TIME+set}" != set; } || - { LC_TIME=C; export LC_TIME; } -(set +x; test -n "`(LC_CTYPE=C; export LC_CTYPE) 2>&1`") && - { $as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set; } || - { LC_CTYPE=C; export LC_CTYPE; } -(set +x; test -n "`(LANGUAGE=C; export LANGUAGE) 2>&1`") && - { $as_unset LANGUAGE || test "${LANGUAGE+set}" != set; } || - { LANGUAGE=C; export LANGUAGE; } -(set +x; test -n "`(LC_COLLATE=C; export LC_COLLATE) 2>&1`") && - { $as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set; } || - { LC_COLLATE=C; export LC_COLLATE; } -(set +x; test -n "`(LC_NUMERIC=C; export LC_NUMERIC) 2>&1`") && - { $as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set; } || - { LC_NUMERIC=C; export LC_NUMERIC; } -(set +x; test -n "`(LC_MESSAGES=C; export LC_MESSAGES) 2>&1`") && - { $as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set; } || - { LC_MESSAGES=C; export LC_MESSAGES; } - - -# Name of the executable. -as_me=`(basename "$0") 2>/dev/null || -$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)$' \| \ - . : '\(.\)' 2>/dev/null || -echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } - /^X\/\(\/\/\)$/{ s//\1/; q; } - /^X\/\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - -# PATH needs CR, and LINENO needs CR and PATH. -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits - -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conftest.sh - echo "exit 0" >>conftest.sh - chmod +x conftest.sh - if (PATH=".;."; conftest.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conftest.sh -fi - - - as_lineno_1=$LINENO - as_lineno_2=$LINENO - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x$as_lineno_3" = "x$as_lineno_2" || { - # Find who we are. Look in the path if we contain no path at all - # relative or not. - case $0 in - *[\\/]* ) as_myself=$0 ;; - *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -done - - ;; - esac - # We did not find ourselves, most probably we were run as `sh COMMAND' - # in which case we are not to be found in the path. - if test "x$as_myself" = x; then - as_myself=$0 - fi - if test ! -f "$as_myself"; then - { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2 - { (exit 1); exit 1; }; } - fi - case $CONFIG_SHELL in - '') - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for as_base in sh bash ksh sh5; do - case $as_dir in - /*) - if ("$as_dir/$as_base" -c ' - as_lineno_1=$LINENO - as_lineno_2=$LINENO - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then - CONFIG_SHELL=$as_dir/$as_base - export CONFIG_SHELL - exec "$CONFIG_SHELL" "$0" ${1+"$@"} - fi;; - esac - done -done -;; - esac - - # Create $as_me.lineno as a copy of $as_myself, but with $LINENO - # uniformly replaced by the line number. The first 'sed' inserts a - # line-number line before each line; the second 'sed' does the real - # work. The second script uses 'N' to pair each line-number line - # with the numbered line, and appends trailing '-' during - # substitution so that $LINENO is not a special case at line end. - # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the - # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) - sed '=' <$as_myself | - sed ' - N - s,$,-, - : loop - s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, - t loop - s,-$,, - s,^['$as_cr_digits']*\n,, - ' >$as_me.lineno && - chmod +x $as_me.lineno || - { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 - { (exit 1); exit 1; }; } - - # Don't try to exec as it changes $[0], causing all sort of problems - # (the dirname of $[0] is not the place where we might find the - # original and so on. Autoconf is especially sensible to this). - . ./$as_me.lineno - # Exit status is that of the last command. - exit -} - - -case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in - *c*,-n*) ECHO_N= ECHO_C=' -' ECHO_T=' ' ;; - *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; - *) ECHO_N= ECHO_C='\c' ECHO_T= ;; -esac - -if expr a : '\(a\)' >/dev/null 2>&1; then - as_expr=expr -else - as_expr=false -fi - -rm -f conf$$ conf$$.exe conf$$.file -echo >conf$$.file -if ln -s conf$$.file conf$$ 2>/dev/null; then - # We could just check for DJGPP; but this test a) works b) is more generic - # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). - if test -f conf$$.exe; then - # Don't use ln at all; we don't have any links - as_ln_s='cp -p' - else - as_ln_s='ln -s' - fi -elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln -else - as_ln_s='cp -p' -fi -rm -f conf$$ conf$$.exe conf$$.file - -as_executable_p="test -f" - -# Sed expression to map a string onto a valid CPP name. -as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" - -# Sed expression to map a string onto a valid variable name. -as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" - - -# IFS -# We need space, tab and new line, in precisely that order. -as_nl=' -' -IFS=" $as_nl" - -# CDPATH. -$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=$PATH_SEPARATOR; export CDPATH; } - +test -n "$DJDIR" || exec 7<&0 &1 # Name of the host. -# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, +# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, # so uname gets run too. ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` -exec 6>&1 - # # Initializations. # ac_default_prefix=/usr/local +ac_clean_files= +ac_config_libobj_dir=. +LIBOBJS= cross_compiling=no subdirs= MFLAGS= MAKEFLAGS= -SHELL=${CONFIG_SHELL-/bin/sh} - -# Maximum number of lines to put in a shell here document. -# This variable seems obsolete. It should probably be removed, and -# only ac_max_sed_lines should be used. -: ${ac_max_here_lines=38} # Identity of this package. PACKAGE_NAME= @@ -416,49 +719,196 @@ PACKAGE_TARNAME= PACKAGE_VERSION= PACKAGE_STRING= PACKAGE_BUGREPORT= +PACKAGE_URL= ac_unique_file="native/sqlite_jni.c" # Factoring default headers for most tests. ac_includes_default="\ #include -#if HAVE_SYS_TYPES_H +#ifdef HAVE_SYS_TYPES_H # include #endif -#if HAVE_SYS_STAT_H +#ifdef HAVE_SYS_STAT_H # include #endif -#if STDC_HEADERS +#ifdef STDC_HEADERS # include # include #else -# if HAVE_STDLIB_H +# ifdef HAVE_STDLIB_H # include # endif #endif -#if HAVE_STRING_H -# if !STDC_HEADERS && HAVE_MEMORY_H +#ifdef HAVE_STRING_H +# if !defined STDC_HEADERS && defined HAVE_MEMORY_H # include # endif # include #endif -#if HAVE_STRINGS_H +#ifdef HAVE_STRINGS_H # include #endif -#if HAVE_INTTYPES_H +#ifdef HAVE_INTTYPES_H # include -#else -# if HAVE_STDINT_H -# include -# endif #endif -#if HAVE_UNISTD_H +#ifdef HAVE_STDINT_H +# include +#endif +#ifdef HAVE_UNISTD_H # include #endif" +ac_subst_vars='LTLIBOBJS +LIBOBJS +NATIVE_LIB_DIR +JDBCVER +JAR_DIR +JNIINCLUDE +JAVADOC +JAR +JAVAC +JAVA_RUN +JAVAH +READLINK +VALIST_FLAGS +SQLITE3_A10N_FLAGS +SQLITE3_A10N_O +SQLITE3_A10N_C +HAVE_SQLITE3_STMT_STATUS +HAVE_SQLITE3_DB_STATUS +HAVE_SQLITE3_STATUS +HAVE_SQLITE3_PROFILE +HAVE_SQLITE3_BACKUPAPI +HAVE_SQLITE3_LOAD_EXTENSION +HAVE_SQLITE3_OPEN_V2 +HAVE_SQLITE3_SHARED_CACHE +HAVE_SQLITE3_KEY +HAVE_SQLITE3_INCRBLOBIO +HAVE_SQLITE3_RESULT_ZEROBLOB +HAVE_SQLITE3_BIND_PARAMETER_INDEX +HAVE_SQLITE3_BIND_PARAMETER_NAME +HAVE_SQLITE3_BIND_PARAMETER_COUNT +HAVE_SQLITE3_COLUMN_ORIGIN_NAME16 +HAVE_SQLITE3_COLUMN_DATABASE_NAME16 +HAVE_SQLITE3_COLUMN_TABLE_NAME16 +HAVE_SQLITE3_CLEAR_BINDINGS +HAVE_SQLITE3_BIND_ZEROBLOB +HAVE_SQLITE3_PREPARE16_V2 +HAVE_SQLITE3_PREPARE_V2 +HAVE_SQLITE3_MALLOC +HAVE_SQLITE3 +SQLITE3_LIB +SQLITE3_INC +HAVE_SQLITE_PROGRESS_HANDLER +HAVE_SQLITE_COMPILE +HAVE_SQLITE_TRACE +HAVE_SQLITE_SET_AUTHORIZER +HAVE_SQLITE_OPEN_AUX_FILE +HAVE_SQLITE_FUNCTION_TYPE +HAVE_SQLITE2 +SQLITE_LIB +SQLITE_INC +target_os +target_vendor +target_cpu +target +HOST_CFLAGS +HOSTCC +INSTALL_DATA +INSTALL_SCRIPT +INSTALL_PROGRAM +LIBTOOL +EGREP +GREP +CPP +STRIP +RANLIB +ECHO +LN_S +OBJEXT +EXEEXT +ac_ct_CC +CPPFLAGS +LDFLAGS +CFLAGS +CC +host_os +host_vendor +host_cpu +host +build_os +build_vendor +build_cpu +build +target_alias +host_alias +build_alias +LIBS +ECHO_T +ECHO_N +ECHO_C +DEFS +mandir +localedir +libdir +psdir +pdfdir +dvidir +htmldir +infodir +docdir +oldincludedir +includedir +localstatedir +sharedstatedir +sysconfdir +datadir +datarootdir +libexecdir +sbindir +bindir +program_transform_name +prefix +exec_prefix +PACKAGE_URL +PACKAGE_BUGREPORT +PACKAGE_STRING +PACKAGE_VERSION +PACKAGE_TARNAME +PACKAGE_NAME +PATH_SEPARATOR +SHELL' +ac_subst_files='' +ac_user_opts=' +enable_option_checking +enable_static +enable_shared +enable_fast_install +with_gnu_ld +enable_libtool_lock +with_pic +with_jardir +with_sqlite +with_sqlite3 +enable_load_extension +with_jdk +' + ac_precious_vars='build_alias +host_alias +target_alias +CC +CFLAGS +LDFLAGS +LIBS +CPPFLAGS +CPP' + # Initialize some variables set by options. ac_init_help= ac_init_version=false +ac_unrecognized_opts= +ac_unrecognized_sep= # The variables have the same names as the options, with # dashes changed to underlines. cache_file=/dev/null @@ -481,34 +931,49 @@ x_libraries=NONE # and all the variables that are supposed to be based on exec_prefix # by default will actually change. # Use braces instead of parens because sh, perl, etc. also accept them. +# (The list follows the same order as the GNU Coding Standards.) bindir='${exec_prefix}/bin' sbindir='${exec_prefix}/sbin' libexecdir='${exec_prefix}/libexec' -datadir='${prefix}/share' +datarootdir='${prefix}/share' +datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' -libdir='${exec_prefix}/lib' includedir='${prefix}/include' oldincludedir='/usr/include' -infodir='${prefix}/info' -mandir='${prefix}/man' +docdir='${datarootdir}/doc/${PACKAGE}' +infodir='${datarootdir}/info' +htmldir='${docdir}' +dvidir='${docdir}' +pdfdir='${docdir}' +psdir='${docdir}' +libdir='${exec_prefix}/lib' +localedir='${datarootdir}/locale' +mandir='${datarootdir}/man' ac_prev= +ac_dashdash= for ac_option do # If the previous option needs an argument, assign it. if test -n "$ac_prev"; then - eval "$ac_prev=\$ac_option" + eval $ac_prev=\$ac_option ac_prev= continue fi - ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'` + case $ac_option in + *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; + *=) ac_optarg= ;; + *) ac_optarg=yes ;; + esac # Accept the important Cygnus configure options, so we can diagnose typos. - case $ac_option in + case $ac_dashdash$ac_option in + --) + ac_dashdash=yes ;; -bindir | --bindir | --bindi | --bind | --bin | --bi) ac_prev=bindir ;; @@ -530,33 +995,59 @@ do --config-cache | -C) cache_file=config.cache ;; - -datadir | --datadir | --datadi | --datad | --data | --dat | --da) + -datadir | --datadir | --datadi | --datad) ac_prev=datadir ;; - -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \ - | --da=*) + -datadir=* | --datadir=* | --datadi=* | --datad=*) datadir=$ac_optarg ;; + -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \ + | --dataroo | --dataro | --datar) + ac_prev=datarootdir ;; + -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \ + | --dataroot=* | --dataroo=* | --dataro=* | --datar=*) + datarootdir=$ac_optarg ;; + -disable-* | --disable-*) - ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` + ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid feature name: $ac_feature" >&2 - { (exit 1); exit 1; }; } - ac_feature=`echo $ac_feature | sed 's/-/_/g'` - eval "enable_$ac_feature=no" ;; + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + as_fn_error $? "invalid feature name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"enable_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval enable_$ac_useropt=no ;; + + -docdir | --docdir | --docdi | --doc | --do) + ac_prev=docdir ;; + -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*) + docdir=$ac_optarg ;; + + -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv) + ac_prev=dvidir ;; + -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*) + dvidir=$ac_optarg ;; -enable-* | --enable-*) - ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` + ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid feature name: $ac_feature" >&2 - { (exit 1); exit 1; }; } - ac_feature=`echo $ac_feature | sed 's/-/_/g'` - case $ac_option in - *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; - *) ac_optarg=yes ;; + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + as_fn_error $? "invalid feature name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"enable_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig" + ac_unrecognized_sep=', ';; esac - eval "enable_$ac_feature='$ac_optarg'" ;; + eval enable_$ac_useropt=\$ac_optarg ;; -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ @@ -583,6 +1074,12 @@ do -host=* | --host=* | --hos=* | --ho=*) host_alias=$ac_optarg ;; + -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht) + ac_prev=htmldir ;; + -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \ + | --ht=*) + htmldir=$ac_optarg ;; + -includedir | --includedir | --includedi | --included | --include \ | --includ | --inclu | --incl | --inc) ac_prev=includedir ;; @@ -607,13 +1104,16 @@ do | --libexe=* | --libex=* | --libe=*) libexecdir=$ac_optarg ;; + -localedir | --localedir | --localedi | --localed | --locale) + ac_prev=localedir ;; + -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*) + localedir=$ac_optarg ;; + -localstatedir | --localstatedir | --localstatedi | --localstated \ - | --localstate | --localstat | --localsta | --localst \ - | --locals | --local | --loca | --loc | --lo) + | --localstate | --localstat | --localsta | --localst | --locals) ac_prev=localstatedir ;; -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ - | --localstate=* | --localstat=* | --localsta=* | --localst=* \ - | --locals=* | --local=* | --loca=* | --loc=* | --lo=*) + | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*) localstatedir=$ac_optarg ;; -mandir | --mandir | --mandi | --mand | --man | --ma | --m) @@ -678,6 +1178,16 @@ do | --progr-tra=* | --program-tr=* | --program-t=*) program_transform_name=$ac_optarg ;; + -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd) + ac_prev=pdfdir ;; + -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*) + pdfdir=$ac_optarg ;; + + -psdir | --psdir | --psdi | --psd | --ps) + ac_prev=psdir ;; + -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*) + psdir=$ac_optarg ;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil) silent=yes ;; @@ -728,26 +1238,36 @@ do ac_init_version=: ;; -with-* | --with-*) - ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` + ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid package name: $ac_package" >&2 - { (exit 1); exit 1; }; } - ac_package=`echo $ac_package| sed 's/-/_/g'` - case $ac_option in - *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; - *) ac_optarg=yes ;; + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + as_fn_error $? "invalid package name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"with_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig" + ac_unrecognized_sep=', ';; esac - eval "with_$ac_package='$ac_optarg'" ;; + eval with_$ac_useropt=\$ac_optarg ;; -without-* | --without-*) - ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` + ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid package name: $ac_package" >&2 - { (exit 1); exit 1; }; } - ac_package=`echo $ac_package | sed 's/-/_/g'` - eval "with_$ac_package=no" ;; + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + as_fn_error $? "invalid package name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"with_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval with_$ac_useropt=no ;; --x) # Obsolete; use --with-x. @@ -767,27 +1287,26 @@ do | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) x_libraries=$ac_optarg ;; - -*) { echo "$as_me: error: unrecognized option: $ac_option -Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; } + -*) as_fn_error $? "unrecognized option: \`$ac_option' +Try \`$0 --help' for more information" ;; *=*) ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` # Reject names that are not valid shell variable names. - expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 - { (exit 1); exit 1; }; } - ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` - eval "$ac_envvar='$ac_optarg'" + case $ac_envvar in #( + '' | [0-9]* | *[!_$as_cr_alnum]* ) + as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; + esac + eval $ac_envvar=\$ac_optarg export $ac_envvar ;; *) # FIXME: should be removed in autoconf 3.0. - echo "$as_me: WARNING: you should use --build, --host, --target" >&2 + $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && - echo "$as_me: WARNING: invalid host type: $ac_option" >&2 - : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} + $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 + : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" ;; esac @@ -795,31 +1314,36 @@ done if test -n "$ac_prev"; then ac_option=--`echo $ac_prev | sed 's/_/-/g'` - { echo "$as_me: error: missing argument to $ac_option" >&2 - { (exit 1); exit 1; }; } + as_fn_error $? "missing argument to $ac_option" fi -# Be sure to have absolute paths. -for ac_var in exec_prefix prefix -do - eval ac_val=$`echo $ac_var` - case $ac_val in - [\\/$]* | ?:[\\/]* | NONE | '' ) ;; - *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 - { (exit 1); exit 1; }; };; +if test -n "$ac_unrecognized_opts"; then + case $enable_option_checking in + no) ;; + fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; + *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; esac -done +fi -# Be sure to have absolute paths. -for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \ - localstatedir libdir includedir oldincludedir infodir mandir +# Check all directory arguments for consistency. +for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ + datadir sysconfdir sharedstatedir localstatedir includedir \ + oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ + libdir localedir mandir do - eval ac_val=$`echo $ac_var` + eval ac_val=\$$ac_var + # Remove trailing slashes. case $ac_val in - [\\/$]* | ?:[\\/]* ) ;; - *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 - { (exit 1); exit 1; }; };; + */ ) + ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'` + eval $ac_var=\$ac_val;; esac + # Be sure to have absolute directory names. + case $ac_val in + [\\/$]* | ?:[\\/]* ) continue;; + NONE | '' ) case $ac_var in *prefix ) continue;; esac;; + esac + as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" done # There might be people who depend on the old broken behavior: `$host' @@ -833,8 +1357,8 @@ target=$target_alias if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used." >&2 + $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. + If a cross compiler is detected then cross compile mode will be used" >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi @@ -846,71 +1370,72 @@ test -n "$host_alias" && ac_tool_prefix=$host_alias- test "$silent" = yes && exec 6>/dev/null +ac_pwd=`pwd` && test -n "$ac_pwd" && +ac_ls_di=`ls -di .` && +ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || + as_fn_error $? "working directory cannot be determined" +test "X$ac_ls_di" = "X$ac_pwd_ls_di" || + as_fn_error $? "pwd does not report name of working directory" + + # Find the source files, if location was not specified. if test -z "$srcdir"; then ac_srcdir_defaulted=yes - # Try the directory containing this script, then its parent. - ac_confdir=`(dirname "$0") 2>/dev/null || -$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$0" : 'X\(//\)[^/]' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$0" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` + # Try the directory containing this script, then the parent directory. + ac_confdir=`$as_dirname -- "$as_myself" || +$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_myself" : 'X\(//\)[^/]' \| \ + X"$as_myself" : 'X\(//\)$' \| \ + X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$as_myself" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` srcdir=$ac_confdir - if test ! -r $srcdir/$ac_unique_file; then + if test ! -r "$srcdir/$ac_unique_file"; then srcdir=.. fi else ac_srcdir_defaulted=no fi -if test ! -r $srcdir/$ac_unique_file; then - if test "$ac_srcdir_defaulted" = yes; then - { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2 - { (exit 1); exit 1; }; } - else - { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 - { (exit 1); exit 1; }; } - fi +if test ! -r "$srcdir/$ac_unique_file"; then + test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." + as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" fi -srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'` -ac_env_build_alias_set=${build_alias+set} -ac_env_build_alias_value=$build_alias -ac_cv_env_build_alias_set=${build_alias+set} -ac_cv_env_build_alias_value=$build_alias -ac_env_host_alias_set=${host_alias+set} -ac_env_host_alias_value=$host_alias -ac_cv_env_host_alias_set=${host_alias+set} -ac_cv_env_host_alias_value=$host_alias -ac_env_target_alias_set=${target_alias+set} -ac_env_target_alias_value=$target_alias -ac_cv_env_target_alias_set=${target_alias+set} -ac_cv_env_target_alias_value=$target_alias -ac_env_CC_set=${CC+set} -ac_env_CC_value=$CC -ac_cv_env_CC_set=${CC+set} -ac_cv_env_CC_value=$CC -ac_env_CFLAGS_set=${CFLAGS+set} -ac_env_CFLAGS_value=$CFLAGS -ac_cv_env_CFLAGS_set=${CFLAGS+set} -ac_cv_env_CFLAGS_value=$CFLAGS -ac_env_LDFLAGS_set=${LDFLAGS+set} -ac_env_LDFLAGS_value=$LDFLAGS -ac_cv_env_LDFLAGS_set=${LDFLAGS+set} -ac_cv_env_LDFLAGS_value=$LDFLAGS -ac_env_CPPFLAGS_set=${CPPFLAGS+set} -ac_env_CPPFLAGS_value=$CPPFLAGS -ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set} -ac_cv_env_CPPFLAGS_value=$CPPFLAGS -ac_env_CPP_set=${CPP+set} -ac_env_CPP_value=$CPP -ac_cv_env_CPP_set=${CPP+set} -ac_cv_env_CPP_value=$CPP +ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" +ac_abs_confdir=`( + cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" + pwd)` +# When building in place, set srcdir=. +if test "$ac_abs_confdir" = "$ac_pwd"; then + srcdir=. +fi +# Remove unnecessary trailing slashes from srcdir. +# Double slashes in file names in object file debugging info +# mess up M-x gdb in Emacs. +case $srcdir in +*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;; +esac +for ac_var in $ac_precious_vars; do + eval ac_env_${ac_var}_set=\${${ac_var}+set} + eval ac_env_${ac_var}_value=\$${ac_var} + eval ac_cv_env_${ac_var}_set=\${${ac_var}+set} + eval ac_cv_env_${ac_var}_value=\$${ac_var} +done # # Report the --help message. @@ -933,15 +1458,12 @@ Configuration: --help=short display options specific to this package --help=recursive display the short help of all the included packages -V, --version display version information and exit - -q, --quiet, --silent do not print \`checking...' messages + -q, --quiet, --silent do not print \`checking ...' messages --cache-file=FILE cache test results in FILE [disabled] -C, --config-cache alias for \`--cache-file=config.cache' -n, --no-create do not create output files --srcdir=DIR find the sources in DIR [configure dir or \`..'] -_ACEOF - - cat <<_ACEOF Installation directories: --prefix=PREFIX install architecture-independent files in PREFIX [$ac_default_prefix] @@ -956,18 +1478,25 @@ for instance \`--prefix=\$HOME'. For better control, use the options below. Fine tuning of the installation directories: - --bindir=DIR user executables [EPREFIX/bin] - --sbindir=DIR system admin executables [EPREFIX/sbin] - --libexecdir=DIR program executables [EPREFIX/libexec] - --datadir=DIR read-only architecture-independent data [PREFIX/share] - --sysconfdir=DIR read-only single-machine data [PREFIX/etc] - --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] - --localstatedir=DIR modifiable single-machine data [PREFIX/var] - --libdir=DIR object code libraries [EPREFIX/lib] - --includedir=DIR C header files [PREFIX/include] - --oldincludedir=DIR C header files for non-gcc [/usr/include] - --infodir=DIR info documentation [PREFIX/info] - --mandir=DIR man documentation [PREFIX/man] + --bindir=DIR user executables [EPREFIX/bin] + --sbindir=DIR system admin executables [EPREFIX/sbin] + --libexecdir=DIR program executables [EPREFIX/libexec] + --sysconfdir=DIR read-only single-machine data [PREFIX/etc] + --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] + --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --libdir=DIR object code libraries [EPREFIX/lib] + --includedir=DIR C header files [PREFIX/include] + --oldincludedir=DIR C header files for non-gcc [/usr/include] + --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] + --datadir=DIR read-only architecture-independent data [DATAROOTDIR] + --infodir=DIR info documentation [DATAROOTDIR/info] + --localedir=DIR locale-dependent data [DATAROOTDIR/locale] + --mandir=DIR man documentation [DATAROOTDIR/man] + --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE] + --htmldir=DIR html documentation [DOCDIR] + --dvidir=DIR dvi documentation [DOCDIR] + --pdfdir=DIR pdf documentation [DOCDIR] + --psdir=DIR ps documentation [DOCDIR] _ACEOF cat <<\_ACEOF @@ -984,6 +1513,7 @@ if test -n "$ac_init_help"; then cat <<\_ACEOF Optional Features: + --disable-option-checking ignore unrecognized --enable/--with options --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] --enable-static=PKGS build static libraries default=no @@ -1013,94 +1543,449 @@ Some influential environment variables: CFLAGS C compiler flags LDFLAGS linker flags, e.g. -L if you have libraries in a nonstandard directory - CPPFLAGS C/C++ preprocessor flags, e.g. -I if you have - headers in a nonstandard directory + LIBS libraries to pass to the linker, e.g. -l + CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if + you have headers in a nonstandard directory CPP C preprocessor Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. +Report bugs to the package provider. _ACEOF +ac_status=$? fi if test "$ac_init_help" = "recursive"; then # If there are subdirs, report their specific --help. - ac_popdir=`pwd` for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue - test -d $ac_dir || continue + test -d "$ac_dir" || + { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } || + continue ac_builddir=. -if test "$ac_dir" != .; then - ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` - # A "../" for each directory in $ac_dir_suffix. - ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` -else - ac_dir_suffix= ac_top_builddir= -fi +case "$ac_dir" in +.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; +*) + ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` + # A ".." for each directory in $ac_dir_suffix. + ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` + case $ac_top_builddir_sub in + "") ac_top_builddir_sub=. ac_top_build_prefix= ;; + *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; + esac ;; +esac +ac_abs_top_builddir=$ac_pwd +ac_abs_builddir=$ac_pwd$ac_dir_suffix +# for backward compatibility: +ac_top_builddir=$ac_top_build_prefix case $srcdir in - .) # No --srcdir option. We are building in place. + .) # We are building in place. ac_srcdir=. - if test -z "$ac_top_builddir"; then - ac_top_srcdir=. - else - ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` - fi ;; - [\\/]* | ?:[\\/]* ) # Absolute path. + ac_top_srcdir=$ac_top_builddir_sub + ac_abs_top_srcdir=$ac_pwd ;; + [\\/]* | ?:[\\/]* ) # Absolute name. ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir ;; - *) # Relative path. - ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_builddir$srcdir ;; + ac_top_srcdir=$srcdir + ac_abs_top_srcdir=$srcdir ;; + *) # Relative name. + ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix + ac_top_srcdir=$ac_top_build_prefix$srcdir + ac_abs_top_srcdir=$ac_pwd/$srcdir ;; esac -# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be -# absolute. -ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` -ac_abs_top_builddir=`cd "$ac_dir" && cd $ac_top_builddir && pwd` -ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` -ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` +ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix - cd $ac_dir - # Check for guested configure; otherwise get Cygnus style configure. - if test -f $ac_srcdir/configure.gnu; then - echo - $SHELL $ac_srcdir/configure.gnu --help=recursive - elif test -f $ac_srcdir/configure; then - echo - $SHELL $ac_srcdir/configure --help=recursive - elif test -f $ac_srcdir/configure.ac || - test -f $ac_srcdir/configure.in; then - echo - $ac_configure --help + cd "$ac_dir" || { ac_status=$?; continue; } + # Check for guested configure. + if test -f "$ac_srcdir/configure.gnu"; then + echo && + $SHELL "$ac_srcdir/configure.gnu" --help=recursive + elif test -f "$ac_srcdir/configure"; then + echo && + $SHELL "$ac_srcdir/configure" --help=recursive else - echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 - fi - cd $ac_popdir + $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 + fi || ac_status=$? + cd "$ac_pwd" || { ac_status=$?; break; } done fi -test -n "$ac_init_help" && exit 0 +test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF +configure +generated by GNU Autoconf 2.68 -Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 -Free Software Foundation, Inc. +Copyright (C) 2010 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF - exit 0 + exit fi -exec 5>config.log -cat >&5 <<_ACEOF + +## ------------------------ ## +## Autoconf initialization. ## +## ------------------------ ## + +# ac_fn_c_try_compile LINENO +# -------------------------- +# Try to compile conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + rm -f conftest.$ac_objext + if { { ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compile") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_c_try_compile + +# ac_fn_c_try_link LINENO +# ----------------------- +# Try to link conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_link () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + rm -f conftest.$ac_objext conftest$ac_exeext + if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information + # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would + # interfere with the next link command; also delete a directory that is + # left behind by Apple's compiler. We do this before executing the actions. + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_c_try_link + +# ac_fn_c_check_func LINENO FUNC VAR +# ---------------------------------- +# Tests whether FUNC exists, setting the cache variable VAR accordingly +ac_fn_c_check_func () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +/* Define $2 to an innocuous variant, in case declares $2. + For example, HP-UX 11i declares gettimeofday. */ +#define $2 innocuous_$2 + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $2 (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef $2 + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char $2 (); +/* 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_$2 || defined __stub___$2 +choke me +#endif + +int +main () +{ +return $2 (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval "$3=yes" +else + eval "$3=no" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_c_check_func + +# ac_fn_c_try_cpp LINENO +# ---------------------- +# Try to preprocess conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_cpp () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { { ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } > conftest.i && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_c_try_cpp + +# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES +# ------------------------------------------------------- +# Tests whether HEADER exists, giving a warning if it cannot be compiled using +# the include files in INCLUDES and setting the cache variable VAR +# accordingly. +ac_fn_c_check_header_mongrel () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if eval \${$3+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +else + # Is the header compilable? +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5 +$as_echo_n "checking $2 usability... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +#include <$2> +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_header_compiler=yes +else + ac_header_compiler=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } + +# Is the header present? +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5 +$as_echo_n "checking $2 presence... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <$2> +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + ac_header_preproc=yes +else + ac_header_preproc=no +fi +rm -f conftest.err conftest.i conftest.$ac_ext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #(( + yes:no: ) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} + ;; + no:yes:* ) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} + ;; +esac + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +else + eval "$3=\$ac_header_compiler" +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +fi + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_c_check_header_mongrel + +# ac_fn_c_try_run LINENO +# ---------------------- +# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes +# that executables *can* be run. +ac_fn_c_try_run () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' + { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then : + ac_retval=0 +else + $as_echo "$as_me: program exited with status $ac_status" >&5 + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=$ac_status +fi + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_c_try_run + +# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES +# ------------------------------------------------------- +# Tests whether HEADER exists and can be compiled using the include files in +# INCLUDES, setting the cache variable VAR accordingly. +ac_fn_c_check_header_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +#include <$2> +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + eval "$3=yes" +else + eval "$3=no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_c_check_header_compile +cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by $as_me, which was -generated by GNU Autoconf 2.53. Invocation command line was +generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ _ACEOF +exec 5>>config.log { cat <<_ASUNAME ## --------- ## @@ -1119,7 +2004,7 @@ uname -v = `(uname -v) 2>/dev/null || echo unknown` /bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` /usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` -hostinfo = `(hostinfo) 2>/dev/null || echo unknown` +/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` /bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` /usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` /bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` @@ -1131,8 +2016,9 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - echo "PATH: $as_dir" -done + $as_echo "PATH: $as_dir" + done +IFS=$as_save_IFS } >&5 @@ -1148,86 +2034,153 @@ _ACEOF # Keep a trace of the command line. # Strip out --no-create and --no-recursion so they do not pile up. +# Strip out --silent because we don't want to record it for future runs. # Also quote any args containing shell meta-characters. +# Make two passes to allow for proper duplicate-argument suppression. ac_configure_args= -ac_sep= -for ac_arg +ac_configure_args0= +ac_configure_args1= +ac_must_keep_next=false +for ac_pass in 1 2 do - case $ac_arg in - -no-create | --no-create | --no-creat | --no-crea | --no-cre \ - | --no-cr | --no-c | -n ) continue ;; - -no-recursion | --no-recursion | --no-recursio | --no-recursi \ - | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) - continue ;; - *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) - ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; - esac - case " $ac_configure_args " in - *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. - *) ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" - ac_sep=" " ;; - esac - # Get rid of the leading space. + for ac_arg + do + case $ac_arg in + -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil) + continue ;; + *\'*) + ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + case $ac_pass in + 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;; + 2) + as_fn_append ac_configure_args1 " '$ac_arg'" + if test $ac_must_keep_next = true; then + ac_must_keep_next=false # Got value, back to normal. + else + case $ac_arg in + *=* | --config-cache | -C | -disable-* | --disable-* \ + | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ + | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ + | -with-* | --with-* | -without-* | --without-* | --x) + case "$ac_configure_args0 " in + "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; + esac + ;; + -* ) ac_must_keep_next=true ;; + esac + fi + as_fn_append ac_configure_args " '$ac_arg'" + ;; + esac + done done +{ ac_configure_args0=; unset ac_configure_args0;} +{ ac_configure_args1=; unset ac_configure_args1;} # When interrupted or exit'd, cleanup temporary files, and complete # config.log. We remove comments because anyway the quotes in there # would cause problems or look ugly. -# WARNING: Be sure not to use single quotes in there, as some shells, -# such as our DU 5.0 friend, will then `close' the trap. +# WARNING: Use '\'' to represent an apostrophe within the trap. +# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. trap 'exit_status=$? # Save into config.log some information that might help in debugging. { echo - cat <<\_ASBOX -## ---------------- ## + + $as_echo "## ---------------- ## ## Cache variables. ## -## ---------------- ## -_ASBOX +## ---------------- ##" echo # The following way of writing the cache mishandles newlines in values, -{ +( + for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do + eval ac_val=\$$ac_var + case $ac_val in #( + *${as_nl}*) + case $ac_var in #( + *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 +$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + esac + case $ac_var in #( + _ | IFS | as_nl) ;; #( + BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( + *) { eval $ac_var=; unset $ac_var;} ;; + esac ;; + esac + done (set) 2>&1 | - case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in - *ac_space=\ *) + case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #( + *${as_nl}ac_space=\ *) sed -n \ - "s/'"'"'/'"'"'\\\\'"'"''"'"'/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p" - ;; + "s/'\''/'\''\\\\'\'''\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" + ;; #( *) - sed -n \ - "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" + sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" ;; - esac; -} + esac | + sort +) echo - if test -s confdefs.h; then - cat <<\_ASBOX -## ----------- ## -## confdefs.h. ## -## ----------- ## -_ASBOX + + $as_echo "## ----------------- ## +## Output variables. ## +## ----------------- ##" + echo + for ac_var in $ac_subst_vars + do + eval ac_val=\$$ac_var + case $ac_val in + *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + esac + $as_echo "$ac_var='\''$ac_val'\''" + done | sort + echo + + if test -n "$ac_subst_files"; then + $as_echo "## ------------------- ## +## File substitutions. ## +## ------------------- ##" echo - sed "/^$/d" confdefs.h + for ac_var in $ac_subst_files + do + eval ac_val=\$$ac_var + case $ac_val in + *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + esac + $as_echo "$ac_var='\''$ac_val'\''" + done | sort + echo + fi + + if test -s confdefs.h; then + $as_echo "## ----------- ## +## confdefs.h. ## +## ----------- ##" + echo + cat confdefs.h echo fi test "$ac_signal" != 0 && - echo "$as_me: caught signal $ac_signal" - echo "$as_me: exit $exit_status" + $as_echo "$as_me: caught signal $ac_signal" + $as_echo "$as_me: exit $exit_status" } >&5 - rm -f core core.* *.core && - rm -rf conftest* confdefs* conf$$* $ac_clean_files && + rm -f core *.core core.conftest.* && + rm -f -r conftest* confdefs* conf$$* $ac_clean_files && exit $exit_status - ' 0 +' 0 for ac_signal in 1 2 13 15; do - trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal + trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal done ac_signal=0 # confdefs.h avoids OS command line length limits that DEFS can exceed. -rm -rf conftest* confdefs.h -# AIX cpp loses on an empty file, so make sure it contains at least a newline. -echo >confdefs.h +rm -f -r conftest* confdefs.h + +$as_echo "/* confdefs.h */" > confdefs.h # Predefined preprocessor variables. @@ -1235,112 +2188,137 @@ cat >>confdefs.h <<_ACEOF #define PACKAGE_NAME "$PACKAGE_NAME" _ACEOF - cat >>confdefs.h <<_ACEOF #define PACKAGE_TARNAME "$PACKAGE_TARNAME" _ACEOF - cat >>confdefs.h <<_ACEOF #define PACKAGE_VERSION "$PACKAGE_VERSION" _ACEOF - cat >>confdefs.h <<_ACEOF #define PACKAGE_STRING "$PACKAGE_STRING" _ACEOF - cat >>confdefs.h <<_ACEOF #define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" _ACEOF +cat >>confdefs.h <<_ACEOF +#define PACKAGE_URL "$PACKAGE_URL" +_ACEOF + # Let the site file select an alternate cache file if it wants to. -# Prefer explicitly selected file to automatically selected ones. -if test -z "$CONFIG_SITE"; then - if test "x$prefix" != xNONE; then - CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" - else - CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" - fi +# Prefer an explicitly selected file to automatically selected ones. +ac_site_file1=NONE +ac_site_file2=NONE +if test -n "$CONFIG_SITE"; then + # We do not want a PATH search for config.site. + case $CONFIG_SITE in #(( + -*) ac_site_file1=./$CONFIG_SITE;; + */*) ac_site_file1=$CONFIG_SITE;; + *) ac_site_file1=./$CONFIG_SITE;; + esac +elif test "x$prefix" != xNONE; then + ac_site_file1=$prefix/share/config.site + ac_site_file2=$prefix/etc/config.site +else + ac_site_file1=$ac_default_prefix/share/config.site + ac_site_file2=$ac_default_prefix/etc/config.site fi -for ac_site_file in $CONFIG_SITE; do - if test -r "$ac_site_file"; then - { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 -echo "$as_me: loading site script $ac_site_file" >&6;} +for ac_site_file in "$ac_site_file1" "$ac_site_file2" +do + test "x$ac_site_file" = xNONE && continue + if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 +$as_echo "$as_me: loading site script $ac_site_file" >&6;} sed 's/^/| /' "$ac_site_file" >&5 - . "$ac_site_file" + . "$ac_site_file" \ + || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "failed to load site script $ac_site_file +See \`config.log' for more details" "$LINENO" 5; } fi done if test -r "$cache_file"; then - # Some versions of bash will fail to source /dev/null (special - # files actually), so we avoid doing that. - if test -f "$cache_file"; then - { echo "$as_me:$LINENO: loading cache $cache_file" >&5 -echo "$as_me: loading cache $cache_file" >&6;} + # Some versions of bash will fail to source /dev/null (special files + # actually), so we avoid doing that. DJGPP emulates it as a regular file. + if test /dev/null != "$cache_file" && test -f "$cache_file"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 +$as_echo "$as_me: loading cache $cache_file" >&6;} case $cache_file in - [\\/]* | ?:[\\/]* ) . $cache_file;; - *) . ./$cache_file;; + [\\/]* | ?:[\\/]* ) . "$cache_file";; + *) . "./$cache_file";; esac fi else - { echo "$as_me:$LINENO: creating cache $cache_file" >&5 -echo "$as_me: creating cache $cache_file" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 +$as_echo "$as_me: creating cache $cache_file" >&6;} >$cache_file fi # Check that the precious variables saved in the cache have kept the same # value. ac_cache_corrupted=false -for ac_var in `(set) 2>&1 | - sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do +for ac_var in $ac_precious_vars; do eval ac_old_set=\$ac_cv_env_${ac_var}_set eval ac_new_set=\$ac_env_${ac_var}_set - eval ac_old_val="\$ac_cv_env_${ac_var}_value" - eval ac_new_val="\$ac_env_${ac_var}_value" + eval ac_old_val=\$ac_cv_env_${ac_var}_value + eval ac_new_val=\$ac_env_${ac_var}_value case $ac_old_set,$ac_new_set in set,) - { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 -echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 +$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} ac_cache_corrupted=: ;; ,set) - { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 -echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 +$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_cache_corrupted=: ;; ,);; *) if test "x$ac_old_val" != "x$ac_new_val"; then - { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 -echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} - { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 -echo "$as_me: former value: $ac_old_val" >&2;} - { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 -echo "$as_me: current value: $ac_new_val" >&2;} - ac_cache_corrupted=: + # differences in whitespace do not lead to failure. + ac_old_val_w=`echo x $ac_old_val` + ac_new_val_w=`echo x $ac_new_val` + if test "$ac_old_val_w" != "$ac_new_val_w"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 +$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} + ac_cache_corrupted=: + else + { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 +$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} + eval $ac_var=\$ac_old_val + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 +$as_echo "$as_me: former value: \`$ac_old_val'" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 +$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} fi;; esac # Pass precious variables to config.status. if test "$ac_new_set" = set; then case $ac_new_val in - *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) - ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; + *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; *) ac_arg=$ac_var=$ac_new_val ;; esac case " $ac_configure_args " in *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. - *) ac_configure_args="$ac_configure_args '$ac_arg'" ;; + *) as_fn_append ac_configure_args " '$ac_arg'" ;; esac fi done if $ac_cache_corrupted; then - { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 -echo "$as_me: error: changes in the environment can compromise the build" >&2;} - { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 -echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} - { (exit 1); exit 1; }; } + { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 +$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} + as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 fi +## -------------------- ## +## Main body of script. ## +## -------------------- ## ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -1349,26 +2327,9 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - - - - - - - - - - - - - - -# Check whether --enable-static or --disable-static was given. -if test "${enable_static+set}" = set; then - enableval="$enable_static" - p=${PACKAGE-default} +# Check whether --enable-static was given. +if test "${enable_static+set}" = set; then : + enableval=$enable_static; p=${PACKAGE-default} case $enableval in yes) enable_static=yes ;; no) enable_static=no ;; @@ -1386,11 +2347,11 @@ no) enable_static=no ;; esac else enable_static=no -fi; -# Check whether --enable-shared or --disable-shared was given. -if test "${enable_shared+set}" = set; then - enableval="$enable_shared" - p=${PACKAGE-default} +fi + +# Check whether --enable-shared was given. +if test "${enable_shared+set}" = set; then : + enableval=$enable_shared; p=${PACKAGE-default} case $enableval in yes) enable_shared=yes ;; no) enable_shared=no ;; @@ -1408,11 +2369,11 @@ no) enable_shared=no ;; esac else enable_shared=yes -fi; -# Check whether --enable-fast-install or --disable-fast-install was given. -if test "${enable_fast_install+set}" = set; then - enableval="$enable_fast_install" - p=${PACKAGE-default} +fi + +# Check whether --enable-fast-install was given. +if test "${enable_fast_install+set}" = set; then : + enableval=$enable_fast_install; p=${PACKAGE-default} case $enableval in yes) enable_fast_install=yes ;; no) enable_fast_install=no ;; @@ -1430,84 +2391,106 @@ no) enable_fast_install=no ;; esac else enable_fast_install=yes -fi; +fi + ac_aux_dir= -for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do - if test -f $ac_dir/install-sh; then +for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do + if test -f "$ac_dir/install-sh"; then ac_aux_dir=$ac_dir ac_install_sh="$ac_aux_dir/install-sh -c" break - elif test -f $ac_dir/install.sh; then + elif test -f "$ac_dir/install.sh"; then ac_aux_dir=$ac_dir ac_install_sh="$ac_aux_dir/install.sh -c" break - elif test -f $ac_dir/shtool; then + elif test -f "$ac_dir/shtool"; then ac_aux_dir=$ac_dir ac_install_sh="$ac_aux_dir/shtool install -c" break fi done if test -z "$ac_aux_dir"; then - { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 -echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 fi -ac_config_guess="$SHELL $ac_aux_dir/config.guess" -ac_config_sub="$SHELL $ac_aux_dir/config.sub" -ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. + +# These three variables are undocumented and unsupported, +# and are intended to be withdrawn in a future Autoconf release. +# They can cause serious problems if a builder's source tree is in a directory +# whose full name contains unusual characters. +ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. +ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. +ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. + # Make sure we can run config.sub. -$ac_config_sub sun4 >/dev/null 2>&1 || - { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5 -echo "$as_me: error: cannot run $ac_config_sub" >&2;} - { (exit 1); exit 1; }; } +$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || + as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 -echo "$as_me:$LINENO: checking build system type" >&5 -echo $ECHO_N "checking build system type... $ECHO_C" >&6 -if test "${ac_cv_build+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 +$as_echo_n "checking build system type... " >&6; } +if ${ac_cv_build+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_cv_build_alias=$build_alias -test -z "$ac_cv_build_alias" && - ac_cv_build_alias=`$ac_config_guess` -test -z "$ac_cv_build_alias" && - { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 -echo "$as_me: error: cannot guess build type; you must specify one" >&2;} - { (exit 1); exit 1; }; } -ac_cv_build=`$ac_config_sub $ac_cv_build_alias` || - { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5 -echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;} - { (exit 1); exit 1; }; } + ac_build_alias=$build_alias +test "x$ac_build_alias" = x && + ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` +test "x$ac_build_alias" = x && + as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 +ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 fi -echo "$as_me:$LINENO: result: $ac_cv_build" >&5 -echo "${ECHO_T}$ac_cv_build" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 +$as_echo "$ac_cv_build" >&6; } +case $ac_cv_build in +*-*-*) ;; +*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; +esac build=$ac_cv_build -build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` +ac_save_IFS=$IFS; IFS='-' +set x $ac_cv_build +shift +build_cpu=$1 +build_vendor=$2 +shift; shift +# Remember, the first character of IFS is used to create $*, +# except with old shells: +build_os=$* +IFS=$ac_save_IFS +case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac -echo "$as_me:$LINENO: checking host system type" >&5 -echo $ECHO_N "checking host system type... $ECHO_C" >&6 -if test "${ac_cv_host+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 +$as_echo_n "checking host system type... " >&6; } +if ${ac_cv_host+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_cv_host_alias=$host_alias -test -z "$ac_cv_host_alias" && - ac_cv_host_alias=$ac_cv_build_alias -ac_cv_host=`$ac_config_sub $ac_cv_host_alias` || - { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5 -echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} - { (exit 1); exit 1; }; } + if test "x$host_alias" = x; then + ac_cv_host=$ac_cv_build +else + ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 +fi fi -echo "$as_me:$LINENO: result: $ac_cv_host" >&5 -echo "${ECHO_T}$ac_cv_host" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 +$as_echo "$ac_cv_host" >&6; } +case $ac_cv_host in +*-*-*) ;; +*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; +esac host=$ac_cv_host -host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` +ac_save_IFS=$IFS; IFS='-' +set x $ac_cv_host +shift +host_cpu=$1 +host_vendor=$2 +shift; shift +# Remember, the first character of IFS is used to create $*, +# except with old shells: +host_os=$* +IFS=$ac_save_IFS +case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac ac_ext=c @@ -1518,10 +2501,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -1531,35 +2514,37 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}gcc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done +IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi + fi if test -z "$ac_cv_prog_CC"; then ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_CC+:} false; then : + $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. @@ -1569,39 +2554,50 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="gcc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done +IFS=$as_save_IFS fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +$as_echo "$ac_ct_CC" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - CC=$ac_ct_CC + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi else CC="$ac_cv_prog_CC" fi if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -1611,77 +2607,37 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}cc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done +IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -fi -if test -z "$ac_cv_prog_CC"; then - ac_ct_CC=$CC - # Extract the first word of "cc", so it can be a program name with args. -set dummy cc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CC="cc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 + fi -done -done - -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - CC=$ac_ct_CC -else - CC="$ac_cv_prog_CC" -fi - fi if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -1692,18 +2648,19 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue fi ac_cv_prog_CC="cc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done +IFS=$as_save_IFS if test $ac_prog_rejected = yes; then # We found a bogon in the path, so make sure we never use it. @@ -1714,33 +2671,32 @@ if test $ac_prog_rejected = yes; then # However, it has the same basename, so the bogon will be chosen # first if we set CC to just the basename; use the full file name. shift - set dummy "$as_dir/$ac_word" ${1+"$@"} - shift - ac_cv_prog_CC="$@" + ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" fi fi fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi + fi if test -z "$CC"; then if test -n "$ac_tool_prefix"; then - for ac_prog in cl + for ac_prog in cl.exe do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -1750,39 +2706,41 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done +IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi + test -n "$CC" && break done fi if test -z "$CC"; then ac_ct_CC=$CC - for ac_prog in cl + for ac_prog in cl.exe do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_CC+:} false; then : + $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. @@ -1792,69 +2750,80 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done +IFS=$as_save_IFS fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +$as_echo "$ac_ct_CC" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi + test -n "$ac_ct_CC" && break done - CC=$ac_ct_CC + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi fi fi -test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH" >&5 -echo "$as_me: error: no acceptable C compiler found in \$PATH" >&2;} - { (exit 1); exit 1; }; } +test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "no acceptable C compiler found in \$PATH +See \`config.log' for more details" "$LINENO" 5; } # Provide some information about the compiler. -echo "$as_me:$LINENO:" \ - "checking for C compiler version" >&5 -ac_compiler=`set X $ac_compile; echo $2` -{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 - (eval $ac_compiler --version &5) 2>&5 +$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 +set X $ac_compile +ac_compiler=$2 +for ac_option in --version -v -V -qversion; do + { { ac_try="$ac_compiler $ac_option >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compiler $ac_option >&5") 2>conftest.err ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v &5\"") >&5 - (eval $ac_compiler -v &5) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V &5\"") >&5 - (eval $ac_compiler -V &5) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } + if test -s conftest.err; then + sed '10a\ +... rest of stderr output deleted ... + 10q' conftest.err >conftest.er1 + cat conftest.er1 >&5 + fi + rm -f conftest.er1 conftest.err + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +done -cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -#include "confdefs.h" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -1864,138 +2833,201 @@ main () } _ACEOF ac_clean_files_save=$ac_clean_files -ac_clean_files="$ac_clean_files a.out a.exe" +ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. -echo "$as_me:$LINENO: checking for C compiler default output" >&5 -echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6 -ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` -if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5 - (eval $ac_link_default) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - # Find the output, starting from the most likely. This scheme is -# not robust to junk in `.', hence go to wildcards (a.*) only as a last -# resort. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 +$as_echo_n "checking whether the C compiler works... " >&6; } +ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` -# Be careful to initialize this variable, since it used to be cached. -# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile. -ac_cv_exeext= -for ac_file in `ls a_out.exe a.exe conftest.exe 2>/dev/null; - ls a.out conftest 2>/dev/null; - ls a.* conftest.* 2>/dev/null`; do +# The possible output files: +ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" + +ac_rmfiles= +for ac_file in $ac_files +do case $ac_file in - *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb | *.xSYM ) ;; - a.out ) # We found the default executable, but exeext='' is most - # certainly right. - break;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; + * ) ac_rmfiles="$ac_rmfiles $ac_file";; + esac +done +rm -f $ac_rmfiles + +if { { ac_try="$ac_link_default" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link_default") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : + # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. +# So ignore a value of `no', otherwise this would lead to `EXEEXT = no' +# in a Makefile. We should not override ac_cv_exeext if it was cached, +# so that the user can short-circuit this test for compilers unknown to +# Autoconf. +for ac_file in $ac_files '' +do + test -f "$ac_file" || continue + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) + ;; + [ab].out ) + # We found the default executable, but exeext='' is most + # certainly right. + break;; + *.* ) + if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; + then :; else + ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + fi + # We set ac_cv_exeext here because the later test for it is not + # safe: cross compilers may not add the suffix if given an `-o' + # argument, so we may need to know it at that point already. + # Even if this section looks crufty: it has the advantage of + # actually working. + break;; + * ) + break;; + esac +done +test "$ac_cv_exeext" = no && ac_cv_exeext= + +else + ac_file='' +fi +if test -z "$ac_file"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +$as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error 77 "C compiler cannot create executables +See \`config.log' for more details" "$LINENO" 5; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 +$as_echo_n "checking for C compiler default output file name... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 +$as_echo "$ac_file" >&6; } +ac_exeext=$ac_cv_exeext + +rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out +ac_clean_files=$ac_clean_files_save +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 +$as_echo_n "checking for suffix of executables... " >&6; } +if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : + # If both `conftest.exe' and `conftest' are `present' (well, observable) +# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will +# work properly (i.e., refer to `conftest.exe'), while it won't with +# `rm'. +for ac_file in conftest.exe conftest conftest.*; do + test -f "$ac_file" || continue + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - # FIXME: I believe we export ac_cv_exeext for Libtool --akim. - export ac_cv_exeext - break;; + break;; * ) break;; esac done else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -{ { echo "$as_me:$LINENO: error: C compiler cannot create executables" >&5 -echo "$as_me: error: C compiler cannot create executables" >&2;} - { (exit 77); exit 77; }; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details" "$LINENO" 5; } fi +rm -f conftest conftest$ac_cv_exeext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 +$as_echo "$ac_cv_exeext" >&6; } -ac_exeext=$ac_cv_exeext -echo "$as_me:$LINENO: result: $ac_file" >&5 -echo "${ECHO_T}$ac_file" >&6 +rm -f conftest.$ac_ext +EXEEXT=$ac_cv_exeext +ac_exeext=$EXEEXT +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +FILE *f = fopen ("conftest.out", "w"); + return ferror (f) || fclose (f) != 0; -# Check the compiler produces executables we can run. If not, either + ; + return 0; +} +_ACEOF +ac_clean_files="$ac_clean_files conftest.out" +# Check that the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -echo "$as_me:$LINENO: checking whether the C compiler works" >&5 -echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6 -# FIXME: These cross compiler hacks should be removed for Autoconf 3.0 -# If not cross compiling, check that we can run a simple program. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 +$as_echo_n "checking whether we are cross compiling... " >&6; } if test "$cross_compiling" != yes; then - if { ac_try='./$ac_file' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + if { ac_try='./conftest$ac_cv_exeext' + { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then cross_compiling=no else if test "$cross_compiling" = maybe; then cross_compiling=yes else - { { echo "$as_me:$LINENO: error: cannot run C compiled programs. -If you meant to cross compile, use \`--host'." >&5 -echo "$as_me: error: cannot run C compiled programs. -If you meant to cross compile, use \`--host'." >&2;} - { (exit 1); exit 1; }; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "cannot run C compiled programs. +If you meant to cross compile, use \`--host'. +See \`config.log' for more details" "$LINENO" 5; } fi fi fi -echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 +$as_echo "$cross_compiling" >&6; } -rm -f a.out a.exe conftest$ac_cv_exeext +rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out ac_clean_files=$ac_clean_files_save -# Check the compiler produces executables we can run. If not, either -# the compiler is broken, or we cross compile. -echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 -echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 -echo "$as_me:$LINENO: result: $cross_compiling" >&5 -echo "${ECHO_T}$cross_compiling" >&6 - -echo "$as_me:$LINENO: checking for suffix of executables" >&5 -echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - # If both `conftest.exe' and `conftest' are `present' (well, observable) -# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will -# work properly (i.e., refer to `conftest.exe'), while it won't with -# `rm'. -for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do - case $ac_file in - *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb ) ;; - *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - export ac_cv_exeext - break;; - * ) break;; - esac -done +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 +$as_echo_n "checking for suffix of object files... " >&6; } +if ${ac_cv_objext+:} false; then : + $as_echo_n "(cached) " >&6 else - { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link" >&5 -echo "$as_me: error: cannot compute suffix of executables: cannot compile and link" >&2;} - { (exit 1); exit 1; }; } -fi + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -rm -f conftest$ac_cv_exeext -echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 -echo "${ECHO_T}$ac_cv_exeext" >&6 - -rm -f conftest.$ac_ext -EXEEXT=$ac_cv_exeext -ac_exeext=$EXEEXT -echo "$as_me:$LINENO: checking for suffix of object files" >&5 -echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6 -if test "${ac_cv_objext+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -#include "confdefs.h" - -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -2005,47 +3037,48 @@ main () } _ACEOF rm -f conftest.o conftest.obj -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 +if { { ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compile") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : + for ac_file in conftest.o conftest.obj conftest.*; do + test -f "$ac_file" || continue; case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb ) ;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;; *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` break;; esac done else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile" >&5 -echo "$as_me: error: cannot compute suffix of object files: cannot compile" >&2;} - { (exit 1); exit 1; }; } -fi + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 +{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "cannot compute suffix of object files: cannot compile +See \`config.log' for more details" "$LINENO" 5; } +fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 -echo "${ECHO_T}$ac_cv_objext" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 +$as_echo "$ac_cv_objext" >&6; } OBJEXT=$ac_cv_objext ac_objext=$OBJEXT -echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 -echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 -if test "${ac_cv_c_compiler_gnu+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 +$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } +if ${ac_cv_c_compiler_gnu+:} false; then : + $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -#include "confdefs.h" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -2057,49 +3090,36 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +if ac_fn_c_try_compile "$LINENO"; then : ac_compiler_gnu=yes else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_compiler_gnu=no + ac_compiler_gnu=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 -echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 -GCC=`test $ac_compiler_gnu = yes && echo yes` +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 +$as_echo "$ac_cv_c_compiler_gnu" >&6; } +if test $ac_compiler_gnu = yes; then + GCC=yes +else + GCC= +fi ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS -CFLAGS="-g" -echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 -echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 -if test "${ac_cv_prog_cc_g+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 +$as_echo_n "checking whether $CC accepts -g... " >&6; } +if ${ac_cv_prog_cc_g+:} false; then : + $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -#include "confdefs.h" + ac_save_c_werror_flag=$ac_c_werror_flag + ac_c_werror_flag=yes + ac_cv_prog_cc_g=no + CFLAGS="-g" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -2108,28 +3128,49 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_g=yes else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_prog_cc_g=no + CFLAGS="" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + +else + ac_c_werror_flag=$ac_save_c_werror_flag + CFLAGS="-g" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_g=yes fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 -echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_c_werror_flag=$ac_save_c_werror_flag +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 +$as_echo "$ac_cv_prog_cc_g" >&6; } if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS elif test $ac_cv_prog_cc_g = yes; then @@ -2145,123 +3186,97 @@ else CFLAGS= fi fi -# Some people use a C++ compiler to compile C. Since we use `exit', -# in C++ we need to declare it. In case someone uses the same compiler -# for both compiling C and C++ we need to have the C++ compiler decide -# the declaration of exit, since it's the most demanding environment. -cat >conftest.$ac_ext <<_ACEOF -#ifndef __cplusplus - choke me -#endif +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 +$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } +if ${ac_cv_prog_cc_c89+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_cv_prog_cc_c89=no +ac_save_CC=$CC +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include +#include +#include +/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ +struct buf { int x; }; +FILE * (*rcsopen) (struct buf *, struct stat *, int); +static char *e (p, i) + char **p; + int i; +{ + return p[i]; +} +static char *f (char * (*g) (char **, int), char **p, ...) +{ + char *s; + va_list v; + va_start (v,p); + s = g (p, va_arg (v,int)); + va_end (v); + return s; +} + +/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has + function prototypes and stuff, but not '\xHH' hex character constants. + These don't provoke an error unfortunately, instead are silently treated + as 'x'. The following induces an error, until -std is added to get + proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an + array size at least. It's necessary to write '\x00'==0 to get something + that's true only with -std. */ +int osf4_cc_array ['\x00' == 0 ? 1 : -1]; + +/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters + inside strings and character constants. */ +#define FOO(x) 'x' +int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; + +int test (int i, double x); +struct s1 {int (*f) (int a);}; +struct s2 {int (*f) (double a);}; +int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); +int argc; +char **argv; +int +main () +{ +return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; + ; + return 0; +} _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - for ac_declaration in \ - ''\ - '#include ' \ - 'extern "C" void std::exit (int) throw (); using std::exit;' \ - 'extern "C" void std::exit (int); using std::exit;' \ - 'extern "C" void exit (int) throw ();' \ - 'extern "C" void exit (int);' \ - 'void exit (int);' +for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ + -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" do - cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -#include "confdefs.h" -#include -$ac_declaration -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif -int -main () -{ -exit (42); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -continue + CC="$ac_save_CC $ac_arg" + if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_c89=$ac_arg fi -rm -f conftest.$ac_objext conftest.$ac_ext - cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -#include "confdefs.h" -$ac_declaration -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif -int -main () -{ -exit (42); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - break -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext + test "x$ac_cv_prog_cc_c89" != "xno" && break done -rm -f conftest* -if test -n "$ac_declaration"; then - echo '#ifdef __cplusplus' >>confdefs.h - echo $ac_declaration >>confdefs.h - echo '#endif' >>confdefs.h +rm -f conftest.$ac_ext +CC=$ac_save_CC + +fi +# AC_CACHE_VAL +case "x$ac_cv_prog_cc_c89" in + x) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +$as_echo "none needed" >&6; } ;; + xno) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +$as_echo "unsupported" >&6; } ;; + *) + CC="$CC $ac_cv_prog_cc_c89" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 +$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; +esac +if test "x$ac_cv_prog_cc_c89" != xno; then : + fi -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -fi -rm -f conftest.$ac_objext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -2280,18 +3295,18 @@ if test "X${PATH_SEPARATOR+set}" != Xset; then fi -# Check whether --with-gnu-ld or --without-gnu-ld was given. -if test "${with_gnu_ld+set}" = set; then - withval="$with_gnu_ld" - test "$withval" = no || with_gnu_ld=yes +# Check whether --with-gnu-ld was given. +if test "${with_gnu_ld+set}" = set; then : + withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes else with_gnu_ld=no -fi; +fi + ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. - echo "$as_me:$LINENO: checking for ld used by GCC" >&5 -echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by GCC" >&5 +$as_echo_n "checking for ld used by GCC... " >&6; } case $host in *-*-mingw*) # gcc leaves a trailing carriage return which upsets mingw @@ -2320,14 +3335,14 @@ echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6 ;; esac elif test "$with_gnu_ld" = yes; then - echo "$as_me:$LINENO: checking for GNU ld" >&5 -echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 +$as_echo_n "checking for GNU ld... " >&6; } else - echo "$as_me:$LINENO: checking for non-GNU ld" >&5 -echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 +$as_echo_n "checking for non-GNU ld... " >&6; } fi -if test "${lt_cv_path_LD+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +if ${lt_cv_path_LD+:} false; then : + $as_echo_n "(cached) " >&6 else if test -z "$LD"; then IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=$PATH_SEPARATOR @@ -2353,19 +3368,17 @@ fi LD="$lt_cv_path_LD" if test -n "$LD"; then - echo "$as_me:$LINENO: result: $LD" >&5 -echo "${ECHO_T}$LD" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5 +$as_echo "$LD" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 -echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} - { (exit 1); exit 1; }; } -echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 -echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6 -if test "${lt_cv_prog_gnu_ld+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 +$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } +if ${lt_cv_prog_gnu_ld+:} false; then : + $as_echo_n "(cached) " >&6 else # I'd rather use --version here, but apparently some GNU ld's only accept -v. if $LD -v 2>&1 &5; then @@ -2374,27 +3387,27 @@ else lt_cv_prog_gnu_ld=no fi fi -echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5 -echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5 +$as_echo "$lt_cv_prog_gnu_ld" >&6; } with_gnu_ld=$lt_cv_prog_gnu_ld -echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5 -echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6 -if test "${lt_cv_ld_reload_flag+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 +$as_echo_n "checking for $LD option to reload object files... " >&6; } +if ${lt_cv_ld_reload_flag+:} false; then : + $as_echo_n "(cached) " >&6 else lt_cv_ld_reload_flag='-r' fi -echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5 -echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5 +$as_echo "$lt_cv_ld_reload_flag" >&6; } reload_flag=$lt_cv_ld_reload_flag test -n "$reload_flag" && reload_flag=" $reload_flag" -echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5 -echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6 -if test "${lt_cv_path_NM+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD-compatible nm" >&5 +$as_echo_n "checking for BSD-compatible nm... " >&6; } +if ${lt_cv_path_NM+:} false; then : + $as_echo_n "(cached) " >&6 else if test -n "$NM"; then # Let the user override the test. @@ -2427,13 +3440,13 @@ fi fi NM="$lt_cv_path_NM" -echo "$as_me:$LINENO: result: $NM" >&5 -echo "${ECHO_T}$NM" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $NM" >&5 +$as_echo "$NM" >&6; } -echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5 -echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6 -if test "${lt_cv_path_SED+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 +$as_echo_n "checking for a sed that does not truncate output... " >&6; } +if ${lt_cv_path_SED+:} false; then : + $as_echo_n "(cached) " >&6 else # Loop through the user's path and test for sed and gsed. # Then use that list of sed's as ones to test for truncation. @@ -2512,24 +3525,24 @@ if test "X$SED" != "X"; then else SED=$lt_cv_path_SED fi -echo "$as_me:$LINENO: result: $SED" >&5 -echo "${ECHO_T}$SED" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $SED" >&5 +$as_echo "$SED" >&6; } -echo "$as_me:$LINENO: checking whether ln -s works" >&5 -echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5 +$as_echo_n "checking whether ln -s works... " >&6; } LN_S=$as_ln_s if test "$LN_S" = "ln -s"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - echo "$as_me:$LINENO: result: no, using $LN_S" >&5 -echo "${ECHO_T}no, using $LN_S" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5 +$as_echo "no, using $LN_S" >&6; } fi -echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5 -echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6 -if test "${lt_cv_deplibs_check_method+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognise dependent libraries" >&5 +$as_echo_n "checking how to recognise dependent libraries... " >&6; } +if ${lt_cv_deplibs_check_method+:} false; then : + $as_echo_n "(cached) " >&6 else lt_cv_file_magic_cmd='$MAGIC_CMD' lt_cv_file_magic_test_file= @@ -2707,8 +3720,8 @@ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) esac fi -echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5 -echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 +$as_echo "$lt_cv_deplibs_check_method" >&6; } file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method @@ -2720,10 +3733,10 @@ deplibs_check_method=$lt_cv_deplibs_check_method # Check for command to grab the raw symbol name followed by C symbol from nm. -echo "$as_me:$LINENO: checking command to parse $NM output" >&5 -echo $ECHO_N "checking command to parse $NM output... $ECHO_C" >&6 -if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output" >&5 +$as_echo_n "checking command to parse $NM output... " >&6; } +if ${lt_cv_sys_global_symbol_pipe+:} false; then : + $as_echo_n "(cached) " >&6 else # These are sane defaults that work on at least a few old systems. @@ -2804,18 +3817,18 @@ void nm_test_func(){} int main(){nm_test_var='a';nm_test_func();return(0);} EOF - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then # Now try to grab the symbols. nlist=conftest.nm - if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\""; } >&5 (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && test -s "$nlist"; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && test -s "$nlist"; then # Try sorting and uniquifying the output. if sort "$nlist" | uniq > "$nlist"T; then mv -f "$nlist"T "$nlist" @@ -2866,11 +3879,11 @@ EOF save_CFLAGS="$CFLAGS" LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$no_builtin_flag" - if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && test -s conftest$ac_exeext; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && test -s conftest$ac_exeext; then pipe_works=yes fi LIBS="$save_LIBS" @@ -2910,11 +3923,11 @@ else fi if test -z "$global_symbol_pipe$global_symbol_to_cdec$global_symbol_to_c_name_address"; then - echo "$as_me:$LINENO: result: failed" >&5 -echo "${ECHO_T}failed" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5 +$as_echo "failed" >&6; } else - echo "$as_me:$LINENO: result: ok" >&5 -echo "${ECHO_T}ok" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 +$as_echo "ok" >&6; } fi ac_ext=c @@ -2922,15 +3935,15 @@ ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 -echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 +$as_echo_n "checking how to run the C preprocessor... " >&6; } # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= fi if test -z "$CPP"; then - if test "${ac_cv_prog_CPP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + if ${ac_cv_prog_CPP+:} false; then : + $as_echo_n "(cached) " >&6 else # Double quotes because CPP needs to be expanded for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" @@ -2940,79 +3953,47 @@ for ac_c_preproc_warn_flag in '' yes do # Use a header file that comes with gcc, so configuring glibc # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -#include "confdefs.h" -#include - Syntax error + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifdef __STDC__ +# include +#else +# include +#endif + Syntax error _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi +if ac_fn_c_try_cpp "$LINENO"; then : + else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - : -else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 # Broken: fails on valid input. continue fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext - # OK, works on sane cases. Now check whether non-existent headers + # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -#include "confdefs.h" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ #include _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then +if ac_fn_c_try_cpp "$LINENO"; then : # Broken: success on invalid input. continue else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 # Passes both tests. ac_preproc_ok=: break fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then +rm -f conftest.i conftest.err conftest.$ac_ext +if $ac_preproc_ok; then : break fi @@ -3024,91 +4005,60 @@ fi else ac_cv_prog_CPP=$CPP fi -echo "$as_me:$LINENO: result: $CPP" >&5 -echo "${ECHO_T}$CPP" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 +$as_echo "$CPP" >&6; } ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes do # Use a header file that comes with gcc, so configuring glibc # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -#include "confdefs.h" -#include - Syntax error + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifdef __STDC__ +# include +#else +# include +#endif + Syntax error _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi +if ac_fn_c_try_cpp "$LINENO"; then : + else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - : -else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 # Broken: fails on valid input. continue fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext - # OK, works on sane cases. Now check whether non-existent headers + # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -#include "confdefs.h" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ #include _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then +if ac_fn_c_try_cpp "$LINENO"; then : # Broken: success on invalid input. continue else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 # Passes both tests. ac_preproc_ok=: break fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then - : +rm -f conftest.i conftest.err conftest.$ac_ext +if $ac_preproc_ok; then : + else - { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check" >&5 -echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;} - { (exit 1); exit 1; }; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details" "$LINENO" 5; } fi ac_ext=c @@ -3118,56 +4068,173 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu -echo "$as_me:$LINENO: checking for ANSI C header files" >&5 -echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 -if test "${ac_cv_header_stdc+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 +$as_echo_n "checking for grep that handles long lines and -e... " >&6; } +if ${ac_cv_path_GREP+:} false; then : + $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -#include "confdefs.h" + if test -z "$GREP"; then + ac_path_GREP_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in grep ggrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue +# Check for GNU ac_path_GREP and select it if it is found. + # Check for GNU $ac_path_GREP +case `"$ac_path_GREP" --version 2>&1` in +*GNU*) + ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; +*) + ac_count=0 + $as_echo_n 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + $as_echo 'GREP' >> "conftest.nl" + "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_GREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_GREP="$ac_path_GREP" + ac_path_GREP_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + + $ac_path_GREP_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_GREP"; then + as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi +else + ac_cv_path_GREP=$GREP +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 +$as_echo "$ac_cv_path_GREP" >&6; } + GREP="$ac_cv_path_GREP" + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 +$as_echo_n "checking for egrep... " >&6; } +if ${ac_cv_path_EGREP+:} false; then : + $as_echo_n "(cached) " >&6 +else + if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 + then ac_cv_path_EGREP="$GREP -E" + else + if test -z "$EGREP"; then + ac_path_EGREP_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in egrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue +# Check for GNU ac_path_EGREP and select it if it is found. + # Check for GNU $ac_path_EGREP +case `"$ac_path_EGREP" --version 2>&1` in +*GNU*) + ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; +*) + ac_count=0 + $as_echo_n 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + $as_echo 'EGREP' >> "conftest.nl" + "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_EGREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_EGREP="$ac_path_EGREP" + ac_path_EGREP_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + + $ac_path_EGREP_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_EGREP"; then + as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi +else + ac_cv_path_EGREP=$EGREP +fi + + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 +$as_echo "$ac_cv_path_EGREP" >&6; } + EGREP="$ac_cv_path_EGREP" + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 +$as_echo_n "checking for ANSI C header files... " >&6; } +if ${ac_cv_header_stdc+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ #include #include #include #include +int +main () +{ + + ; + return 0; +} _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_header_stdc=yes else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 ac_cv_header_stdc=no fi -rm -f conftest.err conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -#include "confdefs.h" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ #include _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "memchr" >/dev/null 2>&1; then - : + $EGREP "memchr" >/dev/null 2>&1; then : + else ac_cv_header_stdc=no fi @@ -3177,15 +4244,14 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -#include "confdefs.h" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ #include _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "free" >/dev/null 2>&1; then - : + $EGREP "free" >/dev/null 2>&1; then : + else ac_cv_header_stdc=no fi @@ -3195,20 +4261,21 @@ fi if test $ac_cv_header_stdc = yes; then # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - if test "$cross_compiling" = yes; then + if test "$cross_compiling" = yes; then : : else - cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -#include "confdefs.h" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ #include +#include #if ((' ' & 0x0FF) == 0x020) # define ISLOWER(c) ('a' <= (c) && (c) <= 'z') # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) #else -# define ISLOWER(c) (('a' <= (c) && (c) <= 'i') \ - || ('j' <= (c) && (c) <= 'r') \ - || ('s' <= (c) && (c) <= 'z')) +# define ISLOWER(c) \ + (('a' <= (c) && (c) <= 'i') \ + || ('j' <= (c) && (c) <= 'r') \ + || ('s' <= (c) && (c) <= 'z')) # define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) #endif @@ -3219,95 +4286,40 @@ main () int i; for (i = 0; i < 256; i++) if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) - exit(2); - exit (0); + || toupper (i) != TOUPPER (i)) + return 2; + return 0; } _ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : +if ac_fn_c_try_run "$LINENO"; then : + else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -( exit $ac_status ) -ac_cv_header_stdc=no + ac_cv_header_stdc=no fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + fi fi -fi -echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 -echo "${ECHO_T}$ac_cv_header_stdc" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 +$as_echo "$ac_cv_header_stdc" >&6; } if test $ac_cv_header_stdc = yes; then -cat >>confdefs.h <<\_ACEOF -#define STDC_HEADERS 1 -_ACEOF +$as_echo "#define STDC_HEADERS 1" >>confdefs.h fi # On IRIX 5.3, sys/types and inttypes.h are conflicting. - - - - - - - - - for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ - inttypes.h stdint.h unistd.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -#include "confdefs.h" -$ac_includes_default - -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$as_ac_Header=yes" -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -eval "$as_ac_Header=no" -fi -rm -f conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -if test `eval echo '${'$as_ac_Header'}'` = yes; then + inttypes.h stdint.h unistd.h +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default +" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF fi @@ -3315,114 +4327,12 @@ fi done - for ac_header in dlfcn.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -else - # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -#include "confdefs.h" -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_header_compiler=no -fi -rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 - -# Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -#include "confdefs.h" -#include <$ac_header> -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - ac_header_preproc=no -fi -rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc in - yes:no ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; - no:yes ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; -esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=$ac_header_preproc" -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 - -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then +do : + ac_fn_c_check_header_mongrel "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default" +if test "x$ac_cv_header_dlfcn_h" = xyes; then : cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +#define HAVE_DLFCN_H 1 _ACEOF fi @@ -3438,10 +4348,10 @@ done case $deplibs_check_method in file_magic*) if test "$file_magic_cmd" = '$MAGIC_CMD'; then - echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5 -echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6 -if test "${lt_cv_path_MAGIC_CMD+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5 +$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; } +if ${lt_cv_path_MAGIC_CMD+:} false; then : + $as_echo_n "(cached) " >&6 else case $MAGIC_CMD in /*) @@ -3493,19 +4403,19 @@ fi MAGIC_CMD="$lt_cv_path_MAGIC_CMD" if test -n "$MAGIC_CMD"; then - echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 -echo "${ECHO_T}$MAGIC_CMD" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 +$as_echo "$MAGIC_CMD" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test -z "$lt_cv_path_MAGIC_CMD"; then if test -n "$ac_tool_prefix"; then - echo "$as_me:$LINENO: checking for file" >&5 -echo $ECHO_N "checking for file... $ECHO_C" >&6 -if test "${lt_cv_path_MAGIC_CMD+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5 +$as_echo_n "checking for file... " >&6; } +if ${lt_cv_path_MAGIC_CMD+:} false; then : + $as_echo_n "(cached) " >&6 else case $MAGIC_CMD in /*) @@ -3557,11 +4467,11 @@ fi MAGIC_CMD="$lt_cv_path_MAGIC_CMD" if test -n "$MAGIC_CMD"; then - echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 -echo "${ECHO_T}$MAGIC_CMD" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 +$as_echo "$MAGIC_CMD" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi else @@ -3576,10 +4486,10 @@ esac if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_RANLIB+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_RANLIB+:} false; then : + $as_echo_n "(cached) " >&6 else if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. @@ -3589,35 +4499,37 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done +IFS=$as_save_IFS fi fi RANLIB=$ac_cv_prog_RANLIB if test -n "$RANLIB"; then - echo "$as_me:$LINENO: result: $RANLIB" >&5 -echo "${ECHO_T}$RANLIB" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 +$as_echo "$RANLIB" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi + fi if test -z "$ac_cv_prog_RANLIB"; then ac_ct_RANLIB=$RANLIB # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_RANLIB+:} false; then : + $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_RANLIB"; then ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. @@ -3627,28 +4539,38 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_RANLIB="ranlib" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done +IFS=$as_save_IFS - test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":" fi fi ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB if test -n "$ac_ct_RANLIB"; then - echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 -echo "${ECHO_T}$ac_ct_RANLIB" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 +$as_echo "$ac_ct_RANLIB" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - RANLIB=$ac_ct_RANLIB + if test "x$ac_ct_RANLIB" = x; then + RANLIB=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + RANLIB=$ac_ct_RANLIB + fi else RANLIB="$ac_cv_prog_RANLIB" fi @@ -3656,10 +4578,10 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_STRIP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_STRIP+:} false; then : + $as_echo_n "(cached) " >&6 else if test -n "$STRIP"; then ac_cv_prog_STRIP="$STRIP" # Let the user override the test. @@ -3669,35 +4591,37 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done +IFS=$as_save_IFS fi fi STRIP=$ac_cv_prog_STRIP if test -n "$STRIP"; then - echo "$as_me:$LINENO: result: $STRIP" >&5 -echo "${ECHO_T}$STRIP" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 +$as_echo "$STRIP" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi + fi if test -z "$ac_cv_prog_STRIP"; then ac_ct_STRIP=$STRIP # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_STRIP+:} false; then : + $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_STRIP"; then ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. @@ -3707,28 +4631,38 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_STRIP="strip" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done +IFS=$as_save_IFS - test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":" fi fi ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP if test -n "$ac_ct_STRIP"; then - echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 -echo "${ECHO_T}$ac_ct_STRIP" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 +$as_echo "$ac_ct_STRIP" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - STRIP=$ac_ct_STRIP + if test "x$ac_ct_STRIP" = x; then + STRIP=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + STRIP=$ac_ct_STRIP + fi else STRIP="$ac_cv_prog_STRIP" fi @@ -3737,11 +4671,11 @@ fi enable_dlopen=no enable_win32_dll=no -# Check whether --enable-libtool-lock or --disable-libtool-lock was given. -if test "${enable_libtool_lock+set}" = set; then - enableval="$enable_libtool_lock" +# Check whether --enable-libtool-lock was given. +if test "${enable_libtool_lock+set}" = set; then : + enableval=$enable_libtool_lock; +fi -fi; test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes # Some flags need to be propagated to the compiler or linker for good @@ -3749,12 +4683,12 @@ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes case $host in *-*-irix6*) # Find out which ABI we are using. - echo '#line 3752 "configure"' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + echo '#line 4686 "configure"' > conftest.$ac_ext + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then case `/usr/bin/file conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -32" @@ -3774,29 +4708,21 @@ case $host in # On SCO OpenServer 5, we need -belf to get full-featured binaries. SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" - echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5 -echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6 -if test "${lt_cv_cc_needs_belf+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5 +$as_echo_n "checking whether the C compiler needs -belf... " >&6; } +if ${lt_cv_cc_needs_belf+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu - cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -#include "confdefs.h" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -3805,25 +4731,13 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +if ac_fn_c_try_link "$LINENO"; then : lt_cv_cc_needs_belf=yes else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -lt_cv_cc_needs_belf=no + lt_cv_cc_needs_belf=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -3831,8 +4745,8 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu fi -echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5 -echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5 +$as_echo "$lt_cv_cc_needs_belf" >&6; } if test x"$lt_cv_cc_needs_belf" != x"yes"; then # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf CFLAGS="$SAVE_CFLAGS" @@ -3932,8 +4846,8 @@ fi set dummy $CC compiler="$2" -echo "$as_me:$LINENO: checking for objdir" >&5 -echo $ECHO_N "checking for objdir... $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5 +$as_echo_n "checking for objdir... " >&6; } rm -f .libs 2>/dev/null mkdir .libs 2>/dev/null if test -d .libs; then @@ -3943,27 +4857,27 @@ else objdir=_libs fi rmdir .libs 2>/dev/null -echo "$as_me:$LINENO: result: $objdir" >&5 -echo "${ECHO_T}$objdir" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $objdir" >&5 +$as_echo "$objdir" >&6; } -# Check whether --with-pic or --without-pic was given. -if test "${with_pic+set}" = set; then - withval="$with_pic" - pic_mode="$withval" +# Check whether --with-pic was given. +if test "${with_pic+set}" = set; then : + withval=$with_pic; pic_mode="$withval" else pic_mode=default -fi; +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 "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 -echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 -if test "${lt_cv_prog_cc_pic+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } +if ${lt_cv_prog_cc_pic+:} false; then : + $as_echo_n "(cached) " >&6 else lt_cv_prog_cc_pic= lt_cv_prog_cc_shlib= @@ -4103,30 +5017,23 @@ else fi if test -z "$lt_cv_prog_cc_pic"; then - echo "$as_me:$LINENO: result: none" >&5 -echo "${ECHO_T}none" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5 +$as_echo "none" >&6; } else - echo "$as_me:$LINENO: result: $lt_cv_prog_cc_pic" >&5 -echo "${ECHO_T}$lt_cv_prog_cc_pic" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_cc_pic" >&5 +$as_echo "$lt_cv_prog_cc_pic" >&6; } # Check to make sure the pic_flag actually works. - echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_cv_prog_cc_pic works" >&5 -echo $ECHO_N "checking if $compiler PIC flag $lt_cv_prog_cc_pic works... $ECHO_C" >&6 - if test "${lt_cv_prog_cc_pic_works+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_cv_prog_cc_pic works" >&5 +$as_echo_n "checking if $compiler PIC flag $lt_cv_prog_cc_pic works... " >&6; } + if ${lt_cv_prog_cc_pic_works+:} false; then : + $as_echo_n "(cached) " >&6 else save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $lt_cv_prog_cc_pic -DPIC" - cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -#include "confdefs.h" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -4135,18 +5042,7 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +if ac_fn_c_try_compile "$LINENO"; then : case $host_os in hpux9* | hpux10* | hpux11*) # On HP-UX, both CC and GCC only warn that PIC is supported... then @@ -4164,12 +5060,10 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 esac else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 - lt_cv_prog_cc_pic_works=no + lt_cv_prog_cc_pic_works=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CFLAGS="$save_CFLAGS" fi @@ -4182,40 +5076,33 @@ fi lt_cv_prog_cc_pic=" $lt_cv_prog_cc_pic" fi - echo "$as_me:$LINENO: result: $lt_cv_prog_cc_pic_works" >&5 -echo "${ECHO_T}$lt_cv_prog_cc_pic_works" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_cc_pic_works" >&5 +$as_echo "$lt_cv_prog_cc_pic_works" >&6; } fi # Check for any special shared library compilation flags. if test -n "$lt_cv_prog_cc_shlib"; then - { echo "$as_me:$LINENO: WARNING: \`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries" >&5 -echo "$as_me: WARNING: \`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries" >&5 +$as_echo "$as_me: WARNING: \`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries" >&2;} if echo "$old_CC $old_CFLAGS " | egrep -e "[ ]$lt_cv_prog_cc_shlib[ ]" >/dev/null; then : else - { echo "$as_me:$LINENO: WARNING: add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&5 -echo "$as_me: WARNING: add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&5 +$as_echo "$as_me: WARNING: add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&2;} lt_cv_prog_cc_can_build_shared=no fi fi -echo "$as_me:$LINENO: checking if $compiler static flag $lt_cv_prog_cc_static works" >&5 -echo $ECHO_N "checking if $compiler static flag $lt_cv_prog_cc_static works... $ECHO_C" >&6 -if test "${lt_cv_prog_cc_static_works+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_cv_prog_cc_static works" >&5 +$as_echo_n "checking if $compiler static flag $lt_cv_prog_cc_static works... " >&6; } +if ${lt_cv_prog_cc_static_works+:} false; then : + $as_echo_n "(cached) " >&6 else lt_cv_prog_cc_static_works=no save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS $lt_cv_prog_cc_static" - cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -#include "confdefs.h" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -4224,24 +5111,11 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +if ac_fn_c_try_link "$LINENO"; then : lt_cv_prog_cc_static_works=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LDFLAGS="$save_LDFLAGS" fi @@ -4249,8 +5123,8 @@ 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 "$as_me:$LINENO: result: $lt_cv_prog_cc_static_works" >&5 -echo "${ECHO_T}$lt_cv_prog_cc_static_works" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_cc_static_works" >&5 +$as_echo "$lt_cv_prog_cc_static_works" >&6; } pic_flag="$lt_cv_prog_cc_pic" special_shlib_compile_flags="$lt_cv_prog_cc_shlib" @@ -4261,10 +5135,10 @@ can_build_shared="$lt_cv_prog_cc_can_build_shared" # Check to see if options -o and -c are simultaneously supported by compiler -echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 -echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6 -if test "${lt_cv_compiler_c_o+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 +$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } +if ${lt_cv_compiler_c_o+:} false; then : + $as_echo_n "(cached) " >&6 else $rm -r conftest 2>/dev/null @@ -4281,7 +5155,7 @@ chmod -w . save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -o out/conftest2.$ac_objext" compiler_c_o=no -if { (eval echo configure:4284: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then +if { (eval echo configure:5158: \"$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 @@ -4305,15 +5179,15 @@ $rm -r conftest 2>/dev/null fi compiler_c_o=$lt_cv_compiler_c_o -echo "$as_me:$LINENO: result: $compiler_c_o" >&5 -echo "${ECHO_T}$compiler_c_o" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $compiler_c_o" >&5 +$as_echo "$compiler_c_o" >&6; } if test x"$compiler_c_o" = x"yes"; then # Check to see if we can write to a .lo - echo "$as_me:$LINENO: checking if $compiler supports -c -o file.lo" >&5 -echo $ECHO_N "checking if $compiler supports -c -o file.lo... $ECHO_C" >&6 - if test "${lt_cv_compiler_o_lo+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.lo" >&5 +$as_echo_n "checking if $compiler supports -c -o file.lo... " >&6; } + if ${lt_cv_compiler_o_lo+:} false; then : + $as_echo_n "(cached) " >&6 else lt_cv_compiler_o_lo=no @@ -4321,16 +5195,9 @@ else CFLAGS="$CFLAGS -c -o conftest.lo" save_objext="$ac_objext" ac_objext=lo - cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -#include "confdefs.h" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -4339,18 +5206,7 @@ int some_variable = 0; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +if ac_fn_c_try_compile "$LINENO"; then : # 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 @@ -4359,19 +5215,16 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 lt_cv_compiler_o_lo=yes fi -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_objext="$save_objext" CFLAGS="$save_CFLAGS" fi compiler_o_lo=$lt_cv_compiler_o_lo - echo "$as_me:$LINENO: result: $compiler_o_lo" >&5 -echo "${ECHO_T}$compiler_o_lo" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $compiler_o_lo" >&5 +$as_echo "$compiler_o_lo" >&6; } else compiler_o_lo=no fi @@ -4380,19 +5233,19 @@ fi 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 "$as_me:$LINENO: checking if we can lock with hard links" >&5 -echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 +$as_echo_n "checking if we can lock with hard links... " >&6; } hard_links=yes $rm conftest* ln conftest.a conftest.b 2>/dev/null && hard_links=no touch conftest.a ln conftest.a conftest.b 2>&5 || hard_links=no ln conftest.a conftest.b 2>/dev/null && hard_links=no - echo "$as_me:$LINENO: result: $hard_links" >&5 -echo "${ECHO_T}$hard_links" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 +$as_echo "$hard_links" >&6; } if test "$hard_links" = no; then - { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 -echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 +$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} need_locks=warn fi else @@ -4401,22 +5254,15 @@ fi if test "$GCC" = yes; then # Check to see if options -fno-rtti -fno-exceptions are supported by compiler - echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 -echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 +$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; } 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 <<_ACEOF -#line $LINENO "configure" -#include "confdefs.h" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -4425,18 +5271,7 @@ int some_variable = 0; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +if ac_fn_c_try_compile "$LINENO"; then : # 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 @@ -4445,14 +5280,11 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 compiler_rtti_exceptions=yes fi -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CFLAGS="$save_CFLAGS" - echo "$as_me:$LINENO: result: $compiler_rtti_exceptions" >&5 -echo "${ECHO_T}$compiler_rtti_exceptions" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $compiler_rtti_exceptions" >&5 +$as_echo "$compiler_rtti_exceptions" >&6; } if test "$compiler_rtti_exceptions" = "yes"; then no_builtin_flag=' -fno-builtin -fno-rtti -fno-exceptions' @@ -4462,8 +5294,8 @@ echo "${ECHO_T}$compiler_rtti_exceptions" >&6 fi # See if the linker supports building shared libraries. -echo "$as_me:$LINENO: checking whether the linker ($LD) supports shared libraries" >&5 -echo $ECHO_N "checking whether the linker ($LD) supports shared libraries... $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the linker ($LD) supports shared libraries" >&5 +$as_echo_n "checking whether the linker ($LD) supports shared libraries... " >&6; } allow_undefined_flag= no_undefined_flag= @@ -5157,13 +5989,13 @@ EOF ;; esac fi -echo "$as_me:$LINENO: result: $ld_shlibs" >&5 -echo "${ECHO_T}$ld_shlibs" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5 +$as_echo "$ld_shlibs" >&6; } test "$ld_shlibs" = no && can_build_shared=no # Check hardcoding attributes. -echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 -echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5 +$as_echo_n "checking how to hardcode library paths into programs... " >&6; } hardcode_action= if test -n "$hardcode_libdir_flag_spec" || \ test -n "$runpath_var"; then @@ -5186,29 +6018,29 @@ else # directories. hardcode_action=unsupported fi -echo "$as_me:$LINENO: result: $hardcode_action" >&5 -echo "${ECHO_T}$hardcode_action" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5 +$as_echo "$hardcode_action" >&6; } striplib= old_striplib= -echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 -echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5 +$as_echo_n "checking whether stripping libraries is possible... " >&6; } if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" test -z "$striplib" && striplib="$STRIP --strip-unneeded" - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&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 "$as_me:$LINENO: checking dynamic linker characteristics" >&5 -echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 +$as_echo_n "checking dynamic linker characteristics... " >&6; } library_names_spec= libname_spec='lib$name' soname_spec= @@ -5467,12 +6299,12 @@ linux-gnu*) libsuff= case "$host_cpu" in x86_64*|s390x*) - echo '#line 5470 "configure"' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + echo '#line 6302 "configure"' > conftest.$ac_ext + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then case `/usr/bin/file conftest.$ac_objext` in *64-bit*) libsuff=64 @@ -5638,18 +6470,18 @@ sysv4*MP*) dynamic_linker=no ;; esac -echo "$as_me:$LINENO: result: $dynamic_linker" >&5 -echo "${ECHO_T}$dynamic_linker" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 +$as_echo "$dynamic_linker" >&6; } test "$dynamic_linker" = no && can_build_shared=no # Report the final consequences. -echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 -echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6 -echo "$as_me:$LINENO: result: $can_build_shared" >&5 -echo "${ECHO_T}$can_build_shared" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5 +$as_echo_n "checking if libtool supports shared libraries... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5 +$as_echo "$can_build_shared" >&6; } -echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 -echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5 +$as_echo_n "checking whether to build shared libraries... " >&6; } test "$can_build_shared" = "no" && enable_shared=no # On AIX, shared libraries and static libraries use the same namespace, and @@ -5669,15 +6501,15 @@ aix4*) fi ;; esac -echo "$as_me:$LINENO: result: $enable_shared" >&5 -echo "${ECHO_T}$enable_shared" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5 +$as_echo "$enable_shared" >&6; } -echo "$as_me:$LINENO: checking whether to build static libraries" >&5 -echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5 +$as_echo_n "checking whether to build static libraries... " >&6; } # Make sure either enable_shared or enable_static is yes. test "$enable_shared" = yes || enable_static=yes -echo "$as_me:$LINENO: result: $enable_static" >&5 -echo "${ECHO_T}$enable_static" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5 +$as_echo "$enable_static" >&6; } if test "$hardcode_action" = relink; then # Fast installation is not supported @@ -5714,370 +6546,168 @@ else ;; *) - echo "$as_me:$LINENO: checking for shl_load" >&5 -echo $ECHO_N "checking for shl_load... $ECHO_C" >&6 -if test "${ac_cv_func_shl_load+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -#include "confdefs.h" -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char shl_load (); below. */ -#include -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* 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 (); -char (*f) (); - -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif -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 -f = shl_load; -#endif - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_shl_load=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_func_shl_load=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 -echo "${ECHO_T}$ac_cv_func_shl_load" >&6 -if test $ac_cv_func_shl_load = yes; then + ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load" +if test "x$ac_cv_func_shl_load" = xyes; then : lt_cv_dlopen="shl_load" else - echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 -echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6 -if test "${ac_cv_lib_dld_shl_load+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5 +$as_echo_n "checking for shl_load in -ldld... " >&6; } +if ${ac_cv_lib_dld_shl_load+:} false; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-ldld $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -#include "confdefs.h" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* 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 (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { -shl_load (); +return shl_load (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_dld_shl_load=yes else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_dld_shl_load=no + ac_cv_lib_dld_shl_load=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 -echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6 -if test $ac_cv_lib_dld_shl_load = yes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5 +$as_echo "$ac_cv_lib_dld_shl_load" >&6; } +if test "x$ac_cv_lib_dld_shl_load" = xyes; then : lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld" else - echo "$as_me:$LINENO: checking for dlopen" >&5 -echo $ECHO_N "checking for dlopen... $ECHO_C" >&6 -if test "${ac_cv_func_dlopen+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -#include "confdefs.h" -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char dlopen (); below. */ -#include -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char dlopen (); -char (*f) (); - -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif -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 -f = dlopen; -#endif - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_dlopen=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_func_dlopen=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 -echo "${ECHO_T}$ac_cv_func_dlopen" >&6 -if test $ac_cv_func_dlopen = yes; then + ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen" +if test "x$ac_cv_func_dlopen" = xyes; then : lt_cv_dlopen="dlopen" else - echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 -echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 -if test "${ac_cv_lib_dl_dlopen+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 +$as_echo_n "checking for dlopen in -ldl... " >&6; } +if ${ac_cv_lib_dl_dlopen+:} false; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -#include "confdefs.h" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char dlopen (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { -dlopen (); +return dlopen (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_dl_dlopen=yes else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_dl_dlopen=no + ac_cv_lib_dl_dlopen=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 -echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 -if test $ac_cv_lib_dl_dlopen = yes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 +$as_echo "$ac_cv_lib_dl_dlopen" >&6; } +if test "x$ac_cv_lib_dl_dlopen" = xyes; then : lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" else - echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 -echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6 -if test "${ac_cv_lib_svld_dlopen+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5 +$as_echo_n "checking for dlopen in -lsvld... " >&6; } +if ${ac_cv_lib_svld_dlopen+:} false; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lsvld $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -#include "confdefs.h" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char dlopen (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { -dlopen (); +return dlopen (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_svld_dlopen=yes else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_svld_dlopen=no + ac_cv_lib_svld_dlopen=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 -echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6 -if test $ac_cv_lib_svld_dlopen = yes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5 +$as_echo "$ac_cv_lib_svld_dlopen" >&6; } +if test "x$ac_cv_lib_svld_dlopen" = xyes; then : lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" else - echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 -echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6 -if test "${ac_cv_lib_dld_dld_link+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5 +$as_echo_n "checking for dld_link in -ldld... " >&6; } +if ${ac_cv_lib_dld_dld_link+:} false; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-ldld $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -#include "confdefs.h" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char dld_link (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { -dld_link (); +return dld_link (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_dld_dld_link=yes else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_dld_dld_link=no + ac_cv_lib_dld_dld_link=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 -echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6 -if test $ac_cv_lib_dld_dld_link = yes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5 +$as_echo "$ac_cv_lib_dld_dld_link" >&6; } +if test "x$ac_cv_lib_dld_dld_link" = xyes; then : lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld" fi @@ -6116,10 +6746,10 @@ fi save_LIBS="$LIBS" LIBS="$lt_cv_dlopen_libs $LIBS" - echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5 -echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6 -if test "${lt_cv_dlopen_self+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5 +$as_echo_n "checking whether a program can dlopen itself... " >&6; } +if ${lt_cv_dlopen_self+:} false; then : + $as_echo_n "(cached) " >&6 else if test "$cross_compiling" = yes; then : lt_cv_dlopen_self=cross @@ -6127,7 +6757,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <&5 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then (./conftest; exit; ) 2>/dev/null lt_status=$? case x$lt_status in @@ -6209,15 +6839,15 @@ rm -fr conftest* fi -echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 -echo "${ECHO_T}$lt_cv_dlopen_self" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5 +$as_echo "$lt_cv_dlopen_self" >&6; } if test "x$lt_cv_dlopen_self" = xyes; then LDFLAGS="$LDFLAGS $link_static_flag" - echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 -echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6 -if test "${lt_cv_dlopen_self_static+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5 +$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; } +if ${lt_cv_dlopen_self_static+:} false; then : + $as_echo_n "(cached) " >&6 else if test "$cross_compiling" = yes; then : lt_cv_dlopen_self_static=cross @@ -6225,7 +6855,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <&5 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then (./conftest; exit; ) 2>/dev/null lt_status=$? case x$lt_status in @@ -6307,8 +6937,8 @@ rm -fr conftest* fi -echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 -echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5 +$as_echo "$lt_cv_dlopen_self_static" >&6; } fi CPPFLAGS="$save_CPPFLAGS" @@ -6338,19 +6968,19 @@ if test "$enable_shared" = yes && test "$GCC" = yes; then # Test whether the compiler implicitly links with -lc since on some # systems, -lgcc has to come before -lc. If gcc already passes -lc # to ld, don't add -lc before -lgcc. - echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 -echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6 - if test "${lt_cv_archive_cmds_need_lc+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 +$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } + if ${lt_cv_archive_cmds_need_lc+:} false; then : + $as_echo_n "(cached) " >&6 else $rm conftest* echo 'static int dummy;' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then soname=conftest lib=conftest libobjs=conftest.$ac_objext @@ -6363,11 +6993,11 @@ else libname=conftest save_allow_undefined_flag=$allow_undefined_flag allow_undefined_flag= - if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\""; } >&5 (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } then lt_cv_archive_cmds_need_lc=no else @@ -6379,8 +7009,8 @@ else fi fi - echo "$as_me:$LINENO: result: $lt_cv_archive_cmds_need_lc" >&5 -echo "${ECHO_T}$lt_cv_archive_cmds_need_lc" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5 +$as_echo "$lt_cv_archive_cmds_need_lc" >&6; } ;; esac fi @@ -6963,22 +7593,25 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool' # AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag # AFS /usr/afsws/bin/install, which mishandles nonexistent args # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" +# OS/2's system install, which has a completely different semantic # ./install, which can be erroneously created by make from ./install.sh. -echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 -echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6 +# Reject install programs that cannot install multiple files. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 +$as_echo_n "checking for a BSD-compatible install... " >&6; } if test -z "$INSTALL"; then -if test "${ac_cv_path_install+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +if ${ac_cv_path_install+:} false; then : + $as_echo_n "(cached) " >&6 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - # Account for people who put trailing slashes in PATH elements. -case $as_dir/ in - ./ | .// | /cC/* | \ + # Account for people who put trailing slashes in PATH elements. +case $as_dir/ in #(( + ./ | .// | /[cC]/* | \ /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ + ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \ /usr/ucb/* ) ;; *) # OSF1 and SCO ODT 3.0 have their own names for install. @@ -6986,40 +7619,53 @@ case $as_dir/ in # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then - if test $ac_prog = install && - grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. - : - elif test $ac_prog = install && - grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # program-specific install script used by HP pwplus--don't use. - : - else - ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" - break 3 - fi - fi + if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then + if test $ac_prog = install && + grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # AIX install. It has an incompatible calling convention. + : + elif test $ac_prog = install && + grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # program-specific install script used by HP pwplus--don't use. + : + else + rm -rf conftest.one conftest.two conftest.dir + echo one > conftest.one + echo two > conftest.two + mkdir conftest.dir + if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && + test -s conftest.one && test -s conftest.two && + test -s conftest.dir/conftest.one && + test -s conftest.dir/conftest.two + then + ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" + break 3 + fi + fi + fi done done ;; esac -done + done +IFS=$as_save_IFS + +rm -rf conftest.one conftest.two conftest.dir fi if test "${ac_cv_path_install+set}" = set; then INSTALL=$ac_cv_path_install else - # As a last resort, use the slow shell script. We don't cache a - # path for INSTALL within a source directory, because that will + # As a last resort, use the slow shell script. Don't cache a + # value for INSTALL within a source directory, because that will # break other packages using the cache if that directory is - # removed, or if the path is relative. + # removed, or if the value is a relative name. INSTALL=$ac_install_sh fi fi -echo "$as_me:$LINENO: result: $INSTALL" >&5 -echo "${ECHO_T}$INSTALL" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 +$as_echo "$INSTALL" >&6; } # Use test -z because SunOS4 sh mishandles braces in ${var-val}. # It thinks the first close brace ends the variable substitution. @@ -7031,27 +7677,41 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' CC=${CC:-cc} +HOSTCC=${HOSTCC:-cc} -echo "$as_me:$LINENO: checking target system type" >&5 -echo $ECHO_N "checking target system type... $ECHO_C" >&6 -if test "${ac_cv_target+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5 +$as_echo_n "checking target system type... " >&6; } +if ${ac_cv_target+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_cv_target_alias=$target_alias -test "x$ac_cv_target_alias" = "x" && - ac_cv_target_alias=$ac_cv_host_alias -ac_cv_target=`$ac_config_sub $ac_cv_target_alias` || - { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_target_alias failed" >&5 -echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;} - { (exit 1); exit 1; }; } + if test "x$target_alias" = x; then + ac_cv_target=$ac_cv_host +else + ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` || + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5 +fi fi -echo "$as_me:$LINENO: result: $ac_cv_target" >&5 -echo "${ECHO_T}$ac_cv_target" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_target" >&5 +$as_echo "$ac_cv_target" >&6; } +case $ac_cv_target in +*-*-*) ;; +*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5;; +esac target=$ac_cv_target -target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -target_vendor=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -target_os=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` +ac_save_IFS=$IFS; IFS='-' +set x $ac_cv_target +shift +target_cpu=$1 +target_vendor=$2 +shift; shift +# Remember, the first character of IFS is used to create $*, +# except with old shells: +target_os=$* +IFS=$ac_save_IFS +case $target_os in *\ *) target_os=`echo "$target_os" | sed 's/ /-/g'`;; esac # The aliases save the names the user supplied, while $host etc. @@ -7076,11 +7736,11 @@ eval libdir="$libdir" # Where to place the .jar file(s) # -# Check whether --with-jardir or --without-jardir was given. -if test "${with_jardir+set}" = set; then - withval="$with_jardir" - JAR_DIR=$withval -fi; +# Check whether --with-jardir was given. +if test "${with_jardir+set}" = set; then : + withval=$with_jardir; JAR_DIR=$withval +fi + if test "x$JAR_DIR" = "x" ; then JAR_DIR_UNSPEC=yes JAR_DIR=$prefix/share/java @@ -7090,14 +7750,14 @@ fi # Find SQLite header file and library # -# Check whether --with-sqlite or --without-sqlite was given. -if test "${with_sqlite+set}" = set; then - withval="$with_sqlite" - SQLITE_DIR=$withval -fi; +# Check whether --with-sqlite was given. +if test "${with_sqlite+set}" = set; then : + withval=$with_sqlite; SQLITE_DIR=$withval +fi + if test ! -n "$SQLITE_DIR" -a -d "$SQLITE_DIR" ; then - { echo "$as_me:$LINENO: WARNING: SQLite2 directory $SQLITE_DIR does not exist" >&5 -echo "$as_me: WARNING: SQLite2 directory $SQLITE_DIR does not exist" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: SQLite2 directory $SQLITE_DIR does not exist" >&5 +$as_echo "$as_me: WARNING: SQLite2 directory $SQLITE_DIR does not exist" >&2;} fi SQLITE_INC="" @@ -7108,8 +7768,8 @@ if test "$with_sqlite" != "no" ; then if test -z "$SQLITE_DIR" ; then SQLITE_DIR="../sqlite /usr /usr/local /opt" fi - echo "$as_me:$LINENO: checking for SQLite header and library" >&5 -echo $ECHO_N "checking for SQLite header and library... $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SQLite header and library" >&5 +$as_echo_n "checking for SQLite header and library... " >&6; } SQLITE_INC=UNKNOWN SQLITE_LIB=UNKNOWN for i in $SQLITE_DIR ; do @@ -7150,18 +7810,18 @@ echo $ECHO_N "checking for SQLite header and library... $ECHO_C" >&6 fi done if test "$SQLITE_INC" = "UNKNOWN" -o "$SQLITE_LIB" = "UNKNOWN" ; then - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - { echo "$as_me:$LINENO: WARNING: SQLite2 header files and/or library not found" >&5 -echo "$as_me: WARNING: SQLite2 header files and/or library not found" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: SQLite2 header files and/or library not found" >&5 +$as_echo "$as_me: WARNING: SQLite2 header files and/or library not found" >&2;} SQLITE_INC="" SQLITE_LIB="" HAVE_SQLITE2=0 else SQLITE_INC="-I${SQLITE_INC}" HAVE_SQLITE2=1 - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi fi @@ -7182,367 +7842,253 @@ if test "$HAVE_SQLITE2" = 1 ; then CFLAGS="$CFLAGS $SQLITE_INC" saved_LIBS=$LIBS LIBS="$LIBS -L$SQLITE_LIBDIR" - echo "$as_me:$LINENO: checking for sqlite_function_type in -lsqlite" >&5 -echo $ECHO_N "checking for sqlite_function_type in -lsqlite... $ECHO_C" >&6 -if test "${ac_cv_lib_sqlite_sqlite_function_type+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite_function_type in -lsqlite" >&5 +$as_echo_n "checking for sqlite_function_type in -lsqlite... " >&6; } +if ${ac_cv_lib_sqlite_sqlite_function_type+:} false; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lsqlite $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -#include "confdefs.h" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char sqlite_function_type (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { -sqlite_function_type (); +return sqlite_function_type (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_sqlite_sqlite_function_type=yes else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_sqlite_sqlite_function_type=no + ac_cv_lib_sqlite_sqlite_function_type=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_sqlite_sqlite_function_type" >&5 -echo "${ECHO_T}$ac_cv_lib_sqlite_sqlite_function_type" >&6 -if test $ac_cv_lib_sqlite_sqlite_function_type = yes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite_sqlite_function_type" >&5 +$as_echo "$ac_cv_lib_sqlite_sqlite_function_type" >&6; } +if test "x$ac_cv_lib_sqlite_sqlite_function_type" = xyes; then : HAVE_SQLITE_FUNCTION_TYPE=1 else HAVE_SQLITE_FUNCTION_TYPE=0 fi - echo "$as_me:$LINENO: checking for sqlite_open_aux_file in -lsqlite" >&5 -echo $ECHO_N "checking for sqlite_open_aux_file in -lsqlite... $ECHO_C" >&6 -if test "${ac_cv_lib_sqlite_sqlite_open_aux_file+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite_open_aux_file in -lsqlite" >&5 +$as_echo_n "checking for sqlite_open_aux_file in -lsqlite... " >&6; } +if ${ac_cv_lib_sqlite_sqlite_open_aux_file+:} false; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lsqlite $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -#include "confdefs.h" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char sqlite_open_aux_file (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { -sqlite_open_aux_file (); +return sqlite_open_aux_file (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_sqlite_sqlite_open_aux_file=yes else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_sqlite_sqlite_open_aux_file=no + ac_cv_lib_sqlite_sqlite_open_aux_file=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_sqlite_sqlite_open_aux_file" >&5 -echo "${ECHO_T}$ac_cv_lib_sqlite_sqlite_open_aux_file" >&6 -if test $ac_cv_lib_sqlite_sqlite_open_aux_file = yes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite_sqlite_open_aux_file" >&5 +$as_echo "$ac_cv_lib_sqlite_sqlite_open_aux_file" >&6; } +if test "x$ac_cv_lib_sqlite_sqlite_open_aux_file" = xyes; then : HAVE_SQLITE_OPEN_AUX_FILE=1 else HAVE_SQLITE_OPEN_AUX_FILE=0 fi - echo "$as_me:$LINENO: checking for sqlite_set_authorizer in -lsqlite" >&5 -echo $ECHO_N "checking for sqlite_set_authorizer in -lsqlite... $ECHO_C" >&6 -if test "${ac_cv_lib_sqlite_sqlite_set_authorizer+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite_set_authorizer in -lsqlite" >&5 +$as_echo_n "checking for sqlite_set_authorizer in -lsqlite... " >&6; } +if ${ac_cv_lib_sqlite_sqlite_set_authorizer+:} false; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lsqlite $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -#include "confdefs.h" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char sqlite_set_authorizer (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { -sqlite_set_authorizer (); +return sqlite_set_authorizer (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_sqlite_sqlite_set_authorizer=yes else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_sqlite_sqlite_set_authorizer=no + ac_cv_lib_sqlite_sqlite_set_authorizer=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_sqlite_sqlite_set_authorizer" >&5 -echo "${ECHO_T}$ac_cv_lib_sqlite_sqlite_set_authorizer" >&6 -if test $ac_cv_lib_sqlite_sqlite_set_authorizer = yes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite_sqlite_set_authorizer" >&5 +$as_echo "$ac_cv_lib_sqlite_sqlite_set_authorizer" >&6; } +if test "x$ac_cv_lib_sqlite_sqlite_set_authorizer" = xyes; then : HAVE_SQLITE_SET_AUTHORIZER=1 else HAVE_SQLITE_SET_AUTHORIZER=0 fi - echo "$as_me:$LINENO: checking for sqlite_trace in -lsqlite" >&5 -echo $ECHO_N "checking for sqlite_trace in -lsqlite... $ECHO_C" >&6 -if test "${ac_cv_lib_sqlite_sqlite_trace+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite_trace in -lsqlite" >&5 +$as_echo_n "checking for sqlite_trace in -lsqlite... " >&6; } +if ${ac_cv_lib_sqlite_sqlite_trace+:} false; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lsqlite $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -#include "confdefs.h" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char sqlite_trace (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { -sqlite_trace (); +return sqlite_trace (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_sqlite_sqlite_trace=yes else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_sqlite_sqlite_trace=no + ac_cv_lib_sqlite_sqlite_trace=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_sqlite_sqlite_trace" >&5 -echo "${ECHO_T}$ac_cv_lib_sqlite_sqlite_trace" >&6 -if test $ac_cv_lib_sqlite_sqlite_trace = yes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite_sqlite_trace" >&5 +$as_echo "$ac_cv_lib_sqlite_sqlite_trace" >&6; } +if test "x$ac_cv_lib_sqlite_sqlite_trace" = xyes; then : HAVE_SQLITE_TRACE=1 else HAVE_SQLITE_TRACE=0 fi - echo "$as_me:$LINENO: checking for sqlite_compile in -lsqlite" >&5 -echo $ECHO_N "checking for sqlite_compile in -lsqlite... $ECHO_C" >&6 -if test "${ac_cv_lib_sqlite_sqlite_compile+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite_compile in -lsqlite" >&5 +$as_echo_n "checking for sqlite_compile in -lsqlite... " >&6; } +if ${ac_cv_lib_sqlite_sqlite_compile+:} false; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lsqlite $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -#include "confdefs.h" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char sqlite_compile (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { -sqlite_compile (); +return sqlite_compile (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_sqlite_sqlite_compile=yes else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_sqlite_sqlite_compile=no + ac_cv_lib_sqlite_sqlite_compile=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_sqlite_sqlite_compile" >&5 -echo "${ECHO_T}$ac_cv_lib_sqlite_sqlite_compile" >&6 -if test $ac_cv_lib_sqlite_sqlite_compile = yes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite_sqlite_compile" >&5 +$as_echo "$ac_cv_lib_sqlite_sqlite_compile" >&6; } +if test "x$ac_cv_lib_sqlite_sqlite_compile" = xyes; then : HAVE_SQLITE_COMPILE=1 else HAVE_SQLITE_COMPILE=0 fi - echo "$as_me:$LINENO: checking for sqlite_progress_handler in -lsqlite" >&5 -echo $ECHO_N "checking for sqlite_progress_handler in -lsqlite... $ECHO_C" >&6 -if test "${ac_cv_lib_sqlite_sqlite_progress_handler+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite_progress_handler in -lsqlite" >&5 +$as_echo_n "checking for sqlite_progress_handler in -lsqlite... " >&6; } +if ${ac_cv_lib_sqlite_sqlite_progress_handler+:} false; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lsqlite $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -#include "confdefs.h" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char sqlite_progress_handler (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { -sqlite_progress_handler (); +return sqlite_progress_handler (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_sqlite_sqlite_progress_handler=yes else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_sqlite_sqlite_progress_handler=no + ac_cv_lib_sqlite_sqlite_progress_handler=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_sqlite_sqlite_progress_handler" >&5 -echo "${ECHO_T}$ac_cv_lib_sqlite_sqlite_progress_handler" >&6 -if test $ac_cv_lib_sqlite_sqlite_progress_handler = yes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite_sqlite_progress_handler" >&5 +$as_echo "$ac_cv_lib_sqlite_sqlite_progress_handler" >&6; } +if test "x$ac_cv_lib_sqlite_sqlite_progress_handler" = xyes; then : HAVE_SQLITE_PROGRESS_HANDLER=1 else HAVE_SQLITE_PROGRESS_HANDLER=0 @@ -7562,22 +8108,22 @@ fi # Find SQLite3 header file and library # -# Check whether --with-sqlite3 or --without-sqlite3 was given. -if test "${with_sqlite3+set}" = set; then - withval="$with_sqlite3" - SQLITE3_DIR=$withval -fi; +# Check whether --with-sqlite3 was given. +if test "${with_sqlite3+set}" = set; then : + withval=$with_sqlite3; SQLITE3_DIR=$withval +fi + if test ! -n "$SQLITE3_DIR" -a -d "$SQLITE3_DIR" ; then - { echo "$as_me:$LINENO: WARNING: SQLite3 directory $SQLITE3_DIR does not exist" >&5 -echo "$as_me: WARNING: SQLite3 directory $SQLITE3_DIR does not exist" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: SQLite3 directory $SQLITE3_DIR does not exist" >&5 +$as_echo "$as_me: WARNING: SQLite3 directory $SQLITE3_DIR does not exist" >&2;} fi if test -z "$SQLITE3_DIR" ; then SQLITE3_DIR="../sqlite /usr /usr/local /opt" fi -echo "$as_me:$LINENO: checking for SQLite3 header and library" >&5 -echo $ECHO_N "checking for SQLite3 header and library... $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SQLite3 header and library" >&5 +$as_echo_n "checking for SQLite3 header and library... " >&6; } SQLITE3_INC=UNKNOWN SQLITE3_LIB=UNKNOWN for i in $SQLITE3_DIR ; do @@ -7634,10 +8180,10 @@ for i in $SQLITE3_DIR ; do fi done if test "$SQLITE3_INC" = "UNKNOWN" -o "$SQLITE3_LIB" = "UNKNOWN" ; then - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - { echo "$as_me:$LINENO: WARNING: SQLite3 header files and/or library not found" >&5 -echo "$as_me: WARNING: SQLite3 header files and/or library not found" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: SQLite3 header files and/or library not found" >&5 +$as_echo "$as_me: WARNING: SQLite3 header files and/or library not found" >&2;} SQLITE3_INC="" SQLITE3_LIB="" HAVE_SQLITE3=0 @@ -7649,17 +8195,17 @@ elif test -n "$SQLITE3_A10N_C" ; then HAVE_SQLITE3=1 if test "$SQLITE3_IS_BUILT_WITH_SEE" = "yes" ; then SQLITE3_A10N_FLAGS="$SQLITE3_A10N_FLAGS -DSQLITE_HAS_CODEC=1" - echo "$as_me:$LINENO: result: yes, using SEE" >&5 -echo "${ECHO_T}yes, using SEE" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, using SEE" >&5 +$as_echo "yes, using SEE" >&6; } else - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi else SQLITE3_INC="-I${SQLITE3_INC}" HAVE_SQLITE3=1 - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi @@ -7668,11 +8214,11 @@ fi ########## # Check SQLite3 features # -# Check whether --enable-load-extension or --disable-load-extension was given. -if test "${enable_load_extension+set}" = set; then - enableval="$enable_load_extension" +# Check whether --enable-load-extension was given. +if test "${enable_load_extension+set}" = set; then : + enableval=$enable_load_extension; +fi -fi; test "x$enable_load_extension" = "xyes" || enable_load_extension=no HAVE_SQLITE3_MALLOC=0 HAVE_SQLITE3_PREPARE_V2=0 @@ -7726,917 +8272,631 @@ if test "$HAVE_SQLITE3" = 1 -a -z "$SQLITE3_A10N_C" ; then CFLAGS="$CFLAGS $SQLITE3_INC" saved_LIBS=$LIBS LIBS="$LIBS -L$SQLITE3_LIBDIR" - echo "$as_me:$LINENO: checking for sqlite3_malloc in -lsqlite3" >&5 -echo $ECHO_N "checking for sqlite3_malloc in -lsqlite3... $ECHO_C" >&6 -if test "${ac_cv_lib_sqlite3_sqlite3_malloc+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3_malloc in -lsqlite3" >&5 +$as_echo_n "checking for sqlite3_malloc in -lsqlite3... " >&6; } +if ${ac_cv_lib_sqlite3_sqlite3_malloc+:} false; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lsqlite3 $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -#include "confdefs.h" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char sqlite3_malloc (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { -sqlite3_malloc (); +return sqlite3_malloc (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_sqlite3_sqlite3_malloc=yes else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_sqlite3_sqlite3_malloc=no + ac_cv_lib_sqlite3_sqlite3_malloc=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_sqlite3_sqlite3_malloc" >&5 -echo "${ECHO_T}$ac_cv_lib_sqlite3_sqlite3_malloc" >&6 -if test $ac_cv_lib_sqlite3_sqlite3_malloc = yes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_malloc" >&5 +$as_echo "$ac_cv_lib_sqlite3_sqlite3_malloc" >&6; } +if test "x$ac_cv_lib_sqlite3_sqlite3_malloc" = xyes; then : HAVE_SQLITE3_MALLOC=1 else HAVE_SQLITE3_MALLOC=0 fi - echo "$as_me:$LINENO: checking for sqlite3_prepare_v2 in -lsqlite3" >&5 -echo $ECHO_N "checking for sqlite3_prepare_v2 in -lsqlite3... $ECHO_C" >&6 -if test "${ac_cv_lib_sqlite3_sqlite3_prepare_v2+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3_prepare_v2 in -lsqlite3" >&5 +$as_echo_n "checking for sqlite3_prepare_v2 in -lsqlite3... " >&6; } +if ${ac_cv_lib_sqlite3_sqlite3_prepare_v2+:} false; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lsqlite3 $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -#include "confdefs.h" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char sqlite3_prepare_v2 (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { -sqlite3_prepare_v2 (); +return sqlite3_prepare_v2 (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_sqlite3_sqlite3_prepare_v2=yes else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_sqlite3_sqlite3_prepare_v2=no + ac_cv_lib_sqlite3_sqlite3_prepare_v2=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_sqlite3_sqlite3_prepare_v2" >&5 -echo "${ECHO_T}$ac_cv_lib_sqlite3_sqlite3_prepare_v2" >&6 -if test $ac_cv_lib_sqlite3_sqlite3_prepare_v2 = yes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_prepare_v2" >&5 +$as_echo "$ac_cv_lib_sqlite3_sqlite3_prepare_v2" >&6; } +if test "x$ac_cv_lib_sqlite3_sqlite3_prepare_v2" = xyes; then : HAVE_SQLITE3_PREPARE_V2=1 else HAVE_SQLITE3_PREPARE_V2=0 fi - echo "$as_me:$LINENO: checking for sqlite3_prepare16_v2 in -lsqlite3" >&5 -echo $ECHO_N "checking for sqlite3_prepare16_v2 in -lsqlite3... $ECHO_C" >&6 -if test "${ac_cv_lib_sqlite3_sqlite3_prepare16_v2+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3_prepare16_v2 in -lsqlite3" >&5 +$as_echo_n "checking for sqlite3_prepare16_v2 in -lsqlite3... " >&6; } +if ${ac_cv_lib_sqlite3_sqlite3_prepare16_v2+:} false; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lsqlite3 $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -#include "confdefs.h" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char sqlite3_prepare16_v2 (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { -sqlite3_prepare16_v2 (); +return sqlite3_prepare16_v2 (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_sqlite3_sqlite3_prepare16_v2=yes else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_sqlite3_sqlite3_prepare16_v2=no + ac_cv_lib_sqlite3_sqlite3_prepare16_v2=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_sqlite3_sqlite3_prepare16_v2" >&5 -echo "${ECHO_T}$ac_cv_lib_sqlite3_sqlite3_prepare16_v2" >&6 -if test $ac_cv_lib_sqlite3_sqlite3_prepare16_v2 = yes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_prepare16_v2" >&5 +$as_echo "$ac_cv_lib_sqlite3_sqlite3_prepare16_v2" >&6; } +if test "x$ac_cv_lib_sqlite3_sqlite3_prepare16_v2" = xyes; then : HAVE_SQLITE3_PREPARE16_V2=1 else HAVE_SQLITE3_PREPARE16_V2=0 fi - echo "$as_me:$LINENO: checking for sqlite3_bind_zeroblob in -lsqlite3" >&5 -echo $ECHO_N "checking for sqlite3_bind_zeroblob in -lsqlite3... $ECHO_C" >&6 -if test "${ac_cv_lib_sqlite3_sqlite3_bind_zeroblob+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3_bind_zeroblob in -lsqlite3" >&5 +$as_echo_n "checking for sqlite3_bind_zeroblob in -lsqlite3... " >&6; } +if ${ac_cv_lib_sqlite3_sqlite3_bind_zeroblob+:} false; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lsqlite3 $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -#include "confdefs.h" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char sqlite3_bind_zeroblob (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { -sqlite3_bind_zeroblob (); +return sqlite3_bind_zeroblob (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_sqlite3_sqlite3_bind_zeroblob=yes else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_sqlite3_sqlite3_bind_zeroblob=no + ac_cv_lib_sqlite3_sqlite3_bind_zeroblob=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_sqlite3_sqlite3_bind_zeroblob" >&5 -echo "${ECHO_T}$ac_cv_lib_sqlite3_sqlite3_bind_zeroblob" >&6 -if test $ac_cv_lib_sqlite3_sqlite3_bind_zeroblob = yes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_bind_zeroblob" >&5 +$as_echo "$ac_cv_lib_sqlite3_sqlite3_bind_zeroblob" >&6; } +if test "x$ac_cv_lib_sqlite3_sqlite3_bind_zeroblob" = xyes; then : HAVE_SQLITE3_BIND_ZEROBLOB=1 else HAVE_SQLITE3_BIND_ZEROBLOB=0 fi - echo "$as_me:$LINENO: checking for sqlite3_clear_bindings in -lsqlite3" >&5 -echo $ECHO_N "checking for sqlite3_clear_bindings in -lsqlite3... $ECHO_C" >&6 -if test "${ac_cv_lib_sqlite3_sqlite3_clear_bindings+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3_clear_bindings in -lsqlite3" >&5 +$as_echo_n "checking for sqlite3_clear_bindings in -lsqlite3... " >&6; } +if ${ac_cv_lib_sqlite3_sqlite3_clear_bindings+:} false; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lsqlite3 $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -#include "confdefs.h" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char sqlite3_clear_bindings (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { -sqlite3_clear_bindings (); +return sqlite3_clear_bindings (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_sqlite3_sqlite3_clear_bindings=yes else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_sqlite3_sqlite3_clear_bindings=no + ac_cv_lib_sqlite3_sqlite3_clear_bindings=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_sqlite3_sqlite3_clear_bindings" >&5 -echo "${ECHO_T}$ac_cv_lib_sqlite3_sqlite3_clear_bindings" >&6 -if test $ac_cv_lib_sqlite3_sqlite3_clear_bindings = yes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_clear_bindings" >&5 +$as_echo "$ac_cv_lib_sqlite3_sqlite3_clear_bindings" >&6; } +if test "x$ac_cv_lib_sqlite3_sqlite3_clear_bindings" = xyes; then : HAVE_SQLITE3_CLEAR_BINDINGS=1 else HAVE_SQLITE3_CLEAR_BINDINGS=0 fi - echo "$as_me:$LINENO: checking for sqlite3_column_table_name16 in -lsqlite3" >&5 -echo $ECHO_N "checking for sqlite3_column_table_name16 in -lsqlite3... $ECHO_C" >&6 -if test "${ac_cv_lib_sqlite3_sqlite3_column_table_name16+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3_column_table_name16 in -lsqlite3" >&5 +$as_echo_n "checking for sqlite3_column_table_name16 in -lsqlite3... " >&6; } +if ${ac_cv_lib_sqlite3_sqlite3_column_table_name16+:} false; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lsqlite3 $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -#include "confdefs.h" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char sqlite3_column_table_name16 (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { -sqlite3_column_table_name16 (); +return sqlite3_column_table_name16 (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_sqlite3_sqlite3_column_table_name16=yes else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_sqlite3_sqlite3_column_table_name16=no + ac_cv_lib_sqlite3_sqlite3_column_table_name16=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_sqlite3_sqlite3_column_table_name16" >&5 -echo "${ECHO_T}$ac_cv_lib_sqlite3_sqlite3_column_table_name16" >&6 -if test $ac_cv_lib_sqlite3_sqlite3_column_table_name16 = yes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_column_table_name16" >&5 +$as_echo "$ac_cv_lib_sqlite3_sqlite3_column_table_name16" >&6; } +if test "x$ac_cv_lib_sqlite3_sqlite3_column_table_name16" = xyes; then : HAVE_SQLITE3_COLUMN_TABLE_NAME16=1 else HAVE_SQLITE3_COLUMN_TABLE_NAME16=0 fi - echo "$as_me:$LINENO: checking for sqlite3_column_database_name16 in -lsqlite3" >&5 -echo $ECHO_N "checking for sqlite3_column_database_name16 in -lsqlite3... $ECHO_C" >&6 -if test "${ac_cv_lib_sqlite3_sqlite3_column_database_name16+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3_column_database_name16 in -lsqlite3" >&5 +$as_echo_n "checking for sqlite3_column_database_name16 in -lsqlite3... " >&6; } +if ${ac_cv_lib_sqlite3_sqlite3_column_database_name16+:} false; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lsqlite3 $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -#include "confdefs.h" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char sqlite3_column_database_name16 (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { -sqlite3_column_database_name16 (); +return sqlite3_column_database_name16 (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_sqlite3_sqlite3_column_database_name16=yes else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_sqlite3_sqlite3_column_database_name16=no + ac_cv_lib_sqlite3_sqlite3_column_database_name16=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_sqlite3_sqlite3_column_database_name16" >&5 -echo "${ECHO_T}$ac_cv_lib_sqlite3_sqlite3_column_database_name16" >&6 -if test $ac_cv_lib_sqlite3_sqlite3_column_database_name16 = yes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_column_database_name16" >&5 +$as_echo "$ac_cv_lib_sqlite3_sqlite3_column_database_name16" >&6; } +if test "x$ac_cv_lib_sqlite3_sqlite3_column_database_name16" = xyes; then : HAVE_SQLITE3_COLUMN_DATABASE_NAME16=1 else HAVE_SQLITE3_COLUMN_DATABASE_NAME16=0 fi - echo "$as_me:$LINENO: checking for sqlite3_column_origin_name16 in -lsqlite3" >&5 -echo $ECHO_N "checking for sqlite3_column_origin_name16 in -lsqlite3... $ECHO_C" >&6 -if test "${ac_cv_lib_sqlite3_sqlite3_column_origin_name16+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3_column_origin_name16 in -lsqlite3" >&5 +$as_echo_n "checking for sqlite3_column_origin_name16 in -lsqlite3... " >&6; } +if ${ac_cv_lib_sqlite3_sqlite3_column_origin_name16+:} false; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lsqlite3 $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -#include "confdefs.h" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char sqlite3_column_origin_name16 (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { -sqlite3_column_origin_name16 (); +return sqlite3_column_origin_name16 (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_sqlite3_sqlite3_column_origin_name16=yes else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_sqlite3_sqlite3_column_origin_name16=no + ac_cv_lib_sqlite3_sqlite3_column_origin_name16=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_sqlite3_sqlite3_column_origin_name16" >&5 -echo "${ECHO_T}$ac_cv_lib_sqlite3_sqlite3_column_origin_name16" >&6 -if test $ac_cv_lib_sqlite3_sqlite3_column_origin_name16 = yes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_column_origin_name16" >&5 +$as_echo "$ac_cv_lib_sqlite3_sqlite3_column_origin_name16" >&6; } +if test "x$ac_cv_lib_sqlite3_sqlite3_column_origin_name16" = xyes; then : HAVE_SQLITE3_COLUMN_ORIGIN_NAME16=1 else HAVE_SQLITE3_COLUMN_ORIGIN_NAME16=0 fi - echo "$as_me:$LINENO: checking for sqlite3_bind_parameter_count in -lsqlite3" >&5 -echo $ECHO_N "checking for sqlite3_bind_parameter_count in -lsqlite3... $ECHO_C" >&6 -if test "${ac_cv_lib_sqlite3_sqlite3_bind_parameter_count+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3_bind_parameter_count in -lsqlite3" >&5 +$as_echo_n "checking for sqlite3_bind_parameter_count in -lsqlite3... " >&6; } +if ${ac_cv_lib_sqlite3_sqlite3_bind_parameter_count+:} false; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lsqlite3 $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -#include "confdefs.h" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char sqlite3_bind_parameter_count (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { -sqlite3_bind_parameter_count (); +return sqlite3_bind_parameter_count (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_sqlite3_sqlite3_bind_parameter_count=yes else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_sqlite3_sqlite3_bind_parameter_count=no + ac_cv_lib_sqlite3_sqlite3_bind_parameter_count=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_sqlite3_sqlite3_bind_parameter_count" >&5 -echo "${ECHO_T}$ac_cv_lib_sqlite3_sqlite3_bind_parameter_count" >&6 -if test $ac_cv_lib_sqlite3_sqlite3_bind_parameter_count = yes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_bind_parameter_count" >&5 +$as_echo "$ac_cv_lib_sqlite3_sqlite3_bind_parameter_count" >&6; } +if test "x$ac_cv_lib_sqlite3_sqlite3_bind_parameter_count" = xyes; then : HAVE_SQLITE3_BIND_PARAMETER_COUNT=1 else HAVE_SQLITE3_BIND_PARAMETER_COUNT=0 fi - echo "$as_me:$LINENO: checking for sqlite3_bind_parameter_name in -lsqlite3" >&5 -echo $ECHO_N "checking for sqlite3_bind_parameter_name in -lsqlite3... $ECHO_C" >&6 -if test "${ac_cv_lib_sqlite3_sqlite3_bind_parameter_name+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3_bind_parameter_name in -lsqlite3" >&5 +$as_echo_n "checking for sqlite3_bind_parameter_name in -lsqlite3... " >&6; } +if ${ac_cv_lib_sqlite3_sqlite3_bind_parameter_name+:} false; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lsqlite3 $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -#include "confdefs.h" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char sqlite3_bind_parameter_name (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { -sqlite3_bind_parameter_name (); +return sqlite3_bind_parameter_name (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_sqlite3_sqlite3_bind_parameter_name=yes else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_sqlite3_sqlite3_bind_parameter_name=no + ac_cv_lib_sqlite3_sqlite3_bind_parameter_name=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_sqlite3_sqlite3_bind_parameter_name" >&5 -echo "${ECHO_T}$ac_cv_lib_sqlite3_sqlite3_bind_parameter_name" >&6 -if test $ac_cv_lib_sqlite3_sqlite3_bind_parameter_name = yes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_bind_parameter_name" >&5 +$as_echo "$ac_cv_lib_sqlite3_sqlite3_bind_parameter_name" >&6; } +if test "x$ac_cv_lib_sqlite3_sqlite3_bind_parameter_name" = xyes; then : HAVE_SQLITE3_BIND_PARAMETER_NAME=1 else HAVE_SQLITE3_BIND_PARAMETER_NAME=0 fi - echo "$as_me:$LINENO: checking for sqlite3_bind_parameter_index in -lsqlite3" >&5 -echo $ECHO_N "checking for sqlite3_bind_parameter_index in -lsqlite3... $ECHO_C" >&6 -if test "${ac_cv_lib_sqlite3_sqlite3_bind_parameter_index+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3_bind_parameter_index in -lsqlite3" >&5 +$as_echo_n "checking for sqlite3_bind_parameter_index in -lsqlite3... " >&6; } +if ${ac_cv_lib_sqlite3_sqlite3_bind_parameter_index+:} false; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lsqlite3 $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -#include "confdefs.h" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char sqlite3_bind_parameter_index (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { -sqlite3_bind_parameter_index (); +return sqlite3_bind_parameter_index (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_sqlite3_sqlite3_bind_parameter_index=yes else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_sqlite3_sqlite3_bind_parameter_index=no + ac_cv_lib_sqlite3_sqlite3_bind_parameter_index=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_sqlite3_sqlite3_bind_parameter_index" >&5 -echo "${ECHO_T}$ac_cv_lib_sqlite3_sqlite3_bind_parameter_index" >&6 -if test $ac_cv_lib_sqlite3_sqlite3_bind_parameter_index = yes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_bind_parameter_index" >&5 +$as_echo "$ac_cv_lib_sqlite3_sqlite3_bind_parameter_index" >&6; } +if test "x$ac_cv_lib_sqlite3_sqlite3_bind_parameter_index" = xyes; then : HAVE_SQLITE3_BIND_PARAMETER_INDEX=1 else HAVE_SQLITE3_BIND_PARAMETER_INDEX=0 fi - echo "$as_me:$LINENO: checking for sqlite3_result_zeroblob in -lsqlite3" >&5 -echo $ECHO_N "checking for sqlite3_result_zeroblob in -lsqlite3... $ECHO_C" >&6 -if test "${ac_cv_lib_sqlite3_sqlite3_result_zeroblob+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3_result_zeroblob in -lsqlite3" >&5 +$as_echo_n "checking for sqlite3_result_zeroblob in -lsqlite3... " >&6; } +if ${ac_cv_lib_sqlite3_sqlite3_result_zeroblob+:} false; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lsqlite3 $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -#include "confdefs.h" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char sqlite3_result_zeroblob (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { -sqlite3_result_zeroblob (); +return sqlite3_result_zeroblob (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_sqlite3_sqlite3_result_zeroblob=yes else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_sqlite3_sqlite3_result_zeroblob=no + ac_cv_lib_sqlite3_sqlite3_result_zeroblob=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_sqlite3_sqlite3_result_zeroblob" >&5 -echo "${ECHO_T}$ac_cv_lib_sqlite3_sqlite3_result_zeroblob" >&6 -if test $ac_cv_lib_sqlite3_sqlite3_result_zeroblob = yes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_result_zeroblob" >&5 +$as_echo "$ac_cv_lib_sqlite3_sqlite3_result_zeroblob" >&6; } +if test "x$ac_cv_lib_sqlite3_sqlite3_result_zeroblob" = xyes; then : HAVE_SQLITE3_RESULT_ZEROBLOB=1 else HAVE_SQLITE3_RESULT_ZEROBLOB=0 fi - echo "$as_me:$LINENO: checking for sqlite3_blob_open in -lsqlite3" >&5 -echo $ECHO_N "checking for sqlite3_blob_open in -lsqlite3... $ECHO_C" >&6 -if test "${ac_cv_lib_sqlite3_sqlite3_blob_open+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3_blob_open in -lsqlite3" >&5 +$as_echo_n "checking for sqlite3_blob_open in -lsqlite3... " >&6; } +if ${ac_cv_lib_sqlite3_sqlite3_blob_open+:} false; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lsqlite3 $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -#include "confdefs.h" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char sqlite3_blob_open (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { -sqlite3_blob_open (); +return sqlite3_blob_open (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_sqlite3_sqlite3_blob_open=yes else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_sqlite3_sqlite3_blob_open=no + ac_cv_lib_sqlite3_sqlite3_blob_open=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_sqlite3_sqlite3_blob_open" >&5 -echo "${ECHO_T}$ac_cv_lib_sqlite3_sqlite3_blob_open" >&6 -if test $ac_cv_lib_sqlite3_sqlite3_blob_open = yes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_blob_open" >&5 +$as_echo "$ac_cv_lib_sqlite3_sqlite3_blob_open" >&6; } +if test "x$ac_cv_lib_sqlite3_sqlite3_blob_open" = xyes; then : HAVE_SQLITE3_INCRBLOBIO=1 else HAVE_SQLITE3_INCRBLOBIO=0 fi - echo "$as_me:$LINENO: checking for sqlite3_key in -lsqlite3" >&5 -echo $ECHO_N "checking for sqlite3_key in -lsqlite3... $ECHO_C" >&6 -if test "${ac_cv_lib_sqlite3_sqlite3_key+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3_key in -lsqlite3" >&5 +$as_echo_n "checking for sqlite3_key in -lsqlite3... " >&6; } +if ${ac_cv_lib_sqlite3_sqlite3_key+:} false; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lsqlite3 $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -#include "confdefs.h" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char sqlite3_key (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { -sqlite3_key (); +return sqlite3_key (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_sqlite3_sqlite3_key=yes else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_sqlite3_sqlite3_key=no + ac_cv_lib_sqlite3_sqlite3_key=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_sqlite3_sqlite3_key" >&5 -echo "${ECHO_T}$ac_cv_lib_sqlite3_sqlite3_key" >&6 -if test $ac_cv_lib_sqlite3_sqlite3_key = yes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_key" >&5 +$as_echo "$ac_cv_lib_sqlite3_sqlite3_key" >&6; } +if test "x$ac_cv_lib_sqlite3_sqlite3_key" = xyes; then : HAVE_SQLITE3_KEY=1 else HAVE_SQLITE3_KEY=0 fi - -echo "$as_me:$LINENO: checking for sqlite3_rekey in -lsqlite3" >&5 -echo $ECHO_N "checking for sqlite3_rekey in -lsqlite3... $ECHO_C" >&6 -if test "${ac_cv_lib_sqlite3_sqlite3_rekey+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3_rekey in -lsqlite3" >&5 +$as_echo_n "checking for sqlite3_rekey in -lsqlite3... " >&6; } +if ${ac_cv_lib_sqlite3_sqlite3_rekey+:} false; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lsqlite3 $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -#include "confdefs.h" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char sqlite3_rekey (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { -sqlite3_rekey (); +return sqlite3_rekey (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_sqlite3_sqlite3_rekey=yes else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_sqlite3_sqlite3_rekey=no + ac_cv_lib_sqlite3_sqlite3_rekey=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_sqlite3_sqlite3_rekey" >&5 -echo "${ECHO_T}$ac_cv_lib_sqlite3_sqlite3_rekey" >&6 -if test $ac_cv_lib_sqlite3_sqlite3_rekey = yes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_rekey" >&5 +$as_echo "$ac_cv_lib_sqlite3_sqlite3_rekey" >&6; } +if test "x$ac_cv_lib_sqlite3_sqlite3_rekey" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_LIBSQLITE3 1 _ACEOF @@ -8647,491 +8907,339 @@ else HAVE_SQLITE3_KEY=0 fi - echo "$as_me:$LINENO: checking for sqlite3_enable_shared_cache in -lsqlite3" >&5 -echo $ECHO_N "checking for sqlite3_enable_shared_cache in -lsqlite3... $ECHO_C" >&6 -if test "${ac_cv_lib_sqlite3_sqlite3_enable_shared_cache+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3_enable_shared_cache in -lsqlite3" >&5 +$as_echo_n "checking for sqlite3_enable_shared_cache in -lsqlite3... " >&6; } +if ${ac_cv_lib_sqlite3_sqlite3_enable_shared_cache+:} false; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lsqlite3 $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -#include "confdefs.h" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char sqlite3_enable_shared_cache (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { -sqlite3_enable_shared_cache (); +return sqlite3_enable_shared_cache (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_sqlite3_sqlite3_enable_shared_cache=yes else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_sqlite3_sqlite3_enable_shared_cache=no + ac_cv_lib_sqlite3_sqlite3_enable_shared_cache=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_sqlite3_sqlite3_enable_shared_cache" >&5 -echo "${ECHO_T}$ac_cv_lib_sqlite3_sqlite3_enable_shared_cache" >&6 -if test $ac_cv_lib_sqlite3_sqlite3_enable_shared_cache = yes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_enable_shared_cache" >&5 +$as_echo "$ac_cv_lib_sqlite3_sqlite3_enable_shared_cache" >&6; } +if test "x$ac_cv_lib_sqlite3_sqlite3_enable_shared_cache" = xyes; then : HAVE_SQLITE3_SHARED_CACHE=1 else HAVE_SQLITE3_SHARED_CACHE=0 fi - echo "$as_me:$LINENO: checking for sqlite3_open_v2 in -lsqlite3" >&5 -echo $ECHO_N "checking for sqlite3_open_v2 in -lsqlite3... $ECHO_C" >&6 -if test "${ac_cv_lib_sqlite3_sqlite3_open_v2+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3_open_v2 in -lsqlite3" >&5 +$as_echo_n "checking for sqlite3_open_v2 in -lsqlite3... " >&6; } +if ${ac_cv_lib_sqlite3_sqlite3_open_v2+:} false; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lsqlite3 $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -#include "confdefs.h" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char sqlite3_open_v2 (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { -sqlite3_open_v2 (); +return sqlite3_open_v2 (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_sqlite3_sqlite3_open_v2=yes else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_sqlite3_sqlite3_open_v2=no + ac_cv_lib_sqlite3_sqlite3_open_v2=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_sqlite3_sqlite3_open_v2" >&5 -echo "${ECHO_T}$ac_cv_lib_sqlite3_sqlite3_open_v2" >&6 -if test $ac_cv_lib_sqlite3_sqlite3_open_v2 = yes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_open_v2" >&5 +$as_echo "$ac_cv_lib_sqlite3_sqlite3_open_v2" >&6; } +if test "x$ac_cv_lib_sqlite3_sqlite3_open_v2" = xyes; then : HAVE_SQLITE3_OPEN_V2=1 else HAVE_SQLITE3_OPEN_V2=0 fi if test "$enable_load_extension" = "yes" ; then - echo "$as_me:$LINENO: checking for sqlite3_load_extension in -lsqlite3" >&5 -echo $ECHO_N "checking for sqlite3_load_extension in -lsqlite3... $ECHO_C" >&6 -if test "${ac_cv_lib_sqlite3_sqlite3_load_extension+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3_load_extension in -lsqlite3" >&5 +$as_echo_n "checking for sqlite3_load_extension in -lsqlite3... " >&6; } +if ${ac_cv_lib_sqlite3_sqlite3_load_extension+:} false; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lsqlite3 $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -#include "confdefs.h" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char sqlite3_load_extension (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { -sqlite3_load_extension (); +return sqlite3_load_extension (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_sqlite3_sqlite3_load_extension=yes else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_sqlite3_sqlite3_load_extension=no + ac_cv_lib_sqlite3_sqlite3_load_extension=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_sqlite3_sqlite3_load_extension" >&5 -echo "${ECHO_T}$ac_cv_lib_sqlite3_sqlite3_load_extension" >&6 -if test $ac_cv_lib_sqlite3_sqlite3_load_extension = yes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_load_extension" >&5 +$as_echo "$ac_cv_lib_sqlite3_sqlite3_load_extension" >&6; } +if test "x$ac_cv_lib_sqlite3_sqlite3_load_extension" = xyes; then : HAVE_SQLITE3_LOAD_EXTENSION=1 else HAVE_SQLITE3_LOAD_EXTENSION=0 fi fi - echo "$as_me:$LINENO: checking for sqlite3_backup_init in -lsqlite3" >&5 -echo $ECHO_N "checking for sqlite3_backup_init in -lsqlite3... $ECHO_C" >&6 -if test "${ac_cv_lib_sqlite3_sqlite3_backup_init+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3_backup_init in -lsqlite3" >&5 +$as_echo_n "checking for sqlite3_backup_init in -lsqlite3... " >&6; } +if ${ac_cv_lib_sqlite3_sqlite3_backup_init+:} false; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lsqlite3 $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -#include "confdefs.h" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char sqlite3_backup_init (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { -sqlite3_backup_init (); +return sqlite3_backup_init (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_sqlite3_sqlite3_backup_init=yes else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_sqlite3_sqlite3_backup_init=no + ac_cv_lib_sqlite3_sqlite3_backup_init=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_sqlite3_sqlite3_backup_init" >&5 -echo "${ECHO_T}$ac_cv_lib_sqlite3_sqlite3_backup_init" >&6 -if test $ac_cv_lib_sqlite3_sqlite3_backup_init = yes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_backup_init" >&5 +$as_echo "$ac_cv_lib_sqlite3_sqlite3_backup_init" >&6; } +if test "x$ac_cv_lib_sqlite3_sqlite3_backup_init" = xyes; then : HAVE_SQLITE3_BACKUPAPI=1 else HAVE_SQLITE3_BACKUPAPI=0 fi - echo "$as_me:$LINENO: checking for sqlite3_profile in -lsqlite3" >&5 -echo $ECHO_N "checking for sqlite3_profile in -lsqlite3... $ECHO_C" >&6 -if test "${ac_cv_lib_sqlite3_sqlite3_profile+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3_profile in -lsqlite3" >&5 +$as_echo_n "checking for sqlite3_profile in -lsqlite3... " >&6; } +if ${ac_cv_lib_sqlite3_sqlite3_profile+:} false; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lsqlite3 $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -#include "confdefs.h" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char sqlite3_profile (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { -sqlite3_profile (); +return sqlite3_profile (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_sqlite3_sqlite3_profile=yes else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_sqlite3_sqlite3_profile=no + ac_cv_lib_sqlite3_sqlite3_profile=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_sqlite3_sqlite3_profile" >&5 -echo "${ECHO_T}$ac_cv_lib_sqlite3_sqlite3_profile" >&6 -if test $ac_cv_lib_sqlite3_sqlite3_profile = yes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_profile" >&5 +$as_echo "$ac_cv_lib_sqlite3_sqlite3_profile" >&6; } +if test "x$ac_cv_lib_sqlite3_sqlite3_profile" = xyes; then : HAVE_SQLITE3_PROFILE=1 else HAVE_SQLITE3_PROFILE=0 fi - echo "$as_me:$LINENO: checking for sqlite3_status in -lsqlite3" >&5 -echo $ECHO_N "checking for sqlite3_status in -lsqlite3... $ECHO_C" >&6 -if test "${ac_cv_lib_sqlite3_sqlite3_status+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3_status in -lsqlite3" >&5 +$as_echo_n "checking for sqlite3_status in -lsqlite3... " >&6; } +if ${ac_cv_lib_sqlite3_sqlite3_status+:} false; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lsqlite3 $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -#include "confdefs.h" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char sqlite3_status (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { -sqlite3_status (); +return sqlite3_status (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_sqlite3_sqlite3_status=yes else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_sqlite3_sqlite3_status=no + ac_cv_lib_sqlite3_sqlite3_status=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_sqlite3_sqlite3_status" >&5 -echo "${ECHO_T}$ac_cv_lib_sqlite3_sqlite3_status" >&6 -if test $ac_cv_lib_sqlite3_sqlite3_status = yes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_status" >&5 +$as_echo "$ac_cv_lib_sqlite3_sqlite3_status" >&6; } +if test "x$ac_cv_lib_sqlite3_sqlite3_status" = xyes; then : HAVE_SQLITE3_STATUS=1 else HAVE_SQLITE3_STATUS=0 fi - echo "$as_me:$LINENO: checking for sqlite3_db_status in -lsqlite3" >&5 -echo $ECHO_N "checking for sqlite3_db_status in -lsqlite3... $ECHO_C" >&6 -if test "${ac_cv_lib_sqlite3_sqlite3_db_status+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3_db_status in -lsqlite3" >&5 +$as_echo_n "checking for sqlite3_db_status in -lsqlite3... " >&6; } +if ${ac_cv_lib_sqlite3_sqlite3_db_status+:} false; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lsqlite3 $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -#include "confdefs.h" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char sqlite3_db_status (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { -sqlite3_db_status (); +return sqlite3_db_status (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_sqlite3_sqlite3_db_status=yes else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_sqlite3_sqlite3_db_status=no + ac_cv_lib_sqlite3_sqlite3_db_status=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_sqlite3_sqlite3_db_status" >&5 -echo "${ECHO_T}$ac_cv_lib_sqlite3_sqlite3_db_status" >&6 -if test $ac_cv_lib_sqlite3_sqlite3_db_status = yes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_db_status" >&5 +$as_echo "$ac_cv_lib_sqlite3_sqlite3_db_status" >&6; } +if test "x$ac_cv_lib_sqlite3_sqlite3_db_status" = xyes; then : HAVE_SQLITE3_DB_STATUS=1 else HAVE_SQLITE3_DB_STATUS=0 fi - echo "$as_me:$LINENO: checking for sqlite3_stmt_status in -lsqlite3" >&5 -echo $ECHO_N "checking for sqlite3_stmt_status in -lsqlite3... $ECHO_C" >&6 -if test "${ac_cv_lib_sqlite3_sqlite3_stmt_status+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3_stmt_status in -lsqlite3" >&5 +$as_echo_n "checking for sqlite3_stmt_status in -lsqlite3... " >&6; } +if ${ac_cv_lib_sqlite3_sqlite3_stmt_status+:} false; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lsqlite3 $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -#include "confdefs.h" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char sqlite3_stmt_status (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { -sqlite3_stmt_status (); +return sqlite3_stmt_status (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_sqlite3_sqlite3_stmt_status=yes else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_sqlite3_sqlite3_stmt_status=no + ac_cv_lib_sqlite3_sqlite3_stmt_status=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_sqlite3_sqlite3_stmt_status" >&5 -echo "${ECHO_T}$ac_cv_lib_sqlite3_sqlite3_stmt_status" >&6 -if test $ac_cv_lib_sqlite3_sqlite3_stmt_status = yes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_stmt_status" >&5 +$as_echo "$ac_cv_lib_sqlite3_sqlite3_stmt_status" >&6; } +if test "x$ac_cv_lib_sqlite3_sqlite3_stmt_status" = xyes; then : HAVE_SQLITE3_STMT_STATUS=1 else HAVE_SQLITE3_STMT_STATUS=0 @@ -9174,29 +9282,26 @@ fi ########## # Any usable SQLite found ? # -echo "$as_me:$LINENO: checking for usable SQLite" >&5 -echo $ECHO_N "checking for usable SQLite... $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for usable SQLite" >&5 +$as_echo_n "checking for usable SQLite... " >&6; } if test "$HAVE_SQLITE2" != "1" -a "$HAVE_SQLITE3" != "1" ; then - { { echo "$as_me:$LINENO: error: No SQLite found, please try --with-sqlite/--with-sqlite3" >&5 -echo "$as_me: error: No SQLite found, please try --with-sqlite/--with-sqlite3" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "No SQLite found, please try --with-sqlite/--with-sqlite3" "$LINENO" 5 fi -echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } ########## # Find out if char ptr array can be passed in place of # a va_list (needed for sqlite_exec_vprintf() and # sqlite_vmprintf()) # -echo "$as_me:$LINENO: checking va_list usage" >&5 -echo $ECHO_N "checking va_list usage... $ECHO_C" >&6 -if test "$cross_compiling" = yes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking va_list usage" >&5 +$as_echo_n "checking va_list usage... " >&6; } +if test "$cross_compiling" = yes; then : USE_VFUNCS=0 else - cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -#include "confdefs.h" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ #include #include @@ -9223,35 +9328,23 @@ main(int argc, char **argv) } _ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +if ac_fn_c_try_run "$LINENO"; then : USE_VFUNCS=1 else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -( exit $ac_status ) -USE_VFUNCS=0 + USE_VFUNCS=0 fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi + if test "$USE_VFUNCS" = "1" ; then - echo "$as_me:$LINENO: result: using sqlite_exec_vprintf/sqlite_vmprintf" >&5 -echo "${ECHO_T}using sqlite_exec_vprintf/sqlite_vmprintf" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: using sqlite_exec_vprintf/sqlite_vmprintf" >&5 +$as_echo "using sqlite_exec_vprintf/sqlite_vmprintf" >&6; } VALIST_FLAGS="" else - echo "$as_me:$LINENO: result: NOT using sqlite_exec_vprintf/sqlite_vmprintf" >&5 -echo "${ECHO_T}NOT using sqlite_exec_vprintf/sqlite_vmprintf" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: NOT using sqlite_exec_vprintf/sqlite_vmprintf" >&5 +$as_echo "NOT using sqlite_exec_vprintf/sqlite_vmprintf" >&6; } VALIST_FLAGS="-DCANT_PASS_VALIST_AS_CHARPTR=1" fi @@ -9261,10 +9354,10 @@ fi # # Extract the first word of "readlink", so it can be a program name with args. set dummy readlink; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_READLINK+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_READLINK+:} false; then : + $as_echo_n "(cached) " >&6 else if test -n "$READLINK"; then ac_cv_prog_READLINK="$READLINK" # Let the user override the test. @@ -9274,38 +9367,38 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_READLINK="readlink" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done +IFS=$as_save_IFS fi fi READLINK=$ac_cv_prog_READLINK if test -n "$READLINK"; then - echo "$as_me:$LINENO: result: $READLINK" >&5 -echo "${ECHO_T}$READLINK" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $READLINK" >&5 +$as_echo "$READLINK" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -# Check whether --with-jdk or --without-jdk was given. -if test "${with_jdk+set}" = set; then - withval="$with_jdk" - JAVA_HOME=$withval -fi; + +# Check whether --with-jdk was given. +if test "${with_jdk+set}" = set; then : + withval=$with_jdk; JAVA_HOME=$withval +fi + if test -z "$JAVA_HOME" ; then JAVA_HOME=`which javac` if test -z "$JAVA_HOME" ; then - { { echo "$as_me:$LINENO: error: JAVA_HOME directory not found, please use --with-jdk=DIR" >&5 -echo "$as_me: error: JAVA_HOME directory not found, please use --with-jdk=DIR" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "JAVA_HOME directory not found, please use --with-jdk=DIR" "$LINENO" 5 fi if test -n "$READLINK" ; then while test -L $JAVA_HOME ; do @@ -9316,8 +9409,8 @@ echo "$as_me: error: JAVA_HOME directory not found, please use --with-jdk=DIR" > JAVA_HOME=`dirname $JAVA_HOME` if test "x$JAR_DIR_UNSPEC" = "xyes" ; then JAR_DIR=$JAVA_HOME/jre/lib/ext - echo "$as_me:$LINENO: result: will install sqlite.jar into $JAR_DIR" >&5 -echo "${ECHO_T}will install sqlite.jar into $JAR_DIR" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: will install sqlite.jar into $JAR_DIR" >&5 +$as_echo "will install sqlite.jar into $JAR_DIR" >&6; } fi if test "$prefix" = "/usr/local" ; then case "$target_cpu" in @@ -9335,24 +9428,32 @@ echo "${ECHO_T}will install sqlite.jar into $JAR_DIR" >&6 NATIVE_LIB_DIR=$JAVA_HOME/jre/lib/$target_cpu ;; esac - echo "$as_me:$LINENO: result: will install libsqlite_jni into $NATIVE_LIB_DIR" >&5 -echo "${ECHO_T}will install libsqlite_jni into $NATIVE_LIB_DIR" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: will install libsqlite_jni into $NATIVE_LIB_DIR" >&5 +$as_echo "will install libsqlite_jni into $NATIVE_LIB_DIR" >&6; } fi fi if test ! -d "$JAVA_HOME" ; then - { { echo "$as_me:$LINENO: error: JAVA_HOME directory not found, please use --with-jdk=DIR" >&5 -echo "$as_me: error: JAVA_HOME directory not found, please use --with-jdk=DIR" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "JAVA_HOME directory not found, please use --with-jdk=DIR" "$LINENO" 5 fi if test -n "$JAVA_HOME" ; then - JAVA_RUN=$JAVA_HOME/bin/java + if test "x$JAVA_RUN" = "x"; then + JAVA_RUN=$JAVA_HOME/bin/java + else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Overriding JAVA command with: $JAVA_RUN" >&5 +$as_echo "$as_me: WARNING: Overriding JAVA command with: $JAVA_RUN" >&2;} + fi JAVAC=$JAVA_HOME/bin/javac JAVAH="$JAVA_HOME/bin/javah -jni" JAR=$JAVA_HOME/bin/jar JAVADOC=$JAVA_HOME/bin/javadoc else - JAVA_RUN=`which java` + if test "x$JAVA_RUN" = "x"; then + JAVA_RUN=`which java` + else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Overriding JAVA command with: $JAVA_RUN" >&5 +$as_echo "$as_me: WARNING: Overriding JAVA command with: $JAVA_RUN" >&2;} + fi JAVAC=`which javac` JAVAH="`which javah` -jni" JAR=`which jar` @@ -9380,21 +9481,27 @@ case $build_os in ;; *) JNIINCLUDE="-I${JAVA_HOME}/include -I${JAVA_HOME}/include/${build_os}" - { echo "$as_me:$LINENO: WARNING: setting generic JNI include file directives!" >&5 -echo "$as_me: WARNING: setting generic JNI include file directives!" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: setting generic JNI include file directives!" >&5 +$as_echo "$as_me: WARNING: setting generic JNI include file directives!" >&2;} ;; esac -echo "$as_me:$LINENO: result: setting JNI include file directives: $JNIINCLUDE" >&5 -echo "${ECHO_T}setting JNI include file directives: $JNIINCLUDE" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: setting JNI include file directives: $JNIINCLUDE" >&5 +$as_echo "setting JNI include file directives: $JNIINCLUDE" >&6; } # Figure out JDK version -JDBCVER=JDBC2 -$JAVA_RUN -version 2>&1 | grep 'version "1.1' >/dev/null && JDBCVER=JDBC1 -$JAVA_RUN -version 2>&1 | grep 'version "1.4' >/dev/null && JDBCVER=JDBC2x -$JAVA_RUN -version 2>&1 | grep 'version "1.5' >/dev/null && JDBCVER=JDBC2y -$JAVA_RUN -version 2>&1 | grep 'version "1.[67]' >/dev/null && JDBCVER=JDBC2z -echo "$as_me:$LINENO: result: using JDBC driver from $JDBCVER directory" >&5 -echo "${ECHO_T}using JDBC driver from $JDBCVER directory" >&6 +if test "x$JDBCVER" = "x" ; then + JDBCVER=JDBC2 + $JAVA_RUN -version 2>&1 | grep 'version "1.1' >/dev/null && JDBCVER=JDBC1 + $JAVA_RUN -version 2>&1 | grep 'version "1.4' >/dev/null && JDBCVER=JDBC2x + $JAVA_RUN -version 2>&1 | grep 'version "1.5' >/dev/null && JDBCVER=JDBC2y + $JAVA_RUN -version 2>&1 | grep 'version "1.[67]' >/dev/null && JDBCVER=JDBC2z + $JAVA_RUN -version 2>&1 | grep 'JSR169' >/dev/null && JDBCVER=JDBC0 +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: overriding JDBC driver: $JDBCVER" >&5 +$as_echo "$as_me: WARNING: overriding JDBC driver: $JDBCVER" >&2;} +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: using JDBC driver from $JDBCVER directory" >&5 +$as_echo "using JDBC driver from $JDBCVER directory" >&6; } if test "$JDBCVER" = "JDBC2y" ; then # 1.5 gives one unchecked warning on SQLite/TableResult.java @@ -9415,6 +9522,7 @@ fi ac_config_files="$ac_config_files Makefile" + cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure @@ -9425,7 +9533,7 @@ cat >confcache <<\_ACEOF # config.status only pays attention to the cache file if you give it # the --recheck option to rerun configure. # -# `ac_cv_env_foo' variables (set or unset) will be overriden when +# `ac_cv_env_foo' variables (set or unset) will be overridden when # loading this file, other *unset* `ac_cv_foo' will be assigned the # following values. @@ -9433,39 +9541,70 @@ _ACEOF # 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. +# So, we kill variables containing newlines. # Ultrix sh set writes to stderr and can't be redirected directly, # and sets the high bit in the cache file unless we assign to the vars. -{ +( + for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do + eval ac_val=\$$ac_var + case $ac_val in #( + *${as_nl}*) + case $ac_var in #( + *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 +$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + esac + case $ac_var in #( + _ | IFS | as_nl) ;; #( + BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( + *) { eval $ac_var=; unset $ac_var;} ;; + esac ;; + esac + done + (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 \). + case $as_nl`(ac_space=' '; set) 2>&1` in #( + *${as_nl}ac_space=\ *) + # `set' does not quote correctly, so add quotes: double-quote + # substitution turns \\\\ into \\, and sed turns \\ into \. sed -n \ - "s/'/'\\\\''/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" - ;; + "s/'/'\\\\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" + ;; #( *) # `set' quotes correctly as required by POSIX, so do not add quotes. - sed -n \ - "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" + sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" ;; - esac; -} | + esac | + sort +) | sed ' + /^ac_cv_env_/b end t clear - : clear + :clear s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ t end - /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ - : end' >>confcache -if cmp -s $cache_file confcache; then :; else - if test -w $cache_file; then - test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" - cat confcache >$cache_file + s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ + :end' >>confcache +if diff "$cache_file" confcache >/dev/null 2>&1; then :; else + if test -w "$cache_file"; then + if test "x$cache_file" != "x/dev/null"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 +$as_echo "$as_me: updating cache $cache_file" >&6;} + if test ! -f "$cache_file" || test -h "$cache_file"; then + cat confcache >"$cache_file" + else + case $cache_file in #( + */* | ?:*) + mv -f confcache "$cache_file"$$ && + mv -f "$cache_file"$$ "$cache_file" ;; #( + *) + mv -f confcache "$cache_file" ;; + esac + fi + fi else - echo "not updating unwritable cache $cache_file" + { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 +$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} fi fi rm -f confcache @@ -9474,61 +9613,70 @@ test "x$prefix" = xNONE && prefix=$ac_default_prefix # Let make expand exec_prefix. test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' -# VPATH may cause trouble with some makes, so we remove $(srcdir), -# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and -# trailing colons and then remove the whole line if VPATH becomes empty -# (actually we leave an empty line to preserve line numbers). -if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=/{ -s/:*\$(srcdir):*/:/; -s/:*\${srcdir}:*/:/; -s/:*@srcdir@:*/:/; -s/^\([^=]*=[ ]*\):*/\1/; -s/:*$//; -s/^[^=]*=[ ]*$//; -}' -fi - # Transform confdefs.h into DEFS. # Protect against shell expansion while executing Makefile rules. # Protect against Makefile macro expansion. # # If the first sed substitution is executed (which looks for macros that -# take arguments), then we branch to the quote section. Otherwise, +# take arguments), then branch to the quote section. Otherwise, # look for a macro that doesn't take arguments. -cat >confdef2opt.sed <<\_ACEOF +ac_script=' +:mline +/\\$/{ + N + s,\\\n,, + b mline +} t clear -: clear -s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g +:clear +s/^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\)/-D\1=\2/g t quote -s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\),-D\1=\2,g +s/^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)/-D\1=\2/g t quote -d -: quote -s,[ `~#$^&*(){}\\|;'"<>?],\\&,g -s,\[,\\&,g -s,\],\\&,g -s,\$,$$,g -p -_ACEOF -# We use echo to avoid assuming a particular line-breaking character. -# The extra dot is to prevent the shell from consuming trailing -# line-breaks from the sub-command output. A line-break within -# single-quotes doesn't work because, if this script is created in a -# platform that uses two characters for line-breaks (e.g., DOS), tr -# would break. -ac_LF_and_DOT=`echo; echo .` -DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'` -rm -f confdef2opt.sed +b any +:quote +s/[ `~#$^&*(){}\\|;'\''"<>?]/\\&/g +s/\[/\\&/g +s/\]/\\&/g +s/\$/$$/g +H +:any +${ + g + s/^\n// + s/\n/ /g + p +} +' +DEFS=`sed -n "$ac_script" confdefs.h` + + +ac_libobjs= +ac_ltlibobjs= +U= +for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue + # 1. Remove the extension, and $U if already installed. + ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' + ac_i=`$as_echo "$ac_i" | sed "$ac_script"` + # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR + # will be set to the directory where LIBOBJS objects are built. + as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext" + as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo' +done +LIBOBJS=$ac_libobjs + +LTLIBOBJS=$ac_ltlibobjs -: ${CONFIG_STATUS=./config.status} +: "${CONFIG_STATUS=./config.status}" +ac_write_fail=0 ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 -echo "$as_me: creating $CONFIG_STATUS" >&6;} -cat >$CONFIG_STATUS <<_ACEOF +{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 +$as_echo "$as_me: creating $CONFIG_STATUS" >&6;} +as_write_fail=0 +cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1 #! $SHELL # Generated by $as_me. # Run this file to recreate the current configuration. @@ -9536,70 +9684,255 @@ cat >$CONFIG_STATUS <<_ACEOF # configure, is in config.log if it exists. debug=false +ac_cs_recheck=false +ac_cs_silent=false + SHELL=\${CONFIG_SHELL-$SHELL} -_ACEOF +export SHELL +_ASEOF +cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 +## -------------------- ## +## M4sh Initialization. ## +## -------------------- ## -cat >>$CONFIG_STATUS <<\_ACEOF - -## --------------------- ## -## M4sh Initialization. ## -## --------------------- ## - -# Be Bourne compatible -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then +# Be more Bourne compatible +DUALCASE=1; export DUALCASE # for MKS sh +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : emulate sh NULLCMD=: -elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then - set -o posix + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; +esac fi + +as_nl=' +' +export as_nl +# Printing a long string crashes Solaris 7 /usr/bin/printf. +as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo +# Prefer a ksh shell builtin over an external printf program on Solaris, +# but without wasting forks for bash or zsh. +if test -z "$BASH_VERSION$ZSH_VERSION" \ + && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='print -r --' + as_echo_n='print -rn --' +elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='printf %s\n' + as_echo_n='printf %s' +else + if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then + as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' + as_echo_n='/usr/ucb/echo -n' + else + as_echo_body='eval expr "X$1" : "X\\(.*\\)"' + as_echo_n_body='eval + arg=$1; + case $arg in #( + *"$as_nl"*) + expr "X$arg" : "X\\(.*\\)$as_nl"; + arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; + esac; + expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" + ' + export as_echo_n_body + as_echo_n='sh -c $as_echo_n_body as_echo' + fi + export as_echo_body + as_echo='sh -c $as_echo_body as_echo' +fi + +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { + (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || + PATH_SEPARATOR=';' + } +fi + + +# IFS +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent editors from complaining about space-tab. +# (If _AS_PATH_WALK were called with IFS unset, it would disable word +# splitting by setting IFS to empty value.) +IFS=" "" $as_nl" + +# Find who we are. Look in the path if we contain no directory separator. +as_myself= +case $0 in #(( + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + done +IFS=$as_save_IFS + + ;; +esac +# We did not find ourselves, most probably we were run as `sh COMMAND' +# in which case we are not to be found in the path. +if test "x$as_myself" = x; then + as_myself=$0 +fi +if test ! -f "$as_myself"; then + $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + exit 1 +fi + +# Unset variables that we do not need and which cause bugs (e.g. in +# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" +# suppresses any "Segmentation fault" message there. '((' could +# trigger a bug in pdksh 5.2.14. +for as_var in BASH_ENV ENV MAIL MAILPATH +do eval test x\${$as_var+set} = xset \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : +done +PS1='$ ' +PS2='> ' +PS4='+ ' + # NLS nuisances. -# Support unset when possible. -if (FOO=FOO; unset FOO) >/dev/null 2>&1; then - as_unset=unset +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE + +# CDPATH. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + + +# as_fn_error STATUS ERROR [LINENO LOG_FD] +# ---------------------------------------- +# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are +# provided, also output the error to LOG_FD, referencing LINENO. Then exit the +# script with STATUS, using 1 if that was 0. +as_fn_error () +{ + as_status=$1; test $as_status -eq 0 && as_status=1 + if test "$4"; then + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + fi + $as_echo "$as_me: error: $2" >&2 + as_fn_exit $as_status +} # as_fn_error + + +# as_fn_set_status STATUS +# ----------------------- +# Set $? to STATUS, without forking. +as_fn_set_status () +{ + return $1 +} # as_fn_set_status + +# as_fn_exit STATUS +# ----------------- +# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. +as_fn_exit () +{ + set +e + as_fn_set_status $1 + exit $1 +} # as_fn_exit + +# as_fn_unset VAR +# --------------- +# Portably unset VAR. +as_fn_unset () +{ + { eval $1=; unset $1;} +} +as_unset=as_fn_unset +# as_fn_append VAR VALUE +# ---------------------- +# Append the text in VALUE to the end of the definition contained in VAR. Take +# advantage of any shell optimizations that allow amortized linear growth over +# repeated appends, instead of the typical quadratic growth present in naive +# implementations. +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : + eval 'as_fn_append () + { + eval $1+=\$2 + }' else - as_unset=false + as_fn_append () + { + eval $1=\$$1\$2 + } +fi # as_fn_append + +# as_fn_arith ARG... +# ------------------ +# Perform arithmetic evaluation on the ARGs, and store the result in the +# global $as_val. Take advantage of shells that can avoid forks. The arguments +# must be portable across $(()) and expr. +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : + eval 'as_fn_arith () + { + as_val=$(( $* )) + }' +else + as_fn_arith () + { + as_val=`expr "$@" || test $? -eq 1` + } +fi # as_fn_arith + + +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr +else + as_expr=false fi -(set +x; test -n "`(LANG=C; export LANG) 2>&1`") && - { $as_unset LANG || test "${LANG+set}" != set; } || - { LANG=C; export LANG; } -(set +x; test -n "`(LC_ALL=C; export LC_ALL) 2>&1`") && - { $as_unset LC_ALL || test "${LC_ALL+set}" != set; } || - { LC_ALL=C; export LC_ALL; } -(set +x; test -n "`(LC_TIME=C; export LC_TIME) 2>&1`") && - { $as_unset LC_TIME || test "${LC_TIME+set}" != set; } || - { LC_TIME=C; export LC_TIME; } -(set +x; test -n "`(LC_CTYPE=C; export LC_CTYPE) 2>&1`") && - { $as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set; } || - { LC_CTYPE=C; export LC_CTYPE; } -(set +x; test -n "`(LANGUAGE=C; export LANGUAGE) 2>&1`") && - { $as_unset LANGUAGE || test "${LANGUAGE+set}" != set; } || - { LANGUAGE=C; export LANGUAGE; } -(set +x; test -n "`(LC_COLLATE=C; export LC_COLLATE) 2>&1`") && - { $as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set; } || - { LC_COLLATE=C; export LC_COLLATE; } -(set +x; test -n "`(LC_NUMERIC=C; export LC_NUMERIC) 2>&1`") && - { $as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set; } || - { LC_NUMERIC=C; export LC_NUMERIC; } -(set +x; test -n "`(LC_MESSAGES=C; export LC_MESSAGES) 2>&1`") && - { $as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set; } || - { LC_MESSAGES=C; export LC_MESSAGES; } +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then + as_basename=basename +else + as_basename=false +fi +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname +else + as_dirname=false +fi -# Name of the executable. -as_me=`(basename "$0") 2>/dev/null || +as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)$' \| \ - . : '\(.\)' 2>/dev/null || -echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } - /^X\/\(\/\/\)$/{ s//\1/; q; } - /^X\/\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` + X"$0" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q + } + /^X\/\(\/\/\)$/{ + s//\1/ + q + } + /^X\/\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` -# PATH needs CR, and LINENO needs CR and PATH. # Avoid depending upon Character Ranges. as_cr_letters='abcdefghijklmnopqrstuvwxyz' as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' @@ -9607,172 +9940,145 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS as_cr_digits='0123456789' as_cr_alnum=$as_cr_Letters$as_cr_digits -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conftest.sh - echo "exit 0" >>conftest.sh - chmod +x conftest.sh - if (PATH=".;."; conftest.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conftest.sh -fi - - - as_lineno_1=$LINENO - as_lineno_2=$LINENO - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x$as_lineno_3" = "x$as_lineno_2" || { - # Find who we are. Look in the path if we contain no path at all - # relative or not. - case $0 in - *[\\/]* ) as_myself=$0 ;; - *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -done - - ;; - esac - # We did not find ourselves, most probably we were run as `sh COMMAND' - # in which case we are not to be found in the path. - if test "x$as_myself" = x; then - as_myself=$0 - fi - if test ! -f "$as_myself"; then - { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5 -echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;} - { (exit 1); exit 1; }; } - fi - case $CONFIG_SHELL in - '') - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for as_base in sh bash ksh sh5; do - case $as_dir in - /*) - if ("$as_dir/$as_base" -c ' - as_lineno_1=$LINENO - as_lineno_2=$LINENO - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then - CONFIG_SHELL=$as_dir/$as_base - export CONFIG_SHELL - exec "$CONFIG_SHELL" "$0" ${1+"$@"} - fi;; - esac - done -done -;; - esac - - # Create $as_me.lineno as a copy of $as_myself, but with $LINENO - # uniformly replaced by the line number. The first 'sed' inserts a - # line-number line before each line; the second 'sed' does the real - # work. The second script uses 'N' to pair each line-number line - # with the numbered line, and appends trailing '-' during - # substitution so that $LINENO is not a special case at line end. - # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the - # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) - sed '=' <$as_myself | - sed ' - N - s,$,-, - : loop - s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, - t loop - s,-$,, - s,^['$as_cr_digits']*\n,, - ' >$as_me.lineno && - chmod +x $as_me.lineno || - { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5 -echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;} - { (exit 1); exit 1; }; } - - # Don't try to exec as it changes $[0], causing all sort of problems - # (the dirname of $[0] is not the place where we might find the - # original and so on. Autoconf is especially sensible to this). - . ./$as_me.lineno - # Exit status is that of the last command. - exit -} - - -case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in - *c*,-n*) ECHO_N= ECHO_C=' -' ECHO_T=' ' ;; - *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; - *) ECHO_N= ECHO_C='\c' ECHO_T= ;; +ECHO_C= ECHO_N= ECHO_T= +case `echo -n x` in #((((( +-n*) + case `echo 'xy\c'` in + *c*) ECHO_T=' ';; # ECHO_T is single tab character. + xy) ECHO_C='\c';; + *) echo `echo ksh88 bug on AIX 6.1` > /dev/null + ECHO_T=' ';; + esac;; +*) + ECHO_N='-n';; esac -if expr a : '\(a\)' >/dev/null 2>&1; then - as_expr=expr -else - as_expr=false -fi - rm -f conf$$ conf$$.exe conf$$.file -echo >conf$$.file -if ln -s conf$$.file conf$$ 2>/dev/null; then - # We could just check for DJGPP; but this test a) works b) is more generic - # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). - if test -f conf$$.exe; then - # Don't use ln at all; we don't have any links - as_ln_s='cp -p' - else +if test -d conf$$.dir; then + rm -f conf$$.dir/conf$$.file +else + rm -f conf$$.dir + mkdir conf$$.dir 2>/dev/null +fi +if (echo >conf$$.file) 2>/dev/null; then + if ln -s conf$$.file conf$$ 2>/dev/null; then as_ln_s='ln -s' + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -p'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || + as_ln_s='cp -p' + elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln + else + as_ln_s='cp -p' fi -elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln else as_ln_s='cp -p' fi -rm -f conf$$ conf$$.exe conf$$.file +rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file +rmdir conf$$.dir 2>/dev/null -as_executable_p="test -f" + +# as_fn_mkdir_p +# ------------- +# Create "$as_dir" as a directory, including parents if necessary. +as_fn_mkdir_p () +{ + + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac + test -d "$as_dir" || eval $as_mkdir_p || { + as_dirs= + while :; do + case $as_dir in #( + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" + as_dir=`$as_dirname -- "$as_dir" || +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + test -d "$as_dir" && break + done + test -z "$as_dirs" || eval "mkdir $as_dirs" + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" + + +} # as_fn_mkdir_p +if mkdir -p . 2>/dev/null; then + as_mkdir_p='mkdir -p "$as_dir"' +else + test -d ./-p && rmdir ./-p + as_mkdir_p=false +fi + +if test -x / >/dev/null 2>&1; then + as_test_x='test -x' +else + if ls -dL / >/dev/null 2>&1; then + as_ls_L_option=L + else + as_ls_L_option= + fi + as_test_x=' + eval sh -c '\'' + if test -d "$1"; then + test -d "$1/."; + else + case $1 in #( + -*)set "./$1";; + esac; + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( + ???[sx]*):;;*)false;;esac;fi + '\'' sh + ' +fi +as_executable_p=$as_test_x # Sed expression to map a string onto a valid CPP name. -as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" +as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" # Sed expression to map a string onto a valid variable name. -as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" +as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" -# IFS -# We need space, tab and new line, in precisely that order. -as_nl=' -' -IFS=" $as_nl" - -# CDPATH. -$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=$PATH_SEPARATOR; export CDPATH; } - exec 6>&1 +## ----------------------------------- ## +## Main body of $CONFIG_STATUS script. ## +## ----------------------------------- ## +_ASEOF +test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1 -# Open the log real soon, to keep \$[0] and so on meaningful, and to +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +# Save the log message, to keep $0 and so on meaningful, and to # report actual input values of CONFIG_FILES etc. instead of their -# values after options handling. Logging --version etc. is OK. -exec 5>>config.log -{ - echo - sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX -## Running $as_me. ## -_ASBOX -} >&5 -cat >&5 <<_CSEOF - +# values after options handling. +ac_log=" This file was extended by $as_me, which was -generated by GNU Autoconf 2.53. Invocation command line was +generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -9780,145 +10086,168 @@ generated by GNU Autoconf 2.53. Invocation command line was CONFIG_COMMANDS = $CONFIG_COMMANDS $ $0 $@ -_CSEOF -echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5 -echo >&5 +on `(hostname || uname -n) 2>/dev/null | sed 1q` +" + _ACEOF +case $ac_config_files in *" +"*) set x $ac_config_files; shift; ac_config_files=$*;; +esac + + + +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 # Files that config.status was made for. -if test -n "$ac_config_files"; then - echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS -fi +config_files="$ac_config_files" -if test -n "$ac_config_headers"; then - echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS -fi - -if test -n "$ac_config_links"; then - echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS -fi - -if test -n "$ac_config_commands"; then - echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS -fi - -cat >>$CONFIG_STATUS <<\_ACEOF +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ac_cs_usage="\ -\`$as_me' instantiates files from templates according to the -current configuration. +\`$as_me' instantiates files and other configuration actions +from templates according to the current configuration. Unless the files +and actions are specified as TAGs, all are instantiated by default. -Usage: $0 [OPTIONS] [FILE]... +Usage: $0 [OPTION]... [TAG]... -h, --help print this help, then exit - -V, --version print version number, then exit + -V, --version print version number and configuration settings, then exit + --config print configuration, then exit + -q, --quiet, --silent + do not print progress messages -d, --debug don't remove temporary files --recheck update $as_me by reconfiguring in the same conditions - --file=FILE[:TEMPLATE] + --file=FILE[:TEMPLATE] instantiate the configuration file FILE Configuration files: $config_files -Report bugs to ." -_ACEOF +Report bugs to the package provider." -cat >>$CONFIG_STATUS <<_ACEOF +_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ config.status -configured by $0, generated by GNU Autoconf 2.53, - with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" +configured by $0, generated by GNU Autoconf 2.68, + with options \\"\$ac_cs_config\\" -Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 -Free Software Foundation, Inc. +Copyright (C) 2010 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." -srcdir=$srcdir -INSTALL="$INSTALL" + +ac_pwd='$ac_pwd' +srcdir='$srcdir' +INSTALL='$INSTALL' +test -n "\$AWK" || AWK=awk _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF -# If no file are specified by the user, then we need to provide default -# value. By we need to know if files were specified by the user. +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +# The default lists apply if the user does not specify any file. ac_need_defaults=: while test $# != 0 do case $1 in - --*=*) - ac_option=`expr "x$1" : 'x\([^=]*\)='` - ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'` - shift - set dummy "$ac_option" "$ac_optarg" ${1+"$@"} - shift + --*=?*) + ac_option=`expr "X$1" : 'X\([^=]*\)='` + ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` + ac_shift=: + ;; + --*=) + ac_option=`expr "X$1" : 'X\([^=]*\)='` + ac_optarg= + ac_shift=: + ;; + *) + ac_option=$1 + ac_optarg=$2 + ac_shift=shift ;; - -*);; - *) # This is not an option, so the user has probably given explicit - # arguments. - ac_need_defaults=false;; esac - case $1 in + case $ac_option in # Handling of the options. -_ACEOF -cat >>$CONFIG_STATUS <<_ACEOF -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) - echo "running $SHELL $0 " $ac_configure_args " --no-create --no-recursion" - exec $SHELL $0 $ac_configure_args --no-create --no-recursion ;; -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF - --version | --vers* | -V ) - echo "$ac_cs_version"; exit 0 ;; - --he | --h) - # Conflict between --help and --header - { { echo "$as_me:$LINENO: error: ambiguous option: $1 -Try \`$0 --help' for more information." >&5 -echo "$as_me: error: ambiguous option: $1 -Try \`$0 --help' for more information." >&2;} - { (exit 1); exit 1; }; };; - --help | --hel | -h ) - echo "$ac_cs_usage"; exit 0 ;; - --debug | --d* | -d ) + ac_cs_recheck=: ;; + --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) + $as_echo "$ac_cs_version"; exit ;; + --config | --confi | --conf | --con | --co | --c ) + $as_echo "$ac_cs_config"; exit ;; + --debug | --debu | --deb | --de | --d | -d ) debug=: ;; --file | --fil | --fi | --f ) - shift - CONFIG_FILES="$CONFIG_FILES $1" - ac_need_defaults=false;; - --header | --heade | --head | --hea ) - shift - CONFIG_HEADERS="$CONFIG_HEADERS $1" + $ac_shift + case $ac_optarg in + *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + '') as_fn_error $? "missing file argument" ;; + esac + as_fn_append CONFIG_FILES " '$ac_optarg'" ac_need_defaults=false;; + --he | --h | --help | --hel | -h ) + $as_echo "$ac_cs_usage"; exit ;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil | --si | --s) + ac_cs_silent=: ;; # This is an error. - -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1 -Try \`$0 --help' for more information." >&5 -echo "$as_me: error: unrecognized option: $1 -Try \`$0 --help' for more information." >&2;} - { (exit 1); exit 1; }; } ;; + -*) as_fn_error $? "unrecognized option: \`$1' +Try \`$0 --help' for more information." ;; - *) ac_config_targets="$ac_config_targets $1" ;; + *) as_fn_append ac_config_targets " $1" + ac_need_defaults=false ;; esac shift done +ac_configure_extra_args= + +if $ac_cs_silent; then + exec 6>/dev/null + ac_configure_extra_args="$ac_configure_extra_args --silent" +fi + +_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +if \$ac_cs_recheck; then + set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + shift + \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 + CONFIG_SHELL='$SHELL' + export CONFIG_SHELL + exec "\$@" +fi + +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +exec 5>>config.log +{ + echo + sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX +## Running $as_me. ## +_ASBOX + $as_echo "$ac_log" +} >&5 + +_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 _ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - - - -cat >>$CONFIG_STATUS <<\_ACEOF +# Handling of arguments. for ac_config_target in $ac_config_targets do - case "$ac_config_target" in - # Handling of arguments. - "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; - *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 -echo "$as_me: error: invalid argument: $ac_config_target" >&2;} - { (exit 1); exit 1; }; };; + case $ac_config_target in + "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; + + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac done + # If the user did not use the arguments to specify the items to instantiate, # then the envvar interface is used. Set only those that are not. # We use the long form for the default assignment because of an extremely @@ -9927,358 +10256,420 @@ if $ac_need_defaults; then test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files fi -# Create a temporary directory, and hook for its removal unless debugging. +# Have a temporary directory for convenience. Make it in the build tree +# simply because there is no reason against having it here, and in addition, +# creating and moving files from /tmp can sometimes cause problems. +# Hook for its removal unless debugging. +# Note that there is a small window in which the directory will not be cleaned: +# after its creation but before its name has been assigned to `$tmp'. $debug || { - trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0 - trap '{ (exit 1); exit 1; }' 1 2 13 15 + tmp= ac_tmp= + trap 'exit_status=$? + : "${ac_tmp:=$tmp}" + { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status +' 0 + trap 'as_fn_exit 1' 1 2 13 15 } - # Create a (secure) tmp directory for tmp files. -: ${TMPDIR=/tmp} + { - tmp=`(umask 077 && mktemp -d -q "$TMPDIR/csXXXXXX") 2>/dev/null` && - test -n "$tmp" && test -d "$tmp" + tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && + test -d "$tmp" } || { - tmp=$TMPDIR/cs$$-$RANDOM - (umask 077 && mkdir $tmp) -} || -{ - echo "$me: cannot create a temporary directory in $TMPDIR" >&2 - { (exit 1); exit 1; } -} + tmp=./conf$$-$RANDOM + (umask 077 && mkdir "$tmp") +} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 +ac_tmp=$tmp -_ACEOF +# Set up the scripts for CONFIG_FILES section. +# No need to generate them if there are no CONFIG_FILES. +# This happens for instance with `./config.status config.h'. +if test -n "$CONFIG_FILES"; then -cat >>$CONFIG_STATUS <<_ACEOF -# -# CONFIG_FILES section. -# - -# No need to generate the scripts if there are no CONFIG_FILES. -# This happens for instance when ./config.status config.h -if test -n "\$CONFIG_FILES"; then - # Protect against being on the right side of a sed subst in config.status. - sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g; - s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF -s,@SHELL@,$SHELL,;t t -s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t -s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t -s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t -s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t -s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t -s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t -s,@exec_prefix@,$exec_prefix,;t t -s,@prefix@,$prefix,;t t -s,@program_transform_name@,$program_transform_name,;t t -s,@bindir@,$bindir,;t t -s,@sbindir@,$sbindir,;t t -s,@libexecdir@,$libexecdir,;t t -s,@datadir@,$datadir,;t t -s,@sysconfdir@,$sysconfdir,;t t -s,@sharedstatedir@,$sharedstatedir,;t t -s,@localstatedir@,$localstatedir,;t t -s,@libdir@,$libdir,;t t -s,@includedir@,$includedir,;t t -s,@oldincludedir@,$oldincludedir,;t t -s,@infodir@,$infodir,;t t -s,@mandir@,$mandir,;t t -s,@build_alias@,$build_alias,;t t -s,@host_alias@,$host_alias,;t t -s,@target_alias@,$target_alias,;t t -s,@DEFS@,$DEFS,;t t -s,@ECHO_C@,$ECHO_C,;t t -s,@ECHO_N@,$ECHO_N,;t t -s,@ECHO_T@,$ECHO_T,;t t -s,@LIBS@,$LIBS,;t t -s,@build@,$build,;t t -s,@build_cpu@,$build_cpu,;t t -s,@build_vendor@,$build_vendor,;t t -s,@build_os@,$build_os,;t t -s,@host@,$host,;t t -s,@host_cpu@,$host_cpu,;t t -s,@host_vendor@,$host_vendor,;t t -s,@host_os@,$host_os,;t t -s,@CC@,$CC,;t t -s,@CFLAGS@,$CFLAGS,;t t -s,@LDFLAGS@,$LDFLAGS,;t t -s,@CPPFLAGS@,$CPPFLAGS,;t t -s,@ac_ct_CC@,$ac_ct_CC,;t t -s,@EXEEXT@,$EXEEXT,;t t -s,@OBJEXT@,$OBJEXT,;t t -s,@LN_S@,$LN_S,;t t -s,@ECHO@,$ECHO,;t t -s,@RANLIB@,$RANLIB,;t t -s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t -s,@STRIP@,$STRIP,;t t -s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t -s,@CPP@,$CPP,;t t -s,@LIBTOOL@,$LIBTOOL,;t t -s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t -s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t -s,@INSTALL_DATA@,$INSTALL_DATA,;t t -s,@target@,$target,;t t -s,@target_cpu@,$target_cpu,;t t -s,@target_vendor@,$target_vendor,;t t -s,@target_os@,$target_os,;t t -s,@SQLITE_INC@,$SQLITE_INC,;t t -s,@SQLITE_LIB@,$SQLITE_LIB,;t t -s,@HAVE_SQLITE2@,$HAVE_SQLITE2,;t t -s,@HAVE_SQLITE_FUNCTION_TYPE@,$HAVE_SQLITE_FUNCTION_TYPE,;t t -s,@HAVE_SQLITE_OPEN_AUX_FILE@,$HAVE_SQLITE_OPEN_AUX_FILE,;t t -s,@HAVE_SQLITE_SET_AUTHORIZER@,$HAVE_SQLITE_SET_AUTHORIZER,;t t -s,@HAVE_SQLITE_TRACE@,$HAVE_SQLITE_TRACE,;t t -s,@HAVE_SQLITE_COMPILE@,$HAVE_SQLITE_COMPILE,;t t -s,@HAVE_SQLITE_PROGRESS_HANDLER@,$HAVE_SQLITE_PROGRESS_HANDLER,;t t -s,@SQLITE3_INC@,$SQLITE3_INC,;t t -s,@SQLITE3_LIB@,$SQLITE3_LIB,;t t -s,@HAVE_SQLITE3@,$HAVE_SQLITE3,;t t -s,@HAVE_SQLITE3_MALLOC@,$HAVE_SQLITE3_MALLOC,;t t -s,@HAVE_SQLITE3_PREPARE_V2@,$HAVE_SQLITE3_PREPARE_V2,;t t -s,@HAVE_SQLITE3_PREPARE16_V2@,$HAVE_SQLITE3_PREPARE16_V2,;t t -s,@HAVE_SQLITE3_BIND_ZEROBLOB@,$HAVE_SQLITE3_BIND_ZEROBLOB,;t t -s,@HAVE_SQLITE3_CLEAR_BINDINGS@,$HAVE_SQLITE3_CLEAR_BINDINGS,;t t -s,@HAVE_SQLITE3_COLUMN_TABLE_NAME16@,$HAVE_SQLITE3_COLUMN_TABLE_NAME16,;t t -s,@HAVE_SQLITE3_COLUMN_DATABASE_NAME16@,$HAVE_SQLITE3_COLUMN_DATABASE_NAME16,;t t -s,@HAVE_SQLITE3_COLUMN_ORIGIN_NAME16@,$HAVE_SQLITE3_COLUMN_ORIGIN_NAME16,;t t -s,@HAVE_SQLITE3_BIND_PARAMETER_COUNT@,$HAVE_SQLITE3_BIND_PARAMETER_COUNT,;t t -s,@HAVE_SQLITE3_BIND_PARAMETER_NAME@,$HAVE_SQLITE3_BIND_PARAMETER_NAME,;t t -s,@HAVE_SQLITE3_BIND_PARAMETER_INDEX@,$HAVE_SQLITE3_BIND_PARAMETER_INDEX,;t t -s,@HAVE_SQLITE3_RESULT_ZEROBLOB@,$HAVE_SQLITE3_RESULT_ZEROBLOB,;t t -s,@HAVE_SQLITE3_INCRBLOBIO@,$HAVE_SQLITE3_INCRBLOBIO,;t t -s,@HAVE_SQLITE3_KEY@,$HAVE_SQLITE3_KEY,;t t -s,@HAVE_SQLITE3_SHARED_CACHE@,$HAVE_SQLITE3_SHARED_CACHE,;t t -s,@HAVE_SQLITE3_OPEN_V2@,$HAVE_SQLITE3_OPEN_V2,;t t -s,@HAVE_SQLITE3_LOAD_EXTENSION@,$HAVE_SQLITE3_LOAD_EXTENSION,;t t -s,@HAVE_SQLITE3_BACKUPAPI@,$HAVE_SQLITE3_BACKUPAPI,;t t -s,@HAVE_SQLITE3_PROFILE@,$HAVE_SQLITE3_PROFILE,;t t -s,@HAVE_SQLITE3_STATUS@,$HAVE_SQLITE3_STATUS,;t t -s,@HAVE_SQLITE3_DB_STATUS@,$HAVE_SQLITE3_DB_STATUS,;t t -s,@HAVE_SQLITE3_STMT_STATUS@,$HAVE_SQLITE3_STMT_STATUS,;t t -s,@SQLITE3_A10N_C@,$SQLITE3_A10N_C,;t t -s,@SQLITE3_A10N_O@,$SQLITE3_A10N_O,;t t -s,@SQLITE3_A10N_FLAGS@,$SQLITE3_A10N_FLAGS,;t t -s,@VALIST_FLAGS@,$VALIST_FLAGS,;t t -s,@READLINK@,$READLINK,;t t -s,@JAVAH@,$JAVAH,;t t -s,@JAVA_RUN@,$JAVA_RUN,;t t -s,@JAVAC@,$JAVAC,;t t -s,@JAR@,$JAR,;t t -s,@JAVADOC@,$JAVADOC,;t t -s,@JNIINCLUDE@,$JNIINCLUDE,;t t -s,@JAR_DIR@,$JAR_DIR,;t t -s,@JDBCVER@,$JDBCVER,;t t -s,@NATIVE_LIB_DIR@,$NATIVE_LIB_DIR,;t t -CEOF - -_ACEOF - - cat >>$CONFIG_STATUS <<\_ACEOF - # Split the substitutions into bite-sized pieces for seds with - # small command number limits, like on Digital OSF/1 and HP-UX. - ac_max_sed_lines=48 - ac_sed_frag=1 # Number of current file. - ac_beg=1 # First line for current file. - ac_end=$ac_max_sed_lines # Line after last line for current file. - ac_more_lines=: - ac_sed_cmds= - while $ac_more_lines; do - if test $ac_beg -gt 1; then - sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag - else - sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag - fi - if test ! -s $tmp/subs.frag; then - ac_more_lines=false - else - # The purpose of the label and of the branching condition is to - # speed up the sed processing (if there are no `@' at all, there - # is no need to browse any of the substitutions). - # These are the two extra sed commands mentioned above. - (echo ':t - /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed - if test -z "$ac_sed_cmds"; then - ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed" - else - ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed" - fi - ac_sed_frag=`expr $ac_sed_frag + 1` - ac_beg=$ac_end - ac_end=`expr $ac_end + $ac_max_sed_lines` - fi - done - if test -z "$ac_sed_cmds"; then - ac_sed_cmds=cat - fi -fi # test -n "$CONFIG_FILES" - -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF -for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue - # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". - case $ac_file in - - | *:- | *:-:* ) # input from stdin - cat >$tmp/stdin - ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; - *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; - * ) ac_file_in=$ac_file.in ;; - esac - - # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories. - ac_dir=`(dirname "$ac_file") 2>/dev/null || -$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$ac_file" : 'X\(//\)[^/]' \| \ - X"$ac_file" : 'X\(//\)$' \| \ - X"$ac_file" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$ac_file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - { case "$ac_dir" in - [\\/]* | ?:[\\/]* ) as_incr_dir=;; - *) as_incr_dir=.;; -esac -as_dummy="$ac_dir" -for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do - case $as_mkdir_dir in - # Skip DOS drivespec - ?:) as_incr_dir=$as_mkdir_dir ;; - *) - as_incr_dir=$as_incr_dir/$as_mkdir_dir - test -d "$as_incr_dir" || - mkdir "$as_incr_dir" || - { { echo "$as_me:$LINENO: error: cannot create \"$ac_dir\"" >&5 -echo "$as_me: error: cannot create \"$ac_dir\"" >&2;} - { (exit 1); exit 1; }; } - ;; - esac -done; } - - ac_builddir=. - -if test "$ac_dir" != .; then - ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` - # A "../" for each directory in $ac_dir_suffix. - ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` +ac_cr=`echo X | tr X '\015'` +# On cygwin, bash can eat \r inside `` if the user requested igncr. +# But we know of no other shell where ac_cr would be empty at this +# point, so we can use a bashism as a fallback. +if test "x$ac_cr" = x; then + eval ac_cr=\$\'\\r\' +fi +ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` +if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then + ac_cs_awk_cr='\\r' else - ac_dir_suffix= ac_top_builddir= + ac_cs_awk_cr=$ac_cr fi -case $srcdir in - .) # No --srcdir option. We are building in place. - ac_srcdir=. - if test -z "$ac_top_builddir"; then - ac_top_srcdir=. - else - ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` - fi ;; - [\\/]* | ?:[\\/]* ) # Absolute path. - ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir ;; - *) # Relative path. - ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_builddir$srcdir ;; -esac -# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be -# absolute. -ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` -ac_abs_top_builddir=`cd "$ac_dir" && cd $ac_top_builddir && pwd` -ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` -ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` +echo 'BEGIN {' >"$ac_tmp/subs1.awk" && +_ACEOF +{ + echo "cat >conf$$subs.awk <<_ACEOF" && + echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && + echo "_ACEOF" +} >conf$$subs.sh || + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 +ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'` +ac_delim='%!_!# ' +for ac_last_try in false false false false false :; do + . ./conf$$subs.sh || + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 + + ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` + if test $ac_delim_n = $ac_delim_num; then + break + elif $ac_last_try; then + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +done +rm -f conf$$subs.sh + +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK && +_ACEOF +sed -n ' +h +s/^/S["/; s/!.*/"]=/ +p +g +s/^[^!]*!// +:repl +t repl +s/'"$ac_delim"'$// +t delim +:nl +h +s/\(.\{148\}\)..*/\1/ +t more1 +s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ +p +n +b repl +:more1 +s/["\\]/\\&/g; s/^/"/; s/$/"\\/ +p +g +s/.\{148\}// +t nl +:delim +h +s/\(.\{148\}\)..*/\1/ +t more2 +s/["\\]/\\&/g; s/^/"/; s/$/"/ +p +b +:more2 +s/["\\]/\\&/g; s/^/"/; s/$/"\\/ +p +g +s/.\{148\}// +t delim +' >$CONFIG_STATUS || ac_write_fail=1 +rm -f conf$$subs.awk +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +_ACAWK +cat >>"\$ac_tmp/subs1.awk" <<_ACAWK && + for (key in S) S_is_set[key] = 1 + FS = "" + +} +{ + line = $ 0 + nfields = split(line, field, "@") + substed = 0 + len = length(field[1]) + for (i = 2; i < nfields; i++) { + key = field[i] + keylen = length(key) + if (S_is_set[key]) { + value = S[key] + line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3) + len += length(value) + length(field[++i]) + substed = 1 + } else + len += 1 + keylen + } + + print line +} + +_ACAWK +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then + sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" +else + cat +fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \ + || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 +_ACEOF + +# VPATH may cause trouble with some makes, so we remove sole $(srcdir), +# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and +# trailing colons and then remove the whole line if VPATH becomes empty +# (actually we leave an empty line to preserve line numbers). +if test "x$srcdir" = x.; then + ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ +h +s/// +s/^/:/ +s/[ ]*$/:/ +s/:\$(srcdir):/:/g +s/:\${srcdir}:/:/g +s/:@srcdir@:/:/g +s/^:*// +s/:*$// +x +s/\(=[ ]*\).*/\1/ +G +s/\n// +s/^[^=]*=[ ]*$// +}' +fi + +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +fi # test -n "$CONFIG_FILES" + + +eval set X " :F $CONFIG_FILES " +shift +for ac_tag +do + case $ac_tag in + :[FHLC]) ac_mode=$ac_tag; continue;; + esac + case $ac_mode$ac_tag in + :[FHL]*:*);; + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; + :[FH]-) ac_tag=-:-;; + :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; + esac + ac_save_IFS=$IFS + IFS=: + set x $ac_tag + IFS=$ac_save_IFS + shift + ac_file=$1 + shift + + case $ac_mode in + :L) ac_source=$1;; + :[FH]) + ac_file_inputs= + for ac_f + do + case $ac_f in + -) ac_f="$ac_tmp/stdin";; + *) # Look for the file first in the build tree, then in the source tree + # (if the path is not absolute). The absolute path cannot be DOS-style, + # because $ac_f cannot contain `:'. + test -f "$ac_f" || + case $ac_f in + [\\/$]*) false;; + *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; + esac || + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; + esac + case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac + as_fn_append ac_file_inputs " '$ac_f'" + done + + # Let's still pretend it is `configure' which instantiates (i.e., don't + # use $as_me), people would be surprised to read: + # /* config.h. Generated by config.status. */ + configure_input='Generated from '` + $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' + `' by configure.' + if test x"$ac_file" != x-; then + configure_input="$ac_file. $configure_input" + { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 +$as_echo "$as_me: creating $ac_file" >&6;} + fi + # Neutralize special characters interpreted by sed in replacement strings. + case $configure_input in #( + *\&* | *\|* | *\\* ) + ac_sed_conf_input=`$as_echo "$configure_input" | + sed 's/[\\\\&|]/\\\\&/g'`;; #( + *) ac_sed_conf_input=$configure_input;; + esac + + case $ac_tag in + *:-:* | *:-) cat >"$ac_tmp/stdin" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; + esac + ;; + esac + + ac_dir=`$as_dirname -- "$ac_file" || +$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$ac_file" : 'X\(//\)[^/]' \| \ + X"$ac_file" : 'X\(//\)$' \| \ + X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$ac_file" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + as_dir="$ac_dir"; as_fn_mkdir_p + ac_builddir=. + +case "$ac_dir" in +.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; +*) + ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` + # A ".." for each directory in $ac_dir_suffix. + ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` + case $ac_top_builddir_sub in + "") ac_top_builddir_sub=. ac_top_build_prefix= ;; + *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; + esac ;; +esac +ac_abs_top_builddir=$ac_pwd +ac_abs_builddir=$ac_pwd$ac_dir_suffix +# for backward compatibility: +ac_top_builddir=$ac_top_build_prefix + +case $srcdir in + .) # We are building in place. + ac_srcdir=. + ac_top_srcdir=$ac_top_builddir_sub + ac_abs_top_srcdir=$ac_pwd ;; + [\\/]* | ?:[\\/]* ) # Absolute name. + ac_srcdir=$srcdir$ac_dir_suffix; + ac_top_srcdir=$srcdir + ac_abs_top_srcdir=$srcdir ;; + *) # Relative name. + ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix + ac_top_srcdir=$ac_top_build_prefix$srcdir + ac_abs_top_srcdir=$ac_pwd/$srcdir ;; +esac +ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix + + + case $ac_mode in + :F) + # + # CONFIG_FILE + # + case $INSTALL in [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; - *) ac_INSTALL=$ac_top_builddir$INSTALL ;; + *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; esac - - if test x"$ac_file" != x-; then - { echo "$as_me:$LINENO: creating $ac_file" >&5 -echo "$as_me: creating $ac_file" >&6;} - rm -f "$ac_file" - fi - # Let's still pretend it is `configure' which instantiates (i.e., don't - # use $as_me), people would be surprised to read: - # /* config.h. Generated by config.status. */ - if test x"$ac_file" = x-; then - configure_input= - else - configure_input="$ac_file. " - fi - configure_input=$configure_input"Generated from `echo $ac_file_in | - sed 's,.*/,,'` by configure." - - # First look for the input files in the build tree, otherwise in the - # src tree. - ac_file_inputs=`IFS=: - for f in $ac_file_in; do - case $f in - -) echo $tmp/stdin ;; - [\\/$]*) - # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 -echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - echo $f;; - *) # Relative - if test -f "$f"; then - # Build tree - echo $f - elif test -f "$srcdir/$f"; then - # Source tree - echo $srcdir/$f - else - # /dev/null tree - { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 -echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - fi;; - esac - done` || { (exit 1); exit 1; } _ACEOF -cat >>$CONFIG_STATUS <<_ACEOF - sed "$ac_vpsub + +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +# If the template does not know about datarootdir, expand it. +# FIXME: This hack should be removed a few years after 2.60. +ac_datarootdir_hack=; ac_datarootdir_seen= +ac_sed_dataroot=' +/datarootdir/ { + p + q +} +/@datadir@/p +/@docdir@/p +/@infodir@/p +/@localedir@/p +/@mandir@/p' +case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in +*datarootdir*) ac_datarootdir_seen=yes;; +*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 +$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} +_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + ac_datarootdir_hack=' + s&@datadir@&$datadir&g + s&@docdir@&$docdir&g + s&@infodir@&$infodir&g + s&@localedir@&$localedir&g + s&@mandir@&$mandir&g + s&\\\${datarootdir}&$datarootdir&g' ;; +esac +_ACEOF + +# Neutralize VPATH when `$srcdir' = `.'. +# Shell code in configure.ac might set extrasub. +# FIXME: do we really want to maintain this feature? +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +ac_sed_extra="$ac_vpsub $extrasub _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 :t /@[a-zA-Z_][a-zA-Z_0-9]*@/!b -s,@configure_input@,$configure_input,;t t -s,@srcdir@,$ac_srcdir,;t t -s,@abs_srcdir@,$ac_abs_srcdir,;t t -s,@top_srcdir@,$ac_top_srcdir,;t t -s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t -s,@builddir@,$ac_builddir,;t t -s,@abs_builddir@,$ac_abs_builddir,;t t -s,@top_builddir@,$ac_top_builddir,;t t -s,@abs_top_builddir@,$ac_abs_top_builddir,;t t -s,@INSTALL@,$ac_INSTALL,;t t -" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out - rm -f $tmp/stdin - if test x"$ac_file" != x-; then - mv $tmp/out $ac_file - else - cat $tmp/out - rm -f $tmp/out - fi +s|@configure_input@|$ac_sed_conf_input|;t t +s&@top_builddir@&$ac_top_builddir_sub&;t t +s&@top_build_prefix@&$ac_top_build_prefix&;t t +s&@srcdir@&$ac_srcdir&;t t +s&@abs_srcdir@&$ac_abs_srcdir&;t t +s&@top_srcdir@&$ac_top_srcdir&;t t +s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t +s&@builddir@&$ac_builddir&;t t +s&@abs_builddir@&$ac_abs_builddir&;t t +s&@abs_top_builddir@&$ac_abs_top_builddir&;t t +s&@INSTALL@&$ac_INSTALL&;t t +$ac_datarootdir_hack +" +eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \ + >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5 -done +test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && + { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && + { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ + "$ac_tmp/out"`; test -z "$ac_out"; } && + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' +which seems to be undefined. Please make sure it is defined" >&5 +$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' +which seems to be undefined. Please make sure it is defined" >&2;} + + rm -f "$ac_tmp/stdin" + case $ac_file in + -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";; + *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";; + esac \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + ;; + + + + esac + +done # for ac_tag + + +as_fn_exit 0 _ACEOF - -cat >>$CONFIG_STATUS <<\_ACEOF - -{ (exit 0); exit 0; } -_ACEOF -chmod +x $CONFIG_STATUS ac_clean_files=$ac_clean_files_save +test $ac_write_fail = 0 || + as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 + # configure is writing to config.log, and then calls config.status. # config.status does its own redirection, appending to config.log. @@ -10290,12 +10681,19 @@ ac_clean_files=$ac_clean_files_save # need to make the FD available again. if test "$no_create" != yes; then ac_cs_success=: + ac_config_status_args= + test "$silent" = yes && + ac_config_status_args="$ac_config_status_args --quiet" exec 5>/dev/null - $SHELL $CONFIG_STATUS || ac_cs_success=false + $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false exec 5>>config.log # Use ||, not &&, to avoid exiting from the if with $? = 1, which # would make configure fail if this is the last instruction. - $ac_cs_success || { (exit 1); exit 1; } + $ac_cs_success || as_fn_exit 1 +fi +if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 +$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} fi diff --git a/lang/sql/jdbc/configure.in b/lang/sql/jdbc/configure.in index b758a179..a37d95e3 100755 --- a/lang/sql/jdbc/configure.in +++ b/lang/sql/jdbc/configure.in @@ -4,7 +4,10 @@ AM_PROG_LIBTOOL AC_PROG_INSTALL CC=${CC:-cc} AC_SUBST(CC) +HOSTCC=${HOSTCC:-cc} +AC_SUBST(HOSTCC) AC_SUBST(CFLAGS) +AC_SUBST(HOST_CFLAGS) AC_CANONICAL_TARGET ########## @@ -482,13 +485,21 @@ if test ! -d "$JAVA_HOME" ; then fi if test -n "$JAVA_HOME" ; then - JAVA_RUN=$JAVA_HOME/bin/java + if test "x$JAVA_RUN" = "x"; then + JAVA_RUN=$JAVA_HOME/bin/java + else + AC_MSG_WARN([Overriding JAVA command with: $JAVA_RUN]) + fi JAVAC=$JAVA_HOME/bin/javac JAVAH="$JAVA_HOME/bin/javah -jni" JAR=$JAVA_HOME/bin/jar JAVADOC=$JAVA_HOME/bin/javadoc else - JAVA_RUN=`which java` + if test "x$JAVA_RUN" = "x"; then + JAVA_RUN=`which java` + else + AC_MSG_WARN([Overriding JAVA command with: $JAVA_RUN]) + fi JAVAC=`which javac` JAVAH="`which javah` -jni" JAR=`which jar` @@ -522,11 +533,16 @@ esac AC_MSG_RESULT([setting JNI include file directives: $JNIINCLUDE]) # Figure out JDK version -JDBCVER=JDBC2 -$JAVA_RUN -version 2>&1 | grep 'version "1.1' >/dev/null && JDBCVER=JDBC1 -$JAVA_RUN -version 2>&1 | grep 'version "1.4' >/dev/null && JDBCVER=JDBC2x -$JAVA_RUN -version 2>&1 | grep 'version "1.5' >/dev/null && JDBCVER=JDBC2y -$JAVA_RUN -version 2>&1 | grep 'version "1.[[67]]' >/dev/null && JDBCVER=JDBC2z +if test "x$JDBCVER" = "x" ; then + JDBCVER=JDBC2 + $JAVA_RUN -version 2>&1 | grep 'version "1.1' >/dev/null && JDBCVER=JDBC1 + $JAVA_RUN -version 2>&1 | grep 'version "1.4' >/dev/null && JDBCVER=JDBC2x + $JAVA_RUN -version 2>&1 | grep 'version "1.5' >/dev/null && JDBCVER=JDBC2y + $JAVA_RUN -version 2>&1 | grep 'version "1.[[67]]' >/dev/null && JDBCVER=JDBC2z + $JAVA_RUN -version 2>&1 | grep 'JSR169' >/dev/null && JDBCVER=JDBC0 +else + AC_MSG_WARN([overriding JDBC driver: $JDBCVER]) +fi AC_MSG_RESULT([using JDBC driver from $JDBCVER directory]) if test "$JDBCVER" = "JDBC2y" ; then diff --git a/lang/sql/jdbc/doc/ChangeLog b/lang/sql/jdbc/doc/ChangeLog index 803a5b50..5c506764 100644 --- a/lang/sql/jdbc/doc/ChangeLog +++ b/lang/sql/jdbc/doc/ChangeLog @@ -1,3 +1,7 @@ +2011-08-05 + + * Add updates so the package can work with Oracle Java Embedded Client + 2011-04-30 * update to SQLite 3.7.6.2 diff --git a/lang/sql/jdbc/doc/SQLite/Authorizer.html b/lang/sql/jdbc/doc/SQLite/Authorizer.html index 822d469a..10fa6857 100644 --- a/lang/sql/jdbc/doc/SQLite/Authorizer.html +++ b/lang/sql/jdbc/doc/SQLite/Authorizer.html @@ -2,25 +2,30 @@ - + Authorizer (SQLite Java Wrapper) - + + +
@@ -28,12 +33,12 @@ function windowTitle() -
+ - + @@ -49,7 +54,7 @@ function windowTitle()  PREV CLASS   NEXT CLASS
Overview  Package  Package   Class  Tree 
- FRAMES   + FRAMES    NO FRAMES     + +
@@ -28,12 +33,12 @@ function windowTitle() -
+ - + @@ -49,7 +54,7 @@ function windowTitle()  PREV CLASS   NEXT CLASS
Overview  Package  Package   Class  Tree 
- FRAMES   + FRAMES    NO FRAMES     + +
@@ -28,12 +33,12 @@ function windowTitle() -
+ - + @@ -49,7 +54,7 @@ function windowTitle()  PREV CLASS   NEXT CLASS
Overview  Package  Package   Class  Tree 
- FRAMES   + FRAMES    NO FRAMES     + +
@@ -28,12 +33,12 @@ function windowTitle() -
+ - + @@ -49,7 +54,7 @@ function windowTitle()  PREV CLASS   NEXT CLASS
Overview  Package  Package   Class  Tree 
- FRAMES   + FRAMES    NO FRAMES     + +
@@ -28,12 +33,12 @@ function windowTitle() -
+ - + @@ -49,7 +54,7 @@ function windowTitle()  PREV CLASS   NEXT CLASS
Overview  Package  Package   Class  Tree 
- FRAMES   + FRAMES    NO FRAMES     + +
@@ -28,12 +33,12 @@ function windowTitle() -
+ - + @@ -49,7 +54,7 @@ function windowTitle()  PREV CLASS   NEXT CLASS
Overview  Package  Package   Class  Tree 
- FRAMES   + FRAMES    NO FRAMES     + +
@@ -28,12 +33,12 @@ function windowTitle() -
+ - + @@ -49,7 +54,7 @@ function windowTitle()  PREV CLASS   NEXT CLASS
Overview  Package  Package   Class  Tree 
- FRAMES   + FRAMES    NO FRAMES     + +
@@ -28,12 +33,12 @@ function windowTitle() -
+ - + @@ -49,7 +54,7 @@ function windowTitle()  PREV CLASS   NEXT CLASS
Overview  Package  Package   Class  Tree 
- FRAMES   + FRAMES    NO FRAMES     + +
@@ -28,12 +33,12 @@ function windowTitle() -
+ - + @@ -49,7 +54,7 @@ function windowTitle()  PREV CLASS   NEXT CLASS
Overview  Package  Package   Class  Tree 
- FRAMES   + FRAMES    NO FRAMES     + +
@@ -28,12 +33,12 @@ function windowTitle() -
+ - + @@ -49,7 +54,7 @@ function windowTitle()  PREV CLASS   NEXT CLASS
Overview  Package  Package   Class  Tree 
- FRAMES   + FRAMES    NO FRAMES     + +
@@ -28,12 +33,12 @@ function windowTitle() -
+ - + @@ -49,7 +54,7 @@ function windowTitle()  PREV CLASS   NEXT CLASS
Overview  Package  Package   Class  Tree 
- FRAMES   + FRAMES    NO FRAMES     + +
@@ -28,12 +33,12 @@ function windowTitle() -
+ - + @@ -49,7 +54,7 @@ function windowTitle()  PREV CLASS   NEXT CLASS
Overview  Package  Package   Class  Tree 
- FRAMES   + FRAMES    NO FRAMES     + +
@@ -28,12 +33,12 @@ function windowTitle() -
+ - + @@ -49,7 +54,7 @@ function windowTitle()  PREV CLASS   NEXT CLASS
Overview  Package  Package   Class  Tree 
- FRAMES   + FRAMES    NO FRAMES     + +
@@ -28,12 +33,12 @@ function windowTitle() -
+ - + @@ -49,7 +54,7 @@ function windowTitle()  PREV CLASS   NEXT CLASS
Overview  Package  Package   Class  Tree 
- FRAMES   + FRAMES    NO FRAMES     + +
@@ -28,12 +33,12 @@ function windowTitle() -
+ - + @@ -49,7 +54,7 @@ function windowTitle()  PREV CLASS   NEXT CLASS
Overview  Package  Package   Class  Tree 
- FRAMES   + FRAMES    NO FRAMES     + +
@@ -28,12 +33,12 @@ function windowTitle() -
+ - + @@ -49,7 +54,7 @@ function windowTitle()  PREV CLASS   NEXT CLASS
Overview  Package  Package   Class  Tree 
- FRAMES   + FRAMES    NO FRAMES     + +
@@ -28,12 +33,12 @@ function windowTitle() -
+ - + @@ -49,7 +54,7 @@ function windowTitle()  PREV CLASS   NEXT CLASS
Overview  Package  Package   Class  Tree 
- FRAMES   + FRAMES    NO FRAMES     + +
@@ -28,12 +33,12 @@ function windowTitle() -
+ - + @@ -49,7 +54,7 @@ function windowTitle()  PREV CLASS   NEXT CLASS
Overview  Package  Package   Class  Tree 
- FRAMES   + FRAMES    NO FRAMES     + +
@@ -28,12 +33,12 @@ function windowTitle() -
+ - + @@ -49,7 +54,7 @@ function windowTitle()  PREV CLASS   NEXT CLASS
Overview  Package  Package   Class  Tree 
- FRAMES   + FRAMES    NO FRAMES     + +
@@ -28,12 +33,12 @@ function windowTitle() -
+ - + @@ -49,7 +54,7 @@ function windowTitle()  PREV PACKAGE   NEXT PACKAGE
Overview   Package  Package  Class  Tree 
- FRAMES   + FRAMES    NO FRAMES     + +
@@ -27,12 +33,12 @@ function windowTitle() -
+ - + @@ -48,7 +54,7 @@ function windowTitle()  PREV   NEXT
Overview  Package  Package  Class   Tree 
- FRAMES   + FRAMES    NO FRAMES     + +
@@ -27,12 +33,12 @@ function windowTitle() -
+ - + @@ -48,7 +54,7 @@ function windowTitle()  PREV   NEXT
Overview  Package  Package  Class  Tree 
- FRAMES   + FRAMES    NO FRAMES     + - + - + <H2> Frame Alert</H2> diff --git a/lang/sql/jdbc/doc/overview-summary.html b/lang/sql/jdbc/doc/overview-summary.html index aaca6735..7d728c48 100644 --- a/lang/sql/jdbc/doc/overview-summary.html +++ b/lang/sql/jdbc/doc/overview-summary.html @@ -2,28 +2,30 @@ <!--NewPage--> <HTML> <HEAD> -<!-- Generated by javadoc (build 1.4.2_03) on Sat Apr 30 14:01:26 CEST 2011 --> +<!-- Generated by javadoc (build 1.6.0_24) on Tue Aug 23 16:11:22 PDT 2011 --> <TITLE> Overview (SQLite Java Wrapper) </TITLE> -<META NAME="keywords" CONTENT="Overview, SQLite Java Wrapper/JDBC Driver -<br><small> -2011-04-30 -</small>"> +<META NAME="date" CONTENT="2011-08-23"> <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style"> <SCRIPT type="text/javascript"> function windowTitle() { - parent.document.title="Overview (SQLite Java Wrapper)"; + if (location.href.indexOf('is-external=true') == -1) { + parent.document.title="Overview (SQLite Java Wrapper)"; + } } </SCRIPT> +<NOSCRIPT> +</NOSCRIPT> </HEAD> <BODY BGCOLOR="white" onload="windowTitle();"> +<HR> <!-- ========= START OF TOP NAVBAR ======= --> @@ -31,12 +33,12 @@ function windowTitle() <A HREF="#skip-navbar_top" title="Skip navigation links"></A> <TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY=""> <TR> -<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> +<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A NAME="navbar_top_firstrow"><!-- --></A> <TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY=""> <TR ALIGN="center" VALIGN="top"> <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Overview</B></FONT>&nbsp;</TD> - <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Package</FONT>&nbsp;</TD> + <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="SQLite/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD> <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD> <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD> </TR> @@ -52,7 +54,7 @@ function windowTitle() &nbsp;PREV&nbsp; &nbsp;NEXT</FONT></TD> <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2"> - <A HREF="index.html" target="_top"><B>FRAMES</B></A> &nbsp; + <A HREF="index.html?overview-summary.html" target="_top"><B>FRAMES</B></A> &nbsp; &nbsp;<A HREF="overview-summary.html" target="_top"><B>NO FRAMES</B></A> &nbsp; &nbsp;<SCRIPT type="text/javascript"> <!-- @@ -65,6 +67,7 @@ function windowTitle() <A HREF="allclasses-noframe.html"><B>All Classes</B></A> </NOSCRIPT> + </FONT></TD> </TR> </TABLE> @@ -92,8 +95,8 @@ SQLite 2/3 database engine</A>. <TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY=""> <TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor"> -<TD COLSPAN=2><FONT SIZE="+2"> -<B>Packages</B></FONT></TD> +<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2"> +<B>Packages</B></FONT></TH> </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> <TD WIDTH="20%"><B><A HREF="SQLite/package-summary.html">SQLite</A></B></TD> @@ -114,10 +117,9 @@ SQLite.Database</A> class. Since June, 2002, it includes a small <A HREF="#jdbc_driver">JDBC driver</A>, which allows the most basic things to be carried out using the <TT>java.sql</TT> package. -Since September, 2004, SQLite3 (minimum 3.0.7) is supported which -is rather experimental. The JNI part can be generated to include support -for both SQLite 2.x and 3.x and detects at runtime the type of the -database. +Since September, 2004, SQLite3 (minimum 3.0.7) is supported. The JNI part can +be generated to include support for both SQLite 2.x and 3.x and detects at +runtime the type of the database. <P> The current source tarball can be downloaded from <A HREF="http://www.ch-werner.de/javasqlite/javasqlite-20110430.tar.gz"> @@ -261,9 +263,13 @@ databases with JDK >= 1.3 and the tool. <P> A JDBC based benchmark program is built into <TT>sqlite.jar</TT>. -It can be invoked by +If using a non OJEC version of Java it can be invoked by <PRE> - $ java -cp sqlite.jar SQLite.Benchmark ... + $ java -cp sqlite.jar SQLite.BenchmarkDriver ... +</PRE> +If using an OJEC version of Java it can be invoked by +<PRE> + $ java -cp sqlite.jar SQLite.BenchmarkDataSource ... </PRE> For further details see the usage information when invoked without arguments and consult the source code. @@ -343,12 +349,12 @@ MODIFICATIONS. <A HREF="#skip-navbar_bottom" title="Skip navigation links"></A> <TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY=""> <TR> -<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> +<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A NAME="navbar_bottom_firstrow"><!-- --></A> <TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY=""> <TR ALIGN="center" VALIGN="top"> <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Overview</B></FONT>&nbsp;</TD> - <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Package</FONT>&nbsp;</TD> + <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="SQLite/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD> <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD> <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD> </TR> @@ -364,7 +370,7 @@ MODIFICATIONS. &nbsp;PREV&nbsp; &nbsp;NEXT</FONT></TD> <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2"> - <A HREF="index.html" target="_top"><B>FRAMES</B></A> &nbsp; + <A HREF="index.html?overview-summary.html" target="_top"><B>FRAMES</B></A> &nbsp; &nbsp;<A HREF="overview-summary.html" target="_top"><B>NO FRAMES</B></A> &nbsp; &nbsp;<SCRIPT type="text/javascript"> <!-- @@ -377,6 +383,7 @@ MODIFICATIONS. <A HREF="allclasses-noframe.html"><B>All Classes</B></A> </NOSCRIPT> + </FONT></TD> </TR> </TABLE> diff --git a/lang/sql/jdbc/doc/overview-tree.html b/lang/sql/jdbc/doc/overview-tree.html index 8be1da68..96322e2f 100644 --- a/lang/sql/jdbc/doc/overview-tree.html +++ b/lang/sql/jdbc/doc/overview-tree.html @@ -2,24 +2,30 @@ <!--NewPage--> <HTML> <HEAD> -<!-- Generated by javadoc (build 1.4.2_03) on Sat Apr 30 14:01:26 CEST 2011 --> +<!-- Generated by javadoc (build 1.6.0_24) on Tue Aug 23 16:11:22 PDT 2011 --> <TITLE> Class Hierarchy (SQLite Java Wrapper) </TITLE> +<META NAME="date" CONTENT="2011-08-23"> <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style"> <SCRIPT type="text/javascript"> function windowTitle() { - parent.document.title="Class Hierarchy (SQLite Java Wrapper)"; + if (location.href.indexOf('is-external=true') == -1) { + parent.document.title="Class Hierarchy (SQLite Java Wrapper)"; + } } </SCRIPT> +<NOSCRIPT> +</NOSCRIPT> </HEAD> <BODY BGCOLOR="white" onload="windowTitle();"> +<HR> <!-- ========= START OF TOP NAVBAR ======= --> @@ -27,12 +33,12 @@ function windowTitle() <A HREF="#skip-navbar_top" title="Skip navigation links"></A> <TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY=""> <TR> -<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> +<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A NAME="navbar_top_firstrow"><!-- --></A> <TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY=""> <TR ALIGN="center" VALIGN="top"> <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD> - <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Package</FONT>&nbsp;</TD> + <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="SQLite/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD> <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD> <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Tree</B></FONT>&nbsp;</TD> </TR> @@ -48,7 +54,7 @@ function windowTitle() &nbsp;PREV&nbsp; &nbsp;NEXT</FONT></TD> <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2"> - <A HREF="index.html" target="_top"><B>FRAMES</B></A> &nbsp; + <A HREF="index.html?overview-tree.html" target="_top"><B>FRAMES</B></A> &nbsp; &nbsp;<A HREF="overview-tree.html" target="_top"><B>NO FRAMES</B></A> &nbsp; &nbsp;<SCRIPT type="text/javascript"> <!-- @@ -61,6 +67,7 @@ function windowTitle() <A HREF="allclasses-noframe.html"><B>All Classes</B></A> </NOSCRIPT> + </FONT></TD> </TR> </TABLE> @@ -79,24 +86,26 @@ Hierarchy For All Packages</H2> Class Hierarchy </H2> <UL> -<LI TYPE="circle">class java.lang.<A HREF="http://java.sun.com/javase/6/docs/api/java/lang/Object.html" title="class or interface in java.lang"><B>Object</B></A><UL> -<LI TYPE="circle">class SQLite.<A HREF="SQLite/Backup.html" title="class in SQLite"><B>Backup</B></A><LI TYPE="circle">class SQLite.<A HREF="SQLite/Blob.html" title="class in SQLite"><B>Blob</B></A><LI TYPE="circle">class SQLite.<A HREF="SQLite/Constants.html" title="class in SQLite"><B>Constants</B></A><LI TYPE="circle">class SQLite.<A HREF="SQLite/Database.html" title="class in SQLite"><B>Database</B></A><LI TYPE="circle">class SQLite.<A HREF="SQLite/FunctionContext.html" title="class in SQLite"><B>FunctionContext</B></A><LI TYPE="circle">class java.io.<A HREF="http://java.sun.com/javase/6/docs/api/java/io/InputStream.html" title="class or interface in java.io"><B>InputStream</B></A><UL> -<LI TYPE="circle">class SQLite.<A HREF="SQLite/BlobR.html" title="class in SQLite"><B>BlobR</B></A></UL> -<LI TYPE="circle">class java.io.<A HREF="http://java.sun.com/javase/6/docs/api/java/io/OutputStream.html" title="class or interface in java.io"><B>OutputStream</B></A><UL> -<LI TYPE="circle">class SQLite.<A HREF="SQLite/BlobW.html" title="class in SQLite"><B>BlobW</B></A></UL> -<LI TYPE="circle">class SQLite.<A HREF="SQLite/Stmt.html" title="class in SQLite"><B>Stmt</B></A><LI TYPE="circle">class SQLite.<A HREF="SQLite/StringEncoder.html" title="class in SQLite"><B>StringEncoder</B></A><LI TYPE="circle">class SQLite.<A HREF="SQLite/TableResult.html" title="class in SQLite"><B>TableResult</B></A> (implements SQLite.<A HREF="SQLite/Callback.html" title="interface in SQLite">Callback</A>) -<LI TYPE="circle">class java.lang.<A HREF="http://java.sun.com/javase/6/docs/api/java/lang/Throwable.html" title="class or interface in java.lang"><B>Throwable</B></A> (implements java.io.<A HREF="http://java.sun.com/javase/6/docs/api/java/io/Serializable.html" title="class or interface in java.io">Serializable</A>) +<LI TYPE="circle">java.lang.Object<UL> +<LI TYPE="circle">SQLite.<A HREF="SQLite/Backup.html" title="class in SQLite"><B>Backup</B></A><LI TYPE="circle">SQLite.<A HREF="SQLite/Blob.html" title="class in SQLite"><B>Blob</B></A><LI TYPE="circle">SQLite.<A HREF="SQLite/Constants.html" title="class in SQLite"><B>Constants</B></A><LI TYPE="circle">SQLite.<A HREF="SQLite/Database.html" title="class in SQLite"><B>Database</B></A><LI TYPE="circle">SQLite.<A HREF="SQLite/FunctionContext.html" title="class in SQLite"><B>FunctionContext</B></A><LI TYPE="circle">java.io.InputStream (implements java.io.Closeable) <UL> -<LI TYPE="circle">class java.lang.<A HREF="http://java.sun.com/javase/6/docs/api/java/lang/Exception.html" title="class or interface in java.lang"><B>Exception</B></A><UL> -<LI TYPE="circle">class SQLite.<A HREF="SQLite/Exception.html" title="class in SQLite"><B>Exception</B></A></UL> +<LI TYPE="circle">SQLite.<A HREF="SQLite/BlobR.html" title="class in SQLite"><B>BlobR</B></A></UL> +<LI TYPE="circle">java.io.OutputStream (implements java.io.Closeable, java.io.Flushable) +<UL> +<LI TYPE="circle">SQLite.<A HREF="SQLite/BlobW.html" title="class in SQLite"><B>BlobW</B></A></UL> +<LI TYPE="circle">SQLite.<A HREF="SQLite/Stmt.html" title="class in SQLite"><B>Stmt</B></A><LI TYPE="circle">SQLite.<A HREF="SQLite/StringEncoder.html" title="class in SQLite"><B>StringEncoder</B></A><LI TYPE="circle">SQLite.<A HREF="SQLite/TableResult.html" title="class in SQLite"><B>TableResult</B></A> (implements SQLite.<A HREF="SQLite/Callback.html" title="interface in SQLite">Callback</A>) +<LI TYPE="circle">java.lang.Throwable (implements java.io.Serializable) +<UL> +<LI TYPE="circle">java.lang.Exception<UL> +<LI TYPE="circle">SQLite.<A HREF="SQLite/Exception.html" title="class in SQLite"><B>Exception</B></A></UL> </UL> -<LI TYPE="circle">class SQLite.<A HREF="SQLite/Vm.html" title="class in SQLite"><B>Vm</B></A></UL> +<LI TYPE="circle">SQLite.<A HREF="SQLite/Vm.html" title="class in SQLite"><B>Vm</B></A></UL> </UL> <H2> Interface Hierarchy </H2> <UL> -<LI TYPE="circle">interface SQLite.<A HREF="SQLite/Authorizer.html" title="interface in SQLite"><B>Authorizer</B></A><LI TYPE="circle">interface SQLite.<A HREF="SQLite/BusyHandler.html" title="interface in SQLite"><B>BusyHandler</B></A><LI TYPE="circle">interface SQLite.<A HREF="SQLite/Callback.html" title="interface in SQLite"><B>Callback</B></A><LI TYPE="circle">interface SQLite.<A HREF="SQLite/Function.html" title="interface in SQLite"><B>Function</B></A><LI TYPE="circle">interface SQLite.<A HREF="SQLite/Profile.html" title="interface in SQLite"><B>Profile</B></A><LI TYPE="circle">interface SQLite.<A HREF="SQLite/ProgressHandler.html" title="interface in SQLite"><B>ProgressHandler</B></A><LI TYPE="circle">interface SQLite.<A HREF="SQLite/Trace.html" title="interface in SQLite"><B>Trace</B></A></UL> +<LI TYPE="circle">SQLite.<A HREF="SQLite/Authorizer.html" title="interface in SQLite"><B>Authorizer</B></A><LI TYPE="circle">SQLite.<A HREF="SQLite/BusyHandler.html" title="interface in SQLite"><B>BusyHandler</B></A><LI TYPE="circle">SQLite.<A HREF="SQLite/Callback.html" title="interface in SQLite"><B>Callback</B></A><LI TYPE="circle">SQLite.<A HREF="SQLite/Function.html" title="interface in SQLite"><B>Function</B></A><LI TYPE="circle">SQLite.<A HREF="SQLite/Profile.html" title="interface in SQLite"><B>Profile</B></A><LI TYPE="circle">SQLite.<A HREF="SQLite/ProgressHandler.html" title="interface in SQLite"><B>ProgressHandler</B></A><LI TYPE="circle">SQLite.<A HREF="SQLite/Trace.html" title="interface in SQLite"><B>Trace</B></A></UL> <HR> @@ -105,12 +114,12 @@ Interface Hierarchy <A HREF="#skip-navbar_bottom" title="Skip navigation links"></A> <TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY=""> <TR> -<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> +<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A NAME="navbar_bottom_firstrow"><!-- --></A> <TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY=""> <TR ALIGN="center" VALIGN="top"> <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD> - <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Package</FONT>&nbsp;</TD> + <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="SQLite/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD> <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD> <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Tree</B></FONT>&nbsp;</TD> </TR> @@ -126,7 +135,7 @@ Interface Hierarchy &nbsp;PREV&nbsp; &nbsp;NEXT</FONT></TD> <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2"> - <A HREF="index.html" target="_top"><B>FRAMES</B></A> &nbsp; + <A HREF="index.html?overview-tree.html" target="_top"><B>FRAMES</B></A> &nbsp; &nbsp;<A HREF="overview-tree.html" target="_top"><B>NO FRAMES</B></A> &nbsp; &nbsp;<SCRIPT type="text/javascript"> <!-- @@ -139,6 +148,7 @@ Interface Hierarchy <A HREF="allclasses-noframe.html"><B>All Classes</B></A> </NOSCRIPT> + </FONT></TD> </TR> </TABLE> diff --git a/lang/sql/jdbc/doc/overview.html b/lang/sql/jdbc/doc/overview.html index b0ed3cc9..f22bf1da 100644 --- a/lang/sql/jdbc/doc/overview.html +++ b/lang/sql/jdbc/doc/overview.html @@ -20,10 +20,9 @@ SQLite.Database</A> class. Since June, 2002, it includes a small <A HREF="#jdbc_driver">JDBC driver</A>, which allows the most basic things to be carried out using the <TT>java.sql</TT> package. -Since September, 2004, SQLite3 (minimum 3.0.7) is supported which -is rather experimental. The JNI part can be generated to include support -for both SQLite 2.x and 3.x and detects at runtime the type of the -database. +Since September, 2004, SQLite3 (minimum 3.0.7) is supported. The JNI part can +be generated to include support for both SQLite 2.x and 3.x and detects at +runtime the type of the database. <P> The current source tarball can be downloaded from <A HREF="http://www.ch-werner.de/javasqlite/javasqlite-20110430.tar.gz"> @@ -167,9 +166,13 @@ databases with JDK >= 1.3 and the tool. <P> A JDBC based benchmark program is built into <TT>sqlite.jar</TT>. -It can be invoked by +If using a non OJEC version of Java it can be invoked by <PRE> - $ java -cp sqlite.jar SQLite.Benchmark ... + $ java -cp sqlite.jar SQLite.BenchmarkDriver ... +</PRE> +If using an OJEC version of Java it can be invoked by +<PRE> + $ java -cp sqlite.jar SQLite.BenchmarkDataSource ... </PRE> For further details see the usage information when invoked without arguments and consult the source code. diff --git a/lang/sql/jdbc/doc/serialized-form.html b/lang/sql/jdbc/doc/serialized-form.html index 9ca3512b..512a6496 100644 --- a/lang/sql/jdbc/doc/serialized-form.html +++ b/lang/sql/jdbc/doc/serialized-form.html @@ -2,24 +2,30 @@ <!--NewPage--> <HTML> <HEAD> -<!-- Generated by javadoc (build 1.4.2_03) on Sat Apr 30 14:01:28 CEST 2011 --> +<!-- Generated by javadoc (build 1.6.0_24) on Tue Aug 23 16:11:22 PDT 2011 --> <TITLE> Serialized Form (SQLite Java Wrapper) </TITLE> +<META NAME="date" CONTENT="2011-08-23"> <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style"> <SCRIPT type="text/javascript"> function windowTitle() { - parent.document.title="Serialized Form (SQLite Java Wrapper)"; + if (location.href.indexOf('is-external=true') == -1) { + parent.document.title="Serialized Form (SQLite Java Wrapper)"; + } } </SCRIPT> +<NOSCRIPT> +</NOSCRIPT> </HEAD> <BODY BGCOLOR="white" onload="windowTitle();"> +<HR> <!-- ========= START OF TOP NAVBAR ======= --> @@ -27,12 +33,12 @@ function windowTitle() <A HREF="#skip-navbar_top" title="Skip navigation links"></A> <TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY=""> <TR> -<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> +<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A NAME="navbar_top_firstrow"><!-- --></A> <TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY=""> <TR ALIGN="center" VALIGN="top"> <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD> - <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Package</FONT>&nbsp;</TD> + <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="SQLite/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD> <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD> <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD> </TR> @@ -48,7 +54,7 @@ function windowTitle() &nbsp;PREV&nbsp; &nbsp;NEXT</FONT></TD> <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2"> - <A HREF="index.html" target="_top"><B>FRAMES</B></A> &nbsp; + <A HREF="index.html?serialized-form.html" target="_top"><B>FRAMES</B></A> &nbsp; &nbsp;<A HREF="serialized-form.html" target="_top"><B>NO FRAMES</B></A> &nbsp; &nbsp;<SCRIPT type="text/javascript"> <!-- @@ -61,6 +67,7 @@ function windowTitle() <A HREF="allclasses-noframe.html"><B>All Classes</B></A> </NOSCRIPT> + </FONT></TD> </TR> </TABLE> @@ -72,11 +79,21 @@ function windowTitle() <H1> Serialized Form</H1> </CENTER> +<HR SIZE="4" NOSHADE> + +<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY=""> +<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor"> +<TH ALIGN="center"><FONT SIZE="+2"> +<B>Package</B> <B>SQLite</B></FONT></TH> +</TR> +</TABLE> + +<P> <A NAME="SQLite.Exception"><!-- --></A> <TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY=""> <TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor"> -<TD COLSPAN=2><FONT SIZE="+2"> -<B>Class <A HREF="SQLite/Exception.html" title="class in SQLite">SQLite.Exception</A> extends <A HREF="http://java.sun.com/javase/6/docs/api/java/lang/Exception.html" title="class or interface in java.lang">Exception</A> implements Serializable</B></FONT></TD> +<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2"> +<B>Class <A HREF="SQLite/Exception.html" title="class in SQLite">SQLite.Exception</A> extends java.lang.Exception implements Serializable</B></FONT></TH> </TR> </TABLE> @@ -91,12 +108,12 @@ Serialized Form</H1> <A HREF="#skip-navbar_bottom" title="Skip navigation links"></A> <TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY=""> <TR> -<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> +<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A NAME="navbar_bottom_firstrow"><!-- --></A> <TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY=""> <TR ALIGN="center" VALIGN="top"> <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD> - <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Package</FONT>&nbsp;</TD> + <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="SQLite/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD> <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD> <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD> </TR> @@ -112,7 +129,7 @@ Serialized Form</H1> &nbsp;PREV&nbsp; &nbsp;NEXT</FONT></TD> <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2"> - <A HREF="index.html" target="_top"><B>FRAMES</B></A> &nbsp; + <A HREF="index.html?serialized-form.html" target="_top"><B>FRAMES</B></A> &nbsp; &nbsp;<A HREF="serialized-form.html" target="_top"><B>NO FRAMES</B></A> &nbsp; &nbsp;<SCRIPT type="text/javascript"> <!-- @@ -125,6 +142,7 @@ Serialized Form</H1> <A HREF="allclasses-noframe.html"><B>All Classes</B></A> </NOSCRIPT> + </FONT></TD> </TR> </TABLE> diff --git a/lang/sql/jdbc/doc/stylesheet.css b/lang/sql/jdbc/doc/stylesheet.css index 6d31fdbc..6ea9e516 100644 --- a/lang/sql/jdbc/doc/stylesheet.css +++ b/lang/sql/jdbc/doc/stylesheet.css @@ -3,27 +3,27 @@ /* Define colors, fonts and other style attributes here to override the defaults */ /* Page background color */ -body { background-color: #FFFFFF } +body { background-color: #FFFFFF; color:#000000 } /* Headings */ h1 { font-size: 145% } /* Table colors */ -.TableHeadingColor { background: #CCCCFF } /* Dark mauve */ -.TableSubHeadingColor { background: #EEEEFF } /* Light mauve */ -.TableRowColor { background: #FFFFFF } /* White */ +.TableHeadingColor { background: #CCCCFF; color:#000000 } /* Dark mauve */ +.TableSubHeadingColor { background: #EEEEFF; color:#000000 } /* Light mauve */ +.TableRowColor { background: #FFFFFF; color:#000000 } /* White */ /* Font used in left-hand frame lists */ -.FrameTitleFont { font-size: 100%; font-family: Helvetica, Arial, sans-serif } -.FrameHeadingFont { font-size: 90%; font-family: Helvetica, Arial, sans-serif } -.FrameItemFont { font-size: 90%; font-family: Helvetica, Arial, sans-serif } +.FrameTitleFont { font-size: 100%; font-family: Helvetica, Arial, sans-serif; color:#000000 } +.FrameHeadingFont { font-size: 90%; font-family: Helvetica, Arial, sans-serif; color:#000000 } +.FrameItemFont { font-size: 90%; font-family: Helvetica, Arial, sans-serif; color:#000000 } /* Navigation bar fonts and colors */ -.NavBarCell1 { background-color:#EEEEFF;} /* Light mauve */ -.NavBarCell1Rev { background-color:#00008B;} /* Dark Blue */ -.NavBarFont1 { font-family: Arial, Helvetica, sans-serif; color:#000000;} -.NavBarFont1Rev { font-family: Arial, Helvetica, sans-serif; color:#FFFFFF;} +.NavBarCell1 { background-color:#EEEEFF; color:#000000} /* Light mauve */ +.NavBarCell1Rev { background-color:#00008B; color:#FFFFFF} /* Dark Blue */ +.NavBarFont1 { font-family: Arial, Helvetica, sans-serif; color:#000000;color:#000000;} +.NavBarFont1Rev { font-family: Arial, Helvetica, sans-serif; color:#FFFFFF;color:#FFFFFF;} -.NavBarCell2 { font-family: Arial, Helvetica, sans-serif; background-color:#FFFFFF;} -.NavBarCell3 { font-family: Arial, Helvetica, sans-serif; background-color:#FFFFFF;} +.NavBarCell2 { font-family: Arial, Helvetica, sans-serif; background-color:#FFFFFF; color:#000000} +.NavBarCell3 { font-family: Arial, Helvetica, sans-serif; background-color:#FFFFFF; color:#000000} diff --git a/lang/sql/jdbc/libtool b/lang/sql/jdbc/libtool index d28fb8cf..be809460 100644 --- a/lang/sql/jdbc/libtool +++ b/lang/sql/jdbc/libtool @@ -38,7 +38,7 @@ if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi # ### BEGIN LIBTOOL CONFIG -# Libtool was configured on host fl18server.nodomain: +# Libtool was configured on host adc2190113: # Shell to use when invoking shell scripts. SHELL="/bin/sh" @@ -57,7 +57,7 @@ fast_install=yes # The host system. host_alias= -host=i686-pc-linux-gnu +host=x86_64-unknown-linux-gnu # An echo program that does not interpret backslashes. echo="echo" @@ -147,7 +147,7 @@ dlopen_self_static=unknown link_static_flag="-static" # Compiler flag to turn off builtin functions. -no_builtin_flag=" -fno-builtin -fno-rtti -fno-exceptions" +no_builtin_flag=" -fno-builtin" # Compiler flag to allow reflexive dlopens. export_dynamic_flag_spec="\${wl}--export-dynamic" @@ -262,10 +262,10 @@ variables_saved_for_relink="PATH LD_LIBRARY_PATH LD_RUN_PATH GCC_EXEC_PREFIX COM link_all_deplibs=unknown # Compile-time system search path for libraries -sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" +sys_lib_search_path_spec="/lib64 /usr/lib64 /usr/local/lib64" # Run-time system search path for libraries -sys_lib_dlsearch_path_spec="/lib /usr/lib" +sys_lib_dlsearch_path_spec="/lib64 /usr/lib64" # Fix the shell variable $srcfile for the compiler. fix_srcfile_path="" diff --git a/lang/sql/sqlite/ext/bfile/examples/bfile_example_sql.c b/lang/sql/sqlite/ext/bfile/examples/bfile_example_sql.c index 9246505a..70ecaf44 100644 --- a/lang/sql/sqlite/ext/bfile/examples/bfile_example_sql.c +++ b/lang/sql/sqlite/ext/bfile/examples/bfile_example_sql.c @@ -13,6 +13,8 @@ #include <sqlite3.h> #include <bfile.h> +typedef sqlite3_int64 bfile_handle; + int exec(sqlite3 *db, char *sql) { int rc; @@ -63,7 +65,8 @@ static int query_bfile(sqlite3* db) { sqlite3_stmt *pStmt, *pBfileStmt; char *photo; off_t offset; - int row, id, bHdl, len, i; + int row, id, len, i; + bfile_handle bHdl; const char *sql_bfile_open = "SELECT id, BFILE_OPEN(photo) FROM test_bfile;"; const char *sql_bfile_read = "SELECT BFILE_READ(?, ?, ?);"; @@ -85,7 +88,7 @@ static int query_bfile(sqlite3* db) { printf("-------------row%d------------\n", ++row); id = sqlite3_column_int(pStmt, 0); - bHdl = sqlite3_column_int(pStmt, 1); + bHdl = sqlite3_column_int64(pStmt, 1); printf("id:\n%d\nphoto:\n", id); @@ -101,7 +104,7 @@ static int query_bfile(sqlite3* db) { cleanup_if_error(rc2, cleanup_read); while (1) { - rc2 = sqlite3_bind_int(pBfileStmt, 1, bHdl); + rc2 = sqlite3_bind_int64(pBfileStmt, 1, bHdl); cleanup_if_error(rc2, cleanup_read); rc2 = sqlite3_bind_int(pBfileStmt, 2, amount); @@ -145,7 +148,7 @@ cleanup_read: rc2 = sqlite3_prepare(db, sql_bfile_close, -1, &pBfileStmt, 0); cleanup_if_error(rc2, cleanup_close); - rc2 = sqlite3_bind_int(pBfileStmt, 1, bHdl); + rc2 = sqlite3_bind_int64(pBfileStmt, 1, bHdl); cleanup_if_error(rc2, cleanup_close); rc2 = sqlite3_step(pBfileStmt); diff --git a/lang/sql/sqlite/ext/bfile/src/bfile.c b/lang/sql/sqlite/ext/bfile/src/bfile.c index 545e5ef7..7b1848a3 100644 --- a/lang/sql/sqlite/ext/bfile/src/bfile.c +++ b/lang/sql/sqlite/ext/bfile/src/bfile.c @@ -716,7 +716,7 @@ static void BFileOpenFunc( memset(pHdl, 0, sizeof(BfileHdl)); pHdl->full_path = full_path; pHdl->fd = fd; - sqlite3_result_int(context, (int)pHdl); + sqlite3_result_int64(context, (sqlite3_int64)pHdl); return; err: @@ -747,7 +747,7 @@ static void BFileCloseFunc( assert(context != NULL && argc == 1 && argv != NULL); - pHdl = (BfileHdl*)sqlite3_value_int(argv[0]); + pHdl = (BfileHdl*)sqlite3_value_int64(argv[0]); if (pHdl != NULL) { if (pHdl->fd >= 0) close(pHdl->fd); @@ -797,7 +797,7 @@ static void BFileReadFunc( assert(context != NULL && argc == 3 && argv != NULL); - pHdl = (BfileHdl*)sqlite3_value_int(argv[0]); + pHdl = (BfileHdl*)sqlite3_value_int64(argv[0]); if (pHdl == NULL || pHdl->full_path == NULL || pHdl->fd < 0) { sqlite3_result_error(context, "invalid bfile handle", -1); return; @@ -855,7 +855,8 @@ static void BFileSizeFunc( { int rc; sqlite3 *db; - int loc_size, size; + int loc_size; + off_t size; char *pLoc, *full_path; assert(context != NULL && argc == 1 && argv != NULL); @@ -883,7 +884,7 @@ static void BFileSizeFunc( /* check existence, if not exits at at set size as -1 */ if (access(full_path, F_OK)) sqlite3_result_int(context, -1); - else if (__bfile_get_size(full_path, (off_t*)&size) == SQLITE_OK) + else if (__bfile_get_size(full_path, &size) == SQLITE_OK) sqlite3_result_int(context, size); else sqlite3_result_error(context, "internal error", -1); diff --git a/lang/sql/sqlite/ext/bfile/test/bfile_test_sql.c b/lang/sql/sqlite/ext/bfile/test/bfile_test_sql.c index 31092c6d..6b7af5f1 100644 --- a/lang/sql/sqlite/ext/bfile/test/bfile_test_sql.c +++ b/lang/sql/sqlite/ext/bfile/test/bfile_test_sql.c @@ -19,6 +19,8 @@ #include <sqlite3.h> #include <bfile.h> +typedef sqlite3_int64 bfile_handle; + #define CHECK_ERR \ if (rc != SQLITE_OK) { \ printf(" SQL error: %s\n", zErrMsg); \ @@ -163,7 +165,8 @@ static void test_BfileSize(sqlite3* db) { } static void test_BfileOpenReadClose(sqlite3* db) { - int rc, rc2, rc3, len, row, bHdl; + int rc, rc2, rc3, len, row; + bfile_handle bHdl; sqlite3_stmt *pStmt, *pBfileStmt; off_t amount, offset; char *sql[] = {"SELECT BFILE_OPEN(photo) FROM address_book", @@ -191,7 +194,7 @@ static void test_BfileOpenReadClose(sqlite3* db) { row++; printf("-----------------row %d--------------------", row); - bHdl = sqlite3_column_int(pStmt, 0); + bHdl = sqlite3_column_int64(pStmt, 0); if ((void*)bHdl == NULL) { printf("\t[OK]\n"); continue; @@ -208,7 +211,7 @@ static void test_BfileOpenReadClose(sqlite3* db) { } while (1) { - rc2 = sqlite3_bind_int(pBfileStmt, 1, bHdl); + rc2 = sqlite3_bind_int64(pBfileStmt, 1, bHdl); if (rc2) { printf("\t[Failed]\tBFILE_READ: bind error\n"); break; @@ -262,7 +265,7 @@ static void test_BfileOpenReadClose(sqlite3* db) { continue; } - rc2 = sqlite3_bind_int(pBfileStmt, 1, bHdl); + rc2 = sqlite3_bind_int64(pBfileStmt, 1, bHdl); if (rc2) printf("\t[Failed]\tBFILE_CLOSE: bind error\n"); else { diff --git a/src/btree/bt_verify.c b/src/btree/bt_verify.c index b1cc9a36..9de94cd0 100644 --- a/src/btree/bt_verify.c +++ b/src/btree/bt_verify.c @@ -914,9 +914,12 @@ __bam_vrfy_itemorder(dbp, vdp, ip, h, pgno, nentries, ovflok, hasdups, flags) BKEYDATA *bk; BOVERFLOW *bo; BTREE *bt; + DB_MPOOLFILE *mpf; DBC *dbc; DBT dbta, dbtb, dup_1, dup_2, *p1, *p2, *tmp; ENV *env; + PAGE *child; + db_pgno_t cpgno; VRFY_PAGEINFO *pip; db_indx_t i, *inp; int adj, cmp, freedup_1, freedup_2, isbad, ret, t_ret; @@ -957,7 +960,38 @@ __bam_vrfy_itemorder(dbp, vdp, ip, h, pgno, nentries, ovflok, hasdups, flags) func = __bam_defcmp; if (dbp->bt_internal != NULL) { bt = (BTREE *)dbp->bt_internal; - if (bt->bt_compare != NULL) + if (TYPE(h) == P_IBTREE && (bt->bt_compare != NULL || + dupfunc != __bam_defcmp)) { + /* + * The problem here is that we cannot + * tell the difference between an off + * page duplicate internal page and + * a main database internal page. + * Walk down the tree to figure it out. + */ + mpf = dbp->mpf; + child = h; + while (TYPE(child) == P_IBTREE) { + bi = GET_BINTERNAL(dbp, child, 0); + cpgno = bi->pgno; + if (child != h && + (ret = __memp_fput(mpf, + vdp->thread_info, child, + DB_PRIORITY_UNCHANGED)) != 0) + goto err; + if ((ret = __memp_fget(mpf, + &cpgno, vdp->thread_info, + NULL, 0, &child)) != 0) + goto err; + } + if (TYPE(child) == P_LDUP) + func = dupfunc; + else if (bt->bt_compare != NULL) + func = bt->bt_compare; + if ((ret = __memp_fput(mpf, vdp->thread_info, + child, DB_PRIORITY_UNCHANGED)) != 0) + goto err; + } else if (bt->bt_compare != NULL) func = bt->bt_compare; } } diff --git a/src/db/db_cam.c b/src/db/db_cam.c index 76b0c6ee..7f7d59df 100644 --- a/src/db/db_cam.c +++ b/src/db/db_cam.c @@ -2670,6 +2670,7 @@ retry: /* Step 1. */ F_SET(pdbc, DBC_TRANSIENT); SET_RET_MEM(pdbc, dbc); ret = __dbc_get(pdbc, pkey, data, DB_SET); + DB_ASSERT(pdbp->env, ret != DB_PAGE_NOTFOUND); /* * If the item wasn't found in the primary, this is a bug; our diff --git a/src/db/db_overflow.c b/src/db/db_overflow.c index fb83c938..6052e180 100644 --- a/src/db/db_overflow.c +++ b/src/db/db_overflow.c @@ -603,7 +603,7 @@ __db_coff(dbc, dbt, match, cmpfunc, cmpp) PAGE *dbt_pagep, *match_pagep; db_pgno_t dbt_pgno, match_pgno; u_int32_t cmp_bytes, dbt_bufsz, dbt_len, match_bufsz; - u_int32_t match_len, max_data, page_sz; + u_int32_t match_len, max_data, page_space; u_int8_t *p1, *p2; int ret; void *dbt_buf, *match_buf; @@ -612,7 +612,7 @@ __db_coff(dbc, dbt, match, cmpfunc, cmpp) ip = dbc->thread_info; txn = dbc->txn; mpf = dbp->mpf; - page_sz = dbp->pgsize; + page_space = P_MAXSPACE(dbp, dbp->pgsize); *cmpp = 0; dbt_buf = match_buf = NULL; @@ -664,7 +664,7 @@ err1: if (dbt_buf != NULL) mpf, ip, dbt_pagep, DB_PRIORITY_UNCHANGED); return (ret); } - cmp_bytes = page_sz < max_data ? page_sz : max_data; + cmp_bytes = page_space < max_data ? page_space : max_data; for (p1 = (u_int8_t *)dbt_pagep + P_OVERHEAD(dbp), p2 = (u_int8_t *)match_pagep + P_OVERHEAD(dbp); cmp_bytes-- > 0; ++p1, ++p2) @@ -675,7 +675,7 @@ err1: if (dbt_buf != NULL) dbt_pgno = NEXT_PGNO(dbt_pagep); match_pgno = NEXT_PGNO(match_pagep); - max_data -= page_sz; + max_data -= page_space; if ((ret = __memp_fput(mpf, ip, dbt_pagep, DB_PRIORITY_UNCHANGED)) != 0) { (void)__memp_fput(mpf, diff --git a/src/db/db_pr.c b/src/db/db_pr.c index 3add6a92..891f2582 100644 --- a/src/db/db_pr.c +++ b/src/db/db_pr.c @@ -765,7 +765,7 @@ __db_prpage_int(env, mbp, dbp, lead, h, pagesize, data, flags) case P_HEAPMETA: return (__db_heapmeta(env, dbp, (HEAPMETA *)h, flags)); case P_IHEAP: - if (!LF_ISSET(DB_PR_PAGE)) + if (!LF_ISSET(DB_PR_PAGE) || dbp == NULL) return (0); return (__db_heapint(dbp, (HEAPPG *)h, flags)); default: diff --git a/src/dbinc/rep.h b/src/dbinc/rep.h index d6750872..03baa87f 100644 --- a/src/dbinc/rep.h +++ b/src/dbinc/rep.h @@ -389,6 +389,7 @@ typedef struct __rep { /* SHARED */ u_int site_max; /* Total array slots allocated. */ int self_eid; /* Where to find the local site. */ u_int siteinfo_seq; /* Number of updates to this info. */ + u_int32_t min_log_file; /* Earliest log needed by repgroup. */ pid_t listener; diff --git a/src/env/env_alloc.c b/src/env/env_alloc.c index 4749e844..d91bd4b7 100644 --- a/src/env/env_alloc.c +++ b/src/env/env_alloc.c @@ -630,6 +630,8 @@ __env_region_extend(env, infop) rp->alloc = rp->max - rp->size; rp->size += rp->alloc; rp->size = (size_t)ALIGNP_INC(rp->size, sizeof(size_t)); + if (rp->max - rp->size <= SHALLOC_FRAGMENT) + rp->size = rp->max; if (infop->fhp && (ret = __db_file_extend(env, infop->fhp, rp->size)) != 0) return (ret); diff --git a/src/hash/hash_meta.c b/src/hash/hash_meta.c index 0996dddf..653c9f74 100644 --- a/src/hash/hash_meta.c +++ b/src/hash/hash_meta.c @@ -90,7 +90,9 @@ __ham_release_meta(dbc) hcp->hdr = NULL; } - return (__TLPUT(dbc, hcp->hlock)); + ret = __TLPUT(dbc, hcp->hlock); + hcp->hlock.mode = DB_LOCK_NG; + return (ret); } /* diff --git a/src/heap/heap.c b/src/heap/heap.c index 3d70bf40..801cc481 100644 --- a/src/heap/heap.c +++ b/src/heap/heap.c @@ -264,7 +264,8 @@ start: if (STD_LOCKING(dbc) && (ret = __db_lget(dbc, cp->pgno - region_pgno - 1, spacebits); } -err: if (rpage != NULL && (t_ret = __memp_fput(mpf, +err: DB_ASSERT(dbp->env, ret != DB_PAGE_NOTFOUND); + if (rpage != NULL && (t_ret = __memp_fput(mpf, dbc->thread_info, rpage, dbc->priority)) != 0 && ret == 0) ret = t_ret; rpage = NULL; @@ -801,6 +802,7 @@ err: if (ret == 0 ) { if (LOCK_ISSET(cp->lock)) (void)__LPUT(dbc, cp->lock); } + DB_ASSERT(dbp->env, ret != DB_PAGE_NOTFOUND); return (ret); } @@ -1158,7 +1160,8 @@ next_pg: if (next_rid.pgno != PGNO_INVALID) { DISCARD(dbc, cp->page, cp->lock, 1, ret); } -err: if (buf != NULL) +err: DB_ASSERT(dbp->env, ret != DB_PAGE_NOTFOUND); + if (buf != NULL) __os_free(dbp->env, buf); return (ret); } @@ -1379,7 +1382,8 @@ next_pg: if (next_rid.pgno != PGNO_INVALID) { DISCARD(dbc, cp->page, cp->lock, 1, ret); } -err: return (ret); +err: DB_ASSERT(dbp->env, ret != DB_PAGE_NOTFOUND); + return (ret); } /* @@ -1421,6 +1425,7 @@ __heapc_put(dbc, key, data, flags, pgnop) ret = __heapc_get(dbc, key, data, DB_SET, pgnop); F_CLR(key, DB_DBT_ISSET); dbc->flags = old_flags; + DB_ASSERT(dbp->env, ret != DB_PAGE_NOTFOUND); if (ret != 0) return (ret); else if (flags == DB_NOOVERWRITE) @@ -1580,7 +1585,8 @@ __heapc_put(dbc, key, data, flags, pgnop) HEAP_SETSPACE(dbp, rpage, cp->pgno - region_pgno - 1, space); } -err: if (rpage != NULL && (t_ret = __memp_fput(mpf, +err: DB_ASSERT(dbp->env, ret != DB_PAGE_NOTFOUND); + if (rpage != NULL && (t_ret = __memp_fput(mpf, dbc->thread_info, rpage, dbc->priority)) != 0 && ret == 0) ret = t_ret; if (F_ISSET(data, DB_DBT_PARTIAL)) @@ -1795,23 +1801,50 @@ next: region_pgno += HEAP_REGION_SIZE(dbp) + 1; meta_pgno = PGNO_BASE_MD; if ((ret = __db_lget(dbc, LCK_ALWAYS, meta_pgno, DB_LOCK_WRITE, DB_LOCK_NOWAIT, &meta_lock)) != 0) { - if (ret != DB_LOCK_NOTGRANTED) - goto err; /* * We don't want to block while having latched * a page off the end of file. This could * get truncated by another thread and we * will deadlock. */ - DISCARD(dbc, cp->page, cp->lock, 0, ret); - if (ret != 0) - goto err; + p = cp->page != NULL; + DISCARD(dbc, cp->page, cp->lock, 0, t_ret); + if (t_ret != 0 || + (ret != DB_LOCK_NOTGRANTED && + ret != DB_LOCK_DEADLOCK)) + goto pg_err; if ((ret = __db_lget(dbc, LCK_ALWAYS, meta_pgno, DB_LOCK_WRITE, 0, &meta_lock)) != 0) - goto err; - ACQUIRE_CUR(dbc, DB_LOCK_WRITE, data_pgno, 0, 0, ret); - if (ret != 0) + goto pg_err; + ACQUIRE_CUR(dbc, DB_LOCK_WRITE, + data_pgno, 0, DB_MPOOL_CREATE, ret); + /* + * We can race, having read this page when it was + * less than last_pgno but now an aborted + * allocation can make this page beyond last_pgno + * so we must free it. If we can't get the + * lock on the page again, then some other + * thread will handle the issue. + */ + if (ret != 0) { +pg_err: if (p != 0) { + ACQUIRE_CUR(dbc, DB_LOCK_WRITE, + data_pgno, 0, 0, t_ret); + if (t_ret == 0 && + PGNO(cp->page) == PGNO_INVALID) { + (void)__memp_fput(mpf, + dbc->thread_info, + cp->page, dbc->priority); + (void)__memp_fget(mpf, + &data_pgno, + dbc->thread_info, dbc->txn, + DB_MPOOL_FREE, &cp->page); + } + (void)__LPUT(dbc, cp->lock); + } + (void)__LPUT(dbc, meta_lock); goto err; + } /* Check if we lost a race. */ if (PGNO(cp->page) != PGNO_INVALID) { if ((ret = __LPUT(dbc, meta_lock)) != 0) @@ -1845,7 +1878,7 @@ next: region_pgno += HEAP_REGION_SIZE(dbp) + 1; ret = t_ret; meta = NULL; if (ret != 0) - goto err; + goto meta_unlock; /* If the page doesn't actually exist we need to create it. */ if (cp->pgno == PGNO_INVALID) { @@ -1853,13 +1886,13 @@ next: region_pgno += HEAP_REGION_SIZE(dbp) + 1; if ((ret = __memp_fget(mpf, &cp->pgno, dbc->thread_info, dbc->txn, DB_MPOOL_CREATE | DB_MPOOL_DIRTY, &cp->page)) != 0) - goto err; + goto meta_unlock; DB_ASSERT(dbp->env, cp->pgno == data_pgno); } else if ((ret = __memp_dirty(mpf, &cp->page, dbc->thread_info, dbc->txn, dbc->priority, 0)) != 0) { /* Did not read the page, so we can release the lock. */ DISCARD(dbc, cp->page, cp->lock, 0, t_ret); - goto err; + goto meta_unlock; } /* Now that we have the page we initialize it and we're done. */ @@ -1867,7 +1900,7 @@ next: region_pgno += HEAP_REGION_SIZE(dbp) + 1; dbp->pgsize, cp->pgno, P_INVALID, P_INVALID, 0, P_HEAP); LSN(cp->page) = meta_lsn; - if ((t_ret = __TLPUT(dbc, meta_lock)) != 0 && ret == 0) +meta_unlock: if ((t_ret = __TLPUT(dbc, meta_lock)) != 0 && ret == 0) ret = t_ret; if (ret != 0) goto err; @@ -1893,7 +1926,8 @@ check: if (size + sizeof(db_indx_t) > HEAP_FREESPACE(dbp, cp->page)) { } h->curpgindx = data_pgno - region_pgno - 1; -err: if (rpage != NULL && (t_ret = __memp_fput(mpf, +err: DB_ASSERT(dbp->env, ret != DB_PAGE_NOTFOUND); + if (rpage != NULL && (t_ret = __memp_fput(mpf, dbc->thread_info, rpage, dbc->priority)) != 0 && ret == 0) ret = t_ret; @@ -1985,7 +2019,8 @@ __heap_append(dbc, key, data) HEAP_SETSPACE(dbp, rpage, cp->pgno - region_pgno - 1, space); } -err: if (rpage != NULL && (t_ret = __memp_fput(mpf, +err: DB_ASSERT(dbp->env, ret != DB_PAGE_NOTFOUND); + if (rpage != NULL && (t_ret = __memp_fput(mpf, dbc->thread_info, rpage, dbc->priority)) != 0 && ret == 0) ret = t_ret; @@ -2199,6 +2234,7 @@ err: if (rpage != NULL && (t_ret = __memp_fput(mpf, if (ret == 0 && key != NULL) ret = __db_retcopy(dbp->env, key, &rid, DB_HEAP_RID_SZ, &dbc->rkey->data, &dbc->rkey->ulen); + DB_ASSERT(dbp->env, ret != DB_PAGE_NOTFOUND); return (ret); } @@ -2494,13 +2530,18 @@ skip_alloc: if (F_ISSET((HEAPHDR *)hdr, HEAP_RECLAST) && !F_ISSET(dbt, DB_DBT_PARTIAL) && (hdr->std_hdr.size != needed)) { + __db_errx(env, DB_STR_A("1168", + "Incorrect record size in header: %s: rid %lu.%lu", + "%s %lu %lu"), dbc->dbp->fname, + (u_long)(cp->pgno), (u_long)(cp->indx)); ret = __env_panic(env, DB_RUNRECOVERY); goto err; } } } -err: if (putpage && dpage != NULL && (t_ret = __memp_fput(mpf, +err: DB_ASSERT(dbp->env, ret != DB_PAGE_NOTFOUND); + if (putpage && dpage != NULL && (t_ret = __memp_fput(mpf, dbc->thread_info, dpage, dbp->priority)) != 0 && ret == 0) ret = t_ret; if ((t_ret = __TLPUT(dbc, data_lock)) != 0 && ret == 0) diff --git a/src/heap/heap_rec.c b/src/heap/heap_rec.c index 012a834c..30132a1a 100644 --- a/src/heap/heap_rec.c +++ b/src/heap/heap_rec.c @@ -196,16 +196,16 @@ __heap_pg_alloc_recover(env, dbtp, lsnp, op, info) argp->pgno, PGNO_INVALID, PGNO_INVALID, 0, argp->ptype); LSN(pagep) = *lsnp; } else if ((cmp_n == 0 || IS_ZERO_LSN(LSN(pagep))) && DB_UNDO(op)) { - if (argp->pgno > meta->dbmeta.last_pgno) { - if (argp->pgno == file_dbp->mpf->mfp->last_pgno) - trunc = 1; - } else if (!IS_ZERO_LSN(LSN(pagep))){ + if (argp->pgno == file_dbp->mpf->mfp->last_pgno) + trunc = 1; + else if (!IS_ZERO_LSN(LSN(pagep))) { REC_DIRTY(mpf, ip, file_dbp->priority, &pagep); memset(pagep, 0, file_dbp->pgsize); } } /* If the page is newly allocated and aborted, give it back. */ - if (pagep != NULL && trunc == 1) { + if (pagep != NULL && (trunc == 1 || + (IS_ZERO_LSN(LSN(pagep)) && TYPE(pagep) != P_IHEAP))) { if ((ret = __memp_fput(mpf, ip, pagep, file_dbp->priority)) != 0) goto out; @@ -213,6 +213,18 @@ __heap_pg_alloc_recover(env, dbtp, lsnp, op, info) if ((ret = __memp_fget(mpf, &argp->pgno, ip, NULL, DB_MPOOL_FREE, &pagep)) != 0) goto out; + if (trunc == 0 && argp->pgno <= mpf->mfp->last_flushed_pgno) { + /* + * If this page is on disk we need to zero it. + * This is safe since we never free pages other + * than backing out an allocation, so there can + * not be a previous allocate and free of this + * page that is reflected on disk. + */ + if ((ret = __db_zero_extend(env, mpf->fhp, + argp->pgno, argp->pgno, file_dbp->pgsize)) != 0) + goto out; + } } /* * Keep the region high_pgno up to date This not logged so we diff --git a/src/heap/heap_verify.c b/src/heap/heap_verify.c index d33a4e76..fefecd76 100644 --- a/src/heap/heap_verify.c +++ b/src/heap/heap_verify.c @@ -249,7 +249,8 @@ __heap_vrfy_structure(dbp, vdp, flags) /* * Not much structure to verify. Just make sure region pages are where - * they're supposed to be. + * they're supposed to be. If we don't have FTRUNCATE, there could be + * a zero'd out page where the region page is supposed to be. */ next_region = FIRST_HEAP_RPAGE; high_pgno = 0; @@ -267,7 +268,11 @@ __heap_vrfy_structure(dbp, vdp, flags) "Page %lu: heap database page of incorrect type %lu", "%lu %lu"), (u_long)i, (u_long)pip->type)); isbad = 1; - } else if (i == next_region && pip->type != P_IHEAP) { + } else if (i == next_region && pip->type != P_IHEAP +#ifndef HAVE_FTRUNCATE + && pip->type != P_INVALID +#endif + ) { EPRINT((dbp->env, DB_STR_A("1164", "Page %lu: heap database missing region page (page type %lu)", "%lu %lu"), (u_long)i, (u_long)pip->type)); diff --git a/src/mp/mp_alloc.c b/src/mp/mp_alloc.c index e3441986..b1676305 100644 --- a/src/mp/mp_alloc.c +++ b/src/mp/mp_alloc.c @@ -39,16 +39,16 @@ __memp_alloc(dbmp, infop, mfp, len, offsetp, retp) { BH *bhp, *current_bhp, *mvcc_bhp, *oldest_bhp; BH_FROZEN_PAGE *frozen_bhp; - DB_LSN vlsn; + DB_LSN oldest_reader, vlsn; DB_MPOOL_HASH *dbht, *hp, *hp_end, *hp_saved, *hp_tmp; ENV *env; MPOOL *c_mp; MPOOLFILE *bh_mfp; size_t freed_space; u_int32_t buckets, bucket_priority, buffers, cache_reduction; - u_int32_t high_priority, priority; + u_int32_t dirty_eviction, high_priority, priority; u_int32_t priority_saved, put_counter, lru_generation, total_buckets; - int aggressive, alloc_freeze, b_lock, giveup, got_oldest; + int aggressive, alloc_freeze, b_lock, giveup; int h_locked, need_free, obsolete, ret, write_error; u_int8_t *endp; void *p; @@ -62,7 +62,7 @@ __memp_alloc(dbmp, infop, mfp, len, offsetp, retp) write_error = 0; buckets = buffers = put_counter = total_buckets = 0; - aggressive = alloc_freeze = giveup = got_oldest = h_locked = 0; + aggressive = alloc_freeze = giveup = h_locked = 0; /* * If we're allocating a buffer, and the one we're discarding is the @@ -158,6 +158,7 @@ search: lru_generation = c_mp->lru_generation; ret = 0; + MAX_LSN(oldest_reader); /* * We re-attempt the allocation every time we've freed 3 times what @@ -348,16 +349,28 @@ retry_search: bhp = NULL; /* * oldest_bhp is the last buffer on the MVCC chain, and * an obsolete buffer at the end of the MVCC chain gets - * used without further search. - * - * If the buffer isn't obsolete with respect to the - * cached old reader LSN, recalculate the oldest reader - * LSN and check again. + * used without further search. Before checking for + * obsolescence, update the cached oldest reader LSN in + * the bucket if it is older than oldest_reader. */ if (BH_REFCOUNT(oldest_bhp) != 0) continue; -retry_obsolete: if (BH_OBSOLETE(oldest_bhp, hp->old_reader, vlsn)) { + if (LOG_COMPARE(&oldest_reader, &hp->old_reader) > 0) { + if (IS_MAX_LSN(oldest_reader) && + (ret = __txn_oldest_reader( + env, &oldest_reader)) != 0) { + MUTEX_UNLOCK(env, hp->mtx_hash); + if (bhp != NULL) + atomic_dec(env, &bhp->ref); + return (ret); + } + if (LOG_COMPARE(&oldest_reader, + &hp->old_reader) > 0) + hp->old_reader = oldest_reader; + } + + if (BH_OBSOLETE(oldest_bhp, hp->old_reader, vlsn)) { obsolete = 1; if (bhp != NULL) atomic_dec(env, &bhp->ref); @@ -365,13 +378,6 @@ retry_obsolete: if (BH_OBSOLETE(oldest_bhp, hp->old_reader, vlsn)) { atomic_inc(env, &bhp->ref); goto this_buffer; } - if (!got_oldest) { - if ((ret = __txn_oldest_reader( - env, &hp->old_reader)) != 0) - return (ret); - got_oldest = 1; - goto retry_obsolete; - } } /* @@ -481,6 +487,7 @@ this_buffer: buffers++; /* If the page is dirty, write it. */ ret = 0; + dirty_eviction = 0; if (F_ISSET(bhp, BH_DIRTY)) { DB_ASSERT(env, atomic_read(&hp->hash_page_dirty) > 0); ret = __memp_bhwrite(dbmp, hp, bh_mfp, bhp, 0); @@ -507,13 +514,8 @@ this_buffer: buffers++; goto next_hb; } - STAT_INC(env, mpool, - dirty_eviction, c_mp->stat.st_rw_evict, infop->id); - + dirty_eviction = 1; } - else - STAT_INC(env, mpool, - clean_eviction, c_mp->stat.st_ro_evict, infop->id); /* * Freeze this buffer, if necessary. That is, if the buffer is @@ -592,6 +594,13 @@ this_buffer: buffers++; goto retry_search; } + /* We are certainly freeing this buf; now update statistic. */ + if (dirty_eviction) + STAT_INC(env, mpool, + dirty_eviction, c_mp->stat.st_rw_evict, infop->id); + else + STAT_INC(env, mpool, + clean_eviction, c_mp->stat.st_ro_evict, infop->id); /* * If we need some empty buffer headers for freezing, turn the * buffer we've found into frozen headers and put them on the diff --git a/src/mp/mp_fget.c b/src/mp/mp_fget.c index 5d95607e..858e95b8 100644 --- a/src/mp/mp_fget.c +++ b/src/mp/mp_fget.c @@ -483,9 +483,7 @@ freebuf: MUTEX_LOCK(env, hp->mtx_hash); } goto done; } else if (F_ISSET(bhp, BH_FREED | BH_TRASH)) { -revive: DB_ASSERT(env, F_ISSET(bhp, BH_TRASH) || - flags == DB_MPOOL_CREATE || flags == DB_MPOOL_NEW); - if (F_ISSET(bhp, BH_FREED)) +revive: if (F_ISSET(bhp, BH_FREED)) makecopy = makecopy || (mvcc && !BH_OWNED_BY(env, bhp, txn)) || F_ISSET(bhp, BH_FROZEN); @@ -495,6 +493,16 @@ revive: DB_ASSERT(env, F_ISSET(bhp, BH_TRASH) || mfp->last_pgno = *pgnoaddr; MUTEX_UNLOCK(env, mfp->mutex); } + /* We can race with a thread trying to free this. */ + if (F_ISSET(bhp, BH_TRASH) && + *pgnoaddr <= mfp->last_pgno) + break; + + /* Otherwise this page does not currently exist. */ + if (flags != DB_MPOOL_CREATE && flags != DB_MPOOL_NEW) { + ret = DB_PAGE_NOTFOUND; + goto done; + } } if (mvcc) { /* diff --git a/src/rep/rep_record.c b/src/rep/rep_record.c index 568b60e0..50d35b91 100644 --- a/src/rep/rep_record.c +++ b/src/rep/rep_record.c @@ -1416,16 +1416,13 @@ err: /* REP_SYSTEM_UNLOCK(env); /* * If we've processed beyond the needed LSN for a pending - * start sync, start it now. We can compare >= here - * because ready_lsn is the next record we expect. - * Since ckp_lsn can point to the last commit record itself, - * but if it does and ready_lsn == commit (i.e. we haven't - * written the commit yet), we can still start to sync - * because we're guaranteed no additional buffers can - * be dirtied. + * start sync, start it now. We must compare > here + * because ready_lsn is the next record we expect and if + * the last record is a commit, that will dirty pages on + * a client as that txn is applied. */ if (!IS_ZERO_LSN(rep->ckp_lsn) && - LOG_COMPARE(&lp->ready_lsn, &rep->ckp_lsn) >= 0) { + LOG_COMPARE(&lp->ready_lsn, &rep->ckp_lsn) > 0) { save_lsn = rep->ckp_lsn; ZERO_LSN(rep->ckp_lsn); } else diff --git a/src/repmgr/repmgr_sel.c b/src/repmgr/repmgr_sel.c index 18741fca..cff3ed03 100644 --- a/src/repmgr/repmgr_sel.c +++ b/src/repmgr/repmgr_sel.c @@ -14,22 +14,23 @@ typedef int (*HEARTBEAT_ACTION) __P((ENV *)); static int accept_handshake __P((ENV *, REPMGR_CONNECTION *, char *)); static int accept_v1_handshake __P((ENV *, REPMGR_CONNECTION *, char *)); -static int __repmgr_call_election __P((ENV *)); -static int __repmgr_connector_main __P((ENV *, REPMGR_RUNNABLE *)); -static void *__repmgr_connector_thread __P((void *)); +static void check_min_log_file __P((ENV *)); static int dispatch_msgin __P((ENV *, REPMGR_CONNECTION *)); -static int __repmgr_next_timeout __P((ENV *, - db_timespec *, HEARTBEAT_ACTION *)); static int prepare_input __P((ENV *, REPMGR_CONNECTION *)); static int process_own_msg __P((ENV *, REPMGR_CONNECTION *)); static int process_parameters __P((ENV *, REPMGR_CONNECTION *, char *, u_int, u_int32_t, int, u_int32_t)); static int read_version_response __P((ENV *, REPMGR_CONNECTION *)); static int record_permlsn __P((ENV *, REPMGR_CONNECTION *)); +static int __repmgr_call_election __P((ENV *)); +static int __repmgr_connector_main __P((ENV *, REPMGR_RUNNABLE *)); +static void *__repmgr_connector_thread __P((void *)); +static int __repmgr_next_timeout __P((ENV *, + db_timespec *, HEARTBEAT_ACTION *)); static int __repmgr_retry_connections __P((ENV *)); static int __repmgr_send_heartbeat __P((ENV *)); -static int send_version_response __P((ENV *, REPMGR_CONNECTION *)); static int __repmgr_try_one __P((ENV *, u_int)); +static int send_version_response __P((ENV *, REPMGR_CONNECTION *)); #define ONLY_HANDSHAKE(env, conn) do { \ if (conn->msg_type != REPMGR_HANDSHAKE) { \ @@ -1865,8 +1866,10 @@ record_permlsn(env, conn) SITE_STRING_BUFFER location; u_int32_t gen; int ret; + u_int do_log_check; db_rep = env->rep_handle; + do_log_check = 0; DB_ASSERT(env, conn->version > 0 && IS_READY_STATE(conn->state) && IS_VALID_EID(conn->eid)); @@ -1907,7 +1910,15 @@ record_permlsn(env, conn) if (ackp->generation == gen && LOG_COMPARE(&ackp->lsn, &site->max_ack) == 1) { + /* + * If file number for this site changed, check lowest log + * file needed after recording new permlsn for this site. + */ + if (ackp->lsn.file > site->max_ack.file) + do_log_check = 1; memcpy(&site->max_ack, &ackp->lsn, sizeof(DB_LSN)); + if (do_log_check) + check_min_log_file(env); if ((ret = __repmgr_wake_waiters(env, &db_rep->ack_waiters)) != 0) return (ret); @@ -1915,6 +1926,51 @@ record_permlsn(env, conn) return (0); } +/* + * Maintains lowest log file still needed by the repgroup. This is stored + * in shared rep region so that it is accessible to repmgr subordinate + * processes that may not themselves have connections to other sites + * (e.g. a separate db_archive process.) + */ +static void +check_min_log_file(env) + ENV *env; +{ + DB_REP *db_rep; + REP *rep; + REPMGR_SITE *site; + u_int32_t min_log; + u_int eid; + + db_rep = env->rep_handle; + rep = db_rep->region; + min_log = 0; + + /* + * Record the lowest log file number from all connected sites. If this + * is a client, ignore the master because the master does not maintain + * nor send out its repmgr perm LSN in this way. Consider connections + * so that we don't allow a site that has been down a long time to + * indefinitely prevent log archiving. + */ + FOR_EACH_REMOTE_SITE_INDEX(eid) { + if ((int)eid == rep->master_id) + continue; + site = SITE_FROM_EID(eid); + if (IS_SITE_AVAILABLE(site) && + !IS_ZERO_LSN(site->max_ack) && + (min_log == 0 || site->max_ack.file < min_log)) + min_log = site->max_ack.file; + } + /* + * During normal operation min_log should increase over time, but it + * is possible if a site returns after being diconnected for a while + * that min_log could decrease. + */ + if (min_log != 0 && min_log != rep->min_log_file) + rep->min_log_file = min_log; +} + /* * PUBLIC: int __repmgr_write_some __P((ENV *, REPMGR_CONNECTION *)); */ diff --git a/src/repmgr/repmgr_util.c b/src/repmgr/repmgr_util.c index b67e993d..8f92e970 100644 --- a/src/repmgr/repmgr_util.c +++ b/src/repmgr/repmgr_util.c @@ -1194,36 +1194,21 @@ __repmgr_stable_lsn(env, stable_lsn) ENV *env; DB_LSN *stable_lsn; { - DB_LSN min_lsn; DB_REP *db_rep; REP *rep; - REPMGR_SITE *site; - u_int eid; db_rep = env->rep_handle; rep = db_rep->region; - ZERO_LSN(min_lsn); - LOCK_MUTEX(db_rep->mutex); - FOR_EACH_REMOTE_SITE_INDEX(eid) { - site = SITE_FROM_EID(eid); - /* - * Record the smallest ack'ed LSN from all connected sites. - * If we're a client, ignore the master because the master - * does not maintain nor send out its repmgr perm LSN in - * this way. + if (rep->min_log_file != 0 && rep->min_log_file < stable_lsn->file) { + /* + * Returning an LSN to be consistent with the rest of the + * log archiving processing. Construct LSN of format + * [filenum][0]. */ - if ((int)eid == rep->master_id) - continue; - if (IS_SITE_AVAILABLE(site) && - !IS_ZERO_LSN(site->max_ack) && - (IS_ZERO_LSN(min_lsn) || - LOG_COMPARE(&site->max_ack, &min_lsn) < 0)) - min_lsn = site->max_ack; + stable_lsn->file = rep->min_log_file; + stable_lsn->offset = 0; } - UNLOCK_MUTEX(db_rep->mutex); - if (!IS_ZERO_LSN(min_lsn) && LOG_COMPARE(&min_lsn, stable_lsn) < 0) - *stable_lsn = min_lsn; RPRINT(env, (env, DB_VERB_REPMGR_MISC, "Repmgr_stable_lsn: Returning stable_lsn[%lu][%lu]", (u_long)stable_lsn->file, (u_long)stable_lsn->offset)); diff --git a/src/txn/txn_chkpt.c b/src/txn/txn_chkpt.c index bffc1801..91912df2 100644 --- a/src/txn/txn_chkpt.c +++ b/src/txn/txn_chkpt.c @@ -97,7 +97,7 @@ __txn_checkpoint(env, kbytes, minutes, flags) u_int32_t kbytes, minutes, flags; { DB_LOG *dblp; - DB_LSN ckp_lsn, last_ckp; + DB_LSN ckp_lsn, last_ckp, msg_lsn; DB_TXNMGR *mgr; DB_TXNREGION *region; LOG *lp; @@ -146,6 +146,10 @@ __txn_checkpoint(env, kbytes, minutes, flags) if ((ret = __log_current_lsn_int(env, &ckp_lsn, &mbytes, &bytes)) != 0) goto err; + /* + * Save for possible use in START_SYNC message. + */ + msg_lsn = ckp_lsn; if (!LF_ISSET(DB_FORCE)) { /* Don't checkpoint a quiescent database. */ if (bytes == 0 && mbytes == 0) @@ -224,9 +228,14 @@ do_ckp: (ret = __repmgr_autostart(env)) != 0) goto err; #endif + /* + * Send the LSN (saved in msg_lsn) where the sync starts + * on the master. Clients must have this LSN to assure that + * they have applied all txns up to this point. + */ if (env->rep_handle->send != NULL) (void)__rep_send_message(env, DB_EID_BROADCAST, - REP_START_SYNC, &ckp_lsn, NULL, 0, 0); + REP_START_SYNC, &msg_lsn, NULL, 0, 0); } /* Flush the cache. */ diff --git a/src/txn/txn_util.c b/src/txn/txn_util.c index 119e8502..3509a0d2 100644 --- a/src/txn/txn_util.c +++ b/src/txn/txn_util.c @@ -452,25 +452,40 @@ __txn_dref_fname(env, txn) ptd = txn->parent != NULL ? txn->parent->td : NULL; np = R_ADDR(&mgr->reginfo, td->log_dbs); - np += td->nlog_dbs - 1; - for (i = 0; i < td->nlog_dbs; i++, np--) { - fname = R_ADDR(&dblp->reginfo, *np); - MUTEX_LOCK(env, fname->mutex); - if (ptd != NULL) { + /* + * The order in which FNAMEs are cleaned up matters. Cleaning up + * in the wrong order can result in database handles leaking. If + * we are passing the FNAMEs to the parent transaction make sure + * they are passed in order. If we are cleaning up the FNAMEs, + * make sure that is done in reverse order. + */ + if (ptd != NULL) { + for (i = 0; i < td->nlog_dbs; i++, np++) { + fname = R_ADDR(&dblp->reginfo, *np); + MUTEX_LOCK(env, fname->mutex); ret = __txn_record_fname(env, txn->parent, fname); fname->txn_ref--; MUTEX_UNLOCK(env, fname->mutex); - } else if (fname->txn_ref == 1) { - MUTEX_UNLOCK(env, fname->mutex); - DB_ASSERT(env, fname->txn_ref != 0); - ret = __dbreg_close_id_int( - env, fname, DBREG_CLOSE, 0); - } else { - fname->txn_ref--; - MUTEX_UNLOCK(env, fname->mutex); + if (ret != 0) + break; + } + } else { + np += td->nlog_dbs - 1; + for (i = 0; i < td->nlog_dbs; i++, np--) { + fname = R_ADDR(&dblp->reginfo, *np); + MUTEX_LOCK(env, fname->mutex); + if (fname->txn_ref == 1) { + MUTEX_UNLOCK(env, fname->mutex); + DB_ASSERT(env, fname->txn_ref != 0); + ret = __dbreg_close_id_int( + env, fname, DBREG_CLOSE, 0); + } else { + fname->txn_ref--; + MUTEX_UNLOCK(env, fname->mutex); + } + if (ret != 0 && ret != EIO) + break; } - if (ret != 0 && ret != EIO) - break; } return (ret); diff --git a/test/sql/bdb_pragmas.test b/test/sql/bdb_pragmas.test index 54103f99..0bb0d526 100644 --- a/test/sql/bdb_pragmas.test +++ b/test/sql/bdb_pragmas.test @@ -158,7 +158,7 @@ do_test bdb_pragma-3.1 { execsql { PRAGMA bdbsql_error_file; } -} {Default} +} {stderr} # Test set bdbql_error_file pragma before opening env. # Create a sqequence to generate error. diff --git a/test/tcl/TESTS b/test/tcl/TESTS index 350ad620..c4eb58a6 100644 --- a/test/tcl/TESTS +++ b/test/tcl/TESTS @@ -1,6 +1,13 @@ # Automatically built by dist/s_test; may require local editing. +=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= +Cold-boot a 4-site group. The first two sites start quickly and + initiate an election. The other two sites don't join the election until + the middle of the long full election timeout period. It's important that + the number of sites that start immediately be a sub-majority, because + that's the case that used to have a bug in it [#18456]. + =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= backup Test of hotbackup functionality. @@ -34,11 +41,8 @@ bigfile002 with 1K pages. Dirty page 6000000. Sync. =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= -Cold-boot a 4-site group. The first two sites start quickly and - initiate an election. The other two sites don't join the election until - the middle of the long full election timeout period. It's important that - the number of sites that start immediately be a sub-majority, because - that's the case that used to have a bug in it [#18456]. +db_reptest + Wrapper to configure and run the db_reptest program. =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= dbm @@ -48,10 +52,6 @@ dbm Then reopen the file, re-retrieve everything. Finally, delete everything. -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= -db_reptest - Wrapper to configure and run the db_reptest program. - =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= dead001 Use two different configurations to test deadlock detection among a diff --git a/test/tcl/repmgr024.tcl b/test/tcl/repmgr024.tcl index 75e45f70..52d6de8d 100644 --- a/test/tcl/repmgr024.tcl +++ b/test/tcl/repmgr024.tcl @@ -195,6 +195,14 @@ proc repmgr024_sub { method niter tnum largs } { } } + # + # Make sure neither log_archive in same process nor db_archive + # in a different process show any files to archive. + # + error_check_good no_files_log_archive [llength [$enva log_archive]] 0 + set dbarchres [eval exec $util_path/db_archive -h $dira] + error_check_good no_files_db_archive [llength $dbarchres] 0 + puts "\tRepmgr$tnum.j: Try to archive. Verify it didn't." set res [$enva log_archive -arch_remove] set res [eval exec $util_path/db_archive -l -h $dira]