diff options
Diffstat (limited to 'db/dist')
49 files changed, 13040 insertions, 7592 deletions
diff --git a/db/dist/Makefile.in b/db/dist/Makefile.in index 2e3d940c4..4990d70af 100644 --- a/db/dist/Makefile.in +++ b/db/dist/Makefile.in @@ -1,4 +1,4 @@ -# $Id: Makefile.in,v 11.226 2003/11/28 18:50:05 bostic Exp $ +# $Id: Makefile.in,v 11.261 2004/09/24 15:27:47 mjc Exp $ srcdir= @srcdir@/.. builddir=. @@ -30,7 +30,6 @@ ln= @db_cv_path_ln@ mkdir= @db_cv_path_mkdir@ ranlib= @db_cv_path_ranlib@ rm= @db_cv_path_rm@ -rpm= @db_cv_path_rpm@ strip= @db_cv_path_strip@ ################################################## @@ -54,10 +53,11 @@ CPPFLAGS= -I$(builddir) -I$(srcdir) @CPPFLAGS@ ################################################## CFLAGS= -c $(CPPFLAGS) @CFLAGS@ CC= @MAKEFILE_CC@ -CCLINK= @MAKEFILE_CCLINK@ +CCLINK= @MAKEFILE_CCLINK@ @CFLAGS@ LDFLAGS= @LDFLAGS@ LIBS= @LIBS@ +TEST_LIBS= @TEST_LIBS@ LIBSO_LIBS= @LIBSO_LIBS@ libdb_base= libdb @@ -75,8 +75,8 @@ libso_major= $(libdb_base)-$(LIBMAJOR)@SOSUFFIX@ ################################################## CXXFLAGS= -c $(CPPFLAGS) @CXXFLAGS@ CXX= @MAKEFILE_CXX@ -CXXLINK= @MAKEFILE_CXXLINK@ -XSOLINK= @MAKEFILE_XSOLINK@ +CXXLINK= @MAKEFILE_CXXLINK@ @CXXFLAGS@ +XSOLINK= @MAKEFILE_XSOLINK@ @CXXFLAGS@ LIBXSO_LIBS= @LIBXSO_LIBS@ libcxx_base= libdb_cxx @@ -101,12 +101,13 @@ JAVACFLAGS= @JAVACFLAGS@ JAVA_CLASSTOP= ./classes JAVA_RPCCLASSTOP=./classes.rpc JAVA_EXCLASSTOP=./classes.ex -JAVA_SRCDIR= $(srcdir)/java/src JAVA_DBREL= com/sleepycat/db JAVA_EXREL= com/sleepycat/examples JAVA_RPCREL= com/sleepycat/db/rpcserver +JAVA_SRCDIR= $(srcdir)/java/src JAVA_EXDIR= $(srcdir)/examples_java/src/com/sleepycat/examples JAVA_RPCDIR= $(srcdir)/rpc_server/java +JAVA_SLEEPYCAT= $(srcdir)/java/src/com/sleepycat libj_jarfile= db.jar libj_exjarfile= dbexamples.jar @@ -172,7 +173,12 @@ QUEUE_OBJS=\ QUEUE_VRFY_OBJS=\ qam_verify@o@ REP_OBJS=\ - rep_method@o@ rep_record@o@ rep_region@o@ rep_util@o@ + rep_auto@o@ rep_backup@o@ rep_method@o@ rep_record@o@ rep_region@o@ \ + rep_stat@o@ rep_util@o@ +PRINT_OBJS=\ + btree_autop@o@ crdel_autop@o@ db_autop@o@ dbreg_autop@o@ \ + fileops_autop@o@ hash_autop@o@ qam_autop@o@ rep_autop@o@ \ + txn_autop@o@ C_OBJS= @ADDITIONAL_OBJS@ @REPLACEMENT_OBJS@ @CRYPTO_OBJS@ @RPC_CLIENT_OBJS@ \ crdel_auto@o@ crdel_rec@o@ db@o@ db_am@o@ db_auto@o@ \ @@ -180,28 +186,31 @@ C_OBJS= @ADDITIONAL_OBJS@ @REPLACEMENT_OBJS@ @CRYPTO_OBJS@ @RPC_CLIENT_OBJS@ \ db_err@o@ db_getlong@o@ db_idspace@o@ db_iface@o@ db_join@o@ \ db_log2@o@ db_meta@o@ db_method@o@ db_open@o@ db_overflow@o@ \ db_pr@o@ db_rec@o@ db_reclaim@o@ db_rename@o@ db_remove@o@ \ - db_ret@o@ db_salloc@o@ db_shash@o@ db_truncate@o@ db_upg@o@ \ - db_upg_opd@o@ dbm@o@ dbreg@o@ dbreg_auto@o@ dbreg_rec@o@ \ - dbreg_util@o@ env_file@o@ env_method@o@ env_open@o@ \ - env_recover@o@ env_region@o@ fileops_auto@o@ fop_basic@o@ \ + db_ret@o@ db_salloc@o@ db_setid@o@ db_setlsn@o@ db_shash@o@ \ + db_stati@o@ db_truncate@o@ db_upg@o@ db_upg_opd@o@ dbm@o@ \ + dbreg@o@ dbreg_auto@o@ dbreg_rec@o@ dbreg_stat@o@ dbreg_util@o@ \ + env_file@o@ env_method@o@ env_open@o@ env_recover@o@ \ + env_region@o@ env_stat@o@ fileops_auto@o@ fop_basic@o@ \ fop_rec@o@ fop_util@o@ hash_func@o@ hmac@o@ hsearch@o@ lock@o@ \ - lock_deadlock@o@ lock_method@o@ lock_region@o@ lock_stat@o@ \ - lock_util@o@ log@o@ log_archive@o@ log_compare@o@ log_get@o@ \ - log_method@o@ log_put@o@ mp_alloc@o@ mp_bh@o@ mp_fget@o@ \ - mp_fopen@o@ mp_fput@o@ mp_fset@o@ mp_method@o@ mp_region@o@ \ - mp_register@o@ mp_stat@o@ mp_sync@o@ mp_trickle@o@ mutex@o@ \ - os_abs@o@ os_alloc@o@ os_clock@o@ os_config@o@ os_dir@o@ \ - os_errno@o@ os_fid@o@ os_fsync@o@ os_handle@o@ os_id@o@ \ - os_map@o@ os_method@o@ os_oflags@o@ os_open@o@ os_region@o@ \ - os_rename@o@ os_root@o@ os_rpath@o@ os_rw@o@ os_seek@o@ \ - os_sleep@o@ os_spin@o@ os_stat@o@ os_tmpdir@o@ os_unlink@o@ \ - sha1@o@ txn@o@ txn_auto@o@ txn_method@o@ txn_rec@o@ \ + lock_deadlock@o@ lock_id@o@ lock_list@o@ lock_method@o@ \ + lock_region@o@ lock_stat@o@ lock_timer@o@ lock_util@o@ log@o@ \ + log_archive@o@ log_compare@o@ log_get@o@ log_method@o@ \ + log_put@o@ log_stat@o@ mp_alloc@o@ mp_bh@o@ mp_fget@o@ \ + mp_fmethod@o@ mp_fopen@o@ mp_fput@o@ mp_fset@o@ mp_method@o@ \ + mp_region@o@ mp_register@o@ mp_stat@o@ mp_sync@o@ mp_trickle@o@ \ + mutex@o@ os_abs@o@ os_alloc@o@ os_clock@o@ os_config@o@ \ + os_dir@o@ os_errno@o@ os_fid@o@ os_fsync@o@ os_handle@o@ \ + os_id@o@ os_map@o@ os_method@o@ os_oflags@o@ os_open@o@ \ + os_region@o@ os_rename@o@ os_root@o@ os_rpath@o@ os_rw@o@ \ + os_seek@o@ os_sleep@o@ os_spin@o@ os_stat@o@ os_tmpdir@o@ \ + os_truncate@o@ os_unlink@o@ sha1@o@ seq_stat@o@ sequence@o@ \ + snprintf@o@ txn@o@ txn_auto@o@ txn_method@o@ txn_rec@o@ \ txn_recover@o@ txn_region@o@ txn_stat@o@ txn_util@o@ xa@o@ \ xa_db@o@ xa_map@o@ CXX_OBJS=\ - cxx_db@o@ cxx_dbc@o@ cxx_dbt@o@ cxx_env@o@ cxx_except@o@ \ - cxx_lock@o@ cxx_logc@o@ cxx_mpool@o@ cxx_txn@o@ cxx_multi@o@ + cxx_db@o@ cxx_dbc@o@ cxx_dbt@o@ cxx_env@o@ cxx_except@o@ cxx_lock@o@ \ + cxx_logc@o@ cxx_mpool@o@ cxx_multi@o@ cxx_seq@o@ cxx_txn@o@ CRYPTO_OBJS=\ aes_method@o@ crypto@o@ mt19937db@o@ rijndael-alg-fst@o@ \ @@ -210,215 +219,256 @@ CRYPTO_OBJS=\ JAVA_OBJS=\ db_java_wrap@o@ -JAVA_SLEEPYCAT=$(JAVA_SRCDIR)/com/sleepycat JAVA_DBSRCS=\ - $(JAVA_SLEEPYCAT)/bdb/bind/ByteArrayBinding.java \ - $(JAVA_SLEEPYCAT)/bdb/bind/ByteArrayFormat.java \ - $(JAVA_SLEEPYCAT)/bdb/bind/DataBinding.java \ - $(JAVA_SLEEPYCAT)/bdb/bind/DataBuffer.java \ - $(JAVA_SLEEPYCAT)/bdb/bind/DataFormat.java \ - $(JAVA_SLEEPYCAT)/bdb/bind/DataType.java \ - $(JAVA_SLEEPYCAT)/bdb/bind/EntityBinding.java \ - $(JAVA_SLEEPYCAT)/bdb/bind/KeyExtractor.java \ - $(JAVA_SLEEPYCAT)/bdb/bind/SimpleBuffer.java \ - $(JAVA_SLEEPYCAT)/bdb/bind/serial/ClassCatalog.java \ - $(JAVA_SLEEPYCAT)/bdb/bind/serial/SerialBinding.java \ - $(JAVA_SLEEPYCAT)/bdb/bind/serial/SerialFormat.java \ - $(JAVA_SLEEPYCAT)/bdb/bind/serial/SerialInput.java \ - $(JAVA_SLEEPYCAT)/bdb/bind/serial/SerialOutput.java \ - $(JAVA_SLEEPYCAT)/bdb/bind/serial/SerialSerialBinding.java \ - $(JAVA_SLEEPYCAT)/bdb/bind/serial/SerialSerialKeyExtractor.java \ - $(JAVA_SLEEPYCAT)/bdb/bind/serial/TupleSerialBinding.java \ - $(JAVA_SLEEPYCAT)/bdb/bind/serial/TupleSerialKeyExtractor.java \ - $(JAVA_SLEEPYCAT)/bdb/bind/serial/TupleSerialMarshalledBinding.java \ - $(JAVA_SLEEPYCAT)/bdb/bind/serial/TupleSerialMarshalledKeyExtractor.java \ - $(JAVA_SLEEPYCAT)/bdb/bind/tuple/MarshalledTupleData.java \ - $(JAVA_SLEEPYCAT)/bdb/bind/tuple/MarshalledTupleKeyEntity.java \ - $(JAVA_SLEEPYCAT)/bdb/bind/tuple/TupleBinding.java \ - $(JAVA_SLEEPYCAT)/bdb/bind/tuple/TupleFormat.java \ - $(JAVA_SLEEPYCAT)/bdb/bind/tuple/TupleInput.java \ - $(JAVA_SLEEPYCAT)/bdb/bind/tuple/TupleInputBinding.java \ - $(JAVA_SLEEPYCAT)/bdb/bind/tuple/TupleMarshalledBinding.java \ - $(JAVA_SLEEPYCAT)/bdb/bind/tuple/TupleOutput.java \ - $(JAVA_SLEEPYCAT)/bdb/bind/tuple/TupleTupleBinding.java \ - $(JAVA_SLEEPYCAT)/bdb/bind/tuple/TupleTupleKeyExtractor.java \ - $(JAVA_SLEEPYCAT)/bdb/bind/tuple/TupleTupleMarshalledBinding.java \ - $(JAVA_SLEEPYCAT)/bdb/bind/tuple/TupleTupleMarshalledKeyExtractor.java \ - $(JAVA_SLEEPYCAT)/db/@db_cv_build_type@/DbConstants.java \ - $(JAVA_SLEEPYCAT)/db/db_java.java \ - $(JAVA_SLEEPYCAT)/db/db_javaJNI.java \ - $(JAVA_SLEEPYCAT)/db/Db.java \ - $(JAVA_SLEEPYCAT)/db/DbAppDispatch.java \ - $(JAVA_SLEEPYCAT)/db/DbAppendRecno.java \ - $(JAVA_SLEEPYCAT)/db/DbBtreeCompare.java \ - $(JAVA_SLEEPYCAT)/db/DbBtreePrefix.java \ - $(JAVA_SLEEPYCAT)/db/DbBtreeStat.java \ - $(JAVA_SLEEPYCAT)/db/DbClient.java \ - $(JAVA_SLEEPYCAT)/db/DbDeadlockException.java \ - $(JAVA_SLEEPYCAT)/db/DbDupCompare.java \ - $(JAVA_SLEEPYCAT)/db/DbEnv.java \ - $(JAVA_SLEEPYCAT)/db/DbEnvFeedback.java \ - $(JAVA_SLEEPYCAT)/db/DbEnvFeedbackHandler.java \ - $(JAVA_SLEEPYCAT)/db/DbErrcall.java \ - $(JAVA_SLEEPYCAT)/db/DbErrorHandler.java \ - $(JAVA_SLEEPYCAT)/db/DbException.java \ - $(JAVA_SLEEPYCAT)/db/DbFeedback.java \ - $(JAVA_SLEEPYCAT)/db/DbFeedbackHandler.java \ - $(JAVA_SLEEPYCAT)/db/DbHash.java \ - $(JAVA_SLEEPYCAT)/db/DbHashStat.java \ - $(JAVA_SLEEPYCAT)/db/DbKeyRange.java \ - $(JAVA_SLEEPYCAT)/db/DbLock.java \ - $(JAVA_SLEEPYCAT)/db/DbLockNotGrantedException.java \ - $(JAVA_SLEEPYCAT)/db/DbLockRequest.java \ - $(JAVA_SLEEPYCAT)/db/DbLockStat.java \ - $(JAVA_SLEEPYCAT)/db/DbLogStat.java \ - $(JAVA_SLEEPYCAT)/db/DbLogc.java \ - $(JAVA_SLEEPYCAT)/db/DbLsn.java \ - $(JAVA_SLEEPYCAT)/db/DbMemoryException.java \ - $(JAVA_SLEEPYCAT)/db/DbMpoolFStat.java \ - $(JAVA_SLEEPYCAT)/db/DbMpoolFile.java \ - $(JAVA_SLEEPYCAT)/db/DbMpoolStat.java \ - $(JAVA_SLEEPYCAT)/db/DbMultipleDataIterator.java \ - $(JAVA_SLEEPYCAT)/db/DbMultipleIterator.java \ - $(JAVA_SLEEPYCAT)/db/DbMultipleKeyDataIterator.java \ - $(JAVA_SLEEPYCAT)/db/DbMultipleRecnoDataIterator.java \ - $(JAVA_SLEEPYCAT)/db/DbPanicHandler.java \ - $(JAVA_SLEEPYCAT)/db/DbPreplist.java \ - $(JAVA_SLEEPYCAT)/db/DbQueueStat.java \ - $(JAVA_SLEEPYCAT)/db/DbRepStat.java \ - $(JAVA_SLEEPYCAT)/db/DbRepTransport.java \ - $(JAVA_SLEEPYCAT)/db/DbRunRecoveryException.java \ - $(JAVA_SLEEPYCAT)/db/DbSecondaryKeyCreate.java \ - $(JAVA_SLEEPYCAT)/db/DbTxn.java \ - $(JAVA_SLEEPYCAT)/db/DbTxnStat.java \ - $(JAVA_SLEEPYCAT)/db/DbUtil.java \ - $(JAVA_SLEEPYCAT)/db/Dbc.java \ - $(JAVA_SLEEPYCAT)/db/Dbt.java \ - $(JAVA_SLEEPYCAT)/bdb/CurrentTransaction.java \ - $(JAVA_SLEEPYCAT)/bdb/DataCursor.java \ - $(JAVA_SLEEPYCAT)/bdb/DataDb.java \ - $(JAVA_SLEEPYCAT)/bdb/DataEnvironment.java \ - $(JAVA_SLEEPYCAT)/bdb/DataIndex.java \ - $(JAVA_SLEEPYCAT)/bdb/DataStore.java \ - $(JAVA_SLEEPYCAT)/bdb/DataThang.java \ - $(JAVA_SLEEPYCAT)/bdb/DataView.java \ - $(JAVA_SLEEPYCAT)/bdb/ForeignKeyIndex.java \ - $(JAVA_SLEEPYCAT)/bdb/IntegrityConstraintException.java \ - $(JAVA_SLEEPYCAT)/bdb/KeyRange.java \ - $(JAVA_SLEEPYCAT)/bdb/KeyRangeException.java \ - $(JAVA_SLEEPYCAT)/bdb/PrimaryKeyAssigner.java \ - $(JAVA_SLEEPYCAT)/bdb/RecordNumberBinding.java \ - $(JAVA_SLEEPYCAT)/bdb/RecordNumberFormat.java \ - $(JAVA_SLEEPYCAT)/bdb/StoredClassCatalog.java \ - $(JAVA_SLEEPYCAT)/bdb/TransactionRunner.java \ - $(JAVA_SLEEPYCAT)/bdb/TransactionWorker.java \ - $(JAVA_SLEEPYCAT)/bdb/collection/MapEntry.java \ - $(JAVA_SLEEPYCAT)/bdb/collection/StoredCollection.java \ - $(JAVA_SLEEPYCAT)/bdb/collection/StoredCollections.java \ - $(JAVA_SLEEPYCAT)/bdb/collection/StoredContainer.java \ - $(JAVA_SLEEPYCAT)/bdb/collection/StoredEntrySet.java \ - $(JAVA_SLEEPYCAT)/bdb/collection/StoredIterator.java \ - $(JAVA_SLEEPYCAT)/bdb/collection/StoredKeySet.java \ - $(JAVA_SLEEPYCAT)/bdb/collection/StoredList.java \ - $(JAVA_SLEEPYCAT)/bdb/collection/StoredMap.java \ - $(JAVA_SLEEPYCAT)/bdb/collection/StoredMapEntry.java \ - $(JAVA_SLEEPYCAT)/bdb/collection/StoredSortedEntrySet.java \ - $(JAVA_SLEEPYCAT)/bdb/collection/StoredSortedKeySet.java \ - $(JAVA_SLEEPYCAT)/bdb/collection/StoredSortedMap.java \ - $(JAVA_SLEEPYCAT)/bdb/collection/StoredSortedValueSet.java \ - $(JAVA_SLEEPYCAT)/bdb/collection/StoredValueSet.java \ - $(JAVA_SLEEPYCAT)/bdb/factory/TupleSerialDbFactory.java \ - $(JAVA_SLEEPYCAT)/bdb/util/ExceptionUnwrapper.java \ - $(JAVA_SLEEPYCAT)/bdb/util/ExceptionWrapper.java \ - $(JAVA_SLEEPYCAT)/bdb/util/FastInputStream.java \ - $(JAVA_SLEEPYCAT)/bdb/util/FastOutputStream.java \ - $(JAVA_SLEEPYCAT)/bdb/util/IOExceptionWrapper.java \ - $(JAVA_SLEEPYCAT)/bdb/util/RuntimeExceptionWrapper.java \ - $(JAVA_SLEEPYCAT)/bdb/util/TimeUnits.java \ - $(JAVA_SLEEPYCAT)/bdb/util/UtfOps.java + $(JAVA_SLEEPYCAT)/bind/ByteArrayBinding.java \ + $(JAVA_SLEEPYCAT)/bind/EntityBinding.java \ + $(JAVA_SLEEPYCAT)/bind/EntryBinding.java \ + $(JAVA_SLEEPYCAT)/bind/RecordNumberBinding.java \ + $(JAVA_SLEEPYCAT)/bind/serial/ClassCatalog.java \ + $(JAVA_SLEEPYCAT)/bind/serial/SerialBinding.java \ + $(JAVA_SLEEPYCAT)/bind/serial/SerialInput.java \ + $(JAVA_SLEEPYCAT)/bind/serial/SerialOutput.java \ + $(JAVA_SLEEPYCAT)/bind/serial/SerialSerialBinding.java \ + $(JAVA_SLEEPYCAT)/bind/serial/SerialSerialKeyCreator.java \ + $(JAVA_SLEEPYCAT)/bind/serial/StoredClassCatalog.java \ + $(JAVA_SLEEPYCAT)/bind/serial/TupleSerialBinding.java \ + $(JAVA_SLEEPYCAT)/bind/serial/TupleSerialKeyCreator.java \ + $(JAVA_SLEEPYCAT)/bind/serial/TupleSerialMarshalledBinding.java \ + $(JAVA_SLEEPYCAT)/bind/serial/TupleSerialMarshalledKeyCreator.java \ + $(JAVA_SLEEPYCAT)/bind/tuple/BooleanBinding.java \ + $(JAVA_SLEEPYCAT)/bind/tuple/ByteBinding.java \ + $(JAVA_SLEEPYCAT)/bind/tuple/CharacterBinding.java \ + $(JAVA_SLEEPYCAT)/bind/tuple/DoubleBinding.java \ + $(JAVA_SLEEPYCAT)/bind/tuple/FloatBinding.java \ + $(JAVA_SLEEPYCAT)/bind/tuple/IntegerBinding.java \ + $(JAVA_SLEEPYCAT)/bind/tuple/LongBinding.java \ + $(JAVA_SLEEPYCAT)/bind/tuple/MarshalledTupleEntry.java \ + $(JAVA_SLEEPYCAT)/bind/tuple/MarshalledTupleKeyEntity.java \ + $(JAVA_SLEEPYCAT)/bind/tuple/ShortBinding.java \ + $(JAVA_SLEEPYCAT)/bind/tuple/StringBinding.java \ + $(JAVA_SLEEPYCAT)/bind/tuple/TupleBinding.java \ + $(JAVA_SLEEPYCAT)/bind/tuple/TupleInput.java \ + $(JAVA_SLEEPYCAT)/bind/tuple/TupleInputBinding.java \ + $(JAVA_SLEEPYCAT)/bind/tuple/TupleMarshalledBinding.java \ + $(JAVA_SLEEPYCAT)/bind/tuple/TupleOutput.java \ + $(JAVA_SLEEPYCAT)/bind/tuple/TupleTupleBinding.java \ + $(JAVA_SLEEPYCAT)/bind/tuple/TupleTupleKeyCreator.java \ + $(JAVA_SLEEPYCAT)/bind/tuple/TupleTupleMarshalledBinding.java \ + $(JAVA_SLEEPYCAT)/bind/tuple/TupleTupleMarshalledKeyCreator.java \ + $(JAVA_SLEEPYCAT)/collections/CurrentTransaction.java \ + $(JAVA_SLEEPYCAT)/collections/DataCursor.java \ + $(JAVA_SLEEPYCAT)/collections/DataView.java \ + $(JAVA_SLEEPYCAT)/collections/KeyRange.java \ + $(JAVA_SLEEPYCAT)/collections/KeyRangeException.java \ + $(JAVA_SLEEPYCAT)/collections/MapEntryParameter.java \ + $(JAVA_SLEEPYCAT)/collections/PrimaryKeyAssigner.java \ + $(JAVA_SLEEPYCAT)/collections/RangeCursor.java \ + $(JAVA_SLEEPYCAT)/collections/StoredCollection.java \ + $(JAVA_SLEEPYCAT)/collections/StoredCollections.java \ + $(JAVA_SLEEPYCAT)/collections/StoredContainer.java \ + $(JAVA_SLEEPYCAT)/collections/StoredEntrySet.java \ + $(JAVA_SLEEPYCAT)/collections/StoredIterator.java \ + $(JAVA_SLEEPYCAT)/collections/StoredKeySet.java \ + $(JAVA_SLEEPYCAT)/collections/StoredList.java \ + $(JAVA_SLEEPYCAT)/collections/StoredMap.java \ + $(JAVA_SLEEPYCAT)/collections/StoredMapEntry.java \ + $(JAVA_SLEEPYCAT)/collections/StoredSortedEntrySet.java \ + $(JAVA_SLEEPYCAT)/collections/StoredSortedKeySet.java \ + $(JAVA_SLEEPYCAT)/collections/StoredSortedMap.java \ + $(JAVA_SLEEPYCAT)/collections/StoredSortedValueSet.java \ + $(JAVA_SLEEPYCAT)/collections/StoredValueSet.java \ + $(JAVA_SLEEPYCAT)/collections/TransactionRunner.java \ + $(JAVA_SLEEPYCAT)/collections/TransactionWorker.java \ + $(JAVA_SLEEPYCAT)/collections/TupleSerialFactory.java \ + $(JAVA_SLEEPYCAT)/compat/DbCompat.java \ + $(JAVA_SLEEPYCAT)/db/BtreePrefixCalculator.java \ + $(JAVA_SLEEPYCAT)/db/BtreeStats.java \ + $(JAVA_SLEEPYCAT)/db/CacheFile.java \ + $(JAVA_SLEEPYCAT)/db/CacheFilePriority.java \ + $(JAVA_SLEEPYCAT)/db/CacheFileStats.java \ + $(JAVA_SLEEPYCAT)/db/CacheStats.java \ + $(JAVA_SLEEPYCAT)/db/CheckpointConfig.java \ + $(JAVA_SLEEPYCAT)/db/Cursor.java \ + $(JAVA_SLEEPYCAT)/db/CursorConfig.java \ + $(JAVA_SLEEPYCAT)/db/Database.java \ + $(JAVA_SLEEPYCAT)/db/DatabaseConfig.java \ + $(JAVA_SLEEPYCAT)/db/DatabaseEntry.java \ + $(JAVA_SLEEPYCAT)/db/DatabaseException.java \ + $(JAVA_SLEEPYCAT)/db/DatabaseStats.java \ + $(JAVA_SLEEPYCAT)/db/DatabaseType.java \ + $(JAVA_SLEEPYCAT)/db/DeadlockException.java \ + $(JAVA_SLEEPYCAT)/db/Environment.java \ + $(JAVA_SLEEPYCAT)/db/EnvironmentConfig.java \ + $(JAVA_SLEEPYCAT)/db/ErrorHandler.java \ + $(JAVA_SLEEPYCAT)/db/FeedbackHandler.java \ + $(JAVA_SLEEPYCAT)/db/HashStats.java \ + $(JAVA_SLEEPYCAT)/db/Hasher.java \ + $(JAVA_SLEEPYCAT)/db/JoinConfig.java \ + $(JAVA_SLEEPYCAT)/db/JoinCursor.java \ + $(JAVA_SLEEPYCAT)/db/KeyRange.java \ + $(JAVA_SLEEPYCAT)/db/Lock.java \ + $(JAVA_SLEEPYCAT)/db/LockDetectMode.java \ + $(JAVA_SLEEPYCAT)/db/LockMode.java \ + $(JAVA_SLEEPYCAT)/db/LockNotGrantedException.java \ + $(JAVA_SLEEPYCAT)/db/LockOperation.java \ + $(JAVA_SLEEPYCAT)/db/LockRequest.java \ + $(JAVA_SLEEPYCAT)/db/LockRequestMode.java \ + $(JAVA_SLEEPYCAT)/db/LockStats.java \ + $(JAVA_SLEEPYCAT)/db/LogCursor.java \ + $(JAVA_SLEEPYCAT)/db/LogRecordHandler.java \ + $(JAVA_SLEEPYCAT)/db/LogSequenceNumber.java \ + $(JAVA_SLEEPYCAT)/db/LogStats.java \ + $(JAVA_SLEEPYCAT)/db/MemoryException.java \ + $(JAVA_SLEEPYCAT)/db/MessageHandler.java \ + $(JAVA_SLEEPYCAT)/db/MultipleDataEntry.java \ + $(JAVA_SLEEPYCAT)/db/MultipleEntry.java \ + $(JAVA_SLEEPYCAT)/db/MultipleKeyDataEntry.java \ + $(JAVA_SLEEPYCAT)/db/MultipleRecnoDataEntry.java \ + $(JAVA_SLEEPYCAT)/db/OperationStatus.java \ + $(JAVA_SLEEPYCAT)/db/PanicHandler.java \ + $(JAVA_SLEEPYCAT)/db/PreparedTransaction.java \ + $(JAVA_SLEEPYCAT)/db/QueueStats.java \ + $(JAVA_SLEEPYCAT)/db/RecordNumberAppender.java \ + $(JAVA_SLEEPYCAT)/db/RecoveryOperation.java \ + $(JAVA_SLEEPYCAT)/db/ReplicationHandleDeadException.java \ + $(JAVA_SLEEPYCAT)/db/ReplicationStats.java \ + $(JAVA_SLEEPYCAT)/db/ReplicationStatus.java \ + $(JAVA_SLEEPYCAT)/db/ReplicationTransport.java \ + $(JAVA_SLEEPYCAT)/db/RunRecoveryException.java \ + $(JAVA_SLEEPYCAT)/db/SecondaryConfig.java \ + $(JAVA_SLEEPYCAT)/db/SecondaryCursor.java \ + $(JAVA_SLEEPYCAT)/db/SecondaryDatabase.java \ + $(JAVA_SLEEPYCAT)/db/SecondaryKeyCreator.java \ + $(JAVA_SLEEPYCAT)/db/Sequence.java \ + $(JAVA_SLEEPYCAT)/db/SequenceConfig.java \ + $(JAVA_SLEEPYCAT)/db/SequenceStats.java \ + $(JAVA_SLEEPYCAT)/db/StatsConfig.java \ + $(JAVA_SLEEPYCAT)/db/Transaction.java \ + $(JAVA_SLEEPYCAT)/db/TransactionConfig.java \ + $(JAVA_SLEEPYCAT)/db/TransactionStats.java \ + $(JAVA_SLEEPYCAT)/db/VerifyConfig.java \ + $(JAVA_SLEEPYCAT)/db/internal/Db.java \ + $(JAVA_SLEEPYCAT)/db/internal/DbClient.java \ + $(JAVA_SLEEPYCAT)/db/internal/DbConstants.java \ + $(JAVA_SLEEPYCAT)/db/internal/DbEnv.java \ + $(JAVA_SLEEPYCAT)/db/internal/DbLock.java \ + $(JAVA_SLEEPYCAT)/db/internal/DbLogc.java \ + $(JAVA_SLEEPYCAT)/db/internal/DbMpoolFile.java \ + $(JAVA_SLEEPYCAT)/db/internal/DbSequence.java \ + $(JAVA_SLEEPYCAT)/db/internal/DbTxn.java \ + $(JAVA_SLEEPYCAT)/db/internal/DbUtil.java \ + $(JAVA_SLEEPYCAT)/db/internal/Dbc.java \ + $(JAVA_SLEEPYCAT)/db/internal/db_java.java \ + $(JAVA_SLEEPYCAT)/db/internal/db_javaJNI.java \ + $(JAVA_SLEEPYCAT)/util/ExceptionUnwrapper.java \ + $(JAVA_SLEEPYCAT)/util/ExceptionWrapper.java \ + $(JAVA_SLEEPYCAT)/util/FastInputStream.java \ + $(JAVA_SLEEPYCAT)/util/FastOutputStream.java \ + $(JAVA_SLEEPYCAT)/util/IOExceptionWrapper.java \ + $(JAVA_SLEEPYCAT)/util/RuntimeExceptionWrapper.java \ + $(JAVA_SLEEPYCAT)/util/UtfOps.java JAVA_EXSRCS=\ + $(JAVA_EXDIR)/collections/access/AccessExample.java \ + $(JAVA_EXDIR)/collections/hello/HelloDatabaseWorld.java \ + $(JAVA_EXDIR)/collections/ship/basic/PartData.java \ + $(JAVA_EXDIR)/collections/ship/basic/PartKey.java \ + $(JAVA_EXDIR)/collections/ship/basic/Sample.java \ + $(JAVA_EXDIR)/collections/ship/basic/SampleDatabase.java \ + $(JAVA_EXDIR)/collections/ship/basic/SampleViews.java \ + $(JAVA_EXDIR)/collections/ship/basic/ShipmentData.java \ + $(JAVA_EXDIR)/collections/ship/basic/ShipmentKey.java \ + $(JAVA_EXDIR)/collections/ship/basic/SupplierData.java \ + $(JAVA_EXDIR)/collections/ship/basic/SupplierKey.java \ + $(JAVA_EXDIR)/collections/ship/basic/Weight.java \ + $(JAVA_EXDIR)/collections/ship/entity/Part.java \ + $(JAVA_EXDIR)/collections/ship/entity/PartData.java \ + $(JAVA_EXDIR)/collections/ship/entity/PartKey.java \ + $(JAVA_EXDIR)/collections/ship/entity/Sample.java \ + $(JAVA_EXDIR)/collections/ship/entity/SampleDatabase.java \ + $(JAVA_EXDIR)/collections/ship/entity/SampleViews.java \ + $(JAVA_EXDIR)/collections/ship/entity/Shipment.java \ + $(JAVA_EXDIR)/collections/ship/entity/ShipmentData.java \ + $(JAVA_EXDIR)/collections/ship/entity/ShipmentKey.java \ + $(JAVA_EXDIR)/collections/ship/entity/Supplier.java \ + $(JAVA_EXDIR)/collections/ship/entity/SupplierData.java \ + $(JAVA_EXDIR)/collections/ship/entity/SupplierKey.java \ + $(JAVA_EXDIR)/collections/ship/entity/Weight.java \ + $(JAVA_EXDIR)/collections/ship/factory/Part.java \ + $(JAVA_EXDIR)/collections/ship/factory/PartKey.java \ + $(JAVA_EXDIR)/collections/ship/factory/Sample.java \ + $(JAVA_EXDIR)/collections/ship/factory/SampleDatabase.java \ + $(JAVA_EXDIR)/collections/ship/factory/SampleViews.java \ + $(JAVA_EXDIR)/collections/ship/factory/Shipment.java \ + $(JAVA_EXDIR)/collections/ship/factory/ShipmentKey.java \ + $(JAVA_EXDIR)/collections/ship/factory/Supplier.java \ + $(JAVA_EXDIR)/collections/ship/factory/SupplierKey.java \ + $(JAVA_EXDIR)/collections/ship/factory/Weight.java \ + $(JAVA_EXDIR)/collections/ship/index/PartData.java \ + $(JAVA_EXDIR)/collections/ship/index/PartKey.java \ + $(JAVA_EXDIR)/collections/ship/index/Sample.java \ + $(JAVA_EXDIR)/collections/ship/index/SampleDatabase.java \ + $(JAVA_EXDIR)/collections/ship/index/SampleViews.java \ + $(JAVA_EXDIR)/collections/ship/index/ShipmentData.java \ + $(JAVA_EXDIR)/collections/ship/index/ShipmentKey.java \ + $(JAVA_EXDIR)/collections/ship/index/SupplierData.java \ + $(JAVA_EXDIR)/collections/ship/index/SupplierKey.java \ + $(JAVA_EXDIR)/collections/ship/index/Weight.java \ + $(JAVA_EXDIR)/collections/ship/marshal/MarshalledEntity.java \ + $(JAVA_EXDIR)/collections/ship/marshal/MarshalledKey.java \ + $(JAVA_EXDIR)/collections/ship/marshal/Part.java \ + $(JAVA_EXDIR)/collections/ship/marshal/PartKey.java \ + $(JAVA_EXDIR)/collections/ship/marshal/Sample.java \ + $(JAVA_EXDIR)/collections/ship/marshal/SampleDatabase.java \ + $(JAVA_EXDIR)/collections/ship/marshal/SampleViews.java \ + $(JAVA_EXDIR)/collections/ship/marshal/Shipment.java \ + $(JAVA_EXDIR)/collections/ship/marshal/ShipmentKey.java \ + $(JAVA_EXDIR)/collections/ship/marshal/Supplier.java \ + $(JAVA_EXDIR)/collections/ship/marshal/SupplierKey.java \ + $(JAVA_EXDIR)/collections/ship/marshal/Weight.java \ + $(JAVA_EXDIR)/collections/ship/sentity/Part.java \ + $(JAVA_EXDIR)/collections/ship/sentity/PartKey.java \ + $(JAVA_EXDIR)/collections/ship/sentity/Sample.java \ + $(JAVA_EXDIR)/collections/ship/sentity/SampleDatabase.java \ + $(JAVA_EXDIR)/collections/ship/sentity/SampleViews.java \ + $(JAVA_EXDIR)/collections/ship/sentity/Shipment.java \ + $(JAVA_EXDIR)/collections/ship/sentity/ShipmentKey.java \ + $(JAVA_EXDIR)/collections/ship/sentity/Supplier.java \ + $(JAVA_EXDIR)/collections/ship/sentity/SupplierKey.java \ + $(JAVA_EXDIR)/collections/ship/sentity/Weight.java \ + $(JAVA_EXDIR)/collections/ship/tuple/Part.java \ + $(JAVA_EXDIR)/collections/ship/tuple/PartData.java \ + $(JAVA_EXDIR)/collections/ship/tuple/PartKey.java \ + $(JAVA_EXDIR)/collections/ship/tuple/Sample.java \ + $(JAVA_EXDIR)/collections/ship/tuple/SampleDatabase.java \ + $(JAVA_EXDIR)/collections/ship/tuple/SampleViews.java \ + $(JAVA_EXDIR)/collections/ship/tuple/Shipment.java \ + $(JAVA_EXDIR)/collections/ship/tuple/ShipmentData.java \ + $(JAVA_EXDIR)/collections/ship/tuple/ShipmentKey.java \ + $(JAVA_EXDIR)/collections/ship/tuple/Supplier.java \ + $(JAVA_EXDIR)/collections/ship/tuple/SupplierData.java \ + $(JAVA_EXDIR)/collections/ship/tuple/SupplierKey.java \ + $(JAVA_EXDIR)/collections/ship/tuple/Weight.java \ $(JAVA_EXDIR)/db/AccessExample.java \ $(JAVA_EXDIR)/db/BtRecExample.java \ $(JAVA_EXDIR)/db/BulkAccessExample.java \ $(JAVA_EXDIR)/db/EnvExample.java \ + $(JAVA_EXDIR)/db/GettingStarted/ExampleDatabaseLoad.java \ + $(JAVA_EXDIR)/db/GettingStarted/ExampleDatabaseRead.java \ + $(JAVA_EXDIR)/db/GettingStarted/Inventory.java \ + $(JAVA_EXDIR)/db/GettingStarted/InventoryBinding.java \ + $(JAVA_EXDIR)/db/GettingStarted/ItemNameKeyCreator.java \ + $(JAVA_EXDIR)/db/GettingStarted/MyDbs.java \ + $(JAVA_EXDIR)/db/GettingStarted/Vendor.java \ $(JAVA_EXDIR)/db/LockExample.java \ - $(JAVA_EXDIR)/db/TpcbExample.java \ - $(JAVA_EXDIR)/bdb/access/AccessExample.java \ - $(JAVA_EXDIR)/bdb/helloworld/HelloDatabaseWorld.java \ - $(JAVA_EXDIR)/bdb/shipment/basic/PartKey.java \ - $(JAVA_EXDIR)/bdb/shipment/basic/PartValue.java \ - $(JAVA_EXDIR)/bdb/shipment/basic/Sample.java \ - $(JAVA_EXDIR)/bdb/shipment/basic/SampleDatabase.java \ - $(JAVA_EXDIR)/bdb/shipment/basic/SampleViews.java \ - $(JAVA_EXDIR)/bdb/shipment/basic/ShipmentKey.java \ - $(JAVA_EXDIR)/bdb/shipment/basic/ShipmentValue.java \ - $(JAVA_EXDIR)/bdb/shipment/basic/SupplierKey.java \ - $(JAVA_EXDIR)/bdb/shipment/basic/SupplierValue.java \ - $(JAVA_EXDIR)/bdb/shipment/basic/Weight.java \ - $(JAVA_EXDIR)/bdb/shipment/entity/Part.java \ - $(JAVA_EXDIR)/bdb/shipment/entity/PartKey.java \ - $(JAVA_EXDIR)/bdb/shipment/entity/PartValue.java \ - $(JAVA_EXDIR)/bdb/shipment/entity/Sample.java \ - $(JAVA_EXDIR)/bdb/shipment/entity/SampleDatabase.java \ - $(JAVA_EXDIR)/bdb/shipment/entity/SampleViews.java \ - $(JAVA_EXDIR)/bdb/shipment/entity/Shipment.java \ - $(JAVA_EXDIR)/bdb/shipment/entity/ShipmentKey.java \ - $(JAVA_EXDIR)/bdb/shipment/entity/ShipmentValue.java \ - $(JAVA_EXDIR)/bdb/shipment/entity/Supplier.java \ - $(JAVA_EXDIR)/bdb/shipment/entity/SupplierKey.java \ - $(JAVA_EXDIR)/bdb/shipment/entity/SupplierValue.java \ - $(JAVA_EXDIR)/bdb/shipment/entity/Weight.java \ - $(JAVA_EXDIR)/bdb/shipment/tuple/Part.java \ - $(JAVA_EXDIR)/bdb/shipment/tuple/PartKey.java \ - $(JAVA_EXDIR)/bdb/shipment/tuple/PartValue.java \ - $(JAVA_EXDIR)/bdb/shipment/tuple/Sample.java \ - $(JAVA_EXDIR)/bdb/shipment/tuple/SampleDatabase.java \ - $(JAVA_EXDIR)/bdb/shipment/tuple/SampleViews.java \ - $(JAVA_EXDIR)/bdb/shipment/tuple/Shipment.java \ - $(JAVA_EXDIR)/bdb/shipment/tuple/ShipmentKey.java \ - $(JAVA_EXDIR)/bdb/shipment/tuple/ShipmentValue.java \ - $(JAVA_EXDIR)/bdb/shipment/tuple/Supplier.java \ - $(JAVA_EXDIR)/bdb/shipment/tuple/SupplierKey.java \ - $(JAVA_EXDIR)/bdb/shipment/tuple/SupplierValue.java \ - $(JAVA_EXDIR)/bdb/shipment/tuple/Weight.java \ - $(JAVA_EXDIR)/bdb/shipment/sentity/Part.java \ - $(JAVA_EXDIR)/bdb/shipment/sentity/PartKey.java \ - $(JAVA_EXDIR)/bdb/shipment/sentity/Sample.java \ - $(JAVA_EXDIR)/bdb/shipment/sentity/SampleDatabase.java \ - $(JAVA_EXDIR)/bdb/shipment/sentity/SampleViews.java \ - $(JAVA_EXDIR)/bdb/shipment/sentity/Shipment.java \ - $(JAVA_EXDIR)/bdb/shipment/sentity/ShipmentKey.java \ - $(JAVA_EXDIR)/bdb/shipment/sentity/Supplier.java \ - $(JAVA_EXDIR)/bdb/shipment/sentity/SupplierKey.java \ - $(JAVA_EXDIR)/bdb/shipment/sentity/Weight.java \ - $(JAVA_EXDIR)/bdb/shipment/marshal/MarshalledEntity.java \ - $(JAVA_EXDIR)/bdb/shipment/marshal/MarshalledKey.java \ - $(JAVA_EXDIR)/bdb/shipment/marshal/Part.java \ - $(JAVA_EXDIR)/bdb/shipment/marshal/PartKey.java \ - $(JAVA_EXDIR)/bdb/shipment/marshal/Sample.java \ - $(JAVA_EXDIR)/bdb/shipment/marshal/SampleDatabase.java \ - $(JAVA_EXDIR)/bdb/shipment/marshal/SampleViews.java \ - $(JAVA_EXDIR)/bdb/shipment/marshal/Shipment.java \ - $(JAVA_EXDIR)/bdb/shipment/marshal/ShipmentKey.java \ - $(JAVA_EXDIR)/bdb/shipment/marshal/Supplier.java \ - $(JAVA_EXDIR)/bdb/shipment/marshal/SupplierKey.java \ - $(JAVA_EXDIR)/bdb/shipment/marshal/Weight.java \ - $(JAVA_EXDIR)/bdb/shipment/factory/Part.java \ - $(JAVA_EXDIR)/bdb/shipment/factory/PartKey.java \ - $(JAVA_EXDIR)/bdb/shipment/factory/Sample.java \ - $(JAVA_EXDIR)/bdb/shipment/factory/SampleDatabase.java \ - $(JAVA_EXDIR)/bdb/shipment/factory/SampleViews.java \ - $(JAVA_EXDIR)/bdb/shipment/factory/Shipment.java \ - $(JAVA_EXDIR)/bdb/shipment/factory/ShipmentKey.java \ - $(JAVA_EXDIR)/bdb/shipment/factory/Supplier.java \ - $(JAVA_EXDIR)/bdb/shipment/factory/SupplierKey.java \ - $(JAVA_EXDIR)/bdb/shipment/factory/Weight.java + $(JAVA_EXDIR)/db/RPCExample.java \ + $(JAVA_EXDIR)/db/SequenceExample.java \ + $(JAVA_EXDIR)/db/TpcbExample.java TCL_OBJS=\ tcl_compat@o@ tcl_db@o@ tcl_db_pkg@o@ tcl_dbcursor@o@ tcl_env@o@ \ tcl_internal@o@ tcl_lock@o@ tcl_log@o@ tcl_mp@o@ tcl_rep@o@ \ - tcl_txn@o@ tcl_util@o@ + tcl_seq@o@ tcl_txn@o@ tcl_util@o@ RPC_CLIENT_OBJS=\ client@o@ db_server_clnt@o@ db_server_xdr@o@ gen_client@o@ \ @@ -433,16 +483,19 @@ RPC_CXXSRV_OBJS=\ gen_db_server@o@ RPC_JAVASRV_SRCS=\ - $(JAVA_RPCDIR)/DbDispatcher.java \ - $(JAVA_RPCDIR)/DbServer.java \ + $(JAVA_RPCDIR)/AssociateCallbacks.java \ + $(JAVA_RPCDIR)/Dispatcher.java \ $(JAVA_RPCDIR)/FreeList.java \ + $(JAVA_RPCDIR)/JoinCursorAdapter.java \ $(JAVA_RPCDIR)/LocalIterator.java \ $(JAVA_RPCDIR)/RpcDb.java \ $(JAVA_RPCDIR)/RpcDbEnv.java \ $(JAVA_RPCDIR)/RpcDbTxn.java \ $(JAVA_RPCDIR)/RpcDbc.java \ + $(JAVA_RPCDIR)/Server.java \ $(JAVA_RPCDIR)/Timer.java \ - $(JAVA_RPCDIR)/gen/DbServerStub.java \ + $(JAVA_RPCDIR)/Util.java \ + $(JAVA_RPCDIR)/gen/ServerStubs.java \ $(JAVA_RPCDIR)/gen/__db_associate_msg.java \ $(JAVA_RPCDIR)/gen/__db_associate_reply.java \ $(JAVA_RPCDIR)/gen/__db_bt_maxkey_msg.java \ @@ -583,8 +636,8 @@ RPC_JAVASRV_SRCS=\ UTIL_PROGS=\ @ADDITIONAL_PROGS@ \ - db_archive db_checkpoint db_deadlock \ - db_dump db_load db_printlog db_recover db_stat db_upgrade db_verify + db_archive db_checkpoint db_deadlock db_dump db_load db_printlog \ + db_recover db_stat db_upgrade db_verify ################################################## # List of files installed into the library directory. @@ -617,7 +670,6 @@ LIB_INSTALL_FILE_LIST=\ $(libj_jarfile) ################################################## -# We're building a standard library or a RPM file hierarchy. # Note: "all" must be the first target in the Makefile. ################################################## all: @BUILD_TARGET@ @@ -631,38 +683,36 @@ library_build: @INSTALL_LIBS@ @ADDITIONAL_LANG@ $(UTIL_PROGS) # Static C library named libdb.a. $(libdb): $(DEF_LIB) - $(rm) -f $@ - test ! -f .libs/$(libdb_version) || \ - $(ln) -s .libs/$(libdb_version) $@ - test -f .libs/$(libdb_version) || \ - (test -f $(libdb_version) && $(ln) -s $(libdb_version) $@) # Real static C library. $(libdb_version): $(C_OBJS) $(ar) cr $@ $(C_OBJS) test ! -f $(ranlib) || $(ranlib) $@ + $(rm) -f $(libdb) + $(ln) -s $(libdb_version) $(libdb) # Shared C library. $(libso_target): $(C_OBJS) $(SOLINK) $(SOFLAGS) $(LDFLAGS) -o $@ $(C_OBJS) $(LIBSO_LIBS) + $(rm) -f $(libdb) + $(ln) -s .libs/$(libdb_version) $(libdb) # Static C++ library named libdb_cxx.a. $(libcxx): $(DEF_LIB_CXX) - $(rm) -f $@ - test ! -f .libs/$(libcxx_version) || \ - $(ln) -s .libs/$(libcxx_version) $@ - test -f .libs/$(libcxx_version) || \ - (test -f $(libcxx_version) && $(ln) -s $(libcxx_version) $@) # Real static C++ library. $(libcxx_version): $(CXX_OBJS) $(C_OBJS) $(ar) cr $@ $(CXX_OBJS) $(C_OBJS) test ! -f $(ranlib) || $(ranlib) $@ + $(rm) -f $(libcxx) + $(ln) -s $(libcxx_version) $(libcxx) # Shared C++ library. $(libxso_target): $(CXX_OBJS) $(C_OBJS) $(XSOLINK) $(SOFLAGS) $(LDFLAGS) \ -o $@ $(CXX_OBJS) $(C_OBJS) $(LIBXSO_LIBS) + $(rm) -f $(libcxx) + $(ln) -s .libs/$(libcxx_version) $(libcxx) # Shared Java library. $(libjso_target): $(JAVA_OBJS) $(C_OBJS) @@ -716,11 +766,11 @@ berkeley_db_cxxsvc: $(RPC_CXXSRV_OBJS) util_log@o@ $(DEF_LIB_CXX) $(POSTLINK) $@ berkeley_db_javasvc: $(rpc_jarfile) - echo > $@ "#!/bin/sh" - echo >> $@ CLASSPATH="$(CLASSPATH):$(rpc_jarfile):$(JAVA_RPCDIR)/oncrpc.jar" - echo >> $@ LD_LIBRARY_PATH=.libs - echo >> $@ export CLASSPATH LD_LIBRARY_PATH - echo >> $@ exec java com.sleepycat.db.rpcserver.DbServer \$$@ + echo "#!/bin/sh" > $@ + echo CLASSPATH="$(CLASSPATH):$(rpc_jarfile):$(JAVA_RPCDIR)/oncrpc.jar" >> $@ + echo LD_LIBRARY_PATH=.libs >> $@ + echo export CLASSPATH LD_LIBRARY_PATH >> $@ + echo exec java com.sleepycat.db.rpcserver.Server \$$@ >> $@ chmod +x $@ db_archive: db_archive@o@ util_sig@o@ $(DEF_LIB) @@ -752,9 +802,9 @@ db_load: db_load@o@ util_cache@o@ util_sig@o@ $(DEF_LIB) db_load@o@ util_cache@o@ util_sig@o@ $(DEF_LIB) $(LIBS) $(POSTLINK) $@ -db_printlog: db_printlog@o@ util_sig@o@ $(DEF_LIB) +db_printlog: db_printlog@o@ $(PRINT_OBJS) util_sig@o@ $(DEF_LIB) $(CCLINK) -o $@ $(LDFLAGS) \ - db_printlog@o@ util_sig@o@ $(DEF_LIB) $(LIBS) + db_printlog@o@ $(PRINT_OBJS) util_sig@o@ $(DEF_LIB) $(LIBS) $(POSTLINK) $@ db_recover: db_recover@o@ util_sig@o@ $(DEF_LIB) @@ -845,7 +895,9 @@ uninstall_utilities: $(rm) -f $$i $$i.exe; \ done) -DOCLIST=api_c api_cxx api_tcl images index.html java ref sleepycat utility +DOCLIST=api_c api_cxx api_tcl collections gsg images index.html java ref \ + sleepycat utility + install_docs: @echo "Installing documentation: $(DESTDIR)$(docdir) ..." @test -d $(DESTDIR)$(docdir) || \ @@ -858,34 +910,16 @@ uninstall_docs: @cd $(docdir) && $(rm) -rf $(DESTDIR)$(DOCLIST) ################################################## -# RPM, build and install. -################################################## -rpm_build: - @test -f @db_cv_path_rpm_archive@ || \ - (echo "@db_cv_path_rpm_archive@: archive file not found" && false) - @$(rm) -rf BUILD RPMS SOURCES SPECS SRPMS RPM_INSTALL - @$(mkdir) -p BUILD && $(chmod) $(dmode) BUILD - @$(mkdir) -p RPMS/i386 && $(chmod) $(dmode) RPMS RPMS/i386 - @$(mkdir) -p SOURCES && $(chmod) $(dmode) SOURCES - @$(mkdir) -p SPECS && $(chmod) $(dmode) SPECS - @$(mkdir) -p SRPMS && $(chmod) $(dmode) SRPMS - $(cp) @db_cv_path_rpm_archive@ SOURCES/ - $(cp) db.spec SPECS/db.spec - @RPM_BUILD@ --define="`cat rpm-macro-defines`" -ba SPECS/db.spec - -rpm_install: - -RPM_SRPMS=db-@DB_VERSION_MAJOR@.@DB_VERSION_MINOR@.@DB_VERSION_PATCH@-1.src.rpm - -################################################## # Remaining standard Makefile targets. ################################################## CLEAN_LIST=\ - berkeley_db_svc berkeley_db_cxxsvc berkeley_db_javasvc \ - db_dump185 db_perf dbs bench_001 \ - ex_access ex_apprec ex_btrec ex_dbclient ex_env ex_lock ex_mpool \ - ex_repquote ex_thread ex_tpcb excxx_access excxx_btrec excxx_env \ - excxx_lock excxx_mpool excxx_tpcb rpmrc + bench_001 berkeley_db_cxxsvc berkeley_db_javasvc berkeley_db_svc \ + db_dump185 db_perf dbs ex_access ex_apprec ex_btrec ex_dbclient \ + ex_env ex_lock ex_mpool ex_repquote ex_sequence ex_thread \ + ex_tpcb example_database_load example_database_read excxx_access \ + excxx_btrec excxx_env excxx_example_database_load \ + excxx_example_database_read excxx_lock excxx_mpool \ + excxx_sequence excxx_tpcb mostly-clean clean: $(rm) -rf $(C_OBJS) @@ -895,14 +929,16 @@ mostly-clean clean: $(rm) -rf $(JAVA_CLASSTOP) $(JAVA_EXCLASSTOP) $(rm) -rf $(JAVA_RPCCLASSES) $(rpc_jarfile) $(rm) -rf tags *@o@ *.o *.o.lock *.lo core *.core - $(rm) -rf ALL.OUT.* BUILD PARALLEL_TESTDIR.* RPMS RPM_INSTALL - $(rm) -rf RUN_LOG RUNQUEUE SOURCES SPECS SRPMS TESTDIR TESTDIR.A + $(rm) -rf ALL.OUT.* PARALLEL_TESTDIR.* + $(rm) -rf RUN_LOG RUNQUEUE TESTDIR TESTDIR.A $(rm) -rf TEST.LIST logtrack_seen.db tm .libs $(LIB_INSTALL_FILE_LIST) REALCLEAN_LIST=\ Makefile confdefs.h config.cache config.log config.status \ - configure.lineno db.h db.spec db185_int.h db_185.h db_config.h \ - db_cxx.h db_int.h db_int_def.h include.tcl rpm-macro-defines win_db.h + configure.lineno db.h db185_int.h db_185.h db_config.h \ + db_cxx.h db_int.h db_int_def.h include.tcl \ + db_server.h db_server_clnt.c db_server_svc.c db_server_xdr.c \ + gen_db_server.c win_db.h distclean maintainer-clean realclean: clean $(rm) -rf $(REALCLEAN_LIST) @@ -911,7 +947,7 @@ distclean maintainer-clean realclean: clean check depend dvi info obj TAGS: @echo "$@: make target not supported" && true -dist: +dist rpm rpmbuild: @echo "$@: make target not supported" && false ################################################## @@ -945,7 +981,7 @@ DBS_OBJS=\ dbs_yield@o@ dbs: $(DBS_OBJS) $(DEF_LIB) $(CCLINK) -o $@ \ - $(LDFLAGS) $(DBS_OBJS) $(DEF_LIB) @LOAD_LIBS@ $(LIBS) + $(LDFLAGS) $(DBS_OBJS) $(DEF_LIB) $(TEST_LIBS) $(LIBS) $(POSTLINK) $@ db_perf@o@: $(srcdir)/test_perf/db_perf.c @@ -999,13 +1035,13 @@ DBPERF_OBJS=\ db_perf: $(DBPERF_OBJS) $(DEF_LIB) $(CCLINK) -o $@ \ - $(LDFLAGS) $(DBPERF_OBJS) $(DEF_LIB) @LOAD_LIBS@ $(LIBS) + $(LDFLAGS) $(DBPERF_OBJS) $(DEF_LIB) $(TEST_LIBS) $(LIBS) $(POSTLINK) $@ tm@o@: $(srcdir)/mutex/tm.c $(CC) $(CFLAGS) $? tm: tm@o@ $(DEF_LIB) - $(CCLINK) -o $@ $(LDFLAGS) tm@o@ $(DEF_LIB) @LOAD_LIBS@ $(LIBS) + $(CCLINK) -o $@ $(LDFLAGS) tm@o@ $(DEF_LIB) $(TEST_LIBS) $(LIBS) $(POSTLINK) $@ ################################################## @@ -1032,7 +1068,7 @@ ex_apprec_rec@o@: $(srcdir)/examples_c/ex_apprec/ex_apprec_rec.c EX_APPREC_OBJS=ex_apprec@o@ ex_apprec_auto@o@ ex_apprec_rec@o@ ex_apprec: $(EX_APPREC_OBJS) $(DEF_LIB) $(CCLINK) -o $@ \ - $(LDFLAGS) $(EX_APPREC_OBJS) $(DEF_LIB) @LOAD_LIBS@ $(LIBS) + $(LDFLAGS) $(EX_APPREC_OBJS) $(DEF_LIB) $(TEST_LIBS) $(LIBS) ex_btrec@o@: $(srcdir)/examples_c/ex_btrec.c $(CC) $(CFLAGS) $? @@ -1078,14 +1114,20 @@ EX_RQ_OBJS=\ ex_rq_client@o@ ex_rq_main@o@ ex_rq_master@o@ ex_rq_net@o@ ex_rq_util@o@ ex_repquote: $(EX_RQ_OBJS) $(DEF_LIB) $(CCLINK) -o $@ \ - $(LDFLAGS) $(EX_RQ_OBJS) $(DEF_LIB) @LOAD_LIBS@ $(LIBS) + $(LDFLAGS) $(EX_RQ_OBJS) $(DEF_LIB) $(TEST_LIBS) $(LIBS) + $(POSTLINK) $@ + +ex_sequence@o@: $(srcdir)/examples_c/ex_sequence.c + $(CC) $(CFLAGS) $? +ex_sequence: ex_sequence@o@ $(DEF_LIB) + $(CCLINK) -o $@ $(LDFLAGS) ex_sequence@o@ $(DEF_LIB) $(LIBS) $(POSTLINK) $@ ex_thread@o@: $(srcdir)/examples_c/ex_thread.c $(CC) $(CFLAGS) $? ex_thread: ex_thread@o@ $(DEF_LIB) $(CCLINK) -o $@ \ - $(LDFLAGS) ex_thread@o@ $(DEF_LIB) @LOAD_LIBS@ $(LIBS) + $(LDFLAGS) ex_thread@o@ $(DEF_LIB) $(TEST_LIBS) $(LIBS) $(POSTLINK) $@ ex_tpcb@o@: $(srcdir)/examples_c/ex_tpcb.c @@ -1094,6 +1136,26 @@ ex_tpcb: ex_tpcb@o@ $(DEF_LIB) $(CCLINK) -o $@ $(LDFLAGS) ex_tpcb@o@ $(DEF_LIB) $(LIBS) $(POSTLINK) $@ +gettingstarted_common@o@: \ + $(srcdir)/examples_c/getting_started/gettingstarted_common.c + $(CC) -I $(srcdir)/examples_c/getting_started $(CFLAGS) $? +example_database_load@o@: \ + $(srcdir)/examples_c/getting_started/example_database_load.c + $(CC) $(CFLAGS) $? +example_database_read@o@: \ + $(srcdir)/examples_c/getting_started/example_database_read.c + $(CC) $(CFLAGS) $? +example_database_load: example_database_load@o@ gettingstarted_common@o@ \ + $(DEF_LIB) + $(CCLINK) -o $@ $(LDFLAGS) \ + example_database_load@o@ gettingstarted_common@o@ $(DEF_LIB) $(LIBS) + $(POSTLINK) $@ +example_database_read: example_database_read@o@ gettingstarted_common@o@ \ + $(DEF_LIB) + $(CCLINK) -o $@ $(LDFLAGS) \ + example_database_read@o@ gettingstarted_common@o@ $(DEF_LIB) $(LIBS) + $(POSTLINK) $@ + ################################################## # Example programs for C++. ################################################## @@ -1127,12 +1189,37 @@ excxx_mpool: MpoolExample@o@ $(DEF_LIB_CXX) $(CXXLINK) -o $@ $(LDFLAGS) MpoolExample@o@ $(DEF_LIB_CXX) $(LIBS) $(POSTLINK) $@ +SequenceExample@o@: $(srcdir)/examples_cxx/SequenceExample.cpp + $(CXX) $(CXXFLAGS) $? +excxx_sequence: SequenceExample@o@ $(DEF_LIB_CXX) + $(CXXLINK) -o $@ $(LDFLAGS) SequenceExample@o@ $(DEF_LIB_CXX) $(LIBS) + $(POSTLINK) $@ + TpcbExample@o@: $(srcdir)/examples_cxx/TpcbExample.cpp $(CXX) $(CXXFLAGS) $? excxx_tpcb: TpcbExample@o@ $(DEF_LIB_CXX) $(CXXLINK) -o $@ $(LDFLAGS) TpcbExample@o@ $(DEF_LIB_CXX) $(LIBS) $(POSTLINK) $@ +excxx_example_database_load@o@: \ + $(srcdir)/examples_cxx/getting_started/excxx_example_database_load.cpp + $(CXX) -I$(srcdir)/examples_cxx/getting_started $(CXXFLAGS) $? +excxx_example_database_read@o@: \ + $(srcdir)/examples_cxx/getting_started/excxx_example_database_read.cpp + $(CXX) -I$(srcdir)/examples_cxx/getting_started $(CXXFLAGS) $? +MyDb@o@: $(srcdir)/examples_cxx/getting_started/MyDb.cpp + $(CXX) -I$(srcdir)/examples_cxx/getting_started $(CXXFLAGS) $? +excxx_example_database_load: \ + excxx_example_database_load@o@ MyDb@o@ $(DEF_LIB_CXX) + $(CXXLINK) -o $@ $(LDFLAGS) \ + excxx_example_database_load@o@ MyDb@o@ $(DEF_LIB_CXX) $(LIBS) + $(POSTLINK) $@ +excxx_example_database_read: \ + excxx_example_database_read@o@ MyDb@o@ $(DEF_LIB_CXX) + $(CXXLINK) -o $@ $(LDFLAGS) \ + excxx_example_database_read@o@ MyDb@o@ $(DEF_LIB_CXX) $(LIBS) + $(POSTLINK) $@ + ################################################## # C API build rules. ################################################## @@ -1174,8 +1261,12 @@ bt_verify@o@: $(srcdir)/btree/bt_verify.c $(CC) $(CFLAGS) $? btree_auto@o@: $(srcdir)/btree/btree_auto.c $(CC) $(CFLAGS) $? +btree_autop@o@: $(srcdir)/btree/btree_autop.c + $(CC) $(CFLAGS) $? crdel_auto@o@: $(srcdir)/db/crdel_auto.c $(CC) $(CFLAGS) $? +crdel_autop@o@: $(srcdir)/db/crdel_autop.c + $(CC) $(CFLAGS) $? crdel_rec@o@: $(srcdir)/db/crdel_rec.c $(CC) $(CFLAGS) $? crypto@o@: $(srcdir)/crypto/crypto.c @@ -1190,6 +1281,8 @@ db_am@o@: $(srcdir)/db/db_am.c $(CC) $(CFLAGS) $? db_auto@o@: $(srcdir)/db/db_auto.c $(CC) $(CFLAGS) $? +db_autop@o@: $(srcdir)/db/db_autop.c + $(CC) $(CFLAGS) $? db_byteorder@o@: $(srcdir)/common/db_byteorder.c $(CC) $(CFLAGS) $? db_cam@o@: $(srcdir)/db/db_cam.c @@ -1234,10 +1327,16 @@ db_remove@o@: $(srcdir)/db/db_remove.c $(CC) $(CFLAGS) $? db_ret@o@: $(srcdir)/db/db_ret.c $(CC) $(CFLAGS) $? +db_setid@o@: $(srcdir)/db/db_setid.c + $(CC) $(CFLAGS) $? +db_setlsn@o@: $(srcdir)/db/db_setlsn.c + $(CC) $(CFLAGS) $? db_salloc@o@: $(srcdir)/env/db_salloc.c $(CC) $(CFLAGS) $? db_shash@o@: $(srcdir)/env/db_shash.c $(CC) $(CFLAGS) $? +db_stati@o@: $(srcdir)/db/db_stati.c + $(CC) $(CFLAGS) $? db_truncate@o@: $(srcdir)/db/db_truncate.c $(CC) $(CFLAGS) $? db_upg@o@: $(srcdir)/db/db_upg.c @@ -1256,8 +1355,12 @@ dbreg@o@: $(srcdir)/dbreg/dbreg.c $(CC) $(CFLAGS) $? dbreg_auto@o@: $(srcdir)/dbreg/dbreg_auto.c $(CC) $(CFLAGS) $? +dbreg_autop@o@: $(srcdir)/dbreg/dbreg_autop.c + $(CC) $(CFLAGS) $? dbreg_rec@o@: $(srcdir)/dbreg/dbreg_rec.c $(CC) $(CFLAGS) $? +dbreg_stat@o@: $(srcdir)/dbreg/dbreg_stat.c + $(CC) $(CFLAGS) $? dbreg_util@o@: $(srcdir)/dbreg/dbreg_util.c $(CC) $(CFLAGS) $? env_file@o@: $(srcdir)/env/env_file.c @@ -1270,8 +1373,12 @@ env_recover@o@: $(srcdir)/env/env_recover.c $(CC) $(CFLAGS) $? env_region@o@: $(srcdir)/env/env_region.c $(CC) $(CFLAGS) $? +env_stat@o@: $(srcdir)/env/env_stat.c + $(CC) $(CFLAGS) $? fileops_auto@o@: $(srcdir)/fileops/fileops_auto.c $(CC) $(CFLAGS) $? +fileops_autop@o@: $(srcdir)/fileops/fileops_autop.c + $(CC) $(CFLAGS) $? fop_basic@o@: $(srcdir)/fileops/fop_basic.c $(CC) $(CFLAGS) $? fop_rec@o@: $(srcdir)/fileops/fop_rec.c @@ -1282,6 +1389,8 @@ hash@o@: $(srcdir)/hash/hash.c $(CC) $(CFLAGS) $? hash_auto@o@: $(srcdir)/hash/hash_auto.c $(CC) $(CFLAGS) $? +hash_autop@o@: $(srcdir)/hash/hash_autop.c + $(CC) $(CFLAGS) $? hash_conv@o@: $(srcdir)/hash/hash_conv.c $(CC) $(CFLAGS) $? hash_dup@o@: $(srcdir)/hash/hash_dup.c @@ -1316,12 +1425,18 @@ lock@o@: $(srcdir)/lock/lock.c $(CC) $(CFLAGS) $? lock_deadlock@o@:$(srcdir)/lock/lock_deadlock.c $(CC) $(CFLAGS) $? +lock_id@o@:$(srcdir)/lock/lock_id.c + $(CC) $(CFLAGS) $? +lock_list@o@:$(srcdir)/lock/lock_list.c + $(CC) $(CFLAGS) $? lock_method@o@:$(srcdir)/lock/lock_method.c $(CC) $(CFLAGS) $? lock_region@o@:$(srcdir)/lock/lock_region.c $(CC) $(CFLAGS) $? lock_stat@o@:$(srcdir)/lock/lock_stat.c $(CC) $(CFLAGS) $? +lock_timer@o@:$(srcdir)/lock/lock_timer.c + $(CC) $(CFLAGS) $? lock_util@o@:$(srcdir)/lock/lock_util.c $(CC) $(CFLAGS) $? log@o@: $(srcdir)/log/log.c @@ -1336,12 +1451,16 @@ log_method@o@: $(srcdir)/log/log_method.c $(CC) $(CFLAGS) $? log_put@o@: $(srcdir)/log/log_put.c $(CC) $(CFLAGS) $? +log_stat@o@: $(srcdir)/log/log_stat.c + $(CC) $(CFLAGS) $? mp_alloc@o@: $(srcdir)/mp/mp_alloc.c $(CC) $(CFLAGS) $? mp_bh@o@: $(srcdir)/mp/mp_bh.c $(CC) $(CFLAGS) $? mp_fget@o@: $(srcdir)/mp/mp_fget.c $(CC) $(CFLAGS) $? +mp_fmethod@o@: $(srcdir)/mp/mp_fmethod.c + $(CC) $(CFLAGS) $? mp_fopen@o@: $(srcdir)/mp/mp_fopen.c $(CC) $(CFLAGS) $? mp_fput@o@: $(srcdir)/mp/mp_fput.c @@ -1420,12 +1539,16 @@ os_stat@o@: $(srcdir)/@OSDIR@/os_stat.c $(CC) $(CFLAGS) $? os_tmpdir@o@: $(srcdir)/os/os_tmpdir.c $(CC) $(CFLAGS) $? +os_truncate@o@: $(srcdir)/@OSDIR@/os_truncate.c + $(CC) $(CFLAGS) $? os_unlink@o@: $(srcdir)/os/os_unlink.c $(CC) $(CFLAGS) $? qam@o@: $(srcdir)/qam/qam.c $(CC) $(CFLAGS) $? qam_auto@o@: $(srcdir)/qam/qam_auto.c $(CC) $(CFLAGS) $? +qam_autop@o@: $(srcdir)/qam/qam_autop.c + $(CC) $(CFLAGS) $? qam_conv@o@: $(srcdir)/qam/qam_conv.c $(CC) $(CFLAGS) $? qam_files@o@: $(srcdir)/qam/qam_files.c @@ -1444,6 +1567,12 @@ qam_upgrade@o@: $(srcdir)/qam/qam_upgrade.c $(CC) $(CFLAGS) $? qam_verify@o@: $(srcdir)/qam/qam_verify.c $(CC) $(CFLAGS) $? +rep_auto@o@: $(srcdir)/rep/rep_auto.c + $(CC) $(CFLAGS) $? +rep_autop@o@: $(srcdir)/rep/rep_autop.c + $(CC) $(CFLAGS) $? +rep_backup@o@: $(srcdir)/rep/rep_backup.c + $(CC) $(CFLAGS) $? rep_method@o@: $(srcdir)/rep/rep_method.c $(CC) $(CFLAGS) $? rep_record@o@: $(srcdir)/rep/rep_record.c @@ -1452,18 +1581,28 @@ rep_region@o@: $(srcdir)/rep/rep_region.c $(CC) $(CFLAGS) $? rep_stub@o@: $(srcdir)/rep/rep_stub.c $(CC) $(CFLAGS) $? +rep_stat@o@: $(srcdir)/rep/rep_stat.c + $(CC) $(CFLAGS) $? rep_util@o@: $(srcdir)/rep/rep_util.c $(CC) $(CFLAGS) $? rijndael-alg-fst@o@: $(srcdir)/crypto/rijndael/rijndael-alg-fst.c $(CC) $(CFLAGS) $? rijndael-api-fst@o@: $(srcdir)/crypto/rijndael/rijndael-api-fst.c $(CC) $(CFLAGS) $? +seq_stat@o@: $(srcdir)/sequence/seq_stat.c + $(CC) $(CFLAGS) $? +sequence@o@: $(srcdir)/sequence/sequence.c + $(CC) $(CFLAGS) $? sha1@o@: $(srcdir)/hmac/sha1.c $(CC) $(CFLAGS) $? +stat_stub@o@: $(srcdir)/common/stat_stub.c + $(CC) $(CFLAGS) $? txn@o@: $(srcdir)/txn/txn.c $(CC) $(CFLAGS) $? txn_auto@o@: $(srcdir)/txn/txn_auto.c $(CC) $(CFLAGS) $? +txn_autop@o@: $(srcdir)/txn/txn_autop.c + $(CC) $(CFLAGS) $? txn_method@o@: $(srcdir)/txn/txn_method.c $(CC) $(CFLAGS) $? txn_rec@o@: $(srcdir)/txn/txn_rec.c @@ -1510,10 +1649,12 @@ cxx_logc@o@: $(srcdir)/cxx/cxx_logc.cpp $(CXX) $(CXXFLAGS) $? cxx_mpool@o@: $(srcdir)/cxx/cxx_mpool.cpp $(CXX) $(CXXFLAGS) $? -cxx_txn@o@: $(srcdir)/cxx/cxx_txn.cpp - $(CXX) $(CXXFLAGS) $? cxx_multi@o@: $(srcdir)/cxx/cxx_multi.cpp $(CXX) $(CXXFLAGS) $? +cxx_seq@o@: $(srcdir)/cxx/cxx_seq.cpp + $(CXX) $(CXXFLAGS) $? +cxx_txn@o@: $(srcdir)/cxx/cxx_txn.cpp + $(CXX) $(CXXFLAGS) $? ################################################## # Java API build rules. @@ -1544,6 +1685,8 @@ tcl_mp@o@: $(srcdir)/tcl/tcl_mp.c $(CC) $(CFLAGS) $(TCFLAGS) $? tcl_rep@o@: $(srcdir)/tcl/tcl_rep.c $(CC) $(CFLAGS) $(TCFLAGS) $? +tcl_seq@o@: $(srcdir)/tcl/tcl_seq.c + $(CC) $(CFLAGS) $(TCFLAGS) $? tcl_txn@o@: $(srcdir)/tcl/tcl_txn.c $(CC) $(CFLAGS) $(TCFLAGS) $? tcl_util@o@: $(srcdir)/tcl/tcl_util.c @@ -1555,7 +1698,7 @@ tcl_util@o@: $(srcdir)/tcl/tcl_util.c # RPC client files client@o@: $(srcdir)/rpc_client/client.c $(CC) $(CFLAGS) $? -db_server_clnt@o@: $(srcdir)/rpc_client/db_server_clnt.c +db_server_clnt@o@: db_server_clnt.c $(CC) $(CFLAGS) $? gen_client@o@: $(srcdir)/rpc_client/gen_client.c $(CC) $(CFLAGS) $? @@ -1565,13 +1708,13 @@ gen_client_ret@o@: $(srcdir)/rpc_client/gen_client_ret.c # RPC server files db_server_proc@o@: $(srcdir)/rpc_server/c/db_server_proc.c $(CC) $(CFLAGS) $? -db_server_svc@o@: $(srcdir)/rpc_server/c/db_server_svc.c +db_server_svc@o@: db_server_svc.c $(CC) $(CFLAGS) $? db_server_util@o@: $(srcdir)/rpc_server/c/db_server_util.c $(CC) $(CFLAGS) $? -db_server_xdr@o@: $(srcdir)/rpc_server/c/db_server_xdr.c +db_server_xdr@o@: db_server_xdr.c $(CC) $(CFLAGS) $? -gen_db_server@o@: $(srcdir)/rpc_server/c/gen_db_server.c +gen_db_server@o@: gen_db_server.c $(CC) $(CFLAGS) $? db_server_cxxproc@o@: $(srcdir)/rpc_server/cxx/db_server_cxxproc.cpp $(CXX) $(CXXFLAGS) $? @@ -1627,5 +1770,3 @@ snprintf@o@: $(srcdir)/clib/snprintf.c $(CC) $(CFLAGS) $? strerror@o@: $(srcdir)/clib/strerror.c $(CC) $(CFLAGS) $? -vsnprintf@o@: $(srcdir)/clib/vsnprintf.c - $(CC) $(CFLAGS) $? diff --git a/db/dist/RELEASE b/db/dist/RELEASE index aec0cdc8a..4de7d27cd 100644 --- a/db/dist/RELEASE +++ b/db/dist/RELEASE @@ -1,8 +1,8 @@ -# $Id: RELEASE,v 11.173 2003/12/03 21:15:38 bostic Exp $ +# $Id: RELEASE,v 11.188 2004/10/14 15:32:29 bostic Exp $ DB_VERSION_MAJOR=4 -DB_VERSION_MINOR=2 -DB_VERSION_PATCH=52 +DB_VERSION_MINOR=3 +DB_VERSION_PATCH=14 DB_VERSION="$DB_VERSION_MAJOR.$DB_VERSION_MINOR.$DB_VERSION_PATCH" DB_VERSION_UNIQUE_NAME=`printf "_%d%03d" $DB_VERSION_MAJOR $DB_VERSION_MINOR` diff --git a/db/dist/aclocal/libtool.ac b/db/dist/aclocal/libtool.ac index 59d0b0938..71dae456a 100644 --- a/db/dist/aclocal/libtool.ac +++ b/db/dist/aclocal/libtool.ac @@ -1,5 +1,5 @@ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- -## Copyright 1996, 1997, 1998, 1999, 2000, 2001 +## Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004 ## Free Software Foundation, Inc. ## Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 ## @@ -200,6 +200,8 @@ if test -n "$RANLIB"; then old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" fi +cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'` + # Only perform the check for file, if the check method requires it case $deplibs_check_method in file_magic*) @@ -317,7 +319,7 @@ fi # The HP-UX ksh and POSIX shell print the target directory to stdout # if CDPATH is set. -if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH if test -z "$ECHO"; then if test "X${echo_test_string+set}" != Xset; then @@ -500,7 +502,7 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) x86_64-*linux*) LD="${LD-ld} -m elf_i386" ;; - ppc64-*linux*) + ppc64-*linux*|powerpc64-*linux*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -564,7 +566,8 @@ need_locks="$enable_libtool_lock" # ---------------------------------------------------------------- # Check whether the given compiler option works AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], -[AC_CACHE_CHECK([$1], [$2], +[AC_REQUIRE([LT_AC_PROG_SED]) +AC_CACHE_CHECK([$1], [$2], [$2=no ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) printf "$lt_simple_compile_test_code" > conftest.$ac_ext @@ -640,7 +643,7 @@ AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], AC_MSG_CHECKING([the maximum length of command line arguments]) AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl i=0 - testring="ABCD" + teststring="ABCD" case $build_os in msdosdjgpp*) @@ -669,20 +672,40 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl lt_cv_sys_max_cmd_len=8192; ;; + amigaos*) + # On AmigaOS with pdksh, this test takes hours, literally. + # So we just punt and use a minimum line length of 8192. + lt_cv_sys_max_cmd_len=8192; + ;; + + netbsd* | freebsd* | openbsd* | darwin* ) + # This has been around since 386BSD, at least. Likely further. + if test -x /sbin/sysctl; then + lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` + elif test -x /usr/sbin/sysctl; then + lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` + else + lt_cv_sys_max_cmd_len=65536 # usable default for *BSD + fi + # And add a safety zone + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` + ;; + *) # If test is not a shell built-in, we'll probably end up computing a # maximum length that is only half of the actual maximum length, but # we can't tell. - while (test "X"`$CONFIG_SHELL [$]0 --fallback-echo "X$testring" 2>/dev/null` \ - = "XX$testring") >/dev/null 2>&1 && - new_result=`expr "X$testring" : ".*" 2>&1` && + SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} + while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \ + = "XX$teststring") >/dev/null 2>&1 && + new_result=`expr "X$teststring" : ".*" 2>&1` && lt_cv_sys_max_cmd_len=$new_result && test $i != 17 # 1/2 MB should be enough do i=`expr $i + 1` - testring=$testring$testring + teststring=$teststring$teststring done - testring= + teststring= # Add a significant safety factor because C++ compilers can tack on massive # amounts of additional arguments before passing them to the linker. # It appears as though 1/2 is a usable value. @@ -832,7 +855,7 @@ else lt_cv_dlopen_self=yes ]) ;; - + *) AC_CHECK_FUNC([shl_load], [lt_cv_dlopen="shl_load"], @@ -921,13 +944,6 @@ AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext], mkdir out printf "$lt_simple_compile_test_code" > conftest.$ac_ext - # According to Tom Tromey, Ian Lance Taylor reported there are C compilers - # that will create temporary files in the current directory regardless of - # the output directory. Thus, making CWD read-only will cause this test - # to fail, enabling locking or at least warning the user not to do parallel - # builds. - chmod -w . - lt_compiler_flag="-o out/conftest2.$ac_objext" # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. @@ -951,8 +967,11 @@ AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext], fi fi chmod u+w . - $rm conftest* out/* - rmdir out + $rm conftest* + # SGI C++ compiler will create directory out/ii_files/ for + # template instantiation + test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files + $rm out/* && rmdir out cd .. rmdir conftest $rm conftest* @@ -1011,8 +1030,8 @@ AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_MSG_CHECKING([how to hardcode library paths into programs]) _LT_AC_TAGVAR(hardcode_action, $1)= if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \ - test -n "$_LT_AC_TAGVAR(runpath_var $1)" || \ - test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)"="Xyes" ; then + test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \ + test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then # We can hardcode non-existant directories. if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no && @@ -1069,7 +1088,7 @@ fi *) AC_MSG_RESULT([no]) ;; - esac + esac fi ])# AC_LIBTOOL_SYS_LIB_STRIP @@ -1082,7 +1101,7 @@ AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER], library_names_spec= libname_spec='lib$name' soname_spec= -shrext=".so" +shrext_cmds=".so" postinstall_cmds= postuninstall_cmds= finish_cmds= @@ -1170,7 +1189,7 @@ aix4* | aix5*) amigaos*) library_names_spec='$libname.ixlibrary $libname.a' # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done' + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' ;; beos*) @@ -1179,7 +1198,7 @@ beos*) shlibpath_var=LIBRARY_PATH ;; -bsdi4*) +bsdi[[45]]*) version_type=linux need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -1195,7 +1214,7 @@ bsdi4*) cygwin* | mingw* | pw32*) version_type=windows - shrext=".dll" + shrext_cmds=".dll" need_version=no need_lib_prefix=no @@ -1217,7 +1236,7 @@ cygwin* | mingw* | pw32*) cygwin*) # Cygwin DLLs use 'cyg' prefix rather than 'lib' soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec="/lib /lib/w32api /usr/lib /usr/local/lib" + sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" ;; mingw*) # MinGW DLLs use traditional 'lib' prefix @@ -1256,17 +1275,16 @@ darwin* | rhapsody*) version_type=darwin need_lib_prefix=no need_version=no - # FIXME: Relying on posixy $() will cause problems for - # cross-compilation, but unfortunately the echo tests do not - # yet detect zsh echo's removal of \ escapes. library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' soname_spec='${libname}${release}${major}$shared_ext' shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH - shrext='$(test .$module = .yes && echo .so || echo .dylib)' + shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)' # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. - if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then - sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` + if test "$GCC" = yes; then + sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` + else + sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' fi sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' ;; @@ -1284,6 +1302,18 @@ freebsd1*) dynamic_linker=no ;; +kfreebsd*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='GNU ld.so' + ;; + freebsd*) objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` version_type=freebsd-$objformat @@ -1332,7 +1362,7 @@ hpux9* | hpux10* | hpux11*) need_version=no case "$host_cpu" in ia64*) - shrext='.so' + shrext_cmds='.so' hardcode_into_libs=yes dynamic_linker="$host_os dld.so" shlibpath_var=LD_LIBRARY_PATH @@ -1347,7 +1377,7 @@ hpux9* | hpux10* | hpux11*) sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; hppa*64*) - shrext='.sl' + shrext_cmds='.sl' hardcode_into_libs=yes dynamic_linker="$host_os dld.sl" shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH @@ -1358,7 +1388,7 @@ hpux9* | hpux10* | hpux11*) sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; *) - shrext='.sl' + shrext_cmds='.sl' dynamic_linker="$host_os dld.sl" shlibpath_var=SHLIB_PATH shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH @@ -1427,6 +1457,12 @@ linux*) # before this can be enabled. hardcode_into_libs=yes + # Append ld.so.conf contents to the search path + if test -f /etc/ld.so.conf; then + lt_ld_extra=`$SED -e 's/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g' /etc/ld.so.conf | tr '\n' ' '` + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + fi + # We used to test for /lib/ld.so.1 and disable shared libraries on # powerpc, because MkLinux only supported shared libraries with the # GNU dynamic linker. Since this was broken with cross compilers, @@ -1436,6 +1472,18 @@ linux*) dynamic_linker='GNU/Linux ld.so' ;; +knetbsd*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='GNU ld.so' + ;; + netbsd*) version_type=sunos need_lib_prefix=no @@ -1445,7 +1493,7 @@ netbsd*) finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' dynamic_linker='NetBSD (a.out) ld.so' else - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${libname}${shared_ext}' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' dynamic_linker='NetBSD ld.elf_so' fi @@ -1461,7 +1509,7 @@ newsos6) shlibpath_overrides_runpath=yes ;; -nto-qnx | nto-qnx6*) +nto-qnx*) version_type=linux need_lib_prefix=no need_version=no @@ -1494,7 +1542,7 @@ openbsd*) os2*) libname_spec='$name' - shrext=".dll" + shrext_cmds=".dll" need_lib_prefix=no library_names_spec='$libname${shared_ext} $libname.a' dynamic_linker='OS/2 ld.exe' @@ -1930,7 +1978,7 @@ fi # AC_PROG_LD # ---------- -# find the path to the GNU or non-GNU linker +# find the pathname to the GNU or non-GNU linker AC_DEFUN([AC_PROG_LD], [AC_ARG_WITH([gnu-ld], [AC_HELP_STRING([--with-gnu-ld], @@ -1956,7 +2004,7 @@ if test "$GCC" = yes; then # Accept absolute paths. [[\\/]]* | ?:[[\\/]]*) re_direlt='/[[^/]][[^/]]*/\.\./' - # Canonicalize the path of ld + # Canonicalize the pathname of ld ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'` while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"` @@ -2019,7 +2067,7 @@ AC_DEFUN([AC_PROG_LD_GNU], [AC_REQUIRE([AC_PROG_EGREP])dnl AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld, [# I'd rather use --version here, but apparently some GNU ld's only accept -v. -case `"$LD" -v 2>&1 </dev/null` in +case `$LD -v 2>&1 </dev/null` in *GNU* | *'with BFD'*) lt_cv_prog_gnu_ld=yes ;; @@ -2045,6 +2093,15 @@ case $reload_flag in *) reload_flag=" $reload_flag" ;; esac reload_cmds='$LD$reload_flag -o $output$reload_objs' +case $host_os in + darwin*) + if test "$GCC" = yes; then + reload_cmds='$CC -nostdlib ${wl}-r -o $output$reload_objs' + else + reload_cmds='$LD$reload_flag -o $output$reload_objs' + fi + ;; +esac ])# AC_PROG_LD_RELOAD_FLAG @@ -2078,34 +2135,30 @@ beos*) lt_cv_deplibs_check_method=pass_all ;; -bsdi4*) +bsdi[[45]]*) lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)' lt_cv_file_magic_cmd='/usr/bin/file -L' lt_cv_file_magic_test_file=/shlib/libc.so ;; -cygwin* | mingw* | pw32*) - # win32_libid is a shell function defined in ltmain.sh +cygwin*) + # func_win32_libid is a shell function defined in ltmain.sh lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='win32_libid' + lt_cv_file_magic_cmd='func_win32_libid' + ;; + +mingw* | pw32*) + # Base MSYS/MinGW do not provide the 'file' command needed by + # func_win32_libid shell function, so use a weaker test based on 'objdump'. + lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' + lt_cv_file_magic_cmd='$OBJDUMP -f' ;; darwin* | rhapsody*) - # this will be overwritten by pass_all, but leave it in just in case - lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library' - lt_cv_file_magic_cmd='/usr/bin/file -L' - case "$host_os" in - rhapsody* | darwin1.[[012]]) - lt_cv_file_magic_test_file=`/System/Library/Frameworks/System.framework/System` - ;; - *) # Darwin 1.3 on - lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib' - ;; - esac lt_cv_deplibs_check_method=pass_all ;; -freebsd*) +freebsd* | kfreebsd*-gnu) if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then case $host_cpu in i*86 ) @@ -2144,36 +2197,27 @@ hpux10.20* | hpux11*) ;; irix5* | irix6* | nonstopux*) - case $host_os in - irix5* | nonstopux*) - # this will be overridden with pass_all, but let us keep it just in case - lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1" - ;; - *) - case $LD in - *-32|*"-32 ") libmagic=32-bit;; - *-n32|*"-n32 ") libmagic=N32;; - *-64|*"-64 ") libmagic=64-bit;; - *) libmagic=never-match;; - esac - # this will be overridden with pass_all, but let us keep it just in case - lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[[1234]] dynamic lib MIPS - version 1" - ;; + case $LD in + *-32|*"-32 ") libmagic=32-bit;; + *-n32|*"-n32 ") libmagic=N32;; + *-64|*"-64 ") libmagic=64-bit;; + *) libmagic=never-match;; esac - lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*` lt_cv_deplibs_check_method=pass_all ;; # This must be Linux ELF. linux*) case $host_cpu in - alpha* | hppa* | i*86 | ia64* | m68* | mips | mipsel | powerpc* | sparc* | s390* | sh*) + alpha*|hppa*|i*86|ia64*|m68*|mips*|powerpc*|sparc*|s390*|sh*) lt_cv_deplibs_check_method=pass_all ;; *) # glibc up to 2.1.1 does not perform some relocations on ARM + # this will be overridden with pass_all, but let us keep it just in case lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' ;; esac lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so` + lt_cv_deplibs_check_method=pass_all ;; netbsd*) @@ -2190,24 +2234,19 @@ newos6*) lt_cv_file_magic_test_file=/usr/lib/libnls.so ;; -nto-qnx | nto-qnx6*) +nto-qnx*) lt_cv_deplibs_check_method=unknown ;; openbsd*) - lt_cv_file_magic_cmd=/usr/bin/file - lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB shared object' + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$' else - lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library' + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' fi ;; osf3* | osf4* | osf5*) - # this will be overridden with pass_all, but let us keep it just in case - lt_cv_deplibs_check_method='file_magic COFF format alpha shared library' - lt_cv_file_magic_test_file=/shlib/libc.so lt_cv_deplibs_check_method=pass_all ;; @@ -2217,7 +2256,6 @@ sco3.2v5*) solaris*) lt_cv_deplibs_check_method=pass_all - lt_cv_file_magic_test_file=/lib/libc.so ;; sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) @@ -2257,7 +2295,7 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown # AC_PROG_NM # ---------- -# find the path to a BSD-compatible name lister +# find the pathname to a BSD-compatible name lister AC_DEFUN([AC_PROG_NM], [AC_CACHE_CHECK([for BSD-compatible nm], lt_cv_path_NM, [if test -n "$NM"; then @@ -2395,7 +2433,7 @@ AC_DEFUN([AC_LIBTOOL_CXX], AC_DEFUN([_LT_AC_LANG_CXX], [AC_REQUIRE([AC_PROG_CXX]) AC_REQUIRE([AC_PROG_CXXCPP]) -_LT_AC_SHELL_INIT([tagnames=`echo "$tagnames,CXX" | sed 's/^,//'`]) +_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX]) ])# _LT_AC_LANG_CXX @@ -2411,7 +2449,7 @@ AC_DEFUN([AC_LIBTOOL_F77], # --------------- AC_DEFUN([_LT_AC_LANG_F77], [AC_REQUIRE([AC_PROG_F77]) -_LT_AC_SHELL_INIT([tagnames=`echo "$tagnames,F77" | sed 's/^,//'`]) +_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}F77]) ])# _LT_AC_LANG_F77 @@ -2432,7 +2470,7 @@ AC_DEFUN([_LT_AC_LANG_GCJ], [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])], [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])], [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])]) -_LT_AC_SHELL_INIT([tagnames=`echo "$tagnames,GCJ" | sed 's/^,//'`]) +_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}GCJ]) ])# _LT_AC_LANG_GCJ @@ -2441,7 +2479,7 @@ _LT_AC_SHELL_INIT([tagnames=`echo "$tagnames,GCJ" | sed 's/^,//'`]) # enable support for Windows resource files AC_DEFUN([AC_LIBTOOL_RC], [AC_REQUIRE([LT_AC_PROG_RC]) -_LT_AC_SHELL_INIT([tagnames=`echo "$tagnames,RC" | sed 's/^,//'`]) +_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}RC]) ])# AC_LIBTOOL_RC @@ -2483,7 +2521,7 @@ if test "$GCC" = no; then fi if test -n "$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)"; then AC_MSG_WARN([`$CC' requires `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to build shared libraries]) - if echo "$old_CC $old_CFLAGS " | grep "[[ ]]$]_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)[[[ ]]" >/dev/null; then : + if echo "$old_CC $old_CFLAGS " | grep "[[ ]]$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)[[ ]]" >/dev/null; then : else AC_MSG_WARN([add `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to the CC or CFLAGS env variable and reconfigure]) _LT_AC_TAGVAR(lt_cv_prog_cc_can_build_shared, $1)=no @@ -2510,9 +2548,9 @@ AC_LIBTOOL_PROG_COMPILER_PIC($1) AC_LIBTOOL_PROG_CC_C_O($1) AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1) AC_LIBTOOL_PROG_LD_SHLIBS($1) +AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) AC_LIBTOOL_SYS_LIB_STRIP -AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) AC_LIBTOOL_DLOPEN_SELF($1) # Report which librarie types wil actually be built @@ -2533,39 +2571,11 @@ aix3*) fi ;; -aix4*) +aix4* | aix5*) if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then test "$enable_shared" = yes && enable_static=no fi - ;; - darwin* | rhapsody*) - if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no - case "$host_os" in - rhapsody* | darwin1.[[012]]) - _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress' - ;; - *) # Darwin 1.3 on - test -z ${LD_TWOLEVEL_NAMESPACE} && _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress' - ;; - esac - # FIXME: Relying on posixy $() will cause problems for - # cross-compilation, but unfortunately the echo tests do not - # yet detect zsh echo's removal of \ escapes. Also zsh mangles - # `"' quotes if we put them in here... so don't! - output_verbose_link_cmd='echo' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring' - _LT_AC_TAGVAR(module_cmds, $1)='$CC -bundle $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -bundle $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - _LT_AC_TAGVAR(hardcode_direct, $1)=no - _LT_AC_TAGVAR(hardcode_automatic, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience' - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - fi - ;; + ;; esac AC_MSG_RESULT([$enable_shared]) @@ -2700,7 +2710,7 @@ if test "$GXX" = yes; then # linker, instead of GNU ld. If possible, this setting should # overridden to take advantage of the native linker features on # the platform it is being used on. - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' fi # Commands to make compiler produce verbose output that lists @@ -2842,6 +2852,7 @@ case $host_os in esac ;; + cygwin* | mingw* | pw32*) # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, # as there is no search path for DLLs. @@ -2865,44 +2876,68 @@ case $host_os in _LT_AC_TAGVAR(ld_shlibs, $1)=no fi ;; + darwin* | rhapsody*) + case "$host_os" in + rhapsody* | darwin1.[[012]]) + _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress' + ;; + *) # Darwin 1.3 on + if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then + _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' + else + case ${MACOSX_DEPLOYMENT_TARGET} in + 10.[[012]]) + _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' + ;; + 10.*) + _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup' + ;; + esac + fi + ;; + esac + _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_AC_TAGVAR(hardcode_direct, $1)=no + _LT_AC_TAGVAR(hardcode_automatic, $1)=yes + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='' + _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - darwin* | rhapsody*) - if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no - case "$host_os" in - rhapsody* | darwin1.[[012]]) - _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress' - ;; - *) # Darwin 1.3 on - test -z ${LD_TWOLEVEL_NAMESPACE} && _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress' - ;; - esac - lt_int_apple_cc_single_mod=no - output_verbose_link_cmd='echo' - if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then - lt_int_apple_cc_single_mod=yes - fi - if test "X$lt_int_apple_cc_single_mod" = Xyes ; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' - else - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' + if test "$GXX" = yes ; then + lt_int_apple_cc_single_mod=no + output_verbose_link_cmd='echo' + if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then + lt_int_apple_cc_single_mod=yes fi - _LT_AC_TAGVAR(module_cmds, $1)='$CC -bundle ${wl}-bind_at_load $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags' - - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's if test "X$lt_int_apple_cc_single_mod" = Xyes ; then - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' else - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' + fi + _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' + # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's + if test "X$lt_int_apple_cc_single_mod" = Xyes ; then + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + else + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + fi + _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + else + case "$cc_basename" in + xlc*) + output_verbose_link_cmd='echo' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' + _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' + # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + ;; + *) + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; + esac fi - _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -bundle $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - _LT_AC_TAGVAR(hardcode_direct, $1)=no - _LT_AC_TAGVAR(hardcode_automatic, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience' - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - fi - ;; + ;; dgux*) case $cc_basename in @@ -2928,7 +2963,7 @@ case $host_os in freebsd-elf*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;; - freebsd*) + freebsd* | kfreebsd*-gnu) # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF # conventions _LT_AC_TAGVAR(ld_shlibs, $1)=yes @@ -2959,7 +2994,7 @@ case $host_os in # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | egrep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[-]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' ;; *) if test "$GXX" = yes; then @@ -3108,9 +3143,20 @@ case $host_os in icpc) # Intel C++ with_gnu_ld=yes + # version 8.0 and above of icpc choke on multiply defined symbols + # if we add $predep_objects and $postdep_objects, however 7.1 and + # earlier do not add the objects themselves. + case `$CC -V 2>&1` in + *"Version 7."*) + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + ;; + *) # Version 8.0 or newer + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + ;; + esac _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' @@ -3167,6 +3213,20 @@ case $host_os in # Workaround some broken pre-1.5 toolchains output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' ;; + openbsd2*) + # C++ shared libraries are fairly broken + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; + openbsd*) + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + fi + output_verbose_link_cmd='echo' + ;; osf3*) case $cc_basename in KCC) @@ -3442,9 +3502,9 @@ AC_LIBTOOL_PROG_COMPILER_PIC($1) AC_LIBTOOL_PROG_CC_C_O($1) AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1) AC_LIBTOOL_PROG_LD_SHLIBS($1) +AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) AC_LIBTOOL_SYS_LIB_STRIP -AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) AC_LIBTOOL_DLOPEN_SELF($1) AC_LIBTOOL_CONFIG($1) @@ -3666,7 +3726,7 @@ aix3*) postinstall_cmds='$RANLIB $lib' fi ;; -aix4*) +aix4* | aix5*) test "$enable_shared" = yes && enable_static=no ;; esac @@ -3686,9 +3746,10 @@ AC_LIBTOOL_PROG_COMPILER_PIC($1) AC_LIBTOOL_PROG_CC_C_O($1) AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1) AC_LIBTOOL_PROG_LD_SHLIBS($1) +AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) AC_LIBTOOL_SYS_LIB_STRIP -AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) + AC_LIBTOOL_CONFIG($1) @@ -3740,9 +3801,9 @@ AC_LIBTOOL_PROG_COMPILER_PIC($1) AC_LIBTOOL_PROG_CC_C_O($1) AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1) AC_LIBTOOL_PROG_LD_SHLIBS($1) +AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) AC_LIBTOOL_SYS_LIB_STRIP -AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) AC_LIBTOOL_DLOPEN_SELF($1) AC_LIBTOOL_CONFIG($1) @@ -3807,11 +3868,12 @@ if test -f "$ltmain"; then # without removal of \ escapes. if test -n "${ZSH_VERSION+set}" ; then setopt NO_GLOB_SUBST - fi + fi # Now quote all the things that may contain metacharacters while being # careful not to overquote the AC_SUBSTed values. We take copies of the # variables and quote the copies for generation of the libtool script. - for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \ + for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \ + SED SHELL STRIP \ libname_spec library_names_spec soname_spec extract_expsyms_cmds \ old_striplib striplib file_magic_cmd finish_cmds finish_eval \ deplibs_check_method reload_flag reload_cmds need_locks \ @@ -3861,7 +3923,7 @@ if test -f "$ltmain"; then _LT_AC_TAGVAR(archive_cmds, $1) | \ _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \ _LT_AC_TAGVAR(module_cmds, $1) | \ - _LT_AC_TAGVAR(module_expsym_cmds, $1) | \ + _LT_AC_TAGVAR(module_expsym_cmds, $1) | \ _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \ _LT_AC_TAGVAR(export_symbols_cmds, $1) | \ extract_expsyms_cmds | reload_cmds | finish_cmds | \ @@ -3931,7 +3993,7 @@ Xsed="$SED -e s/^X//" # The HP-UX ksh and POSIX shell print the target directory to stdout # if CDPATH is set. -if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH # The names of the tagged configurations supported by this script. available_tags= @@ -3992,7 +4054,7 @@ LN_S=$lt_LN_S NM=$lt_NM # A symbol stripping program -STRIP=$STRIP +STRIP=$lt_STRIP # Used to examine libraries when file_magic_cmd begins "file" MAGIC_CMD=$MAGIC_CMD @@ -4023,7 +4085,7 @@ objext="$ac_objext" libext="$libext" # Shared library suffix (normally ".so"). -shrext='$shrext' +shrext_cmds='$shrext_cmds' # Executable file suffix (normally ""). exeext="$exeext" @@ -4267,7 +4329,10 @@ else # If there is no Makefile yet, we rely on a make rule to execute # `config.status --recheck' to rerun these tests and create the # libtool script then. - test -f Makefile && make "$ltmain" + ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` + if test -f "$ltmain_in"; then + test -f Makefile && make "$ltmain" + fi fi ])# AC_LIBTOOL_CONFIG @@ -4340,7 +4405,7 @@ osf*) symcode='[[BCDEGQRST]]' ;; solaris* | sysv5*) - symcode='[[BDT]]' + symcode='[[BDRT]]' ;; sysv4) symcode='[[DFNSTU]]' @@ -4358,7 +4423,7 @@ esac # If we're using GNU nm, then use its standard symbol codes. case `$NM -V 2>&1` in *GNU* | *'with BFD'*) - symcode='[[ABCDGISTW]]' ;; + symcode='[[ABCDGIRSTW]]' ;; esac # Try without a prefix undercore, then with it. @@ -4560,6 +4625,16 @@ AC_MSG_CHECKING([for $compiler option to produce PIC]) ;; esac ;; + darwin*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + case "$cc_basename" in + xlc*) + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon' + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + ;; + esac + ;; dgux*) case $cc_basename in ec++) @@ -4573,7 +4648,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC]) ;; esac ;; - freebsd*) + freebsd* | kfreebsd*-gnu) # FreeBSD uses GNU C++ ;; hpux9* | hpux10* | hpux11*) @@ -4624,7 +4699,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC]) _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' - ;; + ;; cxx) # Compaq C++ # Make sure the PIC flag is empty. It appears that all Alpha @@ -4813,6 +4888,16 @@ AC_MSG_CHECKING([for $compiler option to produce PIC]) _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' fi ;; + darwin*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + case "$cc_basename" in + xlc*) + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon' + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + ;; + esac + ;; mingw* | pw32* | os2*) # This hack is so that the source file can tell whether it is being @@ -4849,12 +4934,12 @@ AC_MSG_CHECKING([for $compiler option to produce PIC]) linux*) case $CC in - icc|ecc) + icc* | ecc*) _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' ;; - ccc) + ccc*) _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' # All Alpha code is PIC. _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' @@ -4984,7 +5069,7 @@ ifelse([$1],[CXX],[ _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown _LT_AC_TAGVAR(hardcode_automatic, $1)=no _LT_AC_TAGVAR(module_cmds, $1)= - _LT_AC_TAGVAR(module_expsym_cmds, $1)= + _LT_AC_TAGVAR(module_expsym_cmds, $1)= _LT_AC_TAGVAR(always_export_symbols, $1)=no _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' # include_expsyms should be a list of space-separated symbols to be *always* @@ -5127,6 +5212,31 @@ EOF _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ;; + linux*) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_AC_TAGVAR(archive_cmds, $1)="$tmp_archive_cmds" + supports_anon_versioning=no + case `$LD -v 2>/dev/null` in + *\ [01].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 + *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... + *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... + *\ 2.11.*) ;; # other 2.11 versions + *) supports_anon_versioning=yes ;; + esac + if test $supports_anon_versioning = yes; then + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~ +cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ +$echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + else + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="$tmp_archive_cmds" + fi + else + _LT_AC_TAGVAR(ld_shlibs, $1)=no + fi + ;; + *) if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' @@ -5289,7 +5399,7 @@ EOF _LT_AC_TAGVAR(ld_shlibs, $1)=no ;; - bsdi4*) + bsdi[[45]]*) _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic ;; @@ -5303,7 +5413,7 @@ EOF # Tell ltmain to make .lib files, not .a files. libext=lib # Tell ltmain to make .dll files, not .so files. - shrext=".dll" + shrext_cmds=".dll" # FIXME: Setting linknames here is a bad hack. _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' # The linker will automatically build a .lib file if we build a DLL. @@ -5315,44 +5425,53 @@ EOF ;; darwin* | rhapsody*) - if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no case "$host_os" in - rhapsody* | darwin1.[[012]]) - _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress' - ;; - *) # Darwin 1.3 on - test -z ${LD_TWOLEVEL_NAMESPACE} && _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress' - ;; + rhapsody* | darwin1.[[012]]) + _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress' + ;; + *) # Darwin 1.3 on + if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then + _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' + else + case ${MACOSX_DEPLOYMENT_TARGET} in + 10.[[012]]) + _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' + ;; + 10.*) + _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup' + ;; + esac + fi + ;; esac - # FIXME: Relying on posixy $() will cause problems for - # cross-compilation, but unfortunately the echo tests do not - # yet detect zsh echo's removal of \ escapes. Also zsh mangles - # `"' quotes if we put them in here... so don't! - lt_int_apple_cc_single_mod=no - output_verbose_link_cmd='echo' - if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then - lt_int_apple_cc_single_mod=yes - fi - if test "X$lt_int_apple_cc_single_mod" = Xyes ; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' - else - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' - fi - _LT_AC_TAGVAR(module_cmds, $1)='$CC -bundle ${wl}-bind_at_load $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's - if test "X$lt_int_apple_cc_single_mod" = Xyes ; then - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - else - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - fi - _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -bundle $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no _LT_AC_TAGVAR(hardcode_direct, $1)=no _LT_AC_TAGVAR(hardcode_automatic, $1)=yes _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience' + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='' _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - fi + if test "$GCC" = yes ; then + output_verbose_link_cmd='echo' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' + _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' + # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + else + case "$cc_basename" in + xlc*) + output_verbose_link_cmd='echo' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' + _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' + # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + ;; + *) + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; + esac + fi ;; dgux*) @@ -5385,7 +5504,7 @@ EOF ;; # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd*) + freebsd* | kfreebsd*-gnu) _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' _LT_AC_TAGVAR(hardcode_direct, $1)=yes @@ -5496,6 +5615,7 @@ EOF _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' else @@ -5702,7 +5822,7 @@ x|xyes) AC_MSG_CHECKING([whether -lc should be explicitly linked in]) $rm conftest* printf "$lt_simple_compile_test_code" > conftest.$ac_ext - + if AC_TRY_EVAL(ac_compile) 2>conftest.err; then soname=conftest lib=conftest @@ -5861,7 +5981,7 @@ for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do fi done done -SED=$lt_cv_path_SED ]) +SED=$lt_cv_path_SED AC_MSG_RESULT([$SED]) ]) diff --git a/db/dist/aclocal/mutex.ac b/db/dist/aclocal/mutex.ac index 4f2b0189e..959ed4ebe 100644 --- a/db/dist/aclocal/mutex.ac +++ b/db/dist/aclocal/mutex.ac @@ -1,28 +1,6 @@ -# $Id: mutex.ac,v 11.42 2003/06/16 14:54:39 bostic Exp $ +# $Id: mutex.ac,v 11.46 2004/07/09 16:23:19 bostic Exp $ # POSIX pthreads tests: inter-process safe and intra-process only. -# -# We need to run a test here, because the PTHREAD_PROCESS_SHARED flag compiles -# fine on problematic systems, but won't actually work. This is a problem for -# cross-compilation environments. I think inter-process mutexes are as likely -# to fail in cross-compilation environments as real ones (especially since the -# likely cross-compilation environment is Linux, where inter-process mutexes -# don't currently work -- the latest estimate I've heard is Q1 2002, as part -# of IBM's NGPT package). So: -# -# If checking for inter-process pthreads mutexes: -# If it's local, run a test. -# If it's a cross-compilation, fail. -# -# If the user specified pthreads mutexes and we're checking for intra-process -# mutexes only: -# If it's local, run a test. -# If it's a cross-compilation, run a link-test. -# -# So, the thing you can't do here is configure for inter-process POSIX pthread -# mutexes when cross-compiling. Since we're using the GNU/Cygnus toolchain for -# cross-compilation, the target system is likely Linux or *BSD, so we're doing -# the right thing. AC_DEFUN(AM_PTHREADS_SHARED, [ AC_TRY_RUN([ #include <pthread.h> @@ -44,7 +22,27 @@ main() { pthread_cond_destroy(&cond) || pthread_condattr_destroy(&condattr) || pthread_mutexattr_destroy(&mutexattr)); -}], [db_cv_mutex="$1"],, [db_cv_mutex="no"])]) +}], [db_cv_mutex="$1"],, +AC_TRY_LINK([ +#include <pthread.h>],[ + pthread_cond_t cond; + pthread_mutex_t mutex; + pthread_condattr_t condattr; + pthread_mutexattr_t mutexattr; + exit ( + pthread_condattr_init(&condattr) || + pthread_condattr_setpshared(&condattr, PTHREAD_PROCESS_SHARED) || + pthread_mutexattr_init(&mutexattr) || + pthread_mutexattr_setpshared(&mutexattr, PTHREAD_PROCESS_SHARED) || + pthread_cond_init(&cond, &condattr) || + pthread_mutex_init(&mutex, &mutexattr) || + pthread_mutex_lock(&mutex) || + pthread_mutex_unlock(&mutex) || + pthread_mutex_destroy(&mutex) || + pthread_cond_destroy(&cond) || + pthread_condattr_destroy(&condattr) || + pthread_mutexattr_destroy(&mutexattr)); +], [db_cv_mutex="$1"]))]) AC_DEFUN(AM_PTHREADS_PRIVATE, [ AC_TRY_RUN([ #include <pthread.h> @@ -103,37 +101,27 @@ orig_libs=$LIBS # is already using one type of mutex and doesn't want to mix-and-match (for # example, on Solaris, which has POSIX, UI and LWP mutexes). Second, the # applications POSIX pthreads mutexes don't support inter-process locking, -# but the application wants to use them anyway (for example, current Linux -# and *BSD systems). -# -# If we're on Solaris, we insist that -lthread or -lpthread be used. The -# problem is the Solaris C library has UI/POSIX interface stubs, but they're -# broken, configuring them for inter-process mutexes doesn't return an error, -# but it doesn't work either. Otherwise, we try first without the library -# and then with it: there's some information that SCO/UnixWare/OpenUNIX needs -# this. [#4950] +# but the application wants to use them anyway (for example, some Linux and +# *BSD systems). # # Test for LWP threads before testing for UI/POSIX threads, we prefer them # on Solaris. There's a bug in SunOS 5.7 where applications get pwrite, not # pwrite64, if they load the C library before the appropriate threads library, # e.g., tclsh using dlopen to load the DB library. By using LWP threads we # avoid answering lots of user questions, not to mention the bugs. +# +# Otherwise, test for POSIX threads before UI threads. There are Linux systems +# that support a UI compatibility mode, and applications are more likely to be +# written for POSIX threads than UI threads. +# +# Try and link with a threads library if possible. The problem is the Solaris +# C library has UI/POSIX interface stubs, but they're broken, configuring them +# for inter-process mutexes doesn't return an error, but it doesn't work either. if test "$db_cv_posixmutexes" = yes; then - case "$host_os" in - solaris*) - db_cv_mutex="posix_library_only";; - *) - db_cv_mutex="posix_only";; - esac + db_cv_mutex="posix_only"; fi - if test "$db_cv_uimutexes" = yes; then - case "$host_os" in - solaris*) - db_cv_mutex="ui_library_only";; - *) - db_cv_mutex="ui_only";; - esac + db_cv_mutex="ui_only"; fi # User-specified Win32 mutexes (MinGW build) @@ -155,10 +143,33 @@ AC_TRY_LINK([ ], [db_cv_mutex="Solaris/lwp"]) fi -# UI threads: thr_XXX +# POSIX.1 pthreads: pthread_XXX # -# Try with and without the -lthread library. +# If the user specified we use POSIX pthreads mutexes, and we fail to find the +# full interface, try and configure for just intra-process support. +if test "$db_cv_mutex" = no -o "$db_cv_mutex" = "posix_only"; then + LIBS="$LIBS -lpthread" + AM_PTHREADS_SHARED("POSIX/pthreads/library") + LIBS="$orig_libs" +fi +if test "$db_cv_mutex" = no -o "$db_cv_mutex" = "posix_only"; then + AM_PTHREADS_SHARED("POSIX/pthreads") +fi +if test "$db_cv_mutex" = "posix_only"; then + AM_PTHREADS_PRIVATE("POSIX/pthreads/private") +fi +if test "$db_cv_mutex" = "posix_only"; then + LIBS="$LIBS -lpthread" + AM_PTHREADS_PRIVATE("POSIX/pthreads/library/private") + LIBS="$orig_libs" +fi +if test "$db_cv_mutex" = "posix_only"; then + AC_MSG_ERROR([unable to find POSIX 1003.1 mutex interfaces]) +fi + +# UI threads: thr_XXX if test "$db_cv_mutex" = no -o "$db_cv_mutex" = "ui_only"; then +LIBS="$LIBS -lthread" AC_TRY_LINK([ #include <thread.h> #include <synch.h>],[ @@ -170,11 +181,10 @@ AC_TRY_LINK([ cond_init(&cond, type, NULL) || mutex_lock(&mutex) || mutex_unlock(&mutex)); -], [db_cv_mutex="UI/threads"]) +], [db_cv_mutex="UI/threads/library"]) +LIBS="$orig_libs" fi -if test "$db_cv_mutex" = no -o \ - "$db_cv_mutex" = "ui_only" -o "$db_cv_mutex" = "ui_library_only"; then -LIBS="$LIBS -lthread" +if test "$db_cv_mutex" = no -o "$db_cv_mutex" = "ui_only"; then AC_TRY_LINK([ #include <thread.h> #include <synch.h>],[ @@ -186,42 +196,12 @@ AC_TRY_LINK([ cond_init(&cond, type, NULL) || mutex_lock(&mutex) || mutex_unlock(&mutex)); -], [db_cv_mutex="UI/threads/library"]) -LIBS="$orig_libs" +], [db_cv_mutex="UI/threads"]) fi -if test "$db_cv_mutex" = "ui_only" -o "$db_cv_mutex" = "ui_library_only"; then +if test "$db_cv_mutex" = "ui_only"; then AC_MSG_ERROR([unable to find UI mutex interfaces]) fi -# POSIX.1 pthreads: pthread_XXX -# -# Try with and without the -lpthread library. If the user specified we use -# POSIX pthreads mutexes, and we fail to find the full interface, try and -# configure for just intra-process support. -if test "$db_cv_mutex" = no -o "$db_cv_mutex" = "posix_only"; then - AM_PTHREADS_SHARED("POSIX/pthreads") -fi -if test "$db_cv_mutex" = no -o \ - "$db_cv_mutex" = "posix_only" -o "$db_cv_mutex" = "posix_library_only"; then - LIBS="$LIBS -lpthread" - AM_PTHREADS_SHARED("POSIX/pthreads/library") - LIBS="$orig_libs" -fi -if test "$db_cv_mutex" = "posix_only"; then - AM_PTHREADS_PRIVATE("POSIX/pthreads/private") -fi -if test "$db_cv_mutex" = "posix_only" -o \ - "$db_cv_mutex" = "posix_library_only"; then - LIBS="$LIBS -lpthread" - AM_PTHREADS_PRIVATE("POSIX/pthreads/library/private") - LIBS="$orig_libs" -fi - -if test "$db_cv_mutex" = "posix_only" -o \ - "$db_cv_mutex" = "posix_library_only"; then - AC_MSG_ERROR([unable to find POSIX 1003.1 mutex interfaces]) -fi - # msemaphore: HPPA only # Try HPPA before general msem test, it needs special alignment. if test "$db_cv_mutex" = no; then @@ -420,7 +400,7 @@ fi # x86/gcc: FreeBSD, NetBSD, BSD/OS, Linux if test "$db_cv_mutex" = no; then AC_TRY_COMPILE(,[ -#if (defined(i386) || defined(__i386__)) && defined(__GNUC__) +#if (defined(i386) || defined(__i386__) || defined(__x86_64__)) && defined(__GNUC__) exit(0); #else FAIL TO COMPILE/LINK @@ -523,12 +503,16 @@ POSIX/pthreads/private) ADDITIONAL_OBJS="mut_pthread${o} $ADDITIONAL_OBJS" AH_TEMPLATE(HAVE_MUTEX_THREAD_ONLY, [Define to 1 to configure mutexes intra-process only.]);; POSIX/pthreads/library) LIBS="$LIBS -lpthread" + LIBJSO_LIBS="$LIBJSO_LIBS -lpthread" + LIBTSO_LIBS="$LIBTSO_LIBS -lpthread" ADDITIONAL_OBJS="mut_pthread${o} $ADDITIONAL_OBJS" AC_DEFINE(HAVE_MUTEX_PTHREADS) AH_TEMPLATE(HAVE_MUTEX_PTHREADS, [Define to 1 to use POSIX 1003.1 pthread_XXX mutexes.]);; POSIX/pthreads/library/private) LIBS="$LIBS -lpthread" + LIBJSO_LIBS="$LIBJSO_LIBS -lpthread" + LIBTSO_LIBS="$LIBTSO_LIBS -lpthread" ADDITIONAL_OBJS="mut_pthread${o} $ADDITIONAL_OBJS" AC_DEFINE(HAVE_MUTEX_PTHREADS) AH_TEMPLATE(HAVE_MUTEX_PTHREADS, diff --git a/db/dist/aclocal/options.ac b/db/dist/aclocal/options.ac index 947a1c06b..b770fc444 100644 --- a/db/dist/aclocal/options.ac +++ b/db/dist/aclocal/options.ac @@ -1,4 +1,4 @@ -# $Id: options.ac,v 11.29 2003/11/05 18:25:41 bostic Exp $ +# $Id: options.ac,v 11.37 2004/06/10 16:38:18 bostic Exp $ # Process user-specified options. AC_DEFUN(AM_OPTIONS_SET, [ @@ -51,6 +51,16 @@ case "$enableval" in yes) AC_MSG_RESULT(no);; esac +AC_MSG_CHECKING(if --disable-statistics option specified) +AC_ARG_ENABLE(statistics, + AC_HELP_STRING([--disable-statistics], + [Do not build statistics support.]),, enableval="yes") +db_cv_build_statistics="$enableval" +case "$enableval" in + no) AC_MSG_RESULT(yes);; +yes) AC_MSG_RESULT(no);; +esac + AC_MSG_CHECKING(if --disable-verify option specified) AC_ARG_ENABLE(verify, AC_HELP_STRING([--disable-verify], @@ -137,6 +147,13 @@ AC_ARG_ENABLE(mingw, [db_cv_mingw="$enable_mingw"], [db_cv_mingw="no"]) AC_MSG_RESULT($db_cv_mingw) +AC_MSG_CHECKING(if --enable-o_direct option specified) +AC_ARG_ENABLE(o_direct, + [AC_HELP_STRING([--enable-o_direct], + [Enable the O_DIRECT flag for direct I/O.])], + [db_cv_o_direct="$enable_o_direct"], [db_cv_o_direct="no"]) +AC_MSG_RESULT($db_cv_o_direct) + AC_MSG_CHECKING(if --enable-posixmutexes option specified) AC_ARG_ENABLE(posixmutexes, [AC_HELP_STRING([--enable-posixmutexes], @@ -161,6 +178,7 @@ if test "$db_cv_smallbuild" = "yes"; then db_cv_build_hash="no" db_cv_build_queue="no" db_cv_build_replication="no" + db_cv_build_statistics="no" db_cv_build_verify="no" fi AC_MSG_RESULT($db_cv_smallbuild) @@ -189,7 +207,7 @@ AC_MSG_RESULT($db_cv_uimutexes) AC_MSG_CHECKING(if --enable-umrw option specified) AC_ARG_ENABLE(umrw, [AC_HELP_STRING([--enable-umrw], - [Mask harmless unitialized memory read/writes.])], + [Mask harmless uninitialized memory read/writes.])], [db_cv_umrw="$enable_umrw"], [db_cv_umrw="no"]) AC_MSG_RESULT($db_cv_umrw) @@ -221,22 +239,6 @@ if test "$with_mutexalign" != "no"; then fi AC_MSG_RESULT($with_mutexalign) -AC_MSG_CHECKING(if --with-rpm=ARCHIVE option specified) -AC_ARG_WITH(rpm, - [AC_HELP_STRING([--with-rpm=ARCHIVE], [Path of RPM archive.])], - [with_rpm="$withval"], [with_rpm="no"]) -if test "$with_rpm" = "no"; then - db_cv_rpm="no" - db_cv_path_rpm_archive="Not-configured-with-rpm=ARCHIVE" -else - if test "$with_rpm" = "yes"; then - AC_MSG_ERROR([--with-rpm requires an archive path argument]) - fi - db_cv_rpm="yes" - db_cv_path_rpm_archive="$with_rpm" -fi -AC_MSG_RESULT($with_rpm) - AC_MSG_CHECKING([if --with-tcl=DIR option specified]) AC_ARG_WITH(tcl, [AC_HELP_STRING([--with-tcl=DIR], @@ -271,4 +273,20 @@ if test "$db_cv_test" = "yes"; then if test "$db_cv_tcl" = "no"; then AC_MSG_ERROR([--enable-test requires --enable-tcl]) fi +fi + +# Uniquename excludes C++, Java, RPC. +if test "$db_cv_uniquename" = "yes"; then + if test "$db_cv_rpc" = "yes"; then + AC_MSG_ERROR( + [--with-uniquename is not compatible with --enable-rpc]) + fi + if test "$db_cv_cxx" = "yes"; then + AC_MSG_ERROR( + [--with-uniquename is not compatible with --enable-cxx]) + fi + if test "$db_cv_java" = "yes"; then + AC_MSG_ERROR( + [--with-uniquename is not compatible with --enable-java]) + fi fi]) diff --git a/db/dist/aclocal/programs.ac b/db/dist/aclocal/programs.ac index 7bfa1fa26..db6b4f03e 100644 --- a/db/dist/aclocal/programs.ac +++ b/db/dist/aclocal/programs.ac @@ -1,4 +1,4 @@ -# $Id: programs.ac,v 11.20 2001/09/24 02:09:25 bostic Exp $ +# $Id: programs.ac,v 11.22 2004/06/10 16:38:18 bostic Exp $ # Check for programs used in building/installation. AC_DEFUN(AM_PROGRAMS_SET, [ @@ -18,15 +18,6 @@ if test "$db_cv_path_cp" = missing_cp; then AC_MSG_ERROR([No cp utility found.]) fi -if test "$db_cv_rpm" = "yes"; then - AC_CHECK_TOOL(path_ldconfig, ldconfig, missing_ldconfig) - AC_PATH_PROG(db_cv_path_ldconfig, $path_ldconfig, missing_ldconfig) - if test "$db_cv_path_ldconfig" != missing_ldconfig; then - RPM_POST_INSTALL="%post -p $db_cv_path_ldconfig" - RPM_POST_UNINSTALL="%postun -p $db_cv_path_ldconfig" - fi -fi - AC_CHECK_TOOL(db_cv_path_ln, ln, missing_ln) if test "$db_cv_path_ln" = missing_ln; then AC_MSG_ERROR([No ln utility found.]) @@ -47,10 +38,10 @@ if test "$db_cv_path_rm" = missing_rm; then AC_MSG_ERROR([No rm utility found.]) fi -if test "$db_cv_rpm" = "yes"; then - AC_CHECK_TOOL(db_cv_path_rpm, rpm, missing_rpm) - if test "$db_cv_path_rpm" = missing_rpm; then - AC_MSG_ERROR([No rpm utility found.]) +if test "$db_cv_rpc" = "yes"; then + AC_CHECK_TOOL(db_cv_path_rpcgen, rpcgen, missing_rpcgen) + if test "$db_cv_path_rpcgen" = missing_rpcgen; then + AC_MSG_ERROR([No rpcgen utility found.]) fi fi diff --git a/db/dist/aclocal/rpc.ac b/db/dist/aclocal/rpc.ac new file mode 100644 index 000000000..7d7f4dabe --- /dev/null +++ b/db/dist/aclocal/rpc.ac @@ -0,0 +1,83 @@ +# $Id: rpc.ac,v 11.9 2004/09/27 21:33:48 mjc Exp $ + +# Try and configure RPC support. +AC_DEFUN(AM_RPC_CONFIGURE, [ + AC_DEFINE(HAVE_RPC) + AH_TEMPLATE(HAVE_RPC, [Define to 1 if building RPC client/server.]) + + # We use the target's rpcgen utility because it may be architecture + # specific, for example, 32- or 64-bit specific. + XDR_FILE=$srcdir/../rpc_server/db_server.x + + # Prefer the -C option to rpcgen which generates ANSI C-conformant + # code. + RPCGEN="rpcgen -C" + AC_MSG_CHECKING(["$RPCGEN" build of db_server.h]) + $RPCGEN -h $XDR_FILE > db_server.h 2>/dev/null + if test $? -ne 0; then + AC_MSG_RESULT([no]) + + # Try rpcgen without the -C option. + RPCGEN="rpcgen" + AC_MSG_CHECKING(["$RPCGEN" build of db_server.h]) + $RPCGEN -h $XDR_FILE > db_server.h 2>/dev/null + if test $? -ne 0; then + AC_MSG_RESULT([no]) + AC_MSG_ERROR( + [Unable to build RPC support: $RPCGEN failed.]) + fi + fi + + # Some rpcgen programs generate a set of client stubs called something + # like __db_env_create_4003 and functions on the server to handle the + # request called something like __db_env_create_4003_svc. Others + # expect client and server stubs to both be called __db_env_create_4003. + # + # We have to generate code in whichever format rpcgen expects, and the + # only reliable way to do that is to check what is in the db_server.h + # file we just created. + if grep "env_create_[[0-9]]*_svc" db_server.h >/dev/null 2>&1 ; then + sed 's/__SVCSUFFIX__/_svc/' \ + < $srcdir/../rpc_server/c/gen_db_server.c > gen_db_server.c + else + sed 's/__SVCSUFFIX__//' \ + < $srcdir/../rpc_server/c/gen_db_server.c > gen_db_server.c + fi + + AC_MSG_RESULT([yes]) + + $RPCGEN -l $XDR_FILE | + sed -e 's/^#include.*db_server.h.*/#include "db_server.h"/' \ + -e '1,/^#include/s/^#include/#include "db_config.h"\ +&/' > db_server_clnt.c + + $RPCGEN -s tcp $XDR_FILE | + sed -e 's/^#include.*db_server.h.*/#include "db_server.h"/' \ + -e 's/^main *()/__dbsrv_main()/' \ + -e 's/^main *(.*argc.*argv.*)/__dbsrv_main(int argc, char *argv[])/' \ + -e '/^db_rpc_serverprog/,/^}/{' \ + -e 's/return;//' \ + -e 's/^}/__dbsrv_timeout(0);}/' \ + -e '}' \ + -e '1,/^#include/s/^#include/#include "db_config.h"\ +&/' > db_server_svc.c + + $RPCGEN -c $XDR_FILE | + sed -e 's/^#include.*db_server.h.*/#include "db_server.h"/' \ + -e '1,/^#include/s/^#include/#include "db_config.h"\ +&/' > db_server_xdr.c + + RPC_SERVER_H=db_server.h + RPC_CLIENT_OBJS="\$(RPC_CLIENT_OBJS)" + ADDITIONAL_PROGS="berkeley_db_svc $ADDITIONAL_PROGS" + + case "$host_os" in + hpux*) + AC_CHECK_FUNC(svc_run,, + AC_CHECK_LIB(nsl, svc_run, + LIBS="-lnsl $LIBS"; LIBTSO_LIBS="-lnsl $LIBTSO_LIBS"; + LIBJSO_LIBS="-lnsl $LIBJSO_LIBS"));; + solaris*) + AC_CHECK_FUNC(svc_run,, AC_CHECK_LIB(nsl, svc_run));; + esac +]) diff --git a/db/dist/aclocal/sequence.ac b/db/dist/aclocal/sequence.ac new file mode 100644 index 000000000..278b16139 --- /dev/null +++ b/db/dist/aclocal/sequence.ac @@ -0,0 +1,67 @@ +# $Id: sequence.ac,v 1.1 2004/04/01 15:27:30 bostic Exp $ + +# Try and configure sequence support. +AC_DEFUN(AM_SEQUENCE_CONFIGURE, [ + AC_MSG_CHECKING([for 64-bit integral type support for sequences]) + db_cv_build_sequence="yes" + + # Have to be able to cast variables to the "unsigned long long" and + # "long long" types, that's our cast for the printf "%ll[du]" format. + if test "$ac_cv_type_long_long" = "no"; then + db_cv_build_sequence="no" + fi + if test "$ac_cv_type_unsigned_long_long" = "no"; then + db_cv_build_sequence="no" + fi + + # Test to see if we can declare variables of the appropriate size + # and format them. If we're cross-compiling, all we get is a link + # test, which won't test for the appropriate printf format strings. + if test "$db_cv_build_sequence" = "yes"; then + AC_TRY_RUN([ + main() { + long long l; + unsigned long long u; + char buf[100]; + + buf[0] = 'a'; + l = 9223372036854775807LL; + (void)snprintf(buf, sizeof(buf), "%lld", l); + if (strcmp(buf, "9223372036854775807")) + return (1); + u = 18446744073709551615ULL; + (void)snprintf(buf, sizeof(buf), "%llu", u); + if (strcmp(buf, "18446744073709551615")) + return (1); + return (0); + }],, [db_cv_build_sequence="no"], + AC_TRY_LINK(,[ + long long l; + unsigned long long u; + char buf[100]; + + buf[0] = 'a'; + l = 9223372036854775807LL; + (void)snprintf(buf, sizeof(buf), "%lld", l); + if (strcmp(buf, "9223372036854775807")) + return (1); + u = 18446744073709551615ULL; + (void)snprintf(buf, sizeof(buf), "%llu", u); + if (strcmp(buf, "18446744073709551615")) + return (1); + return (0); + ],, [db_cv_build_sequence="no"])) + fi + if test "$db_cv_build_sequence" = "yes"; then + AC_DEFINE(HAVE_SEQUENCE) + AH_TEMPLATE(HAVE_SEQUENCE, + [Define to 1 if building sequence support.]) + + AC_SUBST(db_seq_decl) + db_seq_decl="typedef int64_t db_seq_t;"; + else + # It still has to compile, but it won't run. + db_seq_decl="typedef int db_seq_t;"; + fi + AC_MSG_RESULT($db_cv_build_sequence) +]) diff --git a/db/dist/aclocal/sosuffix.ac b/db/dist/aclocal/sosuffix.ac index 6970d4706..8864280f1 100644 --- a/db/dist/aclocal/sosuffix.ac +++ b/db/dist/aclocal/sosuffix.ac @@ -1,4 +1,4 @@ -# $Id: sosuffix.ac,v 1.3 2003/04/19 05:11:55 dda Exp $ +# $Id: sosuffix.ac,v 1.4 2004/08/14 20:00:45 dda Exp $ # Determine shared object suffixes. # # Our method is to use the libtool variable $library_names_spec, @@ -18,11 +18,11 @@ AC_DEFUN(_SOSUFFIX_INTERNAL, [ versuffix="" release="" libname=libfoo - eval _SOSUFFIX=\"$shrext\" - if test "X$_SOSUFFIX" = "" ; then + eval _SOSUFFIX=\"$shrext_cmds\" + if test "$_SOSUFFIX" = "" ; then _SOSUFFIX=".so" if test `$LIBTOOL_PROG --config | grep build_libtool_libs | grep no` 2>/dev/null; then - if test "X$_SOSUFFIX_MESSAGE" = "X"; then + if test "$_SOSUFFIX_MESSAGE" = ""; then _SOSUFFIX_MESSAGE=yes AC_MSG_WARN([libtool may not know about this architecture.]) AC_MSG_WARN([assuming $_SUFFIX suffix for dynamic libraries.]) diff --git a/db/dist/aclocal/tcl.ac b/db/dist/aclocal/tcl.ac index 25e3a16d3..d28d36083 100644 --- a/db/dist/aclocal/tcl.ac +++ b/db/dist/aclocal/tcl.ac @@ -1,4 +1,4 @@ -# $Id: tcl.ac,v 11.17 2003/10/13 21:04:04 bostic Exp $ +# $Id: tcl.ac,v 11.18 2004/03/11 20:11:17 bostic Exp $ # The SC_* macros in this file are from the unix/tcl.m4 files in the Tcl # 8.3.0 distribution, with some minor changes. For this reason, license @@ -124,7 +124,6 @@ AC_DEFUN(SC_LOAD_TCLCONFIG, [ # Optional Tcl API. AC_DEFUN(AM_TCL_LOAD, [ -if test "$db_cv_tcl" = "yes"; then if test `$LIBTOOL_PROG --config | grep build_libtool_libs | grep no` 2>/dev/null; then AC_MSG_ERROR([Tcl requires shared libraries]) fi @@ -139,4 +138,4 @@ if test "$db_cv_tcl" = "yes"; then fi INSTALL_LIBS="${INSTALL_LIBS} \$(libtso_target)" -fi]) +]) diff --git a/db/dist/aclocal/types.ac b/db/dist/aclocal/types.ac index fdac504eb..aae40720e 100644 --- a/db/dist/aclocal/types.ac +++ b/db/dist/aclocal/types.ac @@ -1,4 +1,4 @@ -# $Id: types.ac,v 11.12 2003/09/04 23:59:06 bostic Exp $ +# $Id: types.ac,v 11.16 2004/09/15 21:49:17 mjc Exp $ # Check the sizes we know about, and see if any of them match what's needed. # @@ -14,6 +14,8 @@ AC_DEFUN(AM_SEARCH_USIZES, [ $1="typedef unsigned short $2;";; "$ac_cv_sizeof_unsigned_long") $1="typedef unsigned long $2;";; + "$ac_cv_sizeof_unsigned_long_long") + $1="typedef unsigned long long $2;";; *) AC_MSG_ERROR([No unsigned $3-byte integral type]);; esac]) @@ -27,6 +29,8 @@ AC_DEFUN(AM_SEARCH_SSIZES, [ $1="typedef short $2;";; "$ac_cv_sizeof_long") $1="typedef long $2;";; + "$ac_cv_sizeof_long_long") + $1="typedef long long $2;";; *) AC_MSG_ERROR([No signed $3-byte integral type]);; esac]) @@ -38,19 +42,41 @@ AC_DEFUN(AM_TYPES, [ # autoconf usually includes. For that reason, we specify a set of includes # for all type checking tests. [#5060] # +# C99 says types should be in <stdint.h>; include <stdint.h> if it exists. +# +# Some systems have types in <stddef.h>; include <stddef.h> if it exists. +# # IBM's OS/390 and z/OS releases have types in <inttypes.h> not also found -# in <sys/types.h>. Include <inttypes.h> as well, if it exists. -AC_SUBST(inttypes_decl) +# in <sys/types.h>; include <inttypes.h> if it exists. db_includes="#include <sys/types.h>" +AC_SUBST(inttypes_h_decl) AC_CHECK_HEADER(inttypes.h, [ - inttypes_decl="#include <inttypes.h>" db_includes="$db_includes -#include <inttypes.h>"]) +#include <inttypes.h>" + inttypes_h_decl="#include <inttypes.h>"]) +AC_SUBST(stdint_h_decl) +AC_CHECK_HEADER(stdint.h, [ + db_includes="$db_includes +#include <stdint.h>" + stdint_h_decl="#include <stdint.h>"]) +AC_SUBST(stddef_h_decl) +AC_CHECK_HEADER(stddef.h, [ + db_includes="$db_includes +#include <stddef.h>" + stddef_h_decl="#include <stddef.h>"]) db_includes="$db_includes #include <stdio.h>" +# We require off_t and size_t, and we don't try to substitute our own +# if we can't find them. +AC_CHECK_TYPE(off_t,, AC_MSG_ERROR([No off_t type.]), $db_includes) +AC_CHECK_TYPE(size_t,, AC_MSG_ERROR([No size_t type.]), $db_includes) + +# Check for long long and unsigned long long, we only support sequences +# if those types are available. +AC_CHECK_TYPES([long long, unsigned long long],,, $db_includes) + # We need to know the sizes of various objects on this system. -# We don't use the SIZEOF_XXX values created by autoconf. AC_CHECK_SIZEOF(char,, $db_includes) AC_CHECK_SIZEOF(unsigned char,, $db_includes) AC_CHECK_SIZEOF(short,, $db_includes) @@ -59,14 +85,11 @@ AC_CHECK_SIZEOF(int,, $db_includes) AC_CHECK_SIZEOF(unsigned int,, $db_includes) AC_CHECK_SIZEOF(long,, $db_includes) AC_CHECK_SIZEOF(unsigned long,, $db_includes) +AC_CHECK_SIZEOF(long long,, $db_includes) +AC_CHECK_SIZEOF(unsigned long long,, $db_includes) AC_CHECK_SIZEOF(size_t,, $db_includes) AC_CHECK_SIZEOF(char *,, $db_includes) -# We require off_t and size_t, and we don't try to substitute our own -# if we can't find them. -AC_CHECK_TYPE(off_t,, AC_MSG_ERROR([No off_t type.]), $db_includes) -AC_CHECK_TYPE(size_t,, AC_MSG_ERROR([No size_t type.]), $db_includes) - # We look for u_char, u_short, u_int, u_long -- if we can't find them, # we create our own. AC_SUBST(u_char_decl) @@ -85,6 +108,7 @@ AC_SUBST(u_long_decl) AC_CHECK_TYPE(u_long,, [u_long_decl="typedef unsigned long u_long;"], $db_includes) +# We look for fixed-size variants of u_char, u_short, u_int, u_long as well. AC_SUBST(u_int8_decl) AC_CHECK_TYPE(u_int8_t,, [AM_SEARCH_USIZES(u_int8_decl, u_int8_t, 1)], $db_includes) @@ -105,6 +129,14 @@ AC_SUBST(int32_decl) AC_CHECK_TYPE(int32_t,, [AM_SEARCH_SSIZES(int32_decl, int32_t, 4)], $db_includes) +AC_SUBST(u_int64_decl) +AC_CHECK_TYPE(u_int64_t,, + [AM_SEARCH_SSIZES(u_int64_decl, u_int64_t, 8)], $db_includes) + +AC_SUBST(int64_decl) +AC_CHECK_TYPE(int64_t,, + [AM_SEARCH_SSIZES(int64_decl, int64_t, 8)], $db_includes) + # Check for ssize_t -- if none exists, find a signed integral type that's # the same size as a size_t. AC_SUBST(ssize_t_decl) @@ -112,13 +144,16 @@ AC_CHECK_TYPE(ssize_t,, [AM_SEARCH_SSIZES(ssize_t_decl, ssize_t, $ac_cv_sizeof_size_t)], $db_includes) -# Find the largest integral type. -AC_SUBST(db_align_t_decl) -AC_CHECK_TYPE(unsigned long long, - [db_align_t_decl="typedef unsigned long long db_align_t;"], - [db_align_t_decl="typedef unsigned long db_align_t;"], $db_includes) - -# Find an integral type which is the same size as a pointer. -AC_SUBST(db_alignp_t_decl) -AM_SEARCH_USIZES(db_alignp_t_decl, db_alignp_t, $ac_cv_sizeof_char_p) +# Check for uintmax_t -- if none exists, first the largest unsigned integral +# type available. +AC_SUBST(uintmax_t_decl) +AC_CHECK_TYPE(uintmax_t,, [AC_CHECK_TYPE(unsigned long long, + [uintmax_t_decl="typedef unsigned long long uintmax_t;"], + [uintmax_t_decl="typedef unsigned long uintmax_t;"], $db_includes)]) + +# Check for uintptr_t -- if none exists, find an integral type which is +# the same size as a pointer. +AC_SUBST(uintptr_t_decl) +AC_CHECK_TYPE(uintptr_t,, + [AM_SEARCH_USIZES(uintptr_t_decl, uintptr_t, $ac_cv_sizeof_char_p)]) ]) diff --git a/db/dist/buildrel b/db/dist/buildrel index 9187cc711..76f0fe417 100644 --- a/db/dist/buildrel +++ b/db/dist/buildrel @@ -1,4 +1,4 @@ -# $Id: buildrel,v 1.57 2003/11/28 19:21:02 bostic Exp $ +# $Id: buildrel,v 1.60 2004/10/14 15:32:29 bostic Exp $ # # Build the distribution package. # @@ -17,13 +17,15 @@ echo "Version: $VERSION" # Make sure the source tree is up-to-date cd $D && cvs -q update +# Build auto-generated files. +cd $D/dist && sh s_all + # Build the documentation. cd db.docs && cvs -q update -cd db.docs && sh build ../db.rel clean && sh build ../db.rel |& sed '/.html$/d' -cd db.docs && sh build ../db.rel javadoc +cd db.docs && sh build $D clean && sh build $D |& sed '/.html$/d' +cd je/docs_src && sh build db ../../db -# Generate new support files, commit anything that's changed. -cd $D/dist && sh s_all +# Commit all of the changes. cd $D && cvs -q commit # Copy a development tree into a release tree. diff --git a/db/dist/config.guess b/db/dist/config.guess index d56c46d84..7d0185e01 100755 --- a/db/dist/config.guess +++ b/db/dist/config.guess @@ -1,9 +1,9 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. -timestamp='2003-08-18' +timestamp='2004-09-07' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -53,7 +53,7 @@ version="\ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO @@ -197,15 +197,21 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. echo "${machine}-${os}${release}" exit 0 ;; + amd64:OpenBSD:*:*) + echo x86_64-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; amiga:OpenBSD:*:*) echo m68k-unknown-openbsd${UNAME_RELEASE} exit 0 ;; - arc:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} + cats:OpenBSD:*:*) + echo arm-unknown-openbsd${UNAME_RELEASE} exit 0 ;; hp300:OpenBSD:*:*) echo m68k-unknown-openbsd${UNAME_RELEASE} exit 0 ;; + luna88k:OpenBSD:*:*) + echo m88k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; mac68k:OpenBSD:*:*) echo m68k-unknown-openbsd${UNAME_RELEASE} exit 0 ;; @@ -221,25 +227,33 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in mvmeppc:OpenBSD:*:*) echo powerpc-unknown-openbsd${UNAME_RELEASE} exit 0 ;; - pmax:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; sgi:OpenBSD:*:*) - echo mipseb-unknown-openbsd${UNAME_RELEASE} + echo mips64-unknown-openbsd${UNAME_RELEASE} exit 0 ;; sun3:OpenBSD:*:*) echo m68k-unknown-openbsd${UNAME_RELEASE} exit 0 ;; - wgrisc:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; *:OpenBSD:*:*) echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} exit 0 ;; + *:ekkoBSD:*:*) + echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} + exit 0 ;; + macppc:MirBSD:*:*) + echo powerppc-unknown-mirbsd${UNAME_RELEASE} + exit 0 ;; + *:MirBSD:*:*) + echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} + exit 0 ;; alpha:OSF1:*:*) - if test $UNAME_RELEASE = "V4.0"; then + case $UNAME_RELEASE in + *4.0) UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` - fi + ;; + *5.*) + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` + ;; + esac # According to Compaq, /usr/sbin/psrinfo has been available on # OSF/1 and Tru64 systems produced since 1995. I hope that # covers most systems running today. This code pipes the CPU @@ -277,14 +291,12 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in "EV7.9 (21364A)") UNAME_MACHINE="alphaev79" ;; esac + # A Pn.n version is a patched version. # A Vn.n version is a released version. # A Tn.n version is a released field test version. # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - exit 0 ;; - Alpha*:OpenVMS:*:*) - echo alpha-hp-vms + echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` exit 0 ;; Alpha\ *:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? @@ -307,6 +319,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in *:OS/390:*:*) echo i370-ibm-openedition exit 0 ;; + *:OS400:*:*) + echo powerpc-ibm-os400 + exit 0 ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} exit 0;; @@ -399,6 +414,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) echo m68k-unknown-mint${UNAME_RELEASE} exit 0 ;; + m68k:machten:*:*) + echo m68k-apple-machten${UNAME_RELEASE} + exit 0 ;; powerpc:machten:*:*) echo powerpc-apple-machten${UNAME_RELEASE} exit 0 ;; @@ -734,7 +752,7 @@ EOF echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; *:UNICOS/mp:*:*) - echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` @@ -742,6 +760,11 @@ EOF FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit 0 ;; + 5000:UNIX_System_V:4.*:*) + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit 0 ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} exit 0 ;; @@ -751,22 +774,8 @@ EOF *:BSD/OS:*:*) echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} exit 0 ;; - *:FreeBSD:*:*|*:GNU/FreeBSD:*:*) - # Determine whether the default compiler uses glibc. - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include <features.h> - #if __GLIBC__ >= 2 - LIBC=gnu - #else - LIBC= - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` - # GNU/FreeBSD systems have a "k" prefix to indicate we are using - # FreeBSD's kernel, but not the complete OS. - case ${LIBC} in gnu) kernel_only='k' ;; esac - echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC} + *:FreeBSD:*:*) + echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` exit 0 ;; i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin @@ -799,8 +808,13 @@ EOF echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit 0 ;; *:GNU:*:*) + # the GNU system echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` exit 0 ;; + *:GNU/*:*:*) + # other systems with GNU libc and userland + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu + exit 0 ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix exit 0 ;; @@ -810,9 +824,18 @@ EOF cris:Linux:*:*) echo cris-axis-linux-gnu exit 0 ;; + crisv32:Linux:*:*) + echo crisv32-axis-linux-gnu + exit 0 ;; + frv:Linux:*:*) + echo frv-unknown-linux-gnu + exit 0 ;; ia64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit 0 ;; + m32r*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit 0 ;; m68*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit 0 ;; @@ -981,6 +1004,9 @@ EOF i*86:atheos:*:*) echo ${UNAME_MACHINE}-unknown-atheos exit 0 ;; + i*86:syllable:*:*) + echo ${UNAME_MACHINE}-pc-syllable + exit 0 ;; i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) echo i386-unknown-lynxos${UNAME_RELEASE} exit 0 ;; @@ -1050,9 +1076,9 @@ EOF M680?0:D-NIX:5.3:*) echo m68k-diab-dnix exit 0 ;; - M68*:*:R3V[567]*:*) + M68*:*:R3V[5678]*:*) test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; - 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0) + 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) OS_REL='' test -r /etc/.relid \ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` @@ -1150,9 +1176,10 @@ EOF echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} exit 0 ;; *:Darwin:*:*) - case `uname -p` in + UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown + case $UNAME_PROCESSOR in *86) UNAME_PROCESSOR=i686 ;; - powerpc) UNAME_PROCESSOR=powerpc ;; + unknown) UNAME_PROCESSOR=powerpc ;; esac echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} exit 0 ;; @@ -1167,7 +1194,7 @@ EOF *:QNX:*:4*) echo i386-pc-qnx exit 0 ;; - NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*) + NSR-?:NONSTOP_KERNEL:*:*) echo nsr-tandem-nsk${UNAME_RELEASE} exit 0 ;; *:NonStop-UX:*:*) @@ -1211,6 +1238,16 @@ EOF SEI:*:*:SEIUX) echo mips-sei-seiux${UNAME_RELEASE} exit 0 ;; + *:DragonFly:*:*) + echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` + exit 0 ;; + *:*VMS:*:*) + UNAME_MACHINE=`(uname -p) 2>/dev/null` + case "${UNAME_MACHINE}" in + A*) echo alpha-dec-vms && exit 0 ;; + I*) echo ia64-dec-vms && exit 0 ;; + V*) echo vax-dec-vms && exit 0 ;; + esac esac #echo '(No uname command or uname output not recognized.)' 1>&2 diff --git a/db/dist/config.hin b/db/dist/config.hin index 78fbe74b3..c7ba05ec0 100644 --- a/db/dist/config.hin +++ b/db/dist/config.hin @@ -43,9 +43,15 @@ /* Define to 1 if fcntl/F_SETFD denies child access to file descriptors. */ #undef HAVE_FCNTL_F_SETFD +/* Define to 1 if you have the `fdatasync' function. */ +#undef HAVE_FDATASYNC + /* Define to 1 if allocated filesystem blocks are not zeroed. */ #undef HAVE_FILESYSTEM_NOTZERO +/* Define to 1 if you have the `ftruncate' function. */ +#undef HAVE_FTRUNCATE + /* Define to 1 if you have the `getcwd' function. */ #undef HAVE_GETCWD @@ -70,6 +76,9 @@ /* Define to 1 if you have the `nsl' library (-lnsl). */ #undef HAVE_LIBNSL +/* Define to 1 if the system has the type `long long'. */ +#undef HAVE_LONG_LONG + /* Define to 1 if you have the `memcmp' function. */ #undef HAVE_MEMCMP @@ -217,6 +226,9 @@ /* Define to 1 if you have the `raise' function. */ #undef HAVE_RAISE +/* Define to 1 if you have the `rand' function. */ +#undef HAVE_RAND + /* Define to 1 if building replication support. */ #undef HAVE_REPLICATION @@ -229,12 +241,21 @@ /* Define to 1 if you have the `select' function. */ #undef HAVE_SELECT +/* Define to 1 if building sequence support. */ +#undef HAVE_SEQUENCE + /* Define to 1 if you have the `shmget' function. */ #undef HAVE_SHMGET /* Define to 1 if you have the `snprintf' function. */ #undef HAVE_SNPRINTF +/* Define to 1 if you have the `srand' function. */ +#undef HAVE_SRAND + +/* Define to 1 if building statistics support. */ +#undef HAVE_STATISTICS + /* Define to 1 if you have the <stdint.h> header file. */ #undef HAVE_STDINT_H @@ -294,6 +315,9 @@ /* Define to 1 if unlink of file with open file descriptors will fail. */ #undef HAVE_UNLINK_WITH_OPEN_FAILURE +/* Define to 1 if the system has the type `unsigned long long'. */ +#undef HAVE_UNSIGNED_LONG_LONG + /* Define to 1 if building access method verification support. */ #undef HAVE_VERIFY @@ -339,6 +363,9 @@ /* The size of a `long', as computed by sizeof. */ #undef SIZEOF_LONG +/* The size of a `long long', as computed by sizeof. */ +#undef SIZEOF_LONG_LONG + /* The size of a `short', as computed by sizeof. */ #undef SIZEOF_SHORT @@ -354,6 +381,9 @@ /* The size of a `unsigned long', as computed by sizeof. */ #undef SIZEOF_UNSIGNED_LONG +/* The size of a `unsigned long long', as computed by sizeof. */ +#undef SIZEOF_UNSIGNED_LONG_LONG + /* The size of a `unsigned short', as computed by sizeof. */ #undef SIZEOF_UNSIGNED_SHORT @@ -366,7 +396,7 @@ /* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */ #undef TIME_WITH_SYS_TIME -/* Define to 1 to mask harmless unitialized memory read/writes. */ +/* Define to 1 to mask harmless uninitialized memory read/writes. */ #undef UMRW /* Number of bits in a file offset, on hosts where this is settable. */ diff --git a/db/dist/config.sub b/db/dist/config.sub index 54efcfc18..edb6b663c 100755 --- a/db/dist/config.sub +++ b/db/dist/config.sub @@ -1,9 +1,9 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. -timestamp='2003-08-18' +timestamp='2004-08-29' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -70,7 +70,7 @@ Report bugs and patches to <config-patches@gnu.org>." version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO @@ -118,7 +118,8 @@ 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* | linux-dietlibc | kfreebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) + nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \ + kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; @@ -144,7 +145,7 @@ case $os in -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple | -axis) + -apple | -axis | -knuth | -cray) os= basic_machine=$1 ;; @@ -236,7 +237,7 @@ case $basic_machine in | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ - | m32r | m68000 | m68k | m88k | mcore \ + | m32r | m32rle | m68000 | m68k | m88k | mcore \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -248,6 +249,7 @@ case $basic_machine in | mipsisa32 | mipsisa32el \ | mipsisa32r2 | mipsisa32r2el \ | mipsisa64 | mipsisa64el \ + | mipsisa64r2 | mipsisa64r2el \ | mipsisa64sb1 | mipsisa64sb1el \ | mipsisa64sr71k | mipsisa64sr71kel \ | mipstx39 | mipstx39el \ @@ -298,7 +300,7 @@ case $basic_machine in | avr-* \ | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ - | clipper-* | cydra-* \ + | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ @@ -306,7 +308,7 @@ case $basic_machine in | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ - | m32r-* \ + | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ | m88110-* | m88k-* | mcore-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ @@ -320,11 +322,13 @@ case $basic_machine in | mipsisa32-* | mipsisa32el-* \ | mipsisa32r2-* | mipsisa32r2el-* \ | mipsisa64-* | mipsisa64el-* \ + | mipsisa64r2-* | mipsisa64r2el-* \ | mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ | mipstx39-* | mipstx39el-* \ + | mmix-* \ | msp430-* \ - | none-* | np1-* | nv1-* | ns16k-* | ns32k-* \ + | none-* | np1-* | ns16k-* | ns32k-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ @@ -360,6 +364,9 @@ case $basic_machine in basic_machine=a29k-amd os=-udi ;; + abacus) + basic_machine=abacus-unknown + ;; adobe68k) basic_machine=m68010-adobe os=-scout @@ -377,6 +384,9 @@ case $basic_machine in amd64) basic_machine=x86_64-pc ;; + amd64-*) + basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; amdahl) basic_machine=580-amdahl os=-sysv @@ -436,12 +446,27 @@ case $basic_machine in basic_machine=j90-cray os=-unicos ;; + craynv) + basic_machine=craynv-cray + os=-unicosmp + ;; + cr16c) + basic_machine=cr16c-unknown + os=-elf + ;; crds | unos) basic_machine=m68k-crds ;; + crisv32 | crisv32-* | etraxfs*) + basic_machine=crisv32-axis + ;; cris | cris-* | etrax*) basic_machine=cris-axis ;; + crx) + basic_machine=crx-unknown + os=-elf + ;; da30 | da30-*) basic_machine=m68k-da30 ;; @@ -642,10 +667,6 @@ case $basic_machine in mips3*) basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown ;; - mmix*) - basic_machine=mmix-knuth - os=-mmixware - ;; monitor) basic_machine=m68k-rom68k os=-coff @@ -726,10 +747,6 @@ case $basic_machine in np1) basic_machine=np1-gould ;; - nv1) - basic_machine=nv1-cray - os=-unicosmp - ;; nsr-tandem) basic_machine=nsr-tandem ;; @@ -741,6 +758,10 @@ case $basic_machine in basic_machine=or32-unknown os=-coff ;; + os400) + basic_machine=powerpc-ibm + os=-os400 + ;; OSE68000 | ose68000) basic_machine=m68000-ericsson os=-ose @@ -961,6 +982,10 @@ case $basic_machine in tower | tower-32) basic_machine=m68k-ncr ;; + tpf) + basic_machine=s390x-ibm + os=-tpf + ;; udi29k) basic_machine=a29k-amd os=-udi @@ -1034,6 +1059,9 @@ case $basic_machine in romp) basic_machine=romp-ibm ;; + mmix) + basic_machine=mmix-knuth + ;; rs6000) basic_machine=rs6000-ibm ;; @@ -1129,19 +1157,20 @@ case $os in | -aos* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -netbsd* | -openbsd* | -kfreebsd* | -freebsd* | -riscix* \ - | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ + | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \ + | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ + | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \ + | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ - | -powermax* | -dnix* | -nx6 | -nx7 | -sei*) + | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1180,6 +1209,9 @@ case $os in -opened*) os=-openedition ;; + -os400*) + os=-os400 + ;; -wince*) os=-wince ;; @@ -1201,6 +1233,9 @@ case $os in -atheos*) os=-atheos ;; + -syllable*) + os=-syllable + ;; -386bsd) os=-bsd ;; @@ -1223,6 +1258,9 @@ case $os in -sinix*) os=-sysv4 ;; + -tpf*) + os=-tpf + ;; -triton*) os=-sysv3 ;; @@ -1339,6 +1377,9 @@ case $basic_machine in *-ibm) os=-aix ;; + *-knuth) + os=-mmixware + ;; *-wec) os=-proelf ;; @@ -1471,9 +1512,15 @@ case $basic_machine in -mvs* | -opened*) vendor=ibm ;; + -os400*) + vendor=ibm + ;; -ptx*) vendor=sequent ;; + -tpf*) + vendor=ibm + ;; -vxsim* | -vxworks* | -windiss*) vendor=wrs ;; diff --git a/db/dist/configure b/db/dist/configure index cca842cdf..2a9cad4cf 100755 --- a/db/dist/configure +++ b/db/dist/configure @@ -1,11 +1,10 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.57 for Berkeley DB 4.2.52. +# Generated by GNU Autoconf 2.59 for Berkeley DB 4.3.14. # # Report bugs to <support@sleepycat.com>. # -# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 -# Free Software Foundation, Inc. +# Copyright (C) 2003 Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. ## --------------------- ## @@ -22,9 +21,10 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then set -o posix fi +DUALCASE=1; export DUALCASE # for MKS sh # Support unset when possible. -if (FOO=FOO; unset FOO) >/dev/null 2>&1; then +if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then as_unset=unset else as_unset=false @@ -43,7 +43,7 @@ for as_var in \ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ LC_TELEPHONE LC_TIME do - if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then + if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then eval $as_var=C; export $as_var else $as_unset $as_var @@ -220,16 +220,17 @@ rm -f conf$$ conf$$.exe conf$$.file if mkdir -p . 2>/dev/null; then as_mkdir_p=: else + test -d ./-p && rmdir ./-p as_mkdir_p=false fi 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" +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 @@ -279,7 +280,7 @@ fi # The HP-UX ksh and POSIX shell print the target directory to stdout # if CDPATH is set. -if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH if test -z "$ECHO"; then if test "X${echo_test_string+set}" != Xset; then @@ -392,9 +393,9 @@ fi -tagnames=`echo "$tagnames,CXX" | sed 's/^,//'` +tagnames=${tagnames+${tagnames},}CXX -tagnames=`echo "$tagnames,F77" | sed 's/^,//'` +tagnames=${tagnames+${tagnames},}F77 # Name of the host. # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, @@ -421,13 +422,13 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='Berkeley DB' -PACKAGE_TARNAME='db-4.2.52' -PACKAGE_VERSION='4.2.52' -PACKAGE_STRING='Berkeley DB 4.2.52' +PACKAGE_TARNAME='db-4.3.14' +PACKAGE_VERSION='4.3.14' +PACKAGE_STRING='Berkeley DB 4.3.14' PACKAGE_BUGREPORT='support@sleepycat.com' ac_unique_file="../db/db.c" -ac_default_prefix=/usr/local/BerkeleyDB.4.2 +ac_default_prefix=/usr/local/BerkeleyDB.4.3 # Factoring default headers for most tests. ac_includes_default="\ #include <stdio.h> @@ -465,7 +466,7 @@ ac_includes_default="\ # include <unistd.h> #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os ADDITIONAL_INCS ADDITIONAL_LANG ADDITIONAL_OBJS ADDITIONAL_PROGS BUILD_TARGET CFLAGS CONFIGURATION_ARGS CONFIGURATION_PATH CPPFLAGS CRYPTO_OBJS CXX CXXFLAGS DEFAULT_LIB DEFAULT_LIB_CXX INSTALLER INSTALL_LIBS INSTALL_TARGET JAR JAVACFLAGS LDFLAGS LIBJSO_LIBS LIBSO_LIBS LIBTOOL LIBTSO_LIBS LIBTSO_MODSUFFIX LIBTSO_MODULE LIBXSO_LIBS LOAD_LIBS MAKEFILE_CC MAKEFILE_CCLINK MAKEFILE_CXX MAKEFILE_CXXLINK MAKEFILE_SOLINK MAKEFILE_XSOLINK OSDIR POSTLINK REPLACEMENT_OBJS RPC_CLIENT_OBJS RPM_BUILD RPM_POST_INSTALL RPM_POST_UNINSTALL SOFLAGS db_cv_path_rpm_archive db_int_def o DB_VERSION_MAJOR DB_VERSION_MINOR DB_VERSION_PATCH DB_VERSION_STRING DB_VERSION_UNIQUE_NAME db_cv_path_ar ac_ct_db_cv_path_ar db_cv_path_chmod ac_ct_db_cv_path_chmod db_cv_path_cp ac_ct_db_cv_path_cp path_ldconfig ac_ct_path_ldconfig db_cv_path_ldconfig db_cv_path_ln ac_ct_db_cv_path_ln db_cv_path_mkdir ac_ct_db_cv_path_mkdir path_ranlib ac_ct_path_ranlib db_cv_path_ranlib db_cv_path_rm ac_ct_db_cv_path_rm db_cv_path_rpm ac_ct_db_cv_path_rpm path_sh ac_ct_path_sh db_cv_path_sh path_strip ac_ct_path_strip db_cv_path_strip db_cv_path_kill ac_ct_db_cv_path_kill INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA db_cv_build_type CC ac_ct_CC EXEEXT OBJEXT DB_PROTO1 DB_PROTO2 DB_CONST CCC ac_ct_CCC ac_ct_CXX CXXCPP cxx_have_stdheaders EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP CPP F77 FFLAGS ac_ct_F77 SOSUFFIX MODSUFFIX JMODSUFFIX JAVAC JAVA uudecode _ACJNI_JAVAC TCFLAGS TCL_BIN_DIR TCL_SRC_DIR TCL_LIB_FILE TCL_TCLSH inttypes_decl u_char_decl u_short_decl u_int_decl u_long_decl u_int8_decl u_int16_decl int16_decl u_int32_decl int32_decl ssize_t_decl db_align_t_decl db_alignp_t_decl LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os ADDITIONAL_INCS ADDITIONAL_LANG ADDITIONAL_OBJS ADDITIONAL_PROGS BUILD_TARGET CFLAGS CONFIGURATION_ARGS CONFIGURATION_PATH CPPFLAGS CRYPTO_OBJS CXX CXXFLAGS DB_PROTO1 DB_PROTO2 DEFAULT_LIB DEFAULT_LIB_CXX INSTALLER INSTALL_LIBS INSTALL_TARGET JAR JAVACFLAGS LDFLAGS LIBJSO_LIBS LIBSO_LIBS LIBTOOL LIBTSO_LIBS LIBTSO_MODSUFFIX LIBTSO_MODULE LIBXSO_LIBS MAKEFILE_CC MAKEFILE_CCLINK MAKEFILE_CXX MAKEFILE_CXXLINK MAKEFILE_SOLINK MAKEFILE_XSOLINK OSDIR POSTLINK REPLACEMENT_OBJS RPC_CLIENT_OBJS RPC_SERVER_H SOFLAGS TEST_LIBS db_int_def o DB_VERSION_MAJOR DB_VERSION_MINOR DB_VERSION_PATCH DB_VERSION_STRING DB_VERSION_UNIQUE_NAME db_cv_path_ar ac_ct_db_cv_path_ar db_cv_path_chmod ac_ct_db_cv_path_chmod db_cv_path_cp ac_ct_db_cv_path_cp db_cv_path_ln ac_ct_db_cv_path_ln db_cv_path_mkdir ac_ct_db_cv_path_mkdir path_ranlib ac_ct_path_ranlib db_cv_path_ranlib db_cv_path_rm ac_ct_db_cv_path_rm db_cv_path_rpcgen ac_ct_db_cv_path_rpcgen path_sh ac_ct_path_sh db_cv_path_sh path_strip ac_ct_path_strip db_cv_path_strip db_cv_path_kill ac_ct_db_cv_path_kill INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA db_cv_build_type CC ac_ct_CC EXEEXT OBJEXT DB_CONST CCC ac_ct_CCC ac_ct_CXX CXXCPP cxx_have_stdheaders EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP CPP F77 FFLAGS ac_ct_F77 SOSUFFIX MODSUFFIX JMODSUFFIX JAVAC JAVA uudecode _ACJNI_JAVAC inttypes_h_decl stdint_h_decl stddef_h_decl u_char_decl u_short_decl u_int_decl u_long_decl u_int8_decl u_int16_decl int16_decl u_int32_decl int32_decl u_int64_decl int64_decl ssize_t_decl uintmax_t_decl uintptr_t_decl LIBOBJS TCFLAGS TCL_BIN_DIR TCL_SRC_DIR TCL_LIB_FILE TCL_TCLSH db_seq_decl LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -824,7 +825,7 @@ done # Be sure to have absolute paths. for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \ - localstatedir libdir includedir oldincludedir infodir mandir + localstatedir libdir includedir oldincludedir infodir mandir do eval ac_val=$`echo $ac_var` case $ac_val in @@ -864,10 +865,10 @@ if test -z "$srcdir"; then # 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 || + X"$0" : 'X\(//\)[^/]' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || echo X"$0" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } /^X\(\/\/\)[^/].*/{ s//\1/; q; } @@ -954,7 +955,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 4.2.52 to adapt to many kinds of systems. +\`configure' configures Berkeley DB 4.3.14 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -979,9 +980,9 @@ _ACEOF cat <<_ACEOF Installation directories: --prefix=PREFIX install architecture-independent files in PREFIX - [$ac_default_prefix] + [$ac_default_prefix] --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX - [PREFIX] + [PREFIX] By default, \`make install' will install all the files in \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify @@ -1020,7 +1021,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Berkeley DB 4.2.52:";; + short | recursive ) echo "Configuration of Berkeley DB 4.3.14:";; esac cat <<\_ACEOF @@ -1032,6 +1033,7 @@ Optional Features: --disable-hash Do not build Hash access method. --disable-queue Do not build Queue access method. --disable-replication Do not build database replication support. + --disable-statistics Do not build statistics support. --disable-verify Do not build database verification support. --enable-compat185 Build DB 1.85 compatibility API. --enable-cxx Build C++ API. @@ -1042,13 +1044,14 @@ Optional Features: --enable-dump185 Build db_dump185(1) to dump 1.85 databases. --enable-java Build Java API. --enable-mingw Build Berkeley DB for MinGW. + --enable-o_direct Enable the O_DIRECT flag for direct I/O. --enable-posixmutexes Force use of POSIX standard mutexes. --enable-rpc Build RPC client/server. --enable-smallbuild Build small footprint version of the library. --enable-tcl Build Tcl API. --enable-test Configure to run the test suite. --enable-uimutexes Force use of Unix International mutexes. - --enable-umrw Mask harmless unitialized memory read/writes. + --enable-umrw Mask harmless uninitialized memory read/writes. --enable-shared[=PKGS] build shared libraries [default=yes] --enable-static[=PKGS] @@ -1064,7 +1067,6 @@ Optional Packages: --with-mutex=MUTEX Selection of non-standard mutexes. --with-mutexalign=ALIGNMENT Selection of non-standard mutex alignment. - --with-rpm=ARCHIVE Path of RPM archive. --with-tcl=DIR Directory location of tclConfig.sh. --with-uniquename=NAME Build a uniquely named library. --with-gnu-ld assume the C compiler uses GNU ld [default=no] @@ -1124,12 +1126,45 @@ case $srcdir in 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` + +# Do not use `cd foo && pwd` to compute absolute paths, because +# the directories may not exist. +case `pwd` in +.) ac_abs_builddir="$ac_dir";; +*) + case "$ac_dir" in + .) ac_abs_builddir=`pwd`;; + [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; + *) ac_abs_builddir=`pwd`/"$ac_dir";; + esac;; +esac +case $ac_abs_builddir in +.) ac_abs_top_builddir=${ac_top_builddir}.;; +*) + case ${ac_top_builddir}. in + .) ac_abs_top_builddir=$ac_abs_builddir;; + [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; + *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; + esac;; +esac +case $ac_abs_builddir in +.) ac_abs_srcdir=$ac_srcdir;; +*) + case $ac_srcdir in + .) ac_abs_srcdir=$ac_abs_builddir;; + [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; + *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; + esac;; +esac +case $ac_abs_builddir in +.) ac_abs_top_srcdir=$ac_top_srcdir;; +*) + case $ac_top_srcdir in + .) ac_abs_top_srcdir=$ac_abs_builddir;; + [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; + *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; + esac;; +esac cd $ac_dir # Check for guested configure; otherwise get Cygnus style configure. @@ -1140,7 +1175,7 @@ ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` echo $SHELL $ac_srcdir/configure --help=recursive elif test -f $ac_srcdir/configure.ac || - test -f $ac_srcdir/configure.in; then + test -f $ac_srcdir/configure.in; then echo $ac_configure --help else @@ -1153,11 +1188,10 @@ fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -Berkeley DB configure 4.2.52 -generated by GNU Autoconf 2.57 +Berkeley DB configure 4.3.14 +generated by GNU Autoconf 2.59 -Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 -Free Software Foundation, Inc. +Copyright (C) 2003 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1168,8 +1202,8 @@ cat >&5 <<_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 4.2.52, which was -generated by GNU Autoconf 2.57. Invocation command line was +It was created by Berkeley DB $as_me 4.3.14, which was +generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1246,19 +1280,19 @@ do 2) ac_configure_args1="$ac_configure_args1 '$ac_arg'" if test $ac_must_keep_next = true; then - ac_must_keep_next=false # Got value, back to normal. + 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 + 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 ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" # Get rid of the leading space. @@ -1292,12 +1326,12 @@ _ASBOX case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in *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" + "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" ;; esac; } @@ -1326,7 +1360,7 @@ _ASBOX for ac_var in $ac_subst_files do eval ac_val=$`echo $ac_var` - echo "$ac_var='"'"'$ac_val'"'"'" + echo "$ac_var='"'"'$ac_val'"'"'" done | sort echo fi @@ -1345,7 +1379,7 @@ _ASBOX echo "$as_me: caught signal $ac_signal" echo "$as_me: exit $exit_status" } >&5 - rm -f core core.* *.core && + rm -f core *.core && rm -rf conftest* confdefs* conf$$* $ac_clean_files && exit $exit_status ' 0 @@ -1425,7 +1459,7 @@ fi # 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 + sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; 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" @@ -1442,13 +1476,13 @@ echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ,);; *) 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:$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:$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:$LINENO: current value: $ac_new_val" >&5 echo "$as_me: current value: $ac_new_val" >&2;} - ac_cache_corrupted=: + ac_cache_corrupted=: fi;; esac # Pass precious variables to config.status. @@ -1663,13 +1697,6 @@ echo "${ECHO_T}no" >&6 - -# RPM needs the current absolute path. -# RPM needs the list of original arguments, but we don't include the RPM -# option itself. -CONFIGURATION_PATH=${PWD-`pwd`} -CONFIGURATION_ARGS=`echo "$*" | sed -e 's/--with-rpm[^ ]*//'` - # Set the default installation location. @@ -1677,11 +1704,11 @@ CONFIGURATION_ARGS=`echo "$*" | sed -e 's/--with-rpm[^ ]*//'` DB_VERSION_MAJOR="4" -DB_VERSION_MINOR="2" +DB_VERSION_MINOR="3" -DB_VERSION_PATCH="52" +DB_VERSION_PATCH="14" -DB_VERSION_STRING='"Sleepycat Software: Berkeley DB 4.2.52: (December 3, 2003)"' +DB_VERSION_STRING='"Sleepycat Software: Berkeley DB 4.3.14: (October 14, 2004)"' # Process all options before using them. @@ -1765,6 +1792,23 @@ yes) echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6;; esac +echo "$as_me:$LINENO: checking if --disable-statistics option specified" >&5 +echo $ECHO_N "checking if --disable-statistics option specified... $ECHO_C" >&6 +# Check whether --enable-statistics or --disable-statistics was given. +if test "${enable_statistics+set}" = set; then + enableval="$enable_statistics" + +else + enableval="yes" +fi; +db_cv_build_statistics="$enableval" +case "$enableval" in + no) echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6;; +yes) echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6;; +esac + echo "$as_me:$LINENO: checking if --disable-verify option specified" >&5 echo $ECHO_N "checking if --disable-verify option specified... $ECHO_C" >&6 # Check whether --enable-verify or --disable-verify was given. @@ -1906,6 +1950,18 @@ fi; echo "$as_me:$LINENO: result: $db_cv_mingw" >&5 echo "${ECHO_T}$db_cv_mingw" >&6 +echo "$as_me:$LINENO: checking if --enable-o_direct option specified" >&5 +echo $ECHO_N "checking if --enable-o_direct option specified... $ECHO_C" >&6 +# Check whether --enable-o_direct or --disable-o_direct was given. +if test "${enable_o_direct+set}" = set; then + enableval="$enable_o_direct" + db_cv_o_direct="$enable_o_direct" +else + db_cv_o_direct="no" +fi; +echo "$as_me:$LINENO: result: $db_cv_o_direct" >&5 +echo "${ECHO_T}$db_cv_o_direct" >&6 + echo "$as_me:$LINENO: checking if --enable-posixmutexes option specified" >&5 echo $ECHO_N "checking if --enable-posixmutexes option specified... $ECHO_C" >&6 # Check whether --enable-posixmutexes or --disable-posixmutexes was given. @@ -1944,6 +2000,7 @@ if test "$db_cv_smallbuild" = "yes"; then db_cv_build_hash="no" db_cv_build_queue="no" db_cv_build_replication="no" + db_cv_build_statistics="no" db_cv_build_verify="no" fi echo "$as_me:$LINENO: result: $db_cv_smallbuild" >&5 @@ -2044,31 +2101,6 @@ fi echo "$as_me:$LINENO: result: $with_mutexalign" >&5 echo "${ECHO_T}$with_mutexalign" >&6 -echo "$as_me:$LINENO: checking if --with-rpm=ARCHIVE option specified" >&5 -echo $ECHO_N "checking if --with-rpm=ARCHIVE option specified... $ECHO_C" >&6 - -# Check whether --with-rpm or --without-rpm was given. -if test "${with_rpm+set}" = set; then - withval="$with_rpm" - with_rpm="$withval" -else - with_rpm="no" -fi; -if test "$with_rpm" = "no"; then - db_cv_rpm="no" - db_cv_path_rpm_archive="Not-configured-with-rpm=ARCHIVE" -else - if test "$with_rpm" = "yes"; then - { { echo "$as_me:$LINENO: error: --with-rpm requires an archive path argument" >&5 -echo "$as_me: error: --with-rpm requires an archive path argument" >&2;} - { (exit 1); exit 1; }; } - fi - db_cv_rpm="yes" - db_cv_path_rpm_archive="$with_rpm" -fi -echo "$as_me:$LINENO: result: $with_rpm" >&5 -echo "${ECHO_T}$with_rpm" >&6 - echo "$as_me:$LINENO: checking if --with-tcl=DIR option specified" >&5 echo $ECHO_N "checking if --with-tcl=DIR option specified... $ECHO_C" >&6 @@ -2103,7 +2135,7 @@ echo "${ECHO_T}$with_uniquename" >&6 else db_cv_uniquename="yes" if test "$with_uniquename" = "yes"; then - DB_VERSION_UNIQUE_NAME="_4002" + DB_VERSION_UNIQUE_NAME="_4003" else DB_VERSION_UNIQUE_NAME="$with_uniquename" fi @@ -2120,6 +2152,25 @@ echo "$as_me: error: --enable-test requires --enable-tcl" >&2;} fi fi +# Uniquename excludes C++, Java, RPC. +if test "$db_cv_uniquename" = "yes"; then + if test "$db_cv_rpc" = "yes"; then + { { echo "$as_me:$LINENO: error: --with-uniquename is not compatible with --enable-rpc" >&5 +echo "$as_me: error: --with-uniquename is not compatible with --enable-rpc" >&2;} + { (exit 1); exit 1; }; } + fi + if test "$db_cv_cxx" = "yes"; then + { { echo "$as_me:$LINENO: error: --with-uniquename is not compatible with --enable-cxx" >&5 +echo "$as_me: error: --with-uniquename is not compatible with --enable-cxx" >&2;} + { (exit 1); exit 1; }; } + fi + if test "$db_cv_java" = "yes"; then + { { echo "$as_me:$LINENO: error: --with-uniquename is not compatible with --enable-java" >&5 +echo "$as_me: error: --with-uniquename is not compatible with --enable-java" >&2;} + { (exit 1); exit 1; }; } + fi +fi + # Set some #defines based on configuration options. if test "$db_cv_diagnostic" = "yes"; then cat >>confdefs.h <<\_ACEOF @@ -2424,133 +2475,6 @@ echo "$as_me: error: No cp utility found." >&2;} { (exit 1); exit 1; }; } fi -if test "$db_cv_rpm" = "yes"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}ldconfig", so it can be a program name with args. -set dummy ${ac_tool_prefix}ldconfig; 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_path_ldconfig+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$path_ldconfig"; then - ac_cv_prog_path_ldconfig="$path_ldconfig" # 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_path_ldconfig="${ac_tool_prefix}ldconfig" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - -fi -fi -path_ldconfig=$ac_cv_prog_path_ldconfig -if test -n "$path_ldconfig"; then - echo "$as_me:$LINENO: result: $path_ldconfig" >&5 -echo "${ECHO_T}$path_ldconfig" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - -fi -if test -z "$ac_cv_prog_path_ldconfig"; then - ac_ct_path_ldconfig=$path_ldconfig - # Extract the first word of "ldconfig", so it can be a program name with args. -set dummy ldconfig; 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_path_ldconfig+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_path_ldconfig"; then - ac_cv_prog_ac_ct_path_ldconfig="$ac_ct_path_ldconfig" # 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_path_ldconfig="ldconfig" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - - test -z "$ac_cv_prog_ac_ct_path_ldconfig" && ac_cv_prog_ac_ct_path_ldconfig="missing_ldconfig" -fi -fi -ac_ct_path_ldconfig=$ac_cv_prog_ac_ct_path_ldconfig -if test -n "$ac_ct_path_ldconfig"; then - echo "$as_me:$LINENO: result: $ac_ct_path_ldconfig" >&5 -echo "${ECHO_T}$ac_ct_path_ldconfig" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - path_ldconfig=$ac_ct_path_ldconfig -else - path_ldconfig="$ac_cv_prog_path_ldconfig" -fi - - # Extract the first word of "$path_ldconfig", so it can be a program name with args. -set dummy $path_ldconfig; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_db_cv_path_ldconfig+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $db_cv_path_ldconfig in - [\\/]* | ?:[\\/]*) - ac_cv_path_db_cv_path_ldconfig="$db_cv_path_ldconfig" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_db_cv_path_ldconfig="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - - test -z "$ac_cv_path_db_cv_path_ldconfig" && ac_cv_path_db_cv_path_ldconfig="missing_ldconfig" - ;; -esac -fi -db_cv_path_ldconfig=$ac_cv_path_db_cv_path_ldconfig - -if test -n "$db_cv_path_ldconfig"; then - echo "$as_me:$LINENO: result: $db_cv_path_ldconfig" >&5 -echo "${ECHO_T}$db_cv_path_ldconfig" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - if test "$db_cv_path_ldconfig" != missing_ldconfig; then - RPM_POST_INSTALL="%post -p $db_cv_path_ldconfig" - RPM_POST_UNINSTALL="%postun -p $db_cv_path_ldconfig" - fi -fi - if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ln", so it can be a program name with args. set dummy ${ac_tool_prefix}ln; ac_word=$2 @@ -2932,17 +2856,17 @@ echo "$as_me: error: No rm utility found." >&2;} { (exit 1); exit 1; }; } fi -if test "$db_cv_rpm" = "yes"; then +if test "$db_cv_rpc" = "yes"; then if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}rpm", so it can be a program name with args. -set dummy ${ac_tool_prefix}rpm; ac_word=$2 + # Extract the first word of "${ac_tool_prefix}rpcgen", so it can be a program name with args. +set dummy ${ac_tool_prefix}rpcgen; 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_db_cv_path_rpm+set}" = set; then +if test "${ac_cv_prog_db_cv_path_rpcgen+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test -n "$db_cv_path_rpm"; then - ac_cv_prog_db_cv_path_rpm="$db_cv_path_rpm" # Let the user override the test. + if test -n "$db_cv_path_rpcgen"; then + ac_cv_prog_db_cv_path_rpcgen="$db_cv_path_rpcgen" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH @@ -2951,7 +2875,7 @@ do 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_db_cv_path_rpm="${ac_tool_prefix}rpm" + ac_cv_prog_db_cv_path_rpcgen="${ac_tool_prefix}rpcgen" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -2960,27 +2884,27 @@ done fi fi -db_cv_path_rpm=$ac_cv_prog_db_cv_path_rpm -if test -n "$db_cv_path_rpm"; then - echo "$as_me:$LINENO: result: $db_cv_path_rpm" >&5 -echo "${ECHO_T}$db_cv_path_rpm" >&6 +db_cv_path_rpcgen=$ac_cv_prog_db_cv_path_rpcgen +if test -n "$db_cv_path_rpcgen"; then + echo "$as_me:$LINENO: result: $db_cv_path_rpcgen" >&5 +echo "${ECHO_T}$db_cv_path_rpcgen" >&6 else echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi fi -if test -z "$ac_cv_prog_db_cv_path_rpm"; then - ac_ct_db_cv_path_rpm=$db_cv_path_rpm - # Extract the first word of "rpm", so it can be a program name with args. -set dummy rpm; ac_word=$2 +if test -z "$ac_cv_prog_db_cv_path_rpcgen"; then + ac_ct_db_cv_path_rpcgen=$db_cv_path_rpcgen + # Extract the first word of "rpcgen", so it can be a program name with args. +set dummy rpcgen; 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_db_cv_path_rpm+set}" = set; then +if test "${ac_cv_prog_ac_ct_db_cv_path_rpcgen+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test -n "$ac_ct_db_cv_path_rpm"; then - ac_cv_prog_ac_ct_db_cv_path_rpm="$ac_ct_db_cv_path_rpm" # Let the user override the test. + if test -n "$ac_ct_db_cv_path_rpcgen"; then + ac_cv_prog_ac_ct_db_cv_path_rpcgen="$ac_ct_db_cv_path_rpcgen" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH @@ -2989,33 +2913,33 @@ do 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_db_cv_path_rpm="rpm" + ac_cv_prog_ac_ct_db_cv_path_rpcgen="rpcgen" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done - test -z "$ac_cv_prog_ac_ct_db_cv_path_rpm" && ac_cv_prog_ac_ct_db_cv_path_rpm="missing_rpm" + test -z "$ac_cv_prog_ac_ct_db_cv_path_rpcgen" && ac_cv_prog_ac_ct_db_cv_path_rpcgen="missing_rpcgen" fi fi -ac_ct_db_cv_path_rpm=$ac_cv_prog_ac_ct_db_cv_path_rpm -if test -n "$ac_ct_db_cv_path_rpm"; then - echo "$as_me:$LINENO: result: $ac_ct_db_cv_path_rpm" >&5 -echo "${ECHO_T}$ac_ct_db_cv_path_rpm" >&6 +ac_ct_db_cv_path_rpcgen=$ac_cv_prog_ac_ct_db_cv_path_rpcgen +if test -n "$ac_ct_db_cv_path_rpcgen"; then + echo "$as_me:$LINENO: result: $ac_ct_db_cv_path_rpcgen" >&5 +echo "${ECHO_T}$ac_ct_db_cv_path_rpcgen" >&6 else echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi - db_cv_path_rpm=$ac_ct_db_cv_path_rpm + db_cv_path_rpcgen=$ac_ct_db_cv_path_rpcgen else - db_cv_path_rpm="$ac_cv_prog_db_cv_path_rpm" + db_cv_path_rpcgen="$ac_cv_prog_db_cv_path_rpcgen" fi - if test "$db_cv_path_rpm" = missing_rpm; then - { { echo "$as_me:$LINENO: error: No rpm utility found." >&5 -echo "$as_me: error: No rpm utility found." >&2;} + if test "$db_cv_path_rpcgen" = missing_rpcgen; then + { { echo "$as_me:$LINENO: error: No rpcgen utility found." >&5 +echo "$as_me: error: No rpcgen utility found." >&2;} { (exit 1); exit 1; }; } fi fi @@ -3374,6 +3298,7 @@ fi # 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 @@ -3390,6 +3315,7 @@ do 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. @@ -3397,20 +3323,20 @@ 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 $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 done done ;; @@ -3441,31 +3367,12 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# RPM support: change the standard make and install targets -if test "$db_cv_rpm" = "yes"; then - BUILD_TARGET="rpm_build" - - # Check if we are running RPM version 3 or 4. - case "`rpm --version`" in - *version\ 4*) - RPM_BUILD="rpmbuild" - echo "_topdir $CONFIGURATION_PATH" > rpm-macro-defines;; - *version\ 3*) - RPM_BUILD="rpm" - echo "topdir: $CONFIGURATION_PATH" > rpm-macro-defines;; - esac - INSTALL_TARGET="rpm_install" -else - BUILD_TARGET="library_build" - INSTALL_TARGET="library_install" -fi +BUILD_TARGET="library_build" +INSTALL_TARGET="library_install" # This is where we handle stuff that autoconf can't handle: compiler, # preprocessor and load flags, libraries that the standard tests don't -# look for. The default optimization is -O. We would like to set the -# default optimization for systems using gcc to -O2, but we can't. By -# the time we know we're using gcc, it's too late to set optimization -# flags. +# look for. # # There are additional libraries we need for some compiler/architecture # combinations. @@ -3476,7 +3383,6 @@ fi # The makefile CC may be different than the CC used in config testing, # because the makefile CC may be set to use $(LIBTOOL). # -# XXX # Don't override anything if it's already set from the environment. optimize_def="-O" case "$host_os" in @@ -3485,19 +3391,14 @@ aix4.3.*|aix5*) CC=${CC-"xlc_r"} CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE" LDFLAGS="$LDFLAGS -Wl,-brtl";; -bsdi3*) optimize_def="-O2" - CC=${CC-"shlicc2"} +bsdi3*) CC=${CC-"shlicc2"} LIBS="$LIBS -lipc";; -bsdi*) optimize_def="-O2";; cygwin*) - optimize_def="-O2" CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE -D_REENTRANT";; freebsd*) - optimize_def="-O2" CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE" LDFLAGS="$LDFLAGS -pthread";; gnu*|k*bsd*-gnu|linux*) - optimize_def="-O2" CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE -D_REENTRANT";; hpux*) CPPFLAGS="$CPPFLAGS -D_REENTRANT";; irix*) optimize_def="-O2" @@ -3664,7 +3565,6 @@ ac_compiler=`set X $ac_compile; echo $2` (exit $ac_status); } cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -3684,8 +3584,8 @@ ac_clean_files="$ac_clean_files a.out 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 +echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 +echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6 ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5 (eval $ac_link_default) 2>&5 @@ -3705,23 +3605,23 @@ do test -f "$ac_file" || continue case $ac_file in *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) - ;; + ;; conftest.$ac_ext ) - # This is the source file. - ;; + # This is the source file. + ;; [ab].out ) - # We found the default executable, but exeext='' is most - # certainly right. - break;; + # We found the default executable, but exeext='' is most + # certainly right. + break;; *.* ) - ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - # FIXME: I believe we export ac_cv_exeext for Libtool, - # but it would be cool to find out if it's true. Does anybody - # maintain Libtool? --akim. - export ac_cv_exeext - break;; + ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + # FIXME: I believe we export ac_cv_exeext for Libtool, + # but it would be cool to find out if it's true. Does anybody + # maintain Libtool? --akim. + export ac_cv_exeext + break;; * ) - break;; + break;; esac done else @@ -3795,8 +3695,8 @@ for ac_file in conftest.exe conftest conftest.*; do case $ac_file in *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;; *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - export ac_cv_exeext - break;; + export ac_cv_exeext + break;; * ) break;; esac done @@ -3821,7 +3721,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" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -3872,7 +3771,6 @@ if test "${ac_cv_c_compiler_gnu+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -3892,11 +3790,21 @@ main () _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -3909,7 +3817,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_compiler_gnu=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi @@ -3925,7 +3833,6 @@ if test "${ac_cv_prog_cc_g+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -3942,11 +3849,21 @@ main () _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -3959,7 +3876,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_prog_cc_g=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f 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 @@ -3986,7 +3903,6 @@ else ac_cv_prog_cc_stdc=no ac_save_CC=$CC cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -4014,6 +3930,16 @@ static char *f (char * (*g) (char **, int), char **p, ...) 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 -std1 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 -std1. */ +int osf4_cc_array ['\x00' == 0 ? 1 : -1]; + int test (int i, double x); struct s1 {int (*f) (int a);}; struct s2 {int (*f) (double a);}; @@ -4040,11 +3966,21 @@ do CC="$ac_save_CC $ac_arg" rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4057,7 +3993,7 @@ else sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext +rm -f conftest.err conftest.$ac_objext done rm -f conftest.$ac_ext conftest.$ac_objext CC=$ac_save_CC @@ -4085,11 +4021,21 @@ cat >conftest.$ac_ext <<_ACEOF _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4104,7 +4050,6 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 'void exit (int);' do cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -4122,11 +4067,21 @@ exit (42); _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4139,9 +4094,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 continue fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -4158,11 +4112,21 @@ exit (42); _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4174,7 +4138,7 @@ else sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext done rm -f conftest* if test -n "$ac_declaration"; then @@ -4188,7 +4152,7 @@ else sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -4196,10 +4160,19 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu -# Checks for compiler characteristics. - - +# Set specific per-compiler flags. +if test "$GCC" = "yes"; then + # We want -O2 if we're using gcc. + CFLAGS="$CFLAGS " + CFLAGS=`echo "$CFLAGS" | sed 's/-O /-O2 /g'` +else + case "$host_os" in + hpux11*) + CPPFLAGS="$CPPFLAGS -mt";; + esac +fi +# Checks for compiler characteristics. DB_PROTO1="#undef __P" # AC_PROG_CC_STDC only sets ac_cv_prog_cc_stdc if the test fails, so @@ -4217,7 +4190,6 @@ if test "${ac_cv_c_const+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -4280,11 +4252,21 @@ main () _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4297,7 +4279,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_c_const=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5 echo "${ECHO_T}$ac_cv_c_const" >&6 @@ -4850,7 +4832,6 @@ if test "${ac_cv_cxx_compiler_gnu+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -4870,11 +4851,21 @@ main () _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4887,7 +4878,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_compiler_gnu=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_cxx_compiler_gnu=$ac_compiler_gnu fi @@ -4903,7 +4894,6 @@ if test "${ac_cv_prog_cxx_g+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -4920,11 +4910,21 @@ main () _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4937,7 +4937,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_prog_cxx_g=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6 @@ -4965,7 +4965,6 @@ for ac_declaration in \ 'void exit (int);' do cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -4983,11 +4982,21 @@ exit (42); _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5000,9 +5009,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 continue fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -5019,11 +5027,21 @@ exit (42); _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5035,7 +5053,7 @@ else sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext done rm -f conftest* if test -n "$ac_declaration"; then @@ -5075,7 +5093,6 @@ do # 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" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -5086,7 +5103,7 @@ cat >>conftest.$ac_ext <<_ACEOF #else # include <assert.h> #endif - Syntax error + Syntax error _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 @@ -5098,6 +5115,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_cxx_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag else ac_cpp_err= fi @@ -5118,7 +5136,6 @@ rm -f conftest.err conftest.$ac_ext # OK, works on sane cases. Now check whether non-existent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -5136,6 +5153,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_cxx_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag else ac_cpp_err= fi @@ -5182,7 +5200,6 @@ do # 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" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -5193,7 +5210,7 @@ cat >>conftest.$ac_ext <<_ACEOF #else # include <assert.h> #endif - Syntax error + Syntax error _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 @@ -5205,6 +5222,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_cxx_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag else ac_cpp_err= fi @@ -5225,7 +5243,6 @@ rm -f conftest.err conftest.$ac_ext # OK, works on sane cases. Now check whether non-existent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -5243,6 +5260,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_cxx_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag else ac_cpp_err= fi @@ -5299,7 +5317,6 @@ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ex ac_compiler_gnu=$ac_cv_cxx_compiler_gnu cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -5317,11 +5334,21 @@ std::ostream *o; return 0; _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5334,7 +5361,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 db_cv_cxx_have_stdheaders=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -5542,10 +5569,10 @@ for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do fi done done -SED=$lt_cv_path_SED fi +SED=$lt_cv_path_SED echo "$as_me:$LINENO: result: $SED" >&5 echo "${ECHO_T}$SED" >&6 @@ -5588,7 +5615,7 @@ echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6 # Accept absolute paths. [\\/]* | ?:[\\/]*) re_direlt='/[^/][^/]*/\.\./' - # Canonicalize the path of ld + # Canonicalize the pathname of ld ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'` while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"` @@ -5657,7 +5684,7 @@ if test "${lt_cv_prog_gnu_ld+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else # I'd rather use --version here, but apparently some GNU ld's only accept -v. -case `"$LD" -v 2>&1 </dev/null` in +case `$LD -v 2>&1 </dev/null` in *GNU* | *'with BFD'*) lt_cv_prog_gnu_ld=yes ;; @@ -5686,6 +5713,15 @@ case $reload_flag in *) reload_flag=" $reload_flag" ;; esac reload_cmds='$LD$reload_flag -o $output$reload_objs' +case $host_os in + darwin*) + if test "$GCC" = yes; then + reload_cmds='$CC -nostdlib ${wl}-r -o $output$reload_objs' + else + reload_cmds='$LD$reload_flag -o $output$reload_objs' + fi + ;; +esac echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5 echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6 @@ -5772,34 +5808,30 @@ beos*) lt_cv_deplibs_check_method=pass_all ;; -bsdi4*) +bsdi[45]*) lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)' lt_cv_file_magic_cmd='/usr/bin/file -L' lt_cv_file_magic_test_file=/shlib/libc.so ;; -cygwin* | mingw* | pw32*) - # win32_libid is a shell function defined in ltmain.sh +cygwin*) + # func_win32_libid is a shell function defined in ltmain.sh lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='win32_libid' + lt_cv_file_magic_cmd='func_win32_libid' + ;; + +mingw* | pw32*) + # Base MSYS/MinGW do not provide the 'file' command needed by + # func_win32_libid shell function, so use a weaker test based on 'objdump'. + lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' + lt_cv_file_magic_cmd='$OBJDUMP -f' ;; darwin* | rhapsody*) - # this will be overwritten by pass_all, but leave it in just in case - lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library' - lt_cv_file_magic_cmd='/usr/bin/file -L' - case "$host_os" in - rhapsody* | darwin1.[012]) - lt_cv_file_magic_test_file=`/System/Library/Frameworks/System.framework/System` - ;; - *) # Darwin 1.3 on - lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib' - ;; - esac lt_cv_deplibs_check_method=pass_all ;; -freebsd*) +freebsd* | kfreebsd*-gnu) if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then case $host_cpu in i*86 ) @@ -5838,36 +5870,27 @@ hpux10.20* | hpux11*) ;; irix5* | irix6* | nonstopux*) - case $host_os in - irix5* | nonstopux*) - # this will be overridden with pass_all, but let us keep it just in case - lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1" - ;; - *) - case $LD in - *-32|*"-32 ") libmagic=32-bit;; - *-n32|*"-n32 ") libmagic=N32;; - *-64|*"-64 ") libmagic=64-bit;; - *) libmagic=never-match;; - esac - # this will be overridden with pass_all, but let us keep it just in case - lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[1234] dynamic lib MIPS - version 1" - ;; + case $LD in + *-32|*"-32 ") libmagic=32-bit;; + *-n32|*"-n32 ") libmagic=N32;; + *-64|*"-64 ") libmagic=64-bit;; + *) libmagic=never-match;; esac - lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*` lt_cv_deplibs_check_method=pass_all ;; # This must be Linux ELF. linux*) case $host_cpu in - alpha* | hppa* | i*86 | ia64* | m68* | mips | mipsel | powerpc* | sparc* | s390* | sh*) + alpha*|hppa*|i*86|ia64*|m68*|mips*|powerpc*|sparc*|s390*|sh*) lt_cv_deplibs_check_method=pass_all ;; *) # glibc up to 2.1.1 does not perform some relocations on ARM + # this will be overridden with pass_all, but let us keep it just in case lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' ;; esac lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so` + lt_cv_deplibs_check_method=pass_all ;; netbsd*) @@ -5884,24 +5907,19 @@ newos6*) lt_cv_file_magic_test_file=/usr/lib/libnls.so ;; -nto-qnx | nto-qnx6*) +nto-qnx*) lt_cv_deplibs_check_method=unknown ;; openbsd*) - lt_cv_file_magic_cmd=/usr/bin/file - lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object' + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$' else - lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library' + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' fi ;; osf3* | osf4* | osf5*) - # this will be overridden with pass_all, but let us keep it just in case - lt_cv_deplibs_check_method='file_magic COFF format alpha shared library' - lt_cv_file_magic_test_file=/shlib/libc.so lt_cv_deplibs_check_method=pass_all ;; @@ -5911,7 +5929,6 @@ sco3.2v5*) solaris*) lt_cv_deplibs_check_method=pass_all - lt_cv_file_magic_test_file=/lib/libc.so ;; sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) @@ -5990,7 +6007,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 5993 "configure"' > conftest.$ac_ext + echo '#line 6010 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -6039,7 +6056,7 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) x86_64-*linux*) LD="${LD-ld} -m elf_i386" ;; - ppc64-*linux*) + ppc64-*linux*|powerpc64-*linux*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -6087,7 +6104,6 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -6104,11 +6120,21 @@ main () _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -6121,7 +6147,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 lt_cv_cc_needs_belf=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f 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' @@ -6170,7 +6197,6 @@ do # 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" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -6181,7 +6207,7 @@ cat >>conftest.$ac_ext <<_ACEOF #else # include <assert.h> #endif - Syntax error + Syntax error _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 @@ -6193,6 +6219,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag else ac_cpp_err= fi @@ -6213,7 +6240,6 @@ rm -f conftest.err conftest.$ac_ext # OK, works on sane cases. Now check whether non-existent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -6231,6 +6257,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag else ac_cpp_err= fi @@ -6277,7 +6304,6 @@ do # 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" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -6288,7 +6314,7 @@ cat >>conftest.$ac_ext <<_ACEOF #else # include <assert.h> #endif - Syntax error + Syntax error _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 @@ -6300,6 +6326,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag else ac_cpp_err= fi @@ -6320,7 +6347,6 @@ rm -f conftest.err conftest.$ac_ext # OK, works on sane cases. Now check whether non-existent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -6338,6 +6364,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag else ac_cpp_err= fi @@ -6383,7 +6410,6 @@ if test "${ac_cv_header_stdc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -6404,11 +6430,21 @@ main () _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -6421,12 +6457,11 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_header_stdc=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f 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" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -6448,7 +6483,6 @@ 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" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -6473,7 +6507,6 @@ if test $ac_cv_header_stdc = yes; then : else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -6485,9 +6518,9 @@ cat >>conftest.$ac_ext <<_ACEOF # 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')) + (('a' <= (c) && (c) <= 'i') \ + || ('j' <= (c) && (c) <= 'r') \ + || ('s' <= (c) && (c) <= 'z')) # define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) #endif @@ -6498,7 +6531,7 @@ main () int i; for (i = 0; i < 256; i++) if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) + || toupper (i) != TOUPPER (i)) exit(2); exit (0); } @@ -6523,7 +6556,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) ac_cv_header_stdc=no fi -rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi fi @@ -6548,7 +6581,7 @@ fi for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ - inttypes.h stdint.h unistd.h + 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 @@ -6557,7 +6590,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" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -6569,11 +6601,21 @@ $ac_includes_default _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -6586,7 +6628,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 eval "$as_ac_Header=no" fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err 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 @@ -6617,7 +6659,6 @@ else 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" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -6628,11 +6669,21 @@ $ac_includes_default _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -6645,7 +6696,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_compiler=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 echo "${ECHO_T}$ac_header_compiler" >&6 @@ -6653,7 +6704,6 @@ echo "${ECHO_T}$ac_header_compiler" >&6 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" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -6671,6 +6721,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag else ac_cpp_err= fi @@ -6690,32 +6741,31 @@ 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 ) +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes ;; - no:yes ) + 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: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX ## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## +## Report this to support@sleepycat.com ## ## ------------------------------------ ## _ASBOX ) | @@ -6727,7 +6777,7 @@ 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" + 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 @@ -6747,7 +6797,7 @@ ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5' ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_f77_compiler_gnu if test -n "$ac_tool_prefix"; then - for ac_prog in g77 f77 xlf frt pgf77 fl32 af77 fort77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 lf95 g95 + for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran 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 @@ -6789,7 +6839,7 @@ fi fi if test -z "$F77"; then ac_ct_F77=$F77 - for ac_prog in g77 f77 xlf frt pgf77 fl32 af77 fort77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 lf95 g95 + for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -6834,7 +6884,7 @@ fi # Provide some information about the compiler. -echo "$as_me:6837:" \ +echo "$as_me:6887:" \ "checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5 @@ -6852,9 +6902,10 @@ ac_compiler=`set X $ac_compile; echo $2` ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } +rm -f a.out # If we don't use `.F' as extension, the preprocessor is not run on the -# input file. +# input file. (Note that this only needs to work for GNU compilers.) ac_save_ext=$ac_ext ac_ext=F echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5 @@ -6872,11 +6923,21 @@ else _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_f77_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -6889,14 +6950,13 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_compiler_gnu=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_f77_compiler_gnu=$ac_compiler_gnu fi echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5 echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6 ac_ext=$ac_save_ext -G77=`test $ac_compiler_gnu = yes && echo yes` ac_test_FFLAGS=${FFLAGS+set} ac_save_FFLAGS=$FFLAGS FFLAGS= @@ -6913,11 +6973,21 @@ cat >conftest.$ac_ext <<_ACEOF _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_f77_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -6930,7 +7000,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_prog_f77_g=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5 @@ -6938,18 +7008,20 @@ echo "${ECHO_T}$ac_cv_prog_f77_g" >&6 if test "$ac_test_FFLAGS" = set; then FFLAGS=$ac_save_FFLAGS elif test $ac_cv_prog_f77_g = yes; then - if test "$G77" = yes; then + if test "x$ac_cv_f77_compiler_gnu" = xyes; then FFLAGS="-g -O2" else FFLAGS="-g" fi else - if test "$G77" = yes; then + if test "x$ac_cv_f77_compiler_gnu" = xyes; then FFLAGS="-O2" else FFLAGS= fi fi + +G77=`test $ac_compiler_gnu = yes && echo yes` ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -6967,7 +7039,7 @@ if test "${lt_cv_sys_max_cmd_len+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else i=0 - testring="ABCD" + teststring="ABCD" case $build_os in msdosdjgpp*) @@ -6996,20 +7068,40 @@ else lt_cv_sys_max_cmd_len=8192; ;; + amigaos*) + # On AmigaOS with pdksh, this test takes hours, literally. + # So we just punt and use a minimum line length of 8192. + lt_cv_sys_max_cmd_len=8192; + ;; + + netbsd* | freebsd* | openbsd* | darwin* ) + # This has been around since 386BSD, at least. Likely further. + if test -x /sbin/sysctl; then + lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` + elif test -x /usr/sbin/sysctl; then + lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` + else + lt_cv_sys_max_cmd_len=65536 # usable default for *BSD + fi + # And add a safety zone + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` + ;; + *) # If test is not a shell built-in, we'll probably end up computing a # maximum length that is only half of the actual maximum length, but # we can't tell. - while (test "X"`$CONFIG_SHELL $0 --fallback-echo "X$testring" 2>/dev/null` \ - = "XX$testring") >/dev/null 2>&1 && - new_result=`expr "X$testring" : ".*" 2>&1` && + SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} + while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \ + = "XX$teststring") >/dev/null 2>&1 && + new_result=`expr "X$teststring" : ".*" 2>&1` && lt_cv_sys_max_cmd_len=$new_result && test $i != 17 # 1/2 MB should be enough do i=`expr $i + 1` - testring=$testring$testring + teststring=$teststring$teststring done - testring= + teststring= # Add a significant safety factor because C++ compilers can tack on massive # amounts of additional arguments before passing them to the linker. # It appears as though 1/2 is a usable value. @@ -7077,7 +7169,7 @@ osf*) symcode='[BCDEGQRST]' ;; solaris* | sysv5*) - symcode='[BDT]' + symcode='[BDRT]' ;; sysv4) symcode='[DFNSTU]' @@ -7095,7 +7187,7 @@ esac # If we're using GNU nm, then use its standard symbol codes. case `$NM -V 2>&1` in *GNU* | *'with BFD'*) - symcode='[ABCDGISTW]' ;; + symcode='[ABCDGIRSTW]' ;; esac # Try without a prefix undercore, then with it. @@ -7569,6 +7661,8 @@ if test -n "$RANLIB"; then old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" fi +cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'` + # Only perform the check for file, if the check method requires it case $deplibs_check_method in file_magic*) @@ -7825,7 +7919,8 @@ lt_prog_compiler_no_builtin_flag= if test "$GCC" = yes; then lt_prog_compiler_no_builtin_flag=' -fno-builtin' - echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 + +echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6 if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7843,11 +7938,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7846: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7941: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7850: \$? = $ac_status" >&5 + echo "$as_me:7945: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -7954,6 +8049,16 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp' fi ;; + darwin*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + case "$cc_basename" in + xlc*) + lt_prog_compiler_pic='-qnocommon' + lt_prog_compiler_wl='-Wl,' + ;; + esac + ;; mingw* | pw32* | os2*) # This hack is so that the source file can tell whether it is being @@ -7990,12 +8095,12 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 linux*) case $CC in - icc|ecc) + icc* | ecc*) lt_prog_compiler_wl='-Wl,' lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-static' ;; - ccc) + ccc*) lt_prog_compiler_wl='-Wl,' # All Alpha code is PIC. lt_prog_compiler_static='-non_shared' @@ -8057,7 +8162,8 @@ echo "${ECHO_T}$lt_prog_compiler_pic" >&6 # Check to make sure the PIC flag actually works. # if test -n "$lt_prog_compiler_pic"; then - echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 + +echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6 if test "${lt_prog_compiler_pic_works+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -8075,11 +8181,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8078: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8184: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8082: \$? = $ac_status" >&5 + echo "$as_me:8188: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -8126,13 +8232,6 @@ else mkdir out printf "$lt_simple_compile_test_code" > conftest.$ac_ext - # According to Tom Tromey, Ian Lance Taylor reported there are C compilers - # that will create temporary files in the current directory regardless of - # the output directory. Thus, making CWD read-only will cause this test - # to fail, enabling locking or at least warning the user not to do parallel - # builds. - chmod -w . - lt_compiler_flag="-o out/conftest2.$ac_objext" # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. @@ -8142,11 +8241,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8145: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8244: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8149: \$? = $ac_status" >&5 + echo "$as_me:8248: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -8156,8 +8255,11 @@ else fi fi chmod u+w . - $rm conftest* out/* - rmdir out + $rm conftest* + # SGI C++ compiler will create directory out/ii_files/ for + # template instantiation + test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files + $rm out/* && rmdir out cd .. rmdir conftest $rm conftest* @@ -8354,6 +8456,31 @@ EOF hardcode_shlibpath_var=no ;; + linux*) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_cmds="$tmp_archive_cmds" + supports_anon_versioning=no + case `$LD -v 2>/dev/null` in + *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 + *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... + *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... + *\ 2.11.*) ;; # other 2.11 versions + *) supports_anon_versioning=yes ;; + esac + if test $supports_anon_versioning = yes; then + archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~ +cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ +$echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + else + archive_expsym_cmds="$tmp_archive_cmds" + fi + else + ld_shlibs=no + fi + ;; + *) if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' @@ -8482,7 +8609,6 @@ EOF allow_undefined_flag='-berok' # Determine the default libpath from the value encoded in an empty executable. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -8499,11 +8625,21 @@ main () _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8520,7 +8656,8 @@ else sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" @@ -8533,7 +8670,6 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi else # Determine the default libpath from the value encoded in an empty executable. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -8550,11 +8686,21 @@ main () _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8571,7 +8717,8 @@ else sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" @@ -8598,7 +8745,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ld_shlibs=no ;; - bsdi4*) + bsdi[45]*) export_dynamic_flag_spec=-rdynamic ;; @@ -8612,7 +8759,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # Tell ltmain to make .lib files, not .a files. libext=lib # Tell ltmain to make .dll files, not .so files. - shrext=".dll" + shrext_cmds=".dll" # FIXME: Setting linknames here is a bad hack. archive_cmds='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' # The linker will automatically build a .lib file if we build a DLL. @@ -8624,43 +8771,52 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ;; darwin* | rhapsody*) - if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then - archive_cmds_need_lc=no case "$host_os" in - rhapsody* | darwin1.[012]) - allow_undefined_flag='-undefined suppress' - ;; - *) # Darwin 1.3 on - test -z ${LD_TWOLEVEL_NAMESPACE} && allow_undefined_flag='-flat_namespace -undefined suppress' - ;; + rhapsody* | darwin1.[012]) + allow_undefined_flag='${wl}-undefined ${wl}suppress' + ;; + *) # Darwin 1.3 on + if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then + allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' + else + case ${MACOSX_DEPLOYMENT_TARGET} in + 10.[012]) + allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' + ;; + 10.*) + allow_undefined_flag='${wl}-undefined ${wl}dynamic_lookup' + ;; + esac + fi + ;; esac - # FIXME: Relying on posixy $() will cause problems for - # cross-compilation, but unfortunately the echo tests do not - # yet detect zsh echo's removal of \ escapes. Also zsh mangles - # `"' quotes if we put them in here... so don't! - lt_int_apple_cc_single_mod=no - output_verbose_link_cmd='echo' - if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then - lt_int_apple_cc_single_mod=yes - fi - if test "X$lt_int_apple_cc_single_mod" = Xyes ; then - archive_cmds='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' - else - archive_cmds='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' - fi - module_cmds='$CC -bundle ${wl}-bind_at_load $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's - if test "X$lt_int_apple_cc_single_mod" = Xyes ; then - archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - else - archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - fi - module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -bundle $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + archive_cmds_need_lc=no hardcode_direct=no hardcode_automatic=yes hardcode_shlibpath_var=unsupported - whole_archive_flag_spec='-all_load $convenience' + whole_archive_flag_spec='' link_all_deplibs=yes + if test "$GCC" = yes ; then + output_verbose_link_cmd='echo' + archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' + module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' + # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's + archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + else + case "$cc_basename" in + xlc*) + output_verbose_link_cmd='echo' + archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' + module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' + # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's + archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + ;; + *) + ld_shlibs=no + ;; + esac fi ;; @@ -8694,7 +8850,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ;; # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd*) + freebsd* | kfreebsd*-gnu) archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes @@ -8805,6 +8961,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_shlibpath_var=no if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' hardcode_libdir_flag_spec='${wl}-rpath,$libdir' export_dynamic_flag_spec='${wl}-E' else @@ -9054,78 +9211,12 @@ echo "${ECHO_T}$archive_cmds_need_lc" >&6 ;; esac -echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 -echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 -hardcode_action= -if test -n "$hardcode_libdir_flag_spec" || \ - test -n "$runpath_var " || \ - test "X$hardcode_automatic"="Xyes" ; then - - # We can hardcode non-existant directories. - if test "$hardcode_direct" != no && - # If the only mechanism to avoid hardcoding is shlibpath_var, we - # have to relink, otherwise we might link with an installed library - # when we should be linking with a yet-to-be-installed one - ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, )" != no && - test "$hardcode_minus_L" != no; then - # Linking always hardcodes the temporary library directory. - hardcode_action=relink - else - # We can link without hardcoding, and we can hardcode nonexisting dirs. - hardcode_action=immediate - fi -else - # We cannot hardcode anything, or else we can only hardcode existing - # directories. - hardcode_action=unsupported -fi -echo "$as_me:$LINENO: result: $hardcode_action" >&5 -echo "${ECHO_T}$hardcode_action" >&6 - -if test "$hardcode_action" = relink; then - # Fast installation is not supported - enable_fast_install=no -elif test "$shlibpath_overrides_runpath" = yes || - test "$enable_shared" = no; then - # Fast installation is not necessary - enable_fast_install=needless -fi - -striplib= -old_striplib= -echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 -echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6 -if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then - test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" - test -z "$striplib" && striplib="$STRIP --strip-unneeded" - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 -else -# FIXME - insert some real tests, host_os isn't really good enough - case $host_os in - darwin*) - if test -n "$STRIP" ; then - striplib="$STRIP -x" - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - ;; - *) - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - ;; - esac -fi - echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 library_names_spec= libname_spec='lib$name' soname_spec= -shrext=".so" +shrext_cmds=".so" postinstall_cmds= postuninstall_cmds= finish_cmds= @@ -9213,7 +9304,7 @@ aix4* | aix5*) amigaos*) library_names_spec='$libname.ixlibrary $libname.a' # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done' + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' ;; beos*) @@ -9222,7 +9313,7 @@ beos*) shlibpath_var=LIBRARY_PATH ;; -bsdi4*) +bsdi[45]*) version_type=linux need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -9238,7 +9329,7 @@ bsdi4*) cygwin* | mingw* | pw32*) version_type=windows - shrext=".dll" + shrext_cmds=".dll" need_version=no need_lib_prefix=no @@ -9260,7 +9351,7 @@ cygwin* | mingw* | pw32*) cygwin*) # Cygwin DLLs use 'cyg' prefix rather than 'lib' soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec="/lib /lib/w32api /usr/lib /usr/local/lib" + sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" ;; mingw*) # MinGW DLLs use traditional 'lib' prefix @@ -9299,17 +9390,16 @@ darwin* | rhapsody*) version_type=darwin need_lib_prefix=no need_version=no - # FIXME: Relying on posixy $() will cause problems for - # cross-compilation, but unfortunately the echo tests do not - # yet detect zsh echo's removal of \ escapes. library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' soname_spec='${libname}${release}${major}$shared_ext' shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH - shrext='$(test .$module = .yes && echo .so || echo .dylib)' + shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)' # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. - if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then - sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` + if test "$GCC" = yes; then + sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` + else + sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' fi sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' ;; @@ -9327,6 +9417,18 @@ freebsd1*) dynamic_linker=no ;; +kfreebsd*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='GNU ld.so' + ;; + freebsd*) objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` version_type=freebsd-$objformat @@ -9375,7 +9477,7 @@ hpux9* | hpux10* | hpux11*) need_version=no case "$host_cpu" in ia64*) - shrext='.so' + shrext_cmds='.so' hardcode_into_libs=yes dynamic_linker="$host_os dld.so" shlibpath_var=LD_LIBRARY_PATH @@ -9390,7 +9492,7 @@ hpux9* | hpux10* | hpux11*) sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; hppa*64*) - shrext='.sl' + shrext_cmds='.sl' hardcode_into_libs=yes dynamic_linker="$host_os dld.sl" shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH @@ -9401,7 +9503,7 @@ hpux9* | hpux10* | hpux11*) sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; *) - shrext='.sl' + shrext_cmds='.sl' dynamic_linker="$host_os dld.sl" shlibpath_var=SHLIB_PATH shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH @@ -9470,6 +9572,12 @@ linux*) # before this can be enabled. hardcode_into_libs=yes + # Append ld.so.conf contents to the search path + if test -f /etc/ld.so.conf; then + lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '` + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + fi + # We used to test for /lib/ld.so.1 and disable shared libraries on # powerpc, because MkLinux only supported shared libraries with the # GNU dynamic linker. Since this was broken with cross compilers, @@ -9479,6 +9587,18 @@ linux*) dynamic_linker='GNU/Linux ld.so' ;; +knetbsd*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='GNU ld.so' + ;; + netbsd*) version_type=sunos need_lib_prefix=no @@ -9488,7 +9608,7 @@ netbsd*) finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' dynamic_linker='NetBSD (a.out) ld.so' else - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${libname}${shared_ext}' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' dynamic_linker='NetBSD ld.elf_so' fi @@ -9504,7 +9624,7 @@ newsos6) shlibpath_overrides_runpath=yes ;; -nto-qnx | nto-qnx6*) +nto-qnx*) version_type=linux need_lib_prefix=no need_version=no @@ -9537,7 +9657,7 @@ openbsd*) os2*) libname_spec='$name' - shrext=".dll" + shrext_cmds=".dll" need_lib_prefix=no library_names_spec='$libname${shared_ext} $libname.a' dynamic_linker='OS/2 ld.exe' @@ -9635,6 +9755,72 @@ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 echo "${ECHO_T}$dynamic_linker" >&6 test "$dynamic_linker" = no && can_build_shared=no +echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 +echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 +hardcode_action= +if test -n "$hardcode_libdir_flag_spec" || \ + test -n "$runpath_var" || \ + test "X$hardcode_automatic" = "Xyes" ; then + + # We can hardcode non-existant directories. + if test "$hardcode_direct" != no && + # If the only mechanism to avoid hardcoding is shlibpath_var, we + # have to relink, otherwise we might link with an installed library + # when we should be linking with a yet-to-be-installed one + ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, )" != no && + test "$hardcode_minus_L" != no; then + # Linking always hardcodes the temporary library directory. + hardcode_action=relink + else + # We can link without hardcoding, and we can hardcode nonexisting dirs. + hardcode_action=immediate + fi +else + # We cannot hardcode anything, or else we can only hardcode existing + # directories. + hardcode_action=unsupported +fi +echo "$as_me:$LINENO: result: $hardcode_action" >&5 +echo "${ECHO_T}$hardcode_action" >&6 + +if test "$hardcode_action" = relink; then + # Fast installation is not supported + enable_fast_install=no +elif test "$shlibpath_overrides_runpath" = yes || + test "$enable_shared" = no; then + # Fast installation is not necessary + enable_fast_install=needless +fi + +striplib= +old_striplib= +echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 +echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6 +if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then + test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" + test -z "$striplib" && striplib="$STRIP --strip-unneeded" + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 +else +# FIXME - insert some real tests, host_os isn't really good enough + case $host_os in + darwin*) + if test -n "$STRIP" ; then + striplib="$STRIP -x" + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + ;; + *) + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + ;; + esac +fi + if test "x$enable_dlopen" != xyes; then enable_dlopen=unknown enable_dlopen_self=unknown @@ -9670,7 +9856,6 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -9694,11 +9879,21 @@ dlopen (); _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -9711,7 +9906,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_dl_dlopen=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f 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 @@ -9735,21 +9931,28 @@ 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" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define shl_load innocuous_shl_load + /* System header to define __stub macros and hopefully few prototypes, which can conflict with char shl_load (); below. Prefer <limits.h> to <assert.h> if __STDC__ is defined, since <limits.h> exists even on freestanding compilers. */ + #ifdef __STDC__ # include <limits.h> #else # include <assert.h> #endif + +#undef shl_load + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" @@ -9780,11 +9983,21 @@ return f != shl_load; _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -9797,7 +10010,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_func_shl_load=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err 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 @@ -9812,7 +10026,6 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldld $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -9836,11 +10049,21 @@ shl_load (); _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -9853,7 +10076,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_dld_shl_load=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f 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 @@ -9867,21 +10091,28 @@ 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" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define dlopen innocuous_dlopen + /* System header to define __stub macros and hopefully few prototypes, which can conflict with char dlopen (); below. Prefer <limits.h> to <assert.h> if __STDC__ is defined, since <limits.h> exists even on freestanding compilers. */ + #ifdef __STDC__ # include <limits.h> #else # include <assert.h> #endif + +#undef dlopen + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" @@ -9912,11 +10143,21 @@ return f != dlopen; _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -9929,7 +10170,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_func_dlopen=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err 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 @@ -9944,7 +10186,6 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -9968,11 +10209,21 @@ dlopen (); _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -9985,7 +10236,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_dl_dlopen=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f 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 @@ -10001,7 +10253,6 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lsvld $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -10025,11 +10276,21 @@ dlopen (); _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -10042,7 +10303,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_svld_dlopen=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f 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 @@ -10058,7 +10320,6 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldld $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -10082,11 +10343,21 @@ dld_link (); _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -10099,7 +10370,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_dld_dld_link=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f 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 @@ -10154,7 +10426,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 10157 "configure" +#line 10429 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10252,7 +10524,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 10255 "configure" +#line 10527 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10377,38 +10649,10 @@ aix3*) fi ;; -aix4*) +aix4* | aix5*) if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then test "$enable_shared" = yes && enable_static=no fi - ;; - darwin* | rhapsody*) - if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then - archive_cmds_need_lc=no - case "$host_os" in - rhapsody* | darwin1.[012]) - allow_undefined_flag='-undefined suppress' - ;; - *) # Darwin 1.3 on - test -z ${LD_TWOLEVEL_NAMESPACE} && allow_undefined_flag='-flat_namespace -undefined suppress' - ;; - esac - # FIXME: Relying on posixy $() will cause problems for - # cross-compilation, but unfortunately the echo tests do not - # yet detect zsh echo's removal of \ escapes. Also zsh mangles - # `"' quotes if we put them in here... so don't! - output_verbose_link_cmd='echo' - archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring' - module_cmds='$CC -bundle $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's - archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -bundle $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - hardcode_direct=no - hardcode_automatic=yes - hardcode_shlibpath_var=unsupported - whole_archive_flag_spec='-all_load $convenience' - link_all_deplibs=yes - fi ;; esac echo "$as_me:$LINENO: result: $enable_shared" >&5 @@ -10434,7 +10678,8 @@ if test -f "$ltmain"; then # Now quote all the things that may contain metacharacters while being # careful not to overquote the AC_SUBSTed values. We take copies of the # variables and quote the copies for generation of the libtool script. - for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \ + for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \ + SED SHELL STRIP \ libname_spec library_names_spec soname_spec extract_expsyms_cmds \ old_striplib striplib file_magic_cmd finish_cmds finish_eval \ deplibs_check_method reload_flag reload_cmds need_locks \ @@ -10552,7 +10797,7 @@ Xsed="$SED -e s/^X//" # The HP-UX ksh and POSIX shell print the target directory to stdout # if CDPATH is set. -if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH # The names of the tagged configurations supported by this script. available_tags= @@ -10612,7 +10857,7 @@ LN_S=$lt_LN_S NM=$lt_NM # A symbol stripping program -STRIP=$STRIP +STRIP=$lt_STRIP # Used to examine libraries when file_magic_cmd begins "file" MAGIC_CMD=$MAGIC_CMD @@ -10643,7 +10888,7 @@ objext="$ac_objext" libext="$libext" # Shared library suffix (normally ".so"). -shrext='$shrext' +shrext_cmds='$shrext_cmds' # Executable file suffix (normally ""). exeext="$exeext" @@ -10885,7 +11130,10 @@ else # If there is no Makefile yet, we rely on a make rule to execute # `config.status --recheck' to rerun these tests and create the # libtool script then. - test -f Makefile && make "$ltmain" + ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` + if test -f "$ltmain_in"; then + test -f Makefile && make "$ltmain" + fi fi @@ -11066,7 +11314,7 @@ echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6 # Accept absolute paths. [\\/]* | ?:[\\/]*) re_direlt='/[^/][^/]*/\.\./' - # Canonicalize the path of ld + # Canonicalize the pathname of ld ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'` while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"` @@ -11135,7 +11383,7 @@ if test "${lt_cv_prog_gnu_ld+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else # I'd rather use --version here, but apparently some GNU ld's only accept -v. -case `"$LD" -v 2>&1 </dev/null` in +case `$LD -v 2>&1 </dev/null` in *GNU* | *'with BFD'*) lt_cv_prog_gnu_ld=yes ;; @@ -11180,7 +11428,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld # linker, instead of GNU ld. If possible, this setting should # overridden to take advantage of the native linker features on # the platform it is being used on. - archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' + archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' fi # Commands to make compiler produce verbose output that lists @@ -11288,7 +11536,6 @@ case $host_os in allow_undefined_flag_CXX='-berok' # Determine the default libpath from the value encoded in an empty executable. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -11305,11 +11552,21 @@ main () _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -11326,7 +11583,8 @@ else sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" @@ -11340,7 +11598,6 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi else # Determine the default libpath from the value encoded in an empty executable. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -11357,11 +11614,21 @@ main () _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -11378,7 +11645,8 @@ else sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" @@ -11405,6 +11673,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi esac ;; + cygwin* | mingw* | pw32*) # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless, # as there is no search path for DLLs. @@ -11428,44 +11697,68 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ld_shlibs_CXX=no fi ;; - - darwin* | rhapsody*) - if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then - archive_cmds_need_lc_CXX=no - case "$host_os" in - rhapsody* | darwin1.[012]) - allow_undefined_flag_CXX='-undefined suppress' - ;; - *) # Darwin 1.3 on - test -z ${LD_TWOLEVEL_NAMESPACE} && allow_undefined_flag_CXX='-flat_namespace -undefined suppress' - ;; - esac - lt_int_apple_cc_single_mod=no - output_verbose_link_cmd='echo' - if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then - lt_int_apple_cc_single_mod=yes - fi - if test "X$lt_int_apple_cc_single_mod" = Xyes ; then - archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' - else - archive_cmds_CXX='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' + darwin* | rhapsody*) + case "$host_os" in + rhapsody* | darwin1.[012]) + allow_undefined_flag_CXX='${wl}-undefined ${wl}suppress' + ;; + *) # Darwin 1.3 on + if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then + allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' + else + case ${MACOSX_DEPLOYMENT_TARGET} in + 10.[012]) + allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' + ;; + 10.*) + allow_undefined_flag_CXX='${wl}-undefined ${wl}dynamic_lookup' + ;; + esac + fi + ;; + esac + archive_cmds_need_lc_CXX=no + hardcode_direct_CXX=no + hardcode_automatic_CXX=yes + hardcode_shlibpath_var_CXX=unsupported + whole_archive_flag_spec_CXX='' + link_all_deplibs_CXX=yes + + if test "$GXX" = yes ; then + lt_int_apple_cc_single_mod=no + output_verbose_link_cmd='echo' + if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then + lt_int_apple_cc_single_mod=yes fi - module_cmds_CXX='$CC -bundle ${wl}-bind_at_load $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags' - - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's if test "X$lt_int_apple_cc_single_mod" = Xyes ; then - archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' else - archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + archive_cmds_CXX='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' + fi + module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' + # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's + if test "X$lt_int_apple_cc_single_mod" = Xyes ; then + archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + else + archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + fi + module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + else + case "$cc_basename" in + xlc*) + output_verbose_link_cmd='echo' + archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' + module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' + # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's + archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + ;; + *) + ld_shlibs_CXX=no + ;; + esac fi - module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -bundle $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - hardcode_direct_CXX=no - hardcode_automatic_CXX=yes - hardcode_shlibpath_var_CXX=unsupported - whole_archive_flag_spec_CXX='-all_load $convenience' - link_all_deplibs_CXX=yes - fi - ;; + ;; dgux*) case $cc_basename in @@ -11491,7 +11784,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi freebsd-elf*) archive_cmds_need_lc_CXX=no ;; - freebsd*) + freebsd* | kfreebsd*-gnu) # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF # conventions ld_shlibs_CXX=yes @@ -11522,7 +11815,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | egrep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' ;; *) if test "$GXX" = yes; then @@ -11671,9 +11964,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi icpc) # Intel C++ with_gnu_ld=yes + # version 8.0 and above of icpc choke on multiply defined symbols + # if we add $predep_objects and $postdep_objects, however 7.1 and + # earlier do not add the objects themselves. + case `$CC -V 2>&1` in + *"Version 7."*) + archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + ;; + *) # Version 8.0 or newer + archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + ;; + esac archive_cmds_need_lc_CXX=no - archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' export_dynamic_flag_spec_CXX='${wl}--export-dynamic' whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive' @@ -11730,6 +12034,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # Workaround some broken pre-1.5 toolchains output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' ;; + openbsd2*) + # C++ shared libraries are fairly broken + ld_shlibs_CXX=no + ;; + openbsd*) + archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' + hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' + export_dynamic_flag_spec_CXX='${wl}-E' + whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + fi + output_verbose_link_cmd='echo' + ;; osf3*) case $cc_basename in KCC) @@ -12189,6 +12507,16 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 ;; esac ;; + darwin*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + case "$cc_basename" in + xlc*) + lt_prog_compiler_pic_CXX='-qnocommon' + lt_prog_compiler_wl_CXX='-Wl,' + ;; + esac + ;; dgux*) case $cc_basename in ec++) @@ -12202,7 +12530,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 ;; esac ;; - freebsd*) + freebsd* | kfreebsd*-gnu) # FreeBSD uses GNU C++ ;; hpux9* | hpux10* | hpux11*) @@ -12370,7 +12698,8 @@ echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6 # Check to make sure the PIC flag actually works. # if test -n "$lt_prog_compiler_pic_CXX"; then - echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 + +echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6 if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -12388,11 +12717,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12391: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12720: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:12395: \$? = $ac_status" >&5 + echo "$as_me:12724: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -12439,13 +12768,6 @@ else mkdir out printf "$lt_simple_compile_test_code" > conftest.$ac_ext - # According to Tom Tromey, Ian Lance Taylor reported there are C compilers - # that will create temporary files in the current directory regardless of - # the output directory. Thus, making CWD read-only will cause this test - # to fail, enabling locking or at least warning the user not to do parallel - # builds. - chmod -w . - lt_compiler_flag="-o out/conftest2.$ac_objext" # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. @@ -12455,11 +12777,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12458: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12780: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:12462: \$? = $ac_status" >&5 + echo "$as_me:12784: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -12469,8 +12791,11 @@ else fi fi chmod u+w . - $rm conftest* out/* - rmdir out + $rm conftest* + # SGI C++ compiler will create directory out/ii_files/ for + # template instantiation + test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files + $rm out/* && rmdir out cd .. rmdir conftest $rm conftest* @@ -12598,78 +12923,12 @@ echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6 ;; esac -echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 -echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 -hardcode_action_CXX= -if test -n "$hardcode_libdir_flag_spec_CXX" || \ - test -n "$runpath_var CXX" || \ - test "X$hardcode_automatic_CXX"="Xyes" ; then - - # We can hardcode non-existant directories. - if test "$hardcode_direct_CXX" != no && - # If the only mechanism to avoid hardcoding is shlibpath_var, we - # have to relink, otherwise we might link with an installed library - # when we should be linking with a yet-to-be-installed one - ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, CXX)" != no && - test "$hardcode_minus_L_CXX" != no; then - # Linking always hardcodes the temporary library directory. - hardcode_action_CXX=relink - else - # We can link without hardcoding, and we can hardcode nonexisting dirs. - hardcode_action_CXX=immediate - fi -else - # We cannot hardcode anything, or else we can only hardcode existing - # directories. - hardcode_action_CXX=unsupported -fi -echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5 -echo "${ECHO_T}$hardcode_action_CXX" >&6 - -if test "$hardcode_action_CXX" = relink; then - # Fast installation is not supported - enable_fast_install=no -elif test "$shlibpath_overrides_runpath" = yes || - test "$enable_shared" = no; then - # Fast installation is not necessary - enable_fast_install=needless -fi - -striplib= -old_striplib= -echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 -echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6 -if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then - test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" - test -z "$striplib" && striplib="$STRIP --strip-unneeded" - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 -else -# FIXME - insert some real tests, host_os isn't really good enough - case $host_os in - darwin*) - if test -n "$STRIP" ; then - striplib="$STRIP -x" - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - ;; - *) - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - ;; - esac -fi - echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 library_names_spec= libname_spec='lib$name' soname_spec= -shrext=".so" +shrext_cmds=".so" postinstall_cmds= postuninstall_cmds= finish_cmds= @@ -12757,7 +13016,7 @@ aix4* | aix5*) amigaos*) library_names_spec='$libname.ixlibrary $libname.a' # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done' + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' ;; beos*) @@ -12766,7 +13025,7 @@ beos*) shlibpath_var=LIBRARY_PATH ;; -bsdi4*) +bsdi[45]*) version_type=linux need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -12782,7 +13041,7 @@ bsdi4*) cygwin* | mingw* | pw32*) version_type=windows - shrext=".dll" + shrext_cmds=".dll" need_version=no need_lib_prefix=no @@ -12804,7 +13063,7 @@ cygwin* | mingw* | pw32*) cygwin*) # Cygwin DLLs use 'cyg' prefix rather than 'lib' soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec="/lib /lib/w32api /usr/lib /usr/local/lib" + sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" ;; mingw*) # MinGW DLLs use traditional 'lib' prefix @@ -12843,17 +13102,16 @@ darwin* | rhapsody*) version_type=darwin need_lib_prefix=no need_version=no - # FIXME: Relying on posixy $() will cause problems for - # cross-compilation, but unfortunately the echo tests do not - # yet detect zsh echo's removal of \ escapes. library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' soname_spec='${libname}${release}${major}$shared_ext' shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH - shrext='$(test .$module = .yes && echo .so || echo .dylib)' + shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)' # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. - if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then - sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` + if test "$GCC" = yes; then + sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` + else + sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' fi sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' ;; @@ -12871,6 +13129,18 @@ freebsd1*) dynamic_linker=no ;; +kfreebsd*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='GNU ld.so' + ;; + freebsd*) objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` version_type=freebsd-$objformat @@ -12919,7 +13189,7 @@ hpux9* | hpux10* | hpux11*) need_version=no case "$host_cpu" in ia64*) - shrext='.so' + shrext_cmds='.so' hardcode_into_libs=yes dynamic_linker="$host_os dld.so" shlibpath_var=LD_LIBRARY_PATH @@ -12934,7 +13204,7 @@ hpux9* | hpux10* | hpux11*) sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; hppa*64*) - shrext='.sl' + shrext_cmds='.sl' hardcode_into_libs=yes dynamic_linker="$host_os dld.sl" shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH @@ -12945,7 +13215,7 @@ hpux9* | hpux10* | hpux11*) sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; *) - shrext='.sl' + shrext_cmds='.sl' dynamic_linker="$host_os dld.sl" shlibpath_var=SHLIB_PATH shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH @@ -13014,6 +13284,12 @@ linux*) # before this can be enabled. hardcode_into_libs=yes + # Append ld.so.conf contents to the search path + if test -f /etc/ld.so.conf; then + lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '` + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + fi + # We used to test for /lib/ld.so.1 and disable shared libraries on # powerpc, because MkLinux only supported shared libraries with the # GNU dynamic linker. Since this was broken with cross compilers, @@ -13023,6 +13299,18 @@ linux*) dynamic_linker='GNU/Linux ld.so' ;; +knetbsd*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='GNU ld.so' + ;; + netbsd*) version_type=sunos need_lib_prefix=no @@ -13032,7 +13320,7 @@ netbsd*) finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' dynamic_linker='NetBSD (a.out) ld.so' else - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${libname}${shared_ext}' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' dynamic_linker='NetBSD ld.elf_so' fi @@ -13048,7 +13336,7 @@ newsos6) shlibpath_overrides_runpath=yes ;; -nto-qnx | nto-qnx6*) +nto-qnx*) version_type=linux need_lib_prefix=no need_version=no @@ -13081,7 +13369,7 @@ openbsd*) os2*) libname_spec='$name' - shrext=".dll" + shrext_cmds=".dll" need_lib_prefix=no library_names_spec='$libname${shared_ext} $libname.a' dynamic_linker='OS/2 ld.exe' @@ -13179,6 +13467,72 @@ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 echo "${ECHO_T}$dynamic_linker" >&6 test "$dynamic_linker" = no && can_build_shared=no +echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 +echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 +hardcode_action_CXX= +if test -n "$hardcode_libdir_flag_spec_CXX" || \ + test -n "$runpath_var_CXX" || \ + test "X$hardcode_automatic_CXX" = "Xyes" ; then + + # We can hardcode non-existant directories. + if test "$hardcode_direct_CXX" != no && + # If the only mechanism to avoid hardcoding is shlibpath_var, we + # have to relink, otherwise we might link with an installed library + # when we should be linking with a yet-to-be-installed one + ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, CXX)" != no && + test "$hardcode_minus_L_CXX" != no; then + # Linking always hardcodes the temporary library directory. + hardcode_action_CXX=relink + else + # We can link without hardcoding, and we can hardcode nonexisting dirs. + hardcode_action_CXX=immediate + fi +else + # We cannot hardcode anything, or else we can only hardcode existing + # directories. + hardcode_action_CXX=unsupported +fi +echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5 +echo "${ECHO_T}$hardcode_action_CXX" >&6 + +if test "$hardcode_action_CXX" = relink; then + # Fast installation is not supported + enable_fast_install=no +elif test "$shlibpath_overrides_runpath" = yes || + test "$enable_shared" = no; then + # Fast installation is not necessary + enable_fast_install=needless +fi + +striplib= +old_striplib= +echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 +echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6 +if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then + test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" + test -z "$striplib" && striplib="$STRIP --strip-unneeded" + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 +else +# FIXME - insert some real tests, host_os isn't really good enough + case $host_os in + darwin*) + if test -n "$STRIP" ; then + striplib="$STRIP -x" + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + ;; + *) + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + ;; + esac +fi + if test "x$enable_dlopen" != xyes; then enable_dlopen=unknown enable_dlopen_self=unknown @@ -13214,7 +13568,6 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -13238,11 +13591,21 @@ dlopen (); _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -13255,7 +13618,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_dl_dlopen=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f 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 @@ -13279,21 +13643,28 @@ 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" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define shl_load innocuous_shl_load + /* System header to define __stub macros and hopefully few prototypes, which can conflict with char shl_load (); below. Prefer <limits.h> to <assert.h> if __STDC__ is defined, since <limits.h> exists even on freestanding compilers. */ + #ifdef __STDC__ # include <limits.h> #else # include <assert.h> #endif + +#undef shl_load + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" @@ -13324,11 +13695,21 @@ return f != shl_load; _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -13341,7 +13722,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_func_shl_load=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err 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 @@ -13356,7 +13738,6 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldld $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -13380,11 +13761,21 @@ shl_load (); _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -13397,7 +13788,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_dld_shl_load=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f 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 @@ -13411,21 +13803,28 @@ 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" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define dlopen innocuous_dlopen + /* System header to define __stub macros and hopefully few prototypes, which can conflict with char dlopen (); below. Prefer <limits.h> to <assert.h> if __STDC__ is defined, since <limits.h> exists even on freestanding compilers. */ + #ifdef __STDC__ # include <limits.h> #else # include <assert.h> #endif + +#undef dlopen + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" @@ -13456,11 +13855,21 @@ return f != dlopen; _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -13473,7 +13882,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_func_dlopen=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err 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 @@ -13488,7 +13898,6 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -13512,11 +13921,21 @@ dlopen (); _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -13529,7 +13948,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_dl_dlopen=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f 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 @@ -13545,7 +13965,6 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lsvld $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -13569,11 +13988,21 @@ dlopen (); _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -13586,7 +14015,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_svld_dlopen=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f 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 @@ -13602,7 +14032,6 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldld $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -13626,11 +14055,21 @@ dld_link (); _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -13643,7 +14082,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_dld_dld_link=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f 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 @@ -13698,7 +14138,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 13701 "configure" +#line 14141 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13796,7 +14236,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 13799 "configure" +#line 14239 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13913,7 +14353,8 @@ if test -f "$ltmain"; then # Now quote all the things that may contain metacharacters while being # careful not to overquote the AC_SUBSTed values. We take copies of the # variables and quote the copies for generation of the libtool script. - for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \ + for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \ + SED SHELL STRIP \ libname_spec library_names_spec soname_spec extract_expsyms_cmds \ old_striplib striplib file_magic_cmd finish_cmds finish_eval \ deplibs_check_method reload_flag reload_cmds need_locks \ @@ -14043,7 +14484,7 @@ LN_S=$lt_LN_S NM=$lt_NM # A symbol stripping program -STRIP=$STRIP +STRIP=$lt_STRIP # Used to examine libraries when file_magic_cmd begins "file" MAGIC_CMD=$MAGIC_CMD @@ -14074,7 +14515,7 @@ objext="$ac_objext" libext="$libext" # Shared library suffix (normally ".so"). -shrext='$shrext' +shrext_cmds='$shrext_cmds' # Executable file suffix (normally ""). exeext="$exeext" @@ -14291,7 +14732,10 @@ else # If there is no Makefile yet, we rely on a make rule to execute # `config.status --recheck' to rerun these tests and create the # libtool script then. - test -f Makefile && make "$ltmain" + ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` + if test -f "$ltmain_in"; then + test -f Makefile && make "$ltmain" + fi fi @@ -14393,7 +14837,7 @@ aix3*) postinstall_cmds='$RANLIB $lib' fi ;; -aix4*) +aix4* | aix5*) test "$enable_shared" = yes && enable_static=no ;; esac @@ -14497,6 +14941,16 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp' fi ;; + darwin*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + case "$cc_basename" in + xlc*) + lt_prog_compiler_pic_F77='-qnocommon' + lt_prog_compiler_wl_F77='-Wl,' + ;; + esac + ;; mingw* | pw32* | os2*) # This hack is so that the source file can tell whether it is being @@ -14533,12 +14987,12 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 linux*) case $CC in - icc|ecc) + icc* | ecc*) lt_prog_compiler_wl_F77='-Wl,' lt_prog_compiler_pic_F77='-KPIC' lt_prog_compiler_static_F77='-static' ;; - ccc) + ccc*) lt_prog_compiler_wl_F77='-Wl,' # All Alpha code is PIC. lt_prog_compiler_static_F77='-non_shared' @@ -14600,7 +15054,8 @@ echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6 # Check to make sure the PIC flag actually works. # if test -n "$lt_prog_compiler_pic_F77"; then - echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5 + +echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5 echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6 if test "${lt_prog_compiler_pic_works_F77+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -14618,11 +15073,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14621: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15076: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14625: \$? = $ac_status" >&5 + echo "$as_me:15080: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -14669,13 +15124,6 @@ else mkdir out printf "$lt_simple_compile_test_code" > conftest.$ac_ext - # According to Tom Tromey, Ian Lance Taylor reported there are C compilers - # that will create temporary files in the current directory regardless of - # the output directory. Thus, making CWD read-only will cause this test - # to fail, enabling locking or at least warning the user not to do parallel - # builds. - chmod -w . - lt_compiler_flag="-o out/conftest2.$ac_objext" # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. @@ -14685,11 +15133,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14688: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15136: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14692: \$? = $ac_status" >&5 + echo "$as_me:15140: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -14699,8 +15147,11 @@ else fi fi chmod u+w . - $rm conftest* out/* - rmdir out + $rm conftest* + # SGI C++ compiler will create directory out/ii_files/ for + # template instantiation + test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files + $rm out/* && rmdir out cd .. rmdir conftest $rm conftest* @@ -14897,6 +15348,31 @@ EOF hardcode_shlibpath_var_F77=no ;; + linux*) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_cmds_F77="$tmp_archive_cmds" + supports_anon_versioning=no + case `$LD -v 2>/dev/null` in + *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 + *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... + *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... + *\ 2.11.*) ;; # other 2.11 versions + *) supports_anon_versioning=yes ;; + esac + if test $supports_anon_versioning = yes; then + archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~ +cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ +$echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + else + archive_expsym_cmds_F77="$tmp_archive_cmds" + fi + else + ld_shlibs_F77=no + fi + ;; + *) if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' @@ -15031,11 +15507,21 @@ EOF _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_f77_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -15052,7 +15538,8 @@ else sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath" @@ -15071,11 +15558,21 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_f77_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -15092,7 +15589,8 @@ else sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath" @@ -15119,7 +15617,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ld_shlibs_F77=no ;; - bsdi4*) + bsdi[45]*) export_dynamic_flag_spec_F77=-rdynamic ;; @@ -15133,7 +15631,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # Tell ltmain to make .lib files, not .a files. libext=lib # Tell ltmain to make .dll files, not .so files. - shrext=".dll" + shrext_cmds=".dll" # FIXME: Setting linknames here is a bad hack. archive_cmds_F77='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' # The linker will automatically build a .lib file if we build a DLL. @@ -15145,43 +15643,52 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ;; darwin* | rhapsody*) - if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then - archive_cmds_need_lc_F77=no case "$host_os" in - rhapsody* | darwin1.[012]) - allow_undefined_flag_F77='-undefined suppress' - ;; - *) # Darwin 1.3 on - test -z ${LD_TWOLEVEL_NAMESPACE} && allow_undefined_flag_F77='-flat_namespace -undefined suppress' - ;; + rhapsody* | darwin1.[012]) + allow_undefined_flag_F77='${wl}-undefined ${wl}suppress' + ;; + *) # Darwin 1.3 on + if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then + allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' + else + case ${MACOSX_DEPLOYMENT_TARGET} in + 10.[012]) + allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' + ;; + 10.*) + allow_undefined_flag_F77='${wl}-undefined ${wl}dynamic_lookup' + ;; + esac + fi + ;; esac - # FIXME: Relying on posixy $() will cause problems for - # cross-compilation, but unfortunately the echo tests do not - # yet detect zsh echo's removal of \ escapes. Also zsh mangles - # `"' quotes if we put them in here... so don't! - lt_int_apple_cc_single_mod=no - output_verbose_link_cmd='echo' - if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then - lt_int_apple_cc_single_mod=yes - fi - if test "X$lt_int_apple_cc_single_mod" = Xyes ; then - archive_cmds_F77='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' - else - archive_cmds_F77='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' - fi - module_cmds_F77='$CC -bundle ${wl}-bind_at_load $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's - if test "X$lt_int_apple_cc_single_mod" = Xyes ; then - archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - else - archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - fi - module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -bundle $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + archive_cmds_need_lc_F77=no hardcode_direct_F77=no hardcode_automatic_F77=yes hardcode_shlibpath_var_F77=unsupported - whole_archive_flag_spec_F77='-all_load $convenience' + whole_archive_flag_spec_F77='' link_all_deplibs_F77=yes + if test "$GCC" = yes ; then + output_verbose_link_cmd='echo' + archive_cmds_F77='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' + module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' + # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's + archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + else + case "$cc_basename" in + xlc*) + output_verbose_link_cmd='echo' + archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' + module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' + # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's + archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + ;; + *) + ld_shlibs_F77=no + ;; + esac fi ;; @@ -15215,7 +15722,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ;; # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd*) + freebsd* | kfreebsd*-gnu) archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' hardcode_libdir_flag_spec_F77='-R$libdir' hardcode_direct_F77=yes @@ -15326,6 +15833,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_shlibpath_var_F77=no if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' export_dynamic_flag_spec_F77='${wl}-E' else @@ -15575,78 +16083,12 @@ echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6 ;; esac -echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 -echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 -hardcode_action_F77= -if test -n "$hardcode_libdir_flag_spec_F77" || \ - test -n "$runpath_var F77" || \ - test "X$hardcode_automatic_F77"="Xyes" ; then - - # We can hardcode non-existant directories. - if test "$hardcode_direct_F77" != no && - # If the only mechanism to avoid hardcoding is shlibpath_var, we - # have to relink, otherwise we might link with an installed library - # when we should be linking with a yet-to-be-installed one - ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, F77)" != no && - test "$hardcode_minus_L_F77" != no; then - # Linking always hardcodes the temporary library directory. - hardcode_action_F77=relink - else - # We can link without hardcoding, and we can hardcode nonexisting dirs. - hardcode_action_F77=immediate - fi -else - # We cannot hardcode anything, or else we can only hardcode existing - # directories. - hardcode_action_F77=unsupported -fi -echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5 -echo "${ECHO_T}$hardcode_action_F77" >&6 - -if test "$hardcode_action_F77" = relink; then - # Fast installation is not supported - enable_fast_install=no -elif test "$shlibpath_overrides_runpath" = yes || - test "$enable_shared" = no; then - # Fast installation is not necessary - enable_fast_install=needless -fi - -striplib= -old_striplib= -echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 -echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6 -if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then - test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" - test -z "$striplib" && striplib="$STRIP --strip-unneeded" - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 -else -# FIXME - insert some real tests, host_os isn't really good enough - case $host_os in - darwin*) - if test -n "$STRIP" ; then - striplib="$STRIP -x" - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - ;; - *) - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - ;; - esac -fi - echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 library_names_spec= libname_spec='lib$name' soname_spec= -shrext=".so" +shrext_cmds=".so" postinstall_cmds= postuninstall_cmds= finish_cmds= @@ -15734,7 +16176,7 @@ aix4* | aix5*) amigaos*) library_names_spec='$libname.ixlibrary $libname.a' # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done' + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' ;; beos*) @@ -15743,7 +16185,7 @@ beos*) shlibpath_var=LIBRARY_PATH ;; -bsdi4*) +bsdi[45]*) version_type=linux need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -15759,7 +16201,7 @@ bsdi4*) cygwin* | mingw* | pw32*) version_type=windows - shrext=".dll" + shrext_cmds=".dll" need_version=no need_lib_prefix=no @@ -15781,7 +16223,7 @@ cygwin* | mingw* | pw32*) cygwin*) # Cygwin DLLs use 'cyg' prefix rather than 'lib' soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec="/lib /lib/w32api /usr/lib /usr/local/lib" + sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" ;; mingw*) # MinGW DLLs use traditional 'lib' prefix @@ -15820,17 +16262,16 @@ darwin* | rhapsody*) version_type=darwin need_lib_prefix=no need_version=no - # FIXME: Relying on posixy $() will cause problems for - # cross-compilation, but unfortunately the echo tests do not - # yet detect zsh echo's removal of \ escapes. library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' soname_spec='${libname}${release}${major}$shared_ext' shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH - shrext='$(test .$module = .yes && echo .so || echo .dylib)' + shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)' # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. - if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then - sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` + if test "$GCC" = yes; then + sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` + else + sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' fi sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' ;; @@ -15848,6 +16289,18 @@ freebsd1*) dynamic_linker=no ;; +kfreebsd*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='GNU ld.so' + ;; + freebsd*) objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` version_type=freebsd-$objformat @@ -15896,7 +16349,7 @@ hpux9* | hpux10* | hpux11*) need_version=no case "$host_cpu" in ia64*) - shrext='.so' + shrext_cmds='.so' hardcode_into_libs=yes dynamic_linker="$host_os dld.so" shlibpath_var=LD_LIBRARY_PATH @@ -15911,7 +16364,7 @@ hpux9* | hpux10* | hpux11*) sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; hppa*64*) - shrext='.sl' + shrext_cmds='.sl' hardcode_into_libs=yes dynamic_linker="$host_os dld.sl" shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH @@ -15922,7 +16375,7 @@ hpux9* | hpux10* | hpux11*) sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; *) - shrext='.sl' + shrext_cmds='.sl' dynamic_linker="$host_os dld.sl" shlibpath_var=SHLIB_PATH shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH @@ -15991,6 +16444,12 @@ linux*) # before this can be enabled. hardcode_into_libs=yes + # Append ld.so.conf contents to the search path + if test -f /etc/ld.so.conf; then + lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '` + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + fi + # We used to test for /lib/ld.so.1 and disable shared libraries on # powerpc, because MkLinux only supported shared libraries with the # GNU dynamic linker. Since this was broken with cross compilers, @@ -16000,6 +16459,18 @@ linux*) dynamic_linker='GNU/Linux ld.so' ;; +knetbsd*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='GNU ld.so' + ;; + netbsd*) version_type=sunos need_lib_prefix=no @@ -16009,7 +16480,7 @@ netbsd*) finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' dynamic_linker='NetBSD (a.out) ld.so' else - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${libname}${shared_ext}' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' dynamic_linker='NetBSD ld.elf_so' fi @@ -16025,7 +16496,7 @@ newsos6) shlibpath_overrides_runpath=yes ;; -nto-qnx | nto-qnx6*) +nto-qnx*) version_type=linux need_lib_prefix=no need_version=no @@ -16058,7 +16529,7 @@ openbsd*) os2*) libname_spec='$name' - shrext=".dll" + shrext_cmds=".dll" need_lib_prefix=no library_names_spec='$libname${shared_ext} $libname.a' dynamic_linker='OS/2 ld.exe' @@ -16156,6 +16627,73 @@ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 echo "${ECHO_T}$dynamic_linker" >&6 test "$dynamic_linker" = no && can_build_shared=no +echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 +echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 +hardcode_action_F77= +if test -n "$hardcode_libdir_flag_spec_F77" || \ + test -n "$runpath_var_F77" || \ + test "X$hardcode_automatic_F77" = "Xyes" ; then + + # We can hardcode non-existant directories. + if test "$hardcode_direct_F77" != no && + # If the only mechanism to avoid hardcoding is shlibpath_var, we + # have to relink, otherwise we might link with an installed library + # when we should be linking with a yet-to-be-installed one + ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, F77)" != no && + test "$hardcode_minus_L_F77" != no; then + # Linking always hardcodes the temporary library directory. + hardcode_action_F77=relink + else + # We can link without hardcoding, and we can hardcode nonexisting dirs. + hardcode_action_F77=immediate + fi +else + # We cannot hardcode anything, or else we can only hardcode existing + # directories. + hardcode_action_F77=unsupported +fi +echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5 +echo "${ECHO_T}$hardcode_action_F77" >&6 + +if test "$hardcode_action_F77" = relink; then + # Fast installation is not supported + enable_fast_install=no +elif test "$shlibpath_overrides_runpath" = yes || + test "$enable_shared" = no; then + # Fast installation is not necessary + enable_fast_install=needless +fi + +striplib= +old_striplib= +echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 +echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6 +if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then + test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" + test -z "$striplib" && striplib="$STRIP --strip-unneeded" + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 +else +# FIXME - insert some real tests, host_os isn't really good enough + case $host_os in + darwin*) + if test -n "$STRIP" ; then + striplib="$STRIP -x" + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + ;; + *) + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + ;; + esac +fi + + # The else clause should only fire when bootstrapping the # libtool distribution, otherwise you forgot to ship ltmain.sh @@ -16170,7 +16708,8 @@ if test -f "$ltmain"; then # Now quote all the things that may contain metacharacters while being # careful not to overquote the AC_SUBSTed values. We take copies of the # variables and quote the copies for generation of the libtool script. - for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \ + for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \ + SED SHELL STRIP \ libname_spec library_names_spec soname_spec extract_expsyms_cmds \ old_striplib striplib file_magic_cmd finish_cmds finish_eval \ deplibs_check_method reload_flag reload_cmds need_locks \ @@ -16300,7 +16839,7 @@ LN_S=$lt_LN_S NM=$lt_NM # A symbol stripping program -STRIP=$STRIP +STRIP=$lt_STRIP # Used to examine libraries when file_magic_cmd begins "file" MAGIC_CMD=$MAGIC_CMD @@ -16331,7 +16870,7 @@ objext="$ac_objext" libext="$libext" # Shared library suffix (normally ".so"). -shrext='$shrext' +shrext_cmds='$shrext_cmds' # Executable file suffix (normally ""). exeext="$exeext" @@ -16548,7 +17087,10 @@ else # If there is no Makefile yet, we rely on a make rule to execute # `config.status --recheck' to rerun these tests and create the # libtool script then. - test -f Makefile && make "$ltmain" + ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` + if test -f "$ltmain_in"; then + test -f Makefile && make "$ltmain" + fi fi @@ -16611,7 +17153,8 @@ lt_prog_compiler_no_builtin_flag_GCJ= if test "$GCC" = yes; then lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin' - echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 + +echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6 if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -16629,11 +17172,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16632: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17175: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16636: \$? = $ac_status" >&5 + echo "$as_me:17179: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -16740,6 +17283,16 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp' fi ;; + darwin*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + case "$cc_basename" in + xlc*) + lt_prog_compiler_pic_GCJ='-qnocommon' + lt_prog_compiler_wl_GCJ='-Wl,' + ;; + esac + ;; mingw* | pw32* | os2*) # This hack is so that the source file can tell whether it is being @@ -16776,12 +17329,12 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 linux*) case $CC in - icc|ecc) + icc* | ecc*) lt_prog_compiler_wl_GCJ='-Wl,' lt_prog_compiler_pic_GCJ='-KPIC' lt_prog_compiler_static_GCJ='-static' ;; - ccc) + ccc*) lt_prog_compiler_wl_GCJ='-Wl,' # All Alpha code is PIC. lt_prog_compiler_static_GCJ='-non_shared' @@ -16843,7 +17396,8 @@ echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6 # Check to make sure the PIC flag actually works. # if test -n "$lt_prog_compiler_pic_GCJ"; then - echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5 + +echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5 echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6 if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -16861,11 +17415,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16864: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17418: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16868: \$? = $ac_status" >&5 + echo "$as_me:17422: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -16912,13 +17466,6 @@ else mkdir out printf "$lt_simple_compile_test_code" > conftest.$ac_ext - # According to Tom Tromey, Ian Lance Taylor reported there are C compilers - # that will create temporary files in the current directory regardless of - # the output directory. Thus, making CWD read-only will cause this test - # to fail, enabling locking or at least warning the user not to do parallel - # builds. - chmod -w . - lt_compiler_flag="-o out/conftest2.$ac_objext" # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. @@ -16928,11 +17475,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16931: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17478: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16935: \$? = $ac_status" >&5 + echo "$as_me:17482: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -16942,8 +17489,11 @@ else fi fi chmod u+w . - $rm conftest* out/* - rmdir out + $rm conftest* + # SGI C++ compiler will create directory out/ii_files/ for + # template instantiation + test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files + $rm out/* && rmdir out cd .. rmdir conftest $rm conftest* @@ -17140,6 +17690,31 @@ EOF hardcode_shlibpath_var_GCJ=no ;; + linux*) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_cmds_GCJ="$tmp_archive_cmds" + supports_anon_versioning=no + case `$LD -v 2>/dev/null` in + *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 + *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... + *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... + *\ 2.11.*) ;; # other 2.11 versions + *) supports_anon_versioning=yes ;; + esac + if test $supports_anon_versioning = yes; then + archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~ +cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ +$echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + else + archive_expsym_cmds_GCJ="$tmp_archive_cmds" + fi + else + ld_shlibs_GCJ=no + fi + ;; + *) if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' @@ -17268,7 +17843,6 @@ EOF allow_undefined_flag_GCJ='-berok' # Determine the default libpath from the value encoded in an empty executable. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -17285,11 +17859,21 @@ main () _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -17306,7 +17890,8 @@ else sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath" @@ -17319,7 +17904,6 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi else # Determine the default libpath from the value encoded in an empty executable. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -17336,11 +17920,21 @@ main () _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -17357,7 +17951,8 @@ else sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath" @@ -17384,7 +17979,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ld_shlibs_GCJ=no ;; - bsdi4*) + bsdi[45]*) export_dynamic_flag_spec_GCJ=-rdynamic ;; @@ -17398,7 +17993,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # Tell ltmain to make .lib files, not .a files. libext=lib # Tell ltmain to make .dll files, not .so files. - shrext=".dll" + shrext_cmds=".dll" # FIXME: Setting linknames here is a bad hack. archive_cmds_GCJ='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' # The linker will automatically build a .lib file if we build a DLL. @@ -17410,43 +18005,52 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ;; darwin* | rhapsody*) - if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then - archive_cmds_need_lc_GCJ=no case "$host_os" in - rhapsody* | darwin1.[012]) - allow_undefined_flag_GCJ='-undefined suppress' - ;; - *) # Darwin 1.3 on - test -z ${LD_TWOLEVEL_NAMESPACE} && allow_undefined_flag_GCJ='-flat_namespace -undefined suppress' - ;; + rhapsody* | darwin1.[012]) + allow_undefined_flag_GCJ='${wl}-undefined ${wl}suppress' + ;; + *) # Darwin 1.3 on + if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then + allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' + else + case ${MACOSX_DEPLOYMENT_TARGET} in + 10.[012]) + allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' + ;; + 10.*) + allow_undefined_flag_GCJ='${wl}-undefined ${wl}dynamic_lookup' + ;; + esac + fi + ;; esac - # FIXME: Relying on posixy $() will cause problems for - # cross-compilation, but unfortunately the echo tests do not - # yet detect zsh echo's removal of \ escapes. Also zsh mangles - # `"' quotes if we put them in here... so don't! - lt_int_apple_cc_single_mod=no - output_verbose_link_cmd='echo' - if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then - lt_int_apple_cc_single_mod=yes - fi - if test "X$lt_int_apple_cc_single_mod" = Xyes ; then - archive_cmds_GCJ='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' - else - archive_cmds_GCJ='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' - fi - module_cmds_GCJ='$CC -bundle ${wl}-bind_at_load $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's - if test "X$lt_int_apple_cc_single_mod" = Xyes ; then - archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - else - archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - fi - module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -bundle $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + archive_cmds_need_lc_GCJ=no hardcode_direct_GCJ=no hardcode_automatic_GCJ=yes hardcode_shlibpath_var_GCJ=unsupported - whole_archive_flag_spec_GCJ='-all_load $convenience' + whole_archive_flag_spec_GCJ='' link_all_deplibs_GCJ=yes + if test "$GCC" = yes ; then + output_verbose_link_cmd='echo' + archive_cmds_GCJ='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' + module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' + # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's + archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + else + case "$cc_basename" in + xlc*) + output_verbose_link_cmd='echo' + archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' + module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' + # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's + archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + ;; + *) + ld_shlibs_GCJ=no + ;; + esac fi ;; @@ -17480,7 +18084,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ;; # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd*) + freebsd* | kfreebsd*-gnu) archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' hardcode_libdir_flag_spec_GCJ='-R$libdir' hardcode_direct_GCJ=yes @@ -17591,6 +18195,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_shlibpath_var_GCJ=no if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' export_dynamic_flag_spec_GCJ='${wl}-E' else @@ -17840,78 +18445,12 @@ echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6 ;; esac -echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 -echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 -hardcode_action_GCJ= -if test -n "$hardcode_libdir_flag_spec_GCJ" || \ - test -n "$runpath_var GCJ" || \ - test "X$hardcode_automatic_GCJ"="Xyes" ; then - - # We can hardcode non-existant directories. - if test "$hardcode_direct_GCJ" != no && - # If the only mechanism to avoid hardcoding is shlibpath_var, we - # have to relink, otherwise we might link with an installed library - # when we should be linking with a yet-to-be-installed one - ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, GCJ)" != no && - test "$hardcode_minus_L_GCJ" != no; then - # Linking always hardcodes the temporary library directory. - hardcode_action_GCJ=relink - else - # We can link without hardcoding, and we can hardcode nonexisting dirs. - hardcode_action_GCJ=immediate - fi -else - # We cannot hardcode anything, or else we can only hardcode existing - # directories. - hardcode_action_GCJ=unsupported -fi -echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5 -echo "${ECHO_T}$hardcode_action_GCJ" >&6 - -if test "$hardcode_action_GCJ" = relink; then - # Fast installation is not supported - enable_fast_install=no -elif test "$shlibpath_overrides_runpath" = yes || - test "$enable_shared" = no; then - # Fast installation is not necessary - enable_fast_install=needless -fi - -striplib= -old_striplib= -echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 -echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6 -if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then - test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" - test -z "$striplib" && striplib="$STRIP --strip-unneeded" - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 -else -# FIXME - insert some real tests, host_os isn't really good enough - case $host_os in - darwin*) - if test -n "$STRIP" ; then - striplib="$STRIP -x" - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - ;; - *) - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - ;; - esac -fi - echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 library_names_spec= libname_spec='lib$name' soname_spec= -shrext=".so" +shrext_cmds=".so" postinstall_cmds= postuninstall_cmds= finish_cmds= @@ -17999,7 +18538,7 @@ aix4* | aix5*) amigaos*) library_names_spec='$libname.ixlibrary $libname.a' # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done' + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' ;; beos*) @@ -18008,7 +18547,7 @@ beos*) shlibpath_var=LIBRARY_PATH ;; -bsdi4*) +bsdi[45]*) version_type=linux need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -18024,7 +18563,7 @@ bsdi4*) cygwin* | mingw* | pw32*) version_type=windows - shrext=".dll" + shrext_cmds=".dll" need_version=no need_lib_prefix=no @@ -18046,7 +18585,7 @@ cygwin* | mingw* | pw32*) cygwin*) # Cygwin DLLs use 'cyg' prefix rather than 'lib' soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec="/lib /lib/w32api /usr/lib /usr/local/lib" + sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" ;; mingw*) # MinGW DLLs use traditional 'lib' prefix @@ -18085,17 +18624,16 @@ darwin* | rhapsody*) version_type=darwin need_lib_prefix=no need_version=no - # FIXME: Relying on posixy $() will cause problems for - # cross-compilation, but unfortunately the echo tests do not - # yet detect zsh echo's removal of \ escapes. library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' soname_spec='${libname}${release}${major}$shared_ext' shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH - shrext='$(test .$module = .yes && echo .so || echo .dylib)' + shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)' # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. - if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then - sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` + if test "$GCC" = yes; then + sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` + else + sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' fi sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' ;; @@ -18113,6 +18651,18 @@ freebsd1*) dynamic_linker=no ;; +kfreebsd*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='GNU ld.so' + ;; + freebsd*) objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` version_type=freebsd-$objformat @@ -18161,7 +18711,7 @@ hpux9* | hpux10* | hpux11*) need_version=no case "$host_cpu" in ia64*) - shrext='.so' + shrext_cmds='.so' hardcode_into_libs=yes dynamic_linker="$host_os dld.so" shlibpath_var=LD_LIBRARY_PATH @@ -18176,7 +18726,7 @@ hpux9* | hpux10* | hpux11*) sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; hppa*64*) - shrext='.sl' + shrext_cmds='.sl' hardcode_into_libs=yes dynamic_linker="$host_os dld.sl" shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH @@ -18187,7 +18737,7 @@ hpux9* | hpux10* | hpux11*) sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; *) - shrext='.sl' + shrext_cmds='.sl' dynamic_linker="$host_os dld.sl" shlibpath_var=SHLIB_PATH shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH @@ -18256,6 +18806,12 @@ linux*) # before this can be enabled. hardcode_into_libs=yes + # Append ld.so.conf contents to the search path + if test -f /etc/ld.so.conf; then + lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '` + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + fi + # We used to test for /lib/ld.so.1 and disable shared libraries on # powerpc, because MkLinux only supported shared libraries with the # GNU dynamic linker. Since this was broken with cross compilers, @@ -18265,6 +18821,18 @@ linux*) dynamic_linker='GNU/Linux ld.so' ;; +knetbsd*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='GNU ld.so' + ;; + netbsd*) version_type=sunos need_lib_prefix=no @@ -18274,7 +18842,7 @@ netbsd*) finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' dynamic_linker='NetBSD (a.out) ld.so' else - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${libname}${shared_ext}' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' dynamic_linker='NetBSD ld.elf_so' fi @@ -18290,7 +18858,7 @@ newsos6) shlibpath_overrides_runpath=yes ;; -nto-qnx | nto-qnx6*) +nto-qnx*) version_type=linux need_lib_prefix=no need_version=no @@ -18323,7 +18891,7 @@ openbsd*) os2*) libname_spec='$name' - shrext=".dll" + shrext_cmds=".dll" need_lib_prefix=no library_names_spec='$libname${shared_ext} $libname.a' dynamic_linker='OS/2 ld.exe' @@ -18421,6 +18989,72 @@ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 echo "${ECHO_T}$dynamic_linker" >&6 test "$dynamic_linker" = no && can_build_shared=no +echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 +echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 +hardcode_action_GCJ= +if test -n "$hardcode_libdir_flag_spec_GCJ" || \ + test -n "$runpath_var_GCJ" || \ + test "X$hardcode_automatic_GCJ" = "Xyes" ; then + + # We can hardcode non-existant directories. + if test "$hardcode_direct_GCJ" != no && + # If the only mechanism to avoid hardcoding is shlibpath_var, we + # have to relink, otherwise we might link with an installed library + # when we should be linking with a yet-to-be-installed one + ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, GCJ)" != no && + test "$hardcode_minus_L_GCJ" != no; then + # Linking always hardcodes the temporary library directory. + hardcode_action_GCJ=relink + else + # We can link without hardcoding, and we can hardcode nonexisting dirs. + hardcode_action_GCJ=immediate + fi +else + # We cannot hardcode anything, or else we can only hardcode existing + # directories. + hardcode_action_GCJ=unsupported +fi +echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5 +echo "${ECHO_T}$hardcode_action_GCJ" >&6 + +if test "$hardcode_action_GCJ" = relink; then + # Fast installation is not supported + enable_fast_install=no +elif test "$shlibpath_overrides_runpath" = yes || + test "$enable_shared" = no; then + # Fast installation is not necessary + enable_fast_install=needless +fi + +striplib= +old_striplib= +echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 +echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6 +if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then + test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" + test -z "$striplib" && striplib="$STRIP --strip-unneeded" + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 +else +# FIXME - insert some real tests, host_os isn't really good enough + case $host_os in + darwin*) + if test -n "$STRIP" ; then + striplib="$STRIP -x" + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + ;; + *) + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + ;; + esac +fi + if test "x$enable_dlopen" != xyes; then enable_dlopen=unknown enable_dlopen_self=unknown @@ -18456,7 +19090,6 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -18480,11 +19113,21 @@ dlopen (); _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -18497,7 +19140,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_dl_dlopen=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f 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 @@ -18521,21 +19165,28 @@ 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" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define shl_load innocuous_shl_load + /* System header to define __stub macros and hopefully few prototypes, which can conflict with char shl_load (); below. Prefer <limits.h> to <assert.h> if __STDC__ is defined, since <limits.h> exists even on freestanding compilers. */ + #ifdef __STDC__ # include <limits.h> #else # include <assert.h> #endif + +#undef shl_load + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" @@ -18566,11 +19217,21 @@ return f != shl_load; _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -18583,7 +19244,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_func_shl_load=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err 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 @@ -18598,7 +19260,6 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldld $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -18622,11 +19283,21 @@ shl_load (); _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -18639,7 +19310,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_dld_shl_load=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f 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 @@ -18653,21 +19325,28 @@ 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" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define dlopen innocuous_dlopen + /* System header to define __stub macros and hopefully few prototypes, which can conflict with char dlopen (); below. Prefer <limits.h> to <assert.h> if __STDC__ is defined, since <limits.h> exists even on freestanding compilers. */ + #ifdef __STDC__ # include <limits.h> #else # include <assert.h> #endif + +#undef dlopen + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" @@ -18698,11 +19377,21 @@ return f != dlopen; _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -18715,7 +19404,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_func_dlopen=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err 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 @@ -18730,7 +19420,6 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -18754,11 +19443,21 @@ dlopen (); _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -18771,7 +19470,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_dl_dlopen=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f 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 @@ -18787,7 +19487,6 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lsvld $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -18811,11 +19510,21 @@ dlopen (); _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -18828,7 +19537,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_svld_dlopen=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f 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 @@ -18844,7 +19554,6 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldld $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -18868,11 +19577,21 @@ dld_link (); _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -18885,7 +19604,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_dld_dld_link=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f 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 @@ -18940,7 +19660,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 18943 "configure" +#line 19663 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -19038,7 +19758,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 19041 "configure" +#line 19761 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -19155,7 +19875,8 @@ if test -f "$ltmain"; then # Now quote all the things that may contain metacharacters while being # careful not to overquote the AC_SUBSTed values. We take copies of the # variables and quote the copies for generation of the libtool script. - for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \ + for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \ + SED SHELL STRIP \ libname_spec library_names_spec soname_spec extract_expsyms_cmds \ old_striplib striplib file_magic_cmd finish_cmds finish_eval \ deplibs_check_method reload_flag reload_cmds need_locks \ @@ -19285,7 +20006,7 @@ LN_S=$lt_LN_S NM=$lt_NM # A symbol stripping program -STRIP=$STRIP +STRIP=$lt_STRIP # Used to examine libraries when file_magic_cmd begins "file" MAGIC_CMD=$MAGIC_CMD @@ -19316,7 +20037,7 @@ objext="$ac_objext" libext="$libext" # Shared library suffix (normally ".so"). -shrext='$shrext' +shrext_cmds='$shrext_cmds' # Executable file suffix (normally ""). exeext="$exeext" @@ -19533,7 +20254,10 @@ else # If there is no Makefile yet, we rely on a make rule to execute # `config.status --recheck' to rerun these tests and create the # libtool script then. - test -f Makefile && make "$ltmain" + ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` + if test -f "$ltmain_in"; then + test -f Makefile && make "$ltmain" + fi fi @@ -19596,7 +20320,8 @@ if test -f "$ltmain"; then # Now quote all the things that may contain metacharacters while being # careful not to overquote the AC_SUBSTed values. We take copies of the # variables and quote the copies for generation of the libtool script. - for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \ + for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \ + SED SHELL STRIP \ libname_spec library_names_spec soname_spec extract_expsyms_cmds \ old_striplib striplib file_magic_cmd finish_cmds finish_eval \ deplibs_check_method reload_flag reload_cmds need_locks \ @@ -19726,7 +20451,7 @@ LN_S=$lt_LN_S NM=$lt_NM # A symbol stripping program -STRIP=$STRIP +STRIP=$lt_STRIP # Used to examine libraries when file_magic_cmd begins "file" MAGIC_CMD=$MAGIC_CMD @@ -19757,7 +20482,7 @@ objext="$ac_objext" libext="$libext" # Shared library suffix (normally ".so"). -shrext='$shrext' +shrext_cmds='$shrext_cmds' # Executable file suffix (normally ""). exeext="$exeext" @@ -19974,7 +20699,10 @@ else # If there is no Makefile yet, we rely on a make rule to execute # `config.status --recheck' to rerun these tests and create the # libtool script then. - test -f Makefile && make "$ltmain" + ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` + if test -f "$ltmain_in"; then + test -f Makefile && make "$ltmain" + fi fi @@ -20057,11 +20785,11 @@ echo $ECHO_N "checking SOSUFFIX from libtool... $ECHO_C" >&6 versuffix="" release="" libname=libfoo - eval _SOSUFFIX=\"$shrext\" - if test "X$_SOSUFFIX" = "" ; then + eval _SOSUFFIX=\"$shrext_cmds\" + if test "$_SOSUFFIX" = "" ; then _SOSUFFIX=".so" if test `$LIBTOOL_PROG --config | grep build_libtool_libs | grep no` 2>/dev/null; then - if test "X$_SOSUFFIX_MESSAGE" = "X"; then + if test "$_SOSUFFIX_MESSAGE" = ""; then _SOSUFFIX_MESSAGE=yes { echo "$as_me:$LINENO: WARNING: libtool may not know about this architecture." >&5 echo "$as_me: WARNING: libtool may not know about this architecture." >&2;} @@ -20084,11 +20812,11 @@ echo $ECHO_N "checking MODSUFFIX from libtool... $ECHO_C" >&6 versuffix="" release="" libname=libfoo - eval _SOSUFFIX=\"$shrext\" - if test "X$_SOSUFFIX" = "" ; then + eval _SOSUFFIX=\"$shrext_cmds\" + if test "$_SOSUFFIX" = "" ; then _SOSUFFIX=".so" if test `$LIBTOOL_PROG --config | grep build_libtool_libs | grep no` 2>/dev/null; then - if test "X$_SOSUFFIX_MESSAGE" = "X"; then + if test "$_SOSUFFIX_MESSAGE" = ""; then _SOSUFFIX_MESSAGE=yes { echo "$as_me:$LINENO: WARNING: libtool may not know about this architecture." >&5 echo "$as_me: WARNING: libtool may not know about this architecture." >&2;} @@ -20111,11 +20839,11 @@ echo $ECHO_N "checking JMODSUFFIX from libtool... $ECHO_C" >&6 versuffix="" release="" libname=libfoo - eval _SOSUFFIX=\"$shrext\" - if test "X$_SOSUFFIX" = "" ; then + eval _SOSUFFIX=\"$shrext_cmds\" + if test "$_SOSUFFIX" = "" ; then _SOSUFFIX=".so" if test `$LIBTOOL_PROG --config | grep build_libtool_libs | grep no` 2>/dev/null; then - if test "X$_SOSUFFIX_MESSAGE" = "X"; then + if test "$_SOSUFFIX_MESSAGE" = ""; then _SOSUFFIX_MESSAGE=yes { echo "$as_me:$LINENO: WARNING: libtool may not know about this architecture." >&5 echo "$as_me: WARNING: libtool may not know about this architecture." >&2;} @@ -20147,7 +20875,7 @@ MAKEFILE_CXXLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK}" LIBTOOL="\$(SHELL) ./libtool" case "$host_os" in -cygwin*) +cygwin* | mingw*) MAKEFILE_SOLINK="$MAKEFILE_SOLINK -no-undefined" MAKEFILE_XSOLINK="$MAKEFILE_XSOLINK -no-undefined";; esac @@ -20170,6 +20898,17 @@ else enable_static="yes" fi +case "$host_os" in + darwin*) + LIBTSO_MODULE="" + LIBTSO_MODSUFFIX=".dylib" + ;; + *) + LIBTSO_MODULE="-module" + LIBTSO_MODSUFFIX=@MODSUFFIX@ + ;; +esac + # C API. if test "$enable_shared" = "no"; then DEFAULT_LIB="\$(libdb_version)" @@ -20309,7 +21048,7 @@ else JAVA_TEST=Test.java CLASS_TEST=Test.class cat << \EOF > $JAVA_TEST -/* #line 20312 "configure" */ +/* #line 21051 "configure" */ public class Test { } EOF @@ -20568,7 +21307,7 @@ EOF if uudecode$EXEEXT Test.uue; then ac_cv_prog_uudecode_base64=yes else - echo "configure: 20571: uudecode had trouble decoding base 64 file 'Test.uue'" >&5 + echo "configure: 21310: 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 @@ -20686,7 +21425,7 @@ else JAVA_TEST=Test.java CLASS_TEST=Test.class cat << \EOF > $JAVA_TEST -/* #line 20689 "configure" */ +/* #line 21428 "configure" */ public class Test { } EOF @@ -20723,7 +21462,7 @@ JAVA_TEST=Test.java CLASS_TEST=Test.class TEST=Test cat << \EOF > $JAVA_TEST -/* [#]line 20726 "configure" */ +/* [#]line 21465 "configure" */ public class Test { public static void main (String args[]) { System.exit (0); @@ -20941,509 +21680,6 @@ else PATH_SEPARATOR="/" fi -# Optional RPC client/server. -if test "$db_cv_rpc" = "yes"; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_RPC 1 -_ACEOF - - - - - RPC_CLIENT_OBJS="\$(RPC_CLIENT_OBJS)" - ADDITIONAL_PROGS="berkeley_db_svc $ADDITIONAL_PROGS" - - case "$host_os" in - hpux*) - echo "$as_me:$LINENO: checking for svc_run" >&5 -echo $ECHO_N "checking for svc_run... $ECHO_C" >&6 -if test "${ac_cv_func_svc_run+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char svc_run (); below. - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since - <limits.h> exists even on freestanding compilers. */ -#ifdef __STDC__ -# include <limits.h> -#else -# include <assert.h> -#endif -/* 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 svc_run (); -/* 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_svc_run) || defined (__stub___svc_run) -choke me -#else -char (*f) () = svc_run; -#endif -#ifdef __cplusplus -} -#endif - -int -main () -{ -return f != svc_run; - ; - 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_svc_run=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_func_svc_run=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_func_svc_run" >&5 -echo "${ECHO_T}$ac_cv_func_svc_run" >&6 -if test $ac_cv_func_svc_run = yes; then - : -else - echo "$as_me:$LINENO: checking for svc_run in -lnsl" >&5 -echo $ECHO_N "checking for svc_run in -lnsl... $ECHO_C" >&6 -if test "${ac_cv_lib_nsl_svc_run+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lnsl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* 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 svc_run (); -int -main () -{ -svc_run (); - ; - 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_lib_nsl_svc_run=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_nsl_svc_run=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_svc_run" >&5 -echo "${ECHO_T}$ac_cv_lib_nsl_svc_run" >&6 -if test $ac_cv_lib_nsl_svc_run = yes; then - LIBS="-lnsl $LIBS"; LIBTSO_LIBS="-lnsl $LIBTSO_LIBS"; - LIBJSO_LIBS="-lnsl $LIBJSO_LIBS" -fi - -fi -;; - solaris*) - echo "$as_me:$LINENO: checking for svc_run" >&5 -echo $ECHO_N "checking for svc_run... $ECHO_C" >&6 -if test "${ac_cv_func_svc_run+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char svc_run (); below. - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since - <limits.h> exists even on freestanding compilers. */ -#ifdef __STDC__ -# include <limits.h> -#else -# include <assert.h> -#endif -/* 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 svc_run (); -/* 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_svc_run) || defined (__stub___svc_run) -choke me -#else -char (*f) () = svc_run; -#endif -#ifdef __cplusplus -} -#endif - -int -main () -{ -return f != svc_run; - ; - 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_svc_run=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_func_svc_run=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_func_svc_run" >&5 -echo "${ECHO_T}$ac_cv_func_svc_run" >&6 -if test $ac_cv_func_svc_run = yes; then - : -else - -echo "$as_me:$LINENO: checking for svc_run in -lnsl" >&5 -echo $ECHO_N "checking for svc_run in -lnsl... $ECHO_C" >&6 -if test "${ac_cv_lib_nsl_svc_run+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lnsl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* 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 svc_run (); -int -main () -{ -svc_run (); - ; - 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_lib_nsl_svc_run=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_nsl_svc_run=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_svc_run" >&5 -echo "${ECHO_T}$ac_cv_lib_nsl_svc_run" >&6 -if test $ac_cv_lib_nsl_svc_run = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBNSL 1 -_ACEOF - - LIBS="-lnsl $LIBS" - -fi - -fi -;; - esac -fi - -case "$host_os" in - darwin*) - LIBTSO_MODULE="" - LIBTSO_MODSUFFIX=".dylib" - ;; - *) - LIBTSO_MODULE="-module" - LIBTSO_MODSUFFIX=@MODSUFFIX@ - ;; -esac - - -if test "$db_cv_tcl" = "yes"; then - if test `$LIBTOOL_PROG --config | grep build_libtool_libs | grep no` 2>/dev/null; then - { { echo "$as_me:$LINENO: error: Tcl requires shared libraries" >&5 -echo "$as_me: error: Tcl requires shared libraries" >&2;} - { (exit 1); exit 1; }; } - fi - - - - - if test "${ac_cv_c_tclconfig+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - - - # First check to see if --with-tclconfig was specified. - if test "${with_tclconfig}" != no; then - if test -f "${with_tclconfig}/tclConfig.sh" ; then - ac_cv_c_tclconfig=`(cd ${with_tclconfig}; pwd)` - else - { { echo "$as_me:$LINENO: error: ${with_tclconfig} directory doesn't contain tclConfig.sh" >&5 -echo "$as_me: error: ${with_tclconfig} directory doesn't contain tclConfig.sh" >&2;} - { (exit 1); exit 1; }; } - fi - fi - - # check in a few common install locations - if test x"${ac_cv_c_tclconfig}" = x ; then - for i in `ls -d /usr/local/lib 2>/dev/null` ; do - if test -f "$i/tclConfig.sh" ; then - ac_cv_c_tclconfig=`(cd $i; pwd)` - break - fi - done - fi - - -fi - - - if test x"${ac_cv_c_tclconfig}" = x ; then - TCL_BIN_DIR="# no Tcl configs found" - { { echo "$as_me:$LINENO: error: can't find Tcl configuration definitions" >&5 -echo "$as_me: error: can't find Tcl configuration definitions" >&2;} - { (exit 1); exit 1; }; } - else - TCL_BIN_DIR=${ac_cv_c_tclconfig} - fi - - - echo "$as_me:$LINENO: checking for existence of $TCL_BIN_DIR/tclConfig.sh" >&5 -echo $ECHO_N "checking for existence of $TCL_BIN_DIR/tclConfig.sh... $ECHO_C" >&6 - - if test -f "$TCL_BIN_DIR/tclConfig.sh" ; then - echo "$as_me:$LINENO: result: loading" >&5 -echo "${ECHO_T}loading" >&6 - . $TCL_BIN_DIR/tclConfig.sh - else - echo "$as_me:$LINENO: result: file not found" >&5 -echo "${ECHO_T}file not found" >&6 - fi - - # DB requires at least version 8.4. - if test ${TCL_MAJOR_VERSION} -lt 8 \ - -o ${TCL_MAJOR_VERSION} -eq 8 -a ${TCL_MINOR_VERSION} -lt 4; then - { { echo "$as_me:$LINENO: error: Berkeley DB requires Tcl version 8.4 or better." >&5 -echo "$as_me: error: Berkeley DB requires Tcl version 8.4 or better." >&2;} - { (exit 1); exit 1; }; } - fi - - # - # The eval is required to do the TCL_DBGX substitution in the - # TCL_LIB_FILE variable - # - eval TCL_LIB_FILE="${TCL_LIB_FILE}" - eval TCL_LIB_FLAG="${TCL_LIB_FLAG}" - eval "TCL_LIB_SPEC=\"${TCL_LIB_SPEC}\"" - - # - # If the DB Tcl library isn't loaded with the Tcl spec and library - # flags on AIX, the resulting libdb_tcl-X.Y.so.0 will drop core at - # load time. [#4843] Furthermore, with Tcl 8.3, the link flags - # given by the Tcl spec are insufficient for our use. [#5779] - # - case "$host_os" in - aix4.[2-9].*) - LIBTSO_LIBS="$LIBTSO_LIBS $TCL_LIB_SPEC $TCL_LIB_FLAG" - LIBTSO_LIBS="$LIBTSO_LIBS -L$TCL_EXEC_PREFIX/lib -ltcl$TCL_VERSION";; - aix*) - LIBTSO_LIBS="$LIBTSO_LIBS $TCL_LIB_SPEC $TCL_LIB_FLAG";; - esac - - - - - - TCL_TCLSH="${TCL_PREFIX}/bin/tclsh${TCL_VERSION}" - - - if test x"$TCL_PREFIX" != x && test -f "$TCL_PREFIX/include/tcl.h"; then - TCFLAGS="-I$TCL_PREFIX/include" - fi - - INSTALL_LIBS="${INSTALL_LIBS} \$(libtso_target)" -fi - -# Optional DB 1.85 compatibility API. -if test "$db_cv_compat185" = "yes"; then - ADDITIONAL_INCS="db_185.h $ADDITIONAL_INCS" - - ADDITIONAL_OBJS="db185${o} $ADDITIONAL_OBJS" -fi - -# You can disable pieces of functionality to save space. -# -# Btree is always configured: it is the standard method, and Hash off-page -# duplicates require it. -ADDITIONAL_OBJS="$ADDITIONAL_OBJS \$(BTREE_OBJS)" - -# Hash can be disabled. -if test "$db_cv_build_hash" = "yes"; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_HASH 1 -_ACEOF - - - - ADDITIONAL_OBJS="$ADDITIONAL_OBJS \$(HASH_OBJS)" - if test "$db_cv_build_verify" = "yes"; then - ADDITIONAL_OBJS="$ADDITIONAL_OBJS \$(HASH_VRFY_OBJS)" - fi -else - ADDITIONAL_OBJS="$ADDITIONAL_OBJS hash_stub${o}" -fi - -# Queue can be disabled. -if test "$db_cv_build_queue" = "yes"; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_QUEUE 1 -_ACEOF - - - - ADDITIONAL_OBJS="$ADDITIONAL_OBJS \$(QUEUE_OBJS)" - if test "$db_cv_build_verify" = "yes"; then - ADDITIONAL_OBJS="$ADDITIONAL_OBJS \$(QUEUE_VRFY_OBJS)" - fi -else - ADDITIONAL_OBJS="$ADDITIONAL_OBJS qam_stub${o}" -fi - -# The replication code. -if test "$db_cv_build_replication" = "yes"; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_REPLICATION 1 -_ACEOF - - - - ADDITIONAL_OBJS="$ADDITIONAL_OBJS \$(REP_OBJS)" -else - ADDITIONAL_OBJS="$ADDITIONAL_OBJS rep_stub${o}" -fi - -# The verification code. -if test "$db_cv_build_verify" = "yes"; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_VERIFY 1 -_ACEOF - - - - ADDITIONAL_OBJS="$ADDITIONAL_OBJS \$(BTREE_VRFY_OBJS)" -else - ADDITIONAL_OBJS="$ADDITIONAL_OBJS db_vrfy_stub${o}" -fi - -# The crypto support. -if test -d "$srcdir/../crypto" -a "$db_cv_build_cryptography" = "yes"; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_CRYPTO 1 -_ACEOF - - - - - CRYPTO_OBJS="\$(CRYPTO_OBJS)" -else - CRYPTO_OBJS="crypto_stub${o}" -fi - -# Optional utilities. -if test "$db_cv_dump185" = "yes"; then - ADDITIONAL_PROGS="db_dump185 $ADDITIONAL_PROGS" -fi - # Checks for include files, structures, C types. echo "$as_me:$LINENO: checking whether stat file-mode macros are broken" >&5 echo $ECHO_N "checking whether stat file-mode macros are broken... $ECHO_C" >&6 @@ -21451,7 +21687,6 @@ if test "${ac_cv_header_stat_broken+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -21510,7 +21745,6 @@ if test "${ac_cv_header_time+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -21531,11 +21765,21 @@ return 0; _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -21548,7 +21792,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_header_time=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5 echo "${ECHO_T}$ac_cv_header_time" >&6 @@ -21574,7 +21818,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" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -21594,11 +21837,21 @@ return 0; _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -21611,7 +21864,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 eval "$as_ac_Header=no" fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err 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 @@ -21634,7 +21887,6 @@ else ac_func_search_save_LIBS=$LIBS ac_cv_search_opendir=no cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -21658,11 +21910,21 @@ opendir (); _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -21674,12 +21936,12 @@ else sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext if test "$ac_cv_search_opendir" = no; then for ac_lib in dir; do LIBS="-l$ac_lib $ac_func_search_save_LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -21703,11 +21965,21 @@ opendir (); _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -21720,7 +21992,8 @@ else sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext done fi LIBS=$ac_func_search_save_LIBS @@ -21741,7 +22014,6 @@ else ac_func_search_save_LIBS=$LIBS ac_cv_search_opendir=no cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -21765,11 +22037,21 @@ opendir (); _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -21781,12 +22063,12 @@ else sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext if test "$ac_cv_search_opendir" = no; then for ac_lib in x; do LIBS="-l$ac_lib $ac_func_search_save_LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -21810,11 +22092,21 @@ opendir (); _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -21827,7 +22119,8 @@ else sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext done fi LIBS=$ac_func_search_save_LIBS @@ -21860,7 +22153,6 @@ else 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" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -21871,11 +22163,21 @@ $ac_includes_default _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -21888,7 +22190,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_compiler=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 echo "${ECHO_T}$ac_header_compiler" >&6 @@ -21896,7 +22198,6 @@ echo "${ECHO_T}$ac_header_compiler" >&6 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" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -21914,6 +22215,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag else ac_cpp_err= fi @@ -21933,32 +22235,31 @@ 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 ) +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes ;; - no:yes ) + 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: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX ## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## +## Report this to support@sleepycat.com ## ## ------------------------------------ ## _ASBOX ) | @@ -21970,7 +22271,7 @@ 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" + 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 @@ -21991,7 +22292,6 @@ if test "${ac_cv_member_struct_stat_st_blksize+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -22010,11 +22310,21 @@ return 0; _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -22026,7 +22336,6 @@ else sed 's/^/| /' conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -22045,11 +22354,21 @@ return 0; _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -22062,9 +22381,9 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_member_struct_stat_st_blksize=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_blksize" >&5 echo "${ECHO_T}$ac_cv_member_struct_stat_st_blksize" >&6 @@ -22083,10 +22402,14 @@ fi # autoconf usually includes. For that reason, we specify a set of includes # for all type checking tests. [#5060] # +# C99 says types should be in <stdint.h>; include <stdint.h> if it exists. +# +# Some systems have types in <stddef.h>; include <stddef.h> if it exists. +# # IBM's OS/390 and z/OS releases have types in <inttypes.h> not also found -# in <sys/types.h>. Include <inttypes.h> as well, if it exists. - +# in <sys/types.h>; include <inttypes.h> if it exists. db_includes="#include <sys/types.h>" + if test "${ac_cv_header_inttypes_h+set}" = set; then echo "$as_me:$LINENO: checking for inttypes.h" >&5 echo $ECHO_N "checking for inttypes.h... $ECHO_C" >&6 @@ -22100,7 +22423,6 @@ else echo "$as_me:$LINENO: checking inttypes.h usability" >&5 echo $ECHO_N "checking inttypes.h usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -22111,11 +22433,21 @@ $ac_includes_default _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -22128,7 +22460,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_compiler=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 echo "${ECHO_T}$ac_header_compiler" >&6 @@ -22136,7 +22468,6 @@ echo "${ECHO_T}$ac_header_compiler" >&6 echo "$as_me:$LINENO: checking inttypes.h presence" >&5 echo $ECHO_N "checking inttypes.h presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -22154,6 +22485,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag else ac_cpp_err= fi @@ -22173,32 +22505,31 @@ 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 ) +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) { echo "$as_me:$LINENO: WARNING: inttypes.h: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: inttypes.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: inttypes.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: inttypes.h: proceeding with the preprocessor's result" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + { echo "$as_me:$LINENO: WARNING: inttypes.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: inttypes.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes ;; - no:yes ) + no:yes:* ) { echo "$as_me:$LINENO: WARNING: inttypes.h: present but cannot be compiled" >&5 echo "$as_me: WARNING: inttypes.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: inttypes.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: inttypes.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: inttypes.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: inttypes.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: inttypes.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: inttypes.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: inttypes.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: inttypes.h: section \"Present But Cannot Be Compiled\"" >&2;} { echo "$as_me:$LINENO: WARNING: inttypes.h: proceeding with the preprocessor's result" >&5 echo "$as_me: WARNING: inttypes.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: inttypes.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: inttypes.h: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX ## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## +## Report this to support@sleepycat.com ## ## ------------------------------------ ## _ASBOX ) | @@ -22218,24 +22549,581 @@ echo "${ECHO_T}$ac_cv_header_inttypes_h" >&6 fi if test $ac_cv_header_inttypes_h = yes; then - inttypes_decl="#include <inttypes.h>" db_includes="$db_includes #include <inttypes.h>" + inttypes_h_decl="#include <inttypes.h>" +fi + + + +if test "${ac_cv_header_stdint_h+set}" = set; then + echo "$as_me:$LINENO: checking for stdint.h" >&5 +echo $ECHO_N "checking for stdint.h... $ECHO_C" >&6 +if test "${ac_cv_header_stdint_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: $ac_cv_header_stdint_h" >&5 +echo "${ECHO_T}$ac_cv_header_stdint_h" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking stdint.h usability" >&5 +echo $ECHO_N "checking stdint.h usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include <stdint.h> +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { 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 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_header_compiler=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking stdint.h presence" >&5 +echo $ECHO_N "checking stdint.h presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <stdint.h> +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_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 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: stdint.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: stdint.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: stdint.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: stdint.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: stdint.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: stdint.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: stdint.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: stdint.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: stdint.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: stdint.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: stdint.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: stdint.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: stdint.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: stdint.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: stdint.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: stdint.h: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------ ## +## Report this to support@sleepycat.com ## +## ------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +echo "$as_me:$LINENO: checking for stdint.h" >&5 +echo $ECHO_N "checking for stdint.h... $ECHO_C" >&6 +if test "${ac_cv_header_stdint_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_header_stdint_h=$ac_header_preproc +fi +echo "$as_me:$LINENO: result: $ac_cv_header_stdint_h" >&5 +echo "${ECHO_T}$ac_cv_header_stdint_h" >&6 + +fi +if test $ac_cv_header_stdint_h = yes; then + + db_includes="$db_includes +#include <stdint.h>" + stdint_h_decl="#include <stdint.h>" +fi + + + +if test "${ac_cv_header_stddef_h+set}" = set; then + echo "$as_me:$LINENO: checking for stddef.h" >&5 +echo $ECHO_N "checking for stddef.h... $ECHO_C" >&6 +if test "${ac_cv_header_stddef_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: $ac_cv_header_stddef_h" >&5 +echo "${ECHO_T}$ac_cv_header_stddef_h" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking stddef.h usability" >&5 +echo $ECHO_N "checking stddef.h usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include <stddef.h> +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { 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 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_header_compiler=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking stddef.h presence" >&5 +echo $ECHO_N "checking stddef.h presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <stddef.h> +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_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 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: stddef.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: stddef.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: stddef.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: stddef.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: stddef.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: stddef.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: stddef.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: stddef.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: stddef.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: stddef.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: stddef.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: stddef.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: stddef.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: stddef.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: stddef.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: stddef.h: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------ ## +## Report this to support@sleepycat.com ## +## ------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +echo "$as_me:$LINENO: checking for stddef.h" >&5 +echo $ECHO_N "checking for stddef.h... $ECHO_C" >&6 +if test "${ac_cv_header_stddef_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_header_stddef_h=$ac_header_preproc +fi +echo "$as_me:$LINENO: result: $ac_cv_header_stddef_h" >&5 +echo "${ECHO_T}$ac_cv_header_stddef_h" >&6 + +fi +if test $ac_cv_header_stddef_h = yes; then + + db_includes="$db_includes +#include <stddef.h>" + stddef_h_decl="#include <stddef.h>" fi db_includes="$db_includes #include <stdio.h>" +# We require off_t and size_t, and we don't try to substitute our own +# if we can't find them. +echo "$as_me:$LINENO: checking for off_t" >&5 +echo $ECHO_N "checking for off_t... $ECHO_C" >&6 +if test "${ac_cv_type_off_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$db_includes + +int +main () +{ +if ((off_t *) 0) + return 0; +if (sizeof (off_t)) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { 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_cv_type_off_t=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_type_off_t=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5 +echo "${ECHO_T}$ac_cv_type_off_t" >&6 +if test $ac_cv_type_off_t = yes; then + : +else + { { echo "$as_me:$LINENO: error: No off_t type." >&5 +echo "$as_me: error: No off_t type." >&2;} + { (exit 1); exit 1; }; } +fi + +echo "$as_me:$LINENO: checking for size_t" >&5 +echo $ECHO_N "checking for size_t... $ECHO_C" >&6 +if test "${ac_cv_type_size_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$db_includes + +int +main () +{ +if ((size_t *) 0) + return 0; +if (sizeof (size_t)) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { 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_cv_type_size_t=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_type_size_t=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5 +echo "${ECHO_T}$ac_cv_type_size_t" >&6 +if test $ac_cv_type_size_t = yes; then + : +else + { { echo "$as_me:$LINENO: error: No size_t type." >&5 +echo "$as_me: error: No size_t type." >&2;} + { (exit 1); exit 1; }; } +fi + + +# Check for long long and unsigned long long, we only support sequences +# if those types are available. +echo "$as_me:$LINENO: checking for long long" >&5 +echo $ECHO_N "checking for long long... $ECHO_C" >&6 +if test "${ac_cv_type_long_long+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$db_includes + +int +main () +{ +if ((long long *) 0) + return 0; +if (sizeof (long long)) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { 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_cv_type_long_long=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_type_long_long=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ac_cv_type_long_long" >&5 +echo "${ECHO_T}$ac_cv_type_long_long" >&6 +if test $ac_cv_type_long_long = yes; then + +cat >>confdefs.h <<_ACEOF +#define HAVE_LONG_LONG 1 +_ACEOF + + +fi +echo "$as_me:$LINENO: checking for unsigned long long" >&5 +echo $ECHO_N "checking for unsigned long long... $ECHO_C" >&6 +if test "${ac_cv_type_unsigned_long_long+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$db_includes + +int +main () +{ +if ((unsigned long long *) 0) + return 0; +if (sizeof (unsigned long long)) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { 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_cv_type_unsigned_long_long=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_type_unsigned_long_long=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_long_long" >&5 +echo "${ECHO_T}$ac_cv_type_unsigned_long_long" >&6 +if test $ac_cv_type_unsigned_long_long = yes; then + +cat >>confdefs.h <<_ACEOF +#define HAVE_UNSIGNED_LONG_LONG 1 +_ACEOF + + +fi + + # We need to know the sizes of various objects on this system. -# We don't use the SIZEOF_XXX values created by autoconf. echo "$as_me:$LINENO: checking for char" >&5 echo $ECHO_N "checking for char... $ECHO_C" >&6 if test "${ac_cv_type_char+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -22256,11 +23144,21 @@ if (sizeof (char)) _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -22273,7 +23171,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_type_char=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_type_char" >&5 echo "${ECHO_T}$ac_cv_type_char" >&6 @@ -22291,7 +23189,6 @@ else if test "$cross_compiling" = yes; then # Depending upon the size, compute the lo and hi bounds. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -22311,11 +23208,21 @@ test_array [0] = 0 _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -22324,7 +23231,6 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_lo=0 ac_mid=0 while :; do cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -22344,11 +23250,21 @@ test_array [0] = 0 _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -22360,20 +23276,19 @@ else sed 's/^/| /' conftest.$ac_ext >&5 ac_lo=`expr $ac_mid + 1` - if test $ac_lo -le $ac_mid; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid + 1` + if test $ac_lo -le $ac_mid; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid + 1` fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext done else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -22393,11 +23308,21 @@ test_array [0] = 0 _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -22406,7 +23331,6 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_hi=-1 ac_mid=-1 while :; do cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -22426,11 +23350,21 @@ test_array [0] = 0 _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -22442,13 +23376,13 @@ else sed 's/^/| /' conftest.$ac_ext >&5 ac_hi=`expr '(' $ac_mid ')' - 1` - if test $ac_mid -le $ac_hi; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid` + if test $ac_mid -le $ac_hi; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid` fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext done else echo "$as_me: failed program was:" >&5 @@ -22456,14 +23390,13 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_lo= ac_hi= fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext # Binary search between lo and hi bounds. while test "x$ac_lo" != "x$ac_hi"; do ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -22483,11 +23416,21 @@ test_array [0] = 0 _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -22500,7 +23443,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_lo=`expr '(' $ac_mid ')' + 1` fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext done case $ac_lo in ?*) ac_cv_sizeof_char=$ac_lo;; @@ -22519,7 +23462,6 @@ See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -22582,7 +23524,7 @@ echo "$as_me: error: cannot compute sizeof (char), 77 See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } fi -rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi rm -f conftest.val @@ -22603,7 +23545,6 @@ if test "${ac_cv_type_unsigned_char+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -22624,11 +23565,21 @@ if (sizeof (unsigned char)) _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -22641,7 +23592,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_type_unsigned_char=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_char" >&5 echo "${ECHO_T}$ac_cv_type_unsigned_char" >&6 @@ -22659,7 +23610,6 @@ else if test "$cross_compiling" = yes; then # Depending upon the size, compute the lo and hi bounds. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -22679,11 +23629,21 @@ test_array [0] = 0 _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -22692,7 +23652,6 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_lo=0 ac_mid=0 while :; do cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -22712,11 +23671,21 @@ test_array [0] = 0 _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -22728,20 +23697,19 @@ else sed 's/^/| /' conftest.$ac_ext >&5 ac_lo=`expr $ac_mid + 1` - if test $ac_lo -le $ac_mid; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid + 1` + if test $ac_lo -le $ac_mid; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid + 1` fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext done else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -22761,11 +23729,21 @@ test_array [0] = 0 _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -22774,7 +23752,6 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_hi=-1 ac_mid=-1 while :; do cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -22794,11 +23771,21 @@ test_array [0] = 0 _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -22810,13 +23797,13 @@ else sed 's/^/| /' conftest.$ac_ext >&5 ac_hi=`expr '(' $ac_mid ')' - 1` - if test $ac_mid -le $ac_hi; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid` + if test $ac_mid -le $ac_hi; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid` fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext done else echo "$as_me: failed program was:" >&5 @@ -22824,14 +23811,13 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_lo= ac_hi= fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext # Binary search between lo and hi bounds. while test "x$ac_lo" != "x$ac_hi"; do ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -22851,11 +23837,21 @@ test_array [0] = 0 _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -22868,7 +23864,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_lo=`expr '(' $ac_mid ')' + 1` fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext done case $ac_lo in ?*) ac_cv_sizeof_unsigned_char=$ac_lo;; @@ -22887,7 +23883,6 @@ See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -22950,7 +23945,7 @@ echo "$as_me: error: cannot compute sizeof (unsigned char), 77 See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } fi -rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi rm -f conftest.val @@ -22971,7 +23966,6 @@ if test "${ac_cv_type_short+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -22992,11 +23986,21 @@ if (sizeof (short)) _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -23009,7 +24013,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_type_short=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_type_short" >&5 echo "${ECHO_T}$ac_cv_type_short" >&6 @@ -23027,7 +24031,6 @@ else if test "$cross_compiling" = yes; then # Depending upon the size, compute the lo and hi bounds. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -23047,11 +24050,21 @@ test_array [0] = 0 _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -23060,7 +24073,6 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_lo=0 ac_mid=0 while :; do cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -23080,11 +24092,21 @@ test_array [0] = 0 _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -23096,20 +24118,19 @@ else sed 's/^/| /' conftest.$ac_ext >&5 ac_lo=`expr $ac_mid + 1` - if test $ac_lo -le $ac_mid; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid + 1` + if test $ac_lo -le $ac_mid; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid + 1` fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext done else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -23129,11 +24150,21 @@ test_array [0] = 0 _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -23142,7 +24173,6 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_hi=-1 ac_mid=-1 while :; do cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -23162,11 +24192,21 @@ test_array [0] = 0 _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -23178,13 +24218,13 @@ else sed 's/^/| /' conftest.$ac_ext >&5 ac_hi=`expr '(' $ac_mid ')' - 1` - if test $ac_mid -le $ac_hi; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid` + if test $ac_mid -le $ac_hi; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid` fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext done else echo "$as_me: failed program was:" >&5 @@ -23192,14 +24232,13 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_lo= ac_hi= fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext # Binary search between lo and hi bounds. while test "x$ac_lo" != "x$ac_hi"; do ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -23219,11 +24258,21 @@ test_array [0] = 0 _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -23236,7 +24285,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_lo=`expr '(' $ac_mid ')' + 1` fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext done case $ac_lo in ?*) ac_cv_sizeof_short=$ac_lo;; @@ -23255,7 +24304,6 @@ See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -23318,7 +24366,7 @@ echo "$as_me: error: cannot compute sizeof (short), 77 See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } fi -rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi rm -f conftest.val @@ -23339,7 +24387,6 @@ if test "${ac_cv_type_unsigned_short+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -23360,11 +24407,21 @@ if (sizeof (unsigned short)) _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -23377,7 +24434,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_type_unsigned_short=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_short" >&5 echo "${ECHO_T}$ac_cv_type_unsigned_short" >&6 @@ -23395,7 +24452,6 @@ else if test "$cross_compiling" = yes; then # Depending upon the size, compute the lo and hi bounds. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -23415,11 +24471,21 @@ test_array [0] = 0 _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -23428,7 +24494,6 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_lo=0 ac_mid=0 while :; do cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -23448,11 +24513,21 @@ test_array [0] = 0 _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -23464,20 +24539,19 @@ else sed 's/^/| /' conftest.$ac_ext >&5 ac_lo=`expr $ac_mid + 1` - if test $ac_lo -le $ac_mid; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid + 1` + if test $ac_lo -le $ac_mid; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid + 1` fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext done else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -23497,11 +24571,21 @@ test_array [0] = 0 _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -23510,7 +24594,6 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_hi=-1 ac_mid=-1 while :; do cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -23530,11 +24613,21 @@ test_array [0] = 0 _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -23546,13 +24639,13 @@ else sed 's/^/| /' conftest.$ac_ext >&5 ac_hi=`expr '(' $ac_mid ')' - 1` - if test $ac_mid -le $ac_hi; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid` + if test $ac_mid -le $ac_hi; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid` fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext done else echo "$as_me: failed program was:" >&5 @@ -23560,14 +24653,13 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_lo= ac_hi= fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext # Binary search between lo and hi bounds. while test "x$ac_lo" != "x$ac_hi"; do ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -23587,11 +24679,21 @@ test_array [0] = 0 _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -23604,7 +24706,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_lo=`expr '(' $ac_mid ')' + 1` fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext done case $ac_lo in ?*) ac_cv_sizeof_unsigned_short=$ac_lo;; @@ -23623,7 +24725,6 @@ See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -23686,7 +24787,7 @@ echo "$as_me: error: cannot compute sizeof (unsigned short), 77 See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } fi -rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi rm -f conftest.val @@ -23707,7 +24808,6 @@ if test "${ac_cv_type_int+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -23728,11 +24828,21 @@ if (sizeof (int)) _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -23745,7 +24855,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_type_int=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5 echo "${ECHO_T}$ac_cv_type_int" >&6 @@ -23763,7 +24873,6 @@ else if test "$cross_compiling" = yes; then # Depending upon the size, compute the lo and hi bounds. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -23783,11 +24892,21 @@ test_array [0] = 0 _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -23796,7 +24915,6 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_lo=0 ac_mid=0 while :; do cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -23816,11 +24934,21 @@ test_array [0] = 0 _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -23832,20 +24960,19 @@ else sed 's/^/| /' conftest.$ac_ext >&5 ac_lo=`expr $ac_mid + 1` - if test $ac_lo -le $ac_mid; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid + 1` + if test $ac_lo -le $ac_mid; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid + 1` fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext done else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -23865,11 +24992,21 @@ test_array [0] = 0 _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -23878,7 +25015,6 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_hi=-1 ac_mid=-1 while :; do cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -23898,11 +25034,21 @@ test_array [0] = 0 _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -23914,13 +25060,13 @@ else sed 's/^/| /' conftest.$ac_ext >&5 ac_hi=`expr '(' $ac_mid ')' - 1` - if test $ac_mid -le $ac_hi; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid` + if test $ac_mid -le $ac_hi; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid` fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext done else echo "$as_me: failed program was:" >&5 @@ -23928,14 +25074,13 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_lo= ac_hi= fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext # Binary search between lo and hi bounds. while test "x$ac_lo" != "x$ac_hi"; do ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -23955,11 +25100,21 @@ test_array [0] = 0 _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -23972,7 +25127,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_lo=`expr '(' $ac_mid ')' + 1` fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext done case $ac_lo in ?*) ac_cv_sizeof_int=$ac_lo;; @@ -23991,7 +25146,6 @@ See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -24054,7 +25208,7 @@ echo "$as_me: error: cannot compute sizeof (int), 77 See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } fi -rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi rm -f conftest.val @@ -24075,7 +25229,6 @@ if test "${ac_cv_type_unsigned_int+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -24096,11 +25249,21 @@ if (sizeof (unsigned int)) _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -24113,7 +25276,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_type_unsigned_int=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_int" >&5 echo "${ECHO_T}$ac_cv_type_unsigned_int" >&6 @@ -24131,7 +25294,6 @@ else if test "$cross_compiling" = yes; then # Depending upon the size, compute the lo and hi bounds. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -24151,11 +25313,21 @@ test_array [0] = 0 _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -24164,7 +25336,6 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_lo=0 ac_mid=0 while :; do cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -24184,11 +25355,21 @@ test_array [0] = 0 _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -24200,20 +25381,19 @@ else sed 's/^/| /' conftest.$ac_ext >&5 ac_lo=`expr $ac_mid + 1` - if test $ac_lo -le $ac_mid; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid + 1` + if test $ac_lo -le $ac_mid; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid + 1` fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext done else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -24233,11 +25413,21 @@ test_array [0] = 0 _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -24246,7 +25436,6 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_hi=-1 ac_mid=-1 while :; do cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -24266,11 +25455,21 @@ test_array [0] = 0 _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -24282,13 +25481,13 @@ else sed 's/^/| /' conftest.$ac_ext >&5 ac_hi=`expr '(' $ac_mid ')' - 1` - if test $ac_mid -le $ac_hi; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid` + if test $ac_mid -le $ac_hi; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid` fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext done else echo "$as_me: failed program was:" >&5 @@ -24296,14 +25495,13 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_lo= ac_hi= fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext # Binary search between lo and hi bounds. while test "x$ac_lo" != "x$ac_hi"; do ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -24323,11 +25521,21 @@ test_array [0] = 0 _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -24340,7 +25548,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_lo=`expr '(' $ac_mid ')' + 1` fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext done case $ac_lo in ?*) ac_cv_sizeof_unsigned_int=$ac_lo;; @@ -24359,7 +25567,6 @@ See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -24422,7 +25629,7 @@ echo "$as_me: error: cannot compute sizeof (unsigned int), 77 See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } fi -rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi rm -f conftest.val @@ -24443,7 +25650,6 @@ if test "${ac_cv_type_long+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -24464,11 +25670,21 @@ if (sizeof (long)) _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -24481,7 +25697,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_type_long=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5 echo "${ECHO_T}$ac_cv_type_long" >&6 @@ -24499,7 +25715,6 @@ else if test "$cross_compiling" = yes; then # Depending upon the size, compute the lo and hi bounds. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -24519,11 +25734,21 @@ test_array [0] = 0 _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -24532,7 +25757,6 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_lo=0 ac_mid=0 while :; do cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -24552,11 +25776,21 @@ test_array [0] = 0 _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -24568,20 +25802,19 @@ else sed 's/^/| /' conftest.$ac_ext >&5 ac_lo=`expr $ac_mid + 1` - if test $ac_lo -le $ac_mid; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid + 1` + if test $ac_lo -le $ac_mid; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid + 1` fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext done else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -24601,11 +25834,21 @@ test_array [0] = 0 _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -24614,7 +25857,6 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_hi=-1 ac_mid=-1 while :; do cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -24634,11 +25876,21 @@ test_array [0] = 0 _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -24650,13 +25902,13 @@ else sed 's/^/| /' conftest.$ac_ext >&5 ac_hi=`expr '(' $ac_mid ')' - 1` - if test $ac_mid -le $ac_hi; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid` + if test $ac_mid -le $ac_hi; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid` fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext done else echo "$as_me: failed program was:" >&5 @@ -24664,14 +25916,13 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_lo= ac_hi= fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext # Binary search between lo and hi bounds. while test "x$ac_lo" != "x$ac_hi"; do ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -24691,11 +25942,21 @@ test_array [0] = 0 _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -24708,7 +25969,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_lo=`expr '(' $ac_mid ')' + 1` fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext done case $ac_lo in ?*) ac_cv_sizeof_long=$ac_lo;; @@ -24727,7 +25988,6 @@ See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -24790,7 +26050,7 @@ echo "$as_me: error: cannot compute sizeof (long), 77 See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } fi -rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi rm -f conftest.val @@ -24811,7 +26071,6 @@ if test "${ac_cv_type_unsigned_long+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -24832,11 +26091,21 @@ if (sizeof (unsigned long)) _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -24849,7 +26118,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_type_unsigned_long=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_long" >&5 echo "${ECHO_T}$ac_cv_type_unsigned_long" >&6 @@ -24867,7 +26136,6 @@ else if test "$cross_compiling" = yes; then # Depending upon the size, compute the lo and hi bounds. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -24887,11 +26155,21 @@ test_array [0] = 0 _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -24900,7 +26178,6 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_lo=0 ac_mid=0 while :; do cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -24920,11 +26197,21 @@ test_array [0] = 0 _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -24936,20 +26223,19 @@ else sed 's/^/| /' conftest.$ac_ext >&5 ac_lo=`expr $ac_mid + 1` - if test $ac_lo -le $ac_mid; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid + 1` + if test $ac_lo -le $ac_mid; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid + 1` fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext done else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -24969,11 +26255,21 @@ test_array [0] = 0 _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -24982,7 +26278,6 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_hi=-1 ac_mid=-1 while :; do cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -25002,11 +26297,21 @@ test_array [0] = 0 _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -25018,13 +26323,13 @@ else sed 's/^/| /' conftest.$ac_ext >&5 ac_hi=`expr '(' $ac_mid ')' - 1` - if test $ac_mid -le $ac_hi; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid` + if test $ac_mid -le $ac_hi; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid` fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext done else echo "$as_me: failed program was:" >&5 @@ -25032,14 +26337,13 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_lo= ac_hi= fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext # Binary search between lo and hi bounds. while test "x$ac_lo" != "x$ac_hi"; do ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -25059,11 +26363,21 @@ test_array [0] = 0 _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -25076,7 +26390,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_lo=`expr '(' $ac_mid ')' + 1` fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext done case $ac_lo in ?*) ac_cv_sizeof_unsigned_long=$ac_lo;; @@ -25095,7 +26409,6 @@ See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -25158,7 +26471,7 @@ echo "$as_me: error: cannot compute sizeof (unsigned long), 77 See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } fi -rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi rm -f conftest.val @@ -25173,13 +26486,12 @@ cat >>confdefs.h <<_ACEOF _ACEOF -echo "$as_me:$LINENO: checking for size_t" >&5 -echo $ECHO_N "checking for size_t... $ECHO_C" >&6 -if test "${ac_cv_type_size_t+set}" = set; then +echo "$as_me:$LINENO: checking for long long" >&5 +echo $ECHO_N "checking for long long... $ECHO_C" >&6 +if test "${ac_cv_type_long_long+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -25190,9 +26502,9 @@ $db_includes int main () { -if ((size_t *) 0) +if ((long long *) 0) return 0; -if (sizeof (size_t)) +if (sizeof (long long)) return 0; ; return 0; @@ -25200,34 +26512,44 @@ if (sizeof (size_t)) _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { 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_cv_type_size_t=yes + ac_cv_type_long_long=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_type_size_t=no +ac_cv_type_long_long=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5 -echo "${ECHO_T}$ac_cv_type_size_t" >&6 +echo "$as_me:$LINENO: result: $ac_cv_type_long_long" >&5 +echo "${ECHO_T}$ac_cv_type_long_long" >&6 -echo "$as_me:$LINENO: checking size of size_t" >&5 -echo $ECHO_N "checking size of size_t... $ECHO_C" >&6 -if test "${ac_cv_sizeof_size_t+set}" = set; then +echo "$as_me:$LINENO: checking size of long long" >&5 +echo $ECHO_N "checking size of long long... $ECHO_C" >&6 +if test "${ac_cv_sizeof_long_long+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test "$ac_cv_type_size_t" = yes; then + if test "$ac_cv_type_long_long" = yes; then # The cast to unsigned long works around a bug in the HP C Compiler # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. @@ -25235,7 +26557,6 @@ else if test "$cross_compiling" = yes; then # Depending upon the size, compute the lo and hi bounds. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -25246,7 +26567,7 @@ $db_includes int main () { -static int test_array [1 - 2 * !(((long) (sizeof (size_t))) >= 0)]; +static int test_array [1 - 2 * !(((long) (sizeof (long long))) >= 0)]; test_array [0] = 0 ; @@ -25255,11 +26576,21 @@ test_array [0] = 0 _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -25268,7 +26599,6 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_lo=0 ac_mid=0 while :; do cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -25279,7 +26609,7 @@ $db_includes int main () { -static int test_array [1 - 2 * !(((long) (sizeof (size_t))) <= $ac_mid)]; +static int test_array [1 - 2 * !(((long) (sizeof (long long))) <= $ac_mid)]; test_array [0] = 0 ; @@ -25288,11 +26618,21 @@ test_array [0] = 0 _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -25304,20 +26644,19 @@ else sed 's/^/| /' conftest.$ac_ext >&5 ac_lo=`expr $ac_mid + 1` - if test $ac_lo -le $ac_mid; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid + 1` + if test $ac_lo -le $ac_mid; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid + 1` fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext done else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -25328,7 +26667,7 @@ $db_includes int main () { -static int test_array [1 - 2 * !(((long) (sizeof (size_t))) < 0)]; +static int test_array [1 - 2 * !(((long) (sizeof (long long))) < 0)]; test_array [0] = 0 ; @@ -25337,11 +26676,21 @@ test_array [0] = 0 _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -25350,7 +26699,6 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_hi=-1 ac_mid=-1 while :; do cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -25361,7 +26709,7 @@ $db_includes int main () { -static int test_array [1 - 2 * !(((long) (sizeof (size_t))) >= $ac_mid)]; +static int test_array [1 - 2 * !(((long) (sizeof (long long))) >= $ac_mid)]; test_array [0] = 0 ; @@ -25370,11 +26718,21 @@ test_array [0] = 0 _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -25386,13 +26744,13 @@ else sed 's/^/| /' conftest.$ac_ext >&5 ac_hi=`expr '(' $ac_mid ')' - 1` - if test $ac_mid -le $ac_hi; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid` + if test $ac_mid -le $ac_hi; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid` fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext done else echo "$as_me: failed program was:" >&5 @@ -25400,14 +26758,13 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_lo= ac_hi= fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext # Binary search between lo and hi bounds. while test "x$ac_lo" != "x$ac_hi"; do ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -25418,7 +26775,7 @@ $db_includes int main () { -static int test_array [1 - 2 * !(((long) (sizeof (size_t))) <= $ac_mid)]; +static int test_array [1 - 2 * !(((long) (sizeof (long long))) <= $ac_mid)]; test_array [0] = 0 ; @@ -25427,11 +26784,21 @@ test_array [0] = 0 _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -25444,13 +26811,13 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_lo=`expr '(' $ac_mid ')' + 1` fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext done case $ac_lo in -?*) ac_cv_sizeof_size_t=$ac_lo;; -'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t), 77 +?*) ac_cv_sizeof_long_long=$ac_lo;; +'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long long), 77 See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (size_t), 77 +echo "$as_me: error: cannot compute sizeof (long long), 77 See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } ;; esac @@ -25463,7 +26830,6 @@ See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -25471,8 +26837,8 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $db_includes -long longval () { return (long) (sizeof (size_t)); } -unsigned long ulongval () { return (long) (sizeof (size_t)); } +long longval () { return (long) (sizeof (long long)); } +unsigned long ulongval () { return (long) (sizeof (long long)); } #include <stdio.h> #include <stdlib.h> int @@ -25482,17 +26848,17 @@ main () FILE *f = fopen ("conftest.val", "w"); if (! f) exit (1); - if (((long) (sizeof (size_t))) < 0) + if (((long) (sizeof (long long))) < 0) { long i = longval (); - if (i != ((long) (sizeof (size_t)))) + if (i != ((long) (sizeof (long long)))) exit (1); fprintf (f, "%ld\n", i); } else { unsigned long i = ulongval (); - if (i != ((long) (sizeof (size_t)))) + if (i != ((long) (sizeof (long long)))) exit (1); fprintf (f, "%lu\n", i); } @@ -25513,41 +26879,40 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_sizeof_size_t=`cat conftest.val` + ac_cv_sizeof_long_long=`cat conftest.val` else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) -{ { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t), 77 +{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long long), 77 See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (size_t), 77 +echo "$as_me: error: cannot compute sizeof (long long), 77 See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } fi -rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi rm -f conftest.val else - ac_cv_sizeof_size_t=0 + ac_cv_sizeof_long_long=0 fi fi -echo "$as_me:$LINENO: result: $ac_cv_sizeof_size_t" >&5 -echo "${ECHO_T}$ac_cv_sizeof_size_t" >&6 +echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_long" >&5 +echo "${ECHO_T}$ac_cv_sizeof_long_long" >&6 cat >>confdefs.h <<_ACEOF -#define SIZEOF_SIZE_T $ac_cv_sizeof_size_t +#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long _ACEOF -echo "$as_me:$LINENO: checking for char *" >&5 -echo $ECHO_N "checking for char *... $ECHO_C" >&6 -if test "${ac_cv_type_char_p+set}" = set; then +echo "$as_me:$LINENO: checking for unsigned long long" >&5 +echo $ECHO_N "checking for unsigned long long... $ECHO_C" >&6 +if test "${ac_cv_type_unsigned_long_long+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -25558,9 +26923,9 @@ $db_includes int main () { -if ((char * *) 0) +if ((unsigned long long *) 0) return 0; -if (sizeof (char *)) +if (sizeof (unsigned long long)) return 0; ; return 0; @@ -25568,34 +26933,44 @@ if (sizeof (char *)) _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { 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_cv_type_char_p=yes + ac_cv_type_unsigned_long_long=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_type_char_p=no +ac_cv_type_unsigned_long_long=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_type_char_p" >&5 -echo "${ECHO_T}$ac_cv_type_char_p" >&6 +echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_long_long" >&5 +echo "${ECHO_T}$ac_cv_type_unsigned_long_long" >&6 -echo "$as_me:$LINENO: checking size of char *" >&5 -echo $ECHO_N "checking size of char *... $ECHO_C" >&6 -if test "${ac_cv_sizeof_char_p+set}" = set; then +echo "$as_me:$LINENO: checking size of unsigned long long" >&5 +echo $ECHO_N "checking size of unsigned long long... $ECHO_C" >&6 +if test "${ac_cv_sizeof_unsigned_long_long+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test "$ac_cv_type_char_p" = yes; then + if test "$ac_cv_type_unsigned_long_long" = yes; then # The cast to unsigned long works around a bug in the HP C Compiler # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. @@ -25603,7 +26978,6 @@ else if test "$cross_compiling" = yes; then # Depending upon the size, compute the lo and hi bounds. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -25614,7 +26988,7 @@ $db_includes int main () { -static int test_array [1 - 2 * !(((long) (sizeof (char *))) >= 0)]; +static int test_array [1 - 2 * !(((long) (sizeof (unsigned long long))) >= 0)]; test_array [0] = 0 ; @@ -25623,11 +26997,21 @@ test_array [0] = 0 _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -25636,7 +27020,6 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_lo=0 ac_mid=0 while :; do cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -25647,7 +27030,7 @@ $db_includes int main () { -static int test_array [1 - 2 * !(((long) (sizeof (char *))) <= $ac_mid)]; +static int test_array [1 - 2 * !(((long) (sizeof (unsigned long long))) <= $ac_mid)]; test_array [0] = 0 ; @@ -25656,11 +27039,21 @@ test_array [0] = 0 _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -25672,20 +27065,19 @@ else sed 's/^/| /' conftest.$ac_ext >&5 ac_lo=`expr $ac_mid + 1` - if test $ac_lo -le $ac_mid; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid + 1` + if test $ac_lo -le $ac_mid; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid + 1` fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext done else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -25696,7 +27088,7 @@ $db_includes int main () { -static int test_array [1 - 2 * !(((long) (sizeof (char *))) < 0)]; +static int test_array [1 - 2 * !(((long) (sizeof (unsigned long long))) < 0)]; test_array [0] = 0 ; @@ -25705,11 +27097,21 @@ test_array [0] = 0 _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -25718,7 +27120,6 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_hi=-1 ac_mid=-1 while :; do cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -25729,7 +27130,7 @@ $db_includes int main () { -static int test_array [1 - 2 * !(((long) (sizeof (char *))) >= $ac_mid)]; +static int test_array [1 - 2 * !(((long) (sizeof (unsigned long long))) >= $ac_mid)]; test_array [0] = 0 ; @@ -25738,11 +27139,21 @@ test_array [0] = 0 _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -25754,13 +27165,13 @@ else sed 's/^/| /' conftest.$ac_ext >&5 ac_hi=`expr '(' $ac_mid ')' - 1` - if test $ac_mid -le $ac_hi; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid` + if test $ac_mid -le $ac_hi; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid` fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext done else echo "$as_me: failed program was:" >&5 @@ -25768,14 +27179,13 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_lo= ac_hi= fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext # Binary search between lo and hi bounds. while test "x$ac_lo" != "x$ac_hi"; do ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -25786,7 +27196,7 @@ $db_includes int main () { -static int test_array [1 - 2 * !(((long) (sizeof (char *))) <= $ac_mid)]; +static int test_array [1 - 2 * !(((long) (sizeof (unsigned long long))) <= $ac_mid)]; test_array [0] = 0 ; @@ -25795,11 +27205,21 @@ test_array [0] = 0 _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -25812,13 +27232,13 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_lo=`expr '(' $ac_mid ')' + 1` fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext done case $ac_lo in -?*) ac_cv_sizeof_char_p=$ac_lo;; -'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (char *), 77 +?*) ac_cv_sizeof_unsigned_long_long=$ac_lo;; +'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long long), 77 See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (char *), 77 +echo "$as_me: error: cannot compute sizeof (unsigned long long), 77 See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } ;; esac @@ -25831,7 +27251,6 @@ See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -25839,8 +27258,8 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $db_includes -long longval () { return (long) (sizeof (char *)); } -unsigned long ulongval () { return (long) (sizeof (char *)); } +long longval () { return (long) (sizeof (unsigned long long)); } +unsigned long ulongval () { return (long) (sizeof (unsigned long long)); } #include <stdio.h> #include <stdlib.h> int @@ -25850,17 +27269,17 @@ main () FILE *f = fopen ("conftest.val", "w"); if (! f) exit (1); - if (((long) (sizeof (char *))) < 0) + if (((long) (sizeof (unsigned long long))) < 0) { long i = longval (); - if (i != ((long) (sizeof (char *)))) + if (i != ((long) (sizeof (unsigned long long)))) exit (1); fprintf (f, "%ld\n", i); } else { unsigned long i = ulongval (); - if (i != ((long) (sizeof (char *)))) + if (i != ((long) (sizeof (unsigned long long)))) exit (1); fprintf (f, "%lu\n", i); } @@ -25881,44 +27300,40 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_sizeof_char_p=`cat conftest.val` + ac_cv_sizeof_unsigned_long_long=`cat conftest.val` else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) -{ { echo "$as_me:$LINENO: error: cannot compute sizeof (char *), 77 +{ { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long long), 77 See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (char *), 77 +echo "$as_me: error: cannot compute sizeof (unsigned long long), 77 See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } fi -rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi rm -f conftest.val else - ac_cv_sizeof_char_p=0 + ac_cv_sizeof_unsigned_long_long=0 fi fi -echo "$as_me:$LINENO: result: $ac_cv_sizeof_char_p" >&5 -echo "${ECHO_T}$ac_cv_sizeof_char_p" >&6 +echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_long_long" >&5 +echo "${ECHO_T}$ac_cv_sizeof_unsigned_long_long" >&6 cat >>confdefs.h <<_ACEOF -#define SIZEOF_CHAR_P $ac_cv_sizeof_char_p +#define SIZEOF_UNSIGNED_LONG_LONG $ac_cv_sizeof_unsigned_long_long _ACEOF - -# We require off_t and size_t, and we don't try to substitute our own -# if we can't find them. -echo "$as_me:$LINENO: checking for off_t" >&5 -echo $ECHO_N "checking for off_t... $ECHO_C" >&6 -if test "${ac_cv_type_off_t+set}" = set; then +echo "$as_me:$LINENO: checking for size_t" >&5 +echo $ECHO_N "checking for size_t... $ECHO_C" >&6 +if test "${ac_cv_type_size_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -25929,9 +27344,9 @@ $db_includes int main () { -if ((off_t *) 0) +if ((size_t *) 0) return 0; -if (sizeof (off_t)) +if (sizeof (size_t)) return 0; ; return 0; @@ -25939,42 +27354,407 @@ if (sizeof (off_t)) _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { 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_cv_type_off_t=yes + ac_cv_type_size_t=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_type_off_t=no +ac_cv_type_size_t=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5 -echo "${ECHO_T}$ac_cv_type_off_t" >&6 -if test $ac_cv_type_off_t = yes; then - : +echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5 +echo "${ECHO_T}$ac_cv_type_size_t" >&6 + +echo "$as_me:$LINENO: checking size of size_t" >&5 +echo $ECHO_N "checking size of size_t... $ECHO_C" >&6 +if test "${ac_cv_sizeof_size_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - { { echo "$as_me:$LINENO: error: No off_t type." >&5 -echo "$as_me: error: No off_t type." >&2;} + if test "$ac_cv_type_size_t" = yes; then + # The cast to unsigned long works around a bug in the HP C Compiler + # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects + # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. + # This bug is HP SR number 8606223364. + if test "$cross_compiling" = yes; then + # Depending upon the size, compute the lo and hi bounds. +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$db_includes + +int +main () +{ +static int test_array [1 - 2 * !(((long) (sizeof (size_t))) >= 0)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { 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_lo=0 ac_mid=0 + while :; do + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$db_includes + +int +main () +{ +static int test_array [1 - 2 * !(((long) (sizeof (size_t))) <= $ac_mid)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { 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_hi=$ac_mid; break +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_lo=`expr $ac_mid + 1` + if test $ac_lo -le $ac_mid; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid + 1` +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + done +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$db_includes + +int +main () +{ +static int test_array [1 - 2 * !(((long) (sizeof (size_t))) < 0)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { 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_hi=-1 ac_mid=-1 + while :; do + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$db_includes + +int +main () +{ +static int test_array [1 - 2 * !(((long) (sizeof (size_t))) >= $ac_mid)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { 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_lo=$ac_mid; break +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_hi=`expr '(' $ac_mid ')' - 1` + if test $ac_mid -le $ac_hi; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid` +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + done +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_lo= ac_hi= +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +# Binary search between lo and hi bounds. +while test "x$ac_lo" != "x$ac_hi"; do + ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$db_includes + +int +main () +{ +static int test_array [1 - 2 * !(((long) (sizeof (size_t))) <= $ac_mid)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { 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_hi=$ac_mid +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_lo=`expr '(' $ac_mid ')' + 1` +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +done +case $ac_lo in +?*) ac_cv_sizeof_size_t=$ac_lo;; +'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t), 77 +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot compute sizeof (size_t), 77 +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } ;; +esac +else + if test "$cross_compiling" = yes; then + { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot run test program while cross compiling +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$db_includes + +long longval () { return (long) (sizeof (size_t)); } +unsigned long ulongval () { return (long) (sizeof (size_t)); } +#include <stdio.h> +#include <stdlib.h> +int +main () +{ + + FILE *f = fopen ("conftest.val", "w"); + if (! f) + exit (1); + if (((long) (sizeof (size_t))) < 0) + { + long i = longval (); + if (i != ((long) (sizeof (size_t)))) + exit (1); + fprintf (f, "%ld\n", i); + } + else + { + unsigned long i = ulongval (); + if (i != ((long) (sizeof (size_t)))) + exit (1); + fprintf (f, "%lu\n", i); + } + exit (ferror (f) || fclose (f) != 0); + + ; + 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 + ac_cv_sizeof_size_t=`cat conftest.val` +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +{ { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t), 77 +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot compute sizeof (size_t), 77 +See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } fi +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi +fi +rm -f conftest.val +else + ac_cv_sizeof_size_t=0 +fi +fi +echo "$as_me:$LINENO: result: $ac_cv_sizeof_size_t" >&5 +echo "${ECHO_T}$ac_cv_sizeof_size_t" >&6 +cat >>confdefs.h <<_ACEOF +#define SIZEOF_SIZE_T $ac_cv_sizeof_size_t +_ACEOF -echo "$as_me:$LINENO: checking for size_t" >&5 -echo $ECHO_N "checking for size_t... $ECHO_C" >&6 -if test "${ac_cv_type_size_t+set}" = set; then + +echo "$as_me:$LINENO: checking for char *" >&5 +echo $ECHO_N "checking for char *... $ECHO_C" >&6 +if test "${ac_cv_type_char_p+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -25985,9 +27765,9 @@ $db_includes int main () { -if ((size_t *) 0) +if ((char * *) 0) return 0; -if (sizeof (size_t)) +if (sizeof (char *)) return 0; ; return 0; @@ -25995,34 +27775,400 @@ if (sizeof (size_t)) _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { 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_cv_type_size_t=yes + ac_cv_type_char_p=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_type_size_t=no +ac_cv_type_char_p=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5 -echo "${ECHO_T}$ac_cv_type_size_t" >&6 -if test $ac_cv_type_size_t = yes; then - : +echo "$as_me:$LINENO: result: $ac_cv_type_char_p" >&5 +echo "${ECHO_T}$ac_cv_type_char_p" >&6 + +echo "$as_me:$LINENO: checking size of char *" >&5 +echo $ECHO_N "checking size of char *... $ECHO_C" >&6 +if test "${ac_cv_sizeof_char_p+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - { { echo "$as_me:$LINENO: error: No size_t type." >&5 -echo "$as_me: error: No size_t type." >&2;} + if test "$ac_cv_type_char_p" = yes; then + # The cast to unsigned long works around a bug in the HP C Compiler + # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects + # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. + # This bug is HP SR number 8606223364. + if test "$cross_compiling" = yes; then + # Depending upon the size, compute the lo and hi bounds. +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$db_includes + +int +main () +{ +static int test_array [1 - 2 * !(((long) (sizeof (char *))) >= 0)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { 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_lo=0 ac_mid=0 + while :; do + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$db_includes + +int +main () +{ +static int test_array [1 - 2 * !(((long) (sizeof (char *))) <= $ac_mid)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { 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_hi=$ac_mid; break +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_lo=`expr $ac_mid + 1` + if test $ac_lo -le $ac_mid; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid + 1` +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + done +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$db_includes + +int +main () +{ +static int test_array [1 - 2 * !(((long) (sizeof (char *))) < 0)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { 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_hi=-1 ac_mid=-1 + while :; do + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$db_includes + +int +main () +{ +static int test_array [1 - 2 * !(((long) (sizeof (char *))) >= $ac_mid)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { 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_lo=$ac_mid; break +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_hi=`expr '(' $ac_mid ')' - 1` + if test $ac_mid -le $ac_hi; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid` +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + done +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_lo= ac_hi= +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +# Binary search between lo and hi bounds. +while test "x$ac_lo" != "x$ac_hi"; do + ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$db_includes + +int +main () +{ +static int test_array [1 - 2 * !(((long) (sizeof (char *))) <= $ac_mid)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { 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_hi=$ac_mid +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_lo=`expr '(' $ac_mid ')' + 1` +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +done +case $ac_lo in +?*) ac_cv_sizeof_char_p=$ac_lo;; +'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (char *), 77 +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot compute sizeof (char *), 77 +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } ;; +esac +else + if test "$cross_compiling" = yes; then + { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot run test program while cross compiling +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$db_includes + +long longval () { return (long) (sizeof (char *)); } +unsigned long ulongval () { return (long) (sizeof (char *)); } +#include <stdio.h> +#include <stdlib.h> +int +main () +{ + + FILE *f = fopen ("conftest.val", "w"); + if (! f) + exit (1); + if (((long) (sizeof (char *))) < 0) + { + long i = longval (); + if (i != ((long) (sizeof (char *)))) + exit (1); + fprintf (f, "%ld\n", i); + } + else + { + unsigned long i = ulongval (); + if (i != ((long) (sizeof (char *)))) + exit (1); + fprintf (f, "%lu\n", i); + } + exit (ferror (f) || fclose (f) != 0); + + ; + 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 + ac_cv_sizeof_char_p=`cat conftest.val` +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +{ { echo "$as_me:$LINENO: error: cannot compute sizeof (char *), 77 +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot compute sizeof (char *), 77 +See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } fi +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi +fi +rm -f conftest.val +else + ac_cv_sizeof_char_p=0 +fi +fi +echo "$as_me:$LINENO: result: $ac_cv_sizeof_char_p" >&5 +echo "${ECHO_T}$ac_cv_sizeof_char_p" >&6 +cat >>confdefs.h <<_ACEOF +#define SIZEOF_CHAR_P $ac_cv_sizeof_char_p +_ACEOF + # We look for u_char, u_short, u_int, u_long -- if we can't find them, @@ -26034,7 +28180,6 @@ if test "${ac_cv_type_u_char+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -26055,11 +28200,21 @@ if (sizeof (u_char)) _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -26072,7 +28227,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_type_u_char=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_type_u_char" >&5 echo "${ECHO_T}$ac_cv_type_u_char" >&6 @@ -26090,7 +28245,6 @@ if test "${ac_cv_type_u_short+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -26111,11 +28265,21 @@ if (sizeof (u_short)) _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -26128,7 +28292,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_type_u_short=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_type_u_short" >&5 echo "${ECHO_T}$ac_cv_type_u_short" >&6 @@ -26146,7 +28310,6 @@ if test "${ac_cv_type_u_int+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -26167,11 +28330,21 @@ if (sizeof (u_int)) _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -26184,7 +28357,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_type_u_int=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_type_u_int" >&5 echo "${ECHO_T}$ac_cv_type_u_int" >&6 @@ -26202,7 +28375,6 @@ if test "${ac_cv_type_u_long+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -26223,11 +28395,21 @@ if (sizeof (u_long)) _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -26240,7 +28422,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_type_u_long=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_type_u_long" >&5 echo "${ECHO_T}$ac_cv_type_u_long" >&6 @@ -26251,6 +28433,7 @@ else fi +# We look for fixed-size variants of u_char, u_short, u_int, u_long as well. echo "$as_me:$LINENO: checking for u_int8_t" >&5 echo $ECHO_N "checking for u_int8_t... $ECHO_C" >&6 @@ -26258,7 +28441,6 @@ if test "${ac_cv_type_u_int8_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -26279,11 +28461,21 @@ if (sizeof (u_int8_t)) _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -26296,7 +28488,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_type_u_int8_t=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_type_u_int8_t" >&5 echo "${ECHO_T}$ac_cv_type_u_int8_t" >&6 @@ -26313,6 +28505,8 @@ else u_int8_decl="typedef unsigned short u_int8_t;";; "$ac_cv_sizeof_unsigned_long") u_int8_decl="typedef unsigned long u_int8_t;";; + "$ac_cv_sizeof_unsigned_long_long") + u_int8_decl="typedef unsigned long long u_int8_t;";; *) { { echo "$as_me:$LINENO: error: No unsigned 1-byte integral type" >&5 echo "$as_me: error: No unsigned 1-byte integral type" >&2;} @@ -26328,7 +28522,6 @@ if test "${ac_cv_type_u_int16_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -26349,11 +28542,21 @@ if (sizeof (u_int16_t)) _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -26366,7 +28569,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_type_u_int16_t=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_type_u_int16_t" >&5 echo "${ECHO_T}$ac_cv_type_u_int16_t" >&6 @@ -26383,6 +28586,8 @@ else u_int16_decl="typedef unsigned short u_int16_t;";; "$ac_cv_sizeof_unsigned_long") u_int16_decl="typedef unsigned long u_int16_t;";; + "$ac_cv_sizeof_unsigned_long_long") + u_int16_decl="typedef unsigned long long u_int16_t;";; *) { { echo "$as_me:$LINENO: error: No unsigned 2-byte integral type" >&5 echo "$as_me: error: No unsigned 2-byte integral type" >&2;} @@ -26398,7 +28603,6 @@ if test "${ac_cv_type_int16_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -26419,11 +28623,21 @@ if (sizeof (int16_t)) _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -26436,7 +28650,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_type_int16_t=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_type_int16_t" >&5 echo "${ECHO_T}$ac_cv_type_int16_t" >&6 @@ -26453,6 +28667,8 @@ else int16_decl="typedef short int16_t;";; "$ac_cv_sizeof_long") int16_decl="typedef long int16_t;";; + "$ac_cv_sizeof_long_long") + int16_decl="typedef long long int16_t;";; *) { { echo "$as_me:$LINENO: error: No signed 2-byte integral type" >&5 echo "$as_me: error: No signed 2-byte integral type" >&2;} @@ -26468,7 +28684,6 @@ if test "${ac_cv_type_u_int32_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -26489,11 +28704,21 @@ if (sizeof (u_int32_t)) _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -26506,7 +28731,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_type_u_int32_t=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_type_u_int32_t" >&5 echo "${ECHO_T}$ac_cv_type_u_int32_t" >&6 @@ -26523,6 +28748,8 @@ else u_int32_decl="typedef unsigned short u_int32_t;";; "$ac_cv_sizeof_unsigned_long") u_int32_decl="typedef unsigned long u_int32_t;";; + "$ac_cv_sizeof_unsigned_long_long") + u_int32_decl="typedef unsigned long long u_int32_t;";; *) { { echo "$as_me:$LINENO: error: No unsigned 4-byte integral type" >&5 echo "$as_me: error: No unsigned 4-byte integral type" >&2;} @@ -26538,7 +28765,6 @@ if test "${ac_cv_type_int32_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -26559,11 +28785,21 @@ if (sizeof (int32_t)) _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -26576,7 +28812,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_type_int32_t=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_type_int32_t" >&5 echo "${ECHO_T}$ac_cv_type_int32_t" >&6 @@ -26593,6 +28829,8 @@ else int32_decl="typedef short int32_t;";; "$ac_cv_sizeof_long") int32_decl="typedef long int32_t;";; + "$ac_cv_sizeof_long_long") + int32_decl="typedef long long int32_t;";; *) { { echo "$as_me:$LINENO: error: No signed 4-byte integral type" >&5 echo "$as_me: error: No signed 4-byte integral type" >&2;} @@ -26601,6 +28839,168 @@ echo "$as_me: error: No signed 4-byte integral type" >&2;} fi + +echo "$as_me:$LINENO: checking for u_int64_t" >&5 +echo $ECHO_N "checking for u_int64_t... $ECHO_C" >&6 +if test "${ac_cv_type_u_int64_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$db_includes + +int +main () +{ +if ((u_int64_t *) 0) + return 0; +if (sizeof (u_int64_t)) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { 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_cv_type_u_int64_t=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_type_u_int64_t=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ac_cv_type_u_int64_t" >&5 +echo "${ECHO_T}$ac_cv_type_u_int64_t" >&6 +if test $ac_cv_type_u_int64_t = yes; then + : +else + + case "8" in + "$ac_cv_sizeof_int") + u_int64_decl="typedef int u_int64_t;";; + "$ac_cv_sizeof_char") + u_int64_decl="typedef char u_int64_t;";; + "$ac_cv_sizeof_short") + u_int64_decl="typedef short u_int64_t;";; + "$ac_cv_sizeof_long") + u_int64_decl="typedef long u_int64_t;";; + "$ac_cv_sizeof_long_long") + u_int64_decl="typedef long long u_int64_t;";; + *) + { { echo "$as_me:$LINENO: error: No signed 8-byte integral type" >&5 +echo "$as_me: error: No signed 8-byte integral type" >&2;} + { (exit 1); exit 1; }; };; + esac +fi + + + +echo "$as_me:$LINENO: checking for int64_t" >&5 +echo $ECHO_N "checking for int64_t... $ECHO_C" >&6 +if test "${ac_cv_type_int64_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$db_includes + +int +main () +{ +if ((int64_t *) 0) + return 0; +if (sizeof (int64_t)) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { 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_cv_type_int64_t=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_type_int64_t=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ac_cv_type_int64_t" >&5 +echo "${ECHO_T}$ac_cv_type_int64_t" >&6 +if test $ac_cv_type_int64_t = yes; then + : +else + + case "8" in + "$ac_cv_sizeof_int") + int64_decl="typedef int int64_t;";; + "$ac_cv_sizeof_char") + int64_decl="typedef char int64_t;";; + "$ac_cv_sizeof_short") + int64_decl="typedef short int64_t;";; + "$ac_cv_sizeof_long") + int64_decl="typedef long int64_t;";; + "$ac_cv_sizeof_long_long") + int64_decl="typedef long long int64_t;";; + *) + { { echo "$as_me:$LINENO: error: No signed 8-byte integral type" >&5 +echo "$as_me: error: No signed 8-byte integral type" >&2;} + { (exit 1); exit 1; }; };; + esac +fi + + # Check for ssize_t -- if none exists, find a signed integral type that's # the same size as a size_t. @@ -26610,7 +29010,6 @@ if test "${ac_cv_type_ssize_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -26631,11 +29030,21 @@ if (sizeof (ssize_t)) _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -26648,7 +29057,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_type_ssize_t=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_type_ssize_t" >&5 echo "${ECHO_T}$ac_cv_type_ssize_t" >&6 @@ -26665,6 +29074,8 @@ else ssize_t_decl="typedef short ssize_t;";; "$ac_cv_sizeof_long") ssize_t_decl="typedef long ssize_t;";; + "$ac_cv_sizeof_long_long") + ssize_t_decl="typedef long long ssize_t;";; *) { { echo "$as_me:$LINENO: error: No signed $ac_cv_sizeof_size_t-byte integral type" >&5 echo "$as_me: error: No signed $ac_cv_sizeof_size_t-byte integral type" >&2;} @@ -26673,15 +29084,74 @@ echo "$as_me: error: No signed $ac_cv_sizeof_size_t-byte integral type" >&2;} fi -# Find the largest integral type. +# Check for uintmax_t -- if none exists, first the largest unsigned integral +# type available. -echo "$as_me:$LINENO: checking for unsigned long long" >&5 +echo "$as_me:$LINENO: checking for uintmax_t" >&5 +echo $ECHO_N "checking for uintmax_t... $ECHO_C" >&6 +if test "${ac_cv_type_uintmax_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +if ((uintmax_t *) 0) + return 0; +if (sizeof (uintmax_t)) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { 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_cv_type_uintmax_t=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_type_uintmax_t=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ac_cv_type_uintmax_t" >&5 +echo "${ECHO_T}$ac_cv_type_uintmax_t" >&6 +if test $ac_cv_type_uintmax_t = yes; then + : +else + echo "$as_me:$LINENO: checking for unsigned long long" >&5 echo $ECHO_N "checking for unsigned long long... $ECHO_C" >&6 if test "${ac_cv_type_unsigned_long_long+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -26702,11 +29172,21 @@ if (sizeof (unsigned long long)) _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -26719,34 +29199,100 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_type_unsigned_long_long=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_long_long" >&5 echo "${ECHO_T}$ac_cv_type_unsigned_long_long" >&6 if test $ac_cv_type_unsigned_long_long = yes; then - db_align_t_decl="typedef unsigned long long db_align_t;" + uintmax_t_decl="typedef unsigned long long uintmax_t;" else - db_align_t_decl="typedef unsigned long db_align_t;" + uintmax_t_decl="typedef unsigned long uintmax_t;" +fi + fi -# Find an integral type which is the same size as a pointer. +# Check for uintptr_t -- if none exists, find an integral type which is +# the same size as a pointer. + +echo "$as_me:$LINENO: checking for uintptr_t" >&5 +echo $ECHO_N "checking for uintptr_t... $ECHO_C" >&6 +if test "${ac_cv_type_uintptr_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +if ((uintptr_t *) 0) + return 0; +if (sizeof (uintptr_t)) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { 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_cv_type_uintptr_t=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 +ac_cv_type_uintptr_t=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ac_cv_type_uintptr_t" >&5 +echo "${ECHO_T}$ac_cv_type_uintptr_t" >&6 +if test $ac_cv_type_uintptr_t = yes; then + : +else case "$ac_cv_sizeof_char_p" in "$ac_cv_sizeof_unsigned_int") - db_alignp_t_decl="typedef unsigned int db_alignp_t;";; + uintptr_t_decl="typedef unsigned int uintptr_t;";; "$ac_cv_sizeof_unsigned_char") - db_alignp_t_decl="typedef unsigned char db_alignp_t;";; + uintptr_t_decl="typedef unsigned char uintptr_t;";; "$ac_cv_sizeof_unsigned_short") - db_alignp_t_decl="typedef unsigned short db_alignp_t;";; + uintptr_t_decl="typedef unsigned short uintptr_t;";; "$ac_cv_sizeof_unsigned_long") - db_alignp_t_decl="typedef unsigned long db_alignp_t;";; + uintptr_t_decl="typedef unsigned long uintptr_t;";; + "$ac_cv_sizeof_unsigned_long_long") + uintptr_t_decl="typedef unsigned long long uintptr_t;";; *) { { echo "$as_me:$LINENO: error: No unsigned $ac_cv_sizeof_char_p-byte integral type" >&5 echo "$as_me: error: No unsigned $ac_cv_sizeof_char_p-byte integral type" >&2;} { (exit 1); exit 1; }; };; esac +fi + echo "$as_me:$LINENO: checking for ANSI C exit success/failure values" >&5 @@ -26756,7 +29302,6 @@ if test "${db_cv_exit_defines+set}" = set; then else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -26773,11 +29318,21 @@ return (EXIT_SUCCESS); _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -26790,7 +29345,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 db_cv_exit_defines=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $db_cv_exit_defines" >&5 echo "${ECHO_T}$db_cv_exit_defines" >&6 @@ -26803,85 +29358,146 @@ _ACEOF fi -# Test for various functions/libraries that the test and example programs use: -# sched_yield function -# pthreads, socket and math libraries -echo "$as_me:$LINENO: checking for sched_yield" >&5 -echo $ECHO_N "checking for sched_yield... $ECHO_C" >&6 -if test "${ac_cv_func_sched_yield+set}" = set; then +# Test for various functions/libraries -- do tests that change library values +# first. +# +# The Berkeley DB library calls fdatasync, and it's only available in -lrt on +# Solaris. See if we can find it either without additional libraries or in +# -lrt. If fdatasync is found in -lrt, add -lrt to the Java and Tcl shared +# library link lines. +echo "$as_me:$LINENO: checking for library containing fdatasync" >&5 +echo $ECHO_N "checking for library containing fdatasync... $ECHO_C" >&6 +if test "${ac_cv_search_fdatasync+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" + ac_func_search_save_LIBS=$LIBS +ac_cv_search_fdatasync=no +cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char sched_yield (); below. - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since - <limits.h> exists even on freestanding compilers. */ -#ifdef __STDC__ -# include <limits.h> -#else -# include <assert.h> -#endif + /* 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 sched_yield (); -/* 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_sched_yield) || defined (__stub___sched_yield) -choke me -#else -char (*f) () = sched_yield; -#endif -#ifdef __cplusplus +char fdatasync (); +int +main () +{ +fdatasync (); + ; + return 0; } -#endif +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { 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_search_fdatasync="none required" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +if test "$ac_cv_search_fdatasync" = no; then + for ac_lib in rt; do + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Override any 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 fdatasync (); int main () { -return f != sched_yield; +fdatasync (); ; 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 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { 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_sched_yield=yes + ac_cv_search_fdatasync="-l$ac_lib" +break else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_func_sched_yield=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + done fi -echo "$as_me:$LINENO: result: $ac_cv_func_sched_yield" >&5 -echo "${ECHO_T}$ac_cv_func_sched_yield" >&6 -if test $ac_cv_func_sched_yield = yes; then - : -else - echo "$as_me:$LINENO: checking for library containing sched_yield" >&5 +LIBS=$ac_func_search_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_search_fdatasync" >&5 +echo "${ECHO_T}$ac_cv_search_fdatasync" >&6 +if test "$ac_cv_search_fdatasync" != no; then + test "$ac_cv_search_fdatasync" = "none required" || LIBS="$ac_cv_search_fdatasync $LIBS" + if test "$ac_cv_search_fdatasync" != "none required" ; then + LIBJSO_LIBS="$LIBJSO_LIBS -lrt"; + LIBTSO_LIBS="$LIBTSO_LIBS -lrt"; + fi +fi + + +# The test and example programs use the sched_yield function, taken from -lrt +# on Solaris. +echo "$as_me:$LINENO: checking for library containing sched_yield" >&5 echo $ECHO_N "checking for library containing sched_yield... $ECHO_C" >&6 if test "${ac_cv_search_sched_yield+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -26889,7 +29505,6 @@ else ac_func_search_save_LIBS=$LIBS ac_cv_search_sched_yield=no cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -26913,11 +29528,21 @@ sched_yield (); _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -26929,12 +29554,12 @@ else sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext if test "$ac_cv_search_sched_yield" = no; then for ac_lib in rt; do LIBS="-l$ac_lib $ac_func_search_save_LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -26958,11 +29583,21 @@ sched_yield (); _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -26975,7 +29610,8 @@ else sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext done fi LIBS=$ac_func_search_save_LIBS @@ -26984,19 +29620,18 @@ echo "$as_me:$LINENO: result: $ac_cv_search_sched_yield" >&5 echo "${ECHO_T}$ac_cv_search_sched_yield" >&6 if test "$ac_cv_search_sched_yield" != no; then test "$ac_cv_search_sched_yield" = "none required" || LIBS="$ac_cv_search_sched_yield $LIBS" - LOAD_LIBS="$LOAD_LIBS -lrt" -fi fi -# XXX +# !!! # We can't check for pthreads in the same way we did the test for sched_yield # because the Solaris C library includes pthread interfaces which are not -# thread-safe. For that reason we always add -lpthread if we find a pthread -# library. Also we can't depend on any specific call existing (pthread_create, -# for example), as it may be #defined in an include file -- OSF/1 (Tru64) has -# this problem. +# inter-process safe. For that reason we always add -lpthread if we find a +# pthread library. +# +# We can't depend on any specific call existing (pthread_create, for example), +# as it may be #defined in an include file -- OSF/1 (Tru64) has this problem. echo "$as_me:$LINENO: checking for main in -lpthread" >&5 echo $ECHO_N "checking for main in -lpthread... $ECHO_C" >&6 if test "${ac_cv_lib_pthread_main+set}" = set; then @@ -27005,7 +29640,6 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lpthread $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -27023,11 +29657,21 @@ main (); _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -27040,20 +29684,21 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_pthread_main=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f 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_pthread_main" >&5 echo "${ECHO_T}$ac_cv_lib_pthread_main" >&6 if test $ac_cv_lib_pthread_main = yes; then - LOAD_LIBS="$LOAD_LIBS -lpthread" + TEST_LIBS="$TEST_LIBS -lpthread" fi ac_cv_lib_pthread=ac_cv_lib_pthread_main -# XXX -# We could be more exact about whether these libraries are needed, but we don't -# bother -- if they exist, we load them. +# !!! +# We could be more exact about whether these libraries are needed, but don't +# bother -- if they exist, we load them, it's only the test programs anyway. echo "$as_me:$LINENO: checking for main in -lm" >&5 echo $ECHO_N "checking for main in -lm... $ECHO_C" >&6 if test "${ac_cv_lib_m_main+set}" = set; then @@ -27062,7 +29707,6 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lm $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -27080,11 +29724,21 @@ main (); _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -27097,13 +29751,14 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_m_main=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f 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_m_main" >&5 echo "${ECHO_T}$ac_cv_lib_m_main" >&6 if test $ac_cv_lib_m_main = yes; then - LOAD_LIBS="$LOAD_LIBS -lm" + TEST_LIBS="$TEST_LIBS -lm" fi ac_cv_lib_m=ac_cv_lib_m_main @@ -27115,7 +29770,6 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lsocket $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -27133,11 +29787,21 @@ main (); _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -27150,13 +29814,14 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_socket_main=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f 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_socket_main" >&5 echo "${ECHO_T}$ac_cv_lib_socket_main" >&6 if test $ac_cv_lib_socket_main = yes; then - LOAD_LIBS="$LOAD_LIBS -lsocket" + TEST_LIBS="$TEST_LIBS -lsocket" fi ac_cv_lib_socket=ac_cv_lib_socket_main @@ -27168,7 +29833,6 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lnsl $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -27186,11 +29850,21 @@ main (); _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -27203,13 +29877,14 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_nsl_main=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f 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_nsl_main" >&5 echo "${ECHO_T}$ac_cv_lib_nsl_main" >&6 if test $ac_cv_lib_nsl_main = yes; then - LOAD_LIBS="$LOAD_LIBS -lnsl" + TEST_LIBS="$TEST_LIBS -lnsl" fi ac_cv_lib_nsl=ac_cv_lib_nsl_main @@ -27241,37 +29916,27 @@ orig_libs=$LIBS # is already using one type of mutex and doesn't want to mix-and-match (for # example, on Solaris, which has POSIX, UI and LWP mutexes). Second, the # applications POSIX pthreads mutexes don't support inter-process locking, -# but the application wants to use them anyway (for example, current Linux -# and *BSD systems). -# -# If we're on Solaris, we insist that -lthread or -lpthread be used. The -# problem is the Solaris C library has UI/POSIX interface stubs, but they're -# broken, configuring them for inter-process mutexes doesn't return an error, -# but it doesn't work either. Otherwise, we try first without the library -# and then with it: there's some information that SCO/UnixWare/OpenUNIX needs -# this. [#4950] +# but the application wants to use them anyway (for example, some Linux and +# *BSD systems). # # Test for LWP threads before testing for UI/POSIX threads, we prefer them # on Solaris. There's a bug in SunOS 5.7 where applications get pwrite, not # pwrite64, if they load the C library before the appropriate threads library, # e.g., tclsh using dlopen to load the DB library. By using LWP threads we # avoid answering lots of user questions, not to mention the bugs. +# +# Otherwise, test for POSIX threads before UI threads. There are Linux systems +# that support a UI compatibility mode, and applications are more likely to be +# written for POSIX threads than UI threads. +# +# Try and link with a threads library if possible. The problem is the Solaris +# C library has UI/POSIX interface stubs, but they're broken, configuring them +# for inter-process mutexes doesn't return an error, but it doesn't work either. if test "$db_cv_posixmutexes" = yes; then - case "$host_os" in - solaris*) - db_cv_mutex="posix_library_only";; - *) - db_cv_mutex="posix_only";; - esac + db_cv_mutex="posix_only"; fi - if test "$db_cv_uimutexes" = yes; then - case "$host_os" in - solaris*) - db_cv_mutex="ui_library_only";; - *) - db_cv_mutex="ui_only";; - esac + db_cv_mutex="ui_only"; fi # User-specified Win32 mutexes (MinGW build) @@ -27282,7 +29947,6 @@ fi # LWP threads: _lwp_XXX if test "$db_cv_mutex" = no; then cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -27308,11 +29972,21 @@ main () _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -27324,35 +29998,47 @@ else sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi -# UI threads: thr_XXX +# POSIX.1 pthreads: pthread_XXX # -# Try with and without the -lthread library. -if test "$db_cv_mutex" = no -o "$db_cv_mutex" = "ui_only"; then -cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +# If the user specified we use POSIX pthreads mutexes, and we fail to find the +# full interface, try and configure for just intra-process support. +if test "$db_cv_mutex" = no -o "$db_cv_mutex" = "posix_only"; then + LIBS="$LIBS -lpthread" + +if test "$cross_compiling" = yes; then + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include <thread.h> -#include <synch.h> +#include <pthread.h> int main () { - mutex_t mutex; - cond_t cond; - int type = USYNC_PROCESS; + pthread_cond_t cond; + pthread_mutex_t mutex; + pthread_condattr_t condattr; + pthread_mutexattr_t mutexattr; exit ( - mutex_init(&mutex, type, NULL) || - cond_init(&cond, type, NULL) || - mutex_lock(&mutex) || - mutex_unlock(&mutex)); + pthread_condattr_init(&condattr) || + pthread_condattr_setpshared(&condattr, PTHREAD_PROCESS_SHARED) || + pthread_mutexattr_init(&mutexattr) || + pthread_mutexattr_setpshared(&mutexattr, PTHREAD_PROCESS_SHARED) || + pthread_cond_init(&cond, &condattr) || + pthread_mutex_init(&mutex, &mutexattr) || + pthread_mutex_lock(&mutex) || + pthread_mutex_unlock(&mutex) || + pthread_mutex_destroy(&mutex) || + pthread_cond_destroy(&cond) || + pthread_condattr_destroy(&condattr) || + pthread_mutexattr_destroy(&mutexattr)); ; return 0; @@ -27360,93 +30046,89 @@ main () _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { 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 - db_cv_mutex="UI/threads" + db_cv_mutex=""POSIX/pthreads/library"" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -fi -if test "$db_cv_mutex" = no -o \ - "$db_cv_mutex" = "ui_only" -o "$db_cv_mutex" = "ui_library_only"; then -LIBS="$LIBS -lthread" -cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +else + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include <thread.h> -#include <synch.h> -int -main () -{ - - mutex_t mutex; - cond_t cond; - int type = USYNC_PROCESS; +#include <pthread.h> +main() { + pthread_cond_t cond; + pthread_mutex_t mutex; + pthread_condattr_t condattr; + pthread_mutexattr_t mutexattr; exit ( - mutex_init(&mutex, type, NULL) || - cond_init(&cond, type, NULL) || - mutex_lock(&mutex) || - mutex_unlock(&mutex)); - - ; - return 0; + pthread_condattr_init(&condattr) || + pthread_condattr_setpshared(&condattr, PTHREAD_PROCESS_SHARED) || + pthread_mutexattr_init(&mutexattr) || + pthread_mutexattr_setpshared(&mutexattr, PTHREAD_PROCESS_SHARED) || + pthread_cond_init(&cond, &condattr) || + pthread_mutex_init(&mutex, &mutexattr) || + pthread_mutex_lock(&mutex) || + pthread_mutex_unlock(&mutex) || + pthread_mutex_destroy(&mutex) || + pthread_cond_destroy(&cond) || + pthread_condattr_destroy(&condattr) || + pthread_mutexattr_destroy(&mutexattr)); } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext +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='test -s conftest$ac_exeext' + (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 - db_cv_mutex="UI/threads/library" + db_cv_mutex=""POSIX/pthreads/library"" else - echo "$as_me: failed program was:" >&5 + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS="$orig_libs" +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi -if test "$db_cv_mutex" = "ui_only" -o "$db_cv_mutex" = "ui_library_only"; then - { { echo "$as_me:$LINENO: error: unable to find UI mutex interfaces" >&5 -echo "$as_me: error: unable to find UI mutex interfaces" >&2;} - { (exit 1); exit 1; }; } + LIBS="$orig_libs" fi - -# POSIX.1 pthreads: pthread_XXX -# -# Try with and without the -lpthread library. If the user specified we use -# POSIX pthreads mutexes, and we fail to find the full interface, try and -# configure for just intra-process support. if test "$db_cv_mutex" = no -o "$db_cv_mutex" = "posix_only"; then if test "$cross_compiling" = yes; then - db_cv_mutex="no" -else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -27454,7 +30136,10 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <pthread.h> -main() { +int +main () +{ + pthread_cond_t cond; pthread_mutex_t mutex; pthread_condattr_t condattr; @@ -27472,14 +30157,28 @@ main() { pthread_cond_destroy(&cond) || pthread_condattr_destroy(&condattr) || pthread_mutexattr_destroy(&mutexattr)); + + ; + return 0; } _ACEOF -rm -f conftest$ac_exeext +rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -27487,23 +30186,14 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (exit $ac_status); }; }; then db_cv_mutex=""POSIX/pthreads"" else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi -fi -if test "$db_cv_mutex" = no -o \ - "$db_cv_mutex" = "posix_only" -o "$db_cv_mutex" = "posix_library_only"; then - LIBS="$LIBS -lpthread" - -if test "$cross_compiling" = yes; then - db_cv_mutex="no" +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -27542,22 +30232,20 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - db_cv_mutex=""POSIX/pthreads/library"" + db_cv_mutex=""POSIX/pthreads"" else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi - LIBS="$orig_libs" fi if test "$db_cv_mutex" = "posix_only"; then if test "$cross_compiling" = yes; then cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -27591,11 +30279,21 @@ main () _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -27607,10 +30305,10 @@ else sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -27654,16 +30352,14 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -if test "$db_cv_mutex" = "posix_only" -o \ - "$db_cv_mutex" = "posix_library_only"; then +if test "$db_cv_mutex" = "posix_only"; then LIBS="$LIBS -lpthread" if test "$cross_compiling" = yes; then cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -27697,11 +30393,21 @@ main () _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -27713,10 +30419,10 @@ else sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -27760,23 +30466,145 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi LIBS="$orig_libs" fi - -if test "$db_cv_mutex" = "posix_only" -o \ - "$db_cv_mutex" = "posix_library_only"; then +if test "$db_cv_mutex" = "posix_only"; then { { echo "$as_me:$LINENO: error: unable to find POSIX 1003.1 mutex interfaces" >&5 echo "$as_me: error: unable to find POSIX 1003.1 mutex interfaces" >&2;} { (exit 1); exit 1; }; } fi +# UI threads: thr_XXX +if test "$db_cv_mutex" = no -o "$db_cv_mutex" = "ui_only"; then +LIBS="$LIBS -lthread" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#include <thread.h> +#include <synch.h> +int +main () +{ + + mutex_t mutex; + cond_t cond; + int type = USYNC_PROCESS; + exit ( + mutex_init(&mutex, type, NULL) || + cond_init(&cond, type, NULL) || + mutex_lock(&mutex) || + mutex_unlock(&mutex)); + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { 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 + db_cv_mutex="UI/threads/library" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS="$orig_libs" +fi +if test "$db_cv_mutex" = no -o "$db_cv_mutex" = "ui_only"; then +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#include <thread.h> +#include <synch.h> +int +main () +{ + + mutex_t mutex; + cond_t cond; + int type = USYNC_PROCESS; + exit ( + mutex_init(&mutex, type, NULL) || + cond_init(&cond, type, NULL) || + mutex_lock(&mutex) || + mutex_unlock(&mutex)); + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { 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 + db_cv_mutex="UI/threads" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +if test "$db_cv_mutex" = "ui_only"; then + { { echo "$as_me:$LINENO: error: unable to find UI mutex interfaces" >&5 +echo "$as_me: error: unable to find UI mutex interfaces" >&2;} + { (exit 1); exit 1; }; } +fi + # msemaphore: HPPA only # Try HPPA before general msem test, it needs special alignment. if test "$db_cv_mutex" = no; then cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -27805,11 +30633,21 @@ main () _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -27821,13 +30659,13 @@ else sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi # msemaphore: AIX, OSF/1 if test "$db_cv_mutex" = no; then cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -27853,11 +30691,21 @@ main () _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -27869,14 +30717,14 @@ else sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi # ReliantUNIX if test "$db_cv_mutex" = no; then LIBS="$LIBS -lmproc" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -27900,11 +30748,21 @@ main () _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -27916,14 +30774,14 @@ else sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS="$orig_libs" fi # SCO: UnixWare has threads in libthread, but OpenServer doesn't. if test "$db_cv_mutex" = no; then cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -27946,11 +30804,21 @@ main () _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -27962,13 +30830,12 @@ else sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi # abilock_t: SGI if test "$db_cv_mutex" = no; then cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -27992,11 +30859,21 @@ main () _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -28008,7 +30885,8 @@ else sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi # sema_t: Solaris @@ -28017,7 +30895,6 @@ fi # POSIX.1 interfaces. (I plan to move directly to pthreads on Solaris.) if test "$db_cv_mutex" = DOESNT_WORK; then cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -28041,11 +30918,21 @@ main () _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -28057,7 +30944,8 @@ else sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi # _lock_try/_lock_clear: Solaris @@ -28067,7 +30955,6 @@ fi # problems in those interfaces in some releases of the Solaris C library. if test "$db_cv_mutex" = no; then cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -28090,11 +30977,21 @@ main () _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -28106,13 +31003,13 @@ else sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi # _check_lock/_clear_lock: AIX if test "$db_cv_mutex" = no; then cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -28134,11 +31031,21 @@ main () _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -28150,13 +31057,13 @@ else sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi # _spin_lock_try/_spin_unlock: Apple/Darwin if test "$db_cv_mutex" = no; then cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -28177,11 +31084,21 @@ main () _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -28193,13 +31110,13 @@ else sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi # Tru64/cc if test "$db_cv_mutex" = no; then cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -28222,11 +31139,21 @@ main () _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -28238,13 +31165,12 @@ else sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi # Alpha/gcc if test "$db_cv_mutex" = no; then cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -28267,11 +31193,21 @@ main () _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -28283,13 +31219,12 @@ else sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi # ARM/gcc: Linux if test "$db_cv_mutex" = no; then cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -28312,11 +31247,21 @@ main () _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -28328,13 +31273,12 @@ else sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi # PaRisc/gcc: HP/UX if test "$db_cv_mutex" = no; then cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -28357,11 +31301,21 @@ main () _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -28373,13 +31327,12 @@ else sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi # PPC/gcc: if test "$db_cv_mutex" = no; then cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -28402,11 +31355,21 @@ main () _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -28418,13 +31381,12 @@ else sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi # Sparc/gcc: SunOS, Solaris if test "$db_cv_mutex" = no; then cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -28447,11 +31409,21 @@ main () _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -28463,13 +31435,12 @@ else sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi # 68K/gcc: SunOS if test "$db_cv_mutex" = no; then cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -28492,11 +31463,21 @@ main () _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -28508,13 +31489,12 @@ else sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi # x86/gcc: FreeBSD, NetBSD, BSD/OS, Linux if test "$db_cv_mutex" = no; then cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -28525,7 +31505,7 @@ int main () { -#if (defined(i386) || defined(__i386__)) && defined(__GNUC__) +#if (defined(i386) || defined(__i386__) || defined(__x86_64__)) && defined(__GNUC__) exit(0); #else FAIL TO COMPILE/LINK @@ -28537,11 +31517,21 @@ main () _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -28553,13 +31543,12 @@ else sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi # S390/cc: IBM OS/390 Unix if test "$db_cv_mutex" = no; then cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -28582,11 +31571,21 @@ main () _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -28598,13 +31597,12 @@ else sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi # S390/gcc: Linux if test "$db_cv_mutex" = no; then cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -28627,11 +31625,21 @@ main () _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -28643,13 +31651,12 @@ else sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi # ia86/gcc: Linux if test "$db_cv_mutex" = no; then cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -28672,11 +31679,21 @@ main () _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -28688,13 +31705,12 @@ else sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi # uts/cc: UTS if test "$db_cv_mutex" = no; then cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -28717,11 +31733,21 @@ main () _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -28733,7 +31759,7 @@ else sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi # default to UNIX fcntl system call mutexes. @@ -28823,6 +31849,8 @@ _ACEOF ;; POSIX/pthreads/library) LIBS="$LIBS -lpthread" + LIBJSO_LIBS="$LIBJSO_LIBS -lpthread" + LIBTSO_LIBS="$LIBTSO_LIBS -lpthread" ADDITIONAL_OBJS="mut_pthread${o} $ADDITIONAL_OBJS" cat >>confdefs.h <<\_ACEOF #define HAVE_MUTEX_PTHREADS 1 @@ -28832,6 +31860,8 @@ _ACEOF ;; POSIX/pthreads/library/private) LIBS="$LIBS -lpthread" + LIBJSO_LIBS="$LIBJSO_LIBS -lpthread" + LIBTSO_LIBS="$LIBTSO_LIBS -lpthread" ADDITIONAL_OBJS="mut_pthread${o} $ADDITIONAL_OBJS" cat >>confdefs.h <<\_ACEOF #define HAVE_MUTEX_PTHREADS 1 @@ -29047,21 +32077,28 @@ if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define $ac_func innocuous_$ac_func + /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. Prefer <limits.h> to <assert.h> if __STDC__ is defined, since <limits.h> exists even on freestanding compilers. */ + #ifdef __STDC__ # include <limits.h> #else # include <assert.h> #endif + +#undef $ac_func + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" @@ -29092,11 +32129,21 @@ return f != $ac_func; _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -29109,7 +32156,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 eval "$as_ac_var=no" fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 @@ -29119,7 +32167,14 @@ if test `eval echo '${'$as_ac_var'}'` = yes; then _ACEOF else - LIBOBJS="$LIBOBJS $ac_func.$ac_objext" + case $LIBOBJS in + "$ac_func.$ac_objext" | \ + *" $ac_func.$ac_objext" | \ + "$ac_func.$ac_objext "* | \ + *" $ac_func.$ac_objext "* ) ;; + *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext" ;; +esac + fi done @@ -29127,9 +32182,7 @@ done - - -for ac_func in snprintf strcasecmp strdup strerror vsnprintf +for ac_func in strcasecmp strdup strerror do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` echo "$as_me:$LINENO: checking for $ac_func" >&5 @@ -29138,21 +32191,28 @@ if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define $ac_func innocuous_$ac_func + /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. Prefer <limits.h> to <assert.h> if __STDC__ is defined, since <limits.h> exists even on freestanding compilers. */ + #ifdef __STDC__ # include <limits.h> #else # include <assert.h> #endif + +#undef $ac_func + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" @@ -29183,11 +32243,21 @@ return f != $ac_func; _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -29200,7 +32270,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 eval "$as_ac_var=no" fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 @@ -29210,7 +32281,14 @@ if test `eval echo '${'$as_ac_var'}'` = yes; then _ACEOF else - LIBOBJS="$LIBOBJS $ac_func.$ac_objext" + case $LIBOBJS in + "$ac_func.$ac_objext" | \ + *" $ac_func.$ac_objext" | \ + "$ac_func.$ac_objext "* | \ + *" $ac_func.$ac_objext "* ) ;; + *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext" ;; +esac + fi done @@ -29223,7 +32301,7 @@ done -for ac_func in _fstati64 clock_gettime directio getrusage gettimeofday getuid +for ac_func in _fstati64 clock_gettime directio fdatasync ftruncate getrusage do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` echo "$as_me:$LINENO: checking for $ac_func" >&5 @@ -29232,21 +32310,28 @@ if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define $ac_func innocuous_$ac_func + /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. Prefer <limits.h> to <assert.h> if __STDC__ is defined, since <limits.h> exists even on freestanding compilers. */ + #ifdef __STDC__ # include <limits.h> #else # include <assert.h> #endif + +#undef $ac_func + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" @@ -29277,11 +32362,127 @@ return f != $ac_func; _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { 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 + eval "$as_ac_var=yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +eval "$as_ac_var=no" +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + +fi +done + + + + + + +for ac_func in gettimeofday getuid pstat_getdynamic rand sched_yield +do +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 +if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define $ac_func innocuous_$ac_func + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + +#undef $ac_func + +/* Override any 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 $ac_func (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +choke me +#else +char (*f) () = $ac_func; +#endif +#ifdef __cplusplus +} +#endif + +int +main () +{ +return f != $ac_func; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -29294,7 +32495,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 eval "$as_ac_var=no" fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 @@ -29312,7 +32514,8 @@ done -for ac_func in pstat_getdynamic sched_yield select strtoul sysconf yield + +for ac_func in select snprintf srand strtoul sysconf vsnprintf yield do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` echo "$as_me:$LINENO: checking for $ac_func" >&5 @@ -29321,21 +32524,28 @@ if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define $ac_func innocuous_$ac_func + /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. Prefer <limits.h> to <assert.h> if __STDC__ is defined, since <limits.h> exists even on freestanding compilers. */ + #ifdef __STDC__ # include <limits.h> #else # include <assert.h> #endif + +#undef $ac_func + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" @@ -29366,11 +32576,21 @@ return f != $ac_func; _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -29383,7 +32603,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 eval "$as_ac_var=no" fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 @@ -29415,21 +32636,28 @@ if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define $ac_func innocuous_$ac_func + /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. Prefer <limits.h> to <assert.h> if __STDC__ is defined, since <limits.h> exists even on freestanding compilers. */ + #ifdef __STDC__ # include <limits.h> #else # include <assert.h> #endif + +#undef $ac_func + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" @@ -29460,11 +32688,21 @@ return f != $ac_func; _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -29477,7 +32715,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 eval "$as_ac_var=no" fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 @@ -29499,7 +32738,6 @@ if test "${db_cv_fcntl_f_setfd+set}" = set; then else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -29520,11 +32758,21 @@ main () _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -29537,7 +32785,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 db_cv_fcntl_f_setfd=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $db_cv_fcntl_f_setfd" >&5 echo "${ECHO_T}$db_cv_fcntl_f_setfd" >&6 @@ -29552,33 +32801,40 @@ fi # A/UX has a broken getopt(3). case "$host_os" in -aux*) LIBOBJS="$LIBOBJS getopt.$ac_objext";; +aux*) case $LIBOBJS in + "getopt.$ac_objext" | \ + *" getopt.$ac_objext" | \ + "getopt.$ac_objext "* | \ + *" getopt.$ac_objext "* ) ;; + *) LIBOBJS="$LIBOBJS getopt.$ac_objext" ;; +esac +;; esac -# Linux has a broken O_DIRECT flag, but we allow people to override it from -# the command line. -test_host_prw=yes -echo "$as_me:$LINENO: checking for open/O_DIRECT" >&5 +# Linux has a broken O_DIRECT flag, but you can't detect it at configure time. +# Linux and SGI require buffer alignment we may not match, otherwise writes +# will fail. Default to not using the O_DIRECT flag. +if test "$db_cv_o_direct" = "yes"; then + echo "$as_me:$LINENO: checking for open/O_DIRECT" >&5 echo $ECHO_N "checking for open/O_DIRECT... $ECHO_C" >&6 if test "${db_cv_open_o_direct+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include <sys/types.h> -#include <fcntl.h> + #include <sys/types.h> + #include <fcntl.h> int main () { - open("a", O_RDONLY | O_DIRECT, 0); + open("a", O_RDONLY | O_DIRECT, 0); ; return 0; @@ -29586,42 +32842,47 @@ main () _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { 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 - db_cv_open_o_direct=yes; test_host_prw=no + db_cv_open_o_direct=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 db_cv_open_o_direct=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $db_cv_open_o_direct" >&5 echo "${ECHO_T}$db_cv_open_o_direct" >&6 -if test "$test_host_prw" = "no" -a "$db_cv_open_o_direct" = "yes"; then - case "$host_os" in - linux*) - db_cv_open_o_direct=no; - { echo "$as_me:$LINENO: WARNING: O_DIRECT interface ignored on $host_os-$host_vendor." >&5 -echo "$as_me: WARNING: O_DIRECT interface ignored on $host_os-$host_vendor." >&2;};; - esac -fi -if test "$db_cv_open_o_direct" = "yes"; then - cat >>confdefs.h <<\_ACEOF + if test \ + "$db_cv_o_direct" = "yes" -a "$db_cv_open_o_direct" = "yes"; then + cat >>confdefs.h <<\_ACEOF #define HAVE_O_DIRECT 1 _ACEOF + fi fi # Check for largefile support. @@ -29643,8 +32904,7 @@ else while :; do # IRIX 6.2 and later do not support large files by default, # so use the C compiler's -n32 option if that helps. - cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -29669,11 +32929,21 @@ main () _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -29685,15 +32955,25 @@ else sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext +rm -f conftest.err conftest.$ac_objext CC="$CC -n32" rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -29705,8 +32985,8 @@ else sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext - break +rm -f conftest.err conftest.$ac_objext + break done CC=$ac_save_CC rm -f conftest.$ac_ext @@ -29726,7 +33006,6 @@ else while :; do ac_cv_sys_file_offset_bits=no cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -29751,11 +33030,21 @@ main () _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -29767,9 +33056,8 @@ else sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -29795,11 +33083,21 @@ main () _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -29811,7 +33109,7 @@ else sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext break done fi @@ -29833,7 +33131,6 @@ else while :; do ac_cv_sys_large_files=no cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -29858,11 +33155,21 @@ main () _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -29874,9 +33181,8 @@ else sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -29902,11 +33208,21 @@ main () _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -29918,7 +33234,7 @@ else sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext break done fi @@ -29963,21 +33279,28 @@ if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define $ac_func innocuous_$ac_func + /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. Prefer <limits.h> to <assert.h> if __STDC__ is defined, since <limits.h> exists even on freestanding compilers. */ + #ifdef __STDC__ # include <limits.h> #else # include <assert.h> #endif + +#undef $ac_func + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" @@ -30008,11 +33331,21 @@ return f != $ac_func; _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -30025,7 +33358,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 eval "$as_ac_var=no" fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 @@ -30055,21 +33389,28 @@ if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define $ac_func innocuous_$ac_func + /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. Prefer <limits.h> to <assert.h> if __STDC__ is defined, since <limits.h> exists even on freestanding compilers. */ + #ifdef __STDC__ # include <limits.h> #else # include <assert.h> #endif + +#undef $ac_func + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" @@ -30100,11 +33441,21 @@ return f != $ac_func; _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -30117,7 +33468,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 eval "$as_ac_var=no" fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 @@ -30140,21 +33492,28 @@ if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define $ac_func innocuous_$ac_func + /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. Prefer <limits.h> to <assert.h> if __STDC__ is defined, since <limits.h> exists even on freestanding compilers. */ + #ifdef __STDC__ # include <limits.h> #else # include <assert.h> #endif + +#undef $ac_func + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" @@ -30185,11 +33544,21 @@ return f != $ac_func; _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -30202,7 +33571,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 eval "$as_ac_var=no" fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 @@ -30239,21 +33609,28 @@ if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define $ac_func innocuous_$ac_func + /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. Prefer <limits.h> to <assert.h> if __STDC__ is defined, since <limits.h> exists even on freestanding compilers. */ + #ifdef __STDC__ # include <limits.h> #else # include <assert.h> #endif + +#undef $ac_func + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" @@ -30284,11 +33661,21 @@ return f != $ac_func; _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -30301,7 +33688,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 eval "$as_ac_var=no" fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 @@ -30323,6 +33711,784 @@ if test "$mmap_ok" = "no" -a "$shmget_ok" = "no"; then echo "$as_me: WARNING: Neither mmap/munmap(2) or shmget(2) library functions." >&2;} fi +# Optional RPC client/server. +if test "$db_cv_rpc" = "yes"; then + + cat >>confdefs.h <<\_ACEOF +#define HAVE_RPC 1 +_ACEOF + + + + + # We use the target's rpcgen utility because it may be architecture + # specific, for example, 32- or 64-bit specific. + XDR_FILE=$srcdir/../rpc_server/db_server.x + + # Prefer the -C option to rpcgen which generates ANSI C-conformant + # code. + RPCGEN="rpcgen -C" + echo "$as_me:$LINENO: checking \"$RPCGEN\" build of db_server.h" >&5 +echo $ECHO_N "checking \"$RPCGEN\" build of db_server.h... $ECHO_C" >&6 + $RPCGEN -h $XDR_FILE > db_server.h 2>/dev/null + if test $? -ne 0; then + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + + # Try rpcgen without the -C option. + RPCGEN="rpcgen" + echo "$as_me:$LINENO: checking \"$RPCGEN\" build of db_server.h" >&5 +echo $ECHO_N "checking \"$RPCGEN\" build of db_server.h... $ECHO_C" >&6 + $RPCGEN -h $XDR_FILE > db_server.h 2>/dev/null + if test $? -ne 0; then + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + { { echo "$as_me:$LINENO: error: Unable to build RPC support: $RPCGEN failed." >&5 +echo "$as_me: error: Unable to build RPC support: $RPCGEN failed." >&2;} + { (exit 1); exit 1; }; } + fi + fi + + # Some rpcgen programs generate a set of client stubs called something + # like __db_env_create_4003 and functions on the server to handle the + # request called something like __db_env_create_4003_svc. Others + # expect client and server stubs to both be called __db_env_create_4003. + # + # We have to generate code in whichever format rpcgen expects, and the + # only reliable way to do that is to check what is in the db_server.h + # file we just created. + if grep "env_create_[0-9]*_svc" db_server.h >/dev/null 2>&1 ; then + sed 's/__SVCSUFFIX__/_svc/' \ + < $srcdir/../rpc_server/c/gen_db_server.c > gen_db_server.c + else + sed 's/__SVCSUFFIX__//' \ + < $srcdir/../rpc_server/c/gen_db_server.c > gen_db_server.c + fi + + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + + $RPCGEN -l $XDR_FILE | + sed -e 's/^#include.*db_server.h.*/#include "db_server.h"/' \ + -e '1,/^#include/s/^#include/#include "db_config.h"\ +&/' > db_server_clnt.c + + $RPCGEN -s tcp $XDR_FILE | + sed -e 's/^#include.*db_server.h.*/#include "db_server.h"/' \ + -e 's/^main *()/__dbsrv_main()/' \ + -e 's/^main *(.*argc.*argv.*)/__dbsrv_main(int argc, char *argv)/' \ + -e '/^db_rpc_serverprog/,/^}/{' \ + -e 's/return;//' \ + -e 's/^}/__dbsrv_timeout(0);}/' \ + -e '}' \ + -e '1,/^#include/s/^#include/#include "db_config.h"\ +&/' > db_server_svc.c + + $RPCGEN -c $XDR_FILE | + sed -e 's/^#include.*db_server.h.*/#include "db_server.h"/' \ + -e '1,/^#include/s/^#include/#include "db_config.h"\ +&/' > db_server_xdr.c + + RPC_SERVER_H=db_server.h + RPC_CLIENT_OBJS="\$(RPC_CLIENT_OBJS)" + ADDITIONAL_PROGS="berkeley_db_svc $ADDITIONAL_PROGS" + + case "$host_os" in + hpux*) + echo "$as_me:$LINENO: checking for svc_run" >&5 +echo $ECHO_N "checking for svc_run... $ECHO_C" >&6 +if test "${ac_cv_func_svc_run+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define svc_run to an innocuous variant, in case <limits.h> declares svc_run. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define svc_run innocuous_svc_run + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char svc_run (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + +#undef svc_run + +/* 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 svc_run (); +/* 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_svc_run) || defined (__stub___svc_run) +choke me +#else +char (*f) () = svc_run; +#endif +#ifdef __cplusplus +} +#endif + +int +main () +{ +return f != svc_run; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { 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_svc_run=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_func_svc_run=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ac_cv_func_svc_run" >&5 +echo "${ECHO_T}$ac_cv_func_svc_run" >&6 +if test $ac_cv_func_svc_run = yes; then + : +else + echo "$as_me:$LINENO: checking for svc_run in -lnsl" >&5 +echo $ECHO_N "checking for svc_run in -lnsl... $ECHO_C" >&6 +if test "${ac_cv_lib_nsl_svc_run+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lnsl $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any 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 svc_run (); +int +main () +{ +svc_run (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { 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_lib_nsl_svc_run=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_nsl_svc_run=no +fi +rm -f 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_nsl_svc_run" >&5 +echo "${ECHO_T}$ac_cv_lib_nsl_svc_run" >&6 +if test $ac_cv_lib_nsl_svc_run = yes; then + LIBS="-lnsl $LIBS"; LIBTSO_LIBS="-lnsl $LIBTSO_LIBS"; + LIBJSO_LIBS="-lnsl $LIBJSO_LIBS" +fi + +fi +;; + solaris*) + echo "$as_me:$LINENO: checking for svc_run" >&5 +echo $ECHO_N "checking for svc_run... $ECHO_C" >&6 +if test "${ac_cv_func_svc_run+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define svc_run to an innocuous variant, in case <limits.h> declares svc_run. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define svc_run innocuous_svc_run + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char svc_run (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + +#undef svc_run + +/* 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 svc_run (); +/* 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_svc_run) || defined (__stub___svc_run) +choke me +#else +char (*f) () = svc_run; +#endif +#ifdef __cplusplus +} +#endif + +int +main () +{ +return f != svc_run; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { 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_svc_run=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_func_svc_run=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ac_cv_func_svc_run" >&5 +echo "${ECHO_T}$ac_cv_func_svc_run" >&6 +if test $ac_cv_func_svc_run = yes; then + : +else + +echo "$as_me:$LINENO: checking for svc_run in -lnsl" >&5 +echo $ECHO_N "checking for svc_run in -lnsl... $ECHO_C" >&6 +if test "${ac_cv_lib_nsl_svc_run+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lnsl $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any 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 svc_run (); +int +main () +{ +svc_run (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { 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_lib_nsl_svc_run=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_nsl_svc_run=no +fi +rm -f 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_nsl_svc_run" >&5 +echo "${ECHO_T}$ac_cv_lib_nsl_svc_run" >&6 +if test $ac_cv_lib_nsl_svc_run = yes; then + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBNSL 1 +_ACEOF + + LIBS="-lnsl $LIBS" + +fi + +fi +;; + esac + +fi + +# Optional Tcl support. +if test "$db_cv_tcl" = "yes"; then + + if test `$LIBTOOL_PROG --config | grep build_libtool_libs | grep no` 2>/dev/null; then + { { echo "$as_me:$LINENO: error: Tcl requires shared libraries" >&5 +echo "$as_me: error: Tcl requires shared libraries" >&2;} + { (exit 1); exit 1; }; } + fi + + + + + if test "${ac_cv_c_tclconfig+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + + # First check to see if --with-tclconfig was specified. + if test "${with_tclconfig}" != no; then + if test -f "${with_tclconfig}/tclConfig.sh" ; then + ac_cv_c_tclconfig=`(cd ${with_tclconfig}; pwd)` + else + { { echo "$as_me:$LINENO: error: ${with_tclconfig} directory doesn't contain tclConfig.sh" >&5 +echo "$as_me: error: ${with_tclconfig} directory doesn't contain tclConfig.sh" >&2;} + { (exit 1); exit 1; }; } + fi + fi + + # check in a few common install locations + if test x"${ac_cv_c_tclconfig}" = x ; then + for i in `ls -d /usr/local/lib 2>/dev/null` ; do + if test -f "$i/tclConfig.sh" ; then + ac_cv_c_tclconfig=`(cd $i; pwd)` + break + fi + done + fi + + +fi + + + if test x"${ac_cv_c_tclconfig}" = x ; then + TCL_BIN_DIR="# no Tcl configs found" + { { echo "$as_me:$LINENO: error: can't find Tcl configuration definitions" >&5 +echo "$as_me: error: can't find Tcl configuration definitions" >&2;} + { (exit 1); exit 1; }; } + else + TCL_BIN_DIR=${ac_cv_c_tclconfig} + fi + + + echo "$as_me:$LINENO: checking for existence of $TCL_BIN_DIR/tclConfig.sh" >&5 +echo $ECHO_N "checking for existence of $TCL_BIN_DIR/tclConfig.sh... $ECHO_C" >&6 + + if test -f "$TCL_BIN_DIR/tclConfig.sh" ; then + echo "$as_me:$LINENO: result: loading" >&5 +echo "${ECHO_T}loading" >&6 + . $TCL_BIN_DIR/tclConfig.sh + else + echo "$as_me:$LINENO: result: file not found" >&5 +echo "${ECHO_T}file not found" >&6 + fi + + # DB requires at least version 8.4. + if test ${TCL_MAJOR_VERSION} -lt 8 \ + -o ${TCL_MAJOR_VERSION} -eq 8 -a ${TCL_MINOR_VERSION} -lt 4; then + { { echo "$as_me:$LINENO: error: Berkeley DB requires Tcl version 8.4 or better." >&5 +echo "$as_me: error: Berkeley DB requires Tcl version 8.4 or better." >&2;} + { (exit 1); exit 1; }; } + fi + + # + # The eval is required to do the TCL_DBGX substitution in the + # TCL_LIB_FILE variable + # + eval TCL_LIB_FILE="${TCL_LIB_FILE}" + eval TCL_LIB_FLAG="${TCL_LIB_FLAG}" + eval "TCL_LIB_SPEC=\"${TCL_LIB_SPEC}\"" + + # + # If the DB Tcl library isn't loaded with the Tcl spec and library + # flags on AIX, the resulting libdb_tcl-X.Y.so.0 will drop core at + # load time. [#4843] Furthermore, with Tcl 8.3, the link flags + # given by the Tcl spec are insufficient for our use. [#5779] + # + case "$host_os" in + aix4.[2-9].*) + LIBTSO_LIBS="$LIBTSO_LIBS $TCL_LIB_SPEC $TCL_LIB_FLAG" + LIBTSO_LIBS="$LIBTSO_LIBS -L$TCL_EXEC_PREFIX/lib -ltcl$TCL_VERSION";; + aix*) + LIBTSO_LIBS="$LIBTSO_LIBS $TCL_LIB_SPEC $TCL_LIB_FLAG";; + esac + + + + + + TCL_TCLSH="${TCL_PREFIX}/bin/tclsh${TCL_VERSION}" + + + if test x"$TCL_PREFIX" != x && test -f "$TCL_PREFIX/include/tcl.h"; then + TCFLAGS="-I$TCL_PREFIX/include" + fi + + INSTALL_LIBS="${INSTALL_LIBS} \$(libtso_target)" + +fi + +# Optional sequence code. + + echo "$as_me:$LINENO: checking for 64-bit integral type support for sequences" >&5 +echo $ECHO_N "checking for 64-bit integral type support for sequences... $ECHO_C" >&6 + db_cv_build_sequence="yes" + + # Have to be able to cast variables to the "unsigned long long" and + # "long long" types, that's our cast for the printf "%ll[du]" format. + if test "$ac_cv_type_long_long" = "no"; then + db_cv_build_sequence="no" + fi + if test "$ac_cv_type_unsigned_long_long" = "no"; then + db_cv_build_sequence="no" + fi + + # Test to see if we can declare variables of the appropriate size + # and format them. If we're cross-compiling, all we get is a link + # test, which won't test for the appropriate printf format strings. + if test "$db_cv_build_sequence" = "yes"; then + if test "$cross_compiling" = yes; then + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + long long l; + unsigned long long u; + char buf100; + + buf0 = 'a'; + l = 9223372036854775807LL; + (void)snprintf(buf, sizeof(buf), "%lld", l); + if (strcmp(buf, "9223372036854775807")) + return (1); + u = 18446744073709551615ULL; + (void)snprintf(buf, sizeof(buf), "%llu", u); + if (strcmp(buf, "18446744073709551615")) + return (1); + return (0); + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { 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 + : +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +db_cv_build_sequence="no" +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + + main() { + long long l; + unsigned long long u; + char buf[100]; + + buf[0] = 'a'; + l = 9223372036854775807LL; + (void)snprintf(buf, sizeof(buf), "%lld", l); + if (strcmp(buf, "9223372036854775807")) + return (1); + u = 18446744073709551615ULL; + (void)snprintf(buf, sizeof(buf), "%llu", u); + if (strcmp(buf, "18446744073709551615")) + return (1); + 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 + : +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +db_cv_build_sequence="no" +fi +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi + fi + if test "$db_cv_build_sequence" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define HAVE_SEQUENCE 1 +_ACEOF + + + + + + db_seq_decl="typedef int64_t db_seq_t;"; + else + # It still has to compile, but it won't run. + db_seq_decl="typedef int db_seq_t;"; + fi + echo "$as_me:$LINENO: result: $db_cv_build_sequence" >&5 +echo "${ECHO_T}$db_cv_build_sequence" >&6 + + +# Optional DB 1.85 compatibility API. +if test "$db_cv_compat185" = "yes"; then + ADDITIONAL_INCS="db_185.h $ADDITIONAL_INCS" + + ADDITIONAL_OBJS="db185${o} $ADDITIONAL_OBJS" +fi + +# Optional utilities. +if test "$db_cv_dump185" = "yes"; then + ADDITIONAL_PROGS="db_dump185 $ADDITIONAL_PROGS" +fi + +# You can disable pieces of functionality to save space. +# +# Btree is always configured: it is the standard method, and Hash off-page +# duplicates require it. +ADDITIONAL_OBJS="$ADDITIONAL_OBJS \$(BTREE_OBJS)" + +# Hash can be disabled. +if test "$db_cv_build_hash" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define HAVE_HASH 1 +_ACEOF + + + + ADDITIONAL_OBJS="$ADDITIONAL_OBJS \$(HASH_OBJS)" + if test "$db_cv_build_verify" = "yes"; then + ADDITIONAL_OBJS="$ADDITIONAL_OBJS \$(HASH_VRFY_OBJS)" + fi +else + ADDITIONAL_OBJS="$ADDITIONAL_OBJS hash_stub${o}" +fi + +# Queue can be disabled. +if test "$db_cv_build_queue" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define HAVE_QUEUE 1 +_ACEOF + + + + ADDITIONAL_OBJS="$ADDITIONAL_OBJS \$(QUEUE_OBJS)" + if test "$db_cv_build_verify" = "yes"; then + ADDITIONAL_OBJS="$ADDITIONAL_OBJS \$(QUEUE_VRFY_OBJS)" + fi +else + ADDITIONAL_OBJS="$ADDITIONAL_OBJS qam_stub${o}" +fi + +# Replication can be disabled. +if test "$db_cv_build_replication" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define HAVE_REPLICATION 1 +_ACEOF + + + + ADDITIONAL_OBJS="$ADDITIONAL_OBJS \$(REP_OBJS)" +else + ADDITIONAL_OBJS="$ADDITIONAL_OBJS rep_stub${o}" +fi + +# The statistics code can be disabled. +if test "$db_cv_build_statistics" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define HAVE_STATISTICS 1 +_ACEOF + + + +fi + +# The verification code can be disabled. +if test "$db_cv_build_verify" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define HAVE_VERIFY 1 +_ACEOF + + + + ADDITIONAL_OBJS="$ADDITIONAL_OBJS \$(BTREE_VRFY_OBJS)" +else + ADDITIONAL_OBJS="$ADDITIONAL_OBJS db_vrfy_stub${o}" +fi + +# The crypto code can be disabled. +if test -d "$srcdir/../crypto" -a "$db_cv_build_cryptography" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define HAVE_CRYPTO 1 +_ACEOF + + + + + CRYPTO_OBJS="\$(CRYPTO_OBJS)" +else + CRYPTO_OBJS="crypto_stub${o}" +fi + # We need to add the additional object files into the Makefile with the correct # suffix. We can't use $LTLIBOBJS itself, because that variable has $U encoded # in it for automake, and that's not what we want. See SR #7227 for additional @@ -30357,10 +34523,10 @@ fi # to do DB_VERSION_UNIQUE_NAME substitution. if test "$db_cv_uniquename" = "yes"; then CREATE_LIST="$CREATE_LIST - db.h:$srcdir/../dbinc/db.in:$srcdir/../dbinc_auto/rpc_defs.in:$srcdir/../dbinc_auto/ext_def.in:$srcdir/../dbinc_auto/ext_prot.in" + db.h:$srcdir/../dbinc/db.in:$srcdir/../dbinc_auto/ext_def.in:$srcdir/../dbinc_auto/ext_prot.in" else CREATE_LIST="$CREATE_LIST - db.h:$srcdir/../dbinc/db.in:$srcdir/../dbinc_auto/rpc_defs.in:$srcdir/../dbinc_auto/ext_prot.in" + db.h:$srcdir/../dbinc/db.in:$srcdir/../dbinc_auto/ext_prot.in" fi # If configured for unique names, create the db_int_uext.h file (which @@ -30387,10 +34553,6 @@ if test "$db_cv_compat185" = "yes"; then fi fi -if test "$db_cv_rpm" = "yes"; then - CREATE_LIST="$CREATE_LIST db.spec:../dist/db.spec.in" -fi - ac_config_files="$ac_config_files $CREATE_LIST" cat >confcache <<\_ACEOF @@ -30421,13 +34583,13 @@ _ACEOF # `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" + "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" ;; esac; } | @@ -30457,13 +34619,13 @@ test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' # 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[ ]*=/{ + ac_vpsub='/^[ ]*VPATH[ ]*=/{ s/:*\$(srcdir):*/:/; s/:*\${srcdir}:*/:/; s/:*@srcdir@:*/:/; -s/^\([^=]*=[ ]*\):*/\1/; +s/^\([^=]*=[ ]*\):*/\1/; s/:*$//; -s/^[^=]*=[ ]*$//; +s/^[^=]*=[ ]*$//; }' fi @@ -30474,7 +34636,7 @@ ac_ltlibobjs= for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. ac_i=`echo "$ac_i" | - sed 's/\$U\././;s/\.o$//;s/\.obj$//'` + sed 's/\$U\././;s/\.o$//;s/\.obj$//'` # 2. Add them. ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext" ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo' @@ -30518,9 +34680,10 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then set -o posix fi +DUALCASE=1; export DUALCASE # for MKS sh # Support unset when possible. -if (FOO=FOO; unset FOO) >/dev/null 2>&1; then +if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then as_unset=unset else as_unset=false @@ -30539,7 +34702,7 @@ for as_var in \ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ LC_TELEPHONE LC_TIME do - if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then + if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then eval $as_var=C; export $as_var else $as_unset $as_var @@ -30718,16 +34881,17 @@ rm -f conf$$ conf$$.exe conf$$.file if mkdir -p . 2>/dev/null; then as_mkdir_p=: else + test -d ./-p && rmdir ./-p as_mkdir_p=false fi 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" +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 @@ -30753,8 +34917,8 @@ _ASBOX } >&5 cat >&5 <<_CSEOF -This file was extended by Berkeley DB $as_me 4.2.52, which was -generated by GNU Autoconf 2.57. Invocation command line was +This file was extended by Berkeley DB $as_me 4.3.14, which was +generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -30798,9 +34962,9 @@ Usage: $0 [OPTIONS] [FILE]... -d, --debug don't remove temporary files --recheck update $as_me by reconfiguring in the same conditions --file=FILE[:TEMPLATE] - instantiate the configuration file FILE + instantiate the configuration file FILE --header=FILE[:TEMPLATE] - instantiate the configuration header FILE + instantiate the configuration header FILE Configuration files: $config_files @@ -30813,12 +34977,11 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -Berkeley DB config.status 4.2.52 -configured by $0, generated by GNU Autoconf 2.57, +Berkeley DB config.status 4.3.14 +configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" -Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 -Free Software Foundation, Inc. +Copyright (C) 2003 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 @@ -31023,6 +35186,8 @@ s,@CPPFLAGS@,$CPPFLAGS,;t t s,@CRYPTO_OBJS@,$CRYPTO_OBJS,;t t s,@CXX@,$CXX,;t t s,@CXXFLAGS@,$CXXFLAGS,;t t +s,@DB_PROTO1@,$DB_PROTO1,;t t +s,@DB_PROTO2@,$DB_PROTO2,;t t s,@DEFAULT_LIB@,$DEFAULT_LIB,;t t s,@DEFAULT_LIB_CXX@,$DEFAULT_LIB_CXX,;t t s,@INSTALLER@,$INSTALLER,;t t @@ -31038,7 +35203,6 @@ s,@LIBTSO_LIBS@,$LIBTSO_LIBS,;t t s,@LIBTSO_MODSUFFIX@,$LIBTSO_MODSUFFIX,;t t s,@LIBTSO_MODULE@,$LIBTSO_MODULE,;t t s,@LIBXSO_LIBS@,$LIBXSO_LIBS,;t t -s,@LOAD_LIBS@,$LOAD_LIBS,;t t s,@MAKEFILE_CC@,$MAKEFILE_CC,;t t s,@MAKEFILE_CCLINK@,$MAKEFILE_CCLINK,;t t s,@MAKEFILE_CXX@,$MAKEFILE_CXX,;t t @@ -31049,11 +35213,9 @@ s,@OSDIR@,$OSDIR,;t t s,@POSTLINK@,$POSTLINK,;t t s,@REPLACEMENT_OBJS@,$REPLACEMENT_OBJS,;t t s,@RPC_CLIENT_OBJS@,$RPC_CLIENT_OBJS,;t t -s,@RPM_BUILD@,$RPM_BUILD,;t t -s,@RPM_POST_INSTALL@,$RPM_POST_INSTALL,;t t -s,@RPM_POST_UNINSTALL@,$RPM_POST_UNINSTALL,;t t +s,@RPC_SERVER_H@,$RPC_SERVER_H,;t t s,@SOFLAGS@,$SOFLAGS,;t t -s,@db_cv_path_rpm_archive@,$db_cv_path_rpm_archive,;t t +s,@TEST_LIBS@,$TEST_LIBS,;t t s,@db_int_def@,$db_int_def,;t t s,@o@,$o,;t t s,@DB_VERSION_MAJOR@,$DB_VERSION_MAJOR,;t t @@ -31067,9 +35229,6 @@ s,@db_cv_path_chmod@,$db_cv_path_chmod,;t t s,@ac_ct_db_cv_path_chmod@,$ac_ct_db_cv_path_chmod,;t t s,@db_cv_path_cp@,$db_cv_path_cp,;t t s,@ac_ct_db_cv_path_cp@,$ac_ct_db_cv_path_cp,;t t -s,@path_ldconfig@,$path_ldconfig,;t t -s,@ac_ct_path_ldconfig@,$ac_ct_path_ldconfig,;t t -s,@db_cv_path_ldconfig@,$db_cv_path_ldconfig,;t t s,@db_cv_path_ln@,$db_cv_path_ln,;t t s,@ac_ct_db_cv_path_ln@,$ac_ct_db_cv_path_ln,;t t s,@db_cv_path_mkdir@,$db_cv_path_mkdir,;t t @@ -31079,8 +35238,8 @@ s,@ac_ct_path_ranlib@,$ac_ct_path_ranlib,;t t s,@db_cv_path_ranlib@,$db_cv_path_ranlib,;t t s,@db_cv_path_rm@,$db_cv_path_rm,;t t s,@ac_ct_db_cv_path_rm@,$ac_ct_db_cv_path_rm,;t t -s,@db_cv_path_rpm@,$db_cv_path_rpm,;t t -s,@ac_ct_db_cv_path_rpm@,$ac_ct_db_cv_path_rpm,;t t +s,@db_cv_path_rpcgen@,$db_cv_path_rpcgen,;t t +s,@ac_ct_db_cv_path_rpcgen@,$ac_ct_db_cv_path_rpcgen,;t t s,@path_sh@,$path_sh,;t t s,@ac_ct_path_sh@,$ac_ct_path_sh,;t t s,@db_cv_path_sh@,$db_cv_path_sh,;t t @@ -31097,8 +35256,6 @@ s,@CC@,$CC,;t t s,@ac_ct_CC@,$ac_ct_CC,;t t s,@EXEEXT@,$EXEEXT,;t t s,@OBJEXT@,$OBJEXT,;t t -s,@DB_PROTO1@,$DB_PROTO1,;t t -s,@DB_PROTO2@,$DB_PROTO2,;t t s,@DB_CONST@,$DB_CONST,;t t s,@CCC@,$CCC,;t t s,@ac_ct_CCC@,$ac_ct_CCC,;t t @@ -31125,12 +35282,9 @@ s,@JAVAC@,$JAVAC,;t t s,@JAVA@,$JAVA,;t t s,@uudecode@,$uudecode,;t t s,@_ACJNI_JAVAC@,$_ACJNI_JAVAC,;t t -s,@TCFLAGS@,$TCFLAGS,;t t -s,@TCL_BIN_DIR@,$TCL_BIN_DIR,;t t -s,@TCL_SRC_DIR@,$TCL_SRC_DIR,;t t -s,@TCL_LIB_FILE@,$TCL_LIB_FILE,;t t -s,@TCL_TCLSH@,$TCL_TCLSH,;t t -s,@inttypes_decl@,$inttypes_decl,;t t +s,@inttypes_h_decl@,$inttypes_h_decl,;t t +s,@stdint_h_decl@,$stdint_h_decl,;t t +s,@stddef_h_decl@,$stddef_h_decl,;t t s,@u_char_decl@,$u_char_decl,;t t s,@u_short_decl@,$u_short_decl,;t t s,@u_int_decl@,$u_int_decl,;t t @@ -31140,10 +35294,18 @@ s,@u_int16_decl@,$u_int16_decl,;t t s,@int16_decl@,$int16_decl,;t t s,@u_int32_decl@,$u_int32_decl,;t t s,@int32_decl@,$int32_decl,;t t +s,@u_int64_decl@,$u_int64_decl,;t t +s,@int64_decl@,$int64_decl,;t t s,@ssize_t_decl@,$ssize_t_decl,;t t -s,@db_align_t_decl@,$db_align_t_decl,;t t -s,@db_alignp_t_decl@,$db_alignp_t_decl,;t t +s,@uintmax_t_decl@,$uintmax_t_decl,;t t +s,@uintptr_t_decl@,$uintptr_t_decl,;t t s,@LIBOBJS@,$LIBOBJS,;t t +s,@TCFLAGS@,$TCFLAGS,;t t +s,@TCL_BIN_DIR@,$TCL_BIN_DIR,;t t +s,@TCL_SRC_DIR@,$TCL_SRC_DIR,;t t +s,@TCL_LIB_FILE@,$TCL_LIB_FILE,;t t +s,@TCL_TCLSH@,$TCL_TCLSH,;t t +s,@db_seq_decl@,$db_seq_decl,;t t s,@LTLIBOBJS@,$LTLIBOBJS,;t t CEOF @@ -31174,9 +35336,9 @@ _ACEOF (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" + 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" + 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 @@ -31194,21 +35356,21 @@ 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,:.*,,'` ;; + 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=`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 || + 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; } @@ -31224,10 +35386,10 @@ echo X"$ac_file" | as_dirs="$as_dir $as_dirs" as_dir=`(dirname "$as_dir") 2>/dev/null || $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || echo X"$as_dir" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } /^X\(\/\/\)[^/].*/{ s//\1/; q; } @@ -31265,12 +35427,45 @@ case $srcdir in 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` + +# Do not use `cd foo && pwd` to compute absolute paths, because +# the directories may not exist. +case `pwd` in +.) ac_abs_builddir="$ac_dir";; +*) + case "$ac_dir" in + .) ac_abs_builddir=`pwd`;; + [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; + *) ac_abs_builddir=`pwd`/"$ac_dir";; + esac;; +esac +case $ac_abs_builddir in +.) ac_abs_top_builddir=${ac_top_builddir}.;; +*) + case ${ac_top_builddir}. in + .) ac_abs_top_builddir=$ac_abs_builddir;; + [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; + *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; + esac;; +esac +case $ac_abs_builddir in +.) ac_abs_srcdir=$ac_srcdir;; +*) + case $ac_srcdir in + .) ac_abs_srcdir=$ac_abs_builddir;; + [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; + *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; + esac;; +esac +case $ac_abs_builddir in +.) ac_abs_top_srcdir=$ac_top_srcdir;; +*) + case $ac_top_srcdir in + .) ac_abs_top_srcdir=$ac_abs_builddir;; + [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; + *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; + esac;; +esac case $INSTALL in @@ -31292,7 +35487,7 @@ echo "$as_me: creating $ac_file" >&6;} configure_input="$ac_file. " fi configure_input=$configure_input"Generated from `echo $ac_file_in | - sed 's,.*/,,'` by configure." + sed 's,.*/,,'` by configure." # First look for the input files in the build tree, otherwise in the # src tree. @@ -31301,24 +35496,24 @@ echo "$as_me: creating $ac_file" >&6;} 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 + # 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;; + 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 + 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;; + fi;; esac done` || { (exit 1); exit 1; } _ACEOF @@ -31360,12 +35555,12 @@ cat >>$CONFIG_STATUS <<\_ACEOF # NAME is the cpp macro being defined and VALUE is the value it is being given. # # ac_d sets the value in "#define NAME VALUE" lines. -ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)' -ac_dB='[ ].*$,\1#\2' +ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)' +ac_dB='[ ].*$,\1#\2' ac_dC=' ' ac_dD=',;t' # ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE". -ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' +ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' ac_uB='$,\1#\2define\3' ac_uC=' ' ac_uD=',;t' @@ -31374,11 +35569,11 @@ for ac_file in : $CONFIG_HEADERS; 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,:.*,,'` ;; + 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=`echo "$ac_file" | sed 's,:.*,,'` ;; * ) ac_file_in=$ac_file.in ;; esac @@ -31392,28 +35587,29 @@ echo "$as_me: creating $ac_file" >&6;} 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 + # 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;; + # Do quote $f, to prevent DOS paths from being IFS'd. + 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 + 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;; + fi;; esac done` || { (exit 1); exit 1; } # Remove the trailing spaces. - sed 's/[ ]*$//' $ac_file_inputs >$tmp/in + sed 's/[ ]*$//' $ac_file_inputs >$tmp/in _ACEOF @@ -31436,9 +35632,9 @@ s/[\\&,]/\\&/g s,[\\$`],\\&,g t clear : clear -s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*\)\(([^)]*)\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp +s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*\)\(([^)]*)\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp t end -s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp +s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp : end _ACEOF # If some macros were called several times there might be several times @@ -31452,13 +35648,13 @@ rm -f confdef2sed.sed # example, in the case of _POSIX_SOURCE, which is predefined and required # on some systems where configure will not decide to define it. cat >>conftest.undefs <<\_ACEOF -s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */, +s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */, _ACEOF # Break up conftest.defines because some shells have a limit on the size # of here documents, and old seds have small limits too (100 cmds). echo ' # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS -echo ' if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS +echo ' if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS echo ' :' >>$CONFIG_STATUS rm -f conftest.tail @@ -31467,7 +35663,7 @@ do # Write a limited-size here document to $tmp/defines.sed. echo ' cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS # Speed up: don't consider the non `#define' lines. - echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS + echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS # Work around the forget-to-reset-the-flag bug. echo 't clr' >>$CONFIG_STATUS echo ': clr' >>$CONFIG_STATUS @@ -31494,7 +35690,7 @@ do # Write a limited-size here document to $tmp/undefs.sed. echo ' cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS # Speed up: don't consider the non `#undef' - echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS + echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS # Work around the forget-to-reset-the-flag bug. echo 't clr' >>$CONFIG_STATUS echo ': clr' >>$CONFIG_STATUS @@ -31528,10 +35724,10 @@ echo "$as_me: $ac_file is unchanged" >&6;} else 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 || + 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; } @@ -31547,10 +35743,10 @@ echo X"$ac_file" | as_dirs="$as_dir $as_dirs" as_dir=`(dirname "$as_dir") 2>/dev/null || $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || echo X"$as_dir" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } /^X\(\/\/\)[^/].*/{ s//\1/; q; } diff --git a/db/dist/configure.ac b/db/dist/configure.ac index 839b47da8..5c337c590 100644 --- a/db/dist/configure.ac +++ b/db/dist/configure.ac @@ -1,4 +1,4 @@ -# $Id: configure.ac,v 11.198 2003/10/14 20:24:06 mjc Exp $ +# $Id: configure.ac,v 11.219 2004/09/16 01:27:42 bostic Exp $ # Process this file with autoconf to produce a configure script. PACKAGE=db @@ -33,6 +33,8 @@ AC_SUBST(CPPFLAGS) AC_SUBST(CRYPTO_OBJS) AC_SUBST(CXX) AC_SUBST(CXXFLAGS) +AC_SUBST(DB_PROTO1) +AC_SUBST(DB_PROTO2) AC_SUBST(DEFAULT_LIB) AC_SUBST(DEFAULT_LIB_CXX) AC_SUBST(INSTALLER) @@ -49,7 +51,6 @@ AC_SUBST(LIBTSO_LIBS) AC_SUBST(LIBTSO_MODSUFFIX) AC_SUBST(LIBTSO_MODULE) AC_SUBST(LIBXSO_LIBS) -AC_SUBST(LOAD_LIBS) AC_SUBST(MAKEFILE_CC) AC_SUBST(MAKEFILE_CCLINK) AC_SUBST(MAKEFILE_CXX) @@ -61,20 +62,12 @@ AC_SUBST(PATH_SEPARATOR) AC_SUBST(POSTLINK) AC_SUBST(REPLACEMENT_OBJS) AC_SUBST(RPC_CLIENT_OBJS) -AC_SUBST(RPM_BUILD) -AC_SUBST(RPM_POST_INSTALL) -AC_SUBST(RPM_POST_UNINSTALL) +AC_SUBST(RPC_SERVER_H) AC_SUBST(SOFLAGS) -AC_SUBST(db_cv_path_rpm_archive) +AC_SUBST(TEST_LIBS) AC_SUBST(db_int_def) AC_SUBST(o) -# RPM needs the current absolute path. -# RPM needs the list of original arguments, but we don't include the RPM -# option itself. -CONFIGURATION_PATH=${PWD-`pwd`} -CONFIGURATION_ARGS=`echo "$*" | sed -e 's/--with-rpm[[^ ]]*//'` - # Set the default installation location. AC_PREFIX_DEFAULT(/usr/local/BerkeleyDB.__EDIT_DB_VERSION_MAJOR__.__EDIT_DB_VERSION_MINOR__) @@ -111,7 +104,7 @@ fi if test "$db_cv_umrw" = "yes"; then AC_DEFINE(UMRW) AH_TEMPLATE(UMRW, - [Define to 1 to mask harmless unitialized memory read/writes.]) + [Define to 1 to mask harmless uninitialized memory read/writes.]) fi if test "$db_cv_test" = "yes"; then @@ -124,31 +117,12 @@ fi AM_PROGRAMS_SET AC_PROG_INSTALL -# RPM support: change the standard make and install targets -if test "$db_cv_rpm" = "yes"; then - BUILD_TARGET="rpm_build" - - # Check if we are running RPM version 3 or 4. - case "`rpm --version`" in - *version\ 4*) - RPM_BUILD="rpmbuild" - echo "_topdir $CONFIGURATION_PATH" > rpm-macro-defines;; - *version\ 3*) - RPM_BUILD="rpm" - echo "topdir: $CONFIGURATION_PATH" > rpm-macro-defines;; - esac - INSTALL_TARGET="rpm_install" -else - BUILD_TARGET="library_build" - INSTALL_TARGET="library_install" -fi +BUILD_TARGET="library_build" +INSTALL_TARGET="library_install" # This is where we handle stuff that autoconf can't handle: compiler, # preprocessor and load flags, libraries that the standard tests don't -# look for. The default optimization is -O. We would like to set the -# default optimization for systems using gcc to -O2, but we can't. By -# the time we know we're using gcc, it's too late to set optimization -# flags. +# look for. # # There are additional libraries we need for some compiler/architecture # combinations. @@ -159,7 +133,6 @@ fi # The makefile CC may be different than the CC used in config testing, # because the makefile CC may be set to use $(LIBTOOL). # -# XXX # Don't override anything if it's already set from the environment. optimize_def="-O" case "$host_os" in @@ -168,19 +141,14 @@ aix4.3.*|aix5*) CC=${CC-"xlc_r"} CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE" LDFLAGS="$LDFLAGS -Wl,-brtl";; -bsdi3*) optimize_def="-O2" - CC=${CC-"shlicc2"} +bsdi3*) CC=${CC-"shlicc2"} LIBS="$LIBS -lipc";; -bsdi*) optimize_def="-O2";; cygwin*) - optimize_def="-O2" CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE -D_REENTRANT";; freebsd*) - optimize_def="-O2" CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE" LDFLAGS="$LDFLAGS -pthread";; gnu*|k*bsd*-gnu|linux*) - optimize_def="-O2" CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE -D_REENTRANT";; hpux*) CPPFLAGS="$CPPFLAGS -D_REENTRANT";; irix*) optimize_def="-O2" @@ -222,10 +190,19 @@ AC_SUBST(db_cv_build_type) # for any compiler other than gcc. AC_PROG_CC(cc gcc) -# Checks for compiler characteristics. -AC_SUBST(DB_PROTO1) -AC_SUBST(DB_PROTO2) +# Set specific per-compiler flags. +if test "$GCC" = "yes"; then + # We want -O2 if we're using gcc. + CFLAGS="$CFLAGS " + CFLAGS=`echo "$CFLAGS" | sed 's/-O /-O2 /g'` +else + case "$host_os" in + hpux11*) + CPPFLAGS="$CPPFLAGS -mt";; + esac +fi +# Checks for compiler characteristics. DB_PROTO1="#undef __P" # AC_PROG_CC_STDC only sets ac_cv_prog_cc_stdc if the test fails, so @@ -323,7 +300,7 @@ MAKEFILE_CXXLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK}" LIBTOOL="\$(SHELL) ./libtool" case "$host_os" in -cygwin*) +cygwin* | mingw*) MAKEFILE_SOLINK="$MAKEFILE_SOLINK -no-undefined" MAKEFILE_XSOLINK="$MAKEFILE_XSOLINK -no-undefined";; esac @@ -346,6 +323,17 @@ else enable_static="yes" fi +case "$host_os" in + darwin*) + LIBTSO_MODULE="" + LIBTSO_MODSUFFIX=".dylib" + ;; + *) + LIBTSO_MODULE="-module" + LIBTSO_MODSUFFIX=@MODSUFFIX@ + ;; +esac + # C API. if test "$enable_shared" = "no"; then DEFAULT_LIB="\$(libdb_version)" @@ -428,111 +416,6 @@ else PATH_SEPARATOR="/" fi -# Optional RPC client/server. -if test "$db_cv_rpc" = "yes"; then - AC_DEFINE(HAVE_RPC) - AH_TEMPLATE(HAVE_RPC, [Define to 1 if building RPC client/server.]) - - RPC_CLIENT_OBJS="\$(RPC_CLIENT_OBJS)" - ADDITIONAL_PROGS="berkeley_db_svc $ADDITIONAL_PROGS" - - case "$host_os" in - hpux*) - AC_CHECK_FUNC(svc_run,, - AC_CHECK_LIB(nsl, svc_run, - LIBS="-lnsl $LIBS"; LIBTSO_LIBS="-lnsl $LIBTSO_LIBS"; - LIBJSO_LIBS="-lnsl $LIBJSO_LIBS"));; - solaris*) - AC_CHECK_FUNC(svc_run,, AC_CHECK_LIB(nsl, svc_run));; - esac -fi - -case "$host_os" in - darwin*) - LIBTSO_MODULE="" - LIBTSO_MODSUFFIX=".dylib" - ;; - *) - LIBTSO_MODULE="-module" - LIBTSO_MODSUFFIX=@MODSUFFIX@ - ;; -esac - -AM_TCL_LOAD - -# Optional DB 1.85 compatibility API. -if test "$db_cv_compat185" = "yes"; then - ADDITIONAL_INCS="db_185.h $ADDITIONAL_INCS" - - ADDITIONAL_OBJS="db185${o} $ADDITIONAL_OBJS" -fi - -# You can disable pieces of functionality to save space. -# -# Btree is always configured: it is the standard method, and Hash off-page -# duplicates require it. -ADDITIONAL_OBJS="$ADDITIONAL_OBJS \$(BTREE_OBJS)" - -# Hash can be disabled. -if test "$db_cv_build_hash" = "yes"; then - AC_DEFINE(HAVE_HASH) - AH_TEMPLATE(HAVE_HASH, [Define to 1 if building Hash access method.]) - ADDITIONAL_OBJS="$ADDITIONAL_OBJS \$(HASH_OBJS)" - if test "$db_cv_build_verify" = "yes"; then - ADDITIONAL_OBJS="$ADDITIONAL_OBJS \$(HASH_VRFY_OBJS)" - fi -else - ADDITIONAL_OBJS="$ADDITIONAL_OBJS hash_stub${o}" -fi - -# Queue can be disabled. -if test "$db_cv_build_queue" = "yes"; then - AC_DEFINE(HAVE_QUEUE) - AH_TEMPLATE(HAVE_QUEUE, [Define to 1 if building Queue access method.]) - ADDITIONAL_OBJS="$ADDITIONAL_OBJS \$(QUEUE_OBJS)" - if test "$db_cv_build_verify" = "yes"; then - ADDITIONAL_OBJS="$ADDITIONAL_OBJS \$(QUEUE_VRFY_OBJS)" - fi -else - ADDITIONAL_OBJS="$ADDITIONAL_OBJS qam_stub${o}" -fi - -# The replication code. -if test "$db_cv_build_replication" = "yes"; then - AC_DEFINE(HAVE_REPLICATION) - AH_TEMPLATE(HAVE_REPLICATION, - [Define to 1 if building replication support.]) - ADDITIONAL_OBJS="$ADDITIONAL_OBJS \$(REP_OBJS)" -else - ADDITIONAL_OBJS="$ADDITIONAL_OBJS rep_stub${o}" -fi - -# The verification code. -if test "$db_cv_build_verify" = "yes"; then - AC_DEFINE(HAVE_VERIFY) - AH_TEMPLATE(HAVE_VERIFY, - [Define to 1 if building access method verification support.]) - ADDITIONAL_OBJS="$ADDITIONAL_OBJS \$(BTREE_VRFY_OBJS)" -else - ADDITIONAL_OBJS="$ADDITIONAL_OBJS db_vrfy_stub${o}" -fi - -# The crypto support. -if test -d "$srcdir/../crypto" -a "$db_cv_build_cryptography" = "yes"; then - AC_DEFINE(HAVE_CRYPTO) - AH_TEMPLATE(HAVE_CRYPTO, - [Define to 1 if Berkeley DB release includes strong cryptography.]) - - CRYPTO_OBJS="\$(CRYPTO_OBJS)" -else - CRYPTO_OBJS="crypto_stub${o}" -fi - -# Optional utilities. -if test "$db_cv_dump185" = "yes"; then - ADDITIONAL_PROGS="db_dump185 $ADDITIONAL_PROGS" -fi - # Checks for include files, structures, C types. AC_HEADER_STAT AC_HEADER_TIME @@ -550,27 +433,39 @@ if test "$db_cv_exit_defines" = "yes"; then [Define to 1 if you have EXIT_SUCCESS/EXIT_FAILURE #defines.]) fi -# Test for various functions/libraries that the test and example programs use: -# sched_yield function -# pthreads, socket and math libraries -AC_CHECK_FUNC(sched_yield,, - AC_SEARCH_LIBS(sched_yield, rt, LOAD_LIBS="$LOAD_LIBS -lrt")) - -# XXX +# Test for various functions/libraries -- do tests that change library values +# first. +# +# The Berkeley DB library calls fdatasync, and it's only available in -lrt on +# Solaris. See if we can find it either without additional libraries or in +# -lrt. If fdatasync is found in -lrt, add -lrt to the Java and Tcl shared +# library link lines. +AC_SEARCH_LIBS(fdatasync, rt, [dnl + if test "$ac_cv_search_fdatasync" != "none required" ; then + LIBJSO_LIBS="$LIBJSO_LIBS -lrt"; + LIBTSO_LIBS="$LIBTSO_LIBS -lrt"; + fi]) + +# The test and example programs use the sched_yield function, taken from -lrt +# on Solaris. +AC_SEARCH_LIBS(sched_yield, rt) + +# !!! # We can't check for pthreads in the same way we did the test for sched_yield # because the Solaris C library includes pthread interfaces which are not -# thread-safe. For that reason we always add -lpthread if we find a pthread -# library. Also we can't depend on any specific call existing (pthread_create, -# for example), as it may be #defined in an include file -- OSF/1 (Tru64) has -# this problem. -AC_HAVE_LIBRARY(pthread, LOAD_LIBS="$LOAD_LIBS -lpthread") +# inter-process safe. For that reason we always add -lpthread if we find a +# pthread library. +# +# We can't depend on any specific call existing (pthread_create, for example), +# as it may be #defined in an include file -- OSF/1 (Tru64) has this problem. +AC_HAVE_LIBRARY(pthread, TEST_LIBS="$TEST_LIBS -lpthread") -# XXX -# We could be more exact about whether these libraries are needed, but we don't -# bother -- if they exist, we load them. -AC_HAVE_LIBRARY(m, LOAD_LIBS="$LOAD_LIBS -lm") -AC_HAVE_LIBRARY(socket, LOAD_LIBS="$LOAD_LIBS -lsocket") -AC_HAVE_LIBRARY(nsl, LOAD_LIBS="$LOAD_LIBS -lnsl") +# !!! +# We could be more exact about whether these libraries are needed, but don't +# bother -- if they exist, we load them, it's only the test programs anyway. +AC_HAVE_LIBRARY(m, TEST_LIBS="$TEST_LIBS -lm") +AC_HAVE_LIBRARY(socket, TEST_LIBS="$TEST_LIBS -lsocket") +AC_HAVE_LIBRARY(nsl, TEST_LIBS="$TEST_LIBS -lnsl") # Check for mutexes. # We do this here because it changes $LIBS. @@ -583,11 +478,12 @@ AM_DEFINE_MUTEXES # buffer is non-NULL -- Solaris can't handle a NULL buffer, and they # deleted getwd(). AC_REPLACE_FUNCS(getcwd getopt memcmp memcpy memmove raise) -AC_REPLACE_FUNCS(snprintf strcasecmp strdup strerror vsnprintf) +AC_REPLACE_FUNCS(strcasecmp strdup strerror) # Check for system functions we optionally use. -AC_CHECK_FUNCS(_fstati64 clock_gettime directio getrusage gettimeofday getuid) -AC_CHECK_FUNCS(pstat_getdynamic sched_yield select strtoul sysconf yield) +AC_CHECK_FUNCS(_fstati64 clock_gettime directio fdatasync ftruncate getrusage) +AC_CHECK_FUNCS(gettimeofday getuid pstat_getdynamic rand sched_yield) +AC_CHECK_FUNCS(select snprintf srand strtoul sysconf vsnprintf yield) # Pread/pwrite. # HP-UX has pread/pwrite, but it doesn't work with largefile support. @@ -618,26 +514,22 @@ case "$host_os" in aux*) AC_LIBOBJ([getopt]);; esac -# Linux has a broken O_DIRECT flag, but we allow people to override it from -# the command line. -test_host_prw=yes -AC_CACHE_CHECK([for open/O_DIRECT], db_cv_open_o_direct, [ -AC_TRY_LINK([ -#include <sys/types.h> -#include <fcntl.h>], [ - open("a", O_RDONLY | O_DIRECT, 0); -], [db_cv_open_o_direct=yes; test_host_prw=no], [db_cv_open_o_direct=no])]) -if test "$test_host_prw" = "no" -a "$db_cv_open_o_direct" = "yes"; then - case "$host_os" in - linux*) - db_cv_open_o_direct=no; - AC_MSG_WARN( - [O_DIRECT interface ignored on $host_os-$host_vendor.]);; - esac -fi -if test "$db_cv_open_o_direct" = "yes"; then - AC_DEFINE(HAVE_O_DIRECT) - AH_TEMPLATE(HAVE_O_DIRECT, [Define to 1 if you have the O_DIRECT flag.]) +# Linux has a broken O_DIRECT flag, but you can't detect it at configure time. +# Linux and SGI require buffer alignment we may not match, otherwise writes +# will fail. Default to not using the O_DIRECT flag. +if test "$db_cv_o_direct" = "yes"; then + AC_CACHE_CHECK([for open/O_DIRECT], db_cv_open_o_direct, [ + AC_TRY_LINK([ + #include <sys/types.h> + #include <fcntl.h>], [ + open("a", O_RDONLY | O_DIRECT, 0); + ], [db_cv_open_o_direct=yes], [db_cv_open_o_direct=no])]) + if test \ + "$db_cv_o_direct" = "yes" -a "$db_cv_open_o_direct" = "yes"; then + AC_DEFINE(HAVE_O_DIRECT) + AH_TEMPLATE(HAVE_O_DIRECT, + [Define to 1 if you have the O_DIRECT flag.]) + fi fi # Check for largefile support. @@ -686,6 +578,99 @@ if test "$mmap_ok" = "no" -a "$shmget_ok" = "no"; then AC_MSG_WARN([Neither mmap/munmap(2) or shmget(2) library functions.]) fi +# Optional RPC client/server. +if test "$db_cv_rpc" = "yes"; then + AM_RPC_CONFIGURE +fi + +# Optional Tcl support. +if test "$db_cv_tcl" = "yes"; then + AM_TCL_LOAD +fi + +# Optional sequence code. +AM_SEQUENCE_CONFIGURE + +# Optional DB 1.85 compatibility API. +if test "$db_cv_compat185" = "yes"; then + ADDITIONAL_INCS="db_185.h $ADDITIONAL_INCS" + + ADDITIONAL_OBJS="db185${o} $ADDITIONAL_OBJS" +fi + +# Optional utilities. +if test "$db_cv_dump185" = "yes"; then + ADDITIONAL_PROGS="db_dump185 $ADDITIONAL_PROGS" +fi + +# You can disable pieces of functionality to save space. +# +# Btree is always configured: it is the standard method, and Hash off-page +# duplicates require it. +ADDITIONAL_OBJS="$ADDITIONAL_OBJS \$(BTREE_OBJS)" + +# Hash can be disabled. +if test "$db_cv_build_hash" = "yes"; then + AC_DEFINE(HAVE_HASH) + AH_TEMPLATE(HAVE_HASH, [Define to 1 if building Hash access method.]) + ADDITIONAL_OBJS="$ADDITIONAL_OBJS \$(HASH_OBJS)" + if test "$db_cv_build_verify" = "yes"; then + ADDITIONAL_OBJS="$ADDITIONAL_OBJS \$(HASH_VRFY_OBJS)" + fi +else + ADDITIONAL_OBJS="$ADDITIONAL_OBJS hash_stub${o}" +fi + +# Queue can be disabled. +if test "$db_cv_build_queue" = "yes"; then + AC_DEFINE(HAVE_QUEUE) + AH_TEMPLATE(HAVE_QUEUE, [Define to 1 if building Queue access method.]) + ADDITIONAL_OBJS="$ADDITIONAL_OBJS \$(QUEUE_OBJS)" + if test "$db_cv_build_verify" = "yes"; then + ADDITIONAL_OBJS="$ADDITIONAL_OBJS \$(QUEUE_VRFY_OBJS)" + fi +else + ADDITIONAL_OBJS="$ADDITIONAL_OBJS qam_stub${o}" +fi + +# Replication can be disabled. +if test "$db_cv_build_replication" = "yes"; then + AC_DEFINE(HAVE_REPLICATION) + AH_TEMPLATE(HAVE_REPLICATION, + [Define to 1 if building replication support.]) + ADDITIONAL_OBJS="$ADDITIONAL_OBJS \$(REP_OBJS)" +else + ADDITIONAL_OBJS="$ADDITIONAL_OBJS rep_stub${o}" +fi + +# The statistics code can be disabled. +if test "$db_cv_build_statistics" = "yes"; then + AC_DEFINE(HAVE_STATISTICS) + AH_TEMPLATE(HAVE_STATISTICS, + [Define to 1 if building statistics support.]) +fi + +# The verification code can be disabled. +if test "$db_cv_build_verify" = "yes"; then + AC_DEFINE(HAVE_VERIFY) + AH_TEMPLATE(HAVE_VERIFY, + [Define to 1 if building access method verification support.]) + ADDITIONAL_OBJS="$ADDITIONAL_OBJS \$(BTREE_VRFY_OBJS)" +else + ADDITIONAL_OBJS="$ADDITIONAL_OBJS db_vrfy_stub${o}" +fi + +# The crypto code can be disabled. +if test -d "$srcdir/../crypto" -a "$db_cv_build_cryptography" = "yes"; then + AC_DEFINE(HAVE_CRYPTO) + AH_TEMPLATE(HAVE_CRYPTO, + [Define to 1 if Berkeley DB release includes strong cryptography.]) + + CRYPTO_OBJS="\$(CRYPTO_OBJS)" +else + CRYPTO_OBJS="crypto_stub${o}" +fi + # We need to add the additional object files into the Makefile with the correct # suffix. We can't use $LTLIBOBJS itself, because that variable has $U encoded # in it for automake, and that's not what we want. See SR #7227 for additional @@ -720,10 +705,10 @@ fi # to do DB_VERSION_UNIQUE_NAME substitution. if test "$db_cv_uniquename" = "yes"; then CREATE_LIST="$CREATE_LIST - db.h:$srcdir/../dbinc/db.in:$srcdir/../dbinc_auto/rpc_defs.in:$srcdir/../dbinc_auto/ext_def.in:$srcdir/../dbinc_auto/ext_prot.in" + db.h:$srcdir/../dbinc/db.in:$srcdir/../dbinc_auto/ext_def.in:$srcdir/../dbinc_auto/ext_prot.in" else CREATE_LIST="$CREATE_LIST - db.h:$srcdir/../dbinc/db.in:$srcdir/../dbinc_auto/rpc_defs.in:$srcdir/../dbinc_auto/ext_prot.in" + db.h:$srcdir/../dbinc/db.in:$srcdir/../dbinc_auto/ext_prot.in" fi # If configured for unique names, create the db_int_uext.h file (which @@ -750,9 +735,5 @@ if test "$db_cv_compat185" = "yes"; then fi fi -if test "$db_cv_rpm" = "yes"; then - CREATE_LIST="$CREATE_LIST db.spec:../dist/db.spec.in" -fi - AC_CONFIG_FILES($CREATE_LIST) AC_OUTPUT diff --git a/db/dist/gen_rec.awk b/db/dist/gen_rec.awk index 592c1f39b..8dddc1052 100644 --- a/db/dist/gen_rec.awk +++ b/db/dist/gen_rec.awk @@ -2,10 +2,10 @@ # # See the file LICENSE for redistribution information. # -# Copyright (c) 1996-2003 +# Copyright (c) 1996-2004 # Sleepycat Software. All rights reserved. # -# $Id: gen_rec.awk,v 11.87 2003/11/14 05:32:38 ubell Exp $ +# $Id: gen_rec.awk,v 11.108 2004/09/22 18:03:49 bostic Exp $ # # This awk script generates all the log, print, and read routines for the DB @@ -41,21 +41,25 @@ # PGDBT Just like DBT, only we know it stores a page or page # header, so we can byte-swap it (once we write the # byte-swapping code, which doesn't exist yet). +# LOCKS Just like DBT, but uses a print function for locks. BEGIN { if (source_file == "" || header_file == "" || template_file == "") { print "Usage: gen_rec.awk requires three variables to be set:" - print "\tsource_file\t-- the C source file being created" - print "\theader_file\t-- the C #include file being created" + print "\theader_file\t-- the recover #include file being created" + print "\tprint_file\t-- the print source file being created" + print "\tsource_file\t-- the recover source file being created" print "\ttemplate_file\t-- the template file being created" exit } FS="[\t ][\t ]*" CFILE=source_file HFILE=header_file + PFILE=print_file TFILE=template_file dbprivate = 0 + buf_only = 1; } /^[ ]*DBPRIVATE/ { dbprivate = 1 @@ -64,9 +68,17 @@ BEGIN { prefix = $2 num_funcs = 0; - # Start .c file. - printf("/* Do not edit: automatically built by gen_rec.awk. */\n") \ + # Start .c files. + printf("/* Do not edit: automatically built by gen_rec.awk. */\n\n") \ > CFILE + printf("#include \"db_config.h\"\n\n") >> CFILE + printf("/* Do not edit: automatically built by gen_rec.awk. */\n\n") \ + > PFILE + printf("#include \"db_config.h\"\n\n") >> PFILE + if (prefix == "__ham") + printf("#ifdef HAVE_HASH\n") >> PFILE + if (prefix == "__qam") + printf("#ifdef HAVE_QUEUE\n") >> PFILE # Start .h file, make the entire file conditional. printf("/* Do not edit: automatically built by gen_rec.awk. */\n\n") \ @@ -90,8 +102,11 @@ BEGIN { for (i = 2; i < NF; i++) printf("%s ", $i) >> CFILE printf("%s\n", $i) >> CFILE + for (i = 2; i < NF; i++) + printf("%s ", $i) >> PFILE + printf("%s\n", $i) >> PFILE } -/^[ ]*(BEGIN|IGNORED)/ { +/^[ ]*(BEGIN|IGNORED|BEGIN_BUF)/ { if (in_begin) { print "Invalid format: missing END statement" exit @@ -100,21 +115,22 @@ BEGIN { is_dbt = 0; has_dbp = 0; is_uint = 0; - need_log_function = ($1 == "BEGIN"); + need_log_function = ($1 == "BEGIN") || ($1 == "BEGIN_BUF"); + not_buf = ($1 == "BEGIN") || ($1 == "IGNORED"); + if (not_buf) + buf_only = 0; nvars = 0; - # number of locks that the getpgnos functions will return - nlocks = 0; - thisfunc = $2; funcname = sprintf("%s_%s", prefix, $2); - rectype = $3; + if (not_buf) + rectype = $3; funcs[num_funcs] = funcname; ++num_funcs; } -/^[ ]*(DB|ARG|DBT|PGDBT|POINTER|TIME)/ { +/^[ ]*(DB|ARG|DBT|LOCKS|PGDBT|POINTER|TIME)/ { vars[nvars] = $2; types[nvars] = $3; atypes[nvars] = $1; @@ -147,14 +163,18 @@ BEGIN { } # Declare the record type. - printf("#define\tDB_%s\t%d\n", funcname, rectype) >> HFILE + if (not_buf) { + printf("#define\tDB_%s\t%d\n", funcname, rectype) >> HFILE + } # Structure declaration. printf("typedef struct _%s_args {\n", funcname) >> HFILE # Here are the required fields for every structure - printf("\tu_int32_t type;\n\tDB_TXN *txnid;\n") >> HFILE - printf("\tDB_LSN prev_lsn;\n") >>HFILE + if (not_buf) { + printf("\tu_int32_t type;\n\tDB_TXN *txnid;\n") >> HFILE + printf("\tDB_LSN prev_lsn;\n") >>HFILE + } # Here are the specified fields. for (i = 0; i < nvars; i++) { @@ -167,25 +187,22 @@ BEGIN { } printf("} %s_args;\n\n", funcname) >> HFILE - # Output the log, print, read, and getpgnos functions. + # Output the log, print and read functions. if (need_log_function) { log_function(); - - # The getpgnos function calls DB-private (__rep_*) functions, - # so we only generate it for our own logging functions, - # not application-specific ones. - if (dbprivate) { - getpgnos_function(); - } } - print_function(); + if (not_buf) { + print_function(); + } read_function(); # Recovery template - cmd = sprintf(\ + if (not_buf) { + cmd = sprintf(\ "sed -e s/PREF/%s/ -e s/FUNC/%s/ < template/rec_ctemp >> %s", - prefix, thisfunc, TFILE) - system(cmd); + prefix, thisfunc, TFILE) + system(cmd); + } # Done writing stuff, reset and continue. in_begin = 0; @@ -195,80 +212,63 @@ END { # End the conditional for the HFILE printf("#endif\n") >> HFILE; + if (buf_only == 1) + exit + # Print initialization routine; function prototype p[1] = sprintf("int %s_init_print %s%s", prefix, "__P((DB_ENV *, int (***)(DB_ENV *, DBT *, DB_LSN *, ", "db_recops, void *), size_t *));"); p[2] = ""; - proto_format(p); + proto_format(p, PFILE); # Create the routine to call __db_add_recovery(print_fn, id) printf("int\n%s_init_print(dbenv, dtabp, dtabsizep)\n", \ - prefix) >> CFILE; - printf("\tDB_ENV *dbenv;\n") >> CFILE;; - printf("\tint (***dtabp)__P((DB_ENV *, DBT *, DB_LSN *,") >> CFILE; - printf(" db_recops, void *));\n") >> CFILE; - printf("\tsize_t *dtabsizep;\n{\n") >> CFILE; + prefix) >> PFILE; + printf("\tDB_ENV *dbenv;\n") >> PFILE;; + printf("\tint (***dtabp)__P((DB_ENV *, DBT *, DB_LSN *,") >> PFILE; + printf(" db_recops, void *));\n") >> PFILE; + printf("\tsize_t *dtabsizep;\n{\n") >> PFILE; # If application-specific, the user will need a prototype for # __db_add_recovery, since they won't have DB's. if (!dbprivate) { - printf("\tint __db_add_recovery __P((DB_ENV *,\n") >> CFILE; + printf("\tint __db_add_recovery __P((DB_ENV *,\n") >> PFILE; printf(\ -"\t int (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, void *),\n") >> CFILE; - printf("\t size_t *,\n") >> CFILE; +"\t int (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, void *),\n") >> PFILE; + printf("\t size_t *,\n") >> PFILE; printf(\ "\t int (*)(DB_ENV *, DBT *, DB_LSN *, db_recops, void *), u_int32_t));\n") \ - >> CFILE; + >> PFILE; } - printf("\tint ret;\n\n") >> CFILE; + printf("\tint ret;\n\n") >> PFILE; for (i = 0; i < num_funcs; i++) { - printf("\tif ((ret = __db_add_recovery(dbenv, ") >> CFILE; - printf("dtabp, dtabsizep,\n") >> CFILE; + printf("\tif ((ret = __db_add_recovery(dbenv, ") >> PFILE; + printf("dtabp, dtabsizep,\n") >> PFILE; printf("\t %s_print, DB_%s)) != 0)\n", \ - funcs[i], funcs[i]) >> CFILE; - printf("\t\treturn (ret);\n") >> CFILE; - } - printf("\treturn (0);\n}\n\n") >> CFILE; - - # We only want to generate *_init_{getpgnos,recover} functions - # if this is a DB-private, rather than application-specific, - # set of recovery functions. Application-specific recovery functions - # should be dispatched using the DB_ENV->set_app_dispatch callback - # rather than a DB dispatch table ("dtab"). + funcs[i], funcs[i]) >> PFILE; + printf("\t\treturn (ret);\n") >> PFILE; + } + printf("\treturn (0);\n}\n") >> PFILE; + if (prefix == "__ham") + printf("#endif /* HAVE_HASH */\n") >> PFILE + if (prefix == "__qam") + printf("#endif /* HAVE_QUEUE */\n") >> PFILE + + # We only want to generate *_init_recover functions if this is a + # DB-private, rather than application-specific, set of recovery + # functions. Application-specific recovery functions should be + # dispatched using the DB_ENV->set_app_dispatch callback rather + # than a DB dispatch table ("dtab"). if (!dbprivate) exit - # Page number initialization routine; function prototype - printf("#ifdef HAVE_REPLICATION\n") >> CFILE; - p[1] = sprintf("int %s_init_getpgnos %s%s", prefix, - "__P((DB_ENV *, int (***)(DB_ENV *, DBT *, DB_LSN *, ", - "db_recops, void *), size_t *));"); - p[2] = ""; - proto_format(p); - - # Create the routine to call db_add_recovery(pgno_fn, id) - printf("int\n%s_init_getpgnos(dbenv, dtabp, dtabsizep)\n", \ - prefix) >> CFILE; - printf("\tDB_ENV *dbenv;\n") >> CFILE; - printf("\tint (***dtabp)__P((DB_ENV *, DBT *, DB_LSN *,") >> CFILE; - printf(" db_recops, void *));\n") >> CFILE; - printf("\tsize_t *dtabsizep;\n{\n\tint ret;\n\n") >> CFILE; - for (i = 0; i < num_funcs; i++) { - printf("\tif ((ret = __db_add_recovery(dbenv, ") >> CFILE; - printf("dtabp, dtabsizep,\n") >> CFILE; - printf("\t %s_getpgnos, DB_%s)) != 0)\n", \ - funcs[i], funcs[i]) >> CFILE; - printf("\t\treturn (ret);\n") >> CFILE; - } - printf("\treturn (0);\n}\n#endif /* HAVE_REPLICATION */\n\n") >> CFILE; - # Recover initialization routine p[1] = sprintf("int %s_init_recover %s%s", prefix, "__P((DB_ENV *, int (***)(DB_ENV *, DBT *, DB_LSN *, ", "db_recops, void *), size_t *));"); p[2] = ""; - proto_format(p); + proto_format(p, CFILE); # Create the routine to call db_add_recovery(func, id) printf("int\n%s_init_recover(dbenv, dtabp, dtabsizep)\n", \ @@ -290,34 +290,44 @@ END { function log_function() { # Write the log function; function prototype pi = 1; - p[pi++] = sprintf("int %s_log", funcname); - p[pi++] = " "; - if (has_dbp == 1) { - p[pi++] = "__P((DB *, DB_TXN *, DB_LSN *, u_int32_t"; + if (not_buf) { + p[pi++] = sprintf("int %s_log", funcname); + p[pi++] = " "; + if (has_dbp == 1) { + p[pi++] = "__P((DB *"; + } else { + p[pi++] = "__P((DB_ENV *"; + } + p[pi++] = ", DB_TXN *, DB_LSN *, u_int32_t"; } else { - p[pi++] = "__P((DB_ENV *, DB_TXN *, DB_LSN *, u_int32_t"; + p[pi++] = sprintf("int %s_buf", funcname); + p[pi++] = " "; + p[pi++] = "__P((u_int8_t *, size_t, size_t *"; } for (i = 0; i < nvars; i++) { if (modes[i] == "DB") continue; p[pi++] = ", "; p[pi++] = sprintf("%s%s%s", - (modes[i] == "DBT" || modes[i] == "PGDBT") ? "const " : "", - types[i], - (modes[i] == "DBT" || modes[i] == "PGDBT") ? " *" : ""); + (modes[i] == "DBT" || modes[i] == "LOCKS" || + modes[i] == "PGDBT") ? "const " : "", types[i], + (modes[i] == "DBT" || modes[i] == "LOCKS" || + modes[i] == "PGDBT") ? " *" : ""); } p[pi++] = ""; p[pi++] = "));"; p[pi++] = ""; - proto_format(p); + proto_format(p, CFILE); # Function declaration - if (has_dbp == 1) { + if (not_buf == 1 && has_dbp == 1) { printf("int\n%s_log(dbp, txnid, ret_lsnp, flags", \ funcname) >> CFILE; - } else { + } else if (not_buf == 1) { printf("int\n%s_log(dbenv, txnid, ret_lsnp, flags", \ funcname) >> CFILE; + } else { + printf("int\n%s_buf(buf, max, lenp", funcname) >> CFILE; } for (i = 0; i < nvars; i++) { if (modes[i] == "DB") { @@ -335,16 +345,22 @@ function log_function() { printf(")\n") >> CFILE; # Now print the parameters - if (has_dbp == 1) { - printf("\tDB *dbp;\n") >> CFILE; + if (not_buf == 1) { + if (has_dbp == 1) { + printf("\tDB *dbp;\n") >> CFILE; + } else { + printf("\tDB_ENV *dbenv;\n") >> CFILE; + } + printf("\tDB_TXN *txnid;\n\tDB_LSN *ret_lsnp;\n") >> CFILE; + printf("\tu_int32_t flags;\n") >> CFILE; } else { - printf("\tDB_ENV *dbenv;\n") >> CFILE; + printf("\tu_int8_t *buf;\n") >> CFILE; + printf("\tsize_t max, *lenp;\n") >> CFILE; } - printf("\tDB_TXN *txnid;\n\tDB_LSN *ret_lsnp;\n") >> CFILE; - printf("\tu_int32_t flags;\n") >> CFILE; for (i = 0; i < nvars; i++) { # We just skip for modes == DB. - if (modes[i] == "DBT" || modes[i] == "PGDBT") + if (modes[i] == "DBT" || + modes[i] == "LOCKS" || modes[i] == "PGDBT") printf("\tconst %s *%s;\n", types[i], vars[i]) >> CFILE; else if (modes[i] != "DB") printf("\t%s %s;\n", types[i], vars[i]) >> CFILE; @@ -352,136 +368,185 @@ function log_function() { # Function body and local decls printf("{\n") >> CFILE; - printf("\tDBT logrec;\n") >> CFILE; - if (has_dbp == 1) - printf("\tDB_ENV *dbenv;\n") >> CFILE; - if (dbprivate) - printf("\tDB_TXNLOGREC *lr;\n") >> CFILE; - printf("\tDB_LSN *lsnp, null_lsn;\n") >> CFILE; - printf("\tu_int32_t ") >> CFILE; - if (is_dbt == 1) - printf("zero, ") >> CFILE; - if (is_uint == 1) - printf("uinttmp, ") >> CFILE; - printf("rectype, txn_num;\n") >> CFILE; - printf("\tu_int npad;\n") >> CFILE; + if (not_buf == 1) { + printf("\tDBT logrec;\n") >> CFILE; + if (has_dbp == 1) + printf("\tDB_ENV *dbenv;\n") >> CFILE; + if (dbprivate) + printf("\tDB_TXNLOGREC *lr;\n") >> CFILE; + printf("\tDB_LSN *lsnp, null_lsn, *rlsnp;\n") >> CFILE; + printf("\tu_int32_t ") >> CFILE; + if (is_dbt == 1) + printf("zero, ") >> CFILE; + if (is_uint == 1) + printf("uinttmp, ") >> CFILE; + printf("rectype, txn_num;\n") >> CFILE; + printf("\tu_int npad;\n") >> CFILE; + } else { + if (is_dbt == 1) + printf("\tu_int32_t zero;\n") >> CFILE; + if (is_uint == 1) + printf("\tu_int32_t uinttmp;\n") >> CFILE; + printf("\tu_int8_t *endbuf;\n") >> CFILE; + } printf("\tu_int8_t *bp;\n") >> CFILE; printf("\tint ") >> CFILE; - if (dbprivate) { + if (dbprivate && not_buf == 1) { printf("is_durable, ") >> CFILE; } printf("ret;\n\n") >> CFILE; # Initialization - if (has_dbp == 1) - printf("\tdbenv = dbp->dbenv;\n") >> CFILE; - printf("\trectype = DB_%s;\n", funcname) >> CFILE; - printf("\tnpad = 0;\n\n") >> CFILE; + if (not_buf == 1) { + if (has_dbp == 1) + printf("\tdbenv = dbp->dbenv;\n") >> CFILE; + if (dbprivate) + printf("\tCOMPQUIET(lr, NULL);\n\n") >> CFILE; + printf("\trectype = DB_%s;\n", funcname) >> CFILE; + printf("\tnpad = 0;\n") >> CFILE; + printf("\trlsnp = ret_lsnp;\n\n") >> CFILE; + } + printf("\tret = 0;\n\n") >> CFILE; + + if (not_buf) { + if (dbprivate) { + printf("\tif (LF_ISSET(DB_LOG_NOT_DURABLE)") \ + >> CFILE; + if (has_dbp == 1) { + printf(" ||\n\t ") >> CFILE; + printf("F_ISSET(dbp, DB_AM_NOT_DURABLE)) {\n") \ + >> CFILE; + } else { + printf(") {\n") >> CFILE; + printf("\t\tif (txnid == NULL)\n") >> CFILE; + printf("\t\t\treturn (0);\n") >> CFILE; + } + printf("\t\tis_durable = 0;\n") >> CFILE; + printf("\t} else\n") >> CFILE; + printf("\t\tis_durable = 1;\n\n") >> CFILE; + } + printf("\tif (txnid == NULL) {\n") >> CFILE; + printf("\t\ttxn_num = 0;\n") >> CFILE; + printf("\t\tlsnp = &null_lsn;\n") >> CFILE; + printf("\t\tnull_lsn.file = null_lsn.offset = 0;\n") >> CFILE; + printf("\t} else {\n") >> CFILE; + if (dbprivate && funcname != "__db_debug") { + printf(\ + "\t\tif (TAILQ_FIRST(&txnid->kids) != NULL &&\n") >> CFILE; + printf("\t\t (ret = __txn_activekids(") >> CFILE; + printf("dbenv, rectype, txnid)) != 0)\n") >> CFILE; + printf("\t\t\treturn (ret);\n") >> CFILE; + } + printf("\t\t/*\n\t\t * We need to assign begin_lsn while ") \ + >> CFILE; + printf("holding region mutex.\n") >> CFILE; + printf("\t\t * That assignment is done inside the ") >> CFILE; + printf("DbEnv->log_put call,\n\t\t * ") >> CFILE; + printf("so pass in the appropriate memory location to be ") \ + >> CFILE; + printf("filled\n\t\t * in by the log_put code.\n\t\t*/\n") \ + >> CFILE; + printf("\t\tDB_SET_BEGIN_LSNP(txnid, &rlsnp);\n") >> CFILE; + printf("\t\ttxn_num = txnid->txnid;\n") >> CFILE; + printf("\t\tlsnp = &txnid->last_lsn;\n") >> CFILE; + printf("\t}\n\n") >> CFILE; + # Malloc + printf("\tlogrec.size = ") >> CFILE; + printf("sizeof(rectype) + ") >> CFILE; + printf("sizeof(txn_num) + sizeof(DB_LSN)") >> CFILE; + for (i = 0; i < nvars; i++) + printf("\n\t + %s", sizes[i]) >> CFILE; + printf(";\n") >> CFILE + if (dbprivate) { + printf("\tif (CRYPTO_ON(dbenv)) {\n") >> CFILE; + printf("\t\tnpad =\n") >> CFILE; + printf("\t\t ((DB_CIPHER *)dbenv->crypto_handle)") \ + >> CFILE; + printf("->adj_size(logrec.size);\n") >> CFILE; + printf("\t\tlogrec.size += npad;\n\t}\n\n") >> CFILE - if (dbprivate) { - printf("\tis_durable = 1;\n") >> CFILE; - printf("\tif (LF_ISSET(DB_LOG_NOT_DURABLE) ||\n") >> CFILE; - printf("\t F_ISSET(dbenv, DB_ENV_TXN_NOT_DURABLE)") >> CFILE; - if (has_dbp == 1) { - printf(" ||\n\t ") >> CFILE; - printf("F_ISSET(dbp, DB_AM_NOT_DURABLE)) {\n") >> CFILE; - printf("\t\tif (F_ISSET(dbenv, ") >> CFILE; - printf("DB_ENV_TXN_NOT_DURABLE) && ") >> CFILE; - printf("txnid == NULL)\n") >> CFILE; + printf("\tif (is_durable || txnid == NULL) {\n") \ + >> CFILE; + printf("\t\tif ((ret =\n\t\t __os_malloc(dbenv, ") \ + >> CFILE; + printf("logrec.size, &logrec.data)) != 0)\n") >> CFILE; + printf("\t\t\treturn (ret);\n") >> CFILE; + printf("\t} else {\n") >> CFILE; + write_malloc("\t\t", + "lr", "logrec.size + sizeof(DB_TXNLOGREC)", CFILE) + printf("#ifdef DIAGNOSTIC\n") >> CFILE; + printf("\t\tif ((ret =\n\t\t __os_malloc(dbenv, ") \ + >> CFILE; + printf("logrec.size, &logrec.data)) != 0) {\n") \ + >> CFILE; + printf("\t\t\t__os_free(dbenv, lr);\n") >> CFILE; + printf("\t\t\treturn (ret);\n") >> CFILE; + printf("\t\t}\n") >> CFILE; + printf("#else\n") >> CFILE; + printf("\t\tlogrec.data = lr->data;\n") >> CFILE; + printf("#endif\n") >> CFILE; + printf("\t}\n") >> CFILE; } else { - printf(") {\n") >> CFILE; - printf("\t\tif (txnid == NULL)\n") >> CFILE; + write_malloc("\t", "logrec.data", "logrec.size", CFILE) + printf("\tbp = logrec.data;\n\n") >> CFILE; } - printf("\t\t\treturn (0);\n") >> CFILE; - printf("\t\tis_durable = 0;\n") >> CFILE; - printf("\t}\n") >> CFILE; - } - - printf("\tif (txnid == NULL) {\n") >> CFILE; - printf("\t\ttxn_num = 0;\n") >> CFILE; - printf("\t\tnull_lsn.file = 0;\n") >> CFILE; - printf("\t\tnull_lsn.offset = 0;\n") >> CFILE; - printf("\t\tlsnp = &null_lsn;\n") >> CFILE; - printf("\t} else {\n") >> CFILE; - if (dbprivate && funcname != "__db_debug") { - printf(\ - "\t\tif (TAILQ_FIRST(&txnid->kids) != NULL &&\n") >> CFILE; - printf("\t\t (ret = __txn_activekids(") >> CFILE; - printf("dbenv, rectype, txnid)) != 0)\n") >> CFILE; - printf("\t\t\treturn (ret);\n") >> CFILE; - } - printf("\t\ttxn_num = txnid->txnid;\n") >> CFILE; - printf("\t\tlsnp = &txnid->last_lsn;\n") >> CFILE; - printf("\t}\n\n") >> CFILE; - - # Malloc - printf("\tlogrec.size = sizeof(rectype) + ") >> CFILE; - printf("sizeof(txn_num) + sizeof(DB_LSN)") >> CFILE; - for (i = 0; i < nvars; i++) - printf("\n\t + %s", sizes[i]) >> CFILE; - printf(";\n") >> CFILE - if (dbprivate) { - printf("\tif (CRYPTO_ON(dbenv)) {\n") >> CFILE; - printf("\t\tnpad =\n") >> CFILE; - printf("\t\t ((DB_CIPHER *)dbenv->crypto_handle)") >> CFILE; - printf("->adj_size(logrec.size);\n") >> CFILE; - printf("\t\tlogrec.size += npad;\n\t}\n\n") >> CFILE - - printf("\tif (!is_durable && txnid != NULL) {\n") >> CFILE; - write_malloc("\t\t", - "lr", "logrec.size + sizeof(DB_TXNLOGREC)", CFILE) - printf("#ifdef DIAGNOSTIC\n") >> CFILE; - printf("\t\tgoto do_malloc;\n") >> CFILE; - printf("#else\n") >> CFILE; - printf("\t\tlogrec.data = &lr->data;\n") >> CFILE; - printf("#endif\n") >> CFILE; - printf("\t} else {\n") >> CFILE; - printf("#ifdef DIAGNOSTIC\n") >> CFILE; - printf("do_malloc:\n") >> CFILE; - printf("#endif\n") >> CFILE; - printf("\t\tif ((ret =\n\t\t __os_malloc(dbenv, ") >> CFILE; - printf("logrec.size, &logrec.data)) != 0) {\n") >> CFILE; - printf("#ifdef DIAGNOSTIC\n") >> CFILE; - printf("\t\t\tif (!is_durable && txnid != NULL)\n") >> CFILE; - printf("\t\t\t\t(void)__os_free(dbenv, lr);\n") >> CFILE; - printf("#endif\n") >> CFILE; - printf("\t\t\treturn (ret);\n") >> CFILE; - printf("\t\t}\n") >> CFILE; - printf("\t}\n") >> CFILE; - } else - write_malloc("\t", "logrec.data", "logrec.size", CFILE) - - printf("\tif (npad > 0)\n") >> CFILE; - printf("\t\tmemset((u_int8_t *)logrec.data + logrec.size ") >> CFILE; - printf("- npad, 0, npad);\n\n") >> CFILE; - - # Copy args into buffer - printf("\tbp = logrec.data;\n\n") >> CFILE; - printf("\tmemcpy(bp, &rectype, sizeof(rectype));\n") >> CFILE; - printf("\tbp += sizeof(rectype);\n\n") >> CFILE; - printf("\tmemcpy(bp, &txn_num, sizeof(txn_num));\n") >> CFILE; - printf("\tbp += sizeof(txn_num);\n\n") >> CFILE; - printf("\tmemcpy(bp, lsnp, sizeof(DB_LSN));\n") >> CFILE; - printf("\tbp += sizeof(DB_LSN);\n\n") >> CFILE; + printf("\tif (npad > 0)\n") >> CFILE; + printf("\t\tmemset((u_int8_t *)logrec.data + logrec.size ") \ + >> CFILE; + printf("- npad, 0, npad);\n\n") >> CFILE; + printf("\tbp = logrec.data;\n\n") >> CFILE; + + # Copy args into buffer + printf("\tmemcpy(bp, &rectype, sizeof(rectype));\n") >> CFILE; + printf("\tbp += sizeof(rectype);\n\n") >> CFILE; + printf("\tmemcpy(bp, &txn_num, sizeof(txn_num));\n") >> CFILE; + printf("\tbp += sizeof(txn_num);\n\n") >> CFILE; + printf("\tmemcpy(bp, lsnp, sizeof(DB_LSN));\n") >> CFILE; + printf("\tbp += sizeof(DB_LSN);\n\n") >> CFILE; + } else { + printf("\tbp = buf;\n") >> CFILE; + printf("\tendbuf = bp + max;\n\n") >> CFILE + } for (i = 0; i < nvars; i ++) { if (modes[i] == "ARG" || modes[i] == "TIME") { printf("\tuinttmp = (u_int32_t)%s;\n", \ vars[i]) >> CFILE; + if (not_buf == 0) { + printf("\tif (bp + sizeof(uinttmp) > endbuf)\n") \ + >> CFILE; + printf("\t\treturn (ENOMEM);\n") >> CFILE; + } printf("\tmemcpy(bp, &uinttmp, sizeof(uinttmp));\n") \ >> CFILE; printf("\tbp += sizeof(uinttmp);\n\n") >> CFILE; - } else if (modes[i] == "DBT" || modes[i] == "PGDBT") { + } else if (modes[i] == "DBT" || \ + modes[i] == "LOCKS" || modes[i] == "PGDBT") { printf("\tif (%s == NULL) {\n", vars[i]) >> CFILE; printf("\t\tzero = 0;\n") >> CFILE; + if (not_buf == 0) { + printf("\t\tif (bp + sizeof(u_int32_t) > endbuf)\n") \ + >> CFILE; + printf("\t\t\treturn (ENOMEM);\n") >> CFILE; + } printf("\t\tmemcpy(bp, &zero, sizeof(u_int32_t));\n") \ >> CFILE; printf("\t\tbp += sizeof(u_int32_t);\n") >> CFILE; printf("\t} else {\n") >> CFILE; + if (not_buf == 0) { + printf("\t\tif (bp + sizeof(%s->size) > endbuf)\n", \ + vars[i]) >> CFILE; + printf("\t\t\treturn (ENOMEM);\n") >> CFILE; + } printf("\t\tmemcpy(bp, &%s->size, ", vars[i]) >> CFILE; printf("sizeof(%s->size));\n", vars[i]) >> CFILE; printf("\t\tbp += sizeof(%s->size);\n", vars[i]) \ >> CFILE; + if (not_buf == 0) { + printf("\t\tif (bp + %s->size > endbuf)\n", \ + vars[i]) >> CFILE; + printf("\t\t\treturn (ENOMEM);\n") >> CFILE; + } printf("\t\tmemcpy(bp, %s->data, %s->size);\n", \ vars[i], vars[i]) >> CFILE; printf("\t\tbp += %s->size;\n\t}\n\n", \ @@ -504,6 +569,11 @@ function log_function() { >> CFILE; printf("\tbp += sizeof(uinttmp);\n\n") >> CFILE; } else { # POINTER + if (not_buf == 0) { + printf("\tif (bp + %s > endbuf)\n", \ + sizes[i]) >> CFILE; + printf("\t\treturn (ENOMEM);\n") >> CFILE; + } printf("\tif (%s != NULL)\n", vars[i]) >> CFILE; printf("\t\tmemcpy(bp, %s, %s);\n", vars[i], \ sizes[i]) >> CFILE; @@ -516,87 +586,96 @@ function log_function() { # Error checking. User code won't have DB_ASSERT available, but # this is a pretty unlikely assertion anyway, so we just leave it out # rather than requiring assert.h. - if (dbprivate) { - printf("\tDB_ASSERT((u_int32_t)") >> CFILE; - printf("(bp - (u_int8_t *)logrec.data) <= logrec.size);\n\n") \ - >> CFILE; - } - + if (not_buf == 1) { + if (dbprivate) { + printf("\tDB_ASSERT((u_int32_t)") >> CFILE; + printf("(bp - (u_int8_t *)logrec.data) ") >> CFILE; + printf("<= logrec.size);\n\n") >> CFILE; + # Save the log record off in the txn's linked list, + # or do log call. + # We didn't call the crypto alignment function when + # we created this log record (because we don't have + # the right header files to find the function), so + # we have to copy the log record to make sure the + # alignment is correct. + printf("\tif (is_durable || txnid == NULL) {\n") \ + >> CFILE; + # Output the log record and update the return LSN. + printf("\t\tif ((ret = __log_put(dbenv, rlsnp,") \ + >> CFILE; + printf("(DBT *)&logrec,\n") >> CFILE; + printf("\t\t flags | DB_LOG_NOCOPY)) == 0") >> CFILE; + printf(" && txnid != NULL) {\n") >> CFILE; + printf("\t\t\ttxnid->last_lsn = *rlsnp;\n") >> CFILE; + + printf("\t\t\tif (rlsnp != ret_lsnp)\n") >> CFILE; + printf("\t\t\t\t *ret_lsnp = *rlsnp;\n") >> CFILE; + printf("\t\t}\n\t} else {\n") >> CFILE; + printf("#ifdef DIAGNOSTIC\n") >> CFILE; + + # Add the debug bit if we are logging a ND record. + printf("\t\t/*\n") >> CFILE; + printf("\t\t * Set the debug bit if we are") >> CFILE; + printf(" going to log non-durable\n") >> CFILE; + printf("\t\t * transactions so they will be ignored") \ + >> CFILE; + printf(" by recovery.\n") >> CFILE; + printf("\t\t */\n") >> CFILE; + printf("\t\tmemcpy(lr->data, logrec.data, ") >> CFILE + printf("logrec.size);\n") >> CFILE; + printf("\t\trectype |= DB_debug_FLAG;\n") >> CFILE; + printf("\t\tmemcpy(") >> CFILE + printf("logrec.data, &rectype, sizeof(rectype));\n\n") \ + >> CFILE; + # Output the log record. + printf("\t\tret = __log_put(dbenv,\n") >> CFILE; + printf("\t\t rlsnp, (DBT *)&logrec, ") >> CFILE; + printf("flags | DB_LOG_NOCOPY);\n") >> CFILE; + printf("#else\n") >> CFILE; + printf("\t\tret = 0;\n") >> CFILE; + printf("#endif\n") >> CFILE; + # Add a ND record to the txn list. + printf("\t\tSTAILQ_INSERT_HEAD(&txnid") >> CFILE; + printf("->logs, lr, links);\n") >> CFILE; + # Update the return LSN. + printf("\t\tLSN_NOT_LOGGED(*ret_lsnp);\n") >> CFILE; + printf("\t}\n\n") >> CFILE; + } else { + printf("\tif ((ret = dbenv->log_put(dbenv, rlsnp,") >> CFILE; + printf(" (DBT *)&logrec,\n") >> CFILE; + printf("\t flags | DB_LOG_NOCOPY)) == 0") >> CFILE; + printf(" && txnid != NULL) {\n") >> CFILE; + + # Update the transactions last_lsn. + printf("\t\ttxnid->last_lsn = *rlsnp;\n") >> CFILE; + printf("\t\tif (rlsnp != ret_lsnp)\n") >> CFILE; + printf("\t\t\t *ret_lsnp = *rlsnp;\n") >> CFILE; + printf("\t}\n") >> CFILE; - # Save the log record off in the txn's linked list, or do log call. - # - # We didn't call the crypto alignment function when we created this - # log record (because we don't have the right header files to find - # the function), so we have to copy the log record to make sure the - # alignment is correct. - if (dbprivate) { - # Add the debug bit if we are logging a ND record. - printf("#ifdef DIAGNOSTIC\n") >> CFILE; - printf("\tif (!is_durable && txnid != NULL) {\n") >> CFILE; - printf("\t\t /*\n") >> CFILE; - printf("\t\t * We set the debug bit if we are going\n") \ - >> CFILE; - printf("\t\t * to log non-durable transactions so\n") >> CFILE; - printf("\t\t * they will be ignored by recovery.\n") >> CFILE; - printf("\t\t */\n") >> CFILE; - printf("\t\tmemcpy(lr->data, logrec.data, logrec.size);\n") \ - >> CFILE; - printf("\t\trectype |= DB_debug_FLAG;\n") >> CFILE; - printf("\t\tmemcpy(logrec.data, &rectype, sizeof(rectype));\n")\ - >> CFILE; - printf("\t}\n") >> CFILE; - printf("#endif\n\n") >> CFILE; - - # Add an ND record to the list. - printf("\tif (!is_durable && txnid != NULL) {\n") >> CFILE; - printf("\t\tret = 0;\n") >> CFILE; - printf("\t\tSTAILQ_INSERT_HEAD(&txnid") >> CFILE; - printf("->logs, lr, links);\n") >> CFILE; - printf("#ifdef DIAGNOSTIC\n") >> CFILE; - printf("\t\tgoto do_put;\n") >> CFILE; - printf("#endif\n") >> CFILE; - printf("\t}") >> CFILE; - # Output the log record. - printf(" else{\n") >> CFILE; - printf("#ifdef DIAGNOSTIC\n") >> CFILE; - printf("do_put:\n") >> CFILE; - printf("#endif\n") >> CFILE; - printf("\t\tret = __log_put(dbenv,\n") >> CFILE; - printf("\t\t ret_lsnp, (DBT *)&logrec, ") >> CFILE; - printf("flags | DB_LOG_NOCOPY);\n") >> CFILE; - - # Update the transactions last_lsn. - printf("\t\tif (ret == 0 && txnid != NULL)\n") >> CFILE; - printf("\t\t\ttxnid->last_lsn = *ret_lsnp;\n") >> CFILE; - printf("\t}\n\n") >> CFILE; - printf("\tif (!is_durable)\n") >> CFILE; - printf("\t\tLSN_NOT_LOGGED(*ret_lsnp);\n") >> CFILE; + } + # If out of disk space log writes may fail. If we are debugging + # that print out which records did not make it to disk. + printf("#ifdef LOG_DIAGNOSTIC\n") >> CFILE + printf("\tif (ret != 0)\n") >> CFILE; + printf("\t\t(void)%s_print(dbenv,\n", funcname) >> CFILE; + printf("\t\t (DBT *)&logrec, ret_lsnp, NULL, NULL);\n") \ + >> CFILE + printf("#endif\n\n") >> CFILE + # Free and return + if (dbprivate) { + printf("#ifdef DIAGNOSTIC\n") >> CFILE + write_free("\t", "logrec.data", CFILE) + printf("#else\n") >> CFILE + printf("\tif (is_durable || txnid == NULL)\n") >> CFILE; + write_free("\t\t", "logrec.data", CFILE) + printf("#endif\n") >> CFILE + } else { + write_free("\t", "logrec.data", CFILE) + } } else { - printf("\tret = dbenv->log_put(dbenv, ") >> CFILE; - printf("ret_lsnp, (DBT *)&logrec, flags);\n") >> CFILE; - - # Update the transactions last_lsn. - printf("\tif (ret == 0 && txnid != NULL)\n") >> CFILE; - printf("\t\ttxnid->last_lsn = *ret_lsnp;\n\n") >> CFILE; + printf("\t*lenp = (u_int32_t)(bp - buf);\n\n") >> CFILE } - # If out of disk space log writes may fail. If we are debugging - # that print out which records did not make it to disk. - printf("#ifdef LOG_DIAGNOSTIC\n") >> CFILE - printf("\tif (ret != 0)\n") >> CFILE; - printf("\t\t(void)%s_print(dbenv,\n", funcname) >> CFILE; - printf("\t\t (DBT *)&logrec, ret_lsnp, NULL, NULL);\n") >> CFILE - printf("#endif\n") >> CFILE - - # Free and return - if (dbprivate) { - printf("#ifndef DIAGNOSTIC\n") >> CFILE - printf("\tif (is_durable || txnid == NULL)\n") >> CFILE; - printf("#endif\n") >> CFILE - write_free("\t\t", "logrec.data", CFILE) - } else { - write_free("\t", "logrec.data", CFILE) - } printf("\treturn (ret);\n}\n\n") >> CFILE; } @@ -606,125 +685,143 @@ function print_function() { p[2] = " "; p[3] = "__P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));"; p[4] = ""; - proto_format(p); + proto_format(p, PFILE); # Function declaration - printf("int\n%s_print(dbenv, ", funcname) >> CFILE; - printf("dbtp, lsnp, notused2, notused3)\n") >> CFILE; - printf("\tDB_ENV *dbenv;\n") >> CFILE; - printf("\tDBT *dbtp;\n") >> CFILE; - printf("\tDB_LSN *lsnp;\n") >> CFILE; - printf("\tdb_recops notused2;\n\tvoid *notused3;\n{\n") >> CFILE; + printf("int\n%s_print(dbenv, ", funcname) >> PFILE; + printf("dbtp, lsnp, notused2, notused3)\n") >> PFILE; + printf("\tDB_ENV *dbenv;\n") >> PFILE; + printf("\tDBT *dbtp;\n") >> PFILE; + printf("\tDB_LSN *lsnp;\n") >> PFILE; + printf("\tdb_recops notused2;\n\tvoid *notused3;\n{\n") >> PFILE; # Locals - printf("\t%s_args *argp;\n", funcname) >> CFILE; + printf("\t%s_args *argp;\n", funcname) >> PFILE; for (i = 0; i < nvars; i ++) if (modes[i] == "TIME") { - printf("\tstruct tm *lt;\n") >> CFILE + printf("\tstruct tm *lt;\n") >> PFILE + printf("\ttime_t timeval;\n") >> PFILE break; } for (i = 0; i < nvars; i ++) if (modes[i] == "DBT" || modes[i] == "PGDBT") { - printf("\tu_int32_t i;\n") >> CFILE - printf("\tint ch;\n") >> CFILE + printf("\tu_int32_t i;\n") >> PFILE + printf("\tint ch;\n") >> PFILE break; } - printf("\tint ret;\n\n") >> CFILE; + printf("\tint ret;\n\n") >> PFILE; # Get rid of complaints about unused parameters. - printf("\tnotused2 = DB_TXN_ABORT;\n\tnotused3 = NULL;\n\n") >> CFILE; + printf("\tnotused2 = DB_TXN_ABORT;\n\tnotused3 = NULL;\n\n") >> PFILE; # Call read routine to initialize structure printf("\tif ((ret = %s_read(dbenv, dbtp->data, &argp)) != 0)\n", \ - funcname) >> CFILE; - printf("\t\treturn (ret);\n") >> CFILE; + funcname) >> PFILE; + printf("\t\treturn (ret);\n") >> PFILE; # Print values in every record printf("\t(void)printf(\n\t \"[%%lu][%%lu]%s%%s: ",\ - funcname) >> CFILE; - printf("rec: %%lu txnid %%lx ") >> CFILE; - printf("prevlsn [%%lu][%%lu]\\n\",\n") >> CFILE; - printf("\t (u_long)lsnp->file,\n") >> CFILE; - printf("\t (u_long)lsnp->offset,\n") >> CFILE; + funcname) >> PFILE; + printf("rec: %%lu txnid %%lx ") >> PFILE; + printf("prevlsn [%%lu][%%lu]\\n\",\n") >> PFILE; + printf("\t (u_long)lsnp->file,\n") >> PFILE; + printf("\t (u_long)lsnp->offset,\n") >> PFILE; printf("\t (argp->type & DB_debug_FLAG) ? \"_debug\" : \"\",\n") \ - >> CFILE; - printf("\t (u_long)argp->type,\n") >> CFILE; - printf("\t (u_long)argp->txnid->txnid,\n") >> CFILE; - printf("\t (u_long)argp->prev_lsn.file,\n") >> CFILE; - printf("\t (u_long)argp->prev_lsn.offset);\n") >> CFILE; + >> PFILE; + printf("\t (u_long)argp->type,\n") >> PFILE; + printf("\t (u_long)argp->txnid->txnid,\n") >> PFILE; + printf("\t (u_long)argp->prev_lsn.file,\n") >> PFILE; + printf("\t (u_long)argp->prev_lsn.offset);\n") >> PFILE; # Now print fields of argp for (i = 0; i < nvars; i ++) { if (modes[i] == "TIME") { - printf("\tlt = localtime((time_t *)&argp->%s);\n", - vars[i]) >> CFILE; + printf("\ttimeval = (time_t)argp->%s;\n", + vars[i]) >> PFILE; + printf("\tlt = localtime(&timeval);\n") >> PFILE; printf("\t(void)printf(\n\t \"\\t%s: ", - vars[i]) >> CFILE; + vars[i]) >> PFILE; } else - printf("\t(void)printf(\"\\t%s: ", vars[i]) >> CFILE; + printf("\t(void)printf(\"\\t%s: ", vars[i]) >> PFILE; if (modes[i] == "DBT" || modes[i] == "PGDBT") { - printf("\");\n") >> CFILE; - printf("\tfor (i = 0; i < ") >> CFILE; - printf("argp->%s.size; i++) {\n", vars[i]) >> CFILE; + printf("\");\n") >> PFILE; + printf("\tfor (i = 0; i < ") >> PFILE; + printf("argp->%s.size; i++) {\n", vars[i]) >> PFILE; printf("\t\tch = ((u_int8_t *)argp->%s.data)[i];\n", \ - vars[i]) >> CFILE; - printf("\t\tprintf(isprint(ch) || ch == 0x0a") >> CFILE; - printf(" ? \"%%c\" : \"%%#x \", ch);\n") >> CFILE; - printf("\t}\n\t(void)printf(\"\\n\");\n") >> CFILE; + vars[i]) >> PFILE; + printf("\t\tprintf(isprint(ch) || ch == 0x0a") >> PFILE; + printf(" ? \"%%c\" : \"%%#x \", ch);\n") >> PFILE; + printf("\t}\n\t(void)printf(\"\\n\");\n") >> PFILE; } else if (types[i] == "DB_LSN *") { printf("[%%%s][%%%s]\\n\",\n", \ - formats[i], formats[i]) >> CFILE; + formats[i], formats[i]) >> PFILE; printf("\t (u_long)argp->%s.file,", \ - vars[i]) >> CFILE; + vars[i]) >> PFILE; printf(" (u_long)argp->%s.offset);\n", \ - vars[i]) >> CFILE; + vars[i]) >> PFILE; } else if (modes[i] == "TIME") { # Time values are displayed in two ways: the standard # string returned by ctime, and in the input format # expected by db_recover -t. printf(\ "%%%s (%%.24s, 20%%02lu%%02lu%%02lu%%02lu%%02lu.%%02lu)\\n\",\n", \ - formats[i]) >> CFILE; - printf("\t (long)argp->%s, ", vars[i]) >> CFILE; - printf("ctime((time_t *)&argp->%s),", vars[i]) >> CFILE; - printf("\n\t (u_long)lt->tm_year - 100, ") >> CFILE; - printf("(u_long)lt->tm_mon+1,") >> CFILE; - printf("\n\t (u_long)lt->tm_mday, ") >> CFILE; - printf("(u_long)lt->tm_hour,") >> CFILE; - printf("\n\t (u_long)lt->tm_min, ") >> CFILE; - printf("(u_long)lt->tm_sec);\n") >> CFILE; + formats[i]) >> PFILE; + printf("\t (long)argp->%s, ", vars[i]) >> PFILE; + printf("ctime(&timeval),", vars[i]) >> PFILE; + printf("\n\t (u_long)lt->tm_year - 100, ") >> PFILE; + printf("(u_long)lt->tm_mon+1,") >> PFILE; + printf("\n\t (u_long)lt->tm_mday, ") >> PFILE; + printf("(u_long)lt->tm_hour,") >> PFILE; + printf("\n\t (u_long)lt->tm_min, ") >> PFILE; + printf("(u_long)lt->tm_sec);\n") >> PFILE; + } else if (modes[i] == "LOCKS") { + printf("\\n\");\n") >> PFILE; + printf("\t__lock_list_print(dbenv, &argp->locks);\n") \ + >> PFILE; } else { if (formats[i] == "lx") - printf("0x") >> CFILE; - printf("%%%s\\n\", ", formats[i]) >> CFILE; + printf("0x") >> PFILE; + printf("%%%s\\n\", ", formats[i]) >> PFILE; if (formats[i] == "lx" || formats[i] == "lu") - printf("(u_long)") >> CFILE; + printf("(u_long)") >> PFILE; if (formats[i] == "ld") - printf("(long)") >> CFILE; - printf("argp->%s);\n", vars[i]) >> CFILE; + printf("(long)") >> PFILE; + printf("argp->%s);\n", vars[i]) >> PFILE; } } - printf("\t(void)printf(\"\\n\");\n") >> CFILE; - write_free("\t", "argp", CFILE); - printf("\treturn (0);\n") >> CFILE; - printf("}\n\n") >> CFILE; + printf("\t(void)printf(\"\\n\");\n") >> PFILE; + write_free("\t", "argp", PFILE); + printf("\treturn (0);\n") >> PFILE; + printf("}\n\n") >> PFILE; } function read_function() { # Write the read function; function prototype - p[1] = sprintf("int %s_read __P((DB_ENV *, void *,", funcname); + if (not_buf == 1) + p[1] = sprintf("int %s_read __P((DB_ENV *, void *,", funcname); + else + p[1] = sprintf("int %s_read __P((DB_ENV *, void *, void **,", \ + funcname); p[2] = " "; p[3] = sprintf("%s_args **));", funcname); p[4] = ""; - proto_format(p); + proto_format(p, CFILE); # Function declaration - printf("int\n%s_read(dbenv, recbuf, argpp)\n", funcname) >> CFILE; + if (not_buf == 1) + printf("int\n%s_read(dbenv, recbuf, argpp)\n", funcname) \ + >> CFILE; + else + printf(\ + "int\n%s_read(dbenv, recbuf, nextp, argpp)\n", funcname) \ + >> CFILE; # Now print the parameters printf("\tDB_ENV *dbenv;\n") >> CFILE; printf("\tvoid *recbuf;\n") >> CFILE; + if (not_buf == 0) + printf("\tvoid **nextp;\n") >> CFILE; printf("\t%s_args **argpp;\n", funcname) >> CFILE; # Function body and local decls @@ -742,26 +839,37 @@ function read_function() { printf("\n\tdbenv = NULL;\n") >> CFILE; } - malloc_size = sprintf("sizeof(%s_args) + sizeof(DB_TXN)", funcname) + if (not_buf == 1) { + malloc_size = sprintf("sizeof(%s_args) + sizeof(DB_TXN)", \ + funcname) + } else { + malloc_size = sprintf("sizeof(%s_args)", funcname) + } write_malloc("\t", "argp", malloc_size, CFILE) # Set up the pointers to the txnid. - printf("\targp->txnid = (DB_TXN *)&argp[1];\n\n") >> CFILE; + printf("\tbp = recbuf;\n") >> CFILE; - # First get the record type, prev_lsn, and txnid fields. + if (not_buf == 1) { + printf("\targp->txnid = (DB_TXN *)&argp[1];\n\n") >> CFILE; - printf("\tbp = recbuf;\n") >> CFILE; - printf("\tmemcpy(&argp->type, bp, sizeof(argp->type));\n") >> CFILE; - printf("\tbp += sizeof(argp->type);\n\n") >> CFILE; - printf("\tmemcpy(&argp->txnid->txnid, bp, ") >> CFILE; - printf("sizeof(argp->txnid->txnid));\n") >> CFILE; - printf("\tbp += sizeof(argp->txnid->txnid);\n\n") >> CFILE; - printf("\tmemcpy(&argp->prev_lsn, bp, sizeof(DB_LSN));\n") >> CFILE; - printf("\tbp += sizeof(DB_LSN);\n\n") >> CFILE; + # First get the record type, prev_lsn, and txnid fields. + + printf("\tmemcpy(&argp->type, bp, sizeof(argp->type));\n") \ + >> CFILE; + printf("\tbp += sizeof(argp->type);\n\n") >> CFILE; + printf("\tmemcpy(&argp->txnid->txnid, bp, ") >> CFILE; + printf("sizeof(argp->txnid->txnid));\n") >> CFILE; + printf("\tbp += sizeof(argp->txnid->txnid);\n\n") >> CFILE; + printf("\tmemcpy(&argp->prev_lsn, bp, sizeof(DB_LSN));\n") \ + >> CFILE; + printf("\tbp += sizeof(DB_LSN);\n\n") >> CFILE; + } # Now get rest of data. for (i = 0; i < nvars; i ++) { - if (modes[i] == "DBT" || modes[i] == "PGDBT") { + if (modes[i] == "DBT" || \ + modes[i] == "LOCKS" || modes[i] == "PGDBT") { printf("\tmemset(&argp->%s, 0, sizeof(argp->%s));\n", \ vars[i], vars[i]) >> CFILE; printf("\tmemcpy(&argp->%s.size, ", vars[i]) >> CFILE; @@ -785,119 +893,17 @@ function read_function() { } # Free and return + if (not_buf == 0) + printf("\t*nextp = bp;\n") >> CFILE; printf("\t*argpp = argp;\n") >> CFILE; printf("\treturn (0);\n}\n\n") >> CFILE; } -function getpgnos_function() { - # Write the getpgnos function; function prototype - printf("#ifdef HAVE_REPLICATION\n") >> CFILE; - p[1] = sprintf("int %s_getpgnos", funcname); - p[2] = " "; - p[3] = "__P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));"; - p[4] = ""; - proto_format(p); - - # Function declaration - printf("int\n%s_getpgnos(dbenv, ", funcname) >> CFILE; - printf("rec, lsnp, notused1, summary)\n") >> CFILE; - printf("\tDB_ENV *dbenv;\n") >> CFILE; - printf("\tDBT *rec;\n") >> CFILE; - printf("\tDB_LSN *lsnp;\n") >> CFILE; - printf("\tdb_recops notused1;\n") >> CFILE; - printf("\tvoid *summary;\n{\n") >> CFILE; - - # If there are no locks, return this fact. - if (nlocks == 0) { - printf("\tTXN_RECS *t;\n") >> CFILE; - printf("\tint ret;\n") >> CFILE; - printf("\tCOMPQUIET(rec, NULL);\n") >> CFILE; - printf("\tCOMPQUIET(notused1, DB_TXN_ABORT);\n") >> CFILE; - - printf("\n\tt = (TXN_RECS *)summary;\n") >> CFILE; - printf("\n\tif ((ret = __rep_check_alloc(dbenv, ") >> CFILE; - printf("t, 1)) != 0)\n") >> CFILE; - printf("\t\treturn (ret);\n") >> CFILE; - - printf("\n\tt->array[t->npages].flags = LSN_PAGE_NOLOCK;\n") \ - >> CFILE; - printf("\tt->array[t->npages].lsn = *lsnp;\n") >> CFILE; - printf("\tt->array[t->npages].fid = DB_LOGFILEID_INVALID;\n") \ - >> CFILE; - printf("\tmemset(&t->array[t->npages].pgdesc, 0,\n") >> CFILE; - printf("\t sizeof(t->array[t->npages].pgdesc));\n") >> CFILE; - printf("\n\tt->npages++;\n") >> CFILE; - - printf("\n") >> CFILE; - printf("\treturn (0);\n") >> CFILE; - printf("}\n#endif /* HAVE_REPLICATION */\n\n") >> CFILE; - return; - } - - # Locals - printf("\tDB *dbp;\n") >> CFILE; - printf("\tTXN_RECS *t;\n") >> CFILE; - printf("\t%s_args *argp;\n", funcname) >> CFILE; - printf("\tint ret;\n\n") >> CFILE; - - # Shut up compiler. - printf("\tCOMPQUIET(notused1, DB_TXN_ABORT);\n\n") >> CFILE; - - printf("\targp = NULL;\n") >> CFILE; - printf("\tt = (TXN_RECS *)summary;\n\n") >> CFILE; - - printf("\tif ((ret = %s_read(dbenv, rec->data, &argp)) != 0)\n", \ - funcname) >> CFILE; - printf("\t\treturn (ret);\n") >> CFILE; - - # Get file ID. - printf("\n\tif ((ret = __dbreg_id_to_db(dbenv,\n\t ") >> CFILE; - printf("argp->txnid, &dbp, argp->fileid, 0)) != 0)\n") >> CFILE; - printf("\t\tgoto err;\n") >> CFILE; - - printf("\n\tif ((ret = __rep_check_alloc(dbenv, t, %d)) != 0)\n", \ - nlocks) >> CFILE; - printf("\t\tgoto err;\n\n") >> CFILE; - - for (i = 1; i <= nlocks; i++) { - if (lock_if_zero[i]) { - indent = "\t"; - } else { - indent = "\t\t"; - printf("\tif (argp->%s != PGNO_INVALID) {\n", \ - lock_pgnos[i]) >> CFILE; - } - printf("%st->array[t->npages].flags = 0;\n", indent) >> CFILE; - printf("%st->array[t->npages].fid = argp->fileid;\n", indent) \ - >> CFILE; - printf("%st->array[t->npages].lsn = *lsnp;\n", indent) >> CFILE; - printf("%st->array[t->npages].pgdesc.pgno = argp->%s;\n", \ - indent, lock_pgnos[i]) >> CFILE; - printf("%st->array[t->npages].pgdesc.type = DB_PAGE_LOCK;\n", \ - indent) >> CFILE; - printf("%smemcpy(t->array[t->npages].pgdesc.fileid, ", indent) \ - >> CFILE; - printf("dbp->fileid,\n%s DB_FILE_ID_LEN);\n", \ - indent, indent) >> CFILE; - printf("%st->npages++;\n", indent) >> CFILE; - if (!lock_if_zero[i]) { - printf("\t}\n") >> CFILE; - } - } - - printf("\nerr:\tif (argp != NULL)\n") >> CFILE; - write_free("\t", "argp", CFILE); - - printf("\treturn (ret);\n") >> CFILE; - - printf("}\n#endif /* HAVE_REPLICATION */\n\n") >> CFILE; -} - # proto_format -- # Pretty-print a function prototype. -function proto_format(p) +function proto_format(p, fp) { - printf("/*\n") >> CFILE; + printf("/*\n") >> fp; s = ""; for (i = 1; i in p; ++i) @@ -905,24 +911,24 @@ function proto_format(p) t = " * PUBLIC: " if (length(s) + length(t) < 80) - printf("%s%s", t, s) >> CFILE; + printf("%s%s", t, s) >> fp; else { split(s, p, "__P"); len = length(t) + length(p[1]); - printf("%s%s", t, p[1]) >> CFILE + printf("%s%s", t, p[1]) >> fp n = split(p[2], comma, ","); comma[1] = "__P" comma[1]; for (i = 1; i <= n; i++) { if (len + length(comma[i]) > 70) { - printf("\n * PUBLIC: ") >> CFILE; + printf("\n * PUBLIC: ") >> fp; len = 0; } - printf("%s%s", comma[i], i == n ? "" : ",") >> CFILE; + printf("%s%s", comma[i], i == n ? "" : ",") >> fp; len += length(comma[i]) + 2; } } - printf("\n */\n") >> CFILE; + printf("\n */\n") >> fp; delete p; } @@ -941,8 +947,8 @@ function write_malloc(tab, ptr, size, file) function write_free(tab, ptr, file) { if (dbprivate) { - print(tab "__os_free(dbenv, " ptr ");\n") >> file + print(tab "__os_free(dbenv, " ptr ");") >> file } else { - print(tab "free(" ptr ");\n") >> file + print(tab "free(" ptr ");") >> file } } diff --git a/db/dist/gen_rpc.awk b/db/dist/gen_rpc.awk index 9e57a98f3..7eee77b3d 100644 --- a/db/dist/gen_rpc.awk +++ b/db/dist/gen_rpc.awk @@ -1,5 +1,5 @@ # -# $Id: gen_rpc.awk,v 11.54 2003/09/04 23:59:03 bostic Exp $ +# $Id: gen_rpc.awk,v 11.58 2004/08/19 20:28:37 mjc Exp $ # Awk script for generating client/server RPC code. # # This awk script generates most of the RPC routines for DB client/server @@ -14,7 +14,6 @@ # xidsize -- size of GIDs # client_file -- the C source file being created for client code # ctmpl_file -- the C template file being created for client code -# sed_file -- the sed file created to alter server proc code # server_file -- the C source file being created for server code # stmpl_file -- the C template file being created for server code # xdr_file -- the XDR message file created @@ -23,15 +22,13 @@ BEGIN { if (major == "" || minor == "" || xidsize == "" || client_file == "" || ctmpl_file == "" || - sed_file == "" || server_file == "" || - stmpl_file == "" || xdr_file == "") { + server_file == "" || stmpl_file == "" || xdr_file == "") { print "Usage: gen_rpc.awk requires these variables be set:" print "\tmajor\t-- Major version number" print "\tminor\t-- Minor version number" print "\txidsize\t-- GID size" print "\tclient_file\t-- the client C source file being created" print "\tctmpl_file\t-- the client template file being created" - print "\tsed_file\t-- the sed command file being created" print "\tserver_file\t-- the server C source file being created" print "\tstmpl_file\t-- the server template file being created" print "\txdr_file\t-- the XDR message file being created" @@ -51,32 +48,24 @@ BEGIN { printf("/* Do not edit: automatically built by gen_rpc.awk. */\n") \ > SFILE - # Server procedure template and a sed file to massage an existing - # template source file to change args. - # SEDFILE should be same name as PFILE but .c - # + # Server procedure template. PFILE = stmpl_file - SEDFILE = sed_file - printf("") > SEDFILE - printf("/* Do not edit: automatically built by gen_rpc.awk. */\n") \ - > PFILE - XFILE = xdr_file printf("/* Do not edit: automatically built by gen_rpc.awk. */\n") \ > XFILE nendlist = 1; } END { - printf("#endif /* HAVE_RPC */\n") >> CFILE - printf("#endif /* HAVE_RPC */\n") >> TFILE - printf("program DB_RPC_SERVERPROG {\n") >> XFILE - printf("\tversion DB_RPC_SERVERVERS {\n") >> XFILE + if (error == 0) { + printf("program DB_RPC_SERVERPROG {\n") >> XFILE + printf("\tversion DB_RPC_SERVERVERS {\n") >> XFILE - for (i = 1; i < nendlist; ++i) - printf("\t\t%s;\n", endlist[i]) >> XFILE + for (i = 1; i < nendlist; ++i) + printf("\t\t%s;\n", endlist[i]) >> XFILE - printf("\t} = %d%03d;\n", major, minor) >> XFILE - printf("} = 351457;\n") >> XFILE + printf("\t} = %d%03d;\n", major, minor) >> XFILE + printf("} = 351457;\n") >> XFILE + } } /^[ ]*BEGIN/ { @@ -205,33 +194,29 @@ END { if (first == 0) { printf("#include \"db_config.h\"\n") >> CFILE printf("\n") >> CFILE - printf("#ifdef HAVE_RPC\n") >> CFILE printf("#ifndef NO_SYSTEM_INCLUDES\n") >> CFILE - printf("#include <sys/types.h>\n\n") >> CFILE + printf("#include <sys/types.h>\n") >> CFILE + printf("\n") >> CFILE printf("#include <rpc/rpc.h>\n") >> CFILE - printf("#include <rpc/xdr.h>\n") >> CFILE printf("\n") >> CFILE printf("#include <string.h>\n") >> CFILE printf("#endif\n") >> CFILE printf("\n") >> CFILE + printf("#include \"db_server.h\"\n") >> CFILE + printf("\n") >> CFILE printf("#include \"db_int.h\"\n") >> CFILE printf("#include \"dbinc/txn.h\"\n") >> CFILE - printf("\n") >> CFILE - printf("#include \"dbinc_auto/db_server.h\"\n") >> CFILE printf("#include \"dbinc_auto/rpc_client_ext.h\"\n") >> CFILE printf("\n") >> CFILE printf("#include \"db_config.h\"\n") >> TFILE printf("\n") >> TFILE - printf("#ifdef HAVE_RPC\n") >> TFILE printf("#ifndef NO_SYSTEM_INCLUDES\n") >> TFILE printf("#include <sys/types.h>\n") >> TFILE - printf("#include <rpc/rpc.h>\n") >> TFILE printf("\n") >> TFILE printf("#include <string.h>\n") >> TFILE printf("#endif\n") >> TFILE printf("#include \"db_int.h\"\n") >> TFILE - printf("#include \"dbinc_auto/db_server.h\"\n") >> TFILE printf("#include \"dbinc/txn.h\"\n") >> TFILE printf("\n") >> TFILE @@ -241,13 +226,13 @@ END { printf("#include <sys/types.h>\n") >> SFILE printf("\n") >> SFILE printf("#include <rpc/rpc.h>\n") >> SFILE - printf("#include <rpc/xdr.h>\n") >> SFILE printf("\n") >> SFILE printf("#include <string.h>\n") >> SFILE printf("#endif\n") >> SFILE printf("\n") >> SFILE + printf("#include \"db_server.h\"\n") >> SFILE + printf("\n") >> SFILE printf("#include \"db_int.h\"\n") >> SFILE - printf("#include \"dbinc_auto/db_server.h\"\n") >> SFILE printf("#include \"dbinc/db_server_int.h\"\n") >> SFILE printf("#include \"dbinc_auto/rpc_server_ext.h\"\n") >> SFILE printf("\n") >> SFILE @@ -262,10 +247,10 @@ END { printf("#include <string.h>\n") >> PFILE printf("#endif\n") >> PFILE printf("\n") >> PFILE + printf("#include \"db_server.h\"\n") >> PFILE + printf("\n") >> PFILE printf("#include \"db_int.h\"\n") >> PFILE - printf("#include \"dbinc_auto/db_server.h\"\n") >> PFILE printf("#include \"dbinc/db_server_int.h\"\n") >> PFILE - printf("#include \"dbinc_auto/rpc_server_ext.h\"\n") >> PFILE printf("\n") >> PFILE first = 1; @@ -310,6 +295,7 @@ END { # # Spit out PUBLIC prototypes. # + delete p; pi = 1; p[pi++] = sprintf("int __dbcl_%s __P((", name); p[pi++] = ""; @@ -318,9 +304,8 @@ END { p[pi++] = ", "; } p[pi - 1] = ""; - p[pi++] = "));"; - p[pi] = ""; - proto_format(p, 0, CFILE); + p[pi] = "));"; + proto_format(p, CFILE); # # Spit out function name/args. @@ -476,13 +461,9 @@ END { # # First spit out PUBLIC prototypes for server functions. # - p[1] = sprintf("__%s_reply *__db_%s_%d%03d __P((__%s_msg *, struct svc_req *));", - name, name, major, minor, name); - p[2] = ""; - proto_format(p, 0, SFILE); - printf("__%s_reply *\n", name) >> SFILE - printf("__db_%s_%d%03d(msg, req)\n", name, major, minor) >> SFILE + printf("__db_%s_%d%03d__SVCSUFFIX__(msg, req)\n", \ + name, major, minor) >> SFILE printf("\t__%s_msg *msg;\n", name) >> SFILE; printf("\tstruct svc_req *req;\n", name) >> SFILE; printf("{\n") >> SFILE @@ -529,7 +510,7 @@ END { sep, args[i], args[i]) >> SFILE } if (rpc_type[i] == "GID") { - printf("%smsg->%s", sep, args[i]) >> SFILE + printf("%s(u_int8_t *)msg->%s", sep, args[i]) >> SFILE } if (rpc_type[i] == "INT") { printf("%smsg->%s", sep, args[i]) >> SFILE @@ -568,16 +549,9 @@ END { # ===================================================== # Generate Procedure Template Server code # - # Produce SED file commands if needed at the same time - # # Spit out comment, prototype, function name and arg list. - # - printf("/^\\/\\* BEGIN __%s_proc/,/^\\/\\* END __%s_proc/c\\\n", \ - name, name) >> SEDFILE - printf("/* BEGIN __%s_proc */\n", name) >> PFILE - printf("/* BEGIN __%s_proc */\\\n", name) >> SEDFILE - + delete p; pi = 1; p[pi++] = sprintf("void __%s_proc __P((", name); p[pi++] = ""; @@ -646,12 +620,9 @@ END { p[pi++] = "));"; } p[pi++] = ""; - proto_format(p, 1, SEDFILE); printf("void\n") >> PFILE - printf("void\\\n") >> SEDFILE printf("__%s_proc(", name) >> PFILE - printf("__%s_proc(", name) >> SEDFILE sep = ""; argcount = 0; for (i = 0; i < nvars; ++i) { @@ -664,27 +635,21 @@ END { continue; if (rpc_type[i] == "ID") { printf("%s%scl_id", sep, args[i]) >> PFILE - printf("%s%scl_id", sep, args[i]) >> SEDFILE } if (rpc_type[i] == "STRING") { printf("%s%s", sep, args[i]) >> PFILE - printf("%s%s", sep, args[i]) >> SEDFILE } if (rpc_type[i] == "GID") { printf("%s%s", sep, args[i]) >> PFILE - printf("%s%s", sep, args[i]) >> SEDFILE } if (rpc_type[i] == "INT") { printf("%s%s", sep, args[i]) >> PFILE - printf("%s%s", sep, args[i]) >> SEDFILE } if (rpc_type[i] == "INTRET") { printf("%s%s", sep, args[i]) >> PFILE - printf("%s%s", sep, args[i]) >> SEDFILE } if (rpc_type[i] == "LIST") { printf("%s%s", sep, args[i]) >> PFILE - printf("%s%s", sep, args[i]) >> SEDFILE argcount++; split_lines(); if (argcount == 0) { @@ -693,11 +658,9 @@ END { sep = ", "; } printf("%s%slen", sep, args[i]) >> PFILE - printf("%s%slen", sep, args[i]) >> SEDFILE } if (rpc_type[i] == "DBT") { printf("%s%sdlen", sep, args[i]) >> PFILE - printf("%s%sdlen", sep, args[i]) >> SEDFILE sep = ", "; argcount++; split_lines(); @@ -707,7 +670,6 @@ END { sep = ", "; } printf("%s%sdoff", sep, args[i]) >> PFILE - printf("%s%sdoff", sep, args[i]) >> SEDFILE argcount++; split_lines(); if (argcount == 0) { @@ -716,7 +678,6 @@ END { sep = ", "; } printf("%s%sulen", sep, args[i]) >> PFILE - printf("%s%sulen", sep, args[i]) >> SEDFILE argcount++; split_lines(); if (argcount == 0) { @@ -725,7 +686,6 @@ END { sep = ", "; } printf("%s%sflags", sep, args[i]) >> PFILE - printf("%s%sflags", sep, args[i]) >> SEDFILE argcount++; split_lines(); if (argcount == 0) { @@ -734,7 +694,6 @@ END { sep = ", "; } printf("%s%sdata", sep, args[i]) >> PFILE - printf("%s%sdata", sep, args[i]) >> SEDFILE argcount++; split_lines(); if (argcount == 0) { @@ -743,18 +702,14 @@ END { sep = ", "; } printf("%s%ssize", sep, args[i]) >> PFILE - printf("%s%ssize", sep, args[i]) >> SEDFILE } sep = ", "; } printf("%sreplyp",sep) >> PFILE - printf("%sreplyp",sep) >> SEDFILE if (xdr_free) { printf("%sfreep)\n",sep) >> PFILE - printf("%sfreep)\\\n",sep) >> SEDFILE } else { printf(")\n") >> PFILE - printf(")\\\n") >> SEDFILE } # # Spit out arg types/names; @@ -762,65 +717,44 @@ END { for (i = 0; i < nvars; ++i) { if (rpc_type[i] == "ID") { printf("\tlong %scl_id;\n", args[i]) >> PFILE - printf("\\\tlong %scl_id;\\\n", args[i]) >> SEDFILE } if (rpc_type[i] == "STRING") { printf("\tchar *%s;\n", args[i]) >> PFILE - printf("\\\tchar *%s;\\\n", args[i]) >> SEDFILE } if (rpc_type[i] == "GID") { printf("\tu_int8_t *%s;\n", args[i]) >> PFILE - printf("\\\tu_int8_t *%s;\\\n", args[i]) >> SEDFILE } if (rpc_type[i] == "INT") { printf("\tu_int32_t %s;\n", args[i]) >> PFILE - printf("\\\tu_int32_t %s;\\\n", args[i]) >> SEDFILE } if (rpc_type[i] == "LIST" && list_type[i] == "GID") { printf("\tu_int8_t * %s;\n", args[i]) >> PFILE - printf("\\\tu_int8_t * %s;\\\n", args[i]) >> SEDFILE } if (rpc_type[i] == "LIST" && list_type[i] == "INT") { printf("\tu_int32_t * %s;\n", args[i]) >> PFILE - printf("\\\tu_int32_t * %s;\\\n", \ - args[i]) >> SEDFILE printf("\tu_int32_t %ssize;\n", args[i]) >> PFILE - printf("\\\tu_int32_t %ssize;\\\n", args[i]) >> SEDFILE } if (rpc_type[i] == "LIST" && list_type[i] == "ID") { printf("\tu_int32_t * %s;\n", args[i]) >> PFILE - printf("\\\tu_int32_t * %s;\\\n", args[i]) \ - >> SEDFILE } if (rpc_type[i] == "LIST") { printf("\tu_int32_t %slen;\n", args[i]) >> PFILE - printf("\\\tu_int32_t %slen;\\\n", args[i]) \ - >> SEDFILE } if (rpc_type[i] == "DBT") { printf("\tu_int32_t %sdlen;\n", args[i]) >> PFILE - printf("\\\tu_int32_t %sdlen;\\\n", args[i]) >> SEDFILE printf("\tu_int32_t %sdoff;\n", args[i]) >> PFILE - printf("\\\tu_int32_t %sdoff;\\\n", args[i]) >> SEDFILE printf("\tu_int32_t %sulen;\n", args[i]) >> PFILE - printf("\\\tu_int32_t %sulen;\\\n", args[i]) >> SEDFILE printf("\tu_int32_t %sflags;\n", args[i]) >> PFILE - printf("\\\tu_int32_t %sflags;\\\n", args[i]) >> SEDFILE printf("\tvoid *%sdata;\n", args[i]) >> PFILE - printf("\\\tvoid *%sdata;\\\n", args[i]) >> SEDFILE printf("\tu_int32_t %ssize;\n", args[i]) >> PFILE - printf("\\\tu_int32_t %ssize;\\\n", args[i]) >> SEDFILE } } printf("\t__%s_reply *replyp;\n",name) >> PFILE - printf("\\\t__%s_reply *replyp;\\\n",name) >> SEDFILE if (xdr_free) { printf("\tint * freep;\n") >> PFILE - printf("\\\tint * freep;\\\n") >> SEDFILE } printf("/* END __%s_proc */\n", name) >> PFILE - printf("/* END __%s_proc */\n", name) >> SEDFILE # # Function body @@ -853,6 +787,7 @@ END { # # Spit out PUBLIC prototypes. # + delete p; pi = 1; p[pi++] = sprintf("int __dbcl_%s __P((", name); p[pi++] = ""; @@ -861,9 +796,8 @@ END { p[pi++] = ", "; } p[pi - 1] = ""; - p[pi++] = "));"; - p[pi] = ""; - proto_format(p, 0, CFILE); + p[pi] = "));"; + proto_format(p, CFILE); # # Spit out function name/args. @@ -1106,6 +1040,7 @@ END { # # If we are doing a list, write prototypes # + delete p; pi = 1; p[pi++] = sprintf("int __dbcl_%s_ret __P((", name); p[pi++] = ""; @@ -1113,9 +1048,8 @@ END { p[pi++] = pr_type[i]; p[pi++] = ", "; } - p[pi++] = sprintf("__%s_reply *));", name); - p[pi++] = ""; - proto_format(p, 0, TFILE); + p[pi] = sprintf("__%s_reply *));", name); + proto_format(p, TFILE); printf("int\n") >> TFILE printf("__dbcl_%s_ret(", name) >> TFILE @@ -1206,32 +1140,22 @@ function split_lines() { sub("[ ]$", "", sep) printf("%s\n\t\t", sep) >> PFILE - printf("%s\\\n\\\t\\\t", sep) >> SEDFILE } } # proto_format -- # Pretty-print a function prototype. -function proto_format(p, sedfile, OUTPUT) +function proto_format(p, OUTPUT) { - if (sedfile) - printf("/*\\\n") >> OUTPUT; - else - printf("/*\n") >> OUTPUT; + printf("/*\n") >> OUTPUT; s = ""; for (i = 1; i in p; ++i) s = s p[i]; - if (sedfile) - t = "\\ * PUBLIC: " - else - t = " * PUBLIC: " + t = " * PUBLIC: " if (length(s) + length(t) < 80) - if (sedfile) - printf("%s%s", t, s) >> OUTPUT; - else - printf("%s%s", t, s) >> OUTPUT; + printf("%s%s", t, s) >> OUTPUT; else { split(s, p, "__P"); len = length(t) + length(p[1]); @@ -1241,20 +1165,12 @@ function proto_format(p, sedfile, OUTPUT) comma[1] = "__P" comma[1]; for (i = 1; i <= n; i++) { if (len + length(comma[i]) > 75) { - if (sedfile) - printf(\ - "\\\n\\ * PUBLIC: ") >> OUTPUT; - else - printf("\n * PUBLIC: ") >> OUTPUT; + printf("\n * PUBLIC: ") >> OUTPUT; len = 0; } printf("%s%s", comma[i], i == n ? "" : ",") >> OUTPUT; len += length(comma[i]); } } - if (sedfile) - printf("\\\n\\ */\\\n") >> OUTPUT; - else - printf("\n */\n") >> OUTPUT; - delete p; + printf("\n */\n") >> OUTPUT; } diff --git a/db/dist/ltmain.sh b/db/dist/ltmain.sh index 3526e4b9b..c96a96ddd 100644 --- a/db/dist/ltmain.sh +++ b/db/dist/ltmain.sh @@ -1,7 +1,7 @@ # ltmain.sh - Provide generalized library-building support services. # NOTE: Changing this file will not affect anything until you rerun configure. # -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003 +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004 # Free Software Foundation, Inc. # Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 # @@ -24,6 +24,34 @@ # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. +basename="s,^.*/,,g" + +# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh +# is ksh but when the shell is invoked as "sh" and the current value of +# the _XPG environment variable is not equal to 1 (one), the special +# positional parameter $0, within a function call, is the name of the +# function. +progpath="$0" + +# The name of this program: +progname=`echo "$progpath" | $SED $basename` +modename="$progname" + +# Global variables: +EXIT_SUCCESS=0 +EXIT_FAILURE=1 + +PROGRAM=ltmain.sh +PACKAGE=libtool +VERSION=1.5.8 +TIMESTAMP=" (1.1220.2.117 2004/08/04 14:12:05)" + +# See if we are running on zsh, and set the options which allow our +# commands through without removal of \ escapes. +if test -n "${ZSH_VERSION+set}" ; then + setopt NO_GLOB_SUBST +fi + # Check that we have a working $echo. if test "X$1" = X--no-reexec; then # Discard the --no-reexec flag, and continue. @@ -36,7 +64,7 @@ elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then : else # Restart under the correct shell, and then maybe $echo will work. - exec $SHELL "$0" --no-reexec ${1+"$@"} + exec $SHELL "$progpath" --no-reexec ${1+"$@"} fi if test "X$1" = X--fallback-echo; then @@ -45,19 +73,9 @@ if test "X$1" = X--fallback-echo; then cat <<EOF $* EOF - exit 0 + exit $EXIT_SUCCESS fi -# The name of this program. -progname=`$echo "$0" | ${SED} 's%^.*/%%'` -modename="$progname" - -# Constants. -PROGRAM=ltmain.sh -PACKAGE=libtool -VERSION=1.5 -TIMESTAMP=" (1.1220 2003/04/05 19:32:58)" - default_mode= help="Try \`$progname --help' for more information." magic="%%%MAGIC variable%%%" @@ -94,12 +112,13 @@ if test "${LANG+set}" = set; then fi # Make sure IFS has a sensible default -: ${IFS=" "} +: ${IFS=" +"} if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then $echo "$modename: not configured to build any kind of library" 1>&2 $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 - exit 1 + exit $EXIT_FAILURE fi # Global variables. @@ -118,10 +137,13 @@ o2lo="s/\\.${objext}\$/.lo/" # Shell function definitions: # This seems to be the best place for them +# func_win32_libid arg +# return the library type of file 'arg' +# # Need a lot of goo to handle *both* DLLs and import libs # Has to be a shell function in order to 'eat' the argument # that is supplied when $file_magic_command is called. -win32_libid () { +func_win32_libid () { win32_libid_type="unknown" win32_fileres=`file -L $1 2>/dev/null` case $win32_fileres in @@ -130,7 +152,7 @@ win32_libid () { ;; *ar\ archive*) # could be an import, or static if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \ - grep -E 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then + $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then win32_nmres=`eval $NM -f posix -A $1 | \ sed -n -e '1,100{/ I /{x;/import/!{s/^/import/;h;p;};x;};}'` if test "X$win32_nmres" = "Ximport" ; then @@ -140,7 +162,7 @@ win32_libid () { fi fi ;; - *DLL*) + *DLL*) win32_libid_type="x86 DLL" ;; *executable*) # but shell scripts are "executable" too... @@ -154,9 +176,192 @@ win32_libid () { $echo $win32_libid_type } + +# func_infer_tag arg +# Infer tagged configuration to use if any are available and +# if one wasn't chosen via the "--tag" command line option. +# Only attempt this if the compiler in the base compile +# command doesn't match the default compiler. +# arg is usually of the form 'gcc ...' +func_infer_tag () { + if test -n "$available_tags" && test -z "$tagname"; then + CC_quoted= + for arg in $CC; do + case $arg in + *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") + arg="\"$arg\"" + ;; + esac + CC_quoted="$CC_quoted $arg" + done + case $@ in + # Blanks in the command may have been stripped by the calling shell, + # but not from the CC environment variable when configure was run. + " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*) ;; + # Blanks at the start of $base_compile will cause this to fail + # if we don't check for them as well. + *) + for z in $available_tags; do + if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then + # Evaluate the configuration. + eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`" + CC_quoted= + for arg in $CC; do + # Double-quote args containing other shell metacharacters. + case $arg in + *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") + arg="\"$arg\"" + ;; + esac + CC_quoted="$CC_quoted $arg" + done + case "$@ " in + " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*) + # The compiler in the base compile command matches + # the one in the tagged configuration. + # Assume this is the tagged configuration we want. + tagname=$z + break + ;; + esac + fi + done + # If $tagname still isn't set, then no tagged configuration + # was found and let the user know that the "--tag" command + # line option must be used. + if test -z "$tagname"; then + $echo "$modename: unable to infer tagged configuration" + $echo "$modename: specify a tag with \`--tag'" 1>&2 + exit $EXIT_FAILURE +# else +# $echo "$modename: using $tagname tagged configuration" + fi + ;; + esac + fi +} + + +# func_extract_archives gentop oldlib ... +func_extract_archives () { + my_gentop="$1"; shift + my_oldlibs=${1+"$@"} + my_oldobjs="" + my_xlib="" + my_xabs="" + my_xdir="" + my_status="" + + $show "${rm}r $my_gentop" + $run ${rm}r "$my_gentop" + $show "$mkdir $my_gentop" + $run $mkdir "$my_gentop" + my_status=$? + if test "$my_status" -ne 0 && test ! -d "$my_gentop"; then + exit $my_status + fi + + for my_xlib in $my_oldlibs; do + # Extract the objects. + case $my_xlib in + [\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;; + *) my_xabs=`pwd`"/$my_xlib" ;; + esac + my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'` + my_xdir="$my_gentop/$my_xlib" + + $show "${rm}r $my_xdir" + $run ${rm}r "$my_xdir" + $show "$mkdir $my_xdir" + $run $mkdir "$my_xdir" + status=$? + if test "$status" -ne 0 && test ! -d "$my_xdir"; then + exit $status + fi + case $host in + *-darwin*) + $show "Extracting $my_xabs" + # Do not bother doing anything if just a dry run + if test -z "$run"; then + darwin_orig_dir=`pwd` + cd $my_xdir || exit $? + darwin_archive=$my_xabs + darwin_curdir=`pwd` + darwin_base_archive=`basename $darwin_archive` + darwin_arches=`lipo -info "$darwin_archive" 2>/dev/null | $EGREP Architectures 2>/dev/null` + if test -n "$darwin_arches"; then + darwin_arches=`echo "$darwin_arches" | $SED -e 's/.*are://'` + darwin_arch= + $show "$darwin_base_archive has multiple architectures $darwin_arches" + for darwin_arch in $darwin_arches ; do + mkdir -p "unfat-$$/${darwin_base_archive}-${darwin_arch}" + lipo -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}" + # Remove the table of contents from the thin files. + $AR -d "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" __.SYMDEF 2>/dev/null || true + $AR -d "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" __.SYMDEF\ SORTED 2>/dev/null || true + cd "unfat-$$/${darwin_base_archive}-${darwin_arch}" + $AR -xo "${darwin_base_archive}" + rm "${darwin_base_archive}" + cd "$darwin_curdir" + done # $darwin_arches + ## Okay now we have a bunch of thin objects, gotta fatten them up :) + darwin_filelist=`find unfat-$$ -type f | xargs basename | sort -u | $NL2SP` + darwin_file= + darwin_files= + for darwin_file in $darwin_filelist; do + darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP` + lipo -create -output "$darwin_file" $darwin_files + done # $darwin_filelist + rm -rf unfat-$$ + cd "$darwin_orig_dir" + else + cd $darwin_orig_dir + (cd $my_xdir && $AR x $my_xabs) || exit $? + fi # $darwin_arches + fi # $run + ;; + *) + # We will extract separately just the conflicting names and we will + # no longer touch any unique names. It is faster to leave these + # extract automatically by $AR in one run. + $show "(cd $my_xdir && $AR x $my_xabs)" + $run eval "(cd \$my_xdir && $AR x \$my_xabs)" || exit $? + if ($AR t "$my_xabs" | sort | sort -uc >/dev/null 2>&1); then + : + else + $echo "$modename: warning: object name conflicts; renaming object files" 1>&2 + $echo "$modename: warning: to ensure that they will not overwrite" 1>&2 + $AR t "$my_xabs" | sort | uniq -cd | while read -r count name + do + i=1 + while test "$i" -le "$count" + do + # Put our $i before any first dot (extension) + # Never overwrite any file + name_to="$name" + while test "X$name_to" = "X$name" || test -f "$my_xdir/$name_to" + do + name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"` + done + $show "(cd $my_xdir && $AR xN $i $my_xabs '$name' && $mv '$name' '$name_to')" + $run eval "(cd \$my_xdir && $AR xN $i \$my_xabs '$name' && $mv '$name' '$name_to')" || exit $? + i=`expr $i + 1` + done + done + fi + ;; + esac + my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP` + done + + func_extract_archives_result="$my_oldobjs" +} # End of Shell function definitions ##################################### +# Darwin sucks +eval std_shrext=\"$shrext_cmds\" + # Parse our command line options once, thoroughly. while test "$#" -gt 0 do @@ -176,12 +381,13 @@ do ;; tag) tagname="$arg" + preserve_args="${preserve_args}=$arg" # Check whether tagname contains only valid characters case $tagname in *[!-_A-Za-z0-9,/]*) $echo "$progname: invalid tag name: $tagname" 1>&2 - exit 1 + exit $EXIT_FAILURE ;; esac @@ -191,10 +397,10 @@ do # not specially marked. ;; *) - if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$0" > /dev/null; then + if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$progpath" > /dev/null; then taglist="$taglist $tagname" # Evaluate the configuration. - eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $0`" + eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $progpath`" else $echo "$progname: ignoring unknown tag $tagname" 1>&2 fi @@ -223,21 +429,22 @@ do $echo "Copyright (C) 2003 Free Software Foundation, Inc." $echo "This is free software; see the source for copying conditions. There is NO" $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." - exit 0 + exit $EXIT_SUCCESS ;; --config) - ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $0 + ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $progpath # Now print the configurations for the tags. for tagname in $taglist; do - ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$0" + ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$progpath" done - exit 0 + exit $EXIT_SUCCESS ;; --debug) $echo "$progname: enabling shell trace mode" set -x + preserve_args="$preserve_args $arg" ;; --dry-run | -n) @@ -256,7 +463,7 @@ do else $echo "disable static libraries" fi - exit 0 + exit $EXIT_SUCCESS ;; --finish) mode="finish" ;; @@ -268,6 +475,7 @@ do --quiet | --silent) show=: + preserve_args="$preserve_args $arg" ;; --tag) prevopt="--tag" prev=tag ;; @@ -275,6 +483,7 @@ do set tag "$optarg" ${1+"$@"} shift prev=tag + preserve_args="$preserve_args --tag" ;; -dlopen) @@ -285,7 +494,7 @@ do -*) $echo "$modename: unrecognized option \`$arg'" 1>&2 $echo "$help" 1>&2 - exit 1 + exit $EXIT_FAILURE ;; *) @@ -298,7 +507,7 @@ done if test -n "$prevopt"; then $echo "$modename: option \`$prevopt' requires an argument" 1>&2 $echo "$help" 1>&2 - exit 1 + exit $EXIT_FAILURE fi # If this variable is set in any of the actions, the command in it @@ -354,7 +563,7 @@ if test -z "$show_help"; then if test -n "$execute_dlfiles" && test "$mode" != execute; then $echo "$modename: unrecognized option \`-dlopen'" 1>&2 $echo "$help" 1>&2 - exit 1 + exit $EXIT_FAILURE fi # Change the help message to a mode-specific one. @@ -369,9 +578,11 @@ if test -z "$show_help"; then # Get the compilation command and the source file. base_compile= srcfile="$nonopt" # always keep a non-empty value in "srcfile" + suppress_opt=yes suppress_output= arg_mode=normal libobj= + later= for arg do @@ -394,24 +605,19 @@ if test -z "$show_help"; then -o) if test -n "$libobj" ; then $echo "$modename: you cannot specify \`-o' more than once" 1>&2 - exit 1 + exit $EXIT_FAILURE fi arg_mode=target continue ;; - -static) - build_old_libs=yes + -static | -prefer-pic | -prefer-non-pic) + later="$later $arg" continue ;; - -prefer-pic) - pic_mode=yes - continue - ;; - - -prefer-non-pic) - pic_mode=no + -no-suppress) + suppress_opt=no continue ;; @@ -424,7 +630,7 @@ if test -z "$show_help"; then args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"` lastarg= save_ifs="$IFS"; IFS=',' - for arg in $args; do + for arg in $args; do IFS="$save_ifs" # Double-quote args containing other shell metacharacters. @@ -474,11 +680,11 @@ if test -z "$show_help"; then case $arg_mode in arg) $echo "$modename: you must specify an argument for -Xcompile" - exit 1 + exit $EXIT_FAILURE ;; target) $echo "$modename: you must specify a target with \`-o'" 1>&2 - exit 1 + exit $EXIT_FAILURE ;; *) # Get the name of the library object. @@ -511,50 +717,30 @@ if test -z "$show_help"; then *.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;; *) $echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2 - exit 1 + exit $EXIT_FAILURE ;; esac - # Infer tagged configuration to use if any are available and - # if one wasn't chosen via the "--tag" command line option. - # Only attempt this if the compiler in the base compile - # command doesn't match the default compiler. - if test -n "$available_tags" && test -z "$tagname"; then - case $base_compile in - # Blanks in the command may have been stripped by the calling shell, - # but not from the CC environment variable when configure was run. - " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "*) ;; - # Blanks at the start of $base_compile will cause this to fail - # if we don't check for them as well. - *) - for z in $available_tags; do - if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then - # Evaluate the configuration. - eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`" - case "$base_compile " in - "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*) - # The compiler in the base compile command matches - # the one in the tagged configuration. - # Assume this is the tagged configuration we want. - tagname=$z - break - ;; - esac - fi - done - # If $tagname still isn't set, then no tagged configuration - # was found and let the user know that the "--tag" command - # line option must be used. - if test -z "$tagname"; then - $echo "$modename: unable to infer tagged configuration" - $echo "$modename: specify a tag with \`--tag'" 1>&2 - exit 1 -# else -# $echo "$modename: using $tagname tagged configuration" - fi + func_infer_tag $base_compile + + for arg in $later; do + case $arg in + -static) + build_old_libs=yes + continue + ;; + + -prefer-pic) + pic_mode=yes + continue + ;; + + -prefer-non-pic) + pic_mode=no + continue ;; esac - fi + done objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'` xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'` @@ -568,7 +754,7 @@ if test -z "$show_help"; then if test -z "$base_compile"; then $echo "$modename: you must specify a compilation command" 1>&2 $echo "$help" 1>&2 - exit 1 + exit $EXIT_FAILURE fi # Delete any leftover library objects. @@ -579,7 +765,7 @@ if test -z "$show_help"; then fi $run $rm $removelist - trap "$run $rm $removelist; exit 1" 1 2 15 + trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15 # On Cygwin there's no "real" PIC flag so we must build both object types case $host_os in @@ -598,7 +784,7 @@ if test -z "$show_help"; then output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext} lockfile="$output_obj.lock" removelist="$removelist $output_obj $lockfile" - trap "$run $rm $removelist; exit 1" 1 2 15 + trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15 else output_obj= need_locks=no @@ -608,7 +794,7 @@ if test -z "$show_help"; then # Lock this critical section if it is needed # We use this script file to make the link, it avoids creating a new file if test "$need_locks" = yes; then - until $run ln "$0" "$lockfile" 2>/dev/null; do + until $run ln "$progpath" "$lockfile" 2>/dev/null; do $show "Waiting for $lockfile to be removed" sleep 2 done @@ -626,7 +812,7 @@ avoid parallel builds (make -j) in this platform, or get a better compiler." $run $rm $removelist - exit 1 + exit $EXIT_FAILURE fi $echo $srcfile > "$lockfile" fi @@ -681,7 +867,7 @@ EOF if $run eval "$command"; then : else test -n "$output_obj" && $run $rm $removelist - exit 1 + exit $EXIT_FAILURE fi if test "$need_locks" = warn && @@ -701,7 +887,7 @@ avoid parallel builds (make -j) in this platform, or get a better compiler." $run $rm $removelist - exit 1 + exit $EXIT_FAILURE fi # Just move the object if needed, then go on to compile the next one @@ -722,7 +908,9 @@ pic_object='$objdir/$objname' EOF # Allow error messages only from the first compilation. - suppress_output=' >/dev/null 2>&1' + if test "$suppress_opt" = yes; then + suppress_output=' >/dev/null 2>&1' + fi else # No PIC object so indicate it doesn't exist in the libtool # object file. @@ -751,7 +939,7 @@ EOF if $run eval "$command"; then : else $run $rm $removelist - exit 1 + exit $EXIT_FAILURE fi if test "$need_locks" = warn && @@ -771,7 +959,7 @@ avoid parallel builds (make -j) in this platform, or get a better compiler." $run $rm $removelist - exit 1 + exit $EXIT_FAILURE fi # Just move the object if needed @@ -809,7 +997,7 @@ EOF $run $rm "$lockfile" fi - exit 0 + exit $EXIT_SUCCESS ;; # libtool link mode @@ -835,7 +1023,7 @@ EOF ;; esac libtool_args="$nonopt" - base_compile="$nonopt" + base_compile="$nonopt $@" compile_command="$nonopt" finalize_command="$nonopt" @@ -867,6 +1055,7 @@ EOF no_install=no objs= non_pic_objects= + precious_files_regex= prefer_static_libs=no preload=no prev= @@ -880,6 +1069,8 @@ EOF vinfo= vinfo_number=no + func_infer_tag $base_compile + # We need to know -static, to get the right output filenames. for arg do @@ -911,7 +1102,6 @@ EOF # Go through the arguments, transforming them on the way. while test "$#" -gt 0; do arg="$1" - base_compile="$base_compile $arg" shift case $arg in *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") @@ -975,7 +1165,7 @@ EOF export_symbols="$arg" if test ! -f "$arg"; then $echo "$modename: symbol file \`$arg' does not exist" - exit 1 + exit $EXIT_FAILURE fi prev= continue @@ -990,6 +1180,11 @@ EOF prev= continue ;; + precious_regex) + precious_files_regex="$arg" + prev= + continue + ;; release) release="-$arg" prev= @@ -1022,7 +1217,7 @@ EOF test "$pic_object" = none && \ test "$non_pic_object" = none; then $echo "$modename: cannot find name of object for \`$arg'" 1>&2 - exit 1 + exit $EXIT_FAILURE fi # Extract subdirectory from the argument. @@ -1075,7 +1270,7 @@ EOF # Only an error if not doing a dry-run. if test -z "$run"; then $echo "$modename: \`$arg' is not a valid libtool object" 1>&2 - exit 1 + exit $EXIT_FAILURE else # Dry-run case. @@ -1096,7 +1291,7 @@ EOF done else $echo "$modename: link input file \`$save_arg' does not exist" - exit 1 + exit $EXIT_FAILURE fi arg=$save_arg prev= @@ -1108,7 +1303,7 @@ EOF [\\/]* | [A-Za-z]:[\\/]*) ;; *) $echo "$modename: only absolute run-paths are allowed" 1>&2 - exit 1 + exit $EXIT_FAILURE ;; esac if test "$prev" = rpath; then @@ -1148,6 +1343,11 @@ EOF finalize_command="$finalize_command $qarg" continue ;; + shrext) + shrext_cmds="$arg" + prev= + continue + ;; *) eval "$prev=\"\$arg\"" prev= @@ -1196,7 +1396,7 @@ EOF -export-symbols | -export-symbols-regex) if test -n "$export_symbols" || test -n "$export_symbols_regex"; then $echo "$modename: more than one -exported-symbols argument is not allowed" - exit 1 + exit $EXIT_FAILURE fi if test "X$arg" = "X-export-symbols"; then prev=expsyms @@ -1232,7 +1432,7 @@ EOF absdir=`cd "$dir" && pwd` if test -z "$absdir"; then $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2 - exit 1 + exit $EXIT_FAILURE fi dir="$absdir" ;; @@ -1287,6 +1487,11 @@ EOF continue ;; + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe) + deplibs="$deplibs $arg" + continue + ;; + -module) module=yes continue @@ -1315,6 +1520,28 @@ EOF continue ;; + ################################################################ + #### Local edit for Sleepycat SR #8705 + #### This case was given to us by Albert Chin, and we expect + #### this to be included in future versions of libtool, + #### though we must verify that before upgrading. + ################################################################ + # Flags for IRIX and Solaris compiler + -64|-mips[0-9]|-xarch=*) + # Unknown arguments in both finalize_command and compile_command need + # to be aesthetically quoted because they are evaled later. + arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` + case $arg in + *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") + arg="\"$arg\"" + ;; + esac + compile_command="$compile_command $arg" + finalize_command="$finalize_command $arg" + compiler_flags="$compiler_flags $arg" + continue + ;; + -shrext) prev=shrext continue @@ -1351,6 +1578,11 @@ EOF -o) prev=output ;; + -precious-files-regex) + prev=precious_regex + continue + ;; + -release) prev=release continue @@ -1373,7 +1605,7 @@ EOF [\\/]* | [A-Za-z]:[\\/]*) ;; *) $echo "$modename: only absolute run-paths are allowed" 1>&2 - exit 1 + exit $EXIT_FAILURE ;; esac case "$xrpath " in @@ -1496,7 +1728,7 @@ EOF test "$pic_object" = none && \ test "$non_pic_object" = none; then $echo "$modename: cannot find name of object for \`$arg'" 1>&2 - exit 1 + exit $EXIT_FAILURE fi # Extract subdirectory from the argument. @@ -1549,7 +1781,7 @@ EOF # Only an error if not doing a dry-run. if test -z "$run"; then $echo "$modename: \`$arg' is not a valid libtool object" 1>&2 - exit 1 + exit $EXIT_FAILURE else # Dry-run case. @@ -1616,48 +1848,7 @@ EOF if test -n "$prev"; then $echo "$modename: the \`$prevarg' option requires an argument" 1>&2 $echo "$help" 1>&2 - exit 1 - fi - - # Infer tagged configuration to use if any are available and - # if one wasn't chosen via the "--tag" command line option. - # Only attempt this if the compiler in the base link - # command doesn't match the default compiler. - if test -n "$available_tags" && test -z "$tagname"; then - case $base_compile in - # Blanks in the command may have been stripped by the calling shell, - # but not from the CC environment variable when configure was run. - "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*) ;; - # Blanks at the start of $base_compile will cause this to fail - # if we don't check for them as well. - *) - for z in $available_tags; do - if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then - # Evaluate the configuration. - eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`" - case $base_compile in - "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*) - # The compiler in $compile_command matches - # the one in the tagged configuration. - # Assume this is the tagged configuration we want. - tagname=$z - break - ;; - esac - fi - done - # If $tagname still isn't set, then no tagged configuration - # was found and let the user know that the "--tag" command - # line option must be used. - if test -z "$tagname"; then - $echo "$modename: unable to infer tagged configuration" - $echo "$modename: specify a tag with \`--tag'" 1>&2 - exit 1 -# else -# $echo "$modename: using $tagname tagged configuration" - fi - ;; - esac + exit $EXIT_FAILURE fi if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then @@ -1701,7 +1892,7 @@ EOF "") $echo "$modename: you must specify an output file" 1>&2 $echo "$help" 1>&2 - exit 1 + exit $EXIT_FAILURE ;; *.$libext) linkmode=oldlib ;; *.lo | *.$objext) linkmode=obj ;; @@ -1711,7 +1902,7 @@ EOF case $host in *cygwin* | *mingw* | *pw32*) - # don't eliminate duplcations in $postdeps and $predeps + # don't eliminate duplications in $postdeps and $predeps duplicate_compiler_generated_deps=yes ;; *) @@ -1764,7 +1955,7 @@ EOF *.la) ;; *) $echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2 - exit 1 + exit $EXIT_FAILURE ;; esac done @@ -1802,6 +1993,15 @@ EOF lib= found=no case $deplib in + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe) + if test "$linkmode,$pass" = "prog,link"; then + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + else + deplibs="$deplib $deplibs" + fi + continue + ;; -l*) if test "$linkmode" != lib && test "$linkmode" != prog; then $echo "$modename: warning: \`-l' is ignored for archives/objects" 1>&2 @@ -1813,12 +2013,18 @@ EOF fi name=`$echo "X$deplib" | $Xsed -e 's/^-l//'` for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do - # Search the libtool library - lib="$searchdir/lib${name}.la" - if test -f "$lib"; then - found=yes - break - fi + for search_ext in .la $std_shrext .so .a; do + # Search the libtool library + lib="$searchdir/lib${name}${search_ext}" + if test -f "$lib"; then + if test "$search_ext" = ".la"; then + found=yes + else + found=no + fi + break 2 + fi + done done if test "$found" != yes; then # deplib doesn't seem to be a libtool library @@ -1883,11 +2089,11 @@ EOF fi if test "$pass" = scan; then deplibs="$deplib $deplibs" - newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'` else compile_deplibs="$deplib $compile_deplibs" finalize_deplibs="$deplib $finalize_deplibs" fi + newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'` ;; *) $echo "$modename: warning: \`-L' is ignored for archives/objects" 1>&2 @@ -1915,7 +2121,22 @@ EOF fi case $linkmode in lib) - if test "$deplibs_check_method" != pass_all; then + valid_a_lib=no + case $deplibs_check_method in + match_pattern*) + set dummy $deplibs_check_method + match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"` + if eval $echo \"$deplib\" 2>/dev/null \ + | $SED 10q \ + | $EGREP "$match_pattern_regex" > /dev/null; then + valid_a_lib=yes + fi + ;; + pass_all) + valid_a_lib=yes + ;; + esac + if test "$valid_a_lib" != yes; then $echo $echo "*** Warning: Trying to link with static lib archive $deplib." $echo "*** I have the capability to make that library automatically link in when" @@ -1966,14 +2187,14 @@ EOF if test "$found" = yes || test -f "$lib"; then : else $echo "$modename: cannot find the library \`$lib'" 1>&2 - exit 1 + exit $EXIT_FAILURE fi # Check to see that this really is a libtool archive. if (${SED} -e '2q' $lib | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : else $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 - exit 1 + exit $EXIT_FAILURE fi ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'` @@ -2009,7 +2230,7 @@ EOF if test -z "$libdir"; then if test -z "$old_library"; then $echo "$modename: cannot find name of link library for \`$lib'" 1>&2 - exit 1 + exit $EXIT_FAILURE fi # It is a libtool convenience library, so add in its objects. convenience="$convenience $ladir/$objdir/$old_library" @@ -2026,12 +2247,12 @@ EOF done elif test "$linkmode" != prog && test "$linkmode" != lib; then $echo "$modename: \`$lib' is not a convenience library" 1>&2 - exit 1 + exit $EXIT_FAILURE fi continue fi # $pass = conv - + # Get the name of the library we link against. linklib= for l in $old_library $library_names; do @@ -2039,16 +2260,18 @@ EOF done if test -z "$linklib"; then $echo "$modename: cannot find name of link library for \`$lib'" 1>&2 - exit 1 + exit $EXIT_FAILURE fi # This library was specified with -dlopen. if test "$pass" = dlopen; then if test -z "$libdir"; then $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2 - exit 1 + exit $EXIT_FAILURE fi - if test -z "$dlname" || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then + if test -z "$dlname" || + test "$dlopen_support" != yes || + test "$build_libtool_libs" = no; then # If there is no dlname, no dlopen support or we're linking # statically, we need to preload. We also need to preload any # dependent libraries so libltdl's deplib preloader doesn't @@ -2086,10 +2309,17 @@ EOF absdir="$libdir" fi else - dir="$ladir/$objdir" - absdir="$abs_ladir/$objdir" - # Remove this search path later - notinst_path="$notinst_path $abs_ladir" + if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then + dir="$ladir" + absdir="$abs_ladir" + # Remove this search path later + notinst_path="$notinst_path $abs_ladir" + else + dir="$ladir/$objdir" + absdir="$abs_ladir/$objdir" + # Remove this search path later + notinst_path="$notinst_path $abs_ladir" + fi fi # $installed = yes name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'` @@ -2097,7 +2327,7 @@ EOF if test "$pass" = dlpreopen; then if test -z "$libdir"; then $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2 - exit 1 + exit $EXIT_FAILURE fi # Prefer using a static library (so that no silly _DYNAMIC symbols # are required to link). @@ -2124,7 +2354,7 @@ EOF continue fi - + if test "$linkmode" = prog && test "$pass" != link; then newlib_search_path="$newlib_search_path $ladir" deplibs="$lib $deplibs" @@ -2211,17 +2441,18 @@ EOF need_relink=yes fi # This is a shared library - - # Warn about portability, can't link against -module's on some systems (darwin) - if test "$shouldnotlink" = yes && test "$pass" = link ; then + + # Warn about portability, can't link against -module's on + # some systems (darwin) + if test "$shouldnotlink" = yes && test "$pass" = link ; then $echo if test "$linkmode" = prog; then $echo "*** Warning: Linking the executable $output against the loadable module" else $echo "*** Warning: Linking the shared library $output against the loadable module" fi - $echo "*** $linklib is not portable!" - fi + $echo "*** $linklib is not portable!" + fi if test "$linkmode" = lib && test "$hardcode_into_libs" = yes; then # Hardcode the library path. @@ -2279,9 +2510,10 @@ EOF else $show "extracting exported symbol list from \`$soname'" save_ifs="$IFS"; IFS='~' - eval cmds=\"$extract_expsyms_cmds\" + cmds=$extract_expsyms_cmds for cmd in $cmds; do IFS="$save_ifs" + eval cmd=\"$cmd\" $show "$cmd" $run eval "$cmd" || exit $? done @@ -2292,9 +2524,10 @@ EOF if test -f "$output_objdir/$newlib"; then :; else $show "generating import library for \`$soname'" save_ifs="$IFS"; IFS='~' - eval cmds=\"$old_archive_from_expsyms_cmds\" + cmds=$old_archive_from_expsyms_cmds for cmd in $cmds; do IFS="$save_ifs" + eval cmd=\"$cmd\" $show "$cmd" $run eval "$cmd" || exit $? done @@ -2317,9 +2550,9 @@ EOF case $host in *-*-sco3.2v5* ) add_dir="-L$dir" ;; *-*-darwin* ) - # if the lib is a module then we can not link against it, someone - # is ignoring the new warnings I added - if /usr/bin/file -L $add 2> /dev/null | grep "bundle" >/dev/null ; then + # if the lib is a module then we can not link against + # it, someone is ignoring the new warnings I added + if /usr/bin/file -L $add 2> /dev/null | $EGREP "bundle" >/dev/null ; then $echo "** Warning, lib $linklib is a module, not a shared library" if test -z "$old_library" ; then $echo @@ -2327,7 +2560,7 @@ EOF $echo "** The link will probably fail, sorry" else add="$dir/$old_library" - fi + fi fi esac elif test "$hardcode_minus_L" = no; then @@ -2352,7 +2585,7 @@ EOF if test -n "$inst_prefix_dir"; then case "$libdir" in [\\/]*) - add_dir="-L$inst_prefix_dir$libdir $add_dir" + add_dir="$add_dir -L$inst_prefix_dir$libdir" ;; esac fi @@ -2369,7 +2602,7 @@ EOF if test "$lib_linked" != yes; then $echo "$modename: configuration error: unsupported hardcode properties" - exit 1 + exit $EXIT_FAILURE fi if test -n "$add_shlibpath"; then @@ -2412,7 +2645,8 @@ EOF esac add="-l$name" elif test "$hardcode_automatic" = yes; then - if test -n "$inst_prefix_dir" && test -f "$inst_prefix_dir$libdir/$linklib" ; then + if test -n "$inst_prefix_dir" && + test -f "$inst_prefix_dir$libdir/$linklib" ; then add="$inst_prefix_dir$libdir/$linklib" else add="$libdir/$linklib" @@ -2424,7 +2658,7 @@ EOF if test -n "$inst_prefix_dir"; then case "$libdir" in [\\/]*) - add_dir="-L$inst_prefix_dir$libdir $add_dir" + add_dir="$add_dir -L$inst_prefix_dir$libdir" ;; esac fi @@ -2492,7 +2726,8 @@ EOF if test "$linkmode" = lib; then if test -n "$dependency_libs" && - { test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes || + { test "$hardcode_into_libs" != yes || + test "$build_old_libs" = yes || test "$link_static" = yes; }; then # Extract -R from dependency_libs temp_deplibs= @@ -2549,7 +2784,7 @@ EOF eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` if test -z "$libdir"; then $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2 - exit 1 + exit $EXIT_FAILURE fi if test "$absdir" != "$libdir"; then $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2 @@ -2559,7 +2794,8 @@ EOF depdepl= case $host in *-*-darwin*) - # we do not want to link against static libs, but need to link against shared + # we do not want to link against static libs, + # but need to link against shared eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` if test -n "$deplibrary_names" ; then for tmp in $deplibrary_names ; do @@ -2567,39 +2803,42 @@ EOF done if test -f "$path/$depdepl" ; then depdepl="$path/$depdepl" - fi - newlib_search_path="$newlib_search_path $path" - path="" + fi + # do not add paths which are already there + case " $newlib_search_path " in + *" $path "*) ;; + *) newlib_search_path="$newlib_search_path $path";; + esac fi + path="" ;; *) - path="-L$path" - ;; - esac - + path="-L$path" + ;; + esac ;; - -l*) + -l*) case $host in *-*-darwin*) - # Again, we only want to link against shared libraries - eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"` - for tmp in $newlib_search_path ; do - if test -f "$tmp/lib$tmp_libs.dylib" ; then - eval depdepl="$tmp/lib$tmp_libs.dylib" - break - fi - done - path="" + # Again, we only want to link against shared libraries + eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"` + for tmp in $newlib_search_path ; do + if test -f "$tmp/lib$tmp_libs.dylib" ; then + eval depdepl="$tmp/lib$tmp_libs.dylib" + break + fi + done + path="" ;; *) continue ;; - esac + esac ;; *) continue ;; esac case " $deplibs " in *" $depdepl "*) ;; - *) deplibs="$deplibs $depdepl" ;; - esac + *) deplibs="$depdepl $deplibs" ;; + esac case " $deplibs " in *" $path "*) ;; *) deplibs="$deplibs $path" ;; @@ -2689,7 +2928,8 @@ EOF eval $var=\"$tmp_libs\" done # for var fi - # Last step: remove runtime libs from dependency_libs (they stay in deplibs) + # Last step: remove runtime libs from dependency_libs + # (they stay in deplibs) tmp_libs= for i in $dependency_libs ; do case " $predeps $postdeps $compiler_lib_search_path " in @@ -2749,19 +2989,19 @@ EOF case $outputname in lib*) name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'` - eval shared_ext=\"$shrext\" + eval shared_ext=\"$shrext_cmds\" eval libname=\"$libname_spec\" ;; *) if test "$module" = no; then $echo "$modename: libtool library \`$output' must begin with \`lib'" 1>&2 $echo "$help" 1>&2 - exit 1 + exit $EXIT_FAILURE fi if test "$need_lib_prefix" != no; then # Add the "lib" prefix for modules if required name=`$echo "X$outputname" | $Xsed -e 's/\.la$//'` - eval shared_ext=\"$shrext\" + eval shared_ext=\"$shrext_cmds\" eval libname=\"$libname_spec\" else libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'` @@ -2772,7 +3012,7 @@ EOF if test -n "$objs"; then if test "$deplibs_check_method" != pass_all; then $echo "$modename: cannot build libtool library \`$output' from non-libtool objects on this host:$objs" 2>&1 - exit 1 + exit $EXIT_FAILURE else $echo $echo "*** Warning: Linking the shared library $output against the non-libtool" @@ -2820,13 +3060,13 @@ EOF if test -n "$8"; then $echo "$modename: too many parameters to \`-version-info'" 1>&2 $echo "$help" 1>&2 - exit 1 + exit $EXIT_FAILURE fi # convert absolute version numbers to libtool ages # this retains compatibility with .la files and attempts # to make the code below a bit more comprehensible - + case $vinfo_number in yes) number_major="$2" @@ -2870,7 +3110,7 @@ EOF *) $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2 $echo "$modename: \`$vinfo' is not valid version information" 1>&2 - exit 1 + exit $EXIT_FAILURE ;; esac @@ -2879,7 +3119,7 @@ EOF *) $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2 $echo "$modename: \`$vinfo' is not valid version information" 1>&2 - exit 1 + exit $EXIT_FAILURE ;; esac @@ -2888,14 +3128,14 @@ EOF *) $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2 $echo "$modename: \`$vinfo' is not valid version information" 1>&2 - exit 1 + exit $EXIT_FAILURE ;; esac if test "$age" -gt "$current"; then $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2 $echo "$modename: \`$vinfo' is not valid version information" 1>&2 - exit 1 + exit $EXIT_FAILURE fi # Calculate the version variables. @@ -2912,7 +3152,7 @@ EOF versuffix="$major.$age.$revision" # Darwin ld doesn't like 0 for these options... minor_current=`expr $current + 1` - verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" + verstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision" ;; freebsd-aout) @@ -2984,7 +3224,7 @@ EOF *) $echo "$modename: unknown library version type \`$version_type'" 1>&2 $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 - exit 1 + exit $EXIT_FAILURE ;; esac @@ -3038,6 +3278,12 @@ EOF *.$objext) ;; $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*) + if test "X$precious_files_regex" != "X"; then + if echo $p | $EGREP -e "$precious_files_regex" >/dev/null 2>&1 + then + continue + fi + fi removelist="$removelist $p" ;; *) ;; @@ -3517,7 +3763,7 @@ EOF fi # Get the real and link names of the library. - eval shared_ext=\"$shrext\" + eval shared_ext=\"$shrext_cmds\" eval library_names=\"$library_names_spec\" set dummy $library_names realname="$2" @@ -3547,10 +3793,11 @@ EOF $show "generating symbol list for \`$libname.la'" export_symbols="$output_objdir/$libname.exp" $run $rm $export_symbols - eval cmds=\"$export_symbols_cmds\" + cmds=$export_symbols_cmds save_ifs="$IFS"; IFS='~' for cmd in $cmds; do IFS="$save_ifs" + eval cmd=\"$cmd\" if len=`expr "X$cmd" : ".*"` && test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then $show "$cmd" @@ -3580,12 +3827,12 @@ EOF for test_deplib in $deplibs; do case " $convenience " in *" $test_deplib "*) ;; - *) + *) tmp_deplibs="$tmp_deplibs $test_deplib" ;; esac done - deplibs="$tmp_deplibs" + deplibs="$tmp_deplibs" if test -n "$convenience"; then if test -n "$whole_archive_flag_spec"; then @@ -3593,67 +3840,13 @@ EOF eval libobjs=\"\$libobjs $whole_archive_flag_spec\" else gentop="$output_objdir/${outputname}x" - $show "${rm}r $gentop" - $run ${rm}r "$gentop" - $show "$mkdir $gentop" - $run $mkdir "$gentop" - status=$? - if test "$status" -ne 0 && test ! -d "$gentop"; then - exit $status - fi generated="$generated $gentop" - for xlib in $convenience; do - # Extract the objects. - case $xlib in - [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;; - *) xabs=`pwd`"/$xlib" ;; - esac - xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'` - xdir="$gentop/$xlib" - - $show "${rm}r $xdir" - $run ${rm}r "$xdir" - $show "$mkdir $xdir" - $run $mkdir "$xdir" - status=$? - if test "$status" -ne 0 && test ! -d "$xdir"; then - exit $status - fi - # We will extract separately just the conflicting names and we will no - # longer touch any unique names. It is faster to leave these extract - # automatically by $AR in one run. - $show "(cd $xdir && $AR x $xabs)" - $run eval "(cd \$xdir && $AR x \$xabs)" || exit $? - if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then - : - else - $echo "$modename: warning: object name conflicts; renaming object files" 1>&2 - $echo "$modename: warning: to ensure that they will not overwrite" 1>&2 - $AR t "$xabs" | sort | uniq -cd | while read -r count name - do - i=1 - while test "$i" -le "$count" - do - # Put our $i before any first dot (extension) - # Never overwrite any file - name_to="$name" - while test "X$name_to" = "X$name" || test -f "$xdir/$name_to" - do - name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"` - done - $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')" - $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $? - i=`expr $i + 1` - done - done - fi - - libobjs="$libobjs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP` - done + func_extract_archives $gentop $convenience + libobjs="$libobjs $func_extract_archives_result" fi fi - + if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then eval flag=\"$thread_safe_flag_spec\" linker_flags="$linker_flags $flag" @@ -3667,19 +3860,23 @@ EOF # Do each of the archive commands. if test "$module" = yes && test -n "$module_cmds" ; then if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then - eval cmds=\"$module_expsym_cmds\" + eval test_cmds=\"$module_expsym_cmds\" + cmds=$module_expsym_cmds else - eval cmds=\"$module_cmds\" + eval test_cmds=\"$module_cmds\" + cmds=$module_cmds fi else if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then - eval cmds=\"$archive_expsym_cmds\" + eval test_cmds=\"$archive_expsym_cmds\" + cmds=$archive_expsym_cmds else - eval cmds=\"$archive_cmds\" + eval test_cmds=\"$archive_cmds\" + cmds=$archive_cmds fi fi - if test "X$skipped_export" != "X:" && len=`expr "X$cmds" : ".*"` && + if test "X$skipped_export" != "X:" && len=`expr "X$test_cmds" : ".*"` && test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then : else @@ -3780,19 +3977,28 @@ EOF # value of $libobjs for piecewise linking. # Do each of the archive commands. + if test "$module" = yes && test -n "$module_cmds" ; then + if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then + cmds=$module_expsym_cmds + else + cmds=$module_cmds + fi + else if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then - eval cmds=\"$archive_expsym_cmds\" + cmds=$archive_expsym_cmds else - eval cmds=\"$archive_cmds\" + cmds=$archive_cmds + fi fi # Append the command to remove the reloadable object files # to the just-reset $cmds. - eval cmds=\"\$cmds~$rm $delfiles\" + eval cmds=\"\$cmds~\$rm $delfiles\" fi save_ifs="$IFS"; IFS='~' for cmd in $cmds; do IFS="$save_ifs" + eval cmd=\"$cmd\" $show "$cmd" $run eval "$cmd" || exit $? done @@ -3801,7 +4007,7 @@ EOF # Restore the uninstalled library and exit if test "$mode" = relink; then $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $? - exit 0 + exit $EXIT_SUCCESS fi # Create links to the real library. @@ -3849,7 +4055,7 @@ EOF *.lo) if test -n "$objs$old_deplibs"; then $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2 - exit 1 + exit $EXIT_FAILURE fi libobj="$output" obj=`$echo "X$output" | $Xsed -e "$lo2o"` @@ -3878,64 +4084,10 @@ EOF eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\" else gentop="$output_objdir/${obj}x" - $show "${rm}r $gentop" - $run ${rm}r "$gentop" - $show "$mkdir $gentop" - $run $mkdir "$gentop" - status=$? - if test "$status" -ne 0 && test ! -d "$gentop"; then - exit $status - fi generated="$generated $gentop" - for xlib in $convenience; do - # Extract the objects. - case $xlib in - [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;; - *) xabs=`pwd`"/$xlib" ;; - esac - xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'` - xdir="$gentop/$xlib" - - $show "${rm}r $xdir" - $run ${rm}r "$xdir" - $show "$mkdir $xdir" - $run $mkdir "$xdir" - status=$? - if test "$status" -ne 0 && test ! -d "$xdir"; then - exit $status - fi - # We will extract separately just the conflicting names and we will no - # longer touch any unique names. It is faster to leave these extract - # automatically by $AR in one run. - $show "(cd $xdir && $AR x $xabs)" - $run eval "(cd \$xdir && $AR x \$xabs)" || exit $? - if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then - : - else - $echo "$modename: warning: object name conflicts; renaming object files" 1>&2 - $echo "$modename: warning: to ensure that they will not overwrite" 1>&2 - $AR t "$xabs" | sort | uniq -cd | while read -r count name - do - i=1 - while test "$i" -le "$count" - do - # Put our $i before any first dot (extension) - # Never overwrite any file - name_to="$name" - while test "X$name_to" = "X$name" || test -f "$xdir/$name_to" - do - name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"` - done - $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')" - $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $? - i=`expr $i + 1` - done - done - fi - - reload_conv_objs="$reload_objs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP` - done + func_extract_archives $gentop $convenience + reload_conv_objs="$reload_objs $func_extract_archives_result" fi fi @@ -3943,10 +4095,11 @@ EOF reload_objs="$objs$old_deplibs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test output="$obj" - eval cmds=\"$reload_cmds\" + cmds=$reload_cmds save_ifs="$IFS"; IFS='~' for cmd in $cmds; do IFS="$save_ifs" + eval cmd=\"$cmd\" $show "$cmd" $run eval "$cmd" || exit $? done @@ -3959,7 +4112,7 @@ EOF $run ${rm}r $gentop fi - exit 0 + exit $EXIT_SUCCESS fi if test "$build_libtool_libs" != yes; then @@ -3972,17 +4125,18 @@ EOF # accidentally link it into a program. # $show "echo timestamp > $libobj" # $run eval "echo timestamp > $libobj" || exit $? - exit 0 + exit $EXIT_SUCCESS fi if test -n "$pic_flag" || test "$pic_mode" != default; then # Only do commands if we really have different PIC objects. reload_objs="$libobjs $reload_conv_objs" output="$libobj" - eval cmds=\"$reload_cmds\" + cmds=$reload_cmds save_ifs="$IFS"; IFS='~' for cmd in $cmds; do IFS="$save_ifs" + eval cmd=\"$cmd\" $show "$cmd" $run eval "$cmd" || exit $? done @@ -3994,7 +4148,7 @@ EOF $run ${rm}r $gentop fi - exit 0 + exit $EXIT_SUCCESS ;; prog) @@ -4312,7 +4466,7 @@ static const void *lt_preloaded_setup() { ;; *) $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2 - exit 1 + exit $EXIT_FAILURE ;; esac else @@ -4400,7 +4554,7 @@ static const void *lt_preloaded_setup() { # Link the executable and exit $show "$link_command" $run eval "$link_command" || exit $? - exit 0 + exit $EXIT_SUCCESS fi if test "$hardcode_action" = relink; then @@ -4455,10 +4609,10 @@ static const void *lt_preloaded_setup() { fi # Quote $echo for shipping. - if test "X$echo" = "X$SHELL $0 --fallback-echo"; then - case $0 in - [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $0 --fallback-echo";; - *) qecho="$SHELL `pwd`/$0 --fallback-echo";; + if test "X$echo" = "X$SHELL $progpath --fallback-echo"; then + case $progpath in + [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";; + *) qecho="$SHELL `pwd`/$progpath --fallback-echo";; esac qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"` else @@ -4484,7 +4638,7 @@ static const void *lt_preloaded_setup() { cwrappersource=`$echo ${objdir}/lt-${output}.c` cwrapper=`$echo ${output}.exe` $rm $cwrappersource $cwrapper - trap "$rm $cwrappersource $cwrapper; exit 1" 1 2 15 + trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15 cat > $cwrappersource <<EOF @@ -4493,7 +4647,7 @@ static const void *lt_preloaded_setup() { The $output program cannot be directly executed until all the libtool libraries that it depends on are installed. - + This wrapper executable should never be moved out of the build directory. If it is, it will not operate correctly. @@ -4525,7 +4679,7 @@ EOF #if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \ defined (__OS2__) #define HAVE_DOS_BASED_FILE_SYSTEM -#ifndef DIR_SEPARATOR_2 +#ifndef DIR_SEPARATOR_2 #define DIR_SEPARATOR_2 '\\' #endif #endif @@ -4556,7 +4710,7 @@ main (int argc, char *argv[]) { char **newargz; int i; - + program_name = (char *) xstrdup ((char *) basename (argv[0])); newargz = XMALLOC(char *, argc+2); EOF @@ -4569,7 +4723,7 @@ EOF newargz[1] = fnqualify(argv[0]); /* we know the script has the same name, without the .exe */ /* so make sure newargz[1] doesn't end in .exe */ - strendzap(newargz[1],".exe"); + strendzap(newargz[1],".exe"); for (i = 1; i < argc; i++) newargz[i+1] = xstrdup(argv[i]); newargz[argc+1] = NULL; @@ -4592,7 +4746,7 @@ xmalloc (size_t num) return p; } -char * +char * xstrdup (const char *string) { return string ? strcpy ((char *) xmalloc (strlen (string) + 1), string) : NULL @@ -4606,7 +4760,7 @@ basename (const char *name) #if defined (HAVE_DOS_BASED_FILE_SYSTEM) /* Skip over the disk name in MSDOS pathnames. */ - if (isalpha (name[0]) && name[1] == ':') + if (isalpha (name[0]) && name[1] == ':') name += 2; #endif @@ -4616,7 +4770,7 @@ basename (const char *name) return (char *) base; } -char * +char * fnqualify(const char *path) { size_t size; @@ -4644,7 +4798,7 @@ fnqualify(const char *path) } char * -strendzap(char *str, const char *pat) +strendzap(char *str, const char *pat) { size_t len, patlen; @@ -4664,7 +4818,7 @@ strendzap(char *str, const char *pat) } static void -lt_error_core (int exit_status, const char * mode, +lt_error_core (int exit_status, const char * mode, const char * message, va_list ap) { fprintf (stderr, "%s: %s: ", program_name, mode); @@ -4693,7 +4847,7 @@ EOF ;; esac $rm $output - trap "$rm $output; exit 1" 1 2 15 + trap "$rm $output; exit $EXIT_FAILURE" 1 2 15 $echo > $output "\ #! $SHELL @@ -4714,7 +4868,7 @@ sed_quote_subst='$sed_quote_subst' # The HP-UX ksh and POSIX shell print the target directory to stdout # if CDPATH is set. -if test \"\${CDPATH+set}\" = set; then CDPATH=:; export CDPATH; fi +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH relink_command=\"$relink_command\" @@ -4793,7 +4947,7 @@ else else $echo \"\$relink_command_output\" >&2 $rm \"\$progdir/\$file\" - exit 1 + exit $EXIT_FAILURE fi fi @@ -4855,20 +5009,20 @@ else esac $echo >> $output "\ \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\" - exit 1 + exit $EXIT_FAILURE fi else # The program doesn't exist. \$echo \"\$0: error: \$progdir/\$program does not exist\" 1>&2 \$echo \"This script is just a wrapper for \$program.\" 1>&2 $echo \"See the $PACKAGE documentation for more information.\" 1>&2 - exit 1 + exit $EXIT_FAILURE fi fi\ " chmod +x $output fi - exit 0 + exit $EXIT_SUCCESS ;; esac @@ -4891,76 +5045,21 @@ fi\ if test -n "$addlibs"; then gentop="$output_objdir/${outputname}x" - $show "${rm}r $gentop" - $run ${rm}r "$gentop" - $show "$mkdir $gentop" - $run $mkdir "$gentop" - status=$? - if test "$status" -ne 0 && test ! -d "$gentop"; then - exit $status - fi generated="$generated $gentop" - # Add in members from convenience archives. - for xlib in $addlibs; do - # Extract the objects. - case $xlib in - [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;; - *) xabs=`pwd`"/$xlib" ;; - esac - xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'` - xdir="$gentop/$xlib" - - $show "${rm}r $xdir" - $run ${rm}r "$xdir" - $show "$mkdir $xdir" - $run $mkdir "$xdir" - status=$? - if test "$status" -ne 0 && test ! -d "$xdir"; then - exit $status - fi - # We will extract separately just the conflicting names and we will no - # longer touch any unique names. It is faster to leave these extract - # automatically by $AR in one run. - $show "(cd $xdir && $AR x $xabs)" - $run eval "(cd \$xdir && $AR x \$xabs)" || exit $? - if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then - : - else - $echo "$modename: warning: object name conflicts; renaming object files" 1>&2 - $echo "$modename: warning: to ensure that they will not overwrite" 1>&2 - $AR t "$xabs" | sort | uniq -cd | while read -r count name - do - i=1 - while test "$i" -le "$count" - do - # Put our $i before any first dot (extension) - # Never overwrite any file - name_to="$name" - while test "X$name_to" = "X$name" || test -f "$xdir/$name_to" - do - name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"` - done - $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')" - $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $? - i=`expr $i + 1` - done - done - fi - - oldobjs="$oldobjs "`find $xdir -name \*.${objext} -print -o -name \*.lo -print | $NL2SP` - done + func_extract_archives $gentop $addlibs + oldobjs="$oldobjs $func_extract_archives_result" fi # Do each command in the archive commands. if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then - eval cmds=\"$old_archive_from_new_cmds\" + cmds=$old_archive_from_new_cmds else eval cmds=\"$old_archive_cmds\" if len=`expr "X$cmds" : ".*"` && test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then - : + cmds=$old_archive_cmds else # the command line is too long to link in one step, link in parts $echo "using piecewise archive linking..." @@ -4987,7 +5086,7 @@ fi\ for obj in $save_oldobjs do last_oldobj=$obj - done + done for obj in $save_oldobjs do oldobjs="$objlist $obj" @@ -5001,7 +5100,7 @@ fi\ oldobjs=$objlist if test "$obj" = "$last_oldobj" ; then RANLIB=$save_RANLIB - fi + fi test -z "$concat_cmds" || concat_cmds=$concat_cmds~ eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\" objlist= @@ -5012,12 +5111,13 @@ fi\ if test "X$oldobjs" = "X" ; then eval cmds=\"\$concat_cmds\" else - eval cmds=\"\$concat_cmds~$old_archive_cmds\" + eval cmds=\"\$concat_cmds~\$old_archive_cmds\" fi fi fi save_ifs="$IFS"; IFS='~' for cmd in $cmds; do + eval cmd=\"$cmd\" IFS="$save_ifs" $show "$cmd" $run eval "$cmd" || exit $? @@ -5049,8 +5149,12 @@ fi\ fi done # Quote the link command for shipping. - relink_command="(cd `pwd`; $SHELL $0 --mode=relink $libtool_args @inst_prefix_dir@)" + relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"` + if test "$hardcode_automatic" = yes ; then + relink_command= + fi + # Only create the output if not a dry run. if test -z "$run"; then @@ -5069,7 +5173,7 @@ fi\ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` if test -z "$libdir"; then $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2 - exit 1 + exit $EXIT_FAILURE fi newdependency_libs="$newdependency_libs $libdir/$name" ;; @@ -5083,7 +5187,7 @@ fi\ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` if test -z "$libdir"; then $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 - exit 1 + exit $EXIT_FAILURE fi newdlfiles="$newdlfiles $libdir/$name" done @@ -5094,11 +5198,30 @@ fi\ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` if test -z "$libdir"; then $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 - exit 1 + exit $EXIT_FAILURE fi newdlprefiles="$newdlprefiles $libdir/$name" done dlprefiles="$newdlprefiles" + else + newdlfiles= + for lib in $dlfiles; do + case $lib in + [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; + *) abs=`pwd`"/$lib" ;; + esac + newdlfiles="$newdlfiles $abs" + done + dlfiles="$newdlfiles" + newdlprefiles= + for lib in $dlprefiles; do + case $lib in + [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; + *) abs=`pwd`"/$lib" ;; + esac + newdlprefiles="$newdlprefiles $abs" + done + dlprefiles="$newdlprefiles" fi $rm $output # place dlname in correct position for cygwin @@ -5155,7 +5278,7 @@ relink_command=\"$relink_command\"" $run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $? ;; esac - exit 0 + exit $EXIT_SUCCESS ;; # libtool install mode @@ -5244,13 +5367,13 @@ relink_command=\"$relink_command\"" if test -z "$install_prog"; then $echo "$modename: you must specify an install program" 1>&2 $echo "$help" 1>&2 - exit 1 + exit $EXIT_FAILURE fi if test -n "$prev"; then $echo "$modename: the \`$prev' option requires an argument" 1>&2 $echo "$help" 1>&2 - exit 1 + exit $EXIT_FAILURE fi if test -z "$files"; then @@ -5260,7 +5383,7 @@ relink_command=\"$relink_command\"" $echo "$modename: you must specify a destination" 1>&2 fi $echo "$help" 1>&2 - exit 1 + exit $EXIT_FAILURE fi # Strip any trailing slash from the destination. @@ -5281,7 +5404,7 @@ relink_command=\"$relink_command\"" if test "$#" -gt 2; then $echo "$modename: \`$dest' is not a directory" 1>&2 $echo "$help" 1>&2 - exit 1 + exit $EXIT_FAILURE fi fi case $destdir in @@ -5293,7 +5416,7 @@ relink_command=\"$relink_command\"" *) $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2 $echo "$help" 1>&2 - exit 1 + exit $EXIT_FAILURE ;; esac done @@ -5322,7 +5445,7 @@ relink_command=\"$relink_command\"" else $echo "$modename: \`$file' is not a valid libtool archive" 1>&2 $echo "$help" 1>&2 - exit 1 + exit $EXIT_FAILURE fi library_names= @@ -5364,7 +5487,7 @@ relink_command=\"$relink_command\"" # but it's something to keep an eye on. if test "$inst_prefix_dir" = "$destdir"; then $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2 - exit 1 + exit $EXIT_FAILURE fi if test -n "$inst_prefix_dir"; then @@ -5379,7 +5502,7 @@ relink_command=\"$relink_command\"" if $run eval "$relink_command"; then : else $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2 - exit 1 + exit $EXIT_FAILURE fi fi @@ -5414,10 +5537,11 @@ relink_command=\"$relink_command\"" # Do each command in the postinstall commands. lib="$destdir/$realname" - eval cmds=\"$postinstall_cmds\" + cmds=$postinstall_cmds save_ifs="$IFS"; IFS='~' for cmd in $cmds; do IFS="$save_ifs" + eval cmd=\"$cmd\" $show "$cmd" $run eval "$cmd" || exit $? done @@ -5457,7 +5581,7 @@ relink_command=\"$relink_command\"" *) $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2 $echo "$help" 1>&2 - exit 1 + exit $EXIT_FAILURE ;; esac @@ -5475,7 +5599,7 @@ relink_command=\"$relink_command\"" $show "$install_prog $staticobj $staticdest" $run eval "$install_prog \$staticobj \$staticdest" || exit $? fi - exit 0 + exit $EXIT_SUCCESS ;; *) @@ -5529,7 +5653,7 @@ relink_command=\"$relink_command\"" # Check the variables that should have been set. if test -z "$notinst_deplibs"; then $echo "$modename: invalid libtool wrapper script \`$wrapper'" 1>&2 - exit 1 + exit $EXIT_FAILURE fi finalize=yes @@ -5570,8 +5694,12 @@ relink_command=\"$relink_command\"" tmpdir="/tmp" test -n "$TMPDIR" && tmpdir="$TMPDIR" tmpdir="$tmpdir/libtool-$$" - if $mkdir -p "$tmpdir" && chmod 700 "$tmpdir"; then : + save_umask=`umask` + umask 0077 + if $mkdir "$tmpdir"; then + umask $save_umask else + umask $save_umask $echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2 continue fi @@ -5630,16 +5758,17 @@ relink_command=\"$relink_command\"" $show "$install_prog $file $oldlib" $run eval "$install_prog \$file \$oldlib" || exit $? - if test -n "$stripme" && test -n "$striplib"; then + if test -n "$stripme" && test -n "$old_striplib"; then $show "$old_striplib $oldlib" $run eval "$old_striplib $oldlib" || exit $? fi # Do each command in the postinstall commands. - eval cmds=\"$old_postinstall_cmds\" + cmds=$old_postinstall_cmds save_ifs="$IFS"; IFS='~' for cmd in $cmds; do IFS="$save_ifs" + eval cmd=\"$cmd\" $show "$cmd" $run eval "$cmd" || exit $? done @@ -5653,9 +5782,9 @@ relink_command=\"$relink_command\"" if test -n "$current_libdirs"; then # Maybe just do a dry run. test -n "$run" && current_libdirs=" -n$current_libdirs" - exec_cmd='$SHELL $0 --finish$current_libdirs' + exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs' else - exit 0 + exit $EXIT_SUCCESS fi ;; @@ -5674,10 +5803,11 @@ relink_command=\"$relink_command\"" for libdir in $libdirs; do if test -n "$finish_cmds"; then # Do each command in the finish commands. - eval cmds=\"$finish_cmds\" + cmds=$finish_cmds save_ifs="$IFS"; IFS='~' for cmd in $cmds; do IFS="$save_ifs" + eval cmd=\"$cmd\" $show "$cmd" $run eval "$cmd" || admincmds="$admincmds $cmd" @@ -5694,7 +5824,7 @@ relink_command=\"$relink_command\"" fi # Exit here if they wanted silent mode. - test "$show" = : && exit 0 + test "$show" = : && exit $EXIT_SUCCESS $echo "----------------------------------------------------------------------" $echo "Libraries have been installed in:" @@ -5730,7 +5860,7 @@ relink_command=\"$relink_command\"" $echo "See any operating system documentation about shared libraries for" $echo "more information, such as the ld(1) and ld.so(8) manual pages." $echo "----------------------------------------------------------------------" - exit 0 + exit $EXIT_SUCCESS ;; # libtool execute mode @@ -5742,7 +5872,7 @@ relink_command=\"$relink_command\"" if test -z "$cmd"; then $echo "$modename: you must specify a COMMAND" 1>&2 $echo "$help" - exit 1 + exit $EXIT_FAILURE fi # Handle -dlopen flags immediately. @@ -5750,7 +5880,7 @@ relink_command=\"$relink_command\"" if test ! -f "$file"; then $echo "$modename: \`$file' is not a file" 1>&2 $echo "$help" 1>&2 - exit 1 + exit $EXIT_FAILURE fi dir= @@ -5761,7 +5891,7 @@ relink_command=\"$relink_command\"" else $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 $echo "$help" 1>&2 - exit 1 + exit $EXIT_FAILURE fi # Read the libtool library. @@ -5788,7 +5918,7 @@ relink_command=\"$relink_command\"" dir="$dir/$objdir" else $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2 - exit 1 + exit $EXIT_FAILURE fi ;; @@ -5868,7 +5998,7 @@ relink_command=\"$relink_command\"" $echo "export $shlibpath_var" fi $echo "$cmd$args" - exit 0 + exit $EXIT_SUCCESS fi ;; @@ -5896,7 +6026,7 @@ relink_command=\"$relink_command\"" if test -z "$rm"; then $echo "$modename: you must specify an RM program" 1>&2 $echo "$help" 1>&2 - exit 1 + exit $EXIT_FAILURE fi rmdirs= @@ -5951,10 +6081,11 @@ relink_command=\"$relink_command\"" if test "$mode" = uninstall; then if test -n "$library_names"; then # Do each command in the postuninstall commands. - eval cmds=\"$postuninstall_cmds\" + cmds=$postuninstall_cmds save_ifs="$IFS"; IFS='~' for cmd in $cmds; do IFS="$save_ifs" + eval cmd=\"$cmd\" $show "$cmd" $run eval "$cmd" if test "$?" -ne 0 && test "$rmforce" != yes; then @@ -5966,10 +6097,11 @@ relink_command=\"$relink_command\"" if test -n "$old_library"; then # Do each command in the old_postuninstall commands. - eval cmds=\"$old_postuninstall_cmds\" + cmds=$old_postuninstall_cmds save_ifs="$IFS"; IFS='~' for cmd in $cmds; do IFS="$save_ifs" + eval cmd=\"$cmd\" $show "$cmd" $run eval "$cmd" if test "$?" -ne 0 && test "$rmforce" != yes; then @@ -6008,7 +6140,7 @@ relink_command=\"$relink_command\"" if test "$mode" = clean ; then noexename=$name case $file in - *.exe) + *.exe) file=`$echo $file|${SED} 's,.exe$,,'` noexename=`$echo $name|${SED} 's,.exe$,,'` # $file with .exe has already been added to rmfiles, @@ -6053,20 +6185,20 @@ relink_command=\"$relink_command\"" "") $echo "$modename: you must specify a MODE" 1>&2 $echo "$generic_help" 1>&2 - exit 1 + exit $EXIT_FAILURE ;; esac if test -z "$exec_cmd"; then $echo "$modename: invalid operation mode \`$mode'" 1>&2 $echo "$generic_help" 1>&2 - exit 1 + exit $EXIT_FAILURE fi fi # test -z "$show_help" if test -n "$exec_cmd"; then eval exec $exec_cmd - exit 1 + exit $EXIT_FAILURE fi # We need to display help for each of the modes. @@ -6102,7 +6234,7 @@ MODE-ARGS vary depending on the MODE. Try \`$modename --help --mode=MODE' for a more detailed description of MODE. Report bugs to <bug-libtool@gnu.org>." - exit 0 + exit $EXIT_SUCCESS ;; clean) @@ -6214,6 +6346,8 @@ The following components of LINK-COMMAND are treated specially: -no-undefined declare that a library does not refer to external symbols -o OUTPUT-FILE create OUTPUT-FILE from the specified objects -objectlist FILE Use a list of object files found in FILE to specify objects + -precious-files-regex REGEX + don't remove output files matching REGEX -release RELEASE specify package release information -rpath LIBDIR the created library will eventually be installed in LIBDIR -R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries @@ -6255,14 +6389,14 @@ Otherwise, only FILE itself is deleted using RM." *) $echo "$modename: invalid operation mode \`$mode'" 1>&2 $echo "$help" 1>&2 - exit 1 + exit $EXIT_FAILURE ;; esac $echo $echo "Try \`$modename --help' for more information about other modes." -exit 0 +exit $EXIT_SUCCESS # The TAGs below are defined such that we never get into a situation # in which we disable both kinds of libraries. Given conflicting diff --git a/db/dist/pubdef.in b/db/dist/pubdef.in index 5c028a20b..90a9d719e 100644 --- a/db/dist/pubdef.in +++ b/db/dist/pubdef.in @@ -1,8 +1,8 @@ # Name # D == documentation # I == include file -# C == Java case value (declared and initialized) -# J == Java constant (declared only) +# J == Java constant +# N == wrapped by the Java native layer DB_AFTER D I J DB_AGGRESSIVE D I J DB_ALREADY_ABORTED * I * @@ -20,6 +20,7 @@ DB_AM_DUPSORT * I * DB_AM_ENCRYPT * I * DB_AM_FIXEDLEN * I * DB_AM_INMEM * I * +DB_AM_INORDER * I * DB_AM_IN_RENAME * I * DB_AM_NOT_DURABLE * I * DB_AM_OPEN_CALLED * I * @@ -44,11 +45,12 @@ DB_ARCH_LOG D I J DB_ARCH_REMOVE D I J DB_AUTO_COMMIT D I J DB_BEFORE D I J -DB_BTREE D I C +DB_BTREE D I J DB_BTREEMAGIC * I * DB_BTREEOLDVER * I * DB_BTREEVERSION * I * -DB_CACHED_COUNTS * I J +DB_BUFFER_SMALL D I N +DB_CACHED_COUNTS * I * DB_CDB_ALLDB D I J DB_CHKSUM D I J DB_CONFIG D * * @@ -56,23 +58,26 @@ DB_CONSUME D I J DB_CONSUME_WAIT D I J DB_CREATE D I J DB_CURRENT D I J -DB_CXX_NO_EXCEPTIONS D I J +DB_CXX_NO_EXCEPTIONS D I * DB_DBM_HSEARCH * I * -DB_DBT_APPMALLOC D I * +DB_DBT_APPMALLOC D I N DB_DBT_DUPOK * I * DB_DBT_ISSET * I * DB_DBT_MALLOC D I J DB_DBT_PARTIAL D I J -DB_DBT_REALLOC D I J +DB_DBT_REALLOC D I N DB_DBT_USERMEM D I J +DB_DEGREE_2 D I J DB_DELETED * I * DB_DIRECT D I * DB_DIRECT_DB D I J DB_DIRECT_LOG D I J DB_DIRTY_READ D I J -DB_DONOTINDEX D I C +DB_DONOTINDEX D I J +DB_DSYNC_LOG D I J DB_DUP D I J DB_DUPSORT D I J +DB_DURABLE_UNKNOWN * I * DB_EID_BROADCAST D I J DB_EID_INVALID D I J DB_ENCRYPT D I J @@ -84,9 +89,11 @@ DB_ENV_CREATE * I * DB_ENV_DBLOCAL * I * DB_ENV_DIRECT_DB * I * DB_ENV_DIRECT_LOG * I * +DB_ENV_DSYNC_LOG * I * DB_ENV_FATAL * I * DB_ENV_LOCKDOWN * I * DB_ENV_LOG_AUTOREMOVE * I * +DB_ENV_LOG_INMEMORY * I * DB_ENV_NOLOCKING * I * DB_ENV_NOMMAP * I * DB_ENV_NOPANIC * I * @@ -100,14 +107,12 @@ DB_ENV_SYSTEM_MEM * I * DB_ENV_THREAD * I * DB_ENV_TIME_NOTGRANTED * I * DB_ENV_TXN_NOSYNC * I * -DB_ENV_TXN_NOT_DURABLE * I * DB_ENV_TXN_WRITE_NOSYNC * I * DB_ENV_YIELDCPU * I * DB_EXCL D I J DB_EXTENT * I * DB_FAST_STAT D I J DB_FCNTL_LOCKING * I * -DB_FILEOPEN D I C DB_FILE_ID_LEN * I * DB_FIRST D I J DB_FLUSH D I J @@ -117,7 +122,7 @@ DB_GET_BOTHC * I * DB_GET_BOTH_RANGE D I J DB_GET_RECNO D I J DB_HANDLE_LOCK * I * -DB_HASH D I C +DB_HASH D I J DB_HASHMAGIC * I * DB_HASHOLDVER * I * DB_HASHVERSION * I * @@ -128,17 +133,19 @@ DB_INIT_LOG D I J DB_INIT_MPOOL D I J DB_INIT_REP D I J DB_INIT_TXN D I J +DB_INORDER D I J DB_JOINENV D I J DB_JOIN_ITEM D I J DB_JOIN_NOSORT D I J -DB_KEYEMPTY D I C -DB_KEYEXIST D I C +DB_KEYEMPTY D I J +DB_KEYEXIST D I J DB_KEYFIRST D I J DB_KEYLAST D I J DB_LAST D I J DB_LOCKDOWN D I J DB_LOCKVERSION * I * -DB_LOCK_DEADLOCK D I C +DB_LOCK_ABORT * I * +DB_LOCK_DEADLOCK D I N DB_LOCK_DEFAULT D I J DB_LOCK_DIRTY * I * DB_LOCK_DUMP * I * @@ -150,12 +157,13 @@ DB_LOCK_IREAD D I J DB_LOCK_IWR D I J DB_LOCK_IWRITE D I J DB_LOCK_MAXLOCKS D I J +DB_LOCK_MAXWRITE D I J DB_LOCK_MINLOCKS D I J DB_LOCK_MINWRITE D I J DB_LOCK_NG * I * DB_LOCK_NORUN * I * DB_LOCK_NOTEXIST * I * -DB_LOCK_NOTGRANTED D I C +DB_LOCK_NOTGRANTED D I J DB_LOCK_NOWAIT D I J DB_LOCK_OLDEST D I J DB_LOCK_PUT D I J @@ -182,17 +190,19 @@ DB_LOGMAGIC * I * DB_LOGOLDVER * I * DB_LOGVERSION * I * DB_LOG_AUTOREMOVE D I J +DB_LOG_BUFFER_FULL D I * DB_LOG_CHKPNT * I * DB_LOG_COMMIT * I * DB_LOG_DISK * I * +DB_LOG_INMEMORY D I J DB_LOG_LOCKED * I * DB_LOG_NOCOPY * I * DB_LOG_NOT_DURABLE * I * DB_LOG_PERM * I * +DB_LOG_RESEND * I * DB_LOG_SILENT_ERR * I * DB_LOG_WRNOSYNC * I * DB_LSTAT_ABORTED * I * -DB_LSTAT_ERR * I * DB_LSTAT_EXPIRED * I * DB_LSTAT_FREE * I * DB_LSTAT_HELD * I * @@ -205,10 +215,11 @@ DB_MPOOL_CLEAN D I * DB_MPOOL_CREATE D I * DB_MPOOL_DIRTY D I * DB_MPOOL_DISCARD D I * +DB_MPOOL_FREE * I * DB_MPOOL_LAST D I * DB_MPOOL_NEW D I * DB_MPOOL_NOFILE D I J -DB_MPOOL_UNLINK * I * +DB_MPOOL_UNLINK D I J DB_MULTIPLE D I J DB_MULTIPLE_INIT D I * DB_MULTIPLE_KEY D I J @@ -225,23 +236,23 @@ DB_NOMMAP D I J DB_NOORDERCHK D I J DB_NOOVERWRITE D I J DB_NOPANIC D I J -DB_NOSERVER D I C -DB_NOSERVER_HOME D I C -DB_NOSERVER_ID D I C +DB_NOSERVER D I * +DB_NOSERVER_HOME D I J +DB_NOSERVER_ID D I J DB_NOSYNC D I J -DB_NOTFOUND D I C +DB_NOTFOUND D I J DB_NO_AUTO_COMMIT * I * DB_ODDFILESIZE D I * DB_OK_BTREE * I * DB_OK_HASH * I * DB_OK_QUEUE * I * DB_OK_RECNO * I * -DB_OLD_VERSION D I C +DB_OLD_VERSION D I * DB_OPFLAGS_MASK * I * DB_ORDERCHKONLY D I J DB_OVERWRITE D I J DB_PAGE_LOCK * I * -DB_PAGE_NOTFOUND D I C +DB_PAGE_NOTFOUND D I * DB_PANIC_ENVIRONMENT D I J DB_POSITION D I J DB_PREV D I J @@ -258,12 +269,12 @@ DB_PR_RECOVERYTEST * I * DB_QAMMAGIC * I * DB_QAMOLDVER * I * DB_QAMVERSION * I * -DB_QUEUE D I C +DB_QUEUE D I J DB_RDONLY D I J DB_RDWRMASTER * I * -DB_RECNO D I C +DB_RECNO D I J DB_RECNUM D I J -DB_RECORDCOUNT * I J +DB_RECORDCOUNT * I * DB_RECORD_LOCK * I * DB_RECOVER D I J DB_RECOVER_FATAL D I J @@ -274,37 +285,53 @@ DB_RENAMEMAGIC * I * DB_RENUMBER D I J DB_REP_CLIENT D I J DB_REP_CREATE * I * -DB_REP_DUPMASTER D I C -DB_REP_HANDLE_DEAD D I C -DB_REP_HOLDELECTION D I C +DB_REP_DUPMASTER D I J +DB_REP_EGENCHG * I * +DB_REP_HANDLE_DEAD D I N +DB_REP_HOLDELECTION D I J DB_REP_ISPERM D I J -DB_REP_LOGSONLY D I J +DB_REP_LOGREADY * I * DB_REP_MASTER D I J -DB_REP_NEWMASTER D I C -DB_REP_NEWSITE D I C +DB_REP_NEWMASTER D I J +DB_REP_NEWSITE D I J DB_REP_NOBUFFER D I J DB_REP_NOTPERM D I J -DB_REP_OUTDATED D I C +DB_REP_PAGEDONE * I * DB_REP_PERMANENT D I J -DB_REP_UNAVAIL D I J +DB_REP_STARTUPDONE D I J +DB_REP_UNAVAIL D I * DB_REVSPLITOFF D I J DB_RMW D I J DB_RPCCLIENT D I J -DB_RUNRECOVERY D I C +DB_RUNRECOVERY D I N DB_SALVAGE D I J -DB_SECONDARY_BAD D I C +DB_SECONDARY_BAD D I * +DB_SEQUENCE_VERSION * I * +DB_SEQ_DEC D I J +DB_SEQ_INC D I J +DB_SEQ_RANGE_SET * I * +DB_SEQ_WRAP D I J DB_SET D I J +DB_SET_BEGIN_LSNP * I * DB_SET_LOCK_TIMEOUT D I J DB_SET_RANGE D I J DB_SET_RECNO D I J DB_SET_TXN_NOW * I * DB_SET_TXN_TIMEOUT D I J DB_SNAPSHOT D I J +DB_STAT_ALL D I * DB_STAT_CLEAR D I J +DB_STAT_LOCK_CONF D I * +DB_STAT_LOCK_LOCKERS D I * +DB_STAT_LOCK_OBJECTS D I * +DB_STAT_LOCK_PARAMS D I * +DB_STAT_MEMP_HASH D I * +DB_STAT_SUBSYSTEM D I * DB_SURPRISE_KID * I * DB_SWAPBYTES * I * DB_SYSTEM_MEM D I J DB_TEST_ELECTINIT * I * +DB_TEST_ELECTVOTE1 * I * DB_TEST_POSTDESTROY * I * DB_TEST_POSTLOG * I * DB_TEST_POSTLOGMETA * I * @@ -318,39 +345,39 @@ DB_TIMEOUT * I * DB_TIME_NOTGRANTED D I J DB_TRUNCATE D I J DB_TXNVERSION * I * -DB_TXN_ABORT D I C -DB_TXN_APPLY D I C +DB_TXN_ABORT D I J +DB_TXN_APPLY D I J DB_TXN_BACKWARD_ALLOC * I * -DB_TXN_BACKWARD_ROLL D I C +DB_TXN_BACKWARD_ROLL D I J DB_TXN_CKP * I * -DB_TXN_FORWARD_ROLL D I C -DB_TXN_GETPGNOS * I * +DB_TXN_FORWARD_ROLL D I J DB_TXN_NOSYNC D I J DB_TXN_NOT_DURABLE D I J DB_TXN_NOWAIT D I J DB_TXN_OPENFILES * I * DB_TXN_POPENFILES * I * -DB_TXN_PRINT D I C +DB_TXN_PRINT D I J DB_TXN_SYNC D I J DB_TXN_WRITE_NOSYNC D I J DB_UNDO * I * -DB_UNKNOWN D I C +DB_UNKNOWN D I J +DB_UNREF * I * DB_UPDATE_SECONDARY * I * DB_UPGRADE D I J DB_USE_ENVIRON D I J DB_USE_ENVIRON_ROOT D I J -DB_VERB_CHKPOINT D I J DB_VERB_DEADLOCK D I J DB_VERB_RECOVERY D I J DB_VERB_REPLICATION D I J DB_VERB_WAITSFOR D I J DB_VERIFY D I J -DB_VERIFY_BAD D I C +DB_VERIFY_BAD D I N DB_VERIFY_FATAL * I * DB_VERSION_MAJOR * I J DB_VERSION_MINOR * I J +DB_VERSION_MISMATCH D I * DB_VERSION_PATCH * I J -DB_VERSION_STRING * I * +DB_VERSION_STRING * I N DB_WRITECURSOR D I J DB_WRITELOCK * I * DB_WRITEOPEN * I * diff --git a/db/dist/s_include b/db/dist/s_include index 44bfce30e..ab058d86d 100755 --- a/db/dist/s_include +++ b/db/dist/s_include @@ -1,5 +1,5 @@ #!/bin/sh - -# $Id: s_include,v 1.19 2002/03/27 04:31:50 bostic Exp $ +# $Id: s_include,v 1.22 2004/04/19 18:27:17 mjc Exp $ # # Build the automatically generated function prototype files. @@ -72,13 +72,18 @@ head defonly _DB_INT_DEF_IN_ > $i_dfile # Process the standard directories, creating per-directory prototype # files and adding to the external prototype and #define files. for i in db btree clib common crypto dbreg env fileops hash hmac \ - lock log mp mutex os qam rep rpc_client rpc_server tcl txn xa; do + lock log mp mutex os qam rep rpc_client rpc_server sequence tcl txn xa; do head "_${i}_ext_h_" > $i_pfile - f="../$i/*.c" - [ $i = os ] && f="$f ../os_win32/*.c" - [ $i = rpc_server ] && f="../$i/c/*.c" - [ $i = crypto ] && f="../$i/*.c ../$i/*/*.c" + if [ $i = os ] ; then + f=`ls ../$i/*.c ../os_win32/*.c` + elif [ $i = rpc_server ] ; then + f=`ls ../$i/c/*.c` + elif [ $i = crypto ] ; then + f=`ls ../$i/*.c ../$i/*/*.c` + else + f=`ls ../$i/*.c` + fi awk -f gen_inc.awk \ -v db_version_unique_name=$DB_VERSION_UNIQUE_NAME \ -v e_dfile=$e_dfile \ @@ -96,7 +101,7 @@ done # Process directories which only add to the external prototype and #define # files. for i in dbm hsearch; do - f="../$i/*.c" + f=`ls ../$i/*.c` awk -f gen_inc.awk \ -v db_version_unique_name=$DB_VERSION_UNIQUE_NAME \ -v e_dfile=$e_dfile \ @@ -105,16 +110,6 @@ for i in dbm hsearch; do -v i_pfile="" $f done -# RPC uses rpcgen to generate a header file; post-process it to add more -# interfaces to the internal #define file. -sed -e '/extern bool_t xdr___/{' \ - -e 's/.* //' \ - -e 's/();//' \ - -e 's/.*/#define & &@DB_VERSION_UNIQUE_NAME@/' \ - -e 'p' \ - -e '}' \ - -e d < ../dbinc_auto/db_server.h >> $i_dfile - # There are a few globals in DB -- add them to the external/internal # #define files. (echo "#define __db_global_values __db_global_values@DB_VERSION_UNIQUE_NAME@"; @@ -141,7 +136,7 @@ cmp $i_dfile $f > /dev/null 2>&1 || head space defonly _DB_EXT_185_DEF_IN_ > $e_dfile head space _DB_EXT_185_PROT_IN_ > $e_pfile -f="../db185/*.c" +f=`ls ../db185/*.c` awk -f gen_inc.awk \ -v db_version_unique_name=$DB_VERSION_UNIQUE_NAME \ -v e_dfile=$e_dfile \ diff --git a/db/dist/s_java b/db/dist/s_java index c262a9397..ae715ccd6 100755 --- a/db/dist/s_java +++ b/db/dist/s_java @@ -1,9 +1,8 @@ #!/bin/sh - -# $Id: s_java,v 11.6 2003/11/07 14:39:26 bostic Exp $ +# $Id: s_java,v 11.8 2004/04/06 20:43:35 mjc Exp $ # # Build the Java files. +sh s_java_stat # Create Java stat methods sh s_java_swig # Create core Java API with SWIG sh s_java_const # Create Java constants -sh s_java_stat # Create Java stat methods -sh s_java_camel # Camel-case the Java API. diff --git a/db/dist/s_java_const b/db/dist/s_java_const index 338bb13ec..644b32324 100755 --- a/db/dist/s_java_const +++ b/db/dist/s_java_const @@ -1,5 +1,5 @@ #!/bin/sh - -# $Id: s_java_const,v 1.25 2003/09/04 23:59:03 bostic Exp $ +# $Id: s_java_const,v 1.27 2004/07/30 14:51:37 mjc Exp $ # # Build the Java files. @@ -10,65 +10,26 @@ msgjava="/* DO NOT EDIT: automatically built by dist/s_java_const. */" t=/tmp/__java trap 'rm -f $t; exit 0' 0 1 2 3 13 15 -# Build {debug,release}/DbConstants.java. -for build in debug release ; do - isdebug=`echo $build | sed 's/debug/true/;s/release/false/'` - (echo "$msgjava" && - echo && - echo 'package com.sleepycat.db;' && - echo && - echo 'class DbConstants' && - echo '{' && - for i in `egrep '^DB_.*J$' pubdef.in | awk '{print $1}'`; do \ - egrep -w "^#define[ ]$i|^[ ][ ]*$i" ../dbinc/db.in; \ - done | - sed -e "s/@DB_VERSION_MAJOR@/$DB_VERSION_MAJOR/" \ - -e "s/@DB_VERSION_MINOR@/$DB_VERSION_MINOR/" \ - -e "s/@DB_VERSION_PATCH@/$DB_VERSION_PATCH/" \ - -e 's/^#define[ ][ ]*//' \ - -e 's/[()=,]/ /g' \ - -e 's/\/\*/ /' | \ - awk '{ print " static final int " $1 " = " $2 ";" }' && - echo && - echo " static final boolean DB_DEBUG = ${isdebug};" - echo '}' && - echo && - echo '// end of DbConstants.java') > $t - - f=../java/src/com/sleepycat/db/$build/DbConstants.java - cmp $t $f > /dev/null 2>&1 || - (echo "Building $f" && rm -f $f && cp $t $f && chmod 444 $f) -done - -# Build Db.java. -f=../java/src/com/sleepycat/db/Db.java -sed '/BEGIN-JAVA-SPECIAL-CONSTANTS/q' < $f > $t -(echo " $msgjava" && - for i in `egrep '^DB_.*C$' pubdef.in | awk '{print $1}'`; do \ - egrep -w "^#define[ ]$i|^[ ][ ]*$i" ../dbinc/db.in; \ - done | - sed -e 's/^#define[ ][ ]*//' \ - -e 's/[()=,]/ /g' | - awk '{ print " public static final int " $1 " = " $2 ";" }') >> $t -(for i in `egrep '^DB_.*J$' pubdef.in | awk '{print $1}'`; do \ - egrep -w "^#define[ ]$i|^[ ][ ]*$i" ../dbinc/db.in; \ - done | - sed -e 's/^#define[ ][ ]*//' \ - -e 's/[()=,]/ /g' | - awk '{ print " public static final int " $1 ";" }') >> $t -sed -n \ - '/END-JAVA-SPECIAL-CONSTANTS/,/BEGIN-JAVA-CONSTANT-INITIALIZATION/p' \ - < $f >> $t -(echo " $msgjava" && +(echo "$msgjava" && + echo && + echo 'package com.sleepycat.db.internal;' && + echo && + echo 'public interface DbConstants' && + echo '{' && for i in `egrep '^DB_.*J$' pubdef.in | awk '{print $1}'`; do \ - egrep -w "^#define[ ]$i|^[ ][ ]*$i" ../dbinc/db.in; \ + egrep -w "^#define[ ]$i|^[ ][ ]*$i" ../dbinc/db.in; \ done | - sed -e 's/^#define[ ][ ]*//' \ + sed -e "s/@DB_VERSION_MAJOR@/$DB_VERSION_MAJOR/" \ + -e "s/@DB_VERSION_MINOR@/$DB_VERSION_MINOR/" \ + -e "s/@DB_VERSION_PATCH@/$DB_VERSION_PATCH/" \ + -e 's/^#define[ ][ ]*//' \ -e 's/[()=,]/ /g' \ -e 's/\/\*/ /' | \ - awk '{ print " " $1 " = DbConstants." $1 ";" }') >> $t -sed -n '/END-JAVA-CONSTANT-INITIALIZATION/,$p' < $f >> $t + awk '{ print " int " $1 " = " $2 ";" }' && + echo '}' && + echo && + echo '// end of DbConstants.java') > $t -f=../java/src/com/sleepycat/db/Db.java +f=../java/src/com/sleepycat/db/internal/DbConstants.java cmp $t $f > /dev/null 2>&1 || (echo "Building $f" && rm -f $f && cp $t $f && chmod 444 $f) diff --git a/db/dist/s_java_stat b/db/dist/s_java_stat index 893d3dc7e..4eb2ab147 100755 --- a/db/dist/s_java_stat +++ b/db/dist/s_java_stat @@ -1,186 +1,314 @@ #!/bin/sh - -# $Id: s_java_stat,v 1.26 2003/09/04 23:59:04 bostic Exp $ +# $Id: s_java_stat,v 1.33 2004/09/28 19:30:36 mjc Exp $ # # Build the Java files. -msgjava="/* DO NOT EDIT: automatically built by dist/s_java_stat. */" +msgjava="/*- + * DO NOT EDIT: automatically built by dist/s_java_stat. + * + * See the file LICENSE for redistribution information. + * + * Copyright (c) 2002-2004 + * Sleepycat Software. All rights reserved. + */" + +s=/tmp/__java.sed t=/tmp/__java c=/tmp/__javajnic -h=/tmp/__javajnih -trap 'rm -f $t $c $h; exit 0' 0 1 2 3 13 15 +u1=/tmp/__javautil1 +u2=/tmp/__javautil2 +trap 'rm -f $t $c $u1 $u2; exit 0' 0 1 2 3 13 15 # Script to convert DB C structure declarations into Java declarations. jclass() { - cat ../dbinc/db.in | - sed -n \ - -e "/struct $1 {/,/^}/{" \ - -e "/$1/d" \ - -e '/;/!d' \ - -e '/^}/d' \ - -e '/char[ ]*\*/{' \ - -e "s/^[ ]*[^\*]*\*[ ]*\([^;]*\).*/$2 public String \1;/p"\ - -e 'd' \ - -e '}' \ - -e '/time_t/{' \ - -e "s/^[ ]*[^ ]*[ ]*\([^;]*\).*/$2 public long \1;/p" \ - -e 'd' \ - -e '}' \ - -e '/DB_LSN[ ]*/{' \ - -e "s/^[ ]*[^ ]*[ ]*\([^;]*\).*/$2 public DbLsn \1;/p"\ - -e 'd' \ - -e '}' \ - -e '/DB_TXN_ACTIVE[ ]*\*/{' \ - -e "s/^[ ]*[^\*]*\*[ ]*\([^;]*\).*/$2 public Active \1[];/p"\ - -e 'd' \ - -e '}' \ - -e '/u_int8_t[ ]*xid\[/{' \ - -e "s/^[ ]*[^\*]*\*[ ]*\([^;]*\).*/$2 public byte[] xid;/p"\ - -e 'd' \ - -e '}' \ - -e "s/^[ ]*[^ ]*[ ]*\([^;]*\).*/$2 public int \1;/p" \ - -e '}' + cat > $s <<EOF +/struct __db_$1 {/,/^}/{ + /__db_$1/d + /;/!d + /^}/d + /char[ ]*\*/{ + s/^[ ]*[^\*]*\*[ ]*\([^;]*\).*/\\ +$2 private String \1;\\ +$2 public String get_\1() {\\ +$2 return \1;\\ +$2 }/p + d + } + /time_t/{ + s/^[ ]*[^ ]*[ ]*\([^;]*\).*/\\ +$2 private long \1;\\ +$2 public long get_\1() {\\ +$2 return \1;\\ +$2 }/p + d + } + /db_seq_t/{ + s/^[ ]*[^ ]*[ ]*\([^;]*\).*/\\ +$2 private long \1;\\ +$2 public long get_\1() {\\ +$2 return \1;\\ +$2 }/p + d + } + /DB_LSN[ ]*/{ + s/^[ ]*[^ ]*[ ]*\([^;]*\).*/\\ +$2 private LogSequenceNumber \1;\\ +$2 public LogSequenceNumber get_\1() {\\ +$2 return \1;\\ +$2 }/p + d + } + /DB_TXN_ACTIVE[ ]*\*/{ + s/^[ ]*[^\*]*\*[ ]*\([^;]*\).*/\\ +$2 private Active[] \1;\\ +$2 public Active[] get_\1() {\\ +$2 return \1;\\ +$2 }/p + d + } + /u_int8_t[ ]*xid\[/{ + s/^[ ]*[^ ]*[ ]*\([^[;]*\).*/\\ +$2 private byte[] \1;\\ +$2 public byte[] get_\1() {\\ +$2 return \1;\\ +$2 }/p + d + } + s/^[ ]*[^ ]*[ ]*\([^;]*\).*/\\ +$2 private int \1;\\ +$2 public int get_\1() {\\ +$2 return \1;\\ +$2 }/p +} +EOF + sed -n -f $s < ../dbinc/db.in | + perl -w -p -e 's/get_(st|bt|hash|qs)_/get_/;' \ + -e 'if (m/get.*\(/) {' \ + -e 's/_n([b-df-hj-np-tv-z])/_num_$1/;' \ + -e 's/_(min|max)([a-z])/_$1_$2/;' \ + -e 's/pg(.)/_pages_$1/;' \ + -e 's/(count|flag|free|id\(|page|size|timeout)/_$1/g;' \ + -e 's/__*/_/g;' \ + -e 's/_(.)/\U$1/g' \ + -e '};' \ + -e '1' } -# Script to convert DB C structure declarations into Java declarations. +# Script to convert DB C structure declarations into a JNI method to fill the +# corresponding Java class jclass_jni() { - c=$3 - echo "static int $2(JNIEnv *jnienv, jclass cl," >> $c - echo " jobject jobj, struct $1 *statp) {" >> $c - cat ../dbinc/db.in | - sed -n \ - -e "/struct $1 {/,/^}/{" \ - -e "/$1/d" \ - -e '/;/!d' \ - -e '/^}/d' \ - -e '/char[ ]*\*/{' \ - -e "s/^[ ]*[^\*]*\*[ ]*\([^;]*\).*/ JAVADB_STAT_STRING(jnienv, cl, jobj, statp, \1);/p"\ - -e 'd' \ - -e '}' \ - -e '/time_t/{' \ - -e "s/^[ ]*[^ ]*[ ]*\([^;]*\).*/ JAVADB_STAT_LONG(jnienv, cl, jobj, statp, \1);/p" \ - -e 'd' \ - -e '}' \ - -e '/DB_LSN[ ]*/{' \ - -e "s/^[ ]*[^ ]*[ ]*\([^;]*\).*/ JAVADB_STAT_LSN(jnienv, cl, jobj, statp, \1);/p"\ - -e 'd' \ - -e '}' \ - -e '/DB_TXN_ACTIVE[ ]*\*/{' \ - -e "s/^[ ]*[^\*]*\*[ ]*\([^;]*\).*/ JAVADB_STAT_ACTIVE(jnienv, cl, jobj, statp, \1);/p"\ - -e 'd' \ - -e '}' \ - -e '/u_int8_t[ ]*xid\[/{' \ - -e "s/^[ ]*[^\*]*\*[ ]*\([^;]*\).*/ JAVADB_STAT_XID(jnienv, cl, jobj, statp, xid);/p"\ - -e 'd' \ - -e '}' \ - -e "s/^[ ]*[^ ]*[ ]*\([^;]*\).*/ JAVADB_STAT_INT(jnienv, cl, jobj, statp, \1);/p" \ - -e '}' >> $c + fill=__dbj_fill_$1 + j_class=$2 + jni_fieldid_decls $1 $2 + jni_fieldids $1 $2 + cat > $s <<EOF +/struct __db_$1 {/,/^}/{ + /__db_$1/d + /;/!d + /^}/d + /char[ ]*\*/{ + s/^[ ]*[^\*]*\*[ ]*\([^;]*\).*/ JAVADB_STAT_STRING(jnienv, jobj, $1_\1_fid, statp, \1);/p + d + } + /time_t/{ + s/^[ ]*[^ ]*[ ]*\([^;]*\).*/ JAVADB_STAT_LONG(jnienv, jobj, $1_\1_fid, statp, \1);/p + d + } + /db_seq_t/{ + s/^[ ]*[^ ]*[ ]*\([^;]*\).*/ JAVADB_STAT_LONG(jnienv, jobj, $1_\1_fid, statp, \1);/p + d + } + /DB_LSN[ ]*/{ + s/^[ ]*[^ ]*[ ]*\([^;]*\).*/ JAVADB_STAT_LSN(jnienv, jobj, $1_\1_fid, statp, \1);/p + d + } + /DB_TXN_ACTIVE[ ]*\*/{ + s/^[ ]*[^\*]*\*[ ]*\([^;]*\).*/ JAVADB_STAT_ACTIVE(jnienv, jobj, $1_\1_fid, statp, \1);/p + d + } + /u_int8_t[ ]*xid\[/{ + s/^[ ]*[^ ]*[ ]*\([^[;]*\).*/ JAVADB_STAT_XID(jnienv, jobj, $1_\1_fid, statp, \1);/p + d + } + s/^[ ]*[^ ]*[ ]*\([^;]*\).*/ JAVADB_STAT_INT(jnienv, jobj, $1_\1_fid, statp, \1);/p +} +EOF + echo "static int $fill(JNIEnv *jnienv, " >> $c + echo " jobject jobj, struct __db_$1 *statp) {" >> $c + sed -n -f $s < ../dbinc/db.in >> $c echo ' return (0);' >> $c echo '}' >> $c } +jni_fieldid_decls() +{ + cat > $s <<EOF +/struct __db_$1 {/,/^}/{ + /__db_$1/d + /;/!d + /^}/d + /char[ ]*\*/{ + s/^[ ]*[^\*]*\*[ ]*\([^;]*\).*/static jfieldID $1_\1_fid;/p + d + } + /time_t/{ + s/^[ ]*[^ ]*[ ]*\([^;]*\).*/static jfieldID $1_\1_fid;/p + d + } + /db_seq_t/{ + s/^[ ]*[^ ]*[ ]*\([^;]*\).*/static jfieldID $1_\1_fid;/p + d + } + /DB_LSN[ ]*/{ + s/^[ ]*[^ ]*[ ]*\([^;]*\).*/static jfieldID $1_\1_fid;/p + d + } + /DB_TXN_ACTIVE[ ]*\*/{ + s/^[ ]*[^\*]*\*[ ]*\([^;]*\).*/static jfieldID $1_\1_fid;/p + d + } + /u_int8_t[ ]*xid\[/{ + s/^[ ]*[^ ]*[ ]*\([^[;]*\).*/static jfieldID $1_\1_fid;/p + d + } + s/^[ ]*[^ ]*[ ]*\([^;]*\).*/static jfieldID $1_\1_fid;/p +} +EOF + sed -n -f $s < ../dbinc/db.in >> $u1 +} + +jni_fieldids() +{ + cat > $s <<EOF +/struct __db_$1 {/,/^}/{ + /__db_$1/d + /;/!d + /^}/d + /char[ ]*\*/{ + s/^[ ]*[^\*]*\*[ ]*\([^;]*\).*/ { \&$1_\1_fid, \&$1_class, \"\1\", \"Ljava\/lang\/String;\" },/p + d + } + /time_t/{ + s/^[ ]*[^ ]*[ ]*\([^;]*\).*/ { \&$1_\1_fid, \&$1_class, \"\1\", \"J\" },/p + d + } + /db_seq_t/{ + s/^[ ]*[^ ]*[ ]*\([^;]*\).*/ { \&$1_\1_fid, \&$1_class, \"\1\", \"J\" },/p + d + } + /DB_LSN[ ]*/{ + s/^[ ]*[^ ]*[ ]*\([^;]*\).*/ { \&$1_\1_fid, \&$1_class, \"\1\", \"L\" DB_PKG \"LogSequenceNumber;\" },/p + d + } + /DB_TXN_ACTIVE[ ]*\*/{ + s/^[ ]*[^\*]*\*[ ]*\([^;]*\).*/ { \&$1_\1_fid, \&$1_class, \"\1\", \"[L\" DB_PKG \"TransactionStats\$Active;\" },/p + d + } + /u_int8_t[ ]*xid\[/{ + s/^[ ]*[^ ]*[ ]*\([^[;]*\).*/ { \&$1_\1_fid, \&$1_class, \"\1\", \"[B\" },/p + d + } + s/^[ ]*[^ ]*[ ]*\([^;]*\).*/ { \&$1_\1_fid, \&$1_class, \"\1\", \"I\" },/p +} +EOF + sed -n -f $s < ../dbinc/db.in >> $u2 +} + # Script to convert DB C structure declarations into a toString method body jclass_toString() { - echo "/**" - echo " * Provide a string representation of all the fields contained" - echo " * within this class." - echo " *" - echo " * @return The string representation." - echo " */" + cat > $s <<EOF +/struct __db_$1 {/,/^}/{ + /__db_$1/d + /;/!d + /^}/d + /char[ ]*\*/{ + s/^[ ]*[^\*]*\*[ ]*\([^;]*\).*/$3 + "\\\\n$3 \1=" + \1/p + d + } + /DB_TXN_ACTIVE[ ]*\*/{ + s/^[ ]*[^\*]*\*[ ]*\([^;]*\).*/$3 + \"\\\\n$3 \1=\" + DbUtil.objectArrayToString(\1, \"\1\")/p + d + } + /u_int8_t[ ]*xid\[/{ + s/^[ ]*[^ ]*[ ]*\([^[;]*\).*/$3 + \"\\\\n$3 \1=\" + DbUtil.byteArrayToString(\1)/p + d + } + s/^[ ]*[^ ]*[ ]*\([^;]*\).*/$3 + \"\\\\n$3 \1=\" + \1/p +} +EOF + echo echo "$3 public String toString() {" echo "$3 return \"$2:\"" - cat ../dbinc/db.in | - sed -n \ - -e "/struct $1 {/,/^}/{" \ - -e "/$1/d" \ - -e '/;/!d' \ - -e '/^}/d' \ - -e '/char[ ]*\*/{' \ - -e "s/^[ ]*[^\*]*\*[ ]*\([^;]*\).*/$3 + \"\\\\n$3 \1=\" + \1/p"\ - -e 'd' \ - -e '}' \ - -e '/DB_TXN_ACTIVE[ ]*\*/{' \ - -e "s/^[ ]*[^\*]*\*[ ]*\([^;]*\).*/$3 + \"\\\\n$3 \1=\" + DbUtil.objectArrayToString(\1, \"\1\")/p"\ - -e 'd' \ - -e '}' \ - -e '/u_int8_t[ ]*xid\[/{' \ - -e "s/^[ ]*[^\*]*\*[ ]*\([^;]*\).*/$3 + \"\\\\n$3 xid=\" + DbUtil.byteArrayToString(xid)/p"\ - -e 'd' \ - -e '}' \ - -e "s/^[ ]*[^ ]*[ ]*\([^;]*\).*/$3 + \"\\\\n$3 \1=\" + \1/p"\ - -e '}' + sed -n -f $s < ../dbinc/db.in echo "$3 ;" echo "$3 }" } -echo "$msgjava" >> $c - stat_class() { - c_struct=$1 + c_struct=__db_$1 j_class=$2 - fill=$3 + extends=$3 (echo "$msgjava" echo echo 'package com.sleepycat.db;' echo - echo "/**" - echo " * Statistics associated with $j_class generated by" - echo " * DbEnv on request.<p>" - echo " * The information contained within instances of this" - echo " * class is a snapshot in time, it is not continually updated." - echo " */" - echo "public class $j_class" - echo '{' - jclass $c_struct - echo - jclass_toString $c_struct $j_class - echo '}' - echo "// end of $j_class.java") > $t - jclass_jni $c_struct $fill $c + echo "public class $j_class$extends {" + echo " // no public constructor" + echo " protected $j_class() {}" + jclass $1 + jclass_toString $1 $2 + echo '}') > $t + jclass_jni $1 $2 f=../java/src/com/sleepycat/db/$j_class.java cmp $t $f > /dev/null 2>&1 || (echo "Building $f" && rm -f $f && cp $t $f && chmod 444 $f) } -stat_class __db_bt_stat DbBtreeStat __dbj_fill_bt_stat -stat_class __db_h_stat DbHashStat __dbj_fill_h_stat -stat_class __db_lock_stat DbLockStat __dbj_fill_lock_stat -stat_class __db_log_stat DbLogStat __dbj_fill_log_stat -stat_class __db_mpool_fstat DbMpoolFStat __dbj_fill_mpool_fstat -stat_class __db_mpool_stat DbMpoolStat __dbj_fill_mpool_stat -stat_class __db_qam_stat DbQueueStat __dbj_fill_qam_stat -stat_class __db_rep_stat DbRepStat __dbj_fill_rep_stat +echo "$msgjava" > $c +> $u1 +> $u2 -# Build DbTxnStat.java - special because of embedded Active class -(echo "$msgjava" && - echo && - echo 'package com.sleepycat.db;' && - echo && - echo "/**" - echo " * Statistics associated with DbTxnStat generated by" - echo " * DbEnv on request." - echo " * The information contained within instances of this" - echo " * class is a snapshot in time, it is not continually updated." - echo " */" - echo "public class DbTxnStat" - echo '{' - echo " public static class Active {" - jclass __db_txn_active " " - jclass_toString __db_txn_active Active " " +stat_class bt_stat BtreeStats " extends DatabaseStats" +stat_class h_stat HashStats " extends DatabaseStats" +stat_class lock_stat LockStats +stat_class log_stat LogStats +stat_class mpool_fstat CacheFileStats +stat_class mpool_stat CacheStats +stat_class qam_stat QueueStats " extends DatabaseStats" +stat_class rep_stat ReplicationStats +stat_class seq_stat SequenceStats +# Build TransactionStats.java - special because of embedded Active class +(echo "$msgjava" + echo + echo 'package com.sleepycat.db;' + echo + echo 'import com.sleepycat.db.internal.DbUtil;' + echo + echo "public class TransactionStats" + echo '{' + echo " // no public constructor" + echo " protected TransactionStats() {}" + echo + echo -n " public static class Active {" + echo " // no public constructor" + echo " protected Active() {}" + jclass txn_active " " + jclass_toString txn_active Active " " echo ' };' - jclass __db_txn_stat - jclass_toString __db_txn_stat DbTxnStat + jclass txn_stat + jclass_toString txn_stat TransactionStats echo '}' - echo '// end of DbTxnStat.java') > $t -jclass_jni __db_txn_stat __dbj_fill_txn_stat $c $h -jclass_jni __db_txn_active __dbj_fill_txn_active $c $h -f=../java/src/com/sleepycat/db/DbTxnStat.java + echo '// end of TransactionStats.java') > $t +jclass_jni txn_stat __dbj_fill_txn_stat +jclass_jni txn_active __dbj_fill_txn_active +f=../java/src/com/sleepycat/db/TransactionStats.java cmp $t $f > /dev/null 2>&1 || (echo "Building $f" && rm -f $f && cp $t $f && chmod 444 $f) @@ -188,3 +316,12 @@ mv $c $t f=../libdb_java/java_stat_auto.c cmp $t $f > /dev/null 2>&1 || (echo "Building $f" && rm -f $f && cp $t $f && chmod 444 $f) + +f=../libdb_java/java_util.i +sed '/BEGIN-STAT-FIELD-DECLS/q' < $f > $t +cat $u1 >> $t +sed -n '/END-STAT-FIELD-DECLS/,/BEGIN-STAT-FIELDS/p' < $f >> $t +cat $u2 >> $t +sed -n '/END-STAT-FIELDS/,$p' < $f >> $t +cmp $t $f > /dev/null 2>&1 || + (echo "Building $f" && rm -f $f && cp $t $f && chmod 644 $f) diff --git a/db/dist/s_java_swig b/db/dist/s_java_swig index 569a5e2bc..c1e67e316 100755 --- a/db/dist/s_java_swig +++ b/db/dist/s_java_swig @@ -1,11 +1,12 @@ #!/bin/sh - -# $Id: s_java_swig,v 11.6 2003/05/19 01:14:37 bostic Exp $ +# $Id: s_java_swig,v 11.11 2004/09/23 17:31:53 mjc Exp $ # # Run SWIG to generate the Java APIs SWIG=swig SWIG_DIR=../libdb_java SWIG_FILE=$SWIG_DIR/db.i +PACKAGE="com.sleepycat.db.internal" die() { echo "$@" >&2 @@ -20,7 +21,7 @@ for api in java ; do swig_args="" case $api in java) - swig_args="-nodefault -package com.sleepycat.db $args" + swig_args="-nodefault -package $PACKAGE $args" ;; esac @@ -28,9 +29,15 @@ for api in java ; do -o ../libdb_$api/db_${api}_wrap.c $SWIG_FILE || exit $? done +# Skip Java sources if run with "-n" +if [ "x$1" = "x-n" ] ; then + rm -f $SWIG_DIR/*.java + exit 0 +fi + # Fixups for Java JAVA_SRCTOP=../java/src -JAVA_PKGDIR=com/sleepycat/db +JAVA_PKGDIR=com/sleepycat/db/internal JAVA_SRCDIR=$JAVA_SRCTOP/$JAVA_PKGDIR # SWIG 1.3.18 puts the Java files in the same directory as the native code. @@ -38,8 +45,11 @@ cd $SWIG_DIR [ -f Db.java ] || exit 1 for f in *.java ; do + case $f in + SWIGTYPE*) + die "Interface contains unresolved types: $f" + esac rm -f $JAVA_SRCDIR/$f - sed -f $SWIG_DIR/java-post.sed < $f > $JAVA_SRCDIR/$f || exit $? + perl -p $SWIG_DIR/java-post.pl < $f > $JAVA_SRCDIR/$f || exit $? rm -f $f done -cd ../dist diff --git a/db/dist/s_je2db b/db/dist/s_je2db new file mode 100644 index 000000000..aaaa42cf1 --- /dev/null +++ b/db/dist/s_je2db @@ -0,0 +1,88 @@ +#!/bin/sh - + +# The examples must be hand-edited after they are copied: +# - add setInitializeCache(true), setInitializeLocking(true), setType(BTREE) +# - add null databaseName param to openDatabase() and openSecondaryDatabase() +# - remove foreign key configuration and imports + +COPY_EXAMPLES=0 + +JEDIR=$1 +if [ $# -eq 1 ] ; then + DBDIR=.. +else + DBDIR=$2 +fi + +if [ ! -d "$DBDIR/dbinc" -o ! -f "$JEDIR/build.xml" ] ; then + echo >&2 "Usage $0 /path/to/je [ /path/to/db ]" + exit 1 +fi + +JEDIR=$(cd "$JEDIR" ; /bin/pwd) +DBDIR=$(cd "$DBDIR" ; /bin/pwd) + +JESRC="$JEDIR/src" +JETEST="$JEDIR/test" +JEEXAMPLES="$JEDIR/examples" +DBSRC="$DBDIR/java/src" +DBTEST="$DBDIR/test/scr024/src" +DBEXAMPLES="$DBDIR/examples_java/src" +DIRMATCH="com/sleepycat\(/examples\)*/\(\(bind\)\|\(collections\)\|\(util\)\)" + +cd "$JESRC" +for d in `find . -type d | grep -v CVS | grep $DIRMATCH` ; do + #echo "$DBSRC/$d" + mkdir -p "$DBSRC/$d" +done +cd "$JETEST" +for d in `find . -type d | grep -v CVS | grep $DIRMATCH` ; do + #echo "$DBTEST/$d" + mkdir -p "$DBTEST/$d" +done +if [ $COPY_EXAMPLES -eq 1 ] ; then + cd "$JEEXAMPLES" + for d in `find . -type d | grep -v CVS | grep $DIRMATCH` ; do + #echo "$DBEXAMPLES/$d" + mkdir -p "$DBEXAMPLES/$d" + done +fi + +E1='s/com\.sleepycat\.je/com.sleepycat.db/g' +E2='/import com\.sleepycat\.db\.ForeignKeyNullifier/d' +E3='/implements/s/, ForeignKeyNullifier//' +E4='/<!-- begin JE only -->/,/<!-- end JE only -->/d' +EXCLUDETESTS="\(\(ForeignKeyTest\)\|\(TupleSerialFactoryTest\)\)" + +cd "$JESRC" +for f in `find . -name '*.java' | grep $DIRMATCH` ; do + #echo $DBSRC/$f + sed -e "$E1" -e "$E2" -e "$E3" -e "$E4" < $f > $DBSRC/$f.sed.out + diff -q -I "\$\Id:" $DBSRC/$f $DBSRC/$f.sed.out || \ + mv -f $DBSRC/$f.sed.out $DBSRC/$f + rm -f $DBSRC/$f.sed.out +done + +cd "$JETEST" +for f in `find . -name '*.java' | grep $DIRMATCH | grep -v $EXCLUDETESTS` ; do + #echo $DBTEST/$f + sed -e "$E1" < $f > $DBTEST/$f.sed.out + diff -q -I "\$\Id:" $DBTEST/$f $DBTEST/$f.sed.out || \ + mv -f $DBTEST/$f.sed.out $DBTEST/$f + rm -f $DBTEST/$f.sed.out +done +cp -f "com/sleepycat/collections/test/serial/TestSerial.java.original" \ + "$DBTEST/com/sleepycat/collections/test/serial" + +if [ $COPY_EXAMPLES -eq 1 ] ; then + cd "$JEEXAMPLES" + for f in `find . -name '*.java' | grep $DIRMATCH` ; do + #echo $DBEXAMPLES/$f + sed -e "$E1" < $f > $DBEXAMPLES/$f.sed.out + diff -q -I "\$\Id:" $DBEXAMPLES/$f $DBEXAMPLES/$f.sed.out || \ + mv -f $DBEXAMPLES/$f.sed.out $DBEXAMPLES/$f + rm -f $DBEXAMPLES/$f.sed.out + done +fi + +exit 0 diff --git a/db/dist/s_perm b/db/dist/s_perm index 16450873a..8c3a0f746 100755 --- a/db/dist/s_perm +++ b/db/dist/s_perm @@ -1,5 +1,5 @@ #!/bin/sh - -# $Id: s_perm,v 1.29 2003/11/17 21:11:45 bostic Exp $ +# $Id: s_perm,v 1.31 2004/10/05 18:56:58 bostic Exp $ d=.. echo 'Updating Berkeley DB source tree permissions...' @@ -25,7 +25,6 @@ run dist/s_config 555 run dist/s_crypto 555 run dist/s_include 555 run dist/s_java 555 -run dist/s_java_camel 555 run dist/s_java_const 555 run dist/s_java_stat 555 run dist/s_java_swig 555 @@ -40,6 +39,7 @@ run dist/s_vxworks 555 run dist/s_win32 555 run dist/s_win32_dsp 555 run dist/vx_buildcd 555 +run mod_db4/configure 555 run perl/BerkeleyDB/dbinfo 555 run perl/BerkeleyDB/mkpod 555 diff --git a/db/dist/s_recover b/db/dist/s_recover index 331ae623d..b30a08554 100755 --- a/db/dist/s_recover +++ b/db/dist/s_recover @@ -1,30 +1,29 @@ #!/bin/sh - -# $Id: s_recover,v 1.14 2002/03/27 04:31:51 bostic Exp $ +# $Id: s_recover,v 1.17 2004/06/17 17:35:19 bostic Exp $ # # Build the automatically generated logging/recovery files. -tmp=/tmp/__db_a +header=/tmp/__db_a loglist=/tmp/__db_b -source=/tmp/__db_c -header=/tmp/__db_d +print=/tmp/__db_c +source=/tmp/__db_d template=/tmp/__db_e +tmp=/tmp/__db_f -trap 'rm -f $tmp $loglist $source $header $template; exit 1' 1 2 3 13 15 -trap 'rm -f $tmp $loglist $source $header $template; exit 0' 0 +trap 'rm -f /tmp/__db_[abcdef]; exit 1' 1 2 3 13 15 +trap 'rm -f /tmp/__db_[abcdef]; exit 0' 0 -DIR="db dbreg btree hash qam txn" +DIR="db dbreg btree fileops hash qam rep txn" # Check to make sure we haven't duplicated a log record entry, and build # the list of log record types that the test suite uses. for i in $DIR; do - p=none for f in ../$i/*.src; do # Grab the PREFIX; there should only be one per file, and # so it's okay to just take the first. grep '^PREFIX' $f | sed q egrep '^BEGIN[ ]|^IGNORED[ ]|^DEPRECATED[ ]' $f | awk '{print $1 "\t" $2 "\t" $3}' - done done > $loglist grep -v '^PREFIX' $loglist | @@ -40,12 +39,13 @@ cmp $loglist $f > /dev/null 2>&1 || (echo "Building $f" && rm -f $f && cp $loglist $f && chmod 444 $f) # Build DB's recovery routines. -for i in db dbreg btree fileops hash qam txn; do +for i in $DIR; do for f in ../$i/*.src; do subsystem=`basename $f .src` awk -f gen_rec.awk \ - -v source_file=$source \ -v header_file=$header \ + -v print_file=$print\ + -v source_file=$source \ -v template_file=$template < $f f=../dbinc_auto/${subsystem}_auto.h @@ -56,6 +56,10 @@ for i in db dbreg btree fileops hash qam txn; do cmp $source $f > /dev/null 2>&1 || (echo "Building $f" && rm -f $f && cp $source $f && chmod 444 $f) + f=../$i/${subsystem}_autop.c + cmp $print $f > /dev/null 2>&1 || + (echo "Building $f" && + rm -f $f && cp $print $f && chmod 444 $f) f=template/rec_${subsystem} cmp $template $f > /dev/null 2>&1 || (echo "Building $f" && diff --git a/db/dist/s_rpc b/db/dist/s_rpc index 6c420eee1..8dada0e3b 100644 --- a/db/dist/s_rpc +++ b/db/dist/s_rpc @@ -1,5 +1,5 @@ #!/bin/sh - -# $Id: s_rpc,v 11.19 2003/07/02 15:27:44 bostic Exp $ +# $Id: s_rpc,v 11.20 2004/03/11 20:11:17 bostic Exp $ # # Build the automatically generated RPC files @@ -13,125 +13,26 @@ trap 'rm -f $t ; exit 1' 1 2 3 13 15 client_file=../rpc_client/gen_client.c ctmpl_file=./template/gen_client_ret -dbinc_file=../dbinc/db.in -defs_file=../dbinc_auto/rpc_defs.in -header_file=../dbinc_auto/db_server.h -proc_file=../rpc_server/c/db_server_proc.c -rpcclnt_file=../rpc_client/db_server_clnt.c -rpcsvc_file=../rpc_server/c/db_server_svc.c -rpcxdr_file=../rpc_server/c/db_server_xdr.c -sed_file=../rpc_server/c/db_server_proc.sed server_file=../rpc_server/c/gen_db_server.c stmpl_file=./template/db_server_proc xdr_file=../rpc_server/db_server.x -# -# NOTE: We do NOT want to remove proc_file. It is what we apply $sed_file -# to, but we do not want to remove it, it does not get built in place. -rm -f $client_file \ - $ctmpl_file \ - $header_file \ - $rpcclnt_file \ - $rpcsvc_file \ - $rpcxdr_file \ - $sed_file \ - $server_file \ - $stmpl_file \ - $xdr_file +rm -f $client_file $ctmpl_file $server_file $stmpl_file $xdr_file # # Generate client/server/XDR code # xidsize=\ -`awk '/^#define/ { if ($2 == "DB_XIDDATASIZE") { print $3 }}' $dbinc_file` +`awk '/^#define/ { if ($2 == "DB_XIDDATASIZE") { print $3 }}' ../dbinc/db.in` awk -f gen_rpc.awk \ - -v major=$DB_VERSION_MAJOR \ - -v minor=$DB_VERSION_MINOR \ - -v xidsize=$xidsize \ -v client_file=$client_file \ -v ctmpl_file=$ctmpl_file \ - -v sed_file=$sed_file \ + -v major=$DB_VERSION_MAJOR \ + -v minor=$DB_VERSION_MINOR \ -v server_file=$server_file \ -v stmpl_file=$stmpl_file \ - -v xdr_file=$xdr_file < ../rpc_server/rpc.src -chmod 444 $client_file $server_file - -# -# Now run rpcgen to generate all our sources from the XDR file -# -rpcgen -h $xdr_file > $header_file -rpcgen -l $xdr_file > $rpcclnt_file -rpcgen -s tcp $xdr_file > $rpcsvc_file -rpcgen -c $xdr_file > $rpcxdr_file + -v xdr_file=$xdr_file \ + -v xidsize=$xidsize < ../rpc_server/rpc.src -# -# Run various server files through sed. -# -cat <<ENDOFSEDTEXT>$t -s/^#include[ ]"db_server.h"/#include "db_config.h"\\ -\\ -\\#ifndef NO_SYSTEM_INCLUDES\\ -\\#include <rpc\\/rpc.h>\\ -\\#include <rpc\\/pmap_clnt.h>/ -/^#include <netinet.in.h>/a\\ -\\#endif\\ -\\ -\\#include "db_int.h"\\ -\\#include "dbinc_auto/db_server.h"\\ -\\#include "dbinc/db_server_int.h"\\ -\\#include "dbinc_auto/rpc_server_ext.h" -/^ return;/i\\ -\\ __dbsrv_timeout(0); -s/svc_sendreply(transp, xdr_void,/svc_sendreply(transp, (xdrproc_t)xdr_void,/ -s/svc_getargs(transp, xdr_argument, &argument)/svc_getargs(transp, (xdrproc_t)xdr_argument, (char *)\&argument)/ -s/svc_sendreply(transp, xdr_result, result)/svc_sendreply(transp, (xdrproc_t)xdr_result, result)/ -s/svc_freeargs(transp, xdr_argument, &argument)/svc_freeargs(transp, (xdrproc_t)xdr_argument, (char *)\&argument)/ -s/^main/void __dbsrv_main/ -ENDOFSEDTEXT -sed -f $t $rpcsvc_file > ${rpcsvc_file}.new -mv ${rpcsvc_file}.new $rpcsvc_file - -sed -f $sed_file $proc_file > ${proc_file}.new -mv ${proc_file}.new $proc_file - -# Run rpcgen files through sed to add HAVE_RPC ifdef and appropriate -# includes. -cat <<ENDOFSEDTEXT>$t -1i\\ -\\#include "db_config.h"\\ -\\ -\\#ifdef HAVE_RPC -/^#include "db_server.h"/c\\ -\\#ifndef NO_SYSTEM_INCLUDES\\ -\\#include <rpc/rpc.h>\\ -\\ -\\#include <strings.h>\\ -\\#endif\\ -\\ -\\#include "db_int.h"\\ -\\#include "dbinc_auto/db_server.h" -\$a\\ -\\#endif /* HAVE_RPC */ -ENDOFSEDTEXT - -sed -f $t $rpcxdr_file > ${rpcxdr_file}.new -mv ${rpcxdr_file}.new $rpcxdr_file -sed -f $t $rpcclnt_file > ${rpcclnt_file}.new -mv ${rpcclnt_file}.new $rpcclnt_file - -# Copy the DB_RPC SERVER #defines into a separate file so -# they can be part of db.h. -msgc="/* DO NOT EDIT: automatically built by dist/s_rpc. */" -(echo "" && echo "$msgc" && - sed -n -e "/DB_RPC_SERVER/p" $header_file) > $defs_file - -# Fix up the header file: -# Remove the DB_RPC_SERVER #defines. -# Remove the <rpc/rpc.h> include, it needs to be included earlier -# than that. -sed -e "/DB_RPC_SERVER/d"\ - -e "/^#include.*<rpc\/rpc.h>/d" $header_file > ${header_file}.new -mv ${header_file}.new $header_file - -chmod 444 $header_file $rpcclnt_file $rpcsvc_file $rpcxdr_file +chmod 444 $client_file $server_file diff --git a/db/dist/s_symlink b/db/dist/s_symlink index 17498063b..533eb6b44 100755 --- a/db/dist/s_symlink +++ b/db/dist/s_symlink @@ -1,5 +1,5 @@ #!/bin/sh - -# $Id: s_symlink,v 1.31 2003/07/02 15:27:44 bostic Exp $ +# $Id: s_symlink,v 1.32 2004/04/01 15:10:53 bostic Exp $ echo 'Creating Berkeley DB source tree symbolic links...' @@ -51,6 +51,7 @@ build qam/tags ../dist/tags build rep/tags ../dist/tags build rpc_client/tags ../dist/tags build rpc_server/tags ../dist/tags +build sequence/tags ../dist/tags build tcl/tags ../dist/tags build txn/tags ../dist/tags build xa/tags ../dist/tags diff --git a/db/dist/s_tags b/db/dist/s_tags index 68967eba1..d1c21e5b2 100755 --- a/db/dist/s_tags +++ b/db/dist/s_tags @@ -1,5 +1,5 @@ #!/bin/sh - -# $Id: s_tags,v 1.17 2003/03/18 02:16:32 bostic Exp $ +# $Id: s_tags,v 1.18 2004/04/01 15:11:14 bostic Exp $ # # Build tags files. @@ -29,6 +29,7 @@ files=`echo ../dbinc/*.h \ ../rep/*.[ch] \ ../rpc_client/*.[ch] \ ../rpc_server/c/*.[ch] \ + ../sequence/*.[ch] \ ../tcl/*.[ch] \ ../txn/*.[ch] \ ../xa/*.[ch] \ diff --git a/db/dist/s_test b/db/dist/s_test index 012fa7a09..df0648d56 100755 --- a/db/dist/s_test +++ b/db/dist/s_test @@ -1,5 +1,5 @@ #!/bin/sh - -# $Id: s_test,v 1.28 2003/10/14 17:13:55 sandstro Exp $ +# $Id: s_test,v 1.29 2004/05/13 18:51:43 mjc Exp $ # # Build the Tcl test files. @@ -22,6 +22,7 @@ trap 'rm -f $t; exit 0' 0 1 2 3 13 15 echo "" && \ echo "set src_root @srcdir@/.." && \ echo "set test_path @srcdir@/../test" && \ + echo "set je_root @srcdir@/../../je" && \ echo "" && \ echo "global testdir" && \ echo "set testdir ./TESTDIR" && \ @@ -46,6 +47,7 @@ cmp $t $f > /dev/null 2>&1 || echo "" && \ echo "set src_root .." && \ echo "set test_path ../test" && \ + echo "set je_root ../../je" && \ echo "" && \ echo "global testdir" && \ echo "set testdir ./TESTDIR" && \ diff --git a/db/dist/s_vxworks b/db/dist/s_vxworks index 8802f5e72..e46d6e413 100644 --- a/db/dist/s_vxworks +++ b/db/dist/s_vxworks @@ -1,5 +1,5 @@ #!/bin/sh - -# $Id: s_vxworks,v 1.42 2003/08/27 16:23:33 sue Exp $ +# $Id: s_vxworks,v 1.49 2004/10/07 18:01:56 sue Exp $ # # Build the VxWorks files. @@ -9,10 +9,12 @@ msgc="/* DO NOT EDIT: automatically built by dist/s_vxworks. */" s=/tmp/__db_a t=/tmp/__db_b -vxfilelist=/tmp/__db_c +u=/tmp/__db_c +vxfilelist=/tmp/__db_d +vxsmallfiles=/tmp/__db_e -trap 'rm -f $s $t $vxfilelist ; exit 0' 0 -trap 'rm -f $s $t $vxfilelist ; exit 1' 1 2 3 13 15 +trap 'rm -f $s $t $u $vxfilelist $vxsmallfiles ; exit 0' 0 +trap 'rm -f $s $t $u $vxfilelist $vxsmallfiles ; exit 1' 1 2 3 13 15 # Build the VxWorks automatically generated files. f=../build_vxworks/db.h @@ -27,17 +29,22 @@ i\\ #define __vxworks\\ #endif } +/@inttypes_h_decl@/d +/@stdint_h_decl@/d +/@stddef_h_decl@/d s/@u_int8_decl@/typedef unsigned char u_int8_t;/ -s/@u_int16_decl@/typedef unsigned short u_int16_t;/ -s/@u_int32_decl@/typedef unsigned int u_int32_t;/ -/@inttypes_decl@/d /@int16_decl@/d +s/@u_int16_decl@/typedef unsigned short u_int16_t;/ /@int32_decl@/d +s/@u_int32_decl@/typedef unsigned int u_int32_t;/ +s/@int64_decl@// +s/@u_int64_decl@// /@u_char_decl@/d /@u_short_decl@/d /@u_int_decl@/d /@u_long_decl@/d /@ssize_t_decl@/d +s/@db_seq_decl@/typedef int db_seq_t;/ s/@DB_VERSION_MAJOR@/$DB_VERSION_MAJOR/ s/@DB_VERSION_MINOR@/$DB_VERSION_MINOR/ s/@DB_VERSION_PATCH@/$DB_VERSION_PATCH/ @@ -49,7 +56,6 @@ s/@DB_PROTO2@/#define __P(protos) protos/ ENDOFSEDTEXT (echo "$msgc" && sed -f $s ../dbinc/db.in && - cat ../dbinc_auto/rpc_defs.in && cat ../dbinc_auto/ext_prot.in) > $t cmp $t $f > /dev/null 2>&1 || (echo "Building $f" && rm -f $f && cp $t $f && chmod 444 $f) @@ -57,8 +63,8 @@ cmp $t $f > /dev/null 2>&1 || f=../build_vxworks/db_int.h cat <<ENDOFSEDTEXT > $s s/@PATH_SEPARATOR@/\/\\\\\\\\/ -s/@db_align_t_decl@/typedef unsigned long db_align_t;/ -s/@db_alignp_t_decl@/typedef unsigned long db_alignp_t;/ +s/@uintmax_t_decl@/typedef unsigned long uintmax_t;/ +s/@uintptr_t_decl@/typedef unsigned long uintptr_t;/ s/@db_int_def@// ENDOFSEDTEXT (echo "$msgc" && sed -f $s ../dbinc/db_int.in) > $t @@ -70,6 +76,19 @@ f=../build_vxworks/db_config.h cmp $t $f > /dev/null 2>&1 || (echo "Building $f" && rm -f $f && cp $t $f && chmod 444 $f) +f=../build_vxworks/db_config_small.h +(echo "$msgc" && + sed -e "s/__EDIT_DB_VERSION__/$DB_VERSION/" \ + -e "s;^#define.*HAVE_CRYPTO.*1;/* #undef HAVE_CRYPTO */;" \ + -e "s;^#define.*HAVE_HASH.*1;/* #undef HAVE_HASH */;" \ + -e "s;^#define.*HAVE_QUEUE.*1;/* #undef HAVE_QUEUE */;" \ + -e "s;^#define.*HAVE_REPLICATION.*1;/* #undef HAVE_REPLICATION */;" \ + -e "s;^#define.*HAVE_STATISTICS.*1;/* #undef HAVE_STATISTICS */;" \ + -e "s;^#define.*HAVE_VERIFY.*1;/* #undef HAVE_VERIFY */;" \ + vx_config.in) > $t +cmp $t $f > /dev/null 2>&1 || + (echo "Building $f" && rm -f $f && cp $t $f && chmod 444 $f) + # Build a sed script that will change a "standard" DB utility into # VxWorks-compatible code. transform() @@ -182,8 +201,16 @@ sed -e '/^$/d' -e '/^[ #]/d' srcfiles.in | egrep -w vx | sed 's/[ ].*//' > $vxfilelist +# Build the list of files VxWorks knows about. +sed -e '/^$/d' -e '/^[ #]/d' srcfiles.in | + egrep -w vxsmall | + sed 's/[ ].*//' > $vxsmallfiles + # Build VxWorks Tornado 2.0 project files for the library itself. for v in 0 2 ; do + # + # Build regular project files + # (cat vx_2.${v}/BerkeleyDB.wpj for i in `cat $vxfilelist`; do o="<BEGIN> FILE_\$(PRJ_DIR)/../$i" @@ -215,120 +242,45 @@ for v in 0 2 ; do echo "<BEGIN> userComments" echo "BerkeleyDB" echo "<END>") > $t + # + # Build small lib project files + # + (cat vx_2.${v}/BerkeleyDBsmall.wpj + for i in `cat $vxsmallfiles`; do + o="<BEGIN> FILE_\$(PRJ_DIR)/../$i" + echo "${o}_dependDone" + echo "TRUE" + echo "<END>" + echo + echo "${o}_dependencies" + echo "\$(PRJ_DIR)/db_config.h \\" + echo " \$(PRJ_DIR)/db_int.h \\" + echo " \$(PRJ_DIR)/db.h" + echo "<END>" + echo + echo "${o}_objects" + echo "`basename $i .c`.o" + echo "<END>" + echo + echo "${o}_tool" + echo "C/C++ compiler" + echo "<END>" + echo + done + echo "<BEGIN> PROJECT_FILES" + sed -e '$!s/$/ \\/' \ + -e 's/^/$(PRJ_DIR)\/..\//' \ + -e '1!s/^/ /' < $vxsmallfiles + echo "<END>" + echo + echo "<BEGIN> userComments" + echo "BerkeleyDB" + echo "<END>") > $u f=../build_vxworks/BerkeleyDB2${v}.wpj cmp $t $f > /dev/null 2>&1 || (echo "Building $f" && rm -f $f && cp $t $f && chmod 444 $f) + f=../build_vxworks/BerkeleyDB2${v}small.wpj + cmp $u $f > /dev/null 2>&1 || + (echo "Building $f" && rm -f $f && cp $u $f && chmod 444 $f) done -# Build VxWorks Tornado 3.1 project files for the utilities. -for i in $PROGRAM_LIST; do - if [ $i = "ex_access" ]; then - target=dbdemo - dir=../examples_c - else - target=$i - dir=../$i - fi - - cp vx_3.1/Makefile.custom $t - f=../build_vxworks/$target/$target/Makefile.custom - cmp $t $f > /dev/null 2>&1 || - (echo "Building $f" && rm -f $f && cp $t $f && chmod 444 $f) - - for j in component.cdf component.wpj; do - # - # Some parts of the component files needs to have the - # name in all capitals. Sigh. - # - z=`echo $target | tr "a-z" "A-Z"` - sed -e "s/__DB_APPLICATION_NAME__/$target/g" \ - -e "s/__DB_CAPAPPL_NAME__/$z/g" < vx_3.1/$j > $t - f=../build_vxworks/$target/$target/$j - cmp $t $f > /dev/null 2>&1 || - (echo "Building $f" && rm -f $f && cp $t $f && chmod 444 $f) - done -done - -# Build VxWorks Tornado 3.1 project files for the library itself. -cp vx_3.1/Makefile.custom $t -f=../build_vxworks/BerkeleyDB/Makefile.custom -cmp $t $f > /dev/null 2>&1 || - (echo "Building $f" && rm -f $f && cp $t $f && chmod 444 $f) - -(cat vx_3.1/cdf.1 -echo -n " MODULES" -for i in `cat $vxfilelist`; do - echo " `basename $i .c`.o" -done | sort | sed -e '$!s/$/ \\/' -cat vx_3.1/cdf.2 -for i in `cat $vxfilelist`; do - b="`basename $i .c`.o" - echo "Module $b {" - echo - echo " NAME $b" - echo " SRC_PATH_NAME \$(PRJ_DIR)/../../$i" - echo "}" - echo -done -cat vx_3.1/cdf.3)> $t -f=../build_vxworks/BerkeleyDB/component.cdf -cmp $t $f > /dev/null 2>&1 || - (echo "Building $f" && rm -f $f && cp $t $f && chmod 444 $f) - -(cat vx_3.1/wpj.1 -for i in `cat $vxfilelist`; do - o="<BEGIN> BUILD_PENTIUM2gnu.debug_FILE_\$(PRJ_DIR)/../../$i" - echo "${o}_infoTags" - echo "toolMacro objects" - echo "<END>" - echo - echo "${o}_objects" - echo "`basename $i .c`.o" - echo "<END>" - echo - echo "${o}_toolMacro" - echo "CC" - echo "<END>" - echo -done -cat vx_3.1/wpj.2 -for i in `cat $vxfilelist`; do - o="<BEGIN> BUILD_PENTIUM2gnu.release_FILE_\$(PRJ_DIR)/../../$i" - echo "${o}_infoTags" - echo "toolMacro objects" - echo "<END>" - echo - echo "${o}_objects" - echo "`basename $i .c`.o" - echo "<END>" - echo - echo "${o}_toolMacro" - echo "CC" - echo "<END>" - echo -done -cat vx_3.1/wpj.3 -for i in `cat $vxfilelist`; do - o="<BEGIN> BUILD_PENTIUMgnu.debug_FILE_\$(PRJ_DIR)/../../$i" - echo "${o}_infoTags" - echo "toolMacro objects" - echo "<END>" - echo - echo "${o}_objects" - echo "`basename $i .c`.o" - echo "<END>" - echo - echo "${o}_toolMacro" - echo "CC" - echo "<END>" - echo -done -cat vx_3.1/wpj.4 -sort $vxfilelist | -sed -e 's/^/$(PRJ_DIR)\/..\/..\//' \ - -e '1!s/^/ /' \ - -e '$!s/$/ \\/' -cat vx_3.1/wpj.5) > $t -f=../build_vxworks/BerkeleyDB/component.wpj -cmp $t $f > /dev/null 2>&1 || - (echo "Building $f" && rm -f $f && cp $t $f && chmod 444 $f) diff --git a/db/dist/s_win32 b/db/dist/s_win32 index fd63a8a6a..0e8601ce8 100755 --- a/db/dist/s_win32 +++ b/db/dist/s_win32 @@ -1,5 +1,5 @@ #!/bin/sh - -# $Id: s_win32,v 1.28 2003/05/20 23:37:20 mjc Exp $ +# $Id: s_win32,v 1.36 2004/09/16 20:52:41 mjc Exp $ # # Build Windows/32 include files. @@ -17,15 +17,20 @@ trap 'rm -f $s $t ; exit 1' 1 2 3 13 15 # Build the Win32 automatically generated files. f=../build_win32/db.h cat <<ENDOFSEDTEXT > $s -/@inttypes_decl@/d +/@inttypes_h_decl@/d +/@stdint_h_decl@/d +s/@stddef_h_decl@/#include <stddef.h>/ s/@u_int8_decl@/typedef unsigned char u_int8_t;/ s/@int16_decl@/typedef short int16_t;/ s/@u_int16_decl@/typedef unsigned short u_int16_t;/ s/@int32_decl@/typedef int int32_t;/ s/@u_int32_decl@/typedef unsigned int u_int32_t;/ +s/@int64_decl@/typedef __int64 int64_t;/ +s/@u_int64_decl@/typedef unsigned __int64 u_int64_t;/ +s/@db_seq_decl@/typedef int64_t db_seq_t;/ /@u_char_decl@/{ i\\ -#if !defined(_WINSOCKAPI_) +#ifndef _WINSOCKAPI_ s/@u_char_decl@/typedef unsigned char u_char;/ } s/@u_short_decl@/typedef unsigned short u_short;/ @@ -37,10 +42,20 @@ s/@u_int_decl@/typedef unsigned int u_int;/ } /@ssize_t_decl@/{ i\\ -#if defined(_WIN64)\\ -typedef __int64 ssize_t;\\ +#ifdef _WIN64\\ +typedef int64_t ssize_t;\\ #else\\ -typedef int ssize_t;\\ +typedef int32_t ssize_t;\\ +#endif + d +} +s/@uintmax_t_decl@/typedef u_int64_t uintmax_t;/ +/@uintptr_t_decl@/{ + i\\ +#ifdef _WIN64\\ +typedef u_int64_t uintptr_t;\\ +#else\\ +typedef u_int32_t uintptr_t;\\ #endif d } @@ -55,10 +70,12 @@ s/@DB_PROTO2@/#define __P(protos) protos/ ENDOFSEDTEXT (echo "$msgc" && sed -f $s ../dbinc/db.in && - cat ../dbinc_auto/rpc_defs.in && cat ../dbinc_auto/ext_prot.in) > $t cmp $t $f > /dev/null 2>&1 || (echo "Building $f" && rm -f $f && cp $t $f && chmod 444 $f) +f=../build_win64/db.h +cmp $t $f > /dev/null 2>&1 || + (echo "Building $f" && rm -f $f && cp $t $f && chmod 444 $f) f=../build_win32/db_cxx.h cat <<ENDOFSEDTEXT > $s @@ -67,22 +84,29 @@ ENDOFSEDTEXT (echo "$msgc" && sed -f $s ../dbinc/db_cxx.in) > $t cmp $t $f > /dev/null 2>&1 || (echo "Building $f" && rm -f $f && cp $t $f && chmod 444 $f) +f=../build_win64/db_cxx.h +cmp $t $f > /dev/null 2>&1 || + (echo "Building $f" && rm -f $f && cp $t $f && chmod 444 $f) f=../build_win32/db_int.h cat <<ENDOFSEDTEXT > $s s/@PATH_SEPARATOR@/\\\\\\\\\/:/ -s/@db_align_t_decl@/typedef unsigned long db_align_t;/ -s/@db_alignp_t_decl@/typedef unsigned long db_alignp_t;/ s/@db_int_def@// ENDOFSEDTEXT (echo "$msgc" && sed -f $s ../dbinc/db_int.in) > $t cmp $t $f > /dev/null 2>&1 || (echo "Building $f" && rm -f $f && cp $t $f && chmod 444 $f) +f=../build_win64/db_int.h +cmp $t $f > /dev/null 2>&1 || + (echo "Building $f" && rm -f $f && cp $t $f && chmod 444 $f) f=../build_win32/db_config.h (echo "$msgc" && sed "s/__EDIT_DB_VERSION__/$DB_VERSION/" win_config.in) > $t cmp $t $f > /dev/null 2>&1 || (echo "Building $f" && rm -f $f && cp $t $f && chmod 444 $f) +f=../build_win64/db_config.h +cmp $t $f > /dev/null 2>&1 || + (echo "Building $f" && rm -f $f && cp $t $f && chmod 444 $f) f=../build_win32/libdb.rc cat <<ENDOFSEDTEXT > $s @@ -97,9 +121,6 @@ cmp $t $f > /dev/null 2>&1 || f=../build_win32/libdb.def (echo $msgw && echo && - echo \ - "DESCRIPTION 'Berkeley DB $DB_VERSION_MAJOR.$DB_VERSION_MINOR Library'" && - echo && echo EXPORTS; a=1 for i in `sed -e '/^$/d' -e '/^#/d' win_exports.in`; do @@ -113,5 +134,8 @@ f=../build_win32/win_db.h i=win_db.in cmp $i $f > /dev/null 2>&1 || (echo "Building $f" && rm -f $f && cp $i $f && chmod 444 $f) +f=../build_win64/win_db.h +cmp $i $f > /dev/null 2>&1 || + (echo "Building $f" && rm -f $f && cp $i $f && chmod 444 $f) rm -f $s $t diff --git a/db/dist/s_win32_dsp b/db/dist/s_win32_dsp index cd9ce00f0..10e0ccc4b 100644 --- a/db/dist/s_win32_dsp +++ b/db/dist/s_win32_dsp @@ -1,11 +1,10 @@ #!/bin/sh - -# $Id: s_win32_dsp,v 1.10 2003/03/24 10:35:21 mjc Exp $ +# $Id: s_win32_dsp,v 1.12 2004/08/20 15:01:06 mjc Exp $ # # Build Windows/32 .dsp files. . RELEASE -BUILDDIR=../build_win32 SRCFILES=srcfiles.in create_dsp() @@ -27,7 +26,7 @@ create_dsp() # forward slash, but we need that when feeding that to the # later sed command. set - `echo $srcpath | sed -e 's;\(.*\)/;../\\1 ;' \ - -e 's;../build_win32;.;' \ + -e "s;$BUILDDIR;.;" \ -e 's;/;\\\\\\\\;g'` srcdir="$1" srcfile="$2" @@ -68,49 +67,52 @@ sed -e "s/#.*$//" \ MODULES="`sed -e 's/^[^ ]* //' < $TMPA \ | tr ' ' '\012' | sort | uniq`" -for module in $MODULES +for BUILDDIR in ../build_win32 ../build_win64 do - case "$module" in - dynamic ) - create_dsp db_dll " $module " $TMPA \ - $BUILDDIR/dynamic_dsp.src $BUILDDIR/srcfile_dsp.src - ;; - small ) - create_dsp db_small " $module " $TMPA \ - $BUILDDIR/small_dsp.src $BUILDDIR/srcfile_dsp.src - ;; - static ) - create_dsp db_static " $module " $TMPA \ - $BUILDDIR/static_dsp.src $BUILDDIR/srcfile_dsp.src - ;; - java ) - create_dsp db_java " $module " $TMPA \ - $BUILDDIR/java_dsp.src $BUILDDIR/srcfile_dsp.src - ;; - tcl ) - create_dsp db_tcl " $module " $TMPA \ - $BUILDDIR/tcl_dsp.src $BUILDDIR/srcfile_dsp.src - ;; - testutil ) - create_dsp db_test " $module " $TMPA \ - $BUILDDIR/db_test.src $BUILDDIR/srcfile_dsp.src - ;; - app=* ) - appname=`echo $module | sed -e 's/^app=//'` - if [ -f $BUILDDIR/$appname.src ] ; then - srcname=$BUILDDIR/$appname.src - else - srcname=$BUILDDIR/app_dsp.src - fi - create_dsp $appname " $module " $TMPA \ - $srcname $BUILDDIR/srcfile_dsp.src - ;; - vx ) - ;; - * ) - echo "s_win32_dsp: module name $module in $SRCFILES is unknown type" - ;; - esac + for module in $MODULES + do + case "$module" in + dynamic ) + create_dsp db_dll " $module " $TMPA \ + $BUILDDIR/dynamic_dsp.src $BUILDDIR/srcfile_dsp.src + ;; + small ) + create_dsp db_small " $module " $TMPA \ + $BUILDDIR/small_dsp.src $BUILDDIR/srcfile_dsp.src + ;; + static ) + create_dsp db_static " $module " $TMPA \ + $BUILDDIR/static_dsp.src $BUILDDIR/srcfile_dsp.src + ;; + java ) + create_dsp db_java " $module " $TMPA \ + $BUILDDIR/java_dsp.src $BUILDDIR/srcfile_dsp.src + ;; + tcl ) + create_dsp db_tcl " $module " $TMPA \ + $BUILDDIR/tcl_dsp.src $BUILDDIR/srcfile_dsp.src + ;; + testutil ) + create_dsp db_test " $module " $TMPA \ + $BUILDDIR/db_test.src $BUILDDIR/srcfile_dsp.src + ;; + app=* ) + appname=`echo $module | sed -e 's/^app=//'` + if [ -f $BUILDDIR/$appname.src ] ; then + srcname=$BUILDDIR/$appname.src + else + srcname=$BUILDDIR/app_dsp.src + fi + create_dsp $appname " $module " $TMPA \ + $srcname $BUILDDIR/srcfile_dsp.src + ;; + vx|vxsmall ) + ;; + * ) + echo "s_win32_dsp: module name $module in $SRCFILES is unknown type" + ;; + esac + done done rm -f $TMPA diff --git a/db/dist/srcfiles.in b/db/dist/srcfiles.in index 3eb8733a3..d45dbf8c6 100644 --- a/db/dist/srcfiles.in +++ b/db/dist/srcfiles.in @@ -1,4 +1,4 @@ -# $Id: srcfiles.in,v 1.69 2003/11/21 02:24:47 bostic Exp $ +# $Id: srcfiles.in,v 1.86 2004/09/23 19:54:23 bostic Exp $ # # This is an input file for the s_win32_dsp and s_vxworks scripts. It lists # the source files in the Berkeley DB tree and notes which are used to build @@ -19,25 +19,27 @@ # tcl File is in the Windows tcl DLL (db_tcl.dsp) # testutil File is used for Windows testing (db_test.dsp) # vx File is in the VxWorks library. +# vxsmall File is in the small VxWorks library. -btree/bt_compare.c dynamic small static vx -btree/bt_conv.c dynamic small static vx -btree/bt_curadj.c dynamic small static vx -btree/bt_cursor.c dynamic small static vx -btree/bt_delete.c dynamic small static vx -btree/bt_method.c dynamic small static vx -btree/bt_open.c dynamic small static vx -btree/bt_put.c dynamic small static vx -btree/bt_rec.c dynamic small static vx -btree/bt_reclaim.c dynamic small static vx -btree/bt_recno.c dynamic small static vx -btree/bt_rsearch.c dynamic small static vx -btree/bt_search.c dynamic small static vx -btree/bt_split.c dynamic small static vx -btree/bt_stat.c dynamic small static vx -btree/bt_upgrade.c dynamic small static vx +btree/bt_compare.c dynamic small static vx vxsmall +btree/bt_conv.c dynamic small static vx vxsmall +btree/bt_curadj.c dynamic small static vx vxsmall +btree/bt_cursor.c dynamic small static vx vxsmall +btree/bt_delete.c dynamic small static vx vxsmall +btree/bt_method.c dynamic small static vx vxsmall +btree/bt_open.c dynamic small static vx vxsmall +btree/bt_put.c dynamic small static vx vxsmall +btree/bt_rec.c dynamic small static vx vxsmall +btree/bt_reclaim.c dynamic small static vx vxsmall +btree/bt_recno.c dynamic small static vx vxsmall +btree/bt_rsearch.c dynamic small static vx vxsmall +btree/bt_search.c dynamic small static vx vxsmall +btree/bt_split.c dynamic small static vx vxsmall +btree/bt_stat.c dynamic small static vx vxsmall +btree/bt_upgrade.c dynamic small static vx vxsmall btree/bt_verify.c dynamic static vx -btree/btree_auto.c dynamic small static vx +btree/btree_auto.c dynamic small static vx vxsmall +btree/btree_autop.c app=db_printlog build_vxworks/db_archive/db_archive.c build_vxworks/db_checkpoint/db_checkpoint.c build_vxworks/db_deadlock/db_deadlock.c @@ -54,25 +56,24 @@ build_win32/libdb.def dynamic build_win32/libdb.rc dynamic build_win32/libdb_tcl.def tcl clib/getcwd.c -clib/getopt.c vx +clib/getopt.c vx vxsmall clib/memcmp.c clib/memmove.c clib/raise.c -clib/snprintf.c vx -clib/strcasecmp.c dynamic small static vx -clib/strdup.c vx +clib/snprintf.c vx vxsmall +clib/strcasecmp.c dynamic small static vx vxsmall +clib/strdup.c vx vxsmall clib/strerror.c -clib/vsnprintf.c vx -common/crypto_stub.c small -common/db_byteorder.c dynamic small static vx -common/db_err.c dynamic small static vx -common/db_getlong.c dynamic small static vx -common/db_idspace.c dynamic small static vx -common/db_log2.c dynamic small static vx -common/util_arg.c vx -common/util_cache.c dynamic small static vx -common/util_log.c dynamic small static vx -common/util_sig.c dynamic small static vx +common/crypto_stub.c small vxsmall +common/db_byteorder.c dynamic small static vx vxsmall +common/db_err.c dynamic small static vx vxsmall +common/db_getlong.c dynamic small static vx vxsmall +common/db_idspace.c dynamic small static vx vxsmall +common/db_log2.c dynamic small static vx vxsmall +common/util_arg.c vx vxsmall +common/util_cache.c dynamic small static vx vxsmall +common/util_log.c dynamic small static vx vxsmall +common/util_sig.c dynamic small static vx vxsmall crypto/aes_method.c dynamic static vx crypto/crypto.c dynamic static vx crypto/mersenne/mt19937db.c dynamic static vx @@ -87,34 +88,40 @@ cxx/cxx_lock.cpp dynamic small static cxx/cxx_logc.cpp dynamic small static cxx/cxx_mpool.cpp dynamic small static cxx/cxx_multi.cpp dynamic small static +cxx/cxx_seq.cpp dynamic small static cxx/cxx_txn.cpp dynamic small static -db/crdel_auto.c dynamic small static vx -db/crdel_rec.c dynamic small static vx -db/db.c dynamic small static vx -db/db_am.c dynamic small static vx -db/db_auto.c dynamic small static vx -db/db_cam.c dynamic small static vx -db/db_conv.c dynamic small static vx -db/db_dispatch.c dynamic small static vx -db/db_dup.c dynamic small static vx -db/db_iface.c dynamic small static vx -db/db_join.c dynamic small static vx -db/db_meta.c dynamic small static vx -db/db_method.c dynamic small static vx -db/db_open.c dynamic small static vx -db/db_overflow.c dynamic small static vx +db/crdel_auto.c dynamic small static vx vxsmall +db/crdel_autop.c app=db_printlog +db/crdel_rec.c dynamic small static vx vxsmall +db/db.c dynamic small static vx vxsmall +db/db_am.c dynamic small static vx vxsmall +db/db_auto.c dynamic small static vx vxsmall +db/db_autop.c app=db_printlog +db/db_cam.c dynamic small static vx vxsmall +db/db_conv.c dynamic small static vx vxsmall +db/db_dispatch.c dynamic small static vx vxsmall +db/db_dup.c dynamic small static vx vxsmall +db/db_iface.c dynamic small static vx vxsmall +db/db_join.c dynamic small static vx vxsmall +db/db_meta.c dynamic small static vx vxsmall +db/db_method.c dynamic small static vx vxsmall +db/db_open.c dynamic small static vx vxsmall +db/db_overflow.c dynamic small static vx vxsmall db/db_ovfl_vrfy.c dynamic static vx -db/db_pr.c dynamic small static vx -db/db_rec.c dynamic small static vx -db/db_reclaim.c dynamic small static vx -db/db_remove.c dynamic small static vx -db/db_rename.c dynamic small static vx -db/db_ret.c dynamic small static vx -db/db_truncate.c dynamic small static vx -db/db_upg.c dynamic small static vx -db/db_upg_opd.c dynamic small static vx +db/db_pr.c dynamic small static vx vxsmall +db/db_rec.c dynamic small static vx vxsmall +db/db_reclaim.c dynamic small static vx vxsmall +db/db_remove.c dynamic small static vx vxsmall +db/db_rename.c dynamic small static vx vxsmall +db/db_ret.c dynamic small static vx vxsmall +db/db_setid.c dynamic small static vx vxsmall +db/db_setlsn.c dynamic small static vx vxsmall +db/db_stati.c dynamic small static vx vxsmall +db/db_truncate.c dynamic small static vx vxsmall +db/db_upg.c dynamic small static vx vxsmall +db/db_upg_opd.c dynamic small static vx vxsmall db/db_vrfy.c dynamic static vx -db/db_vrfy_stub.c small +db/db_vrfy_stub.c small vxsmall db/db_vrfyutil.c dynamic static vx db185/db185.c db_archive/db_archive.c app=db_archive @@ -125,25 +132,32 @@ db_dump185/db_dump185.c db_load/db_load.c app=db_load db_printlog/db_printlog.c app=db_printlog db_recover/db_recover.c app=db_recover +db_server_clnt.c +db_server_svc.c +db_server_xdr.c db_stat/db_stat.c app=db_stat db_upgrade/db_upgrade.c app=db_upgrade db_verify/db_verify.c app=db_verify dbm/dbm.c dynamic static -dbreg/dbreg.c dynamic small static vx -dbreg/dbreg_auto.c dynamic small static vx -dbreg/dbreg_rec.c dynamic small static vx -dbreg/dbreg_util.c dynamic small static vx -env/db_salloc.c dynamic small static vx -env/db_shash.c dynamic small static vx -env/env_file.c dynamic small static vx -env/env_method.c dynamic small static vx -env/env_open.c dynamic small static vx -env/env_recover.c dynamic small static vx -env/env_region.c dynamic small static vx +dbreg/dbreg.c dynamic small static vx vxsmall +dbreg/dbreg_auto.c dynamic small static vx vxsmall +dbreg/dbreg_autop.c app=db_printlog +dbreg/dbreg_rec.c dynamic small static vx vxsmall +dbreg/dbreg_stat.c dynamic small static vx vxsmall +dbreg/dbreg_util.c dynamic small static vx vxsmall +env/db_salloc.c dynamic small static vx vxsmall +env/db_shash.c dynamic small static vx vxsmall +env/env_file.c dynamic small static vx vxsmall +env/env_method.c dynamic small static vx vxsmall +env/env_open.c dynamic small static vx vxsmall +env/env_recover.c dynamic small static vx vxsmall +env/env_region.c dynamic small static vx vxsmall +env/env_stat.c dynamic small static vx vxsmall examples_c/bench_001.c examples_c/ex_access.c app=ex_access examples_c/ex_apprec/ex_apprec.c examples_c/ex_apprec/ex_apprec_auto.c +examples_c/ex_apprec/ex_apprec_autop.c examples_c/ex_apprec/ex_apprec_rec.c examples_c/ex_btrec.c app=ex_btrec examples_c/ex_dbclient.c @@ -155,23 +169,34 @@ examples_c/ex_repquote/ex_rq_main.c app=ex_repquote examples_c/ex_repquote/ex_rq_master.c app=ex_repquote examples_c/ex_repquote/ex_rq_net.c app=ex_repquote examples_c/ex_repquote/ex_rq_util.c app=ex_repquote +examples_c/ex_sequence.c examples_c/ex_thread.c examples_c/ex_tpcb.c app=ex_tpcb +examples_c/getting_started/example_database_load.c +examples_c/getting_started/example_database_read.c +examples_c/getting_started/gettingstarted_common.c examples_cxx/AccessExample.cpp app=excxx_access examples_cxx/BtRecExample.cpp app=excxx_btrec examples_cxx/EnvExample.cpp app=excxx_env examples_cxx/LockExample.cpp app=excxx_lock examples_cxx/MpoolExample.cpp app=excxx_mpool +examples_cxx/SequenceExample.cpp examples_cxx/TpcbExample.cpp app=excxx_tpcb -fileops/fileops_auto.c dynamic small static vx -fileops/fop_basic.c dynamic small static vx -fileops/fop_rec.c dynamic small static vx -fileops/fop_util.c dynamic small static vx +examples_cxx/getting_started/MyDb.cpp +examples_cxx/getting_started/excxx_example_database_load.cpp +examples_cxx/getting_started/excxx_example_database_read.cpp +fileops/fileops_auto.c dynamic small static vx vxsmall +fileops/fileops_autop.c app=db_printlog +fileops/fop_basic.c dynamic small static vx vxsmall +fileops/fop_rec.c dynamic small static vx vxsmall +fileops/fop_util.c dynamic small static vx vxsmall +gen_db_server.c hash/hash.c dynamic static vx hash/hash_auto.c dynamic static vx +hash/hash_autop.c app=db_printlog hash/hash_conv.c dynamic static vx hash/hash_dup.c dynamic static vx -hash/hash_func.c dynamic small static vx +hash/hash_func.c dynamic small static vx vxsmall hash/hash_meta.c dynamic static vx hash/hash_method.c dynamic static vx hash/hash_open.c dynamic static vx @@ -179,71 +204,77 @@ hash/hash_page.c dynamic static vx hash/hash_rec.c dynamic static vx hash/hash_reclaim.c dynamic static vx hash/hash_stat.c dynamic static vx -hash/hash_stub.c small +hash/hash_stub.c small vxsmall hash/hash_upgrade.c dynamic static vx hash/hash_verify.c dynamic static vx -hmac/hmac.c dynamic small static vx -hmac/sha1.c dynamic small static vx +hmac/hmac.c dynamic small static vx vxsmall +hmac/sha1.c dynamic small static vx vxsmall hsearch/hsearch.c dynamic static vx libdb_java/db_java_wrap.c java -lock/lock.c dynamic small static vx -lock/lock_deadlock.c dynamic small static vx -lock/lock_method.c dynamic small static vx -lock/lock_region.c dynamic small static vx -lock/lock_stat.c dynamic small static vx -lock/lock_util.c dynamic small static vx -log/log.c dynamic small static vx -log/log_archive.c dynamic small static vx -log/log_compare.c dynamic small static vx -log/log_get.c dynamic small static vx -log/log_method.c dynamic small static vx -log/log_put.c dynamic small static vx -mp/mp_alloc.c dynamic small static vx -mp/mp_bh.c dynamic small static vx -mp/mp_fget.c dynamic small static vx -mp/mp_fopen.c dynamic small static vx -mp/mp_fput.c dynamic small static vx -mp/mp_fset.c dynamic small static vx -mp/mp_method.c dynamic small static vx -mp/mp_region.c dynamic small static vx -mp/mp_register.c dynamic small static vx -mp/mp_stat.c dynamic small static vx -mp/mp_sync.c dynamic small static vx -mp/mp_trickle.c dynamic small static vx +lock/lock.c dynamic small static vx vxsmall +lock/lock_deadlock.c dynamic small static vx vxsmall +lock/lock_id.c dynamic small static vx vxsmall +lock/lock_list.c dynamic small static vx vxsmall +lock/lock_method.c dynamic small static vx vxsmall +lock/lock_region.c dynamic small static vx vxsmall +lock/lock_stat.c dynamic small static vx vxsmall +lock/lock_timer.c dynamic small static vx vxsmall +lock/lock_util.c dynamic small static vx vxsmall +log/log.c dynamic small static vx vxsmall +log/log_archive.c dynamic small static vx vxsmall +log/log_compare.c dynamic small static vx vxsmall +log/log_get.c dynamic small static vx vxsmall +log/log_method.c dynamic small static vx vxsmall +log/log_put.c dynamic small static vx vxsmall +log/log_stat.c dynamic small static vx vxsmall +mp/mp_alloc.c dynamic small static vx vxsmall +mp/mp_bh.c dynamic small static vx vxsmall +mp/mp_fget.c dynamic small static vx vxsmall +mp/mp_fmethod.c dynamic small static vx vxsmall +mp/mp_fopen.c dynamic small static vx vxsmall +mp/mp_fput.c dynamic small static vx vxsmall +mp/mp_fset.c dynamic small static vx vxsmall +mp/mp_method.c dynamic small static vx vxsmall +mp/mp_region.c dynamic small static vx vxsmall +mp/mp_register.c dynamic small static vx vxsmall +mp/mp_stat.c dynamic small static vx vxsmall +mp/mp_sync.c dynamic small static vx vxsmall +mp/mp_trickle.c dynamic small static vx vxsmall mutex/mut_fcntl.c mutex/mut_pthread.c -mutex/mut_tas.c vx +mutex/mut_tas.c vx vxsmall mutex/mut_win32.c dynamic small static -mutex/mutex.c dynamic small static vx +mutex/mutex.c dynamic small static vx vxsmall mutex/tm.c os/os_abs.c -os/os_alloc.c dynamic small static vx -os/os_clock.c vx +os/os_alloc.c dynamic small static vx vxsmall +os/os_clock.c vx vxsmall os/os_config.c -os/os_dir.c vx -os/os_errno.c vx -os/os_fid.c vx -os/os_fsync.c vx -os/os_handle.c vx -os/os_id.c dynamic small static vx +os/os_dir.c vx vxsmall +os/os_errno.c vx vxsmall +os/os_fid.c vx vxsmall +os/os_fsync.c vx vxsmall +os/os_handle.c vx vxsmall +os/os_id.c dynamic small static vx vxsmall os/os_map.c -os/os_method.c dynamic small static vx -os/os_oflags.c dynamic small static vx -os/os_open.c vx -os/os_region.c dynamic small static vx -os/os_rename.c vx -os/os_root.c dynamic small static vx -os/os_rpath.c dynamic small static vx -os/os_rw.c vx -os/os_seek.c vx -os/os_sleep.c vx -os/os_spin.c vx -os/os_stat.c vx -os/os_tmpdir.c dynamic small static vx -os/os_unlink.c dynamic small static vx -os_vxworks/os_vx_abs.c vx -os_vxworks/os_vx_config.c vx -os_vxworks/os_vx_map.c vx +os/os_method.c dynamic small static vx vxsmall +os/os_oflags.c dynamic small static vx vxsmall +os/os_open.c vx vxsmall +os/os_region.c dynamic small static vx vxsmall +os/os_rename.c vx vxsmall +os/os_root.c dynamic small static vx vxsmall +os/os_rpath.c dynamic small static vx vxsmall +os/os_rw.c vx vxsmall +os/os_seek.c vx vxsmall +os/os_sleep.c vx vxsmall +os/os_spin.c vx vxsmall +os/os_stat.c vx vxsmall +os/os_tmpdir.c dynamic small static vx vxsmall +os/os_truncate.c vx vxsmall +os/os_unlink.c vx vxsmall +os_vxworks/os_vx_abs.c vx vxsmall +os_vxworks/os_vx_config.c vx vxsmall +os_vxworks/os_vx_map.c vx vxsmall os_win32/os_abs.c dynamic small static os_win32/os_clock.c dynamic small static os_win32/os_config.c dynamic small static @@ -260,33 +291,38 @@ os_win32/os_seek.c dynamic small static os_win32/os_sleep.c dynamic small static os_win32/os_spin.c dynamic small static os_win32/os_stat.c dynamic small static +os_win32/os_truncate.c dynamic small static +os_win32/os_unlink.c dynamic small static qam/qam.c dynamic static vx qam/qam_auto.c dynamic static vx +qam/qam_autop.c app=db_printlog qam/qam_conv.c dynamic static vx qam/qam_files.c dynamic static vx qam/qam_method.c dynamic static vx qam/qam_open.c dynamic static vx qam/qam_rec.c dynamic static vx qam/qam_stat.c dynamic static vx -qam/qam_stub.c small +qam/qam_stub.c small vxsmall qam/qam_upgrade.c dynamic static vx qam/qam_verify.c dynamic static vx +rep/rep_auto.c dynamic static vx +rep/rep_autop.c app=db_printlog +rep/rep_backup.c dynamic static vx rep/rep_method.c dynamic static vx rep/rep_record.c dynamic static vx rep/rep_region.c dynamic static vx -rep/rep_stub.c small +rep/rep_stat.c dynamic static vx +rep/rep_stub.c small vxsmall rep/rep_util.c dynamic static vx -rpc_client/client.c vx -rpc_client/db_server_clnt.c vx -rpc_client/gen_client.c vx -rpc_client/gen_client_ret.c vx +rpc_client/client.c +rpc_client/gen_client.c +rpc_client/gen_client_ret.c rpc_server/c/db_server_proc.c -rpc_server/c/db_server_svc.c rpc_server/c/db_server_util.c -rpc_server/c/db_server_xdr.c vx -rpc_server/c/gen_db_server.c rpc_server/cxx/db_server_cxxproc.cpp rpc_server/cxx/db_server_cxxutil.cpp +sequence/seq_stat.c dynamic small static +sequence/sequence.c dynamic small static tcl/tcl_compat.c tcl tcl/tcl_db.c tcl tcl/tcl_db_pkg.c tcl @@ -297,6 +333,7 @@ tcl/tcl_lock.c tcl tcl/tcl_log.c tcl tcl/tcl_mp.c tcl tcl/tcl_rep.c tcl +tcl/tcl_seq.c tcl tcl/tcl_txn.c tcl tcl/tcl_util.c tcl test_perf/db_perf.c app=db_perf @@ -320,14 +357,15 @@ test_perf/perf_trickle.c app=db_perf test_perf/perf_txn.c app=db_perf test_perf/perf_util.c app=db_perf test_perf/perf_vx.c -txn/txn.c dynamic small static vx -txn/txn_auto.c dynamic small static vx -txn/txn_method.c dynamic small static vx -txn/txn_rec.c dynamic small static vx -txn/txn_recover.c dynamic small static vx -txn/txn_region.c dynamic small static vx -txn/txn_stat.c dynamic small static vx -txn/txn_util.c dynamic small static vx -xa/xa.c dynamic small static vx -xa/xa_db.c dynamic small static vx -xa/xa_map.c dynamic small static vx +txn/txn.c dynamic small static vx vxsmall +txn/txn_auto.c dynamic small static vx vxsmall +txn/txn_autop.c app=db_printlog +txn/txn_method.c dynamic small static vx vxsmall +txn/txn_rec.c dynamic small static vx vxsmall +txn/txn_recover.c dynamic small static vx vxsmall +txn/txn_region.c dynamic small static vx vxsmall +txn/txn_stat.c dynamic small static vx vxsmall +txn/txn_util.c dynamic small static vx vxsmall +xa/xa.c dynamic small static vx vxsmall +xa/xa_db.c dynamic small static vx vxsmall +xa/xa_map.c dynamic small static vx vxsmall diff --git a/db/dist/tags b/db/dist/tags index a08477953..1e2cce270 100644 --- a/db/dist/tags +++ b/db/dist/tags @@ -1,16 +1,17 @@ ACQUIRE ../btree/bt_cursor.c /^#define ACQUIRE(dbc, mode, lpgno, lock, fpgno, pag/ ACQUIRE_COUPLE ../btree/bt_cursor.c /^#define ACQUIRE_COUPLE(dbc, mode, lpgno, lock, fpg/ -ACQUIRE_CUR ../btree/bt_cursor.c /^#define ACQUIRE_CUR(dbc, mode, p, ret) { \\$/ -ACQUIRE_CUR_COUPLE ../btree/bt_cursor.c /^#define ACQUIRE_CUR_COUPLE(dbc, mode, p, ret) { / -ACQUIRE_WRITE_LOCK ../btree/bt_cursor.c /^#define ACQUIRE_WRITE_LOCK(dbc, ret) { \\$/ -ACTION ../dbinc/db.in 1965 +ACQUIRE_CUR ../btree/bt_cursor.c /^#define ACQUIRE_CUR(dbc, mode, p, ret) do { \\$/ +ACQUIRE_CUR_COUPLE ../btree/bt_cursor.c /^#define ACQUIRE_CUR_COUPLE(dbc, mode, p, ret) do {/ +ACQUIRE_WRITE_LOCK ../btree/bt_cursor.c /^#define ACQUIRE_WRITE_LOCK(dbc, ret) do { \\$/ +ACTION ../dbinc/db.in 2149 ACTIVATE_CTP ../dbinc/db_server_int.h /^#define ACTIVATE_CTP(ctp, id, type) { \\$/ -ALIGN ../dbinc/db_int.in /^#define ALIGN(v, bound) (((v) + (bound) - 1) & ~((/ +ALIGNP_DEC ../dbinc/db_int.in /^#define ALIGNP_DEC(p, bound) \\$/ +ALIGNP_INC ../dbinc/db_int.in /^#define ALIGNP_INC(p, bound) \\$/ ANYSITE ../rep/rep_record.c /^#define ANYSITE(rep)$/ -APPNAME ../dbinc/db_int.in 216 -BACKUP_PREFIX ../db/db.c 994 -BADARG ../clib/getopt.c 61 -BADCH ../clib/getopt.c 59 +APPNAME ../dbinc/db_int.in 288 +BACKUP_PREFIX ../db/db.c 1008 +BADARG ../clib/getopt.c 59 +BADCH ../clib/getopt.c 57 BAD_BLOCK_LENGTH ../crypto/rijndael/rijndael-api-fst.h 64 BAD_CIPHER_INSTANCE ../crypto/rijndael/rijndael-api-fst.h 65 BAD_CIPHER_MODE ../crypto/rijndael/rijndael-api-fst.h 62 @@ -19,16 +20,18 @@ BAD_DATA ../crypto/rijndael/rijndael-api-fst.h 66 BAD_KEY_DIR ../crypto/rijndael/rijndael-api-fst.h 59 BAD_KEY_INSTANCE ../crypto/rijndael/rijndael-api-fst.h 61 BAD_KEY_MAT ../crypto/rijndael/rijndael-api-fst.h 60 -BAD_KILLID ../lock/lock_deadlock.c 42 +BAD_KILLID ../lock/lock_deadlock.c 40 BAD_OTHER ../crypto/rijndael/rijndael-api-fst.h 67 BFMSG ../db185/db185.c 176 BH ../dbinc/mp.h 13 -BH_CALLPGIN ../dbinc/mp.h 303 -BH_DIRTY ../dbinc/mp.h 304 -BH_DIRTY_CREATE ../dbinc/mp.h 305 -BH_DISCARD ../dbinc/mp.h 306 -BH_LOCKED ../dbinc/mp.h 307 -BH_TRASH ../dbinc/mp.h 308 +BH_CALLPGIN ../dbinc/mp.h 331 +BH_DIRTY ../dbinc/mp.h 332 +BH_DIRTY_CREATE ../dbinc/mp.h 333 +BH_DISCARD ../dbinc/mp.h 334 +BH_FREE_FREEMEM ../dbinc/mp.h 318 +BH_FREE_UNLOCKED ../dbinc/mp.h 319 +BH_LOCKED ../dbinc/mp.h 335 +BH_TRASH ../dbinc/mp.h 336 BINTERNAL_PSIZE ../dbinc/db_page.h /^#define BINTERNAL_PSIZE(len) \\$/ BINTERNAL_SIZE ../dbinc/db_page.h /^#define BINTERNAL_SIZE(len) \\$/ BITSPERBLOCK ../crypto/rijndael/rijndael-api-fst.h 56 @@ -82,6 +85,7 @@ CHARKEY ../dbinc/hash.h 92 CHECK_LSN ../dbinc/log.h /^#define CHECK_LSN(redo, cmp, lsn, prev) \\$/ CIPHER_AES ../dbinc/crypto.h 45 CIPHER_ANY ../dbinc/crypto.h 49 +CKPLSN_CMP ../dbinc/log.h 363 CLEAR_BYTE ../dbinc/debug.h 28 CLEAR_MAP ../lock/lock_deadlock.c /^#define CLEAR_MAP(M, N) { \\$/ CLIENT_ONLY ../rep/rep_record.c /^#define CLIENT_ONLY(rep, rp) do { \\$/ @@ -89,7 +93,7 @@ CLOSE_HANDLE ../fileops/fop_util.c /^#define CLOSE_HANDLE(D, F) { \\$/ CLR_MAP ../lock/lock_deadlock.c /^#define CLR_MAP(M, B) ((M)[(B) \/ 32] &= ~(1 << ((B/ COMPQUIET ../dbinc/debug.h /^#define COMPQUIET(n, v) \\$/ CONFLICTS ../dbinc/lock.h /^#define CONFLICTS(T, R, HELD, WANTED) \\$/ -COPY_OBJ ../lock/lock.c /^#define COPY_OBJ(dp, obj) do { \\$/ +COPY_OBJ ../lock/lock_list.c /^#define COPY_OBJ(dp, obj) do { \\$/ COPY_RET_MEM ../dbinc/db_int.in /^#define COPY_RET_MEM(src, dest) \\$/ CRYPTO_ON ../dbinc/db_int.in /^#define CRYPTO_ON(dbenv) ((dbenv)->crypto_handle !/ CT_CURSOR ../dbinc/db_server_int.h 32 @@ -104,428 +108,452 @@ C_EQUAL ../btree/bt_recno.c /^#define C_EQUAL(cp1, cp2) \\$/ C_LESSTHAN ../btree/bt_recno.c /^#define C_LESSTHAN(cp1, cp2) \\$/ C_RECNUM ../dbinc/btree.h 221 C_RENUMBER ../dbinc/btree.h 228 -DATA_INIT_CNT ../env/env_method.c 603 -DB ../dbinc/db.in 97 -DB2JDBENV ../libdb_java/db_java_wrap.c 385 -DBC ../dbinc/db.in 122 -DBC2JDBENV ../libdb_java/db_java_wrap.c 386 -DBC_ACTIVE ../dbinc/db.in 1496 -DBC_COMPENSATE ../dbinc/db.in 1497 -DBC_DIRTY_READ ../dbinc/db.in 1498 -DBC_INTERNAL ../dbinc/db.in 123 +DATA_INIT_CNT ../env/env_method.c 640 +DB ../dbinc/db.in 127 +DB2JDBENV ../libdb_java/db_java_wrap.c 812 +DBC ../dbinc/db.in 155 +DBC2JDBENV ../libdb_java/db_java_wrap.c 813 +DBC_ACTIVE ../dbinc/db.in 1646 +DBC_COMPENSATE ../dbinc/db.in 1647 +DBC_DEGREE_2 ../dbinc/db.in 1648 +DBC_DIRTY_READ ../dbinc/db.in 1649 +DBC_INTERNAL ../dbinc/db.in 156 DBC_LOGGING ../dbinc/db_int.in /^#define DBC_LOGGING(dbc) \\$/ DBC_METHOD ../cxx/cxx_dbc.cpp /^#define DBC_METHOD(_name, _argspec, _arglist, _ret/ -DBC_MULTIPLE ../dbinc/db.in 1505 -DBC_MULTIPLE_KEY ../dbinc/db.in 1506 -DBC_OPD ../dbinc/db.in 1499 -DBC_OWN_LID ../dbinc/db.in 1507 -DBC_RECOVER ../dbinc/db.in 1500 -DBC_RMW ../dbinc/db.in 1501 -DBC_TRANSIENT ../dbinc/db.in 1502 -DBC_WRITECURSOR ../dbinc/db.in 1503 -DBC_WRITER ../dbinc/db.in 1504 +DBC_MULTIPLE ../dbinc/db.in 1656 +DBC_MULTIPLE_KEY ../dbinc/db.in 1657 +DBC_OPD ../dbinc/db.in 1650 +DBC_OWN_LID ../dbinc/db.in 1658 +DBC_RECOVER ../dbinc/db.in 1651 +DBC_RMW ../dbinc/db.in 1652 +DBC_TRANSIENT ../dbinc/db.in 1653 +DBC_WRITECURSOR ../dbinc/db.in 1654 +DBC_WRITER ../dbinc/db.in 1655 DBENV_LOGGING ../dbinc/db_int.in /^#define DBENV_LOGGING(dbenv) \\$/ DBENV_METHOD ../cxx/cxx_env.cpp /^#define DBENV_METHOD(_name, _argspec, _arglist) / DBENV_METHOD_ERR ../cxx/cxx_env.cpp /^#define DBENV_METHOD_ERR(_name, _argspec, _arglist/ DBENV_METHOD_QUIET ../cxx/cxx_env.cpp /^#define DBENV_METHOD_QUIET(_name, _argspec, _argli/ DBENV_METHOD_VOID ../cxx/cxx_env.cpp /^#define DBENV_METHOD_VOID(_name, _argspec, _arglis/ -DBLOG_FORCE_OPEN ../dbinc/log.h 104 -DBLOG_RECOVER ../dbinc/log.h 103 -DBM ../dbinc/db.in 1902 +DBLOG_FORCE_OPEN ../dbinc/log.h 106 +DBLOG_RECOVER ../dbinc/log.h 105 +DBM ../dbinc/db.in 2086 DBMETASIZE ../dbinc/db_page.h 180 DBMETA_CHKSUM ../dbinc/db_page.h 76 -DBM_INSERT ../dbinc/db.in 1904 -DBM_REPLACE ../dbinc/db.in 1905 -DBM_SUFFIX ../dbinc/db.in 1911 +DBM_INSERT ../dbinc/db.in 2088 +DBM_REPLACE ../dbinc/db.in 2089 +DBM_SUFFIX ../dbinc/db.in 2095 DBREG_CHKPNT ../dbinc/log.h 49 DBREG_CLOSE ../dbinc/log.h 50 DBREG_OPEN ../dbinc/log.h 51 DBREG_RCLOSE ../dbinc/log.h 52 -DBT ../dbinc/db.in 100 -DBTBUFLEN ../db/db_pr.c 756 -DBTCL_DBM ../dbinc/tcl_db.h 21 -DBTCL_NDBM ../dbinc/tcl_db.h 22 -DBTCL_PREP ../dbinc/tcl_db.h 19 +DBREP_OPENFILES ../dbinc/rep.h 255 +DBSEQ_METHOD ../cxx/cxx_seq.cpp /^#define DBSEQ_METHOD(_name, _argspec, _arglist, _d/ +DBT ../dbinc/db.in 130 +DBTBUFLEN ../db/db_pr.c 1122 +DBTCL_DBM ../dbinc/tcl_db.h 22 +DBTCL_NDBM ../dbinc/tcl_db.h 23 +DBTCL_PREP ../dbinc/tcl_db.h 20 DBTXN_METHOD ../cxx/cxx_txn.cpp /^#define DBTXN_METHOD(_name, _delete, _argspec, _ar/ -DBTYPE ../dbinc/db.in 965 +DBTYPE ../dbinc/db.in 1101 DB_ADDSTR ../env/env_open.c /^#define DB_ADDSTR(add) { \\$/ DB_ADD_BIG ../dbinc/db_am.h 25 DB_ADD_DUP ../dbinc/db_am.h 23 -DB_ADD_PAGE ../dbinc/db_am.h 27 DB_AES_CHUNK ../dbinc/crypto.h 68 DB_AES_KEYLEN ../dbinc/crypto.h 67 -DB_AFTER ../dbinc/db.in 985 -DB_AGGRESSIVE ../dbinc/db.in 293 -DB_ALREADY_ABORTED ../dbinc/db.in 1075 -DB_AM_CHKSUM ../dbinc/db.in 1334 -DB_AM_CL_WRITER ../dbinc/db.in 1335 -DB_AM_COMPENSATE ../dbinc/db.in 1336 -DB_AM_CREATED ../dbinc/db.in 1337 -DB_AM_CREATED_MSTR ../dbinc/db.in 1338 -DB_AM_DBM_ERROR ../dbinc/db.in 1339 -DB_AM_DELIMITER ../dbinc/db.in 1340 -DB_AM_DIRTY ../dbinc/db.in 1341 -DB_AM_DISCARD ../dbinc/db.in 1342 -DB_AM_DUP ../dbinc/db.in 1343 -DB_AM_DUPSORT ../dbinc/db.in 1344 -DB_AM_ENCRYPT ../dbinc/db.in 1345 -DB_AM_FIXEDLEN ../dbinc/db.in 1346 -DB_AM_INMEM ../dbinc/db.in 1347 -DB_AM_IN_RENAME ../dbinc/db.in 1348 -DB_AM_NOT_DURABLE ../dbinc/db.in 1349 -DB_AM_OPEN_CALLED ../dbinc/db.in 1350 -DB_AM_PAD ../dbinc/db.in 1351 -DB_AM_PGDEF ../dbinc/db.in 1352 -DB_AM_RDONLY ../dbinc/db.in 1353 -DB_AM_RECNUM ../dbinc/db.in 1354 -DB_AM_RECOVER ../dbinc/db.in 1355 -DB_AM_RENUMBER ../dbinc/db.in 1356 -DB_AM_REPLICATION ../dbinc/db.in 1357 -DB_AM_REVSPLITOFF ../dbinc/db.in 1358 -DB_AM_SECONDARY ../dbinc/db.in 1359 -DB_AM_SNAPSHOT ../dbinc/db.in 1360 -DB_AM_SUBDB ../dbinc/db.in 1361 -DB_AM_SWAP ../dbinc/db.in 1362 -DB_AM_TXN ../dbinc/db.in 1363 -DB_AM_VERIFYING ../dbinc/db.in 1364 -DB_APPEND ../dbinc/db.in 986 -DB_ARCH_ABS ../dbinc/db.in 467 -DB_ARCH_DATA ../dbinc/db.in 468 -DB_ARCH_LOG ../dbinc/db.in 469 -DB_ARCH_REMOVE ../dbinc/db.in 470 +DB_AFTER ../dbinc/db.in 1123 +DB_AGGRESSIVE ../dbinc/db.in 344 +DB_ALIGN ../dbinc/db_int.in /^#define DB_ALIGN(v, bound) \\$/ +DB_ALREADY_ABORTED ../dbinc/db.in 1215 +DB_AM_CHKSUM ../dbinc/db.in 1483 +DB_AM_CL_WRITER ../dbinc/db.in 1484 +DB_AM_COMPENSATE ../dbinc/db.in 1485 +DB_AM_CREATED ../dbinc/db.in 1486 +DB_AM_CREATED_MSTR ../dbinc/db.in 1487 +DB_AM_DBM_ERROR ../dbinc/db.in 1488 +DB_AM_DELIMITER ../dbinc/db.in 1489 +DB_AM_DIRTY ../dbinc/db.in 1490 +DB_AM_DISCARD ../dbinc/db.in 1491 +DB_AM_DUP ../dbinc/db.in 1492 +DB_AM_DUPSORT ../dbinc/db.in 1493 +DB_AM_ENCRYPT ../dbinc/db.in 1494 +DB_AM_FIXEDLEN ../dbinc/db.in 1495 +DB_AM_INMEM ../dbinc/db.in 1496 +DB_AM_INORDER ../dbinc/db.in 1497 +DB_AM_IN_RENAME ../dbinc/db.in 1498 +DB_AM_NOT_DURABLE ../dbinc/db.in 1499 +DB_AM_OPEN_CALLED ../dbinc/db.in 1500 +DB_AM_PAD ../dbinc/db.in 1501 +DB_AM_PGDEF ../dbinc/db.in 1502 +DB_AM_RDONLY ../dbinc/db.in 1503 +DB_AM_RECNUM ../dbinc/db.in 1504 +DB_AM_RECOVER ../dbinc/db.in 1505 +DB_AM_RENUMBER ../dbinc/db.in 1506 +DB_AM_REPLICATION ../dbinc/db.in 1507 +DB_AM_REVSPLITOFF ../dbinc/db.in 1508 +DB_AM_SECONDARY ../dbinc/db.in 1509 +DB_AM_SNAPSHOT ../dbinc/db.in 1510 +DB_AM_SUBDB ../dbinc/db.in 1511 +DB_AM_SWAP ../dbinc/db.in 1512 +DB_AM_TXN ../dbinc/db.in 1513 +DB_AM_VERIFYING ../dbinc/db.in 1514 +DB_APPEND ../dbinc/db.in 1124 +DB_ARCH_ABS ../dbinc/db.in 520 +DB_ARCH_DATA ../dbinc/db.in 521 +DB_ARCH_LOG ../dbinc/db.in 522 +DB_ARCH_REMOVE ../dbinc/db.in 523 DB_ASSERT ../dbinc/debug.h /^#define DB_ASSERT(e) ((e) ? (void)0 : __db_assert(/ -DB_AUTO_COMMIT ../dbinc/db.in 190 -DB_BEFORE ../dbinc/db.in 987 +DB_AUTO_COMMIT ../dbinc/db.in 225 +DB_BEFORE ../dbinc/db.in 1125 DB_BEGIN_SINGLE_THREAD ../dbinc/mutex.h 17 -DB_BTREEMAGIC ../dbinc/db.in 971 -DB_BTREEOLDVER ../dbinc/db.in 970 -DB_BTREEVERSION ../dbinc/db.in 969 -DB_BTREE_STAT ../dbinc/db.in 98 -DB_CACHED_COUNTS ../dbinc/db.in 988 +DB_BTREEMAGIC ../dbinc/db.in 1107 +DB_BTREEOLDVER ../dbinc/db.in 1106 +DB_BTREEVERSION ../dbinc/db.in 1105 +DB_BTREE_STAT ../dbinc/db.in 128 +DB_BUFFER_SMALL ../dbinc/db.in 1187 +DB_CACHED_COUNTS ../dbinc/db.in 1126 DB_CACHESIZE_MIN ../dbinc/mp.h 19 -DB_CACHE_PRIORITY ../dbinc/db.in 588 +DB_CACHE_PRIORITY ../dbinc/db.in 651 DB_CALLBACK_C_INTERCEPT ../cxx/cxx_db.cpp /^#define DB_CALLBACK_C_INTERCEPT(_name, _rettype, _/ -DB_CDB_ALLDB ../dbinc/db.in 242 -DB_CHKSUM ../dbinc/db.in 271 -DB_CIPHER ../dbinc/db.in 99 -DB_COMMIT_FLUSH ../dbinc/log.h 264 -DB_CONSUME ../dbinc/db.in 989 -DB_CONSUME_WAIT ../dbinc/db.in 990 -DB_CREATE ../dbinc/db.in 157 -DB_CURRENT ../dbinc/db.in 991 -DB_CXX_NO_EXCEPTIONS ../dbinc/db.in 158 -DB_CXX_PRIVATE_ENV ../dbinc/cxx_int.h 79 -DB_DBM_HSEARCH ../dbinc/db.in 1896 -DB_DBT_APPMALLOC ../dbinc/db.in 142 -DB_DBT_DUPOK ../dbinc/db.in 148 -DB_DBT_ISSET ../dbinc/db.in 143 -DB_DBT_MALLOC ../dbinc/db.in 144 -DB_DBT_PARTIAL ../dbinc/db.in 145 -DB_DBT_REALLOC ../dbinc/db.in 146 -DB_DBT_USERMEM ../dbinc/db.in 147 -DB_DEF_IOSIZE ../dbinc/db_int.in 65 -DB_DELETED ../dbinc/db.in 1076 -DB_DIRECT ../dbinc/db.in 264 -DB_DIRECT_DB ../dbinc/db.in 243 -DB_DIRECT_LOG ../dbinc/db.in 244 -DB_DIRTY_READ ../dbinc/db.in 191 -DB_DONOTINDEX ../dbinc/db.in 1049 -DB_DUP ../dbinc/db.in 272 -DB_DUPSORT ../dbinc/db.in 273 -DB_EID_BROADCAST ../dbinc/db.in 890 -DB_EID_INVALID ../dbinc/db.in 891 -DB_ENCRYPT ../dbinc/db.in 274 -DB_ENCRYPT_AES ../dbinc/db.in 237 +DB_CDB_ALLDB ../dbinc/db.in 278 +DB_CHKSUM ../dbinc/db.in 314 +DB_CIPHER ../dbinc/db.in 129 +DB_COMMIT_FLUSH ../dbinc/log.h 292 +DB_CONSUME ../dbinc/db.in 1127 +DB_CONSUME_WAIT ../dbinc/db.in 1128 +DB_CREATE ../dbinc/db.in 190 +DB_CURRENT ../dbinc/db.in 1129 +DB_CXX_NO_EXCEPTIONS ../dbinc/db.in 191 +DB_CXX_PRIVATE_ENV ../dbinc/cxx_int.h 75 +DB_DBM_HSEARCH ../dbinc/db.in 2080 +DB_DBT_APPMALLOC ../dbinc/db.in 175 +DB_DBT_DUPOK ../dbinc/db.in 181 +DB_DBT_ISSET ../dbinc/db.in 176 +DB_DBT_MALLOC ../dbinc/db.in 177 +DB_DBT_PARTIAL ../dbinc/db.in 178 +DB_DBT_REALLOC ../dbinc/db.in 179 +DB_DBT_USERMEM ../dbinc/db.in 180 +DB_DEF_IOSIZE ../dbinc/db_int.in 96 +DB_DEGREE_2 ../dbinc/db.in 226 +DB_DELETED ../dbinc/db.in 1216 +DB_DESTRUCTOR ../cxx/cxx_db.cpp /^#define DB_DESTRUCTOR(_name, _argspec, _arglist, _/ +DB_DIRECT ../dbinc/db.in 306 +DB_DIRECT_DB ../dbinc/db.in 279 +DB_DIRECT_LOG ../dbinc/db.in 280 +DB_DIRTY_READ ../dbinc/db.in 227 +DB_DONOTINDEX ../dbinc/db.in 1188 +DB_DSYNC_LOG ../dbinc/db.in 281 +DB_DUP ../dbinc/db.in 315 +DB_DUPSORT ../dbinc/db.in 316 +DB_DURABLE_UNKNOWN ../dbinc/db.in 307 +DB_EID_BROADCAST ../dbinc/db.in 957 +DB_EID_INVALID ../dbinc/db.in 958 +DB_ENCRYPT ../dbinc/db.in 317 +DB_ENCRYPT_AES ../dbinc/db.in 273 DB_ENC_MAGIC ../dbinc/hmac.h 29 DB_END_SINGLE_THREAD ../dbinc/mutex.h 18 -DB_ENV ../dbinc/db.in 101 -DB_ENV_AUTO_COMMIT ../dbinc/db.in 1866 -DB_ENV_CDB ../dbinc/db.in 1867 -DB_ENV_CDB_ALLDB ../dbinc/db.in 1868 -DB_ENV_CREATE ../dbinc/db.in 1869 -DB_ENV_DBLOCAL ../dbinc/db.in 1870 -DB_ENV_DIRECT_DB ../dbinc/db.in 1871 -DB_ENV_DIRECT_LOG ../dbinc/db.in 1872 -DB_ENV_FATAL ../dbinc/db.in 1873 +DB_ENV ../dbinc/db.in 131 +DB_ENV_AUTO_COMMIT ../dbinc/db.in 2049 +DB_ENV_CDB ../dbinc/db.in 2050 +DB_ENV_CDB_ALLDB ../dbinc/db.in 2051 +DB_ENV_CREATE ../dbinc/db.in 2052 +DB_ENV_DBLOCAL ../dbinc/db.in 2053 +DB_ENV_DIRECT_DB ../dbinc/db.in 2054 +DB_ENV_DIRECT_LOG ../dbinc/db.in 2055 +DB_ENV_DSYNC_LOG ../dbinc/db.in 2056 +DB_ENV_FATAL ../dbinc/db.in 2057 DB_ENV_INTERNAL ../libdb_java/db_java_wrap.c /^#define DB_ENV_INTERNAL(dbenv) ((dbenv)->api2_inte/ -DB_ENV_LOCKDOWN ../dbinc/db.in 1874 -DB_ENV_LOG_AUTOREMOVE ../dbinc/db.in 1875 -DB_ENV_NOLOCKING ../dbinc/db.in 1876 -DB_ENV_NOMMAP ../dbinc/db.in 1877 -DB_ENV_NOPANIC ../dbinc/db.in 1878 -DB_ENV_OPEN_CALLED ../dbinc/db.in 1879 -DB_ENV_OVERWRITE ../dbinc/db.in 1880 -DB_ENV_PRIVATE ../dbinc/db.in 1881 -DB_ENV_REGION_INIT ../dbinc/db.in 1882 -DB_ENV_RPCCLIENT ../dbinc/db.in 1883 -DB_ENV_RPCCLIENT_GIVEN ../dbinc/db.in 1884 -DB_ENV_SYSTEM_MEM ../dbinc/db.in 1885 -DB_ENV_TEST_RECOVERY ../dbinc/debug.h /^#define DB_ENV_TEST_RECOVERY(env, val, ret, name) / -DB_ENV_THREAD ../dbinc/db.in 1886 -DB_ENV_TIME_NOTGRANTED ../dbinc/db.in 1887 -DB_ENV_TXN_NOSYNC ../dbinc/db.in 1888 -DB_ENV_TXN_NOT_DURABLE ../dbinc/db.in 1889 -DB_ENV_TXN_WRITE_NOSYNC ../dbinc/db.in 1890 -DB_ENV_YIELDCPU ../dbinc/db.in 1891 +DB_ENV_LOCKDOWN ../dbinc/db.in 2058 +DB_ENV_LOG_AUTOREMOVE ../dbinc/db.in 2059 +DB_ENV_LOG_INMEMORY ../dbinc/db.in 2060 +DB_ENV_NOLOCKING ../dbinc/db.in 2061 +DB_ENV_NOMMAP ../dbinc/db.in 2062 +DB_ENV_NOPANIC ../dbinc/db.in 2063 +DB_ENV_OPEN_CALLED ../dbinc/db.in 2064 +DB_ENV_OVERWRITE ../dbinc/db.in 2065 +DB_ENV_PRIVATE ../dbinc/db.in 2066 +DB_ENV_REGION_INIT ../dbinc/db.in 2067 +DB_ENV_RPCCLIENT ../dbinc/db.in 2068 +DB_ENV_RPCCLIENT_GIVEN ../dbinc/db.in 2069 +DB_ENV_SYSTEM_MEM ../dbinc/db.in 2070 +DB_ENV_TEST_RECOVERY ../dbinc/debug.h /^#define DB_ENV_TEST_RECOVERY(env, val, ret, name) / +DB_ENV_THREAD ../dbinc/db.in 2071 +DB_ENV_TIME_NOTGRANTED ../dbinc/db.in 2072 +DB_ENV_TXN_NOSYNC ../dbinc/db.in 2073 +DB_ENV_TXN_WRITE_NOSYNC ../dbinc/db.in 2074 +DB_ENV_YIELDCPU ../dbinc/db.in 2075 DB_ERROR ../dbinc/cxx_int.h /^#define DB_ERROR(env, caller, ecode, policy) \\$/ DB_ERROR_DBT ../dbinc/cxx_int.h /^#define DB_ERROR_DBT(env, caller, dbt, policy) \\$/ -DB_EXCL ../dbinc/db.in 223 -DB_EXTENT ../dbinc/db.in 265 -DB_FAST_STAT ../dbinc/db.in 992 -DB_FCNTL_LOCKING ../dbinc/db.in 224 -DB_FCNTL_OFF_GEN ../dbinc/mutex.h 954 -DB_FCNTL_OFF_LOCK ../dbinc/mutex.h 955 -DB_FCNTL_OFF_MPOOL ../dbinc/mutex.h 956 -DB_FH ../dbinc/db.in 124 -DB_FH_NOSYNC ../dbinc/os.h 72 -DB_FH_OPENED ../dbinc/os.h 73 -DB_FH_UNLINK ../dbinc/os.h 74 -DB_FILEOPEN ../dbinc/db.in 1050 -DB_FILE_ID_LEN ../dbinc/db.in 317 -DB_FIRST ../dbinc/db.in 993 -DB_FLUSH ../dbinc/db.in 473 -DB_FORCE ../dbinc/db.in 159 -DB_FTYPE_NOTSET ../dbinc/db_int.in 362 -DB_FTYPE_SET ../dbinc/db_int.in 361 -DB_GET_BOTH ../dbinc/db.in 994 -DB_GET_BOTHC ../dbinc/db.in 995 -DB_GET_BOTH_RANGE ../dbinc/db.in 996 -DB_GET_RECNO ../dbinc/db.in 997 +DB_EXCL ../dbinc/db.in 259 +DB_EXTENT ../dbinc/db.in 308 +DB_FAST_STAT ../dbinc/db.in 1130 +DB_FCNTL_LOCKING ../dbinc/db.in 260 +DB_FCNTL_OFF_GEN ../dbinc/mutex.h 960 +DB_FCNTL_OFF_LOCK ../dbinc/mutex.h 961 +DB_FCNTL_OFF_MPOOL ../dbinc/mutex.h 962 +DB_FH ../dbinc/db.in 157 +DB_FH_NOSYNC ../dbinc/os.h 84 +DB_FH_OPENED ../dbinc/os.h 85 +DB_FH_UNLINK ../dbinc/os.h 86 +DB_FILE_ID_LEN ../dbinc/db.in 369 +DB_FIRST ../dbinc/db.in 1131 +DB_FLUSH ../dbinc/db.in 526 +DB_FORCE ../dbinc/db.in 192 +DB_FTYPE_NOTSET ../dbinc/db_int.in 437 +DB_FTYPE_SET ../dbinc/db_int.in 436 +DB_GET_BOTH ../dbinc/db.in 1132 +DB_GET_BOTHC ../dbinc/db.in 1133 +DB_GET_BOTH_RANGE ../dbinc/db.in 1134 +DB_GET_RECNO ../dbinc/db.in 1135 DB_GLOBAL ../dbinc/globals.h /^#define DB_GLOBAL(v) __db_global_values.v$/ -DB_GROW_SIZE ../dbinc/log.h 87 -DB_HANDLE_LOCK ../dbinc/db.in 431 -DB_HASHMAGIC ../dbinc/db.in 975 -DB_HASHOLDVER ../dbinc/db.in 974 -DB_HASHVERSION ../dbinc/db.in 973 +DB_GROW_SIZE ../dbinc/log.h 89 +DB_HANDLE_LOCK ../dbinc/db.in 484 +DB_HASHMAGIC ../dbinc/db.in 1111 +DB_HASHOLDVER ../dbinc/db.in 1110 +DB_HASHVERSION ../dbinc/db.in 1109 DB_HASH_DUP ../dbinc/db_page.h 123 DB_HASH_DUPSORT ../dbinc/db_page.h 125 -DB_HASH_STAT ../dbinc/db.in 102 +DB_HASH_STAT ../dbinc/db.in 132 DB_HASH_SUBDB ../dbinc/db_page.h 124 DB_HTONL ../dbinc/db_swap.h /^#define DB_HTONL(p) do { \\$/ DB_ILLEGAL_AFTER_OPEN ../dbinc/db_int.in /^#define DB_ILLEGAL_AFTER_OPEN(dbp, name) \\$/ DB_ILLEGAL_BEFORE_OPEN ../dbinc/db_int.in /^#define DB_ILLEGAL_BEFORE_OPEN(dbp, name) \\$/ DB_ILLEGAL_IN_ENV ../dbinc/db_int.in /^#define DB_ILLEGAL_IN_ENV(dbp, name) \\$/ DB_ILLEGAL_METHOD ../dbinc/db_int.in /^#define DB_ILLEGAL_METHOD(dbp, flags) { \\$/ -DB_INITENV_CDB ../env/env_open.c 96 -DB_INITENV_CDB_ALLDB ../env/env_open.c 97 -DB_INITENV_LOCK ../env/env_open.c 98 -DB_INITENV_LOG ../env/env_open.c 99 -DB_INITENV_MPOOL ../env/env_open.c 100 -DB_INITENV_REP ../env/env_open.c 101 -DB_INITENV_TXN ../env/env_open.c 102 -DB_INITIALIZE_DB_GLOBALS ../env/env_method.c 29 -DB_INIT_CDB ../dbinc/db.in 208 -DB_INIT_LOCK ../dbinc/db.in 209 -DB_INIT_LOG ../dbinc/db.in 210 -DB_INIT_MPOOL ../dbinc/db.in 211 -DB_INIT_REP ../dbinc/db.in 212 -DB_INIT_TXN ../dbinc/db.in 213 +DB_INITENV_CDB ../env/env_open.c 95 +DB_INITENV_CDB_ALLDB ../env/env_open.c 96 +DB_INITENV_LOCK ../env/env_open.c 97 +DB_INITENV_LOG ../env/env_open.c 98 +DB_INITENV_MPOOL ../env/env_open.c 99 +DB_INITENV_REP ../env/env_open.c 100 +DB_INITENV_TXN ../env/env_open.c 101 +DB_INITIALIZE_DB_GLOBALS ../env/env_method.c 31 +DB_INIT_CDB ../dbinc/db.in 244 +DB_INIT_LOCK ../dbinc/db.in 245 +DB_INIT_LOG ../dbinc/db.in 246 +DB_INIT_MPOOL ../dbinc/db.in 247 +DB_INIT_REP ../dbinc/db.in 248 +DB_INIT_TXN ../dbinc/db.in 249 +DB_INORDER ../dbinc/db.in 318 DB_INTERNAL ../libdb_java/db_java_wrap.c /^#define DB_INTERNAL(db) ((db)->api_internal)$/ -DB_IO_READ ../dbinc/os.h 43 -DB_IO_WRITE ../dbinc/os.h 44 +DB_IO_READ ../dbinc/os.h 55 +DB_IO_WRITE ../dbinc/os.h 56 DB_IS_THREADED ../dbinc/db_int.in /^#define DB_IS_THREADED(dbp) \\$/ -DB_IV_BYTES ../dbinc/db_int.in 412 -DB_JOINENV ../dbinc/db.in 214 -DB_JOIN_ITEM ../dbinc/db.in 998 -DB_JOIN_NOSORT ../dbinc/db.in 288 -DB_KEYEMPTY ../dbinc/db.in 1051 -DB_KEYEXIST ../dbinc/db.in 1052 -DB_KEYFIRST ../dbinc/db.in 999 -DB_KEYLAST ../dbinc/db.in 1000 -DB_KEY_RANGE ../dbinc/db.in 126 -DB_LAST ../dbinc/db.in 1001 -DB_LINE ../dbinc/db_int.in 153 -DB_LOCK ../dbinc/db.in 105 -DB_LOCKDOWN ../dbinc/db.in 215 +DB_IV_BYTES ../dbinc/db_int.in 489 +DB_JOINENV ../dbinc/db.in 250 +DB_JOIN_ITEM ../dbinc/db.in 1136 +DB_JOIN_NOSORT ../dbinc/db.in 339 +DB_KEYEMPTY ../dbinc/db.in 1189 +DB_KEYEXIST ../dbinc/db.in 1190 +DB_KEYFIRST ../dbinc/db.in 1137 +DB_KEYLAST ../dbinc/db.in 1138 +DB_KEY_RANGE ../dbinc/db.in 159 +DB_LAST ../dbinc/db.in 1139 +DB_LOCK ../dbinc/db.in 135 +DB_LOCKDOWN ../dbinc/db.in 251 DB_LOCKER_DELETED ../dbinc/lock.h 143 DB_LOCKER_DIRTY ../dbinc/lock.h 144 DB_LOCKER_INABORT ../dbinc/lock.h 145 DB_LOCKER_TIMEOUT ../dbinc/lock.h 146 -DB_LOCKREQ ../dbinc/db.in 106 -DB_LOCKVERSION ../dbinc/db.in 315 -DB_LOCK_CDB_N ../lock/lock_region.c 55 -DB_LOCK_DEADLOCK ../dbinc/db.in 1053 -DB_LOCK_DEFAULT ../dbinc/db.in 324 +DB_LOCKREQ ../dbinc/db.in 136 +DB_LOCKVERSION ../dbinc/db.in 367 +DB_LOCK_ABORT ../dbinc/db.in 387 +DB_LOCK_CDB_N ../lock/lock_region.c 53 +DB_LOCK_DEADLOCK ../dbinc/db.in 1191 +DB_LOCK_DEFAULT ../dbinc/db.in 376 DB_LOCK_DEFAULT_N ../dbinc/lock.h 13 -DB_LOCK_DOALL ../dbinc/lock.h 196 -DB_LOCK_EXPIRE ../dbinc/db.in 325 -DB_LOCK_FREE ../dbinc/lock.h 197 -DB_LOCK_ILOCK ../dbinc/db.in 103 +DB_LOCK_DOALL ../dbinc/lock.h 200 +DB_LOCK_DOWNGRADE ../dbinc/lock.h 201 +DB_LOCK_EXPIRE ../dbinc/db.in 377 +DB_LOCK_FREE ../dbinc/lock.h 202 +DB_LOCK_ILOCK ../dbinc/db.in 133 DB_LOCK_INVALIDID ../dbinc/lock.h 20 DB_LOCK_MAXID ../dbinc/lock.h 21 -DB_LOCK_MAXLOCKS ../dbinc/db.in 326 -DB_LOCK_MINLOCKS ../dbinc/db.in 327 -DB_LOCK_MINWRITE ../dbinc/db.in 328 -DB_LOCK_NOPROMOTE ../dbinc/lock.h 198 -DB_LOCK_NORUN ../dbinc/db.in 323 -DB_LOCK_NOTEXIST ../dbinc/db.in 1077 -DB_LOCK_NOTGRANTED ../dbinc/db.in 1054 -DB_LOCK_NOWAIT ../dbinc/db.in 334 -DB_LOCK_NOWAITERS ../dbinc/lock.h 200 -DB_LOCK_OLDEST ../dbinc/db.in 329 -DB_LOCK_RANDOM ../dbinc/db.in 330 -DB_LOCK_RECORD ../dbinc/db.in 335 -DB_LOCK_REMOVE ../dbinc/db.in 336 -DB_LOCK_RIW_N ../lock/lock_region.c 36 -DB_LOCK_SET_TIMEOUT ../dbinc/db.in 337 -DB_LOCK_STAT ../dbinc/db.in 104 -DB_LOCK_SWITCH ../dbinc/db.in 338 -DB_LOCK_UNLINK ../dbinc/lock.h 199 -DB_LOCK_UPGRADE ../dbinc/db.in 339 -DB_LOCK_YOUNGEST ../dbinc/db.in 331 +DB_LOCK_MAXLOCKS ../dbinc/db.in 378 +DB_LOCK_MAXWRITE ../dbinc/db.in 379 +DB_LOCK_MINLOCKS ../dbinc/db.in 380 +DB_LOCK_MINWRITE ../dbinc/db.in 381 +DB_LOCK_NOPROMOTE ../dbinc/lock.h 203 +DB_LOCK_NOREGION ../dbinc/lock.h 205 +DB_LOCK_NORUN ../dbinc/db.in 375 +DB_LOCK_NOTEXIST ../dbinc/db.in 1217 +DB_LOCK_NOTGRANTED ../dbinc/db.in 1192 +DB_LOCK_NOWAIT ../dbinc/db.in 388 +DB_LOCK_NOWAITERS ../dbinc/lock.h 206 +DB_LOCK_OLDEST ../dbinc/db.in 382 +DB_LOCK_RANDOM ../dbinc/db.in 383 +DB_LOCK_RECORD ../dbinc/db.in 389 +DB_LOCK_REMOVE ../dbinc/db.in 390 +DB_LOCK_RIW_N ../lock/lock_region.c 34 +DB_LOCK_SET_TIMEOUT ../dbinc/db.in 391 +DB_LOCK_STAT ../dbinc/db.in 134 +DB_LOCK_SWITCH ../dbinc/db.in 392 +DB_LOCK_UNLINK ../dbinc/lock.h 204 +DB_LOCK_UPGRADE ../dbinc/db.in 393 +DB_LOCK_YOUNGEST ../dbinc/db.in 384 DB_LOG ../dbinc/log.h 58 -DB_LOGC ../dbinc/db.in 107 -DB_LOGC_BUF_SIZE ../dbinc/db.in 521 -DB_LOGFILEID_INVALID ../dbinc/db.in 1118 -DB_LOGMAGIC ../dbinc/db.in 464 -DB_LOGOLDVER ../dbinc/db.in 463 -DB_LOGVERSION ../dbinc/db.in 462 -DB_LOG_AUTOREMOVE ../dbinc/db.in 245 -DB_LOG_CHKPNT ../dbinc/db.in 474 -DB_LOG_COMMIT ../dbinc/db.in 475 -DB_LOG_DISK ../dbinc/db.in 533 -DB_LOG_LOCKED ../dbinc/db.in 534 -DB_LOG_NOCOPY ../dbinc/db.in 476 -DB_LOG_NOT_DURABLE ../dbinc/db.in 477 -DB_LOG_PERM ../dbinc/db.in 478 -DB_LOG_SILENT_ERR ../dbinc/db.in 535 -DB_LOG_STAT ../dbinc/db.in 108 -DB_LOG_WRNOSYNC ../dbinc/db.in 479 -DB_LSN ../dbinc/db.in 109 -DB_MAC_KEY ../dbinc/db_int.in 413 +DB_LOGC ../dbinc/db.in 137 +DB_LOGC_BUF_SIZE ../dbinc/db.in 575 +DB_LOGFILEID_INVALID ../dbinc/db.in 1261 +DB_LOGMAGIC ../dbinc/db.in 517 +DB_LOGOLDVER ../dbinc/db.in 516 +DB_LOGVERSION ../dbinc/db.in 515 +DB_LOG_AUTOREMOVE ../dbinc/db.in 282 +DB_LOG_BUFFER_FULL ../dbinc/db.in 1193 +DB_LOG_CHKPNT ../dbinc/db.in 527 +DB_LOG_COMMIT ../dbinc/db.in 528 +DB_LOG_DISK ../dbinc/db.in 587 +DB_LOG_INMEMORY ../dbinc/db.in 283 +DB_LOG_LOCKED ../dbinc/db.in 588 +DB_LOG_NOCOPY ../dbinc/db.in 529 +DB_LOG_NOT_DURABLE ../dbinc/db.in 530 +DB_LOG_PERM ../dbinc/db.in 531 +DB_LOG_RESEND ../dbinc/db.in 532 +DB_LOG_SILENT_ERR ../dbinc/db.in 589 +DB_LOG_STAT ../dbinc/db.in 138 +DB_LOG_WRNOSYNC ../dbinc/db.in 533 +DB_LSN ../dbinc/db.in 139 +DB_MAC_KEY ../dbinc/db_int.in 490 DB_MAC_MAGIC ../dbinc/hmac.h 28 -DB_MAXMMAPSIZE ../mp/mp_fopen.c 962 -DB_MAX_HANDLES ../dbinc/mutex.h 973 -DB_MAX_PAGES ../dbinc/db.in 79 -DB_MAX_PGSIZE ../dbinc/db_int.in 54 -DB_MAX_RECORDS ../dbinc/db.in 82 +DB_MAXMMAPSIZE ../mp/mp_fopen.c 493 +DB_MAX_HANDLES ../dbinc/mutex.h 979 +DB_MAX_PAGES ../dbinc/db.in 107 +DB_MAX_PGSIZE ../dbinc/db_int.in 85 +DB_MAX_RECORDS ../dbinc/db.in 110 DB_METHOD ../cxx/cxx_db.cpp /^#define DB_METHOD(_name, _argspec, _arglist, _reto/ -DB_METHOD_CHECKED ../cxx/cxx_db.cpp /^#define DB_METHOD_CHECKED(_name, _cleanup, _argspe/ DB_METHOD_QUIET ../cxx/cxx_db.cpp /^#define DB_METHOD_QUIET(_name, _argspec, _arglist)/ DB_METHOD_VOID ../cxx/cxx_db.cpp /^#define DB_METHOD_VOID(_name, _argspec, _arglist) / -DB_MINPAGECACHE ../dbinc/db_int.in 59 -DB_MIN_PGSIZE ../dbinc/db_int.in 53 -DB_MPOOL ../dbinc/db.in 110 -DB_MPOOLFILE ../dbinc/db.in 113 +DB_MINPAGECACHE ../dbinc/db_int.in 90 +DB_MIN_PGSIZE ../dbinc/db_int.in 84 +DB_MPOOL ../dbinc/db.in 140 +DB_MPOOLFILE ../dbinc/db.in 143 DB_MPOOLFILE_METHOD ../cxx/cxx_mpool.cpp /^#define DB_MPOOLFILE_METHOD(_name, _argspec, _argl/ DB_MPOOLFILE_METHOD_VOID ../cxx/cxx_mpool.cpp /^#define DB_MPOOLFILE_METHOD_VOID(_name, _argspec, / -DB_MPOOL_CLEAN ../dbinc/db.in 573 -DB_MPOOL_CREATE ../dbinc/db.in 568 -DB_MPOOL_DIRTY ../dbinc/db.in 574 -DB_MPOOL_DISCARD ../dbinc/db.in 575 -DB_MPOOL_FSTAT ../dbinc/db.in 111 +DB_MPOOL_CLEAN ../dbinc/db.in 635 +DB_MPOOL_CREATE ../dbinc/db.in 630 +DB_MPOOL_DIRTY ../dbinc/db.in 636 +DB_MPOOL_DISCARD ../dbinc/db.in 637 +DB_MPOOL_FREE ../dbinc/db.in 638 +DB_MPOOL_FSTAT ../dbinc/db.in 141 DB_MPOOL_HASH ../dbinc/mp.h 14 -DB_MPOOL_LAST ../dbinc/db.in 569 -DB_MPOOL_NEW ../dbinc/db.in 570 -DB_MPOOL_NOFILE ../dbinc/db.in 578 -DB_MPOOL_STAT ../dbinc/db.in 112 -DB_MPOOL_UNLINK ../dbinc/db.in 579 +DB_MPOOL_LAST ../dbinc/db.in 631 +DB_MPOOL_NEW ../dbinc/db.in 632 +DB_MPOOL_NOFILE ../dbinc/db.in 641 +DB_MPOOL_STAT ../dbinc/db.in 142 +DB_MPOOL_UNLINK ../dbinc/db.in 642 DB_MPREG ../dbinc/mp.h 15 -DB_MULTIPLE ../dbinc/db.in 1030 +DB_MSGBUF_FLUSH ../dbinc/db_int.in /^#define DB_MSGBUF_FLUSH(dbenv, a) do { \\$/ +DB_MSGBUF_INIT ../dbinc/db_int.in /^#define DB_MSGBUF_INIT(a) do { \\$/ +DB_MULTIPLE ../dbinc/db.in 1168 DB_MULTIPLE_INIT ../dbinc/db.in /^#define DB_MULTIPLE_INIT(pointer, dbt) \\$/ -DB_MULTIPLE_KEY ../dbinc/db.in 1031 +DB_MULTIPLE_KEY ../dbinc/db.in 1169 DB_MULTIPLE_KEY_NEXT ../dbinc/db.in /^#define DB_MULTIPLE_KEY_NEXT(pointer, dbt, retkey,/ DB_MULTIPLE_NEXT ../dbinc/db.in /^#define DB_MULTIPLE_NEXT(pointer, dbt, retdata, re/ DB_MULTIPLE_RECNO_NEXT ../dbinc/db.in /^#define DB_MULTIPLE_RECNO_NEXT(pointer, dbt, recno/ -DB_MUTEX ../dbinc/db.in 128 -DB_NEEDSPLIT ../dbinc/db.in 1078 -DB_NEXT ../dbinc/db.in 1002 -DB_NEXT_DUP ../dbinc/db.in 1003 -DB_NEXT_NODUP ../dbinc/db.in 1004 -DB_NODUPDATA ../dbinc/db.in 1005 -DB_NOLOCKING ../dbinc/db.in 246 -DB_NOMMAP ../dbinc/db.in 160 +DB_MUTEX ../dbinc/db.in 161 +DB_NEEDSPLIT ../dbinc/db.in 1218 +DB_NEXT ../dbinc/db.in 1140 +DB_NEXT_DUP ../dbinc/db.in 1141 +DB_NEXT_NODUP ../dbinc/db.in 1142 +DB_NODUPDATA ../dbinc/db.in 1143 +DB_NOLOCKING ../dbinc/db.in 284 +DB_NOMMAP ../dbinc/db.in 193 DB_NONBLOCK ../dbinc/db_int.in /^#define DB_NONBLOCK(C) ((C)->txn != NULL && F_ISSE/ -DB_NOORDERCHK ../dbinc/db.in 294 -DB_NOOVERWRITE ../dbinc/db.in 1006 -DB_NOPANIC ../dbinc/db.in 247 -DB_NOSERVER ../dbinc/db.in 1055 -DB_NOSERVER_HOME ../dbinc/db.in 1056 -DB_NOSERVER_ID ../dbinc/db.in 1057 -DB_NOSYNC ../dbinc/db.in 1007 -DB_NOTFOUND ../dbinc/db.in 1058 -DB_NO_AUTO_COMMIT ../dbinc/db.in 192 +DB_NOORDERCHK ../dbinc/db.in 345 +DB_NOOVERWRITE ../dbinc/db.in 1144 +DB_NOPANIC ../dbinc/db.in 285 +DB_NOSERVER ../dbinc/db.in 1194 +DB_NOSERVER_HOME ../dbinc/db.in 1195 +DB_NOSERVER_ID ../dbinc/db.in 1196 +DB_NOSYNC ../dbinc/db.in 1145 +DB_NOTFOUND ../dbinc/db.in 1197 +DB_NO_AUTO_COMMIT ../dbinc/db.in 228 DB_NTOHL ../dbinc/db_swap.h /^#define DB_NTOHL(p) do { \\$/ -DB_ODDFILESIZE ../dbinc/db.in 266 -DB_OK_BTREE ../dbinc/db.in 1328 -DB_OK_HASH ../dbinc/db.in 1329 -DB_OK_QUEUE ../dbinc/db.in 1330 -DB_OK_RECNO ../dbinc/db.in 1331 -DB_OLD_VERSION ../dbinc/db.in 1059 -DB_OPFLAGS_MASK ../dbinc/db.in 1023 -DB_OPNOTSUP ../dbinc/db_int.in 183 -DB_ORDERCHKONLY ../dbinc/db.in 295 -DB_OSO_CREATE ../dbinc/os.h 20 -DB_OSO_DIRECT ../dbinc/os.h 21 -DB_OSO_EXCL ../dbinc/os.h 22 -DB_OSO_LOG ../dbinc/os.h 23 -DB_OSO_RDONLY ../dbinc/os.h 24 -DB_OSO_REGION ../dbinc/os.h 25 -DB_OSO_SEQ ../dbinc/os.h 26 -DB_OSO_TEMP ../dbinc/os.h 27 -DB_OSO_TRUNC ../dbinc/os.h 28 -DB_OS_SEEK ../dbinc/os.h 37 +DB_ODDFILESIZE ../dbinc/db.in 309 +DB_OK_BTREE ../dbinc/db.in 1477 +DB_OK_HASH ../dbinc/db.in 1478 +DB_OK_QUEUE ../dbinc/db.in 1479 +DB_OK_RECNO ../dbinc/db.in 1480 +DB_OLD_VERSION ../dbinc/db.in 1198 +DB_OPFLAGS_MASK ../dbinc/db.in 1161 +DB_OPNOTSUP ../dbinc/db_int.in 255 +DB_ORDERCHKONLY ../dbinc/db.in 346 +DB_OSO_CREATE ../dbinc/os.h 31 +DB_OSO_DIRECT ../dbinc/os.h 32 +DB_OSO_DSYNC ../dbinc/os.h 33 +DB_OSO_EXCL ../dbinc/os.h 34 +DB_OSO_LOG ../dbinc/os.h 35 +DB_OSO_RDONLY ../dbinc/os.h 36 +DB_OSO_REGION ../dbinc/os.h 37 +DB_OSO_SEQ ../dbinc/os.h 38 +DB_OSO_TEMP ../dbinc/os.h 39 +DB_OSO_TRUNC ../dbinc/os.h 40 +DB_OS_SEEK ../dbinc/os.h 49 DB_OVERFLOWED_DBT ../dbinc/cxx_int.h /^#define DB_OVERFLOWED_DBT(dbt) \\$/ -DB_OVERWRITE ../dbinc/db.in 248 +DB_OVERWRITE ../dbinc/db.in 286 DB_PAGE_DB_LEN ../dbinc/db_page.h 58 -DB_PAGE_LOCK ../dbinc/db.in 433 -DB_PAGE_NOTFOUND ../dbinc/db.in 1060 +DB_PAGE_LOCK ../dbinc/db.in 486 +DB_PAGE_NOTFOUND ../dbinc/db.in 1199 DB_PAGE_QUEUE_LEN ../dbinc/db_page.h 59 -DB_PANIC_ENVIRONMENT ../dbinc/db.in 249 +DB_PANIC_ENVIRONMENT ../dbinc/db.in 287 +DB_PCT ../dbinc/db_int.in /^#define DB_PCT(v, total) \\$/ +DB_PCT_PG ../dbinc/db_int.in /^#define DB_PCT_PG(v, total, pgsize) \\$/ DB_PKG ../libdb_java/db_java_wrap.c 80 -DB_POSITION ../dbinc/db.in 1008 -DB_PREPLIST ../dbinc/db.in 114 -DB_PREV ../dbinc/db.in 1009 -DB_PREV_NODUP ../dbinc/db.in 1010 -DB_PRINTABLE ../dbinc/db.in 298 -DB_PRIVATE ../dbinc/db.in 216 -DB_PR_PAGE ../dbinc/db.in 296 -DB_PR_RECOVERYTEST ../dbinc/db.in 297 -DB_PUT_ACTION ../db/db_meta.c /^#define DB_PUT_ACTION(dbc, action, lockp) \\$/ -DB_QAMMAGIC ../dbinc/db.in 979 -DB_QAMOLDVER ../dbinc/db.in 978 -DB_QAMVERSION ../dbinc/db.in 977 -DB_QUEUE_STAT ../dbinc/db.in 115 -DB_RDONLY ../dbinc/db.in 161 -DB_RDWRMASTER ../dbinc/db.in 225 -DB_REAL_ERR ../dbinc/debug.h /^#define DB_REAL_ERR(env, error, error_set, stderr_/ -DB_RECNUM ../dbinc/db.in 275 -DB_RECORDCOUNT ../dbinc/db.in 1011 -DB_RECORD_LOCK ../dbinc/db.in 432 -DB_RECOVER ../dbinc/db.in 162 -DB_RECOVER_FATAL ../dbinc/db.in 217 +DB_POSITION ../dbinc/db.in 1146 +DB_PREPLIST ../dbinc/db.in 144 +DB_PREV ../dbinc/db.in 1147 +DB_PREV_NODUP ../dbinc/db.in 1148 +DB_PRINTABLE ../dbinc/db.in 349 +DB_PRIVATE ../dbinc/db.in 252 +DB_PR_PAGE ../dbinc/db.in 347 +DB_PR_RECOVERYTEST ../dbinc/db.in 348 +DB_QAMMAGIC ../dbinc/db.in 1115 +DB_QAMOLDVER ../dbinc/db.in 1114 +DB_QAMVERSION ../dbinc/db.in 1113 +DB_QUEUE_STAT ../dbinc/db.in 145 +DB_RDONLY ../dbinc/db.in 194 +DB_RDWRMASTER ../dbinc/db.in 261 +DB_REAL_ERR ../dbinc/debug.h /^#define DB_REAL_ERR(env, error, error_set, default/ +DB_REAL_MSG ../dbinc/debug.h /^#define DB_REAL_MSG(env, fmt) { \\$/ +DB_RECNUM ../dbinc/db.in 319 +DB_RECORDCOUNT ../dbinc/db.in 1149 +DB_RECORD_LOCK ../dbinc/db.in 485 +DB_RECOVER ../dbinc/db.in 195 +DB_RECOVER_FATAL ../dbinc/db.in 253 DB_REDO ../dbinc/db.in /^#define DB_REDO(op) ((op) == DB_TXN_FORWARD_ROLL |/ +DB_REGENV_REPLOCKED ../dbinc/region.h 170 +DB_REGENV_TIMEOUT ../dbinc/region.h 172 DB_REGION_ENV ../dbinc/region.h 104 DB_REGION_FMT ../dbinc/region.h 103 -DB_REGION_INIT ../dbinc/db.in 250 -DB_REGION_MAGIC ../dbinc/db.in 1582 +DB_REGION_INIT ../dbinc/db.in 288 +DB_REGION_MAGIC ../dbinc/db.in 1734 DB_REGION_NAME_LENGTH ../dbinc/region.h 105 DB_REGION_PREFIX ../dbinc/region.h 102 DB_REM_BIG ../dbinc/db_am.h 26 DB_REM_DUP ../dbinc/db_am.h 24 -DB_REM_PAGE ../dbinc/db_am.h 28 -DB_RENAMEMAGIC ../dbinc/db.in 967 -DB_RENUMBER ../dbinc/db.in 276 -DB_REP ../dbinc/db.in 116 -DB_REPVERSION ../dbinc/rep.h 173 -DB_REP_CLIENT ../dbinc/db.in 894 -DB_REP_CREATE ../dbinc/db.in 202 -DB_REP_DUPMASTER ../dbinc/db.in 1061 -DB_REP_HANDLE_DEAD ../dbinc/db.in 1062 -DB_REP_HOLDELECTION ../dbinc/db.in 1063 -DB_REP_ISPERM ../dbinc/db.in 1064 -DB_REP_LOGSONLY ../dbinc/db.in 895 -DB_REP_MASTER ../dbinc/db.in 896 -DB_REP_MAX_GAP ../dbinc/rep.h 64 -DB_REP_NEWMASTER ../dbinc/db.in 1065 -DB_REP_NEWSITE ../dbinc/db.in 1066 -DB_REP_NOBUFFER ../dbinc/db.in 309 -DB_REP_NOTPERM ../dbinc/db.in 1067 -DB_REP_OUTDATED ../dbinc/db.in 1068 -DB_REP_PERMANENT ../dbinc/db.in 310 -DB_REP_REQUEST_GAP ../dbinc/rep.h 63 -DB_REP_STAT ../dbinc/db.in 117 -DB_REP_UNAVAIL ../dbinc/db.in 1069 +DB_RENAMEMAGIC ../dbinc/db.in 1103 +DB_RENUMBER ../dbinc/db.in 320 +DB_REP ../dbinc/db.in 146 +DB_REPVERSION ../dbinc/rep.h 268 +DB_REP_CLIENT ../dbinc/db.in 961 +DB_REP_CREATE ../dbinc/db.in 238 +DB_REP_DUPMASTER ../dbinc/db.in 1200 +DB_REP_EGENCHG ../dbinc/db.in 1219 +DB_REP_HANDLE_DEAD ../dbinc/db.in 1201 +DB_REP_HOLDELECTION ../dbinc/db.in 1202 +DB_REP_ISPERM ../dbinc/db.in 1203 +DB_REP_LOGREADY ../dbinc/db.in 1220 +DB_REP_MASTER ../dbinc/db.in 962 +DB_REP_MAX_GAP ../dbinc/rep.h 125 +DB_REP_NEWMASTER ../dbinc/db.in 1204 +DB_REP_NEWSITE ../dbinc/db.in 1205 +DB_REP_NOBUFFER ../dbinc/db.in 361 +DB_REP_NOTPERM ../dbinc/db.in 1206 +DB_REP_PAGEDONE ../dbinc/db.in 1221 +DB_REP_PERMANENT ../dbinc/db.in 362 +DB_REP_REQUEST_GAP ../dbinc/rep.h 124 +DB_REP_STARTUPDONE ../dbinc/db.in 1207 +DB_REP_STAT ../dbinc/db.in 147 +DB_REP_UNAVAIL ../dbinc/db.in 1208 DB_RETOK_DBCDEL ../dbinc/db_int.in /^#define DB_RETOK_DBCDEL(ret) ((ret) == 0 || (ret) / DB_RETOK_DBCGET ../dbinc/db_int.in /^#define DB_RETOK_DBCGET(ret) ((ret) == 0 || (ret) / DB_RETOK_DBCPUT ../dbinc/db_int.in /^#define DB_RETOK_DBCPUT(ret) ((ret) == 0 || (ret) / @@ -536,13 +564,31 @@ DB_RETOK_LGGET ../dbinc/db_int.in /^#define DB_RETOK_LGGET(ret) ((ret) == 0 || ( DB_RETOK_MPGET ../dbinc/db_int.in /^#define DB_RETOK_MPGET(ret) ((ret) == 0 || (ret) =/ DB_RETOK_REPPMSG ../dbinc/db_int.in /^#define DB_RETOK_REPPMSG(ret) ((ret) == 0 || \\$/ DB_RETOK_STD ../dbinc/db_int.in /^#define DB_RETOK_STD(ret) ((ret) == 0)$/ -DB_RETRY ../dbinc/db_int.in 68 -DB_REVSPLITOFF ../dbinc/db.in 277 -DB_RMW ../dbinc/db.in 1032 -DB_RPCCLIENT ../dbinc/db.in 197 -DB_RUNRECOVERY ../dbinc/db.in 1070 -DB_SALVAGE ../dbinc/db.in 299 -DB_SECONDARY_BAD ../dbinc/db.in 1071 +DB_RETRY ../dbinc/os.h 18 +DB_REVSPLITOFF ../dbinc/db.in 321 +DB_RMW ../dbinc/db.in 1170 +DB_RPC2ND_CONCATDATAKEY ../dbinc/db_int.in 511 +DB_RPC2ND_CONCATKEYDATA ../dbinc/db_int.in 510 +DB_RPC2ND_CONSTANT ../dbinc/db_int.in 514 +DB_RPC2ND_GETNAME ../dbinc/db_int.in 516 +DB_RPC2ND_GETZIP ../dbinc/db_int.in 515 +DB_RPC2ND_MASK ../dbinc/db_int.in 506 +DB_RPC2ND_NOOP ../dbinc/db_int.in 509 +DB_RPC2ND_REVERSECONCAT ../dbinc/db_int.in 512 +DB_RPC2ND_REVERSEDATA ../dbinc/db_int.in 508 +DB_RPC2ND_TRUNCDATA ../dbinc/db_int.in 513 +DB_RPCCLIENT ../dbinc/db.in 233 +DB_RUNRECOVERY ../dbinc/db.in 1209 +DB_SALVAGE ../dbinc/db.in 350 +DB_SECONDARY_BAD ../dbinc/db.in 1210 +DB_SEQUENCE ../dbinc/db.in 148 +DB_SEQUENCE_STAT ../dbinc/db.in 150 +DB_SEQUENCE_VERSION ../dbinc/db.in 1117 +DB_SEQ_DEC ../dbinc/db.in 1033 +DB_SEQ_INC ../dbinc/db.in 1034 +DB_SEQ_RANGE_SET ../dbinc/db.in 1035 +DB_SEQ_RECORD ../dbinc/db.in 149 +DB_SEQ_WRAP ../dbinc/db.in 1036 DB_SERVER_DBFLAGS ../dbinc/db_server_int.h 61 DB_SERVER_DBNOSHARE ../dbinc/db_server_int.h 62 DB_SERVER_ENVFLAGS ../dbinc/db_server_int.h 57 @@ -550,95 +596,107 @@ DB_SERVER_FLAGMASK ../dbinc/db_server_int.h 28 DB_SERVER_IDLETIMEOUT ../dbinc/db_server_int.h 15 DB_SERVER_MAXTIMEOUT ../dbinc/db_server_int.h 14 DB_SERVER_TIMEOUT ../dbinc/db_server_int.h 13 -DB_SET ../dbinc/db.in 1012 +DB_SET ../dbinc/db.in 1150 +DB_SET_BEGIN_LSNP ../dbinc/log.h /^#define DB_SET_BEGIN_LSNP(txn, rlsnp) do { \\$/ DB_SET_CALLBACK ../cxx/cxx_db.cpp /^#define DB_SET_CALLBACK(_cxxname, _name, _cxxargsp/ -DB_SET_LOCK_TIMEOUT ../dbinc/db.in 1013 -DB_SET_RANGE ../dbinc/db.in 1014 -DB_SET_RECNO ../dbinc/db.in 1015 -DB_SET_TXN_NOW ../dbinc/db.in 1016 -DB_SET_TXN_TIMEOUT ../dbinc/db.in 1017 -DB_SNAPSHOT ../dbinc/db.in 278 -DB_STAT_CLEAR ../dbinc/db.in 283 -DB_SURPRISE_KID ../dbinc/db.in 1079 -DB_SWAPBYTES ../dbinc/db.in 1081 -DB_SYSTEM_MEM ../dbinc/db.in 218 -DB_TEST_ELECTINIT ../dbinc/db.in 1854 -DB_TEST_POSTDESTROY ../dbinc/db.in 1855 -DB_TEST_POSTLOG ../dbinc/db.in 1856 -DB_TEST_POSTLOGMETA ../dbinc/db.in 1857 -DB_TEST_POSTOPEN ../dbinc/db.in 1858 -DB_TEST_POSTSYNC ../dbinc/db.in 1859 -DB_TEST_PREDESTROY ../dbinc/db.in 1860 -DB_TEST_PREOPEN ../dbinc/db.in 1861 -DB_TEST_RECOVERY ../dbinc/debug.h /^#define DB_TEST_RECOVERY(dbp, val, ret, name) \\/ -DB_TEST_RECOVERY_LABEL ../dbinc/debug.h 206 -DB_TEST_SUBDB_LOCKS ../dbinc/db.in 1862 -DB_TEST_SUBLOCKS ../dbinc/debug.h /^#define DB_TEST_SUBLOCKS(env, flags) \\$/ -DB_THREAD ../dbinc/db.in 163 -DB_TIMEOUT ../dbinc/db.in 1082 -DB_TIME_NOTGRANTED ../dbinc/db.in 251 -DB_TRAIL ../env/env_open.c 869 -DB_TRUNCATE ../dbinc/db.in 164 -DB_TXN ../dbinc/db.in 118 -DB_TXNHEAD ../dbinc/db_int.in 419 -DB_TXNLIST ../dbinc/db_int.in 420 +DB_SET_LOCK_TIMEOUT ../dbinc/db.in 1151 +DB_SET_RANGE ../dbinc/db.in 1152 +DB_SET_RECNO ../dbinc/db.in 1153 +DB_SET_TXN_NOW ../dbinc/db.in 1154 +DB_SET_TXN_TIMEOUT ../dbinc/db.in 1155 +DB_SNAPSHOT ../dbinc/db.in 322 +DB_STAT_ALL ../dbinc/db.in 327 +DB_STAT_CLEAR ../dbinc/db.in 328 +DB_STAT_LOCK_CONF ../dbinc/db.in 329 +DB_STAT_LOCK_FLAGS ../lock/lock_stat.c 150 +DB_STAT_LOCK_LOCKERS ../dbinc/db.in 330 +DB_STAT_LOCK_OBJECTS ../dbinc/db.in 331 +DB_STAT_LOCK_PARAMS ../dbinc/db.in 332 +DB_STAT_MEMP_FLAGS ../mp/mp_stat.c 289 +DB_STAT_MEMP_HASH ../dbinc/db.in 333 +DB_STAT_SUBSYSTEM ../dbinc/db.in 334 +DB_SURPRISE_KID ../dbinc/db.in 1222 +DB_SWAPBYTES ../dbinc/db.in 1224 +DB_SYSTEM_MEM ../dbinc/db.in 254 +DB_TEST_CHECKPOINT ../dbinc/debug.h /^#define DB_TEST_CHECKPOINT(env, val) \\$/ +DB_TEST_ELECTINIT ../dbinc/db.in 2035 +DB_TEST_ELECTVOTE1 ../dbinc/db.in 2036 +DB_TEST_POSTDESTROY ../dbinc/db.in 2037 +DB_TEST_POSTLOG ../dbinc/db.in 2038 +DB_TEST_POSTLOGMETA ../dbinc/db.in 2039 +DB_TEST_POSTOPEN ../dbinc/db.in 2040 +DB_TEST_POSTSYNC ../dbinc/db.in 2041 +DB_TEST_PREDESTROY ../dbinc/db.in 2042 +DB_TEST_PREOPEN ../dbinc/db.in 2043 +DB_TEST_RECOVERY ../dbinc/debug.h /^#define DB_TEST_RECOVERY(dbp, val, ret, name) do {/ +DB_TEST_RECOVERY_LABEL ../dbinc/debug.h 248 +DB_TEST_SUBDB_LOCKS ../dbinc/db.in 2044 +DB_TEST_SUBLOCKS ../dbinc/debug.h /^#define DB_TEST_SUBLOCKS(env, flags) do { \\$/ +DB_THREAD ../dbinc/db.in 196 +DB_TIMEOUT ../dbinc/db.in 1225 +DB_TIME_NOTGRANTED ../dbinc/db.in 289 +DB_TRAIL ../env/env_open.c 923 +DB_TRUNCATE ../dbinc/db.in 197 +DB_TXN ../dbinc/db.in 151 +DB_TXNHEAD ../dbinc/db_int.in 523 +DB_TXNLIST ../dbinc/db_int.in 524 DB_TXNLIST_MASK ../dbinc/db_dispatch.h /^#define DB_TXNLIST_MASK(hp, n) (n % hp->nslots)$/ -DB_TXNLIST_MAX_PGNO ../db/db_dispatch.c 1408 +DB_TXNLIST_MAX_PGNO ../db/db_dispatch.c 1468 DB_TXNLOGREC ../dbinc/txn.h 24 -DB_TXNMGR ../dbinc/db.in 121 +DB_TXNMGR ../dbinc/db.in 154 DB_TXNREGION ../dbinc/txn.h 23 -DB_TXNVERSION ../dbinc/db.in 730 -DB_TXN_ACTIVE ../dbinc/db.in 119 -DB_TXN_CKP ../dbinc/db.in 1083 -DB_TXN_NOSYNC ../dbinc/db.in 165 -DB_TXN_NOT_DURABLE ../dbinc/db.in 166 -DB_TXN_NOWAIT ../dbinc/db.in 231 -DB_TXN_STAT ../dbinc/db.in 120 -DB_TXN_SYNC ../dbinc/db.in 232 -DB_TXN_WRITE_NOSYNC ../dbinc/db.in 252 +DB_TXNVERSION ../dbinc/db.in 795 +DB_TXN_ACTIVE ../dbinc/db.in 152 +DB_TXN_CKP ../dbinc/db.in 1226 +DB_TXN_NOSYNC ../dbinc/db.in 198 +DB_TXN_NOT_DURABLE ../dbinc/db.in 199 +DB_TXN_NOWAIT ../dbinc/db.in 267 +DB_TXN_STAT ../dbinc/db.in 153 +DB_TXN_SYNC ../dbinc/db.in 268 +DB_TXN_WRITE_NOSYNC ../dbinc/db.in 294 DB_UNDO ../dbinc/db.in /^#define DB_UNDO(op) ((op) == DB_TXN_ABORT || \\$/ -DB_UPDATE_SECONDARY ../dbinc/db.in 1018 -DB_UPGRADE ../dbinc/db.in 258 -DB_USE_ENVIRON ../dbinc/db.in 167 -DB_USE_ENVIRON_ROOT ../dbinc/db.in 168 -DB_VERB_CHKPOINT ../dbinc/db.in 1606 -DB_VERB_DEADLOCK ../dbinc/db.in 1607 -DB_VERB_RECOVERY ../dbinc/db.in 1608 -DB_VERB_REPLICATION ../dbinc/db.in 1609 -DB_VERB_WAITSFOR ../dbinc/db.in 1610 -DB_VERIFY ../dbinc/db.in 259 -DB_VERIFY_BAD ../dbinc/db.in 1072 -DB_VERIFY_FATAL ../dbinc/db.in 1084 +DB_UNREF ../dbinc/db.in 351 +DB_UPDATE_SECONDARY ../dbinc/db.in 1156 +DB_UPGRADE ../dbinc/db.in 300 +DB_USE_ENVIRON ../dbinc/db.in 200 +DB_USE_ENVIRON_ROOT ../dbinc/db.in 201 +DB_VERB_DEADLOCK ../dbinc/db.in 1764 +DB_VERB_RECOVERY ../dbinc/db.in 1765 +DB_VERB_REPLICATION ../dbinc/db.in 1766 +DB_VERB_WAITSFOR ../dbinc/db.in 1767 +DB_VERIFY ../dbinc/db.in 301 +DB_VERIFY_BAD ../dbinc/db.in 1211 +DB_VERIFY_FATAL ../dbinc/db.in 1227 DB_VERSION_MAJOR ../dbinc/db.in 43 DB_VERSION_MINOR ../dbinc/db.in 44 +DB_VERSION_MISMATCH ../dbinc/db.in 1212 DB_VERSION_PATCH ../dbinc/db.in 45 DB_VERSION_STRING ../dbinc/db.in 46 -DB_WRITECURSOR ../dbinc/db.in 1019 -DB_WRITELOCK ../dbinc/db.in 1020 -DB_WRITEOPEN ../dbinc/db.in 226 -DB_XA_CREATE ../dbinc/db.in 203 -DB_XIDDATASIZE ../dbinc/db.in 853 -DB_YIELDCPU ../dbinc/db.in 253 -DB_debug_FLAG ../dbinc/db.in 505 -DB_user_BEGIN ../dbinc/db.in 504 +DB_WRITECURSOR ../dbinc/db.in 1157 +DB_WRITELOCK ../dbinc/db.in 1158 +DB_WRITEOPEN ../dbinc/db.in 262 +DB_XA_CREATE ../dbinc/db.in 239 +DB_XIDDATASIZE ../dbinc/db.in 920 +DB_YIELDCPU ../dbinc/db.in 295 +DB_debug_FLAG ../dbinc/db.in 559 +DB_user_BEGIN ../dbinc/db.in 558 DCHARHASH ../hash/hash_func.c /^#define DCHARHASH(h, c) ((h) = 0x63c63cd9*(h) + 0x/ -DD_INVALID_ID ../lock/lock_deadlock.c 346 +DD_INVALID_ID ../lock/lock_deadlock.c 370 DEBUG_LREAD ../dbinc/debug.h /^#define DEBUG_LREAD(C, T, O, K, A, F) LOG_OP(C, T,/ DEBUG_LWRITE ../dbinc/debug.h /^#define DEBUG_LWRITE(C, T, O, K, A, F) LOG_OP(C, T/ -DEFINE_DB_CLASS ../dbinc/db_cxx.in /^#define DEFINE_DB_CLASS(name) \\$/ DEFMINKEYPAGE ../dbinc/btree.h 53 DEF_MAX_TXNS ../dbinc/txn.h 34 DELOVFL ../dbinc/hash.h 129 DELPAIR ../dbinc/hash.h 127 DIR_DECRYPT ../crypto/rijndael/rijndael-api-fst.h 48 DIR_ENCRYPT ../crypto/rijndael/rijndael-api-fst.h 47 -DISCARD_CUR ../btree/bt_cursor.c /^#define DISCARD_CUR(dbc, ret) { \\$/ +DISCARD_CUR ../btree/bt_cursor.c /^#define DISCARD_CUR(dbc, ret) do { \\$/ DO_PREPLIST ../tcl/tcl_txn.c /^#define DO_PREPLIST(count) \\$/ -DO_TRADE ../txn/txn_util.c 220 +DO_TRADE ../txn/txn_util.c 218 DUP_SIZE ../dbinc/hash.h /^#define DUP_SIZE(len) ((len) + 2 * sizeof(db_indx_/ +Db ../libdb_java/db_java_wrap.c 1737 Db::Db ../cxx/cxx_db.cpp /^Db::Db(DbEnv *env, u_int32_t flags)$/ Db::cleanup ../cxx/cxx_db.cpp /^void Db::cleanup()$/ -Db::close ../cxx/cxx_db.cpp /^int Db::close(u_int32_t flags)$/ Db::error_policy ../cxx/cxx_db.cpp /^int Db::error_policy()$/ Db::errx ../cxx/cxx_db.cpp /^void Db::errx(const char *format, ...)$/ Db::get_app_private ../cxx/cxx_db.cpp /^void *Db::get_app_private() const$/ @@ -648,18 +706,22 @@ Db::get_mpf ../cxx/cxx_db.cpp /^DbMpoolFile *Db::get_mpf()$/ Db::initialize ../cxx/cxx_db.cpp /^int Db::initialize()$/ Db::pget ../cxx/cxx_db.cpp /^int Db::pget(DbTxn *txnid, Dbt *key, Dbt *pkey, Db/ Db::set_app_private ../cxx/cxx_db.cpp /^void Db::set_app_private(void *value)$/ -Db::set_error_stream ../cxx/cxx_db.cpp /^void Db::set_error_stream(__DB_OSTREAMCLASS *error/ +Db::set_error_stream ../cxx/cxx_db.cpp /^void Db::set_error_stream(__DB_STD(ostream) *error/ +Db::set_message_stream ../cxx/cxx_db.cpp /^void Db::set_message_stream(__DB_STD(ostream) *mes/ +Db::set_msgcall ../cxx/cxx_db.cpp /^void Db::set_msgcall(void (*arg)(const DbEnv *, co/ Db::verify ../cxx/cxx_db.cpp /^int Db::verify(const char *name, const char *subdb/ Db::~Db ../cxx/cxx_db.cpp /^Db::~Db()$/ DbDeadlockException::DbDeadlockException ../cxx/cxx_except.cpp /^DbDeadlockException::DbDeadlockException(const cha/ DbDeadlockException::operator = ../cxx/cxx_except.cpp /^&DbDeadlockException::operator =(const DbDeadlockE/ -DbDeadlockException::~DbDeadlockException ../cxx/cxx_except.cpp /^DbDeadlockException::~DbDeadlockException()$/ +DbDeadlockException::~DbDeadlockException ../cxx/cxx_except.cpp /^DbDeadlockException::~DbDeadlockException() throw(/ +DbEnv ../libdb_java/db_java_wrap.c 1740 DbEnv::DbEnv ../cxx/cxx_env.cpp /^DbEnv::DbEnv(u_int32_t flags)$/ DbEnv::_app_dispatch_intercept ../cxx/cxx_env.cpp /^int DbEnv::_app_dispatch_intercept(DB_ENV *env, DB/ DbEnv::_feedback_intercept ../cxx/cxx_env.cpp /^void DbEnv::_feedback_intercept(DB_ENV *env, int o/ DbEnv::_paniccall_intercept ../cxx/cxx_env.cpp /^void DbEnv::_paniccall_intercept(DB_ENV *env, int / DbEnv::_rep_send_intercept ../cxx/cxx_env.cpp /^int DbEnv::_rep_send_intercept(DB_ENV *env, const / -DbEnv::_stream_error_function ../cxx/cxx_env.cpp /^void DbEnv::_stream_error_function(const char *pre/ +DbEnv::_stream_error_function ../cxx/cxx_env.cpp /^void DbEnv::_stream_error_function($/ +DbEnv::_stream_message_function ../cxx/cxx_env.cpp /^void DbEnv::_stream_message_function(const DB_ENV / DbEnv::cleanup ../cxx/cxx_env.cpp /^void DbEnv::cleanup()$/ DbEnv::close ../cxx/cxx_env.cpp /^int DbEnv::close(u_int32_t flags)$/ DbEnv::error_policy ../cxx/cxx_env.cpp /^int DbEnv::error_policy()$/ @@ -669,24 +731,114 @@ DbEnv::remove ../cxx/cxx_env.cpp /^int DbEnv::remove(const char *db_home, u_int3 DbEnv::runtime_error ../cxx/cxx_env.cpp /^void DbEnv::runtime_error(DbEnv *env,$/ DbEnv::runtime_error_dbt ../cxx/cxx_env.cpp /^void DbEnv::runtime_error_dbt(DbEnv *env,$/ DbEnv::runtime_error_lock_get ../cxx/cxx_env.cpp /^void DbEnv::runtime_error_lock_get(DbEnv *env,$/ -DbEnv::set_error_stream ../cxx/cxx_env.cpp /^void DbEnv::set_error_stream(__DB_OSTREAMCLASS *st/ +DbEnv::set_error_stream ../cxx/cxx_env.cpp /^void DbEnv::set_error_stream(__DB_STD(ostream) *st/ DbEnv::set_feedback ../cxx/cxx_env.cpp /^int DbEnv::set_feedback(void (*arg)(DbEnv *, int, / +DbEnv::set_message_stream ../cxx/cxx_env.cpp /^void DbEnv::set_message_stream(__DB_STD(ostream) */ +DbEnv::set_paniccall ../cxx/cxx_env.cpp /^int DbEnv::set_paniccall(void (*arg)(DbEnv *, int)/ DbEnv::strerror ../cxx/cxx_env.cpp /^char *DbEnv::strerror(int error)$/ DbEnv::wrap_DB_ENV ../cxx/cxx_env.cpp /^DbEnv *DbEnv::wrap_DB_ENV(DB_ENV *dbenv)$/ DbEnv::~DbEnv ../cxx/cxx_env.cpp /^DbEnv::~DbEnv()$/ +DbEnv_close ../libdb_java/db_java_wrap.c /^db_ret_t DbEnv_close(struct DbEnv *self,u_int32_t / +DbEnv_dbremove ../libdb_java/db_java_wrap.c /^db_ret_t DbEnv_dbremove(struct DbEnv *self,DB_TXN / +DbEnv_dbrename ../libdb_java/db_java_wrap.c /^db_ret_t DbEnv_dbrename(struct DbEnv *self,DB_TXN / +DbEnv_err ../libdb_java/db_java_wrap.c /^void DbEnv_err(struct DbEnv *self,int error,char c/ +DbEnv_errx ../libdb_java/db_java_wrap.c /^void DbEnv_errx(struct DbEnv *self,char const *mes/ +DbEnv_get_cachesize ../libdb_java/db_java_wrap.c /^jlong DbEnv_get_cachesize(struct DbEnv *self){$/ +DbEnv_get_cachesize_ncache ../libdb_java/db_java_wrap.c /^int DbEnv_get_cachesize_ncache(struct DbEnv *self)/ +DbEnv_get_data_dirs ../libdb_java/db_java_wrap.c /^char const **DbEnv_get_data_dirs(struct DbEnv *sel/ +DbEnv_get_encrypt_flags ../libdb_java/db_java_wrap.c /^u_int32_t DbEnv_get_encrypt_flags(struct DbEnv *se/ +DbEnv_get_errpfx ../libdb_java/db_java_wrap.c /^char const *DbEnv_get_errpfx(struct DbEnv *self){$/ +DbEnv_get_flags ../libdb_java/db_java_wrap.c /^u_int32_t DbEnv_get_flags(struct DbEnv *self){$/ +DbEnv_get_home ../libdb_java/db_java_wrap.c /^char const *DbEnv_get_home(struct DbEnv *self){$/ +DbEnv_get_lg_bsize ../libdb_java/db_java_wrap.c /^u_int32_t DbEnv_get_lg_bsize(struct DbEnv *self){$/ +DbEnv_get_lg_dir ../libdb_java/db_java_wrap.c /^char const *DbEnv_get_lg_dir(struct DbEnv *self){$/ +DbEnv_get_lg_max ../libdb_java/db_java_wrap.c /^u_int32_t DbEnv_get_lg_max(struct DbEnv *self){$/ +DbEnv_get_lg_regionmax ../libdb_java/db_java_wrap.c /^u_int32_t DbEnv_get_lg_regionmax(struct DbEnv *sel/ +DbEnv_get_lk_conflicts ../libdb_java/db_java_wrap.c /^struct __db_lk_conflicts DbEnv_get_lk_conflicts(st/ +DbEnv_get_lk_detect ../libdb_java/db_java_wrap.c /^u_int32_t DbEnv_get_lk_detect(struct DbEnv *self){/ +DbEnv_get_lk_max_lockers ../libdb_java/db_java_wrap.c /^u_int32_t DbEnv_get_lk_max_lockers(struct DbEnv *s/ +DbEnv_get_lk_max_locks ../libdb_java/db_java_wrap.c /^u_int32_t DbEnv_get_lk_max_locks(struct DbEnv *sel/ +DbEnv_get_lk_max_objects ../libdb_java/db_java_wrap.c /^u_int32_t DbEnv_get_lk_max_objects(struct DbEnv *s/ +DbEnv_get_mp_mmapsize ../libdb_java/db_java_wrap.c /^size_t DbEnv_get_mp_mmapsize(struct DbEnv *self){$/ +DbEnv_get_open_flags ../libdb_java/db_java_wrap.c /^u_int32_t DbEnv_get_open_flags(struct DbEnv *self)/ +DbEnv_get_rep_limit ../libdb_java/db_java_wrap.c /^jlong DbEnv_get_rep_limit(struct DbEnv *self){$/ +DbEnv_get_shm_key ../libdb_java/db_java_wrap.c /^long DbEnv_get_shm_key(struct DbEnv *self){$/ +DbEnv_get_tas_spins ../libdb_java/db_java_wrap.c /^u_int32_t DbEnv_get_tas_spins(struct DbEnv *self){/ +DbEnv_get_timeout ../libdb_java/db_java_wrap.c /^db_timeout_t DbEnv_get_timeout(struct DbEnv *self,/ +DbEnv_get_tmp_dir ../libdb_java/db_java_wrap.c /^char const *DbEnv_get_tmp_dir(struct DbEnv *self){/ +DbEnv_get_tx_max ../libdb_java/db_java_wrap.c /^u_int32_t DbEnv_get_tx_max(struct DbEnv *self){$/ +DbEnv_get_tx_timestamp ../libdb_java/db_java_wrap.c /^time_t DbEnv_get_tx_timestamp(struct DbEnv *self){/ +DbEnv_get_verbose ../libdb_java/db_java_wrap.c /^int_bool DbEnv_get_verbose(struct DbEnv *self,u_in/ DbEnv_get_version_major ../libdb_java/db_java_wrap.c /^int DbEnv_get_version_major(){$/ DbEnv_get_version_minor ../libdb_java/db_java_wrap.c /^int DbEnv_get_version_minor(){$/ DbEnv_get_version_patch ../libdb_java/db_java_wrap.c /^int DbEnv_get_version_patch(){$/ DbEnv_get_version_string ../libdb_java/db_java_wrap.c /^char const *DbEnv_get_version_string(){$/ +DbEnv_lock_detect ../libdb_java/db_java_wrap.c /^int DbEnv_lock_detect(struct DbEnv *self,u_int32_t/ +DbEnv_lock_get ../libdb_java/db_java_wrap.c /^DB_LOCK *DbEnv_lock_get(struct DbEnv *self,u_int32/ +DbEnv_lock_id ../libdb_java/db_java_wrap.c /^u_int32_t DbEnv_lock_id(struct DbEnv *self){$/ +DbEnv_lock_id_free ../libdb_java/db_java_wrap.c /^db_ret_t DbEnv_lock_id_free(struct DbEnv *self,u_i/ +DbEnv_lock_put ../libdb_java/db_java_wrap.c /^db_ret_t DbEnv_lock_put(struct DbEnv *self,DB_LOCK/ +DbEnv_lock_stat ../libdb_java/db_java_wrap.c /^DB_LOCK_STAT *DbEnv_lock_stat(struct DbEnv *self,u/ +DbEnv_log_archive ../libdb_java/db_java_wrap.c /^char **DbEnv_log_archive(struct DbEnv *self,u_int3/ DbEnv_log_compare ../libdb_java/db_java_wrap.c /^int DbEnv_log_compare(DB_LSN const *lsn0,DB_LSN co/ +DbEnv_log_cursor ../libdb_java/db_java_wrap.c /^DB_LOGC *DbEnv_log_cursor(struct DbEnv *self,u_int/ +DbEnv_log_file ../libdb_java/db_java_wrap.c /^char *DbEnv_log_file(struct DbEnv *self,DB_LSN *ls/ +DbEnv_log_flush ../libdb_java/db_java_wrap.c /^db_ret_t DbEnv_log_flush(struct DbEnv *self,DB_LSN/ +DbEnv_log_put ../libdb_java/db_java_wrap.c /^db_ret_t DbEnv_log_put(struct DbEnv *self,DB_LSN */ +DbEnv_log_stat ../libdb_java/db_java_wrap.c /^DB_LOG_STAT *DbEnv_log_stat(struct DbEnv *self,u_i/ +DbEnv_memp_fstat ../libdb_java/db_java_wrap.c /^DB_MPOOL_FSTAT **DbEnv_memp_fstat(struct DbEnv *se/ +DbEnv_memp_stat ../libdb_java/db_java_wrap.c /^DB_MPOOL_STAT *DbEnv_memp_stat(struct DbEnv *self,/ +DbEnv_memp_trickle ../libdb_java/db_java_wrap.c /^int DbEnv_memp_trickle(struct DbEnv *self,int perc/ +DbEnv_open ../libdb_java/db_java_wrap.c /^db_ret_t DbEnv_open(struct DbEnv *self,char const / +DbEnv_remove ../libdb_java/db_java_wrap.c /^db_ret_t DbEnv_remove(struct DbEnv *self,char cons/ +DbEnv_rep_elect ../libdb_java/db_java_wrap.c /^int DbEnv_rep_elect(struct DbEnv *self,int nsites,/ +DbEnv_rep_process_message ../libdb_java/db_java_wrap.c /^int DbEnv_rep_process_message(struct DbEnv *self,D/ +DbEnv_rep_start ../libdb_java/db_java_wrap.c /^db_ret_t DbEnv_rep_start(struct DbEnv *self,DBT *c/ +DbEnv_rep_stat ../libdb_java/db_java_wrap.c /^DB_REP_STAT *DbEnv_rep_stat(struct DbEnv *self,u_i/ +DbEnv_set_app_dispatch ../libdb_java/db_java_wrap.c /^db_ret_t DbEnv_set_app_dispatch(struct DbEnv *self/ +DbEnv_set_cachesize ../libdb_java/db_java_wrap.c /^db_ret_t DbEnv_set_cachesize(struct DbEnv *self,jl/ +DbEnv_set_data_dir ../libdb_java/db_java_wrap.c /^db_ret_t DbEnv_set_data_dir(struct DbEnv *self,cha/ +DbEnv_set_encrypt ../libdb_java/db_java_wrap.c /^db_ret_t DbEnv_set_encrypt(struct DbEnv *self,char/ +DbEnv_set_errcall ../libdb_java/db_java_wrap.c /^void DbEnv_set_errcall(struct DbEnv *self,void (*d/ +DbEnv_set_errpfx ../libdb_java/db_java_wrap.c /^void DbEnv_set_errpfx(struct DbEnv *self,char cons/ +DbEnv_set_feedback ../libdb_java/db_java_wrap.c /^db_ret_t DbEnv_set_feedback(struct DbEnv *self,voi/ +DbEnv_set_flags ../libdb_java/db_java_wrap.c /^db_ret_t DbEnv_set_flags(struct DbEnv *self,u_int3/ +DbEnv_set_lg_bsize ../libdb_java/db_java_wrap.c /^db_ret_t DbEnv_set_lg_bsize(struct DbEnv *self,u_i/ +DbEnv_set_lg_dir ../libdb_java/db_java_wrap.c /^db_ret_t DbEnv_set_lg_dir(struct DbEnv *self,char / +DbEnv_set_lg_max ../libdb_java/db_java_wrap.c /^db_ret_t DbEnv_set_lg_max(struct DbEnv *self,u_int/ +DbEnv_set_lg_regionmax ../libdb_java/db_java_wrap.c /^db_ret_t DbEnv_set_lg_regionmax(struct DbEnv *self/ +DbEnv_set_lk_conflicts ../libdb_java/db_java_wrap.c /^db_ret_t DbEnv_set_lk_conflicts(struct DbEnv *self/ +DbEnv_set_lk_detect ../libdb_java/db_java_wrap.c /^db_ret_t DbEnv_set_lk_detect(struct DbEnv *self,u_/ +DbEnv_set_lk_max_lockers ../libdb_java/db_java_wrap.c /^db_ret_t DbEnv_set_lk_max_lockers(struct DbEnv *se/ +DbEnv_set_lk_max_locks ../libdb_java/db_java_wrap.c /^db_ret_t DbEnv_set_lk_max_locks(struct DbEnv *self/ +DbEnv_set_lk_max_objects ../libdb_java/db_java_wrap.c /^db_ret_t DbEnv_set_lk_max_objects(struct DbEnv *se/ +DbEnv_set_mp_mmapsize ../libdb_java/db_java_wrap.c /^db_ret_t DbEnv_set_mp_mmapsize(struct DbEnv *self,/ +DbEnv_set_msgcall ../libdb_java/db_java_wrap.c /^void DbEnv_set_msgcall(struct DbEnv *self,void (*d/ +DbEnv_set_paniccall ../libdb_java/db_java_wrap.c /^db_ret_t DbEnv_set_paniccall(struct DbEnv *self,vo/ +DbEnv_set_rep_limit ../libdb_java/db_java_wrap.c /^db_ret_t DbEnv_set_rep_limit(struct DbEnv *self,jl/ +DbEnv_set_rep_transport ../libdb_java/db_java_wrap.c /^db_ret_t DbEnv_set_rep_transport(struct DbEnv *sel/ +DbEnv_set_rpc_server ../libdb_java/db_java_wrap.c /^db_ret_t DbEnv_set_rpc_server(struct DbEnv *self,v/ +DbEnv_set_shm_key ../libdb_java/db_java_wrap.c /^db_ret_t DbEnv_set_shm_key(struct DbEnv *self,long/ +DbEnv_set_tas_spins ../libdb_java/db_java_wrap.c /^db_ret_t DbEnv_set_tas_spins(struct DbEnv *self,u_/ +DbEnv_set_timeout ../libdb_java/db_java_wrap.c /^db_ret_t DbEnv_set_timeout(struct DbEnv *self,db_t/ +DbEnv_set_tmp_dir ../libdb_java/db_java_wrap.c /^db_ret_t DbEnv_set_tmp_dir(struct DbEnv *self,char/ +DbEnv_set_tx_max ../libdb_java/db_java_wrap.c /^db_ret_t DbEnv_set_tx_max(struct DbEnv *self,u_int/ +DbEnv_set_tx_timestamp ../libdb_java/db_java_wrap.c /^db_ret_t DbEnv_set_tx_timestamp(struct DbEnv *self/ +DbEnv_set_verbose ../libdb_java/db_java_wrap.c /^db_ret_t DbEnv_set_verbose(struct DbEnv *self,u_in/ DbEnv_strerror ../libdb_java/db_java_wrap.c /^char const *DbEnv_strerror(int error){$/ +DbEnv_txn_begin ../libdb_java/db_java_wrap.c /^DB_TXN *DbEnv_txn_begin(struct DbEnv *self,DB_TXN / +DbEnv_txn_checkpoint ../libdb_java/db_java_wrap.c /^db_ret_t DbEnv_txn_checkpoint(struct DbEnv *self,u/ +DbEnv_txn_recover ../libdb_java/db_java_wrap.c /^DB_PREPLIST *DbEnv_txn_recover(struct DbEnv *self,/ +DbEnv_txn_stat ../libdb_java/db_java_wrap.c /^DB_TXN_STAT *DbEnv_txn_stat(struct DbEnv *self,u_i/ DbException::DbException ../cxx/cxx_except.cpp /^DbException::DbException(int err)$/ +DbException::describe ../cxx/cxx_except.cpp /^void DbException::describe(const char *prefix, con/ DbException::get_env ../cxx/cxx_except.cpp /^DbEnv *DbException::get_env() const$/ DbException::get_errno ../cxx/cxx_except.cpp /^int DbException::get_errno() const$/ DbException::operator = ../cxx/cxx_except.cpp /^DbException &DbException::operator = (const DbExce/ DbException::set_env ../cxx/cxx_except.cpp /^void DbException::set_env(DbEnv *env)$/ -DbException::what ../cxx/cxx_except.cpp /^const char *DbException::what() const$/ -DbException::~DbException ../cxx/cxx_except.cpp /^DbException::~DbException()$/ +DbException::what ../cxx/cxx_except.cpp /^const char *DbException::what() const throw()$/ +DbException::~DbException ../cxx/cxx_except.cpp /^DbException::~DbException() throw()$/ +DbLock ../libdb_java/db_java_wrap.c 1741 DbLock::DbLock ../cxx/cxx_lock.cpp /^DbLock::DbLock(DB_LOCK value)$/ DbLock::operator = ../cxx/cxx_lock.cpp /^DbLock &DbLock::operator = (const DbLock &that)$/ DbLockNotGrantedException::DbLockNotGrantedException ../cxx/cxx_except.cpp /^DbLockNotGrantedException::DbLockNotGrantedExcepti/ @@ -697,47 +849,158 @@ DbLockNotGrantedException::get_obj ../cxx/cxx_except.cpp /^const Dbt* DbLockNotG DbLockNotGrantedException::get_op ../cxx/cxx_except.cpp /^db_lockop_t DbLockNotGrantedException::get_op() co/ DbLockNotGrantedException::operator = ../cxx/cxx_except.cpp /^&DbLockNotGrantedException::operator =(const DbLoc/ DbLockNotGrantedException::~DbLockNotGrantedException ../cxx/cxx_except.cpp /^DbLockNotGrantedException::~DbLockNotGrantedExcept/ +DbLogc ../libdb_java/db_java_wrap.c 1742 DbLogc::close ../cxx/cxx_logc.cpp /^int DbLogc::close(u_int32_t _flags)$/ DbLogc::get ../cxx/cxx_logc.cpp /^int DbLogc::get(DbLsn *lsn, Dbt *data, u_int32_t _/ DbLogc::~DbLogc ../cxx/cxx_logc.cpp /^DbLogc::~DbLogc()$/ +DbLogc_close ../libdb_java/db_java_wrap.c /^db_ret_t DbLogc_close(struct DbLogc *self,u_int32_/ +DbLogc_get ../libdb_java/db_java_wrap.c /^int DbLogc_get(struct DbLogc *self,DB_LSN *lsn,DBT/ +DbLsn ../libdb_java/db_java_wrap.c 1743 DbMemoryException::DbMemoryException ../cxx/cxx_except.cpp /^DbMemoryException::DbMemoryException(Dbt *dbt)$/ DbMemoryException::get_dbt ../cxx/cxx_except.cpp /^Dbt *DbMemoryException::get_dbt() const$/ DbMemoryException::operator = ../cxx/cxx_except.cpp /^&DbMemoryException::operator =(const DbMemoryExcep/ -DbMemoryException::~DbMemoryException ../cxx/cxx_except.cpp /^DbMemoryException::~DbMemoryException()$/ +DbMemoryException::~DbMemoryException ../cxx/cxx_except.cpp /^DbMemoryException::~DbMemoryException() throw()$/ +DbMpoolFile ../libdb_java/db_java_wrap.c 1744 DbMpoolFile::DbMpoolFile ../cxx/cxx_mpool.cpp /^DbMpoolFile::DbMpoolFile()$/ DbMpoolFile::close ../cxx/cxx_mpool.cpp /^int DbMpoolFile::close(u_int32_t flags)$/ DbMpoolFile::~DbMpoolFile ../cxx/cxx_mpool.cpp /^DbMpoolFile::~DbMpoolFile()$/ +DbMpoolFile_get_flags ../libdb_java/db_java_wrap.c /^u_int32_t DbMpoolFile_get_flags(struct DbMpoolFile/ +DbMpoolFile_get_maxsize ../libdb_java/db_java_wrap.c /^jlong DbMpoolFile_get_maxsize(struct DbMpoolFile */ +DbMpoolFile_get_priority ../libdb_java/db_java_wrap.c /^DB_CACHE_PRIORITY DbMpoolFile_get_priority(struct / +DbMpoolFile_set_flags ../libdb_java/db_java_wrap.c /^db_ret_t DbMpoolFile_set_flags(struct DbMpoolFile / +DbMpoolFile_set_maxsize ../libdb_java/db_java_wrap.c /^db_ret_t DbMpoolFile_set_maxsize(struct DbMpoolFil/ +DbMpoolFile_set_priority ../libdb_java/db_java_wrap.c /^db_ret_t DbMpoolFile_set_priority(struct DbMpoolFi/ DbMultipleDataIterator::next ../cxx/cxx_multi.cpp /^bool DbMultipleDataIterator::next(Dbt &data)$/ DbMultipleIterator::DbMultipleIterator ../cxx/cxx_multi.cpp /^DbMultipleIterator::DbMultipleIterator(const Dbt &/ DbMultipleKeyDataIterator::next ../cxx/cxx_multi.cpp /^bool DbMultipleKeyDataIterator::next(Dbt &key, Dbt/ DbMultipleRecnoDataIterator::next ../cxx/cxx_multi.cpp /^bool DbMultipleRecnoDataIterator::next(db_recno_t / DbRunRecoveryException::DbRunRecoveryException ../cxx/cxx_except.cpp /^DbRunRecoveryException::DbRunRecoveryException(con/ DbRunRecoveryException::operator = ../cxx/cxx_except.cpp /^&DbRunRecoveryException::operator =(const DbRunRec/ -DbRunRecoveryException::~DbRunRecoveryException ../cxx/cxx_except.cpp /^DbRunRecoveryException::~DbRunRecoveryException()$/ +DbRunRecoveryException::~DbRunRecoveryException ../cxx/cxx_except.cpp /^DbRunRecoveryException::~DbRunRecoveryException() / +DbSequence ../libdb_java/db_java_wrap.c 1745 +DbSequence::DbSequence ../cxx/cxx_seq.cpp /^DbSequence::DbSequence(Db *db, u_int32_t flags)$/ +DbSequence::get_key ../cxx/cxx_seq.cpp /^Dbt *DbSequence::get_key()$/ +DbSequence::wrap_DB_SEQUENCE ../cxx/cxx_seq.cpp /^DbSequence *DbSequence::wrap_DB_SEQUENCE(DB_SEQUEN/ +DbSequence::~DbSequence ../cxx/cxx_seq.cpp /^DbSequence::~DbSequence()$/ +DbSequence_close ../libdb_java/db_java_wrap.c /^db_ret_t DbSequence_close(struct DbSequence *self,/ +DbSequence_get ../libdb_java/db_java_wrap.c /^db_seq_t DbSequence_get(struct DbSequence *self,DB/ +DbSequence_get_cachesize ../libdb_java/db_java_wrap.c /^int32_t DbSequence_get_cachesize(struct DbSequence/ +DbSequence_get_db ../libdb_java/db_java_wrap.c /^DB *DbSequence_get_db(struct DbSequence *self){$/ +DbSequence_get_flags ../libdb_java/db_java_wrap.c /^u_int32_t DbSequence_get_flags(struct DbSequence */ +DbSequence_get_key ../libdb_java/db_java_wrap.c /^db_ret_t DbSequence_get_key(struct DbSequence *sel/ +DbSequence_get_range_max ../libdb_java/db_java_wrap.c /^db_seq_t DbSequence_get_range_max(struct DbSequenc/ +DbSequence_get_range_min ../libdb_java/db_java_wrap.c /^db_seq_t DbSequence_get_range_min(struct DbSequenc/ +DbSequence_initial_value ../libdb_java/db_java_wrap.c /^db_ret_t DbSequence_initial_value(struct DbSequenc/ +DbSequence_open ../libdb_java/db_java_wrap.c /^db_ret_t DbSequence_open(struct DbSequence *self,D/ +DbSequence_remove ../libdb_java/db_java_wrap.c /^db_ret_t DbSequence_remove(struct DbSequence *self/ +DbSequence_set_cachesize ../libdb_java/db_java_wrap.c /^db_ret_t DbSequence_set_cachesize(struct DbSequenc/ +DbSequence_set_flags ../libdb_java/db_java_wrap.c /^db_ret_t DbSequence_set_flags(struct DbSequence *s/ +DbSequence_set_range ../libdb_java/db_java_wrap.c /^db_ret_t DbSequence_set_range(struct DbSequence *s/ +DbSequence_stat ../libdb_java/db_java_wrap.c /^DB_SEQUENCE_STAT *DbSequence_stat(struct DbSequenc/ +DbTxn ../libdb_java/db_java_wrap.c 1746 DbTxn::DbTxn ../cxx/cxx_txn.cpp /^DbTxn::DbTxn()$/ DbTxn::~DbTxn ../cxx/cxx_txn.cpp /^DbTxn::~DbTxn()$/ +DbTxn_abort ../libdb_java/db_java_wrap.c /^db_ret_t DbTxn_abort(struct DbTxn *self){$/ +DbTxn_commit ../libdb_java/db_java_wrap.c /^db_ret_t DbTxn_commit(struct DbTxn *self,u_int32_t/ +DbTxn_discard ../libdb_java/db_java_wrap.c /^db_ret_t DbTxn_discard(struct DbTxn *self,u_int32_/ +DbTxn_id ../libdb_java/db_java_wrap.c /^u_int32_t DbTxn_id(struct DbTxn *self){$/ +DbTxn_prepare ../libdb_java/db_java_wrap.c /^db_ret_t DbTxn_prepare(struct DbTxn *self,u_int8_t/ +DbTxn_set_timeout ../libdb_java/db_java_wrap.c /^db_ret_t DbTxn_set_timeout(struct DbTxn *self,db_t/ +Db_associate ../libdb_java/db_java_wrap.c /^db_ret_t Db_associate(struct Db *self,DB_TXN *txni/ +Db_close ../libdb_java/db_java_wrap.c /^int Db_close(struct Db *self,u_int32_t flags){$/ +Db_cursor ../libdb_java/db_java_wrap.c /^DBC *Db_cursor(struct Db *self,DB_TXN *txnid,u_int/ +Db_del ../libdb_java/db_java_wrap.c /^int Db_del(struct Db *self,DB_TXN *txnid,DBT *key,/ +Db_err ../libdb_java/db_java_wrap.c /^void Db_err(struct Db *self,int error,char const */ +Db_errx ../libdb_java/db_java_wrap.c /^void Db_errx(struct Db *self,char const *message){/ +Db_get ../libdb_java/db_java_wrap.c /^int Db_get(struct Db *self,DB_TXN *txnid,DBT *key,/ +Db_get_bt_minkey ../libdb_java/db_java_wrap.c /^u_int32_t Db_get_bt_minkey(struct Db *self){$/ +Db_get_byteswapped ../libdb_java/db_java_wrap.c /^int_bool Db_get_byteswapped(struct Db *self){$/ +Db_get_cachesize ../libdb_java/db_java_wrap.c /^jlong Db_get_cachesize(struct Db *self){$/ +Db_get_cachesize_ncache ../libdb_java/db_java_wrap.c /^u_int32_t Db_get_cachesize_ncache(struct Db *self)/ +Db_get_dbname ../libdb_java/db_java_wrap.c /^char const *Db_get_dbname(struct Db *self){$/ +Db_get_encrypt_flags ../libdb_java/db_java_wrap.c /^u_int32_t Db_get_encrypt_flags(struct Db *self){$/ +Db_get_errpfx ../libdb_java/db_java_wrap.c /^char const *Db_get_errpfx(struct Db *self){$/ +Db_get_filename ../libdb_java/db_java_wrap.c /^char const *Db_get_filename(struct Db *self){$/ +Db_get_flags ../libdb_java/db_java_wrap.c /^u_int32_t Db_get_flags(struct Db *self){$/ +Db_get_h_ffactor ../libdb_java/db_java_wrap.c /^u_int32_t Db_get_h_ffactor(struct Db *self){$/ +Db_get_h_nelem ../libdb_java/db_java_wrap.c /^u_int32_t Db_get_h_nelem(struct Db *self){$/ +Db_get_lorder ../libdb_java/db_java_wrap.c /^int Db_get_lorder(struct Db *self){$/ +Db_get_mpf ../libdb_java/db_java_wrap.c /^DB_MPOOLFILE *Db_get_mpf(struct Db *self){$/ +Db_get_open_flags ../libdb_java/db_java_wrap.c /^u_int32_t Db_get_open_flags(struct Db *self){$/ +Db_get_pagesize ../libdb_java/db_java_wrap.c /^u_int32_t Db_get_pagesize(struct Db *self){$/ +Db_get_q_extentsize ../libdb_java/db_java_wrap.c /^u_int32_t Db_get_q_extentsize(struct Db *self){$/ +Db_get_re_delim ../libdb_java/db_java_wrap.c /^int Db_get_re_delim(struct Db *self){$/ +Db_get_re_len ../libdb_java/db_java_wrap.c /^u_int32_t Db_get_re_len(struct Db *self){$/ +Db_get_re_pad ../libdb_java/db_java_wrap.c /^int Db_get_re_pad(struct Db *self){$/ +Db_get_re_source ../libdb_java/db_java_wrap.c /^char const *Db_get_re_source(struct Db *self){$/ +Db_get_transactional ../libdb_java/db_java_wrap.c /^int_bool Db_get_transactional(struct Db *self){$/ +Db_get_type ../libdb_java/db_java_wrap.c /^DBTYPE Db_get_type(struct Db *self){$/ +Db_join ../libdb_java/db_java_wrap.c /^DBC *Db_join(struct Db *self,DBC **curslist,u_int3/ +Db_key_range ../libdb_java/db_java_wrap.c /^db_ret_t Db_key_range(struct Db *self,DB_TXN *txni/ +Db_open ../libdb_java/db_java_wrap.c /^db_ret_t Db_open(struct Db *self,DB_TXN *txnid,cha/ +Db_pget ../libdb_java/db_java_wrap.c /^int Db_pget(struct Db *self,DB_TXN *txnid,DBT *key/ +Db_put ../libdb_java/db_java_wrap.c /^int Db_put(struct Db *self,DB_TXN *txnid,DBT *key,/ +Db_remove ../libdb_java/db_java_wrap.c /^db_ret_t Db_remove(struct Db *self,char const *fil/ +Db_rename ../libdb_java/db_java_wrap.c /^db_ret_t Db_rename(struct Db *self,char const *fil/ +Db_set_append_recno ../libdb_java/db_java_wrap.c /^db_ret_t Db_set_append_recno(struct Db *self,int (/ +Db_set_bt_compare ../libdb_java/db_java_wrap.c /^db_ret_t Db_set_bt_compare(struct Db *self,int (*b/ +Db_set_bt_maxkey ../libdb_java/db_java_wrap.c /^db_ret_t Db_set_bt_maxkey(struct Db *self,u_int32_/ +Db_set_bt_minkey ../libdb_java/db_java_wrap.c /^db_ret_t Db_set_bt_minkey(struct Db *self,u_int32_/ +Db_set_bt_prefix ../libdb_java/db_java_wrap.c /^db_ret_t Db_set_bt_prefix(struct Db *self,size_t (/ +Db_set_cachesize ../libdb_java/db_java_wrap.c /^db_ret_t Db_set_cachesize(struct Db *self,jlong by/ +Db_set_dup_compare ../libdb_java/db_java_wrap.c /^db_ret_t Db_set_dup_compare(struct Db *self,int (*/ +Db_set_encrypt ../libdb_java/db_java_wrap.c /^db_ret_t Db_set_encrypt(struct Db *self,char const/ +Db_set_errpfx ../libdb_java/db_java_wrap.c /^void Db_set_errpfx(struct Db *self,char const *err/ +Db_set_feedback ../libdb_java/db_java_wrap.c /^db_ret_t Db_set_feedback(struct Db *self,void (*db/ +Db_set_flags ../libdb_java/db_java_wrap.c /^db_ret_t Db_set_flags(struct Db *self,u_int32_t fl/ +Db_set_h_ffactor ../libdb_java/db_java_wrap.c /^db_ret_t Db_set_h_ffactor(struct Db *self,u_int32_/ +Db_set_h_hash ../libdb_java/db_java_wrap.c /^db_ret_t Db_set_h_hash(struct Db *self,u_int32_t (/ +Db_set_h_nelem ../libdb_java/db_java_wrap.c /^db_ret_t Db_set_h_nelem(struct Db *self,u_int32_t / +Db_set_lorder ../libdb_java/db_java_wrap.c /^db_ret_t Db_set_lorder(struct Db *self,int lorder)/ +Db_set_pagesize ../libdb_java/db_java_wrap.c /^db_ret_t Db_set_pagesize(struct Db *self,u_int32_t/ +Db_set_q_extentsize ../libdb_java/db_java_wrap.c /^db_ret_t Db_set_q_extentsize(struct Db *self,u_int/ +Db_set_re_delim ../libdb_java/db_java_wrap.c /^db_ret_t Db_set_re_delim(struct Db *self,int re_de/ +Db_set_re_len ../libdb_java/db_java_wrap.c /^db_ret_t Db_set_re_len(struct Db *self,u_int32_t r/ +Db_set_re_pad ../libdb_java/db_java_wrap.c /^db_ret_t Db_set_re_pad(struct Db *self,int re_pad)/ +Db_set_re_source ../libdb_java/db_java_wrap.c /^db_ret_t Db_set_re_source(struct Db *self,char *so/ +Db_stat ../libdb_java/db_java_wrap.c /^void *Db_stat(struct Db *self,DB_TXN *txnid,u_int3/ +Db_sync ../libdb_java/db_java_wrap.c /^db_ret_t Db_sync(struct Db *self,u_int32_t flags){/ Db_tcl_Init ../tcl/tcl_db_pkg.c /^Db_tcl_Init(interp)$/ +Db_truncate ../libdb_java/db_java_wrap.c /^int Db_truncate(struct Db *self,DB_TXN *txnid,u_in/ +Db_upgrade ../libdb_java/db_java_wrap.c /^db_ret_t Db_upgrade(struct Db *self,char const *fi/ +Db_verify ../libdb_java/db_java_wrap.c /^int_bool Db_verify(struct Db *self,char const *fil/ +Dbc ../libdb_java/db_java_wrap.c 1738 Dbc::get ../cxx/cxx_dbc.cpp /^int Dbc::get(Dbt* key, Dbt *data, u_int32_t _flags/ Dbc::pget ../cxx/cxx_dbc.cpp /^int Dbc::pget(Dbt* key, Dbt *pkey, Dbt *data, u_in/ Dbc::~Dbc ../cxx/cxx_dbc.cpp /^Dbc::~Dbc()$/ +Dbc_close ../libdb_java/db_java_wrap.c /^db_ret_t Dbc_close(struct Dbc *self){$/ +Dbc_count ../libdb_java/db_java_wrap.c /^db_recno_t Dbc_count(struct Dbc *self,u_int32_t fl/ +Dbc_del ../libdb_java/db_java_wrap.c /^int Dbc_del(struct Dbc *self,u_int32_t flags){$/ +Dbc_dup ../libdb_java/db_java_wrap.c /^DBC *Dbc_dup(struct Dbc *self,u_int32_t flags){$/ +Dbc_get ../libdb_java/db_java_wrap.c /^int Dbc_get(struct Dbc *self,DBT *key,DBT *data,u_/ +Dbc_pget ../libdb_java/db_java_wrap.c /^int Dbc_pget(struct Dbc *self,DBT *key,DBT *pkey,D/ +Dbc_put ../libdb_java/db_java_wrap.c /^int Dbc_put(struct Dbc *self,DBT *key,DBT *data,u_/ +Dbt ../libdb_java/db_java_wrap.c 1739 Dbt::Dbt ../cxx/cxx_dbt.cpp /^Dbt::Dbt()$/ Dbt::operator = ../cxx/cxx_dbt.cpp /^Dbt &Dbt::operator = (const Dbt &that)$/ Dbt::~Dbt ../cxx/cxx_dbt.cpp /^Dbt::~Dbt()$/ -EMSG ../clib/getopt.c 63 +EMSG ../clib/getopt.c 61 ENV_ILLEGAL_AFTER_OPEN ../dbinc/db_int.in /^#define ENV_ILLEGAL_AFTER_OPEN(dbenv, name) \\$/ ENV_ILLEGAL_BEFORE_OPEN ../dbinc/db_int.in /^#define ENV_ILLEGAL_BEFORE_OPEN(dbenv, name) \\$/ +ENV_NOT_CONFIGURED ../dbinc/db_int.in /^#define ENV_NOT_CONFIGURED(dbenv, handle, i, flags/ ENV_REQUIRES_CONFIG ../dbinc/db_int.in /^#define ENV_REQUIRES_CONFIG(dbenv, handle, i, flag/ EPG ../dbinc/btree.h 50 EPRINT ../dbinc/db_verify.h /^#define EPRINT(x) do { \\$/ FALSE ../crypto/rijndael/rijndael-api-fst.h 55 FAST_HASH ../lock/lock_util.c /^#define FAST_HASH(P) { \\$/ -FLAG_CHECK ../dbinc/tcl_db.h /^#define FLAG_CHECK(flag) \\$/ -FLAG_CHECK2 ../dbinc/tcl_db.h /^#define FLAG_CHECK2(flag,val) \\$/ +FLAG_CHECK ../dbinc/tcl_db.h /^#define FLAG_CHECK(flag) do { \\$/ +FLAG_CHECK2 ../dbinc/tcl_db.h /^#define FLAG_CHECK2(flag, val) do { \\$/ FLD_CLR ../dbinc/db_int.in /^#define FLD_CLR(fld, f) (fld) &= ~(f)$/ FLD_ISSET ../dbinc/db_int.in /^#define FLD_ISSET(fld, f) ((fld) & (f))$/ FLD_SET ../dbinc/db_int.in /^#define FLD_SET(fld, f) (fld) |= (f)$/ -FMAP_ENTRIES ../mp/mp_stat.c 260 -FNAME ../dbinc/db.in 125 +FMAP_ENTRIES ../mp/mp_stat.c 304 +FNAME ../dbinc/db.in 158 +FREE_IF_CHANGED ../rpc_client/gen_client_ret.c /^#define FREE_IF_CHANGED(dbtp, orig) do { \\$/ FREE_IF_NEEDED ../dbinc/db_int.in /^#define FREE_IF_NEEDED(sdbp, dbt) \\$/ F_CLR ../dbinc/db_int.in /^#define F_CLR(p, f) (p)->flags &= ~(f)$/ F_ISSET ../dbinc/db_int.in /^#define F_ISSET(p, f) ((p)->flags & (f))$/ @@ -746,21 +1009,21 @@ GETU32 ../crypto/rijndael/rijndael-alg-fst.c /^#define GETU32(p) SWAP(*((u32 *)( GET_BINTERNAL ../dbinc/db_page.h /^#define GET_BINTERNAL(dbp, pg, indx) \\$/ GET_BKEYDATA ../dbinc/db_page.h /^#define GET_BKEYDATA(dbp, pg, indx) \\$/ GET_BOVERFLOW ../dbinc/db_page.h /^#define GET_BOVERFLOW(dbp, pg, indx) \\$/ -GET_COUNT ../lock/lock.c /^#define GET_COUNT(dp, count) do { \\$/ -GET_ENVLOCK ../fileops/fop_util.c /^#define GET_ENVLOCK(ENV, ID, L) do { \\$/ +GET_COUNT ../lock/lock_list.c /^#define GET_COUNT(dp, count) do { \\$/ +GET_ENVLOCK ../fileops/fop_util.c /^#define GET_ENVLOCK(ENV, ID, L) (0)$/ GET_HANDLE ../mutex/mut_win32.c /^#define GET_HANDLE(mutexp, event) do { \\$/ GET_PAGE ../db/db_upg_opd.c /^#define GET_PAGE(dbp, fhp, pgno, page) { \\$/ -GET_PCOUNT ../lock/lock.c /^#define GET_PCOUNT(dp, count) do { \\$/ -GET_PGNO ../lock/lock.c /^#define GET_PGNO(dp, pgno) do { \\$/ +GET_PCOUNT ../lock/lock_list.c /^#define GET_PCOUNT(dp, count) do { \\$/ +GET_PGNO ../lock/lock_list.c /^#define GET_PGNO(dp, pgno) do { \\$/ GET_RINTERNAL ../dbinc/db_page.h /^#define GET_RINTERNAL(dbp, pg, indx) \\$/ -GET_SIZE ../lock/lock.c /^#define GET_SIZE(dp, size) do { \\$/ -GIGABYTE ../dbinc/db_int.in 42 +GET_SIZE ../lock/lock_list.c /^#define GET_SIZE(dp, size) do { \\$/ +GIGABYTE ../dbinc/db_int.in 73 GLOB_CHAR ../tcl/tcl_internal.c /^#define GLOB_CHAR(c) ((c) == '*' || (c) == '?')$/ GUARD_BYTE ../dbinc/debug.h 29 -HASH4 ../hash/hash_func.c 168 -HASH4a ../hash/hash_func.c 166 -HASH4b ../hash/hash_func.c 167 -HASHC ../hash/hash_func.c 115 +HASH4 ../hash/hash_func.c 166 +HASH4a ../hash/hash_func.c 164 +HASH4b ../hash/hash_func.c 165 +HASHC ../hash/hash_func.c 113 HASHINSERT ../dbinc/db_shash.h /^#define HASHINSERT(begin, ndx, type, field, elt) d/ HASHLOOKUP ../dbinc/db_shash.h /^#define HASHLOOKUP(begin, ndx, type, field, elt, r/ HASHMAGIC ../dbinc/db_185.in 138 @@ -769,13 +1032,13 @@ HASHVERSION ../dbinc/db_185.in 139 HASH_UNUSED1 ../dbinc/hash.h 130 HASH_UNUSED2 ../dbinc/hash.h 131 HDR ../dbinc/log.h 59 -HDR_CRYPTO_SZ ../dbinc/log.h 132 -HDR_NORMAL_SZ ../dbinc/log.h 131 +HDR_CRYPTO_SZ ../dbinc/log.h 134 +HDR_NORMAL_SZ ../dbinc/log.h 133 HKEYDATA_DATA ../dbinc/db_page.h /^#define HKEYDATA_DATA(p) (((u_int8_t *)p) + SSZA(H/ HKEYDATA_PSIZE ../dbinc/db_page.h /^#define HKEYDATA_PSIZE(len) \\$/ HKEYDATA_SIZE ../dbinc/db_page.h /^#define HKEYDATA_SIZE(len) \\$/ -HMAC_BLOCK_SIZE ../hmac/hmac.c 28 -HMAC_OUTPUT_SIZE ../hmac/hmac.c 27 +HMAC_BLOCK_SIZE ../hmac/hmac.c 26 +HMAC_OUTPUT_SIZE ../hmac/hmac.c 25 HOFFDUP_PGNO ../dbinc/db_page.h /^#define HOFFDUP_PGNO(p) (((u_int8_t *)p) + SSZ(HO/ HOFFDUP_SIZE ../dbinc/db_page.h 512 HOFFPAGE_PGNO ../dbinc/db_page.h /^#define HOFFPAGE_PGNO(p) (((u_int8_t *)p) + SSZ(HO/ @@ -785,6 +1048,7 @@ HOFFPAGE_TLEN ../dbinc/db_page.h /^#define HOFFPAGE_TLEN(p) (((u_int8_t *)p) + S HOFFSET ../dbinc/db_page.h /^#define HOFFSET(p) (((PAGE *)p)->hf_offset)$/ HPAGE_PTYPE ../dbinc/db_page.h /^#define HPAGE_PTYPE(p) (*(u_int8_t *)p)$/ HPAGE_TYPE ../dbinc/db_page.h /^#define HPAGE_TYPE(dbp, pg, indx) (*P_ENTRY(dbp, p/ +HPUX_MUTEX_PAD ../dbinc/mutex.h 131 H_CONTINUE ../dbinc/hash.h 79 H_DATAINDEX ../dbinc/db_page.h /^#define H_DATAINDEX(indx) ((indx) + 1)$/ H_DELETED ../dbinc/hash.h 80 @@ -804,11 +1068,14 @@ H_OK ../dbinc/hash.h 87 H_PAIRDATA ../dbinc/db_page.h /^#define H_PAIRDATA(dbp, pg, indx) P_ENTRY(dbp, pg,/ H_PAIRKEY ../dbinc/db_page.h /^#define H_PAIRKEY(dbp, pg, indx) P_ENTRY(dbp, pg, / H_PAIRSIZE ../dbinc/db_page.h /^#define H_PAIRSIZE(dbp, pg, psize, indx) \\$/ -ILLEGAL_SIZE ../env/db_salloc.c 171 -INITIAL_DEAD_ALLOC ../lock/lock_deadlock.c 659 +ILLEGAL_SIZE ../env/db_salloc.c 37 +INITIAL_DEAD_ALLOC ../lock/lock_deadlock.c 699 INIT_LSN ../dbinc/db_int.in /^#define INIT_LSN(LSN) do { \\$/ INP_OFFSET ../db/db_vrfy.c /^#define INP_OFFSET(dbp, h, i) \\$/ -INVALID_LSNMSG ../tcl/tcl_internal.c 506 +INT64_FMT ../dbinc/db_int.in 55 +INT64_MAX ../dbinc/db_int.in 51 +INT64_MIN ../dbinc/db_int.in 52 +INVALID_LSNMSG ../tcl/tcl_internal.c 518 INVALID_ORDER ../dbinc/btree.h 59 INVALID_REGION_ID ../dbinc/region.h 107 INVALID_REGION_SEGID ../dbinc/region.h 119 @@ -819,14 +1086,15 @@ ISBIG ../dbinc/hash.h /^#define ISBIG(I, N) (((N) > ((I)->hdr->dbmeta.page/ ISDOT ../clib/getcwd.c /^#define ISDOT(dp) \\$/ ISINTERNAL ../dbinc/btree.h /^#define ISINTERNAL(p) (TYPE(p) == P_IBTREE || TYPE/ ISLEAF ../dbinc/btree.h /^#define ISLEAF(p) (TYPE(p) == P_LBTREE || \\$/ -ISSET_MAP ../lock/lock_deadlock.c /^#define ISSET_MAP(M, N) ((M)[(N) \/ 32] & (1 << (N)/ +ISSET_MAP ../lock/lock_deadlock.c /^#define ISSET_MAP(M, N) ((M)[(N) \/ 32] & (1 << ((N/ IS_AUTO_COMMIT ../dbinc/db_am.h /^#define IS_AUTO_COMMIT(dbenv, txn, flags) \\$/ IS_BTREE_PAGE ../btree/bt_rec.c /^#define IS_BTREE_PAGE(pagep) \\$/ +IS_CLIENT_PGRECOVER ../dbinc/rep.h /^#define IS_CLIENT_PGRECOVER(dbenv) \\$/ IS_CUR_DELETED ../btree/bt_cursor.c /^#define IS_CUR_DELETED(dbc) \\$/ IS_CUR_DUPLICATE ../btree/bt_cursor.c /^#define IS_CUR_DUPLICATE(dbc, orig_pgno, orig_indx/ IS_DELETED ../btree/bt_cursor.c /^#define IS_DELETED(dbp, page, indx) \\$/ IS_DUPLICATE ../btree/bt_cursor.c /^#define IS_DUPLICATE(dbc, i1, i2) \\$/ -IS_ENV_REPLICATED ../dbinc/rep.h /^#define IS_ENV_REPLICATED(E) (!IS_RECOVERING(E) &&/ +IS_ENV_REPLICATED ../dbinc/rep.h /^#define IS_ENV_REPLICATED(E) (REP_ON(E) && \\$/ IS_HELP ../dbinc/tcl_db.h /^#define IS_HELP(s) \\$/ IS_INITIALIZED ../dbinc/db_int.in /^#define IS_INITIALIZED(dbc) ((dbc)->internal->pgno/ IS_INIT_LSN ../dbinc/db_int.in /^#define IS_INIT_LSN(LSN) ((LSN).file == 1 && (LSN)/ @@ -836,216 +1104,227 @@ IS_READONLY ../db/db_iface.c /^#define IS_READONLY(dbp) \\$/ IS_RECOVERING ../dbinc/db_int.in /^#define IS_RECOVERING(dbenv) \\$/ IS_REPLICATED ../dbinc/rep.h /^#define IS_REPLICATED(E, D) \\$/ IS_REP_CLIENT ../dbinc/rep.h /^#define IS_REP_CLIENT(dbenv) \\$/ -IS_REP_LOGSONLY ../dbinc/rep.h /^#define IS_REP_LOGSONLY(dbenv) \\$/ IS_REP_MASTER ../dbinc/rep.h /^#define IS_REP_MASTER(dbenv) \\$/ -IS_SIMPLE ../rep/rep_record.c /^#define IS_SIMPLE(R) ((R) != DB___txn_regop && (R)/ IS_SUBTRANSACTION ../dbinc/db_int.in /^#define IS_SUBTRANSACTION(txn) \\$/ IS_VALID_PAGESIZE ../dbinc/db_int.in /^#define IS_VALID_PAGESIZE(x) \\$/ IS_VALID_PGNO ../dbinc/db_verify.h /^#define IS_VALID_PGNO(x) ((x) <= vdp->last_pgno)$/ IS_WRITELOCK ../dbinc/lock.h /^#define IS_WRITELOCK(m) \\$/ -IS_XA_TXN ../txn/txn_rec.c /^#define IS_XA_TXN(R) (R->xid.size != 0)$/ IS_ZERO_LSN ../dbinc/db_int.in /^#define IS_ZERO_LSN(LSN) ((LSN).file == 0)$/ -ITEM_BEGIN ../btree/bt_verify.c 603 -ITEM_END ../btree/bt_verify.c 604 JAVADB_STAT_ACTIVE ../libdb_java/db_java_wrap.c /^#define JAVADB_STAT_ACTIVE(jenv, cl, jobj, statp, / -JAVADB_STAT_INT ../libdb_java/db_java_wrap.c /^#define JAVADB_STAT_INT(jenv, cl, jobj, statp, nam/ -JAVADB_STAT_LONG ../libdb_java/db_java_wrap.c /^#define JAVADB_STAT_LONG(jenv, cl, jobj, statp, na/ -JAVADB_STAT_LSN ../libdb_java/db_java_wrap.c /^#define JAVADB_STAT_LSN(jenv, cl, jobj, statp, nam/ -JAVADB_STAT_STRING ../libdb_java/db_java_wrap.c /^#define JAVADB_STAT_STRING(jenv, cl, jobj, statp, / -JAVADB_STAT_XID ../libdb_java/db_java_wrap.c /^#define JAVADB_STAT_XID(jenv, cl, jobj, statp, nam/ -JDBENV ../libdb_java/db_java_wrap.c 384 +JAVADB_STAT_INT ../libdb_java/db_java_wrap.c /^#define JAVADB_STAT_INT(jenv, jobj, fid, statp, na/ +JAVADB_STAT_LONG ../libdb_java/db_java_wrap.c /^#define JAVADB_STAT_LONG(jenv, jobj, fid, statp, n/ +JAVADB_STAT_LSN ../libdb_java/db_java_wrap.c /^#define JAVADB_STAT_LSN(jenv, jobj, fid, statp, na/ +JAVADB_STAT_STRING ../libdb_java/db_java_wrap.c /^#define JAVADB_STAT_STRING(jenv, jobj, fid, statp,/ +JAVADB_STAT_XID ../libdb_java/db_java_wrap.c /^#define JAVADB_STAT_XID(jenv, jobj, fid, statp, na/ +JDBENV ../libdb_java/db_java_wrap.c 811 JOIN_RETRY ../dbinc/db_join.h 27 -Java_com_sleepycat_db_DbUtil_is_1big_1endian ../libdb_java/db_java_wrap.c /^Java_com_sleepycat_db_DbUtil_is_1big_1endian(JNIEn/ -Java_com_sleepycat_db_db_1javaJNI_DbEnv_1close0 ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_DbEnv_1dbremove ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_DbEnv_1dbrename ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_DbEnv_1err ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_DbEnv_1errx ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_DbEnv_1get_1cachesize ../libdb_java/db_java_wrap.c /^JNIEXPORT jlong JNICALL Java_com_sleepycat_db_db_1/ -Java_com_sleepycat_db_db_1javaJNI_DbEnv_1get_1cachesize_1ncache ../libdb_java/db_java_wrap.c /^JNIEXPORT jint JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_DbEnv_1get_1data_1dirs ../libdb_java/db_java_wrap.c /^JNIEXPORT jobjectArray JNICALL Java_com_sleepycat_/ -Java_com_sleepycat_db_db_1javaJNI_DbEnv_1get_1encrypt_1flags ../libdb_java/db_java_wrap.c /^JNIEXPORT jint JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_DbEnv_1get_1flags ../libdb_java/db_java_wrap.c /^JNIEXPORT jint JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_DbEnv_1get_1home ../libdb_java/db_java_wrap.c /^JNIEXPORT jstring JNICALL Java_com_sleepycat_db_db/ -Java_com_sleepycat_db_db_1javaJNI_DbEnv_1get_1lg_1bsize ../libdb_java/db_java_wrap.c /^JNIEXPORT jint JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_DbEnv_1get_1lg_1dir ../libdb_java/db_java_wrap.c /^JNIEXPORT jstring JNICALL Java_com_sleepycat_db_db/ -Java_com_sleepycat_db_db_1javaJNI_DbEnv_1get_1lg_1max ../libdb_java/db_java_wrap.c /^JNIEXPORT jint JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_DbEnv_1get_1lg_1regionmax ../libdb_java/db_java_wrap.c /^JNIEXPORT jint JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_DbEnv_1get_1lk_1conflicts ../libdb_java/db_java_wrap.c /^JNIEXPORT jobjectArray JNICALL Java_com_sleepycat_/ -Java_com_sleepycat_db_db_1javaJNI_DbEnv_1get_1lk_1detect ../libdb_java/db_java_wrap.c /^JNIEXPORT jint JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_DbEnv_1get_1lk_1max_1lockers ../libdb_java/db_java_wrap.c /^JNIEXPORT jint JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_DbEnv_1get_1lk_1max_1locks ../libdb_java/db_java_wrap.c /^JNIEXPORT jint JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_DbEnv_1get_1lk_1max_1objects ../libdb_java/db_java_wrap.c /^JNIEXPORT jint JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_DbEnv_1get_1mp_1mmapsize ../libdb_java/db_java_wrap.c /^JNIEXPORT jlong JNICALL Java_com_sleepycat_db_db_1/ -Java_com_sleepycat_db_db_1javaJNI_DbEnv_1get_1open_1flags ../libdb_java/db_java_wrap.c /^JNIEXPORT jint JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_DbEnv_1get_1rep_1limit ../libdb_java/db_java_wrap.c /^JNIEXPORT jlong JNICALL Java_com_sleepycat_db_db_1/ -Java_com_sleepycat_db_db_1javaJNI_DbEnv_1get_1shm_1key ../libdb_java/db_java_wrap.c /^JNIEXPORT jlong JNICALL Java_com_sleepycat_db_db_1/ -Java_com_sleepycat_db_db_1javaJNI_DbEnv_1get_1tas_1spins ../libdb_java/db_java_wrap.c /^JNIEXPORT jint JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_DbEnv_1get_1timeout ../libdb_java/db_java_wrap.c /^JNIEXPORT jlong JNICALL Java_com_sleepycat_db_db_1/ -Java_com_sleepycat_db_db_1javaJNI_DbEnv_1get_1tmp_1dir ../libdb_java/db_java_wrap.c /^JNIEXPORT jstring JNICALL Java_com_sleepycat_db_db/ -Java_com_sleepycat_db_db_1javaJNI_DbEnv_1get_1tx_1max ../libdb_java/db_java_wrap.c /^JNIEXPORT jint JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_DbEnv_1get_1tx_1timestamp ../libdb_java/db_java_wrap.c /^JNIEXPORT jlong JNICALL Java_com_sleepycat_db_db_1/ -Java_com_sleepycat_db_db_1javaJNI_DbEnv_1get_1verbose ../libdb_java/db_java_wrap.c /^JNIEXPORT jboolean JNICALL Java_com_sleepycat_db_d/ -Java_com_sleepycat_db_db_1javaJNI_DbEnv_1get_1version_1major ../libdb_java/db_java_wrap.c /^JNIEXPORT jint JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_DbEnv_1get_1version_1minor ../libdb_java/db_java_wrap.c /^JNIEXPORT jint JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_DbEnv_1get_1version_1patch ../libdb_java/db_java_wrap.c /^JNIEXPORT jint JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_DbEnv_1get_1version_1string ../libdb_java/db_java_wrap.c /^JNIEXPORT jstring JNICALL Java_com_sleepycat_db_db/ -Java_com_sleepycat_db_db_1javaJNI_DbEnv_1lock_1detect ../libdb_java/db_java_wrap.c /^JNIEXPORT jint JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_DbEnv_1lock_1get ../libdb_java/db_java_wrap.c /^JNIEXPORT jlong JNICALL Java_com_sleepycat_db_db_1/ -Java_com_sleepycat_db_db_1javaJNI_DbEnv_1lock_1id ../libdb_java/db_java_wrap.c /^JNIEXPORT jint JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_DbEnv_1lock_1id_1free ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_DbEnv_1lock_1put ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_DbEnv_1lock_1stat ../libdb_java/db_java_wrap.c /^JNIEXPORT jobject JNICALL Java_com_sleepycat_db_db/ -Java_com_sleepycat_db_db_1javaJNI_DbEnv_1lock_1vec ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_DbEnv_1log_1archive ../libdb_java/db_java_wrap.c /^JNIEXPORT jobjectArray JNICALL Java_com_sleepycat_/ -Java_com_sleepycat_db_db_1javaJNI_DbEnv_1log_1compare ../libdb_java/db_java_wrap.c /^JNIEXPORT jint JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_DbEnv_1log_1cursor ../libdb_java/db_java_wrap.c /^JNIEXPORT jlong JNICALL Java_com_sleepycat_db_db_1/ -Java_com_sleepycat_db_db_1javaJNI_DbEnv_1log_1file ../libdb_java/db_java_wrap.c /^JNIEXPORT jstring JNICALL Java_com_sleepycat_db_db/ -Java_com_sleepycat_db_db_1javaJNI_DbEnv_1log_1flush ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_DbEnv_1log_1put ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_DbEnv_1log_1stat ../libdb_java/db_java_wrap.c /^JNIEXPORT jobject JNICALL Java_com_sleepycat_db_db/ -Java_com_sleepycat_db_db_1javaJNI_DbEnv_1memp_1fstat ../libdb_java/db_java_wrap.c /^JNIEXPORT jobjectArray JNICALL Java_com_sleepycat_/ -Java_com_sleepycat_db_db_1javaJNI_DbEnv_1memp_1stat ../libdb_java/db_java_wrap.c /^JNIEXPORT jobject JNICALL Java_com_sleepycat_db_db/ -Java_com_sleepycat_db_db_1javaJNI_DbEnv_1memp_1trickle ../libdb_java/db_java_wrap.c /^JNIEXPORT jint JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_DbEnv_1open0 ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_DbEnv_1remove0 ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_DbEnv_1rep_1elect ../libdb_java/db_java_wrap.c /^JNIEXPORT jint JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_DbEnv_1rep_1process_1message ../libdb_java/db_java_wrap.c /^JNIEXPORT jint JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_DbEnv_1rep_1start ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_DbEnv_1rep_1stat ../libdb_java/db_java_wrap.c /^JNIEXPORT jobject JNICALL Java_com_sleepycat_db_db/ -Java_com_sleepycat_db_db_1javaJNI_DbEnv_1setErrorHandler ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_DbEnv_1setFeedbackHandler ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_DbEnv_1setPanicHandler ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_DbEnv_1set_1app_1dispatch ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_DbEnv_1set_1cachesize ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_DbEnv_1set_1data_1dir ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_DbEnv_1set_1encrypt ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_DbEnv_1set_1flags ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_DbEnv_1set_1lg_1bsize ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_DbEnv_1set_1lg_1dir ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_DbEnv_1set_1lg_1max ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_DbEnv_1set_1lg_1regionmax ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_DbEnv_1set_1lk_1conflicts ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_DbEnv_1set_1lk_1detect ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_DbEnv_1set_1lk_1max_1lockers ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_DbEnv_1set_1lk_1max_1locks ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_DbEnv_1set_1lk_1max_1objects ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_DbEnv_1set_1mp_1mmapsize ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_DbEnv_1set_1rep_1limit ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_DbEnv_1set_1rep_1transport ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_DbEnv_1set_1rpc_1server ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_DbEnv_1set_1shm_1key ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_DbEnv_1set_1tas_1spins ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_DbEnv_1set_1timeout ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_DbEnv_1set_1tmp_1dir ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_DbEnv_1set_1tx_1max ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_DbEnv_1set_1tx_1timestamp0 ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_DbEnv_1set_1verbose ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_DbEnv_1strerror ../libdb_java/db_java_wrap.c /^JNIEXPORT jstring JNICALL Java_com_sleepycat_db_db/ -Java_com_sleepycat_db_db_1javaJNI_DbEnv_1txn_1begin ../libdb_java/db_java_wrap.c /^JNIEXPORT jlong JNICALL Java_com_sleepycat_db_db_1/ -Java_com_sleepycat_db_db_1javaJNI_DbEnv_1txn_1checkpoint ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_DbEnv_1txn_1recover ../libdb_java/db_java_wrap.c /^JNIEXPORT jobjectArray JNICALL Java_com_sleepycat_/ -Java_com_sleepycat_db_db_1javaJNI_DbEnv_1txn_1stat ../libdb_java/db_java_wrap.c /^JNIEXPORT jobject JNICALL Java_com_sleepycat_db_db/ -Java_com_sleepycat_db_db_1javaJNI_DbLogc_1close0 ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_DbLogc_1get ../libdb_java/db_java_wrap.c /^JNIEXPORT jint JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_DbLsn_1get_1file ../libdb_java/db_java_wrap.c /^JNIEXPORT jint JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_DbLsn_1get_1offset ../libdb_java/db_java_wrap.c /^JNIEXPORT jint JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_DbMpoolFile_1get_1flags ../libdb_java/db_java_wrap.c /^JNIEXPORT jint JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_DbMpoolFile_1get_1maxsize ../libdb_java/db_java_wrap.c /^JNIEXPORT jlong JNICALL Java_com_sleepycat_db_db_1/ -Java_com_sleepycat_db_db_1javaJNI_DbMpoolFile_1get_1priority ../libdb_java/db_java_wrap.c /^JNIEXPORT jint JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_DbMpoolFile_1set_1flags ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_DbMpoolFile_1set_1maxsize ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_DbMpoolFile_1set_1priority ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_DbTxn_1abort0 ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_DbTxn_1commit0 ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_DbTxn_1discard0 ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_DbTxn_1id ../libdb_java/db_java_wrap.c /^JNIEXPORT jint JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_DbTxn_1prepare ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_DbTxn_1set_1timeout ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_Db_1associate ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_Db_1close0 ../libdb_java/db_java_wrap.c /^JNIEXPORT jint JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_Db_1cursor ../libdb_java/db_java_wrap.c /^JNIEXPORT jlong JNICALL Java_com_sleepycat_db_db_1/ -Java_com_sleepycat_db_db_1javaJNI_Db_1del ../libdb_java/db_java_wrap.c /^JNIEXPORT jint JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_Db_1err ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_Db_1errx ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_Db_1get_1_1SWIG_10 ../libdb_java/db_java_wrap.c /^JNIEXPORT jint JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_Db_1get_1_1SWIG_11 ../libdb_java/db_java_wrap.c /^JNIEXPORT jint JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_Db_1get_1bt_1minkey ../libdb_java/db_java_wrap.c /^JNIEXPORT jint JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_Db_1get_1byteswapped ../libdb_java/db_java_wrap.c /^JNIEXPORT jboolean JNICALL Java_com_sleepycat_db_d/ -Java_com_sleepycat_db_db_1javaJNI_Db_1get_1cachesize ../libdb_java/db_java_wrap.c /^JNIEXPORT jlong JNICALL Java_com_sleepycat_db_db_1/ -Java_com_sleepycat_db_db_1javaJNI_Db_1get_1cachesize_1ncache ../libdb_java/db_java_wrap.c /^JNIEXPORT jint JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_Db_1get_1dbname ../libdb_java/db_java_wrap.c /^JNIEXPORT jstring JNICALL Java_com_sleepycat_db_db/ -Java_com_sleepycat_db_db_1javaJNI_Db_1get_1encrypt_1flags ../libdb_java/db_java_wrap.c /^JNIEXPORT jint JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_Db_1get_1filename ../libdb_java/db_java_wrap.c /^JNIEXPORT jstring JNICALL Java_com_sleepycat_db_db/ -Java_com_sleepycat_db_db_1javaJNI_Db_1get_1flags ../libdb_java/db_java_wrap.c /^JNIEXPORT jint JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_Db_1get_1flags_1raw ../libdb_java/db_java_wrap.c /^JNIEXPORT jint JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_Db_1get_1h_1ffactor ../libdb_java/db_java_wrap.c /^JNIEXPORT jint JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_Db_1get_1h_1nelem ../libdb_java/db_java_wrap.c /^JNIEXPORT jint JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_Db_1get_1lorder ../libdb_java/db_java_wrap.c /^JNIEXPORT jint JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_Db_1get_1mpf ../libdb_java/db_java_wrap.c /^JNIEXPORT jlong JNICALL Java_com_sleepycat_db_db_1/ -Java_com_sleepycat_db_db_1javaJNI_Db_1get_1open_1flags ../libdb_java/db_java_wrap.c /^JNIEXPORT jint JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_Db_1get_1pagesize ../libdb_java/db_java_wrap.c /^JNIEXPORT jint JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_Db_1get_1q_1extentsize ../libdb_java/db_java_wrap.c /^JNIEXPORT jint JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_Db_1get_1re_1delim ../libdb_java/db_java_wrap.c /^JNIEXPORT jint JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_Db_1get_1re_1len ../libdb_java/db_java_wrap.c /^JNIEXPORT jint JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_Db_1get_1re_1pad ../libdb_java/db_java_wrap.c /^JNIEXPORT jint JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_Db_1get_1re_1source ../libdb_java/db_java_wrap.c /^JNIEXPORT jstring JNICALL Java_com_sleepycat_db_db/ -Java_com_sleepycat_db_db_1javaJNI_Db_1get_1transactional ../libdb_java/db_java_wrap.c /^JNIEXPORT jboolean JNICALL Java_com_sleepycat_db_d/ -Java_com_sleepycat_db_db_1javaJNI_Db_1get_1type ../libdb_java/db_java_wrap.c /^JNIEXPORT jint JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_Db_1join ../libdb_java/db_java_wrap.c /^JNIEXPORT jlong JNICALL Java_com_sleepycat_db_db_1/ -Java_com_sleepycat_db_db_1javaJNI_Db_1key_1range ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_Db_1open0 ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_Db_1put ../libdb_java/db_java_wrap.c /^JNIEXPORT jint JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_Db_1remove0 ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_Db_1rename0 ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_Db_1setFeedbackHandler ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_Db_1set_1append_1recno ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_Db_1set_1bt_1compare ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_Db_1set_1bt_1maxkey ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_Db_1set_1bt_1minkey ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_Db_1set_1bt_1prefix ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_Db_1set_1cachesize ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_Db_1set_1dup_1compare ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_Db_1set_1encrypt ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_Db_1set_1flags ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_Db_1set_1h_1ffactor ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_Db_1set_1h_1hash ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_Db_1set_1h_1nelem ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_Db_1set_1lorder ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_Db_1set_1pagesize ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_Db_1set_1q_1extentsize ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_Db_1set_1re_1delim ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_Db_1set_1re_1len ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_Db_1set_1re_1pad ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_Db_1set_1re_1source ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_Db_1stat ../libdb_java/db_java_wrap.c /^JNIEXPORT jobject JNICALL Java_com_sleepycat_db_db/ -Java_com_sleepycat_db_db_1javaJNI_Db_1sync ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_Db_1truncate ../libdb_java/db_java_wrap.c /^JNIEXPORT jint JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_Db_1upgrade ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_Db_1verify0 ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_Dbc_1close0 ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_Dbc_1count ../libdb_java/db_java_wrap.c /^JNIEXPORT jint JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_Dbc_1del ../libdb_java/db_java_wrap.c /^JNIEXPORT jint JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_Dbc_1dup ../libdb_java/db_java_wrap.c /^JNIEXPORT jlong JNICALL Java_com_sleepycat_db_db_1/ -Java_com_sleepycat_db_db_1javaJNI_Dbc_1get_1_1SWIG_10 ../libdb_java/db_java_wrap.c /^JNIEXPORT jint JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_Dbc_1get_1_1SWIG_11 ../libdb_java/db_java_wrap.c /^JNIEXPORT jint JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_Dbc_1put ../libdb_java/db_java_wrap.c /^JNIEXPORT jint JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_deleteRef0 ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_delete_1DbLock ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_delete_1DbLsn ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_db_1j/ -Java_com_sleepycat_db_db_1javaJNI_getDbEnv0 ../libdb_java/db_java_wrap.c /^JNIEXPORT jlong JNICALL Java_com_sleepycat_db_db_1/ -Java_com_sleepycat_db_db_1javaJNI_getDbRef0 ../libdb_java/db_java_wrap.c /^JNIEXPORT jobject JNICALL Java_com_sleepycat_db_db/ -Java_com_sleepycat_db_db_1javaJNI_initDbEnvRef0 ../libdb_java/db_java_wrap.c /^JNIEXPORT jobject JNICALL Java_com_sleepycat_db_db/ -Java_com_sleepycat_db_db_1javaJNI_initDbRef0 ../libdb_java/db_java_wrap.c /^JNIEXPORT jobject JNICALL Java_com_sleepycat_db_db/ -Java_com_sleepycat_db_db_1javaJNI_initialize ../libdb_java/db_java_wrap.c /^Java_com_sleepycat_db_db_1javaJNI_initialize(JNIEn/ -Java_com_sleepycat_db_db_1javaJNI_new_1Db ../libdb_java/db_java_wrap.c /^JNIEXPORT jlong JNICALL Java_com_sleepycat_db_db_1/ -Java_com_sleepycat_db_db_1javaJNI_new_1DbEnv ../libdb_java/db_java_wrap.c /^JNIEXPORT jlong JNICALL Java_com_sleepycat_db_db_1/ -Java_com_sleepycat_db_db_1javaJNI_new_1DbLsn ../libdb_java/db_java_wrap.c /^JNIEXPORT jlong JNICALL Java_com_sleepycat_db_db_1/ -LCK_ALWAYS ../dbinc/db_am.h 90 -LCK_COUPLE ../dbinc/db_am.h 91 -LCK_COUPLE_ALWAYS ../dbinc/db_am.h 92 -LCK_DOWNGRADE ../dbinc/db_am.h 93 -LCK_ROLLBACK ../dbinc/db_am.h 94 +Java_com_sleepycat_db_internal_DbUtil_is_1big_1endian ../libdb_java/db_java_wrap.c /^Java_com_sleepycat_db_internal_DbUtil_is_1big_1end/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1close0 ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1dbremove ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1dbrename ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1err ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1errx ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1get_1cachesize ../libdb_java/db_java_wrap.c /^JNIEXPORT jlong JNICALL Java_com_sleepycat_db_inte/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1get_1cachesize_1ncache ../libdb_java/db_java_wrap.c /^JNIEXPORT jint JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1get_1data_1dirs ../libdb_java/db_java_wrap.c /^JNIEXPORT jobjectArray JNICALL Java_com_sleepycat_/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1get_1encrypt_1flags ../libdb_java/db_java_wrap.c /^JNIEXPORT jint JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1get_1errpfx ../libdb_java/db_java_wrap.c /^JNIEXPORT jstring JNICALL Java_com_sleepycat_db_in/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1get_1flags ../libdb_java/db_java_wrap.c /^JNIEXPORT jint JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1get_1home ../libdb_java/db_java_wrap.c /^JNIEXPORT jstring JNICALL Java_com_sleepycat_db_in/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1get_1lg_1bsize ../libdb_java/db_java_wrap.c /^JNIEXPORT jint JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1get_1lg_1dir ../libdb_java/db_java_wrap.c /^JNIEXPORT jstring JNICALL Java_com_sleepycat_db_in/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1get_1lg_1max ../libdb_java/db_java_wrap.c /^JNIEXPORT jint JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1get_1lg_1regionmax ../libdb_java/db_java_wrap.c /^JNIEXPORT jint JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1get_1lk_1conflicts ../libdb_java/db_java_wrap.c /^JNIEXPORT jobjectArray JNICALL Java_com_sleepycat_/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1get_1lk_1detect ../libdb_java/db_java_wrap.c /^JNIEXPORT jint JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1get_1lk_1max_1lockers ../libdb_java/db_java_wrap.c /^JNIEXPORT jint JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1get_1lk_1max_1locks ../libdb_java/db_java_wrap.c /^JNIEXPORT jint JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1get_1lk_1max_1objects ../libdb_java/db_java_wrap.c /^JNIEXPORT jint JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1get_1mp_1mmapsize ../libdb_java/db_java_wrap.c /^JNIEXPORT jlong JNICALL Java_com_sleepycat_db_inte/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1get_1open_1flags ../libdb_java/db_java_wrap.c /^JNIEXPORT jint JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1get_1rep_1limit ../libdb_java/db_java_wrap.c /^JNIEXPORT jlong JNICALL Java_com_sleepycat_db_inte/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1get_1shm_1key ../libdb_java/db_java_wrap.c /^JNIEXPORT jlong JNICALL Java_com_sleepycat_db_inte/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1get_1tas_1spins ../libdb_java/db_java_wrap.c /^JNIEXPORT jint JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1get_1timeout ../libdb_java/db_java_wrap.c /^JNIEXPORT jlong JNICALL Java_com_sleepycat_db_inte/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1get_1tmp_1dir ../libdb_java/db_java_wrap.c /^JNIEXPORT jstring JNICALL Java_com_sleepycat_db_in/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1get_1tx_1max ../libdb_java/db_java_wrap.c /^JNIEXPORT jint JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1get_1tx_1timestamp ../libdb_java/db_java_wrap.c /^JNIEXPORT jlong JNICALL Java_com_sleepycat_db_inte/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1get_1verbose ../libdb_java/db_java_wrap.c /^JNIEXPORT jboolean JNICALL Java_com_sleepycat_db_i/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1get_1version_1major ../libdb_java/db_java_wrap.c /^JNIEXPORT jint JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1get_1version_1minor ../libdb_java/db_java_wrap.c /^JNIEXPORT jint JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1get_1version_1patch ../libdb_java/db_java_wrap.c /^JNIEXPORT jint JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1get_1version_1string ../libdb_java/db_java_wrap.c /^JNIEXPORT jstring JNICALL Java_com_sleepycat_db_in/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1lock_1detect ../libdb_java/db_java_wrap.c /^JNIEXPORT jint JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1lock_1get ../libdb_java/db_java_wrap.c /^JNIEXPORT jlong JNICALL Java_com_sleepycat_db_inte/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1lock_1id ../libdb_java/db_java_wrap.c /^JNIEXPORT jint JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1lock_1id_1free ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1lock_1put ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1lock_1stat ../libdb_java/db_java_wrap.c /^JNIEXPORT jobject JNICALL Java_com_sleepycat_db_in/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1lock_1vec ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1log_1archive ../libdb_java/db_java_wrap.c /^JNIEXPORT jobjectArray JNICALL Java_com_sleepycat_/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1log_1compare ../libdb_java/db_java_wrap.c /^JNIEXPORT jint JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1log_1cursor ../libdb_java/db_java_wrap.c /^JNIEXPORT jlong JNICALL Java_com_sleepycat_db_inte/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1log_1file ../libdb_java/db_java_wrap.c /^JNIEXPORT jstring JNICALL Java_com_sleepycat_db_in/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1log_1flush ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1log_1put ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1log_1stat ../libdb_java/db_java_wrap.c /^JNIEXPORT jobject JNICALL Java_com_sleepycat_db_in/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1memp_1fstat ../libdb_java/db_java_wrap.c /^JNIEXPORT jobjectArray JNICALL Java_com_sleepycat_/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1memp_1stat ../libdb_java/db_java_wrap.c /^JNIEXPORT jobject JNICALL Java_com_sleepycat_db_in/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1memp_1trickle ../libdb_java/db_java_wrap.c /^JNIEXPORT jint JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1open ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1remove0 ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1rep_1elect ../libdb_java/db_java_wrap.c /^JNIEXPORT jint JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1rep_1process_1message ../libdb_java/db_java_wrap.c /^JNIEXPORT jint JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1rep_1start ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1rep_1stat ../libdb_java/db_java_wrap.c /^JNIEXPORT jobject JNICALL Java_com_sleepycat_db_in/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1set_1app_1dispatch ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1set_1cachesize ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1set_1data_1dir ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1set_1encrypt ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1set_1errcall ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1set_1errpfx ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1set_1feedback ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1set_1flags ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1set_1lg_1bsize ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1set_1lg_1dir ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1set_1lg_1max ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1set_1lg_1regionmax ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1set_1lk_1conflicts ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1set_1lk_1detect ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1set_1lk_1max_1lockers ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1set_1lk_1max_1locks ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1set_1lk_1max_1objects ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1set_1mp_1mmapsize ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1set_1msgcall ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1set_1paniccall ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1set_1rep_1limit ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1set_1rep_1transport ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1set_1rpc_1server ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1set_1shm_1key ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1set_1tas_1spins ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1set_1timeout ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1set_1tmp_1dir ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1set_1tx_1max ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1set_1tx_1timestamp0 ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1set_1verbose ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1strerror ../libdb_java/db_java_wrap.c /^JNIEXPORT jstring JNICALL Java_com_sleepycat_db_in/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1txn_1begin ../libdb_java/db_java_wrap.c /^JNIEXPORT jlong JNICALL Java_com_sleepycat_db_inte/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1txn_1checkpoint ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1txn_1recover ../libdb_java/db_java_wrap.c /^JNIEXPORT jobjectArray JNICALL Java_com_sleepycat_/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1txn_1stat ../libdb_java/db_java_wrap.c /^JNIEXPORT jobject JNICALL Java_com_sleepycat_db_in/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbLogc_1close0 ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbLogc_1get ../libdb_java/db_java_wrap.c /^JNIEXPORT jint JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbMpoolFile_1get_1flags ../libdb_java/db_java_wrap.c /^JNIEXPORT jint JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbMpoolFile_1get_1maxsize ../libdb_java/db_java_wrap.c /^JNIEXPORT jlong JNICALL Java_com_sleepycat_db_inte/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbMpoolFile_1get_1priority ../libdb_java/db_java_wrap.c /^JNIEXPORT jint JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbMpoolFile_1set_1flags ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbMpoolFile_1set_1maxsize ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbMpoolFile_1set_1priority ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbSequence_1close0 ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbSequence_1get ../libdb_java/db_java_wrap.c /^JNIEXPORT jlong JNICALL Java_com_sleepycat_db_inte/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbSequence_1get_1cachesize ../libdb_java/db_java_wrap.c /^JNIEXPORT jint JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbSequence_1get_1db ../libdb_java/db_java_wrap.c /^JNIEXPORT jlong JNICALL Java_com_sleepycat_db_inte/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbSequence_1get_1flags ../libdb_java/db_java_wrap.c /^JNIEXPORT jint JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbSequence_1get_1key ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbSequence_1get_1range_1max ../libdb_java/db_java_wrap.c /^JNIEXPORT jlong JNICALL Java_com_sleepycat_db_inte/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbSequence_1get_1range_1min ../libdb_java/db_java_wrap.c /^JNIEXPORT jlong JNICALL Java_com_sleepycat_db_inte/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbSequence_1initial_1value ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbSequence_1open ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbSequence_1remove0 ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbSequence_1set_1cachesize ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbSequence_1set_1flags ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbSequence_1set_1range ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbSequence_1stat ../libdb_java/db_java_wrap.c /^JNIEXPORT jobject JNICALL Java_com_sleepycat_db_in/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbTxn_1abort0 ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbTxn_1commit0 ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbTxn_1discard0 ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbTxn_1id ../libdb_java/db_java_wrap.c /^JNIEXPORT jint JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbTxn_1prepare ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_DbTxn_1set_1timeout ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_Db_1associate ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_Db_1close0 ../libdb_java/db_java_wrap.c /^JNIEXPORT jint JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_Db_1cursor ../libdb_java/db_java_wrap.c /^JNIEXPORT jlong JNICALL Java_com_sleepycat_db_inte/ +Java_com_sleepycat_db_internal_db_1javaJNI_Db_1del ../libdb_java/db_java_wrap.c /^JNIEXPORT jint JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_Db_1err ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_Db_1errx ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_Db_1get ../libdb_java/db_java_wrap.c /^JNIEXPORT jint JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_Db_1get_1bt_1minkey ../libdb_java/db_java_wrap.c /^JNIEXPORT jint JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_Db_1get_1byteswapped ../libdb_java/db_java_wrap.c /^JNIEXPORT jboolean JNICALL Java_com_sleepycat_db_i/ +Java_com_sleepycat_db_internal_db_1javaJNI_Db_1get_1cachesize ../libdb_java/db_java_wrap.c /^JNIEXPORT jlong JNICALL Java_com_sleepycat_db_inte/ +Java_com_sleepycat_db_internal_db_1javaJNI_Db_1get_1cachesize_1ncache ../libdb_java/db_java_wrap.c /^JNIEXPORT jint JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_Db_1get_1dbname ../libdb_java/db_java_wrap.c /^JNIEXPORT jstring JNICALL Java_com_sleepycat_db_in/ +Java_com_sleepycat_db_internal_db_1javaJNI_Db_1get_1encrypt_1flags ../libdb_java/db_java_wrap.c /^JNIEXPORT jint JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_Db_1get_1errpfx ../libdb_java/db_java_wrap.c /^JNIEXPORT jstring JNICALL Java_com_sleepycat_db_in/ +Java_com_sleepycat_db_internal_db_1javaJNI_Db_1get_1filename ../libdb_java/db_java_wrap.c /^JNIEXPORT jstring JNICALL Java_com_sleepycat_db_in/ +Java_com_sleepycat_db_internal_db_1javaJNI_Db_1get_1flags ../libdb_java/db_java_wrap.c /^JNIEXPORT jint JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_Db_1get_1h_1ffactor ../libdb_java/db_java_wrap.c /^JNIEXPORT jint JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_Db_1get_1h_1nelem ../libdb_java/db_java_wrap.c /^JNIEXPORT jint JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_Db_1get_1lorder ../libdb_java/db_java_wrap.c /^JNIEXPORT jint JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_Db_1get_1mpf ../libdb_java/db_java_wrap.c /^JNIEXPORT jlong JNICALL Java_com_sleepycat_db_inte/ +Java_com_sleepycat_db_internal_db_1javaJNI_Db_1get_1open_1flags ../libdb_java/db_java_wrap.c /^JNIEXPORT jint JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_Db_1get_1pagesize ../libdb_java/db_java_wrap.c /^JNIEXPORT jint JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_Db_1get_1q_1extentsize ../libdb_java/db_java_wrap.c /^JNIEXPORT jint JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_Db_1get_1re_1delim ../libdb_java/db_java_wrap.c /^JNIEXPORT jint JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_Db_1get_1re_1len ../libdb_java/db_java_wrap.c /^JNIEXPORT jint JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_Db_1get_1re_1pad ../libdb_java/db_java_wrap.c /^JNIEXPORT jint JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_Db_1get_1re_1source ../libdb_java/db_java_wrap.c /^JNIEXPORT jstring JNICALL Java_com_sleepycat_db_in/ +Java_com_sleepycat_db_internal_db_1javaJNI_Db_1get_1transactional ../libdb_java/db_java_wrap.c /^JNIEXPORT jboolean JNICALL Java_com_sleepycat_db_i/ +Java_com_sleepycat_db_internal_db_1javaJNI_Db_1get_1type ../libdb_java/db_java_wrap.c /^JNIEXPORT jint JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_Db_1join ../libdb_java/db_java_wrap.c /^JNIEXPORT jlong JNICALL Java_com_sleepycat_db_inte/ +Java_com_sleepycat_db_internal_db_1javaJNI_Db_1key_1range ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_Db_1open ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_Db_1pget ../libdb_java/db_java_wrap.c /^JNIEXPORT jint JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_Db_1put ../libdb_java/db_java_wrap.c /^JNIEXPORT jint JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_Db_1remove0 ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_Db_1rename0 ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_Db_1set_1append_1recno ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_Db_1set_1bt_1compare ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_Db_1set_1bt_1maxkey ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_Db_1set_1bt_1minkey ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_Db_1set_1bt_1prefix ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_Db_1set_1cachesize ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_Db_1set_1dup_1compare ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_Db_1set_1encrypt ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_Db_1set_1errpfx ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_Db_1set_1feedback ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_Db_1set_1flags ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_Db_1set_1h_1ffactor ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_Db_1set_1h_1hash ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_Db_1set_1h_1nelem ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_Db_1set_1lorder ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_Db_1set_1pagesize ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_Db_1set_1q_1extentsize ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_Db_1set_1re_1delim ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_Db_1set_1re_1len ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_Db_1set_1re_1pad ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_Db_1set_1re_1source ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_Db_1stat ../libdb_java/db_java_wrap.c /^JNIEXPORT jobject JNICALL Java_com_sleepycat_db_in/ +Java_com_sleepycat_db_internal_db_1javaJNI_Db_1sync ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_Db_1truncate ../libdb_java/db_java_wrap.c /^JNIEXPORT jint JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_Db_1upgrade ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_Db_1verify0 ../libdb_java/db_java_wrap.c /^JNIEXPORT jboolean JNICALL Java_com_sleepycat_db_i/ +Java_com_sleepycat_db_internal_db_1javaJNI_Dbc_1close0 ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_Dbc_1count ../libdb_java/db_java_wrap.c /^JNIEXPORT jint JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_Dbc_1del ../libdb_java/db_java_wrap.c /^JNIEXPORT jint JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_Dbc_1dup ../libdb_java/db_java_wrap.c /^JNIEXPORT jlong JNICALL Java_com_sleepycat_db_inte/ +Java_com_sleepycat_db_internal_db_1javaJNI_Dbc_1get ../libdb_java/db_java_wrap.c /^JNIEXPORT jint JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_Dbc_1pget ../libdb_java/db_java_wrap.c /^JNIEXPORT jint JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_Dbc_1put ../libdb_java/db_java_wrap.c /^JNIEXPORT jint JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_deleteRef0 ../libdb_java/db_java_wrap.c /^Java_com_sleepycat_db_internal_db_1javaJNI_deleteR/ +Java_com_sleepycat_db_internal_db_1javaJNI_delete_1DbLock ../libdb_java/db_java_wrap.c /^JNIEXPORT void JNICALL Java_com_sleepycat_db_inter/ +Java_com_sleepycat_db_internal_db_1javaJNI_getDbEnv0 ../libdb_java/db_java_wrap.c /^Java_com_sleepycat_db_internal_db_1javaJNI_getDbEn/ +Java_com_sleepycat_db_internal_db_1javaJNI_initDbEnvRef0 ../libdb_java/db_java_wrap.c /^Java_com_sleepycat_db_internal_db_1javaJNI_initDbE/ +Java_com_sleepycat_db_internal_db_1javaJNI_initDbRef0 ../libdb_java/db_java_wrap.c /^Java_com_sleepycat_db_internal_db_1javaJNI_initDbR/ +Java_com_sleepycat_db_internal_db_1javaJNI_initialize ../libdb_java/db_java_wrap.c /^Java_com_sleepycat_db_internal_db_1javaJNI_initial/ +Java_com_sleepycat_db_internal_db_1javaJNI_new_1Db ../libdb_java/db_java_wrap.c /^JNIEXPORT jlong JNICALL Java_com_sleepycat_db_inte/ +Java_com_sleepycat_db_internal_db_1javaJNI_new_1DbEnv ../libdb_java/db_java_wrap.c /^JNIEXPORT jlong JNICALL Java_com_sleepycat_db_inte/ +Java_com_sleepycat_db_internal_db_1javaJNI_new_1DbSequence ../libdb_java/db_java_wrap.c /^JNIEXPORT jlong JNICALL Java_com_sleepycat_db_inte/ +LASTCKP_CMP ../dbinc/log.h 364 +LCK_ALWAYS ../dbinc/db_am.h 114 +LCK_COUPLE ../dbinc/db_am.h 115 +LCK_COUPLE_ALWAYS ../dbinc/db_am.h 116 +LCK_DOWNGRADE ../dbinc/db_am.h 117 +LCK_ROLLBACK ../dbinc/db_am.h 118 LEAFLEVEL ../dbinc/db_page.h 240 LEN_HDATA ../dbinc/db_page.h /^#define LEN_HDATA(dbp, p, psize, indx) \\$/ LEN_HITEM ../dbinc/db_page.h /^#define LEN_HITEM(dbp, pg, pgsize, indx) \\$/ @@ -1058,33 +1337,29 @@ LFPREFIX ../dbinc/log.h 63 LF_CLR ../dbinc/db_int.in /^#define LF_CLR(f) ((flags) &= ~(f))$/ LF_ISSET ../dbinc/db_int.in /^#define LF_ISSET(f) ((flags) & (f))$/ LF_SET ../dbinc/db_int.in /^#define LF_SET(f) ((flags) |= (f))$/ -LG_BASE_REGION_SIZE ../dbinc/log.h 69 -LG_BSIZE_DEFAULT ../dbinc/log.h 68 -LG_MAINT_SIZE ../dbinc/log.h 248 +LG_BASE_REGION_SIZE ../dbinc/log.h 71 +LG_BSIZE_DEFAULT ../dbinc/log.h 69 +LG_BSIZE_INMEM ../dbinc/log.h 70 +LG_MAINT_SIZE ../dbinc/log.h 277 LG_MAX_DEFAULT ../dbinc/log.h 67 +LG_MAX_INMEM ../dbinc/log.h 68 LIST_EMPTY ../dbinc/queue.h /^#define LIST_EMPTY(head) ((head)->lh_first == NULL/ LIST_ENTRY ../dbinc/queue.h /^#define LIST_ENTRY(type) \\$/ LIST_FIRST ../dbinc/queue.h /^#define LIST_FIRST(head) ((head)->lh_first)$/ LIST_FOREACH ../dbinc/queue.h /^#define LIST_FOREACH(var, head, field) \\$/ LIST_HEAD ../dbinc/queue.h /^#define LIST_HEAD(name, type) \\$/ LIST_HEAD_INITIALIZER ../dbinc/queue.h /^#define LIST_HEAD_INITIALIZER(head) \\$/ -LIST_INCREMENT ../log/log_archive.c 207 +LIST_INCREMENT ../log/log_archive.c 209 LIST_INIT ../dbinc/queue.h /^#define LIST_INIT(head) do { \\$/ LIST_INSERT_AFTER ../dbinc/queue.h /^#define LIST_INSERT_AFTER(listelm, elm, field) do / LIST_INSERT_BEFORE ../dbinc/queue.h /^#define LIST_INSERT_BEFORE(listelm, elm, field) do/ LIST_INSERT_HEAD ../dbinc/queue.h /^#define LIST_INSERT_HEAD(head, elm, field) do { / LIST_NEXT ../dbinc/queue.h /^#define LIST_NEXT(elm, field) ((elm)->field.le_nex/ LIST_REMOVE ../dbinc/queue.h /^#define LIST_REMOVE(elm, field) do { \\$/ -LOAD_ACTUAL_MUTEX_CODE ../mutex/mut_tas.c 24 +LOAD_ACTUAL_MUTEX_CODE ../mutex/mut_tas.c 22 LOCKER_LOCK ../dbinc/lock.h /^#define LOCKER_LOCK(lt, reg, locker, ndx) \\$/ LOCKING_ON ../dbinc/db_int.in /^#define LOCKING_ON(dbenv) ((dbenv)->lk_handle != N/ -LOCKREGION ../dbinc/lock.h /^#define LOCKREGION(dbenv, lt) R_LOCK((dbenv), &(l/ -LOCK_DUMP_ALL ../lock/lock_stat.c 137 -LOCK_DUMP_CONF ../lock/lock_stat.c 132 -LOCK_DUMP_LOCKERS ../lock/lock_stat.c 133 -LOCK_DUMP_MEM ../lock/lock_stat.c 134 -LOCK_DUMP_OBJECTS ../lock/lock_stat.c 135 -LOCK_DUMP_PARAMS ../lock/lock_stat.c 136 +LOCKREGION ../dbinc/lock.h /^#define LOCKREGION(dbenv, lt) R_LOCK((dbenv), &((/ LOCK_INIT ../dbinc/lock.h /^#define LOCK_INIT(lock) ((lock).off = LOCK_INVALI/ LOCK_INVALID ../dbinc/lock.h 27 LOCK_ISSET ../dbinc/lock.h /^#define LOCK_ISSET(lock) ((lock).off != LOCK_INVAL/ @@ -1099,20 +1374,21 @@ LOG ../dbinc/log.h 60 LOGGING_ON ../dbinc/db_int.in /^#define LOGGING_ON(dbenv) ((dbenv)->lg_handle != N/ LOGP ../dbinc/log.h 61 LOG_OP ../dbinc/debug.h /^#define LOG_OP(C, T, O, K, A, F) { \\$/ -LOWER_MASK ../crypto/mersenne/mt19937db.c 42 +LOWER_MASK ../crypto/mersenne/mt19937db.c 41 LSN ../dbinc/db_page.h /^#define LSN(p) (((PAGE *)p)->lsn)$/ LSN_NOT_LOGGED ../dbinc/db_int.in /^#define LSN_NOT_LOGGED(LSN) do { \\$/ -LSN_PAGE_NOLOCK ../dbinc/rep.h 207 -M ../crypto/mersenne/mt19937db.c 39 -MAKE_STAT_LIST ../dbinc/tcl_db.h /^#define MAKE_STAT_LIST(s,v) \\$/ -MAKE_STAT_LSN ../dbinc/tcl_db.h /^#define MAKE_STAT_LSN(s, lsn) \\$/ -MAKE_STAT_STRLIST ../dbinc/tcl_db.h /^#define MAKE_STAT_STRLIST(s,s1) \\$/ +M ../crypto/mersenne/mt19937db.c 38 +MAKE_STAT_LIST ../dbinc/tcl_db.h /^#define MAKE_STAT_LIST(s, v) do { \\$/ +MAKE_STAT_LSN ../dbinc/tcl_db.h /^#define MAKE_STAT_LSN(s, lsn) do { \\$/ +MAKE_STAT_STRLIST ../dbinc/tcl_db.h /^#define MAKE_STAT_STRLIST(s,s1) do { \\$/ +MAKE_WSTAT_LIST ../dbinc/tcl_db.h /^#define MAKE_WSTAT_LIST(s, v) do { \\$/ MAP_FAILED ../mutex/tm.c 733 MAP_FILE ../mutex/tm.c 736 -MASTER_CHECK ../rep/rep_record.c /^#define MASTER_CHECK(dbenv, eid, rep) \\$/ +MASTER_CHECK ../rep/rep_record.c /^#define MASTER_CHECK(dbenv, eid, rep) do { \\$/ MASTER_ONLY ../rep/rep_record.c /^#define MASTER_ONLY(rep, rp) do { \\$/ -MATRIX_A ../crypto/mersenne/mt19937db.c 40 -MAXARGS ../common/util_arg.c 36 +MASTER_UPDATE ../rep/rep_record.c /^#define MASTER_UPDATE(dbenv, renv) do { \\$/ +MATRIX_A ../crypto/mersenne/mt19937db.c 39 +MAXARGS ../common/util_arg.c 34 MAXBQUALSIZE ../dbinc/xa.h 22 MAXBTREELEVEL ../dbinc/db_page.h 241 MAXGTRIDSIZE ../dbinc/xa.h 21 @@ -1120,17 +1396,17 @@ MAXINFOSIZE ../dbinc/xa.h 46 MAXKB ../crypto/rijndael/rijndael-alg-fst.h 33 MAXKC ../crypto/rijndael/rijndael-alg-fst.h 32 MAXNR ../crypto/rijndael/rijndael-alg-fst.h 34 -MAXPATHLEN ../dbinc/db_int.in 201 -MAX_ID ../dbinc/tcl_db.h 18 +MAXPATHLEN ../dbinc/db_int.in 273 +MAX_ID ../dbinc/tcl_db.h 19 MAX_IV_SIZE ../crypto/rijndael/rijndael-api-fst.h 71 MAX_KEY_SIZE ../crypto/rijndael/rijndael-api-fst.h 70 MAX_LSN ../dbinc/db_int.in /^#define MAX_LSN(LSN) do { \\$/ -MAX_LSN_TO_TEXT ../db/db.c 997 +MAX_LSN_TO_TEXT ../db/db.c 1011 MAX_PAGE_NUMBER ../dbinc/db_185.in 79 MAX_PAGE_OFFSET ../dbinc/db_185.in 81 -MAX_PGNOS ../lock/lock.c 2188 +MAX_PGNOS ../lock/lock_list.c 54 MAX_REC_NUMBER ../dbinc/db_185.in 83 -MEGABYTE ../dbinc/db_int.in 41 +MEGABYTE ../dbinc/db_int.in 72 MINFILL ../dbinc/hash.h 106 MODE_CBC ../crypto/rijndael/rijndael-api-fst.h 50 MODE_CFB1 ../crypto/rijndael/rijndael-api-fst.h 51 @@ -1138,57 +1414,56 @@ MODE_ECB ../crypto/rijndael/rijndael-api-fst.h 49 MPF_ILLEGAL_AFTER_OPEN ../dbinc/mp.h /^#define MPF_ILLEGAL_AFTER_OPEN(dbmfp, name) \\$/ MPF_ILLEGAL_BEFORE_OPEN ../dbinc/mp.h /^#define MPF_ILLEGAL_BEFORE_OPEN(dbmfp, name) \\$/ MPOOL ../dbinc/mp.h 16 -MPOOLFILE ../dbinc/db.in 127 -MPOOL_BASE_DECREMENT ../dbinc/mp.h 186 -MPOOL_DUMP_ALL ../mp/mp_stat.c 264 -MPOOL_DUMP_HASH ../mp/mp_stat.c 262 -MPOOL_DUMP_MEM ../mp/mp_stat.c 263 +MPOOLFILE ../dbinc/db.in 160 +MPOOL_BASE_DECREMENT ../dbinc/mp.h 203 MPOOL_ON ../dbinc/db_int.in /^#define MPOOL_ON(dbenv) ((dbenv)->mp_handle != NU/ -MPOOL_PRI_DEFAULT ../dbinc/mp.h 194 -MPOOL_PRI_DIRTY ../dbinc/mp.h 196 -MPOOL_PRI_HIGH ../dbinc/mp.h 195 -MPOOL_PRI_LOW ../dbinc/mp.h 193 -MPOOL_PRI_VERY_HIGH ../dbinc/mp.h 197 -MPOOL_PRI_VERY_LOW ../dbinc/mp.h 192 -MP_CAN_MMAP ../dbinc/mp.h 281 -MP_DIRECT ../dbinc/mp.h 282 -MP_EXTENT ../dbinc/mp.h 283 -MP_FAKE_DEADFILE ../dbinc/mp.h 284 -MP_FAKE_FILEWRITTEN ../dbinc/mp.h 285 -MP_FAKE_NB ../dbinc/mp.h 286 -MP_FAKE_UOC ../dbinc/mp.h 287 -MP_FILEID_SET ../dbinc/db.in 672 -MP_FLUSH ../dbinc/db.in 673 -MP_NOT_DURABLE ../dbinc/mp.h 288 -MP_OPEN_CALLED ../dbinc/db.in 674 -MP_READONLY ../dbinc/db.in 675 -MP_TEMP ../dbinc/mp.h 289 -MSG ../mutex/mut_fcntl.c 152 -MSG1 ../mutex/mut_pthread.c 24 -MSG2 ../mutex/mut_pthread.c 26 -MSGBUF_LEN ../lock/lock_deadlock.c 802 +MPOOL_PRI_DEFAULT ../dbinc/mp.h 211 +MPOOL_PRI_DIRTY ../dbinc/mp.h 213 +MPOOL_PRI_HIGH ../dbinc/mp.h 212 +MPOOL_PRI_LOW ../dbinc/mp.h 210 +MPOOL_PRI_VERY_HIGH ../dbinc/mp.h 214 +MPOOL_PRI_VERY_LOW ../dbinc/mp.h 209 +MP_CAN_MMAP ../dbinc/mp.h 302 +MP_DIRECT ../dbinc/mp.h 303 +MP_DURABLE_UNKNOWN ../dbinc/mp.h 304 +MP_EXTENT ../dbinc/mp.h 305 +MP_FAKE_DEADFILE ../dbinc/mp.h 306 +MP_FAKE_FILEWRITTEN ../dbinc/mp.h 307 +MP_FAKE_NB ../dbinc/mp.h 308 +MP_FAKE_UOC ../dbinc/mp.h 309 +MP_FILEID_SET ../dbinc/db.in 735 +MP_FLUSH ../dbinc/db.in 736 +MP_NOT_DURABLE ../dbinc/mp.h 310 +MP_OPEN_CALLED ../dbinc/db.in 737 +MP_READONLY ../dbinc/db.in 738 +MP_TEMP ../dbinc/mp.h 311 +MSG ../mutex/mut_fcntl.c 151 +MSG1 ../mutex/mut_pthread.c 23 +MSG2 ../mutex/mut_pthread.c 25 MSG_SIZE ../dbinc/tcl_db.h 13 -MS_PER_SEC ../dbinc/db_int.in 44 +MS_PER_SEC ../dbinc/db_int.in 75 MT_FILE ../mutex/tm.c 42 MT_FILE_QUIT ../mutex/tm.c 43 MUTEX_ALIGN ../dbinc/mutex.h 82 -MUTEX_ALLOC ../dbinc/mutex.h 831 +MUTEX_ALLOC ../dbinc/mutex.h 830 +MUTEX_CLEAR ../dbinc/mutex.h /^#define MUTEX_CLEAR(mp) { \\$/ MUTEX_DESTROY ../dbinc/mutex.h /^#define MUTEX_DESTROY(x) sema_destroy(x)$/ MUTEX_FIELDS ../dbinc/mutex.h 26 -MUTEX_IGNORE ../dbinc/mutex.h 832 +MUTEX_IGNORE ../dbinc/mutex.h 831 MUTEX_INIT ../dbinc/mutex.h /^#define MUTEX_INIT(x) 0$/ -MUTEX_INITED ../dbinc/mutex.h 833 +MUTEX_INITED ../dbinc/mutex.h 832 MUTEX_LOCK ../dbinc/mutex.h /^#define MUTEX_LOCK(dbenv, mp) \\$/ -MUTEX_LOGICAL_LOCK ../dbinc/mutex.h 834 -MUTEX_MPOOL ../dbinc/mutex.h 835 +MUTEX_LOGICAL_LOCK ../dbinc/mutex.h 833 +MUTEX_MPOOL ../dbinc/mutex.h 834 MUTEX_NO_MALLOC_LOCKS ../dbinc/mutex.h 126 -MUTEX_NO_RECORD ../dbinc/mutex.h 836 -MUTEX_NO_RLOCK ../dbinc/mutex.h 837 +MUTEX_NO_RECORD ../dbinc/mutex.h 835 +MUTEX_NO_RLOCK ../dbinc/mutex.h 836 MUTEX_NO_SHMGET_LOCKS ../dbinc/mutex.h 127 -MUTEX_PAUSE ../dbinc/mutex.h 363 -MUTEX_SELF_BLOCK ../dbinc/mutex.h 838 +MUTEX_PAUSE ../dbinc/mutex.h 364 +MUTEX_SELF_BLOCK ../dbinc/mutex.h 837 MUTEX_SET ../dbinc/mutex.h /^#define MUTEX_SET(x) (!_check_lock(x, 0, 1))$/ -MUTEX_THREAD ../dbinc/mutex.h 839 +MUTEX_SET_TEST ../dbinc/mutex.h 380 +MUTEX_THREAD ../dbinc/mutex.h 838 MUTEX_THREAD_LOCK ../dbinc/mutex.h /^#define MUTEX_THREAD_LOCK(dbenv, mp) \\$/ MUTEX_THREAD_UNLOCK ../dbinc/mutex.h /^#define MUTEX_THREAD_UNLOCK(dbenv, mp) \\$/ MUTEX_UNLOCK ../dbinc/mutex.h /^#define MUTEX_UNLOCK(dbenv, mp) \\$/ @@ -1197,13 +1472,14 @@ MUTEX_WAKEME ../mutex/tm.c 58 M_16_SWAP ../dbinc/db_swap.h /^#define M_16_SWAP(a) { \\$/ M_32_SWAP ../dbinc/db_swap.h /^#define M_32_SWAP(a) { \\$/ Mtm ../mutex/tm.c /^main(argc, argv)$/ -N ../crypto/mersenne/mt19937db.c 38 -NAME_TO_DB ../dbinc/tcl_db.h /^#define NAME_TO_DB(name) (DB *)_NameToPtr((name))$/ -NAME_TO_DBC ../dbinc/tcl_db.h /^#define NAME_TO_DBC(name) (DBC *)_NameToPtr((name)/ -NAME_TO_ENV ../dbinc/tcl_db.h /^#define NAME_TO_ENV(name) (DB_ENV *)_NameToPtr((na/ -NAME_TO_LOCK ../dbinc/tcl_db.h /^#define NAME_TO_LOCK(name) (DB_LOCK *)_NameToPtr((/ -NAME_TO_MP ../dbinc/tcl_db.h /^#define NAME_TO_MP(name) (DB_MPOOLFILE *)_NameToPt/ -NAME_TO_TXN ../dbinc/tcl_db.h /^#define NAME_TO_TXN(name) (DB_TXN *)_NameToPtr((na/ +N ../crypto/mersenne/mt19937db.c 37 +NAME_TO_DB ../dbinc/tcl_db.h /^#define NAME_TO_DB(name) (DB *)_NameToPtr((name))$/ +NAME_TO_DBC ../dbinc/tcl_db.h /^#define NAME_TO_DBC(name) (DBC *)_NameToPtr((name)/ +NAME_TO_ENV ../dbinc/tcl_db.h /^#define NAME_TO_ENV(name) (DB_ENV *)_NameToPtr((na/ +NAME_TO_LOCK ../dbinc/tcl_db.h /^#define NAME_TO_LOCK(name) (DB_LOCK *)_NameToPtr((/ +NAME_TO_MP ../dbinc/tcl_db.h /^#define NAME_TO_MP(name) (DB_MPOOLFILE *)_NameToPt/ +NAME_TO_SEQUENCE ../dbinc/tcl_db.h /^#define NAME_TO_SEQUENCE(name) (DB_SEQUENCE *)_Nam/ +NAME_TO_TXN ../dbinc/tcl_db.h /^#define NAME_TO_TXN(name) (DB_TXN *)_NameToPtr((na/ NAMLEN ../clib/getcwd.c /^# define NAMLEN(dirent) strlen((dirent)->d_name)$/ NBUCKET ../dbinc/mp.h /^#define NBUCKET(mc, mf_offset, pgno) \\$/ NCACHE ../dbinc/mp.h /^#define NCACHE(mp, mf_offset, pgno) \\$/ @@ -1213,24 +1489,26 @@ NCACHED30 ../dbinc/db_upgrade.h 152 NDX_INVALID ../dbinc/hash.h 110 NELEM ../libdb_java/db_java_wrap.c /^#define NELEM(x) (sizeof (x) \/ sizeof (x[0]))$/ NEXT_PGNO ../dbinc/db_page.h /^#define NEXT_PGNO(p) (((PAGE *)p)->next_pgno)$/ +NOWAIT_FLAG ../dbinc/db_int.in /^#define NOWAIT_FLAG(txn) \\$/ NUM_ENT ../dbinc/db_page.h /^#define NUM_ENT(p) (((PAGE *)p)->entries)$/ +NewStringObj ../dbinc/tcl_db.h /^#define NewStringObj(a, b) \\$/ OBJECT_LOCK ../dbinc/lock.h /^#define OBJECT_LOCK(lt, reg, obj, ndx) \\$/ OBJ_LINKS_VALID ../dbinc/lock.h /^#define OBJ_LINKS_VALID(L) ((L)->links.stqe_prev !/ -OKFLAGS ../btree/bt_verify.c 37 -OKFLAGS_CDB ../env/env_open.c 87 -OK_CRYPTO_FLAGS ../env/env_method.c 335 -OK_FLAGS ../env/env_method.c 528 -ON_ERROR_RETURN ../dbinc/cxx_int.h 61 -ON_ERROR_THROW ../dbinc/cxx_int.h 60 -ON_ERROR_UNKNOWN ../dbinc/cxx_int.h 62 +OKFLAGS ../db/db_iface.c 1068 +OKFLAGS_CDB ../env/env_open.c 86 +OK_CRYPTO_FLAGS ../env/env_method.c 351 +OK_FLAGS ../env/env_method.c 550 +ON_ERROR_RETURN ../dbinc/cxx_int.h 57 +ON_ERROR_THROW ../dbinc/cxx_int.h 56 +ON_ERROR_UNKNOWN ../dbinc/cxx_int.h 58 OPCODE_OF ../dbinc/hash.h /^#define OPCODE_OF(N) (N & ~PAIR_MASK)$/ OR_MAP ../lock/lock_deadlock.c /^#define OR_MAP(D, S, N) { \\$/ -OS_VMPAGESIZE ../dbinc/region.h 283 +OS_VMPAGESIZE ../dbinc/region.h 292 OS_VMROUNDOFF ../dbinc/region.h /^#define OS_VMROUNDOFF(i) { \\$/ -OVERFLOW_ERROR ../common/db_err.c 333 +OVERFLOW_ERROR ../clib/snprintf.c 122 OV_LEN ../dbinc/db_page.h /^#define OV_LEN(p) (((PAGE *)p)->hf_offset)$/ OV_REF ../dbinc/db_page.h /^#define OV_REF(p) (((PAGE *)p)->entries)$/ -O_ACCMODE ../os/os_oflags.c 50 +O_ACCMODE ../os/os_oflags.c 53 O_INDX ../dbinc/db_page.h 596 PAIR_DATAMASK ../dbinc/hash.h 118 PAIR_DUPMASK ../dbinc/hash.h 119 @@ -1241,24 +1519,24 @@ PAIR_KEYMASK ../dbinc/hash.h 117 PAIR_MASK ../dbinc/hash.h 120 PANIC_CHECK ../dbinc/region.h /^#define PANIC_CHECK(dbenv) \\$/ PANIC_SET ../dbinc/region.h /^#define PANIC_SET(dbenv, onoff) \\$/ -PATH_DOT ../dbinc/db_int.in 203 -PATH_SEPARATOR ../dbinc/db_int.in 205 +PATH_DOT ../dbinc/db_int.in 275 +PATH_SEPARATOR ../dbinc/db_int.in 277 PGNO ../dbinc/db_page.h /^#define PGNO(p) (((PAGE *)p)->pgno)$/ PGNO_BASE_MD ../dbinc/db_page.h 34 PGNO_INVALID ../dbinc/db_page.h 33 POWER_OF_TWO ../dbinc/db_int.in /^#define POWER_OF_TWO(x) (((x) & ((x) - 1)) == 0)$/ -PREPLISTSIZE ../rep/rep_method.c 495 +PREPLISTSIZE ../rep/rep_method.c 512 PREV_PGNO ../dbinc/db_page.h /^#define PREV_PGNO(p) (((PAGE *)p)->prev_pgno)$/ -PTHREAD_UNLOCK_ATTEMPTS ../mutex/mut_pthread.c 55 +PTHREAD_UNLOCK_ATTEMPTS ../mutex/mut_pthread.c 57 PUTOVFL ../dbinc/hash.h 128 PUTPAIR ../dbinc/hash.h 126 PUTU32 ../crypto/rijndael/rijndael-alg-fst.c /^#define PUTU32(ct, st) { *((u32 *)(ct)) = SWAP((st/ -PUT_COUNT ../lock/lock.c /^#define PUT_COUNT(dp, count) do { u_int32_t *ip =/ +PUT_COUNT ../lock/lock_list.c /^#define PUT_COUNT(dp, count) do { u_int32_t *ip = / PUT_HKEYDATA ../dbinc/db_page.h /^#define PUT_HKEYDATA(pe, kd, len, type) { \\$/ PUT_PAGE ../db/db_upg_opd.c /^#define PUT_PAGE(dbp, fhp, pgno, page) { \\$/ -PUT_PCOUNT ../lock/lock.c /^#define PUT_PCOUNT(dp, count) do { u_int16_t *ip / -PUT_PGNO ../lock/lock.c /^#define PUT_PGNO(dp, pgno) do { db_pgno_t *ip = (/ -PUT_SIZE ../lock/lock.c /^#define PUT_SIZE(dp, size) do { u_int16_t *ip = (/ +PUT_PCOUNT ../lock/lock_list.c /^#define PUT_PCOUNT(dp, count) do { u_int16_t *ip =/ +PUT_PGNO ../lock/lock_list.c /^#define PUT_PGNO(dp, pgno) do { db_pgno_t *ip = (d/ +PUT_SIZE ../lock/lock_list.c /^#define PUT_SIZE(dp, size) do { u_int16_t *ip = (u/ P_16_COPY ../dbinc/db_swap.h /^#define P_16_COPY(a, b) { \\$/ P_16_SWAP ../dbinc/db_swap.h /^#define P_16_SWAP(a) { \\$/ P_32_COPY ../dbinc/db_swap.h /^#define P_32_COPY(a, b) { \\$/ @@ -1286,12 +1564,12 @@ P_OVFLSPACE ../dbinc/db_page.h /^#define P_OVFLSPACE(dbp, psize, pg) (P_MAXSPACE P_PAGETYPE_MAX ../dbinc/db_page.h 50 P_QAMDATA ../dbinc/db_page.h 48 P_QAMMETA ../dbinc/db_page.h 47 -P_TO_UINT16 ../dbinc/db_int.in /^#define P_TO_UINT16(p) ((u_int16_t)(db_alignp_t)(p/ -P_TO_UINT32 ../dbinc/db_int.in /^#define P_TO_UINT32(p) ((u_int32_t)(db_alignp_t)(p/ -P_TO_ULONG ../dbinc/db_int.in /^#define P_TO_ULONG(p) ((u_long)(db_alignp_t)(p))$/ +P_TO_UINT16 ../dbinc/db_int.in /^#define P_TO_UINT16(p) ((u_int16_t)(uintptr_t)(p))/ +P_TO_UINT32 ../dbinc/db_int.in /^#define P_TO_UINT32(p) ((u_int32_t)(uintptr_t)(p))/ +P_TO_ULONG ../dbinc/db_int.in /^#define P_TO_ULONG(p) ((u_long)(uintptr_t)(p))$/ QAM_AFTER_CURRENT ../dbinc/qam.h /^#define QAM_AFTER_CURRENT(meta, recno) \\$/ QAM_BEFORE_FIRST ../dbinc/qam.h /^#define QAM_BEFORE_FIRST(meta, recno) \\$/ -QAM_EXNAME ../qam/qam_files.c /^#define QAM_EXNAME(Q, I, B, L) \\$/ +QAM_EXNAME ../qam/qam_files.c /^#define QAM_EXNAME(Q, I, B, L) \\$/ QAM_GET_RECORD ../dbinc/qam.h /^#define QAM_GET_RECORD(dbp, page, index) \\$/ QAM_NOT_VALID ../dbinc/qam.h /^#define QAM_NOT_VALID(meta, recno) \\$/ QAM_PAGE_EXTENT ../dbinc/qam.h /^#define QAM_PAGE_EXTENT(dbp, pgno) \\$/ @@ -1304,7 +1582,7 @@ QAM_SETCUR ../dbinc/qam.h 141 QAM_SETFIRST ../dbinc/qam.h 140 QAM_TRUNCATE ../dbinc/qam.h 142 QAM_VALID ../dbinc/qam.h 18 -QDEBUG ../qam/qam.c 613 +QDEBUG ../qam/qam.c 611 QMD_TRACE_ELEM ../dbinc/queue.h /^#define QMD_TRACE_ELEM(elem) do { \\$/ QMD_TRACE_HEAD ../dbinc/queue.h /^#define QMD_TRACE_HEAD(head) do { \\$/ QPAGE_CHKSUM ../dbinc/db_page.h 293 @@ -1321,72 +1599,81 @@ R1 ../hmac/sha1.c /^#define R1(v,w,x,y,z,i) z+=((w&(x^y))^y)+blk(i)+0x/ R2 ../hmac/sha1.c /^#define R2(v,w,x,y,z,i) z+=(w^x^y)+blk(i)+0x6ED9EB/ R3 ../hmac/sha1.c /^#define R3(v,w,x,y,z,i) z+=(((w|x)&y)|(w&x))+blk(i/ R4 ../hmac/sha1.c /^#define R4(v,w,x,y,z,i) z+=(w^x^y)+blk(i)+0xCA62C1/ -RAND_MAX ../tcl/tcl_util.c 92 RECNO ../dbinc/btree.h 51 -RECNO_OOB ../dbinc/db_int.in 47 -REC_CLOSE ../dbinc/db_am.h 54 +RECNO_OOB ../dbinc/db_int.in 78 +REC_CLOSE ../dbinc/db_am.h 53 +REC_FGET ../dbinc/db_am.h /^#define REC_FGET(mpf, pgno, pagep, cont) \\$/ REC_INTRO ../dbinc/db_am.h /^#define REC_INTRO(func, inc_count) do { \\$/ -REC_NOOP_CLOSE ../dbinc/db_am.h 72 +REC_NOOP_CLOSE ../dbinc/db_am.h 71 REC_NOOP_INTRO ../dbinc/db_am.h /^#define REC_NOOP_INTRO(func) do { \\$/ REC_PRINT ../dbinc/db_am.h /^#define REC_PRINT(func) \\$/ -REGINFO ../dbinc/db_int.in 418 -REGION_CREATE ../dbinc/region.h 218 -REGION_CREATE_OK ../dbinc/region.h 219 +REGINFO ../dbinc/db_int.in 522 +REGION_CREATE ../dbinc/region.h 229 +REGION_CREATE_OK ../dbinc/region.h 230 REGION_ID_ENV ../dbinc/region.h 108 -REGION_JOIN_OK ../dbinc/region.h 220 -REL_ENVLOCK ../fileops/fop_util.c /^#define REL_ENVLOCK(ENV, L) \\$/ -REPDBNAME ../rep/rep_method.c 396 -REP_ALIVE ../dbinc/rep.h 11 -REP_ALIVE_REQ ../dbinc/rep.h 12 -REP_ALL_REQ ../dbinc/rep.h 13 -REP_DUPMASTER ../dbinc/rep.h 14 -REP_FILE ../dbinc/rep.h 15 -REP_FILE_REQ ../dbinc/rep.h 16 -REP_F_EPHASE1 ../dbinc/rep.h 89 -REP_F_EPHASE2 ../dbinc/rep.h 90 -REP_F_LOGSONLY ../dbinc/rep.h 91 -REP_F_MASTER ../dbinc/rep.h 92 -REP_F_MASTERELECT ../dbinc/rep.h 93 -REP_F_NOARCHIVE ../dbinc/rep.h 94 -REP_F_READY ../dbinc/rep.h 95 -REP_F_RECOVER ../dbinc/rep.h 96 -REP_F_TALLY ../dbinc/rep.h 97 -REP_F_UPGRADE ../dbinc/rep.h 98 -REP_ISCLIENT ../dbinc/rep.h 99 -REP_LOG ../dbinc/rep.h 17 -REP_LOG_MORE ../dbinc/rep.h 18 -REP_LOG_REQ ../dbinc/rep.h 19 -REP_MASTER_REQ ../dbinc/rep.h 20 -REP_NEWCLIENT ../dbinc/rep.h 21 -REP_NEWFILE ../dbinc/rep.h 22 -REP_NEWMASTER ../dbinc/rep.h 23 -REP_NEWSITE ../dbinc/rep.h 24 +REGION_JOIN_OK ../dbinc/region.h 231 +REPDBNAME ../rep/rep_method.c 407 +REPPAGENAME ../rep/rep_method.c 408 +REP_ALIVE ../dbinc/rep.h 13 +REP_ALIVE_REQ ../dbinc/rep.h 14 +REP_ALL_REQ ../dbinc/rep.h 15 +REP_DUPMASTER ../dbinc/rep.h 16 +REP_EGENNAME ../dbinc/rep.h 90 +REP_FILE ../dbinc/rep.h 17 +REP_FILE_FAIL ../dbinc/rep.h 18 +REP_FILE_REQ ../dbinc/rep.h 19 +REP_F_CLIENT ../dbinc/rep.h 167 +REP_F_EPHASE1 ../dbinc/rep.h 168 +REP_F_EPHASE2 ../dbinc/rep.h 169 +REP_F_MASTER ../dbinc/rep.h 170 +REP_F_MASTERELECT ../dbinc/rep.h 171 +REP_F_NOARCHIVE ../dbinc/rep.h 172 +REP_F_READY ../dbinc/rep.h 173 +REP_F_RECOVER_LOG ../dbinc/rep.h 174 +REP_F_RECOVER_MASK ../dbinc/rep.h 187 +REP_F_RECOVER_PAGE ../dbinc/rep.h 175 +REP_F_RECOVER_UPDATE ../dbinc/rep.h 176 +REP_F_RECOVER_VERIFY ../dbinc/rep.h 177 +REP_F_TALLY ../dbinc/rep.h 178 +REP_LOG ../dbinc/rep.h 20 +REP_LOG_MORE ../dbinc/rep.h 21 +REP_LOG_REQ ../dbinc/rep.h 22 +REP_MASTER_REQ ../dbinc/rep.h 23 +REP_NEWCLIENT ../dbinc/rep.h 24 +REP_NEWFILE ../dbinc/rep.h 25 +REP_NEWMASTER ../dbinc/rep.h 26 +REP_NEWSITE ../dbinc/rep.h 27 REP_ON ../dbinc/db_int.in /^#define REP_ON(dbenv) ((dbenv)->rep_handle != NUL/ -REP_PAGE ../dbinc/rep.h 30 -REP_PAGE_REQ ../dbinc/rep.h 31 -REP_PLIST ../dbinc/rep.h 32 -REP_PLIST_REQ ../dbinc/rep.h 33 -REP_VERIFY ../dbinc/rep.h 34 -REP_VERIFY_FAIL ../dbinc/rep.h 35 -REP_VERIFY_REQ ../dbinc/rep.h 36 -REP_VOTE1 ../dbinc/rep.h 37 -REP_VOTE2 ../dbinc/rep.h 38 +REP_PAGE ../dbinc/rep.h 33 +REP_PAGE_FAIL ../dbinc/rep.h 34 +REP_PAGE_MORE ../dbinc/rep.h 35 +REP_PAGE_REQ ../dbinc/rep.h 36 +REP_PRINT_MESSAGE ../dbinc/rep.h /^#define REP_PRINT_MESSAGE(dbenv, eid, rp, str) / +REP_UPDATE ../dbinc/rep.h 37 +REP_UPDATE_REQ ../dbinc/rep.h 38 +REP_VERIFY ../dbinc/rep.h 39 +REP_VERIFY_FAIL ../dbinc/rep.h 40 +REP_VERIFY_REQ ../dbinc/rep.h 41 +REP_VOTE1 ../dbinc/rep.h 42 +REP_VOTE2 ../dbinc/rep.h 43 RESET_RET_MEM ../dbinc/db_int.in /^#define RESET_RET_MEM(dbc) \\$/ +RETRY_CHK ../dbinc/os.h /^#define RETRY_CHK(op, ret) do { \\$/ RET_ERROR ../dbinc/db_185.in 58 -RET_SIZE ../lock/lock.c /^#define RET_SIZE(size, count) ((size) + \\$/ +RET_SIZE ../lock/lock_list.c /^#define RET_SIZE(size, count) ((size) + \\$/ RET_SPECIAL ../dbinc/db_185.in 60 RET_SUCCESS ../dbinc/db_185.in 59 RE_NREC ../dbinc/db_page.h /^#define RE_NREC(p) \\$/ RE_NREC_ADJ ../dbinc/db_page.h /^#define RE_NREC_ADJ(p, adj) \\$/ RE_NREC_SET ../dbinc/db_page.h /^#define RE_NREC_SET(p, num) \\$/ +RINGBUF_LEN ../dbinc/log.h /^#define RINGBUF_LEN(lp, start, end) \\$/ RINTERNAL_PSIZE ../dbinc/db_page.h 650 RINTERNAL_SIZE ../dbinc/db_page.h 648 -RLOCK ../log/log_get.c 26 +RLOCK ../log/log_get.c 25 RMNAMESZ ../dbinc/xa.h 44 RPC_ON ../dbinc/db_int.in /^#define RPC_ON(dbenv) ((dbenv)->cl_handle != NULL/ -RPC_SVC_FG ../rpc_server/c/db_server_svc.c 24 +RPRINT ../dbinc/rep.h /^#define RPRINT(e, r, x) do { \\$/ RSMSG ../db185/db185.c 522 -R_ADDR ../dbinc/region.h /^#define R_ADDR(base, offset) \\$/ +R_ADDR ../dbinc/region.h /^#define R_ADDR(dbenv, base, offset) \\$/ R_CURSOR ../dbinc/db_185.in 93 R_DUP ../dbinc/db_185.in 125 R_FIRST ../dbinc/db_185.in 95 @@ -1398,31 +1685,36 @@ R_LOCK ../dbinc/region.h /^#define R_LOCK(dbenv, reginfo) \\$/ R_NEXT ../dbinc/db_185.in 99 R_NOKEY ../dbinc/db_185.in 155 R_NOOVERWRITE ../dbinc/db_185.in 100 -R_OFFSET ../dbinc/region.h /^#define R_OFFSET(base, p) \\$/ +R_OFFSET ../dbinc/region.h /^#define R_OFFSET(dbenv, base, p) \\$/ R_PREV ../dbinc/db_185.in 101 R_RECNOSYNC ../dbinc/db_185.in 103 R_SETCURSOR ../dbinc/db_185.in 102 R_SNAPSHOT ../dbinc/db_185.in 156 R_UNLOCK ../dbinc/region.h /^#define R_UNLOCK(dbenv, reginfo) \\$/ -SALVAGE_HASH ../dbinc/db_verify.h 108 -SALVAGE_IGNORE ../dbinc/db_verify.h 103 -SALVAGE_INVALID ../dbinc/db_verify.h 102 -SALVAGE_LBTREE ../dbinc/db_verify.h 107 -SALVAGE_LDUP ../dbinc/db_verify.h 104 -SALVAGE_LRECNO ../dbinc/db_verify.h 109 -SALVAGE_LRECNODUP ../dbinc/db_verify.h 105 -SALVAGE_OVERFLOW ../dbinc/db_verify.h 106 -SALVAGE_PRINTABLE ../dbinc/db_verify.h 134 -SALVAGE_PRINTFOOTER ../dbinc/db_verify.h 136 -SALVAGE_PRINTHEADER ../dbinc/db_verify.h 135 -SA_SKIPFIRSTKEY ../dbinc/db_verify.h 65 -SERIAL_INIT ../os/os_fid.c 35 +SALVAGE_HASH ../dbinc/db_verify.h 109 +SALVAGE_IGNORE ../dbinc/db_verify.h 104 +SALVAGE_INVALID ../dbinc/db_verify.h 103 +SALVAGE_LBTREE ../dbinc/db_verify.h 108 +SALVAGE_LDUP ../dbinc/db_verify.h 105 +SALVAGE_LRECNO ../dbinc/db_verify.h 110 +SALVAGE_LRECNODUP ../dbinc/db_verify.h 106 +SALVAGE_OVERFLOW ../dbinc/db_verify.h 107 +SALVAGE_PRINTABLE ../dbinc/db_verify.h 135 +SALVAGE_PRINTFOOTER ../dbinc/db_verify.h 137 +SALVAGE_PRINTHEADER ../dbinc/db_verify.h 136 +SA_SKIPFIRSTKEY ../dbinc/db_verify.h 66 +SEQ_ILLEGAL_AFTER_OPEN ../sequence/sequence.c /^#define SEQ_ILLEGAL_AFTER_OPEN(seq, name) \\$/ +SEQ_ILLEGAL_BEFORE_OPEN ../sequence/sequence.c /^#define SEQ_ILLEGAL_BEFORE_OPEN(seq, name) \\$/ +SEQ_OPEN_FLAGS ../sequence/sequence.c 123 +SEQ_SET_FLAGS ../sequence/sequence.c 252 SET_LOG_FLAGS ../txn/txn.c /^#define SET_LOG_FLAGS(dbenv, txnp, lflags) \\$/ SET_MAP ../lock/lock_deadlock.c /^#define SET_MAP(M, B) ((M)[(B) \/ 32] |= (1 << ((B)/ SET_RET_MEM ../dbinc/db_int.in /^#define SET_RET_MEM(dbc, owner) \\$/ SET_TXN ../xa/xa_db.c /^#define SET_TXN(PARAM, LOCAL) { \\$/ -SHA1HANDSOFF ../hmac/sha1.c 76 -SHALLOC_FRAGMENT ../env/db_salloc.c 149 +SHA1HANDSOFF ../hmac/sha1.c 77 +SHALLOC_FRAGMENT ../env/db_salloc.c 192 +SHM_R ../os/os_oflags.c 136 +SHM_W ../os/os_oflags.c 139 SHOBJECT_LOCK ../dbinc/lock.h /^#define SHOBJECT_LOCK(lt, reg, shobj, ndx) \\$/ SH_DBT_PTR ../dbinc/lock.h /^#define SH_DBT_PTR(p) ((void *)(((u_int8_t *)(p)) / SH_LIST_EMPTY ../dbinc/shqueue.h /^#define SH_LIST_EMPTY(head) \\$/ @@ -1483,7 +1775,7 @@ SPLITOLD ../dbinc/hash.h 132 SPL_NRECS ../dbinc/btree.h 69 SSZ ../dbinc/db_int.in /^#define SSZ(name, field) P_TO_UINT16(&(((name *)0/ SSZA ../dbinc/db_int.in /^#define SSZA(name, field) P_TO_UINT16(&(((name *)0/ -STACK_TO_CURSOR ../btree/bt_recno.c /^#define STACK_TO_CURSOR(cp) { \\$/ +STACK_TO_CURSOR ../btree/bt_recno.c /^#define STACK_TO_CURSOR(cp, ret) { \\$/ STAILQ_CONCAT ../dbinc/queue.h /^#define STAILQ_CONCAT(head1, head2) do { \\$/ STAILQ_EMPTY ../dbinc/queue.h /^#define STAILQ_EMPTY(head) ((head)->stqh_first == / STAILQ_ENTRY ../dbinc/queue.h /^#define STAILQ_ENTRY(type) \\$/ @@ -1500,24 +1792,32 @@ STAILQ_NEXT ../dbinc/queue.h /^#define STAILQ_NEXT(elm, field) ((elm)->field.stq STAILQ_REMOVE ../dbinc/queue.h /^#define STAILQ_REMOVE(head, elm, type, field) do {/ STAILQ_REMOVE_HEAD ../dbinc/queue.h /^#define STAILQ_REMOVE_HEAD(head, field) do { \\$/ STAILQ_REMOVE_HEAD_UNTIL ../dbinc/queue.h /^#define STAILQ_REMOVE_HEAD_UNTIL(head, elm, field)/ -STDERR_FILENO ../common/db_err.c 335 +STAT_FMT ../dbinc/db_int.in /^#define STAT_FMT(msg, fmt, type, v) do { \\$/ +STAT_HEX ../dbinc/db_int.in /^#define STAT_HEX(msg, v) \\$/ +STAT_ISSET ../dbinc/db_int.in /^#define STAT_ISSET(msg, p) \\$/ +STAT_LONG ../dbinc/db_int.in /^#define STAT_LONG(msg, v) \\$/ +STAT_LSN ../dbinc/db_int.in /^#define STAT_LSN(msg, lsnp) \\$/ +STAT_STRING ../dbinc/db_int.in /^#define STAT_STRING(msg, p) do { \\$/ +STAT_ULONG ../dbinc/db_int.in /^#define STAT_ULONG(msg, v) \\$/ +STDERR_FILENO ../clib/snprintf.c 124 STD_LOCKING ../dbinc/db_int.in /^#define STD_LOCKING(dbc) \\$/ STK_CLRDBC ../dbinc/btree.h 75 STK_NOLOCK ../dbinc/btree.h 76 -ST_DUPOK ../dbinc/db_verify.h 51 -ST_DUPSET ../dbinc/db_verify.h 52 -ST_DUPSORT ../dbinc/db_verify.h 53 -ST_IS_RECNO ../dbinc/db_verify.h 54 -ST_OVFL_LEAF ../dbinc/db_verify.h 55 -ST_RECNUM ../dbinc/db_verify.h 56 -ST_RELEN ../dbinc/db_verify.h 57 -ST_TOPLEVEL ../dbinc/db_verify.h 58 +ST_DUPOK ../dbinc/db_verify.h 52 +ST_DUPSET ../dbinc/db_verify.h 53 +ST_DUPSORT ../dbinc/db_verify.h 54 +ST_IS_RECNO ../dbinc/db_verify.h 55 +ST_OVFL_LEAF ../dbinc/db_verify.h 56 +ST_RECNUM ../dbinc/db_verify.h 57 +ST_RELEN ../dbinc/db_verify.h 58 +ST_TOPLEVEL ../dbinc/db_verify.h 59 SWAP ../crypto/rijndael/rijndael-alg-fst.c /^#define SWAP(x) (_lrotl(x, 8) & 0x00ff00ff | _lrot/ SWAP16 ../dbinc/db_swap.h /^#define SWAP16(p) { \\$/ SWAP32 ../dbinc/db_swap.h /^#define SWAP32(p) { \\$/ -SWIG_JavaExceptionCodes ../libdb_java/db_java_wrap.c 30 -SWIG_JavaThrowException ../libdb_java/db_java_wrap.c /^void SWIG_JavaThrowException(JNIEnv *jenv, SWIG_Ja/ +SWIG_JavaExceptionCodes ../libdb_java/db_java_wrap.c 31 +SWIG_JavaThrowException ../libdb_java/db_java_wrap.c /^static void SWIG_JavaThrowException(JNIEnv *jenv, / SWIG_NOINCLUDE ../libdb_java/db_java_wrap.c 75 +SWIG_contract_assert ../libdb_java/db_java_wrap.c /^#define SWIG_contract_assert(nullreturn, expr, msg/ S_APPEND ../dbinc/btree.h 103 S_DELETE ../dbinc/btree.h 117 S_DELNO ../dbinc/btree.h 104 @@ -1527,13 +1827,13 @@ S_EXACT ../dbinc/btree.h 107 S_FIND ../dbinc/btree.h 118 S_FIND_WR ../dbinc/btree.h 119 S_INSERT ../dbinc/btree.h 120 -S_IRGRP ../os/os_oflags.c 83 -S_IROTH ../os/os_oflags.c 89 -S_IRUSR ../os/os_oflags.c 77 +S_IRGRP ../os/os_oflags.c 74 +S_IROTH ../os/os_oflags.c 80 +S_IRUSR ../os/os_oflags.c 68 S_ISDIR ../os/os_stat.c /^#define S_ISDIR(m) (_S_IFDIR & (m))$/ -S_IWGRP ../os/os_oflags.c 86 -S_IWOTH ../os/os_oflags.c 92 -S_IWUSR ../os/os_oflags.c 80 +S_IWGRP ../os/os_oflags.c 77 +S_IWOTH ../os/os_oflags.c 83 +S_IWUSR ../os/os_oflags.c 71 S_KEYFIRST ../dbinc/btree.h 121 S_KEYLAST ../dbinc/btree.h 122 S_PARENT ../dbinc/btree.h 108 @@ -1560,13 +1860,14 @@ TAILQ_LAST ../dbinc/queue.h /^#define TAILQ_LAST(head, headname) \\$/ TAILQ_NEXT ../dbinc/queue.h /^#define TAILQ_NEXT(elm, field) ((elm)->field.tqe_n/ TAILQ_PREV ../dbinc/queue.h /^#define TAILQ_PREV(elm, headname, field) \\$/ TAILQ_REMOVE ../dbinc/queue.h /^#define TAILQ_REMOVE(head, elm, field) do { \\$/ -TCLDB_SENDITEMS ../tcl/tcl_db_pkg.c 3089 -TEMPERING_MASK_B ../crypto/mersenne/mt19937db.c 45 -TEMPERING_MASK_C ../crypto/mersenne/mt19937db.c 46 +TCLDB_SENDITEMS ../tcl/tcl_db_pkg.c 3467 +TEMPERING_MASK_B ../crypto/mersenne/mt19937db.c 44 +TEMPERING_MASK_C ../crypto/mersenne/mt19937db.c 45 TEMPERING_SHIFT_L ../crypto/mersenne/mt19937db.c /^#define TEMPERING_SHIFT_L(y) (y >> 18)$/ TEMPERING_SHIFT_S ../crypto/mersenne/mt19937db.c /^#define TEMPERING_SHIFT_S(y) (y << 7)$/ TEMPERING_SHIFT_T ../crypto/mersenne/mt19937db.c /^#define TEMPERING_SHIFT_T(y) (y << 15)$/ TEMPERING_SHIFT_U ../crypto/mersenne/mt19937db.c /^#define TEMPERING_SHIFT_U(y) (y >> 11)$/ +TIMESTAMP_CHECK ../rep/rep_util.c /^#define TIMESTAMP_CHECK(dbenv, ts, renv) \\$/ TLOOP ../clib/memmove.c /^#define TLOOP(s) if (t) TLOOP1(s)$/ TLOOP1 ../clib/memmove.c /^#define TLOOP1(s) do { s; } while (--t)$/ TMASYNC ../dbinc/xa.h 90 @@ -1594,40 +1895,41 @@ TM_RESUME ../dbinc/xa.h 117 TRACEBUF ../dbinc/queue.h 193 TRASHIT ../dbinc/queue.h /^#define TRASHIT(x) do {(x) = (void *)-1;} while (0/ TRUE ../crypto/rijndael/rijndael-api-fst.h 53 -TXN2JDBENV ../libdb_java/db_java_wrap.c 387 +TXN2JDBENV ../libdb_java/db_java_wrap.c 814 TXNLIST_NEW ../dbinc/db_dispatch.h 101 -TXN_ABORT ../dbinc/txn.h 145 +TXN_ABORT ../dbinc/txn.h 207 TXN_ABORTED ../dbinc/txn.h 47 TXN_BUBBLE ../db/db_dispatch.c /^#define TXN_BUBBLE(AP, MAX) { \\$/ -TXN_CHILDCOMMIT ../dbinc/db.in 833 -TXN_COMMIT ../dbinc/txn.h 143 +TXN_CHILDCOMMIT ../dbinc/db.in 898 +TXN_COMMIT ../dbinc/txn.h 205 TXN_COMMITTED ../dbinc/txn.h 49 -TXN_COMPENSATE ../dbinc/db.in 834 -TXN_DIRTY_READ ../dbinc/db.in 835 +TXN_COMPENSATE ../dbinc/db.in 899 +TXN_DEADLOCK ../dbinc/db.in 900 +TXN_DEGREE_2 ../dbinc/db.in 901 +TXN_DIRTY_READ ../dbinc/db.in 902 TXN_DTL_COLLECTED ../dbinc/txn.h 51 TXN_DTL_RESTORED ../dbinc/txn.h 52 -TXN_EVENT ../txn/txn_util.c 27 +TXN_EVENT ../txn/txn_util.c 25 TXN_EVENT_T ../dbinc/txn.h 21 -TXN_EXPECTED ../dbinc/txn.h 148 -TXN_IGNORE ../dbinc/txn.h 147 +TXN_EXPECTED ../dbinc/txn.h 209 +TXN_IGNORE ../dbinc/txn.h 208 TXN_INVALID ../dbinc/txn.h 32 TXN_IN_RECOVERY ../dbinc/txn.h 115 -TXN_LOCKTIMEOUT ../dbinc/db.in 836 +TXN_LOCKTIMEOUT ../dbinc/db.in 903 TXN_MAINT_SIZE ../dbinc/txn.h 120 -TXN_MALLOC ../dbinc/db.in 837 +TXN_MALLOC ../dbinc/db.in 904 TXN_MAXIMUM ../dbinc/txn.h 31 TXN_MINIMUM ../dbinc/txn.h 30 -TXN_NOSYNC ../dbinc/db.in 838 -TXN_NOTFOUND ../dbinc/txn.h 146 -TXN_NOWAIT ../dbinc/db.in 839 -TXN_OK ../dbinc/txn.h 142 +TXN_NOSYNC ../dbinc/db.in 905 +TXN_NOWAIT ../dbinc/db.in 906 +TXN_OK ../dbinc/txn.h 204 TXN_ON ../dbinc/db_int.in /^#define TXN_ON(dbenv) ((dbenv)->tx_handle != NULL/ -TXN_PREPARE ../dbinc/txn.h 144 +TXN_PREPARE ../dbinc/txn.h 206 TXN_PREPARED ../dbinc/txn.h 48 -TXN_RESTORED ../dbinc/db.in 840 +TXN_RESTORED ../dbinc/db.in 907 TXN_RUNNING ../dbinc/txn.h 46 -TXN_SYNC ../dbinc/db.in 841 -TXN_UNEXPECTED ../dbinc/txn.h 149 +TXN_SYNC ../dbinc/db.in 908 +TXN_UNEXPECTED ../dbinc/txn.h 210 TXN_XA_ABORTED ../dbinc/txn.h 57 TXN_XA_DEADLOCKED ../dbinc/txn.h 58 TXN_XA_ENDED ../dbinc/txn.h 59 @@ -1637,32 +1939,37 @@ TXN_XA_SUSPENDED ../dbinc/txn.h 62 TYPE ../dbinc/db_page.h /^#define TYPE(p) (((PAGE *)p)->type)$/ TYPE_ERR_PRINT ../dbinc/db_verify.h /^#define TYPE_ERR_PRINT(dbenv, func, pgno, ptype) / T_RESTORED ../db/db_dispatch.c /^#define T_RESTORED(txn) ((txn) != NULL && F_/ -UINT16_T_MAX ../dbinc/db_int.in 38 -UINT32_T_MAX ../dbinc/db_int.in 39 +UINT16_MAX ../dbinc/db_int.in 39 +UINT32_CMP ../lock/lock_list.c /^#define UINT32_CMP(A, B) ((A) == (B) ? 0 : ((A) > / +UINT32_MAX ../dbinc/db_int.in 42 +UINT64_FMT ../dbinc/db_int.in 56 +UINT64_MAX ../dbinc/db_int.in 53 UMRW_SET ../dbinc/debug.h /^#define UMRW_SET(v) (v) = 0$/ UNLOCKREGION ../dbinc/lock.h /^#define UNLOCKREGION(dbenv, lt) R_UNLOCK((dbenv),/ -UPPER_MASK ../crypto/mersenne/mt19937db.c 41 -UPREFIX ../clib/strerror.c 57 -USEC_PER_MS ../dbinc/db_int.in 45 -VRFY_CHILDINFO ../dbinc/db_int.in 421 -VRFY_DBINFO ../dbinc/db_int.in 422 -VRFY_DUPS_UNSORTED ../dbinc/db_verify.h 181 -VRFY_HAS_DUPS ../dbinc/db_verify.h 182 -VRFY_HAS_DUPSORT ../dbinc/db_verify.h 183 -VRFY_HAS_RECNUMS ../dbinc/db_verify.h 185 -VRFY_HAS_SUBDBS ../dbinc/db_verify.h 184 -VRFY_INCOMPLETE ../dbinc/db_verify.h 186 -VRFY_IS_ALLZEROES ../dbinc/db_verify.h 187 -VRFY_IS_FIXEDLEN ../dbinc/db_verify.h 188 -VRFY_IS_RECNO ../dbinc/db_verify.h 189 -VRFY_IS_RRECNO ../dbinc/db_verify.h 190 -VRFY_LEAFCHAIN_BROKEN ../dbinc/db_verify.h 137 -VRFY_OVFL_LEAFSEEN ../dbinc/db_verify.h 191 -VRFY_PAGEINFO ../dbinc/db_int.in 423 -VRFY_QMETA_SET ../dbinc/db_verify.h 138 -V_DUPLICATE ../dbinc/db_verify.h 202 -V_OVERFLOW ../dbinc/db_verify.h 203 -V_RECNO ../dbinc/db_verify.h 204 +UPPER_MASK ../crypto/mersenne/mt19937db.c 40 +UPREFIX ../clib/strerror.c 55 +USEC_PER_MS ../dbinc/db_int.in 76 +VERIFY_FLAGS ../db/db_vrfy.c 65 +VRFY_CHILDINFO ../dbinc/db_int.in 525 +VRFY_DBINFO ../dbinc/db_int.in 526 +VRFY_DUPS_UNSORTED ../dbinc/db_verify.h 182 +VRFY_HAS_DUPS ../dbinc/db_verify.h 183 +VRFY_HAS_DUPSORT ../dbinc/db_verify.h 184 +VRFY_HAS_RECNUMS ../dbinc/db_verify.h 186 +VRFY_HAS_SUBDBS ../dbinc/db_verify.h 185 +VRFY_INCOMPLETE ../dbinc/db_verify.h 187 +VRFY_IS_ALLZEROES ../dbinc/db_verify.h 188 +VRFY_IS_FIXEDLEN ../dbinc/db_verify.h 189 +VRFY_IS_RECNO ../dbinc/db_verify.h 190 +VRFY_IS_RRECNO ../dbinc/db_verify.h 191 +VRFY_ITEM ../btree/bt_verify.c 507 +VRFY_LEAFCHAIN_BROKEN ../dbinc/db_verify.h 138 +VRFY_OVFL_LEAFSEEN ../dbinc/db_verify.h 192 +VRFY_PAGEINFO ../dbinc/db_int.in 527 +VRFY_QMETA_SET ../dbinc/db_verify.h 139 +V_DUPLICATE ../dbinc/db_verify.h 203 +V_OVERFLOW ../dbinc/db_verify.h 204 +V_RECNO ../dbinc/db_verify.h 205 WRAPPED_CLASS ../dbinc/cxx_int.h /^#define WRAPPED_CLASS(_WRAPPER_CLASS, _IMP_CLASS, / XAER_ASYNC ../dbinc/xa.h 164 XAER_DUPID ../dbinc/xa.h 173 @@ -1672,7 +1979,7 @@ XAER_OUTSIDE ../dbinc/xa.h 174 XAER_PROTO ../dbinc/xa.h 170 XAER_RMERR ../dbinc/xa.h 166 XAER_RMFAIL ../dbinc/xa.h 172 -XA_FLAGS ../xa/xa.c 176 +XA_FLAGS ../xa/xa.c 174 XA_H ../dbinc/xa.h 15 XA_HEURCOM ../dbinc/xa.h 152 XA_HEURHAZ ../dbinc/xa.h 150 @@ -1696,7 +2003,7 @@ XID ../dbinc/xa.h 30 XIDDATASIZE ../dbinc/xa.h 20 ZEROPG_ERR_PRINT ../dbinc/db_verify.h /^#define ZEROPG_ERR_PRINT(dbenv, pgno, str) do { / ZERO_LSN ../dbinc/db_int.in /^#define ZERO_LSN(LSN) do { \\$/ -ZF_LARGE_WRITE ../os/os_rw.c 247 +ZF_LARGE_WRITE ../os/os_rw.c 273 _CXX_INT_H_ ../dbinc/cxx_int.h 11 _CopyObjBytes ../tcl/tcl_internal.c /^_CopyObjBytes(interp, obj, newp, sizep, freep)$/ _DB_185_H_ ../dbinc/db_185.in 39 @@ -1728,10 +2035,10 @@ _DB_VERIFY_H_ ../dbinc/db_verify.h 11 _DbInfoDelete ../tcl/tcl_db.c /^_DbInfoDelete(interp, dbip)$/ _DeleteInfo ../tcl/tcl_internal.c /^_DeleteInfo(p)$/ _EnvInfoDelete ../tcl/tcl_env.c /^_EnvInfoDelete(interp, envip)$/ -_ErrorFunc ../tcl/tcl_internal.c /^_ErrorFunc(pfx, msg)$/ +_ErrorFunc ../tcl/tcl_internal.c /^_ErrorFunc(dbenv, pfx, msg)$/ _ErrorSetup ../tcl/tcl_internal.c /^_ErrorSetup(interp, ret, errmsg)$/ _FOP_H_ ../dbinc/fop.h 11 -_GetFlagsList ../tcl/tcl_internal.c /^_GetFlagsList(interp, flags, func)$/ +_GetFlagsList ../tcl/tcl_internal.c /^_GetFlagsList(interp, flags, fnp)$/ _GetGlobPrefix ../tcl/tcl_internal.c /^_GetGlobPrefix(pattern, prefix)$/ _GetLsn ../tcl/tcl_internal.c /^_GetLsn(interp, obj, lsn)$/ _GetThisLock ../tcl/tcl_lock.c /^_GetThisLock(interp, envp, lockid, flag, objp, mod/ @@ -1751,14 +2058,16 @@ _Set3DBTList ../tcl/tcl_internal.c /^_Set3DBTList(interp, list, elem1, is1recno, _SetInfoData ../tcl/tcl_internal.c /^_SetInfoData(p, data)$/ _SetListElem ../tcl/tcl_internal.c /^_SetListElem(interp, list, elem1, e1cnt, elem2, e2/ _SetListElemInt ../tcl/tcl_internal.c /^_SetListElemInt(interp, list, elem1, elem2)$/ +_SetListElemWideInt ../tcl/tcl_internal.c /^_SetListElemWideInt(interp, list, elem1, elem2)$/ _SetListRecnoElem ../tcl/tcl_internal.c /^_SetListRecnoElem(interp, list, elem1, elem2, e2si/ _SetMultiList ../tcl/tcl_internal.c /^_SetMultiList(interp, list, key, data, type, flag)/ _TXN_H_ ../dbinc/txn.h 11 _TxnInfoDelete ../tcl/tcl_txn.c /^_TxnInfoDelete(interp, txnip)$/ __BIT_TYPES_DEFINED__ ../dbinc/db.in 62 -__DBC_INTERNAL ../dbinc/db_int.in 297 -__DB_OSTREAMCLASS ../dbinc/db_cxx.in 57 +__DBC_INTERNAL ../dbinc/db_int.in 372 __DB_OVFL ../env/env_open.c /^#define __DB_OVFL(v, max) \\$/ +__DB_STD ../dbinc/db_cxx.in /^#define __DB_STD(x) std::x$/ +__ENV_LPUT ../dbinc/db_am.h /^#define __ENV_LPUT(dbenv, lock, flags) \\$/ __LPUT ../dbinc/db_am.h /^#define __LPUT(dbc, lock) \\$/ __P ../dbinc/db_185.in /^#define __P(protos) protos \/* ANSI C prototypes */ __P_DUPLICATE ../dbinc/db_page.h 38 @@ -1782,9 +2091,8 @@ __attribute__ ../dbinc/debug.h /^#define __attribute__(s)$/ __bam_30_btreemeta ../btree/bt_upgrade.c /^__bam_30_btreemeta(dbp, real_name, buf)$/ __bam_31_btreemeta ../btree/bt_upgrade.c /^__bam_31_btreemeta(dbp, real_name, flags, fhp, h, / __bam_31_lbtree ../btree/bt_upgrade.c /^__bam_31_lbtree(dbp, real_name, flags, fhp, h, dir/ -__bam_adj_getpgnos ../btree/btree_auto.c /^__bam_adj_getpgnos(dbenv, rec, lsnp, notused1, sum/ __bam_adj_log ../btree/btree_auto.c /^__bam_adj_log(dbp, txnid, ret_lsnp, flags, pgno, l/ -__bam_adj_print ../btree/btree_auto.c /^__bam_adj_print(dbenv, dbtp, lsnp, notused2, notus/ +__bam_adj_print ../btree/btree_autop.c /^__bam_adj_print(dbenv, dbtp, lsnp, notused2, notus/ __bam_adj_read ../btree/btree_auto.c /^__bam_adj_read(dbenv, recbuf, argpp)$/ __bam_adj_recover ../btree/bt_rec.c /^__bam_adj_recover(dbenv, dbtp, lsnp, op, info)$/ __bam_adjindx ../btree/bt_delete.c /^__bam_adjindx(dbc, h, indx, indx_copy, is_insert)$/ @@ -1819,22 +2127,18 @@ __bam_ca_rsplit ../btree/bt_curadj.c /^__bam_ca_rsplit(my_dbc, fpgno, tpgno)$/ __bam_ca_split ../btree/bt_curadj.c /^__bam_ca_split(my_dbc, ppgno, lpgno, rpgno, split_/ __bam_ca_undodup ../btree/bt_curadj.c /^__bam_ca_undodup(dbp, first, fpgno, fi, ti)$/ __bam_ca_undosplit ../btree/bt_curadj.c /^__bam_ca_undosplit(dbp, frompgno, topgno, lpgno, s/ -__bam_cadjust_getpgnos ../btree/btree_auto.c /^__bam_cadjust_getpgnos(dbenv, rec, lsnp, notused1,/ __bam_cadjust_log ../btree/btree_auto.c /^__bam_cadjust_log(dbp, txnid, ret_lsnp, flags, pgn/ -__bam_cadjust_print ../btree/btree_auto.c /^__bam_cadjust_print(dbenv, dbtp, lsnp, notused2, n/ +__bam_cadjust_print ../btree/btree_autop.c /^__bam_cadjust_print(dbenv, dbtp, lsnp, notused2, n/ __bam_cadjust_read ../btree/btree_auto.c /^__bam_cadjust_read(dbenv, recbuf, argpp)$/ __bam_cadjust_recover ../btree/bt_rec.c /^__bam_cadjust_recover(dbenv, dbtp, lsnp, op, info)/ -__bam_cdel_getpgnos ../btree/btree_auto.c /^__bam_cdel_getpgnos(dbenv, rec, lsnp, notused1, su/ __bam_cdel_log ../btree/btree_auto.c /^__bam_cdel_log(dbp, txnid, ret_lsnp, flags, pgno, / -__bam_cdel_print ../btree/btree_auto.c /^__bam_cdel_print(dbenv, dbtp, lsnp, notused2, notu/ +__bam_cdel_print ../btree/btree_autop.c /^__bam_cdel_print(dbenv, dbtp, lsnp, notused2, notu/ __bam_cdel_read ../btree/btree_auto.c /^__bam_cdel_read(dbenv, recbuf, argpp)$/ __bam_cdel_recover ../btree/bt_rec.c /^__bam_cdel_recover(dbenv, dbtp, lsnp, op, info)$/ __bam_cmp ../btree/bt_compare.c /^__bam_cmp(dbp, dbt, h, indx, func, cmpp)$/ __bam_copy ../btree/bt_split.c /^__bam_copy(dbp, pp, cp, nxt, stop)$/ -__bam_cprint ../btree/bt_curadj.c /^__bam_cprint(dbc)$/ -__bam_curadj_getpgnos ../btree/btree_auto.c /^__bam_curadj_getpgnos(dbenv, rec, lsnp, notused1, / __bam_curadj_log ../btree/btree_auto.c /^__bam_curadj_log(dbp, txnid, ret_lsnp, flags, mode/ -__bam_curadj_print ../btree/btree_auto.c /^__bam_curadj_print(dbenv, dbtp, lsnp, notused2, no/ +__bam_curadj_print ../btree/btree_autop.c /^__bam_curadj_print(dbenv, dbtp, lsnp, notused2, no/ __bam_curadj_read ../btree/btree_auto.c /^__bam_curadj_read(dbenv, recbuf, argpp)$/ __bam_curadj_recover ../btree/bt_rec.c /^__bam_curadj_recover(dbenv, dbtp, lsnp, op, info)$/ __bam_db_close ../btree/bt_method.c /^__bam_db_close(dbp)$/ @@ -1849,9 +2153,8 @@ __bam_get_prev ../btree/bt_cursor.c /^__bam_get_prev(dbc)$/ __bam_getboth_finddatum ../btree/bt_cursor.c /^__bam_getboth_finddatum(dbc, data, flags)$/ __bam_getbothc ../btree/bt_cursor.c /^__bam_getbothc(dbc, data)$/ __bam_iitem ../btree/bt_put.c /^__bam_iitem(dbc, key, data, op, flags)$/ -__bam_init_getpgnos ../btree/btree_auto.c /^__bam_init_getpgnos(dbenv, dtabp, dtabsizep)$/ __bam_init_meta ../btree/bt_open.c /^__bam_init_meta(dbp, meta, pgno, lsnp)$/ -__bam_init_print ../btree/btree_auto.c /^__bam_init_print(dbenv, dtabp, dtabsizep)$/ +__bam_init_print ../btree/btree_autop.c /^__bam_init_print(dbenv, dtabp, dtabsizep)$/ __bam_init_recover ../btree/btree_auto.c /^__bam_init_recover(dbenv, dtabp, dtabsizep)$/ __bam_isopd ../btree/bt_cursor.c /^__bam_isopd(dbc, pgnop)$/ __bam_key_range ../btree/bt_stat.c /^__bam_key_range(dbc, dbt, kp, flags)$/ @@ -1870,30 +2173,32 @@ __bam_partsize ../btree/bt_put.c /^__bam_partsize(dbp, op, data, h, indx)$/ __bam_pgin ../btree/bt_conv.c /^__bam_pgin(dbenv, dummydbp, pg, pp, cookie)$/ __bam_pgout ../btree/bt_conv.c /^__bam_pgout(dbenv, dummydbp, pg, pp, cookie)$/ __bam_pinsert ../btree/bt_split.c /^__bam_pinsert(dbc, parent, lchild, rchild, space_c/ +__bam_print_cursor ../btree/bt_stat.c /^__bam_print_cursor(dbc)$/ __bam_psplit ../btree/bt_split.c /^__bam_psplit(dbc, cp, lp, rp, splitret)$/ -__bam_rcuradj_getpgnos ../btree/btree_auto.c /^__bam_rcuradj_getpgnos(dbenv, rec, lsnp, notused1,/ __bam_rcuradj_log ../btree/btree_auto.c /^__bam_rcuradj_log(dbp, txnid, ret_lsnp, flags, mod/ -__bam_rcuradj_print ../btree/btree_auto.c /^__bam_rcuradj_print(dbenv, dbtp, lsnp, notused2, n/ +__bam_rcuradj_print ../btree/btree_autop.c /^__bam_rcuradj_print(dbenv, dbtp, lsnp, notused2, n/ __bam_rcuradj_read ../btree/btree_auto.c /^__bam_rcuradj_read(dbenv, recbuf, argpp)$/ __bam_rcuradj_recover ../btree/bt_rec.c /^__bam_rcuradj_recover(dbenv, dbtp, lsnp, op, info)/ __bam_read_root ../btree/bt_open.c /^__bam_read_root(dbp, txn, base_pgno, flags)$/ __bam_reclaim ../btree/bt_reclaim.c /^__bam_reclaim(dbp, txn)$/ -__bam_repl_getpgnos ../btree/btree_auto.c /^__bam_repl_getpgnos(dbenv, rec, lsnp, notused1, su/ +__bam_relink ../btree/bt_delete.c /^__bam_relink(dbc, pagep, new_next)$/ +__bam_relink_log ../btree/btree_auto.c /^__bam_relink_log(dbp, txnid, ret_lsnp, flags, pgno/ +__bam_relink_print ../btree/btree_autop.c /^__bam_relink_print(dbenv, dbtp, lsnp, notused2, no/ +__bam_relink_read ../btree/btree_auto.c /^__bam_relink_read(dbenv, recbuf, argpp)$/ +__bam_relink_recover ../btree/bt_rec.c /^__bam_relink_recover(dbenv, dbtp, lsnp, op, info)$/ __bam_repl_log ../btree/btree_auto.c /^__bam_repl_log(dbp, txnid, ret_lsnp, flags, pgno, / -__bam_repl_print ../btree/btree_auto.c /^__bam_repl_print(dbenv, dbtp, lsnp, notused2, notu/ +__bam_repl_print ../btree/btree_autop.c /^__bam_repl_print(dbenv, dbtp, lsnp, notused2, notu/ __bam_repl_read ../btree/btree_auto.c /^__bam_repl_read(dbenv, recbuf, argpp)$/ __bam_repl_recover ../btree/bt_rec.c /^__bam_repl_recover(dbenv, dbtp, lsnp, op, info)$/ __bam_ritem ../btree/bt_put.c /^__bam_ritem(dbc, h, indx, data)$/ __bam_root ../btree/bt_split.c /^__bam_root(dbc, cp)$/ -__bam_root_getpgnos ../btree/btree_auto.c /^__bam_root_getpgnos(dbenv, rec, lsnp, notused1, su/ __bam_root_log ../btree/btree_auto.c /^__bam_root_log(dbp, txnid, ret_lsnp, flags, meta_p/ -__bam_root_print ../btree/btree_auto.c /^__bam_root_print(dbenv, dbtp, lsnp, notused2, notu/ +__bam_root_print ../btree/btree_autop.c /^__bam_root_print(dbenv, dbtp, lsnp, notused2, notu/ __bam_root_read ../btree/btree_auto.c /^__bam_root_read(dbenv, recbuf, argpp)$/ __bam_root_recover ../btree/bt_rec.c /^__bam_root_recover(dbenv, dbtp, lsnp, op, info)$/ __bam_rsearch ../btree/bt_rsearch.c /^__bam_rsearch(dbc, recnop, flags, stop, exactp)$/ -__bam_rsplit_getpgnos ../btree/btree_auto.c /^__bam_rsplit_getpgnos(dbenv, rec, lsnp, notused1, / __bam_rsplit_log ../btree/btree_auto.c /^__bam_rsplit_log(dbp, txnid, ret_lsnp, flags, pgno/ -__bam_rsplit_print ../btree/btree_auto.c /^__bam_rsplit_print(dbenv, dbtp, lsnp, notused2, no/ +__bam_rsplit_print ../btree/btree_autop.c /^__bam_rsplit_print(dbenv, dbtp, lsnp, notused2, no/ __bam_rsplit_read ../btree/btree_auto.c /^__bam_rsplit_read(dbenv, recbuf, argpp)$/ __bam_rsplit_recover ../btree/bt_rec.c /^__bam_rsplit_recover(dbenv, dbtp, lsnp, op, info)$/ __bam_safe_getdata ../btree/bt_verify.c /^__bam_safe_getdata(dbp, h, i, ovflok, dbt, freedbt/ @@ -1906,13 +2211,13 @@ __bam_set_bt_minkey ../btree/bt_method.c /^__bam_set_bt_minkey(dbp, bt_minkey)$/ __bam_set_bt_prefix ../btree/bt_method.c /^__bam_set_bt_prefix(dbp, func)$/ __bam_set_flags ../btree/bt_method.c /^__bam_set_flags(dbp, flagsp)$/ __bam_split ../btree/bt_split.c /^__bam_split(dbc, arg, root_pgnop)$/ -__bam_split_getpgnos ../btree/btree_auto.c /^__bam_split_getpgnos(dbenv, rec, lsnp, notused1, s/ __bam_split_log ../btree/btree_auto.c /^__bam_split_log(dbp, txnid, ret_lsnp, flags, left,/ -__bam_split_print ../btree/btree_auto.c /^__bam_split_print(dbenv, dbtp, lsnp, notused2, not/ +__bam_split_print ../btree/btree_autop.c /^__bam_split_print(dbenv, dbtp, lsnp, notused2, not/ __bam_split_read ../btree/btree_auto.c /^__bam_split_read(dbenv, recbuf, argpp)$/ __bam_split_recover ../btree/bt_rec.c /^__bam_split_recover(dbenv, dbtp, lsnp, op, info)$/ __bam_stat ../btree/bt_stat.c /^__bam_stat(dbc, spp, flags)$/ __bam_stat_callback ../btree/bt_stat.c /^__bam_stat_callback(dbp, h, cookie, putp)$/ +__bam_stat_print ../btree/bt_stat.c /^__bam_stat_print(dbc, flags)$/ __bam_stkgrow ../btree/bt_search.c /^__bam_stkgrow(dbenv, cp)$/ __bam_stkrel ../btree/bt_search.c /^__bam_stkrel(dbc, flags)$/ __bam_total ../btree/bt_rsearch.c /^__bam_total(dbp, h)$/ @@ -1928,17 +2233,16 @@ __bam_vrfy_treeorder ../btree/bt_verify.c /^__bam_vrfy_treeorder(dbp, pgno, h, l __bhcmp ../mp/mp_sync.c /^__bhcmp(p1, p2)$/ __build_data ../log/log_archive.c /^__build_data(dbenv, pref, listp)$/ __cmpfunc ../log/log_archive.c /^__cmpfunc(p1, p2)$/ -__crdel_init_getpgnos ../db/crdel_auto.c /^__crdel_init_getpgnos(dbenv, dtabp, dtabsizep)$/ -__crdel_init_print ../db/crdel_auto.c /^__crdel_init_print(dbenv, dtabp, dtabsizep)$/ +__crdel_init_print ../db/crdel_autop.c /^__crdel_init_print(dbenv, dtabp, dtabsizep)$/ __crdel_init_recover ../db/crdel_auto.c /^__crdel_init_recover(dbenv, dtabp, dtabsizep)$/ -__crdel_metasub_getpgnos ../db/crdel_auto.c /^__crdel_metasub_getpgnos(dbenv, rec, lsnp, notused/ __crdel_metasub_log ../db/crdel_auto.c /^__crdel_metasub_log(dbp, txnid, ret_lsnp, flags, p/ -__crdel_metasub_print ../db/crdel_auto.c /^__crdel_metasub_print(dbenv, dbtp, lsnp, notused2,/ +__crdel_metasub_print ../db/crdel_autop.c /^__crdel_metasub_print(dbenv, dbtp, lsnp, notused2,/ __crdel_metasub_read ../db/crdel_auto.c /^__crdel_metasub_read(dbenv, recbuf, argpp)$/ __crdel_metasub_recover ../db/crdel_rec.c /^__crdel_metasub_recover(dbenv, dbtp, lsnp, op, inf/ __crypto_algsetup ../crypto/crypto.c /^__crypto_algsetup(dbenv, db_cipher, alg, do_init)$/ __crypto_dbenv_close ../crypto/crypto.c /^__crypto_dbenv_close(dbenv)$/ __crypto_decrypt_meta ../crypto/crypto.c /^__crypto_decrypt_meta(dbenv, dbp, mbuf, do_metachk/ +__crypto_region_destroy ../crypto/crypto.c /^__crypto_region_destroy(dbenv)$/ __crypto_region_init ../crypto/crypto.c /^__crypto_region_init(dbenv)$/ __crypto_set_passwd ../crypto/crypto.c /^__crypto_set_passwd(dbenv_src, dbenv_dest)$/ __db185_open ../db185/db185.c /^__db185_open(file, oflags, mode, type, openinfo)$/ @@ -1950,9 +2254,8 @@ __db_SHA1Update ../hmac/sha1.c /^__db_SHA1Update(context, data, len)$/ __db_SHAPrintContext ../hmac/sha1.c /^__db_SHAPrintContext(context, msg)$/ __db_add_limbo ../db/db_dispatch.c /^__db_add_limbo(dbenv, info, fileid, pgno, count)$/ __db_add_recovery ../db/db_dispatch.c /^__db_add_recovery(dbenv, dtab, dtabsize, func, ndx/ -__db_addrem_getpgnos ../db/db_auto.c /^__db_addrem_getpgnos(dbenv, rec, lsnp, notused1, s/ __db_addrem_log ../db/db_auto.c /^__db_addrem_log(dbp, txnid, ret_lsnp, flags,$/ -__db_addrem_print ../db/db_auto.c /^__db_addrem_print(dbenv, dbtp, lsnp, notused2, not/ +__db_addrem_print ../db/db_autop.c /^__db_addrem_print(dbenv, dbtp, lsnp, notused2, not/ __db_addrem_read ../db/db_auto.c /^__db_addrem_read(dbenv, recbuf, argpp)$/ __db_addrem_recover ../db/db_rec.c /^__db_addrem_recover(dbenv, dbtp, lsnp, op, info)$/ __db_append_primary ../db/db_am.c /^__db_append_primary(dbc, key, data)$/ @@ -1964,14 +2267,13 @@ __db_associate_arg ../db/db_iface.c /^__db_associate_arg(dbp, sdbp, callback, fl __db_associate_pp ../db/db_iface.c /^__db_associate_pp(dbp, txn, sdbp, callback, flags)/ __db_associate_proc ../rpc_server/c/db_server_proc.c /^__db_associate_proc(dbpcl_id, txnpcl_id, sdbpcl_id/ __db_backup_name ../db/db.c /^__db_backup_name(dbenv, name, txn, backup)$/ -__db_big_getpgnos ../db/db_auto.c /^__db_big_getpgnos(dbenv, rec, lsnp, notused1, summ/ __db_big_log ../db/db_auto.c /^__db_big_log(dbp, txnid, ret_lsnp, flags,$/ -__db_big_print ../db/db_auto.c /^__db_big_print(dbenv, dbtp, lsnp, notused2, notuse/ +__db_big_print ../db/db_autop.c /^__db_big_print(dbenv, dbtp, lsnp, notused2, notuse/ __db_big_read ../db/db_auto.c /^__db_big_read(dbenv, recbuf, argpp)$/ __db_big_recover ../db/db_rec.c /^__db_big_recover(dbenv, dbtp, lsnp, op, info)$/ __db_blockDecrypt ../crypto/rijndael/rijndael-api-fst.c /^__db_blockDecrypt(cipher, key, input, inputLen, ou/ __db_blockEncrypt ../crypto/rijndael/rijndael-api-fst.c /^__db_blockEncrypt(cipher, key, input, inputLen, ou/ -__db_bmeta ../db/db_pr.c /^__db_bmeta(dbp, fp, h, flags)$/ +__db_bmeta ../db/db_pr.c /^__db_bmeta(dbp, h, flags)$/ __db_bt_maxkey_proc ../rpc_server/c/db_server_proc.c /^__db_bt_maxkey_proc(dbpcl_id, maxkey, replyp)$/ __db_bt_minkey_proc ../rpc_server/c/db_server_proc.c /^__db_bt_minkey_proc(dbpcl_id, minkey, replyp)$/ __db_build_bi ../db/db_upg_opd.c /^__db_build_bi(dbp, fhp, ipage, page, indx, nomemp)/ @@ -2006,22 +2308,20 @@ __db_c_put_arg ../db/db_iface.c /^__db_c_put_arg(dbc, key, data, flags)$/ __db_c_put_pp ../db/db_iface.c /^__db_c_put_pp(dbc, key, data, flags)$/ __db_c_secondary_get_pp ../db/db_cam.c /^__db_c_secondary_get_pp(dbc, skey, data, flags)$/ __db_check_chksum ../hmac/hmac.c /^__db_check_chksum(dbenv, db_cipher, chksum, data, / +__db_check_lsn ../common/db_err.c /^__db_check_lsn(dbenv, lsn, prev)$/ __db_check_txn ../common/db_err.c /^__db_check_txn(dbp, txn, assoc_lid, read_op)$/ __db_chk_meta ../db/db_open.c /^__db_chk_meta(dbenv, dbp, meta, do_metachk)$/ __db_chksum ../hmac/hmac.c /^__db_chksum(data, data_len, mac_key, store)$/ __db_cipherInit ../crypto/rijndael/rijndael-api-fst.c /^__db_cipherInit(cipher, mode, IV)$/ __db_cipherUpdateRounds ../crypto/rijndael/rijndael-api-fst.c /^__db_cipherUpdateRounds(cipher, key, input, inputL/ -__db_cksum_getpgnos ../db/db_auto.c /^__db_cksum_getpgnos(dbenv, rec, lsnp, notused1, su/ __db_cksum_log ../db/db_auto.c /^__db_cksum_log(dbenv, txnid, ret_lsnp, flags)$/ -__db_cksum_print ../db/db_auto.c /^__db_cksum_print(dbenv, dbtp, lsnp, notused2, notu/ +__db_cksum_print ../db/db_autop.c /^__db_cksum_print(dbenv, dbtp, lsnp, notused2, notu/ __db_cksum_read ../db/db_auto.c /^__db_cksum_read(dbenv, recbuf, argpp)$/ __db_cksum_recover ../db/db_rec.c /^__db_cksum_recover(dbenv, dbtp, lsnp, op, info)$/ __db_close ../db/db.c /^__db_close(dbp, txn, flags)$/ __db_close_int ../rpc_server/c/db_server_util.c /^__db_close_int(id, flags)$/ __db_close_pp ../db/db_iface.c /^__db_close_pp(dbp, flags)$/ __db_close_proc ../rpc_server/c/db_server_proc.c /^__db_close_proc(dbpcl_id, flags, replyp)$/ -__db_cprint ../db/db_am.c /^__db_cprint(dbp)$/ -__db_cprint_item ../db/db_am.c /^int __db_cprint_item(dbc)$/ __db_create_proc ../rpc_server/c/db_server_proc.c /^__db_create_proc(dbenvcl_id, flags, replyp)$/ __db_curinval ../db/db_iface.c /^__db_curinval(dbenv)$/ __db_cursor ../db/db_iface.c /^__db_cursor(dbp, txn, dbcp, flags)$/ @@ -2029,55 +2329,55 @@ __db_cursor_arg ../db/db_iface.c /^__db_cursor_arg(dbp, flags)$/ __db_cursor_check ../db/db_truncate.c /^__db_cursor_check(dbp)$/ __db_cursor_int ../db/db_am.c /^__db_cursor_int(dbp, txn, dbtype, root, is_opd, lo/ __db_cursor_pp ../db/db_iface.c /^__db_cursor_pp(dbp, txn, dbcp, flags)$/ -__db_cursor_proc ../rpc_server/c/db_server_proc.c /^__db_cursor_proc(dbpcl_id, txnpcl_id,$/ -__db_db_associate_4002 ../rpc_client/db_server_clnt.c /^__db_db_associate_4002(argp, clnt)$/ -__db_db_bt_maxkey_4002 ../rpc_client/db_server_clnt.c /^__db_db_bt_maxkey_4002(argp, clnt)$/ -__db_db_bt_minkey_4002 ../rpc_client/db_server_clnt.c /^__db_db_bt_minkey_4002(argp, clnt)$/ -__db_db_close_4002 ../rpc_client/db_server_clnt.c /^__db_db_close_4002(argp, clnt)$/ -__db_db_create_4002 ../rpc_client/db_server_clnt.c /^__db_db_create_4002(argp, clnt)$/ -__db_db_cursor_4002 ../rpc_client/db_server_clnt.c /^__db_db_cursor_4002(argp, clnt)$/ -__db_db_del_4002 ../rpc_client/db_server_clnt.c /^__db_db_del_4002(argp, clnt)$/ -__db_db_encrypt_4002 ../rpc_client/db_server_clnt.c /^__db_db_encrypt_4002(argp, clnt)$/ -__db_db_extentsize_4002 ../rpc_client/db_server_clnt.c /^__db_db_extentsize_4002(argp, clnt)$/ -__db_db_flags_4002 ../rpc_client/db_server_clnt.c /^__db_db_flags_4002(argp, clnt)$/ -__db_db_get_4002 ../rpc_client/db_server_clnt.c /^__db_db_get_4002(argp, clnt)$/ -__db_db_get_bt_minkey_4002 ../rpc_client/db_server_clnt.c /^__db_db_get_bt_minkey_4002(argp, clnt)$/ -__db_db_get_encrypt_flags_4002 ../rpc_client/db_server_clnt.c /^__db_db_get_encrypt_flags_4002(argp, clnt)$/ -__db_db_get_extentsize_4002 ../rpc_client/db_server_clnt.c /^__db_db_get_extentsize_4002(argp, clnt)$/ -__db_db_get_flags_4002 ../rpc_client/db_server_clnt.c /^__db_db_get_flags_4002(argp, clnt)$/ -__db_db_get_h_ffactor_4002 ../rpc_client/db_server_clnt.c /^__db_db_get_h_ffactor_4002(argp, clnt)$/ -__db_db_get_h_nelem_4002 ../rpc_client/db_server_clnt.c /^__db_db_get_h_nelem_4002(argp, clnt)$/ -__db_db_get_lorder_4002 ../rpc_client/db_server_clnt.c /^__db_db_get_lorder_4002(argp, clnt)$/ -__db_db_get_name_4002 ../rpc_client/db_server_clnt.c /^__db_db_get_name_4002(argp, clnt)$/ -__db_db_get_open_flags_4002 ../rpc_client/db_server_clnt.c /^__db_db_get_open_flags_4002(argp, clnt)$/ -__db_db_get_pagesize_4002 ../rpc_client/db_server_clnt.c /^__db_db_get_pagesize_4002(argp, clnt)$/ -__db_db_get_re_delim_4002 ../rpc_client/db_server_clnt.c /^__db_db_get_re_delim_4002(argp, clnt)$/ -__db_db_get_re_len_4002 ../rpc_client/db_server_clnt.c /^__db_db_get_re_len_4002(argp, clnt)$/ -__db_db_get_re_pad_4002 ../rpc_client/db_server_clnt.c /^__db_db_get_re_pad_4002(argp, clnt)$/ -__db_db_h_ffactor_4002 ../rpc_client/db_server_clnt.c /^__db_db_h_ffactor_4002(argp, clnt)$/ -__db_db_h_nelem_4002 ../rpc_client/db_server_clnt.c /^__db_db_h_nelem_4002(argp, clnt)$/ -__db_db_join_4002 ../rpc_client/db_server_clnt.c /^__db_db_join_4002(argp, clnt)$/ -__db_db_key_range_4002 ../rpc_client/db_server_clnt.c /^__db_db_key_range_4002(argp, clnt)$/ -__db_db_lorder_4002 ../rpc_client/db_server_clnt.c /^__db_db_lorder_4002(argp, clnt)$/ -__db_db_open_4002 ../rpc_client/db_server_clnt.c /^__db_db_open_4002(argp, clnt)$/ -__db_db_pagesize_4002 ../rpc_client/db_server_clnt.c /^__db_db_pagesize_4002(argp, clnt)$/ -__db_db_pget_4002 ../rpc_client/db_server_clnt.c /^__db_db_pget_4002(argp, clnt)$/ -__db_db_put_4002 ../rpc_client/db_server_clnt.c /^__db_db_put_4002(argp, clnt)$/ -__db_db_re_delim_4002 ../rpc_client/db_server_clnt.c /^__db_db_re_delim_4002(argp, clnt)$/ -__db_db_re_len_4002 ../rpc_client/db_server_clnt.c /^__db_db_re_len_4002(argp, clnt)$/ -__db_db_re_pad_4002 ../rpc_client/db_server_clnt.c /^__db_db_re_pad_4002(argp, clnt)$/ -__db_db_remove_4002 ../rpc_client/db_server_clnt.c /^__db_db_remove_4002(argp, clnt)$/ -__db_db_rename_4002 ../rpc_client/db_server_clnt.c /^__db_db_rename_4002(argp, clnt)$/ -__db_db_stat_4002 ../rpc_client/db_server_clnt.c /^__db_db_stat_4002(argp, clnt)$/ -__db_db_sync_4002 ../rpc_client/db_server_clnt.c /^__db_db_sync_4002(argp, clnt)$/ -__db_db_truncate_4002 ../rpc_client/db_server_clnt.c /^__db_db_truncate_4002(argp, clnt)$/ -__db_dbc_close_4002 ../rpc_client/db_server_clnt.c /^__db_dbc_close_4002(argp, clnt)$/ -__db_dbc_count_4002 ../rpc_client/db_server_clnt.c /^__db_dbc_count_4002(argp, clnt)$/ -__db_dbc_del_4002 ../rpc_client/db_server_clnt.c /^__db_dbc_del_4002(argp, clnt)$/ -__db_dbc_dup_4002 ../rpc_client/db_server_clnt.c /^__db_dbc_dup_4002(argp, clnt)$/ -__db_dbc_get_4002 ../rpc_client/db_server_clnt.c /^__db_dbc_get_4002(argp, clnt)$/ -__db_dbc_pget_4002 ../rpc_client/db_server_clnt.c /^__db_dbc_pget_4002(argp, clnt)$/ -__db_dbc_put_4002 ../rpc_client/db_server_clnt.c /^__db_dbc_put_4002(argp, clnt)$/ +__db_cursor_proc ../rpc_server/c/db_server_proc.c /^__db_cursor_proc(dbpcl_id, txnpcl_id, flags, reply/ +__db_db_associate_4003__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_db_associate_4003__SVCSUFFIX__(msg, req)$/ +__db_db_bt_maxkey_4003__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_db_bt_maxkey_4003__SVCSUFFIX__(msg, req)$/ +__db_db_bt_minkey_4003__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_db_bt_minkey_4003__SVCSUFFIX__(msg, req)$/ +__db_db_close_4003__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_db_close_4003__SVCSUFFIX__(msg, req)$/ +__db_db_create_4003__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_db_create_4003__SVCSUFFIX__(msg, req)$/ +__db_db_cursor_4003__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_db_cursor_4003__SVCSUFFIX__(msg, req)$/ +__db_db_del_4003__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_db_del_4003__SVCSUFFIX__(msg, req)$/ +__db_db_encrypt_4003__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_db_encrypt_4003__SVCSUFFIX__(msg, req)$/ +__db_db_extentsize_4003__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_db_extentsize_4003__SVCSUFFIX__(msg, req)$/ +__db_db_flags_4003__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_db_flags_4003__SVCSUFFIX__(msg, req)$/ +__db_db_get_4003__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_db_get_4003__SVCSUFFIX__(msg, req)$/ +__db_db_get_bt_minkey_4003__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_db_get_bt_minkey_4003__SVCSUFFIX__(msg, req)$/ +__db_db_get_encrypt_flags_4003__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_db_get_encrypt_flags_4003__SVCSUFFIX__(msg, r/ +__db_db_get_extentsize_4003__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_db_get_extentsize_4003__SVCSUFFIX__(msg, req)/ +__db_db_get_flags_4003__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_db_get_flags_4003__SVCSUFFIX__(msg, req)$/ +__db_db_get_h_ffactor_4003__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_db_get_h_ffactor_4003__SVCSUFFIX__(msg, req)$/ +__db_db_get_h_nelem_4003__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_db_get_h_nelem_4003__SVCSUFFIX__(msg, req)$/ +__db_db_get_lorder_4003__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_db_get_lorder_4003__SVCSUFFIX__(msg, req)$/ +__db_db_get_name_4003__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_db_get_name_4003__SVCSUFFIX__(msg, req)$/ +__db_db_get_open_flags_4003__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_db_get_open_flags_4003__SVCSUFFIX__(msg, req)/ +__db_db_get_pagesize_4003__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_db_get_pagesize_4003__SVCSUFFIX__(msg, req)$/ +__db_db_get_re_delim_4003__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_db_get_re_delim_4003__SVCSUFFIX__(msg, req)$/ +__db_db_get_re_len_4003__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_db_get_re_len_4003__SVCSUFFIX__(msg, req)$/ +__db_db_get_re_pad_4003__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_db_get_re_pad_4003__SVCSUFFIX__(msg, req)$/ +__db_db_h_ffactor_4003__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_db_h_ffactor_4003__SVCSUFFIX__(msg, req)$/ +__db_db_h_nelem_4003__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_db_h_nelem_4003__SVCSUFFIX__(msg, req)$/ +__db_db_join_4003__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_db_join_4003__SVCSUFFIX__(msg, req)$/ +__db_db_key_range_4003__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_db_key_range_4003__SVCSUFFIX__(msg, req)$/ +__db_db_lorder_4003__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_db_lorder_4003__SVCSUFFIX__(msg, req)$/ +__db_db_open_4003__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_db_open_4003__SVCSUFFIX__(msg, req)$/ +__db_db_pagesize_4003__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_db_pagesize_4003__SVCSUFFIX__(msg, req)$/ +__db_db_pget_4003__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_db_pget_4003__SVCSUFFIX__(msg, req)$/ +__db_db_put_4003__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_db_put_4003__SVCSUFFIX__(msg, req)$/ +__db_db_re_delim_4003__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_db_re_delim_4003__SVCSUFFIX__(msg, req)$/ +__db_db_re_len_4003__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_db_re_len_4003__SVCSUFFIX__(msg, req)$/ +__db_db_re_pad_4003__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_db_re_pad_4003__SVCSUFFIX__(msg, req)$/ +__db_db_remove_4003__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_db_remove_4003__SVCSUFFIX__(msg, req)$/ +__db_db_rename_4003__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_db_rename_4003__SVCSUFFIX__(msg, req)$/ +__db_db_stat_4003__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_db_stat_4003__SVCSUFFIX__(msg, req)$/ +__db_db_sync_4003__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_db_sync_4003__SVCSUFFIX__(msg, req)$/ +__db_db_truncate_4003__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_db_truncate_4003__SVCSUFFIX__(msg, req)$/ +__db_dbc_close_4003__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_dbc_close_4003__SVCSUFFIX__(msg, req)$/ +__db_dbc_count_4003__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_dbc_count_4003__SVCSUFFIX__(msg, req)$/ +__db_dbc_del_4003__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_dbc_del_4003__SVCSUFFIX__(msg, req)$/ +__db_dbc_dup_4003__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_dbc_dup_4003__SVCSUFFIX__(msg, req)$/ +__db_dbc_get_4003__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_dbc_get_4003__SVCSUFFIX__(msg, req)$/ +__db_dbc_pget_4003__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_dbc_pget_4003__SVCSUFFIX__(msg, req)$/ +__db_dbc_put_4003__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_dbc_put_4003__SVCSUFFIX__(msg, req)$/ __db_dbenv_mpool ../db/db.c /^__db_dbenv_mpool(dbp, fname, flags)$/ __db_dbenv_setup ../db/db.c /^__db_dbenv_setup(dbp, txn, fname, id, flags)$/ __db_dbm_close ../dbm/dbm.c /^__db_dbm_close()$/ @@ -2089,135 +2389,52 @@ __db_dbm_nextkey ../dbm/dbm.c /^__db_dbm_nextkey(key)$/ __db_dbm_store ../dbm/dbm.c /^__db_dbm_store(key, dat)$/ __db_dbtxn_remove ../db/db_remove.c /^__db_dbtxn_remove(dbp, txn, name)$/ __db_dbtype_to_string ../db/db_pr.c /^__db_dbtype_to_string(type)$/ -__db_debug_getpgnos ../db/db_auto.c /^__db_debug_getpgnos(dbenv, rec, lsnp, notused1, su/ __db_debug_log ../db/db_auto.c /^__db_debug_log(dbenv, txnid, ret_lsnp, flags,$/ -__db_debug_print ../db/db_auto.c /^__db_debug_print(dbenv, dbtp, lsnp, notused2, notu/ +__db_debug_print ../db/db_autop.c /^__db_debug_print(dbenv, dbtp, lsnp, notused2, notu/ __db_debug_read ../db/db_auto.c /^__db_debug_read(dbenv, recbuf, argpp)$/ __db_debug_recover ../db/db_rec.c /^__db_debug_recover(dbenv, dbtp, lsnp, op, info)$/ -__db_default_getpgnos ../db/db_dispatch.c /^__db_default_getpgnos(dbenv, lsnp, summary)$/ __db_del ../db/db_am.c /^__db_del(dbp, txn, key, flags)$/ __db_del_arg ../db/db_iface.c /^__db_del_arg(dbp, flags)$/ __db_del_pp ../db/db_iface.c /^__db_del_pp(dbp, txn, key, flags)$/ -__db_del_proc ../rpc_server/c/db_server_proc.c /^__db_del_proc(dbpcl_id, txnpcl_id, keydlen,$/ +__db_del_proc ../rpc_server/c/db_server_proc.c /^__db_del_proc(dbpcl_id, txnpcl_id, keydlen, keydof/ __db_derive_mac ../hmac/hmac.c /^__db_derive_mac(passwd, plen, mac_key)$/ __db_des_destroy ../env/env_region.c /^__db_des_destroy(dbenv, rp, shmem_safe)$/ __db_des_get ../env/env_region.c /^__db_des_get(dbenv, env_infop, infop, rpp)$/ __db_disassociate ../db/db.c /^__db_disassociate(sdbp)$/ __db_dispatch ../db/db_dispatch.c /^__db_dispatch(dbenv, dtab, dtabsize, db, lsnp, red/ __db_ditem ../db/db_dup.c /^__db_ditem(dbc, pagep, indx, nbytes)$/ +__db_dl ../env/env_stat.c /^__db_dl(dbenv, msg, value)$/ +__db_dl_pct ../env/env_stat.c /^__db_dl_pct(dbenv, msg, value, pct, tag)$/ +__db_dlbytes ../env/env_stat.c /^__db_dlbytes(dbenv, msg, gbytes, mbytes, bytes)$/ __db_do_the_limbo ../db/db_dispatch.c /^__db_do_the_limbo(dbenv, ptxn, txn, hp, state)$/ __db_doff ../db/db_overflow.c /^__db_doff(dbc, pgno)$/ -__db_dump ../db/db_pr.c /^__db_dump(dbp, op, name)$/ +__db_dump ../db/db_pr.c /^__db_dump(dbp, subname, callback, handle, pflag, k/ +__db_dump_pp ../db/db_pr.c /^__db_dump_pp(dbp, subname, callback, handle, pflag/ +__db_dumptree ../db/db_pr.c /^__db_dumptree(dbp, op, name)$/ __db_duperr ../db/db_cam.c /^__db_duperr(dbp, flags)$/ __db_e_attach ../env/env_region.c /^__db_e_attach(dbenv, init_flagsp)$/ __db_e_detach ../env/env_region.c /^__db_e_detach(dbenv, destroy)$/ __db_e_remfile ../env/env_region.c /^__db_e_remfile(dbenv)$/ __db_e_remove ../env/env_region.c /^__db_e_remove(dbenv, flags)$/ -__db_e_stat ../env/env_region.c /^__db_e_stat(dbenv, arg_renv, arg_regions, arg_regi/ __db_encrypt_proc ../rpc_server/c/db_server_proc.c /^__db_encrypt_proc(dbpcl_id, passwd, flags, replyp)/ -__db_env_cachesize_4002 ../rpc_client/db_server_clnt.c /^__db_env_cachesize_4002(argp, clnt)$/ -__db_env_close ../libdb_java/db_java_wrap.c /^static db_ret_t __db_env_close(struct __db_env *se/ -__db_env_close_4002 ../rpc_client/db_server_clnt.c /^__db_env_close_4002(argp, clnt)$/ +__db_env_cachesize_4003__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_env_cachesize_4003__SVCSUFFIX__(msg, req)$/ +__db_env_close_4003__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_env_close_4003__SVCSUFFIX__(msg, req)$/ __db_env_config ../env/env_method.c /^__db_env_config(dbenv, i, flags)$/ -__db_env_create_4002 ../rpc_client/db_server_clnt.c /^__db_env_create_4002(argp, clnt)$/ -__db_env_dbremove ../libdb_java/db_java_wrap.c /^static db_ret_t __db_env_dbremove(struct __db_env / -__db_env_dbremove_4002 ../rpc_client/db_server_clnt.c /^__db_env_dbremove_4002(argp, clnt)$/ -__db_env_dbrename ../libdb_java/db_java_wrap.c /^static db_ret_t __db_env_dbrename(struct __db_env / -__db_env_dbrename_4002 ../rpc_client/db_server_clnt.c /^__db_env_dbrename_4002(argp, clnt)$/ -__db_env_encrypt_4002 ../rpc_client/db_server_clnt.c /^__db_env_encrypt_4002(argp, clnt)$/ -__db_env_err ../libdb_java/db_java_wrap.c /^static void __db_env_err(struct __db_env *self,int/ -__db_env_errx ../libdb_java/db_java_wrap.c /^static void __db_env_errx(struct __db_env *self,ch/ -__db_env_flags_4002 ../rpc_client/db_server_clnt.c /^__db_env_flags_4002(argp, clnt)$/ -__db_env_get_cachesize ../libdb_java/db_java_wrap.c /^static jlong __db_env_get_cachesize(struct __db_en/ -__db_env_get_cachesize_4002 ../rpc_client/db_server_clnt.c /^__db_env_get_cachesize_4002(argp, clnt)$/ -__db_env_get_cachesize_ncache ../libdb_java/db_java_wrap.c /^static int __db_env_get_cachesize_ncache(struct __/ -__db_env_get_data_dirs ../libdb_java/db_java_wrap.c /^static char const **__db_env_get_data_dirs(struct / -__db_env_get_encrypt_flags ../libdb_java/db_java_wrap.c /^static u_int32_t __db_env_get_encrypt_flags(struct/ -__db_env_get_encrypt_flags_4002 ../rpc_client/db_server_clnt.c /^__db_env_get_encrypt_flags_4002(argp, clnt)$/ -__db_env_get_flags ../libdb_java/db_java_wrap.c /^static u_int32_t __db_env_get_flags(struct __db_en/ -__db_env_get_flags_4002 ../rpc_client/db_server_clnt.c /^__db_env_get_flags_4002(argp, clnt)$/ -__db_env_get_home ../libdb_java/db_java_wrap.c /^static char const *__db_env_get_home(struct __db_e/ -__db_env_get_home_4002 ../rpc_client/db_server_clnt.c /^__db_env_get_home_4002(argp, clnt)$/ -__db_env_get_lg_bsize ../libdb_java/db_java_wrap.c /^static u_int32_t __db_env_get_lg_bsize(struct __db/ -__db_env_get_lg_dir ../libdb_java/db_java_wrap.c /^static char const *__db_env_get_lg_dir(struct __db/ -__db_env_get_lg_max ../libdb_java/db_java_wrap.c /^static u_int32_t __db_env_get_lg_max(struct __db_e/ -__db_env_get_lg_regionmax ../libdb_java/db_java_wrap.c /^static u_int32_t __db_env_get_lg_regionmax(struct / -__db_env_get_lk_conflicts ../libdb_java/db_java_wrap.c /^static struct __db_lk_conflicts __db_env_get_lk_co/ -__db_env_get_lk_detect ../libdb_java/db_java_wrap.c /^static u_int32_t __db_env_get_lk_detect(struct __d/ -__db_env_get_lk_max_lockers ../libdb_java/db_java_wrap.c /^static u_int32_t __db_env_get_lk_max_lockers(struc/ -__db_env_get_lk_max_locks ../libdb_java/db_java_wrap.c /^static u_int32_t __db_env_get_lk_max_locks(struct / -__db_env_get_lk_max_objects ../libdb_java/db_java_wrap.c /^static u_int32_t __db_env_get_lk_max_objects(struc/ -__db_env_get_mp_mmapsize ../libdb_java/db_java_wrap.c /^static size_t __db_env_get_mp_mmapsize(struct __db/ -__db_env_get_open_flags ../libdb_java/db_java_wrap.c /^static u_int32_t __db_env_get_open_flags(struct __/ -__db_env_get_open_flags_4002 ../rpc_client/db_server_clnt.c /^__db_env_get_open_flags_4002(argp, clnt)$/ -__db_env_get_rep_limit ../libdb_java/db_java_wrap.c /^static jlong __db_env_get_rep_limit(struct __db_en/ -__db_env_get_shm_key ../libdb_java/db_java_wrap.c /^static long __db_env_get_shm_key(struct __db_env */ -__db_env_get_tas_spins ../libdb_java/db_java_wrap.c /^static u_int32_t __db_env_get_tas_spins(struct __d/ -__db_env_get_timeout ../libdb_java/db_java_wrap.c /^static db_timeout_t __db_env_get_timeout(struct __/ -__db_env_get_tmp_dir ../libdb_java/db_java_wrap.c /^static char const *__db_env_get_tmp_dir(struct __d/ -__db_env_get_tx_max ../libdb_java/db_java_wrap.c /^static u_int32_t __db_env_get_tx_max(struct __db_e/ -__db_env_get_tx_timestamp ../libdb_java/db_java_wrap.c /^static time_t __db_env_get_tx_timestamp(struct __d/ -__db_env_get_verbose ../libdb_java/db_java_wrap.c /^static int_bool __db_env_get_verbose(struct __db_e/ -__db_env_lock_detect ../libdb_java/db_java_wrap.c /^static int __db_env_lock_detect(struct __db_env *s/ -__db_env_lock_get ../libdb_java/db_java_wrap.c /^static DB_LOCK *__db_env_lock_get(struct __db_env / -__db_env_lock_id ../libdb_java/db_java_wrap.c /^static u_int32_t __db_env_lock_id(struct __db_env / -__db_env_lock_id_free ../libdb_java/db_java_wrap.c /^static db_ret_t __db_env_lock_id_free(struct __db_/ -__db_env_lock_put ../libdb_java/db_java_wrap.c /^static db_ret_t __db_env_lock_put(struct __db_env / -__db_env_lock_stat ../libdb_java/db_java_wrap.c /^static DB_LOCK_STAT *__db_env_lock_stat(struct __d/ -__db_env_log_archive ../libdb_java/db_java_wrap.c /^static char **__db_env_log_archive(struct __db_env/ -__db_env_log_cursor ../libdb_java/db_java_wrap.c /^static DB_LOGC *__db_env_log_cursor(struct __db_en/ -__db_env_log_file ../libdb_java/db_java_wrap.c /^static char *__db_env_log_file(struct __db_env *se/ -__db_env_log_flush ../libdb_java/db_java_wrap.c /^static db_ret_t __db_env_log_flush(struct __db_env/ -__db_env_log_put ../libdb_java/db_java_wrap.c /^static db_ret_t __db_env_log_put(struct __db_env */ -__db_env_log_stat ../libdb_java/db_java_wrap.c /^static DB_LOG_STAT *__db_env_log_stat(struct __db_/ -__db_env_memp_fstat ../libdb_java/db_java_wrap.c /^static DB_MPOOL_FSTAT **__db_env_memp_fstat(struct/ -__db_env_memp_stat ../libdb_java/db_java_wrap.c /^static DB_MPOOL_STAT *__db_env_memp_stat(struct __/ -__db_env_memp_trickle ../libdb_java/db_java_wrap.c /^static int __db_env_memp_trickle(struct __db_env */ -__db_env_open ../libdb_java/db_java_wrap.c /^static db_ret_t __db_env_open(struct __db_env *sel/ -__db_env_open_4002 ../rpc_client/db_server_clnt.c /^__db_env_open_4002(argp, clnt)$/ -__db_env_remove ../libdb_java/db_java_wrap.c /^static db_ret_t __db_env_remove(struct __db_env *s/ -__db_env_remove_4002 ../rpc_client/db_server_clnt.c /^__db_env_remove_4002(argp, clnt)$/ -__db_env_rep_elect ../libdb_java/db_java_wrap.c /^static int __db_env_rep_elect(struct __db_env *sel/ -__db_env_rep_process_message ../libdb_java/db_java_wrap.c /^static int __db_env_rep_process_message(struct __d/ -__db_env_rep_start ../libdb_java/db_java_wrap.c /^static db_ret_t __db_env_rep_start(struct __db_env/ -__db_env_rep_stat ../libdb_java/db_java_wrap.c /^static DB_REP_STAT *__db_env_rep_stat(struct __db_/ -__db_env_set_app_dispatch ../libdb_java/db_java_wrap.c /^static db_ret_t __db_env_set_app_dispatch(struct _/ -__db_env_set_cachesize ../libdb_java/db_java_wrap.c /^static db_ret_t __db_env_set_cachesize(struct __db/ -__db_env_set_data_dir ../libdb_java/db_java_wrap.c /^static db_ret_t __db_env_set_data_dir(struct __db_/ -__db_env_set_encrypt ../libdb_java/db_java_wrap.c /^static db_ret_t __db_env_set_encrypt(struct __db_e/ -__db_env_set_errcall ../libdb_java/db_java_wrap.c /^static void __db_env_set_errcall(struct __db_env */ -__db_env_set_feedback ../libdb_java/db_java_wrap.c /^static db_ret_t __db_env_set_feedback(struct __db_/ -__db_env_set_flags ../libdb_java/db_java_wrap.c /^static db_ret_t __db_env_set_flags(struct __db_env/ -__db_env_set_lg_bsize ../libdb_java/db_java_wrap.c /^static db_ret_t __db_env_set_lg_bsize(struct __db_/ -__db_env_set_lg_dir ../libdb_java/db_java_wrap.c /^static db_ret_t __db_env_set_lg_dir(struct __db_en/ -__db_env_set_lg_max ../libdb_java/db_java_wrap.c /^static db_ret_t __db_env_set_lg_max(struct __db_en/ -__db_env_set_lg_regionmax ../libdb_java/db_java_wrap.c /^static db_ret_t __db_env_set_lg_regionmax(struct _/ -__db_env_set_lk_conflicts ../libdb_java/db_java_wrap.c /^static db_ret_t __db_env_set_lk_conflicts(struct _/ -__db_env_set_lk_detect ../libdb_java/db_java_wrap.c /^static db_ret_t __db_env_set_lk_detect(struct __db/ -__db_env_set_lk_max_lockers ../libdb_java/db_java_wrap.c /^static db_ret_t __db_env_set_lk_max_lockers(struct/ -__db_env_set_lk_max_locks ../libdb_java/db_java_wrap.c /^static db_ret_t __db_env_set_lk_max_locks(struct _/ -__db_env_set_lk_max_objects ../libdb_java/db_java_wrap.c /^static db_ret_t __db_env_set_lk_max_objects(struct/ -__db_env_set_mp_mmapsize ../libdb_java/db_java_wrap.c /^static db_ret_t __db_env_set_mp_mmapsize(struct __/ -__db_env_set_paniccall ../libdb_java/db_java_wrap.c /^static db_ret_t __db_env_set_paniccall(struct __db/ -__db_env_set_rep_limit ../libdb_java/db_java_wrap.c /^static db_ret_t __db_env_set_rep_limit(struct __db/ -__db_env_set_rep_transport ../libdb_java/db_java_wrap.c /^static db_ret_t __db_env_set_rep_transport(struct / -__db_env_set_rpc_server ../libdb_java/db_java_wrap.c /^static db_ret_t __db_env_set_rpc_server(struct __d/ -__db_env_set_shm_key ../libdb_java/db_java_wrap.c /^static db_ret_t __db_env_set_shm_key(struct __db_e/ -__db_env_set_tas_spins ../libdb_java/db_java_wrap.c /^static db_ret_t __db_env_set_tas_spins(struct __db/ -__db_env_set_timeout ../libdb_java/db_java_wrap.c /^static db_ret_t __db_env_set_timeout(struct __db_e/ -__db_env_set_tmp_dir ../libdb_java/db_java_wrap.c /^static db_ret_t __db_env_set_tmp_dir(struct __db_e/ -__db_env_set_tx_max ../libdb_java/db_java_wrap.c /^static db_ret_t __db_env_set_tx_max(struct __db_en/ -__db_env_set_tx_timestamp ../libdb_java/db_java_wrap.c /^static db_ret_t __db_env_set_tx_timestamp(struct _/ -__db_env_set_verbose ../libdb_java/db_java_wrap.c /^static db_ret_t __db_env_set_verbose(struct __db_e/ -__db_env_txn_begin ../libdb_java/db_java_wrap.c /^static DB_TXN *__db_env_txn_begin(struct __db_env / -__db_env_txn_checkpoint ../libdb_java/db_java_wrap.c /^static db_ret_t __db_env_txn_checkpoint(struct __d/ -__db_env_txn_recover ../libdb_java/db_java_wrap.c /^static DB_PREPLIST *__db_env_txn_recover(struct __/ -__db_env_txn_stat ../libdb_java/db_java_wrap.c /^static DB_TXN_STAT *__db_env_txn_stat(struct __db_/ +__db_env_create_4003__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_env_create_4003__SVCSUFFIX__(msg, req)$/ +__db_env_dbremove_4003__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_env_dbremove_4003__SVCSUFFIX__(msg, req)$/ +__db_env_dbrename_4003__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_env_dbrename_4003__SVCSUFFIX__(msg, req)$/ +__db_env_encrypt_4003__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_env_encrypt_4003__SVCSUFFIX__(msg, req)$/ +__db_env_flags_4003__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_env_flags_4003__SVCSUFFIX__(msg, req)$/ +__db_env_get_cachesize_4003__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_env_get_cachesize_4003__SVCSUFFIX__(msg, req)/ +__db_env_get_encrypt_flags_4003__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_env_get_encrypt_flags_4003__SVCSUFFIX__(msg, / +__db_env_get_flags_4003__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_env_get_flags_4003__SVCSUFFIX__(msg, req)$/ +__db_env_get_home_4003__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_env_get_home_4003__SVCSUFFIX__(msg, req)$/ +__db_env_get_open_flags_4003__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_env_get_open_flags_4003__SVCSUFFIX__(msg, req/ +__db_env_open_4003__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_env_open_4003__SVCSUFFIX__(msg, req)$/ +__db_env_remove_4003__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_env_remove_4003__SVCSUFFIX__(msg, req)$/ __db_err ../common/db_err.c /^__db_err(const DB_ENV *dbenv, const char *fmt, .../ -__db_err_internal ../libdb_java/db_java_wrap.c /^static void __db_err_internal(struct __db *self,in/ __db_errcall ../common/db_err.c /^__db_errcall(dbenv, error, error_set, fmt, ap)$/ __db_errfile ../common/db_err.c /^__db_errfile(dbenv, error, error_set, fmt, ap)$/ -__db_errx ../libdb_java/db_java_wrap.c /^static void __db_errx(struct __db *self,char const/ __db_extentsize_proc ../rpc_server/c/db_server_proc.c /^__db_extentsize_proc(dbpcl_id, extentsize, replyp)/ __db_faultmem ../env/env_region.c /^__db_faultmem(dbenv, addr, size, created)$/ __db_fcchk ../common/db_err.c /^__db_fcchk(dbenv, name, flags, flag1, flag2)$/ @@ -2228,6 +2445,7 @@ __db_fcntl_mutex_lock ../mutex/mut_fcntl.c /^__db_fcntl_mutex_lock(dbenv, mutexp __db_fcntl_mutex_unlock ../mutex/mut_fcntl.c /^__db_fcntl_mutex_unlock(dbenv, mutexp)$/ __db_fd_pp ../db/db_iface.c /^__db_fd_pp(dbp, fdp)$/ __db_ferr ../common/db_err.c /^__db_ferr(dbenv, name, iscombo)$/ +__db_fileid_reset ../db/db_setid.c /^__db_fileid_reset(dbenv, name, passwd)$/ __db_fileinit ../env/env_file.c /^__db_fileinit(dbenv, fhp, size, zerofill)$/ __db_flags_proc ../rpc_server/c/db_server_proc.c /^__db_flags_proc(dbpcl_id, flags, replyp)$/ __db_fnl ../common/db_err.c /^__db_fnl(dbenv, name)$/ @@ -2235,47 +2453,37 @@ __db_free ../db/db_meta.c /^__db_free(dbc, h)$/ __db_generate_iv ../crypto/mersenne/mt19937db.c /^__db_generate_iv(dbenv, iv)$/ __db_genrand ../crypto/mersenne/mt19937db.c /^__db_genrand(dbenv)$/ __db_get ../db/db_iface.c /^__db_get(dbp, txn, key, data, flags)$/ -__db_get__SWIG_0 ../libdb_java/db_java_wrap.c /^static int __db_get__SWIG_0(struct __db *self,DB_T/ __db_get_arg ../db/db_iface.c /^__db_get_arg(dbp, key, data, flags)$/ -__db_get_bt_minkey ../libdb_java/db_java_wrap.c /^static u_int32_t __db_get_bt_minkey(struct __db *s/ __db_get_bt_minkey_proc ../rpc_server/c/db_server_proc.c /^__db_get_bt_minkey_proc(dbpcl_id, replyp)$/ __db_get_byteswapped ../db/db_method.c /^__db_get_byteswapped(dbp, isswapped)$/ __db_get_cachesize ../db/db_method.c /^__db_get_cachesize(dbp, cache_gbytesp, cache_bytes/ -__db_get_cachesize_ncache ../libdb_java/db_java_wrap.c /^static u_int32_t __db_get_cachesize_ncache(struct / __db_get_dbname ../db/db_method.c /^__db_get_dbname(dbp, fnamep, dnamep)$/ __db_get_encrypt_flags ../db/db_method.c /^__db_get_encrypt_flags(dbp, flagsp)$/ __db_get_encrypt_flags_proc ../rpc_server/c/db_server_proc.c /^__db_get_encrypt_flags_proc(dbpcl_id, replyp)$/ -__db_get_env ../db/db_method.c /^__db_get_env(dbp, dbenvp)$/ +__db_get_env ../db/db_method.c /^__db_get_env(dbp)$/ __db_get_errfile ../db/db_method.c /^__db_get_errfile(dbp, errfilep)$/ __db_get_errpfx ../db/db_method.c /^__db_get_errpfx(dbp, errpfxp)$/ __db_get_extentsize_proc ../rpc_server/c/db_server_proc.c /^__db_get_extentsize_proc(dbpcl_id, replyp)$/ -__db_get_filename ../libdb_java/db_java_wrap.c /^static char const *__db_get_filename(struct __db */ __db_get_flags ../db/db_method.c /^__db_get_flags(dbp, flagsp)$/ +__db_get_flags_fn ../db/db_pr.c /^__db_get_flags_fn()$/ __db_get_flags_proc ../rpc_server/c/db_server_proc.c /^__db_get_flags_proc(dbpcl_id, replyp)$/ -__db_get_flags_raw ../libdb_java/db_java_wrap.c /^static u_int32_t __db_get_flags_raw(struct __db *s/ -__db_get_h_ffactor ../libdb_java/db_java_wrap.c /^static u_int32_t __db_get_h_ffactor(struct __db *s/ __db_get_h_ffactor_proc ../rpc_server/c/db_server_proc.c /^__db_get_h_ffactor_proc(dbpcl_id, replyp)$/ -__db_get_h_nelem ../libdb_java/db_java_wrap.c /^static u_int32_t __db_get_h_nelem(struct __db *sel/ __db_get_h_nelem_proc ../rpc_server/c/db_server_proc.c /^__db_get_h_nelem_proc(dbpcl_id, replyp)$/ __db_get_lorder ../db/db_method.c /^__db_get_lorder(dbp, db_lorderp)$/ __db_get_lorder_proc ../rpc_server/c/db_server_proc.c /^__db_get_lorder_proc(dbpcl_id, replyp)$/ -__db_get_mpf ../libdb_java/db_java_wrap.c /^static DB_MPOOLFILE *__db_get_mpf(struct __db *sel/ +__db_get_msgfile ../db/db_method.c /^__db_get_msgfile(dbp, msgfilep)$/ __db_get_name_proc ../rpc_server/c/db_server_proc.c /^__db_get_name_proc(dbpcl_id, replyp)$/ __db_get_open_flags ../db/db_open.c /^__db_get_open_flags(dbp, flagsp)$/ __db_get_open_flags_proc ../rpc_server/c/db_server_proc.c /^__db_get_open_flags_proc(dbpcl_id, replyp)$/ __db_get_pagesize ../db/db_method.c /^__db_get_pagesize(dbp, db_pagesizep)$/ __db_get_pagesize_proc ../rpc_server/c/db_server_proc.c /^__db_get_pagesize_proc(dbpcl_id, replyp)$/ __db_get_pp ../db/db_iface.c /^__db_get_pp(dbp, txn, key, data, flags)$/ -__db_get_proc ../rpc_server/c/db_server_proc.c /^__db_get_proc(dbpcl_id, txnpcl_id, keydlen,$/ -__db_get_q_extentsize ../libdb_java/db_java_wrap.c /^static u_int32_t __db_get_q_extentsize(struct __db/ -__db_get_re_delim ../libdb_java/db_java_wrap.c /^static int __db_get_re_delim(struct __db *self){$/ +__db_get_proc ../rpc_server/c/db_server_proc.c /^__db_get_proc(dbpcl_id, txnpcl_id, keydlen, keydof/ __db_get_re_delim_proc ../rpc_server/c/db_server_proc.c /^__db_get_re_delim_proc(dbpcl_id, replyp)$/ -__db_get_re_len ../libdb_java/db_java_wrap.c /^static u_int32_t __db_get_re_len(struct __db *self/ __db_get_re_len_proc ../rpc_server/c/db_server_proc.c /^__db_get_re_len_proc(dbpcl_id, replyp)$/ -__db_get_re_pad ../libdb_java/db_java_wrap.c /^static int __db_get_re_pad(struct __db *self){$/ __db_get_re_pad_proc ../rpc_server/c/db_server_proc.c /^__db_get_re_pad_proc(dbpcl_id, replyp)$/ -__db_get_re_source ../libdb_java/db_java_wrap.c /^static char const *__db_get_re_source(struct __db / -__db_get_transactional ../db/db_method.c /^__db_get_transactional(dbp, istxnp)$/ +__db_get_seq_flags_fn ../sequence/seq_stat.c /^__db_get_seq_flags_fn()$/ +__db_get_transactional ../db/db_method.c /^__db_get_transactional(dbp)$/ __db_get_type ../db/db_method.c /^__db_get_type(dbp, dbtype)$/ __db_getlong ../common/db_getlong.c /^__db_getlong(dbenv, progname, p, min, max, storep)/ __db_getulong ../common/db_getlong.c /^__db_getulong(dbenv, progname, p, min, max, storep/ @@ -2287,19 +2495,17 @@ __db_hashinit ../env/db_shash.c /^__db_hashinit(begin, nelements)$/ __db_hcreate ../hsearch/hsearch.c /^__db_hcreate(nel)$/ __db_hdestroy ../hsearch/hsearch.c /^__db_hdestroy()$/ __db_hmac ../hmac/hmac.c /^__db_hmac(k, data, data_len, mac)$/ -__db_hmeta ../db/db_pr.c /^__db_hmeta(dbp, fp, h, flags)$/ +__db_hmeta ../db/db_pr.c /^__db_hmeta(dbp, h, flags)$/ __db_home ../env/env_open.c /^__db_home(dbenv, db_home, flags)$/ __db_hsearch ../hsearch/hsearch.c /^__db_hsearch(item, action)$/ __db_idcmp ../common/db_idspace.c /^__db_idcmp(a, b)$/ __db_idspace ../common/db_idspace.c /^__db_idspace(inuse, n, minp, maxp)$/ __db_infohead ../dbinc/tcl_db.h 155 __db_init ../db/db_method.c /^__db_init(dbp, flags)$/ -__db_init_getpgnos ../db/db_auto.c /^__db_init_getpgnos(dbenv, dtabp, dtabsizep)$/ __db_init_meta ../db/db_meta.c /^__db_init_meta(dbp, p, pgno, pgtype)$/ -__db_init_print ../db/db_auto.c /^__db_init_print(dbenv, dtabp, dtabsizep)$/ +__db_init_print ../db/db_autop.c /^__db_init_print(dbenv, dtabp, dtabsizep)$/ __db_init_recover ../db/db_auto.c /^__db_init_recover(dbenv, dtabp, dtabsizep)$/ __db_init_subdb ../db/db_open.c /^__db_init_subdb(mdbp, dbp, name, txn)$/ -__db_inmemdbflags ../db/db_pr.c /^__db_inmemdbflags(flags, cookie, callback)$/ __db_is_valid_magicno ../db/db_vrfy.c /^__db_is_valid_magicno(magic, typep)$/ __db_is_valid_pagetype ../db/db_vrfy.c /^__db_is_valid_pagetype(type)$/ __db_isbigendian ../common/db_byteorder.c /^__db_isbigendian()$/ @@ -2314,11 +2520,10 @@ __db_join_get_pp ../db/db_join.c /^__db_join_get_pp(dbc, key, data, flags)$/ __db_join_getnext ../db/db_join.c /^__db_join_getnext(dbc, key, data, exhausted, opmod/ __db_join_pp ../db/db_iface.c /^__db_join_pp(primary, curslist, dbcp, flags)$/ __db_join_primget ../db/db_join.c /^__db_join_primget(dbp, txn, lockerid, key, data, f/ -__db_join_proc ../rpc_server/c/db_server_proc.c /^__db_join_proc(dbpcl_id, curs, curslen,$/ +__db_join_proc ../rpc_server/c/db_server_proc.c /^__db_join_proc(dbpcl_id, curs, curslen, flags, rep/ __db_join_put ../db/db_join.c /^__db_join_put(dbc, key, data, flags)$/ -__db_key_range ../libdb_java/db_java_wrap.c /^static db_ret_t __db_key_range(struct __db *self,D/ __db_key_range_pp ../db/db_iface.c /^__db_key_range_pp(dbp, txn, key, kr, flags)$/ -__db_key_range_proc ../rpc_server/c/db_server_proc.c /^__db_key_range_proc(dbpcl_id, txnpcl_id, keydlen,$/ +__db_key_range_proc ../rpc_server/c/db_server_proc.c /^__db_key_range_proc(dbpcl_id, txnpcl_id, keydlen, / __db_lastpgno ../db/db_upg.c /^__db_lastpgno(dbp, real_name, fhp, pgno_lastp)$/ __db_lget ../db/db_meta.c /^__db_lget(dbc, action, pgno, mode, lkflags, lockp)/ __db_limbo_bucket ../db/db_dispatch.c /^__db_limbo_bucket(dbenv, txn, elp, state)$/ @@ -2327,38 +2532,35 @@ __db_limbo_move ../db/db_dispatch.c /^__db_limbo_move(dbenv, ptxn, txn, elp)$/ __db_limbo_prepare ../db/db_dispatch.c /^__db_limbo_prepare(dbp, txn, elp)$/ __db_loadme ../db/db_pr.c /^__db_loadme()$/ __db_lock_move ../db/db_dispatch.c /^__db_lock_move(dbenv, fileid, pgno, mode, ptxn, tx/ +__db_lockmode_to_string ../db/db_pr.c /^__db_lockmode_to_string(mode)$/ __db_log2 ../common/db_log2.c /^__db_log2(num)$/ -__db_log_cursor_close ../libdb_java/db_java_wrap.c /^static db_ret_t __db_log_cursor_close(struct __db_/ -__db_log_cursor_get ../libdb_java/db_java_wrap.c /^static int __db_log_cursor_get(struct __db_log_cur/ +__db_log_corrupt ../env/env_recover.c /^__db_log_corrupt(dbenv, lsnp)$/ __db_log_page ../db/db.c /^__db_log_page(dbp, txn, lsn, pgno, page)$/ __db_logmsg ../common/db_err.c /^__db_logmsg(const DB_ENV *dbenv,$/ __db_lorder_proc ../rpc_server/c/db_server_proc.c /^__db_lorder_proc(dbpcl_id, lorder, replyp)$/ __db_lprint ../db/db_meta.c /^__db_lprint(dbc)$/ __db_lput ../db/db_meta.c /^__db_lput(dbc, lockp)$/ __db_lsgenrand ../crypto/mersenne/mt19937db.c /^__db_lsgenrand(seed_array, mt, mtip)$/ -__db_lsn_get_file ../libdb_java/db_java_wrap.c /^static u_int32_t __db_lsn_get_file(struct __db_lsn/ -__db_lsn_get_offset ../libdb_java/db_java_wrap.c /^static u_int32_t __db_lsn_get_offset(struct __db_l/ +__db_lsn_reset ../db/db_setlsn.c /^__db_lsn_reset(dbenv, name, passwd)$/ __db_maintinit ../dbinc/mutex.h /^#define __db_maintinit(a, b, c) __db_shreg_mainti/ __db_makeKey ../crypto/rijndael/rijndael-api-fst.c /^__db_makeKey(key, direction, keyLen, keyMaterial)$/ __db_makecopy ../db/db.c /^__db_makecopy(dbenv, src, dest)$/ __db_map_flags ../db/db_method.c /^__db_map_flags(dbp, inflagsp, outflagsp)$/ -__db_map_rmid ../xa/xa_map.c /^__db_map_rmid(rmid, env)$/ -__db_map_xid ../xa/xa_map.c /^__db_map_xid(env, xid, off)$/ +__db_map_rmid ../xa/xa_map.c /^__db_map_rmid(rmid, dbenv)$/ +__db_map_xid ../xa/xa_map.c /^__db_map_xid(dbenv, xid, off)$/ __db_master_open ../db/db.c /^__db_master_open(subdbp, txn, name, flags, mode, d/ __db_master_update ../db/db.c /^__db_master_update(mdbp, sdbp, txn, subdb, type, a/ -__db_meta ../db/db_pr.c /^__db_meta(dbp, dbmeta, fp, fn, flags)$/ +__db_meta ../db/db_pr.c /^__db_meta(dbp, dbmeta, fn, flags)$/ __db_meta2pgset ../db/db_vrfy.c /^__db_meta2pgset(dbp, vdp, pgno, flags, pgset)$/ __db_meta_setup ../db/db_open.c /^__db_meta_setup(dbenv, dbp, name, meta, oflags, do/ __db_metaswap ../db/db_conv.c /^__db_metaswap(pg)$/ __db_mi_env ../env/env_method.c /^__db_mi_env(dbenv, name)$/ __db_mi_open ../env/env_method.c /^__db_mi_open(dbenv, name, after)$/ __db_moff ../db/db_overflow.c /^__db_moff(dbp, dbt, pgno, tlen, cmpfunc, cmpp)$/ -__db_mpoolfile_get_flags ../libdb_java/db_java_wrap.c /^static u_int32_t __db_mpoolfile_get_flags(struct _/ -__db_mpoolfile_get_maxsize ../libdb_java/db_java_wrap.c /^static jlong __db_mpoolfile_get_maxsize(struct __d/ -__db_mpoolfile_get_priority ../libdb_java/db_java_wrap.c /^static DB_CACHE_PRIORITY __db_mpoolfile_get_priori/ -__db_mpoolfile_set_flags ../libdb_java/db_java_wrap.c /^static db_ret_t __db_mpoolfile_set_flags(struct __/ -__db_mpoolfile_set_maxsize ../libdb_java/db_java_wrap.c /^static db_ret_t __db_mpoolfile_set_maxsize(struct / -__db_mpoolfile_set_priority ../libdb_java/db_java_wrap.c /^static db_ret_t __db_mpoolfile_set_priority(struct/ +__db_msg ../common/db_err.c /^__db_msg(const DB_ENV *dbenv, const char *fmt, .../ +__db_msgadd ../common/db_err.c /^__db_msgadd(DB_ENV *dbenv, DB_MSGBUF *mbp, const c/ +__db_msgcall ../common/db_err.c /^__db_msgcall(dbenv, fmt, ap)$/ +__db_msgfile ../common/db_err.c /^__db_msgfile(dbenv, fmt, ap)$/ __db_mutex_alloc_int ../mutex/mutex.c /^__db_mutex_alloc_int(dbenv, infop, storep)$/ __db_mutex_destroy ../dbinc/mutex.h /^#define __db_mutex_destroy(a) __db_pthread_mutex_/ __db_mutex_free ../mutex/mutex.c /^__db_mutex_free(dbenv, infop, mutexp)$/ @@ -2383,9 +2585,8 @@ __db_ndbm_store ../dbm/dbm.c /^__db_ndbm_store(dbm, key, data, flags)$/ __db_new ../db/db_meta.c /^__db_new(dbc, type, pagepp)$/ __db_new_file ../db/db_open.c /^__db_new_file(dbp, txn, fhp, name)$/ __db_no_open ../dbm/dbm.c /^__db_no_open()$/ -__db_noop_getpgnos ../db/db_auto.c /^__db_noop_getpgnos(dbenv, rec, lsnp, notused1, sum/ __db_noop_log ../db/db_auto.c /^__db_noop_log(dbp, txnid, ret_lsnp, flags, pgno, p/ -__db_noop_print ../db/db_auto.c /^__db_noop_print(dbenv, dbtp, lsnp, notused2, notus/ +__db_noop_print ../db/db_autop.c /^__db_noop_print(dbenv, dbtp, lsnp, notused2, notus/ __db_noop_read ../db/db_auto.c /^__db_noop_read(dbenv, recbuf, argpp)$/ __db_noop_recover ../db/db_rec.c /^__db_noop_recover(dbenv, dbtp, lsnp, op, info)$/ __db_nosystemmem ../os/os_map.c /^__db_nosystemmem(dbenv)$/ @@ -2395,13 +2596,12 @@ __db_omode ../os/os_oflags.c /^__db_omode(perm)$/ __db_open ../db/db_open.c /^__db_open(dbp, txn, fname, dname, type, flags, mod/ __db_open_arg ../db/db_iface.c /^__db_open_arg(dbp, txn, fname, dname, type, flags)/ __db_open_pp ../db/db_iface.c /^__db_open_pp(dbp, txn, fname, dname, type, flags, / -__db_open_proc ../rpc_server/c/db_server_proc.c /^__db_open_proc(dbpcl_id, txnpcl_id, name,$/ +__db_open_proc ../rpc_server/c/db_server_proc.c /^__db_open_proc(dbpcl_id, txnpcl_id, name, subdb, t/ __db_overwrite ../env/env_file.c /^__db_overwrite(dbenv, path)$/ __db_overwrite_pass ../env/env_file.c /^__db_overwrite_pass(dbenv, path, fhp, mbytes, byte/ __db_ovref ../db/db_overflow.c /^__db_ovref(dbc, pgno, adjust)$/ -__db_ovref_getpgnos ../db/db_auto.c /^__db_ovref_getpgnos(dbenv, rec, lsnp, notused1, su/ __db_ovref_log ../db/db_auto.c /^__db_ovref_log(dbp, txnid, ret_lsnp, flags, pgno, / -__db_ovref_print ../db/db_auto.c /^__db_ovref_print(dbenv, dbtp, lsnp, notused2, notu/ +__db_ovref_print ../db/db_autop.c /^__db_ovref_print(dbenv, dbtp, lsnp, notused2, notu/ __db_ovref_read ../db/db_auto.c /^__db_ovref_read(dbenv, recbuf, argpp)$/ __db_ovref_recover ../db/db_rec.c /^__db_ovref_recover(dbenv, dbtp, lsnp, op, info)$/ __db_padDecrypt ../crypto/rijndael/rijndael-api-fst.c /^__db_padDecrypt(cipher, key, input, inputOctets, o/ @@ -2413,55 +2613,61 @@ __db_panic ../common/db_err.c /^__db_panic(dbenv, errval)$/ __db_panic_msg ../common/db_err.c /^__db_panic_msg(dbenv)$/ __db_parse ../env/env_open.c /^__db_parse(dbenv, s)$/ __db_partsize ../db/db_cam.c /^__db_partsize(nbytes, data)$/ -__db_pg_alloc_getpgnos ../db/db_auto.c /^__db_pg_alloc_getpgnos(dbenv, rec, lsnp, notused1,/ __db_pg_alloc_log ../db/db_auto.c /^__db_pg_alloc_log(dbp, txnid, ret_lsnp, flags, met/ -__db_pg_alloc_print ../db/db_auto.c /^__db_pg_alloc_print(dbenv, dbtp, lsnp, notused2, n/ +__db_pg_alloc_print ../db/db_autop.c /^__db_pg_alloc_print(dbenv, dbtp, lsnp, notused2, n/ __db_pg_alloc_read ../db/db_auto.c /^__db_pg_alloc_read(dbenv, recbuf, argpp)$/ __db_pg_alloc_recover ../db/db_rec.c /^__db_pg_alloc_recover(dbenv, dbtp, lsnp, op, info)/ -__db_pg_free_getpgnos ../db/db_auto.c /^__db_pg_free_getpgnos(dbenv, rec, lsnp, notused1, / __db_pg_free_log ../db/db_auto.c /^__db_pg_free_log(dbp, txnid, ret_lsnp, flags, pgno/ -__db_pg_free_print ../db/db_auto.c /^__db_pg_free_print(dbenv, dbtp, lsnp, notused2, no/ +__db_pg_free_print ../db/db_autop.c /^__db_pg_free_print(dbenv, dbtp, lsnp, notused2, no/ __db_pg_free_read ../db/db_auto.c /^__db_pg_free_read(dbenv, recbuf, argpp)$/ __db_pg_free_recover ../db/db_rec.c /^__db_pg_free_recover(dbenv, dbtp, lsnp, op, info)$/ __db_pg_free_recover_int ../db/db_rec.c /^__db_pg_free_recover_int(dbenv, argp, file_dbp, ls/ -__db_pg_freedata_getpgnos ../db/db_auto.c /^__db_pg_freedata_getpgnos(dbenv, rec, lsnp, notuse/ __db_pg_freedata_log ../db/db_auto.c /^__db_pg_freedata_log(dbp, txnid, ret_lsnp, flags, / -__db_pg_freedata_print ../db/db_auto.c /^__db_pg_freedata_print(dbenv, dbtp, lsnp, notused2/ +__db_pg_freedata_print ../db/db_autop.c /^__db_pg_freedata_print(dbenv, dbtp, lsnp, notused2/ __db_pg_freedata_read ../db/db_auto.c /^__db_pg_freedata_read(dbenv, recbuf, argpp)$/ __db_pg_freedata_recover ../db/db_rec.c /^__db_pg_freedata_recover(dbenv, dbtp, lsnp, op, in/ -__db_pg_new_getpgnos ../db/db_auto.c /^__db_pg_new_getpgnos(dbenv, rec, lsnp, notused1, s/ +__db_pg_init_log ../db/db_auto.c /^__db_pg_init_log(dbp, txnid, ret_lsnp, flags, pgno/ +__db_pg_init_print ../db/db_autop.c /^__db_pg_init_print(dbenv, dbtp, lsnp, notused2, no/ +__db_pg_init_read ../db/db_auto.c /^__db_pg_init_read(dbenv, recbuf, argpp)$/ +__db_pg_init_recover ../db/db_rec.c /^__db_pg_init_recover(dbenv, dbtp, lsnp, op, info)$/ __db_pg_new_log ../db/db_auto.c /^__db_pg_new_log(dbp, txnid, ret_lsnp, flags, pgno,/ -__db_pg_new_print ../db/db_auto.c /^__db_pg_new_print(dbenv, dbtp, lsnp, notused2, not/ +__db_pg_new_print ../db/db_autop.c /^__db_pg_new_print(dbenv, dbtp, lsnp, notused2, not/ __db_pg_new_read ../db/db_auto.c /^__db_pg_new_read(dbenv, recbuf, argpp)$/ __db_pg_new_recover ../db/db_rec.c /^__db_pg_new_recover(dbenv, dbtp, lsnp, op, info)$/ -__db_pg_prepare_getpgnos ../db/db_auto.c /^__db_pg_prepare_getpgnos(dbenv, rec, lsnp, notused/ __db_pg_prepare_log ../db/db_auto.c /^__db_pg_prepare_log(dbp, txnid, ret_lsnp, flags, p/ -__db_pg_prepare_print ../db/db_auto.c /^__db_pg_prepare_print(dbenv, dbtp, lsnp, notused2,/ +__db_pg_prepare_print ../db/db_autop.c /^__db_pg_prepare_print(dbenv, dbtp, lsnp, notused2,/ __db_pg_prepare_read ../db/db_auto.c /^__db_pg_prepare_read(dbenv, recbuf, argpp)$/ __db_pg_prepare_recover ../db/db_rec.c /^__db_pg_prepare_recover(dbenv, dbtp, lsnp, op, inf/ __db_pgerr ../common/db_err.c /^__db_pgerr(dbp, pgno, errval)$/ __db_pget ../db/db_iface.c /^__db_pget(dbp, txn, skey, pkey, data, flags)$/ -__db_pget__SWIG_1 ../libdb_java/db_java_wrap.c /^static int __db_pget__SWIG_1(struct __db *self,DB_/ __db_pget_arg ../db/db_iface.c /^__db_pget_arg(dbp, pkey, flags)$/ __db_pget_pp ../db/db_iface.c /^__db_pget_pp(dbp, txn, skey, pkey, data, flags)$/ -__db_pget_proc ../rpc_server/c/db_server_proc.c /^__db_pget_proc(dbpcl_id, txnpcl_id, skeydlen,$/ +__db_pget_proc ../rpc_server/c/db_server_proc.c /^__db_pget_proc(dbpcl_id, txnpcl_id, skeydlen, skey/ __db_pgfmt ../common/db_err.c /^__db_pgfmt(dbenv, pgno)$/ __db_pgin ../db/db_conv.c /^__db_pgin(dbenv, pg, pp, cookie)$/ __db_pgout ../db/db_conv.c /^__db_pgout(dbenv, pg, pp, cookie)$/ __db_pitem ../db/db_dup.c /^__db_pitem(dbc, pagep, indx, nbytes, hdr, data)$/ __db_poff ../db/db_overflow.c /^__db_poff(dbc, dbt, pgnop)$/ -__db_pr ../db/db_pr.c /^__db_pr(p, len, fp)$/ +__db_pr ../db/db_pr.c /^__db_pr(dbenv, mbp, p, len)$/ __db_pr_callback ../db/db_pr.c /^__db_pr_callback(handle, str_arg)$/ -__db_prdb ../db/db_pr.c /^__db_prdb(dbp, fp)$/ +__db_prdb ../db/db_pr.c /^__db_prdb(dbp, flags)$/ __db_prdbt ../db/db_pr.c /^__db_prdbt(dbtp, checkprint, prefix, handle, callb/ -__db_prflags ../db/db_pr.c /^__db_prflags(flags, fn, vfp)$/ +__db_prflags ../db/db_pr.c /^__db_prflags(dbenv, mbp, flags, fn, prefix, suffix/ __db_prfooter ../db/db_pr.c /^__db_prfooter(handle, callback)$/ __db_prheader ../db/db_pr.c /^__db_prheader(dbp, subname, pflag, keyflag, handle/ -__db_prnpage ../db/db_pr.c /^__db_prnpage(dbp, pgno, fp)$/ -__db_proff ../db/db_pr.c /^__db_proff(vp, fp)$/ -__db_prpage ../db/db_pr.c /^__db_prpage(dbp, h, fp, flags)$/ -__db_prqueue ../qam/qam_method.c /^__db_prqueue(dbp, fp, flags)$/ -__db_prtree ../db/db_pr.c /^__db_prtree(dbp, fp, flags)$/ +__db_print_all ../db/db_stati.c /^__db_print_all(dbp, flags)$/ +__db_print_citem ../db/db_stati.c /^int __db_print_citem(dbc)$/ +__db_print_cursor ../db/db_stati.c /^__db_print_cursor(dbp)$/ +__db_print_fh ../env/env_stat.c /^__db_print_fh(dbenv, fh, flags)$/ +__db_print_fileid ../env/env_stat.c /^__db_print_fileid(dbenv, id, suffix)$/ +__db_print_mutex ../env/env_stat.c /^__db_print_mutex(dbenv, mbp, mutex, suffix, flags)/ +__db_print_reginfo ../env/env_stat.c /^__db_print_reginfo(dbenv, infop, s)$/ +__db_print_stats ../db/db_stati.c /^__db_print_stats(dbp, flags)$/ +__db_prnpage ../db/db_pr.c /^__db_prnpage(dbp, pgno)$/ +__db_proff ../db/db_pr.c /^__db_proff(dbenv, mbp, vp)$/ +__db_prpage ../db/db_pr.c /^__db_prpage(dbp, h, flags)$/ +__db_prqueue ../qam/qam_method.c /^__db_prqueue(dbp, flags)$/ +__db_prtree ../db/db_pr.c /^__db_prtree(dbp, flags)$/ __db_pthread_mutex_destroy ../mutex/mut_pthread.c /^__db_pthread_mutex_destroy(mutexp)$/ __db_pthread_mutex_init ../mutex/mut_pthread.c /^__db_pthread_mutex_init(dbenv, mutexp, flags)$/ __db_pthread_mutex_lock ../mutex/mut_pthread.c /^__db_pthread_mutex_lock(dbenv, mutexp)$/ @@ -2469,8 +2675,8 @@ __db_pthread_mutex_unlock ../mutex/mut_pthread.c /^__db_pthread_mutex_unlock(dbe __db_put ../db/db_am.c /^__db_put(dbp, txn, key, data, flags)$/ __db_put_arg ../db/db_iface.c /^__db_put_arg(dbp, key, data, flags)$/ __db_put_pp ../db/db_iface.c /^__db_put_pp(dbp, txn, key, data, flags)$/ -__db_put_proc ../rpc_server/c/db_server_proc.c /^__db_put_proc(dbpcl_id, txnpcl_id, keydlen,$/ -__db_qmeta ../db/db_pr.c /^__db_qmeta(dbp, fp, h, flags)$/ +__db_put_proc ../rpc_server/c/db_server_proc.c /^__db_put_proc(dbpcl_id, txnpcl_id, keydlen, keydof/ +__db_qmeta ../db/db_pr.c /^__db_qmeta(dbp, h, flags)$/ __db_r_attach ../env/env_region.c /^__db_r_attach(dbenv, infop, size)$/ __db_r_detach ../env/env_region.c /^__db_r_detach(dbenv, infop, destroy)$/ __db_rdonly ../db/db_iface.c /^__db_rdonly(dbenv, name)$/ @@ -2482,22 +2688,15 @@ __db_rec_toobig ../common/db_err.c /^__db_rec_toobig(dbenv, data_len, fixed_rec_ __db_reclaim_callback ../db/db_reclaim.c /^__db_reclaim_callback(dbp, p, cookie, putp)$/ __db_refresh ../db/db.c /^__db_refresh(dbp, txn, flags, deferred_closep)$/ __db_region_destroy ../env/env_region.c /^__db_region_destroy(dbenv, infop)$/ -__db_relink ../db/db_dup.c /^__db_relink(dbc, add_rem, pagep, new_next, needloc/ -__db_relink_getpgnos ../db/db_auto.c /^__db_relink_getpgnos(dbenv, rec, lsnp, notused1, s/ -__db_relink_log ../db/db_auto.c /^__db_relink_log(dbp, txnid, ret_lsnp, flags,$/ -__db_relink_print ../db/db_auto.c /^__db_relink_print(dbenv, dbtp, lsnp, notused2, not/ -__db_relink_read ../db/db_auto.c /^__db_relink_read(dbenv, recbuf, argpp)$/ -__db_relink_recover ../db/db_rec.c /^__db_relink_recover(dbenv, dbtp, lsnp, op, info)$/ __db_remove ../db/db_remove.c /^__db_remove(dbp, txn, name, subdb, flags)$/ __db_remove_int ../db/db_remove.c /^__db_remove_int(dbp, txn, name, subdb, flags)$/ __db_remove_pp ../db/db_remove.c /^__db_remove_pp(dbp, name, subdb, flags)$/ -__db_remove_proc ../rpc_server/c/db_server_proc.c /^__db_remove_proc(dbpcl_id, name, subdb,$/ +__db_remove_proc ../rpc_server/c/db_server_proc.c /^__db_remove_proc(dbpcl_id, name, subdb, flags, rep/ __db_rename ../db/db_rename.c /^__db_rename(dbp, txn, name, subdb, newname)$/ __db_rename_int ../db/db_rename.c /^__db_rename_int(dbp, txn, name, subdb, newname)$/ __db_rename_pp ../db/db_rename.c /^__db_rename_pp(dbp, name, subdb, newname, flags)$/ -__db_rename_proc ../rpc_server/c/db_server_proc.c /^__db_rename_proc(dbpcl_id, name, subdb,$/ -__db_rep_enter ../rep/rep_util.c /^__db_rep_enter(dbp, checkgen, return_now)$/ -__db_rep_exit ../rep/rep_util.c /^__db_rep_exit(dbenv)$/ +__db_rename_proc ../rpc_server/c/db_server_proc.c /^__db_rename_proc(dbpcl_id, name, subdb, newname, f/ +__db_rep_enter ../rep/rep_util.c /^__db_rep_enter(dbp, checkgen, checklock, return_no/ __db_ret ../db/db_ret.c /^__db_ret(dbp, h, indx, dbt, memp, memsize)$/ __db_retcopy ../db/db_ret.c /^__db_retcopy(dbenv, dbt, data, len, memp, memsize)/ __db_rijndaelDecrypt ../crypto/rijndael/rijndael-alg-fst.c /^__db_rijndaelDecrypt(rk, Nr, ct, pt)$/ @@ -2506,7 +2705,7 @@ __db_rijndaelEncrypt ../crypto/rijndael/rijndael-alg-fst.c /^__db_rijndaelEncryp __db_rijndaelEncryptRound ../crypto/rijndael/rijndael-alg-fst.c /^__db_rijndaelEncryptRound(rk, Nr, pt, ct)$/ __db_rijndaelKeySetupDec ../crypto/rijndael/rijndael-alg-fst.c /^__db_rijndaelKeySetupDec(rk, cipherKey, keyBits)$/ __db_rijndaelKeySetupEnc ../crypto/rijndael/rijndael-alg-fst.c /^__db_rijndaelKeySetupEnc(rk, cipherKey, keyBits)$/ -__db_rmid_to_env ../xa/xa_map.c /^__db_rmid_to_env(rmid, envp)$/ +__db_rmid_to_env ../xa/xa_map.c /^__db_rmid_to_env(rmid, dbenvp)$/ __db_rpath ../os/os_rpath.c /^__db_rpath(path)$/ __db_s_done ../db/db_cam.c /^__db_s_done(sdbp)$/ __db_s_first ../db/db_cam.c /^__db_s_first(pdbp)$/ @@ -2524,14 +2723,11 @@ __db_salvage_subdbpg ../db/db_vrfy.c /^__db_salvage_subdbpg(dbp, vdp, master, ha __db_salvage_subdbs ../db/db_vrfy.c /^__db_salvage_subdbs(dbp, vdp, handle, callback, fl/ __db_salvage_unknowns ../db/db_vrfy.c /^__db_salvage_unknowns(dbp, vdp, handle, callback, / __db_secondary_close ../db/db_am.c /^__db_secondary_close(sdbp, flags)$/ +__db_secondary_close_pp ../db/db_iface.c /^__db_secondary_close_pp(dbp, flags)$/ __db_secondary_corrupt ../db/db_join.c /^__db_secondary_corrupt(dbp)$/ __db_secondary_get ../db/db_am.c /^__db_secondary_get(sdbp, txn, skey, data, flags)$/ __db_set_alloc ../db/db_method.c /^__db_set_alloc(dbp, mal_func, real_func, free_func/ __db_set_append_recno ../db/db_method.c /^__db_set_append_recno(dbp, func)$/ -__db_set_bt_compare ../libdb_java/db_java_wrap.c /^static db_ret_t __db_set_bt_compare(struct __db *s/ -__db_set_bt_maxkey ../libdb_java/db_java_wrap.c /^static db_ret_t __db_set_bt_maxkey(struct __db *se/ -__db_set_bt_minkey ../libdb_java/db_java_wrap.c /^static db_ret_t __db_set_bt_minkey(struct __db *se/ -__db_set_bt_prefix ../libdb_java/db_java_wrap.c /^static db_ret_t __db_set_bt_prefix(struct __db *se/ __db_set_cachesize ../db/db_method.c /^__db_set_cachesize(dbp, cache_gbytes, cache_bytes,/ __db_set_dup_compare ../db/db_method.c /^__db_set_dup_compare(dbp, func)$/ __db_set_encrypt ../db/db_method.c /^__db_set_encrypt(dbp, passwd, flags)$/ @@ -2540,35 +2736,32 @@ __db_set_errfile ../db/db_method.c /^__db_set_errfile(dbp, errfile)$/ __db_set_errpfx ../db/db_method.c /^__db_set_errpfx(dbp, errpfx)$/ __db_set_feedback ../db/db_method.c /^__db_set_feedback(dbp, feedback)$/ __db_set_flags ../db/db_method.c /^__db_set_flags(dbp, flags)$/ -__db_set_h_ffactor ../libdb_java/db_java_wrap.c /^static db_ret_t __db_set_h_ffactor(struct __db *se/ -__db_set_h_hash ../libdb_java/db_java_wrap.c /^static db_ret_t __db_set_h_hash(struct __db *self,/ -__db_set_h_nelem ../libdb_java/db_java_wrap.c /^static db_ret_t __db_set_h_nelem(struct __db *self/ __db_set_lorder ../db/db_method.c /^__db_set_lorder(dbp, db_lorder)$/ +__db_set_msgcall ../db/db_method.c /^__db_set_msgcall(dbp, msgcall)$/ +__db_set_msgfile ../db/db_method.c /^__db_set_msgfile(dbp, msgfile)$/ __db_set_pagesize ../db/db_method.c /^__db_set_pagesize(dbp, db_pagesize)$/ __db_set_paniccall ../db/db_method.c /^__db_set_paniccall(dbp, paniccall)$/ -__db_set_q_extentsize ../libdb_java/db_java_wrap.c /^static db_ret_t __db_set_q_extentsize(struct __db / -__db_set_re_delim ../libdb_java/db_java_wrap.c /^static db_ret_t __db_set_re_delim(struct __db *sel/ -__db_set_re_len ../libdb_java/db_java_wrap.c /^static db_ret_t __db_set_re_len(struct __db *self,/ -__db_set_re_pad ../libdb_java/db_java_wrap.c /^static db_ret_t __db_set_re_pad(struct __db *self,/ -__db_set_re_source ../libdb_java/db_java_wrap.c /^static db_ret_t __db_set_re_source(struct __db *se/ __db_sgenrand ../crypto/mersenne/mt19937db.c /^__db_sgenrand(seed, mt, mtip)$/ -__db_shalloc ../env/db_salloc.c /^__db_shalloc(p, len, align, retp)$/ -__db_shalloc_dump ../env/db_salloc.c /^__db_shalloc_dump(addr, fp)$/ -__db_shalloc_free ../env/db_salloc.c /^__db_shalloc_free(regionp, ptr)$/ -__db_shalloc_init ../env/db_salloc.c /^__db_shalloc_init(area, size)$/ +__db_shalloc ../env/db_salloc.c /^__db_shalloc(infop, len, align, retp)$/ +__db_shalloc_free ../env/db_salloc.c /^__db_shalloc_free(infop, ptr)$/ +__db_shalloc_init ../env/db_salloc.c /^__db_shalloc_init(infop, size)$/ __db_shalloc_size ../env/db_salloc.c /^__db_shalloc_size(len, align)$/ +__db_shalloc_sizeof ../env/db_salloc.c /^__db_shalloc_sizeof(ptr)$/ __db_shlocks_clear ../dbinc/mutex.h /^#define __db_shlocks_clear(a, b, c) __db_shreg_loc/ __db_shlocks_destroy ../dbinc/mutex.h /^#define __db_shlocks_destroy(a, b) __db_shreg_lock/ +__db_shm_mode ../os/os_oflags.c /^__db_shm_mode(dbenv)$/ __db_shreg_locks_clear ../mutex/mutex.c /^__db_shreg_locks_clear(mutexp, infop, rp)$/ __db_shreg_locks_destroy ../mutex/mutex.c /^__db_shreg_locks_destroy(infop, rp)$/ __db_shreg_locks_record ../mutex/mutex.c /^__db_shreg_locks_record(dbenv, mutexp, infop, rp)$/ __db_shreg_maintinit ../mutex/mutex.c /^__db_shreg_maintinit(infop, addr, size)$/ __db_shreg_mutex_init ../mutex/mutex.c /^__db_shreg_mutex_init(dbenv, mutexp, offset, flags/ -__db_shsizeof ../env/db_salloc.c /^__db_shsizeof(ptr)$/ -__db_stat ../db/db_iface.c /^__db_stat(dbp, spp, flags)$/ -__db_stat_arg ../db/db_iface.c /^__db_stat_arg(dbp, flags)$/ -__db_stat_pp ../db/db_iface.c /^__db_stat_pp(dbp, spp, flags)$/ -__db_stat_proc ../rpc_server/c/db_server_proc.c /^__db_stat_proc(dbpcl_id, flags, replyp, freep)$/ +__db_stat ../db/db_stati.c /^__db_stat(dbp, txn, spp, flags)$/ +__db_stat_arg ../db/db_stati.c /^__db_stat_arg(dbp, flags)$/ +__db_stat_not_built ../env/env_stat.c /^__db_stat_not_built(dbenv)$/ +__db_stat_pp ../db/db_stati.c /^__db_stat_pp(dbp, txn, spp, flags)$/ +__db_stat_print ../db/db_stati.c /^__db_stat_print(dbp, flags)$/ +__db_stat_print_pp ../db/db_stati.c /^__db_stat_print_pp(dbp, flags)$/ +__db_stat_proc ../rpc_server/c/db_server_proc.c /^__db_stat_proc(dbpcl_id, txnpcl_id, flags, replyp,/ __db_strsep ../common/util_arg.c /^__db_strsep(stringp, delim)$/ __db_subdb_remove ../db/db_remove.c /^__db_subdb_remove(dbp, txn, name, subdb)$/ __db_subdb_rename ../db/db_rename.c /^__db_subdb_rename(dbp, txn, name, subdb, newname)$/ @@ -2584,29 +2777,23 @@ __db_testcopy ../db/db.c /^__db_testcopy(dbenv, dbp, name)$/ __db_testdocopy ../db/db.c /^__db_testdocopy(dbenv, name)$/ __db_tmp_open ../env/env_open.c /^__db_tmp_open(dbenv, tmp_oflags, path, fhpp)$/ __db_traverse_big ../db/db_reclaim.c /^__db_traverse_big(dbp, pgno, callback, cookie)$/ -__db_truncate ../db/db_truncate.c /^__db_truncate(dbp, txn, countp, flags)$/ +__db_truncate ../db/db_truncate.c /^__db_truncate(dbp, txn, countp)$/ __db_truncate_callback ../db/db_reclaim.c /^__db_truncate_callback(dbp, p, cookie, putp)$/ __db_truncate_pp ../db/db_truncate.c /^__db_truncate_pp(dbp, txn, countp, flags)$/ -__db_truncate_proc ../rpc_server/c/db_server_proc.c /^__db_truncate_proc(dbpcl_id, txnpcl_id,$/ -__db_txn_abort ../libdb_java/db_java_wrap.c /^static db_ret_t __db_txn_abort(struct __db_txn *se/ -__db_txn_abort_4002 ../rpc_client/db_server_clnt.c /^__db_txn_abort_4002(argp, clnt)$/ +__db_truncate_proc ../rpc_server/c/db_server_proc.c /^__db_truncate_proc(dbpcl_id, txnpcl_id, flags, rep/ +__db_txn_abort_4003__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_txn_abort_4003__SVCSUFFIX__(msg, req)$/ __db_txn_auto_init ../db/db_iface.c /^__db_txn_auto_init(dbenv, txnidp)$/ __db_txn_auto_resolve ../db/db_iface.c /^__db_txn_auto_resolve(dbenv, txn, nosync, ret)$/ -__db_txn_begin_4002 ../rpc_client/db_server_clnt.c /^__db_txn_begin_4002(argp, clnt)$/ -__db_txn_commit ../libdb_java/db_java_wrap.c /^static db_ret_t __db_txn_commit(struct __db_txn *s/ -__db_txn_commit_4002 ../rpc_client/db_server_clnt.c /^__db_txn_commit_4002(argp, clnt)$/ -__db_txn_discard ../libdb_java/db_java_wrap.c /^static db_ret_t __db_txn_discard(struct __db_txn */ -__db_txn_discard_4002 ../rpc_client/db_server_clnt.c /^__db_txn_discard_4002(argp, clnt)$/ -__db_txn_id ../libdb_java/db_java_wrap.c /^static u_int32_t __db_txn_id(struct __db_txn *self/ -__db_txn_prepare ../libdb_java/db_java_wrap.c /^static db_ret_t __db_txn_prepare(struct __db_txn */ -__db_txn_prepare_4002 ../rpc_client/db_server_clnt.c /^__db_txn_prepare_4002(argp, clnt)$/ -__db_txn_recover_4002 ../rpc_client/db_server_clnt.c /^__db_txn_recover_4002(argp, clnt)$/ -__db_txn_set_timeout ../libdb_java/db_java_wrap.c /^static db_ret_t __db_txn_set_timeout(struct __db_t/ +__db_txn_begin_4003__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_txn_begin_4003__SVCSUFFIX__(msg, req)$/ +__db_txn_commit_4003__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_txn_commit_4003__SVCSUFFIX__(msg, req)$/ +__db_txn_discard_4003__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_txn_discard_4003__SVCSUFFIX__(msg, req)$/ +__db_txn_prepare_4003__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_txn_prepare_4003__SVCSUFFIX__(msg, req)$/ +__db_txn_recover_4003__SVCSUFFIX__ ../rpc_server/c/gen_db_server.c /^__db_txn_recover_4003__SVCSUFFIX__(msg, req)$/ __db_txnlist_add ../db/db_dispatch.c /^__db_txnlist_add(dbenv, listp, txnid, status, lsn)/ __db_txnlist_ckp ../db/db_dispatch.c /^__db_txnlist_ckp(dbenv, listp, ckp_lsn)$/ __db_txnlist_end ../db/db_dispatch.c /^__db_txnlist_end(dbenv, listp)$/ -__db_txnlist_find ../db/db_dispatch.c /^__db_txnlist_find(dbenv, listp, txnid)$/ -__db_txnlist_find_internal ../db/db_dispatch.c /^__db_txnlist_find_internal(dbenv, listp, type, txn/ +__db_txnlist_find ../db/db_dispatch.c /^__db_txnlist_find(dbenv, listp, txnid, statusp)$/ +__db_txnlist_find_internal ../db/db_dispatch.c /^__db_txnlist_find_internal(dbenv,$/ __db_txnlist_gen ../db/db_dispatch.c /^__db_txnlist_gen(dbenv, listp, incr, min, max)$/ __db_txnlist_init ../db/db_dispatch.c /^__db_txnlist_init(dbenv, low_txn, hi_txn, trunc_ls/ __db_txnlist_lsnadd ../db/db_dispatch.c /^__db_txnlist_lsnadd(dbenv, listp, lsnp, flags)$/ @@ -2618,12 +2805,12 @@ __db_txnlist_update ../db/db_dispatch.c /^__db_txnlist_update(dbenv, listp, txni __db_unknown_flag ../common/db_err.c /^__db_unknown_flag(dbenv, routine, flag)$/ __db_unknown_type ../common/db_err.c /^__db_unknown_type(dbenv, routine, type)$/ __db_unmap_rmid ../xa/xa_map.c /^__db_unmap_rmid(rmid)$/ -__db_unmap_xid ../xa/xa_map.c /^__db_unmap_xid(env, xid, off)$/ +__db_unmap_xid ../xa/xa_map.c /^__db_unmap_xid(dbenv, xid, off)$/ __db_up_ovref ../db/db_upg_opd.c /^__db_up_ovref(dbp, fhp, pgno)$/ __db_upgrade ../db/db_upg.c /^__db_upgrade(dbp, fname, flags)$/ __db_upgrade_pp ../db/db_upg.c /^__db_upgrade_pp(dbp, fname, flags)$/ __db_util_arg ../common/util_arg.c /^__db_util_arg(arg0, str, argcp, argvp)$/ -__db_util_cache ../common/util_cache.c /^__db_util_cache(dbenv, dbp, cachep, resizep)$/ +__db_util_cache ../common/util_cache.c /^__db_util_cache(dbp, cachep, resizep)$/ __db_util_interrupted ../common/util_sig.c /^__db_util_interrupted()$/ __db_util_logset ../common/util_log.c /^__db_util_logset(progname, fname)$/ __db_util_siginit ../common/util_sig.c /^__db_util_siginit()$/ @@ -2657,6 +2844,7 @@ __db_vrfy_pgset ../db/db_vrfyutil.c /^__db_vrfy_pgset(dbenv, pgsize, dbpp)$/ __db_vrfy_pgset_get ../db/db_vrfyutil.c /^__db_vrfy_pgset_get(dbp, pgno, valp)$/ __db_vrfy_pgset_inc ../db/db_vrfyutil.c /^__db_vrfy_pgset_inc(dbp, pgno)$/ __db_vrfy_pgset_next ../db/db_vrfyutil.c /^__db_vrfy_pgset_next(dbc, pgnop)$/ +__db_vrfy_prdbt ../db/db_vrfyutil.c /^__db_vrfy_prdbt(dbtp, checkprint, prefix, handle, / __db_vrfy_putpageinfo ../db/db_vrfyutil.c /^__db_vrfy_putpageinfo(dbenv, vdp, pip)$/ __db_vrfy_struct_feedback ../db/db_vrfy.c /^__db_vrfy_struct_feedback(dbp, vdp)$/ __db_vrfy_structure ../db/db_vrfy.c /^__db_vrfy_structure(dbp, vdp, dbname, meta_pgno, f/ @@ -2667,33 +2855,26 @@ __db_win32_mutex_init ../mutex/mut_win32.c /^__db_win32_mutex_init(dbenv, mutexp __db_win32_mutex_lock ../mutex/mut_win32.c /^__db_win32_mutex_lock(dbenv, mutexp)$/ __db_win32_mutex_unlock ../mutex/mut_win32.c /^__db_win32_mutex_unlock(dbenv, mutexp)$/ __db_wrlock_err ../db/db_cam.c /^__db_wrlock_err(dbenv)$/ -__db_xa_close ../xa/xa.c /^__db_xa_close(xa_info, rmid, flags)$/ -__db_xa_commit ../xa/xa.c /^__db_xa_commit(xid, rmid, flags)$/ +__db_xa_close ../xa/xa.c /^__db_xa_close(xa_info, rmid, arg_flags)$/ +__db_xa_commit ../xa/xa.c /^__db_xa_commit(xid, rmid, arg_flags)$/ __db_xa_complete ../xa/xa.c /^__db_xa_complete(handle, retval, rmid, flags)$/ __db_xa_create ../xa/xa_db.c /^__db_xa_create(dbp)$/ __db_xa_end ../xa/xa.c /^__db_xa_end(xid, rmid, flags)$/ -__db_xa_forget ../xa/xa.c /^__db_xa_forget(xid, rmid, flags)$/ -__db_xa_open ../xa/xa.c /^__db_xa_open(xa_info, rmid, flags)$/ -__db_xa_prepare ../xa/xa.c /^__db_xa_prepare(xid, rmid, flags)$/ +__db_xa_forget ../xa/xa.c /^__db_xa_forget(xid, rmid, arg_flags)$/ +__db_xa_open ../xa/xa.c /^__db_xa_open(xa_info, rmid, arg_flags)$/ +__db_xa_prepare ../xa/xa.c /^__db_xa_prepare(xid, rmid, arg_flags)$/ __db_xa_recover ../xa/xa.c /^__db_xa_recover(xids, count, rmid, flags)$/ -__db_xa_rollback ../xa/xa.c /^__db_xa_rollback(xid, rmid, flags)$/ -__db_xa_start ../xa/xa.c /^__db_xa_start(xid, rmid, flags)$/ +__db_xa_rollback ../xa/xa.c /^__db_xa_rollback(xid, rmid, arg_flags)$/ +__db_xa_start ../xa/xa.c /^__db_xa_start(xid, rmid, arg_flags)$/ __db_xid_to_txn ../xa/xa_map.c /^__db_xid_to_txn(dbenv, xid, offp)$/ -__dbc_close ../libdb_java/db_java_wrap.c /^static db_ret_t __dbc_close(struct __dbc *self){$/ __dbc_close_int ../rpc_server/c/db_server_util.c /^__dbc_close_int(dbc_ctp)$/ __dbc_close_proc ../rpc_server/c/db_server_proc.c /^__dbc_close_proc(dbccl_id, replyp)$/ -__dbc_count ../libdb_java/db_java_wrap.c /^static db_recno_t __dbc_count(struct __dbc *self,u/ __dbc_count_proc ../rpc_server/c/db_server_proc.c /^__dbc_count_proc(dbccl_id, flags, replyp)$/ -__dbc_del ../libdb_java/db_java_wrap.c /^static int __dbc_del(struct __dbc *self,u_int32_t / __dbc_del_proc ../rpc_server/c/db_server_proc.c /^__dbc_del_proc(dbccl_id, flags, replyp)$/ -__dbc_dup ../libdb_java/db_java_wrap.c /^static DBC *__dbc_dup(struct __dbc *self,u_int32_t/ __dbc_dup_proc ../rpc_server/c/db_server_proc.c /^__dbc_dup_proc(dbccl_id, flags, replyp)$/ -__dbc_get__SWIG_0 ../libdb_java/db_java_wrap.c /^static int __dbc_get__SWIG_0(struct __dbc *self,DB/ -__dbc_get_proc ../rpc_server/c/db_server_proc.c /^__dbc_get_proc(dbccl_id, keydlen, keydoff,$/ -__dbc_pget__SWIG_1 ../libdb_java/db_java_wrap.c /^static int __dbc_pget__SWIG_1(struct __dbc *self,D/ -__dbc_pget_proc ../rpc_server/c/db_server_proc.c /^__dbc_pget_proc(dbccl_id, skeydlen, skeydoff,$/ -__dbc_put ../libdb_java/db_java_wrap.c /^static int __dbc_put(struct __dbc *self,DBT *key,D/ -__dbc_put_proc ../rpc_server/c/db_server_proc.c /^__dbc_put_proc(dbccl_id, keydlen, keydoff,$/ +__dbc_get_proc ../rpc_server/c/db_server_proc.c /^__dbc_get_proc(dbccl_id, keydlen, keydoff, keyulen/ +__dbc_pget_proc ../rpc_server/c/db_server_proc.c /^__dbc_pget_proc(dbccl_id, skeydlen, skeydoff, skey/ +__dbc_put_proc ../rpc_server/c/db_server_proc.c /^__dbc_put_proc(dbccl_id, keydlen, keydoff, keyulen/ __dbcl_c_destroy ../rpc_client/client.c /^__dbcl_c_destroy(dbc)$/ __dbcl_c_refresh ../rpc_client/client.c /^__dbcl_c_refresh(dbc)$/ __dbcl_c_setup ../rpc_client/client.c /^__dbcl_c_setup(cl_id, dbp, dbcp)$/ @@ -2760,8 +2941,8 @@ __dbcl_db_remove_ret ../rpc_client/gen_client_ret.c /^__dbcl_db_remove_ret(dbp, __dbcl_db_rename ../rpc_client/gen_client.c /^__dbcl_db_rename(dbp, name, subdb, newname, flags)/ __dbcl_db_rename_ret ../rpc_client/gen_client_ret.c /^__dbcl_db_rename_ret(dbp, name, subdb, newname, fl/ __dbcl_db_set_append_recno ../rpc_client/gen_client.c /^__dbcl_db_set_append_recno(dbp, func0)$/ -__dbcl_db_stat ../rpc_client/gen_client.c /^__dbcl_db_stat(dbp, sp, flags)$/ -__dbcl_db_stat_ret ../rpc_client/gen_client_ret.c /^__dbcl_db_stat_ret(dbp, sp, flags, replyp)$/ +__dbcl_db_stat ../rpc_client/gen_client.c /^__dbcl_db_stat(dbp, txnp, sp, flags)$/ +__dbcl_db_stat_ret ../rpc_client/gen_client_ret.c /^__dbcl_db_stat_ret(dbp, txnp, sp, flags, replyp)$/ __dbcl_db_sync ../rpc_client/gen_client.c /^__dbcl_db_sync(dbp, flags)$/ __dbcl_db_truncate ../rpc_client/gen_client.c /^__dbcl_db_truncate(dbp, txnp, countp, flags)$/ __dbcl_db_truncate_ret ../rpc_client/gen_client_ret.c /^__dbcl_db_truncate_ret(dbp, txnp, countp, flags, r/ @@ -2814,7 +2995,8 @@ __dbcl_get_lk_detect ../rpc_client/gen_client.c /^__dbcl_get_lk_detect(dbenv, de __dbcl_get_lk_max_lockers ../rpc_client/gen_client.c /^__dbcl_get_lk_max_lockers(dbenv, maxp)$/ __dbcl_get_lk_max_locks ../rpc_client/gen_client.c /^__dbcl_get_lk_max_locks(dbenv, maxp)$/ __dbcl_get_lk_max_objects ../rpc_client/gen_client.c /^__dbcl_get_lk_max_objects(dbenv, maxp)$/ -__dbcl_get_mp_maxwrite ../rpc_client/gen_client.c /^__dbcl_get_mp_maxwrite(dbenv, nwritep, nsleepp)$/ +__dbcl_get_mp_max_openfd ../rpc_client/gen_client.c /^__dbcl_get_mp_max_openfd(dbenv, nopenp)$/ +__dbcl_get_mp_max_write ../rpc_client/gen_client.c /^__dbcl_get_mp_max_write(dbenv, nwritep, nsleepp)$/ __dbcl_get_mp_mmapsize ../rpc_client/gen_client.c /^__dbcl_get_mp_mmapsize(dbenv, mmapsizep)$/ __dbcl_get_shm_key ../rpc_client/gen_client.c /^__dbcl_get_shm_key(dbenv, shm_keyp)$/ __dbcl_get_tas_spins ../rpc_client/gen_client.c /^__dbcl_get_tas_spins(dbenv, tas_spinsp)$/ @@ -2864,7 +3046,7 @@ __dbcl_memp_sync ../rpc_client/gen_client.c /^__dbcl_memp_sync(dbenv, lsn)$/ __dbcl_memp_trickle ../rpc_client/gen_client.c /^__dbcl_memp_trickle(dbenv, pct, nwrotep)$/ __dbcl_noserver ../rpc_client/gen_client.c /^__dbcl_noserver(dbenv)$/ __dbcl_refresh ../rpc_client/client.c /^__dbcl_refresh(dbenv)$/ -__dbcl_rep_elect ../rpc_client/gen_client.c /^__dbcl_rep_elect(dbenv, nsites, pri, timeout, idp)/ +__dbcl_rep_elect ../rpc_client/gen_client.c /^__dbcl_rep_elect(dbenv, nsites, nvotes, pri, timeo/ __dbcl_rep_flush ../rpc_client/gen_client.c /^__dbcl_rep_flush(dbenv)$/ __dbcl_rep_get_limit ../rpc_client/gen_client.c /^__dbcl_rep_get_limit(dbenv, mbytesp, bytesp)$/ __dbcl_rep_process_message ../rpc_client/gen_client.c /^__dbcl_rep_process_message(dbenv, rec, control, id/ @@ -2887,7 +3069,8 @@ __dbcl_set_lk_max ../rpc_client/gen_client.c /^__dbcl_set_lk_max(dbenv, max)$/ __dbcl_set_lk_max_lockers ../rpc_client/gen_client.c /^__dbcl_set_lk_max_lockers(dbenv, max)$/ __dbcl_set_lk_max_locks ../rpc_client/gen_client.c /^__dbcl_set_lk_max_locks(dbenv, max)$/ __dbcl_set_lk_max_objects ../rpc_client/gen_client.c /^__dbcl_set_lk_max_objects(dbenv, max)$/ -__dbcl_set_mp_maxwrite ../rpc_client/gen_client.c /^__dbcl_set_mp_maxwrite(dbenv, nwrite, nsleep)$/ +__dbcl_set_mp_max_openfd ../rpc_client/gen_client.c /^__dbcl_set_mp_max_openfd(dbenv, nopen)$/ +__dbcl_set_mp_max_write ../rpc_client/gen_client.c /^__dbcl_set_mp_max_write(dbenv, nwrite, nsleep)$/ __dbcl_set_mp_mmapsize ../rpc_client/gen_client.c /^__dbcl_set_mp_mmapsize(dbenv, mmapsize)$/ __dbcl_set_shm_key ../rpc_client/gen_client.c /^__dbcl_set_shm_key(dbenv, shm_key)$/ __dbcl_set_tas_spins ../rpc_client/gen_client.c /^__dbcl_set_tas_spins(dbenv, tas_spins)$/ @@ -2931,6 +3114,7 @@ __dbenv_get_errfile ../env/env_method.c /^__dbenv_get_errfile(dbenv, errfilep)$/ __dbenv_get_errpfx ../env/env_method.c /^__dbenv_get_errpfx(dbenv, errpfxp)$/ __dbenv_get_flags ../env/env_method.c /^__dbenv_get_flags(dbenv, flagsp)$/ __dbenv_get_home ../env/env_method.c /^__dbenv_get_home(dbenv, homep)$/ +__dbenv_get_msgfile ../env/env_method.c /^__dbenv_get_msgfile(dbenv, msgfilep)$/ __dbenv_get_open_flags ../env/env_open.c /^__dbenv_get_open_flags(dbenv, flagsp)$/ __dbenv_get_shm_key ../env/env_method.c /^__dbenv_get_shm_key(dbenv, shm_keyp)$/ __dbenv_get_tas_spins ../env/env_method.c /^__dbenv_get_tas_spins(dbenv, tas_spinsp)$/ @@ -2939,6 +3123,8 @@ __dbenv_get_verbose ../env/env_method.c /^__dbenv_get_verbose(dbenv, which, onof __dbenv_init ../env/env_method.c /^__dbenv_init(dbenv)$/ __dbenv_map_flags ../env/env_method.c /^__dbenv_map_flags(dbenv, inflagsp, outflagsp)$/ __dbenv_open ../env/env_open.c /^__dbenv_open(dbenv, db_home, flags, mode)$/ +__dbenv_print_all ../env/env_stat.c /^__dbenv_print_all(dbenv, flags)$/ +__dbenv_print_stats ../env/env_stat.c /^__dbenv_print_stats(dbenv, flags)$/ __dbenv_refresh ../env/env_open.c /^__dbenv_refresh(dbenv, orig_flags, rep_check)$/ __dbenv_remove ../env/env_open.c /^__dbenv_remove(dbenv, db_home, flags)$/ __dbenv_remove_int ../env/env_open.c /^__dbenv_remove_int(dbenv, db_home, flags)$/ @@ -2951,12 +3137,17 @@ __dbenv_set_errfile ../env/env_method.c /^__dbenv_set_errfile(dbenv, errfile)$/ __dbenv_set_errpfx ../env/env_method.c /^__dbenv_set_errpfx(dbenv, errpfx)$/ __dbenv_set_feedback ../env/env_method.c /^__dbenv_set_feedback(dbenv, feedback)$/ __dbenv_set_flags ../env/env_method.c /^__dbenv_set_flags(dbenv, flags, on)$/ +__dbenv_set_intermediate_dir ../env/env_method.c /^__dbenv_set_intermediate_dir(dbenv, mode, flags)$/ +__dbenv_set_msgcall ../env/env_method.c /^__dbenv_set_msgcall(dbenv, msgcall)$/ +__dbenv_set_msgfile ../env/env_method.c /^__dbenv_set_msgfile(dbenv, msgfile)$/ __dbenv_set_paniccall ../env/env_method.c /^__dbenv_set_paniccall(dbenv, paniccall)$/ __dbenv_set_rpc_server_noclnt ../env/env_method.c /^__dbenv_set_rpc_server_noclnt(dbenv, cl, host, tse/ __dbenv_set_shm_key ../env/env_method.c /^__dbenv_set_shm_key(dbenv, shm_key)$/ __dbenv_set_tas_spins ../env/env_method.c /^__dbenv_set_tas_spins(dbenv, tas_spins)$/ __dbenv_set_tmp_dir ../env/env_method.c /^__dbenv_set_tmp_dir(dbenv, dir)$/ __dbenv_set_verbose ../env/env_method.c /^__dbenv_set_verbose(dbenv, which, on)$/ +__dbenv_stat_print ../env/env_stat.c /^__dbenv_stat_print(dbenv, flags)$/ +__dbenv_stat_print_pp ../env/env_stat.c /^__dbenv_stat_print_pp(dbenv, flags)$/ __dbh_am_chk ../db/db_method.c /^__dbh_am_chk(dbp, flags)$/ __dbh_err ../db/db_method.c /^__dbh_err(DB *dbp, int error, const char *fmt, .../ __dbh_errx ../db/db_method.c /^__dbh_errx(DB *dbp, const char *fmt, ...)$/ @@ -2970,24 +3161,26 @@ __dbj_dbt_copyout ../libdb_java/db_java_wrap.c /^static void __dbj_dbt_copyout($ __dbj_dbt_release ../libdb_java/db_java_wrap.c /^static void __dbj_dbt_release($/ __dbj_dup_compare ../libdb_java/db_java_wrap.c /^static int __dbj_dup_compare(DB *db, const DBT *db/ __dbj_env_feedback ../libdb_java/db_java_wrap.c /^static void __dbj_env_feedback(DB_ENV *dbenv, int / -__dbj_error ../libdb_java/db_java_wrap.c /^static void __dbj_error(const char *prefix, char */ -__dbj_fill_bt_stat ../libdb_java/java_stat_auto.c /^static int __dbj_fill_bt_stat(JNIEnv *jnienv, jcla/ -__dbj_fill_h_stat ../libdb_java/java_stat_auto.c /^static int __dbj_fill_h_stat(JNIEnv *jnienv, jclas/ -__dbj_fill_lock_stat ../libdb_java/java_stat_auto.c /^static int __dbj_fill_lock_stat(JNIEnv *jnienv, jc/ -__dbj_fill_log_stat ../libdb_java/java_stat_auto.c /^static int __dbj_fill_log_stat(JNIEnv *jnienv, jcl/ +__dbj_error ../libdb_java/db_java_wrap.c /^static void __dbj_error(const DB_ENV *dbenv, const/ +__dbj_fill_bt_stat ../libdb_java/java_stat_auto.c /^static int __dbj_fill_bt_stat(JNIEnv *jnienv, $/ +__dbj_fill_h_stat ../libdb_java/java_stat_auto.c /^static int __dbj_fill_h_stat(JNIEnv *jnienv, $/ +__dbj_fill_lock_stat ../libdb_java/java_stat_auto.c /^static int __dbj_fill_lock_stat(JNIEnv *jnienv, $/ +__dbj_fill_log_stat ../libdb_java/java_stat_auto.c /^static int __dbj_fill_log_stat(JNIEnv *jnienv, $/ __dbj_fill_mpool_fstat ../libdb_java/java_stat_auto.c /^static int __dbj_fill_mpool_fstat(JNIEnv *jnienv, / -__dbj_fill_mpool_stat ../libdb_java/java_stat_auto.c /^static int __dbj_fill_mpool_stat(JNIEnv *jnienv, j/ -__dbj_fill_qam_stat ../libdb_java/java_stat_auto.c /^static int __dbj_fill_qam_stat(JNIEnv *jnienv, jcl/ -__dbj_fill_rep_stat ../libdb_java/java_stat_auto.c /^static int __dbj_fill_rep_stat(JNIEnv *jnienv, jcl/ -__dbj_fill_txn_active ../libdb_java/java_stat_auto.c /^static int __dbj_fill_txn_active(JNIEnv *jnienv, j/ -__dbj_fill_txn_stat ../libdb_java/java_stat_auto.c /^static int __dbj_fill_txn_stat(JNIEnv *jnienv, jcl/ +__dbj_fill_mpool_stat ../libdb_java/java_stat_auto.c /^static int __dbj_fill_mpool_stat(JNIEnv *jnienv, $/ +__dbj_fill_qam_stat ../libdb_java/java_stat_auto.c /^static int __dbj_fill_qam_stat(JNIEnv *jnienv, $/ +__dbj_fill_rep_stat ../libdb_java/java_stat_auto.c /^static int __dbj_fill_rep_stat(JNIEnv *jnienv, $/ +__dbj_fill_seq_stat ../libdb_java/java_stat_auto.c /^static int __dbj_fill_seq_stat(JNIEnv *jnienv, $/ +__dbj_fill_txn_active ../libdb_java/java_stat_auto.c /^static int __dbj_fill_txn_active(JNIEnv *jnienv, $/ +__dbj_fill_txn_stat ../libdb_java/java_stat_auto.c /^static int __dbj_fill_txn_stat(JNIEnv *jnienv, $/ __dbj_get_except ../libdb_java/db_java_wrap.c /^static jthrowable __dbj_get_except(JNIEnv *jenv,$/ __dbj_get_jnienv ../libdb_java/db_java_wrap.c /^static JNIEnv *__dbj_get_jnienv(void)$/ __dbj_h_hash ../libdb_java/db_java_wrap.c /^static u_int32_t __dbj_h_hash(DB *db, const void */ +__dbj_message ../libdb_java/db_java_wrap.c /^static void __dbj_message(const DB_ENV *dbenv, con/ __dbj_panic ../libdb_java/db_java_wrap.c /^static void __dbj_panic(DB_ENV *dbenv, int err)$/ __dbj_rep_transport ../libdb_java/db_java_wrap.c /^static int __dbj_rep_transport(DB_ENV *dbenv,$/ __dbj_seckey_create ../libdb_java/db_java_wrap.c /^static int __dbj_seckey_create(DB *db,$/ -__dbj_throw ../libdb_java/db_java_wrap.c /^static int __dbj_throw(JNIEnv *jenv, int err, cons/ +__dbj_throw ../libdb_java/db_java_wrap.c /^static int __dbj_throw(JNIEnv *jenv,$/ __dbj_verify_callback ../libdb_java/db_java_wrap.c /^static int __dbj_verify_callback(void *handle, con/ __dbj_wrap_DB_LSN ../libdb_java/db_java_wrap.c /^static jobject __dbj_wrap_DB_LSN(JNIEnv *jenv, DB_/ __dblist_get ../db/db.c /^__dblist_get(dbenv, adjid)$/ @@ -2995,28 +3188,27 @@ __dbreg_add_dbentry ../dbreg/dbreg_util.c /^__dbreg_add_dbentry(dbenv, dblp, dbp __dbreg_assign_id ../dbreg/dbreg.c /^__dbreg_assign_id(dbp, id)$/ __dbreg_check_master ../dbreg/dbreg_util.c /^__dbreg_check_master(dbenv, uid, name)$/ __dbreg_close_files ../dbreg/dbreg_util.c /^__dbreg_close_files(dbenv)$/ -__dbreg_close_id ../dbreg/dbreg.c /^__dbreg_close_id(dbp, txn)$/ +__dbreg_close_id ../dbreg/dbreg.c /^__dbreg_close_id(dbp, txn, op)$/ __dbreg_do_open ../dbreg/dbreg_util.c /^__dbreg_do_open(dbenv,$/ __dbreg_fid_to_fname ../dbreg/dbreg_util.c /^__dbreg_fid_to_fname(dblp, fid, have_lock, fnamep)/ __dbreg_get_id ../dbreg/dbreg.c /^__dbreg_get_id(dbp, txn, idp)$/ __dbreg_get_name ../dbreg/dbreg_util.c /^__dbreg_get_name(dbenv, fid, namep)$/ __dbreg_id_to_db ../dbreg/dbreg_util.c /^__dbreg_id_to_db(dbenv, txn, dbpp, ndx, inc)$/ __dbreg_id_to_db_int ../dbreg/dbreg_util.c /^__dbreg_id_to_db_int(dbenv, txn, dbpp, ndx, inc, t/ -__dbreg_id_to_fname ../dbreg/dbreg_util.c /^__dbreg_id_to_fname(dblp, lid, have_lock, fnamep)$/ -__dbreg_init_getpgnos ../dbreg/dbreg_auto.c /^__dbreg_init_getpgnos(dbenv, dtabp, dtabsizep)$/ -__dbreg_init_print ../dbreg/dbreg_auto.c /^__dbreg_init_print(dbenv, dtabp, dtabsizep)$/ +__dbreg_id_to_fname ../dbreg/dbreg_util.c /^__dbreg_id_to_fname(dblp, id, have_lock, fnamep)$/ +__dbreg_init_print ../dbreg/dbreg_autop.c /^__dbreg_init_print(dbenv, dtabp, dtabsizep)$/ __dbreg_init_recover ../dbreg/dbreg_auto.c /^__dbreg_init_recover(dbenv, dtabp, dtabsizep)$/ __dbreg_lazy_id ../dbreg/dbreg_util.c /^__dbreg_lazy_id(dbp)$/ +__dbreg_log_files ../dbreg/dbreg_util.c /^__dbreg_log_files(dbenv)$/ __dbreg_new_id ../dbreg/dbreg.c /^__dbreg_new_id(dbp, txn)$/ __dbreg_open_file ../dbreg/dbreg_rec.c /^__dbreg_open_file(dbenv, txn, argp, info)$/ -__dbreg_open_files ../dbreg/dbreg_util.c /^__dbreg_open_files(dbenv)$/ -__dbreg_pluck_id ../dbreg/dbreg_util.c /^__dbreg_pluck_id(dbenv, id)$/ -__dbreg_pop_id ../dbreg/dbreg_util.c /^__dbreg_pop_id(dbenv, id)$/ -__dbreg_print_dblist ../dbreg/dbreg_util.c /^__dbreg_print_dblist(dbenv)$/ -__dbreg_push_id ../dbreg/dbreg_util.c /^__dbreg_push_id(dbenv, id)$/ -__dbreg_register_getpgnos ../dbreg/dbreg_auto.c /^__dbreg_register_getpgnos(dbenv, rec, lsnp, notuse/ +__dbreg_pluck_id ../dbreg/dbreg.c /^__dbreg_pluck_id(dbenv, id)$/ +__dbreg_pop_id ../dbreg/dbreg.c /^__dbreg_pop_id(dbenv, id)$/ +__dbreg_print_dblist ../dbreg/dbreg_stat.c /^__dbreg_print_dblist(dbenv, flags)$/ +__dbreg_print_fname ../dbreg/dbreg_stat.c /^__dbreg_print_fname(dbenv, fnp)$/ +__dbreg_push_id ../dbreg/dbreg.c /^__dbreg_push_id(dbenv, id)$/ __dbreg_register_log ../dbreg/dbreg_auto.c /^__dbreg_register_log(dbenv, txnid, ret_lsnp, flags/ -__dbreg_register_print ../dbreg/dbreg_auto.c /^__dbreg_register_print(dbenv, dbtp, lsnp, notused2/ +__dbreg_register_print ../dbreg/dbreg_autop.c /^__dbreg_register_print(dbenv, dbtp, lsnp, notused2/ __dbreg_register_read ../dbreg/dbreg_auto.c /^__dbreg_register_read(dbenv, recbuf, argpp)$/ __dbreg_register_recover ../dbreg/dbreg_rec.c /^__dbreg_register_recover(dbenv, dbtp, lsnp, op, in/ __dbreg_rem_dbentry ../dbreg/dbreg_util.c /^__dbreg_rem_dbentry(dblp, ndx)$/ @@ -3024,7 +3216,6 @@ __dbreg_revoke_id ../dbreg/dbreg.c /^__dbreg_revoke_id(dbp, have_lock, force_id) __dbreg_setup ../dbreg/dbreg.c /^__dbreg_setup(dbp, name, create_txnid)$/ __dbreg_teardown ../dbreg/dbreg.c /^__dbreg_teardown(dbp)$/ __dbsrv_active ../rpc_server/c/db_server_util.c /^__dbsrv_active(ctp)$/ -__dbsrv_main ../rpc_server/c/db_server_svc.c /^void __dbsrv_main()$/ __dbsrv_settimeout ../rpc_server/c/db_server_util.c /^__dbsrv_settimeout(ctp, to)$/ __dbsrv_sharedb ../rpc_server/c/db_server_util.c /^__dbsrv_sharedb(db_ctp, name, subdb, type, flags)$/ __dbsrv_shareenv ../rpc_server/c/db_server_util.c /^__dbsrv_shareenv(env_ctp, home, flags)$/ @@ -3036,61 +3227,55 @@ __dd_debug ../lock/lock_deadlock.c /^__dd_debug(dbenv, idmap, bitmap, nlockers, __dd_find ../lock/lock_deadlock.c /^__dd_find(dbenv, bmp, idmap, nlockers, nalloc, dea/ __dd_isolder ../lock/lock_deadlock.c /^__dd_isolder(a, b, lock_max, txn_max)$/ __dd_verify ../lock/lock_deadlock.c /^__dd_verify(idmap, deadmap, tmpmap, origmap, nlock/ -__env_cachesize_proc ../rpc_server/c/db_server_proc.c /^__env_cachesize_proc(dbenvcl_id, gbytes, bytes,$/ +__env_cachesize_proc ../rpc_server/c/db_server_proc.c /^__env_cachesize_proc(dbenvcl_id, gbytes, bytes, nc/ __env_close_proc ../rpc_server/c/db_server_proc.c /^__env_close_proc(dbenvcl_id, flags, replyp)$/ __env_create_proc ../rpc_server/c/db_server_proc.c /^__env_create_proc(timeout, replyp)$/ -__env_dbremove_proc ../rpc_server/c/db_server_proc.c /^__env_dbremove_proc(dbenvcl_id, txnpcl_id, name,$/ -__env_dbrename_proc ../rpc_server/c/db_server_proc.c /^__env_dbrename_proc(dbenvcl_id, txnpcl_id, name,$/ +__env_db_rep_exit ../rep/rep_util.c /^__env_db_rep_exit(dbenv)$/ +__env_dbremove_proc ../rpc_server/c/db_server_proc.c /^__env_dbremove_proc(dbenvcl_id, txnpcl_id, name, s/ +__env_dbrename_proc ../rpc_server/c/db_server_proc.c /^__env_dbrename_proc(dbenvcl_id, txnpcl_id, name, s/ __env_encrypt_proc ../rpc_server/c/db_server_proc.c /^__env_encrypt_proc(dbenvcl_id, passwd, flags, repl/ __env_flags_proc ../rpc_server/c/db_server_proc.c /^__env_flags_proc(dbenvcl_id, flags, onoff, replyp)/ -__env_get_cachesize_proc ../rpc_server/c/db_server_proc.c /^__env_get_cachesize_proc(dbenvcl_id,$/ +__env_get_cachesize_proc ../rpc_server/c/db_server_proc.c /^__env_get_cachesize_proc(dbenvcl_id, replyp)$/ __env_get_encrypt_flags_proc ../rpc_server/c/db_server_proc.c /^__env_get_encrypt_flags_proc(dbenvcl_id, replyp)$/ __env_get_flags_proc ../rpc_server/c/db_server_proc.c /^__env_get_flags_proc(dbenvcl_id, replyp)$/ __env_get_home_proc ../rpc_server/c/db_server_proc.c /^__env_get_home_proc(dbenvcl_id, replyp)$/ __env_get_open_flags_proc ../rpc_server/c/db_server_proc.c /^__env_get_open_flags_proc(dbenvcl_id, replyp)$/ -__env_open_proc ../rpc_server/c/db_server_proc.c /^__env_open_proc(dbenvcl_id, home, flags,$/ +__env_open_proc ../rpc_server/c/db_server_proc.c /^__env_open_proc(dbenvcl_id, home, flags, mode, rep/ __env_openfiles ../env/env_recover.c /^__env_openfiles(dbenv, logc, txninfo,$/ __env_remove_proc ../rpc_server/c/db_server_proc.c /^__env_remove_proc(dbenvcl_id, home, flags, replyp)/ __env_rep_enter ../rep/rep_util.c /^__env_rep_enter(dbenv)$/ -__env_rep_exit ../rep/rep_util.c /^__env_rep_exit(dbenv)$/ __fop_create ../fileops/fop_basic.c /^__fop_create(dbenv, txn, fhpp, name, appname, mode/ -__fop_create_getpgnos ../fileops/fileops_auto.c /^__fop_create_getpgnos(dbenv, rec, lsnp, notused1, / __fop_create_log ../fileops/fileops_auto.c /^__fop_create_log(dbenv, txnid, ret_lsnp, flags,$/ -__fop_create_print ../fileops/fileops_auto.c /^__fop_create_print(dbenv, dbtp, lsnp, notused2, no/ +__fop_create_print ../fileops/fileops_autop.c /^__fop_create_print(dbenv, dbtp, lsnp, notused2, no/ __fop_create_read ../fileops/fileops_auto.c /^__fop_create_read(dbenv, recbuf, argpp)$/ __fop_create_recover ../fileops/fop_rec.c /^__fop_create_recover(dbenv, dbtp, lsnp, op, info)$/ __fop_dbrename ../fileops/fop_util.c /^__fop_dbrename(dbp, old, new)$/ __fop_dummy ../fileops/fop_util.c /^__fop_dummy(dbp, txn, old, new, flags)$/ -__fop_file_remove_getpgnos ../fileops/fileops_auto.c /^__fop_file_remove_getpgnos(dbenv, rec, lsnp, notus/ __fop_file_remove_log ../fileops/fileops_auto.c /^__fop_file_remove_log(dbenv, txnid, ret_lsnp, flag/ -__fop_file_remove_print ../fileops/fileops_auto.c /^__fop_file_remove_print(dbenv, dbtp, lsnp, notused/ +__fop_file_remove_print ../fileops/fileops_autop.c /^__fop_file_remove_print(dbenv, dbtp, lsnp, notused/ __fop_file_remove_read ../fileops/fileops_auto.c /^__fop_file_remove_read(dbenv, recbuf, argpp)$/ __fop_file_remove_recover ../fileops/fop_rec.c /^__fop_file_remove_recover(dbenv, dbtp, lsnp, op, i/ __fop_file_setup ../fileops/fop_util.c /^__fop_file_setup(dbp, txn, name, mode, flags, reti/ -__fop_init_getpgnos ../fileops/fileops_auto.c /^__fop_init_getpgnos(dbenv, dtabp, dtabsizep)$/ -__fop_init_print ../fileops/fileops_auto.c /^__fop_init_print(dbenv, dtabp, dtabsizep)$/ +__fop_init_print ../fileops/fileops_autop.c /^__fop_init_print(dbenv, dtabp, dtabsizep)$/ __fop_init_recover ../fileops/fileops_auto.c /^__fop_init_recover(dbenv, dtabp, dtabsizep)$/ -__fop_lock_handle ../fileops/fop_util.c /^__fop_lock_handle(dbenv, dbp, locker, mode, elock,/ +__fop_lock_handle ../fileops/fop_util.c /^__fop_lock_handle(dbenv, dbp, locker, mode, elockp/ __fop_read_meta ../fileops/fop_util.c /^__fop_read_meta(dbenv, name, buf, size, fhp, errok/ __fop_remove ../fileops/fop_basic.c /^__fop_remove(dbenv, txn, fileid, name, appname, fl/ -__fop_remove_getpgnos ../fileops/fileops_auto.c /^__fop_remove_getpgnos(dbenv, rec, lsnp, notused1, / __fop_remove_log ../fileops/fileops_auto.c /^__fop_remove_log(dbenv, txnid, ret_lsnp, flags,$/ -__fop_remove_print ../fileops/fileops_auto.c /^__fop_remove_print(dbenv, dbtp, lsnp, notused2, no/ +__fop_remove_print ../fileops/fileops_autop.c /^__fop_remove_print(dbenv, dbtp, lsnp, notused2, no/ __fop_remove_read ../fileops/fileops_auto.c /^__fop_remove_read(dbenv, recbuf, argpp)$/ __fop_remove_recover ../fileops/fop_rec.c /^__fop_remove_recover(dbenv, dbtp, lsnp, op, info)$/ __fop_remove_setup ../fileops/fop_util.c /^__fop_remove_setup(dbp, txn, name, flags)$/ __fop_rename ../fileops/fop_basic.c /^__fop_rename(dbenv, txn, oldname, newname, fid, ap/ -__fop_rename_getpgnos ../fileops/fileops_auto.c /^__fop_rename_getpgnos(dbenv, rec, lsnp, notused1, / __fop_rename_log ../fileops/fileops_auto.c /^__fop_rename_log(dbenv, txnid, ret_lsnp, flags,$/ -__fop_rename_print ../fileops/fileops_auto.c /^__fop_rename_print(dbenv, dbtp, lsnp, notused2, no/ +__fop_rename_print ../fileops/fileops_autop.c /^__fop_rename_print(dbenv, dbtp, lsnp, notused2, no/ __fop_rename_read ../fileops/fileops_auto.c /^__fop_rename_read(dbenv, recbuf, argpp)$/ __fop_rename_recover ../fileops/fop_rec.c /^__fop_rename_recover(dbenv, dbtp, lsnp, op, info)$/ __fop_set_pgsize ../fileops/fop_util.c /^__fop_set_pgsize(dbp, fhp, name)$/ __fop_subdb_setup ../fileops/fop_util.c /^__fop_subdb_setup(dbp, txn, mname, name, mode, fla/ __fop_write ../fileops/fop_basic.c /^__fop_write(dbenv,$/ -__fop_write_getpgnos ../fileops/fileops_auto.c /^__fop_write_getpgnos(dbenv, rec, lsnp, notused1, s/ __fop_write_log ../fileops/fileops_auto.c /^__fop_write_log(dbenv, txnid, ret_lsnp, flags,$/ -__fop_write_print ../fileops/fileops_auto.c /^__fop_write_print(dbenv, dbtp, lsnp, notused2, not/ +__fop_write_print ../fileops/fileops_autop.c /^__fop_write_print(dbenv, dbtp, lsnp, notused2, not/ __fop_write_read ../fileops/fileops_auto.c /^__fop_write_read(dbenv, recbuf, argpp)$/ __fop_write_recover ../fileops/fop_rec.c /^__fop_write_recover(dbenv, dbtp, lsnp, op, info)$/ __ham_30_hashmeta ../hash/hash_upgrade.c /^__ham_30_hashmeta(dbp, real_name, obuf)$/ @@ -3116,21 +3301,17 @@ __ham_c_update ../hash/hash.c /^__ham_c_update(dbc, len, add, is_dup)$/ __ham_c_writelock ../hash/hash.c /^__ham_c_writelock(dbc)$/ __ham_call_hash ../hash/hash.c /^__ham_call_hash(dbc, k, len)$/ __ham_check_move ../hash/hash_dup.c /^__ham_check_move(dbc, add_len)$/ -__ham_chgpg_getpgnos ../hash/hash_auto.c /^__ham_chgpg_getpgnos(dbenv, rec, lsnp, notused1, s/ __ham_chgpg_log ../hash/hash_auto.c /^__ham_chgpg_log(dbp, txnid, ret_lsnp, flags, mode,/ -__ham_chgpg_print ../hash/hash_auto.c /^__ham_chgpg_print(dbenv, dbtp, lsnp, notused2, not/ +__ham_chgpg_print ../hash/hash_autop.c /^__ham_chgpg_print(dbenv, dbtp, lsnp, notused2, not/ __ham_chgpg_read ../hash/hash_auto.c /^__ham_chgpg_read(dbenv, recbuf, argpp)$/ __ham_chgpg_recover ../hash/hash_rec.c /^__ham_chgpg_recover(dbenv, dbtp, lsnp, op, info)$/ __ham_copy_item ../hash/hash_page.c /^__ham_copy_item(dbp, src_page, src_ndx, dest_page)/ -__ham_copypage_getpgnos ../hash/hash_auto.c /^__ham_copypage_getpgnos(dbenv, rec, lsnp, notused1/ __ham_copypage_log ../hash/hash_auto.c /^__ham_copypage_log(dbp, txnid, ret_lsnp, flags, pg/ -__ham_copypage_print ../hash/hash_auto.c /^__ham_copypage_print(dbenv, dbtp, lsnp, notused2, / +__ham_copypage_print ../hash/hash_autop.c /^__ham_copypage_print(dbenv, dbtp, lsnp, notused2, / __ham_copypage_read ../hash/hash_auto.c /^__ham_copypage_read(dbenv, recbuf, argpp)$/ __ham_copypage_recover ../hash/hash_rec.c /^__ham_copypage_recover(dbenv, dbtp, lsnp, op, info/ -__ham_cprint ../hash/hash_dup.c /^__ham_cprint(dbc)$/ -__ham_curadj_getpgnos ../hash/hash_auto.c /^__ham_curadj_getpgnos(dbenv, rec, lsnp, notused1, / __ham_curadj_log ../hash/hash_auto.c /^__ham_curadj_log(dbp, txnid, ret_lsnp, flags, pgno/ -__ham_curadj_print ../hash/hash_auto.c /^__ham_curadj_print(dbenv, dbtp, lsnp, notused2, no/ +__ham_curadj_print ../hash/hash_autop.c /^__ham_curadj_print(dbenv, dbtp, lsnp, notused2, no/ __ham_curadj_read ../hash/hash_auto.c /^__ham_curadj_read(dbenv, recbuf, argpp)$/ __ham_curadj_recover ../hash/hash_rec.c /^__ham_curadj_recover(dbenv, dbtp, lsnp, op, info)$/ __ham_db_close ../hash/hash_method.c /^__ham_db_close(dbp)$/ @@ -3153,19 +3334,16 @@ __ham_get_cpage ../hash/hash_page.c /^__ham_get_cpage(dbc, mode)$/ __ham_get_h_ffactor ../hash/hash_method.c /^__ham_get_h_ffactor(dbp, h_ffactorp)$/ __ham_get_h_nelem ../hash/hash_method.c /^__ham_get_h_nelem(dbp, h_nelemp)$/ __ham_get_meta ../hash/hash_meta.c /^__ham_get_meta(dbc)$/ -__ham_groupalloc_getpgnos ../hash/hash_auto.c /^__ham_groupalloc_getpgnos(dbenv, rec, lsnp, notuse/ __ham_groupalloc_log ../hash/hash_auto.c /^__ham_groupalloc_log(dbp, txnid, ret_lsnp, flags, / -__ham_groupalloc_print ../hash/hash_auto.c /^__ham_groupalloc_print(dbenv, dbtp, lsnp, notused2/ +__ham_groupalloc_print ../hash/hash_autop.c /^__ham_groupalloc_print(dbenv, dbtp, lsnp, notused2/ __ham_groupalloc_read ../hash/hash_auto.c /^__ham_groupalloc_read(dbenv, recbuf, argpp)$/ __ham_groupalloc_recover ../hash/hash_rec.c /^__ham_groupalloc_recover(dbenv, dbtp, lsnp, op, in/ __ham_init_dbt ../hash/hash.c /^__ham_init_dbt(dbenv, dbt, size, bufp, sizep)$/ -__ham_init_getpgnos ../hash/hash_auto.c /^__ham_init_getpgnos(dbenv, dtabp, dtabsizep)$/ __ham_init_meta ../hash/hash_open.c /^__ham_init_meta(dbp, meta, pgno, lsnp)$/ -__ham_init_print ../hash/hash_auto.c /^__ham_init_print(dbenv, dtabp, dtabsizep)$/ +__ham_init_print ../hash/hash_autop.c /^__ham_init_print(dbenv, dtabp, dtabsizep)$/ __ham_init_recover ../hash/hash_auto.c /^__ham_init_recover(dbenv, dtabp, dtabsizep)$/ -__ham_insdel_getpgnos ../hash/hash_auto.c /^__ham_insdel_getpgnos(dbenv, rec, lsnp, notused1, / __ham_insdel_log ../hash/hash_auto.c /^__ham_insdel_log(dbp, txnid, ret_lsnp, flags,$/ -__ham_insdel_print ../hash/hash_auto.c /^__ham_insdel_print(dbenv, dbtp, lsnp, notused2, no/ +__ham_insdel_print ../hash/hash_autop.c /^__ham_insdel_print(dbenv, dbtp, lsnp, notused2, no/ __ham_insdel_read ../hash/hash_auto.c /^__ham_insdel_read(dbenv, recbuf, argpp)$/ __ham_insdel_recover ../hash/hash_rec.c /^__ham_insdel_recover(dbenv, dbtp, lsnp, op, info)$/ __ham_item ../hash/hash_page.c /^__ham_item(dbc, mode, pgnop)$/ @@ -3180,18 +3358,16 @@ __ham_lookup ../hash/hash.c /^__ham_lookup(dbc, key, sought, mode, pgnop)$/ __ham_make_dup ../hash/hash_dup.c /^__ham_make_dup(dbenv, notdup, duplicate, bufp, siz/ __ham_meta2pgset ../hash/hash_verify.c /^int __ham_meta2pgset(dbp, vdp, hmeta, flags, pgset/ __ham_metachk ../hash/hash_open.c /^__ham_metachk(dbp, name, hashm)$/ -__ham_metagroup_getpgnos ../hash/hash_auto.c /^__ham_metagroup_getpgnos(dbenv, rec, lsnp, notused/ __ham_metagroup_log ../hash/hash_auto.c /^__ham_metagroup_log(dbp, txnid, ret_lsnp, flags, b/ -__ham_metagroup_print ../hash/hash_auto.c /^__ham_metagroup_print(dbenv, dbtp, lsnp, notused2,/ +__ham_metagroup_print ../hash/hash_autop.c /^__ham_metagroup_print(dbenv, dbtp, lsnp, notused2,/ __ham_metagroup_read ../hash/hash_auto.c /^__ham_metagroup_read(dbenv, recbuf, argpp)$/ __ham_metagroup_recover ../hash/hash_rec.c /^__ham_metagroup_recover(dbenv, dbtp, lsnp, op, inf/ __ham_move_offpage ../hash/hash_dup.c /^__ham_move_offpage(dbc, pagep, ndx, pgno)$/ __ham_mswap ../hash/hash_conv.c /^__ham_mswap(pg)$/ __ham_new_file ../hash/hash_open.c /^__ham_new_file(dbp, txn, fhp, name)$/ __ham_new_subdb ../hash/hash_open.c /^__ham_new_subdb(mdbp, dbp, txn)$/ -__ham_newpage_getpgnos ../hash/hash_auto.c /^__ham_newpage_getpgnos(dbenv, rec, lsnp, notused1,/ __ham_newpage_log ../hash/hash_auto.c /^__ham_newpage_log(dbp, txnid, ret_lsnp, flags,$/ -__ham_newpage_print ../hash/hash_auto.c /^__ham_newpage_print(dbenv, dbtp, lsnp, notused2, n/ +__ham_newpage_print ../hash/hash_autop.c /^__ham_newpage_print(dbenv, dbtp, lsnp, notused2, n/ __ham_newpage_read ../hash/hash_auto.c /^__ham_newpage_read(dbenv, recbuf, argpp)$/ __ham_newpage_recover ../hash/hash_rec.c /^__ham_newpage_recover(dbenv, dbtp, lsnp, op, info)/ __ham_next_cpage ../hash/hash_page.c /^__ham_next_cpage(dbc, pgno, dirty)$/ @@ -3200,13 +3376,13 @@ __ham_open ../hash/hash_open.c /^__ham_open(dbp, txn, name, base_pgno, flags)$/ __ham_overwrite ../hash/hash.c /^__ham_overwrite(dbc, nval, flags)$/ __ham_pgin ../hash/hash_conv.c /^__ham_pgin(dbenv, dummydbp, pg, pp, cookie)$/ __ham_pgout ../hash/hash_conv.c /^__ham_pgout(dbenv, dummydbp, pg, pp, cookie)$/ +__ham_print_cursor ../hash/hash_stat.c /^__ham_print_cursor(dbc)$/ __ham_putitem ../hash/hash_page.c /^__ham_putitem(dbp, p, dbt, type)$/ __ham_quick_delete ../hash/hash.c /^__ham_quick_delete(dbc)$/ __ham_reclaim ../hash/hash_reclaim.c /^__ham_reclaim(dbp, txn)$/ __ham_release_meta ../hash/hash_meta.c /^__ham_release_meta(dbc)$/ -__ham_replace_getpgnos ../hash/hash_auto.c /^__ham_replace_getpgnos(dbenv, rec, lsnp, notused1,/ __ham_replace_log ../hash/hash_auto.c /^__ham_replace_log(dbp, txnid, ret_lsnp, flags, pgn/ -__ham_replace_print ../hash/hash_auto.c /^__ham_replace_print(dbenv, dbtp, lsnp, notused2, n/ +__ham_replace_print ../hash/hash_autop.c /^__ham_replace_print(dbenv, dbtp, lsnp, notused2, n/ __ham_replace_read ../hash/hash_auto.c /^__ham_replace_read(dbenv, recbuf, argpp)$/ __ham_replace_recover ../hash/hash_rec.c /^__ham_replace_recover(dbenv, dbtp, lsnp, op, info)/ __ham_replpair ../hash/hash_page.c /^__ham_replpair(dbc, dbt, make_dup)$/ @@ -3216,13 +3392,13 @@ __ham_set_h_ffactor ../hash/hash_method.c /^__ham_set_h_ffactor(dbp, h_ffactor)$ __ham_set_h_hash ../hash/hash_method.c /^__ham_set_h_hash(dbp, func)$/ __ham_set_h_nelem ../hash/hash_method.c /^__ham_set_h_nelem(dbp, h_nelem)$/ __ham_split_page ../hash/hash_page.c /^__ham_split_page(dbc, obucket, nbucket)$/ -__ham_splitdata_getpgnos ../hash/hash_auto.c /^__ham_splitdata_getpgnos(dbenv, rec, lsnp, notused/ __ham_splitdata_log ../hash/hash_auto.c /^__ham_splitdata_log(dbp, txnid, ret_lsnp, flags, o/ -__ham_splitdata_print ../hash/hash_auto.c /^__ham_splitdata_print(dbenv, dbtp, lsnp, notused2,/ +__ham_splitdata_print ../hash/hash_autop.c /^__ham_splitdata_print(dbenv, dbtp, lsnp, notused2,/ __ham_splitdata_read ../hash/hash_auto.c /^__ham_splitdata_read(dbenv, recbuf, argpp)$/ __ham_splitdata_recover ../hash/hash_rec.c /^__ham_splitdata_recover(dbenv, dbtp, lsnp, op, inf/ __ham_stat ../hash/hash_stat.c /^__ham_stat(dbc, spp, flags)$/ __ham_stat_callback ../hash/hash_stat.c /^__ham_stat_callback(dbp, pagep, cookie, putp)$/ +__ham_stat_print ../hash/hash_stat.c /^__ham_stat_print(dbc, flags)$/ __ham_test ../hash/hash_func.c /^__ham_test(dbp, key, len)$/ __ham_traverse ../hash/hash_stat.c /^__ham_traverse(dbc, mode, callback, cookie, look_p/ __ham_truncate ../hash/hash_reclaim.c /^__ham_truncate(dbc, countp)$/ @@ -3233,7 +3409,7 @@ __ham_vrfy_item ../hash/hash_verify.c /^__ham_vrfy_item(dbp, vdp, pgno, h, i, fl __ham_vrfy_meta ../hash/hash_verify.c /^__ham_vrfy_meta(dbp, vdp, m, pgno, flags)$/ __ham_vrfy_structure ../hash/hash_verify.c /^__ham_vrfy_structure(dbp, vdp, meta_pgno, flags)$/ __int64 ../libdb_java/db_java_wrap.c 13 -__lock_addfamilylocker ../lock/lock.c /^__lock_addfamilylocker(dbenv, pid, id)$/ +__lock_addfamilylocker ../lock/lock_id.c /^__lock_addfamilylocker(dbenv, pid, id)$/ __lock_cmp ../lock/lock_util.c /^__lock_cmp(dbt, lock_obj)$/ __lock_dbenv_close ../lock/lock_method.c /^__lock_dbenv_close(dbenv)$/ __lock_dbenv_create ../lock/lock_method.c /^__lock_dbenv_create(dbenv)$/ @@ -3241,49 +3417,53 @@ __lock_dbenv_refresh ../lock/lock_region.c /^__lock_dbenv_refresh(dbenv)$/ __lock_detect ../lock/lock_deadlock.c /^__lock_detect(dbenv, atype, abortp)$/ __lock_detect_pp ../lock/lock_deadlock.c /^__lock_detect_pp(dbenv, flags, atype, abortp)$/ __lock_downgrade ../lock/lock.c /^__lock_downgrade(dbenv, lock, new_mode, flags)$/ -__lock_dump_locker ../lock/lock_stat.c /^__lock_dump_locker(lt, lip, fp)$/ -__lock_dump_object ../lock/lock_stat.c /^__lock_dump_object(lt, op, fp)$/ -__lock_dump_region ../lock/lock_stat.c /^__lock_dump_region(dbenv, area, fp)$/ -__lock_expired ../lock/lock.c /^__lock_expired(dbenv, now, timevalp)$/ -__lock_expires ../lock/lock.c /^__lock_expires(dbenv, timevalp, timeout)$/ -__lock_fix_list ../lock/lock.c /^__lock_fix_list(dbenv, list_dbt, nlocks)$/ -__lock_freefamilylocker ../lock/lock.c /^__lock_freefamilylocker(lt, locker)$/ +__lock_dump_locker ../lock/lock_stat.c /^__lock_dump_locker(dbenv, mbp, lt, lip)$/ +__lock_dump_object ../lock/lock_stat.c /^__lock_dump_object(lt, mbp, op)$/ +__lock_expired ../lock/lock_timer.c /^__lock_expired(dbenv, now, timevalp)$/ +__lock_expires ../lock/lock_timer.c /^__lock_expires(dbenv, timevalp, timeout)$/ +__lock_fix_list ../lock/lock_list.c /^__lock_fix_list(dbenv, list_dbt, nlocks)$/ +__lock_freefamilylocker ../lock/lock_id.c /^__lock_freefamilylocker(lt, locker)$/ __lock_freelock ../lock/lock.c /^__lock_freelock(lt, lockp, locker, flags)$/ -__lock_freelocker ../lock/lock.c /^__lock_freelocker(lt, region, sh_locker, indx)$/ +__lock_freelocker ../lock/lock_id.c /^__lock_freelocker(lt, region, sh_locker, indx)$/ __lock_get ../lock/lock.c /^__lock_get(dbenv, locker, flags, obj, lock_mode, l/ __lock_get_env_timeout ../lock/lock_method.c /^__lock_get_env_timeout(dbenv, timeoutp, flag)$/ __lock_get_internal ../lock/lock.c /^__lock_get_internal(lt, locker, flags, obj, lock_m/ -__lock_get_list ../lock/lock.c /^__lock_get_list(dbenv, locker, flags, lock_mode, l/ +__lock_get_list ../lock/lock_list.c /^__lock_get_list(dbenv, locker, flags, lock_mode, l/ __lock_get_lk_conflicts ../lock/lock_method.c /^__lock_get_lk_conflicts(dbenv, lk_conflictsp, lk_m/ __lock_get_lk_detect ../lock/lock_method.c /^__lock_get_lk_detect(dbenv, lk_detectp)$/ __lock_get_lk_max_lockers ../lock/lock_method.c /^__lock_get_lk_max_lockers(dbenv, lk_maxp)$/ __lock_get_lk_max_locks ../lock/lock_method.c /^__lock_get_lk_max_locks(dbenv, lk_maxp)$/ __lock_get_lk_max_objects ../lock/lock_method.c /^__lock_get_lk_max_objects(dbenv, lk_maxp)$/ __lock_get_pp ../lock/lock.c /^__lock_get_pp(dbenv, locker, flags, obj, lock_mode/ -__lock_getlocker ../lock/lock.c /^__lock_getlocker(lt, locker, indx, create, retp)$/ +__lock_getlocker ../lock/lock_id.c /^__lock_getlocker(lt, locker, indx, create, retp)$/ __lock_getobj ../lock/lock.c /^__lock_getobj(lt, obj, ndx, create, retp)$/ -__lock_id ../lock/lock.c /^__lock_id(dbenv, idp)$/ -__lock_id_free ../lock/lock.c /^__lock_id_free(dbenv, id)$/ -__lock_id_free_pp ../lock/lock.c /^__lock_id_free_pp(dbenv, id)$/ -__lock_id_pp ../lock/lock.c /^__lock_id_pp(dbenv, idp)$/ -__lock_id_set ../lock/lock_region.c /^__lock_id_set(dbenv, cur_id, max_id)$/ +__lock_id ../lock/lock_id.c /^__lock_id(dbenv, idp)$/ +__lock_id_free ../lock/lock_id.c /^__lock_id_free(dbenv, id)$/ +__lock_id_free_pp ../lock/lock_id.c /^__lock_id_free_pp(dbenv, id)$/ +__lock_id_pp ../lock/lock_id.c /^__lock_id_pp(dbenv, idp)$/ +__lock_id_set ../lock/lock_id.c /^__lock_id_set(dbenv, cur_id, max_id)$/ __lock_inherit_locks ../lock/lock.c /^__lock_inherit_locks(lt, locker, flags)$/ -__lock_inherit_timeout ../lock/lock.c /^__lock_inherit_timeout(dbenv, parent, locker)$/ -__lock_init ../lock/lock_region.c /^__lock_init(dbenv, lt)$/ +__lock_inherit_timeout ../lock/lock_timer.c /^__lock_inherit_timeout(dbenv, parent, locker)$/ __lock_is_parent ../lock/lock.c /^__lock_is_parent(lt, locker, sh_locker)$/ __lock_lhash ../lock/lock_util.c /^__lock_lhash(lock_obj)$/ +__lock_list_print ../lock/lock_list.c /^__lock_list_print(dbenv, list)$/ __lock_locker_cmp ../lock/lock_util.c /^__lock_locker_cmp(locker, sh_locker)$/ __lock_locker_hash ../lock/lock_util.c /^__lock_locker_hash(locker)$/ +__lock_locker_is_parent ../lock/lock.c /^__lock_locker_is_parent(dbenv, locker, child, retp/ +__lock_nomem ../lock/lock_util.c /^__lock_nomem(dbenv, res)$/ __lock_ohash ../lock/lock_util.c /^__lock_ohash(dbt)$/ __lock_open ../lock/lock_region.c /^__lock_open(dbenv)$/ -__lock_printheader ../lock/lock_stat.c /^__lock_printheader(fp)$/ -__lock_printlock ../lock/lock_stat.c /^__lock_printlock(lt, lp, ispgno, fp)$/ +__lock_print_all ../lock/lock_stat.c /^__lock_print_all(dbenv, flags)$/ +__lock_print_header ../lock/lock_stat.c /^__lock_print_header(dbenv)$/ +__lock_print_stats ../lock/lock_stat.c /^__lock_print_stats(dbenv, flags)$/ +__lock_printlock ../lock/lock_stat.c /^__lock_printlock(lt, mbp, lp, ispgno)$/ __lock_promote ../lock/lock.c /^__lock_promote(lt, obj, flags)$/ -__lock_put ../lock/lock.c /^__lock_put(dbenv, lock)$/ +__lock_put ../lock/lock.c /^__lock_put(dbenv, lock, flags)$/ __lock_put_internal ../lock/lock.c /^__lock_put_internal(lt, lockp, obj_ndx, flags)$/ __lock_put_nolock ../lock/lock.c /^__lock_put_nolock(dbenv, lock, runp, flags)$/ __lock_put_pp ../lock/lock.c /^__lock_put_pp(dbenv, lock)$/ __lock_region_destroy ../lock/lock_region.c /^__lock_region_destroy(dbenv, infop)$/ +__lock_region_init ../lock/lock_region.c /^__lock_region_init(dbenv, lt)$/ __lock_region_maint ../lock/lock_region.c /^__lock_region_maint(dbenv)$/ __lock_region_size ../lock/lock_region.c /^__lock_region_size(dbenv)$/ __lock_remove_waiter ../lock/lock.c /^__lock_remove_waiter(lt, sh_obj, lockp, status)$/ @@ -3294,18 +3474,20 @@ __lock_set_lk_max ../lock/lock_method.c /^__lock_set_lk_max(dbenv, lk_max)$/ __lock_set_lk_max_lockers ../lock/lock_method.c /^__lock_set_lk_max_lockers(dbenv, lk_max)$/ __lock_set_lk_max_locks ../lock/lock_method.c /^__lock_set_lk_max_locks(dbenv, lk_max)$/ __lock_set_lk_max_objects ../lock/lock_method.c /^__lock_set_lk_max_objects(dbenv, lk_max)$/ -__lock_set_timeout ../lock/lock.c /^__lock_set_timeout(dbenv, locker, timeout, op)$/ -__lock_set_timeout_internal ../lock/lock.c /^__lock_set_timeout_internal(dbenv, locker, timeout/ -__lock_sort_cmp ../lock/lock.c /^__lock_sort_cmp(a, b)$/ +__lock_set_timeout ../lock/lock_timer.c /^__lock_set_timeout(dbenv, locker, timeout, op)$/ +__lock_set_timeout_internal ../lock/lock_timer.c /^__lock_set_timeout_internal(dbenv, locker, timeout/ +__lock_sort_cmp ../lock/lock_list.c /^__lock_sort_cmp(a, b)$/ __lock_stat ../lock/lock_stat.c /^__lock_stat(dbenv, statp, flags)$/ __lock_stat_pp ../lock/lock_stat.c /^__lock_stat_pp(dbenv, statp, flags)$/ +__lock_stat_print ../lock/lock_stat.c /^__lock_stat_print(dbenv, flags)$/ +__lock_stat_print_pp ../lock/lock_stat.c /^__lock_stat_print_pp(dbenv, flags)$/ __lock_trade ../lock/lock.c /^__lock_trade(dbenv, lock, new_locker)$/ __lock_vec ../lock/lock.c /^__lock_vec(dbenv, locker, flags, list, nlist, elis/ __lock_vec_pp ../lock/lock.c /^__lock_vec_pp(dbenv, locker, flags, list, nlist, e/ __log_archive ../log/log_archive.c /^__log_archive(dbenv, listp, flags)$/ __log_archive_pp ../log/log_archive.c /^__log_archive_pp(dbenv, listp, flags)$/ -__log_autoremove ../log/log.c /^__log_autoremove(dbenv)$/ -__log_backup ../env/env_recover.c /^__log_backup(dbenv, logc, max_lsn, start_lsn)$/ +__log_autoremove ../log/log_archive.c /^__log_autoremove(dbenv)$/ +__log_backup ../env/env_recover.c /^__log_backup(dbenv, logc, max_lsn, start_lsn, cmp)/ __log_c_close ../log/log_get.c /^__log_c_close(logc)$/ __log_c_close_pp ../log/log_get.c /^__log_c_close_pp(logc, flags)$/ __log_c_get ../log/log_get.c /^__log_c_get(logc, alsn, dbt, flags)$/ @@ -3318,6 +3500,7 @@ __log_c_io ../log/log_get.c /^__log_c_io(logc, fnum, offset, p, nrp, eofp)$/ __log_c_ondisk ../log/log_get.c /^__log_c_ondisk(logc, lsn, last_lsn, flags, hdr, pp/ __log_c_set_maxrec ../log/log_get.c /^__log_c_set_maxrec(logc, np)$/ __log_c_shortread ../log/log_get.c /^__log_c_shortread(logc, lsn, check_silent)$/ +__log_check_sizes ../log/log_method.c /^__log_check_sizes(dbenv, lg_max, lg_bsize)$/ __log_cursor ../log/log_get.c /^__log_cursor(dbenv, logcp)$/ __log_cursor_pp ../log/log_get.c /^__log_cursor_pp(dbenv, logcp, flags)$/ __log_dbenv_create ../log/log_method.c /^__log_dbenv_create(dbenv)$/ @@ -3333,16 +3516,24 @@ __log_flush_commit ../log/log_put.c /^__log_flush_commit(dbenv, lsnp, flags)$/ __log_flush_int ../log/log_put.c /^__log_flush_int(dblp, lsnp, release)$/ __log_flush_pp ../log/log_put.c /^__log_flush_pp(dbenv, lsn)$/ __log_get_cached_ckp_lsn ../log/log.c /^__log_get_cached_ckp_lsn(dbenv, ckp_lsnp)$/ +__log_get_flags ../log/log_method.c /^__log_get_flags(dbenv, flagsp)$/ __log_get_lg_bsize ../log/log_method.c /^__log_get_lg_bsize(dbenv, lg_bsizep)$/ __log_get_lg_dir ../log/log_method.c /^__log_get_lg_dir(dbenv, dirp)$/ __log_get_lg_max ../log/log_method.c /^__log_get_lg_max(dbenv, lg_maxp)$/ __log_get_lg_regionmax ../log/log_method.c /^__log_get_lg_regionmax(dbenv, lg_regionmaxp)$/ __log_init ../log/log.c /^__log_init(dbenv, dblp)$/ +__log_inmem_chkspace ../log/log.c /^__log_inmem_chkspace(dblp, len)$/ +__log_inmem_copyin ../log/log.c /^__log_inmem_copyin(dblp, offset, buf, size)$/ +__log_inmem_copyout ../log/log.c /^__log_inmem_copyout(dblp, offset, buf, size)$/ +__log_inmem_lsnoff ../log/log.c /^__log_inmem_lsnoff(dblp, lsn, offsetp)$/ +__log_inmem_newfile ../log/log.c /^__log_inmem_newfile(dblp, file)$/ __log_is_outdated ../log/log.c /^__log_is_outdated(dbenv, fnum, outdatedp)$/ __log_name ../log/log_put.c /^__log_name(dblp, filenumber, namep, fhpp, flags)$/ -__log_newfh ../log/log_put.c /^__log_newfh(dblp)$/ -__log_newfile ../log/log_put.c /^__log_newfile(dblp, lsnp)$/ +__log_newfh ../log/log_put.c /^__log_newfh(dblp, create)$/ +__log_newfile ../log/log_put.c /^__log_newfile(dblp, lsnp, logfile)$/ __log_open ../log/log.c /^__log_open(dbenv)$/ +__log_print_all ../log/log_stat.c /^__log_print_all(dbenv, flags)$/ +__log_print_stats ../log/log_stat.c /^__log_print_stats(dbenv, flags)$/ __log_put ../log/log_put.c /^__log_put(dbenv, lsnp, udbt, flags)$/ __log_put_next ../log/log_put.c /^__log_put_next(dbenv, lsn, dbt, hdr, old_lsnp)$/ __log_put_pp ../log/log_put.c /^__log_put_pp(dbenv, lsnp, udbt, flags)$/ @@ -3351,12 +3542,15 @@ __log_recover ../log/log.c /^__log_recover(dblp)$/ __log_region_destroy ../log/log.c /^__log_region_destroy(dbenv, infop)$/ __log_region_size ../log/log.c /^__log_region_size(dbenv)$/ __log_rep_put ../log/log_put.c /^__log_rep_put(dbenv, lsnp, rec)$/ +__log_set_flags ../log/log_method.c /^__log_set_flags(dbenv, flags, on)$/ __log_set_lg_bsize ../log/log_method.c /^__log_set_lg_bsize(dbenv, lg_bsize)$/ __log_set_lg_dir ../log/log_method.c /^__log_set_lg_dir(dbenv, dir)$/ __log_set_lg_max ../log/log_method.c /^__log_set_lg_max(dbenv, lg_max)$/ __log_set_lg_regionmax ../log/log_method.c /^__log_set_lg_regionmax(dbenv, lg_regionmax)$/ -__log_stat ../log/log.c /^__log_stat(dbenv, statp, flags)$/ -__log_stat_pp ../log/log.c /^__log_stat_pp(dbenv, statp, flags)$/ +__log_stat ../log/log_stat.c /^__log_stat(dbenv, statp, flags)$/ +__log_stat_pp ../log/log_stat.c /^__log_stat_pp(dbenv, statp, flags)$/ +__log_stat_print ../log/log_stat.c /^__log_stat_print(dbenv, flags)$/ +__log_stat_print_pp ../log/log_stat.c /^__log_stat_print_pp(dbenv, flags)$/ __log_txn_lsn ../log/log_put.c /^__log_txn_lsn(dbenv, lsnp, mbytesp, bytesp)$/ __log_valid ../log/log.c /^__log_valid(dblp, number, set_persist, fhpp, flags/ __log_vtruncate ../log/log.c /^__log_vtruncate(dbenv, lsn, ckplsn, trunclsn)$/ @@ -3365,23 +3559,21 @@ __log_zero ../log/log.c /^__log_zero(dbenv, from_lsn, to_lsn)$/ __lsn_diff ../env/env_recover.c /^__lsn_diff(low, high, current, max, is_forward)$/ __memp_alloc ../mp/mp_alloc.c /^__memp_alloc(dbmp, memreg, mfp, len, offsetp, retp/ __memp_bad_buffer ../mp/mp_alloc.c /^__memp_bad_buffer(hp)$/ -__memp_bhfree ../mp/mp_bh.c /^__memp_bhfree(dbmp, hp, bhp, free_mem)$/ +__memp_bhfree ../mp/mp_bh.c /^__memp_bhfree(dbmp, hp, bhp, flags)$/ __memp_bhwrite ../mp/mp_bh.c /^__memp_bhwrite(dbmp, hp, mfp, bhp, open_extents)$/ __memp_check_order ../mp/mp_alloc.c /^__memp_check_order(hp)$/ -__memp_close_flush_files ../mp/mp_sync.c /^__memp_close_flush_files(dbenv, dbmp)$/ +__memp_close_flush_files ../mp/mp_sync.c /^__memp_close_flush_files(dbenv, dbmp, dosync)$/ __memp_dbenv_create ../mp/mp_method.c /^__memp_dbenv_create(dbenv)$/ __memp_dbenv_refresh ../mp/mp_region.c /^__memp_dbenv_refresh(dbenv)$/ -__memp_dump_region ../mp/mp_stat.c /^__memp_dump_region(dbenv, area, fp)$/ -__memp_dumpcache ../mp/mp_stat.c /^__memp_dumpcache(dbenv, dbmp, reginfo, fmap, fp, f/ __memp_fclose ../mp/mp_fopen.c /^__memp_fclose(dbmfp, flags)$/ __memp_fclose_pp ../mp/mp_fopen.c /^__memp_fclose_pp(dbmfp, flags)$/ -__memp_fcreate ../mp/mp_fopen.c /^__memp_fcreate(dbenv, retp)$/ -__memp_fcreate_pp ../mp/mp_fopen.c /^__memp_fcreate_pp(dbenv, retp, flags)$/ +__memp_fcreate ../mp/mp_fmethod.c /^__memp_fcreate(dbenv, retp)$/ +__memp_fcreate_pp ../mp/mp_fmethod.c /^__memp_fcreate_pp(dbenv, retp, flags)$/ __memp_fget ../mp/mp_fget.c /^__memp_fget(dbmfp, pgnoaddr, flags, addrp)$/ __memp_fget_pp ../mp/mp_fget.c /^__memp_fget_pp(dbmfp, pgnoaddr, flags, addrp)$/ -__memp_fn ../mp/mp_fopen.c /^__memp_fn(dbmfp)$/ -__memp_fns ../mp/mp_fopen.c /^__memp_fns(dbmp, mfp)$/ -__memp_fopen ../mp/mp_fopen.c /^__memp_fopen(dbmfp, mfp, path, flags, mode, pagesi/ +__memp_fn ../mp/mp_fmethod.c /^__memp_fn(dbmfp)$/ +__memp_fns ../mp/mp_fmethod.c /^__memp_fns(dbmp, mfp)$/ +__memp_fopen ../mp/mp_fopen.c /^__memp_fopen(dbmfp, mfp, path, flags, mode, pgsize/ __memp_fopen_pp ../mp/mp_fopen.c /^__memp_fopen_pp(dbmfp, path, flags, mode, pagesize/ __memp_fput ../mp/mp_fput.c /^__memp_fput(dbmfp, pgaddr, flags)$/ __memp_fput_pp ../mp/mp_fput.c /^__memp_fput_pp(dbmfp, pgaddr, flags)$/ @@ -3389,45 +3581,57 @@ __memp_fset ../mp/mp_fset.c /^__memp_fset(dbmfp, pgaddr, flags)$/ __memp_fset_pp ../mp/mp_fset.c /^__memp_fset_pp(dbmfp, pgaddr, flags)$/ __memp_fsync ../mp/mp_sync.c /^__memp_fsync(dbmfp)$/ __memp_fsync_pp ../mp/mp_sync.c /^__memp_fsync_pp(dbmfp)$/ +__memp_ftruncate ../mp/mp_method.c /^__memp_ftruncate(dbmfp, pgno, flags)$/ __memp_get_cachesize ../mp/mp_method.c /^__memp_get_cachesize(dbenv, gbytesp, bytesp, ncach/ -__memp_get_clear_len ../mp/mp_fopen.c /^__memp_get_clear_len(dbmfp, clear_lenp)$/ -__memp_get_fileid ../mp/mp_fopen.c /^__memp_get_fileid(dbmfp, fileid)$/ -__memp_get_flags ../mp/mp_fopen.c /^__memp_get_flags(dbmfp, flagsp)$/ -__memp_get_ftype ../mp/mp_fopen.c /^__memp_get_ftype(dbmfp, ftypep)$/ -__memp_get_lsn_offset ../mp/mp_fopen.c /^__memp_get_lsn_offset(dbmfp, lsn_offsetp)$/ -__memp_get_maxsize ../mp/mp_fopen.c /^__memp_get_maxsize(dbmfp, gbytesp, bytesp)$/ -__memp_get_mp_maxwrite ../mp/mp_method.c /^__memp_get_mp_maxwrite(dbenv, maxwritep, maxwrite_/ +__memp_get_clear_len ../mp/mp_fmethod.c /^__memp_get_clear_len(dbmfp, clear_lenp)$/ +__memp_get_fileid ../mp/mp_fmethod.c /^__memp_get_fileid(dbmfp, fileid)$/ +__memp_get_flags ../mp/mp_fmethod.c /^__memp_get_flags(dbmfp, flagsp)$/ +__memp_get_ftype ../mp/mp_fmethod.c /^__memp_get_ftype(dbmfp, ftypep)$/ +__memp_get_lsn_offset ../mp/mp_fmethod.c /^__memp_get_lsn_offset(dbmfp, lsn_offsetp)$/ +__memp_get_maxsize ../mp/mp_fmethod.c /^__memp_get_maxsize(dbmfp, gbytesp, bytesp)$/ +__memp_get_mp_max_openfd ../mp/mp_method.c /^__memp_get_mp_max_openfd(dbenv, maxopenfdp)$/ +__memp_get_mp_max_write ../mp/mp_method.c /^__memp_get_mp_max_write(dbenv, maxwritep, maxwrite/ __memp_get_mp_mmapsize ../mp/mp_method.c /^__memp_get_mp_mmapsize(dbenv, mp_mmapsizep)$/ -__memp_get_pgcookie ../mp/mp_fopen.c /^__memp_get_pgcookie(dbmfp, pgcookie)$/ -__memp_get_priority ../mp/mp_fopen.c /^__memp_get_priority(dbmfp, priorityp)$/ +__memp_get_pgcookie ../mp/mp_fmethod.c /^__memp_get_pgcookie(dbmfp, pgcookie)$/ +__memp_get_priority ../mp/mp_fmethod.c /^__memp_get_priority(dbmfp, priorityp)$/ __memp_get_refcnt ../mp/mp_method.c /^__memp_get_refcnt(dbenv, fileid, refp)$/ -__memp_last_pgno ../mp/mp_fopen.c /^__memp_last_pgno(dbmfp, pgnoaddr)$/ +__memp_init ../mp/mp_region.c /^__memp_init(dbenv, dbmp, reginfo_off, htab_buckets/ +__memp_init_config ../mp/mp_region.c /^__memp_init_config(dbenv, mp)$/ +__memp_last_pgno ../mp/mp_fmethod.c /^__memp_last_pgno(dbmfp, pgnoaddr)$/ __memp_mf_discard ../mp/mp_fopen.c /^__memp_mf_discard(dbmp, mfp)$/ -__memp_mf_sync ../mp/mp_fopen.c /^__memp_mf_sync(dbmp, mfp)$/ +__memp_mf_sync ../mp/mp_sync.c /^__memp_mf_sync(dbmp, mfp)$/ __memp_nameop ../mp/mp_method.c /^__memp_nameop(dbenv, fileid, newname, fullold, ful/ __memp_open ../mp/mp_region.c /^__memp_open(dbenv)$/ -__memp_pbh ../mp/mp_stat.c /^__memp_pbh(dbmp, bhp, fmap, fp)$/ __memp_pg ../mp/mp_bh.c /^__memp_pg(dbmfp, bhp, is_pgin)$/ __memp_pgread ../mp/mp_bh.c /^__memp_pgread(dbmfp, mutexp, bhp, can_create)$/ __memp_pgwrite ../mp/mp_bh.c /^__memp_pgwrite(dbenv, dbmfp, hp, bhp)$/ +__memp_print_all ../mp/mp_stat.c /^__memp_print_all(dbenv, flags)$/ +__memp_print_bh ../mp/mp_stat.c /^__memp_print_bh(dbenv, dbmp, bhp, fmap, flags)$/ +__memp_print_hash ../mp/mp_stat.c /^__memp_print_hash(dbenv, dbmp, reginfo, fmap, flag/ +__memp_print_stats ../mp/mp_stat.c /^__memp_print_stats(dbenv, flags)$/ +__memp_region_destroy ../mp/mp_region.c /^__memp_region_destroy(dbenv, infop)$/ +__memp_region_maint ../mp/mp_region.c /^__memp_region_maint(infop)$/ __memp_register ../mp/mp_register.c /^__memp_register(dbenv, ftype, pgin, pgout)$/ __memp_register_pp ../mp/mp_register.c /^__memp_register_pp(dbenv, ftype, pgin, pgout)$/ __memp_reset_lru ../mp/mp_fput.c /^__memp_reset_lru(dbenv, memreg)$/ -__memp_set_cachesize ../mp/mp_method.c /^__memp_set_cachesize(dbenv, gbytes, bytes, ncache)/ -__memp_set_clear_len ../mp/mp_fopen.c /^__memp_set_clear_len(dbmfp, clear_len)$/ -__memp_set_fileid ../mp/mp_fopen.c /^__memp_set_fileid(dbmfp, fileid)$/ -__memp_set_flags ../mp/mp_fopen.c /^__memp_set_flags(dbmfp, flags, onoff)$/ -__memp_set_ftype ../mp/mp_fopen.c /^__memp_set_ftype(dbmfp, ftype)$/ -__memp_set_lsn_offset ../mp/mp_fopen.c /^__memp_set_lsn_offset(dbmfp, lsn_offset)$/ -__memp_set_maxsize ../mp/mp_fopen.c /^__memp_set_maxsize(dbmfp, gbytes, bytes)$/ -__memp_set_mp_maxwrite ../mp/mp_method.c /^__memp_set_mp_maxwrite(dbenv, maxwrite, maxwrite_s/ +__memp_set_cachesize ../mp/mp_method.c /^__memp_set_cachesize(dbenv, gbytes, bytes, arg_nca/ +__memp_set_clear_len ../mp/mp_fmethod.c /^__memp_set_clear_len(dbmfp, clear_len)$/ +__memp_set_fileid ../mp/mp_fmethod.c /^__memp_set_fileid(dbmfp, fileid)$/ +__memp_set_flags ../mp/mp_fmethod.c /^__memp_set_flags(dbmfp, flags, onoff)$/ +__memp_set_ftype ../mp/mp_fmethod.c /^__memp_set_ftype(dbmfp, ftype)$/ +__memp_set_lsn_offset ../mp/mp_fmethod.c /^__memp_set_lsn_offset(dbmfp, lsn_offset)$/ +__memp_set_maxsize ../mp/mp_fmethod.c /^__memp_set_maxsize(dbmfp, gbytes, bytes)$/ +__memp_set_mp_max_openfd ../mp/mp_method.c /^__memp_set_mp_max_openfd(dbenv, maxopenfd)$/ +__memp_set_mp_max_write ../mp/mp_method.c /^__memp_set_mp_max_write(dbenv, maxwrite, maxwrite_/ __memp_set_mp_mmapsize ../mp/mp_method.c /^__memp_set_mp_mmapsize(dbenv, mp_mmapsize)$/ -__memp_set_pgcookie ../mp/mp_fopen.c /^__memp_set_pgcookie(dbmfp, pgcookie)$/ -__memp_set_priority ../mp/mp_fopen.c /^__memp_set_priority(dbmfp, priority)$/ +__memp_set_pgcookie ../mp/mp_fmethod.c /^__memp_set_pgcookie(dbmfp, pgcookie)$/ +__memp_set_priority ../mp/mp_fmethod.c /^__memp_set_priority(dbmfp, priority)$/ __memp_stat ../mp/mp_stat.c /^__memp_stat(dbenv, gspp, fspp, flags)$/ -__memp_stat_hash ../mp/mp_stat.c /^__memp_stat_hash(reginfo, mp, dirtyp)$/ +__memp_stat_hash ../mp/mp_stat.c /^__memp_stat_hash(dbenv, reginfo, mp, dirtyp)$/ __memp_stat_pp ../mp/mp_stat.c /^__memp_stat_pp(dbenv, gspp, fspp, flags)$/ -__memp_stat_wait ../mp/mp_stat.c /^__memp_stat_wait(reginfo, mp, mstat, flags)$/ +__memp_stat_print ../mp/mp_stat.c /^__memp_stat_print(dbenv, flags)$/ +__memp_stat_print_pp ../mp/mp_stat.c /^__memp_stat_print_pp(dbenv, flags)$/ +__memp_stat_wait ../mp/mp_stat.c /^__memp_stat_wait(dbenv, reginfo, mp, mstat, flags)/ __memp_sync ../mp/mp_sync.c /^__memp_sync(dbenv, lsnp)$/ __memp_sync_files ../mp/mp_sync.c /^int __memp_sync_files(dbenv, dbmp)$/ __memp_sync_int ../mp/mp_sync.c /^__memp_sync_int(dbenv, dbmfp, trickle_max, op, wro/ @@ -3436,9 +3640,6 @@ __memp_trickle ../mp/mp_trickle.c /^__memp_trickle(dbenv, pct, nwrotep)$/ __memp_trickle_pp ../mp/mp_trickle.c /^__memp_trickle_pp(dbenv, pct, nwrotep)$/ __mp_xxx_fh ../mp/mp_sync.c /^__mp_xxx_fh(dbmfp, fhp)$/ __mpe_fsync ../os/os_fsync.c /^__mpe_fsync(fd)$/ -__mpool_init ../mp/mp_region.c /^__mpool_init(dbenv, dbmp, reginfo_off, htab_bucket/ -__mpool_region_destroy ../mp/mp_region.c /^__mpool_region_destroy(dbenv, infop)$/ -__mpool_region_maint ../mp/mp_region.c /^__mpool_region_maint(infop)$/ __op_rep_enter ../rep/rep_util.c /^__op_rep_enter(dbenv)$/ __op_rep_exit ../rep/rep_util.c /^__op_rep_exit(dbenv)$/ __os_abspath ../os/os_abs.c /^__os_abspath(path)$/ @@ -3457,14 +3658,16 @@ __os_get_errno_ret_zero ../os/os_errno.c /^__os_get_errno_ret_zero()$/ __os_guard ../os/os_alloc.c /^__os_guard(dbenv)$/ __os_have_direct ../os/os_open.c /^__os_have_direct()$/ __os_id ../os/os_id.c /^__os_id(idp)$/ +__os_intermediate_dir ../os/os_open.c /^__os_intermediate_dir(dbenv, name)$/ __os_io ../os/os_rw.c /^__os_io(dbenv, op, fhp, pgno, pagesize, buf, niop)/ __os_ioinfo ../os/os_stat.c /^__os_ioinfo(dbenv, path, fhp, mbytesp, bytesp, ios/ __os_isroot ../os/os_root.c /^__os_isroot()$/ __os_malloc ../os/os_alloc.c /^__os_malloc(dbenv, size, storep)$/ __os_map ../os/os_map.c /^__os_map(dbenv, path, fhp, len, is_region, is_rdon/ __os_mapfile ../os/os_map.c /^__os_mapfile(dbenv, path, fhp, len, is_rdonly, add/ +__os_mkdir ../os/os_open.c /^__os_mkdir(dbenv, name)$/ __os_open ../os/os_open.c /^__os_open(dbenv, name, flags, mode, fhpp)$/ -__os_open_extend ../os/os_open.c /^__os_open_extend(dbenv, name, log_size, page_size,/ +__os_open_extend ../os/os_open.c /^__os_open_extend(dbenv, name, page_size, flags, mo/ __os_openhandle ../os/os_handle.c /^__os_openhandle(dbenv, name, flags, mode, fhpp)$/ __os_physwrite ../os/os_rw.c /^__os_physwrite(dbenv, fhp, addr, len, nwp)$/ __os_pstat_getdynamic ../os/os_spin.c /^__os_pstat_getdynamic()$/ @@ -3476,7 +3679,7 @@ __os_r_sysdetach ../os/os_map.c /^__os_r_sysdetach(dbenv, infop, destroy)$/ __os_read ../os/os_rw.c /^__os_read(dbenv, fhp, addr, len, nrp)$/ __os_realloc ../os/os_alloc.c /^__os_realloc(dbenv, size, storep)$/ __os_region_unlink ../os/os_unlink.c /^__os_region_unlink(dbenv, path)$/ -__os_rename ../os/os_rename.c /^__os_rename(dbenv, old, new, flags)$/ +__os_rename ../os/os_rename.c /^__os_rename(dbenv, old, new, silent)$/ __os_seek ../os/os_seek.c /^__os_seek(dbenv, fhp, pgsize, pageno, relative, is/ __os_set_errno ../os/os_errno.c /^__os_set_errno(evalue)$/ __os_shmname ../os/os_open.c /^__os_shmname(dbenv, name, newnamep)$/ @@ -3485,8 +3688,10 @@ __os_spin ../os/os_spin.c /^__os_spin(dbenv)$/ __os_strdup ../os/os_alloc.c /^__os_strdup(dbenv, str, storep)$/ __os_sysconf ../os/os_spin.c /^__os_sysconf()$/ __os_tmpdir ../os/os_tmpdir.c /^__os_tmpdir(dbenv, flags)$/ +__os_truncate ../os/os_truncate.c /^__os_truncate(dbenv, fhp, pgno, pgsize)$/ __os_ufree ../os/os_alloc.c /^__os_ufree(dbenv, ptr)$/ __os_umalloc ../os/os_alloc.c /^__os_umalloc(dbenv, size, storep)$/ +__os_unique_id ../os/os_id.c /^__os_unique_id(dbenv, idp)$/ __os_unlink ../os/os_unlink.c /^__os_unlink(dbenv, path)$/ __os_unmapfile ../os/os_map.c /^__os_unmapfile(dbenv, addr, len)$/ __os_urealloc ../os/os_alloc.c /^__os_urealloc(dbenv, size, storep)$/ @@ -3495,9 +3700,8 @@ __os_yield ../os/os_spin.c /^__os_yield(dbenv, usecs)$/ __os_zerofill ../os/os_rw.c /^__os_zerofill(dbenv, fhp)$/ __qam_31_qammeta ../qam/qam_upgrade.c /^__qam_31_qammeta(dbp, real_name, buf)$/ __qam_32_qammeta ../qam/qam_upgrade.c /^__qam_32_qammeta(dbp, real_name, buf)$/ -__qam_add_getpgnos ../qam/qam_auto.c /^__qam_add_getpgnos(dbenv, rec, lsnp, notused1, sum/ __qam_add_log ../qam/qam_auto.c /^__qam_add_log(dbp, txnid, ret_lsnp, flags, lsn, pg/ -__qam_add_print ../qam/qam_auto.c /^__qam_add_print(dbenv, dbtp, lsnp, notused2, notus/ +__qam_add_print ../qam/qam_autop.c /^__qam_add_print(dbenv, dbtp, lsnp, notused2, notus/ __qam_add_read ../qam/qam_auto.c /^__qam_add_read(dbenv, recbuf, argpp)$/ __qam_add_recover ../qam/qam_rec.c /^__qam_add_recover(dbenv, dbtp, lsnp, op, info)$/ __qam_append ../qam/qam.c /^__qam_append(dbc, key, data)$/ @@ -3512,14 +3716,12 @@ __qam_c_put ../qam/qam.c /^__qam_c_put(dbc, key, data, flags, pgnop)$/ __qam_consume ../qam/qam.c /^__qam_consume(dbc, meta, first)$/ __qam_db_close ../qam/qam_method.c /^__qam_db_close(dbp, flags)$/ __qam_db_create ../qam/qam_method.c /^__qam_db_create(dbp)$/ -__qam_del_getpgnos ../qam/qam_auto.c /^__qam_del_getpgnos(dbenv, rec, lsnp, notused1, sum/ __qam_del_log ../qam/qam_auto.c /^__qam_del_log(dbp, txnid, ret_lsnp, flags, lsn, pg/ -__qam_del_print ../qam/qam_auto.c /^__qam_del_print(dbenv, dbtp, lsnp, notused2, notus/ +__qam_del_print ../qam/qam_autop.c /^__qam_del_print(dbenv, dbtp, lsnp, notused2, notus/ __qam_del_read ../qam/qam_auto.c /^__qam_del_read(dbenv, recbuf, argpp)$/ __qam_del_recover ../qam/qam_rec.c /^__qam_del_recover(dbenv, dbtp, lsnp, op, info)$/ -__qam_delext_getpgnos ../qam/qam_auto.c /^__qam_delext_getpgnos(dbenv, rec, lsnp, notused1, / __qam_delext_log ../qam/qam_auto.c /^__qam_delext_log(dbp, txnid, ret_lsnp, flags, lsn,/ -__qam_delext_print ../qam/qam_auto.c /^__qam_delext_print(dbenv, dbtp, lsnp, notused2, no/ +__qam_delext_print ../qam/qam_autop.c /^__qam_delext_print(dbenv, dbtp, lsnp, notused2, no/ __qam_delext_read ../qam/qam_auto.c /^__qam_delext_read(dbenv, recbuf, argpp)$/ __qam_delext_recover ../qam/qam_rec.c /^__qam_delext_recover(dbenv, dbtp, lsnp, op, info)$/ __qam_exid ../qam/qam_files.c /^__qam_exid(dbp, fidp, exnum)$/ @@ -3532,20 +3734,18 @@ __qam_fremove ../qam/qam_files.c /^__qam_fremove(dbp, pgnoaddr)$/ __qam_gen_filelist ../qam/qam_files.c /^__qam_gen_filelist(dbp, filelistp)$/ __qam_get_extentsize ../qam/qam_method.c /^__qam_get_extentsize(dbp, q_extentsizep)$/ __qam_getno ../qam/qam.c /^__qam_getno(dbp, key, rep)$/ -__qam_incfirst_getpgnos ../qam/qam_auto.c /^__qam_incfirst_getpgnos(dbenv, rec, lsnp, notused1/ __qam_incfirst_log ../qam/qam_auto.c /^__qam_incfirst_log(dbp, txnid, ret_lsnp, flags, re/ -__qam_incfirst_print ../qam/qam_auto.c /^__qam_incfirst_print(dbenv, dbtp, lsnp, notused2, / +__qam_incfirst_print ../qam/qam_autop.c /^__qam_incfirst_print(dbenv, dbtp, lsnp, notused2, / __qam_incfirst_read ../qam/qam_auto.c /^__qam_incfirst_read(dbenv, recbuf, argpp)$/ __qam_incfirst_recover ../qam/qam_rec.c /^__qam_incfirst_recover(dbenv, dbtp, lsnp, op, info/ -__qam_init_getpgnos ../qam/qam_auto.c /^__qam_init_getpgnos(dbenv, dtabp, dtabsizep)$/ __qam_init_meta ../qam/qam_open.c /^__qam_init_meta(dbp, meta)$/ -__qam_init_print ../qam/qam_auto.c /^__qam_init_print(dbenv, dtabp, dtabsizep)$/ +__qam_init_print ../qam/qam_autop.c /^__qam_init_print(dbenv, dtabp, dtabsizep)$/ __qam_init_recover ../qam/qam_auto.c /^__qam_init_recover(dbenv, dtabp, dtabsizep)$/ +__qam_map_flags ../qam/qam_method.c /^__qam_map_flags(dbp, inflagsp, outflagsp)$/ __qam_metachk ../qam/qam_open.c /^__qam_metachk(dbp, name, qmeta)$/ __qam_mswap ../qam/qam_conv.c /^__qam_mswap(pg)$/ -__qam_mvptr_getpgnos ../qam/qam_auto.c /^__qam_mvptr_getpgnos(dbenv, rec, lsnp, notused1, s/ __qam_mvptr_log ../qam/qam_auto.c /^__qam_mvptr_log(dbp, txnid, ret_lsnp, flags,$/ -__qam_mvptr_print ../qam/qam_auto.c /^__qam_mvptr_print(dbenv, dbtp, lsnp, notused2, not/ +__qam_mvptr_print ../qam/qam_autop.c /^__qam_mvptr_print(dbenv, dbtp, lsnp, notused2, not/ __qam_mvptr_read ../qam/qam_auto.c /^__qam_mvptr_read(dbenv, recbuf, argpp)$/ __qam_mvptr_recover ../qam/qam_rec.c /^__qam_mvptr_recover(dbenv, dbtp, lsnp, op, info)$/ __qam_nameop ../qam/qam_files.c /^int __qam_nameop(dbp, txn, newname, op)$/ @@ -3554,12 +3754,15 @@ __qam_open ../qam/qam_open.c /^__qam_open(dbp, txn, name, base_pgno, mode, flags __qam_pgin_out ../qam/qam_conv.c /^__qam_pgin_out(dbenv, pg, pp, cookie)$/ __qam_pitem ../qam/qam.c /^__qam_pitem(dbc, pagep, indx, recno, data)$/ __qam_position ../qam/qam.c /^__qam_position(dbc, recnop, mode, exactp)$/ -__qam_remove ../qam/qam_method.c /^__qam_remove(dbp, txn, name, subdb, lsnp)$/ -__qam_rename ../qam/qam_method.c /^__qam_rename(dbp, txn, filename, subdb, newname)$/ +__qam_remove ../qam/qam_method.c /^__qam_remove(dbp, txn, name, subdb)$/ +__qam_rename ../qam/qam_method.c /^__qam_rename(dbp, txn, name, subdb, newname)$/ +__qam_rr ../qam/qam_method.c /^__qam_rr(dbp, txn, name, subdb, newname, op)$/ __qam_salvage ../qam/qam_verify.c /^__qam_salvage(dbp, vdp, pgno, h, handle, callback,/ __qam_set_ext_data ../qam/qam_open.c /^__qam_set_ext_data(dbp, name)$/ __qam_set_extentsize ../qam/qam_method.c /^__qam_set_extentsize(dbp, extentsize)$/ +__qam_set_flags ../qam/qam_method.c /^__qam_set_flags(dbp, flagsp)$/ __qam_stat ../qam/qam_stat.c /^__qam_stat(dbc, spp, flags)$/ +__qam_stat_print ../qam/qam_stat.c /^__qam_stat_print(dbc, flags)$/ __qam_sync ../qam/qam_files.c /^__qam_sync(dbp)$/ __qam_testdocopy ../db/db.c /^__qam_testdocopy(dbp, name)$/ __qam_truncate ../qam/qam.c /^__qam_truncate(dbc, countp)$/ @@ -3567,6 +3770,7 @@ __qam_vrfy_data ../qam/qam_verify.c /^__qam_vrfy_data(dbp, vdp, h, pgno, flags)$ __qam_vrfy_meta ../qam/qam_verify.c /^__qam_vrfy_meta(dbp, vdp, meta, pgno, flags)$/ __qam_vrfy_structure ../qam/qam_verify.c /^__qam_vrfy_structure(dbp, vdp, flags)$/ __qam_vrfy_walkqueue ../qam/qam_verify.c /^__qam_vrfy_walkqueue(dbp, vdp, handle, callback, f/ +__queue_pageinfo ../qam/qam_method.c /^__queue_pageinfo(dbp, firstp, lastp, emptyp, prpag/ __ram_add ../btree/bt_recno.c /^__ram_add(dbc, recnop, data, flags, bi_flags)$/ __ram_append ../btree/bt_recno.c /^__ram_append(dbc, key, data)$/ __ram_c_del ../btree/bt_recno.c /^__ram_c_del(dbc)$/ @@ -3593,51 +3797,105 @@ __ram_update ../btree/bt_recno.c /^__ram_update(dbc, recno, can_create)$/ __ram_vrfy_inp ../btree/bt_verify.c /^__ram_vrfy_inp(dbp, vdp, h, pgno, nentriesp, flags/ __ram_vrfy_leaf ../btree/bt_verify.c /^__ram_vrfy_leaf(dbp, vdp, h, pgno, flags)$/ __ram_writeback ../btree/bt_recno.c /^__ram_writeback(dbp)$/ +__reg_type ../env/env_stat.c /^__reg_type(t)$/ __rep_abort_prepared ../rep/rep_method.c /^__rep_abort_prepared(dbenv)$/ __rep_apply ../rep/rep_record.c /^__rep_apply(dbenv, rp, rec, ret_lsnp)$/ __rep_bt_cmp ../rep/rep_method.c /^__rep_bt_cmp(dbp, dbt1, dbt2)$/ -__rep_check_alloc ../rep/rep_util.c /^__rep_check_alloc(dbenv, r, n)$/ -__rep_client_dbinit ../rep/rep_method.c /^__rep_client_dbinit(dbenv, startup)$/ +__rep_check_doreq ../rep/rep_record.c /^__rep_check_doreq(dbenv, rep)$/ +__rep_client_dbinit ../rep/rep_method.c /^__rep_client_dbinit(dbenv, startup, which)$/ __rep_cmp_vote ../rep/rep_record.c /^__rep_cmp_vote(dbenv, rep, eidp, lsnp, priority, g/ __rep_cmp_vote2 ../rep/rep_record.c /^__rep_cmp_vote2(dbenv, rep, eid, egen)$/ __rep_collect_txn ../rep/rep_record.c /^__rep_collect_txn(dbenv, lsnp, lc)$/ __rep_dbenv_close ../rep/rep_region.c /^__rep_dbenv_close(dbenv)$/ __rep_dbenv_create ../rep/rep_method.c /^__rep_dbenv_create(dbenv)$/ __rep_dbenv_refresh ../rep/rep_region.c /^__rep_dbenv_refresh(dbenv)$/ +__rep_do_ckp ../rep/rep_record.c /^__rep_do_ckp(dbenv, rec, rp)$/ __rep_dorecovery ../rep/rep_record.c /^__rep_dorecovery(dbenv, lsnp, trunclsnp)$/ -__rep_elect ../rep/rep_method.c /^__rep_elect(dbenv, nsites, priority, timeout, eidp/ +__rep_egen_init ../rep/rep_region.c /^__rep_egen_init(dbenv, rep)$/ +__rep_elect ../rep/rep_method.c /^__rep_elect(dbenv, nsites, nvotes, priority, timeo/ __rep_elect_done ../rep/rep_util.c /^__rep_elect_done(dbenv, rep)$/ -__rep_elect_init ../rep/rep_method.c /^__rep_elect_init(dbenv, lsnp, nsites, priority, be/ +__rep_elect_init ../rep/rep_method.c /^__rep_elect_init(dbenv, lsnp, nsites, nvotes, prio/ __rep_elect_master ../rep/rep_method.c /^__rep_elect_master(dbenv, rep, eidp)$/ +__rep_filedone ../rep/rep_backup.c /^__rep_filedone(dbenv, eid, rep, msgfp, type)$/ +__rep_fileinfo_buf ../rep/rep_auto.c /^__rep_fileinfo_buf(buf, max, lenp,$/ +__rep_fileinfo_read ../rep/rep_auto.c /^__rep_fileinfo_read(dbenv, recbuf, nextp, argpp)$/ +__rep_files_data ../rep/rep_backup.c /^__rep_files_data(dbenv, fp, fileszp, filelenp, fil/ +__rep_files_inmem ../rep/rep_backup.c /^__rep_files_inmem(dbenv, fp, fileszp, filelenp, fi/ +__rep_finfo_alloc ../rep/rep_backup.c /^__rep_finfo_alloc(dbenv, rfpsrc, rfpp)$/ __rep_flush ../rep/rep_method.c /^__rep_flush(dbenv)$/ +__rep_get_fileinfo ../rep/rep_backup.c /^__rep_get_fileinfo(dbenv, file, rfp, uid, filecntp/ __rep_get_gen ../rep/rep_util.c /^__rep_get_gen(dbenv, genp)$/ __rep_get_limit ../rep/rep_method.c /^__rep_get_limit(dbenv, gbytesp, bytesp)$/ +__rep_getnext ../rep/rep_record.c /^__rep_getnext(dbenv)$/ __rep_grow_sites ../rep/rep_util.c /^__rep_grow_sites(dbenv, nsites)$/ __rep_is_client ../rep/rep_util.c /^__rep_is_client(dbenv)$/ +__rep_lockout ../rep/rep_record.c /^__rep_lockout(dbenv, db_rep, rep)$/ +__rep_log_setup ../rep/rep_backup.c /^__rep_log_setup(dbenv, rep)$/ +__rep_loggap_req ../rep/rep_backup.c /^__rep_loggap_req(dbenv, rep, lsnp, moregap)$/ __rep_lsn_cmp ../rep/rep_record.c /^__rep_lsn_cmp(lsn1, lsn2)$/ +__rep_mpf_open ../rep/rep_backup.c /^__rep_mpf_open(dbenv, mpfp, rfp)$/ __rep_new_master ../rep/rep_util.c /^__rep_new_master(dbenv, cntrl, eid)$/ __rep_newfile ../rep/rep_record.c /^__rep_newfile(dbenv, rc, lsnp)$/ __rep_noarchive ../rep/rep_util.c /^__rep_noarchive(dbenv)$/ __rep_open ../rep/rep_method.c /^__rep_open(dbenv)$/ +__rep_page ../rep/rep_backup.c /^__rep_page(dbenv, eid, rp, rec)$/ +__rep_page_fail ../rep/rep_backup.c /^__rep_page_fail(dbenv, eid, rec)$/ +__rep_page_gap ../rep/rep_backup.c /^__rep_page_gap(dbenv, rep, msgfp, type)$/ +__rep_page_req ../rep/rep_backup.c /^__rep_page_req(dbenv, eid, rec)$/ +__rep_page_sendpages ../rep/rep_backup.c /^__rep_page_sendpages(dbenv, eid, msgfp, mpf, dbp)$/ +__rep_pggap_req ../rep/rep_backup.c /^__rep_pggap_req(dbenv, rep, reqfp, moregap)$/ __rep_preclose ../rep/rep_region.c /^__rep_preclose(dbenv, do_closefiles)$/ +__rep_print_all ../rep/rep_stat.c /^__rep_print_all(dbenv, flags)$/ __rep_print_logmsg ../rep/rep_util.c /^__rep_print_logmsg(dbenv, logdbt, lsnp)$/ __rep_print_message ../rep/rep_util.c /^__rep_print_message(dbenv, eid, rp, str)$/ +__rep_print_stats ../rep/rep_stat.c /^__rep_print_stats(dbenv, flags)$/ __rep_process_message ../rep/rep_record.c /^__rep_process_message(dbenv, control, rec, eidp, r/ +__rep_process_rec ../rep/rep_record.c /^__rep_process_rec(dbenv, rp, rec, typep, ret_lsnp)/ __rep_process_txn ../rep/rep_record.c /^__rep_process_txn(dbenv, rec)$/ +__rep_queue_filedone ../rep/rep_backup.c /^__rep_queue_filedone(dbenv, rep, rfp)$/ __rep_region_destroy ../rep/rep_region.c /^__rep_region_destroy(dbenv)$/ __rep_region_init ../rep/rep_region.c /^__rep_region_init(dbenv)$/ +__rep_remfirst ../rep/rep_record.c /^__rep_remfirst(dbenv, cntrl, rec)$/ +__rep_resend_req ../rep/rep_record.c /^__rep_resend_req(dbenv, eid)$/ __rep_restore_prepared ../rep/rep_method.c /^__rep_restore_prepared(dbenv)$/ -__rep_send_file ../rep/rep_util.c /^__rep_send_file(dbenv, rec, eid)$/ __rep_send_message ../rep/rep_util.c /^__rep_send_message(dbenv, eid, rtype, lsnp, dbtp, / -__rep_send_vote ../rep/rep_util.c /^__rep_send_vote(dbenv, lsnp, nsites, pri, tiebreak/ +__rep_send_vote ../rep/rep_util.c /^__rep_send_vote(dbenv, lsnp, nsites, nvotes, pri, / __rep_set_limit ../rep/rep_method.c /^__rep_set_limit(dbenv, gbytes, bytes)$/ __rep_set_rep_transport ../rep/rep_method.c /^__rep_set_rep_transport(dbenv, eid, f_send)$/ __rep_set_request ../rep/rep_method.c /^__rep_set_request(dbenv, min, max)$/ __rep_start ../rep/rep_method.c /^__rep_start(dbenv, dbt, flags)$/ -__rep_stat ../rep/rep_method.c /^__rep_stat(dbenv, statp, flags)$/ +__rep_stat ../rep/rep_stat.c /^__rep_stat(dbenv, statp, flags)$/ +__rep_stat_pp ../rep/rep_stat.c /^__rep_stat_pp(dbenv, statp, flags)$/ +__rep_stat_print ../rep/rep_stat.c /^__rep_stat_print(dbenv, flags)$/ +__rep_stat_print_pp ../rep/rep_stat.c /^__rep_stat_print_pp(dbenv, flags)$/ __rep_tally ../rep/rep_record.c /^__rep_tally(dbenv, rep, eid, countp, egen, vtoff)$/ -__rep_verify_match ../rep/rep_record.c /^__rep_verify_match(dbenv, rp, savetime)$/ +__rep_update_buf ../rep/rep_auto.c /^__rep_update_buf(buf, max, lenp,$/ +__rep_update_read ../rep/rep_auto.c /^__rep_update_read(dbenv, recbuf, nextp, argpp)$/ +__rep_update_req ../rep/rep_backup.c /^__rep_update_req(dbenv, eid)$/ +__rep_update_setup ../rep/rep_backup.c /^__rep_update_setup(dbenv, eid, rp, rec)$/ +__rep_verify_match ../rep/rep_record.c /^__rep_verify_match(dbenv, reclsnp, savetime)$/ __rep_wait ../rep/rep_method.c /^__rep_wait(dbenv, timeout, eidp, flags)$/ +__rep_walk_dir ../rep/rep_backup.c /^__rep_walk_dir(dbenv, dir, fp, fileszp, filelenp, / +__rep_write_egen ../rep/rep_region.c /^__rep_write_egen(dbenv, egen)$/ +__rep_write_page ../rep/rep_backup.c /^__rep_write_page(dbenv, rep, msgfp)$/ +__seq_close ../sequence/sequence.c /^__seq_close(seq, flags)$/ +__seq_get ../sequence/sequence.c /^__seq_get(seq, txn, delta, retp, flags)$/ +__seq_get_cachesize ../sequence/sequence.c /^__seq_get_cachesize(seq, cachesize)$/ +__seq_get_db ../sequence/sequence.c /^__seq_get_db(seq, dbpp)$/ +__seq_get_flags ../sequence/sequence.c /^__seq_get_flags(seq, flagsp)$/ +__seq_get_key ../sequence/sequence.c /^__seq_get_key(seq, key)$/ +__seq_get_range ../sequence/sequence.c /^__seq_get_range(seq, minp, maxp)$/ +__seq_initial_value ../sequence/sequence.c /^__seq_initial_value(seq, value)$/ +__seq_open ../sequence/sequence.c /^__seq_open(seq, txn, keyp, flags)$/ +__seq_print_all ../sequence/seq_stat.c /^__seq_print_all(seq, flags)$/ +__seq_print_stats ../sequence/seq_stat.c /^__seq_print_stats(seq, flags)$/ +__seq_remove ../sequence/sequence.c /^__seq_remove(seq, txn, flags)$/ +__seq_set_cachesize ../sequence/sequence.c /^__seq_set_cachesize(seq, cachesize)$/ +__seq_set_flags ../sequence/sequence.c /^__seq_set_flags(seq, flags)$/ +__seq_set_range ../sequence/sequence.c /^__seq_set_range(seq, min, max)$/ +__seq_stat ../sequence/seq_stat.c /^__seq_stat(seq, spp, flags)$/ +__seq_stat_print ../sequence/seq_stat.c /^__seq_stat_print(seq, flags)$/ +__seq_update ../sequence/sequence.c /^__seq_update(seq, txn, delta, flags)$/ __txn_abort ../txn/txn.c /^__txn_abort(txnp)$/ __txn_abort_pp ../txn/txn.c /^__txn_abort_pp(txnp)$/ __txn_abort_proc ../rpc_server/c/db_server_proc.c /^__txn_abort_proc(txnpcl_id, replyp)$/ @@ -3645,23 +3903,22 @@ __txn_activekids ../txn/txn.c /^__txn_activekids(dbenv, rectype, txnp)$/ __txn_begin ../txn/txn.c /^__txn_begin(dbenv, parent, txnpp, flags)$/ __txn_begin_int ../txn/txn.c /^__txn_begin_int(txn, internal)$/ __txn_begin_pp ../txn/txn.c /^__txn_begin_pp(dbenv, parent, txnpp, flags)$/ -__txn_begin_proc ../rpc_server/c/db_server_proc.c /^__txn_begin_proc(dbenvcl_id, parentcl_id,$/ +__txn_begin_proc ../rpc_server/c/db_server_proc.c /^__txn_begin_proc(dbenvcl_id, parentcl_id, flags, r/ __txn_checkpoint ../txn/txn.c /^__txn_checkpoint(dbenv, kbytes, minutes, flags)$/ __txn_checkpoint_pp ../txn/txn.c /^__txn_checkpoint_pp(dbenv, kbytes, minutes, flags)/ -__txn_child_getpgnos ../txn/txn_auto.c /^__txn_child_getpgnos(dbenv, rec, lsnp, notused1, s/ __txn_child_log ../txn/txn_auto.c /^__txn_child_log(dbenv, txnid, ret_lsnp, flags,$/ -__txn_child_print ../txn/txn_auto.c /^__txn_child_print(dbenv, dbtp, lsnp, notused2, not/ +__txn_child_print ../txn/txn_autop.c /^__txn_child_print(dbenv, dbtp, lsnp, notused2, not/ __txn_child_read ../txn/txn_auto.c /^__txn_child_read(dbenv, recbuf, argpp)$/ __txn_child_recover ../txn/txn_rec.c /^__txn_child_recover(dbenv, dbtp, lsnp, op, info)$/ -__txn_ckp_getpgnos ../txn/txn_auto.c /^__txn_ckp_getpgnos(dbenv, rec, lsnp, notused1, sum/ __txn_ckp_log ../txn/txn_auto.c /^__txn_ckp_log(dbenv, txnid, ret_lsnp, flags,$/ -__txn_ckp_print ../txn/txn_auto.c /^__txn_ckp_print(dbenv, dbtp, lsnp, notused2, notus/ +__txn_ckp_print ../txn/txn_autop.c /^__txn_ckp_print(dbenv, dbtp, lsnp, notused2, notus/ __txn_ckp_read ../txn/txn_auto.c /^__txn_ckp_read(dbenv, recbuf, argpp)$/ __txn_ckp_recover ../txn/txn_rec.c /^__txn_ckp_recover(dbenv, dbtp, lsnp, op, info)$/ __txn_closeevent ../txn/txn_util.c /^__txn_closeevent(dbenv, txn, dbp)$/ __txn_commit ../txn/txn.c /^__txn_commit(txnp, flags)$/ __txn_commit_pp ../txn/txn.c /^__txn_commit_pp(txnp, flags)$/ __txn_commit_proc ../rpc_server/c/db_server_proc.c /^__txn_commit_proc(txnpcl_id, flags, replyp)$/ +__txn_compare ../txn/txn_stat.c /^__txn_compare(a1, b1)$/ __txn_compensate_begin ../txn/txn.c /^__txn_compensate_begin(dbenv, txnpp)$/ __txn_continue ../txn/txn_recover.c /^__txn_continue(env, txnp, td, off)$/ __txn_dbenv_create ../txn/txn_method.c /^__txn_dbenv_create(dbenv)$/ @@ -3672,38 +3929,39 @@ __txn_discard_proc ../rpc_server/c/db_server_proc.c /^__txn_discard_proc(txnpcl_ __txn_dispatch_undo ../txn/txn.c /^__txn_dispatch_undo(dbenv, txnp, rdbt, key_lsn, tx/ __txn_doevents ../txn/txn_util.c /^__txn_doevents(dbenv, txn, opcode, preprocess)$/ __txn_end ../txn/txn.c /^__txn_end(txnp, is_commit)$/ -__txn_findlastckp ../txn/txn_region.c /^__txn_findlastckp(dbenv, lsnp)$/ +__txn_findlastckp ../txn/txn_region.c /^__txn_findlastckp(dbenv, lsnp, max_lsn)$/ __txn_force_abort ../txn/txn.c /^__txn_force_abort(dbenv, buffer)$/ __txn_get_prepared ../txn/txn_recover.c /^__txn_get_prepared(dbenv, xids, txns, count, retp,/ __txn_get_tx_max ../txn/txn_method.c /^__txn_get_tx_max(dbenv, tx_maxp)$/ __txn_get_tx_timestamp ../txn/txn_method.c /^__txn_get_tx_timestamp(dbenv, timestamp)$/ +__txn_getactive ../txn/txn.c /^__txn_getactive(dbenv, lsnp)$/ __txn_getckp ../txn/txn.c /^__txn_getckp(dbenv, lsnp)$/ __txn_id ../txn/txn.c /^__txn_id(txnp)$/ __txn_id_set ../txn/txn_region.c /^__txn_id_set(dbenv, cur_txnid, max_txnid)$/ __txn_init ../txn/txn_region.c /^__txn_init(dbenv, tmgrp)$/ -__txn_init_getpgnos ../txn/txn_auto.c /^__txn_init_getpgnos(dbenv, dtabp, dtabsizep)$/ -__txn_init_print ../txn/txn_auto.c /^__txn_init_print(dbenv, dtabp, dtabsizep)$/ +__txn_init_print ../txn/txn_autop.c /^__txn_init_print(dbenv, dtabp, dtabsizep)$/ __txn_init_recover ../txn/txn_auto.c /^__txn_init_recover(dbenv, dtabp, dtabsizep)$/ __txn_isvalid ../txn/txn.c /^__txn_isvalid(txnp, tdp, op)$/ __txn_lockevent ../txn/txn_util.c /^__txn_lockevent(dbenv, txn, dbp, lock, locker)$/ __txn_map_gid ../txn/txn_recover.c /^__txn_map_gid(dbenv, gid, tdp, offp)$/ __txn_open ../txn/txn_region.c /^__txn_open(dbenv)$/ +__txn_openfiles ../txn/txn_recover.c /^__txn_openfiles(dbenv, min, force)$/ __txn_preclose ../txn/txn.c /^__txn_preclose(dbenv)$/ __txn_prepare ../txn/txn.c /^__txn_prepare(txnp, gid)$/ __txn_prepare_proc ../rpc_server/c/db_server_proc.c /^__txn_prepare_proc(txnpcl_id, gid, replyp)$/ +__txn_print_all ../txn/txn_stat.c /^__txn_print_all(dbenv, flags)$/ +__txn_print_stats ../txn/txn_stat.c /^__txn_print_stats(dbenv, flags)$/ __txn_recover ../txn/txn_recover.c /^__txn_recover(dbenv, preplist, count, retp, flags)/ __txn_recover_pp ../txn/txn_recover.c /^__txn_recover_pp(dbenv, preplist, count, retp, fla/ -__txn_recover_proc ../rpc_server/c/db_server_proc.c /^__txn_recover_proc(dbenvcl_id, count,$/ -__txn_recycle_getpgnos ../txn/txn_auto.c /^__txn_recycle_getpgnos(dbenv, rec, lsnp, notused1,/ +__txn_recover_proc ../rpc_server/c/db_server_proc.c /^__txn_recover_proc(dbenvcl_id, count, flags, reply/ __txn_recycle_log ../txn/txn_auto.c /^__txn_recycle_log(dbenv, txnid, ret_lsnp, flags,$/ -__txn_recycle_print ../txn/txn_auto.c /^__txn_recycle_print(dbenv, dbtp, lsnp, notused2, n/ +__txn_recycle_print ../txn/txn_autop.c /^__txn_recycle_print(dbenv, dbtp, lsnp, notused2, n/ __txn_recycle_read ../txn/txn_auto.c /^__txn_recycle_read(dbenv, recbuf, argpp)$/ __txn_recycle_recover ../txn/txn_rec.c /^__txn_recycle_recover(dbenv, dbtp, lsnp, op, info)/ __txn_region_destroy ../txn/txn_region.c /^__txn_region_destroy(dbenv, infop)$/ __txn_region_size ../txn/txn_region.c /^__txn_region_size(dbenv)$/ -__txn_regop_getpgnos ../txn/txn_auto.c /^__txn_regop_getpgnos(dbenv, rec, lsnp, notused1, s/ __txn_regop_log ../txn/txn_auto.c /^__txn_regop_log(dbenv, txnid, ret_lsnp, flags,$/ -__txn_regop_print ../txn/txn_auto.c /^__txn_regop_print(dbenv, dbtp, lsnp, notused2, not/ +__txn_regop_print ../txn/txn_autop.c /^__txn_regop_print(dbenv, dbtp, lsnp, notused2, not/ __txn_regop_read ../txn/txn_auto.c /^__txn_regop_read(dbenv, recbuf, argpp)$/ __txn_regop_recover ../txn/txn_rec.c /^__txn_regop_recover(dbenv, dbtp, lsnp, op, info)$/ __txn_remevent ../txn/txn_util.c /^__txn_remevent(dbenv, txn, name, fileid)$/ @@ -3711,19 +3969,22 @@ __txn_remlock ../txn/txn_util.c /^__txn_remlock(dbenv, txn, lock, locker)$/ __txn_remrem ../txn/txn_util.c /^__txn_remrem(dbenv, txn, name)$/ __txn_reset ../txn/txn.c /^__txn_reset(dbenv)$/ __txn_restore_txn ../txn/txn_rec.c /^__txn_restore_txn(dbenv, lsnp, argp)$/ +__txn_set_begin_lsnp ../txn/txn.c /^__txn_set_begin_lsnp(txn, rlsnp)$/ __txn_set_timeout ../txn/txn.c /^__txn_set_timeout(txnp, timeout, op)$/ __txn_set_tx_max ../txn/txn_method.c /^__txn_set_tx_max(dbenv, tx_max)$/ __txn_set_tx_timestamp ../txn/txn_method.c /^__txn_set_tx_timestamp(dbenv, timestamp)$/ __txn_stat ../txn/txn_stat.c /^__txn_stat(dbenv, statp, flags)$/ __txn_stat_pp ../txn/txn_stat.c /^__txn_stat_pp(dbenv, statp, flags)$/ +__txn_stat_print ../txn/txn_stat.c /^__txn_stat_print(dbenv, flags)$/ +__txn_stat_print_pp ../txn/txn_stat.c /^__txn_stat_print_pp(dbenv, flags)$/ __txn_undo ../txn/txn.c /^__txn_undo(txnp)$/ __txn_updateckp ../txn/txn.c /^__txn_updateckp(dbenv, lsnp)$/ __txn_xa_begin ../txn/txn.c /^__txn_xa_begin(dbenv, txn)$/ -__txn_xa_regop_getpgnos ../txn/txn_auto.c /^__txn_xa_regop_getpgnos(dbenv, rec, lsnp, notused1/ __txn_xa_regop_log ../txn/txn_auto.c /^__txn_xa_regop_log(dbenv, txnid, ret_lsnp, flags,$/ -__txn_xa_regop_print ../txn/txn_auto.c /^__txn_xa_regop_print(dbenv, dbtp, lsnp, notused2, / +__txn_xa_regop_print ../txn/txn_autop.c /^__txn_xa_regop_print(dbenv, dbtp, lsnp, notused2, / __txn_xa_regop_read ../txn/txn_auto.c /^__txn_xa_regop_read(dbenv, recbuf, argpp)$/ __txn_xa_regop_recover ../txn/txn_rec.c /^__txn_xa_regop_recover(dbenv, dbtp, lsnp, op, info/ +__txn_xid_stats ../txn/txn_stat.c /^__txn_xid_stats(dbenv, mbp, txnp)$/ __ua_memcpy ../os/os_alloc.c /^__ua_memcpy(dst, src, len)$/ __usermem ../log/log_archive.c /^__usermem(dbenv, listp)$/ __vx_fsync ../os/os_fsync.c /^__vx_fsync(fd)$/ @@ -3731,17 +3992,18 @@ __xa_close ../xa/xa_db.c /^__xa_close(dbp, flags)$/ __xa_cursor ../xa/xa_db.c /^__xa_cursor(dbp, txn, dbcp, flags)$/ __xa_del ../xa/xa_db.c /^__xa_del(dbp, txn, key, flags)$/ __xa_get ../xa/xa_db.c /^__xa_get(dbp, txn, key, data, flags)$/ -__xa_get_txn ../xa/xa.c /^__xa_get_txn(env, txnp, do_init)$/ +__xa_get_txn ../xa/xa.c /^__xa_get_txn(dbenv, txnp, do_init)$/ __xa_open ../xa/xa_db.c /^__xa_open(dbp, txn, name, subdb, type, flags, mode/ __xa_put ../xa/xa_db.c /^__xa_put(dbp, txn, key, data, flags)$/ -__xa_put_txn ../xa/xa.c /^__xa_put_txn(env, txnp)$/ +__xa_put_txn ../xa/xa.c /^__xa_put_txn(dbenv, txnp)$/ _app_dispatch_intercept_c ../cxx/cxx_env.cpp /^int _app_dispatch_intercept_c(DB_ENV *env, DBT *db/ _debug_check ../tcl/tcl_internal.c /^_debug_check()$/ -_exported ../dbinc/db_cxx.in 150 +_exported ../dbinc/db_cxx.in 132 _feedback_intercept_c ../cxx/cxx_env.cpp /^void _feedback_intercept_c(DB_ENV *env, int opcode/ _paniccall_intercept_c ../cxx/cxx_env.cpp /^void _paniccall_intercept_c(DB_ENV *env, int errva/ _rep_send_intercept_c ../cxx/cxx_env.cpp /^int _rep_send_intercept_c(DB_ENV *env, const DBT */ -_stream_error_function_c ../cxx/cxx_env.cpp /^void _stream_error_function_c(const char *prefix, / +_stream_error_function_c ../cxx/cxx_env.cpp /^void _stream_error_function_c(const DB_ENV *env,$/ +_stream_message_function_c ../cxx/cxx_env.cpp /^void _stream_message_function_c(const DB_ENV *env,/ add_home ../rpc_server/c/db_server_util.c /^add_home(home)$/ add_passwd ../rpc_server/c/db_server_util.c /^add_passwd(passwd)$/ bdb_DbOpen ../tcl/tcl_db_pkg.c /^bdb_DbOpen(interp, objc, objv, ip, dbp)$/ @@ -3753,14 +4015,16 @@ bdb_DbmCommand ../tcl/tcl_compat.c /^bdb_DbmCommand(interp, objc, objv, flag, db bdb_EnvOpen ../tcl/tcl_db_pkg.c /^bdb_EnvOpen(interp, objc, objv, ip, env)$/ bdb_HCommand ../tcl/tcl_compat.c /^bdb_HCommand(interp, objc, objv)$/ bdb_Handles ../tcl/tcl_db_pkg.c /^bdb_Handles(interp, objc, objv)$/ +bdb_MsgType ../tcl/tcl_db_pkg.c /^bdb_MsgType(interp, objc, objv)$/ bdb_NdbmOpen ../tcl/tcl_compat.c /^bdb_NdbmOpen(interp, objc, objv, dbpp)$/ bdb_RandCommand ../tcl/tcl_util.c /^bdb_RandCommand(interp, objc, objv)$/ +bdb_SeqOpen ../tcl/tcl_db_pkg.c /^bdb_SeqOpen(interp, objc, objv, ip, seqp)$/ bdb_Version ../tcl/tcl_db_pkg.c /^bdb_Version(interp, objc, objv)$/ berkdb_Cmd ../tcl/tcl_db_pkg.c /^berkdb_Cmd(notused, interp, objc, objv)$/ blk ../hmac/sha1.c /^#define blk(i) (block->l[i&15] = rol(block->l[(i+1/ blk0 ../hmac/sha1.c /^#define blk0(i) is_bigendian ? block->l[i] : \\$/ -bt_compare_fcn_type ../dbinc/db_cxx.in 177 -bt_prefix_fcn_type ../dbinc/db_cxx.in 179 +bt_compare_fcn_type ../dbinc/db_cxx.in 159 +bt_prefix_fcn_type ../dbinc/db_cxx.in 161 ca_recno_arg ../dbinc/btree.h 84 const ../dbinc/db_185.in 54 ct_anyp ../dbinc/db_server_int.h 126 @@ -3784,7 +4048,7 @@ db185_put ../db185/db185.c /^db185_put(db185p, key185, data185, flags)$/ db185_seq ../db185/db185.c /^db185_seq(db185p, key185, data185, flags)$/ db185_sync ../db185/db185.c /^db185_sync(db185p, flags)$/ db_Cmd ../tcl/tcl_db.c /^db_Cmd(clientData, interp, objc, objv)$/ -db_ca_mode ../dbinc/btree.h 315 +db_ca_mode ../dbinc/btree.h 316 db_create ../db/db_method.c /^db_create(dbpp, dbenv, flags)$/ db_env_create ../env/env_method.c /^db_env_create(dbenvpp, flags)$/ db_env_set_func_close ../os/os_method.c /^db_env_set_func_close(func_close)$/ @@ -3793,10 +4057,13 @@ db_env_set_func_dirlist ../os/os_method.c /^db_env_set_func_dirlist(func_dirlist db_env_set_func_exists ../os/os_method.c /^db_env_set_func_exists(func_exists)$/ db_env_set_func_free ../os/os_method.c /^db_env_set_func_free(func_free)$/ db_env_set_func_fsync ../os/os_method.c /^db_env_set_func_fsync(func_fsync)$/ +db_env_set_func_ftruncate ../os/os_method.c /^db_env_set_func_ftruncate(func_ftruncate)$/ db_env_set_func_ioinfo ../os/os_method.c /^db_env_set_func_ioinfo(func_ioinfo)$/ db_env_set_func_malloc ../os/os_method.c /^db_env_set_func_malloc(func_malloc)$/ db_env_set_func_map ../os/os_method.c /^db_env_set_func_map(func_map)$/ db_env_set_func_open ../os/os_method.c /^db_env_set_func_open(func_open)$/ +db_env_set_func_pread ../os/os_method.c /^db_env_set_func_pread(func_pread)$/ +db_env_set_func_pwrite ../os/os_method.c /^db_env_set_func_pwrite(func_pwrite)$/ db_env_set_func_read ../os/os_method.c /^db_env_set_func_read(func_read)$/ db_env_set_func_realloc ../os/os_method.c /^db_env_set_func_realloc(func_realloc)$/ db_env_set_func_rename ../os/os_method.c /^db_env_set_func_rename(func_rename)$/ @@ -3806,24 +4073,23 @@ db_env_set_func_unlink ../os/os_method.c /^db_env_set_func_unlink(func_unlink)$/ db_env_set_func_unmap ../os/os_method.c /^db_env_set_func_unmap(func_unmap)$/ db_env_set_func_write ../os/os_method.c /^db_env_set_func_write(func_write)$/ db_env_set_func_yield ../os/os_method.c /^db_env_set_func_yield(func_yield)$/ -db_errcall_fcn_type ../cxx/cxx_env.cpp 69 -db_free_fcn_type ../dbinc/db_cxx.in 175 +db_free_fcn_type ../dbinc/db_cxx.in 157 db_ham_mode ../dbinc/hash.h 142 -db_indx_t ../dbinc/db.in 78 +db_indx_t ../dbinc/db.in 106 db_limbo_state ../dbinc/db_dispatch.h 113 -db_lockmode_t ../dbinc/db.in 359 -db_lockop_t ../dbinc/db.in 376 -db_malloc_fcn_type ../dbinc/db_cxx.in 171 -db_pgno_t ../dbinc/db.in 77 -db_realloc_fcn_type ../dbinc/db_cxx.in 173 -db_recno_t ../dbinc/db.in 81 -db_recops ../dbinc/db.in 742 -db_ret_t ../libdb_java/db_java_wrap.c 1253 -db_rpc_serverprog_4002 ../rpc_server/c/db_server_svc.c /^db_rpc_serverprog_4002(rqstp, transp)$/ -db_status_t ../dbinc/db.in 393 +db_lockmode_t ../dbinc/db.in 413 +db_lockop_t ../dbinc/db.in 430 +db_malloc_fcn_type ../dbinc/db_cxx.in 153 +db_pgno_t ../dbinc/db.in 105 +db_realloc_fcn_type ../dbinc/db_cxx.in 155 +db_recno_t ../dbinc/db.in 109 +db_recops ../dbinc/db.in 806 +db_ret_t ../libdb_java/db_java_wrap.c 1724 +db_sequence_create ../sequence/sequence.c /^db_sequence_create(seqp, dbp, flags)$/ +db_status_t ../dbinc/db.in 446 db_strerror ../common/db_err.c /^db_strerror(error)$/ db_sync_op ../dbinc/mp.h 37 -db_timeout_t ../dbinc/db.in 84 +db_timeout_t ../dbinc/db.in 112 db_txnlist_type ../dbinc/db_dispatch.h 51 db_version ../env/env_open.c /^db_version(majverp, minverp, patchp)$/ dbc_Cmd ../tcl/tcl_dbcursor.c /^dbc_Cmd(clientData, interp, objc, objv)$/ @@ -3839,16 +4105,15 @@ dbm_open ../dbinc/db.in /^#define dbm_open(a, b, c) __db_ndbm_open@DB_VERSIO/ dbm_pagfno ../dbinc/db.in /^#define dbm_pagfno(a) __db_ndbm_pagfno@DB_VERSION/ dbm_rdonly ../dbinc/db.in /^#define dbm_rdonly(a) __db_ndbm_rdonly@DB_VERSION/ dbm_store ../dbinc/db.in /^#define dbm_store(a, b, c, d) \\$/ -dbmclose ../dbinc/db.in 1951 +dbmclose ../dbinc/db.in 2135 dbminit ../dbinc/db.in /^#define dbminit(a) __db_dbm_init@DB_VERSION_UNIQUE/ dbopen ../dbinc/db_185.in 167 delete ../dbinc/db.in /^#define delete(a) __db_dbm_delete@DB_VERSION_UNIQU/ -delete___db_lock_u ../libdb_java/db_java_wrap.c /^void delete___db_lock_u(struct __db_lock_u *self){/ -delete___db_lsn ../libdb_java/db_java_wrap.c /^void delete___db_lsn(struct __db_lsn *self){$/ -dirent ../clib/getcwd.c 50 +delete_DbLock ../libdb_java/db_java_wrap.c /^void delete_DbLock(struct DbLock *self){$/ +dirent ../clib/getcwd.c 48 dirfd ../clib/getcwd.c /^#define dirfd(dirp) ((dirp)->dd_fd)$/ dupString ../cxx/cxx_except.cpp /^static char *dupString(const char *s)$/ -dup_compare_fcn_type ../dbinc/db_cxx.in 181 +dup_compare_fcn_type ../dbinc/db_cxx.in 163 env_Cmd ../tcl/tcl_env.c /^env_Cmd(clientData, interp, objc, objv)$/ env_DbRemove ../tcl/tcl_env.c /^env_DbRemove(interp, objc, objv, dbenv)$/ env_DbRename ../tcl/tcl_env.c /^env_DbRename(interp, objc, objv, dbenv)$/ @@ -3860,15 +4125,15 @@ env_GetVerbose ../tcl/tcl_env.c /^env_GetVerbose(interp, objc, objv, dbenv)$/ env_recover ../rpc_server/c/db_server_util.c /^env_recover(progname)$/ exec_proc ../mutex/tm.c /^exec_proc(id, tmpath, typearg)$/ fetch ../dbinc/db.in /^#define fetch(a) __db_dbm_fetch@DB_VERSION_UNIQUE_/ -firstkey ../dbinc/db.in 1956 -fsync ../os/os_fsync.c /^#define fsync(fd) __vx_fsync(fd);$/ +firstkey ../dbinc/db.in 2140 +fsync ../os/os_fsync.c /^#define fsync(fd) __vx_fsync(fd)$/ get_fullhome ../rpc_server/c/db_server_util.c /^get_fullhome(name)$/ get_tableent ../rpc_server/c/db_server_util.c /^get_tableent(id)$/ getcwd ../clib/getcwd.c /^getcwd(pt, size)$/ getopt ../clib/getopt.c /^getopt(nargc, nargv, ostr)$/ -h_hash_fcn_type ../dbinc/db_cxx.in 183 +h_hash_fcn_type ../dbinc/db_cxx.in 165 hcreate ../dbinc/db.in /^#define hcreate(a) __db_hcreate@DB_VERSION_UNIQUE_/ -hdestroy ../dbinc/db.in 1973 +hdestroy ../dbinc/db.in 2157 home_entry ../dbinc/db_server_int.h 40 hsearch ../dbinc/db.in /^#define hsearch(a, b) __db_hsearch@DB_VERSION_UNIQ/ i_anyp ../dbinc/tcl_db.h 123 @@ -3894,53 +4159,58 @@ i_pgno ../dbinc/tcl_db.h 135 i_pgsz ../dbinc/tcl_db.h 138 i_txnp ../dbinc/tcl_db.h 128 indx_t ../dbinc/db_185.in 82 -int_bool ../libdb_java/db_java_wrap.c 1254 +int_bool ../libdb_java/db_java_wrap.c 1725 item ../hsearch/hsearch.c /^ ENTRY item;$/ lock_Cmd ../tcl/tcl_lock.c /^lock_Cmd(clientData, interp, objc, objv)$/ log_compare ../log/log_compare.c /^log_compare(lsn0, lsn1)$/ logc_Cmd ../tcl/tcl_log.c /^logc_Cmd(clientData, interp, objc, objv)$/ -logfile_validity ../dbinc/log.h 288 -m ../dbinc/tcl_db.h 41 +logfile_validity ../dbinc/log.h 376 +m ../dbinc/tcl_db.h 42 map_file ../mutex/tm.c /^map_file(gm_addrp, tm_addrp, lm_addrp, fdp)$/ memcmp ../clib/memcmp.c /^memcmp(s1, s2, n)$/ memcpy ../clib/memmove.c /^memcpy(dst0, src0, length)$/ mp_Cmd ../tcl/tcl_mp.c /^mp_Cmd(clientData, interp, objc, objv)$/ -mu_action ../dbinc/db_int.in 313 +mu_action ../dbinc/db_int.in 388 mutex_Cmd ../tcl/tcl_util.c /^mutex_Cmd(clientData, interp, objc, objv)$/ ndbm_Cmd ../tcl/tcl_compat.c /^ndbm_Cmd(clientData, interp, objc, objv)$/ -new___db ../libdb_java/db_java_wrap.c /^struct __db *new___db(DB_ENV *dbenv,u_int32_t flag/ -new___db_env ../libdb_java/db_java_wrap.c /^struct __db_env *new___db_env(u_int32_t flags){$/ -new___db_lsn ../libdb_java/db_java_wrap.c /^struct __db_lsn *new___db_lsn(u_int32_t file,u_int/ +new_Db ../libdb_java/db_java_wrap.c /^struct Db *new_Db(DB_ENV *dbenv,u_int32_t flags){$/ +new_DbEnv ../libdb_java/db_java_wrap.c /^struct DbEnv *new_DbEnv(u_int32_t flags){$/ +new_DbSequence ../libdb_java/db_java_wrap.c /^struct DbSequence *new_DbSequence(DB *db,u_int32_t/ new_ct_ent ../rpc_server/c/db_server_util.c /^new_ct_ent(errp)$/ nextkey ../dbinc/db.in /^#define nextkey(a) __db_dbm_nextkey@DB_VERSION_UNI/ onint ../common/util_sig.c /^onint(signo)$/ pg_Cmd ../tcl/tcl_mp.c /^pg_Cmd(clientData, interp, objc, objv)$/ -pgin_fcn_type ../dbinc/db_cxx.in 185 +pgin_fcn_type ../dbinc/db_cxx.in 167 pgno_t ../dbinc/db_185.in 76 -pgout_fcn_type ../dbinc/db_cxx.in 187 +pgout_fcn_type ../dbinc/db_cxx.in 169 +pthread_cond_destroy ../mutex/mut_pthread.c /^#define pthread_cond_destroy(x) 0$/ pthread_cond_signal ../mutex/mut_pthread.c 33 pthread_cond_wait ../mutex/mut_pthread.c 34 pthread_mutex_destroy ../mutex/mut_pthread.c /^#define pthread_mutex_destroy(x) 0$/ -pthread_mutex_lock ../mutex/mut_pthread.c 35 -pthread_mutex_trylock ../mutex/mut_pthread.c 36 -pthread_mutex_unlock ../mutex/mut_pthread.c 37 -pthread_self ../mutex/mut_pthread.c 51 +pthread_mutex_lock ../mutex/mut_pthread.c 36 +pthread_mutex_trylock ../mutex/mut_pthread.c 37 +pthread_mutex_unlock ../mutex/mut_pthread.c 38 +pthread_self ../mutex/mut_pthread.c 54 qam_name_op ../dbinc/qam.h 166 qam_position_mode ../dbinc/qam.h 151 qam_probe_mode ../dbinc/qam.h 157 raise ../clib/raise.c /^raise(s)$/ recno_t ../dbinc/db_185.in 84 -reg_type ../dbinc/region.h 117 +reg_type_t ../dbinc/region.h 117 +repdb_t ../dbinc/rep.h 98 retval ../hsearch/hsearch.c /^static ENTRY retval;$/ -roff_t ../dbinc/db.in 91 +roff_t ../dbinc/db.in 121 rol ../hmac/sha1.c /^#define rol(value, bits) (((value) << (bits)) | ((/ run_locker ../mutex/tm.c /^run_locker(id)$/ run_lthread ../mutex/tm.c /^run_lthread(arg)$/ run_wakeup ../mutex/tm.c /^run_wakeup(id)$/ run_wthread ../mutex/tm.c /^run_wthread(arg)$/ +seq_Cmd ../tcl/tcl_seq.c /^seq_Cmd(clientData, interp, objc, objv)$/ shm_open ../mutex/tm.c 25 shm_unlink ../mutex/tm.c 26 snprintf ../clib/snprintf.c /^snprintf(char *str, size_t n, const char *fmt, .../ +sprintf_overflow ../clib/snprintf.c /^sprintf_overflow()$/ +sprintf_retcharpnt ../clib/snprintf.c /^sprintf_retcharpnt()$/ store ../dbinc/db.in /^#define store(a, b) __db_dbm_store@DB_VERSION_UNIQ/ strcasecmp ../clib/strcasecmp.c /^strcasecmp(s1, s2)$/ strdup ../clib/strdup.c /^strdup(str)$/ @@ -3966,6 +4236,8 @@ tcl_DbcPut ../tcl/tcl_dbcursor.c /^tcl_DbcPut(interp, objc, objv, dbc)$/ tcl_EnvAttr ../tcl/tcl_env.c /^tcl_EnvAttr(interp, objc, objv, dbenv)$/ tcl_EnvGetEncryptFlags ../tcl/tcl_env.c /^tcl_EnvGetEncryptFlags(interp, objc, objv, dbenv)$/ tcl_EnvRemove ../tcl/tcl_env.c /^tcl_EnvRemove(interp, objc, objv, dbenv, envip)$/ +tcl_EnvSetErrfile ../tcl/tcl_env.c /^tcl_EnvSetErrfile(interp, dbenv, ip, errf)$/ +tcl_EnvSetErrpfx ../tcl/tcl_env.c /^tcl_EnvSetErrpfx(interp, dbenv, ip, pfx)$/ tcl_EnvSetFlags ../tcl/tcl_env.c /^tcl_EnvSetFlags(interp, dbenv, which, onoff)$/ tcl_EnvTest ../tcl/tcl_env.c /^tcl_EnvTest(interp, objc, objv, dbenv)$/ tcl_EnvVerbose ../tcl/tcl_env.c /^tcl_EnvVerbose(interp, dbenv, which, onoff)$/ @@ -3998,6 +4270,11 @@ tcl_RepProcessMessage ../tcl/tcl_rep.c /^tcl_RepProcessMessage(interp, objc, obj tcl_RepRequest ../tcl/tcl_rep.c /^tcl_RepRequest(interp, objc, objv, dbenv)$/ tcl_RepStart ../tcl/tcl_rep.c /^tcl_RepStart(interp, objc, objv, dbenv)$/ tcl_RepStat ../tcl/tcl_rep.c /^tcl_RepStat(interp, objc, objv, dbenv)$/ +tcl_SeqClose ../tcl/tcl_seq.c /^tcl_SeqClose(interp, objc, objv, seq, ip)$/ +tcl_SeqGet ../tcl/tcl_seq.c /^tcl_SeqGet(interp, objc, objv, seq)$/ +tcl_SeqGetFlags ../tcl/tcl_seq.c /^tcl_SeqGetFlags(interp, objc, objv, seq)$/ +tcl_SeqRemove ../tcl/tcl_seq.c /^tcl_SeqRemove(interp, objc, objv, seq, ip)$/ +tcl_SeqStat ../tcl/tcl_seq.c /^tcl_SeqStat(interp, objc, objv, seq)$/ tcl_Txn ../tcl/tcl_txn.c /^tcl_Txn(interp, objc, objv, envp, envip)$/ tcl_TxnCheckpoint ../tcl/tcl_txn.c /^tcl_TxnCheckpoint(interp, objc, objv, envp)$/ tcl_TxnCommit ../tcl/tcl_txn.c /^tcl_TxnCommit(interp, objc, objv, txnp, txnip)$/ @@ -4010,7 +4287,6 @@ tcl_db_free ../tcl/tcl_db_pkg.c /^tcl_db_free(ptr)$/ tcl_db_malloc ../tcl/tcl_db_pkg.c /^tcl_db_malloc(size)$/ tcl_db_realloc ../tcl/tcl_db_pkg.c /^tcl_db_realloc(ptr, size)$/ tcl_dup_compare ../tcl/tcl_db_pkg.c /^tcl_dup_compare(dbp, dbta, dbtb)$/ -tcl_flag_callback ../tcl/tcl_internal.c /^tcl_flag_callback(flags, fn, vtcbp)$/ tcl_h_hash ../tcl/tcl_db_pkg.c /^tcl_h_hash(dbp, buf, len)$/ tcl_rep_send ../tcl/tcl_db_pkg.c /^tcl_rep_send(dbenv, control, rec, lsnp, eid, flags/ tcl_second_call ../tcl/tcl_db.c /^tcl_second_call(dbp, pkey, data, skey)$/ @@ -4018,154 +4294,17 @@ tm_file_init ../mutex/tm.c /^tm_file_init()$/ tm_mutex_destroy ../mutex/tm.c /^tm_mutex_destroy()$/ tm_mutex_init ../mutex/tm.c /^tm_mutex_init()$/ tm_mutex_stats ../mutex/tm.c /^tm_mutex_stats()$/ -tmpString::tmpString ../cxx/cxx_except.cpp /^tmpString::tmpString(const char *str1,$/ tsl_t ../dbinc/mutex.h 79 txn_Cmd ../tcl/tcl_txn.c /^txn_Cmd(clientData, interp, objc, objv)$/ -txnop_t ../txn/txn.c 98 +txnop_t ../txn/txn.c 96 u16 ../crypto/rijndael/rijndael-alg-fst.h 37 u32 ../crypto/rijndael/rijndael-alg-fst.h 38 u8 ../crypto/rijndael/rijndael-alg-fst.h 36 unmap_file ../mutex/tm.c /^unmap_file(addr, fd)$/ usage ../mutex/tm.c /^usage()$/ -val ../dbinc/tcl_db.h 42 +val ../dbinc/tcl_db.h 43 version_check ../rpc_server/c/db_server_util.c /^version_check()$/ -vsnprintf ../clib/vsnprintf.c /^vsnprintf(str, n, fmt, ap)$/ -wmask ../clib/memmove.c 55 -word ../clib/memmove.c 50 -wsize ../clib/memmove.c 53 -xdr___db_associate_msg ../rpc_server/c/db_server_xdr.c /^xdr___db_associate_msg(xdrs, objp)$/ -xdr___db_associate_reply ../rpc_server/c/db_server_xdr.c /^xdr___db_associate_reply(xdrs, objp)$/ -xdr___db_bt_maxkey_msg ../rpc_server/c/db_server_xdr.c /^xdr___db_bt_maxkey_msg(xdrs, objp)$/ -xdr___db_bt_maxkey_reply ../rpc_server/c/db_server_xdr.c /^xdr___db_bt_maxkey_reply(xdrs, objp)$/ -xdr___db_bt_minkey_msg ../rpc_server/c/db_server_xdr.c /^xdr___db_bt_minkey_msg(xdrs, objp)$/ -xdr___db_bt_minkey_reply ../rpc_server/c/db_server_xdr.c /^xdr___db_bt_minkey_reply(xdrs, objp)$/ -xdr___db_close_msg ../rpc_server/c/db_server_xdr.c /^xdr___db_close_msg(xdrs, objp)$/ -xdr___db_close_reply ../rpc_server/c/db_server_xdr.c /^xdr___db_close_reply(xdrs, objp)$/ -xdr___db_create_msg ../rpc_server/c/db_server_xdr.c /^xdr___db_create_msg(xdrs, objp)$/ -xdr___db_create_reply ../rpc_server/c/db_server_xdr.c /^xdr___db_create_reply(xdrs, objp)$/ -xdr___db_cursor_msg ../rpc_server/c/db_server_xdr.c /^xdr___db_cursor_msg(xdrs, objp)$/ -xdr___db_cursor_reply ../rpc_server/c/db_server_xdr.c /^xdr___db_cursor_reply(xdrs, objp)$/ -xdr___db_del_msg ../rpc_server/c/db_server_xdr.c /^xdr___db_del_msg(xdrs, objp)$/ -xdr___db_del_reply ../rpc_server/c/db_server_xdr.c /^xdr___db_del_reply(xdrs, objp)$/ -xdr___db_encrypt_msg ../rpc_server/c/db_server_xdr.c /^xdr___db_encrypt_msg(xdrs, objp)$/ -xdr___db_encrypt_reply ../rpc_server/c/db_server_xdr.c /^xdr___db_encrypt_reply(xdrs, objp)$/ -xdr___db_extentsize_msg ../rpc_server/c/db_server_xdr.c /^xdr___db_extentsize_msg(xdrs, objp)$/ -xdr___db_extentsize_reply ../rpc_server/c/db_server_xdr.c /^xdr___db_extentsize_reply(xdrs, objp)$/ -xdr___db_flags_msg ../rpc_server/c/db_server_xdr.c /^xdr___db_flags_msg(xdrs, objp)$/ -xdr___db_flags_reply ../rpc_server/c/db_server_xdr.c /^xdr___db_flags_reply(xdrs, objp)$/ -xdr___db_get_bt_minkey_msg ../rpc_server/c/db_server_xdr.c /^xdr___db_get_bt_minkey_msg(xdrs, objp)$/ -xdr___db_get_bt_minkey_reply ../rpc_server/c/db_server_xdr.c /^xdr___db_get_bt_minkey_reply(xdrs, objp)$/ -xdr___db_get_encrypt_flags_msg ../rpc_server/c/db_server_xdr.c /^xdr___db_get_encrypt_flags_msg(xdrs, objp)$/ -xdr___db_get_encrypt_flags_reply ../rpc_server/c/db_server_xdr.c /^xdr___db_get_encrypt_flags_reply(xdrs, objp)$/ -xdr___db_get_extentsize_msg ../rpc_server/c/db_server_xdr.c /^xdr___db_get_extentsize_msg(xdrs, objp)$/ -xdr___db_get_extentsize_reply ../rpc_server/c/db_server_xdr.c /^xdr___db_get_extentsize_reply(xdrs, objp)$/ -xdr___db_get_flags_msg ../rpc_server/c/db_server_xdr.c /^xdr___db_get_flags_msg(xdrs, objp)$/ -xdr___db_get_flags_reply ../rpc_server/c/db_server_xdr.c /^xdr___db_get_flags_reply(xdrs, objp)$/ -xdr___db_get_h_ffactor_msg ../rpc_server/c/db_server_xdr.c /^xdr___db_get_h_ffactor_msg(xdrs, objp)$/ -xdr___db_get_h_ffactor_reply ../rpc_server/c/db_server_xdr.c /^xdr___db_get_h_ffactor_reply(xdrs, objp)$/ -xdr___db_get_h_nelem_msg ../rpc_server/c/db_server_xdr.c /^xdr___db_get_h_nelem_msg(xdrs, objp)$/ -xdr___db_get_h_nelem_reply ../rpc_server/c/db_server_xdr.c /^xdr___db_get_h_nelem_reply(xdrs, objp)$/ -xdr___db_get_lorder_msg ../rpc_server/c/db_server_xdr.c /^xdr___db_get_lorder_msg(xdrs, objp)$/ -xdr___db_get_lorder_reply ../rpc_server/c/db_server_xdr.c /^xdr___db_get_lorder_reply(xdrs, objp)$/ -xdr___db_get_msg ../rpc_server/c/db_server_xdr.c /^xdr___db_get_msg(xdrs, objp)$/ -xdr___db_get_name_msg ../rpc_server/c/db_server_xdr.c /^xdr___db_get_name_msg(xdrs, objp)$/ -xdr___db_get_name_reply ../rpc_server/c/db_server_xdr.c /^xdr___db_get_name_reply(xdrs, objp)$/ -xdr___db_get_open_flags_msg ../rpc_server/c/db_server_xdr.c /^xdr___db_get_open_flags_msg(xdrs, objp)$/ -xdr___db_get_open_flags_reply ../rpc_server/c/db_server_xdr.c /^xdr___db_get_open_flags_reply(xdrs, objp)$/ -xdr___db_get_pagesize_msg ../rpc_server/c/db_server_xdr.c /^xdr___db_get_pagesize_msg(xdrs, objp)$/ -xdr___db_get_pagesize_reply ../rpc_server/c/db_server_xdr.c /^xdr___db_get_pagesize_reply(xdrs, objp)$/ -xdr___db_get_re_delim_msg ../rpc_server/c/db_server_xdr.c /^xdr___db_get_re_delim_msg(xdrs, objp)$/ -xdr___db_get_re_delim_reply ../rpc_server/c/db_server_xdr.c /^xdr___db_get_re_delim_reply(xdrs, objp)$/ -xdr___db_get_re_len_msg ../rpc_server/c/db_server_xdr.c /^xdr___db_get_re_len_msg(xdrs, objp)$/ -xdr___db_get_re_len_reply ../rpc_server/c/db_server_xdr.c /^xdr___db_get_re_len_reply(xdrs, objp)$/ -xdr___db_get_re_pad_msg ../rpc_server/c/db_server_xdr.c /^xdr___db_get_re_pad_msg(xdrs, objp)$/ -xdr___db_get_re_pad_reply ../rpc_server/c/db_server_xdr.c /^xdr___db_get_re_pad_reply(xdrs, objp)$/ -xdr___db_get_reply ../rpc_server/c/db_server_xdr.c /^xdr___db_get_reply(xdrs, objp)$/ -xdr___db_h_ffactor_msg ../rpc_server/c/db_server_xdr.c /^xdr___db_h_ffactor_msg(xdrs, objp)$/ -xdr___db_h_ffactor_reply ../rpc_server/c/db_server_xdr.c /^xdr___db_h_ffactor_reply(xdrs, objp)$/ -xdr___db_h_nelem_msg ../rpc_server/c/db_server_xdr.c /^xdr___db_h_nelem_msg(xdrs, objp)$/ -xdr___db_h_nelem_reply ../rpc_server/c/db_server_xdr.c /^xdr___db_h_nelem_reply(xdrs, objp)$/ -xdr___db_join_msg ../rpc_server/c/db_server_xdr.c /^xdr___db_join_msg(xdrs, objp)$/ -xdr___db_join_reply ../rpc_server/c/db_server_xdr.c /^xdr___db_join_reply(xdrs, objp)$/ -xdr___db_key_range_msg ../rpc_server/c/db_server_xdr.c /^xdr___db_key_range_msg(xdrs, objp)$/ -xdr___db_key_range_reply ../rpc_server/c/db_server_xdr.c /^xdr___db_key_range_reply(xdrs, objp)$/ -xdr___db_lorder_msg ../rpc_server/c/db_server_xdr.c /^xdr___db_lorder_msg(xdrs, objp)$/ -xdr___db_lorder_reply ../rpc_server/c/db_server_xdr.c /^xdr___db_lorder_reply(xdrs, objp)$/ -xdr___db_open_msg ../rpc_server/c/db_server_xdr.c /^xdr___db_open_msg(xdrs, objp)$/ -xdr___db_open_reply ../rpc_server/c/db_server_xdr.c /^xdr___db_open_reply(xdrs, objp)$/ -xdr___db_pagesize_msg ../rpc_server/c/db_server_xdr.c /^xdr___db_pagesize_msg(xdrs, objp)$/ -xdr___db_pagesize_reply ../rpc_server/c/db_server_xdr.c /^xdr___db_pagesize_reply(xdrs, objp)$/ -xdr___db_pget_msg ../rpc_server/c/db_server_xdr.c /^xdr___db_pget_msg(xdrs, objp)$/ -xdr___db_pget_reply ../rpc_server/c/db_server_xdr.c /^xdr___db_pget_reply(xdrs, objp)$/ -xdr___db_put_msg ../rpc_server/c/db_server_xdr.c /^xdr___db_put_msg(xdrs, objp)$/ -xdr___db_put_reply ../rpc_server/c/db_server_xdr.c /^xdr___db_put_reply(xdrs, objp)$/ -xdr___db_re_delim_msg ../rpc_server/c/db_server_xdr.c /^xdr___db_re_delim_msg(xdrs, objp)$/ -xdr___db_re_delim_reply ../rpc_server/c/db_server_xdr.c /^xdr___db_re_delim_reply(xdrs, objp)$/ -xdr___db_re_len_msg ../rpc_server/c/db_server_xdr.c /^xdr___db_re_len_msg(xdrs, objp)$/ -xdr___db_re_len_reply ../rpc_server/c/db_server_xdr.c /^xdr___db_re_len_reply(xdrs, objp)$/ -xdr___db_re_pad_msg ../rpc_server/c/db_server_xdr.c /^xdr___db_re_pad_msg(xdrs, objp)$/ -xdr___db_re_pad_reply ../rpc_server/c/db_server_xdr.c /^xdr___db_re_pad_reply(xdrs, objp)$/ -xdr___db_remove_msg ../rpc_server/c/db_server_xdr.c /^xdr___db_remove_msg(xdrs, objp)$/ -xdr___db_remove_reply ../rpc_server/c/db_server_xdr.c /^xdr___db_remove_reply(xdrs, objp)$/ -xdr___db_rename_msg ../rpc_server/c/db_server_xdr.c /^xdr___db_rename_msg(xdrs, objp)$/ -xdr___db_rename_reply ../rpc_server/c/db_server_xdr.c /^xdr___db_rename_reply(xdrs, objp)$/ -xdr___db_stat_msg ../rpc_server/c/db_server_xdr.c /^xdr___db_stat_msg(xdrs, objp)$/ -xdr___db_stat_reply ../rpc_server/c/db_server_xdr.c /^xdr___db_stat_reply(xdrs, objp)$/ -xdr___db_sync_msg ../rpc_server/c/db_server_xdr.c /^xdr___db_sync_msg(xdrs, objp)$/ -xdr___db_sync_reply ../rpc_server/c/db_server_xdr.c /^xdr___db_sync_reply(xdrs, objp)$/ -xdr___db_truncate_msg ../rpc_server/c/db_server_xdr.c /^xdr___db_truncate_msg(xdrs, objp)$/ -xdr___db_truncate_reply ../rpc_server/c/db_server_xdr.c /^xdr___db_truncate_reply(xdrs, objp)$/ -xdr___dbc_close_msg ../rpc_server/c/db_server_xdr.c /^xdr___dbc_close_msg(xdrs, objp)$/ -xdr___dbc_close_reply ../rpc_server/c/db_server_xdr.c /^xdr___dbc_close_reply(xdrs, objp)$/ -xdr___dbc_count_msg ../rpc_server/c/db_server_xdr.c /^xdr___dbc_count_msg(xdrs, objp)$/ -xdr___dbc_count_reply ../rpc_server/c/db_server_xdr.c /^xdr___dbc_count_reply(xdrs, objp)$/ -xdr___dbc_del_msg ../rpc_server/c/db_server_xdr.c /^xdr___dbc_del_msg(xdrs, objp)$/ -xdr___dbc_del_reply ../rpc_server/c/db_server_xdr.c /^xdr___dbc_del_reply(xdrs, objp)$/ -xdr___dbc_dup_msg ../rpc_server/c/db_server_xdr.c /^xdr___dbc_dup_msg(xdrs, objp)$/ -xdr___dbc_dup_reply ../rpc_server/c/db_server_xdr.c /^xdr___dbc_dup_reply(xdrs, objp)$/ -xdr___dbc_get_msg ../rpc_server/c/db_server_xdr.c /^xdr___dbc_get_msg(xdrs, objp)$/ -xdr___dbc_get_reply ../rpc_server/c/db_server_xdr.c /^xdr___dbc_get_reply(xdrs, objp)$/ -xdr___dbc_pget_msg ../rpc_server/c/db_server_xdr.c /^xdr___dbc_pget_msg(xdrs, objp)$/ -xdr___dbc_pget_reply ../rpc_server/c/db_server_xdr.c /^xdr___dbc_pget_reply(xdrs, objp)$/ -xdr___dbc_put_msg ../rpc_server/c/db_server_xdr.c /^xdr___dbc_put_msg(xdrs, objp)$/ -xdr___dbc_put_reply ../rpc_server/c/db_server_xdr.c /^xdr___dbc_put_reply(xdrs, objp)$/ -xdr___env_cachesize_msg ../rpc_server/c/db_server_xdr.c /^xdr___env_cachesize_msg(xdrs, objp)$/ -xdr___env_cachesize_reply ../rpc_server/c/db_server_xdr.c /^xdr___env_cachesize_reply(xdrs, objp)$/ -xdr___env_close_msg ../rpc_server/c/db_server_xdr.c /^xdr___env_close_msg(xdrs, objp)$/ -xdr___env_close_reply ../rpc_server/c/db_server_xdr.c /^xdr___env_close_reply(xdrs, objp)$/ -xdr___env_create_msg ../rpc_server/c/db_server_xdr.c /^xdr___env_create_msg(xdrs, objp)$/ -xdr___env_create_reply ../rpc_server/c/db_server_xdr.c /^xdr___env_create_reply(xdrs, objp)$/ -xdr___env_dbremove_msg ../rpc_server/c/db_server_xdr.c /^xdr___env_dbremove_msg(xdrs, objp)$/ -xdr___env_dbremove_reply ../rpc_server/c/db_server_xdr.c /^xdr___env_dbremove_reply(xdrs, objp)$/ -xdr___env_dbrename_msg ../rpc_server/c/db_server_xdr.c /^xdr___env_dbrename_msg(xdrs, objp)$/ -xdr___env_dbrename_reply ../rpc_server/c/db_server_xdr.c /^xdr___env_dbrename_reply(xdrs, objp)$/ -xdr___env_encrypt_msg ../rpc_server/c/db_server_xdr.c /^xdr___env_encrypt_msg(xdrs, objp)$/ -xdr___env_encrypt_reply ../rpc_server/c/db_server_xdr.c /^xdr___env_encrypt_reply(xdrs, objp)$/ -xdr___env_flags_msg ../rpc_server/c/db_server_xdr.c /^xdr___env_flags_msg(xdrs, objp)$/ -xdr___env_flags_reply ../rpc_server/c/db_server_xdr.c /^xdr___env_flags_reply(xdrs, objp)$/ -xdr___env_get_cachesize_msg ../rpc_server/c/db_server_xdr.c /^xdr___env_get_cachesize_msg(xdrs, objp)$/ -xdr___env_get_cachesize_reply ../rpc_server/c/db_server_xdr.c /^xdr___env_get_cachesize_reply(xdrs, objp)$/ -xdr___env_get_encrypt_flags_msg ../rpc_server/c/db_server_xdr.c /^xdr___env_get_encrypt_flags_msg(xdrs, objp)$/ -xdr___env_get_encrypt_flags_reply ../rpc_server/c/db_server_xdr.c /^xdr___env_get_encrypt_flags_reply(xdrs, objp)$/ -xdr___env_get_flags_msg ../rpc_server/c/db_server_xdr.c /^xdr___env_get_flags_msg(xdrs, objp)$/ -xdr___env_get_flags_reply ../rpc_server/c/db_server_xdr.c /^xdr___env_get_flags_reply(xdrs, objp)$/ -xdr___env_get_home_msg ../rpc_server/c/db_server_xdr.c /^xdr___env_get_home_msg(xdrs, objp)$/ -xdr___env_get_home_reply ../rpc_server/c/db_server_xdr.c /^xdr___env_get_home_reply(xdrs, objp)$/ -xdr___env_get_open_flags_msg ../rpc_server/c/db_server_xdr.c /^xdr___env_get_open_flags_msg(xdrs, objp)$/ -xdr___env_get_open_flags_reply ../rpc_server/c/db_server_xdr.c /^xdr___env_get_open_flags_reply(xdrs, objp)$/ -xdr___env_open_msg ../rpc_server/c/db_server_xdr.c /^xdr___env_open_msg(xdrs, objp)$/ -xdr___env_open_reply ../rpc_server/c/db_server_xdr.c /^xdr___env_open_reply(xdrs, objp)$/ -xdr___env_remove_msg ../rpc_server/c/db_server_xdr.c /^xdr___env_remove_msg(xdrs, objp)$/ -xdr___env_remove_reply ../rpc_server/c/db_server_xdr.c /^xdr___env_remove_reply(xdrs, objp)$/ -xdr___txn_abort_msg ../rpc_server/c/db_server_xdr.c /^xdr___txn_abort_msg(xdrs, objp)$/ -xdr___txn_abort_reply ../rpc_server/c/db_server_xdr.c /^xdr___txn_abort_reply(xdrs, objp)$/ -xdr___txn_begin_msg ../rpc_server/c/db_server_xdr.c /^xdr___txn_begin_msg(xdrs, objp)$/ -xdr___txn_begin_reply ../rpc_server/c/db_server_xdr.c /^xdr___txn_begin_reply(xdrs, objp)$/ -xdr___txn_commit_msg ../rpc_server/c/db_server_xdr.c /^xdr___txn_commit_msg(xdrs, objp)$/ -xdr___txn_commit_reply ../rpc_server/c/db_server_xdr.c /^xdr___txn_commit_reply(xdrs, objp)$/ -xdr___txn_discard_msg ../rpc_server/c/db_server_xdr.c /^xdr___txn_discard_msg(xdrs, objp)$/ -xdr___txn_discard_reply ../rpc_server/c/db_server_xdr.c /^xdr___txn_discard_reply(xdrs, objp)$/ -xdr___txn_prepare_msg ../rpc_server/c/db_server_xdr.c /^xdr___txn_prepare_msg(xdrs, objp)$/ -xdr___txn_prepare_reply ../rpc_server/c/db_server_xdr.c /^xdr___txn_prepare_reply(xdrs, objp)$/ -xdr___txn_recover_msg ../rpc_server/c/db_server_xdr.c /^xdr___txn_recover_msg(xdrs, objp)$/ -xdr___txn_recover_reply ../rpc_server/c/db_server_xdr.c /^xdr___txn_recover_reply(xdrs, objp)$/ +vsnprintf ../clib/snprintf.c /^vsnprintf(str, n, fmt, ap)$/ +wmask ../clib/memmove.c 53 +word ../clib/memmove.c 48 +wsize ../clib/memmove.c 51 diff --git a/db/dist/template/db_server_proc b/db/dist/template/db_server_proc index 84fce4d2e..224c83684 100644 --- a/db/dist/template/db_server_proc +++ b/db/dist/template/db_server_proc @@ -1,4 +1,3 @@ -/* Do not edit: automatically built by gen_rpc.awk. */ #include "db_config.h" #ifndef NO_SYSTEM_INCLUDES @@ -9,10 +8,10 @@ #include <string.h> #endif +#include "db_server.h" + #include "db_int.h" -#include "dbinc_auto/db_server.h" #include "dbinc/db_server_int.h" -#include "dbinc_auto/rpc_server_ext.h" /* BEGIN __env_get_cachesize_proc */ void @@ -1442,8 +1441,10 @@ __db_rename_proc(dbpcl_id, name, subdb, /* BEGIN __db_stat_proc */ void -__db_stat_proc(dbpcl_id, flags, replyp, freep) +__db_stat_proc(dbpcl_id, txnpcl_id, + flags, replyp, freep) long dbpcl_id; + long txnpcl_id; u_int32_t flags; __db_stat_reply *replyp; int * freep; @@ -1452,9 +1453,13 @@ __db_stat_proc(dbpcl_id, flags, replyp, freep) int ret; DB * dbp; ct_entry *dbp_ctp; + DB_TXN * txnp; + ct_entry *txnp_ctp; ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB); dbp = (DB *)dbp_ctp->ct_anyp; + ACTIVATE_CTP(txnp_ctp, txnpcl_id, CT_TXN); + txnp = (DB_TXN *)txnp_ctp->ct_anyp; /* * XXX Code goes here diff --git a/db/dist/template/gen_client_ret b/db/dist/template/gen_client_ret index 340f99e0d..3d897e609 100644 --- a/db/dist/template/gen_client_ret +++ b/db/dist/template/gen_client_ret @@ -1,15 +1,12 @@ /* Do not edit: automatically built by gen_rpc.awk. */ #include "db_config.h" -#ifdef HAVE_RPC #ifndef NO_SYSTEM_INCLUDES #include <sys/types.h> -#include <rpc/rpc.h> #include <string.h> #endif #include "db_int.h" -#include "dbinc_auto/db_server.h" #include "dbinc/txn.h" /* @@ -338,14 +335,12 @@ __dbcl_db_open_ret(dbp, txnp, name, subdb, type, flags, mode, replyp) int ret; long db; DBTYPE type; - u_int32_t dbflags; int lorder; if (replyp->status != 0) return (replyp->status); db = replyp->dbcl_id; type = replyp->type; - dbflags = replyp->dbflags; lorder = replyp->lorder; /* @@ -464,12 +459,13 @@ __dbcl_db_rename_ret(dbp, name, subdb, newname, flags, replyp) } /* - * PUBLIC: int __dbcl_db_stat_ret __P((DB *, void *, u_int32_t, + * PUBLIC: int __dbcl_db_stat_ret __P((DB *, DB_TXN *, void *, u_int32_t, * PUBLIC: __db_stat_reply *)); */ int -__dbcl_db_stat_ret(dbp, sp, flags, replyp) +__dbcl_db_stat_ret(dbp, txnp, sp, flags, replyp) DB * dbp; + DB_TXN * txnp; void * sp; u_int32_t flags; __db_stat_reply *replyp; @@ -725,4 +721,3 @@ __dbcl_dbc_put_ret(dbc, key, data, flags, replyp) return (replyp->status); } -#endif /* HAVE_RPC */ diff --git a/db/dist/template/rec_btree b/db/dist/template/rec_btree index 6c954db1a..0b2c96182 100644 --- a/db/dist/template/rec_btree +++ b/db/dist/template/rec_btree @@ -7,319 +7,9 @@ #endif #include "db_int.h" -#include "db_page.h" -#include "bam.h" -#include "log.h" - -/* - * __bam_pg_alloc_recover -- - * Recovery function for pg_alloc. - * - * PUBLIC: int __bam_pg_alloc_recover - * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *)); - */ -int -__bam_pg_alloc_recover(dbenv, dbtp, lsnp, op, info) - DB_ENV *dbenv; - DBT *dbtp; - DB_LSN *lsnp; - db_recops op; - void *info; -{ - __bam_pg_alloc_args *argp; - DB *file_dbp; - DBC *dbc; - DB_MPOOLFILE *mpf; - PAGE *pagep; - int cmp_n, cmp_p, modified, ret; - - REC_PRINT(__bam_pg_alloc_print); - REC_INTRO(__bam_pg_alloc_read); - - if ((ret = memp_fget(mpf, &argp->pgno, 0, &pagep)) != 0) - if (DB_REDO(op)) { - if ((ret = memp_fget(mpf, - &argp->pgno, DB_MPOOL_CREATE, &pagep)) != 0) - goto out; - } else { - *lsnp = argp->prev_lsn; - ret = 0; - goto out; - } - - modified = 0; - cmp_n = log_compare(lsnp, &LSN(pagep)); - - /* - * Use this when there is something like "pagelsn" in the argp - * structure. Sometimes, you might need to compare meta-data - * lsn's instead. - * - * cmp_p = log_compare(&LSN(pagep), argp->pagelsn); - */ - if (cmp_p == 0 && DB_REDO(op)) { - /* Need to redo update described. */ - modified = 1; - } else if (cmp_n == 0 && !DB_REDO(op)) { - /* Need to undo update described. */ - modified = 1; - } - if (ret = memp_fput(mpf, pagep, modified ? DB_MPOOL_DIRTY : 0)) - goto out; - - *lsnp = argp->prev_lsn; - ret = 0; - -out: REC_CLOSE; -} - -/* - * __bam_pg_alloc1_recover -- - * Recovery function for pg_alloc1. - * - * PUBLIC: int __bam_pg_alloc1_recover - * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *)); - */ -int -__bam_pg_alloc1_recover(dbenv, dbtp, lsnp, op, info) - DB_ENV *dbenv; - DBT *dbtp; - DB_LSN *lsnp; - db_recops op; - void *info; -{ - __bam_pg_alloc1_args *argp; - DB *file_dbp; - DBC *dbc; - DB_MPOOLFILE *mpf; - PAGE *pagep; - int cmp_n, cmp_p, modified, ret; - - REC_PRINT(__bam_pg_alloc1_print); - REC_INTRO(__bam_pg_alloc1_read); - - if ((ret = memp_fget(mpf, &argp->pgno, 0, &pagep)) != 0) - if (DB_REDO(op)) { - if ((ret = memp_fget(mpf, - &argp->pgno, DB_MPOOL_CREATE, &pagep)) != 0) - goto out; - } else { - *lsnp = argp->prev_lsn; - ret = 0; - goto out; - } - - modified = 0; - cmp_n = log_compare(lsnp, &LSN(pagep)); - - /* - * Use this when there is something like "pagelsn" in the argp - * structure. Sometimes, you might need to compare meta-data - * lsn's instead. - * - * cmp_p = log_compare(&LSN(pagep), argp->pagelsn); - */ - if (cmp_p == 0 && DB_REDO(op)) { - /* Need to redo update described. */ - modified = 1; - } else if (cmp_n == 0 && !DB_REDO(op)) { - /* Need to undo update described. */ - modified = 1; - } - if (ret = memp_fput(mpf, pagep, modified ? DB_MPOOL_DIRTY : 0)) - goto out; - - *lsnp = argp->prev_lsn; - ret = 0; - -out: REC_CLOSE; -} - -/* - * __bam_pg_free_recover -- - * Recovery function for pg_free. - * - * PUBLIC: int __bam_pg_free_recover - * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *)); - */ -int -__bam_pg_free_recover(dbenv, dbtp, lsnp, op, info) - DB_ENV *dbenv; - DBT *dbtp; - DB_LSN *lsnp; - db_recops op; - void *info; -{ - __bam_pg_free_args *argp; - DB *file_dbp; - DBC *dbc; - DB_MPOOLFILE *mpf; - PAGE *pagep; - int cmp_n, cmp_p, modified, ret; - - REC_PRINT(__bam_pg_free_print); - REC_INTRO(__bam_pg_free_read); - - if ((ret = memp_fget(mpf, &argp->pgno, 0, &pagep)) != 0) - if (DB_REDO(op)) { - if ((ret = memp_fget(mpf, - &argp->pgno, DB_MPOOL_CREATE, &pagep)) != 0) - goto out; - } else { - *lsnp = argp->prev_lsn; - ret = 0; - goto out; - } - - modified = 0; - cmp_n = log_compare(lsnp, &LSN(pagep)); - - /* - * Use this when there is something like "pagelsn" in the argp - * structure. Sometimes, you might need to compare meta-data - * lsn's instead. - * - * cmp_p = log_compare(&LSN(pagep), argp->pagelsn); - */ - if (cmp_p == 0 && DB_REDO(op)) { - /* Need to redo update described. */ - modified = 1; - } else if (cmp_n == 0 && !DB_REDO(op)) { - /* Need to undo update described. */ - modified = 1; - } - if (ret = memp_fput(mpf, pagep, modified ? DB_MPOOL_DIRTY : 0)) - goto out; - - *lsnp = argp->prev_lsn; - ret = 0; - -out: REC_CLOSE; -} - -/* - * __bam_pg_free1_recover -- - * Recovery function for pg_free1. - * - * PUBLIC: int __bam_pg_free1_recover - * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *)); - */ -int -__bam_pg_free1_recover(dbenv, dbtp, lsnp, op, info) - DB_ENV *dbenv; - DBT *dbtp; - DB_LSN *lsnp; - db_recops op; - void *info; -{ - __bam_pg_free1_args *argp; - DB *file_dbp; - DBC *dbc; - DB_MPOOLFILE *mpf; - PAGE *pagep; - int cmp_n, cmp_p, modified, ret; - - REC_PRINT(__bam_pg_free1_print); - REC_INTRO(__bam_pg_free1_read); - - if ((ret = memp_fget(mpf, &argp->pgno, 0, &pagep)) != 0) - if (DB_REDO(op)) { - if ((ret = memp_fget(mpf, - &argp->pgno, DB_MPOOL_CREATE, &pagep)) != 0) - goto out; - } else { - *lsnp = argp->prev_lsn; - ret = 0; - goto out; - } - - modified = 0; - cmp_n = log_compare(lsnp, &LSN(pagep)); - - /* - * Use this when there is something like "pagelsn" in the argp - * structure. Sometimes, you might need to compare meta-data - * lsn's instead. - * - * cmp_p = log_compare(&LSN(pagep), argp->pagelsn); - */ - if (cmp_p == 0 && DB_REDO(op)) { - /* Need to redo update described. */ - modified = 1; - } else if (cmp_n == 0 && !DB_REDO(op)) { - /* Need to undo update described. */ - modified = 1; - } - if (ret = memp_fput(mpf, pagep, modified ? DB_MPOOL_DIRTY : 0)) - goto out; - - *lsnp = argp->prev_lsn; - ret = 0; - -out: REC_CLOSE; -} - -/* - * __bam_split1_recover -- - * Recovery function for split1. - * - * PUBLIC: int __bam_split1_recover - * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *)); - */ -int -__bam_split1_recover(dbenv, dbtp, lsnp, op, info) - DB_ENV *dbenv; - DBT *dbtp; - DB_LSN *lsnp; - db_recops op; - void *info; -{ - __bam_split1_args *argp; - DB *file_dbp; - DBC *dbc; - DB_MPOOLFILE *mpf; - PAGE *pagep; - int cmp_n, cmp_p, modified, ret; - - REC_PRINT(__bam_split1_print); - REC_INTRO(__bam_split1_read); - - if ((ret = memp_fget(mpf, &argp->pgno, 0, &pagep)) != 0) - if (DB_REDO(op)) { - if ((ret = memp_fget(mpf, - &argp->pgno, DB_MPOOL_CREATE, &pagep)) != 0) - goto out; - } else { - *lsnp = argp->prev_lsn; - ret = 0; - goto out; - } - - modified = 0; - cmp_n = log_compare(lsnp, &LSN(pagep)); - - /* - * Use this when there is something like "pagelsn" in the argp - * structure. Sometimes, you might need to compare meta-data - * lsn's instead. - * - * cmp_p = log_compare(&LSN(pagep), argp->pagelsn); - */ - if (cmp_p == 0 && DB_REDO(op)) { - /* Need to redo update described. */ - modified = 1; - } else if (cmp_n == 0 && !DB_REDO(op)) { - /* Need to undo update described. */ - modified = 1; - } - if (ret = memp_fput(mpf, pagep, modified ? DB_MPOOL_DIRTY : 0)) - goto out; - - *lsnp = argp->prev_lsn; - ret = 0; - -out: REC_CLOSE; -} +#include "dbinc/db_page.h" +#include "dbinc/__bam.h" +#include "dbinc/log.h" /* * __bam_split_recover -- @@ -344,11 +34,11 @@ __bam_split_recover(dbenv, dbtp, lsnp, op, info) int cmp_n, cmp_p, modified, ret; REC_PRINT(__bam_split_print); - REC_INTRO(__bam_split_read); + REC_INTRO(__bam_split_read, 1); - if ((ret = memp_fget(mpf, &argp->pgno, 0, &pagep)) != 0) + if ((ret = mpf->get(mpf, &argp->pgno, 0, &pagep)) != 0) if (DB_REDO(op)) { - if ((ret = memp_fget(mpf, + if ((ret = mpf->get(mpf, &argp->pgno, DB_MPOOL_CREATE, &pagep)) != 0) goto out; } else { @@ -374,7 +64,7 @@ __bam_split_recover(dbenv, dbtp, lsnp, op, info) /* Need to undo update described. */ modified = 1; } - if (ret = memp_fput(mpf, pagep, modified ? DB_MPOOL_DIRTY : 0)) + if (ret = mpf->put(mpf, pagep, modified ? DB_MPOOL_DIRTY : 0)) goto out; *lsnp = argp->prev_lsn; @@ -384,33 +74,33 @@ out: REC_CLOSE; } /* - * __bam_rsplit1_recover -- - * Recovery function for rsplit1. + * __bam_rsplit_recover -- + * Recovery function for rsplit. * - * PUBLIC: int __bam_rsplit1_recover + * PUBLIC: int __bam_rsplit_recover * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *)); */ int -__bam_rsplit1_recover(dbenv, dbtp, lsnp, op, info) +__bam_rsplit_recover(dbenv, dbtp, lsnp, op, info) DB_ENV *dbenv; DBT *dbtp; DB_LSN *lsnp; db_recops op; void *info; { - __bam_rsplit1_args *argp; + __bam_rsplit_args *argp; DB *file_dbp; DBC *dbc; DB_MPOOLFILE *mpf; PAGE *pagep; int cmp_n, cmp_p, modified, ret; - REC_PRINT(__bam_rsplit1_print); - REC_INTRO(__bam_rsplit1_read); + REC_PRINT(__bam_rsplit_print); + REC_INTRO(__bam_rsplit_read, 1); - if ((ret = memp_fget(mpf, &argp->pgno, 0, &pagep)) != 0) + if ((ret = mpf->get(mpf, &argp->pgno, 0, &pagep)) != 0) if (DB_REDO(op)) { - if ((ret = memp_fget(mpf, + if ((ret = mpf->get(mpf, &argp->pgno, DB_MPOOL_CREATE, &pagep)) != 0) goto out; } else { @@ -436,7 +126,7 @@ __bam_rsplit1_recover(dbenv, dbtp, lsnp, op, info) /* Need to undo update described. */ modified = 1; } - if (ret = memp_fput(mpf, pagep, modified ? DB_MPOOL_DIRTY : 0)) + if (ret = mpf->put(mpf, pagep, modified ? DB_MPOOL_DIRTY : 0)) goto out; *lsnp = argp->prev_lsn; @@ -446,33 +136,33 @@ out: REC_CLOSE; } /* - * __bam_rsplit_recover -- - * Recovery function for rsplit. + * __bam_adj_recover -- + * Recovery function for adj. * - * PUBLIC: int __bam_rsplit_recover + * PUBLIC: int __bam_adj_recover * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *)); */ int -__bam_rsplit_recover(dbenv, dbtp, lsnp, op, info) +__bam_adj_recover(dbenv, dbtp, lsnp, op, info) DB_ENV *dbenv; DBT *dbtp; DB_LSN *lsnp; db_recops op; void *info; { - __bam_rsplit_args *argp; + __bam_adj_args *argp; DB *file_dbp; DBC *dbc; DB_MPOOLFILE *mpf; PAGE *pagep; int cmp_n, cmp_p, modified, ret; - REC_PRINT(__bam_rsplit_print); - REC_INTRO(__bam_rsplit_read); + REC_PRINT(__bam_adj_print); + REC_INTRO(__bam_adj_read, 1); - if ((ret = memp_fget(mpf, &argp->pgno, 0, &pagep)) != 0) + if ((ret = mpf->get(mpf, &argp->pgno, 0, &pagep)) != 0) if (DB_REDO(op)) { - if ((ret = memp_fget(mpf, + if ((ret = mpf->get(mpf, &argp->pgno, DB_MPOOL_CREATE, &pagep)) != 0) goto out; } else { @@ -498,7 +188,7 @@ __bam_rsplit_recover(dbenv, dbtp, lsnp, op, info) /* Need to undo update described. */ modified = 1; } - if (ret = memp_fput(mpf, pagep, modified ? DB_MPOOL_DIRTY : 0)) + if (ret = mpf->put(mpf, pagep, modified ? DB_MPOOL_DIRTY : 0)) goto out; *lsnp = argp->prev_lsn; @@ -508,33 +198,33 @@ out: REC_CLOSE; } /* - * __bam_adj_recover -- - * Recovery function for adj. + * __bam_cadjust_recover -- + * Recovery function for cadjust. * - * PUBLIC: int __bam_adj_recover + * PUBLIC: int __bam_cadjust_recover * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *)); */ int -__bam_adj_recover(dbenv, dbtp, lsnp, op, info) +__bam_cadjust_recover(dbenv, dbtp, lsnp, op, info) DB_ENV *dbenv; DBT *dbtp; DB_LSN *lsnp; db_recops op; void *info; { - __bam_adj_args *argp; + __bam_cadjust_args *argp; DB *file_dbp; DBC *dbc; DB_MPOOLFILE *mpf; PAGE *pagep; int cmp_n, cmp_p, modified, ret; - REC_PRINT(__bam_adj_print); - REC_INTRO(__bam_adj_read); + REC_PRINT(__bam_cadjust_print); + REC_INTRO(__bam_cadjust_read, 1); - if ((ret = memp_fget(mpf, &argp->pgno, 0, &pagep)) != 0) + if ((ret = mpf->get(mpf, &argp->pgno, 0, &pagep)) != 0) if (DB_REDO(op)) { - if ((ret = memp_fget(mpf, + if ((ret = mpf->get(mpf, &argp->pgno, DB_MPOOL_CREATE, &pagep)) != 0) goto out; } else { @@ -560,7 +250,7 @@ __bam_adj_recover(dbenv, dbtp, lsnp, op, info) /* Need to undo update described. */ modified = 1; } - if (ret = memp_fput(mpf, pagep, modified ? DB_MPOOL_DIRTY : 0)) + if (ret = mpf->put(mpf, pagep, modified ? DB_MPOOL_DIRTY : 0)) goto out; *lsnp = argp->prev_lsn; @@ -570,33 +260,33 @@ out: REC_CLOSE; } /* - * __bam_cadjust_recover -- - * Recovery function for cadjust. + * __bam_cdel_recover -- + * Recovery function for cdel. * - * PUBLIC: int __bam_cadjust_recover + * PUBLIC: int __bam_cdel_recover * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *)); */ int -__bam_cadjust_recover(dbenv, dbtp, lsnp, op, info) +__bam_cdel_recover(dbenv, dbtp, lsnp, op, info) DB_ENV *dbenv; DBT *dbtp; DB_LSN *lsnp; db_recops op; void *info; { - __bam_cadjust_args *argp; + __bam_cdel_args *argp; DB *file_dbp; DBC *dbc; DB_MPOOLFILE *mpf; PAGE *pagep; int cmp_n, cmp_p, modified, ret; - REC_PRINT(__bam_cadjust_print); - REC_INTRO(__bam_cadjust_read); + REC_PRINT(__bam_cdel_print); + REC_INTRO(__bam_cdel_read, 1); - if ((ret = memp_fget(mpf, &argp->pgno, 0, &pagep)) != 0) + if ((ret = mpf->get(mpf, &argp->pgno, 0, &pagep)) != 0) if (DB_REDO(op)) { - if ((ret = memp_fget(mpf, + if ((ret = mpf->get(mpf, &argp->pgno, DB_MPOOL_CREATE, &pagep)) != 0) goto out; } else { @@ -622,7 +312,7 @@ __bam_cadjust_recover(dbenv, dbtp, lsnp, op, info) /* Need to undo update described. */ modified = 1; } - if (ret = memp_fput(mpf, pagep, modified ? DB_MPOOL_DIRTY : 0)) + if (ret = mpf->put(mpf, pagep, modified ? DB_MPOOL_DIRTY : 0)) goto out; *lsnp = argp->prev_lsn; @@ -632,33 +322,33 @@ out: REC_CLOSE; } /* - * __bam_cdel_recover -- - * Recovery function for cdel. + * __bam_repl_recover -- + * Recovery function for repl. * - * PUBLIC: int __bam_cdel_recover + * PUBLIC: int __bam_repl_recover * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *)); */ int -__bam_cdel_recover(dbenv, dbtp, lsnp, op, info) +__bam_repl_recover(dbenv, dbtp, lsnp, op, info) DB_ENV *dbenv; DBT *dbtp; DB_LSN *lsnp; db_recops op; void *info; { - __bam_cdel_args *argp; + __bam_repl_args *argp; DB *file_dbp; DBC *dbc; DB_MPOOLFILE *mpf; PAGE *pagep; int cmp_n, cmp_p, modified, ret; - REC_PRINT(__bam_cdel_print); - REC_INTRO(__bam_cdel_read); + REC_PRINT(__bam_repl_print); + REC_INTRO(__bam_repl_read, 1); - if ((ret = memp_fget(mpf, &argp->pgno, 0, &pagep)) != 0) + if ((ret = mpf->get(mpf, &argp->pgno, 0, &pagep)) != 0) if (DB_REDO(op)) { - if ((ret = memp_fget(mpf, + if ((ret = mpf->get(mpf, &argp->pgno, DB_MPOOL_CREATE, &pagep)) != 0) goto out; } else { @@ -684,7 +374,7 @@ __bam_cdel_recover(dbenv, dbtp, lsnp, op, info) /* Need to undo update described. */ modified = 1; } - if (ret = memp_fput(mpf, pagep, modified ? DB_MPOOL_DIRTY : 0)) + if (ret = mpf->put(mpf, pagep, modified ? DB_MPOOL_DIRTY : 0)) goto out; *lsnp = argp->prev_lsn; @@ -694,33 +384,33 @@ out: REC_CLOSE; } /* - * __bam_repl_recover -- - * Recovery function for repl. + * __bam_root_recover -- + * Recovery function for root. * - * PUBLIC: int __bam_repl_recover + * PUBLIC: int __bam_root_recover * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *)); */ int -__bam_repl_recover(dbenv, dbtp, lsnp, op, info) +__bam_root_recover(dbenv, dbtp, lsnp, op, info) DB_ENV *dbenv; DBT *dbtp; DB_LSN *lsnp; db_recops op; void *info; { - __bam_repl_args *argp; + __bam_root_args *argp; DB *file_dbp; DBC *dbc; DB_MPOOLFILE *mpf; PAGE *pagep; int cmp_n, cmp_p, modified, ret; - REC_PRINT(__bam_repl_print); - REC_INTRO(__bam_repl_read); + REC_PRINT(__bam_root_print); + REC_INTRO(__bam_root_read, 1); - if ((ret = memp_fget(mpf, &argp->pgno, 0, &pagep)) != 0) + if ((ret = mpf->get(mpf, &argp->pgno, 0, &pagep)) != 0) if (DB_REDO(op)) { - if ((ret = memp_fget(mpf, + if ((ret = mpf->get(mpf, &argp->pgno, DB_MPOOL_CREATE, &pagep)) != 0) goto out; } else { @@ -746,7 +436,7 @@ __bam_repl_recover(dbenv, dbtp, lsnp, op, info) /* Need to undo update described. */ modified = 1; } - if (ret = memp_fput(mpf, pagep, modified ? DB_MPOOL_DIRTY : 0)) + if (ret = mpf->put(mpf, pagep, modified ? DB_MPOOL_DIRTY : 0)) goto out; *lsnp = argp->prev_lsn; @@ -756,33 +446,33 @@ out: REC_CLOSE; } /* - * __bam_root_recover -- - * Recovery function for root. + * __bam_curadj_recover -- + * Recovery function for curadj. * - * PUBLIC: int __bam_root_recover + * PUBLIC: int __bam_curadj_recover * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *)); */ int -__bam_root_recover(dbenv, dbtp, lsnp, op, info) +__bam_curadj_recover(dbenv, dbtp, lsnp, op, info) DB_ENV *dbenv; DBT *dbtp; DB_LSN *lsnp; db_recops op; void *info; { - __bam_root_args *argp; + __bam_curadj_args *argp; DB *file_dbp; DBC *dbc; DB_MPOOLFILE *mpf; PAGE *pagep; int cmp_n, cmp_p, modified, ret; - REC_PRINT(__bam_root_print); - REC_INTRO(__bam_root_read); + REC_PRINT(__bam_curadj_print); + REC_INTRO(__bam_curadj_read, 1); - if ((ret = memp_fget(mpf, &argp->pgno, 0, &pagep)) != 0) + if ((ret = mpf->get(mpf, &argp->pgno, 0, &pagep)) != 0) if (DB_REDO(op)) { - if ((ret = memp_fget(mpf, + if ((ret = mpf->get(mpf, &argp->pgno, DB_MPOOL_CREATE, &pagep)) != 0) goto out; } else { @@ -808,7 +498,7 @@ __bam_root_recover(dbenv, dbtp, lsnp, op, info) /* Need to undo update described. */ modified = 1; } - if (ret = memp_fput(mpf, pagep, modified ? DB_MPOOL_DIRTY : 0)) + if (ret = mpf->put(mpf, pagep, modified ? DB_MPOOL_DIRTY : 0)) goto out; *lsnp = argp->prev_lsn; @@ -818,33 +508,33 @@ out: REC_CLOSE; } /* - * __bam_curadj_recover -- - * Recovery function for curadj. + * __bam_rcuradj_recover -- + * Recovery function for rcuradj. * - * PUBLIC: int __bam_curadj_recover + * PUBLIC: int __bam_rcuradj_recover * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *)); */ int -__bam_curadj_recover(dbenv, dbtp, lsnp, op, info) +__bam_rcuradj_recover(dbenv, dbtp, lsnp, op, info) DB_ENV *dbenv; DBT *dbtp; DB_LSN *lsnp; db_recops op; void *info; { - __bam_curadj_args *argp; + __bam_rcuradj_args *argp; DB *file_dbp; DBC *dbc; DB_MPOOLFILE *mpf; PAGE *pagep; int cmp_n, cmp_p, modified, ret; - REC_PRINT(__bam_curadj_print); - REC_INTRO(__bam_curadj_read); + REC_PRINT(__bam_rcuradj_print); + REC_INTRO(__bam_rcuradj_read, 1); - if ((ret = memp_fget(mpf, &argp->pgno, 0, &pagep)) != 0) + if ((ret = mpf->get(mpf, &argp->pgno, 0, &pagep)) != 0) if (DB_REDO(op)) { - if ((ret = memp_fget(mpf, + if ((ret = mpf->get(mpf, &argp->pgno, DB_MPOOL_CREATE, &pagep)) != 0) goto out; } else { @@ -870,7 +560,7 @@ __bam_curadj_recover(dbenv, dbtp, lsnp, op, info) /* Need to undo update described. */ modified = 1; } - if (ret = memp_fput(mpf, pagep, modified ? DB_MPOOL_DIRTY : 0)) + if (ret = mpf->put(mpf, pagep, modified ? DB_MPOOL_DIRTY : 0)) goto out; *lsnp = argp->prev_lsn; @@ -880,33 +570,33 @@ out: REC_CLOSE; } /* - * __bam_rcuradj_recover -- - * Recovery function for rcuradj. + * __bam_relink_recover -- + * Recovery function for relink. * - * PUBLIC: int __bam_rcuradj_recover + * PUBLIC: int __bam_relink_recover * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *)); */ int -__bam_rcuradj_recover(dbenv, dbtp, lsnp, op, info) +__bam_relink_recover(dbenv, dbtp, lsnp, op, info) DB_ENV *dbenv; DBT *dbtp; DB_LSN *lsnp; db_recops op; void *info; { - __bam_rcuradj_args *argp; + __bam_relink_args *argp; DB *file_dbp; DBC *dbc; DB_MPOOLFILE *mpf; PAGE *pagep; int cmp_n, cmp_p, modified, ret; - REC_PRINT(__bam_rcuradj_print); - REC_INTRO(__bam_rcuradj_read); + REC_PRINT(__bam_relink_print); + REC_INTRO(__bam_relink_read, 1); - if ((ret = memp_fget(mpf, &argp->pgno, 0, &pagep)) != 0) + if ((ret = mpf->get(mpf, &argp->pgno, 0, &pagep)) != 0) if (DB_REDO(op)) { - if ((ret = memp_fget(mpf, + if ((ret = mpf->get(mpf, &argp->pgno, DB_MPOOL_CREATE, &pagep)) != 0) goto out; } else { @@ -932,7 +622,7 @@ __bam_rcuradj_recover(dbenv, dbtp, lsnp, op, info) /* Need to undo update described. */ modified = 1; } - if (ret = memp_fput(mpf, pagep, modified ? DB_MPOOL_DIRTY : 0)) + if (ret = mpf->put(mpf, pagep, modified ? DB_MPOOL_DIRTY : 0)) goto out; *lsnp = argp->prev_lsn; diff --git a/db/dist/template/rec_db b/db/dist/template/rec_db index d5245d4b5..5c4c8f08d 100644 --- a/db/dist/template/rec_db +++ b/db/dist/template/rec_db @@ -198,68 +198,6 @@ out: REC_CLOSE; } /* - * __db_relink_recover -- - * Recovery function for relink. - * - * PUBLIC: int __db_relink_recover - * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *)); - */ -int -__db_relink_recover(dbenv, dbtp, lsnp, op, info) - DB_ENV *dbenv; - DBT *dbtp; - DB_LSN *lsnp; - db_recops op; - void *info; -{ - __db_relink_args *argp; - DB *file_dbp; - DBC *dbc; - DB_MPOOLFILE *mpf; - PAGE *pagep; - int cmp_n, cmp_p, modified, ret; - - REC_PRINT(__db_relink_print); - REC_INTRO(__db_relink_read, 1); - - if ((ret = mpf->get(mpf, &argp->pgno, 0, &pagep)) != 0) - if (DB_REDO(op)) { - if ((ret = mpf->get(mpf, - &argp->pgno, DB_MPOOL_CREATE, &pagep)) != 0) - goto out; - } else { - *lsnp = argp->prev_lsn; - ret = 0; - goto out; - } - - modified = 0; - cmp_n = log_compare(lsnp, &LSN(pagep)); - - /* - * Use this when there is something like "pagelsn" in the argp - * structure. Sometimes, you might need to compare meta-data - * lsn's instead. - * - * cmp_p = log_compare(&LSN(pagep), argp->pagelsn); - */ - if (cmp_p == 0 && DB_REDO(op)) { - /* Need to redo update described. */ - modified = 1; - } else if (cmp_n == 0 && !DB_REDO(op)) { - /* Need to undo update described. */ - modified = 1; - } - if (ret = mpf->put(mpf, pagep, modified ? DB_MPOOL_DIRTY : 0)) - goto out; - - *lsnp = argp->prev_lsn; - ret = 0; - -out: REC_CLOSE; -} - -/* * __db_debug_recover -- * Recovery function for debug. * @@ -755,3 +693,65 @@ __db_pg_new_recover(dbenv, dbtp, lsnp, op, info) out: REC_CLOSE; } +/* + * __db_pg_init_recover -- + * Recovery function for pg_init. + * + * PUBLIC: int __db_pg_init_recover + * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *)); + */ +int +__db_pg_init_recover(dbenv, dbtp, lsnp, op, info) + DB_ENV *dbenv; + DBT *dbtp; + DB_LSN *lsnp; + db_recops op; + void *info; +{ + __db_pg_init_args *argp; + DB *file_dbp; + DBC *dbc; + DB_MPOOLFILE *mpf; + PAGE *pagep; + int cmp_n, cmp_p, modified, ret; + + REC_PRINT(__db_pg_init_print); + REC_INTRO(__db_pg_init_read, 1); + + if ((ret = mpf->get(mpf, &argp->pgno, 0, &pagep)) != 0) + if (DB_REDO(op)) { + if ((ret = mpf->get(mpf, + &argp->pgno, DB_MPOOL_CREATE, &pagep)) != 0) + goto out; + } else { + *lsnp = argp->prev_lsn; + ret = 0; + goto out; + } + + modified = 0; + cmp_n = log_compare(lsnp, &LSN(pagep)); + + /* + * Use this when there is something like "pagelsn" in the argp + * structure. Sometimes, you might need to compare meta-data + * lsn's instead. + * + * cmp_p = log_compare(&LSN(pagep), argp->pagelsn); + */ + if (cmp_p == 0 && DB_REDO(op)) { + /* Need to redo update described. */ + modified = 1; + } else if (cmp_n == 0 && !DB_REDO(op)) { + /* Need to undo update described. */ + modified = 1; + } + if (ret = mpf->put(mpf, pagep, modified ? DB_MPOOL_DIRTY : 0)) + goto out; + + *lsnp = argp->prev_lsn; + ret = 0; + +out: REC_CLOSE; +} + diff --git a/db/dist/vx_2.0/BerkeleyDBsmall.wpj b/db/dist/vx_2.0/BerkeleyDBsmall.wpj new file mode 100644 index 000000000..3c9fd350f --- /dev/null +++ b/db/dist/vx_2.0/BerkeleyDBsmall.wpj @@ -0,0 +1,251 @@ +Document file - DO NOT EDIT + +<BEGIN> BUILD_PENTIUM_debug_BUILDRULE +BerkeleyDB20small.out +<END> + +<BEGIN> BUILD_PENTIUM_debug_MACRO_AR +ar386 +<END> + +<BEGIN> BUILD_PENTIUM_debug_MACRO_ARCHIVE +$(PRJ_DIR)/PENTIUMgnu/BerkeleyDB20small_sim.a +<END> + +<BEGIN> BUILD_PENTIUM_debug_MACRO_AS +cc386 +<END> + +<BEGIN> BUILD_PENTIUM_debug_MACRO_CC +cc386 +<END> + +<BEGIN> BUILD_PENTIUM_debug_MACRO_CFLAGS +-g \ + -mpentium \ + -ansi \ + -nostdinc \ + -DRW_MULTI_THREAD \ + -D_REENTRANT \ + -fvolatile \ + -nostdlib \ + -fno-builtin \ + -fno-defer-pop \ + -I. \ + -I$(WIND_BASE)/target/h \ + -DCPU=PENTIUM \ + -O0 \ + -I$(PRJ_DIR) \ + -I$(PRJ_DIR)/.. \ + -DDIAGNOSTIC \ + -DDEBUG +<END> + +<BEGIN> BUILD_PENTIUM_debug_MACRO_CFLAGS_AS +-g \ + -mpentium \ + -ansi \ + -nostdinc \ + -fvolatile \ + -nostdlib \ + -fno-builtin \ + -fno-defer-pop \ + -P \ + -x \ + assembler-with-cpp \ + -I. \ + -I$(WIND_BASE)/target/h \ + -DCPU=PENTIUM +<END> + +<BEGIN> BUILD_PENTIUM_debug_MACRO_CPP +cc386 -E -P -xc +<END> + +<BEGIN> BUILD_PENTIUM_debug_MACRO_LD +ld386 +<END> + +<BEGIN> BUILD_PENTIUM_debug_MACRO_LDFLAGS +-X -N +<END> + +<BEGIN> BUILD_PENTIUM_debug_MACRO_LD_PARTIAL_FLAGS +-X -r +<END> + +<BEGIN> BUILD_PENTIUM_debug_MACRO_NM +nm386 -g +<END> + +<BEGIN> BUILD_PENTIUM_debug_MACRO_OPTION_DEFINE_MACRO +-D +<END> + +<BEGIN> BUILD_PENTIUM_debug_MACRO_OPTION_INCLUDE_DIR +-I +<END> + +<BEGIN> BUILD_PENTIUM_debug_MACRO_POST_BUILD_RULE + +<END> + +<BEGIN> BUILD_PENTIUM_debug_MACRO_PRJ_LIBS + +<END> + +<BEGIN> BUILD_PENTIUM_debug_MACRO_SIZE +size386 +<END> + +<BEGIN> BUILD_PENTIUM_debug_RO_DEPEND_PATH +{$(WIND_BASE)/target/h/} \ + {$(WIND_BASE)/target/src/} \ + {$(WIND_BASE)/target/config/} +<END> + +<BEGIN> BUILD_PENTIUM_debug_TC +::tc_PENTIUMgnu +<END> + +<BEGIN> BUILD_PENTIUM_release_BUILDRULE +BerkeleyDB20small.out +<END> + +<BEGIN> BUILD_PENTIUM_release_MACRO_AR +ar386 +<END> + +<BEGIN> BUILD_PENTIUM_release_MACRO_ARCHIVE +$(PRJ_DIR)/PENTIUMgnu/BerkeleyDB20small_sim.a +<END> + +<BEGIN> BUILD_PENTIUM_release_MACRO_AS +cc386 +<END> + +<BEGIN> BUILD_PENTIUM_release_MACRO_CC +cc386 +<END> + +<BEGIN> BUILD_PENTIUM_release_MACRO_CFLAGS +-mpentium \ + -ansi \ + -nostdinc \ + -DRW_MULTI_THREAD \ + -D_REENTRANT \ + -fvolatile \ + -nostdlib \ + -fno-builtin \ + -fno-defer-pop \ + -I. \ + -I$(WIND_BASE)/target/h \ + -DCPU=PENTIUM \ + -O2 \ + -I$(PRJ_DIR) \ + -I$(PRJ_DIR)/.. +<END> + +<BEGIN> BUILD_PENTIUM_release_MACRO_CFLAGS_AS +-g \ + -mpentium \ + -ansi \ + -nostdinc \ + -fvolatile \ + -nostdlib \ + -fno-builtin \ + -fno-defer-pop \ + -P \ + -x \ + assembler-with-cpp \ + -I. \ + -I$(WIND_BASE)/target/h \ + -DCPU=PENTIUM +<END> + +<BEGIN> BUILD_PENTIUM_release_MACRO_CPP +cc386 -E -P -xc +<END> + +<BEGIN> BUILD_PENTIUM_release_MACRO_LD +ld386 +<END> + +<BEGIN> BUILD_PENTIUM_release_MACRO_LDDEPS + +<END> + +<BEGIN> BUILD_PENTIUM_release_MACRO_LDFLAGS +-X -N +<END> + +<BEGIN> BUILD_PENTIUM_release_MACRO_LD_PARTIAL_FLAGS +-X -r +<END> + +<BEGIN> BUILD_PENTIUM_release_MACRO_NM +nm386 -g +<END> + +<BEGIN> BUILD_PENTIUM_release_MACRO_OPTION_DEFINE_MACRO +-D +<END> + +<BEGIN> BUILD_PENTIUM_release_MACRO_OPTION_INCLUDE_DIR +-I +<END> + +<BEGIN> BUILD_PENTIUM_release_MACRO_POST_BUILD_RULE + +<END> + +<BEGIN> BUILD_PENTIUM_release_MACRO_PRJ_LIBS + +<END> + +<BEGIN> BUILD_PENTIUM_release_MACRO_SIZE +size386 +<END> + +<BEGIN> BUILD_PENTIUM_release_RO_DEPEND_PATH +{$(WIND_BASE)/target/h/} \ + {$(WIND_BASE)/target/src/} \ + {$(WIND_BASE)/target/config/} +<END> + +<BEGIN> BUILD_PENTIUM_release_TC +::tc_PENTIUMgnu +<END> + +<BEGIN> BUILD_RULE_BerkeleyDB20small.out + +<END> + +<BEGIN> BUILD_RULE_BerkeleyDB20small_sim.out + +<END> + +<BEGIN> BUILD_RULE_archive + +<END> + +<BEGIN> BUILD_RULE_objects + +<END> + +<BEGIN> BUILD__CURRENT +PENTIUM_debug +<END> + +<BEGIN> BUILD__LIST +PENTIUM_release PENTIUM_debug +<END> + +<BEGIN> CORE_INFO_TYPE +::prj_vxApp +<END> + +<BEGIN> CORE_INFO_VERSION +2.0 +<END> + diff --git a/db/dist/vx_2.2/BerkeleyDBsmall.wpj b/db/dist/vx_2.2/BerkeleyDBsmall.wpj new file mode 100644 index 000000000..bfbdadc46 --- /dev/null +++ b/db/dist/vx_2.2/BerkeleyDBsmall.wpj @@ -0,0 +1,310 @@ +Document file - DO NOT EDIT + +<BEGIN> BUILD_PENTIUM_debug_BUILDRULE +BerkeleyDB22small.out +<END> + +<BEGIN> BUILD_PENTIUM_debug_MACRO_AR +arpentium +<END> + +<BEGIN> BUILD_PENTIUM_debug_MACRO_ARCHIVE +$(PRJ_DIR)/PENTIUM_debug/BerkeleyDB22small.a +<END> + +<BEGIN> BUILD_PENTIUM_debug_MACRO_AS +ccpentium +<END> + +<BEGIN> BUILD_PENTIUM_debug_MACRO_CC +ccpentium +<END> + +<BEGIN> BUILD_PENTIUM_debug_MACRO_CC_ARCH_SPEC +-mcpu=pentiumpro -march=pentiumpro +<END> + +<BEGIN> BUILD_PENTIUM_debug_MACRO_CFLAGS +-g \ + -mcpu=pentiumpro \ + -march=pentiumpro \ + -ansi \ + -nostdlib \ + -fno-builtin \ + -fno-defer-pop \ + -I. \ + -I$(WIND_BASE)/target/h \ + -DCPU=PENTIUM2 \ + -DTOOL_FAMILY=gnu \ + -DTOOL=gnu \ + -O0 \ + -I$(PRJ_DIR) \ + -I$(PRJ_DIR)/.. \ + -DDIAGNOSTIC \ + -DDEBUG +<END> + +<BEGIN> BUILD_PENTIUM_debug_MACRO_CFLAGS_AS +-g \ + -mcpu=pentiumpro \ + -march=pentiumpro \ + -ansi \ + -nostdlib \ + -fno-builtin \ + -fno-defer-pop \ + -P \ + -xassembler-with-cpp \ + -I. \ + -I$(WIND_BASE)/target/h \ + -DCPU=PENTIUM2 \ + -DTOOL_FAMILY=gnu \ + -DTOOL=gnu +<END> + +<BEGIN> BUILD_PENTIUM_debug_MACRO_CPP +ccpentium -E -P +<END> + +<BEGIN> BUILD_PENTIUM_debug_MACRO_HEX_FLAGS + +<END> + +<BEGIN> BUILD_PENTIUM_debug_MACRO_LD +ldpentium +<END> + +<BEGIN> BUILD_PENTIUM_debug_MACRO_LDFLAGS +-X -N +<END> + +<BEGIN> BUILD_PENTIUM_debug_MACRO_LD_PARTIAL +ccpentium -r -nostdlib -Wl,-X +<END> + +<BEGIN> BUILD_PENTIUM_debug_MACRO_LD_PARTIAL_FLAGS +-X -r +<END> + +<BEGIN> BUILD_PENTIUM_debug_MACRO_NM +nmpentium -g +<END> + +<BEGIN> BUILD_PENTIUM_debug_MACRO_OPTION_DEFINE_MACRO +-D +<END> + +<BEGIN> BUILD_PENTIUM_debug_MACRO_OPTION_DEPEND +-M -w +<END> + +<BEGIN> BUILD_PENTIUM_debug_MACRO_OPTION_GENERATE_DEPENDENCY_FILE +-MD +<END> + +<BEGIN> BUILD_PENTIUM_debug_MACRO_OPTION_INCLUDE_DIR +-I +<END> + +<BEGIN> BUILD_PENTIUM_debug_MACRO_OPTION_LANG_C +-xc +<END> + +<BEGIN> BUILD_PENTIUM_debug_MACRO_OPTION_UNDEFINE_MACRO +-U +<END> + +<BEGIN> BUILD_PENTIUM_debug_MACRO_POST_BUILD_RULE + +<END> + +<BEGIN> BUILD_PENTIUM_debug_MACRO_PRJ_LIBS + +<END> + +<BEGIN> BUILD_PENTIUM_debug_MACRO_SIZE +sizepentium +<END> + +<BEGIN> BUILD_PENTIUM_debug_MACRO_TOOL_FAMILY +gnu +<END> + +<BEGIN> BUILD_PENTIUM_debug_RO_DEPEND_PATH +{$(WIND_BASE)/target/h/} \ + {$(WIND_BASE)/target/src/} \ + {$(WIND_BASE)/target/config/} +<END> + +<BEGIN> BUILD_PENTIUM_debug_TC +::tc_PENTIUM2gnu +<END> + +<BEGIN> BUILD_PENTIUM_release_BUILDRULE +BerkeleyDB22small.out +<END> + +<BEGIN> BUILD_PENTIUM_release_MACRO_AR +arpentium +<END> + +<BEGIN> BUILD_PENTIUM_release_MACRO_ARCHIVE +$(PRJ_DIR)/PENTIUM_release/BerkeleyDB22small.a +<END> + +<BEGIN> BUILD_PENTIUM_release_MACRO_AS +ccpentium +<END> + +<BEGIN> BUILD_PENTIUM_release_MACRO_CC +ccpentium +<END> + +<BEGIN> BUILD_PENTIUM_release_MACRO_CC_ARCH_SPEC +-mcpu=pentiumpro -march=pentiumpro +<END> + +<BEGIN> BUILD_PENTIUM_release_MACRO_CFLAGS +-g \ + -mcpu=pentiumpro \ + -march=pentiumpro \ + -ansi \ + -nostdlib \ + -fno-builtin \ + -fno-defer-pop \ + -I. \ + -I$(WIND_BASE)/target/h \ + -DCPU=PENTIUM2 \ + -DTOOL_FAMILY=gnu \ + -DTOOL=gnu \ + -O2 \ + -I$(PRJ_DIR) \ + -I$(PRJ_DIR)/.. +<END> + +<BEGIN> BUILD_PENTIUM_release_MACRO_CFLAGS_AS +-g \ + -mcpu=pentiumpro \ + -march=pentiumpro \ + -ansi \ + -nostdlib \ + -fno-builtin \ + -fno-defer-pop \ + -P \ + -xassembler-with-cpp \ + -I. \ + -I$(WIND_BASE)/target/h \ + -DCPU=PENTIUM2 \ + -DTOOL_FAMILY=gnu \ + -DTOOL=gnu +<END> + +<BEGIN> BUILD_PENTIUM_release_MACRO_CPP +ccpentium -E -P +<END> + +<BEGIN> BUILD_PENTIUM_release_MACRO_HEX_FLAGS + +<END> + +<BEGIN> BUILD_PENTIUM_release_MACRO_LD +ldpentium +<END> + +<BEGIN> BUILD_PENTIUM_release_MACRO_LDFLAGS +-X -N +<END> + +<BEGIN> BUILD_PENTIUM_release_MACRO_LD_PARTIAL +ccpentium -r -nostdlib -Wl,-X +<END> + +<BEGIN> BUILD_PENTIUM_release_MACRO_LD_PARTIAL_FLAGS +-X -r +<END> + +<BEGIN> BUILD_PENTIUM_release_MACRO_NM +nmpentium -g +<END> + +<BEGIN> BUILD_PENTIUM_release_MACRO_OPTION_DEFINE_MACRO +-D +<END> + +<BEGIN> BUILD_PENTIUM_release_MACRO_OPTION_DEPEND +-M -w +<END> + +<BEGIN> BUILD_PENTIUM_release_MACRO_OPTION_GENERATE_DEPENDENCY_FILE +-MD +<END> + +<BEGIN> BUILD_PENTIUM_release_MACRO_OPTION_INCLUDE_DIR +-I +<END> + +<BEGIN> BUILD_PENTIUM_release_MACRO_OPTION_LANG_C +-xc +<END> + +<BEGIN> BUILD_PENTIUM_release_MACRO_OPTION_UNDEFINE_MACRO +-U +<END> + +<BEGIN> BUILD_PENTIUM_release_MACRO_POST_BUILD_RULE + +<END> + +<BEGIN> BUILD_PENTIUM_release_MACRO_PRJ_LIBS + +<END> + +<BEGIN> BUILD_PENTIUM_release_MACRO_SIZE +sizepentium +<END> + +<BEGIN> BUILD_PENTIUM_release_MACRO_TOOL_FAMILY +gnu +<END> + +<BEGIN> BUILD_PENTIUM_release_RO_DEPEND_PATH +{$(WIND_BASE)/target/h/} \ + {$(WIND_BASE)/target/src/} \ + {$(WIND_BASE)/target/config/} +<END> + +<BEGIN> BUILD_PENTIUM_release_TC +::tc_PENTIUM2gnu +<END> + +<BEGIN> BUILD_RULE_BerkeleyDB22small.out + +<END> + +<BEGIN> BUILD_RULE_BerkeleyDB22small.pl + +<END> + +<BEGIN> BUILD_RULE_archive + +<END> + +<BEGIN> BUILD_RULE_objects + +<END> + +<BEGIN> BUILD__CURRENT +PENTIUM_debug +<END> + +<BEGIN> BUILD__LIST +PENTIUM_release PENTIUM_debug +<END> + +<BEGIN> CORE_INFO_TYPE +::prj_vxApp +<END> + +<BEGIN> CORE_INFO_VERSION +2.2 +<END> + diff --git a/db/dist/vx_config.in b/db/dist/vx_config.in index e05d46984..3c0ef3af1 100644 --- a/db/dist/vx_config.in +++ b/db/dist/vx_config.in @@ -53,9 +53,15 @@ /* Define to 1 if fcntl/F_SETFD denies child access to file descriptors. */ /* #undef HAVE_FCNTL_F_SETFD */ +/* Define to 1 if you have the `fdatasync' function. */ +/* #undef HAVE_FDATASYNC */ + /* Define to 1 if allocated filesystem blocks are not zeroed. */ #define HAVE_FILESYSTEM_NOTZERO 1 +/* Define to 1 if you have the `ftruncate' function. */ +/* #undef HAVE_FTRUNCATE */ + /* Define to 1 if you have the `getcwd' function. */ #define HAVE_GETCWD 1 @@ -80,6 +86,9 @@ /* Define to 1 if you have the `nsl' library (-lnsl). */ /* #undef HAVE_LIBNSL */ +/* Define to 1 if the system has the type `long long'. */ +/* #undef HAVE_LONG_LONG */ + /* Define to 1 if you have the `memcmp' function. */ #define HAVE_MEMCMP 1 @@ -227,6 +236,9 @@ /* Define to 1 if you have the `raise' function. */ #define HAVE_RAISE 1 +/* Define to 1 if you have the `rand' function. */ +#define HAVE_RAND 1 + /* Define to 1 if building replication support. */ #define HAVE_REPLICATION 1 @@ -239,12 +251,21 @@ /* Define to 1 if you have the `select' function. */ #define HAVE_SELECT 1 +/* Define to 1 if building sequence support. */ +/* #undef HAVE_SEQUENCE */ + /* Define to 1 if you have the `shmget' function. */ /* #undef HAVE_SHMGET */ /* Define to 1 if you have the `snprintf' function. */ /* #undef HAVE_SNPRINTF */ +/* Define to 1 if you have the `srand' function. */ +#define HAVE_SRAND 1 + +/* Define to 1 if building statistics support. */ +#define HAVE_STATISTICS 1 + /* Define to 1 if you have the <stdint.h> header file. */ /* #undef HAVE_STDINT_H */ @@ -304,6 +325,9 @@ /* Define to 1 if unlink of file with open file descriptors will fail. */ #define HAVE_UNLINK_WITH_OPEN_FAILURE 1 +/* Define to 1 if the system has the type `unsigned long long'. */ +/* #undef HAVE_UNSIGNED_LONG_LONG */ + /* Define to 1 if building access method verification support. */ #define HAVE_VERIFY 1 @@ -346,7 +370,7 @@ /* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */ /* #undef TIME_WITH_SYS_TIME */ -/* Define to 1 to mask harmless unitialized memory read/writes. */ +/* Define to 1 to mask harmless uninitialized memory read/writes. */ /* #undef UMRW */ /* Number of bits in a file offset, on hosts where this is settable. */ diff --git a/db/dist/vx_setup/LICENSE.TXT b/db/dist/vx_setup/LICENSE.TXT index 463fb66d2..f31971375 100644 --- a/db/dist/vx_setup/LICENSE.TXT +++ b/db/dist/vx_setup/LICENSE.TXT @@ -1,3 +1,3 @@ -Copyright (c) 1996-2003 +Copyright (c) 1996-2004 Sleepycat Software. All rights reserved. See the file LICENSE for redistribution information. diff --git a/db/dist/win_config.in b/db/dist/win_config.in index b4404d2fb..8041f36a7 100644 --- a/db/dist/win_config.in +++ b/db/dist/win_config.in @@ -48,9 +48,15 @@ /* Define to 1 if fcntl/F_SETFD denies child access to file descriptors. */ /* #undef HAVE_FCNTL_F_SETFD */ +/* Define to 1 if you have the `fdatasync' function. */ +/* #undef HAVE_FDATASYNC */ + /* Define to 1 if allocated filesystem blocks are not zeroed. */ #define HAVE_FILESYSTEM_NOTZERO 1 +/* Define to 1 if you have the `ftruncate' function. */ +#define HAVE_FTRUNCATE 1 + /* Define to 1 if you have the `getcwd' function. */ #define HAVE_GETCWD 1 @@ -77,6 +83,9 @@ /* Define to 1 if you have the `nsl' library (-lnsl). */ /* #undef HAVE_LIBNSL */ +/* Define to 1 if the system has the type `long long'. */ +#define HAVE_LONG_LONG 1 + /* Define to 1 if you have the `memcmp' function. */ #define HAVE_MEMCMP 1 @@ -226,6 +235,9 @@ /* Define to 1 if you have the `raise' function. */ #define HAVE_RAISE 1 +/* Define to 1 if you have the `rand' function. */ +#define HAVE_RAND 1 + /* Define to 1 if building replication support. */ #ifndef HAVE_SMALLBUILD #define HAVE_REPLICATION 1 @@ -240,12 +252,21 @@ /* Define to 1 if you have the `select' function. */ /* #undef HAVE_SELECT */ +/* Define to 1 if building sequence support. */ +#define HAVE_SEQUENCE 1 + /* Define to 1 if you have the `shmget' function. */ /* #undef HAVE_SHMGET */ /* Define to 1 if you have the `snprintf' function. */ #define HAVE_SNPRINTF 1 +/* Define to 1 if you have the `srand' function. */ +#define HAVE_SRAND 1 + +/* Define to 1 if building statistics support. */ +#define HAVE_STATISTICS 1 + /* Define to 1 if you have the <stdint.h> header file. */ /* #undef HAVE_STDINT_H */ @@ -305,6 +326,9 @@ /* Define to 1 if unlink of file with open file descriptors will fail. */ /* #undef HAVE_UNLINK_WITH_OPEN_FAILURE */ +/* Define to 1 if the system has the type `unsigned long long'. */ +#define HAVE_UNSIGNED_LONG_LONG 1 + /* Define to 1 if building access method verification support. */ #ifndef HAVE_SMALLBUILD #define HAVE_VERIFY 1 @@ -349,7 +373,7 @@ /* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */ /* #undef TIME_WITH_SYS_TIME */ -/* Define to 1 to mask harmless unitialized memory read/writes. */ +/* Define to 1 to mask harmless uninitialized memory read/writes. */ /* #undef UMRW */ /* Number of bits in a file offset, on hosts where this is settable. */ @@ -410,6 +434,6 @@ * arguments turning OFF all vendor extensions. Even more unfortunately, if * we do that, it fails to parse windows.h!!!!! So, we define __STDC__ here, * after windows.h comes in. Note: the compiler knows we've defined it, and - * starts enforcing strict ANSI compilance from this point on. + * starts enforcing strict ANSI compliance from this point on. */ #define __STDC__ 1 diff --git a/db/dist/win_db.in b/db/dist/win_db.in index 5f2ecbee1..d623610f4 100644 --- a/db/dist/win_db.in +++ b/db/dist/win_db.in @@ -1,5 +1,5 @@ /*- - * $Id: win_db.in,v 11.1 2003/03/20 15:08:21 bostic Exp $ + * $Id: win_db.in,v 11.4 2004/10/07 13:59:24 carol Exp $ * * The following provides the information necessary to build Berkeley * DB on native Windows, and other Windows environments such as MinGW. @@ -17,6 +17,7 @@ #include <signal.h> #include <stdio.h> #include <stdlib.h> +#include <tchar.h> #include <time.h> #include <errno.h> @@ -57,3 +58,37 @@ extern int getopt(int, char * const *, const char *); #if defined(__cplusplus) } #endif + +#ifdef _UNICODE +#define TO_TSTRING(dbenv, s, ts, ret) do { \ + int __len = strlen(s) + 1; \ + ts = NULL; \ + if ((ret = __os_malloc((dbenv), \ + __len * sizeof (_TCHAR), &(ts))) == 0 && \ + MultiByteToWideChar(CP_UTF8, 0, \ + (s), -1, (ts), __len) == 0) \ + ret = __os_get_errno(); \ + } while (0) + +#define FROM_TSTRING(dbenv, ts, s, ret) { \ + int __len = WideCharToMultiByte(CP_UTF8, 0, ts, -1, \ + NULL, 0, NULL, NULL); \ + s = NULL; \ + if ((ret = __os_malloc((dbenv), __len, &(s))) == 0 && \ + WideCharToMultiByte(CP_UTF8, 0, \ + (ts), -1, (s), __len, NULL, NULL) == 0) \ + ret = __os_get_errno(); \ + } while (0) + +#define FREE_STRING(dbenv, s) do { \ + if ((s) != NULL) { \ + __os_free((dbenv), (s)); \ + (s) = NULL; \ + } \ + } while (0) + +#else +#define TO_TSTRING(dbenv, s, ts, ret) (ret) = 0, (ts) = (_TCHAR *)(s) +#define FROM_TSTRING(dbenv, ts, s, ret) (ret) = 0, (s) = (char *)(ts) +#define FREE_STRING(dbenv, ts) +#endif diff --git a/db/dist/win_exports.in b/db/dist/win_exports.in index bf2b181ab..9087875cc 100644 --- a/db/dist/win_exports.in +++ b/db/dist/win_exports.in @@ -1,8 +1,9 @@ -# $Id: win_exports.in,v 1.28 2003/06/30 21:50:10 mjc Exp $ +# $Id: win_exports.in,v 1.41 2004/10/12 17:44:10 bostic Exp $ # Standard interfaces. db_create db_env_create + db_sequence_create db_strerror db_version db_xa_switch @@ -15,10 +16,13 @@ db_env_set_func_exists db_env_set_func_free db_env_set_func_fsync + db_env_set_func_ftruncate db_env_set_func_ioinfo db_env_set_func_malloc db_env_set_func_map db_env_set_func_open + db_env_set_func_pread + db_env_set_func_pwrite db_env_set_func_read db_env_set_func_realloc db_env_set_func_rename @@ -40,6 +44,8 @@ __db_dbm_init __db_dbm_nextkey __db_dbm_store + __db_get_flags_fn + __db_get_seq_flags_fn __db_hcreate __db_hdestroy __db_hsearch @@ -67,9 +73,7 @@ __ham_func4 __ham_func5 __ham_test - __lock_dump_region __lock_id_set - __memp_dump_region __os_calloc __os_closehandle __os_free @@ -85,42 +89,75 @@ __txn_id_set #These are needed for linking tools or java. - __bam_init_print + __bam_adj_read + __bam_cadjust_read + __bam_cdel_read + __bam_curadj_read __bam_pgin __bam_pgout - __crdel_init_print + __bam_rcuradj_read + __bam_relink_read + __bam_repl_read + __bam_root_read + __bam_rsplit_read + __bam_split_read + __crdel_metasub_read + __db_addrem_read + __db_big_read + __db_cksum_read + __db_debug_read __db_dispatch - __db_dump - __db_e_stat + __db_dumptree __db_err + __db_fileid_reset __db_getlong __db_getulong __db_global_values - __db_init_print - __db_inmemdbflags __db_isbigendian + __db_lsn_reset + __db_noop_read __db_omode __db_overwrite + __db_ovref_read + __db_pg_alloc_read + __db_pg_free_read + __db_pg_freedata_read + __db_pg_init_read + __db_pg_new_read + __db_pg_prepare_read __db_pgin __db_pgout __db_pr_callback - __db_prdbt - __db_prfooter - __db_prheader __db_rpath + __db_stat_pp + __db_stat_print_pp __db_util_cache __db_util_interrupted __db_util_logset __db_util_siginit __db_util_sigresend __db_verify_internal - __dbreg_init_print - __fop_init_print + __dbreg_register_read + __fop_create_read + __fop_file_remove_read + __fop_remove_read + __fop_rename_read + __fop_write_read + __ham_chgpg_read + __ham_copypage_read + __ham_curadj_read __ham_get_meta - __ham_init_print + __ham_groupalloc_read + __ham_insdel_read + __ham_metagroup_read + __ham_newpage_read __ham_pgin __ham_pgout __ham_release_meta + __ham_replace_read + __ham_splitdata_read + __lock_list_print + __log_stat_pp __os_clock __os_get_errno __os_id @@ -128,6 +165,15 @@ __os_sleep __os_ufree __os_yield - __qam_init_print + __qam_add_read + __qam_del_read + __qam_delext_read + __qam_incfirst_read + __qam_mvptr_read __qam_pgin_out - __txn_init_print + __rep_stat_print + __txn_child_read + __txn_ckp_read + __txn_recycle_read + __txn_regop_read + __txn_xa_regop_read |